Add prstr_inl, print string inline

diff --git a/ddt180.z80 b/ddt180.z80
index 24e2dcc72cf9ddc79a1498b80531a803851cd0c7..75b9b4eedb55cb308b7f1b67a1d8700532c86383 100644 (file)
--- a/ddt180.z80
+++ b/ddt180.z80
@@ -469,15 +469,21 @@ pstr:
        ld c,0                  ;0288   0e 00   . .\r
 l028ah:\r
        ld a,(hl)               ;028a   7e      ~\r
+       inc hl                  ;0291   23      #\r
        and a                   ;028b   a7      .\r
        ret z                   ;028c   c8      .\r
        call outchar            ;028d   cd 5d 02        . ] .\r
        inc c                   ;0290   0c      .\r
-       inc hl                  ;0291   23      #\r
        and a                   ;0292   a7      .\r
        ret m                   ;0293   f8      .\r
        jr l028ah               ;0294   18 f4   . .\r
 \r
+pstr_inl:\r
+       ex      (sp),hl\r
+       call    pstr\r
+       ex      (sp),hl\r
+       ret\r
+\r
 outbl6:\r
        call outbl2             ;0296   cd 9c 02        . . .\r
 outbl4:\r
@@ -497,6 +503,7 @@ crlf:
        ld (con_col),a          ;02b2   32 72 02        2 r .\r
        jp c,mainloop           ;02b5   da bd 00        . . .\r
        ret                     ;02b8   c9      .\r
+\r
 add_hl_a:\r
        add a,l                 ;02b9   85      .\r
        ld l,a                  ;02ba   6f      o\r
@@ -1950,6 +1957,7 @@ l0c30h:
        pop af                  ;0c30   f1      .\r
        pop hl                  ;0c31   e1      .\r
        ret                     ;0c32   c9      .\r
+\r
 l0c33h:\r
        ld b,c                  ;0c33   41      A\r
        call pstr               ;0c34   cd 88 02        . . .\r
@@ -2871,8 +2879,8 @@ read_symfile:
        cp ' '\r
        jp z,p_max_high\r
 \r
-       ld hl,msg_symbols\r
-       call pstr\r
+       call pstr_inl\r
+       db      'SYMBOLS',CR,LF+80h\r
 \r
        dec de\r
        call file_open\r
@@ -2955,24 +2963,17 @@ rs_61:
 ;------------------------------------------------------------------------\r
 \r
 p_max_high0:\r
-       call assert_eol         ;116f   cd d6 02        . . .\r
+       call assert_eol\r
 p_max_high:\r
-       ld hl,msg_high          ;1172   21 8d 11        ! . .\r
-       call pstr               ;1175   cd 88 02        . . .\r
-       ld hl,(high_load)       ;1178   2a 9c 11        * . .\r
-       call out_hl             ;117b   cd 13 02        . . .\r
-       ld hl,msg_max           ;117e   21 94 11        ! . .\r
-       call pstr               ;1181   cd 88 02        . . .\r
-       ld hl,(max_load)        ;1184   2a 9e 11        * . .\r
-       call out_hl             ;1187   cd 13 02        . . .\r
-       jp crlf                 ;118a   c3 a3 02        . . .\r
-\r
-msg_symbols:\r
-       db      'SYMBOLS',CR,LF+80h\r
-msg_high:\r
+       call pstr_inl\r
        DC      'High = '\r
-msg_max:\r
+       ld hl,(high_load)\r
+       call out_hl\r
+       call pstr_inl\r
        DC      '  Max = '\r
+       ld hl,(max_load)\r
+       call out_hl\r
+       jp crlf\r
 \r
 cmd_W:\r
        call get_arg_range      ;11a0   cd 7d 03        . } .\r
@@ -4279,14 +4280,11 @@ p_disas_instr:
        ret                     ;197e   c9      .\r
 \r
 l197fh:\r
-       ld hl,msg_undef_opcode  ;197f   21 89 19        ! . .\r
-       call pstr               ;1982   cd 88 02        . . .\r
-       ld b,001h               ;1985   06 01   . .\r
-       sub a                   ;1987   97      .\r
-       ret                     ;1988   c9      .\r
-\r
-msg_undef_opcode:\r
+       call pstr_inl\r
        DC      '???'\r
+       ld b,001h\r
+       sub a\r
+       ret\r
 \r
 disas_get_instrlen:\r
        sub a                   ;198c   97      .\r
@@ -4783,12 +4781,9 @@ l1c98h:
        jp out_hex              ;1c9d   c3 18 02        . . .\r
 \r
 l1ca0h:\r
-       ld hl,b_1ca9_start      ;1ca0   21 a9 1c        ! . .\r
-       call pstr               ;1ca3   cd 88 02        . . .\r
-       jp p_arg_hlixiy         ;1ca6   c3 7e 1e        . ~ .\r
-\r
-b_1ca9_start:\r
+       call pstr_inl           ;1ca3   cd 88 02        . . .\r
        DC      '(SP),'\r
+       jp p_arg_hlixiy         ;1ca6   c3 7e 1e        . ~ .\r
 \r
 l1caeh:\r
        call p_char_lparen      ;1cb0   cd 5d 02        . ] .\r
@@ -4800,12 +4795,9 @@ p_arg_ex_dehl:
        jp pstr                 ;1cbe   c3 88 02        . . .\r
 \r
 l1cc1h:\r
-       ld hl,b_1cca_start      ;1cc1   21 ca 1c        ! . .\r
-       call pstr               ;1cc4   cd 88 02        . . .\r
-       jp p_arg_hlixiy         ;1cc7   c3 7e 1e        . ~ .\r
-\r
-b_1cca_start:\r
+       call pstr_inl\r
        DC      'SP,'\r
+       jp p_arg_hlixiy\r
 \r
 p_arg_ex_afaf:\r
        ld hl,b_176d_start      ;1ccd   21 6d 17        ! m .\r