diff options
| author |  bunnei | 2016-05-09 18:54:09 -0400 |
|---|---|---|
| committer | bunnei | 2016-05-09 18:54:09 -0400 |
| commit | 976bacf5f776a629f1003d5d8303daa7cb36c5f8 (patch) | |
| tree | 39c5cd4541a2534b76c91868d9ccc17f57024c6e | |
| parent | Merge pull request #1770 from lioncash/format (diff) | |
| parent | dyncom: Reset the context into user mode correctly (diff) | |
| download | yuzu-976bacf5f776a629f1003d5d8303daa7cb36c5f8.tar.gz yuzu-976bacf5f776a629f1003d5d8303daa7cb36c5f8.tar.xz yuzu-976bacf5f776a629f1003d5d8303daa7cb36c5f8.zip | |
Merge pull request #1771 from lioncash/user
dyncom: Reset the context into user mode correctly
| -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 a3581132c..13492a08b 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 | ((entry_point & 1) << 5); // Usermode and THUMB mode | 96 | context.cpsr = USER32MODE | ((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) { |