From 7d5c3b00a8237d9bfccad7b88224372e15ba0fb6 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Tue, 12 Dec 2017 19:08:53 +0000 Subject: [PATCH] dynarmic: Update to d1d4705 --- externals/dynarmic | 2 +- src/core/arm/dynarmic/arm_dynarmic.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/externals/dynarmic b/externals/dynarmic index 4110494ac..d1d470536 160000 --- a/externals/dynarmic +++ b/externals/dynarmic @@ -1 +1 @@ -Subproject commit 4110494ac4edc83f74c65834ab3ba6ddd166f42e +Subproject commit d1d4705364031512cb89333aebc00b8d75a2f732 diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 1890e7c5f..2f42c915a 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -30,7 +30,7 @@ static void InterpreterFallback(u32 pc, Dynarmic::Jit* jit, void* user_arg) { state->Reg[15] &= (is_thumb ? 0xFFFFFFFE : 0xFFFFFFFC); jit->Regs() = state->Reg; - jit->Cpsr() = state->Cpsr; + jit->SetCpsr(state->Cpsr); jit->ExtRegs() = state->ExtReg; jit->SetFpscr(state->VFP[VFP_FPSCR]); } @@ -137,7 +137,7 @@ u32 ARM_Dynarmic::GetCPSR() const { } void ARM_Dynarmic::SetCPSR(u32 cpsr) { - jit->Cpsr() = cpsr; + jit->SetCpsr(cpsr); } u32 ARM_Dynarmic::GetCP15Register(CP15Register reg) { @@ -168,7 +168,7 @@ void ARM_Dynarmic::LoadContext(const ARM_Interface::ThreadContext& ctx) { jit->Regs()[13] = ctx.sp; jit->Regs()[14] = ctx.lr; jit->Regs()[15] = ctx.pc; - jit->Cpsr() = ctx.cpsr; + jit->SetCpsr(ctx.cpsr); jit->SetFpscr(ctx.fpscr); interpreter_state->VFP[VFP_FPEXC] = ctx.fpexc;