Mercurial > repos > blastem

changeset 278:9578e5dea147

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use hex where appropriate in disassembler
author Mike Pavone <pavone@retrodev.com>
date Fri, 03 May 2013 20:15:23 -0700
parents 765e132edd71
children 6be6056735a9
files z80inst.c
diffstat 1 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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);