Reorg & rename

2 files changed, 23 insertions, 107 deletions

diff --git a/ddt180.z80 b/ddt180.z80
index 5e17667..602ceea 100644
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -91,7 +91,7 @@ reg.c2:	db	000h
 reg.b2:	db	000h

 reg.f2:	db	000h

 reg.a2:	db	000h

-l004eh:	db	000h

+	db	000h

 reg.i:	db	000h

 reg.iy:	dw	0000h

 reg.ix:	dw	0000h

@@ -205,7 +205,6 @@ CMDTAB:
 	dw	cmd_Z		;Zap (fill) memory with a byte string

 

 ERROR:

-p_msg_error:

 	call	pstr_inl

 	dc	'?',CR,LF

 	;fall thru

@@ -240,6 +239,7 @@ mainloop:
 	ld h,(hl)

 	ld l,a

 exe_hl:

+CALL_HL:

 	jp (hl)

 

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

@@ -553,8 +553,6 @@ skipbl:
 	call get_char_upper

 	cp ' '

 	jr z,skipbl0

-	cp TAB

-	jr z,skipbl0

 	or a

 	ret

 

@@ -2288,8 +2286,9 @@ l16c6h:
 	call i.gethexbyte	;checksum

 	ld a,c

 	and a

-	jp nz,ERROR		;exit if checksum error

+	jr nz,error2		;exit if checksum error

 	jr w_recstart		;next record

+

 rdhex_done:

 	pop hl

 	call i.gethexbyte

@@ -2378,11 +2377,6 @@ p_max_high:
 

 ;cmd_A:

 

-

-CALL_HL:

-	jp (hl)

-

-

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

 ; >>L [startaddr] [endaddr]

 ;      List disassembled code

@@ -2453,10 +2447,10 @@ p_disas_instr:
 	ld	a,(con_col)

 	add	a,5

 	ld	c,a

-	call	pstr

+	call	pstr					;print mnemonic

 	call	p_goto_col

 	ex de,hl

-	call call_hl

+	call CALL_HL					;print arguments

 	pop bc

 	ld a,(disas_argtype)

 	ld hl,(disas_arg_16)

@@ -2722,23 +2716,23 @@ b_1ab6_start:
 ; Format: db mask, match, t_MNEMONICS-index

 ;	  dw argument formating function

 b_1ad1_start:

-	db 0c0h,040h,o_LD	;ld r,r

-	dw p_arg_r_r

-	db 0f8h,080h,o_ADD	;add a,r

+	db 0c0h,040h,o_LD	;ld r[y],r[z]

+	dw p_arg_ry_rz

+	db 0f8h,080h,o_ADD	;add a,r[z]

 	dw p_arg_a_r

-	db 0f8h,088h,o_ADC	;adc a,r

+	db 0f8h,088h,o_ADC	;adc a,r[z]

 	dw p_arg_a_r

-	db 0f8h,090h,o_SUB	;sub r

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

 	dw p_arg_rs

-	db 0f8h,098h,o_SBC	;sbc a,r

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

 	dw p_arg_a_r

-	db 0f8h,0a0h,o_AND	;and r

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

 	dw p_arg_rs

-	db 0f8h,0a8h,o_XOR	;xor r

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

 	dw p_arg_rs

-	db 0f8h,0b0h,o_OR	;or r

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

 	dw p_arg_rs

-	db 0f8h,0b8h,o_CP	;cp r

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

 	dw p_arg_rs

 	db 0c7h,0c0h,o_RET	;ret cc

 	dw p_arg_cc

@@ -2854,8 +2848,8 @@ b_1bc9_start:
 	db 0bbh,o_OTDR		;otdr

 	db 08bh,o_OTDM		;otdm

 	db 09bh,o_OTDMR		;otdmr

-	db 083h,o_OTDM		;otim

-	db 093h,o_OTDMR		;otimr

+	db 083h,o_OTIM		;otim

+	db 093h,o_OTIMR		;otimr

 	db 076h,o_SLP		;slp

 	db 0ffh			;<end mark>

 

@@ -2889,11 +2883,11 @@ b_1bf4_start:
 l228bh:

 	db 0ffh,030h,0ffh	;in0 (m)

 	dw p_arg_r_m

-	db 0c7h,000h,o_IN	;in0 r,(m) ;r=b,c,d,e,h,l,a

+	db 0c7h,000h,o_IN0	;in0 r,(m) ;r=b,c,d,e,h,l,a

 	dw p_arg_r_m

 	db 0ffh,031h,0ffh	;out0 (m),0

 	dw p_arg_m_r

-	db 0ech,001h,o_OUT0	;out0 (m),r ;r=b,c,d,e

+	db 0c7h,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

@@ -2937,7 +2931,7 @@ b_1c55_start:
 

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

 

-p_arg_r_r:

+p_arg_ry_rz:

 	call p_arg_r

 	call p_char_comma

 	jp p_arg_rs

@@ -3203,7 +3197,7 @@ p_arg_r0:
 	and 007h

 	cp 006h

 	ld b,a

-	ld hl,t_BCDEHL_HL_A

+	ld hl,t_BCDEHLMA

 	jr nz,p_arg0

 	ld a,(isprefix_ixiy)

 	and a

@@ -3387,7 +3381,7 @@ t_mn_bli:
 

 	DB	0

 

-t_BCDEHL_HL_A:

+t_BCDEHLMA:

 	DC	'B'

 	DC	'C'

 	DC	'D'

diff --git a/filter-unref.awk b/filter-unref.awk
index d0bf1c6..7f5bcaa 100644
--- a/filter-unref.awk
+++ b/filter-unref.awk
@@ -1,7 +1,6 @@
 BEGIN	{
 			ign["DDTZ_END"] = 1
 			ign["DEFVERS"] = 1
-			ign["P_MSG_ERROR"] = 1
 
 			ign["I_ADC"] = 1
 			ign["I_ADD"] = 1
@@ -80,83 +79,6 @@ BEGIN	{
 			ign["I_TST"] = 1
 			ign["I_TSTIO"] = 1
 			ign["I_XOR"] = 1
-			ign["O_ADC"] = 1
-			ign["O_ADD"] = 1
-			ign["O_AND"] = 1
-			ign["O_BIT"] = 1
-			ign["O_CALL"] = 1
-			ign["O_CCF"] = 1
-			ign["O_CP"] = 1
-			ign["O_CPD"] = 1
-			ign["O_CPDR"] = 1
-			ign["O_CPI"] = 1
-			ign["O_CPIR"] = 1
-			ign["O_CPL"] = 1
-			ign["O_DAA"] = 1
-			ign["O_DEC"] = 1
-			ign["O_DI"] = 1
-			ign["O_DJNZ"] = 1
-			ign["O_EI"] = 1
-			ign["O_EX"] = 1
-			ign["O_EXX"] = 1
-			ign["O_HALT"] = 1
-			ign["O_IM"] = 1
-			ign["O_IN"] = 1
-			ign["O_IN0"] = 1
-			ign["O_INC"] = 1
-			ign["O_IND"] = 1
-			ign["O_INDR"] = 1
-			ign["O_INI"] = 1
-			ign["O_INIR"] = 1
-			ign["O_JP"] = 1
-			ign["O_JR"] = 1
-			ign["O_LD"] = 1
-			ign["O_LDD"] = 1
-			ign["O_LDDR"] = 1
-			ign["O_LDI"] = 1
-			ign["O_LDIR"] = 1
-			ign["O_MLT"] = 1
-			ign["O_NEG"] = 1
-			ign["O_NOP"] = 1
-			ign["O_OR"] = 1
-			ign["O_OTDM"] = 1
-			ign["O_OTDMR"] = 1
-			ign["O_OTDR"] = 1
-			ign["O_OTIM"] = 1
-			ign["O_OTIMR"] = 1
-			ign["O_OTIR"] = 1
-			ign["O_OUT"] = 1
-			ign["O_OUT0"] = 1
-			ign["O_OUTD"] = 1
-			ign["O_OUTI"] = 1
-			ign["O_POP"] = 1
-			ign["O_PUSH"] = 1
-			ign["O_RES"] = 1
-			ign["O_RET"] = 1
-			ign["O_RETI"] = 1
-			ign["O_RETN"] = 1
-			ign["O_RL"] = 1
-			ign["O_RLA"] = 1
-			ign["O_RLC"] = 1
-			ign["O_RLCA"] = 1
-			ign["O_RLD"] = 1
-			ign["O_RR"] = 1
-			ign["O_RRA"] = 1
-			ign["O_RRC"] = 1
-			ign["O_RRCA"] = 1
-			ign["O_RRD"] = 1
-			ign["O_RST"] = 1
-			ign["O_SBC"] = 1
-			ign["O_SCF"] = 1
-			ign["O_SET"] = 1
-			ign["O_SLA"] = 1
-			ign["O_SLP"] = 1
-			ign["O_SRA"] = 1
-			ign["O_SRL"] = 1
-			ign["O_SUB"] = 1
-			ign["O_TST"] = 1
-			ign["O_TSTIO"] = 1
-			ign["O_XOR"] = 1
 		}
 
 /\x1A/	{ exit }