Moved actual computation of DOS 3.3 header to linker configurations:

- This will allow for different "formulas".
- This brings things together in one place.

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

diff --git a/libsrc/apple2/exehdr.s b/libsrc/apple2/exehdr.s
index 5ebd6f7f1c8b3b0ba8e63f9f820da85e61f36a50..f66b14a5c8c6d9f3d3edfb6263d0e3b6c986abf3 100644 (file)
--- a/libsrc/apple2/exehdr.s
+++ b/libsrc/apple2/exehdr.s
@@ -6,15 +6,11 @@
 ;
 
         .export         __EXEHDR__ : absolute = 1      ; Linker referenced
-        .import                __RAM_START__, __ZPSAVE_RUN__   ; Linker generated
-        .import         __MOVE_START__, __MOVE_LAST__  ; Linker generated
-
-        .linecont      +
+        .import                __LOADADDR__, __LOADSIZE__      ; Linker generated
 
 ; ------------------------------------------------------------------------
 
         .segment        "EXEHDR"
 
-        .addr           __RAM_START__                  ; Start address
-        .word           __ZPSAVE_RUN__ - __RAM_START__ + \
-                       __MOVE_LAST__  - __MOVE_START__ ; Size
+        .addr           __LOADADDR__   ; Load address
+        .word           __LOADSIZE__   ; Load length

diff --git a/src/ld65/cfg/apple2-dos33.cfg b/src/ld65/cfg/apple2-dos33.cfg
index 091406e5c17cbbfe1069f96a228b4c72493f307d..644b0cc418a0042b082f44669185094c0382168b 100644 (file)
--- a/src/ld65/cfg/apple2-dos33.cfg
+++ b/src/ld65/cfg/apple2-dos33.cfg
@@ -6,6 +6,9 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __LOADADDR__:  type = weak, value = __RAM_START__;
+    __LOADSIZE__:  type = weak, value = __ZPSAVE_RUN__ - __RAM_START__ +
+                                        __MOVE_LAST__  - __MOVE_START__;
 }
 MEMORY {
     ZP:     file = "", define = yes, start = $0080, size = $001A;

diff --git a/src/ld65/cfg/apple2-loader.cfg b/src/ld65/cfg/apple2-loader.cfg
index 68556a277bfd484b6f17a39ea42828c2975b7222..8cf2b43f5527234299e7819346934f32e36a5c13 100644 (file)
--- a/src/ld65/cfg/apple2-loader.cfg
+++ b/src/ld65/cfg/apple2-loader.cfg
@@ -6,6 +6,9 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __LOADADDR__:  type = weak, value = __RAM_START__;
+    __LOADSIZE__:  type = weak, value = __ZPSAVE_RUN__ - __RAM_START__ +
+                                        __MOVE_LAST__  - __MOVE_START__;
 }
 MEMORY {
     ZP:     file = "", define = yes, start = $0080, size = $001A;

diff --git a/src/ld65/cfg/apple2-reboot.cfg b/src/ld65/cfg/apple2-reboot.cfg
index 82b2ea59b28eeeaaa5fae6333e5a81ece38dfa7d..e10b0debbd8946cb40a6d068dfc2b236c48f04ef 100644 (file)
--- a/src/ld65/cfg/apple2-reboot.cfg
+++ b/src/ld65/cfg/apple2-reboot.cfg
@@ -7,6 +7,9 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __LOADADDR__:  type = weak, value = __RAM_START__;
+    __LOADSIZE__:  type = weak, value = __ZPSAVE_RUN__ - __RAM_START__ +
+                                        __MOVE_LAST__  - __MOVE_START__;
 }
 MEMORY {
     ZP:     file = "", define = yes, start = $0080, size = $001A;

diff --git a/src/ld65/cfg/apple2-system.cfg b/src/ld65/cfg/apple2-system.cfg
index 187cc7907d9c920076fb1b4f8069e5d1d1b5fb87..51397f096c47305d2f67fa97ea66b80f4b4a050c 100644 (file)
--- a/src/ld65/cfg/apple2-system.cfg
+++ b/src/ld65/cfg/apple2-system.cfg
@@ -3,6 +3,9 @@
 SYMBOLS {
     __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __LOADADDR__:  type = weak, value = __RAM_START__;
+    __LOADSIZE__:  type = weak, value = __ZPSAVE_RUN__ - __RAM_START__ +
+                                        __MOVE_LAST__  - __MOVE_START__;
 }
 MEMORY {
     ZP:     file = "", define = yes, start = $0080, size = $001A;

diff --git a/src/ld65/cfg/apple2.cfg b/src/ld65/cfg/apple2.cfg
index 00d61564428a6d52c17cf13b5ee91a22ed770a22..16f6428ce1d30a22b7d1b5491e117223f5784110 100644 (file)
--- a/src/ld65/cfg/apple2.cfg
+++ b/src/ld65/cfg/apple2.cfg
@@ -6,6 +6,9 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __LOADADDR__:  type = weak, value = __RAM_START__;
+    __LOADSIZE__:  type = weak, value = __ZPSAVE_RUN__ - __RAM_START__ +
+                                        __MOVE_LAST__  - __MOVE_START__;
 }
 MEMORY {
     ZP:     file = "", define = yes, start = $0080, size = $001A;

diff --git a/src/ld65/cfg/apple2enh-dos33.cfg b/src/ld65/cfg/apple2enh-dos33.cfg
index 091406e5c17cbbfe1069f96a228b4c72493f307d..644b0cc418a0042b082f44669185094c0382168b 100644 (file)
--- a/src/ld65/cfg/apple2enh-dos33.cfg
+++ b/src/ld65/cfg/apple2enh-dos33.cfg
@@ -6,6 +6,9 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __LOADADDR__:  type = weak, value = __RAM_START__;
+    __LOADSIZE__:  type = weak, value = __ZPSAVE_RUN__ - __RAM_START__ +
+                                        __MOVE_LAST__  - __MOVE_START__;
 }
 MEMORY {
     ZP:     file = "", define = yes, start = $0080, size = $001A;

diff --git a/src/ld65/cfg/apple2enh-loader.cfg b/src/ld65/cfg/apple2enh-loader.cfg
index 68556a277bfd484b6f17a39ea42828c2975b7222..8cf2b43f5527234299e7819346934f32e36a5c13 100644 (file)
--- a/src/ld65/cfg/apple2enh-loader.cfg
+++ b/src/ld65/cfg/apple2enh-loader.cfg
@@ -6,6 +6,9 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __LOADADDR__:  type = weak, value = __RAM_START__;
+    __LOADSIZE__:  type = weak, value = __ZPSAVE_RUN__ - __RAM_START__ +
+                                        __MOVE_LAST__  - __MOVE_START__;
 }
 MEMORY {
     ZP:     file = "", define = yes, start = $0080, size = $001A;

diff --git a/src/ld65/cfg/apple2enh-reboot.cfg b/src/ld65/cfg/apple2enh-reboot.cfg
index 82b2ea59b28eeeaaa5fae6333e5a81ece38dfa7d..e10b0debbd8946cb40a6d068dfc2b236c48f04ef 100644 (file)
--- a/src/ld65/cfg/apple2enh-reboot.cfg
+++ b/src/ld65/cfg/apple2enh-reboot.cfg
@@ -7,6 +7,9 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __LOADADDR__:  type = weak, value = __RAM_START__;
+    __LOADSIZE__:  type = weak, value = __ZPSAVE_RUN__ - __RAM_START__ +
+                                        __MOVE_LAST__  - __MOVE_START__;
 }
 MEMORY {
     ZP:     file = "", define = yes, start = $0080, size = $001A;

diff --git a/src/ld65/cfg/apple2enh-system.cfg b/src/ld65/cfg/apple2enh-system.cfg
index 187cc7907d9c920076fb1b4f8069e5d1d1b5fb87..51397f096c47305d2f67fa97ea66b80f4b4a050c 100644 (file)
--- a/src/ld65/cfg/apple2enh-system.cfg
+++ b/src/ld65/cfg/apple2enh-system.cfg
@@ -3,6 +3,9 @@
 SYMBOLS {
     __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __LOADADDR__:  type = weak, value = __RAM_START__;
+    __LOADSIZE__:  type = weak, value = __ZPSAVE_RUN__ - __RAM_START__ +
+                                        __MOVE_LAST__  - __MOVE_START__;
 }
 MEMORY {
     ZP:     file = "", define = yes, start = $0080, size = $001A;

diff --git a/src/ld65/cfg/apple2enh.cfg b/src/ld65/cfg/apple2enh.cfg
index 00d61564428a6d52c17cf13b5ee91a22ed770a22..16f6428ce1d30a22b7d1b5491e117223f5784110 100644 (file)
--- a/src/ld65/cfg/apple2enh.cfg
+++ b/src/ld65/cfg/apple2enh.cfg
@@ -6,6 +6,9 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:    type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2k stack
+    __LOADADDR__:  type = weak, value = __RAM_START__;
+    __LOADSIZE__:  type = weak, value = __ZPSAVE_RUN__ - __RAM_START__ +
+                                        __MOVE_LAST__  - __MOVE_START__;
 }
 MEMORY {
     ZP:     file = "", define = yes, start = $0080, size = $001A;