The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 22:56:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

JitArm64: Automatically set whether RS is scratch

Browse Source 
When EmitBackpatchRoutine emits slow access code for a load, RS must not
be in scratch_gprs/scratch_fprs if we have memchecks (otherwise the
memcheck exit won't be able to save RS properly), and RS must be in
scratch_gprs/scratch_fprs if we don't have memchecks (otherwise RS will
be restored to the value it had before the load, overwriting the result
of the load). Let's save callers from having to think about this by
embedding the relevant logic inside EmitBackpatchRoutine.
This commit is contained in:
JosJuice 2024-12-29 18:08:03 +01:00
parent 53770f4abe
commit 099b5d1afb
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/PowerPC/JitArm64/JitArm64_BackPatch.cpp
View File

@ -67,6 +67,14 @@ void JitArm64::EmitBackpatchRoutine(u32 flags, MemAccessMode mode, ARM64Reg RS,
const bool memcheck = jo.memcheck && !emitting_routine;
if ((flags & BackPatchInfo::FLAG_LOAD))
{
if ((flags & BackPatchInfo::FLAG_FLOAT))
scratch_fprs[DecodeReg(RS)] = !memcheck;
else
scratch_gprs[DecodeReg(RS)] = !memcheck;
}
BitSet32 temp_gpr_candidates = scratch_gprs;
BitSet32 temp_fpr_candidates = scratch_fprs;
temp_gpr_candidates[DecodeReg(addr)] = false;

4
Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp
View File

@ -129,8 +129,6 @@ void JitArm64::SafeLoadToReg(u32 dest, s32 addr, s32 offsetReg, u32 flags, s32 o
scratch_gprs[DecodeReg(ARM64Reg::W1)] = true;
if (jo.memcheck)
scratch_gprs[DecodeReg(ARM64Reg::W0)] = true;
if (!jo.memcheck)
scratch_gprs[DecodeReg(dest_reg)] = true;
u32 access_size = BackPatchInfo::GetFlagSize(flags);
u32 mmio_address = 0;
@ -592,8 +590,6 @@ void JitArm64::lmw(UGeckoInstruction inst)
scratch_gprs[DecodeReg(addr_reg)] = true;
if (jo.memcheck)
scratch_gprs[DecodeReg(ARM64Reg::W0)] = true;
if (!jo.memcheck)
scratch_gprs[DecodeReg(dest_reg)] = true;
EmitBackpatchRoutine(flags, MemAccessMode::Auto, dest_reg, EncodeRegTo64(addr_reg),
scratch_gprs, scratch_fprs);

2
Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp
View File

@ -169,8 +169,6 @@ void JitArm64::lfXX(UGeckoInstruction inst)
scratch_gprs[DecodeReg(ARM64Reg::W1)] = true;
if (jo.memcheck)
scratch_gprs[DecodeReg(ARM64Reg::W0)] = true;
if (!jo.memcheck)
scratch_fprs[DecodeReg(VD)] = true;
if (is_immediate && m_mmu.IsOptimizableRAMAddress(imm_addr, BackPatchInfo::GetFlagSize(flags)))
{

2
Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp
View File

@ -85,8 +85,6 @@ void JitArm64::psq_lXX(UGeckoInstruction inst)
scratch_gprs[DecodeReg(ARM64Reg::W1)] = true;
if (jo.memcheck)
scratch_gprs[DecodeReg(ARM64Reg::W0)] = true;
if (!jo.memcheck)
scratch_fprs[DecodeReg(VS)] = true;
u32 flags = BackPatchInfo::FLAG_LOAD | BackPatchInfo::FLAG_FLOAT | BackPatchInfo::FLAG_SIZE_32;
if (!w)