mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-12-16 04:09:39 +00:00
Merge pull request #14197 from JosJuice/jit64-store-clobber-imm
Jit64: Explicitly get imm for clobbered stores
This commit is contained in:
commit
75bc9a474e
@ -568,13 +568,20 @@ void Jit64::stX(UGeckoInstruction inst)
|
||||
{
|
||||
RCX64Reg Ra = gpr.Bind(a, update ? RCMode::ReadWrite : RCMode::Read);
|
||||
RCOpArg reg_value;
|
||||
if (!gpr.IsImm(s) && WriteClobbersRegValue(accessSize, /* swap */ true))
|
||||
if (WriteClobbersRegValue(accessSize, /* swap */ true))
|
||||
{
|
||||
if (gpr.IsImm(s))
|
||||
{
|
||||
reg_value = RCOpArg::Imm32(gpr.Imm32(s));
|
||||
}
|
||||
else
|
||||
{
|
||||
RCOpArg Rs = gpr.Use(s, RCMode::Read);
|
||||
RegCache::Realize(Rs);
|
||||
reg_value = RCOpArg::R(RSCRATCH2);
|
||||
MOV(32, reg_value, Rs);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
reg_value = gpr.BindOrImm(s, RCMode::Read);
|
||||
@ -624,7 +631,9 @@ void Jit64::stXx(UGeckoInstruction inst)
|
||||
|
||||
RCOpArg Ra = update ? gpr.Bind(a, RCMode::ReadWrite) : gpr.Use(a, 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);
|
||||
|
||||
MOV_sum(32, RSCRATCH2, Ra, Rb);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user