citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

dynarmic: Update to d1d4705

This commit is contained in:
MerryMage 2017-12-12 19:08:53 +00:00
parent 87ac05a575
commit 7d5c3b00a8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/dynarmic vendored

@ -1 +1 @@
Subproject commit 4110494ac4edc83f74c65834ab3ba6ddd166f42e Subproject commit d1d4705364031512cb89333aebc00b8d75a2f732

6
src/core/arm/dynarmic/arm_dynarmic.cpp
View File

@ -30,7 +30,7 @@ static void InterpreterFallback(u32 pc, Dynarmic::Jit* jit, void* user_arg) {
state->Reg[15] &= (is_thumb ? 0xFFFFFFFE : 0xFFFFFFFC); state->Reg[15] &= (is_thumb ? 0xFFFFFFFE : 0xFFFFFFFC);
jit->Regs() = state->Reg; jit->Regs() = state->Reg;
jit->Cpsr() = state->Cpsr; jit->SetCpsr(state->Cpsr);
jit->ExtRegs() = state->ExtReg; jit->ExtRegs() = state->ExtReg;
jit->SetFpscr(state->VFP[VFP_FPSCR]); jit->SetFpscr(state->VFP[VFP_FPSCR]);
} }
@ -137,7 +137,7 @@ u32 ARM_Dynarmic::GetCPSR() const {
} }
void ARM_Dynarmic::SetCPSR(u32 cpsr) { void ARM_Dynarmic::SetCPSR(u32 cpsr) {
jit->Cpsr() = cpsr; jit->SetCpsr(cpsr);
} }
u32 ARM_Dynarmic::GetCP15Register(CP15Register reg) { 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()[13] = ctx.sp;
jit->Regs()[14] = ctx.lr; jit->Regs()[14] = ctx.lr;
jit->Regs()[15] = ctx.pc; jit->Regs()[15] = ctx.pc;
jit->Cpsr() = ctx.cpsr; jit->SetCpsr(ctx.cpsr);
jit->SetFpscr(ctx.fpscr); jit->SetFpscr(ctx.fpscr);
interpreter_state->VFP[VFP_FPEXC] = ctx.fpexc; interpreter_state->VFP[VFP_FPEXC] = ctx.fpexc;