diff options
| author | bunnei <bunneidev@gmail.com> | 2014-08-28 18:07:45 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-08-28 18:07:45 -0400 |
| commit | 06864c93fdf41ed383aadc3a76c40cb4725051b0 (patch) | |
| tree | 5b2f042cae820f5b8ad622731bc378247fac7788 /src/core/arm/interpreter | |
| parent | 7122c46937b2382879de4fbee1c3eaf50c9c35b4 (diff) | |
| parent | 6966fdf02578750f31098f23f1f14ebb4f642e2a (diff) | |
Merge pull request #80 from bunnei/fix-latest-libctru
Fixes Citra for the latest changes made to the "refactor" branch of libctru.
- For reference, see: https://github.com/smealum/ctrulib/tree/refactor/libctru
Diffstat (limited to 'src/core/arm/interpreter')
| -rw-r--r-- | src/core/arm/interpreter/arm_interpreter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/interpreter/arm_interpreter.cpp b/src/core/arm/interpreter/arm_interpreter.cpp index d35a3ae17..0842d2f8e 100644 --- a/src/core/arm/interpreter/arm_interpreter.cpp +++ b/src/core/arm/interpreter/arm_interpreter.cpp @@ -27,7 +27,7 @@ ARM_Interpreter::ARM_Interpreter() { // Reset the core to initial state ARMul_CoProInit(state); ARMul_Reset(state); - state->NextInstr = RESUME; + state->NextInstr = RESUME; // NOTE: This will be overwritten by LoadContext state->Emulate = 3; state->pc = state->Reg[15] = 0x00000000; |