Save some bytes by sharing the code doing the actual vector setting. Note: Jumping from segemnt INIT to segment CODE is okay while the other way wouldn't be.

git-svn-id: svn://svn.cc65.org/cc65/trunk@5989 b7a2c559-68d2-44c3-8de9-860c34a00d81
2013-02-14 16:48:05 +00:00 · 2013-02-14 16:48:05 +00:00 · 2e5823d43d
commit 2e5823d43d
parent 4a5bd362ac
6 changed files with 12 additions and 36 deletions
--- a/libsrc/atmos/irq.s
+++ b/libsrc/atmos/irq.s
@ -18,11 +18,7 @@ initirq:
 	stx	IRQInd+2
 	lda	#<IRQStub
 	ldx	#>IRQStub
-	sei
-	sta	IRQVec
-	stx	IRQVec+1
-	cli
-	rts
+	jmp	setvec

 ; ------------------------------------------------------------------------

@ -31,7 +27,7 @@ initirq:
 doneirq:
 	lda	IRQInd+1
 	ldx	IRQInd+2
-	sei
+setvec:	sei
 	sta	IRQVec
 	stx	IRQVec+1
 	cli
--- a/libsrc/c128/irq.s
+++ b/libsrc/c128/irq.s
@ -20,11 +20,7 @@ initirq:
 	stx	IRQInd+2
 	lda	#<IRQStub
 	ldx	#>IRQStub
-	sei
-	sta	IRQVec
-	stx	IRQVec+1
-	cli
-	rts
+	jmp	setvec

 ; ------------------------------------------------------------------------

@ -33,7 +29,7 @@ initirq:
 doneirq:
 	lda	IRQInd+1
 	ldx	IRQInd+2
-	sei
+setvec:	sei
 	sta	IRQVec
 	stx	IRQVec+1
 	cli
--- a/libsrc/c16/irq.s
+++ b/libsrc/c16/irq.s
@ -18,11 +18,7 @@ initirq:
 	stx	IRQInd+2
 	lda	#<IRQStub
 	ldx	#>IRQStub
-	sei
-	sta	IRQVec
-	stx	IRQVec+1
-	cli
-	rts
+	jmp	setvec

 ; ------------------------------------------------------------------------

@ -31,7 +27,7 @@ initirq:
 doneirq:
 	lda	IRQInd+1
 	ldx	IRQInd+2
-	sei
+setvec:	sei
 	sta	IRQVec
 	stx	IRQVec+1
 	cli
--- a/libsrc/c64/irq.s
+++ b/libsrc/c64/irq.s
@ -18,11 +18,7 @@ initirq:
 	stx	IRQInd+2
 	lda	#<IRQStub
 	ldx	#>IRQStub
-	sei
-	sta	IRQVec
-	stx	IRQVec+1
-	cli
-	rts
+	jmp	setvec

 ; ------------------------------------------------------------------------

@ -31,7 +27,7 @@ initirq:
 doneirq:
 	lda	IRQInd+1
 	ldx	IRQInd+2
-	sei
+setvec:	sei
 	sta	IRQVec
 	stx	IRQVec+1
 	cli
--- a/libsrc/pet/irq.s
+++ b/libsrc/pet/irq.s
@ -18,11 +18,7 @@ initirq:
 	stx	IRQInd+2
 	lda	#<IRQStub
 	ldx	#>IRQStub
-	sei
-	sta	IRQVec
-	stx	IRQVec+1
-	cli
-	rts
+	jmp	setvec

 ; ------------------------------------------------------------------------

@ -31,7 +27,7 @@ initirq:
 doneirq:
 	lda	IRQInd+1
 	ldx	IRQInd+2
-	sei
+setvec:	sei
 	sta	IRQVec
 	stx	IRQVec+1
 	cli
--- a/libsrc/vic20/irq.s
+++ b/libsrc/vic20/irq.s
@ -18,11 +18,7 @@ initirq:
 	stx	IRQInd+2
 	lda	#<IRQStub
 	ldx	#>IRQStub
-	sei
-	sta	IRQVec
-	stx	IRQVec+1
-	cli
-	rts
+	jmp	setvec

 ; ------------------------------------------------------------------------

@ -31,7 +27,7 @@ initirq:
 doneirq:
 	lda	IRQInd+1
 	ldx	IRQInd+2
-	sei
+setvec:	sei
 	sta	IRQVec
 	stx	IRQVec+1
 	cli