aboutsummaryrefslogtreecommitdiff
path: root/src/ARM.cpp
diff options
context:
space:
mode:
authorArisotura <thetotalworm@gmail.com>2021-10-28 21:24:39 +0200
committerArisotura <thetotalworm@gmail.com>2021-10-28 21:24:39 +0200
commit43daa1c7d25043eb4e9eb13e6d2df58f1d0400f6 (patch)
treeb42fe5c263bca1e4713fc9a944f74c9a3544b1d9 /src/ARM.cpp
parente121953c9a42e853dc71f08e1e342ecd1e2c8753 (diff)
blarg
Diffstat (limited to 'src/ARM.cpp')
-rw-r--r--src/ARM.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/ARM.cpp b/src/ARM.cpp
index 1abdbdd..9b114f2 100644
--- a/src/ARM.cpp
+++ b/src/ARM.cpp
@@ -83,6 +83,8 @@ ARMv5::ARMv5() : ARM(0)
#ifndef JIT_ENABLED
DTCM = new u8[DTCMPhysicalSize];
#endif
+
+ PU_Map = PU_PrivMap;
}
ARMv4::ARMv4() : ARM(1)
@@ -162,7 +164,7 @@ void ARMv5::Reset()
GetMemRegion = NDS::ARM9GetMemRegion;
}
- //PU_Map = PU_PrivMap;
+ PU_Map = PU_PrivMap;
ARM::Reset();
}
@@ -239,10 +241,10 @@ void ARM::DoSavestate(Savestate* file)
SetupCodeMem(R[15]); // should fix it
((ARMv5*)this)->RegionCodeCycles = ((ARMv5*)this)->MemTimings[R[15] >> 12][0];
- /*if ((CPSR & 0x1F) == 0x10)
+ if ((CPSR & 0x1F) == 0x10)
((ARMv5*)this)->PU_Map = ((ARMv5*)this)->PU_UserMap;
else
- ((ARMv5*)this)->PU_Map = ((ARMv5*)this)->PU_PrivMap;*/
+ ((ARMv5*)this)->PU_Map = ((ARMv5*)this)->PU_PrivMap;
}
else
{
@@ -501,10 +503,10 @@ void ARM::UpdateMode(u32 oldmode, u32 newmode, bool phony)
if ((!phony) && (Num == 0))
{
- /*if ((newmode & 0x1F) == 0x10)
+ if ((newmode & 0x1F) == 0x10)
((ARMv5*)this)->PU_Map = ((ARMv5*)this)->PU_UserMap;
else
- ((ARMv5*)this)->PU_Map = ((ARMv5*)this)->PU_PrivMap;*/
+ ((ARMv5*)this)->PU_Map = ((ARMv5*)this)->PU_PrivMap;
}
}