Clean out unnecessary includes from the DSP JIT.

dolphin-emu · Oct 19, 2013 · 6adf3e3 · 6adf3e3
1 parent af1b5fe
commit 6adf3e3
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 34 deletions.
diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.cpp b/Source/Core/Core/Src/DSP/DSPEmitter.cpp
@@ -10,8 +10,6 @@
 #include "DSPHost.h"
 #include "DSPInterpreter.h"
 #include "DSPAnalyzer.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
 
 #define MAX_BLOCK_SIZE 250
 #define DSP_IDLE_SKIP_CYCLES 0x1000

diff --git a/Source/Core/Core/Src/DSP/DSPEmitter.h b/Source/Core/Core/Src/DSP/DSPEmitter.h
@@ -8,6 +8,7 @@
 #include <list>
 
 #include "DSPCommon.h"
+#include "x64ABI.h"
 #include "x64Emitter.h"
 #include "Jit/DSPJitRegCache.h"
 

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitArithmetic.cpp
@@ -4,12 +4,11 @@
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
+#include "../DSPAnalyzer.h"
+#include "../DSPEmitter.h"
 #include "../DSPIntCCUtil.h"
 #include "../DSPIntUtil.h"
-#include "../DSPEmitter.h"
-#include "../DSPAnalyzer.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+
 using namespace Gen;
 
 // CLR $acR

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitBranch.cpp
@@ -2,12 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../DSPMemoryMap.h"
+#include "../DSPAnalyzer.h"
 #include "../DSPEmitter.h"
+#include "../DSPMemoryMap.h"
 #include "../DSPStacks.h"
-#include "../DSPAnalyzer.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
 
 using namespace Gen;
 

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitCCUtil.cpp
@@ -4,13 +4,9 @@
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
-
-// HELPER FUNCTIONS
-
-#include "../DSPIntUtil.h"
 #include "../DSPEmitter.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "../DSPIntUtil.h" // Helper functions
+
 using namespace Gen;
 
 // In: RAX: s64 _Value

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
@@ -2,10 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../DSPMemoryMap.h"
 #include "../DSPEmitter.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "../DSPMemoryMap.h"
 
 using namespace Gen;
 

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitLoadStore.cpp
@@ -4,11 +4,10 @@
 
 // Additional copyrights go to Duddie and Tratax (c) 2004
 
+#include "../DSPEmitter.h"
 #include "../DSPIntCCUtil.h"
 #include "../DSPIntUtil.h"
-#include "../DSPEmitter.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+
 using namespace Gen;
 
 // SRS @M, $(0x18+S)

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
@@ -2,10 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../DSPIntUtil.h"
 #include "../DSPEmitter.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "../DSPIntUtil.h"
+
 using namespace Gen;
 
 // MRR $D, $S

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitMultiplier.cpp
@@ -7,11 +7,10 @@
 
 // Multiplier and product register control
 
-#include "../DSPIntUtil.h"
-#include "../DSPEmitter.h"
 #include "../DSPAnalyzer.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "../DSPEmitter.h"
+#include "../DSPIntUtil.h"
+
 using namespace Gen;
 
 // Returns s64 in RAX

diff --git a/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp b/Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
@@ -2,12 +2,10 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "../DSPMemoryMap.h"
-#include "../DSPHWInterface.h"
-#include "../DSPEmitter.h"
 #include "DSPJitUtil.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
+#include "../DSPEmitter.h"
+#include "../DSPHWInterface.h"
+#include "../DSPMemoryMap.h"
 
 using namespace Gen;