1
0
mirror of https://github.com/cc65/cc65.git synced 2024-06-26 05:29:30 +00:00

Renamed __IRQFUNC_xxx -> __INTERRUPTOR_xxx

git-svn-id: svn://svn.cc65.org/cc65/trunk@3189 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz 2004-09-20 10:24:59 +00:00
parent e6b456a8a6
commit cfef8e1e0d
11 changed files with 36 additions and 36 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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