piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

JitArm64_LoadStore: Use ScopedARM64Reg

Browse Source
This commit is contained in:
Sintendo 2024-06-23 23:18:34 +02:00
parent ac3d3de66d
commit 9420250046
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -538,9 +538,12 @@ void JitArm64::lmw(UGeckoInstruction inst)
else else
ADDI2R(addr_reg, gpr.R(a), offset, addr_reg); ADDI2R(addr_reg, gpr.R(a), offset, addr_reg);
ARM64Reg addr_base_reg = a_is_addr_base_reg ? ARM64Reg::INVALID_REG : gpr.GetReg(); Arm64RegCache::ScopedARM64Reg addr_base_reg;
if (!a_is_addr_base_reg) if (!a_is_addr_base_reg)
{
addr_base_reg = gpr.GetScopedReg();
MOV(addr_base_reg, addr_reg); MOV(addr_base_reg, addr_reg);
}
BitSet32 gprs_to_discard{}; BitSet32 gprs_to_discard{};
if (!jo.memcheck) if (!jo.memcheck)
@ -628,8 +631,6 @@ void JitArm64::lmw(UGeckoInstruction inst)
gpr.Unlock(ARM64Reg::W1, ARM64Reg::W30); gpr.Unlock(ARM64Reg::W1, ARM64Reg::W30);
if (jo.memcheck || !jo.fastmem) if (jo.memcheck || !jo.fastmem)
gpr.Unlock(ARM64Reg::W0); gpr.Unlock(ARM64Reg::W0);
if (!a_is_addr_base_reg)
gpr.Unlock(addr_base_reg);
} }
void JitArm64::stmw(UGeckoInstruction inst) void JitArm64::stmw(UGeckoInstruction inst)
@ -655,9 +656,12 @@ void JitArm64::stmw(UGeckoInstruction inst)
else else
ADDI2R(addr_reg, gpr.R(a), offset, addr_reg); ADDI2R(addr_reg, gpr.R(a), offset, addr_reg);
ARM64Reg addr_base_reg = a_is_addr_base_reg ? ARM64Reg::INVALID_REG : gpr.GetReg(); Arm64GPRCache::ScopedARM64Reg addr_base_reg;
if (!a_is_addr_base_reg) if (!a_is_addr_base_reg)
{
addr_base_reg = gpr.GetScopedReg();
MOV(addr_base_reg, addr_reg); MOV(addr_base_reg, addr_reg);
}
BitSet32 gprs_to_discard{}; BitSet32 gprs_to_discard{};
if (!jo.memcheck) if (!jo.memcheck)
@ -748,8 +752,6 @@ void JitArm64::stmw(UGeckoInstruction inst)
gpr.Unlock(ARM64Reg::W1, ARM64Reg::W2, ARM64Reg::W30); gpr.Unlock(ARM64Reg::W1, ARM64Reg::W2, ARM64Reg::W30);
if (!jo.fastmem) if (!jo.fastmem)
gpr.Unlock(ARM64Reg::W0); gpr.Unlock(ARM64Reg::W0);
if (!a_is_addr_base_reg)
gpr.Unlock(addr_base_reg);
} }
void JitArm64::dcbx(UGeckoInstruction inst) void JitArm64::dcbx(UGeckoInstruction inst)
@ -786,8 +788,8 @@ void JitArm64::dcbx(UGeckoInstruction inst)
// bdnz afterwards! So if we invalidate a single cache line, we don't adjust the registers at // bdnz afterwards! So if we invalidate a single cache line, we don't adjust the registers at
// all, if we invalidate 2 cachelines we adjust the registers by one step, and so on. // all, if we invalidate 2 cachelines we adjust the registers by one step, and so on.
const ARM64Reg reg_cycle_count = gpr.GetReg(); const auto reg_cycle_count = gpr.GetScopedReg();
const ARM64Reg reg_downcount = gpr.GetReg(); const auto reg_downcount = gpr.GetScopedReg();
// Figure out how many loops we want to do. // Figure out how many loops we want to do.
const u8 cycle_count_per_loop = const u8 cycle_count_per_loop =
@ -855,12 +857,9 @@ void JitArm64::dcbx(UGeckoInstruction inst)
SetJumpTarget(branch_out); SetJumpTarget(branch_out);
SetJumpTarget(branch_over); SetJumpTarget(branch_over);
} }
gpr.Unlock(reg_cycle_count, reg_downcount);
} }
constexpr ARM64Reg effective_addr = WB; constexpr ARM64Reg effective_addr = WB;
const ARM64Reg physical_addr = gpr.GetReg();
if (a) if (a)
ADD(effective_addr, gpr.R(a), gpr.R(b)); ADD(effective_addr, gpr.R(a), gpr.R(b));
@ -874,6 +873,8 @@ void JitArm64::dcbx(UGeckoInstruction inst)
ADD(gpr.R(b), gpr.R(b), WA, ArithOption(WA, ShiftType::LSL, 5)); // Rb += (WA * 32) ADD(gpr.R(b), gpr.R(b), WA, ArithOption(WA, ShiftType::LSL, 5)); // Rb += (WA * 32)
} }
auto physical_addr = gpr.GetScopedReg();
// Translate effective address to physical address. // Translate effective address to physical address.
const u8* loop_start = GetCodePtr(); const u8* loop_start = GetCodePtr();
FixupBranch bat_lookup_failed; FixupBranch bat_lookup_failed;
@ -939,7 +940,7 @@ void JitArm64::dcbx(UGeckoInstruction inst)
SwitchToNearCode(); SwitchToNearCode();
SetJumpTarget(near_addr); SetJumpTarget(near_addr);
gpr.Unlock(WA, WB, physical_addr); gpr.Unlock(WA, WB);
if (make_loop) if (make_loop)
gpr.Unlock(loop_counter); gpr.Unlock(loop_counter);
} }