summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-04-03 04:15:37 +1000
committer Vas Crabb <vas@vastheman.com>2018-04-03 04:15:37 +1000
commite5a2ac53869fc74f6a5bfbd060314a1ced0f3064 (patch)
treec1b4ae206d395e76f7c6b701faa093ebd027ce63
parent17043f615a86e9b8d5ae648b1cc0ebb340723487 (diff)
extricate refereces to emucore.o from t11dasm.o (nw)
-rw-r--r--src/devices/cpu/t11/t11dasm.cpp119
-rw-r--r--src/devices/cpu/t11/t11dasm.h2
2 files changed, 62 insertions, 59 deletions
diff --git a/src/devices/cpu/t11/t11dasm.cpp b/src/devices/cpu/t11/t11dasm.cpp
index c99789163ac..161a4d52011 100644
--- a/src/devices/cpu/t11/t11dasm.cpp
+++ b/src/devices/cpu/t11/t11dasm.cpp
@@ -12,6 +12,9 @@
#include "emu.h"
#include "t11dasm.h"
+#include <cassert>
+
+
const char *const t11_disassembler::regs[8] = { "R0", "R1", "R2", "R3", "R4", "R5", "SP", "PC" };
u16 t11_disassembler::r16p(offs_t &pc, const data_buffer &opcodes)
@@ -21,11 +24,11 @@ u16 t11_disassembler::r16p(offs_t &pc, const data_buffer &opcodes)
return r;
}
-std::string t11_disassembler::MakeEA (int lo, offs_t &pc, int width, const data_buffer &opcodes)
+template <int Width> std::string t11_disassembler::MakeEA (int lo, offs_t &pc, const data_buffer &opcodes)
{
int reg, pm;
- assert (width == 2 || width == 4);
+ static_assert((Width == 2) || (Width == 4), "invalid width - must be 2 or 4");
reg = lo & 7;
@@ -41,7 +44,7 @@ std::string t11_disassembler::MakeEA (int lo, offs_t &pc, int width, const data_
if (reg == 7)
{
pm = r16p(pc, opcodes);
- return util::string_format ("#$%0*X", width, pm & ((width == 2) ? 0xff : 0xffff));
+ return util::string_format ("#$%0*X", Width, pm & ((Width == 2) ? 0xff : 0xffff));
}
else
{
@@ -112,7 +115,7 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
}
break;
case 0x0040:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "JMP %s", ea1);
break;
case 0x0080:
@@ -154,7 +157,7 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
}
break;
case 0x00c0:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "SWAB %s", ea1);
break;
case 0x0100: case 0x0140: case 0x0180: case 0x01c0:
@@ -187,7 +190,7 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
break;
case 0x0800: case 0x0840: case 0x0880: case 0x08c0:
case 0x0900: case 0x0940: case 0x0980: case 0x09c0:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
if ( (hi & 7) == 7 )
util::stream_format(stream, "JSR %s", ea1);
else
@@ -195,58 +198,58 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
flags = STEP_OVER;
break;
case 0x0a00:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "CLR %s", ea1);
break;
case 0x0a40:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "COM %s", ea1);
break;
case 0x0a80:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "INC %s", ea1);
break;
case 0x0ac0:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "DEC %s", ea1);
break;
case 0x0b00:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "NEG %s", ea1);
break;
case 0x0b40:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "ADC %s", ea1);
break;
case 0x0b80:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "SBC %s", ea1);
break;
case 0x0bc0:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "TST %s", ea1);
break;
case 0x0c00:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "ROR %s", ea1);
break;
case 0x0c40:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "ROL %s", ea1);
break;
case 0x0c80:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "ASR %s", ea1);
break;
case 0x0cc0:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "ASL %s", ea1);
break;
/* case 0x0d00:
util::stream_format(stream, "MARK #$%X", lo);
break;*/
case 0x0dc0:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "SXT %s", ea1);
break;
case 0x1000: case 0x1040: case 0x1080: case 0x10c0: case 0x1100: case 0x1140: case 0x1180: case 0x11c0:
@@ -257,8 +260,8 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
case 0x1a00: case 0x1a40: case 0x1a80: case 0x1ac0: case 0x1b00: case 0x1b40: case 0x1b80: case 0x1bc0:
case 0x1c00: case 0x1c40: case 0x1c80: case 0x1cc0: case 0x1d00: case 0x1d40: case 0x1d80: case 0x1dc0:
case 0x1e00: case 0x1e40: case 0x1e80: case 0x1ec0: case 0x1f00: case 0x1f40: case 0x1f80: case 0x1fc0:
- ea1 = MakeEA (hi, pc, 4, opcodes);
- ea2 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (hi, pc, opcodes);
+ ea2 = MakeEA<4> (lo, pc, opcodes);
if (lo == 046) /* MOV src,-(SP) */
util::stream_format(stream, "PUSH %s", ea1);
else
@@ -275,8 +278,8 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
case 0x2a00: case 0x2a40: case 0x2a80: case 0x2ac0: case 0x2b00: case 0x2b40: case 0x2b80: case 0x2bc0:
case 0x2c00: case 0x2c40: case 0x2c80: case 0x2cc0: case 0x2d00: case 0x2d40: case 0x2d80: case 0x2dc0:
case 0x2e00: case 0x2e40: case 0x2e80: case 0x2ec0: case 0x2f00: case 0x2f40: case 0x2f80: case 0x2fc0:
- ea1 = MakeEA (hi, pc, 4, opcodes);
- ea2 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (hi, pc, opcodes);
+ ea2 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "CMP %s,%s", ea1, ea2);
break;
case 0x3000: case 0x3040: case 0x3080: case 0x30c0: case 0x3100: case 0x3140: case 0x3180: case 0x31c0:
@@ -287,8 +290,8 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
case 0x3a00: case 0x3a40: case 0x3a80: case 0x3ac0: case 0x3b00: case 0x3b40: case 0x3b80: case 0x3bc0:
case 0x3c00: case 0x3c40: case 0x3c80: case 0x3cc0: case 0x3d00: case 0x3d40: case 0x3d80: case 0x3dc0:
case 0x3e00: case 0x3e40: case 0x3e80: case 0x3ec0: case 0x3f00: case 0x3f40: case 0x3f80: case 0x3fc0:
- ea1 = MakeEA (hi, pc, 4, opcodes);
- ea2 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (hi, pc, opcodes);
+ ea2 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "BIT %s,%s", ea1, ea2);
break;
case 0x4000: case 0x4040: case 0x4080: case 0x40c0: case 0x4100: case 0x4140: case 0x4180: case 0x41c0:
@@ -299,8 +302,8 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
case 0x4a00: case 0x4a40: case 0x4a80: case 0x4ac0: case 0x4b00: case 0x4b40: case 0x4b80: case 0x4bc0:
case 0x4c00: case 0x4c40: case 0x4c80: case 0x4cc0: case 0x4d00: case 0x4d40: case 0x4d80: case 0x4dc0:
case 0x4e00: case 0x4e40: case 0x4e80: case 0x4ec0: case 0x4f00: case 0x4f40: case 0x4f80: case 0x4fc0:
- ea1 = MakeEA (hi, pc, 4, opcodes);
- ea2 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (hi, pc, opcodes);
+ ea2 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "BIC %s,%s", ea1, ea2);
break;
case 0x5000: case 0x5040: case 0x5080: case 0x50c0: case 0x5100: case 0x5140: case 0x5180: case 0x51c0:
@@ -311,8 +314,8 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
case 0x5a00: case 0x5a40: case 0x5a80: case 0x5ac0: case 0x5b00: case 0x5b40: case 0x5b80: case 0x5bc0:
case 0x5c00: case 0x5c40: case 0x5c80: case 0x5cc0: case 0x5d00: case 0x5d40: case 0x5d80: case 0x5dc0:
case 0x5e00: case 0x5e40: case 0x5e80: case 0x5ec0: case 0x5f00: case 0x5f40: case 0x5f80: case 0x5fc0:
- ea1 = MakeEA (hi, pc, 4, opcodes);
- ea2 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (hi, pc, opcodes);
+ ea2 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "BIS %s,%s", ea1, ea2);
break;
case 0x6000: case 0x6040: case 0x6080: case 0x60c0: case 0x6100: case 0x6140: case 0x6180: case 0x61c0:
@@ -323,13 +326,13 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
case 0x6a00: case 0x6a40: case 0x6a80: case 0x6ac0: case 0x6b00: case 0x6b40: case 0x6b80: case 0x6bc0:
case 0x6c00: case 0x6c40: case 0x6c80: case 0x6cc0: case 0x6d00: case 0x6d40: case 0x6d80: case 0x6dc0:
case 0x6e00: case 0x6e40: case 0x6e80: case 0x6ec0: case 0x6f00: case 0x6f40: case 0x6f80: case 0x6fc0:
- ea1 = MakeEA (hi, pc, 4, opcodes);
- ea2 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (hi, pc, opcodes);
+ ea2 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "ADD %s,%s", ea1, ea2);
break;
case 0x7800: case 0x7840: case 0x7880: case 0x78c0: case 0x7900: case 0x7940: case 0x7980: case 0x79c0:
- ea1 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "XOR %s,%s", regs[hi & 7], ea1);
break;
@@ -378,59 +381,59 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
break;
case 0x8a00:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "CLRB %s", ea1);
break;
case 0x8a40:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "COMB %s", ea1);
break;
case 0x8a80:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "INCB %s", ea1);
break;
case 0x8ac0:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "DECB %s", ea1);
break;
case 0x8b00:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "NEGB %s", ea1);
break;
case 0x8b40:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "ADCB %s", ea1);
break;
case 0x8b80:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "SBCB %s", ea1);
break;
case 0x8bc0:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "TSTB %s", ea1);
break;
case 0x8c00:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "RORB %s", ea1);
break;
case 0x8c40:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "ROLB %s", ea1);
break;
case 0x8c80:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "ASRB %s", ea1);
break;
case 0x8cc0:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "ASLB %s", ea1);
break;
case 0x8d00:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "MTPS %s", ea1);
break;
case 0x8dc0:
- ea1 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "MFPS %s", ea1);
break;
case 0x9000: case 0x9040: case 0x9080: case 0x90c0: case 0x9100: case 0x9140: case 0x9180: case 0x91c0:
@@ -441,8 +444,8 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
case 0x9a00: case 0x9a40: case 0x9a80: case 0x9ac0: case 0x9b00: case 0x9b40: case 0x9b80: case 0x9bc0:
case 0x9c00: case 0x9c40: case 0x9c80: case 0x9cc0: case 0x9d00: case 0x9d40: case 0x9d80: case 0x9dc0:
case 0x9e00: case 0x9e40: case 0x9e80: case 0x9ec0: case 0x9f00: case 0x9f40: case 0x9f80: case 0x9fc0:
- ea1 = MakeEA (hi, pc, 2, opcodes);
- ea2 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (hi, pc, opcodes);
+ ea2 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "MOVB %s,%s", ea1, ea2);
break;
case 0xa000: case 0xa040: case 0xa080: case 0xa0c0: case 0xa100: case 0xa140: case 0xa180: case 0xa1c0:
@@ -453,8 +456,8 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
case 0xaa00: case 0xaa40: case 0xaa80: case 0xaac0: case 0xab00: case 0xab40: case 0xab80: case 0xabc0:
case 0xac00: case 0xac40: case 0xac80: case 0xacc0: case 0xad00: case 0xad40: case 0xad80: case 0xadc0:
case 0xae00: case 0xae40: case 0xae80: case 0xaec0: case 0xaf00: case 0xaf40: case 0xaf80: case 0xafc0:
- ea1 = MakeEA (hi, pc, 2, opcodes);
- ea2 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (hi, pc, opcodes);
+ ea2 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "CMPB %s,%s", ea1, ea2);
break;
case 0xb000: case 0xb040: case 0xb080: case 0xb0c0: case 0xb100: case 0xb140: case 0xb180: case 0xb1c0:
@@ -465,8 +468,8 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
case 0xba00: case 0xba40: case 0xba80: case 0xbac0: case 0xbb00: case 0xbb40: case 0xbb80: case 0xbbc0:
case 0xbc00: case 0xbc40: case 0xbc80: case 0xbcc0: case 0xbd00: case 0xbd40: case 0xbd80: case 0xbdc0:
case 0xbe00: case 0xbe40: case 0xbe80: case 0xbec0: case 0xbf00: case 0xbf40: case 0xbf80: case 0xbfc0:
- ea1 = MakeEA (hi, pc, 2, opcodes);
- ea2 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (hi, pc, opcodes);
+ ea2 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "BITB %s,%s", ea1, ea2);
break;
case 0xc000: case 0xc040: case 0xc080: case 0xc0c0: case 0xc100: case 0xc140: case 0xc180: case 0xc1c0:
@@ -477,8 +480,8 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
case 0xca00: case 0xca40: case 0xca80: case 0xcac0: case 0xcb00: case 0xcb40: case 0xcb80: case 0xcbc0:
case 0xcc00: case 0xcc40: case 0xcc80: case 0xccc0: case 0xcd00: case 0xcd40: case 0xcd80: case 0xcdc0:
case 0xce00: case 0xce40: case 0xce80: case 0xcec0: case 0xcf00: case 0xcf40: case 0xcf80: case 0xcfc0:
- ea1 = MakeEA (hi, pc, 2, opcodes);
- ea2 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (hi, pc, opcodes);
+ ea2 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "BICB %s,%s", ea1, ea2);
break;
case 0xd000: case 0xd040: case 0xd080: case 0xd0c0: case 0xd100: case 0xd140: case 0xd180: case 0xd1c0:
@@ -489,8 +492,8 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
case 0xda00: case 0xda40: case 0xda80: case 0xdac0: case 0xdb00: case 0xdb40: case 0xdb80: case 0xdbc0:
case 0xdc00: case 0xdc40: case 0xdc80: case 0xdcc0: case 0xdd00: case 0xdd40: case 0xdd80: case 0xddc0:
case 0xde00: case 0xde40: case 0xde80: case 0xdec0: case 0xdf00: case 0xdf40: case 0xdf80: case 0xdfc0:
- ea1 = MakeEA (hi, pc, 2, opcodes);
- ea2 = MakeEA (lo, pc, 2, opcodes);
+ ea1 = MakeEA<2> (hi, pc, opcodes);
+ ea2 = MakeEA<2> (lo, pc, opcodes);
util::stream_format(stream, "BISB %s,%s", ea1, ea2);
break;
case 0xe000: case 0xe040: case 0xe080: case 0xe0c0: case 0xe100: case 0xe140: case 0xe180: case 0xe1c0:
@@ -501,8 +504,8 @@ offs_t t11_disassembler::disassemble(std::ostream &stream, offs_t pc, const data
case 0xea00: case 0xea40: case 0xea80: case 0xeac0: case 0xeb00: case 0xeb40: case 0xeb80: case 0xebc0:
case 0xec00: case 0xec40: case 0xec80: case 0xecc0: case 0xed00: case 0xed40: case 0xed80: case 0xedc0:
case 0xee00: case 0xee40: case 0xee80: case 0xeec0: case 0xef00: case 0xef40: case 0xef80: case 0xefc0:
- ea1 = MakeEA (hi, pc, 4, opcodes);
- ea2 = MakeEA (lo, pc, 4, opcodes);
+ ea1 = MakeEA<4> (hi, pc, opcodes);
+ ea2 = MakeEA<4> (lo, pc, opcodes);
util::stream_format(stream, "SUB %s,%s", ea1, ea2);
break;
diff --git a/src/devices/cpu/t11/t11dasm.h b/src/devices/cpu/t11/t11dasm.h
index 4d51dd75777..e9d31c161a6 100644
--- a/src/devices/cpu/t11/t11dasm.h
+++ b/src/devices/cpu/t11/t11dasm.h
@@ -26,7 +26,7 @@ public:
private:
static const char *const regs[8];
u16 r16p(offs_t &pc, const data_buffer &opcodes);
- std::string MakeEA (int lo, offs_t &pc, int width, const data_buffer &opcodes);
+ template <int Width> std::string MakeEA (int lo, offs_t &pc, const data_buffer &opcodes);
};