Don't save original IRQ, NMI, and RESET vectors -- it's not needed.

diff --git a/libsrc/atari/save_area.inc b/libsrc/atari/save_area.inc
index d3868723d9c6ffed4a36bb711bce571e2cec2fc9..f14152ae01d89937546c203709c57ca4a367737e 100644 (file)
--- a/libsrc/atari/save_area.inc
+++ b/libsrc/atari/save_area.inc
@@ -1,7 +1,11 @@
+;
+; Atari XL, shared data between 2nd load chunk and main chunk, header file
+;
+; Contains old values of modified system variables and ports.
+;
+; Christian Groessler, chris@groessler.org, 2013
+;
 
-.import        IRQ_save
-.import        NMI_save
-.import        RESET_save
 .import        SAVMSC_save
 .import        MEMTOP_save
 .import        APPMHI_save

diff --git a/libsrc/atari/save_area.s b/libsrc/atari/save_area.s
index e222b70bdbf75d3c76d81fb0992b0f26a10bf7b7..752e81487ca8dbcd9d7bbd577156bfd66e4c2f06 100644 (file)
--- a/libsrc/atari/save_area.s
+++ b/libsrc/atari/save_area.s
@@ -1,5 +1,5 @@
 ;
-; Atari XL, shared data between 2nd load chunk and main chunk
+; Atari XL, shared data between 2nd load chunk and main chunk, definition file
 ;
 ; Contains old values of modified system variables and ports.
 ;
@@ -8,9 +8,6 @@
 
 .if .defined(__ATARIXL__)
 
-.export                IRQ_save
-.export                NMI_save
-.export                RESET_save
 .export                SAVMSC_save
 .export                MEMTOP_save
 .export                APPMHI_save
@@ -21,9 +18,6 @@
 
 .segment        "SAVEAREA"
 
-IRQ_save:      .res    2
-NMI_save:      .res    2
-RESET_save:    .res    2
 SAVMSC_save:   .res    2
 MEMTOP_save:   .res    2
 APPMHI_save:   .res    2

diff --git a/libsrc/atari/shadow_ram_handlers.s b/libsrc/atari/shadow_ram_handlers.s
index 3c65c98ee90e0cdc0021d70ac47f1022766f4893..80dc5c2d19d45fadf0cf008cc3f8b9b61765d463 100644 (file)
--- a/libsrc/atari/shadow_ram_handlers.s
+++ b/libsrc/atari/shadow_ram_handlers.s
@@ -145,7 +145,7 @@ my_IRQ_han:
        pla
        plp
 .endif
-       int_wrap IRQ_save
+       int_wrap $FFFE
 
 my_NMI_han:
 .ifdef DEBUG
@@ -174,11 +174,11 @@ my_NMI_han:
        pla
        tax
        pla
-       int_wrap NMI_save
+       int_wrap $FFFA
 
 my_RESET_han:
        enable_rom
-       jmp     (RESET_save)
+       jmp     ($FFFC)
 
 
 ; System request handlers

diff --git a/libsrc/atari/shadow_ram_prepare.s b/libsrc/atari/shadow_ram_prepare.s
index f8a7dbbf65d9861e8dc50986279c1d4c4c9b0157..6458ffdb121c17cb0faf439d2f0d4a9284fcdde8 100644 (file)
--- a/libsrc/atari/shadow_ram_prepare.s
+++ b/libsrc/atari/shadow_ram_prepare.s
@@ -88,19 +88,6 @@ sramprep:
         lda     SIOV+2
         sta     ZP_SIOV_save+2
 
-        lda     $fffe
-        sta     IRQ_save
-        lda     $ffff
-        sta     IRQ_save+1
-        lda     $fffc
-        sta     RESET_save
-        lda     $fffd
-        sta     RESET_save+1
-        lda     $fffa
-        sta     NMI_save
-        lda     $fffb
-        sta     NMI_save+1
-
 ; disable BASIC
 
         lda     PORTB