Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix instruction fetch alignment

Browse Source
This commit is contained in:
Patrick Mackinlay 2017-01-17 17:39:12 +08:00
parent 10ac8f7093
commit 6c77efba69
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/devices/cpu/clipper/clipper.cpp
View File

@ -211,7 +211,10 @@ void clipper_device::decode_instruction (uint16_t insn)
else else
{ {
// fetch 32 bit immediate and sign extend // fetch 32 bit immediate and sign extend
m_info.op.imm = (int32_t)m_program->read_dword(m_pc + 2); if ((m_pc & 0x2) == 0)
m_info.op.imm = (int32_t)(m_program->read_word(m_pc + 2) | (m_program->read_word(m_pc + 4) << 16));
else
m_info.op.imm = (int32_t)m_program->read_dword(m_pc + 2);
m_info.size = 6; m_info.size = 6;
} }
} }
@ -225,19 +228,28 @@ void clipper_device::decode_instruction (uint16_t insn)
{ {
case ADDR_MODE_PC32: case ADDR_MODE_PC32:
m_info.op.r2 = R2; m_info.op.r2 = R2;
m_info.address = m_pc + (int32_t)m_program->read_dword(m_pc + 2); if ((m_pc & 0x2) == 0)
m_info.address = m_pc + (int32_t)(m_program->read_word(m_pc + 2) | (m_program->read_word(m_pc + 4) << 16));
else
m_info.address = m_pc + (int32_t)m_program->read_dword(m_pc + 2);
m_info.size = 6; m_info.size = 6;
break; break;
case ADDR_MODE_ABS32: case ADDR_MODE_ABS32:
m_info.op.r2 = R2; m_info.op.r2 = R2;
m_info.address = m_program->read_dword(m_pc + 2); if ((m_pc & 0x2) == 0)
m_info.address = (m_program->read_word(m_pc + 2) | (m_program->read_word(m_pc + 4) << 16));
else
m_info.address = m_program->read_dword(m_pc + 2);
m_info.size = 6; m_info.size = 6;
break; break;
case ADDR_MODE_REL32: case ADDR_MODE_REL32:
m_info.op.r2 = m_program->read_word(m_pc + 2) & 0xf; m_info.op.r2 = m_program->read_word(m_pc + 2) & 0xf;
m_info.address = m_r[R2] + (int32_t)m_program->read_dword(m_pc + 4); if ((m_pc & 0x2) == 0)
m_info.address = m_r[R2] + (int32_t)m_program->read_dword(m_pc + 4);
else
m_info.address = m_r[R2] + (int32_t)(m_program->read_word(m_pc + 4) | (m_program->read_word(m_pc + 6) << 16));
m_info.size = 8; m_info.size = 8;
break; break;