From eb53a511c383cd319fafe502b008ed2f0bda2469 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Mon, 22 Mar 2021 23:58:38 -0400 Subject: cartbank2.cfg is now a generated file, add to .gitignore --- .gitignore | 1 + cartbank2.cfg | 68 ------------------------------------------------------ cartbank2.cfg.new | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ cartbank2.cfg.old | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ cartbank2.sh | 25 ++++++++++++++++++++ 5 files changed, 158 insertions(+), 68 deletions(-) delete mode 100644 cartbank2.cfg create mode 100644 cartbank2.cfg.new create mode 100644 cartbank2.cfg.old create mode 100644 cartbank2.sh diff --git a/.gitignore b/.gitignore index dbf7582..fcf130b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +cartbank2.cfg procsizes msg.inc messages.c diff --git a/cartbank2.cfg b/cartbank2.cfg deleted file mode 100644 index 1e6e5cc..0000000 --- a/cartbank2.cfg +++ /dev/null @@ -1,68 +0,0 @@ -# TODO: get rid of some of the chunks like HEADER SYSCHKHDR etc. -# right now I'm killing them with -Wl options to cl65. - -FEATURES { - STARTADDRESS: default = $2000; -} -SYMBOLS { - __EXEHDR__: type = import; - __SYSTEM_CHECK__: type = import; # force inclusion of "system check" load chunk - __AUTOSTART__: type = import; # force inclusion of autostart "trailer" - __STACKSIZE__: type = weak, value = $0800; # 2k stack - __STARTADDRESS__: type = export, value = %S; - __RESERVED_MEMORY__: type = weak, value = $0000; -} -MEMORY { - ZP: file = "", define = yes, start = $0082, size = $007E; - -# file header, just $FFFF - HEADER: file = %O, start = $0000, size = $0002; - -# "system check" load chunk - SYSCHKHDR: file = %O, start = $0000, size = $0004; - SYSCHKCHNK: file = %O, start = $2E00, size = $0300; - SYSCHKTRL: file = %O, start = $0000, size = $0006; - -# "main program" load chunk - MAINHDR: file = %O, start = $0000, size = $0004; - RAM: file = %O, define = yes, start = %S, size = $BC20 - __STACKSIZE__ - __RESERVED_MEMORY__ - %S; - TRAILER: file = %O, start = $0000, size = $0006; - -# read-only data (and some code) goes in a cart bank - HIGHDATA: file = "rodata.8000" start = $8000, size = $2000; - -} -SEGMENTS { - EXEHDR: load = HEADER, type = ro; - SYSCHKHDR: load = SYSCHKHDR, type = ro, optional = yes; - SYSCHK: load = SYSCHKCHNK, type = rw, define = yes, optional = yes; - SYSCHKTRL: load = SYSCHKTRL, type = ro, optional = yes; - MAINHDR: load = MAINHDR, type = ro; - STARTUP: load = RAM, type = ro, define = yes; - LOWCODE: load = RAM, type = ro, define = yes, optional = yes; - INIT: load = RAM, type = ro, optional = yes; - CODE: load = RAM, type = ro, define = yes; - RODATA: load = HIGHDATA, type = ro; - HIGHCODE: load = HIGHDATA, type = ro; - DATA: load = RAM, type = rw; - INITBSS: load = RAM, type = bss, optional = yes; - BSS: load = RAM, type = bss, define = yes; - ZEROPAGE: load = ZP, type = zp; - EXTZP: load = ZP, type = zp, optional = yes; - AUTOSTRT: load = TRAILER, type = ro; -} -FEATURES { - 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/cartbank2.cfg.new b/cartbank2.cfg.new new file mode 100644 index 0000000..b05d0fd --- /dev/null +++ b/cartbank2.cfg.new @@ -0,0 +1,63 @@ +FEATURES { + STARTADDRESS: default = $2000; +} +SYMBOLS { + __EXEHDR__: type = import; + __SYSTEM_CHECK__: type = import; # force inclusion of "system check" load chunk + __AUTOSTART__: type = import; # force inclusion of autostart "trailer" + __STACKSIZE__: type = weak, value = $0800; # 2k stack + __STARTADDRESS__: type = export, value = %S; + __RESERVED_MEMORY__: type = weak, value = $0000; +} +MEMORY { + ZP: file = "", define = yes, start = $0082, size = $007E; + +# file header, just $FFFF + HEADER: file = %O, start = $0000, size = $0002; + +# "system check" load chunk + SYSCHKHDR: file = %O, start = $0000, size = $0004; + SYSCHKCHNK: file = %O, start = $2E00, size = $0300; + SYSCHKTRL: file = %O, start = $0000, size = $0006; + +# "main program" load chunk + MAINHDR: file = %O, start = $0000, size = $0004; + MAIN: file = %O, define = yes, start = %S, size = $BC20 - __STACKSIZE__ - __RESERVED_MEMORY__ - %S; + TRAILER: file = %O, start = $0000, size = $0006; +# read-only data (and some code) goes in a cart bank + HIGHDATA: file = "rodata.8000" start = $8000, size = $2000; +} +SEGMENTS { + ZEROPAGE: load = ZP, type = zp; + EXTZP: load = ZP, type = zp, optional = yes; + EXEHDR: load = HEADER, type = ro; + SYSCHKHDR: load = SYSCHKHDR, type = ro, optional = yes; + SYSCHK: load = SYSCHKCHNK, type = rw, define = yes, optional = yes; + SYSCHKTRL: load = SYSCHKTRL, type = ro, optional = yes; + MAINHDR: load = MAINHDR, type = ro; + STARTUP: load = MAIN, type = ro, define = yes; + LOWCODE: load = MAIN, type = ro, define = yes, optional = yes; + ONCE: load = MAIN, type = ro, optional = yes; + CODE: load = MAIN, type = ro, define = yes; + RODATA: load = HIGHDATA, type = ro; + HIGHCODE: load = HIGHDATA, type = ro; + DATA: load = MAIN, type = rw; + INIT: load = MAIN, type = rw, optional = yes; + BSS: load = MAIN, type = bss, define = yes; + AUTOSTRT: load = TRAILER, type = ro; +} +FEATURES { + CONDES: type = constructor, + label = __CONSTRUCTOR_TABLE__, + count = __CONSTRUCTOR_COUNT__, + segment = ONCE; + 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/cartbank2.cfg.old b/cartbank2.cfg.old new file mode 100644 index 0000000..6532e57 --- /dev/null +++ b/cartbank2.cfg.old @@ -0,0 +1,69 @@ +# TODO: get rid of some of the chunks like HEADER SYSCHKHDR etc. +# right now I'm killing them with -Wl options to cl65. + +FEATURES { + STARTADDRESS: default = $2000; +} +SYMBOLS { + __EXEHDR__: type = import; + __SYSTEM_CHECK__: type = import; # force inclusion of "system check" load chunk + __AUTOSTART__: type = import; # force inclusion of autostart "trailer" + __STACKSIZE__: type = weak, value = $0800; # 2k stack + __STARTADDRESS__: type = export, value = %S; + __RESERVED_MEMORY__: type = weak, value = $0000; +} +MEMORY { + ZP: file = "", define = yes, start = $0082, size = $007E; + +# file header, just $FFFF + HEADER: file = %O, start = $0000, size = $0002; + +# "system check" load chunk + SYSCHKHDR: file = %O, start = $0000, size = $0004; + SYSCHKCHNK: file = %O, start = $2E00, size = $0300; + SYSCHKTRL: file = %O, start = $0000, size = $0006; + +# "main program" load chunk + MAINHDR: file = %O, start = $0000, size = $0004; + RAM: file = %O, define = yes, start = %S, size = $BC20 - __STACKSIZE__ - __RESERVED_MEMORY__ - %S; + TRAILER: file = %O, start = $0000, size = $0006; + +# read-only data (and some code) goes in a cart bank + HIGHDATA: file = "rodata.8000" start = $8000, size = $2000; + +} +SEGMENTS { + EXEHDR: load = HEADER, type = ro; + SYSCHKHDR: load = SYSCHKHDR, type = ro, optional = yes; + SYSCHK: load = SYSCHKCHNK, type = rw, define = yes, optional = yes; + SYSCHKTRL: load = SYSCHKTRL, type = ro, optional = yes; + MAINHDR: load = MAINHDR, type = ro; + STARTUP: load = RAM, type = ro, define = yes; + LOWCODE: load = RAM, type = ro, define = yes, optional = yes; + INIT: load = RAM, type = ro, optional = yes; + CODE: load = RAM, type = ro, define = yes; + RODATA: load = HIGHDATA, type = ro; + HIGHCODE: load = HIGHDATA, type = ro; + DATA: load = RAM, type = rw; + INITBSS: load = RAM, type = bss, optional = yes; + BSS: load = RAM, type = bss, define = yes; + ZEROPAGE: load = ZP, type = zp; + EXTZP: load = ZP, type = zp, optional = yes; + AUTOSTRT: load = TRAILER, type = ro; + ONCE: load = RAM, type = ro, optional = yes; +} +FEATURES { + 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/cartbank2.sh b/cartbank2.sh new file mode 100644 index 0000000..d9a0bce --- /dev/null +++ b/cartbank2.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +# cc65 linker script stuff changed between 2.15 and 2.16. Pick the right +# .cfg for the version of cc65 we're using. + +DEST="cartbank2.cfg" + +VER="$( cc65 --version 2>&1 | sed 's,^.*V\([0-9.]*\) .*$,\1,' )" +MAJOR="$( echo "$VER" | cut -d. -f1 )" +MINOR="$( echo "$VER" | cut -d. -f2 )" +VERDEC="$( printf "%d%03d" "$MAJOR" "$MINOR" )" + +if [ "$VERDEC" -lt "2015" ]; then + echo "*** Warning: cc65 version $VER is too old, upgrade to at least 2.15" + CFG=old +elif [ "$VERDEC" -eq "2015" ]; then + CFG=old +else + CFG=new +fi + +CONFIG="$DEST.$CFG" +echo "=== Found cc65 version $VER, using $CONFIG" +rm -f "$DEST" +cp "$CONFIG" "$DEST" -- cgit v1.2.3