mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 05:47:56 -07:00
JitArm64: Fix BindToRegister in case Immediate && !set_dirty
Fixes a Rogue Squadron II regression from 9d73583
.
This set_dirty stuff is pretty tricky to reason about. I thought I
was clever when coming up with set_dirty, but maybe I was too clever
for my own good...
This commit is contained in:
parent
15393f0344
commit
42775eed36
@ -365,12 +365,16 @@ void Arm64GPRCache::BindToRegister(const GuestRegInfo& guest_reg, bool do_load,
|
|||||||
else if (reg_type == RegType::Immediate)
|
else if (reg_type == RegType::Immediate)
|
||||||
{
|
{
|
||||||
const ARM64Reg host_reg = bitsize != 64 ? GetReg() : EncodeRegTo64(GetReg());
|
const ARM64Reg host_reg = bitsize != 64 ? GetReg() : EncodeRegTo64(GetReg());
|
||||||
if (do_load)
|
if (do_load || !set_dirty)
|
||||||
{
|
{
|
||||||
|
// TODO: Emitting this instruction when (!do_load && !set_dirty) would be unnecessary if we
|
||||||
|
// had some way to indicate to Flush that the immediate value should be written to ppcState
|
||||||
|
// even though there is a host register allocated
|
||||||
m_emit->MOVI2R(host_reg, reg.GetImm());
|
m_emit->MOVI2R(host_reg, reg.GetImm());
|
||||||
}
|
}
|
||||||
reg.Load(host_reg);
|
reg.Load(host_reg);
|
||||||
reg.SetDirty(set_dirty);
|
// If the register had an immediate value, the register was effectively already dirty
|
||||||
|
reg.SetDirty(true);
|
||||||
}
|
}
|
||||||
else if (set_dirty)
|
else if (set_dirty)
|
||||||
{
|
{
|
||||||
|
@ -254,33 +254,55 @@ public:
|
|||||||
// but in other cases it can be set to ARM64Reg::INVALID_REG when convenient for the caller.
|
// but in other cases it can be set to ARM64Reg::INVALID_REG when convenient for the caller.
|
||||||
void Flush(FlushMode mode, Arm64Gen::ARM64Reg tmp_reg) override;
|
void Flush(FlushMode mode, Arm64Gen::ARM64Reg tmp_reg) override;
|
||||||
|
|
||||||
// Returns a guest GPR inside of a host register
|
// Returns a guest GPR inside of a host register.
|
||||||
// Will dump an immediate to the host register as well
|
// Will dump an immediate to the host register as well.
|
||||||
Arm64Gen::ARM64Reg R(size_t preg) { return R(GetGuestGPR(preg)); }
|
Arm64Gen::ARM64Reg R(size_t preg) { return R(GetGuestGPR(preg)); }
|
||||||
// Returns a guest CR inside of a host register
|
|
||||||
|
// Returns a guest CR inside of a host register.
|
||||||
Arm64Gen::ARM64Reg CR(size_t preg) { return R(GetGuestCR(preg)); }
|
Arm64Gen::ARM64Reg CR(size_t preg) { return R(GetGuestCR(preg)); }
|
||||||
// Set a register to an immediate, only valid for guest GPRs
|
|
||||||
|
// Set a register to an immediate. Only valid for guest GPRs.
|
||||||
void SetImmediate(size_t preg, u32 imm) { SetImmediate(GetGuestGPR(preg), imm); }
|
void SetImmediate(size_t preg, u32 imm) { SetImmediate(GetGuestGPR(preg), imm); }
|
||||||
// Returns if a register is set as an immediate, only valid for guest GPRs
|
|
||||||
|
// Returns if a register is set as an immediate. Only valid for guest GPRs.
|
||||||
bool IsImm(size_t preg) const { return GetGuestGPROpArg(preg).GetType() == RegType::Immediate; }
|
bool IsImm(size_t preg) const { return GetGuestGPROpArg(preg).GetType() == RegType::Immediate; }
|
||||||
// Gets the immediate that a register is set to, only valid for guest GPRs
|
|
||||||
|
// Gets the immediate that a register is set to. Only valid for guest GPRs.
|
||||||
u32 GetImm(size_t preg) const { return GetGuestGPROpArg(preg).GetImm(); }
|
u32 GetImm(size_t preg) const { return GetGuestGPROpArg(preg).GetImm(); }
|
||||||
// Binds a guest GPR to a host register, optionally loading its value
|
|
||||||
|
// Binds a guest GPR to a host register, optionally loading its value.
|
||||||
|
//
|
||||||
|
// Using set_dirty = false is a little trick that's useful when emulating a memory load that might
|
||||||
|
// have to be rolled back. (Don't use set_dirty = false in other circumstances.) By calling this
|
||||||
|
// function with set_dirty = false before performing the load, this function guarantees that the
|
||||||
|
// guest register will be marked as dirty (needing to be written back to ppcState) only if the
|
||||||
|
// guest register previously contained a value that needs to be written back to ppcState.
|
||||||
|
//
|
||||||
|
// This trick prevents a problem that would otherwise happen where the call to this function could
|
||||||
|
// allocate a new host register without writing anything to it (if do_load = false), and then
|
||||||
|
// later when preparing to jump to an exception handler, a call to Flush would write the old value
|
||||||
|
// in the host register to ppcState because the register was marked dirty.
|
||||||
|
//
|
||||||
|
// If you call this with set_dirty = false, you must make sure to call this with set_dirty = true
|
||||||
|
// later.
|
||||||
void BindToRegister(size_t preg, bool do_load, bool set_dirty = true)
|
void BindToRegister(size_t preg, bool do_load, bool set_dirty = true)
|
||||||
{
|
{
|
||||||
BindToRegister(GetGuestGPR(preg), do_load, set_dirty);
|
BindToRegister(GetGuestGPR(preg), do_load, set_dirty);
|
||||||
}
|
}
|
||||||
// Binds a guest CR to a host register, optionally loading its value
|
|
||||||
|
// Binds a guest CR to a host register, optionally loading its value.
|
||||||
void BindCRToRegister(size_t preg, bool do_load, bool set_dirty = true)
|
void BindCRToRegister(size_t preg, bool do_load, bool set_dirty = true)
|
||||||
{
|
{
|
||||||
BindToRegister(GetGuestCR(preg), do_load, set_dirty);
|
BindToRegister(GetGuestCR(preg), do_load, set_dirty);
|
||||||
}
|
}
|
||||||
|
|
||||||
BitSet32 GetCallerSavedUsed() const override;
|
BitSet32 GetCallerSavedUsed() const override;
|
||||||
|
|
||||||
void StoreRegisters(BitSet32 regs, Arm64Gen::ARM64Reg tmp_reg = Arm64Gen::ARM64Reg::INVALID_REG)
|
void StoreRegisters(BitSet32 regs, Arm64Gen::ARM64Reg tmp_reg = Arm64Gen::ARM64Reg::INVALID_REG)
|
||||||
{
|
{
|
||||||
FlushRegisters(regs, false, tmp_reg);
|
FlushRegisters(regs, false, tmp_reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
void StoreCRRegisters(BitSet32 regs, Arm64Gen::ARM64Reg tmp_reg = Arm64Gen::ARM64Reg::INVALID_REG)
|
void StoreCRRegisters(BitSet32 regs, Arm64Gen::ARM64Reg tmp_reg = Arm64Gen::ARM64Reg::INVALID_REG)
|
||||||
{
|
{
|
||||||
FlushCRRegisters(regs, false, tmp_reg);
|
FlushCRRegisters(regs, false, tmp_reg);
|
||||||
|
Loading…
Reference in New Issue
Block a user