From 12a2f9ca7bf610af7b1ba7827240f7891266014e Mon Sep 17 00:00:00 2001
From: user <none>
Date: Thu, 17 Aug 2023 20:12:11 -0500
Subject: [PATCH] Fix EXT macro bug and add out-of-range test prints

These prints are ugly, but they'll print 0x01 when a branch target is
out of range, and 0x00 if a branch is fine.
---
 asm_2/tbc.inc | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/asm_2/tbc.inc b/asm_2/tbc.inc
index 7523e17..739c982 100644
--- a/asm_2/tbc.inc
+++ b/asm_2/tbc.inc
@@ -600,6 +600,7 @@
 ; ----- Group B, branches
 
 .macro T_JTAB
+	.message "Branch at ", PC, " ", (@0-(PC+1-PCERROR) < -0x80) || (@0-(PC+1-PCERROR) >= 0x80)
 	.if @0 < 0 || @0 > 0x5
 	.error "Tortoise Bytecode: invalid variable register (V0-V5 for JTAB)"
 	.endif
@@ -610,6 +611,7 @@
 .endmacro
 
 .macro T_BLT
+	.message "Branch at ", PC, " ", (@0-(PC+1-PCERROR) < -0x80) || (@0-(PC+1-PCERROR) >= 0x80)
 	;.if (@0-(PC+1-PCERROR)) < -0x80 || (@0-(PC+1-PCERROR)) >= 0x80
 	;.error "Tortoise Bytecode: branch target out of range"
 	;.endif
@@ -617,6 +619,7 @@
 .endmacro
 
 .macro T_BGE
+	.message "Branch at ", PC, " ", (@0-(PC+1-PCERROR) < -0x80) || (@0-(PC+1-PCERROR) >= 0x80)
 	;.if (@0-(PC+1-PCERROR)) < -0x80 || (@0-(PC+1-PCERROR)) >= 0x80
 	;.error "Tortoise Bytecode: branch target out of range"
 	;.endif
@@ -624,6 +627,7 @@
 .endmacro
 
 .macro T_BV
+	.message "Branch at ", PC, " ", (@0-(PC+1-PCERROR) < -0x80) || (@0-(PC+1-PCERROR) >= 0x80)
 	;.if (@0-(PC+1-PCERROR)) < -0x80 || (@0-(PC+1-PCERROR)) >= 0x80
 	;.error "Tortoise Bytecode: branch target out of range"
 	;.endif
@@ -631,6 +635,7 @@
 .endmacro
 
 .macro T_BNV
+	.message "Branch at ", PC, " ", (@0-(PC+1-PCERROR) < -0x80) || (@0-(PC+1-PCERROR) >= 0x80)
 	;.if (@0-(PC+1-PCERROR)) < -0x80 || (@0-(PC+1-PCERROR)) >= 0x80
 	;.error "Tortoise Bytecode: branch target out of range"
 	;.endif
@@ -638,6 +643,7 @@
 .endmacro
 
 .macro T_BMI
+	.message "Branch at ", PC, " ", (@0-(PC+1-PCERROR) < -0x80) || (@0-(PC+1-PCERROR) >= 0x80)
 	;.if (@0-(PC+1-PCERROR)) < -0x80 || (@0-(PC+1-PCERROR)) >= 0x80
 	;.error "Tortoise Bytecode: branch target out of range"
 	;.endif
@@ -645,6 +651,7 @@
 .endmacro
 
 .macro T_BPL
+	.message "Branch at ", PC, " ", (@0-(PC+1-PCERROR) < -0x80) || (@0-(PC+1-PCERROR) >= 0x80)
 	;.if (@0-(PC+1-PCERROR)) < -0x80 || (@0-(PC+1-PCERROR)) >= 0x80
 	;.error "Tortoise Bytecode: branch target out of range"
 	;.endif
@@ -652,6 +659,7 @@
 .endmacro
 
 .macro T_BZ
+	.message "Branch at ", PC, " ", (@0-(PC+1-PCERROR) < -0x80) || (@0-(PC+1-PCERROR) >= 0x80)
 	;.if (@0-(PC+1-PCERROR)) < -0x80 || (@0-(PC+1-PCERROR)) >= 0x80
 	;.error "Tortoise Bytecode: branch target out of range"
 	;.endif
@@ -659,6 +667,7 @@
 .endmacro
 
 .macro T_BNZ
+	.message "Branch at ", PC, " ", (@0-(PC+1-PCERROR) < -0x80) || (@0-(PC+1-PCERROR) >= 0x80)
 	;.if (@0-(PC+1-PCERROR)) < -0x80 || (@0(PC+1-PCERROR)) >= 0x80
 	;.error "Tortoise Bytecode: branch target out of range"
 	;.endif
@@ -666,6 +675,7 @@
 .endmacro
 
 .macro T_BC
+	.message "Branch at ", PC, " ", (@0-(PC+1-PCERROR) < -0x80) || (@0-(PC+1-PCERROR) >= 0x80)
 	;.if (@0-(PC+1-PCERROR)) < -0x80 || (@0-(PC+1-PCERROR)) >= 0x80
 	;.error "Tortoise Bytecode: branch target out of range"
 	;.endif
@@ -673,6 +683,7 @@
 .endmacro
 
 .macro T_BNC
+	.message "Branch at ", PC, " ", (@0-(PC+1-PCERROR) < -0x80) || (@0-(PC+1-PCERROR) >= 0x80)
 	;.if (@0-(PC+1-PCERROR)) < -0x80 || (@0-(PC+1-PCERROR)) >= 0x80
 	;.error "Tortoise Bytecode: branch target out of range"
 	;.endif
@@ -699,6 +710,7 @@
 ; ----- Miscellaneous
 
 .macro T_JAL
+	.message "Jump at ", PC, "   ", (@0-(PC+1-PCERROR) < -0x800) || (@0-(PC+1-PCERROR) >= 0x800)
 	;.if (@0-(PC+1-PCERROR)) < -0x800 || (@0-(PC+1-PCERROR)) >= 0x800
 	;.error "Tortoise Bytecode: jump target out of range"
 	;.endif
@@ -706,6 +718,7 @@
 .endmacro
 
 .macro T_JMP
+	.message "Jump at ", PC, "   ", (@0-(PC+1-PCERROR) < -0x800) || (@0-(PC+1-PCERROR) >= 0x800)
 	;.if (@0-(PC+1-PCERROR)) < -0x800 || (@0-(PC+1-PCERROR)) >= 0x800
 	;.error "Tortoise Bytecode: jump target out of range"
 	;.endif
@@ -713,10 +726,11 @@
 .endmacro
 
 .macro T_EXT
+	.message "Ext at ", PC, "    ", (@0 < 0) || (@0 > 0xfff)
 	;.if @0 < 0 || @0 > 0xfff
 	;.error "Tortoise Bytecode: EXT target out of range"
 	;.endif
-	.dw	(0xe << 12) | (HIGH(@0)&0x0f) | LOW(@0)
+	.dw	(0xe << 12) | ((HIGH(@0)&0x0f) << 8) | LOW(@0)
 .endmacro
 
 .macro T_CLR
-- 
2.43.0