diff options
| author | bunnei <bunneidev@gmail.com> | 2014-08-05 23:45:44 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-08-05 23:45:44 +0200 |
| commit | 8a9f155f29a1e49cf461370c23a69c297ee60778 (patch) | |
| tree | c29766d5b8374fa7bbc38c1bbb67c3787e4b034a /src/core/arm/interpreter/arm_interpreter.cpp | |
| parent | Merge pull request #27 from neobrain/disassembly_view_rewrite (diff) | |
| parent | ARM: Synchronize Citra's SkyEye core with 3dmoo's. (diff) | |
| download | yuzu-8a9f155f29a1e49cf461370c23a69c297ee60778.tar yuzu-8a9f155f29a1e49cf461370c23a69c297ee60778.tar.gz yuzu-8a9f155f29a1e49cf461370c23a69c297ee60778.tar.bz2 yuzu-8a9f155f29a1e49cf461370c23a69c297ee60778.tar.lz yuzu-8a9f155f29a1e49cf461370c23a69c297ee60778.tar.xz yuzu-8a9f155f29a1e49cf461370c23a69c297ee60778.tar.zst yuzu-8a9f155f29a1e49cf461370c23a69c297ee60778.zip | |
Diffstat (limited to 'src/core/arm/interpreter/arm_interpreter.cpp')
| -rw-r--r-- | src/core/arm/interpreter/arm_interpreter.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/arm/interpreter/arm_interpreter.cpp b/src/core/arm/interpreter/arm_interpreter.cpp index 0e893f182..d35a3ae17 100644 --- a/src/core/arm/interpreter/arm_interpreter.cpp +++ b/src/core/arm/interpreter/arm_interpreter.cpp @@ -12,6 +12,8 @@ ARM_Interpreter::ARM_Interpreter() { state = new ARMul_State; ARMul_EmulateInit(); + memset(state, 0, sizeof(ARMul_State)); + ARMul_NewState(state); state->abort_model = 0; @@ -23,12 +25,14 @@ ARM_Interpreter::ARM_Interpreter() { mmu_init(state); // Reset the core to initial state + ARMul_CoProInit(state); ARMul_Reset(state); - state->NextInstr = 0; + state->NextInstr = RESUME; state->Emulate = 3; state->pc = state->Reg[15] = 0x00000000; state->Reg[13] = 0x10000000; // Set stack pointer to the top of the stack + state->servaddr = 0xFFFF0000; } ARM_Interpreter::~ARM_Interpreter() { |