diff options
| author | bunnei <bunneidev@gmail.com> | 2016-05-09 18:54:09 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-05-09 18:54:09 -0400 |
| commit | 976bacf5f776a629f1003d5d8303daa7cb36c5f8 (patch) | |
| tree | 39c5cd4541a2534b76c91868d9ccc17f57024c6e /src | |
| parent | 21b040bd8cd40c9b28d458d4360d4a512b12e1d8 (diff) | |
| parent | 0f941d0245a42497e430a7c76f868aa9b120159e (diff) | |
Merge pull request #1771 from lioncash/user
dyncom: Reset the context into user mode correctly
Diffstat (limited to 'src')
| -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 context.cpu_registers[0] = arg; context.pc = entry_point; context.sp = stack_top; - context.cpsr = 0x1F | ((entry_point & 1) << 5); // Usermode and THUMB mode + context.cpsr = USER32MODE | ((entry_point & 1) << 5); // Usermode and THUMB mode } void ARM_DynCom::SaveContext(Core::ThreadContext& ctx) { |