Fixed problems with the startup code (Greg King): Interrupts must be hooked

[cc65] / libsrc / c64 / crt0.s

diff --git a/libsrc/c64/crt0.s b/libsrc/c64/crt0.s
index 9c6464523cb806ffb414d36f99a98486ec16b14d..8b094148ddc2e224d42958aca9d90e1f82116f9a 100644 (file)
--- a/libsrc/c64/crt0.s
+++ b/libsrc/c64/crt0.s
@@ -73,10 +73,6 @@ 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     #<__INTERRUPTOR_COUNT__
@@ -92,14 +88,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). Reset the IRQ vector if we
-; chained it.
+; Back from main (This is also the _exit entry). Run module destructors
 
-_exit:         pha                     ; Save the return code on stack
+_exit:  jsr    donelib
+
+
+; Reset the IRQ vector if we chained it.
+
+        pha                    ; Save the return code on stack
        lda     #<__INTERRUPTOR_COUNT__
        beq     NoIRQ2
        lda     IRQInd+1
@@ -109,13 +113,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