Avoid mixing of memory areas and segments in address computations (and made move...

[cc65] / src / ld65 / cfg / apple2enh.cfg

diff --git a/src/ld65/cfg/apple2enh.cfg b/src/ld65/cfg/apple2enh.cfg
index 55119e639c75fc2bf5940e09f717d22ca114acab..379fbcf401936764fdd4192a3573f83e316ed6fc 100644 (file)
--- a/src/ld65/cfg/apple2enh.cfg
+++ b/src/ld65/cfg/apple2enh.cfg
@@ -8,21 +8,21 @@ SYMBOLS {
     __LCADDR__:    type = weak, value = $D400; # Behind quit code
     __LCSIZE__:    type = weak, value = $0C00; # Rest of bank two
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
-    __LOADADDR__:  type = weak, value = __RAM_START__;
-    __LOADSIZE__:  type = weak, value = __ZPSAVE_RUN__ - __RAM_START__ +
+    __LOADADDR__:  type = weak, value = __STARTUP_RUN__;
+    __LOADSIZE__:  type = weak, value = __ZPSAVE_RUN__ - __STARTUP_RUN__ +
                                         __MOVE_LAST__  - __MOVE_START__;
 }
 MEMORY {
     ZP:                define = yes, start = $0080,      size = $001A;
     HEADER: file = %O,               start = $0000,      size = $0004;
-    RAM:    file = %O, define = yes, start = %S,         size = $9600 - __STACKSIZE__ - %S;
+    RAM:    file = %O,               start = %S,         size = $9600 - __STACKSIZE__ - %S;
     MOVE:   file = %O, define = yes, start = $0000,      size = $FFFF;
     LC:                define = yes, start = __LCADDR__, size = __LCSIZE__;
 }
 SEGMENTS {
     ZEROPAGE: load = ZP,              type = zp;
     EXEHDR:   load = HEADER,          type = ro;
-    STARTUP:  load = RAM,             type = ro;
+    STARTUP:  load = RAM,             type = ro,  define   = yes;
     LOWCODE:  load = RAM,             type = ro;
     CODE:     load = RAM,             type = ro;
     RODATA:   load = RAM,             type = ro;