From: ol.sc Date: Mon, 2 Jan 2012 12:28:44 +0000 (+0000) Subject: Renamed apple-geos.cfg to geos-apple.cfg and added it as built-in configuration. X-Git-Tag: V2.13.3~99 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f24ff82ea2f8cf75e433e672d424c52ce0121386;p=cc65 Renamed apple-geos.cfg to geos-apple.cfg and added it as built-in configuration. git-svn-id: svn://svn.cc65.org/cc65/trunk@5366 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- diff --git a/src/ld65/cfg/apple-geos.cfg b/src/ld65/cfg/apple-geos.cfg deleted file mode 100644 index abbfd22e5..000000000 --- a/src/ld65/cfg/apple-geos.cfg +++ /dev/null @@ -1,96 +0,0 @@ -SYMBOLS { - __STACKSIZE__: type = weak, value = $0400; # 1k stack - __OVERLAYADDR__: type = weak, value = $0C00; - __OVERLAYSIZE__: type = weak, value = $2000 - $0C00; -} -MEMORY { - CVT: file = %O, start = $0, size = $20000; - ZP: define = yes, start = $80, size = $1A + $06; - VLIR0: define = yes, start = $4000, size = $A000 - $4000 - __STACKSIZE__; - VLIR1: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR2: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR3: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR4: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR5: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR6: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR7: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR8: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR9: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR10: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR11: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR12: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR13: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR14: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR15: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR16: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR17: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR18: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; - VLIR19: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; -} -SEGMENTS { - ZEROPAGE: type = zp, load = ZP; - EXTZP: type = zp, load = ZP; - FILEINFO: type = ro, load = CVT, offset = $002; - RECORDS: type = ro, load = CVT, offset = $100, optional = yes; - DIRENTRY: type = ro, load = CVT, offset = $180; - VLIRIDX0: type = ro, load = CVT, align = $200, optional = yes; - STARTUP: type = ro, run = VLIR0, load = CVT, align_load = $200, define = yes; - LOWCODE: type = ro, run = VLIR0, load = CVT, optional = yes; - INIT: type = ro, run = VLIR0, load = CVT, define = yes, optional = yes; - CODE: type = ro, run = VLIR0, load = CVT; - RODATA: type = ro, run = VLIR0, load = CVT; - DATA: type = rw, run = VLIR0, load = CVT; - BSS: type = bss, load = VLIR0, define = yes; - VLIRIDX1: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY1: type = ro, run = VLIR1, load = CVT, align_load = $200, optional = yes; - VLIRIDX2: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY2: type = ro, run = VLIR2, load = CVT, align_load = $200, optional = yes; - VLIRIDX3: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY3: type = ro, run = VLIR3, load = CVT, align_load = $200, optional = yes; - VLIRIDX4: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY4: type = ro, run = VLIR4, load = CVT, align_load = $200, optional = yes; - VLIRIDX5: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY5: type = ro, run = VLIR5, load = CVT, align_load = $200, optional = yes; - VLIRIDX6: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY6: type = ro, run = VLIR6, load = CVT, align_load = $200, optional = yes; - VLIRIDX7: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY7: type = ro, run = VLIR7, load = CVT, align_load = $200, optional = yes; - VLIRIDX8: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY8: type = ro, run = VLIR8, load = CVT, align_load = $200, optional = yes; - VLIRIDX9: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY9: type = ro, run = VLIR9, load = CVT, align_load = $200, optional = yes; - VLIRIDX10: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY10: type = ro, run = VLIR10, load = CVT, align_load = $200, optional = yes; - VLIRIDX11: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY11: type = ro, run = VLIR11, load = CVT, align_load = $200, optional = yes; - VLIRIDX12: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY12: type = ro, run = VLIR12, load = CVT, align_load = $200, optional = yes; - VLIRIDX13: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY13: type = ro, run = VLIR13, load = CVT, align_load = $200, optional = yes; - VLIRIDX14: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY14: type = ro, run = VLIR14, load = CVT, align_load = $200, optional = yes; - VLIRIDX15: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY15: type = ro, run = VLIR15, load = CVT, align_load = $200, optional = yes; - VLIRIDX16: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY16: type = ro, run = VLIR16, load = CVT, align_load = $200, optional = yes; - VLIRIDX17: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY17: type = ro, run = VLIR17, load = CVT, align_load = $200, optional = yes; - VLIRIDX18: type = ro, load = CVT, align = $200, optional = yes; - OVERLAY18: type = ro, run = VLIR18, load = CVT, align_load = $200, optional = yes; - VLIRIDX19: type = ro, load = CVT, align = $200, optional = yes; - 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__; -} diff --git a/src/ld65/cfg/geos-apple.cfg b/src/ld65/cfg/geos-apple.cfg new file mode 100644 index 000000000..abbfd22e5 --- /dev/null +++ b/src/ld65/cfg/geos-apple.cfg @@ -0,0 +1,96 @@ +SYMBOLS { + __STACKSIZE__: type = weak, value = $0400; # 1k stack + __OVERLAYADDR__: type = weak, value = $0C00; + __OVERLAYSIZE__: type = weak, value = $2000 - $0C00; +} +MEMORY { + CVT: file = %O, start = $0, size = $20000; + ZP: define = yes, start = $80, size = $1A + $06; + VLIR0: define = yes, start = $4000, size = $A000 - $4000 - __STACKSIZE__; + VLIR1: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR2: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR3: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR4: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR5: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR6: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR7: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR8: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR9: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR10: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR11: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR12: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR13: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR14: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR15: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR16: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR17: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR18: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; + VLIR19: define = yes, start = __OVERLAYADDR__, size = __OVERLAYSIZE__; +} +SEGMENTS { + ZEROPAGE: type = zp, load = ZP; + EXTZP: type = zp, load = ZP; + FILEINFO: type = ro, load = CVT, offset = $002; + RECORDS: type = ro, load = CVT, offset = $100, optional = yes; + DIRENTRY: type = ro, load = CVT, offset = $180; + VLIRIDX0: type = ro, load = CVT, align = $200, optional = yes; + STARTUP: type = ro, run = VLIR0, load = CVT, align_load = $200, define = yes; + LOWCODE: type = ro, run = VLIR0, load = CVT, optional = yes; + INIT: type = ro, run = VLIR0, load = CVT, define = yes, optional = yes; + CODE: type = ro, run = VLIR0, load = CVT; + RODATA: type = ro, run = VLIR0, load = CVT; + DATA: type = rw, run = VLIR0, load = CVT; + BSS: type = bss, load = VLIR0, define = yes; + VLIRIDX1: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY1: type = ro, run = VLIR1, load = CVT, align_load = $200, optional = yes; + VLIRIDX2: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY2: type = ro, run = VLIR2, load = CVT, align_load = $200, optional = yes; + VLIRIDX3: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY3: type = ro, run = VLIR3, load = CVT, align_load = $200, optional = yes; + VLIRIDX4: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY4: type = ro, run = VLIR4, load = CVT, align_load = $200, optional = yes; + VLIRIDX5: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY5: type = ro, run = VLIR5, load = CVT, align_load = $200, optional = yes; + VLIRIDX6: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY6: type = ro, run = VLIR6, load = CVT, align_load = $200, optional = yes; + VLIRIDX7: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY7: type = ro, run = VLIR7, load = CVT, align_load = $200, optional = yes; + VLIRIDX8: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY8: type = ro, run = VLIR8, load = CVT, align_load = $200, optional = yes; + VLIRIDX9: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY9: type = ro, run = VLIR9, load = CVT, align_load = $200, optional = yes; + VLIRIDX10: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY10: type = ro, run = VLIR10, load = CVT, align_load = $200, optional = yes; + VLIRIDX11: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY11: type = ro, run = VLIR11, load = CVT, align_load = $200, optional = yes; + VLIRIDX12: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY12: type = ro, run = VLIR12, load = CVT, align_load = $200, optional = yes; + VLIRIDX13: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY13: type = ro, run = VLIR13, load = CVT, align_load = $200, optional = yes; + VLIRIDX14: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY14: type = ro, run = VLIR14, load = CVT, align_load = $200, optional = yes; + VLIRIDX15: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY15: type = ro, run = VLIR15, load = CVT, align_load = $200, optional = yes; + VLIRIDX16: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY16: type = ro, run = VLIR16, load = CVT, align_load = $200, optional = yes; + VLIRIDX17: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY17: type = ro, run = VLIR17, load = CVT, align_load = $200, optional = yes; + VLIRIDX18: type = ro, load = CVT, align = $200, optional = yes; + OVERLAY18: type = ro, run = VLIR18, load = CVT, align_load = $200, optional = yes; + VLIRIDX19: type = ro, load = CVT, align = $200, optional = yes; + 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__; +} diff --git a/src/ld65/make/gcc.mak b/src/ld65/make/gcc.mak index 06249a106..4baf8708a 100644 --- a/src/ld65/make/gcc.mak +++ b/src/ld65/make/gcc.mak @@ -75,6 +75,7 @@ INCS = apple2.inc \ c64.inc \ cbm510.inc \ cbm610.inc \ + geos-apple.inc \ geos-cbm.inc \ lunix.inc \ lynx.inc \ @@ -155,6 +156,9 @@ cbm510.inc: cfg/cbm510.cfg cbm610.inc: cfg/cbm610.cfg @$(CVT) $< $@ CfgCBM610 +geos-apple.inc: cfg/geos-apple.cfg + @$(CVT) $< $@ CfgGeosApple + geos-cbm.inc: cfg/geos-cbm.cfg @$(CVT) $< $@ CfgGeosCBM diff --git a/src/ld65/tgtcfg.c b/src/ld65/tgtcfg.c index c9df07f45..72fd2eb80 100644 --- a/src/ld65/tgtcfg.c +++ b/src/ld65/tgtcfg.c @@ -95,7 +95,7 @@ const TargetDesc Targets[TGT_COUNT] = { { BINFMT_BINARY, CfgApple2 }, { BINFMT_BINARY, CfgApple2Enh }, { BINFMT_BINARY, CfgGeosCBM }, - { BINFMT_BINARY, CfgGeos }, + { BINFMT_BINARY, CfgGeosApple }, { BINFMT_O65, CfgLunix }, { BINFMT_BINARY, CfgAtmos }, { BINFMT_BINARY, CfgNES },