dahjah/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-12-16 04:09:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14197 from JosJuice/jit64-store-clobber-imm

Browse Source 
Jit64: Explicitly get imm for clobbered stores
This commit is contained in:
JMC47 2025-12-10 02:42:12 -05:00 committed by GitHub
commit 75bc9a474e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp
View File

@ -568,12 +568,19 @@ void Jit64::stX(UGeckoInstruction inst)
{ {
RCX64Reg Ra = gpr.Bind(a, update ? RCMode::ReadWrite : RCMode::Read); RCX64Reg Ra = gpr.Bind(a, update ? RCMode::ReadWrite : RCMode::Read);
RCOpArg reg_value; RCOpArg reg_value;
if (!gpr.IsImm(s) && WriteClobbersRegValue(accessSize, /* swap */ true)) if (WriteClobbersRegValue(accessSize, /* swap */ true))
{ {
RCOpArg Rs = gpr.Use(s, RCMode::Read); if (gpr.IsImm(s))
RegCache::Realize(Rs); {
reg_value = RCOpArg::R(RSCRATCH2); reg_value = RCOpArg::Imm32(gpr.Imm32(s));
MOV(32, reg_value, Rs); }
else
{
RCOpArg Rs = gpr.Use(s, RCMode::Read);
RegCache::Realize(Rs);
reg_value = RCOpArg::R(RSCRATCH2);
MOV(32, reg_value, Rs);
}
} }
else else
{ {
@ -624,7 +631,9 @@ void Jit64::stXx(UGeckoInstruction inst)
RCOpArg Ra = update ? gpr.Bind(a, RCMode::ReadWrite) : gpr.Use(a, RCMode::Read); RCOpArg Ra = update ? gpr.Bind(a, RCMode::ReadWrite) : gpr.Use(a, RCMode::Read);
RCOpArg Rb = gpr.Use(b, RCMode::Read); RCOpArg Rb = gpr.Use(b, RCMode::Read);
RCOpArg Rs = does_clobber ? gpr.Use(s, RCMode::Read) : gpr.BindOrImm(s, RCMode::Read); RCOpArg Rs = does_clobber ?
(gpr.IsImm(s) ? RCOpArg::Imm32(gpr.Imm32(s)) : gpr.Use(s, RCMode::Read)) :
gpr.BindOrImm(s, RCMode::Read);
RegCache::Realize(Ra, Rb, Rs); RegCache::Realize(Ra, Rb, Rs);
MOV_sum(32, RSCRATCH2, Ra, Rb); MOV_sum(32, RSCRATCH2, Ra, Rb);