Changed the solution for the PLOT problem with old -02 kernals to that used

[cc65] / libsrc / c64 / crt0.s

diff --git a/libsrc/c64/crt0.s b/libsrc/c64/crt0.s
index 20f0827f6f662d92ae02243540c3344b18c56122..18ef109048821c6860eb4b6fedbbc99c7d44f36a 100644 (file)
--- a/libsrc/c64/crt0.s
+++ b/libsrc/c64/crt0.s
@@ -1,15 +1,14 @@
 ;
 ; Startup code for cc65 (C64 version)
-;
-; This must be the *first* file on the linker command line
 ;
 
        .export         _exit
-       .import         initlib, donelib, condes
-               .import         zerobss, push0
+        .export         __STARTUP__ : absolute = 1      ; Mark as startup
+       .import         initlib, donelib, callirq
+               .import         zerobss
        .import         callmain
         .import         RESTOR, BSOUT, CLRCH
-       .import         __IRQFUNC_TABLE__, __IRQFUNC_COUNT__
+       .import         __INTERRUPTOR_COUNT__
        .import         __RAM_START__, __RAM_SIZE__     ; Linker generated
 
         .include        "zeropage.inc"
@@ -73,13 +72,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
@@ -92,15 +87,23 @@ 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
@@ -109,13 +112,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,10 +141,7 @@ L2:        lda     zpsave,x
 
 IRQStub:
        cld                             ; Just to be sure
-       ldy     #<(__IRQFUNC_COUNT__*2)
-               lda     #<__IRQFUNC_TABLE__
-       ldx     #>__IRQFUNC_TABLE__
-       jsr     condes                  ; Call the functions
+               jsr     callirq                 ; Call the functions
                jmp     IRQInd                  ; Jump to the saved IRQ vector
 
 ; ------------------------------------------------------------------------
@@ -153,9 +149,12 @@ IRQStub:
 
 .data
 
-zpsave:        .res    zpspace
 IRQInd: jmp     $0000
 
+.segment        "ZPSAVE"
+
+zpsave:        .res    zpspace
+
 .bss
 
 spsave:        .res    1