aboutsummaryrefslogtreecommitdiff
path: root/src/core/arm/dyncom/arm_dyncom.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-04-06 15:06:07 -0400
committerbunnei <bunneidev@gmail.com>2015-04-06 15:06:07 -0400
commit14dcd986535c681601d6f255899157aff021a5d2 (patch)
treefb35f0b8444122438dcdf41b4a3b0bf32e4d7d29 /src/core/arm/dyncom/arm_dyncom.cpp
parent8d7a77a1d4e8c7d46976bf025031f454c51ef9c1 (diff)
parent8004d35ea163b621ea3f3d4333f2c58ec926d7c9 (diff)
Merge pull request #685 from lioncash/cpregs
dyncom: Set the MPCore CP15 register reset values on initialization.
Diffstat (limited to 'src/core/arm/dyncom/arm_dyncom.cpp')
-rw-r--r--src/core/arm/dyncom/arm_dyncom.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index cb1a410a0..1b1d01420 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -68,6 +68,14 @@ void ARM_DynCom::SetCPSR(u32 cpsr) {
state->Cpsr = cpsr;
}
+u32 ARM_DynCom::GetCP15Register(CP15Register reg) {
+ return state->CP15[reg];
+}
+
+void ARM_DynCom::SetCP15Register(CP15Register reg, u32 value) {
+ state->CP15[reg] = value;
+}
+
void ARM_DynCom::AddTicks(u64 ticks) {
down_count -= ticks;
if (down_count < 0)