Reorg & rename

diff --git a/ddt180.z80 b/ddt180.z80
index 5e17667aa124973a22d8d89b1d78ecba4f75729e..602ceea44656cb4e3c147d6335b907c395b7cba4 100644 (file)
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -91,7 +91,7 @@ reg.c2:       db      000h
 reg.b2:        db      000h\r
 reg.f2:        db      000h\r
 reg.a2:        db      000h\r
-l004eh:        db      000h\r
+       db      000h\r
 reg.i: db      000h\r
 reg.iy:        dw      0000h\r
 reg.ix:        dw      0000h\r
@@ -205,7 +205,6 @@ CMDTAB:
        dw      cmd_Z           ;Zap (fill) memory with a byte string\r
 \r
 ERROR:\r
-p_msg_error:\r
        call    pstr_inl\r
        dc      '?',CR,LF\r
        ;fall thru\r
@@ -240,6 +239,7 @@ mainloop:
        ld h,(hl)\r
        ld l,a\r
 exe_hl:\r
+CALL_HL:\r
        jp (hl)\r
 \r
 ;-------------------------------------------------------------------------------\r
@@ -553,8 +553,6 @@ skipbl:
        call get_char_upper\r
        cp ' '\r
        jr z,skipbl0\r
-       cp TAB\r
-       jr z,skipbl0\r
        or a\r
        ret\r
 \r
@@ -2288,8 +2286,9 @@ l16c6h:
        call i.gethexbyte       ;checksum\r
        ld a,c\r
        and a\r
-       jp nz,ERROR             ;exit if checksum error\r
+       jr nz,error2            ;exit if checksum error\r
        jr w_recstart           ;next record\r
+\r
 rdhex_done:\r
        pop hl\r
        call i.gethexbyte\r
@@ -2378,11 +2377,6 @@ p_max_high:
 \r
 ;cmd_A:\r
 \r
-\r
-CALL_HL:\r
-       jp (hl)\r
-\r
-\r
 ;-------------------------------------------------------------------------------\r
 ; >>L [startaddr] [endaddr]\r
 ;      List disassembled code\r
@@ -2453,10 +2447,10 @@ p_disas_instr:
        ld      a,(con_col)\r
        add     a,5\r
        ld      c,a\r
-       call    pstr\r
+       call    pstr                                    ;print mnemonic\r
        call    p_goto_col\r
        ex de,hl\r
-       call call_hl\r
+       call CALL_HL                                    ;print arguments\r
        pop bc\r
        ld a,(disas_argtype)\r
        ld hl,(disas_arg_16)\r
@@ -2722,23 +2716,23 @@ b_1ab6_start:
 ; Format: db mask, match, t_MNEMONICS-index\r
 ;        dw argument formating function\r
 b_1ad1_start:\r
-       db 0c0h,040h,o_LD       ;ld r,r\r
-       dw p_arg_r_r\r
-       db 0f8h,080h,o_ADD      ;add a,r\r
+       db 0c0h,040h,o_LD       ;ld r[y],r[z]\r
+       dw p_arg_ry_rz\r
+       db 0f8h,080h,o_ADD      ;add a,r[z]\r
        dw p_arg_a_r\r
-       db 0f8h,088h,o_ADC      ;adc a,r\r
+       db 0f8h,088h,o_ADC      ;adc a,r[z]\r
        dw p_arg_a_r\r
-       db 0f8h,090h,o_SUB      ;sub r\r
+       db 0f8h,090h,o_SUB      ;sub r[z]\r
        dw p_arg_rs\r
-       db 0f8h,098h,o_SBC      ;sbc a,r\r
+       db 0f8h,098h,o_SBC      ;sbc a,r[z]\r
        dw p_arg_a_r\r
-       db 0f8h,0a0h,o_AND      ;and r\r
+       db 0f8h,0a0h,o_AND      ;and r[z]\r
        dw p_arg_rs\r
-       db 0f8h,0a8h,o_XOR      ;xor r\r
+       db 0f8h,0a8h,o_XOR      ;xor r[z]\r
        dw p_arg_rs\r
-       db 0f8h,0b0h,o_OR       ;or r\r
+       db 0f8h,0b0h,o_OR       ;or r[z]\r
        dw p_arg_rs\r
-       db 0f8h,0b8h,o_CP       ;cp r\r
+       db 0f8h,0b8h,o_CP       ;cp r[z]\r
        dw p_arg_rs\r
        db 0c7h,0c0h,o_RET      ;ret cc\r
        dw p_arg_cc\r
@@ -2854,8 +2848,8 @@ b_1bc9_start:
        db 0bbh,o_OTDR          ;otdr\r
        db 08bh,o_OTDM          ;otdm\r
        db 09bh,o_OTDMR         ;otdmr\r
-       db 083h,o_OTDM          ;otim\r
-       db 093h,o_OTDMR         ;otimr\r
+       db 083h,o_OTIM          ;otim\r
+       db 093h,o_OTIMR         ;otimr\r
        db 076h,o_SLP           ;slp\r
        db 0ffh                 ;<end mark>\r
 \r
@@ -2889,11 +2883,11 @@ b_1bf4_start:
 l228bh:\r
        db 0ffh,030h,0ffh       ;in0 (m)\r
        dw p_arg_r_m\r
-       db 0c7h,000h,o_IN       ;in0 r,(m) ;r=b,c,d,e,h,l,a\r
+       db 0c7h,000h,o_IN0      ;in0 r,(m) ;r=b,c,d,e,h,l,a\r
        dw p_arg_r_m\r
        db 0ffh,031h,0ffh       ;out0 (m),0\r
        dw p_arg_m_r\r
-       db 0ech,001h,o_OUT0     ;out0 (m),r ;r=b,c,d,e\r
+       db 0c7h,001h,o_OUT0     ;out0 (m),r ;r=b,c,d,e\r
        dw p_arg_m_r\r
        db 0ffh,064h,o_TST      ;tst m\r
        dw l1d09h\r
@@ -2937,7 +2931,7 @@ b_1c55_start:
 \r
 ;-------------------------------------------------------------------------------\r
 \r
-p_arg_r_r:\r
+p_arg_ry_rz:\r
        call p_arg_r\r
        call p_char_comma\r
        jp p_arg_rs\r
@@ -3203,7 +3197,7 @@ p_arg_r0:
        and 007h\r
        cp 006h\r
        ld b,a\r
-       ld hl,t_BCDEHL_HL_A\r
+       ld hl,t_BCDEHLMA\r
        jr nz,p_arg0\r
        ld a,(isprefix_ixiy)\r
        and a\r
@@ -3387,7 +3381,7 @@ t_mn_bli:
 \r
        DB      0\r
 \r
-t_BCDEHL_HL_A:\r
+t_BCDEHLMA:\r
        DC      'B'\r
        DC      'C'\r
        DC      'D'\r

diff --git a/filter-unref.awk b/filter-unref.awk
index d0bf1c606fadd70fabf80635f6ec952ef015ba98..7f5bcaa825b7fadbe0ab72868a280d86680a1e29 100644 (file)
--- 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 }