Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-02 08:39:21 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arm: fixed register-base shift with a value >= 32, this fixes the RISC OS graphics issues.

Browse Source
This commit is contained in:
Sandro Ronco 2016-11-01 10:39:38 +01:00
parent e7d31b6009
commit e0c4c04f0c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/devices/cpu/arm/arm.cpp
View File

@ -1302,8 +1302,9 @@ uint32_t arm_cpu_device::decodeShift(uint32_t insn, uint32_t *pCarry)
if (ARM_DEBUG_CORE && (insn&0x80)==0x80) if (ARM_DEBUG_CORE && (insn&0x80)==0x80)
logerror("%08x: RegShift ERROR (p36)\n",R15); logerror("%08x: RegShift ERROR (p36)\n",R15);
//see p35 for check on this // Only the least significant byte of the contents of Rs is used to determine the shift amount
k = GetRegister(k >> 1)&0x1f; k = GetRegister(k >> 1) & 0xff;
m_icount -= S_CYCLE; m_icount -= S_CYCLE;
if( k == 0 ) /* Register shift by 0 is a no-op */ if( k == 0 ) /* Register shift by 0 is a no-op */
{ {
@ -1316,7 +1317,13 @@ uint32_t arm_cpu_device::decodeShift(uint32_t insn, uint32_t *pCarry)
switch (t >> 1) switch (t >> 1)
{ {
case 0: /* LSL */ case 0: /* LSL */
if (pCarry) if (k >= 32)
{
if (pCarry)
*pCarry = (k == 32) ? rm & 1 : 0;
return 0;
}
else if (pCarry)
{ {
*pCarry = k ? (rm & (1 << (32 - k))) : (R15 & C_MASK); *pCarry = k ? (rm & (1 << (32 - k))) : (R15 & C_MASK);
} }