X-Git-Url: http://cloudbase.mooo.com/gitweb/ddt180.git/blobdiff_plain/1190f4f040cac38f70ef6a25352b3154929d9a78..d0ff7c76b85c1d1f7e76672462c0ba85861ab9b3:/ddt180.z80

diff --git a/ddt180.z80 b/ddt180.z80
index 5c13492..da5cfe6 100644
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -120,7 +120,6 @@ reg.iff:
 	db	0c3h
 reg.pc:	dw	TPA
 var.$:	dw	0000h
-var.@:	dw	0
 
 cmd_rpt:dw	mainloop
 
@@ -132,9 +131,7 @@ conbuf:
 	ld sp,stack
 	exx
 	ld de,ddtz_base
-	or a
-	sbc hl,de
-	add hl,de
+	call cp_hl_de
 	jr c,l0079h
 	ex de,hl
 l0079h:
@@ -171,7 +168,7 @@ l0093h:
 ;-------------------------------------------------------------------------------
 
 CMDTAB:
-	dw	cmd_@		;examine/substitute the displacement register @
+	dw	ERROR ;cmd_@	;examine/substitute the displacement register @
 	dw	ERROR ;cmd_A	;Assemble
 	dw	cmd_B		;Breakpoints display/set/clear
 	dw	cmd_C		;trace over Calls
@@ -211,6 +208,7 @@ mainloop:
 	call bp_clr_temporary
 	ld hl,(cmd_rpt)
 	ld de,mainloop
+	push de
 	call cp_hl_de
 	ld a,'>'
 	call outchar
@@ -219,7 +217,8 @@ mainloop:
 	call get_line
 	call skipbl
 	jr z,exe_hl
-	ld hl,mainloop
+	pop hl
+	push hl
 	ld (cmd_rpt),hl
 	inc de
 	sub '@'
@@ -235,8 +234,7 @@ mainloop:
 	ld l,a
 
 exe_hl:
-	call CALL_HL
-	jr mainloop
+	jp (hl)
 
 ;-------------------------------------------------------------------------------
 
@@ -249,25 +247,6 @@ crlf:
 	jr c,mainloop
 	ret
 
-out.hl.@:
-	call out_hl
-	push de
-	push hl
-	ld de,(var.@)
-	ld a,d
-	or e
-	jr z,l01bfh
-	call outbl
-	call	pstr_inl
-	dc	'@'
-	and a
-	sbc hl,de
-	call out_hl
-l01bfh:
-	pop hl
-	pop de
-	ret
-
 sub_01d9h:
 	call	pstr_inl
 	dc	'-'
@@ -557,10 +536,6 @@ l0300h:
 sub_0303h:
 	ld hl,t_reg_names
 	ld b,07fh
-	jr l030ch
-
-sub_030ah:
-	ld b,0ffh
 l030ch:
 	inc b
 	ld a,(hl)
@@ -571,10 +546,6 @@ l030ch:
 	res 7,b
 	ret
 
-sub_0318h:
-	push bc
-	res 7,b
-	defb 03eh		;ld a,nn
 sub_031ch:
 	push bc
 	push de
@@ -988,9 +959,6 @@ do_factor:
 	ld hl,TPA
 	cp 'L'
 	ret z
-	ld hl,(var.@)
-	cp '@'
-	ret z
 	ld hl,(var.$)
 	cp '$'
 	ret z
@@ -1222,6 +1190,7 @@ p_cpustat:
 l063eh:
 	call p_regs
 	djnz l063eh
+	call outbl6
 	push hl
 	push de
 	ld iy,(reg.pc)
@@ -1238,8 +1207,6 @@ l065bh:
 	djnz l065bh
 	pop af
 	pop hl
-	call nz,outbl6
-	call nz,p_offset
 	jp crlf
 
 p_f:
@@ -1296,12 +1263,6 @@ p_regs:
 	inc hl
 	ld d,(hl)
 	ex de,hl
-	dec a
-	jr z,l06d9h
-	call out.hl.@
-	call z,outbl6
-	jr l06e2h
-l06d9h:
 	call out_hl
 	jr l06e2h
 l06deh:
@@ -1482,7 +1443,7 @@ l07cdh:
 	call outbl
 	ld l,(ix+002h)
 	ld h,(ix+003h)
-	call out.hl.@
+	call out_hl
 	call 	pstr_inl
 	dc	'  :'
 	ld l,(ix+004h)
@@ -1906,7 +1867,7 @@ cmd_X:
 	call sel_dc_string
 l0c12h:
 	call l0c33h
-l0c15h:
+
 	call outbl
 	push de
 	push bc
@@ -1940,9 +1901,7 @@ l0c33h:
 	ld a,(de)
 	dec de
 	ld h,a
-	bit 1,c
-	jp z,out_hl
-	jp out.hl.@
+	jp out_hl
 
 l0c4fh:
 	call p_f
@@ -2125,7 +2084,7 @@ cmd_S:
 	call get_lastarg_def
 l0d60h:
 	ld (last_S),hl
-	call out.hl.@
+	call out_hl
 	call outbl
 	ld a,(hl)
 	call out_hex
@@ -2160,22 +2119,13 @@ l0d8ah:
 ; > @
 ;      examine (substitute) displacement register @
 
-cmd_@:
-	call assert_eol
-	ld hl,msg_@
-	ld de,var.@
-	ld c,001h
-	jp l0c12h
-
-msg_@:
-	dc	'@'
+;cmd_@:
 
 ;-------------------------------------------------------------------------------
 ; >>I [port]
 ;      Input a byte from port
 
 cmd_I:
-	ld hl,cmd_I
 	ld (cmd_rpt),hl
 	ld hl,(last_I)
 	call get_lastarg_def
@@ -2195,7 +2145,6 @@ cmd_I:
 ;      Output a byte to a port
 
 cmd_O:
-	ld hl,cmd_O
 	ld (cmd_rpt),hl
 	ld hl,(last_O_val)
 	call get_arg_def
@@ -2225,7 +2174,7 @@ l0dedh:
 	cp b
 	jr z,l0e10h
 	ld c,a
-	call out.hl.@
+	call out_hl
 	call outbl
 	ld a,b
 	call out_hex
@@ -2234,7 +2183,7 @@ l0dedh:
 	call out_hex
 	call outbl
 	ex de,hl
-	call out.hl.@
+	call out_hl
 	ex de,hl
 	call crlf
 l0e10h:
@@ -2287,30 +2236,11 @@ cmdm_up:
 ;      off all loaded files, and Top address of available memory
 ; > H expression
 ;      evaluate expression and display result in hex, decimal and other formats
-; > H expression expression
-;      display sum und difference of expressions
 
 cmd_H:
 	call expr
 	jp c,p_max_high0
-	call next_arg
-	push hl
-	call expr
-	push af
 	call assert_eol
-	pop af
-	ex de,hl
-	pop hl
-	jr c,l0e5eh
-	push hl
-	push de
-	add hl,de
-	call l0e5eh
-	pop de
-	pop hl
-	and a
-	sbc hl,de
-l0e5eh:
 	call out_hl
 	call outbl2
 	call out_hl_neg
@@ -2490,7 +2420,6 @@ l0f42h:
 ;      Display memory in hex and ASCII
 
 cmd_D:
-	ld hl,cmd_D
 	ld (cmd_rpt),hl
 	ld hl,(last_D)
 	ld bc,128
@@ -2502,7 +2431,7 @@ sub_0f58h:
 	push hl
 	push af
 l0f5ch:
-	call out.hl.@
+	call out_hl
 	call z,outbl2
 	call outbl
 	ld de,0
@@ -3004,7 +2933,6 @@ l1773h:
 ;      List disassembled code
 
 cmd_L:
-	ld hl,cmd_L
 	ld (cmd_rpt),hl
 	call expr
 	jr nc,l18dbh
@@ -3051,7 +2979,7 @@ cmdl_p_line:
 
 p_disas_line:
 	call outbl2
-	call out.hl.@
+	call out_hl
 	call z,outbl
 	call outbl
 	sub a
@@ -3065,19 +2993,7 @@ p_disas_line:
 	call	p_goto_col
 	; fall thru
 ;-------------------------------------------------------------------------------
-
-p_offset:
-	ld de,(var.@)
-	ld a,d
-	or e
-	ret z
-	call	pstr_inl
-	dc	'(@'
-	and a
-	sbc hl,de
-	call out_hl
-	add	hl,de
-	jp out_rparen
+	ret
 
 ;-------------------------------------------------------------------------------
 
@@ -4249,7 +4165,6 @@ l2113h:
 ;     trace over Calls [No list] [Jumps only] /.While./.Until.
 
 cmd_C:
-	ld hl,cmd_C
 	ld a,1
 	jr cmd_tc
 
@@ -4261,7 +4176,6 @@ cmd_C:
 
 cmd_T:
 	xor a
-	ld hl,cmd_T
 cmd_tc:
 	ld (cmd_rpt),hl
 	ld (trace_call_flag),a