From 74c19504953505ccc36a100657de3a106b8be238 Mon Sep 17 00:00:00 2001 From: nakeee Date: Thu, 18 Dec 2008 11:51:11 +0000 Subject: [PATCH] Adjusted to fit some gcc weirdness git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1584 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/PowerPC/PPCTables.cpp | 25 ++++++++++++---------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/PPCTables.cpp b/Source/Core/Core/Src/PowerPC/PPCTables.cpp index fb4eb01d56..08e9b53da2 100644 --- a/Source/Core/Core/Src/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/Src/PowerPC/PPCTables.cpp @@ -16,6 +16,7 @@ // http://code.google.com/p/dolphin-emu/ #include +#include #include "Common.h" #include "PPCTables.h" @@ -41,6 +42,16 @@ struct GekkoOPTemplate int runCount; }; +struct inf +{ + const char *name; + int count; + bool operator < (const inf &o) const + { + return count > o.count; + } +}; + static GekkoOPInfo *m_infoTable[64]; static GekkoOPInfo *m_infoTable4[1024]; static GekkoOPInfo *m_infoTable19[1024]; @@ -656,7 +667,7 @@ namespace { } #endif -void PPCTables::CompileInstruction(UGeckoInstruction _inst) +void CompileInstruction(UGeckoInstruction _inst) { dynaOpTable[_inst.OPCD](_inst); GekkoOPInfo *info = GetOpInfo(_inst); @@ -688,15 +699,7 @@ void CountInstruction(UGeckoInstruction _inst) void PrintInstructionRunCounts() { - struct inf - { - const char *name; - int count; - bool operator < (const inf &o) const - { - return count > o.count; - } - }; + std::vector temp; for (int i = 0; i < m_numInstructions; i++) { @@ -742,4 +745,4 @@ void LogCompiledInstructions() time++; } -} // namespace \ No newline at end of file +} // namespace