Remove W option from cmds S,Q,Z; J otion from Q

[ddt180.git] / ddt180.z80

diff --git a/ddt180.z80 b/ddt180.z80
index 67930dbeb14238b013fd66af6fd46b26c215454a..3a445c3b6f080106444fce47e1dd760521263965 100644 (file)
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -2106,29 +2106,17 @@ l0dedh:
        call crlf\r
 l0e10h:\r
        pop bc\r
-       inc hl\r
        inc de\r
-       dec bc\r
-       ld a,b\r
-       or c\r
-       jr nz,l0dedh\r
+       cpi\r
+       jp pe,l0dedh\r
        ret\r
 \r
 ;-------------------------------------------------------------------------------\r
-; > M[V] startaddr endaddr destaddr\r
-;      Move memory [and verify]\r
+; > M startaddr endaddr destaddr\r
+;      Move memory\r
 \r
 cmd_M:\r
-       call get_char_upper\r
-       cp 'V'\r
-       jr nz,l0e1fh\r
-       inc de\r
-l0e1fh:\r
-       push af\r
        call sub_034eh\r
-       push hl\r
-       push de\r
-       push bc\r
        call cp_hl_de\r
        jr nc,cmdm_up\r
        add hl,bc\r
@@ -2141,11 +2129,6 @@ l0e1fh:
        db 01h          ;swallow ldir instruction (ld bc,...)\r
 cmdm_up:\r
        ldir\r
-       pop bc\r
-       pop de\r
-       pop hl\r
-       pop af\r
-       jr z,l0dedh\r
        ret\r
 \r
 ;-------------------------------------------------------------------------------\r
@@ -2178,32 +2161,31 @@ cmd_H:
 ;      Query memory for a byte string [Justified]\r
 \r
 cmd_Q:\r
-       call get_char_upper\r
-       sub 'J'\r
-       ld (cmd_Q_jopt),a\r
-       jr nz,l0e8dh\r
-       inc de\r
-l0e8dh:\r
        call get_arg_range\r
        push bc\r
        push hl\r
        call sub_0ee6h\r
        pop hl\r
 l0e96h:\r
-       call sub_0ed7h\r
+       push    hl\r
+       push    de\r
+       push bc\r
+l0edah:\r
+       ld a,(de)\r
+       cp (hl)\r
+       jr nz,l0ee2h\r
+       inc de\r
+       inc hl\r
+       djnz l0edah\r
+l0ee2h:\r
+       pop bc\r
+       pop de\r
+       pop hl\r
        jr nz,l0eb0h\r
        push bc\r
-       push hl\r
-       ld a,(cmd_Q_jopt)\r
-       or a\r
-       jr nz,l0ea7h\r
-       ld bc,-8\r
-       add hl,bc\r
-l0ea7h:\r
        ld bc,16\r
-       and a\r
+       and a                   ;clear carry\r
        call sub_0f58h\r
-       pop hl\r
        pop bc\r
 l0eb0h:\r
        inc hl\r
@@ -2242,23 +2224,6 @@ l0ed3h:
        pop hl\r
        ret\r
 \r
-sub_0ed7h:\r
-       push    hl\r
-       push    de\r
-       push bc\r
-l0edah:\r
-       ld a,(de)\r
-       cp (hl)\r
-       jr nz,l0ee2h\r
-       inc de\r
-       inc hl\r
-       djnz l0edah\r
-l0ee2h:\r
-       pop bc\r
-       pop de\r
-       pop hl\r
-       ret\r
-\r
 sub_0ee6h:\r
        ld hl,conbuf+1\r
        call sub_0ef7h\r
@@ -2269,26 +2234,13 @@ sub_0ee6h:
        ret nz\r
        jp ERROR\r
 \r
-sub_0ef7h:\r
-       db      0e6h            ; and 037h (clear carry)\r
-sub_0ef8h:\r
+sub_0ef7h:                     ;from cmd_Q, cmd_Z\r
+       db      0e6h            ;and 037h (clear carry)\r
+sub_0ef8h:                     ;from cmd_S\r
        scf\r
 l0ef9h:\r
        push af\r
        call next_arg\r
-       cp 'W'\r
-       jr nz,l0f0eh\r
-       inc de\r
-       push hl\r
-       call sub_035dh\r
-       ex de,hl\r
-       ex (sp),hl\r
-       ld (hl),e\r
-       inc hl\r
-       ld a,d\r
-       pop de\r
-       jr l0f1ah\r
-l0f0eh:\r
        cp ''''\r
        jr z,l0f1eh\r
        push hl\r
@@ -2350,8 +2302,7 @@ sub_0f58h:
        push af\r
 l0f5ch:\r
        call out_hl\r
-       call z,outbl2\r
-       call outbl\r
+       call outbl2\r
        ld de,0\r
 l0f68h:\r
        ld a,(hl)\r
@@ -3928,9 +3879,6 @@ last_O_addr:
 last_O_val:\r
        db      0\r
 \r
-cmd_Q_jopt:\r
-       db      -1\r
-\r
 last_D:\r
        dw      TPA\r
 \r