From e0bbee443b514bc8d236a40707db649d3a06b0c4 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Mon, 2 Sep 2019 20:56:37 +0200
Subject: [PATCH] removed 'branch out of range' warnings

---
 c64/basic/basic_execute_line.s  |  5 +--
 c64/basic/cmd_load.s            |  4 ++-
 c64/basic/wedge_dos.s           | 26 ++++++++++-----
 c64/kernal/chrout_real.s        |  5 +--
 c64/kernal/f4a5.load.s          | 58 ++++++++++++++++++++-------------
 c64/kernal/iec/iec_tx_command.s |  5 +--
 c64/kernal/lvs_helpers.s        |  7 ++--
 c64/kernal/scnkey.s             |  9 +++--
 8 files changed, 76 insertions(+), 43 deletions(-)

diff --git a/c64/basic/basic_execute_line.s b/c64/basic/basic_execute_line.s
index 5ea0aafb..1ddd7b43 100644
--- a/c64/basic/basic_execute_line.s
+++ b/c64/basic/basic_execute_line.s
@@ -30,8 +30,9 @@ basic_execute_statement:
 
 	;; Check for RUN/STOP
 	lda STKEY
-	bpl basic_do_break
-	
+	bmi +
+	jmp basic_do_break
+*
 	;; Skip over any white space and :
 	ldy #0
 	ldx #<basic_current_statement_ptr
diff --git a/c64/basic/cmd_load.s b/c64/basic/cmd_load.s
index ac286c6e..bca40cf2 100644
--- a/c64/basic/cmd_load.s
+++ b/c64/basic/cmd_load.s
@@ -66,7 +66,9 @@ got_filename:
 
 	jsr basic_parse_line_number
 	lda basic_line_number+1
-	bne do_ILLEGAL_QUANTITY_error
+	beq +
+	jmp do_ILLEGAL_QUANTITY_error
+*
 	lda basic_line_number+0
 	sta current_device_number
 
diff --git a/c64/basic/wedge_dos.s b/c64/basic/wedge_dos.s
index ccfffe4d..ddef3a38 100644
--- a/c64/basic/wedge_dos.s
+++ b/c64/basic/wedge_dos.s
@@ -17,11 +17,13 @@ wedge_dos:
 	;; Check if user asked for a status
 	ldy #$00
 	lda (basic_current_statement_ptr), y
-	beq wedge_dos_status
-	
+	bne +
+	jmp wedge_dos_status ; XXX try to optimize this, perhaps move 'wedge_dos_status' above?
+*
 	;; Check if asked for a directory
 	cmp #$24
-	beq wedge_dos_directory
+	bne +
+	jmp wedge_dos_directory
 *
 	;; Check if asked to change drive number, or if it is a regular command
 	cmp #$30
@@ -42,8 +44,9 @@ wedge_dos_command:
 	
 	jsr JSETNAM
 	jsr JOPEN
-	bcs wedge_dos_basic_error
-
+	bcc +
+	jmp wedge_dos_basic_error ; XXX combine with other such jumps
+*
 	;; Retrieve status, print it if not OK
 	jsr JCLALL
 	jsr wedge_dos_status_get
@@ -83,12 +86,16 @@ wedge_dos_status_get:
 	lda #$00  ; empty file name
 	jsr JSETNAM
 	jsr JOPEN
-	bcs wedge_dos_basic_error
+	bcc +
+	jmp wedge_dos_basic_error ; XXX combine with other such jumps
+*
 
 	;; Set channel for input
 	ldx #$0F
 	jsr JCHKIN
-	bcs wedge_dos_basic_error
+	bcc +
+	jmp wedge_dos_basic_error ; XXX combine with other such jumps
+*
 	
 	ldy #$00
 *
@@ -99,7 +106,9 @@ wedge_dos_status_get:
 	;; Print out everything retrieved from the drive
 	bne +
 	jsr JCHRIN
-	bcs wedge_dos_basic_error
+	bcc wedge_dos_x1
+	jmp wedge_dos_basic_error ; XXX try to optimize this
+wedge_dos_x1:
 	sta BUF, y
 	iny
 	jmp -
@@ -129,7 +138,6 @@ wedge_dos_directory:
 
 	;; First change the secondary address to the one suitable for
 	;; directory loading
-	;; XXX
 	lda #$00 ; logical device number
 	ldx current_device_number
 	ldy #$60
diff --git a/c64/kernal/chrout_real.s b/c64/kernal/chrout_real.s
index 128a7426..d85084b0 100644
--- a/c64/kernal/chrout_real.s
+++ b/c64/kernal/chrout_real.s
@@ -448,8 +448,9 @@ screen_grow_logical_line:
 	ldy current_screen_y
 	;; Don't grow line if it is already grown
 	lda screen_line_link_table,y
-	bmi done_grow_line
-	
+	bpl +
+	jmp done_grow_line
+*
 	lda #$80
 	sta screen_line_link_table,y
 
diff --git a/c64/kernal/f4a5.load.s b/c64/kernal/f4a5.load.s
index b5290e55..0bc03517 100644
--- a/c64/kernal/f4a5.load.s
+++ b/c64/kernal/f4a5.load.s
@@ -41,8 +41,9 @@ load:
 	;; Check whether we support the requested device
 	lda current_device_number
 	and #$FC
-	beq lvs_illegal_device_number ; device number below 4, not an IEC device
-
+	bne +
+	jmp lvs_illegal_device_number ; device number below 4, not an IEC device
+*
 	;; Device numbers above 30 are also illegal (see https://www.pagetable.com/?p=1031),
 	;; as the protocol combines device number with command code int one byte,
 	;; above 30 it is no longer possible (UNLISTEN and UNTALK codes prevent using
@@ -60,41 +61,51 @@ load:
 	;; Call device to LISTEN (p16)
 	lda current_device_number
 	jsr listen
-	bcs lvs_device_not_found_error
-
+	bcc +
+	jmp lvs_device_not_found_error ; XXX deduplicate with other jumps in this routine
+*
 	;; Open channel 0 (reserved for file reading)
 	lda #$00
 	jsr iec_cmd_open
-	bcs lvs_device_not_found_error
-
+	bcc +
+	jmp lvs_device_not_found_error ; XXX deduplicate with other jumps in this routine
+*
 	;; Send file name
 	jsr lvs_send_file_name
-	bcs lvs_load_verify_error
-
+	bcc +
+	jmp lvs_load_verify_error ; XXX deduplicate with other jumps in this routine 
+*
 	;; Now command device to talk (p16)
 	lda current_device_number
 	jsr talk
-	bcs lvs_load_verify_error
-
+	bcc +
+	jmp lvs_load_verify_error ; XXX deduplicate with other jumps in this routine 
+*
 	lda #$60 ; open channel / data (p3) , required according to p13
 	sta IEC_TMP2
 	jsr iec_tx_command
-	bcs lvs_load_verify_error
-
+	bcc +
+	jmp lvs_load_verify_error ; XXX deduplicate with other jumps in this routine 
+*
 	;; We are currently talker, so do the IEC turn around so that we
 	;; are the listener (p16)
 	jsr iec_turnaround_to_listen
-	bcs lvs_load_verify_error
-
+	bcc +
+	jmp lvs_load_verify_error ; XXX deduplicate with other jumps in this routine 
+*
 	;; Get load address and store it if secondary address is zero
 	jsr iec_rx_byte
-	bcs lvs_file_not_found_error
+	bcc +
+	jmp lvs_file_not_found_error ; XXX deduplicate with other jumps in this routine
+*
 	ldx current_secondary_address
 	beq +
 	sta STAL+0
 *
 	jsr iec_rx_byte
-	bcs lvs_file_not_found_error
+	bcc +
+	jmp lvs_file_not_found_error ; XXX deduplicate with other jumps in this routine
+*
 	ldx current_secondary_address
 	beq +
 	sta STAL+1
@@ -105,16 +116,19 @@ load:
 load_loop:
 	;; We are now ready to receive bytes
 	jsr iec_rx_byte
-	bcs lvs_load_verify_error
-
+	bcc +
+	jmp lvs_load_verify_error ; XXX deduplicate with other jumps in this routine 
+*
 	;; Handle the byte (store in memory / verify)
 	jsr lvs_handle_byte_load_verify
-	bcs lvs_load_verify_error
-	
+	bcc +
+	jmp lvs_load_verify_error ; XXX deduplicate with other jumps in this routine 
+*	
 	;; Advance pointer to data
 	jsr lvs_advance_pointer
-	bcs lvs_wrap_around_error
-
+	bcc +
+	jmp lvs_wrap_around_error
+*
 	;; Check for EOI - if so, this was the last byte
 	lda IOSTATUS
 	and #K_STS_EOI
diff --git a/c64/kernal/iec/iec_tx_command.s b/c64/kernal/iec/iec_tx_command.s
index 98aeb585..2332be44 100644
--- a/c64/kernal/iec/iec_tx_command.s
+++ b/c64/kernal/iec/iec_tx_command.s
@@ -22,8 +22,9 @@ iec_tx_command:
 	;; Give devices time to respond (response is mandatory!) by pulling DATA
 	jsr iec_wait1ms
 	lda CIA2_PRA ; pulled DATA = highest bit 0 = 'plus'
-	bmi iec_return_DEVICE_NOT_FOUND
-
+	bpl +
+	jmp iec_return_DEVICE_NOT_FOUND
+*
 	;; At least one device responded, but they are still allowed to stall
 	;; (can be busy processing something), we have to wait till they are all
 	;; ready (or bored with DOS attack...)
diff --git a/c64/kernal/lvs_helpers.s b/c64/kernal/lvs_helpers.s
index 7bcbf4e9..d52c1bcf 100644
--- a/c64/kernal/lvs_helpers.s
+++ b/c64/kernal/lvs_helpers.s
@@ -51,10 +51,13 @@ lvs_handle_byte_load_verify:
 lvs_advance_pointer:
 	;; Advance pointer
 	inc STAL
-	bne lvs_success_end
+	beq + 
+	jmp lvs_success_end
+*
 	inc STAL+1
 	;; If we wrap around to $0000, then this is bad.
-	beq lvs_error_end
+	bne +
+	jmp lvs_error_end
 *
 	clc
 	rts
diff --git a/c64/kernal/scnkey.s b/c64/kernal/scnkey.s
index c1a8a28a..87e52bfc 100644
--- a/c64/kernal/scnkey.s
+++ b/c64/kernal/scnkey.s
@@ -322,8 +322,9 @@ next_row:
 
 	stx $dc00       ;// Disconnect all Keyboard Rows
 	cpx $dc01       ;// Only Control Port activity will be detected
-	bne ReturnNoKeys
-
+	beq + 
+	jmp ReturnNoKeys
+*
 	;; Make X = $00, assumed below
 	inx
 
@@ -462,7 +463,9 @@ RecordKeypress:
         ;; // New Key Detected
 	ldy BufferQuantity
 	cpy #MaxKeyRollover
-	bcs TooManyNewKeys
+	bcc +
+	jmp TooManyNewKeys
+*
 AcceptKeyEvent:	
         sta Buffer,y
 	iny