Return after errors, move left bracket consumption down

[cc65] / cfg / atarixl.cfg

diff --git a/cfg/atarixl.cfg b/cfg/atarixl.cfg
index 84992a205fd98995c69cc64cfd0754d0298af575..197daace6a67b18fc9a4b4b38c32b72e8edf1b36 100644 (file)
--- a/cfg/atarixl.cfg
+++ b/cfg/atarixl.cfg
@@ -1,53 +1,49 @@
 FEATURES {
     STARTADDRESS: default = $2400;
 }
-
 SYMBOLS {
-    __EXEHDR__:          type = import;
-    __SYSTEM_CHECK__:    type = import;  # force inclusion of "system check" load chunk
-    __AUTOSTART__:       type = import;  # force inclusion of autostart "trailer"
-    __STACKSIZE__:       type = weak, value = $0800; # 2k stack
-    __STARTADDRESS__:    type = export, value = %S;
+    __EXEHDR__:       type = import;
+    __SYSTEM_CHECK__: type = import;  # force inclusion of "system check" load chunk
+    __AUTOSTART__:    type = import;  # force inclusion of autostart "trailer"
+    __STACKSIZE__:    type = weak, value = $0800; # 2k stack
+    __STARTADDRESS__: type = export, value = %S;
 }
-
 MEMORY {
-    ZP:            file = "", define = yes, start = $0082,                  size = $007E;
+    ZP:          file = "", define = yes, start = $0082,                size = $007E;
 
 # just $FFFF
-    HEADER:        file = %O,               start = $0000,                  size = $0002;
+    HEADER:      file = %O,               start = $0000,                size = $0002;
 
 # "system check" load chunk
-    SYSCHKHDR:     file = %O,               start = $0000,                  size = $0004;
-    SYSCHKCHNK:    file = %O,               start = $2E00,                  size = $0300;
-    SYSCHKTRL:     file = %O,               start = $0000,                  size = $0006;
+    SYSCHKHDR:   file = %O,               start = $0000,                size = $0004;
+    SYSCHKCHNK:  file = %O,               start = $2E00,                size = $0300;
+    SYSCHKTRL:   file = %O,               start = $0000,                size = $0006;
 
 # "shadow RAM preparation" load chunk
-    SRPREPHDR:     file = %O,               start = $0000,                  size = $0004;
-    SRPREPCHNK:    file = %O, define = yes, start = %S,                     size = $7C20 - %S - $07FF;  # $07FF: space for temp. chargen buffer, 1K aligned
-    SRPREPTRL:     file = %O,               start = $0000,                  size = $0006;
+    SRPREPHDR:   file = %O,               start = $0000,                size = $0004;
+    SRPREPCHNK:  file = %O, define = yes, start = %S,                   size = $7C20 - %S - $07FF;  # $07FF: space for temp. chargen buffer, 1K aligned
+    SRPREPTRL:   file = %O,               start = $0000,                size = $0006;
 
 # "main program" load chunk
-    MAINHDR:       file = %O,               start = $0000,                  size = $0004;
-    RAM:           file = %O, define = yes, start = %S +
-                                                    __LOWBSS_SIZE__,        size = $D000 -
-                                                                                   __STACKSIZE__ -
-                                                                                   %S -
-                                                                                   __LOWBSS_SIZE__;
+    MAINHDR:     file = %O,               start = $0000,                size = $0004;
+    MAIN:        file = %O, define = yes, start = %S + __LOWBSS_SIZE__, size = $D000 - __STACKSIZE__ - %S - __LOWBSS_SIZE__;
 
 # defines entry point into program
-    TRAILER:       file = %O,               start = $0000, size = $0006;
+    TRAILER:     file = %O,               start = $0000,                size = $0006;
 
 # memory beneath the ROM preceeding the character generator
-    HIDDEN_RAM2:   file = "", define = yes, start = $D800, size = $0800;
+    HIDDEN_RAM2: file = "", define = yes, start = $D800,                size = $0800;
 
 # address of relocated character generator (same addess as ROM version)
-    CHARGEN:       file = "", define = yes, start = $E000, size = $0400;
+    CHARGEN:     file = "", define = yes, start = $E000,                size = $0400;
 
 # memory beneath the ROM
-    HIDDEN_RAM:    file = "", define = yes, start = $E400, size = $FFFA - $E400;
+    HIDDEN_RAM:  file = "", define = yes, start = $E400,                size = $FFFA - $E400;
 }
-
 SEGMENTS {
+    ZEROPAGE:    load = ZP,                            type = zp;
+    EXTZP:       load = ZP,                            type = zp,                optional = yes;
+
     EXEHDR:      load = HEADER,                        type = ro;
 
     SYSCHKHDR:   load = SYSCHKHDR,                     type = ro,                optional = yes;
@@ -62,23 +58,21 @@ SEGMENTS {
     SRPREPTRL:   load = SRPREPTRL,                     type = ro;
 
     MAINHDR:     load = MAINHDR,                       type = ro;
-    STARTUP:     load = RAM,                           type = ro,  define = yes;
-    LOWCODE:     load = RAM,                           type = ro,  define = yes, optional = yes;
-    INIT:        load = RAM,                           type = ro,                optional = yes;
-    CODE:        load = RAM,                           type = ro,  define = yes;
-    RODATA:      load = RAM,                           type = ro;
-    DATA:        load = RAM,                           type = rw;
-    INITBSS:     load = RAM,                           type = bss,               optional = yes;
-    BSS:         load = RAM,                           type = bss, define = yes;
-    ZEROPAGE:    load = ZP,                            type = zp;
-    EXTZP:       load = ZP,                            type = zp,                optional = yes;
+    STARTUP:     load = MAIN,                          type = ro,  define = yes;
+    LOWCODE:     load = MAIN,                          type = ro,  define = yes, optional = yes;
+    ONCE:        load = MAIN,                          type = ro,                optional = yes;
+    CODE:        load = MAIN,                          type = ro,  define = yes;
+    RODATA:      load = MAIN,                          type = ro;
+    DATA:        load = MAIN,                          type = rw;
+    INIT:        load = MAIN,                          type = rw,                optional = yes;
+    BSS:         load = MAIN,                          type = bss, define = yes;
     AUTOSTRT:    load = TRAILER,                       type = ro;
 }
 FEATURES {
     CONDES: type    = constructor,
             label   = __CONSTRUCTOR_TABLE__,
             count   = __CONSTRUCTOR_COUNT__,
-            segment = INIT;
+            segment = ONCE;
     CONDES: type    = destructor,
             label   = __DESTRUCTOR_TABLE__,
             count   = __DESTRUCTOR_COUNT__,