mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-07-04 23:31:19 +01:00
Merge pull request #10020 from merryhime/update-dynarmic
externals: Update dynarmic to 6.4.6
This commit is contained in:
commit
756f013d8a
2 changed files with 11 additions and 14 deletions
2
externals/dynarmic
vendored
2
externals/dynarmic
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 165621a872ffb802c7a26ef5900e1e62681f1a88
|
Subproject commit c08c5a9362bb224dc343c2f616c24df027dfdf13
|
|
@ -5,7 +5,6 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <dynarmic/interface/A32/a32.h>
|
#include <dynarmic/interface/A32/a32.h>
|
||||||
#include <dynarmic/interface/A32/config.h>
|
#include <dynarmic/interface/A32/config.h>
|
||||||
#include <dynarmic/interface/A32/context.h>
|
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
#include "common/literals.h"
|
#include "common/literals.h"
|
||||||
#include "common/logging/log.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) {
|
void ARM_Dynarmic_32::SaveContext(ThreadContext32& ctx) {
|
||||||
Dynarmic::A32::Context context;
|
Dynarmic::A32::Jit* j = jit.load();
|
||||||
jit.load()->SaveContext(context);
|
ctx.cpu_registers = j->Regs();
|
||||||
ctx.cpu_registers = context.Regs();
|
ctx.extension_registers = j->ExtRegs();
|
||||||
ctx.extension_registers = context.ExtRegs();
|
ctx.cpsr = j->Cpsr();
|
||||||
ctx.cpsr = context.Cpsr();
|
ctx.fpscr = j->Fpscr();
|
||||||
ctx.fpscr = context.Fpscr();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ARM_Dynarmic_32::LoadContext(const ThreadContext32& ctx) {
|
void ARM_Dynarmic_32::LoadContext(const ThreadContext32& ctx) {
|
||||||
Dynarmic::A32::Context context;
|
Dynarmic::A32::Jit* j = jit.load();
|
||||||
context.Regs() = ctx.cpu_registers;
|
j->Regs() = ctx.cpu_registers;
|
||||||
context.ExtRegs() = ctx.extension_registers;
|
j->ExtRegs() = ctx.extension_registers;
|
||||||
context.SetCpsr(ctx.cpsr);
|
j->SetCpsr(ctx.cpsr);
|
||||||
context.SetFpscr(ctx.fpscr);
|
j->SetFpscr(ctx.fpscr);
|
||||||
jit.load()->LoadContext(context);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ARM_Dynarmic_32::SignalInterrupt() {
|
void ARM_Dynarmic_32::SignalInterrupt() {
|
||||||
|
|
Loading…
Reference in a new issue