Remove ':count' from cmd_B

1 files changed, 9 insertions, 42 deletions

diff --git a/ddt180.z80 b/ddt180.z80
index 15e272f..67930db 100644
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -51,7 +51,7 @@ STACK_SIZE	equ	80	;ddtz internal stack
 CONBUF_SIZE	equ	80	;Size of console input buffer

 EXPR_BUF_SIZE	equ	128	;expressen buffer for conditional breakpoints

 BP_CNT		equ	12	;Number of breakpoints

-BP_SIZE		equ	6	;Size of a breakpoint record

+BP_SIZE		equ	4	;Size of a breakpoint record

 

 ;-------------------------------------------------------------------------------

 

@@ -1462,11 +1462,10 @@ bp_clr_temporary:
 ;      set breakpoints

 ; > BX

 ;      clear all breakpoints

-; > BX address [address..]

+; > BX breakp [breakp..]

 ;      clear breakpoints

 ;

-; where breakp is:

-;      expression

+; breakp can be any valid expression

 

 cmd_B:

 	call skipbl

@@ -1550,9 +1549,6 @@ bp_enter:
 	pop de

 	ld (ix+002h),l

 	ld (ix+003h),h

-	call bp_get_count

-	ld (ix+004h),l

-	ld (ix+005h),h

 	call next_arg

 	pop af

 	ld (ix+000h),a

@@ -1570,15 +1566,6 @@ bp_get_freeslot:
 error12

 	jp ERROR

 

-bp_get_count:

-	call skipbl

-	ld hl,1

-	cp ':'

-	ret nz

-	inc de

-	call expr

-	jr c,error12

-	ret

 

 ;-------------------------------------------------------------------------------

 ; Breakpoint handling routine.

@@ -1646,32 +1633,14 @@ sub_0913h:
 	ld d,(ix+003h)

 	ld hl,(reg.pc)

 	call cp_hl_de

-	push bc

-	call z,sub_0942h

-	pop bc

-l0938h:

-

-	call	bpl_next

-	ex af,af'

-	ret

-

-sub_0942h:

+	jr nz,l0938h

 	ex af,af'

 	res 7,a

-	ex af,af'

-	ld e,(ix+004h)

-	ld d,(ix+005h)

-	dec de

-	ld a,d

-	or e

-	jr z,l0974h

-	ld (ix+004h),e

-	ld (ix+005h),d

-	ret

-l0974h:

-	ex af,af'

 	or (ix+000h)

 	ex af,af'

+l0938h:

+	call	bpl_next

+	ex af,af'

 	ret

 

 bp_restore_mem:

@@ -1712,8 +1681,6 @@ bp_tst_e:
 

 bp_trace_enter:

 	call bp_get_freeslot

-	ld (ix+004h),001h

-	ld (ix+005h),000h

 	ld (ix+002h),l

 	ld (ix+003h),h

 	ld a,(b_21e2_start)

@@ -3646,7 +3613,7 @@ tc_set_bp:
 	ld de,BDOS

 	and a

 	sbc hl,de

-	ld hl,l20edh

+	ld hl,l20edh		;set break after BDOS call

 	jr z,l2031h

 	ld iy,(reg.pc)

 	call disas_get_instrlen

@@ -3777,7 +3744,7 @@ l20d7h:
 

 l20dch:

 l20edh:

-	ld hl,(reg_sp)

+	ld hl,(reg_sp)		;break on return address

 	ld e,(hl)

 	inc hl

 	ld d,(hl)