Edit, rename, refactor

diff --git a/ddt180.z80 b/ddt180.z80
index 079ef7e45d7312418156bd0d33ab7fd30138c0d5..0d78e8292c05f591fe97638678f626686736db62 100644 (file)
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -81,7 +81,7 @@ current_cseg  defl    $ - current_cseg
        .phase  current_phase + current_cseg\r
 signon:\r
        db      'DDT/180',TAB\r
-       db      '[8101] 002',CR,LF,'$'\r
+       db      '[8101] 003',CR,LF,'$'\r
 msgz80:\r
        db      'Z80 or better required!',cr,lf,'$'\r
 \r
@@ -116,11 +116,11 @@ reg_sp:   dw      TPA
 reg.iff:\r
        db      0f3h\r
        db      0c3h\r
-REG.PC:        dw      TPA\r
-l0062h:        dw      0000h\r
-offs.@:        dw      0\r
+reg.pc:        dw      TPA\r
+var.$: dw      0000h\r
+var.@: dw      0\r
 \r
-CMD_ERR:dw     l0146h\r
+error_func:dw  l0146h\r
 cmd_rpt:dw     mainloop\r
 \r
 conbuf:\r
@@ -166,12 +166,41 @@ l0093h:
 \r
        ds      CONBUF_SIZE + 3 - ($ - conbuf)\r
 \r
+CMDTAB:\r
+       dw      cmd_@           ;examine/substitute the displacement register @\r
+       dw      cmd_A           ;Assemble\r
+       dw      cmd_B           ;Breakpoints display/set/clear\r
+       dw      cmd_C           ;trace over Calls\r
+       dw      cmd_D           ;Display memory in hex and ascii\r
+       dw      ERROR           ;\r
+       dw      cmd_F           ;specify Filename and command line\r
+       dw      cmd_G           ;Go\r
+       dw      cmd_H           ;compute Hex and other expressions\r
+       dw      cmd_I           ;Input a byte from port\r
+       dw      ERROR           ;\r
+       dw      ERROR           ;\r
+       dw      cmd_L           ;List disassembled code\r
+       dw      cmd_M           ;Move memory [and verify]\r
+       dw      ERROR           ;\r
+       dw      cmd_O           ;Output a byte to port\r
+       dw      ERROR           ;\r
+       dw      cmd_Q           ;Qery memory for byte string\r
+       dw      cmd_R           ;Read binary or hex file and/or symbol file\r
+       dw      cmd_S           ;Substitute memory\r
+       dw      cmd_T           ;Trace\r
+       dw      ERROR           ;\r
+       dw      cmd_V           ;Verify (compare) two memory areas\r
+       dw      cmd_W           ;Write a file to disk\r
+       dw      cmd_X           ;eXamine [and substitute] registers\r
+       dw      cmd_Y           ;examine [and substitute] Y variables\r
+       dw      cmd_Z           ;Zap (fill) memory with a byte string\r
+\r
 mainloop:\r
        ld sp,stack\r
        ld hl,l0146h\r
-       ld (CMD_ERR),hl\r
-       ld hl,(REG.PC)\r
-       ld (l0062h),hl\r
+       ld (error_func),hl\r
+       ld hl,(reg.pc)\r
+       ld (var.$),hl\r
        call bp_clr_temporary\r
        ld hl,(cmd_rpt)\r
        ld de,mainloop\r
@@ -198,45 +227,28 @@ mainloop:
        ld h,(hl)\r
        ld l,a\r
        jr exe_hl\r
+\r
 ERROR:\r
-       ld hl,(CMD_ERR)\r
+       ld hl,(error_func)\r
 exe_hl:\r
        call CALL_HL\r
        jr mainloop\r
 \r
-CMDTAB:\r
-       dw      cmd_@\r
-       dw      cmd_A\r
-       dw      cmd_B\r
-       dw      cmd_C\r
-       dw      cmd_D\r
-       dw      ERROR\r
-       dw      cmd_F\r
-       dw      cmd_G\r
-       dw      cmd_H\r
-       dw      cmd_I\r
-       dw      ERROR\r
-       dw      ERROR\r
-       dw      cmd_L\r
-       dw      cmd_M\r
-       dw      ERROR\r
-       dw      cmd_O\r
-       dw      ERROR\r
-       dw      cmd_Q\r
-       dw      cmd_R\r
-       dw      cmd_S\r
-       dw      cmd_T\r
-       dw      ERROR\r
-       dw      cmd_V\r
-       dw      cmd_W\r
-       dw      cmd_X\r
-       dw      cmd_Y\r
-       dw      cmd_Z\r
-\r
 l0146h:\r
        ld a,'?'\r
        call outchar\r
-       jp crlf\r
+       ;fall thru\r
+crlf:\r
+       call inchar\r
+       ld a,CR\r
+       call outchar\r
+       ld a,LF\r
+       call outchar\r
+       ld a,0\r
+       ld (con_col),a\r
+       jr c,mainloop\r
+       ret\r
+\r
 get_line:\r
        push hl\r
        ld de,conbuf\r
@@ -304,7 +316,7 @@ out.hl.@:
        call out_hl\r
        push de\r
        push hl\r
-       ld de,(offs.@)\r
+       ld de,(var.@)\r
        ld a,d\r
        or e\r
        jr z,l01bfh\r
@@ -465,6 +477,7 @@ l0284h:
        pop de\r
        pop hl\r
        ret\r
+\r
 pstr:\r
        ld c,0\r
 l028ah:\r
@@ -493,16 +506,6 @@ outbl2:
 outbl:\r
        ld a,' '\r
        jr outchar\r
-crlf:\r
-       call inchar\r
-       ld a,CR\r
-       call outchar\r
-       ld a,LF\r
-       call outchar\r
-       ld a,0\r
-       ld (con_col),a\r
-       jp c,mainloop\r
-       ret\r
 \r
 add_hl_a:\r
        add a,l\r
@@ -1007,10 +1010,10 @@ do_factor:
        ld hl,TPA\r
        cp 'L'\r
        ret z\r
-       ld hl,(offs.@)\r
+       ld hl,(var.@)\r
        cp '@'\r
        ret z\r
-       ld hl,(l0062h)\r
+       ld hl,(var.$)\r
        cp '$'\r
        ret z\r
        cp '-'\r
@@ -1248,7 +1251,7 @@ l063eh:
        djnz l063eh\r
        push hl\r
        push de\r
-       ld iy,(REG.PC)\r
+       ld iy,(reg.pc)\r
        call p_disas_instr\r
        exx\r
        ex af,af'\r
@@ -1370,7 +1373,7 @@ b_0709_start:
        db      001h\r
        dw      reg_sp\r
        db      001h\r
-       dw      REG.PC\r
+       dw      reg.pc\r
        db      002h\r
        dw      reg.a2\r
        db      000h\r
@@ -1394,7 +1397,7 @@ cmd_G:
        ld (l0941h),a\r
        call expr\r
        jr c,l0740h\r
-       ld (REG.PC),hl\r
+       ld (reg.pc),hl\r
 l0740h:\r
        call skipbl\r
        jp z,user_go\r
@@ -1603,7 +1606,7 @@ bpddtz:
        ld (reg.l),hl\r
        pop hl\r
        dec hl\r
-       ld (REG.PC),hl\r
+       ld (reg.pc),hl\r
        ld (reg_sp),sp\r
        ld sp,reg.l\r
        push de\r
@@ -1661,7 +1664,7 @@ l0920h:
        jr z,l0938h\r
        ld e,(ix+002h)\r
        ld d,(ix+003h)\r
-       ld hl,(REG.PC)\r
+       ld hl,(reg.pc)\r
        call cp_hl_de\r
        push bc\r
        call z,sub_0942h\r
@@ -1736,7 +1739,7 @@ l09ach:
        jr z,l09c0h\r
        ld e,(ix+002h)\r
        ld d,(ix+003h)\r
-       ld hl,(REG.PC)\r
+       ld hl,(reg.pc)\r
        call cp_hl_de\r
        ret z\r
 l09c0h:\r
@@ -2128,7 +2131,7 @@ b_0cfa_start:
        db      003h\r
        dw      reg_sp\r
        db      003h\r
-       dw      REG.PC\r
+       dw      reg.pc\r
        db      003h\r
        dw      reg.ix\r
        db      003h\r
@@ -2136,7 +2139,7 @@ b_0cfa_start:
        db      003h\r
        dw      reg_sp\r
        db      003h\r
-       dw      REG.PC\r
+       dw      reg.pc\r
        db      000h\r
        dw      reg.i\r
        db      003h\r
@@ -2178,12 +2181,12 @@ l0d8ah:
 \r
 cmd_@:\r
        call assert_eol\r
-       ld hl,msg_offset\r
-       ld de,offs.@\r
+       ld hl,msg_@\r
+       ld de,var.@\r
        ld c,001h\r
        jp l0c12h\r
 \r
-msg_offset:\r
+msg_@:\r
        dc      '@'\r
 \r
 cmd_I:\r
@@ -3042,18 +3045,18 @@ cmd_A:
        push hl\r
        pop iy\r
        ld hl,l1259h\r
-       ld (CMD_ERR),hl\r
+       ld (error_func),hl\r
        ld (l1262h),sp\r
 l1211h:\r
        push iy\r
        pop hl\r
        ld (last_A),hl\r
-       ld (l0062h),hl\r
+       ld (var.$),hl\r
        push hl\r
        call p_disas_line\r
        pop iy\r
        ld c,b\r
-       ld de,(offs.@)\r
+       ld de,(var.@)\r
        ld a,d\r
        or e\r
        ld b,011h\r
@@ -3081,6 +3084,7 @@ l124bh:
        ld b,0\r
        add iy,bc\r
        jr l1211h\r
+\r
 l1259h:\r
        call l0146h\r
        ld sp,(l1262h)\r
@@ -4252,7 +4256,7 @@ l193fh:
        jr c,l193fh\r
 \r
 p_offset:\r
-       ld de,(offs.@)\r
+       ld de,(var.@)\r
        ld a,d\r
        or e\r
        ret z\r
@@ -5249,7 +5253,7 @@ t__C_:
        DB      0\r
 \r
 sub_1ffeh:\r
-       ld hl,(REG.PC)\r
+       ld hl,(reg.pc)\r
        ld a,h\r
        or l\r
        jr z,l2037h\r
@@ -5258,15 +5262,15 @@ sub_1ffeh:
        sbc hl,de\r
        ld hl,l20edh\r
        jr z,l2031h\r
-       ld iy,(REG.PC)\r
+       ld iy,(reg.pc)\r
        call disas_get_instrlen\r
        jp nc,ERROR\r
        ld c,b\r
        ld b,000h\r
-       ld hl,(REG.PC)\r
+       ld hl,(reg.pc)\r
        add hl,bc\r
        call sub_09cah\r
-       ld iy,(REG.PC)\r
+       ld iy,(reg.pc)\r
        ld hl,b_2039_start\r
        call lookup_opc\r
        ccf\r
@@ -5330,7 +5334,7 @@ l2093h:
        rla\r
        sbc a,a\r
        ld b,a\r
-       ld hl,(REG.PC)\r
+       ld hl,(reg.pc)\r
        add hl,bc\r
        inc hl\r
        inc hl\r
@@ -5456,7 +5460,7 @@ l2151h:
        ld a,(trace_J_flag)\r
        and a\r
        jr nz,l216bh\r
-       ld iy,(REG.PC)\r
+       ld iy,(reg.pc)\r
        call sub_21c8h\r
        jr z,l216bh\r
        ld hl,b_2048_start\r