summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-08-01 17:49:46 -0700
committerPierre Bourdon <delroth@gmail.com>2014-08-01 17:49:46 -0700
commit1aab63bef75e62de19e0887b79232b3a858ec99e (patch)
tree676c924e2e81b51d50a2ca7d01468473151c280d /Source
parente0b6f8c9c4ef4fb873577b7451a3c79fa7adefca (diff)
parent005004dfa59966160b0b95ee9bbe9249007c1a2c (diff)
Merge pull request #712 from lioncash/cast
Core: Fix cast warnings in DSPJitRegCache
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp10
-rw-r--r--Source/Core/Core/DSP/Jit/DSPJitRegCache.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp b/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp
index f0e34d507a..7f60e25a93 100644
--- a/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp
+++ b/Source/Core/Core/DSP/Jit/DSPJitRegCache.cpp
@@ -580,7 +580,7 @@ X64Reg DSPJitRegCache::makeABICallSafe(X64Reg reg)
return reg;
}
- int rbp_guest = xregs[RBP].guest_reg;
+ size_t rbp_guest = xregs[RBP].guest_reg;
xregs[RBP].guest_reg = DSP_REG_USED;
X64Reg safe = findSpillFreeXReg();
_assert_msg_(DSPLLE, safe != INVALID_REG, "could not find register");
@@ -597,7 +597,7 @@ X64Reg DSPJitRegCache::makeABICallSafe(X64Reg reg)
return safe;
}
-void DSPJitRegCache::movToHostReg(int reg, X64Reg host_reg, bool load)
+void DSPJitRegCache::movToHostReg(size_t reg, X64Reg host_reg, bool load)
{
_assert_msg_(DSPLLE, reg >= 0 && reg <= DSP_REG_MAX_MEM_BACKED,
"bad register name %x", reg);
@@ -645,7 +645,7 @@ void DSPJitRegCache::movToHostReg(int reg, X64Reg host_reg, bool load)
}
}
-void DSPJitRegCache::movToHostReg(int reg, bool load)
+void DSPJitRegCache::movToHostReg(size_t reg, bool load)
{
_assert_msg_(DSPLLE, reg >= 0 && reg <= DSP_REG_MAX_MEM_BACKED,
"bad register name %x", reg);
@@ -677,7 +677,7 @@ void DSPJitRegCache::movToHostReg(int reg, bool load)
movToHostReg(reg, tmp, load);
}
-void DSPJitRegCache::rotateHostReg(int reg, int shift, bool emit)
+void DSPJitRegCache::rotateHostReg(size_t reg, int shift, bool emit)
{
_assert_msg_(DSPLLE, reg >= 0 && reg <= DSP_REG_MAX_MEM_BACKED,
"bad register name %x", reg);
@@ -725,7 +725,7 @@ void DSPJitRegCache::rotateHostReg(int reg, int shift, bool emit)
regs[reg].shift = shift;
}
-void DSPJitRegCache::movToMemory(int reg)
+void DSPJitRegCache::movToMemory(size_t reg)
{
_assert_msg_(DSPLLE, reg >= 0 && reg <= DSP_REG_MAX_MEM_BACKED,
"bad register name %x", reg);
diff --git a/Source/Core/Core/DSP/Jit/DSPJitRegCache.h b/Source/Core/Core/DSP/Jit/DSPJitRegCache.h
index 41fa16fc6c..67c1bc1803 100644
--- a/Source/Core/Core/DSP/Jit/DSPJitRegCache.h
+++ b/Source/Core/Core/DSP/Jit/DSPJitRegCache.h
@@ -44,7 +44,7 @@ class DSPJitRegCache
private:
struct X64CachedReg
{
- int guest_reg; //including DSPJitRegSpecial
+ size_t guest_reg; //including DSPJitRegSpecial
bool pushed;
};
@@ -85,10 +85,10 @@ private:
Gen::X64Reg findSpillFreeXReg();
void spillXReg(Gen::X64Reg reg);
- void movToHostReg(int reg, Gen::X64Reg host_reg, bool load);
- void movToHostReg(int reg, bool load);
- void rotateHostReg(int reg, int shift, bool emit);
- void movToMemory(int reg);
+ void movToHostReg(size_t reg, Gen::X64Reg host_reg, bool load);
+ void movToHostReg(size_t reg, bool load);
+ void rotateHostReg(size_t reg, int shift, bool emit);
+ void movToMemory(size_t reg);
void flushMemBackedRegs();
public: