diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 8fe48c992e..eca343be85 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -123,10 +123,6 @@ void Host_RequestRenderWindowSize(int width, int height) { } -void Host_SetStartupDebuggingParameters() -{ -} - bool Host_UINeedsControllerState() { return true; diff --git a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp index 9ff81b6924..d5cb376766 100644 --- a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp +++ b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp @@ -103,7 +103,7 @@ void CachedInterpreter::ExecuteOneBlock() break; default: - ERROR_LOG(POWERPC, "Unknown CachedInterpreter Instruction: %d", code->type); + ERROR_LOG(POWERPC, "Unknown CachedInterpreter Instruction: %d", static_cast(code->type)); break; } } diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/PowerPC/PPCAnalyst.cpp index 17b64462b5..b59b54d26b 100644 --- a/Source/Core/Core/PowerPC/PPCAnalyst.cpp +++ b/Source/Core/Core/PowerPC/PPCAnalyst.cpp @@ -644,28 +644,11 @@ void PPCAnalyzer::SetInstructionStats(CodeBlock* block, CodeOp* code, const Gekk if (opinfo->flags & FL_IN_FLOAT_S) code->fregsIn[code->inst.FS] = true; - switch (opinfo->type) + // For analysis purposes, we can assume that blr eats opinfo->flags. + if (opinfo->type == OpType::Branch && code->inst.hex == 0x4e800020) { - case OpType::Integer: - case OpType::Load: - case OpType::Store: - case OpType::LoadFP: - case OpType::StoreFP: - break; - case OpType::SingleFP: - case OpType::DoubleFP: - break; - case OpType::Branch: - if (code->inst.hex == 0x4e800020) - { - // For analysis purposes, we can assume that blr eats opinfo->flags. - code->outputCR0 = true; - code->outputCR1 = true; - } - break; - case OpType::System: - case OpType::SystemFP: - break; + code->outputCR0 = true; + code->outputCR1 = true; } } diff --git a/Source/Core/DolphinQt2/Translation.cpp b/Source/Core/DolphinQt2/Translation.cpp index 191a721c3b..1fd00e0b2e 100644 --- a/Source/Core/DolphinQt2/Translation.cpp +++ b/Source/Core/DolphinQt2/Translation.cpp @@ -217,7 +217,7 @@ private: MoFile m_mo_file; }; -QStringList FindPossibleLanguageCodes(const QString& exact_language_code) +static QStringList FindPossibleLanguageCodes(const QString& exact_language_code) { QStringList possible_language_codes; possible_language_codes << exact_language_code; diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index a67f303c10..d5259aa651 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -76,8 +76,8 @@ static bool s_efbCacheIsCleared = false; static std::vector s_efbCache[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; // 2 for PeekZ and PeekColor -void APIENTRY ErrorCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, - const char* message, const void* userParam) +static void APIENTRY ErrorCallback(GLenum source, GLenum type, GLuint id, GLenum severity, + GLsizei length, const char* message, const void* userParam) { const char* s_source; const char* s_type; diff --git a/Source/DSPTool/StubHost.cpp b/Source/DSPTool/StubHost.cpp index 502e6e0c7e..f70466f882 100644 --- a/Source/DSPTool/StubHost.cpp +++ b/Source/DSPTool/StubHost.cpp @@ -34,9 +34,6 @@ void Host_UpdateMainFrame() void Host_RequestRenderWindowSize(int, int) { } -void Host_SetStartupDebuggingParameters() -{ -} bool Host_UINeedsControllerState() { return false; diff --git a/Source/UnitTests/StubHost.cpp b/Source/UnitTests/StubHost.cpp index 860992bffd..b20750110a 100644 --- a/Source/UnitTests/StubHost.cpp +++ b/Source/UnitTests/StubHost.cpp @@ -36,9 +36,6 @@ void Host_UpdateMainFrame() void Host_RequestRenderWindowSize(int, int) { } -void Host_SetStartupDebuggingParameters() -{ -} bool Host_UINeedsControllerState() { return false;