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

libsrc/apple2/exehdr.s

@@ -6,15 +6,11 @@
 ;
 
         .export         __EXEHDR__ : absolute = 1	; Linker referenced
-        .import        	__RAM_START__, __ZPSAVE_RUN__	; Linker generated
+        .import        	__LOADADDR__, __LOADSIZE__	; Linker generated
-        .import         __MOVE_START__, __MOVE_LAST__	; Linker generated
-
-        .linecont	+
 
 ; ------------------------------------------------------------------------
 
         .segment        "EXEHDR"
 
-        .addr           __RAM_START__			; Start address
+        .addr           __LOADADDR__	; Load address
-        .word           __ZPSAVE_RUN__ - __RAM_START__ + \
+        .word           __LOADSIZE__	; Load length
-			__MOVE_LAST__  - __MOVE_START__	; Size

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;