The Apple2 linker configs *-loader.cfg only differed in the presumed HIMEM from the...

git-svn-id: svn://svn.cc65.org/cc65/trunk@5728 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ld65/cfg/apple2-loader.cfg b/src/ld65/cfg/apple2-loader.cfg
deleted file mode 100644 (file)
index e8b81ad..0000000
--- a/src/ld65/cfg/apple2-loader.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-# Configuration optimized for programs loaded with LOADER.SYSTEM
-
-FEATURES {
-    STARTADDRESS: default = $0800;
-}
-SYMBOLS {
-    __EXEHDR__:    type = import;
-    __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 = __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,               start = %S,         size = $BF00 - __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,  define   = yes;
-    LOWCODE:  load = RAM,             type = ro;
-    CODE:     load = RAM,             type = ro;
-    RODATA:   load = RAM,             type = ro;
-    DATA:     load = RAM,             type = rw;
-    ZPSAVE:   load = RAM,             type = bss, define   = yes;
-    BSS:      load = RAM,             type = bss, define   = yes;
-    INIT:     load = MOVE, run = RAM, type = ro,  define   = yes;
-    LC:       load = MOVE, run = LC,  type = ro,  optional = yes;
-}
-FEATURES {
-    CONDES: segment = INIT,
-            type    = constructor,
-            label   = __CONSTRUCTOR_TABLE__,
-            count   = __CONSTRUCTOR_COUNT__;
-    CONDES: segment = RODATA,
-            type    = destructor,
-            label   = __DESTRUCTOR_TABLE__,
-            count   = __DESTRUCTOR_COUNT__;
-    CONDES: segment = RODATA,
-            type    = interruptor,
-            label   = __INTERRUPTOR_TABLE__,
-            count   = __INTERRUPTOR_COUNT__;
-}

diff --git a/src/ld65/cfg/apple2.cfg b/src/ld65/cfg/apple2.cfg
index d95c9ce81022dcb0a0d213bd220b58770dffe781..5ebe8d31d94a5c7f2772e055514ed2c618365f7b 100644 (file)
--- a/src/ld65/cfg/apple2.cfg
+++ b/src/ld65/cfg/apple2.cfg
@@ -5,6 +5,7 @@ FEATURES {
 }
 SYMBOLS {
     __EXEHDR__:    type = import;
+    __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
@@ -15,7 +16,7 @@ SYMBOLS {
 MEMORY {
     ZP:                define = yes, start = $0080,      size = $001A;
     HEADER: file = %O,               start = $0000,      size = $0004;
-    RAM:    file = %O,               start = %S,         size = $9600 - __STACKSIZE__ - %S;
+    RAM:    file = %O,               start = %S,         size = __HIMEM__ - __STACKSIZE__ - %S;
     MOVE:   file = %O, define = yes, start = $0000,      size = $FFFF;
     LC:                define = yes, start = __LCADDR__, size = __LCSIZE__;
 }

diff --git a/src/ld65/cfg/apple2enh-loader.cfg b/src/ld65/cfg/apple2enh-loader.cfg
deleted file mode 100644 (file)
index e8b81ad..0000000
--- a/src/ld65/cfg/apple2enh-loader.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-# Configuration optimized for programs loaded with LOADER.SYSTEM
-
-FEATURES {
-    STARTADDRESS: default = $0800;
-}
-SYMBOLS {
-    __EXEHDR__:    type = import;
-    __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 = __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,               start = %S,         size = $BF00 - __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,  define   = yes;
-    LOWCODE:  load = RAM,             type = ro;
-    CODE:     load = RAM,             type = ro;
-    RODATA:   load = RAM,             type = ro;
-    DATA:     load = RAM,             type = rw;
-    ZPSAVE:   load = RAM,             type = bss, define   = yes;
-    BSS:      load = RAM,             type = bss, define   = yes;
-    INIT:     load = MOVE, run = RAM, type = ro,  define   = yes;
-    LC:       load = MOVE, run = LC,  type = ro,  optional = yes;
-}
-FEATURES {
-    CONDES: segment = INIT,
-            type    = constructor,
-            label   = __CONSTRUCTOR_TABLE__,
-            count   = __CONSTRUCTOR_COUNT__;
-    CONDES: segment = RODATA,
-            type    = destructor,
-            label   = __DESTRUCTOR_TABLE__,
-            count   = __DESTRUCTOR_COUNT__;
-    CONDES: segment = RODATA,
-            type    = interruptor,
-            label   = __INTERRUPTOR_TABLE__,
-            count   = __INTERRUPTOR_COUNT__;
-}

diff --git a/src/ld65/cfg/apple2enh.cfg b/src/ld65/cfg/apple2enh.cfg
index d95c9ce81022dcb0a0d213bd220b58770dffe781..5ebe8d31d94a5c7f2772e055514ed2c618365f7b 100644 (file)
--- a/src/ld65/cfg/apple2enh.cfg
+++ b/src/ld65/cfg/apple2enh.cfg
@@ -5,6 +5,7 @@ FEATURES {
 }
 SYMBOLS {
     __EXEHDR__:    type = import;
+    __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
@@ -15,7 +16,7 @@ SYMBOLS {
 MEMORY {
     ZP:                define = yes, start = $0080,      size = $001A;
     HEADER: file = %O,               start = $0000,      size = $0004;
-    RAM:    file = %O,               start = %S,         size = $9600 - __STACKSIZE__ - %S;
+    RAM:    file = %O,               start = %S,         size = __HIMEM__ - __STACKSIZE__ - %S;
     MOVE:   file = %O, define = yes, start = $0000,      size = $FFFF;
     LC:                define = yes, start = __LCADDR__, size = __LCSIZE__;
 }