From: Oliver Schmidt <ol.sc@web.de>
Date: Mon, 16 Feb 2015 14:43:08 +0000 (+0100)
Subject: Moved interrupt enabling to the interrupt constructor.
X-Git-Tag: V2.15~23
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3ed3e98ec735c0fc8bebf28e4afebcac1d628fca;p=cc65

Moved interrupt enabling to the interrupt constructor.
---

diff --git a/libsrc/apple2/crt0.s b/libsrc/apple2/crt0.s
index 4a7463b27..0f134202e 100644
--- a/libsrc/apple2/crt0.s
+++ b/libsrc/apple2/crt0.s
@@ -164,10 +164,6 @@ basic:  lda     HIMEM
 :       sta     sp
         stx     sp+1
 
-        ; Enable interrupts, as old ProDOS versions (i.e. 1.1.1)
-        ; jump to SYS and BIN programs with interrupts disabled.
-        cli
-
         ; Call the module constructors.
         jsr     initlib
 
diff --git a/libsrc/apple2/irq.s b/libsrc/apple2/irq.s
index c81fa7108..0b0555695 100644
--- a/libsrc/apple2/irq.s
+++ b/libsrc/apple2/irq.s
@@ -21,6 +21,10 @@ initirq:
         .byte   $40             ; Alloc interrupt
         .addr   i_param
         bcs     prterr
+
+        ; Enable interrupts, as old ProDOS versions (i.e. 1.1.1)
+        ; jump to SYS and BIN programs with interrupts disabled.
+        cli
         rts
 
         ; Print error message and exit