Merge branch 'master' into Opt-ldptr1

libsrc/dbg/dbg.c

@@ -332,7 +332,7 @@ BreakPoint DbgBreaks [MAX_USERBREAKS+2];
 BreakPoint* DbgGetBreakSlot (void);
 /* Search for a free breakpoint slot. Return a pointer to the slot or 0 */
 
-BreakPoint* DbgIsBreak (unsigned Addr);
+BreakPoint* __cdecl__ DbgIsBreak (unsigned Addr);
 /* Check if there is a user breakpoint at the given address, if so, return
 ** a pointer to the slot, else return 0.
 */

libsrc/telestrat/crt0.s

@@ -1,7 +1,7 @@
 ;
 ; Startup code for cc65 (Oric version)
 ;
-; By Debrune J<EFBFBD>r<EFBFBD>me <jede@oric.org> and Ullrich von Bassewitz <uz@cc65.org>
+; By Debrune Jérôme <jede@oric.org> and Ullrich von Bassewitz <uz@cc65.org>
 ;
 
         .export         _exit
@@ -36,12 +36,12 @@
 
 ; Call the module destructors. This is also the exit() entry.
 
-_exit:  jsr     donelib
+_exit:
 
-; Restore the system stuff.
+; Save return code on stack
 
-        ldx     spsave
-        txs
+        pha
+        jsr     donelib
 
 ; Copy back the zero-page stuff.
 
@@ -51,6 +51,16 @@ L2:     lda     zpsave,x
         dex
         bpl     L2
 
+; Restore the return code.
+; The return code is on the stack, so we can just pop it.
+; This is the return code from main().
+        pla
+
+; Restore the system stuff.
+
+        ldx     spsave
+        txs
+
 ; Back to BASIC.
 
         rts