diff options
author | Lioncash <mathew1800@gmail.com> | 2018-07-31 13:56:57 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-07-31 13:56:59 +0200 |
commit | 9d6aa7bff773a1553bf855177621315f882fa4dd (patch) | |
tree | 8de835fcbaf224bd54b3ec0c51047171a977b6f4 | |
parent | arm_dynarmic: Correct initializer list order (diff) | |
download | yuzu-9d6aa7bff773a1553bf855177621315f882fa4dd.tar yuzu-9d6aa7bff773a1553bf855177621315f882fa4dd.tar.gz yuzu-9d6aa7bff773a1553bf855177621315f882fa4dd.tar.bz2 yuzu-9d6aa7bff773a1553bf855177621315f882fa4dd.tar.lz yuzu-9d6aa7bff773a1553bf855177621315f882fa4dd.tar.xz yuzu-9d6aa7bff773a1553bf855177621315f882fa4dd.tar.zst yuzu-9d6aa7bff773a1553bf855177621315f882fa4dd.zip |
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 343866251..acb3437f2 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -141,7 +141,7 @@ void ARM_Dynarmic::Step() { ARM_Dynarmic::ARM_Dynarmic(std::shared_ptr<ExclusiveMonitor> exclusive_monitor, size_t core_index) : cb(std::make_unique<ARM_Dynarmic_Callbacks>(*this)), core_index{core_index}, exclusive_monitor{std::dynamic_pointer_cast<DynarmicExclusiveMonitor>(exclusive_monitor)} { - ARM_Interface::ThreadContext ctx; + ThreadContext ctx; inner_unicorn.SaveContext(ctx); PageTableChanged(); LoadContext(ctx); @@ -215,7 +215,7 @@ void ARM_Dynarmic::SetTPIDR_EL0(u64 value) { cb->tpidr_el0 = value; } -void ARM_Dynarmic::SaveContext(ARM_Interface::ThreadContext& ctx) { +void ARM_Dynarmic::SaveContext(ThreadContext& ctx) { ctx.cpu_registers = jit->GetRegisters(); ctx.sp = jit->GetSP(); ctx.pc = jit->GetPC(); @@ -224,7 +224,7 @@ void ARM_Dynarmic::SaveContext(ARM_Interface::ThreadContext& ctx) { ctx.fpscr = jit->GetFpcr(); } -void ARM_Dynarmic::LoadContext(const ARM_Interface::ThreadContext& ctx) { +void ARM_Dynarmic::LoadContext(const ThreadContext& ctx) { jit->SetRegisters(ctx.cpu_registers); jit->SetSP(ctx.sp); jit->SetPC(ctx.pc); |