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 #4760 from lioncash/regcache 

DSPJitRegCache: Move allocation order array to the cpp file
This commit is contained in:
Markus Wick 2017-01-26 23:42:25 +01:00 committed by GitHub
parent 360bbe0610 bdd7034fcb
commit 764d2abae3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp
View File

@ -23,7 +23,7 @@ namespace x86
{ {
// Ordered in order of prefered use. // Ordered in order of prefered use.
// Not all of these are actually available // Not all of these are actually available
const std::array<X64Reg, 15> DSPJitRegCache::m_allocation_order = { constexpr std::array<X64Reg, 15> s_allocation_order = {
{R8, R9, R10, R11, R12, R13, R14, R15, RSI, RDI, RBX, RCX, RDX, RAX, RBP}}; {R8, R9, R10, R11, R12, R13, R14, R15, RSI, RDI, RBX, RCX, RDX, RAX, RBP}};
static void* GetRegisterPointer(size_t reg) static void* GetRegisterPointer(size_t reg)
@ -905,7 +905,7 @@ X64Reg DSPJitRegCache::SpillXReg()
{ {
int max_use_ctr_diff = 0; int max_use_ctr_diff = 0;
X64Reg least_recent_use_reg = INVALID_REG; X64Reg least_recent_use_reg = INVALID_REG;
for (X64Reg reg : m_allocation_order) for (X64Reg reg : s_allocation_order)
{ {
if (m_xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED && !m_regs[m_xregs[reg].guest_reg].used) if (m_xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED && !m_regs[m_xregs[reg].guest_reg].used)
{ {
@ -925,7 +925,7 @@ X64Reg DSPJitRegCache::SpillXReg()
} }
// just choose one. // just choose one.
for (X64Reg reg : m_allocation_order) for (X64Reg reg : s_allocation_order)
{ {
if (m_xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED && !m_regs[m_xregs[reg].guest_reg].used) if (m_xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED && !m_regs[m_xregs[reg].guest_reg].used)
{ {
@ -956,7 +956,7 @@ void DSPJitRegCache::SpillXReg(X64Reg reg)
X64Reg DSPJitRegCache::FindFreeXReg() X64Reg DSPJitRegCache::FindFreeXReg()
{ {
for (X64Reg x : m_allocation_order) for (X64Reg x : s_allocation_order)
{ {
if (m_xregs[x].guest_reg == DSP_REG_NONE) if (m_xregs[x].guest_reg == DSP_REG_NONE)
{ {

2
Source/Core/Core/DSP/Jit/DSPJitRegCache.h
View File

@ -174,8 +174,6 @@ private:
void MovToMemory(size_t reg); void MovToMemory(size_t reg);
void FlushMemBackedRegs(); void FlushMemBackedRegs();
static const std::array<Gen::X64Reg, 15> m_allocation_order;
std::array<DynamicReg, 37> m_regs; std::array<DynamicReg, 37> m_regs;
std::array<X64CachedReg, 16> m_xregs; std::array<X64CachedReg, 16> m_xregs;