From 7b34609930c5308f9697a665000afba371a7bb21 Mon Sep 17 00:00:00 2001 From: uz Date: Sat, 3 Nov 2012 21:59:15 +0000 Subject: [PATCH] Have the callirq module export __CALLIRQ__ and changed all config files so this symbol is a forced import for all interruptors. git-svn-id: svn://svn.cc65.org/cc65/trunk@5902 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/runtime/callirq.s | 3 ++- src/ld65/cfg/apple2.cfg | 3 ++- src/ld65/cfg/apple2enh-overlay.cfg | 3 ++- src/ld65/cfg/apple2enh-system.cfg | 3 ++- src/ld65/cfg/apple2enh.cfg | 3 ++- src/ld65/cfg/atari-overlay.cfg | 3 ++- src/ld65/cfg/atari.cfg | 3 ++- src/ld65/cfg/atmos.cfg | 3 ++- src/ld65/cfg/bbc.cfg | 3 ++- src/ld65/cfg/c128-overlay.cfg | 3 ++- src/ld65/cfg/c128.cfg | 3 ++- src/ld65/cfg/c16.cfg | 3 ++- src/ld65/cfg/c64.cfg | 3 ++- src/ld65/cfg/cbm510.cfg | 3 ++- src/ld65/cfg/cbm610.cfg | 3 ++- src/ld65/cfg/geos-apple.cfg | 3 ++- src/ld65/cfg/geos-cbm.cfg | 3 ++- src/ld65/cfg/lunix.cfg | 3 ++- src/ld65/cfg/lynx-bll.cfg | 3 ++- src/ld65/cfg/lynx-coll.cfg | 3 ++- src/ld65/cfg/lynx-uploader.cfg | 3 ++- src/ld65/cfg/lynx.cfg | 3 ++- src/ld65/cfg/nes.cfg | 3 ++- src/ld65/cfg/none.cfg | 3 ++- src/ld65/cfg/pet.cfg | 3 ++- src/ld65/cfg/plus4.cfg | 3 ++- src/ld65/cfg/supervision-16k.cfg | 3 ++- src/ld65/cfg/supervision.cfg | 3 ++- src/ld65/cfg/vic20-32k.cfg | 3 ++- src/ld65/cfg/vic20.cfg | 3 ++- 30 files changed, 60 insertions(+), 30 deletions(-) diff --git a/libsrc/runtime/callirq.s b/libsrc/runtime/callirq.s index 5f2c2d616..618f80f8d 100644 --- a/libsrc/runtime/callirq.s +++ b/libsrc/runtime/callirq.s @@ -29,7 +29,8 @@ .export callirq .export callirq_y ; Same but with Y preloaded - + + .export __CALLIRQ__: absolute = 1 .import __INTERRUPTOR_TABLE__, __INTERRUPTOR_COUNT__ .code diff --git a/src/ld65/cfg/apple2.cfg b/src/ld65/cfg/apple2.cfg index 5ebe8d31d..656e97e45 100644 --- a/src/ld65/cfg/apple2.cfg +++ b/src/ld65/cfg/apple2.cfg @@ -45,5 +45,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/apple2enh-overlay.cfg b/src/ld65/cfg/apple2enh-overlay.cfg index 0fcfe4a2a..f77c27f2b 100644 --- a/src/ld65/cfg/apple2enh-overlay.cfg +++ b/src/ld65/cfg/apple2enh-overlay.cfg @@ -71,5 +71,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/apple2enh-system.cfg b/src/ld65/cfg/apple2enh-system.cfg index 34fc3e85a..bd0b328d3 100644 --- a/src/ld65/cfg/apple2enh-system.cfg +++ b/src/ld65/cfg/apple2enh-system.cfg @@ -38,5 +38,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/apple2enh.cfg b/src/ld65/cfg/apple2enh.cfg index 5ebe8d31d..656e97e45 100644 --- a/src/ld65/cfg/apple2enh.cfg +++ b/src/ld65/cfg/apple2enh.cfg @@ -45,5 +45,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/atari-overlay.cfg b/src/ld65/cfg/atari-overlay.cfg index 9e1e0ceb2..737c0dc83 100644 --- a/src/ld65/cfg/atari-overlay.cfg +++ b/src/ld65/cfg/atari-overlay.cfg @@ -56,5 +56,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/atari.cfg b/src/ld65/cfg/atari.cfg index fcfc9a761..d275896b2 100644 --- a/src/ld65/cfg/atari.cfg +++ b/src/ld65/cfg/atari.cfg @@ -37,5 +37,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/atmos.cfg b/src/ld65/cfg/atmos.cfg index b2194b6b0..83c0679e4 100644 --- a/src/ld65/cfg/atmos.cfg +++ b/src/ld65/cfg/atmos.cfg @@ -30,5 +30,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/bbc.cfg b/src/ld65/cfg/bbc.cfg index d9b8b6732..57ca726e5 100644 --- a/src/ld65/cfg/bbc.cfg +++ b/src/ld65/cfg/bbc.cfg @@ -27,5 +27,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/c128-overlay.cfg b/src/ld65/cfg/c128-overlay.cfg index 21cc99865..0ca4a62ea 100644 --- a/src/ld65/cfg/c128-overlay.cfg +++ b/src/ld65/cfg/c128-overlay.cfg @@ -53,5 +53,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/c128.cfg b/src/ld65/cfg/c128.cfg index f521f4002..12b206997 100644 --- a/src/ld65/cfg/c128.cfg +++ b/src/ld65/cfg/c128.cfg @@ -34,5 +34,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/c16.cfg b/src/ld65/cfg/c16.cfg index 80e1e2170..55b49f2d0 100644 --- a/src/ld65/cfg/c16.cfg +++ b/src/ld65/cfg/c16.cfg @@ -34,5 +34,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__ ; } diff --git a/src/ld65/cfg/c64.cfg b/src/ld65/cfg/c64.cfg index fafea059d..9cb475a94 100644 --- a/src/ld65/cfg/c64.cfg +++ b/src/ld65/cfg/c64.cfg @@ -34,5 +34,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/cbm510.cfg b/src/ld65/cfg/cbm510.cfg index 9bac135bf..dd8114dfb 100644 --- a/src/ld65/cfg/cbm510.cfg +++ b/src/ld65/cfg/cbm510.cfg @@ -38,5 +38,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/cbm610.cfg b/src/ld65/cfg/cbm610.cfg index f9d02ba64..f989c083f 100644 --- a/src/ld65/cfg/cbm610.cfg +++ b/src/ld65/cfg/cbm610.cfg @@ -35,5 +35,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/geos-apple.cfg b/src/ld65/cfg/geos-apple.cfg index e07b17ded..66034d68b 100644 --- a/src/ld65/cfg/geos-apple.cfg +++ b/src/ld65/cfg/geos-apple.cfg @@ -96,5 +96,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/geos-cbm.cfg b/src/ld65/cfg/geos-cbm.cfg index ef0f2a08e..e6e3cf15c 100644 --- a/src/ld65/cfg/geos-cbm.cfg +++ b/src/ld65/cfg/geos-cbm.cfg @@ -74,5 +74,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/lunix.cfg b/src/ld65/cfg/lunix.cfg index 37b485e36..16400528b 100644 --- a/src/ld65/cfg/lunix.cfg +++ b/src/ld65/cfg/lunix.cfg @@ -30,7 +30,8 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } FILES { %O: format = o65; diff --git a/src/ld65/cfg/lynx-bll.cfg b/src/ld65/cfg/lynx-bll.cfg index 468ed5e21..b5aae6aed 100644 --- a/src/ld65/cfg/lynx-bll.cfg +++ b/src/ld65/cfg/lynx-bll.cfg @@ -34,5 +34,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/lynx-coll.cfg b/src/ld65/cfg/lynx-coll.cfg index b189936f1..e4c40e002 100644 --- a/src/ld65/cfg/lynx-coll.cfg +++ b/src/ld65/cfg/lynx-coll.cfg @@ -40,5 +40,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/lynx-uploader.cfg b/src/ld65/cfg/lynx-uploader.cfg index 6a4796443..251c3343b 100644 --- a/src/ld65/cfg/lynx-uploader.cfg +++ b/src/ld65/cfg/lynx-uploader.cfg @@ -44,5 +44,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/lynx.cfg b/src/ld65/cfg/lynx.cfg index 520a291d5..e191de6d0 100644 --- a/src/ld65/cfg/lynx.cfg +++ b/src/ld65/cfg/lynx.cfg @@ -40,5 +40,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/nes.cfg b/src/ld65/cfg/nes.cfg index 43d213452..c5ab3dda6 100644 --- a/src/ld65/cfg/nes.cfg +++ b/src/ld65/cfg/nes.cfg @@ -57,5 +57,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/none.cfg b/src/ld65/cfg/none.cfg index 8821bd05f..dbb58f8d1 100644 --- a/src/ld65/cfg/none.cfg +++ b/src/ld65/cfg/none.cfg @@ -26,5 +26,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/pet.cfg b/src/ld65/cfg/pet.cfg index c77fe6f6b..19f9d95cf 100644 --- a/src/ld65/cfg/pet.cfg +++ b/src/ld65/cfg/pet.cfg @@ -34,5 +34,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/plus4.cfg b/src/ld65/cfg/plus4.cfg index a181bf00d..08d54eb07 100644 --- a/src/ld65/cfg/plus4.cfg +++ b/src/ld65/cfg/plus4.cfg @@ -34,5 +34,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/supervision-16k.cfg b/src/ld65/cfg/supervision-16k.cfg index 70cb115c9..8be534553 100644 --- a/src/ld65/cfg/supervision-16k.cfg +++ b/src/ld65/cfg/supervision-16k.cfg @@ -36,5 +36,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/supervision.cfg b/src/ld65/cfg/supervision.cfg index af6df38fa..a3eac0037 100644 --- a/src/ld65/cfg/supervision.cfg +++ b/src/ld65/cfg/supervision.cfg @@ -32,5 +32,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/vic20-32k.cfg b/src/ld65/cfg/vic20-32k.cfg index 8672fef6a..4ca1e6ba2 100644 --- a/src/ld65/cfg/vic20-32k.cfg +++ b/src/ld65/cfg/vic20-32k.cfg @@ -36,5 +36,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } diff --git a/src/ld65/cfg/vic20.cfg b/src/ld65/cfg/vic20.cfg index 4c8776e9d..731c86ebf 100644 --- a/src/ld65/cfg/vic20.cfg +++ b/src/ld65/cfg/vic20.cfg @@ -34,5 +34,6 @@ FEATURES { CONDES: segment = RODATA, type = interruptor, label = __INTERRUPTOR_TABLE__, - count = __INTERRUPTOR_COUNT__; + count = __INTERRUPTOR_COUNT__, + import = __CALLIRQ__; } -- 2.39.5