no TGI_ERR_NO_MEM or TGI_ERR_NO_IOCB anymore: replaced by TGI_ERR_NO_RES

[cc65] / libsrc / vic20 / crt0.s

diff --git a/libsrc/vic20/crt0.s b/libsrc/vic20/crt0.s
index 81a9c025d5844e2b0e44a55a5f58a9df05c76aeb..a5d61386551f27a3be3c8f95a34ff96bc3c56919 100644 (file)
--- a/libsrc/vic20/crt0.s
+++ b/libsrc/vic20/crt0.s
@@ -1,15 +1,14 @@
 ;
 ; Startup code for cc65 (Vic20 version)
-;
-; This must be the *first* file on the linker command line
 ;
 
        .export         _exit
+        .export         __STARTUP__ : absolute = 1      ; Mark as startup
        .import         initlib, donelib, callirq
                .import         zerobss, push0
        .import         callmain
         .import         RESTOR, BSOUT, CLRCH
-       .import         __IRQFUNC_COUNT__
+       .import         __INTERRUPTOR_COUNT__
        .import         __RAM_START__, __RAM_SIZE__     ; Linker generated
 
         .include        "zeropage.inc"
@@ -66,13 +65,9 @@ L1:  lda     sp,x
        lda     #>(__RAM_START__ + __RAM_SIZE__)
                sta     sp+1            ; Set argument stack ptr
 
-; Call module constructors
-
-       jsr     initlib
-
 ; If we have IRQ functions, chain our stub into the IRQ vector
 
-        lda     #<__IRQFUNC_COUNT__
+        lda     #<__INTERRUPTOR_COUNT__
        beq     NoIRQ1
        lda     IRQVec
                ldx     IRQVec+1
@@ -85,15 +80,22 @@ L1: lda     sp,x
        stx     IRQVec+1
        cli
 
+; Call module constructors
+
+NoIRQ1: jsr     initlib
+
 ; Push arguments and call main()
 
-NoIRQ1: jsr     callmain
+        jsr     callmain
+
+; Back from main (This is also the _exit entry). Run module destructors
 
-; Back from main (This is also the _exit entry). Reset the IRQ vector if we
-; chained it.
+_exit:  jsr     donelib
 
-_exit:         pha                     ; Save the return code on stack
-       lda     #<__IRQFUNC_COUNT__
+; Reset the IRQ vector if we chained it.
+
+        pha                    ; Save the return code on stack
+       lda     #<__INTERRUPTOR_COUNT__
        beq     NoIRQ2
        lda     IRQInd+1
        ldx     IRQInd+2
@@ -102,13 +104,9 @@ _exit:     pha                     ; Save the return code on stack
        stx     IRQVec+1
        cli
 
-; Run module destructors
-
-NoIRQ2: jsr    donelib
-
 ; Copy back the zero page stuff
 
-               ldx     #zpspace-1
+NoIRQ2: ldx    #zpspace-1
 L2:    lda     zpsave,x
        sta     sp,x
        dex
@@ -142,9 +140,12 @@ IRQStub:
 
 .data
 
-zpsave:        .res    zpspace
 IRQInd: jmp     $0000
 
+.segment        "ZPSAVE"
+
+zpsave:        .res    zpspace
+
 .bss
 
 spsave:        .res    1