From 6e54ce5551739d6daa3ef59d52aebdc1f4006b92 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Fri, 15 Mar 2013 00:43:35 -0700 Subject: [PATCH] Fix some minor warnings. --- Common/ArmThunk.cpp | 2 ++ Core/HLE/sceDisplay.cpp | 2 +- Core/HLE/sceIo.cpp | 2 +- Core/HLE/sceKernelThread.cpp | 2 +- android/jni/NativeApp.cpp | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Common/ArmThunk.cpp b/Common/ArmThunk.cpp index 98cee1683d..207676dca5 100644 --- a/Common/ArmThunk.cpp +++ b/Common/ArmThunk.cpp @@ -52,4 +52,6 @@ void ThunkManager::Shutdown() void *ThunkManager::ProtectFunction(void *function, int num_params) { + _dbg_assert_msg_(JIT, false, "Arm ThunkManager not implemented? Will crash."); + return NULL; } diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index 7b415d1e26..98ffbcb991 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -620,7 +620,7 @@ u32 sceDisplayIsForeground() { } u32 sceDisplayGetMode(u32 modeAddr, u32 widthAddr, u32 heightAddr) { - DEBUG_LOG(HLE,"sceDisplayGetMode()", modeAddr, widthAddr, heightAddr); + DEBUG_LOG(HLE,"sceDisplayGetMode(%08x, %08x, %08x)", modeAddr, widthAddr, heightAddr); if (Memory::IsValidAddress(modeAddr)) Memory::Write_U32(mode, modeAddr); if (Memory::IsValidAddress(widthAddr)) diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index 3c313e879b..cfb1401337 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -652,7 +652,7 @@ s64 sceIoLseek(int id, s64 offset, int whence) { u32 sceIoLseek32(int id, int offset, int whence) { s32 result = (s32) __IoLseek(id, offset, whence); if (result >= 0) { - DEBUG_LOG(HLE, "%lli = sceIoLseek(%d, %x, %i)", result, id, offset, whence); + DEBUG_LOG(HLE, "%i = sceIoLseek(%d, %x, %i)", result, id, offset, whence); // Educated guess at timing. return hleDelayResult(result, "io seek", 100); } else { diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 94a726584e..63a5bec80a 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -2025,7 +2025,7 @@ static void __KernelSleepThread(bool doCallbacks) { DEBUG_LOG(HLE, "sceKernelSleepThread() - wakeupCount decremented to %i", thread->nt.wakeupCount); RETURN(0); } else { - VERBOSE_LOG(HLE, "sceKernelSleepThread()", thread->nt.wakeupCount); + VERBOSE_LOG(HLE, "sceKernelSleepThread()"); RETURN(0); __KernelWaitCurThread(WAITTYPE_SLEEP, 0, 0, 0, doCallbacks, "thread slept"); } diff --git a/android/jni/NativeApp.cpp b/android/jni/NativeApp.cpp index 74d8e357ce..073102fc7b 100644 --- a/android/jni/NativeApp.cpp +++ b/android/jni/NativeApp.cpp @@ -100,7 +100,7 @@ public: virtual void SetDebugMode(bool mode) { } - virtual bool InitGL(std::string *error_message) {} + virtual bool InitGL(std::string *error_message) { return true; } virtual void BeginFrame() {} virtual void ShutdownGL() {}