diff options
author | bunnei <bunneidev@gmail.com> | 2018-09-30 21:32:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-30 21:32:27 +0200 |
commit | 5e2f23e2b185475c3ce7ae1750ec14daefcd3e08 (patch) | |
tree | ac2c341c94976552acd507359e8853105193d288 /src/core/arm/dynarmic | |
parent | Merge pull request #1418 from FearlessTobi/port-4269 (diff) | |
parent | kernel/svc: Implement svcGetThreadContext() (diff) | |
download | yuzu-5e2f23e2b185475c3ce7ae1750ec14daefcd3e08.tar yuzu-5e2f23e2b185475c3ce7ae1750ec14daefcd3e08.tar.gz yuzu-5e2f23e2b185475c3ce7ae1750ec14daefcd3e08.tar.bz2 yuzu-5e2f23e2b185475c3ce7ae1750ec14daefcd3e08.tar.lz yuzu-5e2f23e2b185475c3ce7ae1750ec14daefcd3e08.tar.xz yuzu-5e2f23e2b185475c3ce7ae1750ec14daefcd3e08.tar.zst yuzu-5e2f23e2b185475c3ce7ae1750ec14daefcd3e08.zip |
Diffstat (limited to 'src/core/arm/dynarmic')
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 8cad070b4..05cc84458 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -130,7 +130,7 @@ public: std::unique_ptr<Dynarmic::A64::Jit> ARM_Dynarmic::MakeJit() const { auto& current_process = Core::CurrentProcess(); - auto** const page_table = current_process->vm_manager.page_table.pointers.data(); + auto** const page_table = current_process->VMManager().page_table.pointers.data(); Dynarmic::A64::UserConfig config; @@ -139,7 +139,7 @@ std::unique_ptr<Dynarmic::A64::Jit> ARM_Dynarmic::MakeJit() const { // Memory config.page_table = reinterpret_cast<void**>(page_table); - config.page_table_address_space_bits = current_process->vm_manager.GetAddressSpaceWidth(); + config.page_table_address_space_bits = current_process->VMManager().GetAddressSpaceWidth(); config.silently_mirror_page_table = false; // Multi-process state @@ -247,15 +247,19 @@ void ARM_Dynarmic::SaveContext(ThreadContext& ctx) { ctx.pstate = jit->GetPstate(); ctx.vector_registers = jit->GetVectors(); ctx.fpcr = jit->GetFpcr(); + ctx.fpsr = jit->GetFpsr(); + ctx.tpidr = cb->tpidr_el0; } void ARM_Dynarmic::LoadContext(const ThreadContext& ctx) { jit->SetRegisters(ctx.cpu_registers); jit->SetSP(ctx.sp); jit->SetPC(ctx.pc); - jit->SetPstate(static_cast<u32>(ctx.pstate)); + jit->SetPstate(ctx.pstate); jit->SetVectors(ctx.vector_registers); - jit->SetFpcr(static_cast<u32>(ctx.fpcr)); + jit->SetFpcr(ctx.fpcr); + jit->SetFpsr(ctx.fpsr); + SetTPIDR_EL0(ctx.tpidr); } void ARM_Dynarmic::PrepareReschedule() { |