Moved opcode macros to more relevant locations

1 files changed, 52 insertions, 31 deletions

diff --git a/main.asm b/main.asm
index 9383eaf..2a65546 100644
--- a/main.asm
+++ b/main.asm
@@ -115,21 +115,6 @@ DONE	MACRO			; 8 cycles, 2 bytes
 
 	;; == Special Opcode Macros ========================================
 
-	;; Do an ADD \2,\1
-	;; XXX check this
-F_ADD_B	MACRO			; 14 bytes?
-	move.b	\1,f_tmp_src_b	; preserve operands for flag work
-	move.b	\2,f_tmp_dst_b
-	move.b	#0,flag_n
-	move.b	#1,f_tmp_byte
-	add	\1,\2
-	move	sr,f_host_ccr
-	ENDM
-
-	;; Do an ADC \2,\1
-F_ADC_B	MACRO
-	ENDM
-
 	;; Do a SUB \2,\1
 F_SUB_B	MACRO			;14 bytes?
 	move.b	\1,f_tmp_src_b	; preserve operands for flagging
@@ -140,18 +125,6 @@ F_SUB_B	MACRO			;14 bytes?
 	move	sr,f_host_ccr
 	ENDM
 
-	;; Do a SBC \2,\1
-F_SBC_B	MACRO
-	ENDM
-
-F_AND_B	MACRO
-	ENDM
-
-F_XOR_B	MACRO
-	ENDM
-
-F_OR_B	MACRO
-	ENDM
 
 	;; Do an ADD \1,\2
 F_ADD_W	MACRO
@@ -173,10 +146,6 @@ F_INC_W	MACRO
 F_DEC_W	MACRO
 	ENDM
 
-	;; COMPARE instruction
-F_CP_B	MACRO
-	ENDM
-
 	;; I might be able to unify rotation flags or maybe use a
 	;; lookup table
 
@@ -1261,6 +1230,19 @@ emu_op_7f:
 	;; LD	A,A
 	DONE
 
+
+
+	;; Do an ADD \2,\1
+	;; XXX check this
+F_ADD_B	MACRO			; 14 bytes?
+	move.b	\1,f_tmp_src_b	; preserve operands for flag work
+	move.b	\2,f_tmp_dst_b
+	move.b	#0,flag_n
+	move.b	#1,f_tmp_byte
+	add	\1,\2
+	move	sr,f_host_ccr
+	ENDM
+
 	START
 emu_op_80:
 	;; ADD	A,B
@@ -1317,6 +1299,13 @@ emu_op_87:
 	F_ADD_B	d3,d3
 	DONE
 
+
+
+	;; Do an ADC \2,\1
+F_ADC_B	MACRO
+	;; XXX
+	ENDM
+
 	START
 emu_op_88:
 	;; ADC	A,B
@@ -1435,6 +1424,14 @@ emu_op_97:
 	F_SUB_B	d3,d3
 	DONE
 
+
+
+
+	;; Do a SBC \2,\1
+F_SBC_B	MACRO
+	;; XXX
+	ENDM
+
 	START
 emu_op_98:
 	;; SBC	A,B
@@ -1491,6 +1488,14 @@ emu_op_9f:
 	F_SBC_B	d3,d3
 	DONE
 
+
+
+
+
+F_AND_B	MACRO
+	;; XXX
+	ENDM
+
 	START
 emu_op_a0:
 	;; AND	B
@@ -1547,6 +1552,14 @@ emu_op_a7:
 	F_AND_B	d3,d3
 	DONE
 
+
+
+
+
+F_XOR_B	MACRO
+	;; XXX
+	ENDM
+
 	START
 emu_op_a8:
 	;; XOR	B
@@ -1603,6 +1616,14 @@ emu_op_af:
 	F_XOR_B	d3,d3
 	DONE
 
+
+
+
+
+F_OR_B	MACRO
+	;; XXX
+	ENDM
+
 	START
 emu_op_b0:
 	;; OR	B