X-Git-Url: http://cloudbase.mooo.com/gitweb/ddt180.git/blobdiff_plain/d2df51e361a9c16b0df309714a35c86d46118993..c18ba81991314d10f95b00051fd1e3fbcebc8e48:/ddt180.z80

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