Fix more warnings from #579

This commit is contained in:
Tillmann Karras
2014-08-07 03:24:42 +02:00
parent 470bfc9b0b
commit f927af20f2
6 changed files with 11 additions and 15 deletions

View File

@ -1011,7 +1011,7 @@ void DSPJitRegCache::spillXReg(X64Reg reg)
if (xregs[reg].guest_reg <= DSP_REG_MAX_MEM_BACKED)
{
_assert_msg_(DSPLLE, !regs[xregs[reg].guest_reg].used,
"to be spilled host reg %x(guest reg %x) still in use!",
"to be spilled host reg %x(guest reg %zx) still in use!",
reg, xregs[reg].guest_reg);
movToMemory(xregs[reg].guest_reg);

View File

@ -1666,7 +1666,7 @@ static void DoWriteCode(IRBuilder* ibuild, JitIL* Jit, u32 exitAddress) {
u64 val = ibuild->GetImmValue64(I);
if ((u32)val == val)
Jit->MOV(32, R(reg), Imm32(val));
else if ((s32)val == val)
else if ((s32)val == (s64)val)
Jit->MOV(64, R(reg), Imm32(val));
else
Jit->MOV(64, R(reg), Imm64(val));

View File

@ -110,8 +110,6 @@ bool Host_RendererHasFocus()
void Host_ConnectWiimote(int wm_idx, bool connect) {}
void Host_SetWaitCursor(bool enable){}
void Host_UpdateStatusBar(const std::string& text, int filed){}
void Host_SysMessage(const char *fmt, ...)

View File

@ -41,15 +41,15 @@
#import <Cocoa/Cocoa.h>
#endif
bool rendererHasFocus = true;
bool running = true;
static bool rendererHasFocus = true;
static bool running = true;
void Host_NotifyMapLoaded() {}
void Host_RefreshDSPDebuggerWindow() {}
void Host_ShowJitResults(unsigned int address){}
Common::Event updateMainFrameEvent;
static Common::Event updateMainFrameEvent;
void Host_Message(int Id)
{
switch (Id)
@ -109,8 +109,6 @@ bool Host_RendererHasFocus()
void Host_ConnectWiimote(int wm_idx, bool connect) {}
void Host_SetWaitCursor(bool enable){}
void Host_UpdateStatusBar(const std::string& text, int filed){}
void Host_SysMessage(const char *fmt, ...)
@ -137,7 +135,7 @@ void Host_SetWiiMoteConnectionState(int _State) {}
void Host_ShowVideoConfig(void*, const std::string&, const std::string&) {}
#if HAVE_X11
void X11_MainLoop()
static void X11_MainLoop()
{
bool fullscreen = SConfig::GetInstance().m_LocalCoreStartupParameter.bFullscreen;
while (!Core::IsRunning())
@ -271,7 +269,7 @@ void X11_MainLoop()
#endif
#if HAVE_WAYLAND
void Wayland_MainLoop()
static void Wayland_MainLoop()
{
// Wait for display to be initialized
while (!GLWin.wl_display)