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

hmcs40/sm510: can just get rid of next_pc tables, sorry for likely merge conflct (nw)

Browse Source
This commit is contained in:
hap 2017-08-01 16:54:23 +02:00
parent 14642adc5a
commit fe87fa37b4
2 changed files with 6 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/devices/cpu/hmcs40/hmcs40d.cpp
View File

@ -81,17 +81,6 @@ static const u32 s_flags[] =
0
};
#ifdef COMPUTE_NEXT_PC
// next program counter in sequence (relative)
static const s8 s_next_pc[0x40] =
{
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 32+0x40 /* rollback */,
-32, -31, -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17,
-15, -14, -13, -12, -11, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, -1
};
#endif
static const u8 hmcs40_mnemonic[0x400] =
{
@ -228,11 +217,5 @@ CPU_DISASSEMBLE(hmcs40)
}
}
#ifdef COMPUTE_NEXT_PC
// falsifying instruction lengths like this breaks the MAME disassembler quite badly
int pos = s_next_pc[pc & 0x3f] & DASMFLAG_LENGTHMASK;
return pos | s_flags[instr] | DASMFLAG_SUPPORTED;
#else
return 1 | s_flags[instr] | DASMFLAG_SUPPORTED;
#endif
}

41
src/devices/cpu/sm510/sm510d.cpp
View File

@ -122,31 +122,10 @@ static const u32 s_flags[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _OVER
};
// next program counter in sequence (relative)
static const s8 s_next_pc_6[0x40] =
{
32, -1 /* rollback */, -1, 30, 30, -3, -3, 28, 28, -5, -5, 26, 26, -7, -7, 24,
24, -9, -9, 22, 22, -11, -11, 20, 20, -13, -13, 18, 18, -15, -15, 16,
16, -17, -17, 14, 14, -19, -19, 12, 12, -21, -21, 10, 10, -23, -23, 8,
8, -25, -25, 6, 6, -27, -27, 4, 4, -29, -29, 2, 2, -31, -31, 0 /* gets stuck here */
};
static const s8 s_next_pc_7[0x80] =
{
64, -1 /* rollback */, -1, 62, 62, -3, -3, 60, 60, -5, -5, 58, 58, -7, -7, 56,
56, -9, -9, 54, 54, -11, -11, 52, 52, -13, -13, 50, 50, -15, -15, 48,
48, -17, -17, 46, 46, -19, -19, 44, 44, -21, -21, 42, 42, -23, -23, 40,
40, -25, -25, 38, 38, -27, -27, 36, 36, -29, -29, 34, 34, -31, -31, 32,
32, -33, -33, 30, 30, -35, -35, 28, 28, -37, -37, 26, 26, -39, -39, 24,
24, -41, -41, 22, 22, -43, -43, 20, 20, -45, -45, 18, 18, -47, -47, 16,
16, -49, -49, 14, 14, -51, -51, 12, 12, -53, -53, 10, 10, -55, -55, 8,
8, -57, -57, 6, 6, -59, -59, 4, 4, -61, -61, 2, 2, -63, -63, 0 /* gets stuck here */
};
// common disasm
static offs_t sm510_common_disasm(const u8 *lut_mnemonic, const u8 *lut_extended, std::ostream &stream, offs_t pc, const u8 *oprom, const u8 *opram, const u8 pclen)
static offs_t sm510_common_disasm(const u8 *lut_mnemonic, const u8 *lut_extended, std::ostream &stream, offs_t pc, const u8 *oprom, const u8 *opram)
{
// get raw opcode
u8 op = oprom[0];
@ -158,7 +137,6 @@ static offs_t sm510_common_disasm(const u8 *lut_mnemonic, const u8 *lut_extended
u16 param = mask;
if (bits >= 8)
{
// note: doesn't work with lfsr pc
param = oprom[1];
len++;
}
@ -189,13 +167,6 @@ static offs_t sm510_common_disasm(const u8 *lut_mnemonic, const u8 *lut_extended
u16 address = (param << 4 & 0xc00) | (mask << 6 & 0x3c0) | (param & 0x03f);
util::stream_format(stream, "$%03X", address);
}
// show param offset
if (bits >= 8)
{
s8 next_pc_delta = ((pclen == 6) ? s_next_pc_6[pc & 0x3f] : s_next_pc_7[pc & 0x7f]);
util::stream_format(stream, " [$%03X]", pc + next_pc_delta);
}
}
return len | s_flags[instr] | DASMFLAG_SUPPORTED;
@ -230,7 +201,7 @@ static const u8 sm510_mnemonic[0x100] =
CPU_DISASSEMBLE(sm510)
{
return sm510_common_disasm(sm510_mnemonic, nullptr, stream, pc, oprom, opram, 6);
return sm510_common_disasm(sm510_mnemonic, nullptr, stream, pc, oprom, opram);
}
@ -272,7 +243,7 @@ CPU_DISASSEMBLE(sm511)
memset(ext, 0, 0x100);
memcpy(ext + 0x30, sm511_extended, 0x10);
return sm510_common_disasm(sm511_mnemonic, ext, stream, pc, oprom, opram, 6);
return sm510_common_disasm(sm511_mnemonic, ext, stream, pc, oprom, opram);
}
@ -314,7 +285,7 @@ CPU_DISASSEMBLE(sm500)
memset(ext, 0, 0x100);
memcpy(ext + 0x00, sm500_extended, 0x10);
return sm510_common_disasm(sm500_mnemonic, ext, stream, pc, oprom, opram, 6);
return sm510_common_disasm(sm500_mnemonic, ext, stream, pc, oprom, opram);
}
@ -356,7 +327,7 @@ CPU_DISASSEMBLE(sm5a)
memset(ext, 0, 0x100);
memcpy(ext + 0x00, sm5a_extended, 0x10);
return sm510_common_disasm(sm5a_mnemonic, ext, stream, pc, oprom, opram, 6);
return sm510_common_disasm(sm5a_mnemonic, ext, stream, pc, oprom, opram);
}
@ -389,5 +360,5 @@ static const u8 sm590_mnemonic[0x100] =
CPU_DISASSEMBLE(sm590)
{
return sm510_common_disasm(sm590_mnemonic, nullptr, stream, pc, oprom, opram, 7);
return sm510_common_disasm(sm590_mnemonic, nullptr, stream, pc, oprom, opram);
}