outchar --> pstr_inl

1 files changed, 36 insertions, 43 deletions

diff --git a/ddt180.z80 b/ddt180.z80
index 8d7cb46..11f42e9 100644
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -235,15 +235,13 @@ exe_hl:
 	jr mainloop

 

 l0146h:

-	ld a,'?'

-	call outchar

+	call	pstr_inl

+	dc	'?'

 	;fall thru

 crlf:

+	call	pstr_inl

+	db	CR,LF+80h

 	call inchar

-	ld a,CR

-	call outchar

-	ld a,LF

-	call outchar

 	ld a,0

 	ld (con_col),a

 	jr c,mainloop

@@ -258,8 +256,8 @@ out.hl.@:
 	or e

 	jr z,l01bfh

 	call outbl

-	ld a,'@'

-	call outchar

+	call	pstr_inl

+	dc	'@'

 	and a

 	sbc hl,de

 	call out_hl

@@ -269,8 +267,8 @@ l01bfh:
 	ret

 

 sub_01d9h:

-	ld a,'-'

-	call outchar

+	call	pstr_inl

+	dc	'-'

 	dec hl

 	jp cpl.hl

 

@@ -283,8 +281,8 @@ out.hl.dec:
 	ld b,006h

 	call sub_01f9h

 	pop hl

-	ld a,'.'

-	call outchar

+	call	pstr_inl

+	dc	'.'

 l01f3h:

 	call outbl

 	djnz l01f3h

@@ -359,8 +357,8 @@ out.ascii:
 	jr nc,l0242h

 	sub 0c0h

 	ex af,af'

-	ld a,'^'

-	call outchar

+	call	pstr_inl

+	dc	'^'

 	ex af,af'

 l0242h:

 	call outchar

@@ -409,17 +407,14 @@ outchar:
 	ret

 

 pstr:

-	ld c,0

-l028ah:

 	ld a,(hl)

 	inc hl

 	and a

 	ret z

 	call outchar

-	inc c

 	and a

 	ret m

-	jr l028ah

+	jr pstr

 

 pstr_inl:

 	ex	(sp),hl

@@ -621,10 +616,8 @@ p_sym_space:
 	jr	z,psb_align

 	bit	7,c

 	jr	z,psb_nd

-	ld	a,' '

-	call	outchar

-	ld	a,'.'

-	call	outchar

+	call	pstr_inl

+	dc	' .'

 psb_nd:

 	call	p_symstr

 

@@ -659,8 +652,8 @@ p_label:
 	call	sym_getname

 	jr	z,pl_e

 	call	p_symstr

-	ld	a,':'

-	call	outchar

+	call	pstr_inl

+	dc	':'

 	call	crlf

 pl_e:

 	pop	hl

@@ -1480,8 +1473,8 @@ p_regs:
 	push bc

 	push de

 	call pstr

-	ld a,'='

-	call outchar

+	call	pstr_inl

+	dc	'='

 	ex (sp),hl

 	ld e,(hl)

 	inc hl

@@ -1664,9 +1657,8 @@ l07cdh:
 	or l

 	jr z,l0805h

 	call outbl4

-	ld a,'I'

-	call outchar

-	call outbl2

+	call	pstr_inl

+	dc	'I  '

 	call pstr

 l0805h:

 	call crlf

@@ -2140,8 +2132,8 @@ l0c30h:
 l0c33h:

 	ld b,c

 	call pstr

-	ld a,'='

-	call outchar

+	call	pstr_inl

+	dc	'='

 	ld a,(de)

 	bit 0,b

 	jp z,out_hex

@@ -4494,9 +4486,8 @@ p_offset:
 	ld a,d

 	or e

 	ret z

-	call p_char_lparen

-	ld a,'@'

-	call outchar

+	call	pstr_inl

+	dc	'(@'

 	and a

 	sbc hl,de

 	call out_hl

@@ -5270,13 +5261,13 @@ l1e4dh:
 	ld a,(iy+001h)

 	and a

 	jp m,l1e61h

-	ld a,'+'

-	call outchar

+	call	pstr_inl

+	dc	'+'

 	ld a,(iy+001h)

 	jr l1e6bh

 l1e61h:

-	ld a,'-'

-	call outchar

+	call	pstr_inl

+	dc	'-'

 	ld a,(iy+001h)

 	neg

 l1e6bh:

@@ -5326,13 +5317,15 @@ p_arg:
 	jp pstr

 

 p_mnemonic:

+	ld	a,(con_col)

+	ld	c,a

 	call pstr

 l1ebch:

-	call outbl

-	inc c

-	ld a,c

-	cp 5

-	jr c,l1ebch

+	call	outbl

+	ld	a,(con_col)

+	sub	c

+	cp	5

+	jr	c,l1ebch

 	ret

 

 t_MNEMONICS: