From b71370630411c2b1102aa2e59c5b3e3b3d89b866 Mon Sep 17 00:00:00 2001 From: Christian Groessler Date: Wed, 18 Sep 2013 00:48:01 +0200 Subject: [PATCH] Get rid of SAVEAREA segment: fold it into LOWDATA. --- cfg/atarixl-largehimem.cfg | 13 +++++-------- cfg/atarixl-overlay.cfg | 15 ++++++--------- cfg/atarixl.cfg | 13 +++++-------- libsrc/atari/save_area.s | 2 +- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/cfg/atarixl-largehimem.cfg b/cfg/atarixl-largehimem.cfg index 94aff46a5..f01294d61 100644 --- 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 74a4a8c2f..5f19c6354 100644 --- 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 e400c6bea..ceb4141af 100644 --- 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 45cd42400..2fddce017 100644 --- 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 -- 2.39.2