Interpreter: Remove unnecessary includes from Interpreter.h

Previously the JIT code relied on indirect inclusion from this header,
this gets rid of that.

Source/Core/Core/PowerPC/CachedInterpreter.cpp

@@ -2,9 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
-
+#include "Core/ConfigManager.h"
+#include "Core/HLE/HLE.h"
 #include "Core/PowerPC/CachedInterpreter.h"
+#include "Core/PowerPC/PowerPC.h"
 
 void CachedInterpreter::Init()
 {

Source/Core/Core/PowerPC/CachedInterpreter.h

@@ -6,7 +6,7 @@
 
 #include <map>
 
-#include "Core/PowerPC/CPUCoreBase.h"
+#include "Common/CommonTypes.h"
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 

Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp

@@ -10,9 +10,14 @@
 #include "Common/CommonTypes.h"
 #include "Common/GekkoDisassembler.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
+#include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
 #include "Core/Host.h"
 #include "Core/Debugger/Debugger_SymbolMap.h"
-#include "Core/IPC_HLE/WII_IPC_HLE.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HW/CPU.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/PPCTables.h"
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 

Source/Core/Core/PowerPC/Interpreter/Interpreter.h

@@ -4,16 +4,9 @@
 
 #pragma once
 
-#include "Common/Atomic.h"
+#include "Common/CommonTypes.h"
-#include "Core/ConfigManager.h"
-#include "Core/Core.h"
-#include "Core/CoreTiming.h"
-#include "Core/HLE/HLE.h"
-#include "Core/HW/CPU.h"
-#include "Core/HW/Memmap.h"
 #include "Core/PowerPC/CPUCoreBase.h"
 #include "Core/PowerPC/Gekko.h"
-#include "Core/PowerPC/PowerPC.h"
 
 class Interpreter : public CPUCoreBase
 {

Source/Core/Core/PowerPC/Interpreter/Interpreter_Branch.cpp

@@ -4,7 +4,10 @@
 
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
-#include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
+#include "Core/HLE/HLE.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 
 void Interpreter::bx(UGeckoInstruction _inst)
@@ -16,13 +19,6 @@ void Interpreter::bx(UGeckoInstruction _inst)
 		NPC = SignExt26(_inst.LI << 2);
 	else
 		NPC = PC+SignExt26(_inst.LI << 2);
-/*
-#ifdef _DEBUG
-	if (_inst.LK)
-	{
-		PPCAnalyst::LogFunctionCall(NPC);
-	}
-#endif*/
 
 	m_EndBlock = true;
 

Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h

@@ -7,10 +7,11 @@
 #include <cmath>
 #include <limits>
 
+#include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 #include "Common/MathUtil.h"
 #include "Core/PowerPC/Gekko.h"
-#include "Core/PowerPC/Interpreter/Interpreter.h"
+#include "Core/PowerPC/PowerPC.h"
 
 const u64 PPC_NAN_U64 = 0x7ff8000000000000ull;
 const double PPC_NAN  = *(double* const)&PPC_NAN_U64;

Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp

@@ -5,7 +5,9 @@
 #include <cmath>
 #include <limits>
 
+#include "Common/CommonTypes.h"
 #include "Common/MathUtil.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
 

Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp

@@ -2,6 +2,11 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/CommonFuncs.h"
+#include "Common/CommonTypes.h"
+#include "Common/MsgHandler.h"
+#include "Common/Logging/Log.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 
 void Interpreter::Helper_UpdateCR0(u32 value)

Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp

@@ -5,8 +5,10 @@
 #include "Common/CommonTypes.h"
 #include "Common/MathUtil.h"
 
+#include "Core/ConfigManager.h"
 #include "Core/HW/DSP.h"
 #include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
 

Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp

@@ -2,9 +2,14 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include <tuple>
+#include <type_traits>
+#include <utility>
+
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/MathUtil.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
 

Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp

@@ -3,8 +3,10 @@
 // Refer to the license.txt file included.
 
 #include <cmath>
+
 #include "Common/CommonTypes.h"
 #include "Common/MathUtil.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
 

Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp

@@ -4,10 +4,11 @@
 
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
-#include "Common/CPUDetect.h"
 #include "Common/FPURoundMode.h"
+#include "Common/Logging/Log.h"
 #include "Core/HW/GPFifo.h"
 #include "Core/HW/SystemTimers.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
 

Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp

@@ -2,6 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/MsgHandler.h"
 #include "Core/PowerPC/Gekko.h"
 #include "Core/PowerPC/PPCTables.h"
 #include "Core/PowerPC/Interpreter/Interpreter.h"

Source/Core/Core/PowerPC/JitArm64/Jit.cpp

@@ -2,11 +2,17 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "Common/Arm64Emitter.h"
+#include <cstdio>
-#include "Common/Common.h"
-#include "Common/PerformanceCounter.h"
 
+#include "Common/Arm64Emitter.h"
+#include "Common/CommonTypes.h"
+#include "Common/PerformanceCounter.h"
+#include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
+
+#include "Core/ConfigManager.h"
 #include "Core/PatchEngine.h"
+#include "Core/HLE/HLE.h"
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/PowerPC/JitInterface.h"
 #include "Core/PowerPC/Profiler.h"

Source/Core/Core/PowerPC/JitCommon/JitBase.cpp

@@ -7,8 +7,10 @@
 
 #include "disasm.h"
 
+#include "Common/CommonTypes.h"
 #include "Common/GekkoDisassembler.h"
 #include "Common/StringUtil.h"
+#include "Core/ConfigManager.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 
 JitBase *jit;

Source/Core/Core/PowerPC/JitCommon/JitBase.h

@@ -14,6 +14,7 @@
 #include "Common/x64Analyzer.h"
 #include "Common/x64Emitter.h"
 
+#include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
 #include "Core/MachineContext.h"

Source/Core/Core/PowerPC/JitCommon/JitCache.cpp

@@ -10,11 +10,13 @@
 // locating performance issues.
 
 #include <cstring>
-#include "disasm.h"
+#include <map>
+#include <utility>
 
 #include "Common/CommonTypes.h"
 #include "Common/JitRegister.h"
-#include "Common/MemoryUtil.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
 #include "Core/PowerPC/JitInterface.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 

Source/Core/Core/PowerPC/PPCAnalyst.cpp

@@ -6,12 +6,10 @@
 #include <queue>
 #include <string>
 
+#include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"
-
 #include "Core/ConfigManager.h"
-#include "Core/GeckoCode.h"
+#include "Core/PowerPC/PowerPC.h"
-#include "Core/HW/Memmap.h"
-#include "Core/PowerPC/JitInterface.h"
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/PPCTables.h"

Source/Core/Core/PowerPC/PPCSymbolDB.cpp

@@ -9,9 +9,8 @@
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
-
+#include "Common/Logging/Log.h"
-#include "Core/Host.h"
+#include "Core/ConfigManager.h"
-#include "Core/HW/Memmap.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/PPCSymbolDB.h"

Source/Core/Core/PowerPC/PowerPC.cpp

@@ -2,20 +2,18 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/Assert.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Event.h"
 #include "Common/FPURoundMode.h"
 #include "Common/MathUtil.h"
+#include "Common/Logging/Log.h"
 
-#include "Core/Core.h"
+#include "Core/ConfigManager.h"
-#include "Core/CoreTiming.h"
 #include "Core/Host.h"
-#include "Core/HW/CPU.h"
-#include "Core/HW/EXI.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/SystemTimers.h"
-
 #include "Core/PowerPC/CPUCoreBase.h"
 #include "Core/PowerPC/JitInterface.h"
 #include "Core/PowerPC/PowerPC.h"

Source/Core/Core/PowerPC/SignatureDB.cpp

@@ -6,9 +6,8 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
-
+#include "Common/Logging/Log.h"
-#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
-
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/SignatureDB.h"