Disassembler: rename 'print arg' routines

1 files changed, 64 insertions, 51 deletions

diff --git a/ddt180.z80 b/ddt180.z80
index e8fa484..bef7e5f 100644
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -2710,25 +2710,25 @@ b_1ad1_start:
 	db 0f8h,088h,o_ADC	;adc a,r[z]

 	dw p_arg_a_r

 	db 0f8h,090h,o_SUB	;sub r[z]

-	dw p_arg_rs

+	dw p_rz

 	db 0f8h,098h,o_SBC	;sbc a,r[z]

 	dw p_arg_a_r

 	db 0f8h,0a0h,o_AND	;and r[z]

-	dw p_arg_rs

+	dw p_rz

 	db 0f8h,0a8h,o_XOR	;xor r[z]

-	dw p_arg_rs

+	dw p_rz

 	db 0f8h,0b0h,o_OR	;or r[z]

-	dw p_arg_rs

+	dw p_rz

 	db 0f8h,0b8h,o_CP	;cp r[z]

-	dw p_arg_rs

+	dw p_rz

 	db 0c7h,0c0h,o_RET	;ret cc

-	dw p_arg_cc

+	dw p_cc

 	db 0c7h,0c7h,o_RST	;rst

 	dw p_arg_rst

 	db 0cfh,0c1h,o_POP	;pop rr

-	dw p_arg_zz

+	dw p_rp2

 	db 0cfh,0c5h,o_PUSH	;push rr

-	dw p_arg_zz

+	dw p_rp2

 	db 0ffh,0e3h,o_EX	;ex (sp),hl

 	dw l1ca0h

 	db 0ffh,0e9h,o_JP	;jp (hl)

@@ -2738,13 +2738,13 @@ b_1ad1_start:
 	db 0ffh,0f9h,o_LD	;ld sp,hl

 	dw l1cc1h

 	db 0cfh,003h,o_INC	;inc rr

-	dw p_arg_ww

+	dw p_rp

 	db 0cfh,00bh,o_DEC	;dec rr

-	dw p_arg_ww

+	dw p_rp

 	db 0c7h,004h,o_INC	;inc r

-	dw p_arg_r

+	dw p_ry

 	db 0c7h,005h,o_DEC	;dec r

-	dw p_arg_r

+	dw p_ry

 	db 0ffh,008h,o_EX	;ex af,af'

 	dw p_arg_ex_afaf

 	db 0cfh,009h,o_ADD	;add hl,rr

@@ -2862,9 +2862,9 @@ b_1bf4_start:
 	db 0e7h,047h,o_LD	;ld i,a ... ld a,r

 	dw p_arg_IR	   	;

 	db 0cfh,04ch,o_MLT	;mlt rr

-	dw p_arg_ww

+	dw p_rp

 	db 0c7h,004h,o_TST	;tst r

-	dw p_arg_r

+	dw p_ry

 	db 0

 

 l228bh:

@@ -2895,19 +2895,19 @@ b_1c40_start:
 ; CB

 b_1c55_start:

 	db 0f8h,000h,o_RLC	;rlc g

-	dw l1e03h

+	dw p_rz_cb

 	db 0f8h,008h,o_RRC	;rrc g

-	dw l1e03h

+	dw p_rz_cb

 	db 0f8h,010h,o_RL	;rl g

-	dw l1e03h

+	dw p_rz_cb

 	db 0f8h,018h,o_RR	;rr g

-	dw l1e03h

+	dw p_rz_cb

 	db 0f8h,020h,o_SLA	;sla g

-	dw l1e03h

+	dw p_rz_cb

 	db 0f8h,028h,o_SRA	;sra g

-	dw l1e03h

+	dw p_rz_cb

 	db 0f8h,038h,o_SRL	;srl g

-	dw l1e03h

+	dw p_rz_cb

 	db 0c0h,040h,o_BIT	;bit b,g

 	dw p_arg_bitop

 	db 0c0h,080h,o_RES	;res b,g

@@ -2919,22 +2919,22 @@ b_1c55_start:
 ;-------------------------------------------------------------------------------

 

 p_arg_ry_rz:

-	call p_arg_r

+	call p_ry

 	call p_char_comma

-	jp p_arg_rs

+	jp p_rz

 p_arg_a_r:

 	call p_A_comma

-	jp p_arg_rs

+	jp p_rz

 

 p_arg_r_m:

-	call p_arg_r

+	call p_ry

 	call p_char_comma

 	jp sub_1d2ch

 

 p_arg_m_r:

 	call sub_1d2ch

 	call p_char_comma

-	jp p_arg_r

+	jp p_ry

 

 p_arg_rst:

 	ld a,(iy+000h)

@@ -2970,7 +2970,7 @@ p_arg_ex_afaf:
 l1cd3h:

 	call p_arg_hlixiy

 	call p_char_comma

-	jp p_arg_ww

+	jp p_rp

 l1cdch:

 	call sub_1ce8h

 	call p_char_comma

@@ -2980,14 +2980,14 @@ l1ce5h:
 	call p_A_comma

 sub_1ce8h:

 	call p_char_lparen

-	call p_arg_ww

+	call p_rp

 	jr out_rparen

 

 l1cf5h:

 	call p_A_comma

 	jr l1d09h

 l1cfah:

-	call p_arg_r

+	call p_ry

 	call p_char_comma

 	ld a,(isprefix_ixiy)

 	and a

@@ -3040,7 +3040,7 @@ l1d4eh:
 	jp out_hl

 

 p_arg_ww_mn:

-	call p_arg_ww

+	call p_rp

 	call p_char_comma

 	jr p_arg_mn

 

@@ -3101,7 +3101,7 @@ t_arg_IR:
 	db	0

 

 p_arg_in_c:

-	call p_arg_r

+	call p_ry

 	call p_char_comma

 	ld hl,t__C_

 	jp pstr

@@ -3110,20 +3110,20 @@ p_arg_out_c:
 	ld hl,t__C_

 	call pstr

 	call p_char_comma

-	jr p_arg_r

+	jr p_ry

 

 l1dcah:

 	call p_arg_hlixiy

 	call p_char_comma

-	jp p_arg_ww

+	jp p_rp

 

 p_arg_addr_ww:

 	call p_arg_addr

 	call p_char_comma

-	jp p_arg_ww

+	jp p_rp

 

 p_arg_ww_addr:

-	call p_arg_ww

+	call p_rp

 	call p_char_comma

 	jr p_arg_addr

 

@@ -3153,9 +3153,9 @@ l1df2h:
 	call outchar

 	call p_char_comma

 	pop af

-	jr p_arg_r0

+	jr p_r0

 

-l1e03h:

+p_rz_cb:

 	ld a,(isprefix_ixiy)

 	and a

 	jr nz,l1e0eh

@@ -3164,21 +3164,21 @@ l1e03h:
 l1e0eh:

 	ld a,(iy+002h)

 l1e11h:

-	jr p_arg_r0

+	jr p_r0

 

-p_arg_r:

+p_ry:

 	ld a,(iy+000h)

 	rra

 	rra

 	rra

-	jr p_arg_r0

-p_arg_rs:

+	jr p_r0

+p_rz:

 	ld a,(iy+000h)

-p_arg_r0:

+p_r0:

 	and 007h

 	cp 006h

 	ld b,a

-	ld hl,t_BCDEHLMA

+	ld hl,t_arg_r

 	jr nz,p_arg0

 	ld a,(isprefix_ixiy)

 	and a

@@ -3209,11 +3209,13 @@ p_arg_hlixiy:
 	ld hl,t_HL.IX.IY

 	jr p_arg

 

+p_rp2:

 p_arg_zz:

-	ld hl,t_BC.DE.HL.AF

+	ld hl,t_arg_rp2

 	jr l1e8eh

+p_rp:

 p_arg_ww:

-	ld hl,t_BC.DE.HL.SP

+	ld hl,t_arg_rp

 l1e8eh:

 	ld a,(iy+000h)

 	rra

@@ -3225,6 +3227,7 @@ l1e8eh:
 	jr z,p_arg_hlixiy

 	jr p_arg

 

+p_cc:

 p_arg_cc:

 	ld a,(iy+000h)

 p_arg_cc0:

@@ -3232,12 +3235,14 @@ p_arg_cc0:
 	rra

 	rra

 	and 007h

-	ld hl,t_tstfl_ZCPS

+	ld hl,t_arg_cc

 p_arg:

 	ld b,a

 p_arg0:

 	jp pstr_sel

 

+;-------------------------------------------------------------------------------

+

 if 0

 p_bli:

 	ld a,(iy+000h)

@@ -3370,7 +3375,7 @@ t_mn_bli:
 

 	DB	0

 

-t_BCDEHLMA:

+t_arg_r:

 	DC	'B'

 	DC	'C'

 	DC	'D'

@@ -3380,13 +3385,13 @@ t_BCDEHLMA:
 	DC	'(HL)'

 	DC	'A'

 	DB	0

-t_BC.DE.HL.SP:

+t_arg_rp:

 	DC	'BC'

 	DC	'DE'

 	DC	'HL'

 	DC	'SP'

 	DB	0

-t_BC.DE.HL.AF:

+t_arg_rp2:

 	DC	'BC'

 	DC	'DE'

 	DC	'HL'

@@ -3397,7 +3402,7 @@ t_HL.IX.IY:
 	DC	'IX'

 	DC	'IY'

 	DB	0

-t_tstfl_ZCPS:

+t_arg_cc:

 	DC	'NZ'

 	DC	'Z'

 	DC	'NC'

@@ -3449,6 +3454,8 @@ pria_1:				;
 	jr	pria_l

 

 ;

+;	http://www.z80.info/decoding.htm

+;

 ;	| 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |

 ;	|   x   |     y     |     z     |

 ;	        |   p   | q |

@@ -3464,7 +3471,8 @@ t_argf:
 	db	'DE,HL',0

 	db	'AF,AF''',0

 	db	fi_hlixiy,0

-

+	db	fi_rp			;rp[p]

+	db	fi_rp2			;rp2[p]

 

 ;-------------------------------------------------------------------------------

 

@@ -3482,12 +3490,17 @@ do_arg_n:
 	argpf	m8

 	argpf	rst

 	argpf	hlixiy

+	argpf	rp

+	argpf	rp2

 

 p_ry:

 p_rz:

 p_m8:

 p_rst:

 p_hlixiy:

+p_rp:

+p_rp2:

+

 

 endif

 ;-------------------------------------------------------------------------------