Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 01:11:11 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1713 from npwoods/dasmstream_m58846

Browse Source 
Changed the m58846 disassembler to use 'std::ostream &' internally
This commit is contained in:
Vas Crabb 2016-11-17 02:02:17 +11:00 committed by GitHub
commit 239ec4c96e
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/devices/cpu/melps4/melps4d.cpp
View File

@ -100,10 +100,9 @@ static const uint8_t m58846_opmap[0xc0] =
em_LA, em_LA, em_LA, em_LA, em_LA, em_LA, em_LA, em_LA, em_LA, em_LA, em_LA, em_LA, em_LA, em_LA, em_LA, em_LA // Bx
};
CPU_DISASSEMBLE(m58846)
static offs_t internal_disasm_m58846(cpu_device *device, std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, int options)
{
uint16_t op = (oprom[0] | oprom[1] << 8) & 0x1ff;
char *dst = buffer;
// get opcode
uint8_t instr;
@ -116,7 +115,7 @@ CPU_DISASSEMBLE(m58846)
else
instr = m58846_opmap[op];
dst += sprintf(dst, "%-6s", em_name[instr]);
util::stream_format(stream, "%-6s", em_name[instr]);
// get immediate param
uint8_t bits = em_bits[instr];
@ -126,16 +125,26 @@ CPU_DISASSEMBLE(m58846)
{
uint8_t x = op >> 4 & 3;
uint8_t y = op & 0xf;
dst += sprintf(dst, " %d,%d", x, y);
util::stream_format(stream, " %d,%d", x, y);
}
else if (bits > 0)
{
uint8_t param = op & ((1 << bits) - 1);
if (bits > 4)
dst += sprintf(dst, " $%02X", param);
util::stream_format(stream, " $%02X", param);
else
dst += sprintf(dst, " %d", param);
util::stream_format(stream, " %d", param);
}
return 1 | em_flags[instr] | DASMFLAG_SUPPORTED;
}
CPU_DISASSEMBLE(m58846)
{
std::ostringstream stream;
offs_t result = internal_disasm_m58846(device, stream, pc, oprom, opram, options);
std::string stream_str = stream.str();
strcpy(buffer, stream_str.c_str());
return result;
}