ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JitArm64: Refactor EmitBackpatchRoutine parameters, part 2

This commit is contained in:
JosJuice 2022-06-06 19:17:36 +02:00
parent 27ed2a99a0
commit 63283dcc72
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,17 +60,16 @@ void JitArm64::EmitBackpatchRoutine(u32 flags, MemAccessMode mode, ARM64Reg RS,
{ {
const u32 access_size = BackPatchInfo::GetFlagSize(flags); const u32 access_size = BackPatchInfo::GetFlagSize(flags);
const bool fastmem = jo.fastmem_arena && mode != MemAccessMode::AlwaysSafe; const bool emit_fastmem = jo.fastmem_arena && mode != MemAccessMode::AlwaysSafe;
const bool do_farcode = jo.fastmem_arena && (mode == MemAccessMode::Auto || const bool emit_slowmem = !jo.fastmem_arena || mode != MemAccessMode::AlwaysUnsafe;
mode == MemAccessMode::AutoWithoutBackpatch);
bool in_far_code = false; bool in_far_code = false;
const u8* fastmem_start = GetCodePtr(); const u8* fastmem_start = GetCodePtr();
std::optional<FixupBranch> slowmem_fixup; std::optional<FixupBranch> slowmem_fixup;
if (fastmem) if (emit_fastmem)
{ {
if (do_farcode && emitting_routine) if (emit_slowmem && emitting_routine)
{ {
const ARM64Reg temp1 = flags & BackPatchInfo::FLAG_STORE ? ARM64Reg::W0 : ARM64Reg::W3; const ARM64Reg temp1 = flags & BackPatchInfo::FLAG_STORE ? ARM64Reg::W0 : ARM64Reg::W3;
const ARM64Reg temp2 = ARM64Reg::W2; const ARM64Reg temp2 = ARM64Reg::W2;
@ -126,11 +125,11 @@ void JitArm64::EmitBackpatchRoutine(u32 flags, MemAccessMode mode, ARM64Reg RS,
} }
const u8* fastmem_end = GetCodePtr(); const u8* fastmem_end = GetCodePtr();
if (!fastmem || do_farcode) if (emit_slowmem)
{ {
const bool memcheck = jo.memcheck && !emitting_routine; const bool memcheck = jo.memcheck && !emitting_routine;
if (fastmem && do_farcode) if (emit_fastmem)
{ {
in_far_code = true; in_far_code = true;
SwitchToFarCode(); SwitchToFarCode();