From 4bb547a7aa8504d67450125bcd1c38065277e6b4 Mon Sep 17 00:00:00 2001
From: Leo C
Date: Thu, 29 Nov 2018 20:17:12 +0100
Subject: Renaming

---
 ddt180.z80 | 71 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/ddt180.z80 b/ddt180.z80
index b7503fa..a2c6213 100644
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -75,7 +75,7 @@ ddtz_base:
 	jp ddtz_bdos
 l0003h:
 	rst 30h
-sub_0004h:
+di_or_ei:
 	nop
 	ret
 ddtz_bdos:
@@ -170,7 +170,7 @@ l007ch:
 	ld a,0fbh
 l0093h:
 	ld (reg.iff),a
-	call sub_0004h
+	call di_or_ei
 	ld hl,ddtz_base
 	ld l,000h
 	ld (reg_sp),hl
@@ -1556,18 +1556,19 @@ b_0709_start:
 cmd_G:
 	sub a
 	ld (trace_call_flag),a
-	ld (l0941h),a
+	ld (bp_p_cpu_flag),a
 	call expr
 	jr c,l0740h
 	ld (reg.pc),hl
 l0740h:
 	call skipbl
-	jp z,user_go
+	jr z,user_go0
 	cp ';'
 	jp nz,ERROR
 	inc de
 	ld a,002h
 	call bp_enter
+user_go0:
 	jp user_go
 
 ;-------------------------------------------------------------------------------
@@ -1807,13 +1808,13 @@ bpddtz:
 	push ix
 	push iy
 	ld a,i
-	call sub_0004h
+	call di_or_ei
 	ld h,a
 	ld l,000h
 	push hl
-	ld a,0f3h
+	ld a,0f3h		; EI
 	jp po,l08dfh
-	ld a,0fbh
+	ld a,0fbh		; DI
 l08dfh:
 	ld (reg.iff),a
 	ex af,af'
@@ -1822,18 +1823,18 @@ l08dfh:
 	push bc
 	push de
 	push hl
-	call sub_097ah
+	call bp_restore_mem
 	ld a,(b_21e2_start)
 	dec a
 	jr z,l090bh
-	call inchar
-	jr c,l0902h
+	call inchar		;Keyboard hit?
+	jr c,do_break		;yes
 	call sub_0913h
 	and a
 	jp z,user_go
 	and 083h
 	jp z,l2151h
-l0902h:
+do_break:
 	call bp_clr_temporary
 	call p_cpustat
 	jp mainloop
@@ -1847,7 +1848,7 @@ sub_0913h:
 	ld a,080h
 	ex af,af'
 	sub a
-	ld (l0941h),a
+	ld (bp_p_cpu_flag),a
 	call	bpl_init
 
 	ld a,(ix+000h)
@@ -1891,7 +1892,7 @@ l0969h:
 	bit 4,(ix+000h)
 	ret z
 	ld a,001h
-	ld (l0941h),a
+	ld (bp_p_cpu_flag),a
 	ret
 l0974h:
 	ex af,af'
@@ -1899,7 +1900,7 @@ l0974h:
 	ex af,af'
 	ret
 
-sub_097ah:
+bp_restore_mem:
 	call	bpl_init
 
 	bit 5,(ix+000h)
@@ -1918,7 +1919,7 @@ l099ah:
 	call	bpl_next
 	ret
 
-sub_09a6h:
+bp_tst_@pc:
 	call	bpl_init
 
 	ld a,(ix+000h)
@@ -1936,7 +1937,7 @@ l09c0h:
 	inc a
 	ret
 
-sub_09cah:
+bp_trace_enter:
 	call bp_get_freeslot
 	ld (ix+004h),001h
 	ld (ix+005h),000h
@@ -1985,10 +1986,10 @@ l0a1dh:
 user_go:
 	sub a
 	ld (b_21e2_start),a
-	ld a,(l0941h)
+	ld a,(bp_p_cpu_flag)
 	and a
 	call nz,p_cpustat
-	call sub_09a6h
+	call bp_tst_@pc
 	ld c,007h
 	jr nz,l0a41h
 	ld a,001h
@@ -5718,7 +5719,7 @@ sub_1ffeh:
 	ld b,0
 	ld hl,(reg.pc)
 	add hl,bc
-	call sub_09cah
+	call bp_trace_enter
 	ld iy,(reg.pc)
 	ld hl,b_2039_start
 	call lookup_opc
@@ -5727,7 +5728,7 @@ sub_1ffeh:
 	ex de,hl
 l2031h:
 	call CALL_HL
-	call c,sub_09cah
+	call c,bp_trace_enter
 l2037h:
 	scf
 	ret
@@ -5850,7 +5851,7 @@ l20edh:
 	inc hl
 	ld d,(hl)
 	ex de,hl
-	call sub_09cah
+	call bp_trace_enter
 	and a
 	ret
 
@@ -5917,7 +5918,7 @@ l2137h:
 l2145h:
 	ld (trace_count),hl
 	sub a
-	ld (l0941h),a
+	ld (bp_p_cpu_flag),a
 l214ch:
 	call sub_1ffeh
 	jr l21a3h
@@ -5947,23 +5948,23 @@ l216bh:
 	xor (hl)
 	bit 1,a
 	jr z,l2193h
-l2185h:
-	jp l0902h
+do_break0:				;print registers and go to main loop
+	jp do_break
 l2188h:
 	ld hl,(trace_count)
 	dec hl
 	ld (trace_count),hl
 	ld a,h
 	or l
-	jr z,l2185h
+	jr z,do_break0
 l2193h:
 	call sub_1ffeh
-	jr nc,l2185h
+	jr nc,do_break0
 	ld a,(trace_N_flag)
 	ld b,a
-	ld a,(l0941h)
+	ld a,(bp_p_cpu_flag)
 	or b
-	ld (l0941h),a
+	ld (bp_p_cpu_flag),a
 l21a3h:
 	jp user_go
 
@@ -6007,6 +6008,11 @@ l21dah:
 
 ;-------------------------------------------------------------------------------
 
+con_col:
+	db	0
+
+;-------------------------------------------------------------------------------
+
 b_21e2_start:
 	db	0
 trace_call_flag:
@@ -6020,12 +6026,7 @@ trace_N_flag:
 trace_J_flag:
 	db	0		;0 if 'J'
 
-;-------------------------------------------------------------------------------
-
-con_col:
-	db	0
-
-l0941h:
+bp_p_cpu_flag:
 	db	0
 
 bp_tab:
@@ -6037,8 +6038,6 @@ bp_tab:
 
 expr_p1:
 	dw	expr_buf
-expr_p2:
-	dw	expr_buf
 
 expr_buf:
 current_cseg	defl	$ - current_cseg
-- 
cgit v1.2.3