From 2217c8551dde4e881d8e25ac7472c7fc1f103092 Mon Sep 17 00:00:00 2001
From: Leo <erbl259-lmu@yahoo.de>
Date: Wed, 21 Mar 2012 15:56:16 +0000
Subject: [PATCH] * avr/Z80int-jmp.asm   - Bugfix: XOR A,<ixh,ixl,iyh,iyl,
 (<ix,iy>+d)>   - Bugfix: CP<i,r><d>   - LDxx, CPxx refactored   - INC/DEC
 cleaned up

git-svn-id: svn://cu.loc/avr-cpm/avrcpm/trunk@184 57430480-672e-4586-8877-bcf8adbbf3b7
---
 avr/Makefile       |   2 +-
 avr/Z80int-jmp.asm | 435 ++++++++++++++++++++++-----------------------
 2 files changed, 218 insertions(+), 219 deletions(-)

diff --git a/avr/Makefile b/avr/Makefile
index 722d6a5..664425f 100644
--- a/avr/Makefile
+++ b/avr/Makefile
@@ -129,7 +129,7 @@ tags: $(SRC) $(ASRC)
 	ctags $(SRC) $(ASRC)
 
 svnrev.inc: $(ASRC0)
-	svnrev -osvnrev.inc $^
+	@svnrev -osvnrev.inc $^
 
 # Target: clean project.
 clean:
diff --git a/avr/Z80int-jmp.asm b/avr/Z80int-jmp.asm
index 01a877f..b73de8f 100644
--- a/avr/Z80int-jmp.asm
+++ b/avr/Z80int-jmp.asm
@@ -25,7 +25,7 @@
 ;
 
 #if EM_Z80
-  #define OPC_TABSTART 0x1a00
+  #define OPC_TABSTART 0x1900
 #else
   #define OPC_TABSTART 0x1200
 #endif
@@ -200,51 +200,63 @@ int_nobreak:
 ;
 .macro	instr	
 
-  .set fetch_ = (do_@0 != do_fetch_nop)		; must call or jump to fetch phase
-  .set op_    = (do_@1 != do_op_nop)		; must call or jump to op phase
-  .set store_ = (do_@2 != do_store_nop)		; must jump to store phase
-  .set cnt_ = fetch_ + op_ + store_
+  .set fetch_ = (do_@0 != do_fetch_nop)		; must call or jump to fetch action
+  .set op_    = (do_@1 != do_op_nop)		; must call or jump to op action
+  .set store_ = (do_@2 != do_store_nop)		; must jump to store action
+  .set cnt_ = fetch_ + op_ + store_		; number of actions for this instruction
+
+  .set action_1_ = 0
+  .set action_2_ = 0
+  .set action_3_ = 0
+
+  .if cnt_ == 1
+    .if fetch_
+      .set action_1_ = do_@0
+    .elif op_
+      .set action_1_ = do_@1
+    .else
+      .set action_1_ = do_@2
+    .endif
+  .elif cnt_ == 2
+    .if fetch_
+      .set action_1_ = do_@0
+      .if op_
+        .set action_2_ = do_@1
+      .else
+        .set action_2_ = do_@2
+      .endif
+    .else
+      .set action_1_ = do_@1
+      .set action_2_ = do_@2
+    .endif
+  .elif cnt_ == 3
+    .set action_1_ = do_@0
+    .set action_2_ = do_@1
+    .set action_3_ = do_@2
+  .endif
+
   .set longdist_ = 0
   .set pc_save_ = PC
 
   .org opcjmp_table_pos_
   .set opcjmp_table_pos_ = opcjmp_table_pos_ + 1
 
+
   .if cnt_ == 0					; nothing to do (nop)
     ret						; go back to main
   .elif cnt_ == 1				; jump direct to action
-    .if fetch_					; 
-      .if (PC - do_@0) > 2047
-  	.set longdist_ = 1
-      .else
-        rjmp do_@0				; do op and return to main
-      .endif
-    .endif    
-    .if op_
-      .if (PC - do_@1) > 2047
-  	.set longdist_ = 1
-      .else
-        rjmp do_@1				; do op and return to main
-      .endif
-    .endif    
-    .if store_					; 
-      .if (PC - do_@2) > 2047
-  	.set longdist_ = 1
-      .else
-        rjmp do_@2				; do op and return to main
-      .endif
-    .endif    
+    .if (PC - action_1_) > 2047
+      .set longdist_ = 1                        ; target action out of reach for rel jump
+    .else
+        rjmp action_1_				; do op and return to main
+    .endif
   .endif
 
+
   .set done_ = 0
   .if (cnt_ > 1) || longdist_
-
-    .set labelexists_ = 0
-    .if defined (l_@0_@1_@2)
-      .set labelexists_ = 1
-    .endif
 						; two or tree actions
-    .if labelexists_				; same combination of fetch/op/store allready present?
+    .if defined (l_@0_@1_@2)
       .if (PC - l_@0_@1_@2) <= 2047
         rjmp l_@0_@1_@2				; generate a jump to action table
 	.set done_ = 1
@@ -266,7 +278,7 @@ int_nobreak:
         .endif
       .endif
 
-      .if labelexists_
+      .if defined (l_@0_@1_@2)
         rjmp todo_table_pos_
         .org todo_table_pos_
 	jmp l_@0_@1_@2
@@ -994,63 +1006,97 @@ do_op_ina:				; in a,(opl)
 ;|INC r     |**-P0-|Increment            |r=r+1                 |
 ;|INC [HL]  |**-P0-|Increment            |[HL]=[HL]+1           |
 ;
-; 
+
 do_op_inc:
+	andi	z_flags,(1<<ZFL_C)		; preserve C-flag
 	ldi	temp,1
 	add	opl,temp
-	in	temp, sreg
-	andi	z_flags,(1<<ZFL_C)		; preserve C-flag
-	ldpmx	temp2, sz53p_tab, opl
-	or	z_flags,temp2			;
-	bmov	z_flags, ZFL_H, temp, AVR_H
-	do_z80_flags_V
+#if EM_Z80
+	brpl	PC+2
+	 sbr	z_flags,(1<<ZFL_S)
+	brne	PC+2
+	 sbr	z_flags,(1<<ZFL_Z)
+	brhc	PC+2
+	 sbr	z_flags,(1<<ZFL_H)
+	brvc	PC+2
+	 sbr	z_flags,(1<<ZFL_P)
+#else /* 8080 */
+	ldpmx	temp,sz53p_tab,opl		;S,Z,P flag
+	or	z_flags,temp
+#endif
 	ret
 
 do_op_inca:
+	andi	z_flags,(1<<ZFL_C)		; preserve C-flag
 	ldi	temp,1
 	add	z_a,temp
-	in	temp, sreg
-	andi	z_flags,(1<<ZFL_C)		; preserve C-flag
-	ldpmx	temp2, sz53p_tab, z_a
-	or	z_flags,temp2			;
-	bmov	z_flags, ZFL_H, temp, AVR_H
-	do_z80_flags_V
+#if EM_Z80
+	brpl	PC+2
+	 sbr	z_flags,(1<<ZFL_S)
+	brne	PC+2
+	 sbr	z_flags,(1<<ZFL_Z)
+	brhc	PC+2
+	 sbr	z_flags,(1<<ZFL_H)
+	brvc	PC+2
+	 sbr	z_flags,(1<<ZFL_P)
+#else /* 8080 */
+	ldpmx	temp,sz53p_tab,opl		;S,Z,P flag
+	or	z_flags,temp
+#endif
 	ret
 
 ;----------------------------------------------------------------
 ;|Mnemonic  |SZHPNC|Description          |Notes                 |
 ;----------------------------------------------------------------
 ;|DEC r     |***V1-|Decrement            |s=s-1                 |
-;|INC [HL]  |***V0-|Increment            |[HL]=[HL]+1           |
-;|INC [xx+d]|***V0-|Increment            |[xx+d]=[xx+d]+1       |
+;|DEC [HL]  |***V0-|Increment            |[HL]=[HL]-1           |
+;|DEC [xx+d]|***V0-|Increment            |[xx+d]=[xx+d]-1       |
 ;|----------|SZHP C|---------- 8080 ----------------------------|
-;|DEC r     |**-P -|Increment            |r=r+1                 |
-;|DEC [HL]  |**-P -|Increment            |[HL]=[HL]+1           |
-;
+;|DEC r     |**-P -|Increment            |r=r-1                 |
+;|DEC [HL]  |**-P -|Increment            |[HL]=[HL]-1           |
 ;
+
 do_op_dec:
-	subi	opl,1
-	in    temp, sreg
 	andi	z_flags,(1<<ZFL_C)		; preserve C-flag
-	ldpmx	temp2, sz53p_tab, opl
-	or	z_flags,temp2		;
-	bmov	z_flags, ZFL_H, temp, AVR_H
-	do_z80_flags_V
-	do_z80_flags_set_N
+	subi	opl,1
+#if EM_Z80
+	brpl	PC+2
+	 sbr	z_flags,(1<<ZFL_S)
+	brne	PC+2
+	 sbr	z_flags,(1<<ZFL_Z)
+	brhc	PC+2
+	 sbr	z_flags,(1<<ZFL_H)
+	brvc	PC+2
+	 sbr	z_flags,(1<<ZFL_P)
+	ori	z_flags,(1<<ZFL_N)		; Set N-flag
+#else /* 8080 */
+	ldpmx	temp,sz53p_tab,opl		; S,Z,P flag
+	or	z_flags,temp
+#endif
 	ret
 
+
 do_op_deca:
-	ldi	opl,1
-	sub	z_a,opl
-	in    temp, sreg
 	andi	z_flags,(1<<ZFL_C)		; preserve C-flag
-	ldpmx	temp2, sz53p_tab, z_a
-	or	z_flags,temp2		;
-	bmov	z_flags, ZFL_H, temp, AVR_H
-	do_z80_flags_V
-	do_z80_flags_set_N
+	ldi	temp,1
+#if EM_Z80
+	sub	z_a,temp
+	brpl	PC+2
+	 sbr	z_flags,(1<<ZFL_S)
+	brne	PC+2
+	 sbr	z_flags,(1<<ZFL_Z)
+	brhc	PC+2
+	 sbr	z_flags,(1<<ZFL_H)
+	brvc	PC+2
+	 sbr	z_flags,(1<<ZFL_P)
+	ori	z_flags,(1<<ZFL_N)		; Set N-flag
+#else /* 8080 */
+	ldpmx	temp,sz53p_tab,opl		; S,Z,P flag
+	or	z_flags,temp
+#endif
 	ret
 
+
 ;----------------------------------------------------------------
 ;|Mnemonic  |SZHPNC|Description          |Notes                 |
 ;----------------------------------------------------------------
@@ -2630,101 +2676,56 @@ opadx_e:
 ;|LDIR      |--000-|Load, Inc., Repeat   |LDI till BC=0         |
 ;
 
-do_op_LDD:
-	ldd	oph,y+oz_b		;B
-	ldd	opl,y+oz_c		;C
-	ldd	xh,y+oz_d		;D
-	ldd	xl,y+oz_e		;E
+op_LDxx_common:
 	ldd	zh,y+oz_h		;H
 	ldd	zl,y+oz_l		;L
-	mem_read_ds temp, z
-	sbiw	z,1
-	mem_write_ds x, temp
-	sbiw	x,1
-	cbr	z_flags,(1<<ZFL_H) | (1<<ZFL_P) | (1<<ZFL_N)
-	subi	opl,1
-	sbci	oph,0
-	breq	PC+2
-	 sbr	z_flags,(1<<ZFL_P)
-	std	y+oz_l,zl		;L
-	std	y+oz_h,zh		;H
-	std	y+oz_e,xl		;E
-	std	y+oz_d,xh		;D
-	std	y+oz_c,opl		;C
-	std	y+oz_b,oph		;B
-	ret
-
-
-do_op_LDDR:
-	ldd	oph,y+oz_b		;B
-	ldd	opl,y+oz_c		;C
 	ldd	xh,y+oz_d		;D
 	ldd	xl,y+oz_e		;E
-	ldd	zh,y+oz_h		;H
-	ldd	zl,y+oz_l		;L
-oplddr_l:
-	mem_read_ds temp, z
-	sbiw	z,1
-	mem_write_ds x, temp
-	sbiw	x,1
-	subi	opl,1
-	sbci	oph,0
-	brne	oplddr_l
-	std	y+oz_l,zl		;L
-	std	y+oz_h,zh		;H
-	std	y+oz_e,xl		;E
-	std	y+oz_d,xh		;D
-	std	y+oz_c,opl		;C
-	std	y+oz_b,oph		;B
-	cbr	z_flags,(1<<ZFL_H) | (1<<ZFL_P) | (1<<ZFL_N)
-	ret
-
-do_op_LDI:
 	ldd	oph,y+oz_b		;B
 	ldd	opl,y+oz_c		;C
-	ldd	xh,y+oz_d		;D
-	ldd	xl,y+oz_e		;E
-	ldd	zh,y+oz_h		;H
-	ldd	zl,y+oz_l		;L
 	mem_read_ds temp, z
-	adiw	z,1
 	mem_write_ds x, temp
-	adiw	x,1
 	cbr	z_flags,(1<<ZFL_H) | (1<<ZFL_P) | (1<<ZFL_N)
 	subi	opl,1
 	sbci	oph,0
 	breq	PC+2
 	 sbr	z_flags,(1<<ZFL_P)
-	std	y+oz_l,zl		;L
-	std	y+oz_h,zh		;H
-	std	y+oz_e,xl		;E
-	std	y+oz_d,xh		;D
 	std	y+oz_c,opl		;C
 	std	y+oz_b,oph		;B
 	ret
 
-do_op_LDIR:
-	ldd	oph,y+oz_b		;B
-	ldd	opl,y+oz_c		;C
-	ldd	xh,y+oz_d		;D
-	ldd	xl,y+oz_e		;E
-	ldd	zh,y+oz_h		;H
-	ldd	zl,y+oz_l		;L
-opldir_l:
-	mem_read_ds temp, z
+do_op_LDI:
+	rcall	op_LDxx_common
 	adiw	z,1
-	mem_write_ds x, temp
 	adiw	x,1
-	subi	opl,1
-	sbci	oph,0
-	brne	opldir_l
+	std	y+oz_e,xl		;E
+	std	y+oz_d,xh		;D
 	std	y+oz_l,zl		;L
 	std	y+oz_h,zh		;H
+	ret
+
+do_op_LDD:
+	rcall	op_LDxx_common
+	sbiw	z,1
+	sbiw	x,1
 	std	y+oz_e,xl		;E
 	std	y+oz_d,xh		;D
-	std	y+oz_c,opl		;C
-	std	y+oz_b,oph		;B
-	cbr	z_flags,(1<<ZFL_H) | (1<<ZFL_P) | (1<<ZFL_N)
+	std	y+oz_l,zl		;L
+	std	y+oz_h,zh		;H
+	ret
+
+do_op_LDIR:
+	rcall	do_op_LDI
+	sbrs	z_flags,ZFL_P
+	 ret
+	sbiw	z_pcl,2
+	ret
+
+do_op_LDDR:
+	rcall	do_op_LDD
+	sbrs	z_flags,ZFL_P
+	 ret
+	sbiw	z_pcl,2
 	ret
 
 ;----------------------------------------------------------------
@@ -2736,46 +2737,44 @@ opldir_l:
 ;|CPIR      |****1-|Compare, Inc., Repeat|CPI till A=[HL]or BC=0|
 
 
-do_op_CPI:
-	ldd	xh,y+oz_h		;H
-	ldd	xl,y+oz_l		;L
-	ldd	zh,y+oz_b		;B
-	ldd	zl,y+oz_c		;C
-	push	zh
-	push	zl
-	mem_read_ds opl, x
-	lcall	do_op_cpfa
-	pop	zl
-	pop	zh
-	adiw	x,1
-	sbiw	z,1
+op_CPxx_common:
+	ldd	xh,y+oz_h		; H
+	ldd	xl,y+oz_l		; L
+	ldd	zh,y+oz_b		; B
+	ldd	zl,y+oz_c		; C
+
+	cbr	z_flags,(1<<ZFL_S)|(1<<ZFL_Z)|(1<<ZFL_H)|(1<<ZFL_P)
+	sbr	z_flags,(1<<ZFL_N)
+	mem_read			; temp = (HL)
+	mov	temp2,z_a
+	sub	temp2,temp		; A - (HL)
+	brpl	PC+2
+	 sbr	z_flags,(1<<ZFL_S)
+	brne	PC+2
+	 sbr	z_flags,(1<<ZFL_Z)
+	brhc	PC+2
+	 sbr	z_flags,(1<<ZFL_H)
+
+	sbiw	z,1			; BC--
 	breq	PC+2
 	 sbr	z_flags,(1<<ZFL_P)
-	std	y+oz_c,zl		;C
-	std	y+oz_b,zh		;B
-	std	y+oz_l,xl		;L
-	std	y+oz_h,xh		;H
+	std	y+oz_c,zl		; C
+	std	y+oz_b,zh		; B
+	ret
+
+do_op_CPI:
+	rcall	op_CPxx_common
+	adiw	x,1			; HL++
+	std	y+oz_l,xl		; L
+	std	y+oz_h,xh		; H
 	ret
 
+
 do_op_CPD:
-	ldd	xh,y+oz_h		;H
-	ldd	xl,y+oz_l		;L
-	ldd	zh,y+oz_b		;B
-	ldd	zl,y+oz_c		;C
-	push	zh
-	push	zl
-	mem_read_ds opl, x
-	lcall	do_op_cpfa
-	pop	zl
-	pop	zh
-	sbiw	x,1
-	sbiw	z,1
-	breq	PC+2
-	 sbr	z_flags,(1<<ZFL_P)
-	std	y+oz_c,zl		;C
-	std	y+oz_b,zh		;B
-	std	y+oz_l,xl		;L
-	std	y+oz_h,xh		;H
+	rcall	op_CPxx_common
+	sbiw	x,1			; HL--
+	std	y+oz_l,xl		; L
+	std	y+oz_h,xh		; H
 	ret
 
 do_op_CPIR:
@@ -3337,17 +3336,17 @@ instr 	fetch_nop,	op_nop,		store_nop	;20		;
 instr 	fetch_DIR16,	op_nop,		store_xx	;21		;LD xx,nn
 instr 	fetch_DIR16,	op_STxx,	store_nop	;22		;LD (nn),xx
 instr 	fetch_xx,	op_INC16,	store_xx	;23		;INC xx
-instr 	fetch_xh,	op_INC,		store_xh	;24		;INC xh
-instr 	fetch_xh,	op_DEC,		store_xh	;25		;DEC xh
-instr 	fetch_DIR8,	op_nop,		store_xh	;26		;LD xh,n
+instr 	fetch_xH,	op_INC,		store_xH	;24		;INC xh
+instr 	fetch_xH,	op_DEC,		store_xH	;25		;DEC xh
+instr 	fetch_DIR8,	op_nop,		store_xH	;26		;LD xh,n
 instr 	fetch_nop,	op_nop,		store_nop	;27		;
 instr 	fetch_nop,	op_nop,		store_nop	;28		;
 instr 	fetch_xx,	op_ADDxx,	store_nop	;29		;ADD xx,xx
 instr 	fetch_DIR16,	op_RMEM16,	store_xx	;2A		;LD xx,(nn)
 instr 	fetch_xx,	op_DEC16,	store_xx	;2B		;DEC xx
-instr 	fetch_xl,	op_INC,		store_xl	;2C		;INC xl
-instr 	fetch_xl,	op_DEC,		store_xl	;2D		;DEC xl
-instr 	fetch_DIR8,	op_nop,		store_xl	;2E		;LD xl,n
+instr 	fetch_xL,	op_INC,		store_xL	;2C		;INC xl
+instr 	fetch_xL,	op_DEC,		store_xL	;2D		;DEC xl
+instr 	fetch_DIR8,	op_nop,		store_xL	;2E		;LD xl,n
 instr 	fetch_nop,	op_nop,		store_nop	;2F		;
 instr 	fetch_nop,	op_nop,		store_nop	;30		;
 instr 	fetch_nop,	op_nop,		store_nop	;31		;
@@ -3369,50 +3368,50 @@ instr 	fetch_nop,	op_nop,		store_nop	;40		;
 instr 	fetch_nop,	op_nop,		store_nop	;41		;
 instr 	fetch_nop,	op_nop,		store_nop	;42		;
 instr 	fetch_nop,	op_nop,		store_nop	;43		;
-instr 	fetch_xh,	op_nop,		store_B		;44		;LD B,xh
-instr 	fetch_xl,	op_nop,		store_B		;45		;LD B,xl
+instr 	fetch_xH,	op_nop,		store_B		;44		;LD B,xh
+instr 	fetch_xL,	op_nop,		store_B		;45		;LD B,xl
 instr 	fetch_MXX,	op_nop,		store_B		;46		;LD B,(xx+d)
 instr 	fetch_nop,	op_nop,		store_nop	;47		;
 instr 	fetch_nop,	op_nop,		store_nop	;48		;
 instr 	fetch_nop,	op_nop,		store_nop	;49		;
 instr 	fetch_nop,	op_nop,		store_nop	;4A		;
 instr 	fetch_nop,	op_nop,		store_nop	;4B		;
-instr 	fetch_xh,	op_nop,		store_C		;4C		;LD C,xh
-instr 	fetch_xl,	op_nop,		store_C		;4D		;LD C,xl
+instr 	fetch_xH,	op_nop,		store_C		;4C		;LD C,xh
+instr 	fetch_xL,	op_nop,		store_C		;4D		;LD C,xl
 instr 	fetch_MXX,	op_nop,		store_C		;4E		;LD C,(xx+d)
 instr 	fetch_nop,	op_nop,		store_nop	;4F		;
 instr 	fetch_nop,	op_nop,		store_nop	;50		;
 instr 	fetch_nop,	op_nop,		store_nop	;51		;
 instr 	fetch_nop,	op_nop,		store_nop	;52		;
 instr 	fetch_nop,	op_nop,		store_nop	;53		;
-instr 	fetch_xh,	op_nop,		store_D		;54		;LD D,xh
-instr 	fetch_xl,	op_nop,		store_D		;55		;LD D,xl
+instr 	fetch_xH,	op_nop,		store_D		;54		;LD D,xh
+instr 	fetch_xL,	op_nop,		store_D		;55		;LD D,xl
 instr 	fetch_MXX,	op_nop,		store_D		;56		;LD D,(xx+d)
 instr 	fetch_nop,	op_nop,		store_nop	;57		;
 instr 	fetch_nop,	op_nop,		store_nop	;58		;
 instr 	fetch_nop,	op_nop,		store_nop	;59		;
 instr 	fetch_nop,	op_nop,		store_nop	;5A		;
 instr 	fetch_nop,	op_nop,		store_nop	;5B		;
-instr 	fetch_xh,	op_nop,		store_E		;5C		;LD E,xh
-instr 	fetch_xl,	op_nop,		store_E		;5D		;LD E,xl
+instr 	fetch_xH,	op_nop,		store_E		;5C		;LD E,xh
+instr 	fetch_xL,	op_nop,		store_E		;5D		;LD E,xl
 instr 	fetch_MXX,	op_nop,		store_E		;5E		;LD E,(xx+d)
 instr 	fetch_nop,	op_nop,		store_nop	;5F		;
-instr 	fetch_B,	op_nop,		store_xh	;60		;LD xh,B
-instr 	fetch_C,	op_nop,		store_xh	;61		;LD xh,C
-instr 	fetch_D,	op_nop,		store_xh	;62		;LD xh,D
-instr 	fetch_E,	op_nop,		store_xh	;63		;LD xh,E
+instr 	fetch_B,	op_nop,		store_xH	;60		;LD xh,B
+instr 	fetch_C,	op_nop,		store_xH	;61		;LD xh,C
+instr 	fetch_D,	op_nop,		store_xH	;62		;LD xh,D
+instr 	fetch_E,	op_nop,		store_xH	;63		;LD xh,E
 instr 	fetch_nop,	op_nop,		store_nop	;64		;LD xh,xh
-instr 	fetch_xl,	op_nop,		store_xh	;65		;LD xh,xl
+instr 	fetch_xL,	op_nop,		store_xH	;65		;LD xh,xl
 instr 	fetch_MXX,	op_nop,		store_H		;66		;LD H,(xx+d)
-instr 	fetch_A,	op_nop,		store_xh	;67		;LD xh,A
-instr 	fetch_B,	op_nop,		store_xl	;68		;LD xl,B
-instr 	fetch_C,	op_nop,		store_xl	;69		;LD xl,C
-instr 	fetch_D,	op_nop,		store_xl	;6A		;LD xl,D
-instr 	fetch_E,	op_nop,		store_xl	;6B		;LD xl,E
-instr 	fetch_xh,	op_nop,		store_xl	;6C		;LD xl,xh
+instr 	fetch_A,	op_nop,		store_xH	;67		;LD xh,A
+instr 	fetch_B,	op_nop,		store_xL	;68		;LD xl,B
+instr 	fetch_C,	op_nop,		store_xL	;69		;LD xl,C
+instr 	fetch_D,	op_nop,		store_xL	;6A		;LD xl,D
+instr 	fetch_E,	op_nop,		store_xL	;6B		;LD xl,E
+instr 	fetch_xH,	op_nop,		store_xL	;6C		;LD xl,xh
 instr 	fetch_nop,	op_nop,		store_nop	;6D		;LD xl,xl
 instr 	fetch_MXX,	op_nop,		store_L		;6E		;LD L,(xx+d)
-instr 	fetch_A,	op_nop,		store_xl	;6F		;LD xl,A
+instr 	fetch_A,	op_nop,		store_xL	;6F		;LD xl,A
 instr 	fetch_B,	op_nop,		store_MXX	;70		;LD (xx+d),B
 instr 	fetch_C,	op_nop,		store_MXX	;71		;LD (xx+d),C
 instr 	fetch_D,	op_nop,		store_MXX	;72		;LD (xx+d),D
@@ -3425,72 +3424,72 @@ instr 	fetch_nop,	op_nop,		store_nop	;78		;
 instr 	fetch_nop,	op_nop,		store_nop	;79		;
 instr 	fetch_nop,	op_nop,		store_nop	;7A		;
 instr 	fetch_nop,	op_nop,		store_nop	;7B		;
-instr 	fetch_xh,	op_nop,		store_A		;7C		;LD A,xh
-instr 	fetch_xl,	op_nop,		store_A		;7D		;LD A,xl
+instr 	fetch_xH,	op_nop,		store_A		;7C		;LD A,xh
+instr 	fetch_xL,	op_nop,		store_A		;7D		;LD A,xl
 instr 	fetch_MXX,	op_nop,		store_A		;7E		;LD A,(xx+d)
 instr 	fetch_nop,	op_nop,		store_nop	;7F		;
 instr 	fetch_nop,	op_nop,		store_nop	;80		;
 instr 	fetch_nop,	op_nop,		store_nop	;81		;
 instr 	fetch_nop,	op_nop,		store_nop	;82		;
 instr 	fetch_nop,	op_nop,		store_nop	;83		;
-instr 	fetch_xh,	op_ADDA,	store_nop	;84		;ADD A,xh
-instr 	fetch_xl,	op_ADDA,	store_nop	;85		;ADD A,xl
+instr 	fetch_xH,	op_ADDA,	store_nop	;84		;ADD A,xh
+instr 	fetch_xL,	op_ADDA,	store_nop	;85		;ADD A,xl
 instr 	fetch_MXX,	op_ADDA,	store_nop	;86		;ADD A,(xx)
 instr 	fetch_nop,	op_nop,		store_nop	;87		;
 instr 	fetch_nop,	op_nop,		store_nop	;88		;
 instr 	fetch_nop,	op_nop,		store_nop	;89		;
 instr 	fetch_nop,	op_nop,		store_nop	;8A		;
 instr 	fetch_nop,	op_nop,		store_nop	;8B		;
-instr 	fetch_xh,	op_ADCA,	store_nop	;8C		;ADC A,xh
-instr 	fetch_xl,	op_ADCA,	store_nop	;8D		;ADC A,xl
+instr 	fetch_xH,	op_ADCA,	store_nop	;8C		;ADC A,xh
+instr 	fetch_xL,	op_ADCA,	store_nop	;8D		;ADC A,xl
 instr 	fetch_MXX,	op_ADCA,	store_nop	;8E		;ADC A,(xx)
 instr 	fetch_nop,	op_nop,		store_nop	;8F		;
 instr 	fetch_nop,	op_nop,		store_nop	;90		;
 instr 	fetch_nop,	op_nop,		store_nop	;91		;
 instr 	fetch_nop,	op_nop,		store_nop	;92		;
 instr 	fetch_nop,	op_nop,		store_nop	;93		;
-instr 	fetch_xh,	op_SUBFA,	store_nop	;94		;SUB A,xh
-instr 	fetch_xl,	op_SUBFA,	store_nop	;95		;SUB A,xl
+instr 	fetch_xH,	op_SUBFA,	store_nop	;94		;SUB A,xh
+instr 	fetch_xL,	op_SUBFA,	store_nop	;95		;SUB A,xl
 instr 	fetch_MXX,	op_SUBFA,	store_nop	;96		;SUB A,(xx)
 instr 	fetch_nop,	op_nop,		store_nop	;97		;
 instr 	fetch_nop,	op_nop,		store_nop	;98		;
 instr 	fetch_nop,	op_nop,		store_nop	;99		;
 instr 	fetch_nop,	op_nop,		store_nop	;9A		;
 instr 	fetch_nop,	op_nop,		store_nop	;9B		;
-instr 	fetch_xh,	op_SBCFA,	store_nop	;9C		;SBC A,xh
-instr 	fetch_xl,	op_SBCFA,	store_nop	;9D		;SBC A,xl
+instr 	fetch_xH,	op_SBCFA,	store_nop	;9C		;SBC A,xh
+instr 	fetch_xL,	op_SBCFA,	store_nop	;9D		;SBC A,xl
 instr 	fetch_MXX,	op_SBCFA,	store_nop	;9E		;SBC A,(xx)
 instr 	fetch_nop,	op_nop,		store_nop	;9F		;
 instr 	fetch_nop,	op_nop,		store_nop	;A0		;
 instr 	fetch_nop,	op_nop,		store_nop	;A1		;
 instr 	fetch_nop,	op_nop,		store_nop	;A2		;
 instr 	fetch_nop,	op_nop,		store_nop	;A3		;
-instr 	fetch_xh,	op_ANDA,	store_nop	;A4		;AND A,xh
-instr 	fetch_xl,	op_ANDA,	store_nop	;A5		;AND A,xl
+instr 	fetch_xH,	op_ANDA,	store_nop	;A4		;AND A,xh
+instr 	fetch_xL,	op_ANDA,	store_nop	;A5		;AND A,xl
 instr 	fetch_MXX,	op_ANDA,	store_nop	;A6		;AND A,(xx)
 instr 	fetch_nop,	op_nop,		store_nop	;A7		;
 instr 	fetch_nop,	op_nop,		store_nop	;A8		;
 instr 	fetch_nop,	op_nop,		store_nop	;A9		;
 instr 	fetch_nop,	op_nop,		store_nop	;AA		;
 instr 	fetch_nop,	op_nop,		store_nop	;AB		;
-instr 	fetch_xh,	op_ANDA,	store_nop	;AC		;XOR A,xh
-instr 	fetch_xl,	op_ANDA,	store_nop	;AD		;XOR A,xl
-instr 	fetch_MXX,	op_ANDA,	store_nop	;AE		;XOR A,(xx)
+instr 	fetch_xH,	op_XORA,	store_nop	;AC		;XOR A,xh
+instr 	fetch_xL,	op_XORA,	store_nop	;AD		;XOR A,xl
+instr 	fetch_MXX,	op_XORA,	store_nop	;AE		;XOR A,(xx)
 instr 	fetch_nop,	op_nop,		store_nop	;AF		;
 instr 	fetch_nop,	op_nop,		store_nop	;B0		;
 instr 	fetch_nop,	op_nop,		store_nop	;B1		;
 instr 	fetch_nop,	op_nop,		store_nop	;B2		;
 instr 	fetch_nop,	op_nop,		store_nop	;B3		;
-instr 	fetch_xh,	op_ORA,		store_nop	;B4		;OR A,xh
-instr 	fetch_xl,	op_ORA,		store_nop	;B5		;OR A,xl
+instr 	fetch_xH,	op_ORA,		store_nop	;B4		;OR A,xh
+instr 	fetch_xL,	op_ORA,		store_nop	;B5		;OR A,xl
 instr 	fetch_MXX,	op_ORA,		store_nop	;B6		;OR A,(xx)
 instr 	fetch_nop,	op_nop,		store_nop	;B7		;
 instr 	fetch_nop,	op_nop,		store_nop	;B8		;
 instr 	fetch_nop,	op_nop,		store_nop	;B9		;
 instr 	fetch_nop,	op_nop,		store_nop	;BA		;
 instr 	fetch_nop,	op_nop,		store_nop	;BB		;
-instr 	fetch_xh,	op_CPFA,	store_nop	;BC		;CP A,xh
-instr 	fetch_xl,	op_CPFA,	store_nop	;BD		;CP A,xl
+instr 	fetch_xH,	op_CPFA,	store_nop	;BC		;CP A,xh
+instr 	fetch_xL,	op_CPFA,	store_nop	;BD		;CP A,xl
 instr 	fetch_MXX,	op_CPFA,	store_nop	;BE		;CP A,(xx)
 instr 	fetch_nop,	op_nop,		store_nop	;BF		;
 instr 	fetch_nop,	op_nop,		store_nop	;C0		;
-- 
2.39.2