cartbank2.cfg is now a generated file, add to .gitignore

4 files changed, 90 insertions, 0 deletions

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.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 b/cartbank2.cfg.old
index 1e6e5cc..6532e57 100644
--- a/cartbank2.cfg
+++ b/cartbank2.cfg.old
@@ -50,6 +50,7 @@ SEGMENTS {
     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,
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"