Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-24 14:56:21 +03:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fixed LDM opcode register writeback in ARM CPU core [Tim Schuerewegen]

Browse Source
This commit is contained in:
Angelo Salese 2010-12-27 14:25:05 +00:00
parent aa4894ded5
commit 679f772779
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/emu/cpu/arm/arm.c
View File

@ -321,6 +321,17 @@ INLINE void SetRegister( ARM_REGS* cpustate, int rIndex, UINT32 value )
cpustate->sArmRegister[sRegisterTable[MODE][rIndex]] = value; cpustate->sArmRegister[sRegisterTable[MODE][rIndex]] = value;
} }
INLINE UINT32 GetModeRegister( ARM_REGS* cpustate, int mode, int rIndex )
{
return cpustate->sArmRegister[sRegisterTable[mode][rIndex]];
}
INLINE void SetModeRegister( ARM_REGS* cpustate, int mode, int rIndex, UINT32 value )
{
cpustate->sArmRegister[sRegisterTable[mode][rIndex]] = value;
}
/***************************************************************************/ /***************************************************************************/
static CPU_RESET( arm ) static CPU_RESET( arm )
@ -1071,6 +1082,8 @@ static void HandleMemBlock( ARM_REGS* cpustate, UINT32 insn )
/* Loading */ /* Loading */
if (insn & INSN_BDT_U) if (insn & INSN_BDT_U)
{ {
int mode = MODE;
/* Incrementing */ /* Incrementing */
if (!(insn & INSN_BDT_P)) rbp = rbp + (- 4); if (!(insn & INSN_BDT_P)) rbp = rbp + (- 4);
@ -1098,7 +1111,7 @@ static void HandleMemBlock( ARM_REGS* cpustate, UINT32 insn )
logerror("%08x: Illegal LDRM writeback to r15\n",R15); logerror("%08x: Illegal LDRM writeback to r15\n",R15);
if ((insn&(1<<rb))==0) if ((insn&(1<<rb))==0)
SetRegister(cpustate,rb,GetRegister(cpustate, rb)+result*4); SetModeRegister(cpustate, mode, rb, GetModeRegister(cpustate, mode, rb) + result * 4);
else if (ARM_DEBUG_CORE) else if (ARM_DEBUG_CORE)
logerror("%08x: Illegal LDRM writeback to base register (%d)\n",R15, rb); logerror("%08x: Illegal LDRM writeback to base register (%d)\n",R15, rb);
} }