From: Christian Groessler <chris@groessler.org>
Date: Fri, 18 Oct 2013 12:53:06 +0000 (+0200)
Subject: Put EXE header and main chunk load header into a single file --
X-Git-Tag: V2.15~214^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=refs%2Fpull%2F56%2Fhead;p=cc65

Put EXE header and main chunk load header into a single file --
it makes no sense to be able to include/exclude them separately.
---

diff --git a/cfg/atari-asm.cfg b/cfg/atari-asm.cfg
index 203521352..4e87a8884 100644
--- a/cfg/atari-asm.cfg
+++ b/cfg/atari-asm.cfg
@@ -3,7 +3,6 @@ FEATURES {
 }
 SYMBOLS {
     __EXEHDR__:          type = import;
-    __MAINCHNKHDR__:     type = import;
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STARTADDRESS__:    type = export, value = %S;
 }
diff --git a/cfg/atari-overlay.cfg b/cfg/atari-overlay.cfg
index d5a73531b..1d339b208 100644
--- a/cfg/atari-overlay.cfg
+++ b/cfg/atari-overlay.cfg
@@ -4,7 +4,6 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:          type = import;
     __SYSTEM_CHECK__:    type = import;  # force inclusion of "system check" load chunk
-    __MAINCHNKHDR__:     type = import;
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __OVERLAYSIZE__:     type = weak, value = $1000; # 4k overlay
diff --git a/cfg/atari.cfg b/cfg/atari.cfg
index ef57c3e52..dce593f05 100644
--- a/cfg/atari.cfg
+++ b/cfg/atari.cfg
@@ -4,7 +4,6 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:          type = import;
     __SYSTEM_CHECK__:    type = import;  # force inclusion of "system check" load chunk
-    __MAINCHNKHDR__:     type = import;
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __STARTADDRESS__:    type = export, value = %S;
diff --git a/cfg/atarixl-largehimem.cfg b/cfg/atarixl-largehimem.cfg
index 17874b600..533987258 100644
--- a/cfg/atarixl-largehimem.cfg
+++ b/cfg/atarixl-largehimem.cfg
@@ -10,7 +10,6 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:          type = import;
     __SYSTEM_CHECK__:    type = import;  # force inclusion of "system check" load chunk
-    __MAINCHNKHDR__:     type = import;
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __STARTADDRESS__:    type = export, value = %S;
diff --git a/cfg/atarixl-overlay.cfg b/cfg/atarixl-overlay.cfg
index 2f5595c0b..0c903ef45 100644
--- a/cfg/atarixl-overlay.cfg
+++ b/cfg/atarixl-overlay.cfg
@@ -5,7 +5,6 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:          type = import;
     __SYSTEM_CHECK__:    type = import;  # force inclusion of "system check" load chunk
-    __MAINCHNKHDR__:     type = import;
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __OVERLAYSIZE__:     type = weak, value = $1000; # 4k overlay
diff --git a/cfg/atarixl.cfg b/cfg/atarixl.cfg
index f217c308f..f2cf20bc6 100644
--- a/cfg/atarixl.cfg
+++ b/cfg/atarixl.cfg
@@ -5,7 +5,6 @@ FEATURES {
 SYMBOLS {
     __EXEHDR__:          type = import;
     __SYSTEM_CHECK__:    type = import;  # force inclusion of "system check" load chunk
-    __MAINCHNKHDR__:     type = import;
     __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
     __STACKSIZE__:       type = weak, value = $0800; # 2k stack
     __STARTADDRESS__:    type = export, value = %S;
diff --git a/libsrc/atari/exehdr.s b/libsrc/atari/exehdr.s
index f2f77501d..ea9fa95d7 100644
--- a/libsrc/atari/exehdr.s
+++ b/libsrc/atari/exehdr.s
@@ -1,8 +1,11 @@
-; This file defines the EXE header for Atari executables
+; This file defines the EXE header and main chunk load header for Atari executables
 
         .export         __EXEHDR__: absolute = 1
+        .import         __RAM_START__, __BSS_LOAD__
 
 .segment        "EXEHDR"
-
         .word   $FFFF
 
+.segment        "MAINHDR"
+        .word   __RAM_START__
+        .word   __BSS_LOAD__ - 1
diff --git a/libsrc/atari/mainhdr.s b/libsrc/atari/mainhdr.s
deleted file mode 100644
index 31b339b45..000000000
--- a/libsrc/atari/mainhdr.s
+++ /dev/null
@@ -1,9 +0,0 @@
-; This file defines the chunk header for the main program load chunk
-
-        .export         __MAINCHNKHDR__: absolute = 1
-        .import         __RAM_START__, __BSS_LOAD__
-
-.segment        "MAINHDR"
-
-        .word   __RAM_START__
-        .word   __BSS_LOAD__ - 1