Reworked and improved the SYMBOLS section. The old syntax (using symbol =

value) is now gone, attributes are used instead. The SYMBOLS section does now support imports, so the linker config can be used to force symbols (and therefore module) imports. Evaluation of start address and size for memory areas has been delayed even further, so it is now possible to use the values from one memory area in the definition of the next one. git-svn-id: svn://svn.cc65.org/cc65/trunk@4851 b7a2c559-68d2-44c3-8de9-860c34a00d81
2010-11-12 14:17:35 +00:00
parent a0a0347ecc
commit 5e8252fa36
38 changed files with 460 additions and 334 deletions
--- a/src/ld65/cfg/apple2-dos33.cfg
+++ b/src/ld65/cfg/apple2-dos33.cfg
@@ -1,10 +1,10 @@
 # Configuration optimized for DOS 3.3 by allowing for 12KB of HIGHCODE
- 
+
 FEATURES {
    STARTADDRESS: default = $0803;
 }
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0080, size = $001A;
--- a/src/ld65/cfg/apple2-loader.cfg
+++ b/src/ld65/cfg/apple2-loader.cfg
@@ -4,7 +4,7 @@ FEATURES {
    STARTADDRESS: default = $0800;
 }
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0080, size = $001A;
--- a/src/ld65/cfg/apple2-reboot.cfg
+++ b/src/ld65/cfg/apple2-reboot.cfg
@@ -5,7 +5,7 @@ FEATURES {
    STARTADDRESS: default = $0800;
 }
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0080, size = $001A;
--- a/src/ld65/cfg/apple2-system.cfg
+++ b/src/ld65/cfg/apple2-system.cfg
@@ -1,7 +1,7 @@
 # Configuration for ProDOS 8 system programs (without the header)

 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0080, size = $001A;
--- a/src/ld65/cfg/apple2.cfg
+++ b/src/ld65/cfg/apple2.cfg
@@ -1,10 +1,10 @@
 # Default configuration built into ld65 (allowing for 3KB of HIGHCODE)
- 
+
 FEATURES {
    STARTADDRESS: default = $0803;
 }
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0080, size = $001A;
--- a/src/ld65/cfg/apple2enh-dos33.cfg
+++ b/src/ld65/cfg/apple2enh-dos33.cfg
@@ -1,10 +1,10 @@
 # Configuration optimized for DOS 3.3 by allowing for 12KB of HIGHCODE
- 
+
 FEATURES {
    STARTADDRESS: default = $0803;
 }
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0080, size = $001A;
--- a/src/ld65/cfg/apple2enh-loader.cfg
+++ b/src/ld65/cfg/apple2enh-loader.cfg
@@ -4,7 +4,7 @@ FEATURES {
    STARTADDRESS: default = $0800;
 }
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0080, size = $001A;
--- a/src/ld65/cfg/apple2enh-reboot.cfg
+++ b/src/ld65/cfg/apple2enh-reboot.cfg
@@ -5,7 +5,7 @@ FEATURES {
    STARTADDRESS: default = $0800;
 }
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0080, size = $001A;
--- a/src/ld65/cfg/apple2enh-system.cfg
+++ b/src/ld65/cfg/apple2enh-system.cfg
@@ -1,7 +1,7 @@
 # Configuration for ProDOS 8 system programs (without the header)

 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0080, size = $001A;
--- a/src/ld65/cfg/apple2enh.cfg
+++ b/src/ld65/cfg/apple2enh.cfg
@@ -1,10 +1,10 @@
 # Default configuration built into ld65 (allowing for 3KB of HIGHCODE)
- 
+
 FEATURES {
    STARTADDRESS: default = $0803;
 }
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0080, size = $001A;
--- a/src/ld65/cfg/atari.cfg
+++ b/src/ld65/cfg/atari.cfg
@@ -2,8 +2,8 @@ FEATURES {
    STARTADDRESS: default = $2E00;
 }
 SYMBOLS {
-    __STACKSIZE__:       value = $0800, weak = yes; # 2k stack
-    __RESERVED_MEMORY__: value = $0000, weak = yes;
+    __STACKSIZE__:       type = weak, value = $0800; # 2k stack
+    __RESERVED_MEMORY__: type = weak, value = $0000;
 }
 MEMORY {
    ZP:      define = yes, start = $0082, size = $007E;
--- a/src/ld65/cfg/atmos.cfg
+++ b/src/ld65/cfg/atmos.cfg
@@ -1,5 +1,5 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                 define = yes, start = $00E2, size = $001A;
--- a/src/ld65/cfg/bbc.cfg
+++ b/src/ld65/cfg/bbc.cfg
@@ -1,5 +1,5 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:  define = yes, start = $0070, size = $0020;
--- a/src/ld65/cfg/c128.cfg
+++ b/src/ld65/cfg/c128.cfg
@@ -1,6 +1,6 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
-}
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
+}                                            
 MEMORY {
    ZP:                define = yes, start = $0002, size = $001A;
    HEADER: file = %O,               start = $1BFF, size = $000E;
--- a/src/ld65/cfg/c16.cfg
+++ b/src/ld65/cfg/c16.cfg
@@ -1,5 +1,5 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:     define = yes, start = $0002, size = $001A;
--- a/src/ld65/cfg/c64.cfg
+++ b/src/ld65/cfg/c64.cfg
@@ -1,5 +1,5 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0002, size = $001A;
--- a/src/ld65/cfg/cbm510.cfg
+++ b/src/ld65/cfg/cbm510.cfg
@@ -1,6 +1,6 @@
 SYMBOLS {
    # The stack starts from $FEC3 and grows towards the video ram
-    __STACKSIZE__: value = $06C3, weak = yes; # ~1.5k stack
+    __STACKSIZE__: type = weak, value = $06C3; # ~1.5k stack
 }
 MEMORY {
    HEADER:   file = %O,               start = $0001, size = $0050, fill = yes;
--- a/src/ld65/cfg/cbm610.cfg
+++ b/src/ld65/cfg/cbm610.cfg
@@ -1,5 +1,5 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    HEADER:   file = %O,               start = $0001, size = $0050, fill = yes;
--- a/src/ld65/cfg/geos.cfg
+++ b/src/ld65/cfg/geos.cfg
@@ -1,5 +1,5 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0400, weak = yes; # 1k stack
+    __STACKSIZE__: type = weak, value = $0400; # 1k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0058, size = $0028;
--- a/src/ld65/cfg/lunix.cfg
+++ b/src/ld65/cfg/lunix.cfg
@@ -1,8 +1,8 @@
 # ld65 Linker-configuration for LUnix, Next Generation.

 SYMBOLS {
-    __HEAPSIZE__:  value = $2000, weak = yes; # 8k heap [temporary, until LUnix malloc() exists]
-    __STACKSIZE__: value = $0400, weak = yes; # 1k stack (do typical LUnix apps. need 2k?)
+    __HEAPSIZE__:  type = weak, value = $2000; # 8k heap [temporary, until LUnix malloc() exists]
+    __STACKSIZE__: type = weak, value = $0400; # 1k stack (do typical LUnix apps. need 2k?)
 }
 MEMORY {
    ZP:	 start = $0080, size = $0040;
@@ -28,7 +28,7 @@ FEATURES {
 	    label   = __DESTRUCTOR_TABLE__,
 	    count   = __DESTRUCTOR_COUNT__;
    CONDES: segment = RODATA,
-            type    = interruptor,	    
+            type    = interruptor,
 	    label   = __INTERRUPTOR_TABLE__,
 	    count   = __INTERRUPTOR_COUNT__;
 }
--- a/src/ld65/cfg/lynx.cfg
+++ b/src/ld65/cfg/lynx.cfg
@@ -1,5 +1,5 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0000, size = $0100;
--- a/src/ld65/cfg/nes.cfg
+++ b/src/ld65/cfg/nes.cfg
@@ -1,5 +1,5 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0300, weak = yes; # 3 pages stack
+    __STACKSIZE__: type = weak, value = $0300; # 3 pages stack
 }
 MEMORY {
    ZP:     start = $0002, size = $001A, type = rw, define = yes;
--- a/src/ld65/cfg/none.cfg
+++ b/src/ld65/cfg/none.cfg
@@ -1,5 +1,5 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:  define = yes, start = $0000, size = $0001F;
--- a/src/ld65/cfg/pet.cfg
+++ b/src/ld65/cfg/pet.cfg
@@ -1,5 +1,5 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:     define = yes, start = $0055, size = $001A;
--- a/src/ld65/cfg/plus4.cfg
+++ b/src/ld65/cfg/plus4.cfg
@@ -1,5 +1,5 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0800, weak = yes; # 2k stack
+    __STACKSIZE__: type = weak, value = $0800; # 2k stack
 }
 MEMORY {
    ZP:     define = yes, start = $0002, size = $001A;
--- a/src/ld65/cfg/supervision-128k.cfg
+++ b/src/ld65/cfg/supervision-128k.cfg
@@ -5,7 +5,7 @@
 # ld65 --config supervision.cfg -o <prog>.bin <prog>.o

 SYMBOLS {
-    __STACKSIZE__: value = $0100, weak = yes; # 1 page stack
+    __STACKSIZE__: type = weak, value = $0100; # 1 page stack
 }
 MEMORY {
    RAM:      start = $0000, size = $2000 - __STACKSIZE__;
--- a/src/ld65/cfg/supervision-16k.cfg
+++ b/src/ld65/cfg/supervision-16k.cfg
@@ -4,7 +4,7 @@
 # ld65 --config supervision16.cfg -o <prog>.bin <prog>.o

 SYMBOLS {
-    __STACKSIZE__: value = $0100, weak = yes; # 1 page stack
+    __STACKSIZE__: type = weak, value = $0100; # 1 page stack
 }
 MEMORY {
    ZP:       start = $0000, size = $0100;
--- a/src/ld65/cfg/supervision-64k.cfg
+++ b/src/ld65/cfg/supervision-64k.cfg
@@ -5,7 +5,7 @@
 # ld65 --config supervision.cfg -o <prog>.bin <prog>.o

 SYMBOLS {
-    __STACKSIZE__: value = $0100, weak = yes; # 1 page stack
+    __STACKSIZE__: type = weak, value = $0100; # 1 page stack
 }
 MEMORY {
    RAM:      start = $0000, size = $2000 - __STACKSIZE__;
--- a/src/ld65/cfg/vic20-32k.cfg
+++ b/src/ld65/cfg/vic20-32k.cfg
@@ -2,7 +2,7 @@
 # Contributed by Stefan Haubenthal

 SYMBOLS {
-    __STACKSIZE__: value = $0400, weak = yes; # 1k stack
+    __STACKSIZE__: type = weak, value = $0400; # 1k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0002, size = $001A;
--- a/src/ld65/cfg/vic20.cfg
+++ b/src/ld65/cfg/vic20.cfg
@@ -1,5 +1,5 @@
 SYMBOLS {
-    __STACKSIZE__: value = $0400, weak = yes; # 1k stack
+    __STACKSIZE__: type = weak, value = $0400; # 1k stack
 }
 MEMORY {
    ZP:                define = yes, start = $0002, size = $001A;