Merge pull request #6662 from Tilka/fix_warnings

Fix some warnings
This commit is contained in:
Mat M 2018-04-17 10:17:01 -04:00 committed by GitHub
commit 8bb0e0ee96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 35 deletions

View File

@ -123,10 +123,6 @@ void Host_RequestRenderWindowSize(int width, int height)
{
}
void Host_SetStartupDebuggingParameters()
{
}
bool Host_UINeedsControllerState()
{
return true;

View File

@ -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<int>(code->type));
break;
}
}

View File

@ -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;
}
}

View File

@ -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;

View File

@ -76,8 +76,8 @@ static bool s_efbCacheIsCleared = false;
static std::vector<u32>
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;

View File

@ -34,9 +34,6 @@ void Host_UpdateMainFrame()
void Host_RequestRenderWindowSize(int, int)
{
}
void Host_SetStartupDebuggingParameters()
{
}
bool Host_UINeedsControllerState()
{
return false;

View File

@ -36,9 +36,6 @@ void Host_UpdateMainFrame()
void Host_RequestRenderWindowSize(int, int)
{
}
void Host_SetStartupDebuggingParameters()
{
}
bool Host_UINeedsControllerState()
{
return false;