ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pft

This commit is contained in:
Arisotura 2019-06-10 18:24:38 +02:00
parent fd28391160
commit 09cfdc6e76
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ARM.cpp
View File

@ -387,7 +387,7 @@ void ARM::UpdateMode(u32 oldmode, u32 newmode)
if (Num == 0) if (Num == 0)
{ {
/*if ((newmode & 0x1F) == 0x16) /*if ((newmode & 0x1F) == 0x10)
((ARMv5*)this)->PU_Map = ((ARMv5*)this)->PU_UserMap; ((ARMv5*)this)->PU_Map = ((ARMv5*)this)->PU_UserMap;
else else
((ARMv5*)this)->PU_Map = ((ARMv5*)this)->PU_PrivMap;*/ ((ARMv5*)this)->PU_Map = ((ARMv5*)this)->PU_PrivMap;*/
@ -428,7 +428,7 @@ void ARMv5::PrefetchAbort()
return; return;
} }
R_IRQ[2] = oldcpsr; R_ABT[2] = oldcpsr;
R[14] = R[15] + (oldcpsr & 0x20 ? 2 : 0); R[14] = R[15] + (oldcpsr & 0x20 ? 2 : 0);
JumpTo(ExceptionBase + 0x0C); JumpTo(ExceptionBase + 0x0C);
} }
@ -442,7 +442,7 @@ void ARMv5::DataAbort()
CPSR |= 0x97; CPSR |= 0x97;
UpdateMode(oldcpsr, CPSR); UpdateMode(oldcpsr, CPSR);
R_IRQ[2] = oldcpsr; R_ABT[2] = oldcpsr;
R[14] = R[15] + (oldcpsr & 0x20 ? 6 : 4); R[14] = R[15] + (oldcpsr & 0x20 ? 6 : 4);
JumpTo(ExceptionBase + 0x10); JumpTo(ExceptionBase + 0x10);
} }