Renamed __IRQFUNC_xxx -> __INTERRUPTOR_xxx

git-svn-id: svn://svn.cc65.org/cc65/trunk@3189 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/c128/crt0.s b/libsrc/c128/crt0.s
index 3e3576a215af43715caaff262db40e5c96fbf955..83ae66c581118eab3f2c8ca06bde50a318bd3ecb 100644 (file)
--- a/libsrc/c128/crt0.s
+++ b/libsrc/c128/crt0.s
@@ -9,7 +9,7 @@
        .import         zerobss
        .import         push0, callmain
         .import         RESTOR, BSOUT, CLRCH
-       .import         __IRQFUNC_COUNT__
+       .import         __INTERRUPTOR_COUNT__
        .import         __RAM_START__, __RAM_SIZE__
 
         .include        "zeropage.inc"
@@ -88,8 +88,8 @@ L1:   lda     sp,x
 
        jsr     initlib
 
-; Set the bank for the file name to our execution bank. We must do this, 
-; *after* calling constructors, because some of them may depend on the 
+; Set the bank for the file name to our execution bank. We must do this,
+; *after* calling constructors, because some of them may depend on the
 ; original value of this register.
 
         lda     #0
@@ -97,7 +97,7 @@ L1:   lda     sp,x
 
 ; If we have IRQ functions, chain our stub into the IRQ vector
 
-        lda     #<__IRQFUNC_COUNT__
+        lda     #<__INTERRUPTOR_COUNT__
        beq     NoIRQ1
        lda     IRQVec
                ldx     IRQVec+1
@@ -118,7 +118,7 @@ NoIRQ1:     jsr     callmain
 ; chained it.
 
 _exit: pha                             ; Save the return code on stack
-       lda     #<__IRQFUNC_COUNT__
+       lda     #<__INTERRUPTOR_COUNT__
        beq     NoIRQ2
        lda     IRQInd+1
        ldx     IRQInd+2

diff --git a/libsrc/c64/crt0.s b/libsrc/c64/crt0.s
index 0f3c2d35f81a67d10c62df6d7504f270af7bc736..45f1120312138af659029e9929cfa66c6a69d155 100644 (file)
--- a/libsrc/c64/crt0.s
+++ b/libsrc/c64/crt0.s
@@ -9,7 +9,7 @@
                .import         zerobss, push0
        .import         callmain
         .import         RESTOR, BSOUT, CLRCH
-       .import         __IRQFUNC_COUNT__
+       .import         __INTERRUPTOR_COUNT__
        .import         __RAM_START__, __RAM_SIZE__     ; Linker generated
 
         .include        "zeropage.inc"
@@ -79,7 +79,7 @@ L1:   lda     sp,x
 
 ; If we have IRQ functions, chain our stub into the IRQ vector
 
-        lda     #<__IRQFUNC_COUNT__
+        lda     #<__INTERRUPTOR_COUNT__
        beq     NoIRQ1
        lda     IRQVec
                ldx     IRQVec+1
@@ -100,7 +100,7 @@ NoIRQ1: jsr     callmain
 ; chained it.
 
 _exit:         pha                     ; Save the return code on stack
-       lda     #<__IRQFUNC_COUNT__
+       lda     #<__INTERRUPTOR_COUNT__
        beq     NoIRQ2
        lda     IRQInd+1
        ldx     IRQInd+2

diff --git a/libsrc/cbm510/crt0.s b/libsrc/cbm510/crt0.s
index 78ad684dbd9ad2ff7060358b49d98fe2afa58292..d135e96184ff4ed9168e06c220ca303b192fa923 100644 (file)
--- a/libsrc/cbm510/crt0.s
+++ b/libsrc/cbm510/crt0.s
@@ -10,7 +10,7 @@
        .import         push0, callmain
        .import         __CHARRAM_START__, __CHARRAM_SIZE__, __VIDRAM_START__
        .import         __BSS_RUN__, __BSS_SIZE__, __EXTZP_RUN__
-       .import         __IRQFUNC_COUNT__
+       .import         __INTERRUPTOR_COUNT__
        .import         scnkey, UDTIM
 
        .include        "zeropage.inc"
@@ -428,7 +428,7 @@ ccopy2:     lda     __VIDRAM_START__,y
 ; Call module constructors, enable chained IRQs afterwards.
 
         jsr    initlib
-        lda     #.lobyte(__IRQFUNC_COUNT__*2)
+        lda     #.lobyte(__INTERRUPTOR_COUNT__*2)
         sta     irqcount
 
 ; Enable interrupts

diff --git a/libsrc/cbm610/crt0.s b/libsrc/cbm610/crt0.s
index 8cd91d726a5c6ba16e6b0cca1d891130f935ea76..95ba67ffe51f1d953c7d87ac0e58f74fda75c234 100644 (file)
--- a/libsrc/cbm610/crt0.s
+++ b/libsrc/cbm610/crt0.s
@@ -9,7 +9,7 @@
        .import         callirq_y, initlib, donelib
        .import         push0, callmain
        .import         __BSS_RUN__, __BSS_SIZE__, __EXTZP_RUN__
-       .import         __IRQFUNC_COUNT__
+       .import         __INTERRUPTOR_COUNT__
        .import         scnkey, UDTIM
 
        .include        "zeropage.inc"
@@ -349,7 +349,7 @@ Z4:     jmp     Init
 ; Call module constructors, enable chained IRQs afterwards.
 
 Init:          jsr     initlib
-        lda     #.lobyte(__IRQFUNC_COUNT__*2)
+        lda     #.lobyte(__INTERRUPTOR_COUNT__*2)
         sta     irqcount
 
 ; Enable interrupts

diff --git a/libsrc/plus4/crt0.s b/libsrc/plus4/crt0.s
index 5b2757ea34f18f4163ca01bbe9264ba0a56d0fe1..3b75860095fb3dfb1974b04f23b83a12d4f6acef 100644 (file)
--- a/libsrc/plus4/crt0.s
+++ b/libsrc/plus4/crt0.s
@@ -9,7 +9,7 @@
 
        .import         callirq_y, initlib, donelib
        .import         push0, callmain, zerobss
-       .import         __IRQFUNC_COUNT__
+       .import         __INTERRUPTOR_COUNT__
 
         .include        "zeropage.inc"
        .include        "plus4.inc"
@@ -87,7 +87,7 @@ L1:   lda     sp,x
 ; Initialize irqcount, which means that from now own custom linked in IRQ
 ; handlers (via condes) will be called.
 
-        lda     #.lobyte(__IRQFUNC_COUNT__*2)
+        lda     #.lobyte(__INTERRUPTOR_COUNT__*2)
         sta     irqcount
 
 ; Push arguments and call main()
@@ -147,9 +147,9 @@ IRQ:    cld                 ; Just to be sure
         bne     dobreak
 
 ; It's an IRQ and RAM is enabled. If we have handlers, call them. We will use
-; a flag here instead of loading __IRQFUNC_COUNT__ directly, since the condes
-; function is not reentrant. The irqcount flag will be set/reset from the main
-; code, to avoid races.
+; a flag here instead of loading __INTERRUPTOR_COUNT__ directly, since the 
+; condes function is not reentrant. The irqcount flag will be set/reset from 
+; the main code, to avoid races.
 
        ldy     irqcount
        beq     @L1

diff --git a/libsrc/runtime/callirq.s b/libsrc/runtime/callirq.s
index 1fd376f8bd0c1411b30b42edb4a78f0e44a58f24..b456ce892c09cd9bf71fd61656a4ce6b878447ef 100644 (file)
--- a/libsrc/runtime/callirq.s
+++ b/libsrc/runtime/callirq.s
@@ -23,7 +23,7 @@
                .export callirq
         .export callirq_y       ; Same but with Y preloaded
 
-               .import __IRQFUNC_TABLE__, __IRQFUNC_COUNT__
+               .import __INTERRUPTOR_TABLE__, __INTERRUPTOR_COUNT__
 
 .code
 
@@ -35,13 +35,13 @@
 .data
 
 callirq:
-        ldy     #.lobyte(__IRQFUNC_COUNT__*2)
+        ldy     #.lobyte(__INTERRUPTOR_COUNT__*2)
 callirq_y:
         dey
-        lda     __IRQFUNC_TABLE__,y
+        lda     __INTERRUPTOR_TABLE__,y
         sta     jmpvec+2                ; Modify code below
        dey
-        lda     __IRQFUNC_TABLE__,y
+        lda     __INTERRUPTOR_TABLE__,y
         sta     jmpvec+1                ; Modify code below
                sty     index+1                 ; Modify code below
 jmpvec: jsr            $FFFF                   ; Patched at runtime

diff --git a/src/ld65/cfg/c128.cfg b/src/ld65/cfg/c128.cfg
index 6a89c12a1cd8d6ce203ef4640bda314d6ac9a92e..5f69ded686955fae64a7a534b5446818daa9f758 100644 (file)
--- a/src/ld65/cfg/c128.cfg
+++ b/src/ld65/cfg/c128.cfg
@@ -22,9 +22,9 @@ FEATURES {
            count = __DESTRUCTOR_COUNT__;
     # condes functions with type 2 are called in the interrupt
     CONDES: segment = RODATA,
-           type = 2,
-           label = __IRQFUNC_TABLE__,
-           count = __IRQFUNC_COUNT__;
+           type = interruptor,
+           label = __INTERRUPTOR_TABLE__,
+           count = __INTERRUPTOR_COUNT__;
 }
 SYMBOLS {
     __STACKSIZE__ = $800;      # 2K stack

diff --git a/src/ld65/cfg/c64.cfg b/src/ld65/cfg/c64.cfg
index 417f84e14260a1671b3142955840df4ec192f48c..09956ea301e3131e43feb0a88271951b288c3cae 100644 (file)
--- a/src/ld65/cfg/c64.cfg
+++ b/src/ld65/cfg/c64.cfg
@@ -22,9 +22,9 @@ FEATURES {
            count = __DESTRUCTOR_COUNT__;
     # condes functions with type 2 are called in the interrupt
     CONDES: segment = RODATA,
-           type = 2,
-           label = __IRQFUNC_TABLE__,
-           count = __IRQFUNC_COUNT__;
+           type = interruptor,
+           label = __INTERRUPTOR_TABLE__,
+           count = __INTERRUPTOR_COUNT__;
 }
 SYMBOLS {
     __STACKSIZE__ = $800;      # 2K stack

diff --git a/src/ld65/cfg/cbm510.cfg b/src/ld65/cfg/cbm510.cfg
index 04f0654e899317263196e2b5fef05a493c5894b7..3c52148b032946849daa7c70432b96a54e57a745 100644 (file)
--- a/src/ld65/cfg/cbm510.cfg
+++ b/src/ld65/cfg/cbm510.cfg
@@ -31,9 +31,9 @@ FEATURES {
            label = __DESTRUCTOR_TABLE__,
            count = __DESTRUCTOR_COUNT__;
     CONDES: segment = RODATA,
-           type = 2,
-           label = __IRQFUNC_TABLE__,
-           count = __IRQFUNC_COUNT__;
+           type = interruptor,
+           label = __INTERRUPTOR_TABLE__,
+           count = __INTERRUPTOR_COUNT__;
 }
 SYMBOLS {
     __STACKSIZE__ = $781;              # ~2K stack

diff --git a/src/ld65/cfg/cbm610.cfg b/src/ld65/cfg/cbm610.cfg
index dbc1e8674f4fce4a9fed2b87fb1e3542a39e8b0f..16dfd97189f058979b1a310ac893d7ca34389107 100644 (file)
--- a/src/ld65/cfg/cbm610.cfg
+++ b/src/ld65/cfg/cbm610.cfg
@@ -30,9 +30,9 @@ FEATURES {
            count = __DESTRUCTOR_COUNT__;
     # condes functions with type 2 are called in the interrupt
     CONDES: segment = RODATA,
-           type = 2,
-           label = __IRQFUNC_TABLE__,
-           count = __IRQFUNC_COUNT__;
+           type = interruptor,
+           label = __INTERRUPTOR_TABLE__,
+           count = __INTERRUPTOR_COUNT__;
 }
 SYMBOLS {
     __STACKSIZE__ = $800;      # 2K stack

diff --git a/src/ld65/cfg/plus4.cfg b/src/ld65/cfg/plus4.cfg
index 3a3ab6504774a2aa1964eb79436698f5d66e43a3..1c4c3291f2c9d56b21895ad9bc5193dd8bda3424 100644 (file)
--- a/src/ld65/cfg/plus4.cfg
+++ b/src/ld65/cfg/plus4.cfg
@@ -22,9 +22,9 @@ FEATURES {
            count = __DESTRUCTOR_COUNT__;
     # condes functions with type 2 are called in the interrupt
     CONDES: segment = RODATA,
-           type = 2,
-           label = __IRQFUNC_TABLE__,
-           count = __IRQFUNC_COUNT__;
+           type = interruptor,
+           label = __INTERRUPTOR_TABLE__,
+           count = __INTERRUPTOR_COUNT__;
 }
 SYMBOLS {
     __STACKSIZE__ = $800;      # 2K stack