Just some beautification.

[cc65] / src / ld65 / cfg / plus4.cfg

diff --git a/src/ld65/cfg/plus4.cfg b/src/ld65/cfg/plus4.cfg
index 607185e614b4fbafeba8a5f6546334751c1d6e9a..c756f45a1e9f0a3c0695af33cefe4e2c30b110a6 100644 (file)
--- a/src/ld65/cfg/plus4.cfg
+++ b/src/ld65/cfg/plus4.cfg
@@ -1,33 +1,39 @@
+SYMBOLS {
+    __LOADADDR__:  type = import;
+    __EXEHDR__:    type = import;
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
+}
 MEMORY {
-    ZP:  start = $0002, size = $001A, type = rw, define = yes;
-    RAM: start = $0FFF, size = $ED01, file = %O;
+    ZP:       file = "", define = yes, start = $0002, size = $001A;
+    LOADADDR: file = %O,               start = $0FFF, size = $0002;
+    HEADER:   file = %O,               start = $1001, size = $000C;
+    RAM:      file = %O, define = yes, start = $100D, size = $ECF3 - __STACKSIZE__;
 }
 SEGMENTS {
-    STARTUP:  load = RAM, type = ro;
-    LOWCODE:  load = RAM, type = ro,               optional = yes;
-    INIT:     load = RAM, type = ro, define = yes, optional = yes;
-    CODE:     load = RAM, type = ro;
-    RODATA:   load = RAM, type = ro;
-    DATA:     load = RAM, type = rw;
-    ZPSAVE:   load = RAM, type = bss;
-    BSS:      load = RAM, type = bss, define = yes;
-    HEAP:     load = RAM, type = bss, optional = yes; # must sit just below stack
-    ZEROPAGE: load = ZP,  type = zp;
+    LOADADDR: load = LOADADDR, type = ro;
+    EXEHDR:   load = HEADER,   type = ro;
+    STARTUP:  load = RAM,      type = ro;
+    LOWCODE:  load = RAM,      type = ro,                optional = yes;
+    INIT:     load = RAM,      type = ro,  define = yes, optional = yes;
+    CODE:     load = RAM,      type = ro;
+    RODATA:   load = RAM,      type = ro;
+    DATA:     load = RAM,      type = rw;
+    ZPSAVE:   load = RAM,      type = bss;
+    BSS:      load = RAM,      type = bss, define = yes;
+    ZEROPAGE: load = ZP,       type = zp;
 }
 FEATURES {
-    CONDES: segment = INIT,
-           type = constructor,
-           label = __CONSTRUCTOR_TABLE__,
-           count = __CONSTRUCTOR_COUNT__;
-    CONDES: segment = RODATA,
-           type = destructor,
-           label = __DESTRUCTOR_TABLE__,
-           count = __DESTRUCTOR_COUNT__;
-    CONDES: segment = RODATA,
-           type = interruptor,
-           label = __INTERRUPTOR_TABLE__,
-           count = __INTERRUPTOR_COUNT__;
-}
-SYMBOLS {
-    __STACKSIZE__ = $800;      # 2K stack
+    CONDES: type    = constructor,
+            label   = __CONSTRUCTOR_TABLE__,
+            count   = __CONSTRUCTOR_COUNT__,
+            segment = INIT;
+    CONDES: type    = destructor,
+            label   = __DESTRUCTOR_TABLE__,
+            count   = __DESTRUCTOR_COUNT__,
+            segment = RODATA;
+    CONDES: type    = interruptor,
+            label   = __INTERRUPTOR_TABLE__,
+            count   = __INTERRUPTOR_COUNT__,
+            segment = RODATA,
+            import  = __CALLIRQ__;
 }