diff options
| author | Leo C | 2016-08-04 13:53:44 +0200 |
|---|---|---|
| committer | Leo C | 2016-08-04 13:53:44 +0200 |
| commit | f2bb0732ed7638599962fbdaa5ad0a2a72eafe4f (patch) | |
| tree | 642646691de7c1e2fc9ae0602355f678d77b7938 | |
| parent | 990f66ca70c01178f95bac31a2c039c4082b1fb6 (diff) | |
| parent | 25a690e55795985e3849d423955af71a40d1e06e (diff) | |
| download | ddt180-Original.zip | |
Merge branch 'master' into OriginalOriginal
# Conflicts:
# ddtz.z80
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | ddtz.z80 | 369 |
2 files changed, 199 insertions, 175 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dff828a --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +scratch +*.lst +*.rel +*.prl +*.com @@ -1261,54 +1261,54 @@ l0625h: sub '0' ;062a d6 30 . 0
ret ;062c c9 .
-prnt_cpustat0:
+p_cpustat0:
call assert_eol ;062d cd d6 02 . . .
-prnt_cpustat:
- call prnt_f ;0630 cd 6e 06 . n .
+p_cpustat:
+ call p_f ;0630 cd 6e 06 . n .
call outbl2 ;0633 cd 9c 02 . . .
ld hl,b_06e9_start ;0636 21 e9 06 ! . .
ld de,b_0709_start ;0639 11 09 07 . . .
ld b,6 ;063c 06 06 . .
l063eh:
- call prnt_regs ;063e cd b2 06 . . .
+ call p_regs ;063e cd b2 06 . . .
djnz l063eh ;0641 10 fb . .
push hl ;0643 e5 .
push de ;0644 d5 .
ld iy,(REG.PC) ;0645 fd 2a 60 00 . * ` .
- call prnt_disas_instr ;0649 cd 65 19 . e .
+ call p_disas_instr ;0649 cd 65 19 . e .
exx ;064c d9 .
ex af,af' ;064d 08 .
call crlf ;064e cd a3 02 . . .
- call prnt_f2 ;0651 cd 81 06 . . .
+ call p_f2 ;0651 cd 81 06 . . .
call outbl2 ;0654 cd 9c 02 . . .
pop de ;0657 d1 .
pop hl ;0658 e1 .
ld b,7 ;0659 06 07 . .
l065bh:
- call prnt_regs ;065b cd b2 06 . . .
+ call p_regs ;065b cd b2 06 . . .
djnz l065bh ;065e 10 fb . .
exx ;0660 d9 .
ex af,af' ;0661 08 .
and a ;0662 a7 .
jr z,l066bh ;0663 28 06 ( .
call outbl6 ;0665 cd 96 02 . . .
- call prnt_offset ;0668 cd 49 19 . I .
+ call p_offset ;0668 cd 49 19 . I .
l066bh:
jp crlf ;066b c3 a3 02 . . .
-prnt_f:
+p_f:
ld a,(reg.f) ;066e 3a 54 00 : T .
- call prnt_flags ;0671 cd 8a 06 . . .
+ call p_flags ;0671 cd 8a 06 . . .
ld a,(reg.iff) ;0674 3a 5e 00 : ^ .
cp 0f3h ;0677 fe f3 . .
jp z,outbl ;0679 ca 9f 02 . . .
ld a,'E' ;067c 3e 45 > E
jp outchar ;067e c3 5d 02 . ] .
-prnt_f2:
+p_f2:
ld a,(reg.f2) ;0681 3a 4c 00 : L .
- call prnt_flags ;0684 cd 8a 06 . . .
+ call p_flags ;0684 cd 8a 06 . . .
jp outbl ;0687 c3 9f 02 . . .
-prnt_flags:
+p_flags:
ld b,a ;068a 47 G
ld a,'S' ;068b 3e 53 > S
call sub_06aah ;068d cd aa 06 . . .
@@ -1327,7 +1327,8 @@ sub_06aah: rl b ;06aa cb 10 . .
jp c,outchar ;06ac da 5d 02 . ] .
jp outbl ;06af c3 9f 02 . . .
-prnt_regs:
+
+p_regs:
push bc ;06b2 c5 .
push de ;06b3 d5 .
call pstr ;06b4 cd 88 02 . . .
@@ -1665,7 +1666,7 @@ l08dfh: jp z,l2151h ;08ff ca 51 21 . Q !
l0902h:
call bp_clr_temporary ;0902 cd 54 07 . T .
- call prnt_cpustat ;0905 cd 30 06 . 0 .
+ call p_cpustat ;0905 cd 30 06 . 0 .
jp mainloop ;0908 c3 bd 00 . . .
l090bh:
@@ -1826,7 +1827,7 @@ user_go: ld (b_21e2_start),a ;0a26 32 e2 21 2 . !
ld a,(l0941h) ;0a29 3a 41 09 : A .
and a ;0a2c a7 .
- call nz,prnt_cpustat ;0a2d c4 30 06 . 0 .
+ call nz,p_cpustat ;0a2d c4 30 06 . 0 .
call sub_09a6h ;0a30 cd a6 09 . . .
ld c,007h ;0a33 0e 07 . .
jr nz,l0a41h ;0a35 20 0a .
@@ -1982,7 +1983,7 @@ sub_0bdch: cmd_X:
call skipbl ;0bf1 cd bf 02 . . .
call sub_0caeh ;0bf4 cd ae 0c . . .
- jp nc,prnt_cpustat0 ;0bf7 d2 2d 06 . - .
+ jp nc,p_cpustat0 ;0bf7 d2 2d 06 . - .
call assert_eol ;0bfa cd d6 02 . . .
ld a,b ;0bfd 78 x
cp 01eh ;0bfe fe 1e . .
@@ -2036,7 +2037,7 @@ l0c33h: jp out.hl.@ ;0c4c c3 a4 01 . . .
l0c4fh:
- call prnt_f ;0c4f cd 6e 06 . n .
+ call p_f ;0c4f cd 6e 06 . n .
ld a,0f3h ;0c52 3e f3 > .
ld (reg.iff),a ;0c54 32 5e 00 2 ^ .
scf ;0c57 37 7
@@ -2044,7 +2045,7 @@ l0c4fh: ld (reg.f),a ;0c5b 32 54 00 2 T .
ret ;0c5e c9 .
l0c5fh:
- call prnt_f2 ;0c5f cd 81 06 . . .
+ call p_f2 ;0c5f cd 81 06 . . .
and a ;0c62 a7 .
call sub_0c6ah ;0c63 cd 6a 0c . j .
ld (reg.f2),a ;0c66 32 4c 00 2 L .
@@ -2349,7 +2350,7 @@ l0e1fh: cmd_H:
call expr ;0e3d cd be 03 . . .
- jp c,prnt_max_high0 ;0e40 da 6f 11 . o .
+ jp c,p_max_high0 ;0e40 da 6f 11 . o .
call next_arg ;0e43 cd ca 02 . . .
push hl ;0e46 e5 .
call expr ;0e47 cd be 03 . . .
@@ -2764,7 +2765,7 @@ read_file: l108eh:
call read_sector ;108e cd 21 11 . ! .
pop hl ;1091 e1 .
- jp z,prnt_max_high ;1092 ca 72 11 . r .
+ jp z,p_max_high ;1092 ca 72 11 . r .
ld de,DMA_BUF ;1095 11 80 00 . . .
ld b,080h ;1098 06 80 . .
l109ah:
@@ -2816,7 +2817,7 @@ l10cch: jr l10aeh ;10e2 18 ca . .
rdhex_done:
pop hl ;10e4 e1 .
- jp prnt_max_high ;10e5 c3 72 11 . r .
+ jp p_max_high ;10e5 c3 72 11 . r .
read_hexchar:
call read_hexdigit ;10e8 cd f9 10 . . .
@@ -2912,9 +2913,9 @@ strncmp: djnz strncmp ;116c 10 f9 . .
ret ;116e c9 .
-prnt_max_high0:
+p_max_high0:
call assert_eol ;116f cd d6 02 . . .
-prnt_max_high:
+p_max_high:
ld hl,msg_high ;1172 21 8d 11 ! . .
call pstr ;1175 cd 88 02 . . .
ld hl,(high_load) ;1178 2a 9c 11 * . .
@@ -3009,7 +3010,7 @@ l1211h: ld (last_A),hl ;1214 22 64 12 " d .
ld (l0062h),hl ;1217 22 62 00 " b .
push hl ;121a e5 .
- call prnt_disas_line ;121b cd 2d 19 . - .
+ call p_disas_line ;121b cd 2d 19 . - .
pop iy ;121e fd e1 . .
ld c,b ;1220 48 H
ld de,(offs.@) ;1221 ed 5b 64 00 . [ d .
@@ -4084,7 +4085,7 @@ l18ebh: push iy ;18ec fd e5 . .
pop hl ;18ee e1 .
push hl ;18ef e5 .
- call prnt_disas_line ;18f0 cd 2d 19 . - .
+ call p_disas_line ;18f0 cd 2d 19 . - .
call crlf ;18f3 cd a3 02 . . .
pop iy ;18f6 fd e1 . .
ld c,b ;18f8 48 H
@@ -4107,7 +4108,7 @@ l190fh: push iy ;1910 fd e5 . .
pop hl ;1912 e1 .
push hl ;1913 e5 .
- call prnt_disas_line ;1914 cd 2d 19 . - .
+ call p_disas_line ;1914 cd 2d 19 . - .
call crlf ;1917 cd a3 02 . . .
pop iy ;191a fd e1 . .
ld e,b ;191c 58 X
@@ -4121,13 +4122,13 @@ l190fh: ret c ;192a d8 .
jr l190fh ;192b 18 e2 . .
-prnt_disas_line:
+p_disas_line:
call out.hl.@ ;192d cd a4 01 . . .
call z,outbl ;1930 cc 9f 02 . . .
call outbl ;1933 cd 9f 02 . . .
sub a ;1936 97 .
ld (con_col),a ;1937 32 72 02 2 r .
- call prnt_disas_instr ;193a cd 65 19 . e .
+ call p_disas_instr ;193a cd 65 19 . e .
and a ;193d a7 .
ret z ;193e c8 .
@@ -4137,7 +4138,7 @@ l193fh: cp 16 ;1945 fe 10 . .
jr c,l193fh ;1947 38 f6 8 .
-prnt_offset:
+p_offset:
ld de,(offs.@) ;1949 ed 5b 64 00 . [ d .
ld a,d ;194d 7a z
or e ;194e b3 .
@@ -4152,15 +4153,15 @@ prnt_offset: ld a,')' ;1960 3e 29 > )
jp outchar ;1962 c3 5d 02 . ] .
-prnt_disas_instr:
+p_disas_instr:
sub a ;1965 97 .
ld (l1ffdh),a ;1966 32 fd 1f 2 . .
call disas_get_instrlen ;1969 cd 8c 19 . . .
jr nc,l197fh ;196c 30 11 0 .
push bc ;196e c5 .
- call prnt_mnemonic ;196f cd b9 1e . . .
+ call p_mnemonic ;196f cd b9 1e . . .
ex de,hl ;1972 eb .
- call sub_19c1h ;1973 cd c1 19 . . .
+ call CALL_HL2 ;1973 cd c1 19 . . .
pop bc ;1976 c1 .
ld a,(l1ffdh) ;1977 3a fd 1f : . .
ld hl,(l1ffbh) ;197a 2a fb 1f * . .
@@ -4209,7 +4210,7 @@ l19b1h: scf ;19bf 37 7
ret ;19c0 c9 .
-sub_19c1h:
+CALL_HL2:
jp (hl) ;19c1 e9 .
disas_pfx.DDFD:
@@ -4415,51 +4416,51 @@ b_1ab6_start: ; dw argument formating fuction
b_1ad1_start:
db 0c0h,040h,056h ;ld r,r
- dw l1c88h
+ dw p_arg_r_r
db 0f8h,080h,003h ;add a,r
- dw l1c91h
+ dw p_arg_a_r
db 0f8h,088h,000h ;adc a,r
- dw l1c91h
- db 0f8h,090h,0c9h ;
- dw l1e30h
- db 0f8h,098h,0b7h ;
- dw l1c91h
- db 0f8h,0a0h,006h ;
- dw l1e30h
- db 0f8h,0a8h,0cch ;
- dw l1e30h
- db 0f8h,0b0h,06ch ;
- dw l1e30h
- db 0f8h,0b8h,013h ;
- dw l1e30h
+ dw p_arg_a_r
+ db 0f8h,090h,0c9h ;sub r
+ dw p_arg_rs
+ db 0f8h,098h,0b7h ;sbc a,r
+ dw p_arg_a_r
+ db 0f8h,0a0h,006h ;and r
+ dw p_arg_rs
+ db 0f8h,0a8h,0cch ;xor r
+ dw p_arg_rs
+ db 0f8h,0b0h,06ch ;or r
+ dw p_arg_rs
+ db 0f8h,0b8h,013h ;cp r
+ dw p_arg_rs
db 0c7h,0c0h,08bh ;ret cc
- dw prnt_arg_cc
+ dw p_arg_cc
db 0c7h,0c7h,0b4h ;rst
dw l1c98h
db 0ffh,0c9h,08bh ;ret
dw l1c97h
db 0cfh,0c1h,081h ;pop rr
- dw prnt_arg_zz
+ dw p_arg_zz
db 0cfh,0c5h,084h ;push rr
- dw prnt_arg_zz
+ dw p_arg_zz
db 0ffh,0e3h,034h ;ex (sp),hl
dw l1ca0h
db 0ffh,0e9h,052h ;jp (hl)
dw l1caeh
db 0ffh,0ebh,034h ;ex de,hl
- dw l1cbbh
+ dw p_arg_ex_dehl
db 0ffh,0f9h,056h ;ld sp,hl
dw l1cc1h
db 0cfh,003h,041h ;inc rr
- dw prnt_arg_ww
+ dw p_arg_ww
db 0cfh,00bh,029h ;dec rr
- dw prnt_arg_ww
+ dw p_arg_ww
db 0c7h,004h,041h ;inc r
- dw l1e28h
+ dw p_arg_r
db 0c7h,005h,029h ;dec r
- dw l1e28h
+ dw p_arg_r
db 0ffh,008h,034h ;ex af,af'
- dw l1ccdh
+ dw p_arg_ex_afaf
db 0cfh,009h,003h ;add hl,rr
dw l1cd3h
db 0efh,002h,056h ;ld (rr),a ;rr=bc,de
@@ -4502,24 +4503,24 @@ b_1b54_start: ; 3 byte opcodes
b_1b9b_start:
- db 0c7h,0c2h,052h ;
- dw l1d42h
- db 0c7h,0c4h,00ch ;
- dw l1d42h
- db 0cfh,001h,056h ;
- dw l1d5ah
- db 0ffh,0c3h,052h ;
- dw l1d48h
- db 0ffh,0cdh,00ch ;
- dw l1d48h
- db 0ffh,022h,056h ;
- dw l1d62h
- db 0ffh,02ah,056h ;
- dw l1d6bh
- db 0ffh,032h,056h ;
- dw l1d74h
- db 0ffh,03ah,056h ;
- dw l1d7fh
+ db 0c7h,0c2h,052h ;jp cc,mn
+ dw p_arg_cc_mn
+ db 0c7h,0c4h,00ch ;call cc,mn
+ dw p_arg_cc_mn
+ db 0cfh,001h,056h ;ld ww,mn
+ dw p_arg_ww_mn
+ db 0ffh,0c3h,052h ;jp mn
+ dw p_arg_mn
+ db 0ffh,0cdh,00ch ;call mn
+ dw p_arg_mn
+ db 0ffh,022h,056h ;ld (mn),hl
+ dw p_arg_addr_hl
+ db 0ffh,02ah,056h ;ld hl,(mn)
+ dw p_arg_hl_addr
+ db 0ffh,032h,056h ;ld (mn),a
+ dw p_arg_addr_a
+ db 0ffh,03ah,056h ;ld a,(mn)
+ dw p_arg_a_addr
db 0
; Prefix ED + 1 byte opcode, no arguments
@@ -4550,17 +4551,17 @@ b_1bc9_start: b_1bf4_start:
db 0e7h,040h,03fh ;in r,(c) ;r=b,c,d,e
- dw l1db3h ;
+ dw p_arg_in_c ;
db 0f7h,060h,03fh ;in r,(c) ;r=h,l
- dw l1db3h ;
+ dw p_arg_in_c ;
db 0ffh,078h,03fh ;in r,(c) ;r=a
- dw l1db3h ;
+ dw p_arg_in_c ;
db 0e7h,041h,076h ;out (c),r ;r=b,c,d,e
- dw l1dbfh ;
+ dw p_arg_out_c ;
db 0f7h,061h,076h ;out (c),r ;r=h,l
- dw l1dbfh ;
+ dw p_arg_out_c ;
db 0ffh,079h,076h ;out (c),r ;r=a
- dw l1dbfh ;
+ dw p_arg_out_c ;
db 0cfh,042h,0b7h ;sbc hl,rr
dw l1dcah ;
db 0cfh,04ah,000h ;adc hl,rr
@@ -4583,13 +4584,13 @@ b_1bf4_start: b_1c40_start:
db 0efh,043h,056h ;ld (mn),ww ;ww=bc,de
- dw l1dd3h
+ dw p_arg_addr_ww
db 0ffh,073h,056h ;ld (mn),sp
- dw l1dd3h
+ dw p_arg_addr_ww
db 0efh,04bh,056h ;ld ww,(mn) ;ww=bc,de
- dw l1ddch
+ dw p_arg_ww_addr
db 0ffh,07bh,056h ;ld sp,(mn)
- dw l1ddch
+ dw p_arg_ww_addr
db 0
; CB
@@ -4609,75 +4610,80 @@ b_1c55_start: db 0f8h,038h,0c6h ;srl g
dw l1e03h
db 0c0h,040h,009h ;bit b,g
- dw l1de4h
+ dw p_arg_bitop
db 0c0h,080h,088h ;res b,g
- dw l1de4h
+ dw p_arg_bitop
db 0c0h,0c0h,0bdh ;set b,g
- dw l1de4h
+ dw p_arg_bitop
db 0
-l1c88h:
- call l1e28h ;1c88 cd 28 1e . ( .
- call prnt_char_comma ;1c8b cd b4 1e . . .
- jp l1e30h ;1c8e c3 30 1e . 0 .
-l1c91h:
- call prnt_A_comma ;1c91 cd b1 1e . . .
- jp l1e30h ;1c94 c3 30 1e . 0 .
+p_arg_r_r:
+ call p_arg_r ;1c88 cd 28 1e . ( .
+ call p_char_comma ;1c8b cd b4 1e . . .
+ jp p_arg_rs ;1c8e c3 30 1e . 0 .
+p_arg_a_r:
+ call p_A_comma ;1c91 cd b1 1e . . .
+ jp p_arg_rs ;1c94 c3 30 1e . 0 .
l1c97h:
ret ;1c97 c9 .
l1c98h:
ld a,(iy+000h) ;1c98 fd 7e 00 . ~ .
and 038h ;1c9b e6 38 . 8
jp out_hex ;1c9d c3 18 02 . . .
+
l1ca0h:
ld hl,b_1ca9_start ;1ca0 21 a9 1c ! . .
call pstr ;1ca3 cd 88 02 . . .
- jp prnt_arg_hlixiy ;1ca6 c3 7e 1e . ~ .
+ jp p_arg_hlixiy ;1ca6 c3 7e 1e . ~ .
b_1ca9_start:
DC '(SP),'
+
l1caeh:
ld a,'(' ;1cae 3e 28 > (
call outchar ;1cb0 cd 5d 02 . ] .
- call prnt_arg_hlixiy ;1cb3 cd 7e 1e . ~ .
+ call p_arg_hlixiy ;1cb3 cd 7e 1e . ~ .
ld a,')' ;1cb6 3e 29 > )
jp outchar ;1cb8 c3 5d 02 . ] .
-l1cbbh:
+p_arg_ex_dehl:
ld hl,l1773h ;1cbb 21 73 17 ! s .
jp pstr ;1cbe c3 88 02 . . .
+
l1cc1h:
ld hl,b_1cca_start ;1cc1 21 ca 1c ! . .
call pstr ;1cc4 cd 88 02 . . .
- jp prnt_arg_hlixiy ;1cc7 c3 7e 1e . ~ .
+ jp p_arg_hlixiy ;1cc7 c3 7e 1e . ~ .
b_1cca_start:
DC 'SP,'
-l1ccdh:
+
+p_arg_ex_afaf:
ld hl,b_176d_start ;1ccd 21 6d 17 ! m .
jp pstr ;1cd0 c3 88 02 . . .
+
l1cd3h:
- call prnt_arg_hlixiy ;1cd3 cd 7e 1e . ~ .
- call prnt_char_comma ;1cd6 cd b4 1e . . .
- jp prnt_arg_ww ;1cd9 c3 8b 1e . . .
+ call p_arg_hlixiy ;1cd3 cd 7e 1e . ~ .
+ call p_char_comma ;1cd6 cd b4 1e . . .
+ jp p_arg_ww ;1cd9 c3 8b 1e . . .
l1cdch:
call sub_1ce8h ;1cdc cd e8 1c . . .
- call prnt_char_comma ;1cdf cd b4 1e . . .
- jp prnt_char_A ;1ce2 c3 3d 1d . = .
+ call p_char_comma ;1cdf cd b4 1e . . .
+ jp p_char_A ;1ce2 c3 3d 1d . = .
l1ce5h:
- call prnt_A_comma ;1ce5 cd b1 1e . . .
+ call p_A_comma ;1ce5 cd b1 1e . . .
sub_1ce8h:
ld a,'(' ;1ce8 3e 28 > (
call outchar ;1cea cd 5d 02 . ] .
- call prnt_arg_ww ;1ced cd 8b 1e . . .
+ call p_arg_ww ;1ced cd 8b 1e . . .
ld a,')' ;1cf0 3e 29 > )
jp outchar ;1cf2 c3 5d 02 . ] .
l1cf5h:
- call prnt_A_comma ;1cf5 cd b1 1e . . .
+ call p_A_comma ;1cf5 cd b1 1e . . .
jr l1d09h ;1cf8 18 0f . .
l1cfah:
- call l1e28h ;1cfa cd 28 1e . ( .
- call prnt_char_comma ;1cfd cd b4 1e . . .
+ call p_arg_r ;1cfa cd 28 1e . ( .
+ call p_char_comma ;1cfd cd b4 1e . . .
ld a,(isprefix_ixiy) ;1d00 3a f8 1f : . .
and a ;1d03 a7 .
ld a,(iy+002h) ;1d04 fd 7e 02 . ~ .
@@ -4690,8 +4696,8 @@ l1d0ch: l1d0fh:
ld a,(iy+000h) ;1d0f fd 7e 00 . ~ .
and 018h ;1d12 e6 18 . .
- call prnt_arg_cc0 ;1d14 cd a0 1e . . .
- call prnt_char_comma ;1d17 cd b4 1e . . .
+ call p_arg_cc0 ;1d14 cd a0 1e . . .
+ call p_char_comma ;1d17 cd b4 1e . . .
l1d1ah:
ld c,(iy+001h) ;1d1a fd 4e 01 . N .
ld a,c ;1d1d 79 y
@@ -4705,7 +4711,7 @@ l1d1ah: inc hl ;1d26 23 #
jr l1d4eh ;1d27 18 25 . %
l1d29h:
- call prnt_A_comma ;1d29 cd b1 1e . . .
+ call p_A_comma ;1d29 cd b1 1e . . .
sub_1d2ch:
ld a,'(' ;1d2c 3e 28 > (
call outchar ;1d2e cd 5d 02 . ] .
@@ -4713,15 +4719,15 @@ sub_1d2ch: jp l1e6bh ;1d34 c3 6b 1e . k .
l1d37h:
call sub_1d2ch ;1d37 cd 2c 1d . , .
- call prnt_char_comma ;1d3a cd b4 1e . . .
-prnt_char_A:
+ call p_char_comma ;1d3a cd b4 1e . . .
+p_char_A:
ld a,'A' ;1d3d 3e 41 > A
jp outchar ;1d3f c3 5d 02 . ] .
-l1d42h:
- call prnt_arg_cc ;1d42 cd 9d 1e . . .
- call prnt_char_comma ;1d45 cd b4 1e . . .
-l1d48h:
+p_arg_cc_mn:
+ call p_arg_cc ;1d42 cd 9d 1e . . .
+ call p_char_comma ;1d45 cd b4 1e . . .
+p_arg_mn:
ld l,(iy+001h) ;1d48 fd 6e 01 . n .
ld h,(iy+002h) ;1d4b fd 66 02 . f .
l1d4eh:
@@ -4731,25 +4737,28 @@ sub_1d50h: ld (l1ffbh),hl ;1d53 22 fb 1f " . .
call out_hl ;1d56 cd 13 02 . . .
ret ;1d59 c9 .
-l1d5ah:
- call prnt_arg_ww ;1d5a cd 8b 1e . . .
- call prnt_char_comma ;1d5d cd b4 1e . . .
- jr l1d48h ;1d60 18 e6 . .
-l1d62h:
+p_arg_ww_mn:
+ call p_arg_ww ;1d5a cd 8b 1e . . .
+ call p_char_comma ;1d5d cd b4 1e . . .
+ jr p_arg_mn ;1d60 18 e6 . .
+
+p_arg_addr_hl:
call sub_1e13h ;1d62 cd 13 1e . . .
- call prnt_char_comma ;1d65 cd b4 1e . . .
- jp prnt_arg_hlixiy ;1d68 c3 7e 1e . ~ .
-l1d6bh:
- call prnt_arg_hlixiy ;1d6b cd 7e 1e . ~ .
- call prnt_char_comma ;1d6e cd b4 1e . . .
+ call p_char_comma ;1d65 cd b4 1e . . .
+ jp p_arg_hlixiy ;1d68 c3 7e 1e . ~ .
+p_arg_hl_addr:
+ call p_arg_hlixiy ;1d6b cd 7e 1e . ~ .
+ call p_char_comma ;1d6e cd b4 1e . . .
jp sub_1e13h ;1d71 c3 13 1e . . .
-l1d74h:
+
+p_arg_addr_a:
call sub_1e13h ;1d74 cd 13 1e . . .
- call prnt_char_comma ;1d77 cd b4 1e . . .
+p_char_comma_A:
+ call p_char_comma ;1d77 cd b4 1e . . .
ld a,'A' ;1d7a 3e 41 > A
- jp outchar ;1d7c c3 5d 02 . ] .
-l1d7fh:
- call prnt_A_comma ;1d7f cd b1 1e . . .
+ jp outchar ;1d87 18 06 . .
+p_arg_a_addr:
+ call p_A_comma ;1d7f cd b1 1e . . .
jp sub_1e13h ;1d82 c3 13 1e . . .
l1d85h:
ld a,'0' ;1d85 3e 30 > 0
@@ -4784,29 +4793,34 @@ l1dadh: l1db0h:
DC 'A,R'
-l1db3h:
- call l1e28h ;1db3 cd 28 1e . ( .
- call prnt_char_comma ;1db6 cd b4 1e . . .
+p_arg_in_c:
+ call p_arg_r ;1db3 cd 28 1e . ( .
+ call p_char_comma ;1db6 cd b4 1e . . .
ld hl,t__C_ ;1db9 21 f4 1f ! . .
jp pstr ;1dbc c3 88 02 . . .
-l1dbfh:
+
+p_arg_out_c:
ld hl,t__C_ ;1dbf 21 f4 1f ! . .
call pstr ;1dc2 cd 88 02 . . .
- call prnt_char_comma ;1dc5 cd b4 1e . . .
- jr l1e28h ;1dc8 18 5e . ^
+ call p_char_comma ;1dc5 cd b4 1e . . .
+ jr p_arg_r ;1dc8 18 5e . ^
+
l1dcah:
- call prnt_arg_hlixiy ;1dca cd 7e 1e . ~ .
- call prnt_char_comma ;1dcd cd b4 1e . . .
- jp prnt_arg_ww ;1dd0 c3 8b 1e . . .
-l1dd3h:
+ call p_arg_hlixiy ;1dca cd 7e 1e . ~ .
+ call p_char_comma ;1dcd cd b4 1e . . .
+ jp p_arg_ww ;1dd0 c3 8b 1e . . .
+
+p_arg_addr_ww:
call sub_1e13h ;1dd3 cd 13 1e . . .
- call prnt_char_comma ;1dd6 cd b4 1e . . .
- jp prnt_arg_ww ;1dd9 c3 8b 1e . . .
-l1ddch:
- call prnt_arg_ww ;1ddc cd 8b 1e . . .
- call prnt_char_comma ;1ddf cd b4 1e . . .
+ call p_char_comma ;1dd6 cd b4 1e . . .
+ jp p_arg_ww ;1dd9 c3 8b 1e . . .
+
+p_arg_ww_addr:
+ call p_arg_ww ;1ddc cd 8b 1e . . .
+ call p_char_comma ;1ddf cd b4 1e . . .
jr sub_1e13h ;1de2 18 2f . /
-l1de4h:
+
+p_arg_bitop:
ld a,(isprefix_ixiy) ;1de4 3a f8 1f : . .
and a ;1de7 a7 .
jr nz,l1defh ;1de8 20 05 .
@@ -4822,9 +4836,10 @@ l1df2h: and 007h ;1df6 e6 07 . .
add a,'0' ;1df8 c6 30 . 0
call outchar ;1dfa cd 5d 02 . ] .
- call prnt_char_comma ;1dfd cd b4 1e . . .
+ call p_char_comma ;1dfd cd b4 1e . . .
pop af ;1e00 f1 .
- jr l1e33h ;1e01 18 30 . 0
+ jr p_arg_r0 ;1e01 18 30 . 0
+
l1e03h:
ld a,(isprefix_ixiy) ;1e03 3a f8 1f : . .
and a ;1e06 a7 .
@@ -4834,7 +4849,8 @@ l1e03h: l1e0eh:
ld a,(iy+002h) ;1e0e fd 7e 02 . ~ .
l1e11h:
- jr l1e33h ;1e11 18 20 .
+ jr p_arg_r0 ;1e11 18 20 .
+
sub_1e13h:
ld a,'(' ;1e13 3e 28 > (
call outchar ;1e15 cd 5d 02 . ] .
@@ -4842,24 +4858,27 @@ sub_1e13h: ld h,(iy+002h) ;1e1b fd 66 02 . f .
ld a,001h ;1e1e 3e 01 > .
call sub_1d50h ;1e20 cd 50 1d . P .
+
+p_char_rparen:
ld a,')' ;1e23 3e 29 > )
jp outchar ;1e25 c3 5d 02 . ] .
-l1e28h:
+
+p_arg_r:
ld a,(iy+000h) ;1e28 fd 7e 00 . ~ .
rra ;1e2b 1f .
rra ;1e2c 1f .
rra ;1e2d 1f .
- jr l1e33h ;1e2e 18 03 . .
-l1e30h:
+ jr p_arg_r0 ;1e2e 18 03 . .
+p_arg_rs:
ld a,(iy+000h) ;1e30 fd 7e 00 . ~ .
-l1e33h:
+p_arg_r0:
and 007h ;1e33 e6 07 . .
cp 006h ;1e35 fe 06 . .
- jr nz,prnt_arg_r ;1e37 20 3a :
+ jr nz,p_arg_r1 ;1e37 20 3a :
ld a,(isprefix_ixiy) ;1e39 3a f8 1f : . .
and a ;1e3c a7 .
ld a,006h ;1e3d 3e 06 > .
- jr z,prnt_arg_r ;1e3f 28 32 ( 2
+ jr z,p_arg_r1 ;1e3f 28 32 ( 2
ld hl,b_1e78_start ;1e41 21 78 1e ! x .
ld a,(isprefix_ixiy) ;1e44 3a f8 1f : . .
dec a ;1e47 3d =
@@ -4884,23 +4903,23 @@ l1e6bh: ld a,')' ;1e6e 3e 29 > )
jp outchar ;1e70 c3 5d 02 . ] .
-prnt_arg_r:
+p_arg_r1:
ld hl,t_BCDEHL_HL_A ;1e73 21 96 1f ! . .
- jr prnt_arg ;1e76 18 32 . 2
+ jr p_arg ;1e76 18 32 . 2
b_1e78_start:
DC '(IX'
l1e7bh:
DC '(IY'
-prnt_arg_hlixiy:
+p_arg_hlixiy:
ld a,(isprefix_ixiy) ;1e7e 3a f8 1f : . .
ld hl,t_HL.IX.IY ;1e81 21 c6 1f ! . .
- jr prnt_arg ;1e84 18 24 . $
-prnt_arg_zz:
+ jr p_arg ;1e84 18 24 . $
+p_arg_zz:
ld hl,t_BC.DE.HL.AF ;1e86 21 ab 1f ! . .
jr l1e8eh ;1e89 18 03 . .
-prnt_arg_ww:
+p_arg_ww:
ld hl,t_BC.DE.HL.SP ;1e8b 21 a2 1f ! . .
l1e8eh:
ld a,(iy+000h) ;1e8e fd 7e 00 . ~ .
@@ -4910,12 +4929,12 @@ l1e8eh: rra ;1e94 1f .
and 003h ;1e95 e6 03 . .
cp 002h ;1e97 fe 02 . .
- jr z,prnt_arg_hlixiy ;1e99 28 e3 ( .
- jr prnt_arg ;1e9b 18 0d . .
+ jr z,p_arg_hlixiy ;1e99 28 e3 ( .
+ jr p_arg ;1e9b 18 0d . .
-prnt_arg_cc:
+p_arg_cc:
ld a,(iy+000h) ;1e9d fd 7e 00 . ~ .
-prnt_arg_cc0:
+p_arg_cc0:
rra ;1ea0 1f .
rra ;1ea1 1f .
rra ;1ea2 1f .
@@ -4923,18 +4942,18 @@ prnt_arg_cc0: ld hl,t_tstfl_ZCPS ;1ea5 21 dc 1f ! . .
jr l1eaah ;1ea8 18 00 . .
l1eaah:
-prnt_arg:
+p_arg:
ld b,a ;1eaa 47 G
call sel_dc_string ;1eab cd 3d 03 . = .
jp pstr ;1eae c3 88 02 . . .
-prnt_A_comma:
- call prnt_char_A ;1eb1 cd 3d 1d . = .
-prnt_char_comma:
+p_A_comma:
+ call p_char_A ;1eb1 cd 3d 1d . = .
+p_char_comma:
ld a,',' ;1eb4 3e 2c > ,
jp outchar ;1eb6 c3 5d 02 . ] .
-prnt_mnemonic:
+p_mnemonic:
call pstr ;1eb9 cd 88 02 . . .
l1ebch:
call outbl ;1ebc cd 9f 02 . . .
|