X-Git-Url: http://cloudbase.mooo.com/gitweb/ddt180.git/blobdiff_plain/7c2469ef03a160299cd9e664cf6b88e0db347383..25ba7c19777f6d5dad514864f40f57bbedcb3e13:/ddt180.z80

diff --git a/ddt180.z80 b/ddt180.z80
index 9fd3d82..5e17667 100644
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -2683,6 +2683,9 @@ lookup_opc:
 l1aa8h:
 	inc hl
 	ld c,(hl)
+	inc c
+	ret z
+	dec c
 	inc hl
 	ld e,(hl)
 	inc hl
@@ -2717,7 +2720,7 @@ b_1ab6_start:
 
 ; 1 byte opcodes
 ; Format: db mask, match, t_MNEMONICS-index
-;	  dw argument formating fuction
+;	  dw argument formating function
 b_1ad1_start:
 	db 0c0h,040h,o_LD	;ld r,r
 	dw p_arg_r_r
@@ -2857,17 +2860,13 @@ b_1bc9_start:
 	db 0ffh			;<end mark>
 
 b_1bf4_start:
-	db 0e7h,040h,o_IN	;in r,(c) ;r=b,c,d,e
-	dw p_arg_in_c	   	;
-	db 0f7h,060h,o_IN	;in r,(c) ;r=h,l
+	db 0ffh,070h,0ffh	;in (c)    ;
 	dw p_arg_in_c	   	;
-	db 0ffh,078h,o_IN	;in r,(c) ;r=a
+	db 0c7h,040h,o_IN	;in r,(c)  ;r=b,c,d,e,h,l,a
 	dw p_arg_in_c	   	;
-	db 0e7h,041h,o_OUT	;out (c),r ;r=b,c,d,e
+	db 0ffh,071h,0ffh	;out (c),0 ;
 	dw p_arg_out_c	   	;
-	db 0f7h,061h,o_OUT	;out (c),r ;r=h,l
-	dw p_arg_out_c	   	;
-	db 0ffh,079h,o_OUT	;out (c),r ;r=a
+	db 0c7h,041h,o_OUT	;out (c),r ;r=b,c,d,e,h,l,a
 	dw p_arg_out_c	   	;
 	db 0cfh,042h,o_SBC	;sbc hl,rr
 	dw l1dcah	   	;
@@ -2888,17 +2887,13 @@ b_1bf4_start:
 	db 0
 
 l228bh:
-	db 0e7h,000h,o_IN	;in0 r,(m) ;r=b,c,d,e
-	dw p_arg_r_m
-	db 0f7h,020h,o_IN	;in0 r,(m) ;r=h,l
+	db 0ffh,030h,0ffh	;in0 (m)
 	dw p_arg_r_m
-	db 0ffh,038h,o_IN	;in0 a,(m)
+	db 0c7h,000h,o_IN	;in0 r,(m) ;r=b,c,d,e,h,l,a
 	dw p_arg_r_m
-	db 0e7h,001h,o_OUT0	;out0 (m),r ;r=b,c,d,e
+	db 0ffh,031h,0ffh	;out0 (m),0
 	dw p_arg_m_r
-	db 0f7h,021h,o_OUT0	;out0 (m),r ;r=h,l
-	dw p_arg_m_r
-	db 0ffh,039h,o_OUT0	;out0 (m),a
+	db 0ech,001h,o_OUT0	;out0 (m),r ;r=b,c,d,e
 	dw p_arg_m_r
 	db 0ffh,064h,o_TST	;tst m
 	dw l1d09h
@@ -2906,14 +2901,13 @@ l228bh:
 	dw l1d09h
 	db 0
 
+; Prefix ED + 1 byte opcode + 2 byte address
+; Format: db mask, match, t_MNEMONICS-index
+;	  dw argument formating function
 b_1c40_start:
-	db 0efh,043h,o_LD	;ld (mn),ww	;ww=bc,de
+	db 0cfh,043h,o_LD	;ld (mn),ww	;ww=bc,de,hl,sp
 	dw p_arg_addr_ww
-	db 0ffh,073h,o_LD	;ld (mn),sp
-	dw p_arg_addr_ww
-	db 0efh,04bh,o_LD	;ld ww,(mn)	;ww=bc,de
-	dw p_arg_ww_addr
-	db 0ffh,07bh,o_LD	;ld sp,(mn)
+	db 0cfh,04bh,o_LD	;ld ww,(mn)	;ww=bc,de,hl,sp
 	dw p_arg_ww_addr
 	db 0