summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2016-10-29 20:49:35 -0400
committer GitHub <noreply@github.com>2016-10-29 20:49:35 -0400
commitef888eb70a77565c9a099d4aed2657007bb74b9e (patch)
treeef54b941d75a4b00563938fff7f1d5b78a1347b7
parentfc57abb57f8111e8e5e7cf94085c934dd413bd75 (diff)
parent1c4fe649594cdb3ddef912c37b6d40e1b0a87a35 (diff)
Merge pull request #1598 from npwoods/dasmstream_tms32051
Changed the TMS32051 disassembler to use 'std::ostream &' internally
-rw-r--r--src/devices/cpu/tms32051/dis32051.cpp409
1 files changed, 205 insertions, 204 deletions
diff --git a/src/devices/cpu/tms32051/dis32051.cpp b/src/devices/cpu/tms32051/dis32051.cpp
index e4e422d6868..6fda434ab36 100644
--- a/src/devices/cpu/tms32051/dis32051.cpp
+++ b/src/devices/cpu/tms32051/dis32051.cpp
@@ -58,16 +58,7 @@ static offs_t npc;
static const uint8_t *rombase;
static offs_t pcbase;
-static char *output;
-
-static void ATTR_PRINTF(1,2) print(const char *fmt, ...)
-{
- va_list vl;
-
- va_start(vl, fmt);
- output += vsprintf(output, fmt, vl);
- va_end(vl);
-}
+static std::ostream *output;
static uint16_t FETCH(void)
{
@@ -133,22 +124,22 @@ static void print_condition_codes(bool pp, int zl, int cv, int tp)
if (*(zl_condition_codes[zl]) != 0)
{
if (pp)
- print(", ");
- print("%s", zl_condition_codes[zl]);
+ util::stream_format(*output, ", ");
+ util::stream_format(*output, "%s", zl_condition_codes[zl]);
pp = true;
}
if (*(cv_condition_codes[cv]) != 0)
{
if (pp)
- print(", ");
- print("%s", cv_condition_codes[cv]);
+ util::stream_format(*output, ", ");
+ util::stream_format(*output, "%s", cv_condition_codes[cv]);
pp = true;
}
if (*(tp_condition_codes[tp]) != 0)
{
if (pp)
- print(", ");
- print("%s", tp_condition_codes[tp]);
+ util::stream_format(*output, ", ");
+ util::stream_format(*output, "%s", tp_condition_codes[tp]);
}
}
@@ -158,64 +149,64 @@ static void dasm_group_be(uint16_t opcode)
switch (subop)
{
- case 0x00: print("abs"); break;
- case 0x01: print("cmpl"); break;
- case 0x02: print("neg"); break;
- case 0x03: print("pac"); break;
- case 0x04: print("apac"); break;
- case 0x05: print("spac"); break;
- case 0x09: print("sfl"); break;
- case 0x0a: print("sfr"); break;
- case 0x0c: print("rol"); break;
- case 0x0d: print("ror"); break;
- case 0x10: print("addb"); break;
- case 0x11: print("adcb"); break;
- case 0x12: print("andb"); break;
- case 0x13: print("orb"); break;
- case 0x14: print("rolb"); break;
- case 0x15: print("rorb"); break;
- case 0x16: print("sflb"); break;
- case 0x17: print("sfrb"); break;
- case 0x18: print("sbb"); break;
- case 0x19: print("sbbb"); break;
- case 0x1a: print("xorb"); break;
- case 0x1b: print("crgt"); break;
- case 0x1c: print("crlt"); break;
- case 0x1d: print("exar"); break;
- case 0x1e: print("sacb"); break;
- case 0x1f: print("lacb"); break;
- case 0x20: print("bacc"); break;
- case 0x21: print("baccd"); break;
- case 0x22: print("idle"); break;
- case 0x23: print("idle2"); break;
- case 0x30: print("cala"); break;
- case 0x32: print("pop"); break;
- case 0x38: print("reti"); break;
- case 0x3a: print("rete"); break;
- case 0x3c: print("push"); break;
- case 0x3d: print("calad"); break;
- case 0x40: print("clrc intm"); break;
- case 0x41: print("setc intm"); break;
- case 0x42: print("clrc ovm"); break;
- case 0x43: print("setc ovm"); break;
- case 0x44: print("clrc cnf"); break;
- case 0x45: print("setc cnf"); break;
- case 0x46: print("clrc sxm"); break;
- case 0x47: print("setc sxm"); break;
- case 0x48: print("clrc hold"); break;
- case 0x49: print("setc hold"); break;
- case 0x4a: print("clrc tc"); break;
- case 0x4b: print("setc tc"); break;
- case 0x4c: print("clrc xf"); break;
- case 0x4d: print("setc xf"); break;
- case 0x4e: print("clrc carry"); break;
- case 0x4f: print("setc carry"); break;
- case 0x51: print("trap"); break;
- case 0x52: print("nmi"); break;
- case 0x58: print("zpr"); break;
- case 0x59: print("zap"); break;
- case 0x5a: print("sath"); break;
- case 0x5b: print("satl"); break;
+ case 0x00: util::stream_format(*output, "abs"); break;
+ case 0x01: util::stream_format(*output, "cmpl"); break;
+ case 0x02: util::stream_format(*output, "neg"); break;
+ case 0x03: util::stream_format(*output, "pac"); break;
+ case 0x04: util::stream_format(*output, "apac"); break;
+ case 0x05: util::stream_format(*output, "spac"); break;
+ case 0x09: util::stream_format(*output, "sfl"); break;
+ case 0x0a: util::stream_format(*output, "sfr"); break;
+ case 0x0c: util::stream_format(*output, "rol"); break;
+ case 0x0d: util::stream_format(*output, "ror"); break;
+ case 0x10: util::stream_format(*output, "addb"); break;
+ case 0x11: util::stream_format(*output, "adcb"); break;
+ case 0x12: util::stream_format(*output, "andb"); break;
+ case 0x13: util::stream_format(*output, "orb"); break;
+ case 0x14: util::stream_format(*output, "rolb"); break;
+ case 0x15: util::stream_format(*output, "rorb"); break;
+ case 0x16: util::stream_format(*output, "sflb"); break;
+ case 0x17: util::stream_format(*output, "sfrb"); break;
+ case 0x18: util::stream_format(*output, "sbb"); break;
+ case 0x19: util::stream_format(*output, "sbbb"); break;
+ case 0x1a: util::stream_format(*output, "xorb"); break;
+ case 0x1b: util::stream_format(*output, "crgt"); break;
+ case 0x1c: util::stream_format(*output, "crlt"); break;
+ case 0x1d: util::stream_format(*output, "exar"); break;
+ case 0x1e: util::stream_format(*output, "sacb"); break;
+ case 0x1f: util::stream_format(*output, "lacb"); break;
+ case 0x20: util::stream_format(*output, "bacc"); break;
+ case 0x21: util::stream_format(*output, "baccd"); break;
+ case 0x22: util::stream_format(*output, "idle"); break;
+ case 0x23: util::stream_format(*output, "idle2"); break;
+ case 0x30: util::stream_format(*output, "cala"); break;
+ case 0x32: util::stream_format(*output, "pop"); break;
+ case 0x38: util::stream_format(*output, "reti"); break;
+ case 0x3a: util::stream_format(*output, "rete"); break;
+ case 0x3c: util::stream_format(*output, "push"); break;
+ case 0x3d: util::stream_format(*output, "calad"); break;
+ case 0x40: util::stream_format(*output, "clrc intm"); break;
+ case 0x41: util::stream_format(*output, "setc intm"); break;
+ case 0x42: util::stream_format(*output, "clrc ovm"); break;
+ case 0x43: util::stream_format(*output, "setc ovm"); break;
+ case 0x44: util::stream_format(*output, "clrc cnf"); break;
+ case 0x45: util::stream_format(*output, "setc cnf"); break;
+ case 0x46: util::stream_format(*output, "clrc sxm"); break;
+ case 0x47: util::stream_format(*output, "setc sxm"); break;
+ case 0x48: util::stream_format(*output, "clrc hold"); break;
+ case 0x49: util::stream_format(*output, "setc hold"); break;
+ case 0x4a: util::stream_format(*output, "clrc tc"); break;
+ case 0x4b: util::stream_format(*output, "setc tc"); break;
+ case 0x4c: util::stream_format(*output, "clrc xf"); break;
+ case 0x4d: util::stream_format(*output, "setc xf"); break;
+ case 0x4e: util::stream_format(*output, "clrc carry"); break;
+ case 0x4f: util::stream_format(*output, "setc carry"); break;
+ case 0x51: util::stream_format(*output, "trap"); break;
+ case 0x52: util::stream_format(*output, "nmi"); break;
+ case 0x58: util::stream_format(*output, "zpr"); break;
+ case 0x59: util::stream_format(*output, "zap"); break;
+ case 0x5a: util::stream_format(*output, "sath"); break;
+ case 0x5b: util::stream_format(*output, "satl"); break;
case 0x60: case 0x61: case 0x62: case 0x63:
case 0x64: case 0x65: case 0x66: case 0x67:
case 0x68: case 0x69: case 0x6a: case 0x6b:
@@ -224,17 +215,17 @@ static void dasm_group_be(uint16_t opcode)
case 0x74: case 0x75: case 0x76: case 0x77:
case 0x78: case 0x79: case 0x7a: case 0x7b:
case 0x7c: case 0x7d: case 0x7e: case 0x7f:
- print("intr %d", opcode & 0x1f); break;
+ util::stream_format(*output, "intr %d", opcode & 0x1f); break;
- case 0x80: print("mpy #%04X", FETCH()); break;
- case 0x81: print("and #%04X", FETCH() << 16); break;
- case 0x82: print("or #%04X", FETCH() << 16); break;
- case 0x83: print("xor #%04X", FETCH() << 16); break;
- case 0xc4: print("rpt #%04X", FETCH()); break;
- case 0xc5: print("rptz #%04X", FETCH()); break;
- case 0xc6: print("rptb #%04X", FETCH()); break;
+ case 0x80: util::stream_format(*output, "mpy #%04X", FETCH()); break;
+ case 0x81: util::stream_format(*output, "and #%04X", FETCH() << 16); break;
+ case 0x82: util::stream_format(*output, "or #%04X", FETCH() << 16); break;
+ case 0x83: util::stream_format(*output, "xor #%04X", FETCH() << 16); break;
+ case 0xc4: util::stream_format(*output, "rpt #%04X", FETCH()); break;
+ case 0xc5: util::stream_format(*output, "rptz #%04X", FETCH()); break;
+ case 0xc6: util::stream_format(*output, "rptb #%04X", FETCH()); break;
- default: print("??? (group be)"); break;
+ default: util::stream_format(*output, "??? (group be)"); break;
}
}
@@ -249,11 +240,11 @@ static void dasm_group_bf(uint16_t opcode)
{
if (opcode & 0x8)
{
- print("lar ar%d, #%04X", opcode & 0x7, FETCH());
+ util::stream_format(*output, "lar ar%d, #%04X", opcode & 0x7, FETCH());
}
else
{
- print("spm #%02X", opcode & 0x3);
+ util::stream_format(*output, "spm #%02X", opcode & 0x3);
}
break;
}
@@ -262,27 +253,27 @@ static void dasm_group_bf(uint16_t opcode)
{
switch (opcode & 0x3)
{
- case 0: print("cmpr ar = arcr"); break;
- case 1: print("cmpr ar < arcr"); break;
- case 2: print("cmpr ar > arcr"); break;
- case 3: print("cmpr ar != arcr"); break;
+ case 0: util::stream_format(*output, "cmpr ar = arcr"); break;
+ case 1: util::stream_format(*output, "cmpr ar < arcr"); break;
+ case 2: util::stream_format(*output, "cmpr ar > arcr"); break;
+ case 3: util::stream_format(*output, "cmpr ar != arcr"); break;
}
break;
}
- case 0x8: print("lacc #%04X", FETCH() << shift); break;
- case 0x9: print("add #%04X", FETCH() << shift); break;
- case 0xa: print("sub #%04X", FETCH() << shift); break;
- case 0xb: print("and #%04X", FETCH() << shift); break;
- case 0xc: print("or #%04X", FETCH() << shift); break;
- case 0xd: print("xor #%04X", FETCH() << shift); break;
- case 0xe: print("bsar %d", shift+1); break;
+ case 0x8: util::stream_format(*output, "lacc #%04X", FETCH() << shift); break;
+ case 0x9: util::stream_format(*output, "add #%04X", FETCH() << shift); break;
+ case 0xa: util::stream_format(*output, "sub #%04X", FETCH() << shift); break;
+ case 0xb: util::stream_format(*output, "and #%04X", FETCH() << shift); break;
+ case 0xc: util::stream_format(*output, "or #%04X", FETCH() << shift); break;
+ case 0xd: util::stream_format(*output, "xor #%04X", FETCH() << shift); break;
+ case 0xe: util::stream_format(*output, "bsar %d", shift+1); break;
- default: print("??? (group bf)"); break;
+ default: util::stream_format(*output, "??? (group bf)"); break;
}
}
-CPU_DISASSEMBLE( tms32051 )
+static offs_t internal_disasm_tms32051(cpu_device *device, std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, int options)
{
uint32_t flags = 0;
uint16_t opcode;
@@ -292,7 +283,7 @@ CPU_DISASSEMBLE( tms32051 )
pcbase = pc;
rombase = oprom;
npc = pc;
- output = buffer;
+ output = &stream;
opcode = FETCH();
baseop = (opcode >> 8) & 0xff;
@@ -305,24 +296,24 @@ CPU_DISASSEMBLE( tms32051 )
case 0x00: case 0x01: case 0x02: case 0x03:
case 0x04: case 0x05: case 0x06: case 0x07:
{
- print("lar ar%d, %s", (opcode >> 8) & 0x7, GET_ADDRESS(addr_mode, address));
+ util::stream_format(*output, "lar ar%d, %s", (opcode >> 8) & 0x7, GET_ADDRESS(addr_mode, address));
break;
}
- case 0x08: print("lamm %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x09: print("smmr %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
- case 0x0a: print("subc %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x0b: print("rpt %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x0c: print("out %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
- case 0x0d: print("ldp %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x0e: print("lst 0, %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x0f: print("lst 1, %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x08: util::stream_format(*output, "lamm %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x09: util::stream_format(*output, "smmr %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0x0a: util::stream_format(*output, "subc %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x0b: util::stream_format(*output, "rpt %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x0c: util::stream_format(*output, "out %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0x0d: util::stream_format(*output, "ldp %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x0e: util::stream_format(*output, "lst 0, %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x0f: util::stream_format(*output, "lst 1, %s", GET_ADDRESS(addr_mode, address)); break;
case 0x10: case 0x11: case 0x12: case 0x13:
case 0x14: case 0x15: case 0x16: case 0x17:
case 0x18: case 0x19: case 0x1a: case 0x1b:
case 0x1c: case 0x1d: case 0x1e: case 0x1f:
{
- print("lacc %s %s", GET_ADDRESS(addr_mode, address), GET_SHIFT((opcode >> 8) & 0xf));
+ util::stream_format(*output, "lacc %s %s", GET_ADDRESS(addr_mode, address), GET_SHIFT((opcode >> 8) & 0xf));
break;
}
@@ -331,7 +322,7 @@ CPU_DISASSEMBLE( tms32051 )
case 0x28: case 0x29: case 0x2a: case 0x2b:
case 0x2c: case 0x2d: case 0x2e: case 0x2f:
{
- print("add %s %s", GET_ADDRESS(addr_mode, address), GET_SHIFT((opcode >> 8) & 0xf));
+ util::stream_format(*output, "add %s %s", GET_ADDRESS(addr_mode, address), GET_SHIFT((opcode >> 8) & 0xf));
break;
}
@@ -340,7 +331,7 @@ CPU_DISASSEMBLE( tms32051 )
case 0x38: case 0x39: case 0x3a: case 0x3b:
case 0x3c: case 0x3d: case 0x3e: case 0x3f:
{
- print("sub %s %s", GET_ADDRESS(addr_mode, address), GET_SHIFT((opcode >> 8) & 0xf));
+ util::stream_format(*output, "sub %s %s", GET_ADDRESS(addr_mode, address), GET_SHIFT((opcode >> 8) & 0xf));
break;
}
@@ -349,130 +340,130 @@ CPU_DISASSEMBLE( tms32051 )
case 0x48: case 0x49: case 0x4a: case 0x4b:
case 0x4c: case 0x4d: case 0x4e: case 0x4f:
{
- print("bit %d, %s", (opcode >> 8) & 0xf, GET_ADDRESS(addr_mode, address));
+ util::stream_format(*output, "bit %d, %s", (opcode >> 8) & 0xf, GET_ADDRESS(addr_mode, address));
break;
}
- case 0x50: print("mpya %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x51: print("mpys %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x52: print("sqra %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x53: print("sqrs %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x54: print("mpy %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x55: print("mpyu %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x57: print("bldp %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x58: print("xpl %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x59: print("opl %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x5a: print("apl %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x5b: print("cpl %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x5c: print("xpl %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
- case 0x5d: print("opl %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
- case 0x5e: print("apl %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
- case 0x5f: print("cpl %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
-
- case 0x60: print("addc %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x61: print("add %s << 16", GET_ADDRESS(addr_mode, address)); break;
- case 0x62: print("adds %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x63: print("addt %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x64: print("subb %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x65: print("sub %s << 16", GET_ADDRESS(addr_mode, address)); break;
- case 0x66: print("subs %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x67: print("subt %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x68: print("zalr %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x69: print("lacl %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x6a: print("lacc %s << 16", GET_ADDRESS(addr_mode, address)); break;
- case 0x6b: print("lact %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x6c: print("xor %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x6d: print("or %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x6e: print("and %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x6f: print("bitt %s", GET_ADDRESS(addr_mode, address)); break;
-
- case 0x70: print("lta %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x71: print("ltp %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x72: print("ltd %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x73: print("lt %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x74: print("lts %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x75: print("lph %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x76: print("pshd %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x77: print("dmov %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x78: print("adrk #%02X", opcode & 0xff); break;
- case 0x79: print("b %04X, %s", FETCH(), GET_ADDRESS(1, address)); break;
- case 0x7a: print("call %04X, %s", FETCH(), GET_ADDRESS(1, address)); flags = DASMFLAG_STEP_OVER; break;
- case 0x7b: print("banz %04X, %s", FETCH(), GET_ADDRESS(1, address)); break;
- case 0x7c: print("sbrk #%02X", opcode & 0xff); break;
- case 0x7d: print("bd %04X, %s", FETCH(), GET_ADDRESS(1, address)); break;
- case 0x7e: print("calld %04X, %s", FETCH(), GET_ADDRESS(1, address)); flags = DASMFLAG_STEP_OVER; break;
- case 0x7f: print("banzd %04X, %s", FETCH(), GET_ADDRESS(1, address)); break;
+ case 0x50: util::stream_format(*output, "mpya %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x51: util::stream_format(*output, "mpys %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x52: util::stream_format(*output, "sqra %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x53: util::stream_format(*output, "sqrs %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x54: util::stream_format(*output, "mpy %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x55: util::stream_format(*output, "mpyu %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x57: util::stream_format(*output, "bldp %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x58: util::stream_format(*output, "xpl %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x59: util::stream_format(*output, "opl %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x5a: util::stream_format(*output, "apl %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x5b: util::stream_format(*output, "cpl %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x5c: util::stream_format(*output, "xpl %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0x5d: util::stream_format(*output, "opl %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0x5e: util::stream_format(*output, "apl %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0x5f: util::stream_format(*output, "cpl %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+
+ case 0x60: util::stream_format(*output, "addc %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x61: util::stream_format(*output, "add %s << 16", GET_ADDRESS(addr_mode, address)); break;
+ case 0x62: util::stream_format(*output, "adds %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x63: util::stream_format(*output, "addt %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x64: util::stream_format(*output, "subb %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x65: util::stream_format(*output, "sub %s << 16", GET_ADDRESS(addr_mode, address)); break;
+ case 0x66: util::stream_format(*output, "subs %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x67: util::stream_format(*output, "subt %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x68: util::stream_format(*output, "zalr %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x69: util::stream_format(*output, "lacl %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x6a: util::stream_format(*output, "lacc %s << 16", GET_ADDRESS(addr_mode, address)); break;
+ case 0x6b: util::stream_format(*output, "lact %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x6c: util::stream_format(*output, "xor %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x6d: util::stream_format(*output, "or %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x6e: util::stream_format(*output, "and %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x6f: util::stream_format(*output, "bitt %s", GET_ADDRESS(addr_mode, address)); break;
+
+ case 0x70: util::stream_format(*output, "lta %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x71: util::stream_format(*output, "ltp %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x72: util::stream_format(*output, "ltd %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x73: util::stream_format(*output, "lt %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x74: util::stream_format(*output, "lts %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x75: util::stream_format(*output, "lph %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x76: util::stream_format(*output, "pshd %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x77: util::stream_format(*output, "dmov %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x78: util::stream_format(*output, "adrk #%02X", opcode & 0xff); break;
+ case 0x79: util::stream_format(*output, "b %04X, %s", FETCH(), GET_ADDRESS(1, address)); break;
+ case 0x7a: util::stream_format(*output, "call %04X, %s", FETCH(), GET_ADDRESS(1, address)); flags = DASMFLAG_STEP_OVER; break;
+ case 0x7b: util::stream_format(*output, "banz %04X, %s", FETCH(), GET_ADDRESS(1, address)); break;
+ case 0x7c: util::stream_format(*output, "sbrk #%02X", opcode & 0xff); break;
+ case 0x7d: util::stream_format(*output, "bd %04X, %s", FETCH(), GET_ADDRESS(1, address)); break;
+ case 0x7e: util::stream_format(*output, "calld %04X, %s", FETCH(), GET_ADDRESS(1, address)); flags = DASMFLAG_STEP_OVER; break;
+ case 0x7f: util::stream_format(*output, "banzd %04X, %s", FETCH(), GET_ADDRESS(1, address)); break;
case 0x80: case 0x81: case 0x82: case 0x83:
case 0x84: case 0x85: case 0x86: case 0x87:
{
- print("sar ar%d, %s", (opcode >> 8) & 0x7, GET_ADDRESS(addr_mode, address));
+ util::stream_format(*output, "sar ar%d, %s", (opcode >> 8) & 0x7, GET_ADDRESS(addr_mode, address));
break;
}
- case 0x88: print("samm %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x89: print("lmmr %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
- case 0x8a: print("popd %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x88: util::stream_format(*output, "samm %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x89: util::stream_format(*output, "lmmr %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0x8a: util::stream_format(*output, "popd %s", GET_ADDRESS(addr_mode, address)); break;
case 0x8b:
{
if ((opcode & 0xff) == 0)
{
- print("nop");
+ util::stream_format(*output, "nop");
}
else
{
- print("mar %s", GET_ADDRESS(addr_mode, address));
+ util::stream_format(*output, "mar %s", GET_ADDRESS(addr_mode, address));
}
break;
}
- case 0x8c: print("spl %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x8d: print("sph %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x8e: print("sst 0, %s", GET_ADDRESS(addr_mode, address)); break;
- case 0x8f: print("sst 1, %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x8c: util::stream_format(*output, "spl %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x8d: util::stream_format(*output, "sph %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x8e: util::stream_format(*output, "sst 0, %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0x8f: util::stream_format(*output, "sst 1, %s", GET_ADDRESS(addr_mode, address)); break;
case 0x90: case 0x91: case 0x92: case 0x93:
case 0x94: case 0x95: case 0x96: case 0x97:
{
- print("sacl %s %s", GET_ADDRESS(addr_mode, address), GET_SHIFT((opcode >> 8) & 0x7));
+ util::stream_format(*output, "sacl %s %s", GET_ADDRESS(addr_mode, address), GET_SHIFT((opcode >> 8) & 0x7));
break;
}
case 0x98: case 0x99: case 0x9a: case 0x9b:
case 0x9c: case 0x9d: case 0x9e: case 0x9f:
{
- print("sach %s %s", GET_ADDRESS(addr_mode, address), GET_SHIFT((opcode >> 8) & 0x7));
+ util::stream_format(*output, "sach %s %s", GET_ADDRESS(addr_mode, address), GET_SHIFT((opcode >> 8) & 0x7));
break;
}
- case 0xa0: print("norm %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
- case 0xa2: print("mac %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
- case 0xa3: print("macd %s", GET_ADDRESS(addr_mode, address)); break;
- case 0xa4: print("blpd %s", GET_ADDRESS(addr_mode, address)); break;
- case 0xa5: print("blpd %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
- case 0xa6: print("tblr %s", GET_ADDRESS(addr_mode, address)); break;
- case 0xa7: print("tblw %s", GET_ADDRESS(addr_mode, address)); break;
- case 0xa8: print("bldd %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
- case 0xa9: print("bldd %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
- case 0xaa: print("mads %s", GET_ADDRESS(addr_mode, address)); break;
- case 0xab: print("madd %s", GET_ADDRESS(addr_mode, address)); break;
- case 0xac: print("bldd %s", GET_ADDRESS(addr_mode, address)); break;
- case 0xad: print("bldd %s", GET_ADDRESS(addr_mode, address)); break;
- case 0xae: print("splk %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
- case 0xaf: print("in %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0xa0: util::stream_format(*output, "norm %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0xa2: util::stream_format(*output, "mac %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0xa3: util::stream_format(*output, "macd %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0xa4: util::stream_format(*output, "blpd %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0xa5: util::stream_format(*output, "blpd %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0xa6: util::stream_format(*output, "tblr %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0xa7: util::stream_format(*output, "tblw %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0xa8: util::stream_format(*output, "bldd %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0xa9: util::stream_format(*output, "bldd %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0xaa: util::stream_format(*output, "mads %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0xab: util::stream_format(*output, "madd %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0xac: util::stream_format(*output, "bldd %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0xad: util::stream_format(*output, "bldd %s", GET_ADDRESS(addr_mode, address)); break;
+ case 0xae: util::stream_format(*output, "splk %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
+ case 0xaf: util::stream_format(*output, "in %s, #%04X", GET_ADDRESS(addr_mode, address), FETCH()); break;
case 0xb0: case 0xb1: case 0xb2: case 0xb3:
case 0xb4: case 0xb5: case 0xb6: case 0xb7:
{
- print("lar ar%d, #%02X", (opcode >> 8) & 0x7, opcode & 0xff);
+ util::stream_format(*output, "lar ar%d, #%02X", (opcode >> 8) & 0x7, opcode & 0xff);
break;
}
- case 0xb8: print("add #%02X", opcode & 0xff); break;
- case 0xb9: print("lacl #%02X", opcode & 0xff); break;
- case 0xba: print("sub #%02X", opcode & 0xff); break;
- case 0xbb: print("rpt #%02X", opcode & 0xff); break;
+ case 0xb8: util::stream_format(*output, "add #%02X", opcode & 0xff); break;
+ case 0xb9: util::stream_format(*output, "lacl #%02X", opcode & 0xff); break;
+ case 0xba: util::stream_format(*output, "sub #%02X", opcode & 0xff); break;
+ case 0xbb: util::stream_format(*output, "rpt #%02X", opcode & 0xff); break;
case 0xbc:
case 0xbd:
{
- print("ldp #%03X", opcode & 0x1ff);
+ util::stream_format(*output, "ldp #%03X", opcode & 0x1ff);
break;
}
case 0xbe: dasm_group_be(opcode); break;
@@ -486,7 +477,7 @@ CPU_DISASSEMBLE( tms32051 )
int cv = ((zlcv << 2) & 0xc) | (zlcvmask & 0x3);
int tp = (opcode >> 8) & 0x3;
- print("bcnd %04X", FETCH());
+ util::stream_format(*output, "bcnd %04X", FETCH());
print_condition_codes(true, zl, cv, tp);
break;
}
@@ -501,7 +492,7 @@ CPU_DISASSEMBLE( tms32051 )
int tp = (opcode >> 8) & 0x3;
int n = ((opcode >> 12) & 0x1) + 1;
- print("xc %d", n);
+ util::stream_format(*output, "xc %d", n);
print_condition_codes(true, zl, cv, tp);
break;
}
@@ -514,7 +505,7 @@ CPU_DISASSEMBLE( tms32051 )
int cv = ((zlcv << 2) & 0xc) | (zlcvmask & 0x3);
int tp = (opcode >> 8) & 0x3;
- print("cc %04X", FETCH());
+ util::stream_format(*output, "cc %04X", FETCH());
print_condition_codes(true, zl, cv, tp);
break;
}
@@ -529,11 +520,11 @@ CPU_DISASSEMBLE( tms32051 )
if (opcode == 0xef00)
{
- print("ret");
+ util::stream_format(*output, "ret");
}
else
{
- print("retc ");
+ util::stream_format(*output, "retc ");
print_condition_codes(false, zl, cv, tp);
}
flags = DASMFLAG_STEP_OUT;
@@ -548,7 +539,7 @@ CPU_DISASSEMBLE( tms32051 )
int cv = ((zlcv << 2) & 0xc) | (zlcvmask & 0x3);
int tp = (opcode >> 8) & 0x3;
- print("bcndd %04X", FETCH());
+ util::stream_format(*output, "bcndd %04X", FETCH());
print_condition_codes(true, zl, cv, tp);
break;
}
@@ -561,7 +552,7 @@ CPU_DISASSEMBLE( tms32051 )
int cv = ((zlcv << 2) & 0xc) | (zlcvmask & 0x3);
int tp = (opcode >> 8) & 0x3;
- print("ccd %04X", FETCH());
+ util::stream_format(*output, "ccd %04X", FETCH());
print_condition_codes(true, zl, cv, tp);
break;
}
@@ -576,19 +567,29 @@ CPU_DISASSEMBLE( tms32051 )
if (opcode == 0xff00)
{
- print("retd");
+ util::stream_format(*output, "retd");
}
else
{
- print("retcd ");
+ util::stream_format(*output, "retcd ");
print_condition_codes(false, zl, cv, tp);
}
flags = DASMFLAG_STEP_OUT;
break;
}
- default: print("??? ($%04X)", opcode); break;
+ default: util::stream_format(*output, "??? ($%04X)", opcode); break;
}
return (npc-pc) | flags | DASMFLAG_SUPPORTED;
}
+
+
+CPU_DISASSEMBLE(tms32051)
+{
+ std::ostringstream stream;
+ offs_t result = internal_disasm_tms32051(device, stream, pc, oprom, opram, options);
+ std::string stream_str = stream.str();
+ strcpy(buffer, stream_str.c_str());
+ return result;
+}