summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathew Maidment <mathew1800@gmail.com>2016-04-08 17:50:44 +0200
committerMathew Maidment <mathew1800@gmail.com>2016-04-08 17:50:44 +0200
commitf3ba678b81ea68eaaa2aa40ccda213682d8d1a98 (patch)
tree0701c5c2a916b689e21aa26f898a3fde35b7b068
parentMerge pull request #1639 from linkmauve/fix-double-framebuffer-check (diff)
parentUpdate cpsr (T)humb bit while creating thread (diff)
downloadyuzu-f3ba678b81ea68eaaa2aa40ccda213682d8d1a98.tar
yuzu-f3ba678b81ea68eaaa2aa40ccda213682d8d1a98.tar.gz
yuzu-f3ba678b81ea68eaaa2aa40ccda213682d8d1a98.tar.bz2
yuzu-f3ba678b81ea68eaaa2aa40ccda213682d8d1a98.tar.lz
yuzu-f3ba678b81ea68eaaa2aa40ccda213682d8d1a98.tar.xz
yuzu-f3ba678b81ea68eaaa2aa40ccda213682d8d1a98.tar.zst
yuzu-f3ba678b81ea68eaaa2aa40ccda213682d8d1a98.zip
-rw-r--r--src/core/arm/dyncom/arm_dyncom.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index 947f5094b..a3581132c 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -93,7 +93,7 @@ void ARM_DynCom::ResetContext(Core::ThreadContext& context, u32 stack_top, u32 e
context.cpu_registers[0] = arg;
context.pc = entry_point;
context.sp = stack_top;
- context.cpsr = 0x1F; // Usermode
+ context.cpsr = 0x1F | ((entry_point & 1) << 5); // Usermode and THUMB mode
}
void ARM_DynCom::SaveContext(Core::ThreadContext& ctx) {