Merge pull request #3502 from lioncash/jit

Jit: Get rid of indirect includes

Source/Core/Core/PowerPC/CachedInterpreter.cpp

@@ -3,10 +3,14 @@
 // Refer to the license.txt file included.
 
 #include "Common/CommonTypes.h"
+#include "Common/Logging/Log.h"
 #include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
 #include "Core/HLE/HLE.h"
 #include "Core/PowerPC/CachedInterpreter.h"
+#include "Core/PowerPC/Gekko.h"
 #include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
 
 void CachedInterpreter::Init()
 {

Source/Core/Core/PowerPC/CachedInterpreter.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <map>
+#include <vector>
 
 #include "Common/CommonTypes.h"
 #include "Core/PowerPC/PPCAnalyst.h"

Source/Core/Core/PowerPC/Jit64/Jit.cpp

@@ -11,16 +11,23 @@
 #endif
 
 #include "Common/CommonTypes.h"
+#include "Common/MemoryUtil.h"
 #include "Common/StringUtil.h"
+#include "Common/x64ABI.h"
+#include "Common/Logging/Log.h"
+#include "Core/CoreTiming.h"
 #include "Core/PatchEngine.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HW/GPFifo.h"
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Profiler.h"
 #include "Core/PowerPC/Jit64/Jit.h"
 #include "Core/PowerPC/Jit64/Jit64_Tables.h"
 #include "Core/PowerPC/Jit64/JitAsm.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
 #if defined(_DEBUG) || defined(DEBUGFAST)
 #include "Common/GekkoDisassembler.h"
 #endif

Source/Core/Core/PowerPC/Jit64/Jit.h

@@ -18,21 +18,11 @@
 // ----------
 #pragma once
 
-#include "Common/x64ABI.h"
-#include "Common/x64Analyzer.h"
+#include "Common/CommonTypes.h"
 #include "Common/x64Emitter.h"
-
-#include "Core/ConfigManager.h"
-#include "Core/Core.h"
-#include "Core/CoreTiming.h"
-#include "Core/HW/GPFifo.h"
-#include "Core/HW/Memmap.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/PPCAnalyst.h"
-#include "Core/PowerPC/PPCTables.h"
 #include "Core/PowerPC/Jit64/JitAsm.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
-#include "Core/PowerPC/JitCommon/Jit_Util.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 #include "Core/PowerPC/JitCommon/JitCache.h"
 

Source/Core/Core/PowerPC/Jit64/JitAsm.cpp

@@ -2,9 +2,14 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/CommonTypes.h"
 #include "Common/JitRegister.h"
-#include "Common/MemoryUtil.h"
-
+#include "Common/x64ABI.h"
+#include "Common/x64Emitter.h"
+#include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/Memmap.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Jit64/Jit.h"
 #include "Core/PowerPC/Jit64/JitAsm.h"
 

Source/Core/Core/PowerPC/Jit64/JitAsm.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "Common/CommonTypes.h"
 #include "Core/PowerPC/Jit64Common/Jit64AsmCommon.h"
 
 // In Dolphin, we don't use inline assembly. Instead, we generate all machine-near

Source/Core/Core/PowerPC/Jit64/JitRegCache.cpp

@@ -2,11 +2,20 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include <algorithm>
 #include <cinttypes>
+#include <cmath>
+#include <limits>
 
+#include "Common/Assert.h"
+#include "Common/BitSet.h"
+#include "Common/CommonTypes.h"
+#include "Common/MsgHandler.h"
+#include "Common/x64Emitter.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Jit64/Jit.h"
-#include "Core/PowerPC/Jit64/JitAsm.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
 
 using namespace Gen;
 using namespace PowerPC;

Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp

@@ -2,10 +2,14 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/Assert.h"
 #include "Common/CommonTypes.h"
-
+#include "Common/x64Emitter.h"
+#include "Core/ConfigManager.h"
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/Jit64/Jit.h"
-#include "Core/PowerPC/Jit64/JitAsm.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
 
 // The branches are known good, or at least reasonably good.

Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp

@@ -2,9 +2,17 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include <algorithm>
+#include <vector>
+
+#include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
-
+#include "Common/x64Emitter.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/Jit64/Jit.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
 

Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp

@@ -5,10 +5,16 @@
 #include <limits>
 #include <vector>
 
+#include "Common/Assert.h"
+#include "Common/CommonTypes.h"
 #include "Common/MathUtil.h"
+#include "Common/x64Emitter.h"
+#include "Core/ConfigManager.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/Jit64/Jit.h"
-#include "Core/PowerPC/Jit64/JitAsm.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
 
 using namespace Gen;
 

Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp

@@ -5,13 +5,20 @@
 // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
 // Should give a very noticable speed boost to paired single heavy code.
 
+#include "Common/BitSet.h"
 #include "Common/CommonTypes.h"
-
+#include "Common/MsgHandler.h"
+#include "Common/x64ABI.h"
+#include "Common/x64Emitter.h"
+#include "Core/ConfigManager.h"
+#include "Core/CoreTiming.h"
 #include "Core/HW/DSP.h"
+#include "Core/HW/Memmap.h"
 #include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Jit64/Jit.h"
-#include "Core/PowerPC/Jit64/JitAsm.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
 
 using namespace Gen;
 

Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp

@@ -2,12 +2,14 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/BitSet.h"
 #include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
-
+#include "Common/x64Emitter.h"
+#include "Core/ConfigManager.h"
 #include "Core/PowerPC/Jit64/Jit.h"
-#include "Core/PowerPC/Jit64/JitAsm.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
 
 using namespace Gen;
 

Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp

@@ -5,12 +5,15 @@
 // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
 // Should give a very noticeable speed boost to paired single heavy code.
 
+#include "Common/BitSet.h"
 #include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
-
+#include "Common/x64Emitter.h"
+#include "Core/ConfigManager.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Jit64/Jit.h"
-#include "Core/PowerPC/Jit64/JitAsm.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
 #include "Core/PowerPC/JitCommon/JitAsmCommon.h"
 
 using namespace Gen;

Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp

@@ -4,7 +4,9 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
-
+#include "Common/MsgHandler.h"
+#include "Common/x64Emitter.h"
+#include "Core/ConfigManager.h"
 #include "Core/PowerPC/Jit64/Jit.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
 

Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp

@@ -2,12 +2,15 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/BitSet.h"
 #include "Common/CommonTypes.h"
-
+#include "Common/x64Emitter.h"
+#include "Core/CoreTiming.h"
 #include "Core/HW/ProcessorInterface.h"
-#include "Core/HW/SystemTimers.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Jit64/Jit.h"
 #include "Core/PowerPC/Jit64/JitRegCache.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
 
 using namespace Gen;
 

Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp

@@ -2,12 +2,16 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
+#include "Common/Assert.h"
+#include "Common/CommonTypes.h"
 #include "Common/JitRegister.h"
 #include "Common/MathUtil.h"
 #include "Common/x64ABI.h"
 #include "Common/x64Emitter.h"
-
+#include "Core/HW/GPFifo.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Jit64Common/Jit64AsmCommon.h"
+#include "Core/PowerPC/JitCommon/Jit_Util.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 
 #define QUANTIZED_REGS_TO_SAVE \

Source/Core/Core/PowerPC/Jit64IL/IR_X86.cpp

@@ -25,12 +25,19 @@ The register allocation is linear scan allocation.
 #endif
 
 #include <algorithm>
+#include <vector>
 
 #include "Common/BitSet.h"
+#include "Common/CommonTypes.h"
 #include "Common/CPUDetect.h"
 #include "Common/MathUtil.h"
+#include "Common/MsgHandler.h"
+#include "Common/x64ABI.h"
+#include "Common/x64Emitter.h"
+#include "Core/CoreTiming.h"
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Jit64IL/JitIL.h"
 
 using namespace IREmitter;

Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp

@@ -7,13 +7,17 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <vector>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/Intrinsics.h"
 #include "Common/StringUtil.h"
+#include "Common/x64ABI.h"
+#include "Common/Logging/Log.h"
 #include "Core/PatchEngine.h"
 #include "Core/HLE/HLE.h"
+#include "Core/PowerPC/PowerPC.h"
 #include "Core/PowerPC/Profiler.h"
 #include "Core/PowerPC/Jit64IL/JitIL.h"
 #include "Core/PowerPC/Jit64IL/JitIL_Tables.h"

Source/Core/Core/PowerPC/Jit64IL/JitIL.h

@@ -16,23 +16,13 @@
 
 #pragma once
 
-#include "Common/x64ABI.h"
-#include "Common/x64Analyzer.h"
+#include "Common/CommonTypes.h"
 #include "Common/x64Emitter.h"
-
-#include "Core/ConfigManager.h"
-#include "Core/Core.h"
-#include "Core/CoreTiming.h"
-#include "Core/HW/GPFifo.h"
-#include "Core/HW/Memmap.h"
-#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/Gekko.h"
 #include "Core/PowerPC/PPCAnalyst.h"
-#include "Core/PowerPC/PPCTables.h"
 #include "Core/PowerPC/Jit64/JitAsm.h"
-#include "Core/PowerPC/JitCommon/Jit_Util.h"
 #include "Core/PowerPC/JitCommon/JitBase.h"
 #include "Core/PowerPC/JitCommon/JitCache.h"
-#include "Core/PowerPC/JitILCommon/IR.h"
 #include "Core/PowerPC/JitILCommon/JitILBase.h"
 
 class JitIL : public JitILBase

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

@@ -11,8 +11,11 @@
 #include "Common/Logging/Log.h"
 
 #include "Core/ConfigManager.h"
+#include "Core/Core.h"
 #include "Core/PatchEngine.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HW/GPFifo.h"
+#include "Core/HW/Memmap.h"
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/PowerPC/JitInterface.h"
 #include "Core/PowerPC/Profiler.h"