summaryrefslogtreecommitdiffstats
path: root/src/core/arm
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2023-04-02 02:03:08 +0200
committerbunnei <bunneidev@gmail.com>2023-04-02 02:03:08 +0200
commit9c94faaa2b2532a4d383afc1b9825bd5005e5a8e (patch)
tree7da305e8ed1225a806bb1d2ff2fdf63beca2550f /src/core/arm
parentexternals: Update dynarmic to 6.4.6 (diff)
downloadyuzu-9c94faaa2b2532a4d383afc1b9825bd5005e5a8e.tar
yuzu-9c94faaa2b2532a4d383afc1b9825bd5005e5a8e.tar.gz
yuzu-9c94faaa2b2532a4d383afc1b9825bd5005e5a8e.tar.bz2
yuzu-9c94faaa2b2532a4d383afc1b9825bd5005e5a8e.tar.lz
yuzu-9c94faaa2b2532a4d383afc1b9825bd5005e5a8e.tar.xz
yuzu-9c94faaa2b2532a4d383afc1b9825bd5005e5a8e.tar.zst
yuzu-9c94faaa2b2532a4d383afc1b9825bd5005e5a8e.zip
Diffstat (limited to 'src/core/arm')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_32.cpp23
1 files changed, 10 insertions, 13 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
index cab21a88e..dfdcbe35a 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -5,7 +5,6 @@
#include <memory>
#include <dynarmic/interface/A32/a32.h>
#include <dynarmic/interface/A32/config.h>
-#include <dynarmic/interface/A32/context.h>
#include "common/assert.h"
#include "common/literals.h"
#include "common/logging/log.h"
@@ -410,21 +409,19 @@ void ARM_Dynarmic_32::SetTPIDR_EL0(u64 value) {
}
void ARM_Dynarmic_32::SaveContext(ThreadContext32& ctx) {
- Dynarmic::A32::Context context;
- jit.load()->SaveContext(context);
- ctx.cpu_registers = context.Regs();
- ctx.extension_registers = context.ExtRegs();
- ctx.cpsr = context.Cpsr();
- ctx.fpscr = context.Fpscr();
+ Dynarmic::A32::Jit* j = jit.load();
+ ctx.cpu_registers = j->Regs();
+ ctx.extension_registers = j->ExtRegs();
+ ctx.cpsr = j->Cpsr();
+ ctx.fpscr = j->Fpscr();
}
void ARM_Dynarmic_32::LoadContext(const ThreadContext32& ctx) {
- Dynarmic::A32::Context context;
- context.Regs() = ctx.cpu_registers;
- context.ExtRegs() = ctx.extension_registers;
- context.SetCpsr(ctx.cpsr);
- context.SetFpscr(ctx.fpscr);
- jit.load()->LoadContext(context);
+ Dynarmic::A32::Jit* j = jit.load();
+ j->Regs() = ctx.cpu_registers;
+ j->ExtRegs() = ctx.extension_registers;
+ j->SetCpsr(ctx.cpsr);
+ j->SetFpscr(ctx.fpscr);
}
void ARM_Dynarmic_32::SignalInterrupt() {