use pseudocode instead of jmp/bra selection

src/basic/basic_commands/cmd_run_goto.s

@@ -49,12 +49,7 @@ cmd_goto:
 	// Else - search from the current line
 
 	jsr find_line_from_current
-
+	jmp_8 cmd_goto_check
-#if HAS_OPCODES_65C02
-	bra cmd_goto_check
-#else
-	jmp cmd_goto_check
-#endif
 
 cmd_goto_direct:
 

src/basic/basic_commands_CC/cmd_mem.s

@@ -123,11 +123,7 @@ cmd_mem_loop:
 	bcs !+
 	lda #$3F
 	jsr JCHROUT
-#if HAS_OPCODES_65C02
+	jmp_8 cmd_mem_next
-	bra cmd_mem_next
-#else
-	jmp cmd_mem_next
-#endif
 
 !:
 	jsr print_integer

src/basic/engine_editor/find_line.s

@@ -24,6 +24,8 @@ find_line_from_current:
 	// Fetch the high byte of line number and compare
 	ldy #$03
 
+	// XXX consider optimized 46K/50K version
+
 #if CONFIG_MEMORY_MODEL_60K
 	ldx #<OLDTXT+0
 	jsr peek_under_roms
@@ -67,6 +69,8 @@ find_line_next:
 	jsr peek_line_pointer_null_check
 	bcc find_line_fail                           // branch in no more lines exist
 
+	// XXX consider optimized 46K/50K version
+
 	ldy #$00
 
 #if CONFIG_MEMORY_MODEL_60K
@@ -93,11 +97,7 @@ find_line_next:
 	pla
 	sta OLDTXT+0
 
-#if HAS_OPCODES_65C02
+	jmp_8 find_line_from_current
-	bra find_line_from_current
-#else
-	jmp find_line_from_current
-#endif
 
 find_line_fail:
 

src/basic/engine_editor/tk_shorten.s

@@ -91,11 +91,7 @@ tk_shorten_3n_byte_nibble:             // tk__nibble_flag = $00, both nibbles fr
 	// Reuse 'tk_shorten_1n_hi'
 
 	sty tk__byte_offset
-#if HAS_OPCODES_65C02
+	jmp_8 tk_shorten_1n_hi
-	bra tk_shorten_1n_hi
-#else
-	jmp tk_shorten_1n_hi
-#endif
 
 tk_shorten_3n_2bytes:                  // tk__nibble_flag = $FF, only the high nibble is free
 

src/basic/engine_editor/tokenise_line.s

@@ -100,11 +100,7 @@ tokenise_line_loop:
 
 	jsr tk_shorten
 
-#if HAS_OPCODES_65C02
+	jmp_8 !-
-	bra !-
-#else
-	jmp !-
-#endif
 
 tokenise_line_keyword_V2:
 

src/basic/engine_runtime/ad9e.frmevl.s

@@ -114,11 +114,7 @@ FRMEVL_loop:
 
 #endif
 
-#if HAS_OPCODES_65C02
+	jmp_8 FRMEVL_got_value
-	bra FRMEVL_got_value
-#else
-	jmp FRMEVL_got_value
-#endif
 
 !:
 	// There is one possibility left - a floating point value

src/basic/engine_runtime/fetch_uint16.s

@@ -80,11 +80,7 @@ fetch_uint16_loop:
 
 	// Next iteration
 
-#if HAS_OPCODES_65C02
+	jmp_8 fetch_uint16_loop
-	bra fetch_uint16_loop
-#else
-	jmp fetch_uint16_loop
-#endif
 
 fetch_uint16_end:
 

src/basic/engine_variables/fetch_variable.s

@@ -67,11 +67,7 @@ fetch_variable_type_float:
 	dew TXTPTR
 #endif
 
-#if HAS_OPCODES_65C02
+	jmp_8 fetch_variable_special
-	bra fetch_variable_special
-#else
-	jmp fetch_variable_special
-#endif
 
 fetch_variable_type_integer:
 
@@ -313,8 +309,4 @@ fetch_variable_alocate_space_OK:
 
 	// Adjust variable pointer and quit
 
-#if HAS_OPCODES_65C02
+	jmp_8 fetch_variable_adjust_VARPNT
-	bra fetch_variable_adjust_VARPNT
-#else
-	jmp fetch_variable_adjust_VARPNT
-#endif

src/basic/engine_variables/tmpstr_free.s

@@ -16,11 +16,8 @@ tmpstr_free_FAC1:
 	sta DSCPNT+1
 	lda __FAC1+2
 
-#if HAS_OPCODES_65C02
+	jmp_8 !+
-	bra !+
+
-#else
-	jmp !+
-#endif
 
 tmpstr_free_FAC2:
 

src/basic/engine_variables/varstr_alloc.s

@@ -138,8 +138,4 @@ varstr_alloc_fail:
 	dec GARBFL                                   // $00 -> $FF
 	jsr varstr_garbage_collect
 
-#if HAS_OPCODES_65C02
+	jmp_8 varstr_alloc_retry
-	bra varstr_alloc_retry
-#else
-	jmp varstr_alloc_retry
-#endif

src/basic/memory/under_rom_peek_fetch_46k_50k.s

@@ -44,12 +44,7 @@ peek_under_roms_via_OLDTXT:
 	// Retrieve value from under ROMs
 
 	lda (OLDTXT), y
-
+	jmp_8 peek_under_roms_finalize
-#if HAS_OPCODES_65C02
-	bra peek_under_roms_finalize
-#else
-	jmp peek_under_roms_finalize
-#endif
 
 peek_under_roms_via_VARPNT:
 
@@ -61,12 +56,7 @@ peek_under_roms_via_VARPNT:
 	// Retrieve value from under ROMs
 
 	lda (VARPNT), y
-
+	jmp_8 peek_under_roms_finalize
-#if HAS_OPCODES_65C02
-	bra peek_under_roms_finalize
-#else
-	jmp peek_under_roms_finalize
-#endif
 
 peek_under_roms_via_FAC1_PLUS_1:
 
@@ -78,12 +68,7 @@ peek_under_roms_via_FAC1_PLUS_1:
 	// Retrieve value from under ROMs
 
 	lda (__FAC1 + 1), y
-
+	jmp_8 peek_under_roms_finalize
-#if HAS_OPCODES_65C02
-	bra peek_under_roms_finalize
-#else
-	jmp peek_under_roms_finalize
-#endif
 
 
 #if ROM_LAYOUT_M65

src/basic/memory/under_rom_shift_46k_50k.s

@@ -33,11 +33,7 @@ shift_mem_up_internal:
 	dec memmove__size+1
 	bne !-
 
-#if HAS_OPCODES_65C02
+	jmp_8 shift_mem_internal_finalize
-	bra shift_mem_internal_finalize
-#else
-	jmp shift_mem_internal_finalize
-#endif
 
 
 shift_mem_down_internal:

src/basic/print/list_single_line.s

@@ -127,11 +127,8 @@ list_display_token_CC:
 	// Now ask for it to be printed
 	jsr print_packed_keyword_CC
 
-#if HAS_OPCODES_65C02
+	jmp_8 list_token_displayed
-	bra list_token_displayed
+
-#else
-	jmp list_token_displayed
-#endif
 
 list_display_token_CD:
 
@@ -169,11 +166,7 @@ list_display_token_CD:
 	// Now ask for it to be printed
 	jsr print_packed_keyword_CD
 
-#if HAS_OPCODES_65C02
+	jmp_8 list_token_displayed
-	bra list_token_displayed
-#else
-	jmp list_token_displayed
-#endif
 
 list_display_token_V2:
 
@@ -242,11 +235,7 @@ list_is_unknown:
 	jsr STROUT
 	ply_trash_a
 
-#if HAS_OPCODES_65C02
+	jmp_8 !+
-	bra !+
-#else
-	jmp !+
-#endif
 
 list_is_literal_known:
 
@@ -263,10 +252,6 @@ list_display_unknown_token:
 	pla
 	pla
 
-#if HAS_OPCODES_65C02
+	jmp_8 list_is_unknown
-	bra list_is_unknown
-#else
-	jmp list_is_unknown
-#endif
 
 #endif // ROM layout

src/basic/print/print_packed_freq_string.s

@@ -114,7 +114,7 @@ print_freq_packed_string_nibble_hi:
 
 	tax
 	lda packed_as_1n-1, x
-	jmp !+                             // XXX should be bra on some CPUs
+	jmp_8 !+
 
 print_freq_packed_string_3n_single:
 

src/basic/wedge/wedge_dos.s

@@ -216,11 +216,7 @@ wedge_dos_status_get_done:
 wedge_dos_status:
 
 	jsr wedge_dos_status_get
-#if HAS_OPCODES_65C02
+	jmp_8 wedge_dos_status_print_no_new_line
-	bra wedge_dos_status_print_no_new_line
-#else
-	jmp wedge_dos_status_print_no_new_line
-#endif
 
 wedge_dos_status_print:
 
@@ -243,11 +239,7 @@ wedge_dos_status_print_no_new_line:
 !:
 	// Clean-up and exit
 
-#if HAS_OPCODES_65C02
+	jmp_8 wedge_dos_clean_exit
-	bra wedge_dos_clean_exit
-#else
-	jmp wedge_dos_clean_exit
-#endif
 
 wedge_dos_directory:
 

src/kernal/keyboard/scnkey.s

@@ -150,11 +150,8 @@ scnkey_bucky_loop:
 	lda KEYLOG+1
 	bne !+
 	jsr scnkey_set_keytab              // KEYLOG routine on zeropage? most likely vector not set
-#if HAS_OPCODES_65C02
+	jmp_8 scnkey_keytab_set_done
-	bra scnkey_keytab_set_done
+
-#else
-	jmp scnkey_keytab_set_done
-#endif
 !:
 #if HAS_OPCODES_65CE02
 	jsr_ind KEYLOG

src/kernal/memory/under_rom_46k_50k.s

@@ -53,11 +53,7 @@ peek_under_roms_via_FNADDR:
 
 	// Continue using common code
 
-#if HAS_OPCODES_65C02
+	jmp_8 peek_under_roms_finalize
-	bra peek_under_roms_finalize
-#else
-	jmp peek_under_roms_finalize
-#endif
 
 
 peek_under_roms_via_EAL:
@@ -75,11 +71,7 @@ peek_under_roms_via_EAL:
 
 	// Continue using common code
 
-#if HAS_OPCODES_65C02
+	jmp_8 peek_under_roms_finalize
-	bra peek_under_roms_finalize
-#else
-	jmp peek_under_roms_finalize
-#endif
 
 
 #endif