From 250e26c56e071b59b0613ed07f4387650c834923 Mon Sep 17 00:00:00 2001
From: Christian Groessler <chris@groessler.org>
Date: Fri, 28 Jun 2013 01:08:07 +0200
Subject: [PATCH] Don't save original IRQ, NMI, and RESET vectors -- it's not
 needed.

---
 libsrc/atari/save_area.inc         | 10 +++++++---
 libsrc/atari/save_area.s           |  8 +-------
 libsrc/atari/shadow_ram_handlers.s |  6 +++---
 libsrc/atari/shadow_ram_prepare.s  | 13 -------------
 4 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/libsrc/atari/save_area.inc b/libsrc/atari/save_area.inc
index d3868723d..f14152ae0 100644
--- 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 e222b70bd..752e81487 100644
--- 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 3c65c98ee..80dc5c2d1 100644
--- 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 f8a7dbbf6..6458ffdb1 100644
--- 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
-- 
2.39.5