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

arm7: add ARM v5/9 check (nw)

Browse Source
This commit is contained in:
MetalliC 2017-11-10 20:18:09 +02:00
parent bb96e249ca
commit 41e94b4c12
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/devices/cpu/arm7/arm7ops.cpp
View File

@ -492,8 +492,7 @@ void arm7_cpu_device::HandleMemSingle(uint32_t insn)
R15 = (R15 & ~0x03FFFFFC) /* N Z C V I F M1 M0 */ | ((data - 4) & 0x03FFFFFC);
// LDR, PC takes 2S + 2N + 1I (5 total cycles)
ARM7_ICOUNT -= 2;
// TODO only ARMv5T and above
if (data & 1)
if ((data & 1) && m_archRev >= 5)
{
set_cpsr(GET_CPSR | T_MASK);
R15--;
@ -1377,9 +1376,8 @@ void arm7_cpu_device::HandleMemBlock(uint32_t insn)
SwitchMode(temp & 3);
}
}
// TODO only ARMv5T and above
else
if (R15 & 1)
if ((R15 & 1) && m_archRev >= 5)
{
set_cpsr(GET_CPSR | T_MASK);
R15--;
@ -1441,9 +1439,8 @@ void arm7_cpu_device::HandleMemBlock(uint32_t insn)
SwitchMode(temp & 3);
}
}
// TODO only ARMv5T and above
else
if (R15 & 1)
if ((R15 & 1) && m_archRev >= 5)
{
set_cpsr(GET_CPSR | T_MASK);
R15--;