# HG changeset patch # User Mike Pavone # Date 1367637323 25200 # Node ID 9578e5dea147c441ce3bc4dfb97ccef87940c1f1 # Parent 765e132edd71b012bbce2bfd50ab16c9669d4838 Use hex where appropriate in disassembler diff -r 765e132edd71 -r 9578e5dea147 z80inst.c --- a/z80inst.c Fri May 03 19:27:32 2013 -0700 +++ b/z80inst.c Fri May 03 20:15:23 2013 -0700 @@ -1386,10 +1386,15 @@ len += sprintf(dst+len, " (%s)", z80_regs[decoded->ea_reg]); break; case Z80_IMMED: - len += sprintf(dst+len, " %d", decoded->immed); + if (decoded->immed >= 63 || decoded->op == Z80_JP || decoded->op == Z80_JPCC || decoded->op == Z80_CALL || decoded->op == Z80_CALLCC || decoded->op == Z80_RST) + { + len += sprintf(dst+len, " $%X", decoded->immed); + } else { + len += sprintf(dst+len, " %d", decoded->immed); + } break; case Z80_IMMED_INDIRECT: - len += sprintf(dst+len, " (%d)", decoded->immed); + len += sprintf(dst+len, " ($%X)", decoded->immed); break; case Z80_IX_DISPLACE: len += sprintf(dst+len, " (ix+%d)", decoded->ea_reg); @@ -1433,10 +1438,15 @@ len += sprintf(dst+len, "%s (%s)", needcomma ? "," : "" , z80_regs[decoded->ea_reg]); break; case Z80_IMMED: - len += sprintf(dst+len, "%s %d", needcomma ? "," : "" , decoded->immed); + if (decoded->immed >= 63 || decoded->op == Z80_JP || decoded->op == Z80_JPCC || decoded->op == Z80_CALL || decoded->op == Z80_CALLCC || decoded->op == Z80_RST) + { + len += sprintf(dst+len, "%s $%X", needcomma ? "," : "" , decoded->immed); + } else { + len += sprintf(dst+len, "%s %d", needcomma ? "," : "" , decoded->immed); + } break; case Z80_IMMED_INDIRECT: - len += sprintf(dst+len, "%s (%d)", needcomma ? "," : "" , decoded->immed); + len += sprintf(dst+len, "%s ($%X)", needcomma ? "," : "" , decoded->immed); break; case Z80_IX_DISPLACE: len += sprintf(dst+len, "%s (ix+%d)", needcomma ? "," : "" , decoded->ea_reg);