Better handling of imports in the ExprNode structure.

[cc65] / src / ld65 / cfg / vic20-32k.cfg

diff --git a/src/ld65/cfg/vic20-32k.cfg b/src/ld65/cfg/vic20-32k.cfg
index 666cd15ea3f2db020cce4015409e6e9a142434d1..1aeffcc88ef1137d3a99d381e1b9f6fbb100fd91 100644 (file)
--- a/src/ld65/cfg/vic20-32k.cfg
+++ b/src/ld65/cfg/vic20-32k.cfg
@@ -1,37 +1,37 @@
 # Memory configuration for the VIC-20 with 32K RAM Cartridge
 # Contributed by Stefan Haubenthal
+
+SYMBOLS {
+    __STACKSIZE__: value = $0400, weak = yes; # 1k stack
+}
 MEMORY {
-    ZP:     start = $0002, size = $001A, type = rw, define = yes;
-    HEADER: start = $11FF, size = $000E, file = %O;
-    RAM:    start = $120D, size = $6DF3, file = %O, define = yes;
+    ZP:                define = yes, start = $0002, size = $001A;
+    HEADER: file = %O,               start = $11FF, size = $000E;
+    RAM:    file = %O, define = yes, start = $120D, size = $6DF3 - __STACKSIZE__;
 }
 SEGMENTS {
     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;
+    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;
 }
 FEATURES {
     CONDES: segment = INIT,
-           type = constructor,
-           label = __CONSTRUCTOR_TABLE__,
-           count = __CONSTRUCTOR_COUNT__;
+           type    = constructor,
+           label   = __CONSTRUCTOR_TABLE__,
+           count   = __CONSTRUCTOR_COUNT__;
     CONDES: segment = RODATA,
-           type = destructor,
-           label = __DESTRUCTOR_TABLE__,
-           count = __DESTRUCTOR_COUNT__;
+           type    = destructor,
+           label   = __DESTRUCTOR_TABLE__,
+           count   = __DESTRUCTOR_COUNT__;
     CONDES: segment = RODATA,
-           type = interruptor,
-           label = __INTERRUPTOR_TABLE__,
-           count = __INTERRUPTOR_COUNT__;
-}
-SYMBOLS {
-    __STACKSIZE__: value = $0400, weak = yes; # 1k stack
+           type    = interruptor,
+           label   = __INTERRUPTOR_TABLE__,
+           count   = __INTERRUPTOR_COUNT__;
 }