Cleanup

1 files changed, 39 insertions, 39 deletions

diff --git a/ddt180.z80 b/ddt180.z80
index 5cf41a9..5275297 100644
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -1152,7 +1152,7 @@ do_factor:
 

 fact_reg.Y:

 	call get.decdigit

-	jr c,error4

+	jr c,error1

 	inc de

 get_y_val:

 	add a,a

@@ -1192,7 +1192,7 @@ l0557h:
 

 fact_reg.CPU:

 	call sub_0caeh

-	jr nc,error4

+	jr nc,error1

 	ld a,(hl)

 	inc hl

 	ld h,(hl)

@@ -1221,10 +1221,10 @@ fact_factinv:
 

 fact_mem:

 	call expr1

-	jr c,error4

+	jr c,error1

 	ld a,(de)

 	cp ')'

-	jr nz,error4

+	jr nz,error1

 	inc de

 	ld a,(hl)

 	inc hl

@@ -1241,12 +1241,12 @@ fact_mem:
 

 expr_brckt:

 	call expr1

-	jr c,error4

+	jr c,error1

 	ld a,(de)

 	cp ']'

 	inc de

 	ret z

-error4:

+error1:

 	jp ERROR

 

 fact_symbol:

@@ -1256,7 +1256,7 @@ fact_symbol:
 fs_nxtsym:

 	ld	a,(hl)			;symlen

 	cp	0c3h

-	jr	z,error4

+	jr	z,error1

 	ld	b,a

 	inc	b

 	push	hl

@@ -1294,7 +1294,7 @@ fs_endstr:
 	ret

 

 t_trmchrs:

-	db	' !#&()*+,-/:;<=>[\]{|}',0

+	db	' !#&()*+,-/:;<=>[\]^{|}~',0

 t_trmchrs_len	equ $ - t_trmchrs

 

 test_termchar:

@@ -2952,7 +2952,7 @@ read_sector:
 	call ddtz_bdos

 	sub a,1

 	jr z,l1132h

-	jr nc,error8

+	jr nc,error2

 l1132h:

 	pop bc

 	pop de

@@ -2964,10 +2964,10 @@ cmdR_storebyte:
 	push de

 	ld de,TPA

 	call cp_hl_de

-	jr c,error8

+	jr c,error2

 	ld de,(BDOS+1)

 	call cp_hl_de

-	jr nc,error8

+	jr nc,error2

 	ld de,(high_load)

 	call cp_hl_de

 	jr c,l1157h

@@ -3012,11 +3012,11 @@ read_hexchar:
 

 read_hexdigit:

 	call read_byte

-	jr z,error8

+	jr z,error2

 hex_digit_v:

 	call hex_digit

 	ret nc

-error8:

+error2:

 	jp ERROR

 

 read_hexbyte:

@@ -3105,7 +3105,7 @@ l10cch:
 	call read_hexchar	; CHKSUM

 	ld a,c

 	and a

-	jr nz,error9

+	jr nz,error3

 	jr l10aeh

 rdhex_done:

 	pop hl

@@ -3156,13 +3156,13 @@ rs_5:	dec	hl		;
 	cp	CR		;

 	jr	z,rs_6		;

 	cp	'!'		; TODO: check for valid symbol char instead

-	jr	c,error9	;

+	jr	c,error3	;

 	ld	(hl),a		;

 	inc	d		; symlen++

 	ld	a,d		;

 	cp	10h+1		;

 	jr	c,rs_5		;

-error9:

+error3:

 	jp	ERROR		;

 

 rs_6:	push	de		; symlen

@@ -3182,7 +3182,7 @@ rs_6:	push	de		; symlen
 

 	ld	de,(max_load)	;

 	call	cp_hl_de	;

-	jr	c,error9	;

+	jr	c,error3	;

 

 	ld	de,(reg_sp)	;

 	call	cp_hl_de	;

@@ -3238,7 +3238,7 @@ l11adh:
 	push bc

 	ld a,(dfcb1+1)

 	cp ' '

-	jr z,error5

+	jr z,error4

 	ld de,dfcb1

 	call setup_fcb

 	push de

@@ -3248,7 +3248,7 @@ l11adh:
 	ld c,BDOS_CREATE

 	call ddtz_bdos

 	inc a

-	jr z,error5

+	jr z,error4

 	pop bc

 	pop hl

 l11cch:

@@ -3277,7 +3277,7 @@ write_sector:
 	and a

 	ret z

 	call close_file

-error5:

+error4:

 	jp ERROR

 

 close_file:

@@ -3530,9 +3530,9 @@ as.TSTIO:
 

 as.IN0:

 	call arg.r_HL_A		;

-	jr nc,error7

+	jr nc,error5

 	cp 006h

-	jr z,error7

+	jr z,error5

 	rlca

 	rlca

 	rlca

@@ -3546,9 +3546,9 @@ as.OUTO:
 	call arg.addr_8bit	;

 	call assert_comma	;

 	call arg.r_HL_A		;

-	jr nc,error7

+	jr nc,error5

 	cp 006h

-	jr z,error7

+	jr z,error5

 	rlca

 	rlca

 	rlca

@@ -3565,12 +3565,12 @@ as.store_io0:
 

 as.MLT:

 	call arg.ww		;

-	jr nc,error7

+	jr nc,error5

 	add a,b

 	ld b,a

 	jp gen.opc.ED2

 

-error7:

+error5:

 	jp ERROR

 

 as.LD:

@@ -4069,7 +4069,7 @@ as.IM:
 	call arg.imm_8bit

 	ld a,l

 	cp 003h

-	jr nc,error2

+	jr nc,error7

 	and a

 	jr z,l16c7h

 	ld b,056h

@@ -4087,14 +4087,14 @@ as.RST:
 	ld b,a

 	pop af

 	and 0c7h

-	jr nz,error2

+	jr nz,error7

 	jp as.opc.noarg

 

 as.POP_PUSH:

 	call arg.IX_IY

 	jr c,l16e7h

 	call arg.zz

-	jr nc,error2

+	jr nc,error7

 	add a,b

 	jp l13ech

 l16e7h:

@@ -4104,9 +4104,9 @@ l16e7h:
 

 as.IN:

 	call arg.r_HL_A

-	jr nc,error2

+	jr nc,error7

 	cp 006h

-	jr z,error2

+	jr z,error7

 	rlca

 	rlca

 	rlca

@@ -4125,7 +4125,7 @@ l170fh:
 	call sub_171bh

 l1715h:

 	jp c,gen.opc.ED2

-error2:

+error7:

 	jp ERROR

 

 sub_171bh:

@@ -4137,9 +4137,9 @@ as.OUT:
 	jr nc,l1739h

 	call assert_comma

 	call arg.r_HL_A

-	jr nc,error2

+	jr nc,error7

 	cp 006h

-	jr z,error2

+	jr z,error7

 	rlca

 	rlca

 	rlca

@@ -4150,7 +4150,7 @@ l1739h:
 	call arg.addr_8bit

 	call assert_comma

 	cp 'A'

-	jr nz,error2

+	jr nz,error7

 	inc de

 	ld b,0d3h

 	jp as.store_2

@@ -4233,7 +4233,7 @@ arg.bit:
 	call arg.imm_8bit

 	ld a,l

 	cp 008h

-	jr nc,error3

+	jr nc,error8

 	ret

 

 arg.j_displ:

@@ -4250,7 +4250,7 @@ arg.j_displ:
 	ld a,h

 	xor l

 	bit 7,a

-	jr nz,error3

+	jr nz,error8

 	ret

 

 arg.addr_8bit:

@@ -4269,14 +4269,14 @@ sub_1802h:
 	ret z

 	inc a

 	ret z

-	jr error3

+	jr error8

 

 test_expr:

 	push bc

 	call expr

 	pop bc

 	ret nc

-error3:

+error8:

 	jp ERROR

 

 arg.zz: