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

Merge pull request #1708 from npwoods/dasmstream_mb88

Browse Source 
Changed the mb88 disassembler to use 'std::ostream &' internally
This commit is contained in:
Vas Crabb 2016-11-16 17:38:17 +11:00 committed by GitHub
commit df6bd66919
1 changed files with 81 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
src/devices/cpu/mb88xx/mb88dasm.cpp
View File

@ -13,7 +13,7 @@
#include "mb88xx.h"
CPU_DISASSEMBLE( mb88 )
static offs_t internal_disasm_mb88(cpu_device *device, std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, int options)
{
unsigned startpc = pc;
uint8_t op = oprom[pc++ - startpc];
@ -21,94 +21,94 @@ CPU_DISASSEMBLE( mb88 )
switch( op )
{
case 0x00: sprintf( buffer, "nop" ); break;
case 0x01: sprintf( buffer, "outO (PortO<=A)" ); break;
case 0x02: sprintf( buffer, "outP" ); break;
case 0x03: sprintf( buffer, "outR (PortR[Y]<=A)" ); break;
case 0x04: sprintf( buffer, "tay (Y<=A)" ); break;
case 0x05: sprintf( buffer, "tath (TH<=A)" ); break;
case 0x06: sprintf( buffer, "tatl (TL<=A)" ); break;
case 0x07: sprintf( buffer, "tas (SB<=A)" ); break;
case 0x08: sprintf( buffer, "icy (Y++)" ); break;
case 0x09: sprintf( buffer, "icm (M[X,Y]++)" ); break;
case 0x0A: sprintf( buffer, "stic (M[X,Y]<=A; Y++)" ); break;
case 0x0B: sprintf( buffer, "x (A<=>M[X,Y])" ); break;
case 0x0C: sprintf( buffer, "rol" ); break;
case 0x0D: sprintf( buffer, "load (A<=M[X,Y])" ); break;
case 0x0E: sprintf( buffer, "adc (A<=A+M[X,Y]+cf)" ); break;
case 0x0F: sprintf( buffer, "and (A<=A & M[X,Y])" ); break;
case 0x10: sprintf( buffer, "daa (A<=A+6 if (A>9 | cf=1)" ); break;
case 0x11: sprintf( buffer, "das (A<=A+10 if (A>9 | cf=1)" ); break;
case 0x12: sprintf( buffer, "inK (A<=PortK)" ); break;
case 0x13: sprintf( buffer, "inR (A<=PortR[Y])" ); break;
case 0x14: sprintf( buffer, "tya (A<=Y)" ); break;
case 0x15: sprintf( buffer, "ttha (A<=TH)" ); break;
case 0x16: sprintf( buffer, "ttla (A<=TL)" ); break;
case 0x17: sprintf( buffer, "tsa (A<=S)" ); break;
case 0x18: sprintf( buffer, "dcy (Y--)" ); break;
case 0x19: sprintf( buffer, "dcm (M[X,Y]--)" ); break;
case 0x1A: sprintf( buffer, "stdc (M[X,Y]<=A; Y--)" ); break;
case 0x1B: sprintf( buffer, "xx (A<=>X)" ); break;
case 0x1C: sprintf( buffer, "ror" ); break;
case 0x1D: sprintf( buffer, "store (M[X,Y]<=A)" ); break;
case 0x1E: sprintf( buffer, "sbc (A<=M[X,Y]-A-cf)" ); break;
case 0x1F: sprintf( buffer, "or (A<=A | M[X,Y])" ); break;
case 0x20: sprintf( buffer, "setR (PortR bit[Y]<=1)" ); break;
case 0x21: sprintf( buffer, "setc (cf<=1)" ); break;
case 0x22: sprintf( buffer, "rstR (PortR bit[Y]<=0)" ); break;
case 0x23: sprintf( buffer, "rstc (cf<=0)" ); break;
case 0x24: sprintf( buffer, "tstR (st<=PortR bit[Y])" ); break;
case 0x25: sprintf( buffer, "tsti (st<=IRQ Line)" ); break;
case 0x26: sprintf( buffer, "tstv (st<=vf)" ); break;
case 0x27: sprintf( buffer, "tsts (st<=sf)" ); break;
case 0x28: sprintf( buffer, "tstc (st<=cf)" ); break;
case 0x29: sprintf( buffer, "tstz (st<=zf)" ); break;
case 0x2A: sprintf( buffer, "sts (M[X,Y]<=SB)" ); break;
case 0x2B: sprintf( buffer, "ls (SB<=M[X,Y])" ); break;
case 0x2C: sprintf( buffer, "rts" ); break;
case 0x2D: sprintf( buffer, "neg (A=-A)" ); break;
case 0x2E: sprintf( buffer, "c (A==M[X,Y])" ); break;
case 0x2F: sprintf( buffer, "eor (A ^ M[X,Y])" ); break;
case 0x00: util::stream_format( stream, "nop" ); break;
case 0x01: util::stream_format( stream, "outO (PortO<=A)" ); break;
case 0x02: util::stream_format( stream, "outP" ); break;
case 0x03: util::stream_format( stream, "outR (PortR[Y]<=A)" ); break;
case 0x04: util::stream_format( stream, "tay (Y<=A)" ); break;
case 0x05: util::stream_format( stream, "tath (TH<=A)" ); break;
case 0x06: util::stream_format( stream, "tatl (TL<=A)" ); break;
case 0x07: util::stream_format( stream, "tas (SB<=A)" ); break;
case 0x08: util::stream_format( stream, "icy (Y++)" ); break;
case 0x09: util::stream_format( stream, "icm (M[X,Y]++)" ); break;
case 0x0A: util::stream_format( stream, "stic (M[X,Y]<=A; Y++)" ); break;
case 0x0B: util::stream_format( stream, "x (A<=>M[X,Y])" ); break;
case 0x0C: util::stream_format( stream, "rol" ); break;
case 0x0D: util::stream_format( stream, "load (A<=M[X,Y])" ); break;
case 0x0E: util::stream_format( stream, "adc (A<=A+M[X,Y]+cf)" ); break;
case 0x0F: util::stream_format( stream, "and (A<=A & M[X,Y])" ); break;
case 0x10: util::stream_format( stream, "daa (A<=A+6 if (A>9 | cf=1)" ); break;
case 0x11: util::stream_format( stream, "das (A<=A+10 if (A>9 | cf=1)" ); break;
case 0x12: util::stream_format( stream, "inK (A<=PortK)" ); break;
case 0x13: util::stream_format( stream, "inR (A<=PortR[Y])" ); break;
case 0x14: util::stream_format( stream, "tya (A<=Y)" ); break;
case 0x15: util::stream_format( stream, "ttha (A<=TH)" ); break;
case 0x16: util::stream_format( stream, "ttla (A<=TL)" ); break;
case 0x17: util::stream_format( stream, "tsa (A<=S)" ); break;
case 0x18: util::stream_format( stream, "dcy (Y--)" ); break;
case 0x19: util::stream_format( stream, "dcm (M[X,Y]--)" ); break;
case 0x1A: util::stream_format( stream, "stdc (M[X,Y]<=A; Y--)" ); break;
case 0x1B: util::stream_format( stream, "xx (A<=>X)" ); break;
case 0x1C: util::stream_format( stream, "ror" ); break;
case 0x1D: util::stream_format( stream, "store (M[X,Y]<=A)" ); break;
case 0x1E: util::stream_format( stream, "sbc (A<=M[X,Y]-A-cf)" ); break;
case 0x1F: util::stream_format( stream, "or (A<=A | M[X,Y])" ); break;
case 0x20: util::stream_format( stream, "setR (PortR bit[Y]<=1)" ); break;
case 0x21: util::stream_format( stream, "setc (cf<=1)" ); break;
case 0x22: util::stream_format( stream, "rstR (PortR bit[Y]<=0)" ); break;
case 0x23: util::stream_format( stream, "rstc (cf<=0)" ); break;
case 0x24: util::stream_format( stream, "tstR (st<=PortR bit[Y])" ); break;
case 0x25: util::stream_format( stream, "tsti (st<=IRQ Line)" ); break;
case 0x26: util::stream_format( stream, "tstv (st<=vf)" ); break;
case 0x27: util::stream_format( stream, "tsts (st<=sf)" ); break;
case 0x28: util::stream_format( stream, "tstc (st<=cf)" ); break;
case 0x29: util::stream_format( stream, "tstz (st<=zf)" ); break;
case 0x2A: util::stream_format( stream, "sts (M[X,Y]<=SB)" ); break;
case 0x2B: util::stream_format( stream, "ls (SB<=M[X,Y])" ); break;
case 0x2C: util::stream_format( stream, "rts" ); break;
case 0x2D: util::stream_format( stream, "neg (A=-A)" ); break;
case 0x2E: util::stream_format( stream, "c (A==M[X,Y])" ); break;
case 0x2F: util::stream_format( stream, "eor (A ^ M[X,Y])" ); break;
case 0x30:
case 0x31:
case 0x32:
case 0x33: sprintf( buffer, "sbit%d (M[X,Y] bit%d=1)", op&3, op&3 ); break;
case 0x33: util::stream_format( stream, "sbit%d (M[X,Y] bit%d=1)", op&3, op&3 ); break;
case 0x34:
case 0x35:
case 0x36:
case 0x37: sprintf( buffer, "rbit%d (M[X,Y] bit%d=0)", op&3, op&3 ); break;
case 0x37: util::stream_format( stream, "rbit%d (M[X,Y] bit%d=0)", op&3, op&3 ); break;
case 0x38:
case 0x39:
case 0x3A:
case 0x3B: sprintf( buffer, "tbit%d (M[X,Y] bit%d == 1)", op&3, op&3 ); break;
case 0x3C: sprintf( buffer, "rti" ); break;
case 0x3D: sprintf( buffer, "jpa #$%02x (jump always)", arg ); pc++; break;
case 0x3E: sprintf( buffer, "en #$%02x (enable bits)", arg ); pc++; break;
case 0x3F: sprintf( buffer, "dis #$%02x (disable bits)", arg ); pc++; break;
case 0x3B: util::stream_format( stream, "tbit%d (M[X,Y] bit%d == 1)", op&3, op&3 ); break;
case 0x3C: util::stream_format( stream, "rti" ); break;
case 0x3D: util::stream_format( stream, "jpa #$%02x (jump always)", arg ); pc++; break;
case 0x3E: util::stream_format( stream, "en #$%02x (enable bits)", arg ); pc++; break;
case 0x3F: util::stream_format( stream, "dis #$%02x (disable bits)", arg ); pc++; break;
case 0x40:
case 0x41:
case 0x42:
case 0x43: sprintf( buffer, "setd%d (PortR bit%d<=1)", op&3, op&3 ); break;
case 0x43: util::stream_format( stream, "setd%d (PortR bit%d<=1)", op&3, op&3 ); break;
case 0x44:
case 0x45:
case 0x46:
case 0x47: sprintf( buffer, "rstd%d (PortR bit%d<=0)", op&3, op&3 ); break;
case 0x47: util::stream_format( stream, "rstd%d (PortR bit%d<=0)", op&3, op&3 ); break;
case 0x48:
case 0x49:
case 0x4A:
case 0x4B: sprintf( buffer, "tstd%d (PortR bit%d == 1)", (op&3)+8, (op&3)+8 ); break;
case 0x4B: util::stream_format( stream, "tstd%d (PortR bit%d == 1)", (op&3)+8, (op&3)+8 ); break;
case 0x4C:
case 0x4D:
case 0x4E:
case 0x4F: sprintf( buffer, "tba%d (A bit%d == 1)", op&3, op&3 ); break;
case 0x4F: util::stream_format( stream, "tba%d (A bit%d == 1)", op&3, op&3 ); break;
case 0x50:
case 0x51:
case 0x52:
case 0x53: sprintf( buffer, "xd%d (A<=>M[0,%d])", op&3, op&3 ); break;
case 0x53: util::stream_format( stream, "xd%d (A<=>M[0,%d])", op&3, op&3 ); break;
case 0x54:
case 0x55:
case 0x56:
case 0x57: sprintf( buffer, "xyd%d (Y<=>M[0,%d])", (op&3)+4, (op&3)+4 ); break;
case 0x57: util::stream_format( stream, "xyd%d (Y<=>M[0,%d])", (op&3)+4, (op&3)+4 ); break;
case 0x58:
case 0x59:
case 0x5A:
@ -116,7 +116,7 @@ CPU_DISASSEMBLE( mb88 )
case 0x5C:
case 0x5D:
case 0x5E:
case 0x5F: sprintf( buffer, "lxi #$%1x (X<=$%1x)", op&7, op&7 ); break;
case 0x5F: util::stream_format( stream, "lxi #$%1x (X<=$%1x)", op&7, op&7 ); break;
case 0x60:
case 0x61:
case 0x62:
@ -124,7 +124,7 @@ CPU_DISASSEMBLE( mb88 )
case 0x64:
case 0x65:
case 0x66:
case 0x67: sprintf( buffer, "call %02x%02x (call if st=1)", op&7, arg ); pc++; break;
case 0x67: util::stream_format( stream, "call %02x%02x (call if st=1)", op&7, arg ); pc++; break;
case 0x68:
case 0x69:
case 0x6A:
@ -132,7 +132,7 @@ CPU_DISASSEMBLE( mb88 )
case 0x6C:
case 0x6D:
case 0x6E:
case 0x6F: sprintf( buffer, "jpl %02x%02x (jump if st=1)", op&7, arg ); pc++; break;
case 0x6F: util::stream_format( stream, "jpl %02x%02x (jump if st=1)", op&7, arg ); pc++; break;
case 0x70:
case 0x71:
case 0x72:
@ -148,7 +148,7 @@ CPU_DISASSEMBLE( mb88 )
case 0x7C:
case 0x7D:
case 0x7E:
case 0x7F: sprintf( buffer, "ai #$%1x (A<=A+$%1x)", op&0xf, op&0xf ); break;
case 0x7F: util::stream_format( stream, "ai #$%1x (A<=A+$%1x)", op&0xf, op&0xf ); break;
case 0x80:
case 0x81:
case 0x82:
@ -164,7 +164,7 @@ CPU_DISASSEMBLE( mb88 )
case 0x8C:
case 0x8D:
case 0x8E:
case 0x8F: sprintf( buffer, "lyi #$%1x (Y<=$%1x)", op&0xf, op&0xf ); break;
case 0x8F: util::stream_format( stream, "lyi #$%1x (Y<=$%1x)", op&0xf, op&0xf ); break;
case 0x90:
case 0x91:
case 0x92:
@ -180,7 +180,7 @@ CPU_DISASSEMBLE( mb88 )
case 0x9C:
case 0x9D:
case 0x9E:
case 0x9F: sprintf( buffer, "li #$%1x (A<=$%1x)", op&0xf, op&0xf ); break;
case 0x9F: util::stream_format( stream, "li #$%1x (A<=$%1x)", op&0xf, op&0xf ); break;
case 0xA0:
case 0xA1:
case 0xA2:
@ -196,7 +196,7 @@ CPU_DISASSEMBLE( mb88 )
case 0xAC:
case 0xAD:
case 0xAE:
case 0xAF: sprintf( buffer, "cyi #$%1x (Y==$%1x)", op&0xf, op&0xf ); break;
case 0xAF: util::stream_format( stream, "cyi #$%1x (Y==$%1x)", op&0xf, op&0xf ); break;
case 0xB0:
case 0xB1:
case 0xB2:
@ -212,13 +212,23 @@ CPU_DISASSEMBLE( mb88 )
case 0xBC:
case 0xBD:
case 0xBE:
case 0xBF: sprintf( buffer, "ci #$%1x (A==$%1x)", op&0xf, op&0xf ); break;
case 0xBF: util::stream_format( stream, "ci #$%1x (A==$%1x)", op&0xf, op&0xf ); break;
default:
/* C0-FF */
sprintf( buffer, "jmp $%04x (jump if st=1)", (pc&(~0x3f))+ op-0xC0 );
util::stream_format( stream, "jmp $%04x (jump if st=1)", (pc&(~0x3f))+ op-0xC0 );
break;
}
return (pc - startpc) | DASMFLAG_SUPPORTED;
}
CPU_DISASSEMBLE(mb88)
{
std::ostringstream stream;
offs_t result = internal_disasm_mb88(device, stream, pc, oprom, opram, options);
std::string stream_str = stream.str();
strcpy(buffer, stream_str.c_str());
return result;
}