diff options
author | bunnei <bunneidev@gmail.com> | 2016-12-22 06:08:09 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2016-12-22 06:27:49 +0100 |
commit | 8b1e269e5898ad0b6aadabee41fea777f0e62fdc (patch) | |
tree | 74040972517faa02fa84a819c5a39fcad12a8953 /src/core/arm/dynarmic | |
parent | core: Replace "AppCore" nomenclature with just "CPU". (diff) | |
download | yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar.gz yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar.bz2 yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar.lz yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar.xz yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.tar.zst yuzu-8b1e269e5898ad0b6aadabee41fea777f0e62fdc.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 4 | ||||
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.h | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index fc4254670..5290382ff 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -137,7 +137,7 @@ void ARM_Dynarmic::ExecuteInstructions(int num_instructions) { AddTicks(ticks_executed); } -void ARM_Dynarmic::SaveContext(Core::ThreadContext& ctx) { +void ARM_Dynarmic::SaveContext(ARM_Interface::ThreadContext& ctx) { memcpy(ctx.cpu_registers, jit->Regs().data(), sizeof(ctx.cpu_registers)); memcpy(ctx.fpu_registers, jit->ExtRegs().data(), sizeof(ctx.fpu_registers)); @@ -150,7 +150,7 @@ void ARM_Dynarmic::SaveContext(Core::ThreadContext& ctx) { ctx.fpexc = interpreter_state->VFP[VFP_FPEXC]; } -void ARM_Dynarmic::LoadContext(const Core::ThreadContext& ctx) { +void ARM_Dynarmic::LoadContext(const ARM_Interface::ThreadContext& ctx) { memcpy(jit->Regs().data(), ctx.cpu_registers, sizeof(ctx.cpu_registers)); memcpy(jit->ExtRegs().data(), ctx.fpu_registers, sizeof(ctx.fpu_registers)); diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h index ced86d29b..87ab53d81 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.h +++ b/src/core/arm/dynarmic/arm_dynarmic.h @@ -10,10 +10,6 @@ #include "core/arm/arm_interface.h" #include "core/arm/skyeye_common/armstate.h" -namespace Core { -struct ThreadContext; -} - class ARM_Dynarmic final : public ARM_Interface { public: ARM_Dynarmic(PrivilegeMode initial_mode); @@ -33,8 +29,8 @@ public: void AddTicks(u64 ticks) override; - void SaveContext(Core::ThreadContext& ctx) override; - void LoadContext(const Core::ThreadContext& ctx) override; + void SaveContext(ThreadContext& ctx) override; + void LoadContext(const ThreadContext& ctx) override; void PrepareReschedule() override; void ExecuteInstructions(int num_instructions) override; |