Reverted the change by Stefan Haubenthal - order of segments is important for

the heap to work correctly.

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

diff --git a/doc/atmos.sgml b/doc/atmos.sgml
index e8e564b86731279c480144b863f21da57d61f6ce..692977d6a153eceba1ab5516b2494111f4dfeadb 100644 (file)
--- a/doc/atmos.sgml
+++ b/doc/atmos.sgml
@@ -33,8 +33,8 @@ information.
 <sect>Binary format<p>
 
 The standard binary output format generated by the linker for the Atmos target
-is a machine language program with a 14 byte tape header. The standard load
-and autostart address is &dollar;500.
+is a machine language program with a 17 byte tape header including a cc65 tag.
+The standard load and autostart address is &dollar;500.
 
 
 <sect>Memory layout<p>

diff --git a/libsrc/atmos/crt0.s b/libsrc/atmos/crt0.s
index 5feb06d3904865df6785cfb12bd0b3ce30a57598..1f5bcd568033242b2f694265184b872280558d0d 100644 (file)
--- a/libsrc/atmos/crt0.s
+++ b/libsrc/atmos/crt0.s
@@ -9,7 +9,7 @@
        .import         initlib, donelib
        .import         callmain, zerobss
        .import         __RAM_START__, __RAM_SIZE__
-       .import         __BSS_LOAD__, __STACKSIZE__
+       .import         __ZPSAVE_LOAD__, __STACKSIZE__
 
        .include        "zeropage.inc"
        .include        "atmos.inc"
@@ -27,7 +27,7 @@
        .byte   $00                             ; $2AF
        .byte   $80                             ; $2AE Machine code flag
        .byte   $C7                             ; $2AD Autoload flag
-       .dbyt   __BSS_LOAD__                    ; $2AB
+       .dbyt   __ZPSAVE_LOAD__                 ; $2AB
        .dbyt   __RAM_START__                   ; $2A9
        .byte   $00                             ; $2A8
        .byte   ((.VERSION >> 8) & $0F) + '0'

diff --git a/src/ld65/cfg/atmos.cfg b/src/ld65/cfg/atmos.cfg
index 2bfb691b0b81779e5f04b9fe0f9707b0ffb4ccdd..b2194b6b0acb531ca95a499c174000a376b4376a 100644 (file)
--- a/src/ld65/cfg/atmos.cfg
+++ b/src/ld65/cfg/atmos.cfg
@@ -14,8 +14,8 @@ SEGMENTS {
     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;
-    ZPSAVE:   load = RAM,     type = bss;
     ZEROPAGE: load = ZP,      type = zp;
 }
 FEATURES {