Merge pull request #1284 from comex/even-more-warnings

Even more warnings
This commit is contained in:
comex 2014-10-16 17:05:25 -04:00
commit eb865cae20
2 changed files with 7 additions and 8 deletions

View File

@ -114,7 +114,7 @@ u32 GPRRegCache::CountRegsIn(size_t preg, u32 lookahead)
if (jit->js.op[i].regsIn[j] >= 0) if (jit->js.op[i].regsIn[j] >= 0)
regsUsed |= 1 << jit->js.op[i].regsIn[j]; regsUsed |= 1 << jit->js.op[i].regsIn[j];
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
if (jit->js.op[i].regsIn[j] == preg) if ((size_t)jit->js.op[i].regsIn[j] == preg)
return regsUsed; return regsUsed;
} }
return regsUsed; return regsUsed;
@ -129,7 +129,7 @@ u32 FPURegCache::CountRegsIn(size_t preg, u32 lookahead)
if (jit->js.op[i].fregsIn[j] >= 0) if (jit->js.op[i].fregsIn[j] >= 0)
regsUsed |= 1 << jit->js.op[i].fregsIn[j]; regsUsed |= 1 << jit->js.op[i].fregsIn[j];
for (int j = 0; j < 4; j++) for (int j = 0; j < 4; j++)
if (jit->js.op[i].fregsIn[j] == preg) if ((size_t)jit->js.op[i].fregsIn[j] == preg)
return regsUsed; return regsUsed;
} }
return regsUsed; return regsUsed;
@ -153,7 +153,6 @@ float RegCache::ScoreRegister(X64Reg xr)
// writing it back to the register file isn't quite as bad. // writing it back to the register file isn't quite as bad.
if (GetRegUtilization() & (1 << preg)) if (GetRegUtilization() & (1 << preg))
{ {
u32 regsUsed = 0;
// Don't look too far ahead; we don't want to have quadratic compilation times for // Don't look too far ahead; we don't want to have quadratic compilation times for
// enormous block sizes! // enormous block sizes!
// This actually improves register allocation a tiny bit; I'm not sure why. // This actually improves register allocation a tiny bit; I'm not sure why.

View File

@ -23,11 +23,11 @@ u8 texMtxIdx[8];
// Internal vars // Internal vars
SetupUnit vtxUnit; static SetupUnit vtxUnit;
VAT myVat; static VAT myVat;
u8 * bufferPos; static u8 * bufferPos;
TVtxDesc vertexDesc; static TVtxDesc vertexDesc;
PortableVertexDeclaration vertexDecl; static PortableVertexDeclaration vertexDecl;
// Gets the pointer to the current buffer position // Gets the pointer to the current buffer position
void LOADERDECL SetVertexBufferPosition() void LOADERDECL SetVertexBufferPosition()