Get rid of SAVEAREA segment: fold it into LOWDATA.

diff --git a/cfg/atarixl-largehimem.cfg b/cfg/atarixl-largehimem.cfg
index 94aff46a59bce26535dde8d2dda8bb995e9122e1..f01294d61aba63dbb5379bb1af91af04c34c2275 100644 (file)
--- a/cfg/atarixl-largehimem.cfg
+++ b/cfg/atarixl-largehimem.cfg
@@ -28,12 +28,10 @@ MEMORY {
 # "main program" load chunk
     MAINHDR:       file = %O,               start = $0000,                  size = $0004;
     RAM:           file = %O, define = yes, start = %S +
-                                                   __SAVEAREA_SIZE__ +
-                                                   __LOWDATA_SIZE__, size = $D000 -
-                                                                            __STACKSIZE__ -
-                                                                            %S -
-                                                                            __SAVEAREA_SIZE__ -
-                                                                            __LOWDATA_SIZE__;
+                                                   __LOWDATA_SIZE__,       size = $D000 -
+                                                                                  __STACKSIZE__ -
+                                                                                  %S -
+                                                                                  __LOWDATA_SIZE__;
 
 # defines entry point into program
     TRAILER:       file = %O,               start = $0000, size = $0006;
@@ -53,8 +51,7 @@ SEGMENTS {
     SYSCHKTRL:  load = SYSCHKTRL,                   type = ro,                optional = yes;
 
     SRPREPHDR:  load = SRPREPHDR,                   type = ro;
-    SAVEAREA:   load = SRPREPCHNK,                  type = bss, define = yes;  # shared btw. SRPREP and RAM
-    LOWDATA:    load = SRPREPCHNK,                  type = bss, define = yes;  #   "  "  "  "  "  "  "  "
+    LOWDATA:    load = SRPREPCHNK,                  type = bss, define = yes;  # shared btw. SRPREP and RAM
     SRPREP:     load = SRPREPCHNK,                  type = rw,  define = yes;
     SHADOW_RAM:  load = SRPREPCHNK, run = HIDDEN_RAM, type = rw,  define = yes, optional = yes;
     SHADOW_RAM2: load = SRPREPCHNK, run = HIDDEN_RAM, type = rw,  define = yes, optional = yes;

diff --git a/cfg/atarixl-overlay.cfg b/cfg/atarixl-overlay.cfg
index 74a4a8c2f11da4cf9f7f81463abd07d71d45d08f..5f19c6354c079901896706136bdf6ba98b0b3e3c 100644 (file)
--- a/cfg/atarixl-overlay.cfg
+++ b/cfg/atarixl-overlay.cfg
@@ -30,13 +30,11 @@ MEMORY {
     MAINHDR:       file = %O,               start = $0000,                  size = $0004;
     RAM:           file = %O, define = yes, start = %S +
                                                     __OVERLAYSIZE__ +
-                                                    __SAVEAREA_SIZE__ +
-                                                    __LOWDATA_SIZE__, size = $D000 -
-                                                                             __STACKSIZE__ -
-                                                                             %S -
-                                                                             __OVERLAYSIZE__ -
-                                                                             __SAVEAREA_SIZE__ -
-                                                                             __LOWDATA_SIZE__;
+                                                    __LOWDATA_SIZE__,       size = $D000 -
+                                                                                   __STACKSIZE__ -
+                                                                                   %S -
+                                                                                   __OVERLAYSIZE__ -
+                                                                                   __LOWDATA_SIZE__;
 
 # defines entry point into program
     TRAILER:       file = %O,               start = $0000, size = $0006;
@@ -67,8 +65,7 @@ SEGMENTS {
     SYSCHKTRL:  load = SYSCHKTRL,                   type = ro,                optional = yes;
 
     SRPREPHDR:  load = SRPREPHDR,                   type = ro;
-    SAVEAREA:   load = SRPREPCHNK,                  type = bss, define = yes;  # shared btw. SRPREP and RAM
-    LOWDATA:    load = SRPREPCHNK,                  type = bss, define = yes;  #   "  "  "  "  "  "  "  "
+    LOWDATA:    load = SRPREPCHNK,                  type = bss, define = yes;  # shared btw. SRPREP and RAM
     SRPREP:     load = SRPREPCHNK,                  type = rw,  define = yes;
     SHADOW_RAM:  load = SRPREPCHNK, run = HIDDEN_RAM, type = rw,  define = yes, optional = yes;
     SHADOW_RAM2: load = SRPREPCHNK, run = HIDDEN_RAM, type = rw,  define = yes, optional = yes;

diff --git a/cfg/atarixl.cfg b/cfg/atarixl.cfg
index e400c6beac1f9a9ee008e78bce43900373daaf35..ceb4141af935c9fb4b687db6dbb6c205e6a54f6d 100644 (file)
--- a/cfg/atarixl.cfg
+++ b/cfg/atarixl.cfg
@@ -28,12 +28,10 @@ MEMORY {
 # "main program" load chunk
     MAINHDR:       file = %O,               start = $0000,                  size = $0004;
     RAM:           file = %O, define = yes, start = %S +
-                                                   __SAVEAREA_SIZE__ +
-                                                   __LOWDATA_SIZE__, size = $D000 -
-                                                                            __STACKSIZE__ -
-                                                                            %S -
-                                                                            __SAVEAREA_SIZE__ -
-                                                                            __LOWDATA_SIZE__;
+                                                   __LOWDATA_SIZE__,       size = $D000 -
+                                                                                  __STACKSIZE__ -
+                                                                                  %S -
+                                                                                  __LOWDATA_SIZE__;
 
 # defines entry point into program
     TRAILER:       file = %O,               start = $0000, size = $0006;
@@ -56,8 +54,7 @@ SEGMENTS {
     SYSCHKTRL:  load = SYSCHKTRL,                   type = ro,                optional = yes;
 
     SRPREPHDR:  load = SRPREPHDR,                   type = ro;
-    SAVEAREA:   load = SRPREPCHNK,                  type = bss, define = yes;  # shared btw. SRPREP and RAM
-    LOWDATA:    load = SRPREPCHNK,                  type = bss, define = yes;  #   "  "  "  "  "  "  "  "
+    LOWDATA:    load = SRPREPCHNK,                  type = bss, define = yes;  # shared btw. SRPREP and RAM
     SRPREP:     load = SRPREPCHNK,                  type = rw,  define = yes;
     SHADOW_RAM:  load = SRPREPCHNK, run = HIDDEN_RAM,  type = rw,  define = yes, optional = yes;
     SHADOW_RAM2: load = SRPREPCHNK, run = HIDDEN_RAM2, type = rw,  define = yes, optional = yes;

diff --git a/libsrc/atari/save_area.s b/libsrc/atari/save_area.s
index 45cd4240074411ba34b31895a70a15582dba4d7e..2fddce017868985ce4917130ab6eeba76b38cba4 100644 (file)
--- a/libsrc/atari/save_area.s
+++ b/libsrc/atari/save_area.s
@@ -14,7 +14,7 @@
 .export                RAMTOP_save
 .export                PORTB_save
 
-.segment        "SAVEAREA"
+.segment        "LOWDATA"
 
 SAVMSC_save:   .res    2
 MEMTOP_save:   .res    2