X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=cfg%2Fapple2enh-overlay.cfg;h=e6a5ae25c1589334b3eaecdfdc6a4ade7c3d9113;hb=2fde8d35c2354da7e541021f4d6952f4b71dbbf5;hp=1e34b62507ac3b04c3f0b1d458747dc31ceb0226;hpb=aac0b1cbbb1f56ccfb1a39c12e9e53cbb02c3045;p=cc65

diff --git a/cfg/apple2enh-overlay.cfg b/cfg/apple2enh-overlay.cfg
index 1e34b6250..e6a5ae25c 100644
--- a/cfg/apple2enh-overlay.cfg
+++ b/cfg/apple2enh-overlay.cfg
@@ -12,21 +12,18 @@ FEATURES {
 }
 SYMBOLS {
     __EXEHDR__:      type = import;
+    __STACKSIZE__:   type = weak, value = $0800; # 2k stack
     __HIMEM__:       type = weak, value = $9600; # Presumed RAM end
     __LCADDR__:      type = weak, value = $D400; # Behind quit code
     __LCSIZE__:      type = weak, value = $0C00; # Rest of bank two
-    __STACKSIZE__:   type = weak, value = $0800; # 2k stack
     __OVERLAYSIZE__: type = weak, value = $1000; # 4k overlay
-    __LOADADDR__:    type = weak, value = __STARTUP_RUN__;
-    __LOADSIZE__:    type = weak, value = __INIT_RUN__ - __STARTUP_RUN__ +
-                                          __MOVE_LAST__  - __MOVE_START__;
 }
 MEMORY {
-    ZP:                define = yes, start = $0080,                size = $001A;
-    HEADER: file = %O,               start = $0000,                size = $0004;
-    MAIN:   file = %O,               start = %S + __OVERLAYSIZE__, size = __HIMEM__ - __STACKSIZE__ - __OVERLAYSIZE__ - %S;
-    MOVE:   file = %O, define = yes, start = $0000,                size = $FFFF;
-    LC:                define = yes, start = __LCADDR__,           size = __LCSIZE__;
+    ZP:     file = "", define = yes, start = $0080,                size = $001A;
+    HEADER: file = %O,               start = %S - 4,               size = $0004;
+    MAIN:   file = %O, define = yes, start = %S + __OVERLAYSIZE__, size = __HIMEM__ - __OVERLAYSIZE__ - %S;
+    BSS:    file = "",               start = __ONCE_RUN__,         size = __HIMEM__ - __STACKSIZE__ - __ONCE_RUN__;
+    LC:     file = "", define = yes, start = __LCADDR__,           size = __LCSIZE__;
     OVL1:   file = "%O.1",           start = %S,                   size = __OVERLAYSIZE__;
     OVL2:   file = "%O.2",           start = %S,                   size = __OVERLAYSIZE__;
     OVL3:   file = "%O.3",           start = %S,                   size = __OVERLAYSIZE__;
@@ -38,26 +35,26 @@ MEMORY {
     OVL9:   file = "%O.9",           start = %S,                   size = __OVERLAYSIZE__;
 }
 SEGMENTS {
-    ZEROPAGE: load = ZP,               type = zp;
-    EXEHDR:   load = HEADER,           type = ro;
-    STARTUP:  load = MAIN,             type = ro,  define = yes;
-    LOWCODE:  load = MAIN,             type = ro,                optional = yes;
-    CODE:     load = MAIN,             type = ro;
-    RODATA:   load = MAIN,             type = ro;
-    DATA:     load = MAIN,             type = rw;
-    INIT:     load = MAIN,             type = bss, define = yes;
-    BSS:      load = MAIN,             type = bss, define = yes;
-    ONCE:     load = MOVE, run = MAIN, type = ro,  define = yes, optional = yes;
-    LC:       load = MOVE, run = LC,   type = ro,                optional = yes;
-    OVERLAY1: load = OVL1,             type = ro,  define = yes, optional = yes;
-    OVERLAY2: load = OVL2,             type = ro,  define = yes, optional = yes;
-    OVERLAY3: load = OVL3,             type = ro,  define = yes, optional = yes;
-    OVERLAY4: load = OVL4,             type = ro,  define = yes, optional = yes;
-    OVERLAY5: load = OVL5,             type = ro,  define = yes, optional = yes;
-    OVERLAY6: load = OVL6,             type = ro,  define = yes, optional = yes;
-    OVERLAY7: load = OVL7,             type = ro,  define = yes, optional = yes;
-    OVERLAY8: load = OVL8,             type = ro,  define = yes, optional = yes;
-    OVERLAY9: load = OVL9,             type = ro,  define = yes, optional = yes;
+    ZEROPAGE: load = ZP,             type = zp;
+    EXEHDR:   load = HEADER,         type = ro;
+    STARTUP:  load = MAIN,           type = ro,  define = yes;
+    LOWCODE:  load = MAIN,           type = ro,                optional = yes;
+    CODE:     load = MAIN,           type = ro;
+    RODATA:   load = MAIN,           type = ro;
+    DATA:     load = MAIN,           type = rw;
+    INIT:     load = MAIN,           type = rw;
+    ONCE:     load = MAIN,           type = ro,  define = yes;
+    LC:       load = MAIN, run = LC, type = ro,                optional = yes;
+    BSS:      load = BSS,            type = bss, define = yes;
+    OVERLAY1: load = OVL1,           type = ro,  define = yes, optional = yes;
+    OVERLAY2: load = OVL2,           type = ro,  define = yes, optional = yes;
+    OVERLAY3: load = OVL3,           type = ro,  define = yes, optional = yes;
+    OVERLAY4: load = OVL4,           type = ro,  define = yes, optional = yes;
+    OVERLAY5: load = OVL5,           type = ro,  define = yes, optional = yes;
+    OVERLAY6: load = OVL6,           type = ro,  define = yes, optional = yes;
+    OVERLAY7: load = OVL7,           type = ro,  define = yes, optional = yes;
+    OVERLAY8: load = OVL8,           type = ro,  define = yes, optional = yes;
+    OVERLAY9: load = OVL9,           type = ro,  define = yes, optional = yes;
 }
 FEATURES {
     CONDES: type    = constructor,