Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JitArm64: Fix uninitialized use of register in dcbx

Browse Source 
Also do a little cleanup in the equivalent part of Jit64.
This commit is contained in:
Martino Fontana
2026-06-08 23:38:05 +02:00
parent aabea5b1e3
commit da45cbe8fd
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp
+8 -8
View File
@@ -326,8 +326,8 @@ void Jit64::dcbx(UGeckoInstruction inst)
} }
} }
X64Reg addr = RSCRATCH; X64Reg effective_address = RSCRATCH;
MOV_sum(32, addr, Ra, Rb); MOV_sum(32, effective_address, Ra, Rb);
if (make_loop) if (make_loop)
{ {
@@ -338,19 +338,19 @@ void Jit64::dcbx(UGeckoInstruction inst)
} }
X64Reg tmp = RSCRATCH2; X64Reg tmp = RSCRATCH2;
RCX64Reg effective_address = gpr.Scratch(); RCX64Reg addr = gpr.Scratch();
RegCache::Realize(effective_address); RegCache::Realize(addr);
FixupBranch bat_lookup_failed; FixupBranch bat_lookup_failed;
MOV(32, R(effective_address), R(addr));
const u8* loop_start = GetCodePtr(); const u8* loop_start = GetCodePtr();
MOV(32, R(addr), R(effective_address));
if (m_ppc_state.feature_flags & FEATURE_FLAG_MSR_IR) if (m_ppc_state.feature_flags & FEATURE_FLAG_MSR_IR)
{ {
// Translate effective address to physical address. // Translate effective address to physical address.
bat_lookup_failed = BATAddressLookup(addr, tmp, m_jit.m_mmu.GetIBATTable().data()); bat_lookup_failed = BATAddressLookup(addr, tmp, m_jit.m_mmu.GetIBATTable().data());
MOV(32, R(tmp), R(effective_address)); MOV(32, R(tmp), R(effective_address));
AND(32, R(tmp), Imm32(0x0001ffff)); AND(32, R(tmp), Imm32(PowerPC::BAT_PAGE_SIZE - 1));
AND(32, R(addr), Imm32(0xfffe0000)); AND(32, R(addr), Imm32(~(PowerPC::BAT_PAGE_SIZE - 1)));
OR(32, R(addr), R(tmp)); OR(32, R(addr), R(tmp));
} }
@@ -366,7 +366,6 @@ void Jit64::dcbx(UGeckoInstruction inst)
if (make_loop) if (make_loop)
{ {
ADD(32, R(effective_address), Imm8(32)); ADD(32, R(effective_address), Imm8(32));
MOV(32, R(addr), R(effective_address));
SUB(32, R(loop_counter), Imm8(1)); SUB(32, R(loop_counter), Imm8(1));
J_CC(CC_NZ, loop_start); J_CC(CC_NZ, loop_start);
} }
@@ -379,6 +378,7 @@ void Jit64::dcbx(UGeckoInstruction inst)
BitSet32 registersInUse = CallerSavedRegistersInUse(); BitSet32 registersInUse = CallerSavedRegistersInUse();
registersInUse[X64Reg(tmp)] = false; registersInUse[X64Reg(tmp)] = false;
registersInUse[X64Reg(effective_address)] = false; registersInUse[X64Reg(effective_address)] = false;
registersInUse[X64Reg(addr)] = false;
if (make_loop) if (make_loop)
registersInUse[X64Reg(loop_counter)] = false; registersInUse[X64Reg(loop_counter)] = false;
ABI_PushRegistersAndAdjustStack(registersInUse, 0); ABI_PushRegistersAndAdjustStack(registersInUse, 0);
Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp
+6 -2
View File
@@ -867,10 +867,14 @@ void JitArm64::dcbx(UGeckoInstruction inst)
bat_lookup_failed = bat_lookup_failed =
BATAddressLookup(physical_addr, effective_addr, WA, m_mmu.GetIBATTable().data()); BATAddressLookup(physical_addr, effective_addr, WA, m_mmu.GetIBATTable().data());
BFI(physical_addr, effective_addr, 0, PowerPC::BAT_INDEX_SHIFT); BFI(physical_addr, effective_addr, 0, PowerPC::BAT_INDEX_SHIFT);
}
// Check whether a JIT cache line needs to be invalidated. // Check whether a JIT cache line needs to be invalidated.
LSR(physical_addr, physical_addr, 5 + 5); // >> 5 for cache line size, >> 5 for width of bitset LSR(physical_addr, physical_addr, 5 + 5); // >> 5 for cache line size, >> 5 for width of bitset
}
else
{
LSR(physical_addr, effective_addr, 5 + 5);
}
MOVP2R(EncodeRegTo64(WA), GetBlockCache()->GetBlockBitSet()); MOVP2R(EncodeRegTo64(WA), GetBlockCache()->GetBlockBitSet());
LDR(physical_addr, EncodeRegTo64(WA), ArithOption(EncodeRegTo64(physical_addr), true)); LDR(physical_addr, EncodeRegTo64(WA), ArithOption(EncodeRegTo64(physical_addr), true));