diff --git a/Common/UI/UIScreen.h b/Common/UI/UIScreen.h index 4c1fae115e..c1bf67f2ac 100644 --- a/Common/UI/UIScreen.h +++ b/Common/UI/UIScreen.h @@ -49,7 +49,7 @@ public: virtual bool AllowKeyboardNavigation() const { return true; } // Process keyboard shortcuts even outside the game. - virtual InputMode PassInputToMapper() const { return InputMode::Keyboard; } + virtual InputMode PassInputToMapper() const override { return InputMode::Keyboard; } protected: virtual void CreateViews() = 0; diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp index 6130af10fd..7dbfc29608 100644 --- a/Core/HLE/HLE.cpp +++ b/Core/HLE/HLE.cpp @@ -1186,6 +1186,10 @@ void hleDoLogInternal(Log t, LogLevel level, u64 res, const char *file, int line // Void. Return value should not be shown. (the first %s is the "K " string, see below). fmt = "%s%s(%s)%s"; break; + case '?': + // Unknown return format. Should we log extra? + fmt = "%s%s(%s)%s"; + break; default: _dbg_assert_msg_(false, "Invalid return format: %c", retmask); fmt = "%s%08llx=%s(%s)%s"; diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp index 85df5f83ef..ac42b62e40 100644 --- a/Core/HLE/sceKernel.cpp +++ b/Core/HLE/sceKernel.cpp @@ -1001,7 +1001,7 @@ void Register_ExceptionManagerForKernel() // Seen in some homebrew const HLEFunction UtilsForKernel[] = { - {0xC2DF770E, WrapI_UI, "sceKernelIcacheInvalidateRange", '?', "", HLE_KERNEL_SYSCALL }, + {0xC2DF770E, WrapI_UI, "sceKernelIcacheInvalidateRange", 'i', "xi", HLE_KERNEL_SYSCALL }, {0X78934841, nullptr, "sceKernelGzipDecompress", '?', "" }, {0XE8DB3CE6, nullptr, "sceKernelDeflateDecompress", '?', "" }, {0X840259F1, nullptr, "sceKernelUtilsSha1Digest", '?', "" }, @@ -1017,7 +1017,7 @@ const HLEFunction UtilsForKernel[] = { {0X34B9FA9E, &WrapI_UI, "sceKernelDcacheWritebackInvalidateRange", '?', "" }, {0XB435DEC5, &WrapI_V, "sceKernelDcacheWritebackInvalidateAll", '?', "" }, {0XBFA98062, &WrapI_UI, "sceKernelDcacheInvalidateRange", '?', "" }, - {0X920F104A, &WrapU_V, "sceKernelIcacheInvalidateAll", '?', "" }, + {0X920F104A, &WrapU_V, "sceKernelIcacheInvalidateAll", 'i', "xi" }, {0XE860E75E, nullptr, "sceKernelUtilsMt19937Init", '?', "" }, {0X06FB8A63, nullptr, "sceKernelUtilsMt19937UInt", '?', "" }, };