diff options
Diffstat (limited to 'src/devices/cpu/mn10200')
-rw-r--r-- | src/devices/cpu/mn10200/mn10200.cpp | 6 | ||||
-rw-r--r-- | src/devices/cpu/mn10200/mn10200.h | 4 | ||||
-rw-r--r-- | src/devices/cpu/mn10200/mn102dis.cpp | 380 | ||||
-rw-r--r-- | src/devices/cpu/mn10200/mn102dis.h | 28 |
4 files changed, 205 insertions, 213 deletions
diff --git a/src/devices/cpu/mn10200/mn10200.cpp b/src/devices/cpu/mn10200/mn10200.cpp index 59407b507ca..74757bd9e53 100644 --- a/src/devices/cpu/mn10200/mn10200.cpp +++ b/src/devices/cpu/mn10200/mn10200.cpp @@ -11,6 +11,7 @@ #include "emu.h" #include "debugger.h" #include "mn10200.h" +#include "mn102dis.h" #define log_write(...) #define log_event(...) @@ -88,10 +89,9 @@ void mn10200_device::state_string_export(const device_state_entry &entry, std::s } } -offs_t mn10200_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) +util::disasm_interface *mn10200_device::create_disassembler() { - extern CPU_DISASSEMBLE( mn10200 ); - return CPU_DISASSEMBLE_NAME(mn10200)(this, stream, pc, oprom, opram, options); + return new mn10200_disassembler; } diff --git a/src/devices/cpu/mn10200/mn10200.h b/src/devices/cpu/mn10200/mn10200.h index 307b0b4b6a9..7f3524df68c 100644 --- a/src/devices/cpu/mn10200/mn10200.h +++ b/src/devices/cpu/mn10200/mn10200.h @@ -87,9 +87,7 @@ protected: virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; // device_disasm_interface overrides - virtual uint32_t disasm_min_opcode_bytes() const override { return 1; } - virtual uint32_t disasm_max_opcode_bytes() const override { return 7; } - virtual offs_t disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; + virtual util::disasm_interface *create_disassembler() override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/mn10200/mn102dis.cpp b/src/devices/cpu/mn10200/mn102dis.cpp index be3fb46c0eb..8be02ad6a58 100644 --- a/src/devices/cpu/mn10200/mn102dis.cpp +++ b/src/devices/cpu/mn10200/mn102dis.cpp @@ -5,76 +5,47 @@ */ #include "emu.h" +#include "mn102dis.h" -#include <stdio.h> - -static const uint8_t *sOpROM; // current opROM pointer -static uint32_t sBasePC; - -static uint8_t program_read_byte(offs_t pc) -{ - return sOpROM[pc - sBasePC]; -} - -static uint32_t r16u(offs_t pc) -{ - return sOpROM[pc - sBasePC] | (sOpROM[pc - sBasePC + 1]<<8); -} - -static int32_t r16s(offs_t pc) -{ - return (int16_t)(sOpROM[pc - sBasePC] | (sOpROM[pc - sBasePC + 1]<<8)); -} - -static uint32_t r24u(offs_t pc) +u32 mn10200_disassembler::r24(const data_buffer &opcodes, offs_t pc) { - return sOpROM[pc - sBasePC] | (sOpROM[pc - sBasePC + 1]<<8) | (sOpROM[pc - sBasePC + 2]<<16); + return opcodes.r16(pc) | (opcodes.r8(pc+2) << 16); } -static int32_t r24s(offs_t pc) +std::string mn10200_disassembler::i8str(s8 v) { - return sOpROM[pc - sBasePC] | (sOpROM[pc - sBasePC + 1]<<8) | ((int8_t)sOpROM[pc - sBasePC + 2]<<16); -} - -static const char *i8str(int8_t v) -{ - static char res[0x10]; if(v>=0) - sprintf(res, "$%x", v); + return util::string_format("$%x", v); else - sprintf(res, "-$%x", (uint8_t)(-v)); - return res; + return util::string_format("-$%x", u8(-v)); } -static const char *i16str(int16_t v) +std::string mn10200_disassembler::i16str(int16_t v) { - static char res[0x10]; if(v>=0) - sprintf(res, "$%x", v); + return util::string_format("$%x", v); else - sprintf(res, "-$%x", (uint16_t)(-v)); - return res; + return util::string_format("-$%x", u16(-v)); } -static const char *i24str(int32_t v) -{ - static char res[0x10]; - if(v>=0) - sprintf(res, "$%x", v); +std::string mn10200_disassembler::i24str(u32 v) +{ + if(!(v & 0x800000)) + return util::string_format("$%x", v & 0xffffff); else - sprintf(res, "-$%x", -v); - return res; + return util::string_format("-$%x", (-v) & 0xffffff); } - -static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *oprom) +u32 mn10200_disassembler::opcode_alignment() const { - uint8_t opcode; + return 1; +} - sOpROM = oprom; - sBasePC = pc; +offs_t mn10200_disassembler::disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer ¶ms) +{ + u8 opcode; - opcode = program_read_byte(pc); + opcode = opcodes.r8(pc); switch(opcode) { case 0x00: case 0x01: case 0x02: case 0x03: case 0x04: case 0x05: case 0x06: case 0x07: @@ -99,22 +70,22 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o case 0x40: case 0x41: case 0x42: case 0x43: case 0x44: case 0x45: case 0x46: case 0x47: case 0x48: case 0x49: case 0x4a: case 0x4b: case 0x4c: case 0x4d: case 0x4e: case 0x4f: - util::stream_format(stream, "mov d%d, (%s, a%d)", opcode & 3, i8str(program_read_byte(pc+1)), (opcode>>2) & 3); + util::stream_format(stream, "mov d%d, (%s, a%d)", opcode & 3, i8str(opcodes.r8(pc+1)), (opcode>>2) & 3); return 2; case 0x50: case 0x51: case 0x52: case 0x53: case 0x54: case 0x55: case 0x56: case 0x57: case 0x58: case 0x59: case 0x5a: case 0x5b: case 0x5c: case 0x5d: case 0x5e: case 0x5f: - util::stream_format(stream, "mov a%d, (%s, a%d)", opcode & 3, i8str(program_read_byte(pc+1)), (opcode>>2) & 3); + util::stream_format(stream, "mov a%d, (%s, a%d)", opcode & 3, i8str(opcodes.r8(pc+1)), (opcode>>2) & 3); return 2; case 0x60: case 0x61: case 0x62: case 0x63: case 0x64: case 0x65: case 0x66: case 0x67: case 0x68: case 0x69: case 0x6a: case 0x6b: case 0x6c: case 0x6d: case 0x6e: case 0x6f: - util::stream_format(stream, "mov (%s, a%d), d%d", i8str(program_read_byte(pc+1)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "mov (%s, a%d), d%d", i8str(opcodes.r8(pc+1)), (opcode>>2) & 3, opcode & 3); return 2; case 0x70: case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x76: case 0x77: case 0x78: case 0x79: case 0x7a: case 0x7b: case 0x7c: case 0x7d: case 0x7e: case 0x7f: - util::stream_format(stream, "mov (%s, a%d), a%d", i8str(program_read_byte(pc+1)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "mov (%s, a%d), a%d", i8str(opcodes.r8(pc+1)), (opcode>>2) & 3, opcode & 3); return 2; case 0x81: case 0x82: case 0x83: case 0x84: case 0x86: case 0x87: @@ -123,7 +94,7 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o return 1; case 0x80: case 0x85: case 0x8a: case 0x8f: - util::stream_format(stream, "mov %s, d%d", i8str(program_read_byte(pc+1)), opcode & 3); + util::stream_format(stream, "mov %s, d%d", i8str(opcodes.r8(pc+1)), opcode & 3); return 2; case 0x90: case 0x91: case 0x92: case 0x93: case 0x94: case 0x95: case 0x96: case 0x97: @@ -153,79 +124,79 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o return 1; case 0xc0: case 0xc1: case 0xc2: case 0xc3: - util::stream_format(stream, "mov d%d, ($%04x)", opcode & 3, r16u(pc+1)); + util::stream_format(stream, "mov d%d, ($%04x)", opcode & 3, opcodes.r16(pc+1)); return 3; case 0xc4: case 0xc5: case 0xc6: case 0xc7: - util::stream_format(stream, "movb d%d, ($%04x)", opcode & 3, r16u(pc+1)); + util::stream_format(stream, "movb d%d, ($%04x)", opcode & 3, opcodes.r16(pc+1)); return 3; case 0xc8: case 0xc9: case 0xca: case 0xcb: - util::stream_format(stream, "mov ($%04x), d%d", r16u(pc+1), opcode & 3); + util::stream_format(stream, "mov ($%04x), d%d", opcodes.r16(pc+1), opcode & 3); return 3; case 0xcc: case 0xcd: case 0xce: case 0xcf: - util::stream_format(stream, "movbu ($%04x), d%d", r16u(pc+1), opcode & 3); + util::stream_format(stream, "movbu ($%04x), d%d", opcodes.r16(pc+1), opcode & 3); return 3; case 0xd0: case 0xd1: case 0xd2: case 0xd3: - util::stream_format(stream, "add %s, a%d", i8str(program_read_byte(pc+1)), opcode & 3); + util::stream_format(stream, "add %s, a%d", i8str(opcodes.r8(pc+1)), opcode & 3); return 2; case 0xd4: case 0xd5: case 0xd6: case 0xd7: - util::stream_format(stream, "add %s, d%d", i8str(program_read_byte(pc+1)), opcode & 3); + util::stream_format(stream, "add %s, d%d", i8str(opcodes.r8(pc+1)), opcode & 3); return 2; case 0xd8: case 0xd9: case 0xda: case 0xdb: - util::stream_format(stream, "cmp %s, d%d", i8str(program_read_byte(pc+1)), opcode & 3); + util::stream_format(stream, "cmp %s, d%d", i8str(opcodes.r8(pc+1)), opcode & 3); return 2; case 0xdc: case 0xdd: case 0xde: case 0xdf: - util::stream_format(stream, "move $%04x, a%d", r16u(pc+1), opcode & 3); + util::stream_format(stream, "move $%04x, a%d", opcodes.r16(pc+1), opcode & 3); return 3; case 0xe0: - util::stream_format(stream, "blt $%x", (pc+2+(int8_t)program_read_byte(pc+1)) & 0xffffff); + util::stream_format(stream, "blt $%x", (pc+2+(s8)opcodes.r8(pc+1)) & 0xffffff); return 2; case 0xe1: - util::stream_format(stream, "bgt $%x", (pc+2+(int8_t)program_read_byte(pc+1)) & 0xffffff); + util::stream_format(stream, "bgt $%x", (pc+2+(s8)opcodes.r8(pc+1)) & 0xffffff); return 2; case 0xe2: - util::stream_format(stream, "bge $%x", (pc+2+(int8_t)program_read_byte(pc+1)) & 0xffffff); + util::stream_format(stream, "bge $%x", (pc+2+(s8)opcodes.r8(pc+1)) & 0xffffff); return 2; case 0xe3: - util::stream_format(stream, "ble $%x", (pc+2+(int8_t)program_read_byte(pc+1)) & 0xffffff); + util::stream_format(stream, "ble $%x", (pc+2+(s8)opcodes.r8(pc+1)) & 0xffffff); return 2; case 0xe4: - util::stream_format(stream, "bcs $%x", (pc+2+(int8_t)program_read_byte(pc+1)) & 0xffffff); + util::stream_format(stream, "bcs $%x", (pc+2+(s8)opcodes.r8(pc+1)) & 0xffffff); return 2; case 0xe5: - util::stream_format(stream, "bhi $%x", (pc+2+(int8_t)program_read_byte(pc+1)) & 0xffffff); + util::stream_format(stream, "bhi $%x", (pc+2+(s8)opcodes.r8(pc+1)) & 0xffffff); return 2; case 0xe6: - util::stream_format(stream, "bcc $%x", (pc+2+(int8_t)program_read_byte(pc+1)) & 0xffffff); + util::stream_format(stream, "bcc $%x", (pc+2+(s8)opcodes.r8(pc+1)) & 0xffffff); return 2; case 0xe7: - util::stream_format(stream, "bls $%x", (pc+2+(int8_t)program_read_byte(pc+1)) & 0xffffff); + util::stream_format(stream, "bls $%x", (pc+2+(s8)opcodes.r8(pc+1)) & 0xffffff); return 2; case 0xe8: - util::stream_format(stream, "beq $%x", (pc+2+(int8_t)program_read_byte(pc+1)) & 0xffffff); + util::stream_format(stream, "beq $%x", (pc+2+(s8)opcodes.r8(pc+1)) & 0xffffff); return 2; case 0xe9: - util::stream_format(stream, "bne $%x", (pc+2+(int8_t)program_read_byte(pc+1)) & 0xffffff); + util::stream_format(stream, "bne $%x", (pc+2+(s8)opcodes.r8(pc+1)) & 0xffffff); return 2; case 0xea: - util::stream_format(stream, "bra $%x", (pc+2+(int8_t)program_read_byte(pc+1)) & 0xffffff); + util::stream_format(stream, "bra $%x", (pc+2+(s8)opcodes.r8(pc+1)) & 0xffffff); return 2; case 0xeb: @@ -233,11 +204,11 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o return 1; case 0xec: case 0xed: case 0xee: case 0xef: - util::stream_format(stream, "cmp $%04x, a%d", r16u(pc+1), opcode & 3); + util::stream_format(stream, "cmp $%04x, a%d", opcodes.r16(pc+1), opcode & 3); return 3; case 0xf0: - opcode = program_read_byte(pc+1); + opcode = opcodes.r8(pc+1); switch(opcode) { case 0x00: case 0x04: case 0x08: case 0x0c: @@ -296,7 +267,7 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o } case 0xf1: - opcode = program_read_byte(pc+1); + opcode = opcodes.r8(pc+1); switch(opcode&0xc0) { case 0x00: @@ -318,7 +289,7 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o break; case 0xf2: - opcode = program_read_byte(pc+1); + opcode = opcodes.r8(pc+1); switch(opcode&0xf0) { case 0x00: @@ -382,7 +353,7 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o } case 0xf3: - opcode = program_read_byte(pc+1); + opcode = opcodes.r8(pc+1); switch(opcode) { case 0x00: case 0x01: case 0x02: case 0x03: case 0x04: case 0x05: case 0x06: case 0x07: @@ -465,25 +436,25 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o return 2; case 0xfe: - opcode = program_read_byte(pc+2); + opcode = opcodes.r8(pc+2); switch(opcode) { case 0xc0: case 0xc1: case 0xc2: case 0xc3: case 0xc4: case 0xc5: case 0xc6: case 0xc7: - util::stream_format(stream, "tbz ($%x) %d, $%x", r24u(pc+3), opcode & 7, - (pc+7+(int8_t)program_read_byte(pc+6)) & 0xffffff); + util::stream_format(stream, "tbz ($%x) %d, $%x", r24(opcodes, pc+3), opcode & 7, + (pc+7+(s8)opcodes.r8(pc+6)) & 0xffffff); return 7; case 0xc8: case 0xc9: case 0xca: case 0xcb: case 0xcc: case 0xcd: case 0xce: case 0xcf: - util::stream_format(stream, "tbnz ($%x) %d, $%x", r24u(pc+3), opcode & 7, - (pc+7+(int8_t)program_read_byte(pc+6)) & 0xffffff); + util::stream_format(stream, "tbnz ($%x) %d, $%x", r24(opcodes, pc+3), opcode & 7, + (pc+7+(s8)opcodes.r8(pc+6)) & 0xffffff); return 7; case 0xd0: case 0xd1: case 0xd2: case 0xd3: case 0xd4: case 0xd5: case 0xd6: case 0xd7: - util::stream_format(stream, "bset ($%x) %d", r24u(pc+2), opcode & 7); + util::stream_format(stream, "bset ($%x) %d", r24(opcodes, pc+2), opcode & 7); return 6; case 0xd8: case 0xd9: case 0xda: case 0xdb: case 0xdc: case 0xdd: case 0xde: case 0xdf: - util::stream_format(stream, "bclr ($%x) %d", r24u(pc+2), opcode & 7); + util::stream_format(stream, "bclr ($%x) %d", r24(opcodes, pc+2), opcode & 7); return 6; default: @@ -491,29 +462,29 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o } case 0xff: - opcode = program_read_byte(pc+2); + opcode = opcodes.r8(pc+2); switch(opcode) { case 0x80: case 0x81: case 0x82: case 0x83: case 0x84: case 0x85: case 0x86: case 0x87: case 0x88: case 0x89: case 0x8a: case 0x8b: case 0x8c: case 0x8d: case 0x8e: case 0x8f: - util::stream_format(stream, "tbz (%s, a%d) %d, $%x", i8str(program_read_byte(pc+3)), 2+((opcode>>3)&1), opcode & 7, - (pc+5+(int8_t)program_read_byte(pc+4)) & 0xffffff); + util::stream_format(stream, "tbz (%s, a%d) %d, $%x", i8str(opcodes.r8(pc+3)), 2+((opcode>>3)&1), opcode & 7, + (pc+5+(s8)opcodes.r8(pc+4)) & 0xffffff); return 5; case 0x90: case 0x91: case 0x92: case 0x93: case 0x94: case 0x95: case 0x96: case 0x97: case 0x98: case 0x99: case 0x9a: case 0x9b: case 0x9c: case 0x9d: case 0x9e: case 0x9f: - util::stream_format(stream, "bset (%s, a%d) %d", i8str(program_read_byte(pc+3)), 2+((opcode>>3)&1), opcode & 7); + util::stream_format(stream, "bset (%s, a%d) %d", i8str(opcodes.r8(pc+3)), 2+((opcode>>3)&1), opcode & 7); return 4; case 0xa0: case 0xa1: case 0xa2: case 0xa3: case 0xa4: case 0xa5: case 0xa6: case 0xa7: case 0xa8: case 0xa9: case 0xaa: case 0xab: case 0xac: case 0xad: case 0xae: case 0xaf: - util::stream_format(stream, "tbnz (%s, a%d) %d, $%x", i8str(program_read_byte(pc+3)), 2+((opcode>>3)&1), opcode & 7, - (pc+5+(int8_t)program_read_byte(pc+4)) & 0xffffff); + util::stream_format(stream, "tbnz (%s, a%d) %d, $%x", i8str(opcodes.r8(pc+3)), 2+((opcode>>3)&1), opcode & 7, + (pc+5+(s8)opcodes.r8(pc+4)) & 0xffffff); return 5; case 0xb0: case 0xb1: case 0xb2: case 0xb3: case 0xb4: case 0xb5: case 0xb6: case 0xb7: case 0xb8: case 0xb9: case 0xba: case 0xbb: case 0xbc: case 0xbd: case 0xbe: case 0xbf: - util::stream_format(stream, "bclr (%s, a%d) %d", i8str(program_read_byte(pc+3)), 2+((opcode>>3)&1), opcode & 7); + util::stream_format(stream, "bclr (%s, a%d) %d", i8str(opcodes.r8(pc+3)), 2+((opcode>>3)&1), opcode & 7); return 4; default: @@ -525,144 +496,144 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o } case 0xf4: - opcode = program_read_byte(pc+1); + opcode = opcodes.r8(pc+1); switch(opcode) { case 0x00: case 0x01: case 0x02: case 0x03: case 0x04: case 0x05: case 0x06: case 0x07: case 0x08: case 0x09: case 0x0a: case 0x0b: case 0x0c: case 0x0d: case 0x0e: case 0x0f: - util::stream_format(stream, "mov d%d, (%s, a%d)", opcode & 3, i24str(r24s(pc+2)), (opcode>>2) & 3); + util::stream_format(stream, "mov d%d, (%s, a%d)", opcode & 3, i24str(r24(opcodes, pc+2)), (opcode>>2) & 3); return 5; 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: - util::stream_format(stream, "mov a%d, (%s, a%d)", opcode & 3, i24str(r24s(pc+2)), (opcode>>2) & 3); + util::stream_format(stream, "mov a%d, (%s, a%d)", opcode & 3, i24str(r24(opcodes, pc+2)), (opcode>>2) & 3); return 5; case 0x20: case 0x21: case 0x22: case 0x23: case 0x24: case 0x25: case 0x26: case 0x27: case 0x28: case 0x29: case 0x2a: case 0x2b: case 0x2c: case 0x2d: case 0x2e: case 0x2f: - util::stream_format(stream, "movb d%d, (%s, a%d)", opcode & 3, i24str(r24s(pc+2)), (opcode>>2) & 3); + util::stream_format(stream, "movb d%d, (%s, a%d)", opcode & 3, i24str(r24(opcodes, pc+2)), (opcode>>2) & 3); return 5; case 0x30: case 0x31: case 0x32: case 0x33: case 0x34: case 0x35: case 0x36: case 0x37: case 0x38: case 0x39: case 0x3a: case 0x3b: case 0x3c: case 0x3d: case 0x3e: case 0x3f: - util::stream_format(stream, "movx d%d, (%s, a%d)", opcode & 3, i24str(r24s(pc+2)), (opcode>>2) & 3); + util::stream_format(stream, "movx d%d, (%s, a%d)", opcode & 3, i24str(r24(opcodes, pc+2)), (opcode>>2) & 3); return 5; case 0x40: case 0x41: case 0x42: case 0x43: - util::stream_format(stream, "mov d%d, ($%06x)", opcode & 3, r24u(pc+2)); + util::stream_format(stream, "mov d%d, ($%06x)", opcode & 3, r24(opcodes, pc+2)); return 5; case 0x44: case 0x45: case 0x46: case 0x47: - util::stream_format(stream, "movb d%d, ($%06x)", opcode & 3, r24u(pc+2)); + util::stream_format(stream, "movb d%d, ($%06x)", opcode & 3, r24(opcodes, pc+2)); return 5; case 0x4b: - util::stream_format(stream, "bset %02x, ($%06x)", program_read_byte(pc+5), r24u(pc+2)); + util::stream_format(stream, "bset %02x, ($%06x)", opcodes.r8(pc+5), r24(opcodes, pc+2)); return 6; case 0x4f: - util::stream_format(stream, "bclr %02x, ($%06x)", program_read_byte(pc+5), r24u(pc+2)); + util::stream_format(stream, "bclr %02x, ($%06x)", opcodes.r8(pc+5), r24(opcodes, pc+2)); return 6; case 0x50: case 0x51: case 0x52: case 0x53: - util::stream_format(stream, "mov a%d, ($%06x)", opcode & 3, r24u(pc+2)); + util::stream_format(stream, "mov a%d, ($%06x)", opcode & 3, r24(opcodes, pc+2)); return 5; case 0x60: case 0x61: case 0x62: case 0x63: - util::stream_format(stream, "add %s, d%d", i24str(r24s(pc+2)), opcode & 3); + util::stream_format(stream, "add %s, d%d", i24str(r24(opcodes, pc+2)), opcode & 3); return 5; case 0x64: case 0x65: case 0x66: case 0x67: - util::stream_format(stream, "add %s, a%d", i24str(r24s(pc+2)), opcode & 3); + util::stream_format(stream, "add %s, a%d", i24str(r24(opcodes, pc+2)), opcode & 3); return 5; case 0x68: case 0x69: case 0x6a: case 0x6b: - util::stream_format(stream, "sub %s, d%d", i24str(r24s(pc+2)), opcode & 3); + util::stream_format(stream, "sub %s, d%d", i24str(r24(opcodes, pc+2)), opcode & 3); return 5; case 0x6c: case 0x6d: case 0x6e: case 0x6f: - util::stream_format(stream, "sub %s, a%d", i24str(r24s(pc+2)), opcode & 3); + util::stream_format(stream, "sub %s, a%d", i24str(r24(opcodes, pc+2)), opcode & 3); return 5; case 0x70: case 0x71: case 0x72: case 0x73: - util::stream_format(stream, "mov %s, d%d", i24str(r24s(pc+2)), opcode & 3); + util::stream_format(stream, "mov %s, d%d", i24str(r24(opcodes, pc+2)), opcode & 3); return 5; case 0x74: case 0x75: case 0x76: case 0x77: - util::stream_format(stream, "mov $%06x, a%d", r24u(pc+2), opcode & 3); + util::stream_format(stream, "mov $%06x, a%d", r24(opcodes, pc+2), opcode & 3); return 5; case 0x78: case 0x79: case 0x7a: case 0x7b: - util::stream_format(stream, "cmp %s, d%d", i24str(r24s(pc+2)), opcode & 3); + util::stream_format(stream, "cmp %s, d%d", i24str(r24(opcodes, pc+2)), opcode & 3); return 5; case 0x7c: case 0x7d: case 0x7e: case 0x7f: - util::stream_format(stream, "cmp $%06x, a%d", r24u(pc+2), opcode & 3); + util::stream_format(stream, "cmp $%06x, a%d", r24(opcodes, pc+2), opcode & 3); return 5; case 0x80: case 0x81: case 0x82: case 0x83: case 0x84: case 0x85: case 0x86: case 0x87: case 0x88: case 0x89: case 0x8a: case 0x8b: case 0x8c: case 0x8d: case 0x8e: case 0x8f: - util::stream_format(stream, "mov (%s, a%d), d%d", i24str(r24s(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "mov (%s, a%d), d%d", i24str(r24(opcodes, pc+2)), (opcode>>2) & 3, opcode & 3); return 5; case 0x90: case 0x91: case 0x92: case 0x93: case 0x94: case 0x95: case 0x96: case 0x97: case 0x98: case 0x99: case 0x9a: case 0x9b: case 0x9c: case 0x9d: case 0x9e: case 0x9f: - util::stream_format(stream, "movbu (%s, a%d), d%d", i24str(r24s(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "movbu (%s, a%d), d%d", i24str(r24(opcodes, pc+2)), (opcode>>2) & 3, opcode & 3); return 5; case 0xa0: case 0xa1: case 0xa2: case 0xa3: case 0xa4: case 0xa5: case 0xa6: case 0xa7: case 0xa8: case 0xa9: case 0xaa: case 0xab: case 0xac: case 0xad: case 0xae: case 0xaf: - util::stream_format(stream, "movb (%s, a%d), d%d", i24str(r24s(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "movb (%s, a%d), d%d", i24str(r24(opcodes, pc+2)), (opcode>>2) & 3, opcode & 3); return 5; case 0xb0: case 0xb1: case 0xb2: case 0xb3: case 0xb4: case 0xb5: case 0xb6: case 0xb7: case 0xb8: case 0xb9: case 0xba: case 0xbb: case 0xbc: case 0xbd: case 0xbe: case 0xbf: - util::stream_format(stream, "movx (%s, a%d), d%d", i24str(r24s(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "movx (%s, a%d), d%d", i24str(r24(opcodes, pc+2)), (opcode>>2) & 3, opcode & 3); return 5; case 0xc0: case 0xc1: case 0xc2: case 0xc3: - util::stream_format(stream, "mov ($%06x), d%d", r24u(pc+2), opcode & 3); + util::stream_format(stream, "mov ($%06x), d%d", r24(opcodes, pc+2), opcode & 3); return 5; case 0xc4: case 0xc5: case 0xc6: case 0xc7: - util::stream_format(stream, "movb ($%06x), d%d", r24u(pc+2), opcode & 3); + util::stream_format(stream, "movb ($%06x), d%d", r24(opcodes, pc+2), opcode & 3); return 5; case 0xc8: case 0xc9: case 0xca: case 0xcb: - util::stream_format(stream, "movbu ($%06x), d%d", r24u(pc+2), opcode & 3); + util::stream_format(stream, "movbu ($%06x), d%d", r24(opcodes, pc+2), opcode & 3); return 5; case 0xd0: case 0xd1: case 0xd2: case 0xd3: - util::stream_format(stream, "mov ($%06x), a%d", r24u(pc+2), opcode & 3); + util::stream_format(stream, "mov ($%06x), a%d", r24(opcodes, pc+2), opcode & 3); return 5; case 0xe0: - util::stream_format(stream, "jmp $%x", (pc+5+r24s(pc+2)) & 0xffffff); + util::stream_format(stream, "jmp $%x", (pc+5+r24(opcodes, pc+2)) & 0xffffff); return 5; case 0xe1: - util::stream_format(stream, "jsr $%x", (pc+5+r24s(pc+2)) & 0xffffff); + util::stream_format(stream, "jsr $%x", (pc+5+r24(opcodes, pc+2)) & 0xffffff); return 5; case 0xe3: - util::stream_format(stream, "bset $%02x, ($%x)", program_read_byte(pc+4), r16u(pc+2)); + util::stream_format(stream, "bset $%02x, ($%x)", opcodes.r8(pc+4), opcodes.r16(pc+2)); return 6; case 0xe7: - util::stream_format(stream, "bclr $%02x, ($%x)", program_read_byte(pc+4), r16u(pc+2)); + util::stream_format(stream, "bclr $%02x, ($%x)", opcodes.r8(pc+4), opcodes.r16(pc+2)); return 6; case 0xe8: case 0xe9: case 0xea: case 0xeb: - util::stream_format(stream, "bset $%02x, (%s, a%d)", program_read_byte(pc+3), i8str(program_read_byte(pc+2)), opcode & 3); + util::stream_format(stream, "bset $%02x, (%s, a%d)", opcodes.r8(pc+3), i8str(opcodes.r8(pc+2)), opcode & 3); return 4; case 0xec: case 0xed: case 0xee: case 0xef: - util::stream_format(stream, "bclr $%02x, (%s, a%d)", program_read_byte(pc+3), i8str(program_read_byte(pc+2)), opcode & 3); + util::stream_format(stream, "bclr $%02x, (%s, a%d)", opcodes.r8(pc+3), i8str(opcodes.r8(pc+2)), opcode & 3); return 4; case 0xf0: case 0xf1: case 0xf2: case 0xf3: case 0xf4: case 0xf5: case 0xf6: case 0xf7: case 0xf8: case 0xf9: case 0xfa: case 0xfb: case 0xfc: case 0xfd: case 0xfe: case 0xff: - util::stream_format(stream, "mov (%s, a%d), a%d", i24str(r24s(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "mov (%s, a%d), a%d", i24str(r24(opcodes, pc+2)), (opcode>>2) & 3, opcode & 3); return 5; default: @@ -670,44 +641,44 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o } case 0xf5: - opcode = program_read_byte(pc+1); + opcode = opcodes.r8(pc+1); switch(opcode) { case 0x00: case 0x01: case 0x02: case 0x03: - util::stream_format(stream, "and $%02x, d%d", program_read_byte(pc+2), opcode & 3); + util::stream_format(stream, "and $%02x, d%d", opcodes.r8(pc+2), opcode & 3); return 3; case 0x04: case 0x05: case 0x06: case 0x07: - util::stream_format(stream, "btst $%02x, d%d", program_read_byte(pc+2), opcode & 3); + util::stream_format(stream, "btst $%02x, d%d", opcodes.r8(pc+2), opcode & 3); return 3; case 0x08: case 0x09: case 0x0a: case 0x0b: - util::stream_format(stream, "or $%02x, d%d", program_read_byte(pc+2), opcode & 3); + util::stream_format(stream, "or $%02x, d%d", opcodes.r8(pc+2), opcode & 3); return 3; case 0x0c: case 0x0d: case 0x0e: case 0x0f: - util::stream_format(stream, "addnf %s, a%d", i8str(program_read_byte(pc+2)), opcode & 3); + util::stream_format(stream, "addnf %s, a%d", i8str(opcodes.r8(pc+2)), opcode & 3); return 3; 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: - util::stream_format(stream, "movb d%d, (%s, a%d)", opcode & 3, i8str(program_read_byte(pc+2)), (opcode>>2) & 3); + util::stream_format(stream, "movb d%d, (%s, a%d)", opcode & 3, i8str(opcodes.r8(pc+2)), (opcode>>2) & 3); return 3; case 0x20: case 0x21: case 0x22: case 0x23: case 0x24: case 0x25: case 0x26: case 0x27: case 0x28: case 0x29: case 0x2a: case 0x2b: case 0x2c: case 0x2d: case 0x2e: case 0x2f: - util::stream_format(stream, "movb (%s, a%d), d%d", i8str(program_read_byte(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "movb (%s, a%d), d%d", i8str(opcodes.r8(pc+2)), (opcode>>2) & 3, opcode & 3); return 3; case 0x30: case 0x31: case 0x32: case 0x33: case 0x34: case 0x35: case 0x36: case 0x37: case 0x38: case 0x39: case 0x3a: case 0x3b: case 0x3c: case 0x3d: case 0x3e: case 0x3f: - util::stream_format(stream, "movbu (%s, a%d), d%d", i8str(program_read_byte(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "movbu (%s, a%d), d%d", i8str(opcodes.r8(pc+2)), (opcode>>2) & 3, opcode & 3); return 3; case 0x40: case 0x41: case 0x42: case 0x43: case 0x44: case 0x45: case 0x46: case 0x47: case 0x48: case 0x49: case 0x4a: case 0x4b: case 0x4c: case 0x4d: case 0x4e: case 0x4f: { - uint8_t opcode2 = program_read_byte(pc+2); + u8 opcode2 = opcodes.r8(pc+2); switch(opcode2) { case 0x00: @@ -725,13 +696,13 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o case 0x50: case 0x51: case 0x52: case 0x53: case 0x54: case 0x55: case 0x56: case 0x57: case 0x58: case 0x59: case 0x5a: case 0x5b: case 0x5c: case 0x5d: case 0x5e: case 0x5f: - util::stream_format(stream, "movx d%d, (%s, a%d)", opcode & 3, i8str(program_read_byte(pc+2)), (opcode>>2) & 3); + util::stream_format(stream, "movx d%d, (%s, a%d)", opcode & 3, i8str(opcodes.r8(pc+2)), (opcode>>2) & 3); return 3; case 0x60: case 0x61: case 0x62: case 0x63: case 0x64: case 0x65: case 0x66: case 0x67: case 0x68: case 0x69: case 0x6a: case 0x6b: case 0x6c: case 0x6d: case 0x6e: case 0x6f: { - uint8_t opcode2 = program_read_byte(pc+2); + u8 opcode2 = opcodes.r8(pc+2); switch(opcode2) { case 0x10: @@ -745,124 +716,124 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o case 0x70: case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x76: case 0x77: case 0x78: case 0x79: case 0x7a: case 0x7b: case 0x7c: case 0x7d: case 0x7e: case 0x7f: - util::stream_format(stream, "movx (%s, a%d), d%d", i8str(program_read_byte(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "movx (%s, a%d), d%d", i8str(opcodes.r8(pc+2)), (opcode>>2) & 3, opcode & 3); return 3; case 0x80: case 0x81: case 0x82: case 0x83: case 0x84: case 0x85: case 0x86: case 0x87: case 0x88: case 0x89: case 0x8a: case 0x8b: case 0x8c: case 0x8d: case 0x8e: case 0x8f: - util::stream_format(stream, "tbz (%s, a%d) %d, $%x", i8str(program_read_byte(pc+2)), (opcode>>3)&1, opcode & 7, - (pc+4+(int8_t)program_read_byte(pc+3)) & 0xffffff); + util::stream_format(stream, "tbz (%s, a%d) %d, $%x", i8str(opcodes.r8(pc+2)), (opcode>>3)&1, opcode & 7, + (pc+4+(s8)opcodes.r8(pc+3)) & 0xffffff); return 4; case 0x90: case 0x91: case 0x92: case 0x93: case 0x94: case 0x95: case 0x96: case 0x97: case 0x98: case 0x99: case 0x9a: case 0x9b: case 0x9c: case 0x9d: case 0x9e: case 0x9f: - util::stream_format(stream, "bset (%s, a%d) %d", i8str(program_read_byte(pc+2)), (opcode>>3)&1, opcode & 7); + util::stream_format(stream, "bset (%s, a%d) %d", i8str(opcodes.r8(pc+2)), (opcode>>3)&1, opcode & 7); return 3; case 0xa0: case 0xa1: case 0xa2: case 0xa3: case 0xa4: case 0xa5: case 0xa6: case 0xa7: case 0xa8: case 0xa9: case 0xaa: case 0xab: case 0xac: case 0xad: case 0xae: case 0xaf: - util::stream_format(stream, "tbnz (%s, a%d) %d, $%x", i8str(program_read_byte(pc+2)), (opcode>>3)&1, opcode & 7, - (pc+4+(int8_t)program_read_byte(pc+3)) & 0xffffff); + util::stream_format(stream, "tbnz (%s, a%d) %d, $%x", i8str(opcodes.r8(pc+2)), (opcode>>3)&1, opcode & 7, + (pc+4+(s8)opcodes.r8(pc+3)) & 0xffffff); return 4; case 0xb0: case 0xb1: case 0xb2: case 0xb3: case 0xb4: case 0xb5: case 0xb6: case 0xb7: case 0xb8: case 0xb9: case 0xba: case 0xbb: case 0xbc: case 0xbd: case 0xbe: case 0xbf: - util::stream_format(stream, "bclr (%s, a%d) %d", i8str(program_read_byte(pc+2)), (opcode>>3)&1, opcode & 7); + util::stream_format(stream, "bclr (%s, a%d) %d", i8str(opcodes.r8(pc+2)), (opcode>>3)&1, opcode & 7); return 3; case 0xc0: case 0xc1: case 0xc2: case 0xc3: case 0xc4: case 0xc5: case 0xc6: case 0xc7: - util::stream_format(stream, "tbz ($%x) %d, $%x", r16u(pc+2), opcode & 7, - (pc+5+(int8_t)program_read_byte(pc+4)) & 0xffffff); + util::stream_format(stream, "tbz ($%x) %d, $%x", opcodes.r16(pc+2), opcode & 7, + (pc+5+(s8)opcodes.r8(pc+4)) & 0xffffff); return 5; case 0xc8: case 0xc9: case 0xca: case 0xcb: case 0xcc: case 0xcd: case 0xce: case 0xcf: - util::stream_format(stream, "tbnz ($%x) %d, $%x", r16u(pc+2), opcode & 7, - (pc+5+(int8_t)program_read_byte(pc+4)) & 0xffffff); + util::stream_format(stream, "tbnz ($%x) %d, $%x", opcodes.r16(pc+2), opcode & 7, + (pc+5+(s8)opcodes.r8(pc+4)) & 0xffffff); return 5; case 0xd0: case 0xd1: case 0xd2: case 0xd3: case 0xd4: case 0xd5: case 0xd6: case 0xd7: - util::stream_format(stream, "bset ($%x) %d", r16u(pc+2), opcode & 7); + util::stream_format(stream, "bset ($%x) %d", opcodes.r16(pc+2), opcode & 7); return 4; case 0xd8: case 0xd9: case 0xda: case 0xdb: case 0xdc: case 0xdd: case 0xde: case 0xdf: - util::stream_format(stream, "bclr ($%x) %d", r16u(pc+2), opcode & 7); + util::stream_format(stream, "bclr ($%x) %d", opcodes.r16(pc+2), opcode & 7); return 4; case 0xe0: - util::stream_format(stream, "bltx $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bltx $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xe1: - util::stream_format(stream, "bgtx $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bgtx $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xe2: - util::stream_format(stream, "bgex $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bgex $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xe3: - util::stream_format(stream, "blex $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "blex $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xe4: - util::stream_format(stream, "bcsx $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bcsx $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xe5: - util::stream_format(stream, "bhix $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bhix $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xe6: - util::stream_format(stream, "bccx $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bccx $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xe7: - util::stream_format(stream, "blsx $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "blsx $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xe8: - util::stream_format(stream, "beqx $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "beqx $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xe9: - util::stream_format(stream, "bnex $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bnex $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xec: - util::stream_format(stream, "bvcx $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bvcx $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xed: - util::stream_format(stream, "bvsx $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bvsx $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xee: - util::stream_format(stream, "bncx $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bncx $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xef: - util::stream_format(stream, "bnsx $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bnsx $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xf0: case 0xf1: case 0xf2: case 0xf3: case 0xf4: case 0xf5: case 0xf6: case 0xf7: { - uint8_t opcode2 = program_read_byte(pc+2); + u8 opcode2 = opcodes.r8(pc+2); switch(opcode2) { case 0x04: - util::stream_format(stream, "mulql %s, d%d", i8str(program_read_byte(pc+3)), opcode & 3); + util::stream_format(stream, "mulql %s, d%d", i8str(opcodes.r8(pc+3)), opcode & 3); return 4; case 0x05: - util::stream_format(stream, "mulqh %s, d%d", i8str(program_read_byte(pc+3)), opcode & 3); + util::stream_format(stream, "mulqh %s, d%d", i8str(opcodes.r8(pc+3)), opcode & 3); return 4; case 0x08: - util::stream_format(stream, "mulql %s, d%d", i16str(r16s(pc+3)), opcode & 3); + util::stream_format(stream, "mulql %s, d%d", i16str(opcodes.r16(pc+3)), opcode & 3); return 5; case 0x09: - util::stream_format(stream, "mulqh %s, d%d", i16str(r16s(pc+3)), opcode & 3); + util::stream_format(stream, "mulqh %s, d%d", i16str(opcodes.r16(pc+3)), opcode & 3); return 5; default: @@ -871,19 +842,19 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o } case 0xfc: - util::stream_format(stream, "bvc $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bvc $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xfd: - util::stream_format(stream, "bvs $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bvs $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xfe: - util::stream_format(stream, "bnc $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bnc $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; case 0xff: - util::stream_format(stream, "bns $%x", (pc+3+(int8_t)program_read_byte(pc+2)) & 0xffffff); + util::stream_format(stream, "bns $%x", (pc+3+s8(opcodes.r8(pc+2))) & 0xffffff); return 3; default: @@ -895,104 +866,104 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o return 1; case 0xf7: - opcode = program_read_byte(pc+1); + opcode = opcodes.r8(pc+1); switch(opcode) { case 0x00: case 0x01: case 0x02: case 0x03: - util::stream_format(stream, "and $%04x, d%d", r16u(pc+2), opcode & 3); + util::stream_format(stream, "and $%04x, d%d", opcodes.r16(pc+2), opcode & 3); return 4; case 0x04: case 0x05: case 0x06: case 0x07: - util::stream_format(stream, "btst $%04x, d%d", r16u(pc+2), opcode & 3); + util::stream_format(stream, "btst $%04x, d%d", opcodes.r16(pc+2), opcode & 3); return 4; case 0x08: case 0x09: case 0x0a: case 0x0b: - util::stream_format(stream, "add %s, a%d", i16str(r16s(pc+2)), opcode & 3); + util::stream_format(stream, "add %s, a%d", i16str(opcodes.r16(pc+2)), opcode & 3); return 4; case 0x0c: case 0x0d: case 0x0e: case 0x0f: - util::stream_format(stream, "sub %s, a%d", i16str(r16s(pc+2)), opcode & 3); + util::stream_format(stream, "sub %s, a%d", i16str(opcodes.r16(pc+2)), opcode & 3); return 4; case 0x10: - util::stream_format(stream, "and $%04x, psw", r16u(pc+2)); + util::stream_format(stream, "and $%04x, psw", opcodes.r16(pc+2)); return 4; case 0x14: - util::stream_format(stream, "or $%04x, psw", r16u(pc+2)); + util::stream_format(stream, "or $%04x, psw", opcodes.r16(pc+2)); return 4; case 0x18: case 0x19: case 0x1a: case 0x1b: - util::stream_format(stream, "add %s, d%d", i16str(r16u(pc+2)), opcode & 3); + util::stream_format(stream, "add %s, d%d", i16str(opcodes.r16(pc+2)), opcode & 3); return 4; case 0x1c: case 0x1d: case 0x1e: case 0x1f: - util::stream_format(stream, "sub %s, d%d", i16str(r16s(pc+2)), opcode & 3); + util::stream_format(stream, "sub %s, d%d", i16str(opcodes.r16(pc+2)), opcode & 3); return 4; case 0x20: case 0x21: case 0x22: case 0x23: - util::stream_format(stream, "mov a%d, ($%04x)", opcode & 3, r16u(pc+2)); + util::stream_format(stream, "mov a%d, ($%04x)", opcode & 3, opcodes.r16(pc+2)); return 4; case 0x30: case 0x31: case 0x32: case 0x33: - util::stream_format(stream, "mov ($%04x), a%d", r16u(pc+2), opcode & 3); + util::stream_format(stream, "mov ($%04x), a%d", opcodes.r16(pc+2), opcode & 3); return 4; case 0x40: case 0x41: case 0x42: case 0x43: - util::stream_format(stream, "or $%04x, d%d", r16u(pc+2), opcode & 3); + util::stream_format(stream, "or $%04x, d%d", opcodes.r16(pc+2), opcode & 3); return 4; case 0x48: case 0x49: case 0x4a: case 0x4b: - util::stream_format(stream, "cmp %s, d%d", i16str(r16u(pc+2)), opcode & 3); + util::stream_format(stream, "cmp %s, d%d", i16str(opcodes.r16(pc+2)), opcode & 3); return 4; case 0x4c: case 0x4d: case 0x4e: case 0x4f: - util::stream_format(stream, "xor $%04x, d%d", r16u(pc+2), opcode & 3); + util::stream_format(stream, "xor $%04x, d%d", opcodes.r16(pc+2), opcode & 3); return 4; case 0x50: case 0x51: case 0x52: case 0x53: case 0x54: case 0x55: case 0x56: case 0x57: case 0x58: case 0x59: case 0x5a: case 0x5b: case 0x5c: case 0x5d: case 0x5e: case 0x5f: - util::stream_format(stream, "movbu (%s, a%d), d%d", i16str(r16s(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "movbu (%s, a%d), d%d", i16str(opcodes.r16(pc+2)), (opcode>>2) & 3, opcode & 3); return 4; case 0x60: case 0x61: case 0x62: case 0x63: case 0x64: case 0x65: case 0x66: case 0x67: case 0x68: case 0x69: case 0x6a: case 0x6b: case 0x6c: case 0x6d: case 0x6e: case 0x6f: - util::stream_format(stream, "movx d%d, (%s, a%d)", opcode & 3, i16str(r16s(pc+2)), (opcode>>2) & 3); + util::stream_format(stream, "movx d%d, (%s, a%d)", opcode & 3, i16str(opcodes.r16(pc+2)), (opcode>>2) & 3); return 4; case 0x70: case 0x71: case 0x72: case 0x73: case 0x74: case 0x75: case 0x76: case 0x77: case 0x78: case 0x79: case 0x7a: case 0x7b: case 0x7c: case 0x7d: case 0x7e: case 0x7f: - util::stream_format(stream, "movx (%s, a%d), d%d", i16str(r16s(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "movx (%s, a%d), d%d", i16str(opcodes.r16(pc+2)), (opcode>>2) & 3, opcode & 3); return 4; case 0x80: case 0x81: case 0x82: case 0x83: case 0x84: case 0x85: case 0x86: case 0x87: case 0x88: case 0x89: case 0x8a: case 0x8b: case 0x8c: case 0x8d: case 0x8e: case 0x8f: - util::stream_format(stream, "mov d%d, (%s, a%d)", opcode & 3, i16str(r16s(pc+2)), (opcode>>2) & 3); + util::stream_format(stream, "mov d%d, (%s, a%d)", opcode & 3, i16str(opcodes.r16(pc+2)), (opcode>>2) & 3); return 4; case 0x90: case 0x91: case 0x92: case 0x93: case 0x94: case 0x95: case 0x96: case 0x97: case 0x98: case 0x99: case 0x9a: case 0x9b: case 0x9c: case 0x9d: case 0x9e: case 0x9f: - util::stream_format(stream, "movb d%d, (%s, a%d)", opcode & 3, i16str(r16s(pc+2)), (opcode>>2) & 3); + util::stream_format(stream, "movb d%d, (%s, a%d)", opcode & 3, i16str(opcodes.r16(pc+2)), (opcode>>2) & 3); return 4; case 0xa0: case 0xa1: case 0xa2: case 0xa3: case 0xa4: case 0xa5: case 0xa6: case 0xa7: case 0xa8: case 0xa9: case 0xaa: case 0xab: case 0xac: case 0xad: case 0xae: case 0xaf: - util::stream_format(stream, "mov a%d, (%s, a%d)", opcode & 3, i16str(r16s(pc+2)), (opcode>>2) & 3); + util::stream_format(stream, "mov a%d, (%s, a%d)", opcode & 3, i16str(opcodes.r16(pc+2)), (opcode>>2) & 3); return 4; case 0xb0: case 0xb1: case 0xb2: case 0xb3: case 0xb4: case 0xb5: case 0xb6: case 0xb7: case 0xb8: case 0xb9: case 0xba: case 0xbb: case 0xbc: case 0xbd: case 0xbe: case 0xbf: - util::stream_format(stream, "mov (%s, a%d), a%d", i16str(r16s(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "mov (%s, a%d), a%d", i16str(opcodes.r16(pc+2)), (opcode>>2) & 3, opcode & 3); return 4; case 0xc0: case 0xc1: case 0xc2: case 0xc3: case 0xc4: case 0xc5: case 0xc6: case 0xc7: case 0xc8: case 0xc9: case 0xca: case 0xcb: case 0xcc: case 0xcd: case 0xce: case 0xcf: - util::stream_format(stream, "mov (%s, a%d), d%d", i16str(r16s(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "mov (%s, a%d), d%d", i16str(opcodes.r16(pc+2)), (opcode>>2) & 3, opcode & 3); return 4; case 0xd0: case 0xd1: case 0xd2: case 0xd3: case 0xd4: case 0xd5: case 0xd6: case 0xd7: case 0xd8: case 0xd9: case 0xda: case 0xdb: case 0xdc: case 0xdd: case 0xde: case 0xdf: - util::stream_format(stream, "movb (%s, a%d), d%d", i16str(r16s(pc+2)), (opcode>>2) & 3, opcode & 3); + util::stream_format(stream, "movb (%s, a%d), d%d", i16str(opcodes.r16(pc+2)), (opcode>>2) & 3, opcode & 3); return 4; default: @@ -1000,15 +971,15 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o } case 0xf8: case 0xf9: case 0xfa: case 0xfb: - util::stream_format(stream, "mov %s, d%d", i16str(r16s(pc+1)), opcode & 3); + util::stream_format(stream, "mov %s, d%d", i16str(opcodes.r16(pc+1)), opcode & 3); return 3; case 0xfc: - util::stream_format(stream, "jmp $%x", (pc+3+r16s(pc+1)) & 0xffffff); + util::stream_format(stream, "jmp $%x", (pc+3+s16(opcodes.r16(pc+1))) & 0xffffff); return 3; case 0xfd: - util::stream_format(stream, "jsr $%x", (pc+3+r16s(pc+1)) & 0xffffff); + util::stream_format(stream, "jsr $%x", (pc+3+s16(opcodes.r16(pc+1))) & 0xffffff); return 3; case 0xfe: @@ -1020,19 +991,14 @@ static int mn102_disassemble(std::ostream &stream, uint32_t pc, const uint8_t *o }; illegal1: - util::stream_format(stream, "dc.b $%02x", program_read_byte(pc)); + util::stream_format(stream, "dc.b $%02x", opcodes.r8(pc)); return 1; illegal2: - util::stream_format(stream, "dc.b $%02x $%02x", program_read_byte(pc), program_read_byte(pc+1)); + util::stream_format(stream, "dc.b $%02x $%02x", opcodes.r8(pc), opcodes.r8(pc+1)); return 2; illegal3: - util::stream_format(stream, "dc.b $%02x $%02x $%02x", program_read_byte(pc), program_read_byte(pc+1), program_read_byte(pc+2)); + util::stream_format(stream, "dc.b $%02x $%02x $%02x", opcodes.r8(pc), opcodes.r8(pc+1), opcodes.r8(pc+2)); return 3; } - -CPU_DISASSEMBLE( mn10200 ) -{ - return mn102_disassemble(stream, pc, oprom); -} diff --git a/src/devices/cpu/mn10200/mn102dis.h b/src/devices/cpu/mn10200/mn102dis.h new file mode 100644 index 00000000000..4fa8e932812 --- /dev/null +++ b/src/devices/cpu/mn10200/mn102dis.h @@ -0,0 +1,28 @@ +// license:BSD-3-Clause +// copyright-holders:Olivier Galibert, R. Belmont, hap +/* + Panasonic MN10200 disassembler +*/ + +#ifndef MAME_CPU_MN10200_MN102DIS_H +#define MAME_CPU_MN10200_MN102DIS_H + +#pragma once + +class mn10200_disassembler : public util::disasm_interface +{ +public: + mn10200_disassembler() = default; + virtual ~mn10200_disassembler() = default; + + virtual u32 opcode_alignment() const override; + virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer ¶ms) override; + +private: + u32 r24(const data_buffer &opcodes, offs_t pc); + std::string i8str(s8 v); + std::string i16str(int16_t v); + std::string i24str(u32 v); +}; + +#endif |