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

Merge pull request #1656 from npwoods/dasmstream_apexc

Browse Source 
Changed the apexc disassembler to use 'std::ostream &' internally
This commit is contained in:
Vas Crabb 2016-11-12 17:26:45 +11:00 committed by GitHub
commit c8a5498f9a
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/devices/cpu/apexc/apexcdsm.cpp
View File

@ -83,7 +83,7 @@ static const instr_desc instructions[16] =
{ "A", store }, { "S", swap } { "A", store }, { "S", swap }
}; };
CPU_DISASSEMBLE( apexc ) static offs_t internal_disasm_apexc(cpu_device *device, std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, int options)
{ {
uint32_t instruction; /* 32-bit machine instruction */ uint32_t instruction; /* 32-bit machine instruction */
int x, y, function, c6, vector; /* instruction fields */ int x, y, function, c6, vector; /* instruction fields */
@ -114,7 +114,7 @@ CPU_DISASSEMBLE( apexc )
case two_address: case two_address:
case branch: case branch:
case swap: case swap:
buffer += sprintf(buffer, " %-10s", mnemonic); /* 10 chars*/ util::stream_format(stream, " %-10s", mnemonic); /* 10 chars*/
break; break;
case shiftl: case shiftl:
@ -123,32 +123,32 @@ CPU_DISASSEMBLE( apexc )
n = c6; n = c6;
else else
n = 64-c6; n = 64-c6;
buffer += sprintf(buffer, " %-2s(%2d) ", mnemonic, n); /* 10 chars */ util::stream_format(stream, " %-2s(%2d) ", mnemonic, n); /* 10 chars */
break; break;
case multiply: case multiply:
n = 33-c6; n = 33-c6;
if (n == 32) if (n == 32)
/* case "32" : do not show bit specifier */ /* case "32" : do not show bit specifier */
buffer += sprintf(buffer, " %-10s", mnemonic); /* 10 chars */ util::stream_format(stream, " %-10s", mnemonic); /* 10 chars */
else else
buffer += sprintf(buffer, " %-2s(%2d) ", mnemonic, n); /* 10 chars */ util::stream_format(stream, " %-2s(%2d) ", mnemonic, n); /* 10 chars */
break; break;
case store: case store:
if (c6 == 0) if (c6 == 0)
{ /* case "1-32" : do not show bit specifier */ { /* case "1-32" : do not show bit specifier */
buffer += sprintf(buffer, " %-10s", mnemonic); /* 10 chars*/ util::stream_format(stream, " %-10s", mnemonic); /* 10 chars*/
} }
else if (c6 & 0x20) else if (c6 & 0x20)
{ /* case "1-n" */ { /* case "1-n" */
n = c6-32; n = c6-32;
buffer += sprintf(buffer, " %-2s (1-%02d) ", mnemonic, n); /* 10 chars */ util::stream_format(stream, " %-2s (1-%02d) ", mnemonic, n); /* 10 chars */
} }
else else
{ /* case "n-32" */ { /* case "n-32" */
n = c6+1; n = c6+1;
buffer += sprintf(buffer, " %-2s(%02d-32) ", mnemonic, n); /* 8 chars */ util::stream_format(stream, " %-2s(%02d-32) ", mnemonic, n); /* 8 chars */
} }
} }
@ -156,29 +156,39 @@ CPU_DISASSEMBLE( apexc )
switch (the_desc->format) switch (the_desc->format)
{ {
case branch: case branch:
buffer--; /* eat last char */ stream.seekp(-1, std::ios_base::cur); /* eat last char */
buffer += sprintf(buffer, "<%03X(%02d/%02d) >=", x<<2, (x >> 5) & 0x1f, x & 0x1f); /* 10+1 chars */ util::stream_format(stream, "<%03X(%02d/%02d) >=", x<<2, (x >> 5) & 0x1f, x & 0x1f); /* 10+1 chars */
break; break;
case multiply: case multiply:
case swap: case swap:
buffer += sprintf(buffer, " (%02d) ", (x >> 5) & 0x1f); /* 10 chars */ util::stream_format(stream, " (%02d) ", (x >> 5) & 0x1f); /* 10 chars */
break; break;
case one_address: case one_address:
case shiftl: case shiftl:
case shiftr: case shiftr:
buffer += sprintf(buffer, " "); /* 10 chars */ util::stream_format(stream, " "); /* 10 chars */
break; break;
case two_address: case two_address:
case store: case store:
buffer += sprintf(buffer, "%03X(%02d/%02d) ", x<<2, (x >> 5) & 0x1f, x & 0x1f); /* 10 chars */ util::stream_format(stream, "%03X(%02d/%02d) ", x<<2, (x >> 5) & 0x1f, x & 0x1f); /* 10 chars */
break; break;
} }
/* print Y address */ /* print Y address */
buffer += sprintf(buffer, "%03X(%02d/%02d)", y<<2, (y >> 5) & 0x1f, y & 0x1f); /* 7 chars */ util::stream_format(stream, "%03X(%02d/%02d)", y<<2, (y >> 5) & 0x1f, y & 0x1f); /* 7 chars */
return 4; return 4;
} }
CPU_DISASSEMBLE(apexc)
{
std::ostringstream stream;
offs_t result = internal_disasm_apexc(device, stream, pc, oprom, opram, options);
std::string stream_str = stream.str();
strcpy(buffer, stream_str.c_str());
return result;
}