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
2024-12-27 00:29:31 +00:00 · 2012-11-03 21:59:15 +00:00 · 2012-11-03 21:59:15 +00:00 · 7b34609930
commit 7b34609930
parent 754674dfab
30 changed files with 60 additions and 30 deletions
--- 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
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__       ;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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;
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }
--- 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__;
 }