Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-16 09:20:04 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

h8: Disassembly improvements

Browse Source 
- Correct sign extension for 16-bit absolute addresses
- Use H' prefix for hexadecimal numbers
- Restrict address length depending on model
- Format arguments in separate column
This commit is contained in:
AJR 2019-09-02 20:53:09 -04:00
parent 08cd02a876
commit 62c658d9d0
5 changed files with 51 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/devices/cpu/h8/h8d.cpp
View File

@ -12,11 +12,11 @@
#include "h8d.h" #include "h8d.h"
#include "cpu/h8/h8d.hxx" #include "cpu/h8/h8d.hxx"
h8_disassembler::h8_disassembler(const disasm_entry *_table) : table(_table) h8_disassembler::h8_disassembler(const disasm_entry *_table, bool _advanced) : table(_table), advanced(_advanced)
{ {
} }
h8_disassembler::h8_disassembler() : h8_disassembler(disasm_entries) h8_disassembler::h8_disassembler() : h8_disassembler(disasm_entries, false)
{ {
} }
@ -89,7 +89,7 @@ void h8_disassembler::disassemble_am(std::ostream &stream, int am, offs_t pc, co
break; break;
case DASM_r16d16h: case DASM_r16d16h:
util::stream_format(stream, "@(%x, %s)", opcodes.r16(epc-2), r16_names[(opcode >> 4) & 7]); util::stream_format(stream, "@(h'%x, %s)", opcodes.r16(epc-2), r16_names[(opcode >> 4) & 7]);
break; break;
case DASM_r32ih: case DASM_r32ih:
@ -113,11 +113,11 @@ void h8_disassembler::disassemble_am(std::ostream &stream, int am, offs_t pc, co
break; break;
case DASM_r32d16h: case DASM_r32d16h:
util::stream_format(stream, "@(%x, %s)", opcodes.r16(epc-2), r32_names[(opcode >> 4) & 7]); util::stream_format(stream, "@(h'%x, %s)", opcodes.r16(epc-2), r32_names[(opcode >> 4) & 7]);
break; break;
case DASM_r32d32hh: case DASM_r32d32hh:
util::stream_format(stream, "@(%x, %s)", opcodes.r32(epc-4), r32_names[(opcode >> 20) & 7]); util::stream_format(stream, "@(h'%x, %s)", opcodes.r32(epc-4), r32_names[(opcode >> 20) & 7]);
break; break;
case DASM_psp: case DASM_psp:
@ -141,41 +141,60 @@ void h8_disassembler::disassemble_am(std::ostream &stream, int am, offs_t pc, co
break; break;
case DASM_abs8: case DASM_abs8:
util::stream_format(stream, "@%08x", 0xffffff00 | opcodes.r8(pc+1)); if (advanced)
util::stream_format(stream, "@h'%06x", 0xffff00 | opcodes.r8(pc+1));
else
util::stream_format(stream, "@h'%04x", 0xff00 | opcodes.r8(pc+1));
break; break;
case DASM_abs16: case DASM_abs16:
if(offset >= 6) if(offset >= 6)
util::stream_format(stream, "@%08x", s16(opcodes.r16(epc-4))); {
if (advanced)
util::stream_format(stream, "@h'%06x", s32(s16(opcodes.r16(epc-4))) & 0xffffff);
else else
util::stream_format(stream, "@%08x", s16(opcodes.r16(epc-2))); util::stream_format(stream, "@h'%04x", opcodes.r16(epc-4));
}
else
{
if (advanced)
util::stream_format(stream, "@h'%06x", s32(s16(opcodes.r16(epc-2))) & 0xffffff);
else
util::stream_format(stream, "@h'%04x", opcodes.r16(epc-2));
}
break; break;
case DASM_abs32: case DASM_abs32:
if(slot == 3) if(slot == 3)
util::stream_format(stream, "@%08x", opcodes.r32(epc-6)); util::stream_format(stream, "@h'%06x", opcodes.r32(epc-6));
else else
util::stream_format(stream, "@%08x", opcodes.r32(epc-4)); util::stream_format(stream, "@h'%06x", opcodes.r32(epc-4));
break; break;
case DASM_abs8i: case DASM_abs8i:
util::stream_format(stream, "@%02x", opcodes.r8(pc+1)); util::stream_format(stream, "@h'%02x", opcodes.r8(pc+1));
break; break;
case DASM_abs16e: case DASM_abs16e:
util::stream_format(stream, "%04x", opcodes.r16(pc+2)); util::stream_format(stream, "h'%04x", opcodes.r16(pc+2));
break; break;
case DASM_abs24e: case DASM_abs24e:
util::stream_format(stream, "%08x", opcodes.r32(pc) & 0xffffff); util::stream_format(stream, "h'%06x", opcodes.r32(pc) & 0xffffff);
break; break;
case DASM_rel8: case DASM_rel8:
util::stream_format(stream, "%08x", pc + 2 + s8(opcodes.r8(pc+1))); if (advanced)
util::stream_format(stream, "h'%06x", (pc + 2 + s8(opcodes.r8(pc+1))) & 0xffffff);
else
util::stream_format(stream, "h'%04x", (pc + 2 + s8(opcodes.r8(pc+1))) & 0xffff);
break; break;
case DASM_rel16: case DASM_rel16:
util::stream_format(stream, "%08x", pc + 4 + s16(opcodes.r16(pc+2))); if (advanced)
util::stream_format(stream, "h'%06x", (pc + 4 + s16(opcodes.r16(pc+2))) & 0xffffff);
else
util::stream_format(stream, "h'%04x", (pc + 4 + s16(opcodes.r16(pc+2))) & 0xffff);
break; break;
case DASM_one: case DASM_one:
@ -199,15 +218,15 @@ void h8_disassembler::disassemble_am(std::ostream &stream, int am, offs_t pc, co
break; break;
case DASM_imm8: case DASM_imm8:
util::stream_format(stream, "#%02x", opcodes.r8(pc+1)); util::stream_format(stream, "#h'%02x", opcodes.r8(pc+1));
break; break;
case DASM_imm16: case DASM_imm16:
util::stream_format(stream, "#%04x", opcodes.r16(pc+2)); util::stream_format(stream, "#h'%04x", opcodes.r16(pc+2));
break; break;
case DASM_imm32: case DASM_imm32:
util::stream_format(stream, "#%08x", opcodes.r32(pc+2)); util::stream_format(stream, "#h'%08x", opcodes.r32(pc+2));
break; break;
case DASM_ccr: case DASM_ccr:
@ -248,15 +267,15 @@ offs_t h8_disassembler::disassemble(std::ostream &stream, offs_t pc, const data_
break; break;
} }
const disasm_entry &e = table[inst]; const disasm_entry &e = table[inst];
if(e.am1 == DASM_none)
stream << e.opcode; stream << e.opcode;
else {
if(e.am1 != DASM_none) { util::stream_format(stream, "%-08s", e.opcode);
stream << ' ';
disassemble_am(stream, e.am1, pc, opcodes, slot[e.slot], e.slot, e.flags & LENGTHMASK); disassemble_am(stream, e.am1, pc, opcodes, slot[e.slot], e.slot, e.flags & LENGTHMASK);
}
if(e.am2 != DASM_none) { if(e.am2 != DASM_none) {
stream << ", "; stream << ", ";
disassemble_am(stream, e.am2, pc, opcodes, slot[e.slot], e.slot, e.flags & LENGTHMASK); disassemble_am(stream, e.am2, pc, opcodes, slot[e.slot], e.slot, e.flags & LENGTHMASK);
} }
}
return e.flags | SUPPORTED; return e.flags | SUPPORTED;
} }

5
src/devices/cpu/h8/h8d.h
View File

@ -26,7 +26,7 @@ protected:
}; };
public: public:
h8_disassembler(const disasm_entry *_table); h8_disassembler(const disasm_entry *_table, bool _advanced);
h8_disassembler(); h8_disassembler();
virtual u32 opcode_alignment() const override; virtual u32 opcode_alignment() const override;
@ -93,7 +93,8 @@ protected:
void disassemble_am(std::ostream &stream, int am, offs_t pc, const data_buffer &opcodes, u32 opcode, int slot, int offset); void disassemble_am(std::ostream &stream, int am, offs_t pc, const data_buffer &opcodes, u32 opcode, int slot, int offset);
const disasm_entry *table; const disasm_entry *const table;
const bool advanced;
static const disasm_entry disasm_entries[]; static const disasm_entry disasm_entries[];
}; };

2
src/devices/cpu/h8/h8hd.cpp
View File

@ -12,6 +12,6 @@
#include "h8hd.h" #include "h8hd.h"
#include "cpu/h8/h8hd.hxx" #include "cpu/h8/h8hd.hxx"
h8h_disassembler::h8h_disassembler() : h8_disassembler(disasm_entries) h8h_disassembler::h8h_disassembler() : h8_disassembler(disasm_entries, true)
{ {
} }

2
src/devices/cpu/h8/h8s2000d.cpp
View File

@ -12,6 +12,6 @@
#include "h8s2000d.h" #include "h8s2000d.h"
#include "cpu/h8/h8s2000d.hxx" #include "cpu/h8/h8s2000d.hxx"
h8s2000_disassembler::h8s2000_disassembler() : h8_disassembler(disasm_entries) h8s2000_disassembler::h8s2000_disassembler() : h8_disassembler(disasm_entries, true)
{ {
} }

2
src/devices/cpu/h8/h8s2600d.cpp
View File

@ -12,6 +12,6 @@
#include "h8s2600d.h" #include "h8s2600d.h"
#include "cpu/h8/h8s2600d.hxx" #include "cpu/h8/h8s2600d.hxx"
h8s2600_disassembler::h8s2600_disassembler() : h8_disassembler(disasm_entries) h8s2600_disassembler::h8s2600_disassembler() : h8_disassembler(disasm_entries, true)
{ {
} }