outchar --> pstr_inl

diff --git a/ddt180.z80 b/ddt180.z80
index 8d7cb466e23bb6ac849b85310f8a08db1b8d46ce..11f42e930ffdd939a1a4ba0cfefed6b3a2861da4 100644 (file)
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -235,15 +235,13 @@ exe_hl:
        jr mainloop\r
 \r
 l0146h:\r
-       ld a,'?'\r
-       call outchar\r
+       call    pstr_inl\r
+       dc      '?'\r
        ;fall thru\r
 crlf:\r
+       call    pstr_inl\r
+       db      CR,LF+80h\r
        call inchar\r
-       ld a,CR\r
-       call outchar\r
-       ld a,LF\r
-       call outchar\r
        ld a,0\r
        ld (con_col),a\r
        jr c,mainloop\r
@@ -258,8 +256,8 @@ out.hl.@:
        or e\r
        jr z,l01bfh\r
        call outbl\r
-       ld a,'@'\r
-       call outchar\r
+       call    pstr_inl\r
+       dc      '@'\r
        and a\r
        sbc hl,de\r
        call out_hl\r
@@ -269,8 +267,8 @@ l01bfh:
        ret\r
 \r
 sub_01d9h:\r
-       ld a,'-'\r
-       call outchar\r
+       call    pstr_inl\r
+       dc      '-'\r
        dec hl\r
        jp cpl.hl\r
 \r
@@ -283,8 +281,8 @@ out.hl.dec:
        ld b,006h\r
        call sub_01f9h\r
        pop hl\r
-       ld a,'.'\r
-       call outchar\r
+       call    pstr_inl\r
+       dc      '.'\r
 l01f3h:\r
        call outbl\r
        djnz l01f3h\r
@@ -359,8 +357,8 @@ out.ascii:
        jr nc,l0242h\r
        sub 0c0h\r
        ex af,af'\r
-       ld a,'^'\r
-       call outchar\r
+       call    pstr_inl\r
+       dc      '^'\r
        ex af,af'\r
 l0242h:\r
        call outchar\r
@@ -409,17 +407,14 @@ outchar:
        ret\r
 \r
 pstr:\r
-       ld c,0\r
-l028ah:\r
        ld a,(hl)\r
        inc hl\r
        and a\r
        ret z\r
        call outchar\r
-       inc c\r
        and a\r
        ret m\r
-       jr l028ah\r
+       jr pstr\r
 \r
 pstr_inl:\r
        ex      (sp),hl\r
@@ -621,10 +616,8 @@ p_sym_space:
        jr      z,psb_align\r
        bit     7,c\r
        jr      z,psb_nd\r
-       ld      a,' '\r
-       call    outchar\r
-       ld      a,'.'\r
-       call    outchar\r
+       call    pstr_inl\r
+       dc      ' .'\r
 psb_nd:\r
        call    p_symstr\r
 \r
@@ -659,8 +652,8 @@ p_label:
        call    sym_getname\r
        jr      z,pl_e\r
        call    p_symstr\r
-       ld      a,':'\r
-       call    outchar\r
+       call    pstr_inl\r
+       dc      ':'\r
        call    crlf\r
 pl_e:\r
        pop     hl\r
@@ -1480,8 +1473,8 @@ p_regs:
        push bc\r
        push de\r
        call pstr\r
-       ld a,'='\r
-       call outchar\r
+       call    pstr_inl\r
+       dc      '='\r
        ex (sp),hl\r
        ld e,(hl)\r
        inc hl\r
@@ -1664,9 +1657,8 @@ l07cdh:
        or l\r
        jr z,l0805h\r
        call outbl4\r
-       ld a,'I'\r
-       call outchar\r
-       call outbl2\r
+       call    pstr_inl\r
+       dc      'I  '\r
        call pstr\r
 l0805h:\r
        call crlf\r
@@ -2140,8 +2132,8 @@ l0c30h:
 l0c33h:\r
        ld b,c\r
        call pstr\r
-       ld a,'='\r
-       call outchar\r
+       call    pstr_inl\r
+       dc      '='\r
        ld a,(de)\r
        bit 0,b\r
        jp z,out_hex\r
@@ -4494,9 +4486,8 @@ p_offset:
        ld a,d\r
        or e\r
        ret z\r
-       call p_char_lparen\r
-       ld a,'@'\r
-       call outchar\r
+       call    pstr_inl\r
+       dc      '(@'\r
        and a\r
        sbc hl,de\r
        call out_hl\r
@@ -5270,13 +5261,13 @@ l1e4dh:
        ld a,(iy+001h)\r
        and a\r
        jp m,l1e61h\r
-       ld a,'+'\r
-       call outchar\r
+       call    pstr_inl\r
+       dc      '+'\r
        ld a,(iy+001h)\r
        jr l1e6bh\r
 l1e61h:\r
-       ld a,'-'\r
-       call outchar\r
+       call    pstr_inl\r
+       dc      '-'\r
        ld a,(iy+001h)\r
        neg\r
 l1e6bh:\r
@@ -5326,13 +5317,15 @@ p_arg:
        jp pstr\r
 \r
 p_mnemonic:\r
+       ld      a,(con_col)\r
+       ld      c,a\r
        call pstr\r
 l1ebch:\r
-       call outbl\r
-       inc c\r
-       ld a,c\r
-       cp 5\r
-       jr c,l1ebch\r
+       call    outbl\r
+       ld      a,(con_col)\r
+       sub     c\r
+       cp      5\r
+       jr      c,l1ebch\r
        ret\r
 \r
 t_MNEMONICS:\r