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 #719 from lioncash/warnings 

Core: Fix warnings on Linux related to the JIT
This commit is contained in:
Pierre Bourdon 2014-08-02 13:21:20 -07:00
parent 46ce810b45 a46a500b94
commit 1bb7c2791a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,7 +305,7 @@ void FPURegCache::LoadRegister(size_t preg, X64Reg newLoc)
{ {
if (!regs[preg].location.IsImm() && (regs[preg].location.offset & 0xF)) if (!regs[preg].location.IsImm() && (regs[preg].location.offset & 0xF))
{ {
PanicAlert("WARNING - misaligned fp register location %i", preg); PanicAlert("WARNING - misaligned fp register location %" PRIx64, preg);
} }
emit->MOVAPD(newLoc, regs[preg].location); emit->MOVAPD(newLoc, regs[preg].location);
} }
@ -320,7 +320,7 @@ void RegCache::Flush(FlushMode mode)
for (size_t i = 0; i < xregs.size(); i++) for (size_t i = 0; i < xregs.size(); i++)
{ {
if (xregs[i].locked) if (xregs[i].locked)
PanicAlert("Someone forgot to unlock X64 reg %zu.", i); PanicAlert("Someone forgot to unlock X64 reg %" PRIx64, i);
} }
for (size_t i = 0; i < regs.size(); i++) for (size_t i = 0; i < regs.size(); i++)

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

@ -5,6 +5,7 @@
#pragma once #pragma once
#include <array> #include <array>
#include <cinttypes>
#include "Common/x64Emitter.h" #include "Common/x64Emitter.h"
@ -85,7 +86,7 @@ public:
if (IsBound(preg)) if (IsBound(preg))
return regs[preg].location.GetSimpleReg(); return regs[preg].location.GetSimpleReg();
PanicAlert("Not so simple - %i", preg); PanicAlert("Not so simple - %" PRIx64, preg);
return Gen::INVALID_REG; return Gen::INVALID_REG;
} }
virtual Gen::OpArg GetDefaultLocation(size_t reg) const = 0; virtual Gen::OpArg GetDefaultLocation(size_t reg) const = 0;

2
Source/Core/Core/PowerPC/PPCAnalyst.cpp
View File

@ -34,7 +34,7 @@ using namespace std;
static const int CODEBUFFER_SIZE = 32000; static const int CODEBUFFER_SIZE = 32000;
// 0 does not perform block merging // 0 does not perform block merging
static const int FUNCTION_FOLLOWING_THRESHOLD = 16; static const u32 FUNCTION_FOLLOWING_THRESHOLD = 16;
CodeBuffer::CodeBuffer(int size) CodeBuffer::CodeBuffer(int size)
{ {