Edit, rename, refactor

1 files changed, 77 insertions, 73 deletions

diff --git a/ddt180.z80 b/ddt180.z80
index 079ef7e..0d78e82 100644
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -81,7 +81,7 @@ current_cseg	defl	$ - current_cseg
 	.phase	current_phase + current_cseg

 signon:

 	db	'DDT/180',TAB

-	db	'[8101] 002',CR,LF,'$'

+	db	'[8101] 003',CR,LF,'$'

 msgz80:

 	db	'Z80 or better required!',cr,lf,'$'

 

@@ -116,11 +116,11 @@ reg_sp:	dw	TPA
 reg.iff:

 	db	0f3h

 	db	0c3h

-REG.PC:	dw	TPA

-l0062h:	dw	0000h

-offs.@:	dw	0

+reg.pc:	dw	TPA

+var.$:	dw	0000h

+var.@:	dw	0

 

-CMD_ERR:dw	l0146h

+error_func:dw	l0146h

 cmd_rpt:dw	mainloop

 

 conbuf:

@@ -166,12 +166,41 @@ l0093h:
 

 	ds	CONBUF_SIZE + 3 - ($ - conbuf)

 

+CMDTAB:

+	dw	cmd_@		;examine/substitute the displacement register @

+	dw	cmd_A		;Assemble

+	dw	cmd_B		;Breakpoints display/set/clear

+	dw	cmd_C		;trace over Calls

+	dw	cmd_D		;Display memory in hex and ascii

+	dw	ERROR		;

+	dw	cmd_F		;specify Filename and command line

+	dw	cmd_G		;Go

+	dw	cmd_H		;compute Hex and other expressions

+	dw	cmd_I		;Input a byte from port

+	dw	ERROR		;

+	dw	ERROR		;

+	dw	cmd_L		;List disassembled code

+	dw	cmd_M		;Move memory [and verify]

+	dw	ERROR		;

+	dw	cmd_O		;Output a byte to port

+	dw	ERROR		;

+	dw	cmd_Q		;Qery memory for byte string

+	dw	cmd_R		;Read binary or hex file and/or symbol file

+	dw	cmd_S		;Substitute memory

+	dw	cmd_T		;Trace

+	dw	ERROR		;

+	dw	cmd_V		;Verify (compare) two memory areas

+	dw	cmd_W		;Write a file to disk

+	dw	cmd_X		;eXamine [and substitute] registers

+	dw	cmd_Y		;examine [and substitute] Y variables

+	dw	cmd_Z		;Zap (fill) memory with a byte string

+

 mainloop:

 	ld sp,stack

 	ld hl,l0146h

-	ld (CMD_ERR),hl

-	ld hl,(REG.PC)

-	ld (l0062h),hl

+	ld (error_func),hl

+	ld hl,(reg.pc)

+	ld (var.$),hl

 	call bp_clr_temporary

 	ld hl,(cmd_rpt)

 	ld de,mainloop

@@ -198,45 +227,28 @@ mainloop:
 	ld h,(hl)

 	ld l,a

 	jr exe_hl

+

 ERROR:

-	ld hl,(CMD_ERR)

+	ld hl,(error_func)

 exe_hl:

 	call CALL_HL

 	jr mainloop

 

-CMDTAB:

-	dw	cmd_@

-	dw	cmd_A

-	dw	cmd_B

-	dw	cmd_C

-	dw	cmd_D

-	dw	ERROR

-	dw	cmd_F

-	dw	cmd_G

-	dw	cmd_H

-	dw	cmd_I

-	dw	ERROR

-	dw	ERROR

-	dw	cmd_L

-	dw	cmd_M

-	dw	ERROR

-	dw	cmd_O

-	dw	ERROR

-	dw	cmd_Q

-	dw	cmd_R

-	dw	cmd_S

-	dw	cmd_T

-	dw	ERROR

-	dw	cmd_V

-	dw	cmd_W

-	dw	cmd_X

-	dw	cmd_Y

-	dw	cmd_Z

-

 l0146h:

 	ld a,'?'

 	call outchar

-	jp crlf

+	;fall thru

+crlf:

+	call inchar

+	ld a,CR

+	call outchar

+	ld a,LF

+	call outchar

+	ld a,0

+	ld (con_col),a

+	jr c,mainloop

+	ret

+

 get_line:

 	push hl

 	ld de,conbuf

@@ -304,7 +316,7 @@ out.hl.@:
 	call out_hl

 	push de

 	push hl

-	ld de,(offs.@)

+	ld de,(var.@)

 	ld a,d

 	or e

 	jr z,l01bfh

@@ -465,6 +477,7 @@ l0284h:
 	pop de

 	pop hl

 	ret

+

 pstr:

 	ld c,0

 l028ah:

@@ -493,16 +506,6 @@ outbl2:
 outbl:

 	ld a,' '

 	jr outchar

-crlf:

-	call inchar

-	ld a,CR

-	call outchar

-	ld a,LF

-	call outchar

-	ld a,0

-	ld (con_col),a

-	jp c,mainloop

-	ret

 

 add_hl_a:

 	add a,l

@@ -1007,10 +1010,10 @@ do_factor:
 	ld hl,TPA

 	cp 'L'

 	ret z

-	ld hl,(offs.@)

+	ld hl,(var.@)

 	cp '@'

 	ret z

-	ld hl,(l0062h)

+	ld hl,(var.$)

 	cp '$'

 	ret z

 	cp '-'

@@ -1248,7 +1251,7 @@ l063eh:
 	djnz l063eh

 	push hl

 	push de

-	ld iy,(REG.PC)

+	ld iy,(reg.pc)

 	call p_disas_instr

 	exx

 	ex af,af'

@@ -1370,7 +1373,7 @@ b_0709_start:
 	db	001h

 	dw	reg_sp

 	db	001h

-	dw	REG.PC

+	dw	reg.pc

 	db	002h

 	dw	reg.a2

 	db	000h

@@ -1394,7 +1397,7 @@ cmd_G:
 	ld (l0941h),a

 	call expr

 	jr c,l0740h

-	ld (REG.PC),hl

+	ld (reg.pc),hl

 l0740h:

 	call skipbl

 	jp z,user_go

@@ -1603,7 +1606,7 @@ bpddtz:
 	ld (reg.l),hl

 	pop hl

 	dec hl

-	ld (REG.PC),hl

+	ld (reg.pc),hl

 	ld (reg_sp),sp

 	ld sp,reg.l

 	push de

@@ -1661,7 +1664,7 @@ l0920h:
 	jr z,l0938h

 	ld e,(ix+002h)

 	ld d,(ix+003h)

-	ld hl,(REG.PC)

+	ld hl,(reg.pc)

 	call cp_hl_de

 	push bc

 	call z,sub_0942h

@@ -1736,7 +1739,7 @@ l09ach:
 	jr z,l09c0h

 	ld e,(ix+002h)

 	ld d,(ix+003h)

-	ld hl,(REG.PC)

+	ld hl,(reg.pc)

 	call cp_hl_de

 	ret z

 l09c0h:

@@ -2128,7 +2131,7 @@ b_0cfa_start:
 	db	003h

 	dw	reg_sp

 	db	003h

-	dw	REG.PC

+	dw	reg.pc

 	db	003h

 	dw	reg.ix

 	db	003h

@@ -2136,7 +2139,7 @@ b_0cfa_start:
 	db	003h

 	dw	reg_sp

 	db	003h

-	dw	REG.PC

+	dw	reg.pc

 	db	000h

 	dw	reg.i

 	db	003h

@@ -2178,12 +2181,12 @@ l0d8ah:
 

 cmd_@:

 	call assert_eol

-	ld hl,msg_offset

-	ld de,offs.@

+	ld hl,msg_@

+	ld de,var.@

 	ld c,001h

 	jp l0c12h

 

-msg_offset:

+msg_@:

 	dc	'@'

 

 cmd_I:

@@ -3042,18 +3045,18 @@ cmd_A:
 	push hl

 	pop iy

 	ld hl,l1259h

-	ld (CMD_ERR),hl

+	ld (error_func),hl

 	ld (l1262h),sp

 l1211h:

 	push iy

 	pop hl

 	ld (last_A),hl

-	ld (l0062h),hl

+	ld (var.$),hl

 	push hl

 	call p_disas_line

 	pop iy

 	ld c,b

-	ld de,(offs.@)

+	ld de,(var.@)

 	ld a,d

 	or e

 	ld b,011h

@@ -3081,6 +3084,7 @@ l124bh:
 	ld b,0

 	add iy,bc

 	jr l1211h

+

 l1259h:

 	call l0146h

 	ld sp,(l1262h)

@@ -4252,7 +4256,7 @@ l193fh:
 	jr c,l193fh

 

 p_offset:

-	ld de,(offs.@)

+	ld de,(var.@)

 	ld a,d

 	or e

 	ret z

@@ -5249,7 +5253,7 @@ t__C_:
 	DB	0

 

 sub_1ffeh:

-	ld hl,(REG.PC)

+	ld hl,(reg.pc)

 	ld a,h

 	or l

 	jr z,l2037h

@@ -5258,15 +5262,15 @@ sub_1ffeh:
 	sbc hl,de

 	ld hl,l20edh

 	jr z,l2031h

-	ld iy,(REG.PC)

+	ld iy,(reg.pc)

 	call disas_get_instrlen

 	jp nc,ERROR

 	ld c,b

 	ld b,000h

-	ld hl,(REG.PC)

+	ld hl,(reg.pc)

 	add hl,bc

 	call sub_09cah

-	ld iy,(REG.PC)

+	ld iy,(reg.pc)

 	ld hl,b_2039_start

 	call lookup_opc

 	ccf

@@ -5330,7 +5334,7 @@ l2093h:
 	rla

 	sbc a,a

 	ld b,a

-	ld hl,(REG.PC)

+	ld hl,(reg.pc)

 	add hl,bc

 	inc hl

 	inc hl

@@ -5456,7 +5460,7 @@ l2151h:
 	ld a,(trace_J_flag)

 	and a

 	jr nz,l216bh

-	ld iy,(REG.PC)

+	ld iy,(reg.pc)

 	call sub_21c8h

 	jr z,l216bh

 	ld hl,b_2048_start