From 0856c6debca5751aa1af22b6dfcc1a1bc9e89ebe Mon Sep 17 00:00:00 2001
From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Thu, 13 Sep 2001 15:29:13 +0000
Subject: [PATCH] Fixed an error in the reset_brk() routine of all target
 machines (all the code was derived from my old C64 code which had an error).

git-svn-id: svn://svn.cc65.org/cc65/trunk@900 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 libsrc/apple2/break.s | 12 +++++++-----
 libsrc/atari/break.s  | 12 +++++++-----
 libsrc/c64/break.s    | 12 +++++++-----
 libsrc/cbm610/break.s | 12 +++++++-----
 libsrc/pet/break.s    | 12 +++++++-----
 libsrc/plus4/break.s  | 12 +++++++-----
 6 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/libsrc/apple2/break.s b/libsrc/apple2/break.s
index d9d029805..b4f44977a 100644
--- a/libsrc/apple2/break.s
+++ b/libsrc/apple2/break.s
@@ -44,9 +44,9 @@ uservec:    	jmp	$FFFF		; Patched at runtime
  	sta	oldvec+1	; Save the old vector
 
 L1:	lda	#<brk_handler	; Set the break vector to our routine
+       	ldx	#>brk_handler
 	sta	BRKVec
-	lda	#>brk_handler
-	sta	BRKVec+1
+	stx	BRKVec+1
 	rts
 
 .endproc
@@ -56,11 +56,13 @@ L1:	lda	#<brk_handler	; Set the break vector to our routine
 .proc	_reset_brk
 
 	lda  	oldvec
-	bne  	@L1
-	ldx  	oldvec
+	ldx  	oldvec+1
 	beq  	@L9		; Jump if vector not installed
-@L1:	sta    	BRKVec
+	sta    	BRKVec
 	stx  	BRKVec+1
+	lda	#$00
+	sta	oldvec		; Clear the old vector
+	stx	oldvec+1
 @L9:	rts
 
 .endproc
diff --git a/libsrc/atari/break.s b/libsrc/atari/break.s
index b1b58c831..ebad1cb3d 100644
--- a/libsrc/atari/break.s
+++ b/libsrc/atari/break.s
@@ -36,7 +36,7 @@ uservec:    	jmp	$FFFF		; Patched at runtime
 
 	lda	oldvec
 	ora	oldvec+1	; Did we save the vector already?
-        	bne	L1		; Jump if we installed the handler already
+	bne	L1		; Jump if we installed the handler already
 
 	lda	VBREAK
  	sta    	oldvec
@@ -56,12 +56,14 @@ L1:	lda	#<brk_handler	; Set the break vector to our routine
 .proc	_reset_brk
 
 	lda  	oldvec
-	bne  	@L1
-	ldx  	oldvec
+	ldx  	oldvec+1
 	beq  	@L9		; Jump if vector not installed
-@L1:	sta    	VBREAK
+	sta    	VBREAK
 	stx  	VBREAK+1
-@L9:	rts
+	lda	#$00
+	sta	oldvec		; Clear the old vector
+	stx	oldvec+1
+@L9:	rts	
 
 .endproc
 
diff --git a/libsrc/c64/break.s b/libsrc/c64/break.s
index 345f5e75f..76315b7b9 100644
--- a/libsrc/c64/break.s
+++ b/libsrc/c64/break.s
@@ -44,9 +44,9 @@ uservec:     	jmp	$FFFF		; Patched at runtime
  	sta  	oldvec+1	; Save the old vector
 
 L1:	lda  	#<brk_handler	; Set the break vector to our routine
+	ldx  	#>brk_handler
 	sta  	BRKVec
-	lda  	#>brk_handler
-	sta  	BRKVec+1
+	stx  	BRKVec+1
 	rts
 
 .endproc
@@ -56,11 +56,13 @@ L1:	lda  	#<brk_handler	; Set the break vector to our routine
 .proc	_reset_brk
 
 	lda  	oldvec
-	bne  	@L1
-	ldx  	oldvec
+	ldx  	oldvec+1
 	beq  	@L9		; Jump if vector not installed
-@L1:	sta    	BRKVec
+	sta    	BRKVec
 	stx  	BRKVec+1
+	lda	#$00
+	sta	oldvec		; Clear the old vector
+	stx	oldvec+1
 @L9:	rts
 
 .endproc
diff --git a/libsrc/cbm610/break.s b/libsrc/cbm610/break.s
index 67e9ca225..cf5332a95 100644
--- a/libsrc/cbm610/break.s
+++ b/libsrc/cbm610/break.s
@@ -46,9 +46,9 @@ uservec:    	jmp	$FFFF		; Patched at runtime
  	sta	oldvec+1	; Save the old vector
 
 L1:	lda	#<brk_handler	; Set the break vector to our routine
+	ldx	#>brk_handler
 	sta	BRKVec
-	lda	#>brk_handler
-	sta	BRKVec+1
+	stx	BRKVec+1
 	rts
 
 .endproc
@@ -58,11 +58,13 @@ L1:	lda	#<brk_handler	; Set the break vector to our routine
 .proc	_reset_brk
 
 	lda  	oldvec
-	bne  	@L1
-	ldx  	oldvec
+	ldx  	oldvec+1
 	beq  	@L9		; Jump if vector not installed
-@L1:	sta    	BRKVec
+	sta    	BRKVec
 	stx  	BRKVec+1
+	lda	#$00
+	sta	oldvec		; Clear the old vector
+	stx	oldvec+1
 @L9:	rts
 
 .endproc
diff --git a/libsrc/pet/break.s b/libsrc/pet/break.s
index 2c85a49af..7d31c679d 100644
--- a/libsrc/pet/break.s
+++ b/libsrc/pet/break.s
@@ -44,9 +44,9 @@ uservec:    	jmp	$FFFF 		; Patched at runtime
  	sta	oldvec+1      	; Save the old vector
 
 L1:	lda	#<brk_handler 	; Set the break vector to our routine
+	ldx	#>brk_handler
 	sta	BRKVec
-	lda	#>brk_handler
-	sta	BRKVec+1
+	stx	BRKVec+1
 	rts
 
 .endproc
@@ -56,11 +56,13 @@ L1:	lda	#<brk_handler 	; Set the break vector to our routine
 .proc	_reset_brk
 
 	lda  	oldvec
-	bne  	@L1
-	ldx  	oldvec
+	ldx  	oldvec+1
 	beq  	@L9		; Jump if vector not installed
-@L1:	sta    	BRKVec
+	sta    	BRKVec
 	stx  	BRKVec+1
+	lda	#$00
+	sta	oldvec		; Clear the old vector
+	stx	oldvec+1
 @L9:	rts
 
 .endproc
diff --git a/libsrc/plus4/break.s b/libsrc/plus4/break.s
index d6f144977..c51cc4b07 100644
--- a/libsrc/plus4/break.s
+++ b/libsrc/plus4/break.s
@@ -44,9 +44,9 @@ uservec:    	jmp	$FFFF		; Patched at runtime
  	sta	oldvec+1	; Save the old vector
 
 L1:	lda	#<brk_handler	; Set the break vector to our routine
+	ldx	#>brk_handler
 	sta	BRKVec
-	lda	#>brk_handler
-	sta	BRKVec+1
+	stx	BRKVec+1
 	rts
 
 .endproc
@@ -56,11 +56,13 @@ L1:	lda	#<brk_handler	; Set the break vector to our routine
 .proc	_reset_brk
 
 	lda  	oldvec
-	bne  	@L1
-	ldx  	oldvec
+	ldx  	oldvec+1
 	beq  	@L9		; Jump if vector not installed
-@L1:	sta    	BRKVec
+	sta    	BRKVec
 	stx  	BRKVec+1
+	lda	#$00
+	sta	oldvec		; Clear the old vector
+	stx	oldvec+1
 @L9:	rts
 
 .endproc
-- 
2.39.5