Remove some more unnecessary includes, as well as organize a little m…

…ore.
dolphin-emu · Oct 19, 2013 · 22cdc0f · 22cdc0f
1 parent 97cd42f
commit 22cdc0f
Show file tree

Hide file tree

Showing 25 changed files with 40 additions and 134 deletions.
diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
@@ -2,18 +2,14 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../../HW/Memmap.h"
-#include "../../HW/CPU.h"
-#include "../../Host.h"
-#include "../PPCTables.h"
+
 #include "Interpreter.h"
-#include "../../Debugger/Debugger_SymbolMap.h"
-#include "../../CoreTiming.h"
-#include "../../ConfigManager.h"
 #include "PowerPCDisasm.h"
+#include "../PPCTables.h"
+#include "../../Debugger/Debugger_SymbolMap.h"
+#include "../../Host.h"
 #include "../../IPC_HLE/WII_IPC_HLE.h"
-#include "Atomic.h"
-#include "HLE/HLE.h"
+
 
 #ifdef USE_GDBSTUB
 #include "../GDBStub.h"

diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.h
@@ -5,9 +5,16 @@
 #ifndef _INTERPRETER_H
 #define _INTERPRETER_H
 
+#include "Atomic.h"
 #include "../Gekko.h"
 #include "../PowerPC.h"
 #include "../CPUCoreBase.h"
+#include "../../Core.h"
+#include "../../CoreTiming.h"
+#include "../../ConfigManager.h"
+#include "../../HLE/HLE.h"
+#include "../../HW/Memmap.h"
+#include "../../HW/CPU.h"
 
 class Interpreter : public CPUCoreBase
 {

diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Branch.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Branch.cpp
@@ -3,10 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "Interpreter.h"
-#include "../../HW/CPU.h"
-#include "../../HLE/HLE.h"
 #include "../PPCAnalyst.h"
-#include "Atomic.h"
 
 void Interpreter::bx(UGeckoInstruction _inst)
 {

diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FPUtils.h b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FPUtils.h
@@ -5,7 +5,6 @@
 #ifndef _INTERPRETER_FPUTILS_H
 #define _INTERPRETER_FPUTILS_H
 
-#include "../../Core.h"
 #include "Interpreter.h"
 #include "MathUtil.h"
 

diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
@@ -17,10 +17,9 @@
 #undef _interlockedbittestandreset64
 #endif
 
-#include "../../Core.h"
 #include "Interpreter.h"
-#include "MathUtil.h"
 #include "Interpreter_FPUtils.h"
+#include "MathUtil.h"
 #include "../LUT_frsqrtex.h"
 
 using namespace MathUtil;

diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Integer.cpp
@@ -3,8 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "Interpreter.h"
-#include "../../Core.h"
-#include "Atomic.h"
 
 void Interpreter::Helper_UpdateCR0(u32 _uValue)
 {

diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStore.cpp
@@ -3,17 +3,13 @@
 // Refer to the license.txt file included.
 
 #include "Common.h"
-#include "Atomic.h"
 #include "MathUtil.h"
 
-#include "../../HW/Memmap.h"
-
 #include "Interpreter.h"
-#include "../../Core.h"
+#include "Interpreter_FPUtils.h"
 
 #include "../JitInterface.h"
 
-#include "Interpreter_FPUtils.h"
 
 bool Interpreter::g_bReserve;
 u32  Interpreter::g_reserveAddr;

diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
@@ -3,8 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "Interpreter.h"
-#include "../../HW/Memmap.h"
-
 #include "Interpreter_FPUtils.h"
 
 // dequantize table

diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Paired.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_Paired.cpp
@@ -6,8 +6,6 @@
 #include "Common.h"
 #include "MathUtil.h"
 #include "Interpreter.h"
-#include "../../HW/Memmap.h"
-
 #include "Interpreter_FPUtils.h"
 
 using namespace MathUtil;

diff --git a/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
@@ -15,16 +15,11 @@
 #endif
 
 #include "CPUDetect.h"
-#include "Atomic.h"
-#include "../../CoreTiming.h"
-#include "../../HW/Memmap.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/SystemTimers.h"
-#include "../../Core.h"
 #include "Interpreter.h"
-#include "FPURoundMode.h"
-
 #include "Interpreter_FPUtils.h"
+#include "FPURoundMode.h"
+#include "../../HW/GPFifo.h"
+#include "../../HW/SystemTimers.h"
 
 /*
 

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
@@ -10,19 +10,9 @@
 #endif
 
 #include "Common.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
 #include "../../HLE/HLE.h"
-#include "../../Core.h"
 #include "../../PatchEngine.h"
-#include "../../CoreTiming.h"
-#include "../../ConfigManager.h"
-#include "../PowerPC.h"
 #include "../Profiler.h"
-#include "../PPCTables.h"
-#include "../PPCAnalyst.h"
-#include "../../HW/Memmap.h"
-#include "../../HW/GPFifo.h"
 #include "Jit.h"
 #include "JitAsm.h"
 #include "JitRegCache.h"

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.h b/Source/Core/Core/Src/PowerPC/Jit64/Jit.h
@@ -19,15 +19,23 @@
 #ifndef _JIT64_H
 #define _JIT64_H
 
-#include "../PPCAnalyst.h"
+#include "../JitCommon/JitBackpatch.h"
+#include "../JitCommon/JitBase.h"
 #include "../JitCommon/JitCache.h"
 #include "../JitCommon/Jit_Util.h"
+#include "../PowerPC.h"
+#include "../PPCAnalyst.h"
+#include "../PPCTables.h"
+#include "../../Core.h"
+#include "../../CoreTiming.h"
+#include "../../ConfigManager.h"
+#include "../../HW/Memmap.h"
+#include "../../HW/GPFifo.h"
+#include "JitAsm.h"
 #include "JitRegCache.h"
-#include "x64Emitter.h"
+#include "x64ABI.h"
 #include "x64Analyzer.h"
-#include "../JitCommon/JitBackpatch.h"
-#include "../JitCommon/JitBase.h"
-#include "JitAsm.h"
+#include "x64Emitter.h"
 
 // Use these to control the instruction selection
 // #define INSTRUCTION_START Default(inst); return;

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitAsm.cpp
@@ -2,21 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "x64ABI.h"
-#include "x64Emitter.h"
-
-#include "../../HW/Memmap.h"
-
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
 #include "MemoryUtil.h"
 
-#include "x64ABI.h"
 #include "Jit.h"
-#include "../JitCommon/JitCache.h"
-
-#include "../../HW/GPFifo.h"
-#include "../../Core.h"
 #include "JitAsm.h"
 
 using namespace Gen;

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp b/Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
@@ -2,9 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "../PPCAnalyst.h"
 #include "Jit.h"
 #include "JitAsm.h"
 #include "JitRegCache.h"

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Branch.cpp
@@ -4,12 +4,6 @@
 
 #include "Common.h"
 
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-
 #include "Jit.h"
 #include "JitRegCache.h"
 #include "JitAsm.h"

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_FloatingPoint.cpp
@@ -4,11 +4,6 @@
 
 #include "Common.h"
 
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-
 #include "Jit.h"
 #include "JitRegCache.h"
 #include "CPUDetect.h"

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp
@@ -2,11 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../../Core.h" // include "Common.h", "CoreParameter.h", SCoreStartupParameter
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-
 #include "Jit.h"
 #include "JitRegCache.h"
 #include "JitAsm.h"

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
@@ -7,15 +7,6 @@
 
 #include "Common.h"
 
-#include "../PowerPC.h"
-#include "../../Core.h"
-#include "../../ConfigManager.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/Memmap.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
-
 #include "Jit.h"
 #include "JitAsm.h"
 #include "JitRegCache.h"

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
@@ -6,15 +6,7 @@
 // Should give a very noticeable speed boost to paired single heavy code.
 
 #include "Common.h"
-
-#include "../PowerPC.h"
-#include "../../Core.h" // include "Common.h", "CoreParameter.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/Memmap.h"
-#include "../PPCTables.h"
 #include "CPUDetect.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
 
 #include "Jit.h"
 #include "JitAsm.h"

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStorePaired.cpp
@@ -6,15 +6,7 @@
 // Should give a very noticeable speed boost to paired single heavy code.
 
 #include "Common.h"
-
-#include "../PowerPC.h"
-#include "../../Core.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/Memmap.h"
-#include "../PPCTables.h"
 #include "CPUDetect.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
 
 #include "Jit.h"
 #include "JitAsm.h"

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Paired.cpp
@@ -4,12 +4,6 @@
 
 #include "Common.h"
 
-#include "../../Core.h"
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-#include "../../HW/GPFifo.h"
-
 #include "Jit.h"
 #include "JitRegCache.h"
 

diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_SystemRegisters.cpp
@@ -4,17 +4,11 @@
 
 #include "Common.h"
 
-#include "../../Core.h"
-#include "../../CoreTiming.h"
 #include "../../HW/SystemTimers.h"
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "HW/ProcessorInterface.h"
 
 #include "Jit.h"
 #include "JitRegCache.h"
-#include "HW/ProcessorInterface.h"
 
 void Jit64::mtspr(UGeckoInstruction inst)
 {

diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
@@ -18,7 +18,6 @@
 #include "../PPCAnalyst.h"
 #include "../../HW/Memmap.h"
 #include "../../HW/GPFifo.h"
-#include "../JitCommon/JitCache.h"
 #include "JitIL.h"
 #include "JitILAsm.h"
 #include "JitIL_Tables.h"

diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.h
@@ -17,17 +17,17 @@
 #ifndef _JITIL_H
 #define _JITIL_H
 
+#include "JitILAsm.h"
+#include "x64Emitter.h"
+#include "x64ABI.h"
+#include "x64Analyzer.h"
 #include "../PPCAnalyst.h"
 #include "../JitCommon/JitBase.h"
 #include "../JitCommon/JitCache.h"
 #include "../JitCommon/JitBackpatch.h"
 #include "../JitCommon/Jit_Util.h"
-#include "x64Emitter.h"
-#include "x64Analyzer.h"
 #include "../JitILCommon/JitILBase.h"
 #include "../JitILCommon/IR.h"
-#include "../JitCommon/JitBase.h"
-#include "JitILAsm.h"
 
 // #define INSTRUCTION_START Default(inst); return;
 // #define INSTRUCTION_START PPCTables::CountInstruction(inst);

diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitILAsm.cpp
@@ -2,22 +2,16 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "x64ABI.h"
-#include "x64Emitter.h"
-
-#include "../../HW/Memmap.h"
+#include "JitIL.h"
+#include "JitILAsm.h"
 
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
 #include "MemoryUtil.h"
 #include "CPUDetect.h"
 
-#include "x64ABI.h"
-
-#include "../../HW/GPFifo.h"
+#include "../PowerPC.h"
 #include "../../Core.h"
-#include "JitIL.h"
-#include "JitILAsm.h"
+#include "../../CoreTiming.h"
+#include "../../HW/GPFifo.h"
 
 using namespace Gen;