summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-05-23 00:47:42 +0200
committerbunnei <ericbunnie@gmail.com>2014-05-23 00:47:42 +0200
commit481d936d34c595b994f48b00819bb2c4bcfa7e57 (patch)
tree8fdfe8c688075e8de5f094b05b31cafa70510b6f /src
parentthread: fixed bug where result of __NextThread was not being properly checked when NULL (diff)
downloadyuzu-481d936d34c595b994f48b00819bb2c4bcfa7e57.tar
yuzu-481d936d34c595b994f48b00819bb2c4bcfa7e57.tar.gz
yuzu-481d936d34c595b994f48b00819bb2c4bcfa7e57.tar.bz2
yuzu-481d936d34c595b994f48b00819bb2c4bcfa7e57.tar.lz
yuzu-481d936d34c595b994f48b00819bb2c4bcfa7e57.tar.xz
yuzu-481d936d34c595b994f48b00819bb2c4bcfa7e57.tar.zst
yuzu-481d936d34c595b994f48b00819bb2c4bcfa7e57.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/arm/interpreter/arm_interpreter.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/arm/interpreter/arm_interpreter.cpp b/src/core/arm/interpreter/arm_interpreter.cpp
index a9ec94820..17f787b86 100644
--- a/src/core/arm/interpreter/arm_interpreter.cpp
+++ b/src/core/arm/interpreter/arm_interpreter.cpp
@@ -115,7 +115,7 @@ void ARM_Interpreter::SaveContext(ThreadContext& ctx) {
ctx.lr = state->Reg[14];
ctx.pc = state->pc;
ctx.cpsr = state->Cpsr;
-
+
ctx.fpscr = state->VFP[1];
ctx.fpexc = state->VFP[2];
}
@@ -136,4 +136,7 @@ void ARM_Interpreter::LoadContext(const ThreadContext& ctx) {
state->VFP[1] = ctx.fpscr;
state->VFP[2] = ctx.fpexc;
+
+ state->Reg[15] = ctx.pc;
+ state->NextInstr = RESUME;
}