diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-12-22 07:30:09 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-01-09 06:51:55 +0100 |
commit | 7b3452c7303cf348377de6702ddda0307533663c (patch) | |
tree | ce08ed7d7c42015919e1dd26cb2ec8721a54ec8a /src/core/arm/interpreter/arm_interpreter.cpp | |
parent | Merge pull request #255 from Subv/cbranch_3 (diff) | |
download | yuzu-7b3452c7303cf348377de6702ddda0307533663c.tar yuzu-7b3452c7303cf348377de6702ddda0307533663c.tar.gz yuzu-7b3452c7303cf348377de6702ddda0307533663c.tar.bz2 yuzu-7b3452c7303cf348377de6702ddda0307533663c.tar.lz yuzu-7b3452c7303cf348377de6702ddda0307533663c.tar.xz yuzu-7b3452c7303cf348377de6702ddda0307533663c.tar.zst yuzu-7b3452c7303cf348377de6702ddda0307533663c.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, 4 insertions, 2 deletions
diff --git a/src/core/arm/interpreter/arm_interpreter.cpp b/src/core/arm/interpreter/arm_interpreter.cpp index 80ebc359e..c76d371a2 100644 --- a/src/core/arm/interpreter/arm_interpreter.cpp +++ b/src/core/arm/interpreter/arm_interpreter.cpp @@ -4,6 +4,8 @@ #include "core/arm/interpreter/arm_interpreter.h" +#include "core/core.h" + const static cpu_config_t arm11_cpu_info = { "armv6", "arm11", 0x0007b000, 0x0007f000, NONCACHE }; @@ -75,7 +77,7 @@ void ARM_Interpreter::ExecuteInstructions(int num_instructions) { ARMul_Emulate32(state); } -void ARM_Interpreter::SaveContext(ThreadContext& ctx) { +void ARM_Interpreter::SaveContext(Core::ThreadContext& ctx) { memcpy(ctx.cpu_registers, state->Reg, sizeof(ctx.cpu_registers)); memcpy(ctx.fpu_registers, state->ExtReg, sizeof(ctx.fpu_registers)); @@ -91,7 +93,7 @@ void ARM_Interpreter::SaveContext(ThreadContext& ctx) { ctx.mode = state->NextInstr; } -void ARM_Interpreter::LoadContext(const ThreadContext& ctx) { +void ARM_Interpreter::LoadContext(const Core::ThreadContext& ctx) { memcpy(state->Reg, ctx.cpu_registers, sizeof(ctx.cpu_registers)); memcpy(state->ExtReg, ctx.fpu_registers, sizeof(ctx.fpu_registers)); |