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

diff --git a/libsrc/runtime/callirq.s b/libsrc/runtime/callirq.s
index 5f2c2d6161b59e8c861a6fde31d31f21e49e7fb1..618f80f8db81268d745cdfb5bef2991b13f7ae6f 100644 (file)
--- 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 5ebe8d31d94a5c7f2772e055514ed2c618365f7b..656e97e451ce813751aa04271f776d75e4c2d2e1 100644 (file)
--- 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 0fcfe4a2a5588e26422edbe42888f318af0a0370..f77c27f2baa2ce6b86a29de5d848b1007d219ecf 100644 (file)
--- 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 34fc3e85a3b1398e809cd8bd127199b1e7999e2e..bd0b328d31f25bb012564b01ace15fe080aef742 100644 (file)
--- 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 5ebe8d31d94a5c7f2772e055514ed2c618365f7b..656e97e451ce813751aa04271f776d75e4c2d2e1 100644 (file)
--- 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 9e1e0ceb2daec78aea7a08633339301290f92379..737c0dc83ab42a136f090281a37e5cbd05597ec4 100644 (file)
--- 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 fcfc9a76114ed8d978028aa29bb6bb54e5c02358..d275896b21de70b8d70579ee1fc4cf5233d819bb 100644 (file)
--- 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 b2194b6b0acb531ca95a499c174000a376b4376a..83c0679e418ff3420549ae4b0fa524e52ef3d27b 100644 (file)
--- 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 d9b8b6732056a4535cc4682400f4d7d09a242a6d..57ca726e5b5fcd23c9379edbde29d7b1c88f0932 100644 (file)
--- 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 21cc99865a135c3f72079004ed9b26a4767159ad..0ca4a62ea90074a1ea7146e3877e4dd014a876a3 100644 (file)
--- 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 f521f4002b4cc83ec86a46745c5a9cd863b9a4fc..12b20699780aecdd48a1f86622a572503e84b711 100644 (file)
--- 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 80e1e2170ab54cabb2a1be08ab0c0438e462c68b..55b49f2d09fd6d52aebc26624ccecfa6d59d0110 100644 (file)
--- 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 fafea059db353e95f063809c8ec5f288ed75e4a3..9cb475a94d641a25fd078a90022d2927cccb20e4 100644 (file)
--- 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 9bac135bf40e9244bcb80e316a89fcf0b0072492..dd8114dfb3d6c7ee0faf5e0f6e104b6b90342731 100644 (file)
--- 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 f9d02ba643502e31c34b32d40da4d6691d9fbfed..f989c083f66924aa7d538b0ead39d25f2322f7a4 100644 (file)
--- 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 e07b17ded9ee5595e570489ec475e9648340c974..66034d68bd6ed24aaf84250eaba64506105a4cf1 100644 (file)
--- 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 ef0f2a08e06bcb63fc722204cb25c6bed0036960..e6e3cf15c3396d258e51f184a9a3b7ddbeb02ded 100644 (file)
--- 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 37b485e362dfd20a086042b3e3445b6750dec9f8..16400528bd37d1339dec6f876f2f888cce2d449b 100644 (file)
--- 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 468ed5e213ed41eb597a7ef71d8862b88d83122f..b5aae6aedcb83d49a5189c74c5d641d71f4a3ef4 100644 (file)
--- 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 b189936f1a695355293a3b0c3894bc279c6fb579..e4c40e002c1b077764691129963708423a6eb531 100644 (file)
--- 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 6a47964437bfb076470ec3b7ed081d3a296c9158..251c3343be4554e49349e4a1a8b06201f99a1879 100644 (file)
--- 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 520a291d59224b3e0d7d2d88703dc1816bcb4452..e191de6d06118a25b5e5bff7b3d9f39064f39490 100644 (file)
--- 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 43d213452ed457ee56b80c01749d85165b87a5f6..c5ab3dda6be14ad8e97053df2b459fd01e876297 100644 (file)
--- 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 8821bd05f70da0b16aa1f8e00025865a6489b03d..dbb58f8d1af919108d9a550ef2012adeacd11a89 100644 (file)
--- 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 c77fe6f6b6d56186a86fe44bdf624c49d295bb08..19f9d95cf3b11a614735cd8571845bf5b7d28e17 100644 (file)
--- 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 a181bf00d8cc509b25a345a44ae1fde24baf9ae8..08d54eb07ea0141b79b5f4e429bf7c5921d0e51c 100644 (file)
--- 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 70cb115c92a368ce96ab07ac0c51fdbc053d4ad1..8be534553f8d38ee46bb1b57446d75441bd55d4a 100644 (file)
--- 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 af6df38faa3ab94f414b5312a2e17de763865de2..a3eac00374f6f2a4e611a5da93c3b162772b0ebe 100644 (file)
--- 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 8672fef6aa86de0b00acb58df5f454ef2e69c966..4ca1e6ba2f404c6d2db8673ed1a8e89940e7e775 100644 (file)
--- 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 4c8776e9d97f98b02b37dc738c0f8e77a31074a7..731c86ebf8b2a91c45fbf98aed8c3f2ec49c81b8 100644 (file)
--- 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__;
 }