From: ol.sc Date: Tue, 12 Feb 2013 20:55:19 +0000 (+0000) Subject: Just some beautification. X-Git-Tag: V2.14~90 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1607b05104bcaee1e4ace7604856c62cce33c408;p=cc65 Just some beautification. git-svn-id: svn://svn.cc65.org/cc65/trunk@5984 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- diff --git a/src/ld65/cfg/apple2-overlay.cfg b/src/ld65/cfg/apple2-overlay.cfg index f77c27f2b..9216aa7c7 100644 --- a/src/ld65/cfg/apple2-overlay.cfg +++ b/src/ld65/cfg/apple2-overlay.cfg @@ -60,17 +60,17 @@ SEGMENTS { OVERLAY9: load = OVL9, type = ro, define = yes, optional = yes; } FEATURES { - CONDES: segment = INIT, - type = constructor, + CONDES: type = constructor, label = __CONSTRUCTOR_TABLE__, - count = __CONSTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = destructor, + count = __CONSTRUCTOR_COUNT__, + segment = INIT; + CONDES: type = destructor, label = __DESTRUCTOR_TABLE__, - count = __DESTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = interruptor, + count = __DESTRUCTOR_COUNT__, + segment = RODATA; + CONDES: type = interruptor, label = __INTERRUPTOR_TABLE__, count = __INTERRUPTOR_COUNT__, + segment = RODATA, import = __CALLIRQ__; } diff --git a/src/ld65/cfg/apple2-system.cfg b/src/ld65/cfg/apple2-system.cfg index bd0b328d3..d3df44d05 100644 --- a/src/ld65/cfg/apple2-system.cfg +++ b/src/ld65/cfg/apple2-system.cfg @@ -27,17 +27,17 @@ SEGMENTS { LC: load = MOVE, run = LC, type = ro, optional = yes; } FEATURES { - CONDES: segment = INIT, - type = constructor, + CONDES: type = constructor, label = __CONSTRUCTOR_TABLE__, - count = __CONSTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = destructor, + count = __CONSTRUCTOR_COUNT__, + segment = INIT; + CONDES: type = destructor, label = __DESTRUCTOR_TABLE__, - count = __DESTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = interruptor, + count = __DESTRUCTOR_COUNT__, + segment = RODATA; + CONDES: type = interruptor, label = __INTERRUPTOR_TABLE__, count = __INTERRUPTOR_COUNT__, + segment = RODATA, import = __CALLIRQ__; } diff --git a/src/ld65/cfg/apple2.cfg b/src/ld65/cfg/apple2.cfg index 656e97e45..1f0ae121a 100644 --- a/src/ld65/cfg/apple2.cfg +++ b/src/ld65/cfg/apple2.cfg @@ -34,17 +34,17 @@ SEGMENTS { LC: load = MOVE, run = LC, type = ro, optional = yes; } FEATURES { - CONDES: segment = INIT, - type = constructor, + CONDES: type = constructor, label = __CONSTRUCTOR_TABLE__, - count = __CONSTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = destructor, + count = __CONSTRUCTOR_COUNT__, + segment = INIT; + CONDES: type = destructor, label = __DESTRUCTOR_TABLE__, - count = __DESTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = interruptor, + count = __DESTRUCTOR_COUNT__, + segment = RODATA; + CONDES: type = interruptor, label = __INTERRUPTOR_TABLE__, count = __INTERRUPTOR_COUNT__, + segment = RODATA, import = __CALLIRQ__; } diff --git a/src/ld65/cfg/apple2enh-overlay.cfg b/src/ld65/cfg/apple2enh-overlay.cfg index f77c27f2b..9216aa7c7 100644 --- a/src/ld65/cfg/apple2enh-overlay.cfg +++ b/src/ld65/cfg/apple2enh-overlay.cfg @@ -60,17 +60,17 @@ SEGMENTS { OVERLAY9: load = OVL9, type = ro, define = yes, optional = yes; } FEATURES { - CONDES: segment = INIT, - type = constructor, + CONDES: type = constructor, label = __CONSTRUCTOR_TABLE__, - count = __CONSTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = destructor, + count = __CONSTRUCTOR_COUNT__, + segment = INIT; + CONDES: type = destructor, label = __DESTRUCTOR_TABLE__, - count = __DESTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = interruptor, + count = __DESTRUCTOR_COUNT__, + segment = RODATA; + CONDES: type = interruptor, label = __INTERRUPTOR_TABLE__, count = __INTERRUPTOR_COUNT__, + segment = RODATA, import = __CALLIRQ__; } diff --git a/src/ld65/cfg/apple2enh-system.cfg b/src/ld65/cfg/apple2enh-system.cfg index bd0b328d3..d3df44d05 100644 --- a/src/ld65/cfg/apple2enh-system.cfg +++ b/src/ld65/cfg/apple2enh-system.cfg @@ -27,17 +27,17 @@ SEGMENTS { LC: load = MOVE, run = LC, type = ro, optional = yes; } FEATURES { - CONDES: segment = INIT, - type = constructor, + CONDES: type = constructor, label = __CONSTRUCTOR_TABLE__, - count = __CONSTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = destructor, + count = __CONSTRUCTOR_COUNT__, + segment = INIT; + CONDES: type = destructor, label = __DESTRUCTOR_TABLE__, - count = __DESTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = interruptor, + count = __DESTRUCTOR_COUNT__, + segment = RODATA; + CONDES: type = interruptor, label = __INTERRUPTOR_TABLE__, count = __INTERRUPTOR_COUNT__, + segment = RODATA, import = __CALLIRQ__; } diff --git a/src/ld65/cfg/apple2enh.cfg b/src/ld65/cfg/apple2enh.cfg index 656e97e45..1f0ae121a 100644 --- a/src/ld65/cfg/apple2enh.cfg +++ b/src/ld65/cfg/apple2enh.cfg @@ -34,17 +34,17 @@ SEGMENTS { LC: load = MOVE, run = LC, type = ro, optional = yes; } FEATURES { - CONDES: segment = INIT, - type = constructor, + CONDES: type = constructor, label = __CONSTRUCTOR_TABLE__, - count = __CONSTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = destructor, + count = __CONSTRUCTOR_COUNT__, + segment = INIT; + CONDES: type = destructor, label = __DESTRUCTOR_TABLE__, - count = __DESTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = interruptor, + count = __DESTRUCTOR_COUNT__, + segment = RODATA; + CONDES: type = interruptor, label = __INTERRUPTOR_TABLE__, count = __INTERRUPTOR_COUNT__, + segment = RODATA, import = __CALLIRQ__; } diff --git a/src/ld65/cfg/atari-overlay.cfg b/src/ld65/cfg/atari-overlay.cfg index 737c0dc83..02becd29b 100644 --- a/src/ld65/cfg/atari-overlay.cfg +++ b/src/ld65/cfg/atari-overlay.cfg @@ -45,17 +45,17 @@ SEGMENTS { OVERLAY9: load = OVL9, type = ro, define = yes, optional = yes; } 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__, + 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__; } diff --git a/src/ld65/cfg/atari.cfg b/src/ld65/cfg/atari.cfg index d275896b2..975d16213 100644 --- a/src/ld65/cfg/atari.cfg +++ b/src/ld65/cfg/atari.cfg @@ -26,17 +26,17 @@ SEGMENTS { AUTOSTRT: load = TRAILER, type = ro; } 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__, + 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__; } diff --git a/src/ld65/cfg/atmos.cfg b/src/ld65/cfg/atmos.cfg index 83c0679e4..137c0e9a9 100644 --- a/src/ld65/cfg/atmos.cfg +++ b/src/ld65/cfg/atmos.cfg @@ -19,17 +19,17 @@ SEGMENTS { 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__, + 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__; } diff --git a/src/ld65/cfg/bbc.cfg b/src/ld65/cfg/bbc.cfg index 57ca726e5..6304c309b 100644 --- a/src/ld65/cfg/bbc.cfg +++ b/src/ld65/cfg/bbc.cfg @@ -16,17 +16,17 @@ SEGMENTS { 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__, + 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__; } diff --git a/src/ld65/cfg/c128-overlay.cfg b/src/ld65/cfg/c128-overlay.cfg index 0ca4a62ea..811e099ef 100644 --- a/src/ld65/cfg/c128-overlay.cfg +++ b/src/ld65/cfg/c128-overlay.cfg @@ -42,17 +42,17 @@ SEGMENTS { OVERLAY9: load = OVL9, type = ro, define = yes, optional = yes; } 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__, + 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__; } diff --git a/src/ld65/cfg/c128.cfg b/src/ld65/cfg/c128.cfg index 12b206997..0e1259111 100644 --- a/src/ld65/cfg/c128.cfg +++ b/src/ld65/cfg/c128.cfg @@ -23,17 +23,17 @@ SEGMENTS { 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__, + 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__; } diff --git a/src/ld65/cfg/c16.cfg b/src/ld65/cfg/c16.cfg index 55b49f2d0..78c1739d3 100644 --- a/src/ld65/cfg/c16.cfg +++ b/src/ld65/cfg/c16.cfg @@ -23,17 +23,17 @@ SEGMENTS { 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__, - import = __CALLIRQ__ ; + 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__; } diff --git a/src/ld65/cfg/c64-asm.cfg b/src/ld65/cfg/c64-asm.cfg index 9ef6c724c..0924cdb56 100644 --- a/src/ld65/cfg/c64-asm.cfg +++ b/src/ld65/cfg/c64-asm.cfg @@ -2,7 +2,7 @@ FEATURES { STARTADDRESS: default = $0801; } SYMBOLS { - __LOADADDR__: type = import; + __LOADADDR__: type = import; } MEMORY { LOADADDR: file = %O, start = %S - 2, size = $0002; diff --git a/src/ld65/cfg/c64-overlay.cfg b/src/ld65/cfg/c64-overlay.cfg index 09eedb4f2..c5e9e070c 100644 --- a/src/ld65/cfg/c64-overlay.cfg +++ b/src/ld65/cfg/c64-overlay.cfg @@ -42,17 +42,17 @@ SEGMENTS { OVERLAY9: load = OVL9, type = ro, define = yes, optional = yes; } FEATURES { - CONDES: segment = INIT, - type = constructor, + CONDES: type = constructor, label = __CONSTRUCTOR_TABLE__, - count = __CONSTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = destructor, + count = __CONSTRUCTOR_COUNT__, + segment = INIT; + CONDES: type = destructor, label = __DESTRUCTOR_TABLE__, - count = __DESTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = interruptor, + count = __DESTRUCTOR_COUNT__, + segment = RODATA; + CONDES: type = interruptor, label = __INTERRUPTOR_TABLE__, count = __INTERRUPTOR_COUNT__, + segment = RODATA, import = __CALLIRQ__; } diff --git a/src/ld65/cfg/c64.cfg b/src/ld65/cfg/c64.cfg index 9cb475a94..5d8befd02 100644 --- a/src/ld65/cfg/c64.cfg +++ b/src/ld65/cfg/c64.cfg @@ -23,17 +23,17 @@ SEGMENTS { 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__, + 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__; } diff --git a/src/ld65/cfg/cbm510.cfg b/src/ld65/cfg/cbm510.cfg index dd8114dfb..7635c6eeb 100644 --- a/src/ld65/cfg/cbm510.cfg +++ b/src/ld65/cfg/cbm510.cfg @@ -3,14 +3,14 @@ SYMBOLS { __STACKSIZE__: type = weak, value = $06C3; # ~1.5k stack } MEMORY { - HEADER: file = %O, start = $0001, size = $0050, fill = yes; - ZP: file = %O, define = yes, start = $0051, size = $00AD, fill = yes; - STARTUP: file = %O, start = $00FE, size = $0102, fill = yes; - PAGE2: file = %O, start = $0200, size = $0100, fill = yes; - PAGE3: file = %O, start = $0300, size = $0100, fill = yes; - RAM: file = %O, start = $0400, size = $DC00; - CHARRAM: file = "", define = yes, start = $E000, size = $1000; - VIDRAM: file = "", define = yes, start = $F000, size = $0400; + HEADER: file = %O, start = $0001, size = $0050, fill = yes; + ZP: file = %O, define = yes, start = $0051, size = $00AD, fill = yes; + STARTUP: file = %O, start = $00FE, size = $0102, fill = yes; + PAGE2: file = %O, start = $0200, size = $0100, fill = yes; + PAGE3: file = %O, start = $0300, size = $0100, fill = yes; + RAM: file = %O, start = $0400, size = $DC00; + CHARRAM: file = "", define = yes, start = $E000, size = $1000; + VIDRAM: file = "", define = yes, start = $F000, size = $0400; } SEGMENTS { EXEHDR: load = HEADER, type = rw; @@ -27,17 +27,17 @@ SEGMENTS { EXTZP: load = ZP, type = rw, define = yes; } 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__, + 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__; } diff --git a/src/ld65/cfg/cbm610.cfg b/src/ld65/cfg/cbm610.cfg index f989c083f..48b5eba0c 100644 --- a/src/ld65/cfg/cbm610.cfg +++ b/src/ld65/cfg/cbm610.cfg @@ -2,12 +2,12 @@ SYMBOLS { __STACKSIZE__: type = weak, value = $0800; # 2k stack } MEMORY { - HEADER: file = %O, start = $0001, size = $0050, fill = yes; - ZP: file = %O, define = yes, start = $0051, size = $00AD, fill = yes; - STARTUP: file = %O, start = $00FE, size = $0102, fill = yes; - PAGE2: file = %O, start = $0200, size = $0100, fill = yes; - PAGE3: file = %O, start = $0300, size = $0100, fill = yes; - RAM: file = %O, start = $0400, size = $FECB - __STACKSIZE__; + HEADER: file = %O, start = $0001, size = $0050, fill = yes; + ZP: file = %O, define = yes, start = $0051, size = $00AD, fill = yes; + STARTUP: file = %O, start = $00FE, size = $0102, fill = yes; + PAGE2: file = %O, start = $0200, size = $0100, fill = yes; + PAGE3: file = %O, start = $0300, size = $0100, fill = yes; + RAM: file = %O, start = $0400, size = $FECB - __STACKSIZE__; } SEGMENTS { EXEHDR: load = HEADER, type = rw; @@ -24,17 +24,17 @@ SEGMENTS { EXTZP: load = ZP, type = rw, define = yes; } 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__, + 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__; } diff --git a/src/ld65/cfg/geos-apple.cfg b/src/ld65/cfg/geos-apple.cfg index 66034d68b..1900c4866 100644 --- a/src/ld65/cfg/geos-apple.cfg +++ b/src/ld65/cfg/geos-apple.cfg @@ -85,17 +85,17 @@ SEGMENTS { OVERLAY19: type = ro, run = VLIR19, load = CVT, align_load = $200, optional = yes; } 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__, + 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__; } diff --git a/src/ld65/cfg/geos-cbm.cfg b/src/ld65/cfg/geos-cbm.cfg index e6e3cf15c..f2aea55a2 100644 --- a/src/ld65/cfg/geos-cbm.cfg +++ b/src/ld65/cfg/geos-cbm.cfg @@ -63,17 +63,17 @@ SEGMENTS { OVERLAY19: type = ro, run = VLIR19, load = CVT, align_load = $FE, optional = yes; } 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__, + 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__; } diff --git a/src/ld65/cfg/lunix.cfg b/src/ld65/cfg/lunix.cfg index 16400528b..1342c390b 100644 --- a/src/ld65/cfg/lunix.cfg +++ b/src/ld65/cfg/lunix.cfg @@ -5,32 +5,32 @@ SYMBOLS { __STACKSIZE__: type = weak, value = $0400; # 1k stack (do typical LUnix apps. need 2k?) } MEMORY { - ZP: start = $0080, size = $0040; + ZP: start = $0080, size = $0040; RAM: start = %S, size = $7600 - __STACKSIZE__; } SEGMENTS { ZEROPAGE: load = ZP, type = zp, define = yes; # Pseudo-registers - STARTUP: load = RAM, type = ro; # First initialization code + STARTUP: load = RAM, type = ro; # First initialization code LOWCODE: load = RAM, type = ro, optional = yes; # Legacy from other platforms INIT: load = RAM, type = ro, define = yes, optional = yes; # Library initialization code - CODE: load = RAM, type = ro; # Program - RODATA: load = RAM, type = ro; # Literals, constants - DATA: load = RAM, type = rw; # Initialized variables + CODE: load = RAM, type = ro; # Program + RODATA: load = RAM, type = ro; # Literals, constants + DATA: load = RAM, type = rw; # Initialized variables BSS: load = RAM, type = bss, define = yes; # Uninitialized variables } 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__, + 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__; } FILES { @@ -39,6 +39,6 @@ FILES { FORMATS { o65: os = lunix, type = small, - export = main, # Program entry-point - import = LUNIXKERNEL; # Kernel entry-points + export = main, # Program entry-point + import = LUNIXKERNEL; # Kernel entry-points } diff --git a/src/ld65/cfg/lynx-bll.cfg b/src/ld65/cfg/lynx-bll.cfg index b5aae6aed..3d6cf19aa 100644 --- a/src/ld65/cfg/lynx-bll.cfg +++ b/src/ld65/cfg/lynx-bll.cfg @@ -1,8 +1,8 @@ SYMBOLS { - __STACKSIZE__: type = weak, value = $0800; # 2k stack + __STACKSIZE__: type = weak, value = $0800; # 2k stack __STARTOFDIRECTORY__: type = weak, value = $00CB; # start just after loader - __BLOCKSIZE__: type = weak, value = 1024; # cart block size - __BLLHDR__: type = import; + __BLOCKSIZE__: type = weak, value = $0400; # cart block size + __BLLHDR__: type = import; } MEMORY { ZP: file = "", define = yes, start = $0000, size = $0100; @@ -23,17 +23,17 @@ SEGMENTS { APPZP: load = ZP, type = zp, optional = yes; } 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__, + 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__; } diff --git a/src/ld65/cfg/lynx-coll.cfg b/src/ld65/cfg/lynx-coll.cfg index e4c40e002..e7a220fb3 100644 --- a/src/ld65/cfg/lynx-coll.cfg +++ b/src/ld65/cfg/lynx-coll.cfg @@ -1,10 +1,10 @@ SYMBOLS { - __STACKSIZE__: type = weak, value = $0800; # 2k stack + __STACKSIZE__: type = weak, value = $0800; # 2k stack __STARTOFDIRECTORY__: type = weak, value = $00CB; # start just after loader - __BLOCKSIZE__: type = weak, value = 1024; # cart block size - __EXEHDR__: type = import; - __BOOTLDR__: type = import; - __DEFDIR__: type = import; + __BLOCKSIZE__: type = weak, value = $0400; # cart block size + __EXEHDR__: type = import; + __BOOTLDR__: type = import; + __DEFDIR__: type = import; } MEMORY { ZP: file = "", define = yes, start = $0000, size = $0100; @@ -14,32 +14,32 @@ MEMORY { RAM: file = %O, define = yes, start = $0200, size = $9E58 - __STACKSIZE__; } SEGMENTS { - EXEHDR: load = HEADER, type = ro; - BOOTLDR: load = BOOT, type = ro; - DIRECTORY:load = DIR, type = ro; - STARTUP: load = RAM, type = ro, define = yes; - LOWCODE: load = RAM, type = ro, optional = yes; - INIT: load = RAM, type = ro, define = yes, optional = yes; - CODE: load = RAM, type = ro, define = yes; - RODATA: load = RAM, type = ro, define = yes; - DATA: load = RAM, type = rw, define = yes; - BSS: load = RAM, type = bss, define = yes; - ZEROPAGE: load = ZP, type = zp; - EXTZP: load = ZP, type = zp, optional = yes; - APPZP: load = ZP, type = zp, optional = yes; + EXEHDR: load = HEADER, type = ro; + BOOTLDR: load = BOOT, type = ro; + DIRECTORY: load = DIR, type = ro; + STARTUP: load = RAM, type = ro, define = yes; + LOWCODE: load = RAM, type = ro, optional = yes; + INIT: load = RAM, type = ro, define = yes, optional = yes; + CODE: load = RAM, type = ro, define = yes; + RODATA: load = RAM, type = ro, define = yes; + DATA: load = RAM, type = rw, define = yes; + BSS: load = RAM, type = bss, define = yes; + ZEROPAGE: load = ZP, type = zp; + EXTZP: load = ZP, type = zp, optional = yes; + APPZP: load = ZP, type = zp, optional = yes; } 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__, + 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__; } diff --git a/src/ld65/cfg/lynx-uploader.cfg b/src/ld65/cfg/lynx-uploader.cfg index 251c3343b..4a1e87bee 100644 --- a/src/ld65/cfg/lynx-uploader.cfg +++ b/src/ld65/cfg/lynx-uploader.cfg @@ -1,11 +1,11 @@ SYMBOLS { - __STACKSIZE__: type = weak, value = $0800; # 2k stack + __STACKSIZE__: type = weak, value = $0800; # 2k stack __STARTOFDIRECTORY__: type = weak, value = $00CB; # start just after loader - __BLOCKSIZE__: type = weak, value = 1024; # cart block size - __EXEHDR__: type = import; - __BOOTLDR__: type = import; - __DEFDIR__: type = import; - __UPLOADER__: type = import; + __BLOCKSIZE__: type = weak, value = $0400; # cart block size + __EXEHDR__: type = import; + __BOOTLDR__: type = import; + __DEFDIR__: type = import; + __UPLOADER__: type = import; } MEMORY { ZP: file = "", define = yes, start = $0000, size = $0100; @@ -33,17 +33,17 @@ SEGMENTS { APPZP: load = ZP, type = zp, optional = yes; } 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__, + 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__; } diff --git a/src/ld65/cfg/lynx.cfg b/src/ld65/cfg/lynx.cfg index e191de6d0..77345bf49 100644 --- a/src/ld65/cfg/lynx.cfg +++ b/src/ld65/cfg/lynx.cfg @@ -1,10 +1,10 @@ SYMBOLS { - __STACKSIZE__: type = weak, value = $0800; # 2k stack + __STACKSIZE__: type = weak, value = $0800; # 2k stack __STARTOFDIRECTORY__: type = weak, value = $00CB; # start just after loader - __BLOCKSIZE__: type = weak, value = 1024; # cart block size - __EXEHDR__: type = import; - __BOOTLDR__: type = import; - __DEFDIR__: type = import; + __BLOCKSIZE__: type = weak, value = 1024; # cart block size + __EXEHDR__: type = import; + __BOOTLDR__: type = import; + __DEFDIR__: type = import; } MEMORY { ZP: file = "", define = yes, start = $0000, size = $0100; @@ -14,32 +14,32 @@ MEMORY { RAM: file = %O, define = yes, start = $0200, size = $BE38 - __STACKSIZE__; } SEGMENTS { - EXEHDR: load = HEADER, type = ro; - BOOTLDR: load = BOOT, type = ro; - DIRECTORY:load = DIR, type = ro; - STARTUP: load = RAM, type = ro, define = yes; - LOWCODE: load = RAM, type = ro, optional = yes; - INIT: load = RAM, type = ro, define = yes, optional = yes; - CODE: load = RAM, type = ro, define = yes; - RODATA: load = RAM, type = ro, define = yes; - DATA: load = RAM, type = rw, define = yes; - BSS: load = RAM, type = bss, define = yes; - ZEROPAGE: load = ZP, type = zp; - EXTZP: load = ZP, type = zp, optional = yes; - APPZP: load = ZP, type = zp, optional = yes; + EXEHDR: load = HEADER, type = ro; + BOOTLDR: load = BOOT, type = ro; + DIRECTORY: load = DIR, type = ro; + STARTUP: load = RAM, type = ro, define = yes; + LOWCODE: load = RAM, type = ro, optional = yes; + INIT: load = RAM, type = ro, define = yes, optional = yes; + CODE: load = RAM, type = ro, define = yes; + RODATA: load = RAM, type = ro, define = yes; + DATA: load = RAM, type = rw, define = yes; + BSS: load = RAM, type = bss, define = yes; + ZEROPAGE: load = ZP, type = zp; + EXTZP: load = ZP, type = zp, optional = yes; + APPZP: load = ZP, type = zp, optional = yes; } 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__, + 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__; } diff --git a/src/ld65/cfg/nes.cfg b/src/ld65/cfg/nes.cfg index c5ab3dda6..3e2f408cc 100644 --- a/src/ld65/cfg/nes.cfg +++ b/src/ld65/cfg/nes.cfg @@ -30,7 +30,7 @@ MEMORY { # - data (run) # - bss # - heap - RAM: file = "", start = $6000, size = $2000, define = yes; + RAM: file = "", start = $6000, size = $2000, define = yes; } SEGMENTS { HEADER: load = HEADER, type = ro; @@ -46,17 +46,17 @@ SEGMENTS { 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__, + 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__; } diff --git a/src/ld65/cfg/none.cfg b/src/ld65/cfg/none.cfg index dbb58f8d1..49409a82c 100644 --- a/src/ld65/cfg/none.cfg +++ b/src/ld65/cfg/none.cfg @@ -15,17 +15,17 @@ SEGMENTS { 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__, + 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__; } diff --git a/src/ld65/cfg/pet.cfg b/src/ld65/cfg/pet.cfg index 19f9d95cf..ef8b82e54 100644 --- a/src/ld65/cfg/pet.cfg +++ b/src/ld65/cfg/pet.cfg @@ -23,17 +23,17 @@ SEGMENTS { 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__, + 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__; } diff --git a/src/ld65/cfg/plus4.cfg b/src/ld65/cfg/plus4.cfg index 08d54eb07..c756f45a1 100644 --- a/src/ld65/cfg/plus4.cfg +++ b/src/ld65/cfg/plus4.cfg @@ -23,17 +23,17 @@ SEGMENTS { 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__, + 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__; } diff --git a/src/ld65/cfg/supervision-16k.cfg b/src/ld65/cfg/supervision-16k.cfg index 8be534553..e38948d5f 100644 --- a/src/ld65/cfg/supervision-16k.cfg +++ b/src/ld65/cfg/supervision-16k.cfg @@ -25,17 +25,17 @@ SEGMENTS { ZEROPAGE: load = ZP, type = zp, define = yes; } FEATURES { - CONDES: segment = INIT, - type = constructor, + CONDES: type = constructor, label = __CONSTRUCTOR_TABLE__, - count = __CONSTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = destructor, + count = __CONSTRUCTOR_COUNT__, + segment = INIT; + CONDES: type = destructor, label = __DESTRUCTOR_TABLE__, - count = __DESTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = interruptor, - label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__, + count = __DESTRUCTOR_COUNT__, + segment = RODATA; + CONDES: type = interruptor, + label = __INTERRUPTOR_TABLE__, + count = __INTERRUPTOR_COUNT__, + segment = RODATA, import = __CALLIRQ__; } diff --git a/src/ld65/cfg/supervision.cfg b/src/ld65/cfg/supervision.cfg index a3eac0037..66fb4cfad 100644 --- a/src/ld65/cfg/supervision.cfg +++ b/src/ld65/cfg/supervision.cfg @@ -21,17 +21,17 @@ SEGMENTS { ZEROPAGE: load = ZP, type = zp, define = yes; } FEATURES { - CONDES: segment = INIT, - type = constructor, + CONDES: type = constructor, label = __CONSTRUCTOR_TABLE__, - count = __CONSTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = destructor, + count = __CONSTRUCTOR_COUNT__, + segment = INIT; + CONDES: type = destructor, label = __DESTRUCTOR_TABLE__, - count = __DESTRUCTOR_COUNT__; - CONDES: segment = RODATA, - type = interruptor, - label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__, + count = __DESTRUCTOR_COUNT__, + segment = RODATA; + CONDES: type = interruptor, + label = __INTERRUPTOR_TABLE__, + count = __INTERRUPTOR_COUNT__, + segment = RODATA, import = __CALLIRQ__; } diff --git a/src/ld65/cfg/vic20-32k.cfg b/src/ld65/cfg/vic20-32k.cfg index 4ca1e6ba2..c66b35247 100644 --- a/src/ld65/cfg/vic20-32k.cfg +++ b/src/ld65/cfg/vic20-32k.cfg @@ -25,17 +25,17 @@ SEGMENTS { 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__, + 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__; } diff --git a/src/ld65/cfg/vic20.cfg b/src/ld65/cfg/vic20.cfg index 731c86ebf..f356eb61e 100644 --- a/src/ld65/cfg/vic20.cfg +++ b/src/ld65/cfg/vic20.cfg @@ -23,17 +23,17 @@ SEGMENTS { 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__, + 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__; }