ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RegCache: merge fpr+gpr BindToRegister

This commit is contained in:
degasus 2014-06-02 14:11:33 +02:00
parent 9e9b71fa87
commit 38c3812a60
2 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp
View File

@ -217,7 +217,7 @@ void RegCache::KillImmediate(int preg, bool doLoad, bool makeDirty)
} }
} }
void GPRRegCache::BindToRegister(int i, bool doLoad, bool makeDirty) void RegCache::BindToRegister(int i, bool doLoad, bool makeDirty)
{ {
if (!regs[i].away && regs[i].location.IsImm()) if (!regs[i].away && regs[i].location.IsImm())
PanicAlert("Bad immediate"); PanicAlert("Bad immediate");
@ -230,9 +230,8 @@ void GPRRegCache::BindToRegister(int i, bool doLoad, bool makeDirty)
xregs[xr].free = false; xregs[xr].free = false;
xregs[xr].ppcReg = i; xregs[xr].ppcReg = i;
xregs[xr].dirty = makeDirty || regs[i].location.IsImm(); xregs[xr].dirty = makeDirty || regs[i].location.IsImm();
OpArg newloc = ::Gen::R(xr);
if (doLoad) if (doLoad)
emit->MOV(32, newloc, regs[i].location); LoadRegister(i, xr);
for (int j = 0; j < (int)regs.size(); j++) for (int j = 0; j < (int)regs.size(); j++)
{ {
if (i != j && regs[j].location.IsSimpleReg() && regs[j].location.GetSimpleReg() == xr) if (i != j && regs[j].location.IsSimpleReg() && regs[j].location.GetSimpleReg() == xr)
@ -241,7 +240,7 @@ void GPRRegCache::BindToRegister(int i, bool doLoad, bool makeDirty)
} }
} }
regs[i].away = true; regs[i].away = true;
regs[i].location = newloc; regs[i].location = ::Gen::R(xr);
} }
else else
{ {
@ -282,39 +281,23 @@ void RegCache::StoreFromRegister(int i)
} }
} }
void GPRRegCache::LoadRegister(int preg, X64Reg newLoc)
{
emit->MOV(32, ::Gen::R(newLoc), regs[preg].location);
}
void GPRRegCache::StoreRegister(int preg, OpArg newLoc) void GPRRegCache::StoreRegister(int preg, OpArg newLoc)
{ {
emit->MOV(32, newLoc, regs[preg].location); emit->MOV(32, newLoc, regs[preg].location);
} }
void FPURegCache::BindToRegister(int i, bool doLoad, bool makeDirty) void FPURegCache::LoadRegister(int preg, X64Reg newLoc)
{ {
_assert_msg_(DYNA_REC, !regs[i].location.IsImm(), "WTF - load - imm"); if (!regs[preg].location.IsImm() && (regs[preg].location.offset & 0xF))
if (!regs[i].away)
{ {
// Reg is at home in the memory register file. Let's pull it out. PanicAlert("WARNING - misaligned fp register location %i", preg);
X64Reg xr = GetFreeXReg();
_assert_msg_(DYNA_REC, xr < xregs.size(), "WTF - load - invalid reg");
xregs[xr].ppcReg = i;
xregs[xr].free = false;
xregs[xr].dirty = makeDirty;
OpArg newloc = ::Gen::R(xr);
if (doLoad)
{
if (!regs[i].location.IsImm() && (regs[i].location.offset & 0xF))
{
PanicAlert("WARNING - misaligned fp register location %i", i);
}
emit->MOVAPD(xr, regs[i].location);
}
regs[i].location = newloc;
regs[i].away = true;
}
else
{
// There are no immediates in the FPR reg file, so we already had this in a register. Make dirty as necessary.
xregs[RX(i)].dirty |= makeDirty;
} }
emit->MOVAPD(newLoc, regs[preg].location);
} }
void FPURegCache::StoreRegister(int preg, OpArg newLoc) void FPURegCache::StoreRegister(int preg, OpArg newLoc)

7
Source/Core/Core/PowerPC/Jit64/JitRegCache.h
View File

@ -70,9 +70,10 @@ public:
//TODO - instead of doload, use "read", "write" //TODO - instead of doload, use "read", "write"
//read only will not set dirty flag //read only will not set dirty flag
virtual void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true) = 0; void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true);
void StoreFromRegister(int preg); void StoreFromRegister(int preg);
virtual void StoreRegister(int preg, OpArg newLoc) = 0; virtual void StoreRegister(int preg, OpArg newLoc) = 0;
virtual void LoadRegister(int preg, X64Reg newLoc) = 0;
const OpArg &R(int preg) const {return regs[preg].location;} const OpArg &R(int preg) const {return regs[preg].location;}
X64Reg RX(int preg) const X64Reg RX(int preg) const
@ -107,8 +108,8 @@ public:
class GPRRegCache : public RegCache class GPRRegCache : public RegCache
{ {
public: public:
void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true) override;
void StoreRegister(int preg, OpArg newLoc) override; void StoreRegister(int preg, OpArg newLoc) override;
void LoadRegister(int preg, X64Reg newLoc) override;
OpArg GetDefaultLocation(int reg) const override; OpArg GetDefaultLocation(int reg) const override;
const int *GetAllocationOrder(int &count) override; const int *GetAllocationOrder(int &count) override;
void SetImmediate32(int preg, u32 immValue); void SetImmediate32(int preg, u32 immValue);
@ -118,8 +119,8 @@ public:
class FPURegCache : public RegCache class FPURegCache : public RegCache
{ {
public: public:
void BindToRegister(int preg, bool doLoad = true, bool makeDirty = true) override;
void StoreRegister(int preg, OpArg newLoc) override; void StoreRegister(int preg, OpArg newLoc) override;
void LoadRegister(int preg, X64Reg newLoc) override;
const int *GetAllocationOrder(int &count) override; const int *GetAllocationOrder(int &count) override;
OpArg GetDefaultLocation(int reg) const override; OpArg GetDefaultLocation(int reg) const override;
}; };