diff options
| author |  bunnei | 2014-08-28 18:07:45 -0400 |
|---|---|---|
| committer | bunnei | 2014-08-28 18:07:45 -0400 |
| commit | 06864c93fdf41ed383aadc3a76c40cb4725051b0 (patch) | |
| tree | 5b2f042cae820f5b8ad622731bc378247fac7788 /src/core/arm | |
| parent | Merge pull request #81 from yuriks/downgrade-shader (diff) | |
| parent | Loader: Added support for loading raw BIN executables. (diff) | |
| download | yuzu-06864c93fdf41ed383aadc3a76c40cb4725051b0.tar.gz yuzu-06864c93fdf41ed383aadc3a76c40cb4725051b0.tar.xz yuzu-06864c93fdf41ed383aadc3a76c40cb4725051b0.zip | |
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')
| -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() { | |||
| 27 | // Reset the core to initial state | 27 | // Reset the core to initial state |
| 28 | ARMul_CoProInit(state); | 28 | ARMul_CoProInit(state); |
| 29 | ARMul_Reset(state); | 29 | ARMul_Reset(state); |
| 30 | state->NextInstr = RESUME; | 30 | state->NextInstr = RESUME; // NOTE: This will be overwritten by LoadContext |
| 31 | state->Emulate = 3; | 31 | state->Emulate = 3; |
| 32 | 32 | ||
| 33 | state->pc = state->Reg[15] = 0x00000000; | 33 | state->pc = state->Reg[15] = 0x00000000; |