diff options
| author |  Mathew Maidment | 2016-04-08 11:50:44 -0400 |
|---|---|---|
| committer | Mathew Maidment | 2016-04-08 11:50:44 -0400 |
| commit | f3ba678b81ea68eaaa2aa40ccda213682d8d1a98 (patch) | |
| tree | 0701c5c2a916b689e21aa26f898a3fde35b7b068 | |
| parent | Merge pull request #1639 from linkmauve/fix-double-framebuffer-check (diff) | |
| parent | Update cpsr (T)humb bit while creating thread (diff) | |
| download | yuzu-f3ba678b81ea68eaaa2aa40ccda213682d8d1a98.tar.gz yuzu-f3ba678b81ea68eaaa2aa40ccda213682d8d1a98.tar.xz yuzu-f3ba678b81ea68eaaa2aa40ccda213682d8d1a98.zip | |
Merge pull request #1651 from mailwl/thread-init-thumb
Update cpsr (T)humb bit while creating thread
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom.cpp | 2 |
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 | |||
| 93 | context.cpu_registers[0] = arg; | 93 | context.cpu_registers[0] = arg; |
| 94 | context.pc = entry_point; | 94 | context.pc = entry_point; |
| 95 | context.sp = stack_top; | 95 | context.sp = stack_top; |
| 96 | context.cpsr = 0x1F; // Usermode | 96 | context.cpsr = 0x1F | ((entry_point & 1) << 5); // Usermode and THUMB mode |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | void ARM_DynCom::SaveContext(Core::ThreadContext& ctx) { | 99 | void ARM_DynCom::SaveContext(Core::ThreadContext& ctx) { |