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

Merge pull request #2066 from lpereira/regcache-with-variadic-tpl 

Jit64: Use variadic templates for RegCache locking
This commit is contained in:
Fiora 2015-02-17 08:53:07 -08:00
parent 39e121e551 1162c5344b
commit 53bf21e15a
2 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,41 +48,6 @@ void RegCache::Start()
//But only preload IF written OR reads >= 3
}
// these are powerpc reg indices
void RegCache::Lock(int p1, int p2, int p3, int p4)
{
regs[p1].locked = true;
if (p2 != 0xFF)
regs[p2].locked = true;
if (p3 != 0xFF)
regs[p3].locked = true;
if (p4 != 0xFF)
regs[p4].locked = true;
}
// these are x64 reg indices
void RegCache::LockX(int x1, int x2, int x3, int x4)
{
if (xregs[x1].locked)
{
PanicAlert("RegCache: x %i already locked!", x1);
}
xregs[x1].locked = true;
if (x2 != 0xFF)
xregs[x2].locked = true;
if (x3 != 0xFF)
xregs[x3].locked = true;
if (x4 != 0xFF)
xregs[x4].locked = true;
}
void RegCache::UnlockAll()
{
for (auto& reg : regs)

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

@ -109,8 +109,35 @@ public:
virtual Gen::OpArg GetDefaultLocation(size_t reg) const = 0;
// Register locking.
void Lock(int p1, int p2=0xff, int p3=0xff, int p4=0xff);
void LockX(int x1, int x2=0xff, int x3=0xff, int x4=0xff);
// these are powerpc reg indices
template<typename T>
void Lock(T p)
{
regs[p].locked = true;
}
template<typename T, typename... Args>
void Lock(T first, Args... args)
{
Lock(first);
Lock(args...);
}
// these are x64 reg indices
template<typename T>
void LockX(T x)
{
if (xregs[x].locked)
PanicAlert("RegCache: x %i already locked!", x);
xregs[x].locked = true;
}
template<typename T, typename... Args>
void LockX(T first, Args... args)
{
LockX(first);
LockX(args...);
}
void UnlockAll();
void UnlockAllX();