diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2021-04-08 08:47:06 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2021-04-08 08:47:06 -0400 |
commit | e493e96800b815ee27ad6a6721496f2c82798152 (patch) | |
tree | b2974faef542f1a50a81b3b518b23b3c088498f4 | |
parent | 7b72b123c2719b17f4edc7164b18497c6e578c73 (diff) |
unidasm: Add preliminary MN1860 disassembler (still missing a few opcodes due to lack of documentation)
-rw-r--r-- | src/devices/cpu/mn1880/mn1880d.cpp | 71 | ||||
-rw-r--r-- | src/devices/cpu/mn1880/mn1880d.h | 11 | ||||
-rw-r--r-- | src/tools/unidasm.cpp | 1 |
3 files changed, 75 insertions, 8 deletions
diff --git a/src/devices/cpu/mn1880/mn1880d.cpp b/src/devices/cpu/mn1880/mn1880d.cpp index 01ab3fac038..194aa6dc8fa 100644 --- a/src/devices/cpu/mn1880/mn1880d.cpp +++ b/src/devices/cpu/mn1880/mn1880d.cpp @@ -11,6 +11,11 @@ reverse engineering (which include CALL XP actually being provided by the MN1880 despite the MN1870 manual claiming it as exclusive). + Since almost nothing about MN1860 is known except that it seems to be + closely related to the MN1880, its several additional instructions + have not been completely identified and MN1860 disassembler output + should therefore be considered preliminary. + The direct flag (bit 5 of the flag status register) is the key to data memory addressing. When DF is cleared, the upper bytes of direct addresses are zeroed; when DF is set, the upper address bytes are @@ -122,6 +127,48 @@ const char *const mn1870_disassembler::s_inst_names[256] = "cmpbe", "cmpbe", "mov1n", "push", "br", "call", "rdtbl", nullptr }; +mn1860_disassembler::mn1860_disassembler() + : mn1880_disassembler(s_inst_names) +{ +} + +// MN1860 probably includes most if not all MN1880 opcodes +const char *const mn1860_disassembler::s_inst_names[256] = +{ + "nop", "rep", "rep", "rep", "rep", "rep", "rep", "rep", + "rep", "rep", "rep", "rep", "rep", "rep", "rep", "rep", + "clr", "clr", "clr", "clr", "clr", "clr", "clr", "clr", + "set", "set", "set", "set", "set", "set", "set", "set", + "t1bnz", "t1bnz", "t1bnz", "t1bnz", "t1bnz", "t1bnz", "t1bnz", "t1bnz", + "t1bz", "t1bz", "t1bz", "t1bz", "t1bz", "t1bz", "t1bz", "t1bz", + nullptr, "movl", nullptr, "movl", "movl", "movl", "mov", "mov", + "movl", "movl", "movl", "movl", "asl", "asl", "asr", "asr", + "dec", "dec", "not", "not", "cmpm", "cmpm", "xch4", "xch4", + "inc", "inc", "clr", "clr", "rol", "rol", "ror", "ror", + "cmpm", "div", "cmpm", "movda", "mov", "mov", "mov", "mov", + "xch", "mul", "xch", "movda", "movl", "movl", "movl", "movl", + "cmp", "cmp", "cmp", "cmp", "and", "and", "and", "and", + "xor", "xor", "xor", "xor", "or", "or", "or", "or", + "subc", "subc", "subc", "subc", "subd", "subd", "subd", "subd", + "addc", "addc", "addc", "addc", "addd", "addd", "addd", "addd", + "skip", "bc", "bz", "ble", "cmpl", "clr", "cmpl", "clr", + "br", "bnc", "bnz", "bgt", "cmpl", "set", "cmpl", "set", + "call", "call", "call", "call", "call", "call", "call", "call", + "call", "call", "call", "call", "call", "call", "call", "call", + "br", "br", "br", "br", "br", "br", "br", "br", + "br", "br", "br", "br", "br", "br", "br", "br", + nullptr, "pop", nullptr, "pop", "pop", "pop", "pop", "pop", + nullptr, "push", nullptr, "push", "push", "push", "push", "push", + "subcl", "div", "subcl", "subcl", "xch", "xch", "xch", "xch", + "addcl", "mul", "addcl", "addcl", "mov", "mov", "mov", "mov", + "cmp", "cmp", "cmp", "cmp", "xch", "xch", nullptr, "xch", + "mov", "mov", "mov", "mov", "mov", "mov", "mov", "mov", + "loop", "rloop", "loop", "rloop", "dec", "inc", "dec", "inc", + "addr", "addr", "addr", "addr", "addr", "addr", "addr", "addr", + "cmpbne", "cmpbne", "mov1", "wait", "ret", "reti", "br", "call", + "cmpbe", "cmpbe", "mov1n", "push", "br", "call", "rdtbl", "pi" +}; + u32 mn1880_disassembler::opcode_alignment() const { return 1; @@ -250,7 +297,7 @@ void mn1880_disassembler::dasm_operands(std::ostream &stream, u8 opcode, offs_t stream << ", "; format_imm(stream, opcodes.r8(pc++)); } - else if (opcode < 0x50 || (opcode & 0xf7) == 0xb5 || (opcode & 0xf7) == 0xc3) + else if (opcode < 0x50 || (opcode & 0xf7) == 0xb5 || ((opcode & 0xf7) == 0xc3 && m_inst_names[opcode][4] == 0)) { // Unary operations if (BIT(opcode, 0)) @@ -284,13 +331,21 @@ void mn1880_disassembler::dasm_operands(std::ostream &stream, u8 opcode, offs_t } else if (opcode == 0x53) { - // MOVDA (MN1880 only) + // MOVDA (MN1880, MN1860 only) format_direct16(stream, opcodes.r16(pc + 2)); stream << ", "; format_direct16(stream, opcodes.r16(pc)); pc += 4; } - else if (opcode < 0x80 || (opcode & 0xfd) == 0x84 || (opcode & 0xf4) == 0xc0) + else if (opcode == 0x5b) + { + // MOVDA with immediate source? (MN1860 only) + format_direct16(stream, opcodes.r16(pc + 1)); + stream << ", "; + format_imm(stream, opcodes.r8(pc)); + pc += 3; + } + else if (opcode < 0x80 || (opcode & 0xfd) == 0x84 || (opcode & 0xfd) == 0x8c || (opcode & 0xf4) == 0xc0) { // Binary operations if (BIT(opcode, 1)) @@ -299,11 +354,11 @@ void mn1880_disassembler::dasm_operands(std::ostream &stream, u8 opcode, offs_t u8 op2 = opcodes.r8(pc++); format_direct(stream, opcodes.r8(pc++)); stream << ", "; - if (BIT(opcode, 0)) + if (opcode == 0x5f || opcode == 0x8e || (opcode & 0xf7) == 0xc3) + format_imm16(stream, op2 | u16(opcodes.r8(pc++)) << 8); + else if (BIT(opcode, 0)) { - if (opcode == 0x5f) - format_imm16(stream, op2 | u16(opcodes.r8(pc++)) << 8); - else if ((opcode & 0xf4) == 0x74) + if ((opcode & 0xf4) == 0x74) format_imm4(stream, op2); else format_imm(stream, op2); @@ -315,7 +370,7 @@ void mn1880_disassembler::dasm_operands(std::ostream &stream, u8 opcode, offs_t { // Indirect modes stream << "(xp), "; - if (opcode == 0x5d) + if (opcode == 0x5d || opcode == 0x8c) { format_imm16(stream, swapendian_int16(opcodes.r16(pc))); pc += 2; diff --git a/src/devices/cpu/mn1880/mn1880d.h b/src/devices/cpu/mn1880/mn1880d.h index 453522aa43b..00e88510d5c 100644 --- a/src/devices/cpu/mn1880/mn1880d.h +++ b/src/devices/cpu/mn1880/mn1880d.h @@ -52,4 +52,15 @@ private: static const char *const s_inst_names[256]; }; +class mn1860_disassembler : public mn1880_disassembler +{ +public: + // construction/destruction + mn1860_disassembler(); + +private: + // instruction mnemonic table + static const char *const s_inst_names[256]; +}; + #endif // MAME_CPU_PIC17_PIC17D_H diff --git a/src/tools/unidasm.cpp b/src/tools/unidasm.cpp index eb668c39d6d..4a2aa8c9e54 100644 --- a/src/tools/unidasm.cpp +++ b/src/tools/unidasm.cpp @@ -504,6 +504,7 @@ static const dasm_table_entry dasm_table[] = { "mm76", le, 0, []() -> util::disasm_interface * { return new mm76_disassembler; } }, { "mm78", le, 0, []() -> util::disasm_interface * { return new mm78_disassembler; } }, { "mn10200", le, 0, []() -> util::disasm_interface * { return new mn10200_disassembler; } }, + { "mn1860", be, 0, []() -> util::disasm_interface * { return new mn1860_disassembler; } }, { "mn1870", be, 0, []() -> util::disasm_interface * { return new mn1870_disassembler; } }, { "mn1880", be, 0, []() -> util::disasm_interface * { return new mn1880_disassembler; } }, { "msm65x2", le, 0, []() -> util::disasm_interface * { return new msm65x2_disassembler; } }, |