Clean out includes from regular JitCommon.

dolphin-emu · Oct 19, 2013 · 80b4cb6 · 80b4cb6
1 parent 3360ec0
commit 80b4cb6
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 49 deletions.
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp
@@ -2,23 +2,12 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "x64ABI.h"
-#include "CPUDetect.h"
-#include "x64Emitter.h"
-
-#include "../../HW/Memmap.h"
+#include "JitAsmCommon.h"
+#include "JitBase.h"
 
-#include "../PowerPC.h"
-#include "../../CoreTiming.h"
+#include "CPUDetect.h"
 #include "MemoryUtil.h"
 
-#include "x64ABI.h"
-#include "../JitCommon/JitCache.h"
-
-#include "../../HW/GPFifo.h"
-#include "../../Core.h"
-#include "JitAsmCommon.h"
-#include "JitBase.h"
 
 #define QUANTIZED_REGS_TO_SAVE (ABI_ALL_CALLEE_SAVED & ~((1 << RAX) | (1 << RCX) | (1 << RDX) | \
                                                          (1 << XMM0) | (1 << XMM1)))
@@ -150,7 +139,8 @@ static void WriteDual32(u32 address)
 }
 
 // See comment in header for in/outs.
-void CommonAsmRoutines::GenQuantizedStores() {
+void CommonAsmRoutines::GenQuantizedStores()
+{
 	const u8* storePairedIllegal = AlignCode4();
 	UD2();
 	const u8* storePairedFloat = AlignCode4();
@@ -289,7 +279,8 @@ void CommonAsmRoutines::GenQuantizedStores() {
 }
 
 // See comment in header for in/outs.
-void CommonAsmRoutines::GenQuantizedSingleStores() {
+void CommonAsmRoutines::GenQuantizedSingleStores()
+{
 	const u8* storeSingleIllegal = AlignCode4();
 	UD2();
 
@@ -365,7 +356,8 @@ void CommonAsmRoutines::GenQuantizedSingleStores() {
 	singleStoreQuantized[7] = storeSingleS16;
 }
 
-void CommonAsmRoutines::GenQuantizedLoads() {
+void CommonAsmRoutines::GenQuantizedLoads()
+{
 	const u8* loadPairedIllegal = AlignCode4();
 	UD2();
 

diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.h
@@ -5,7 +5,7 @@
 #ifndef _JITASMCOMMON_H
 #define _JITASMCOMMON_H
 
-#include "../JitCommon/Jit_Util.h"
+#include "Jit_Util.h"
 
 class CommonAsmRoutinesBase  {
 public:

diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp
@@ -6,14 +6,8 @@
 
 #include "Common.h"
 #include "disasm.h"
-#include "../JitCommon/JitBase.h"
-#include "../JitCommon/JitBackpatch.h"
-
-#include "../../HW/Memmap.h"
-
-#include "x64Emitter.h"
-#include "x64ABI.h"
-#include "x64Analyzer.h"
+#include "JitBase.h"
+#include "JitBackpatch.h"
 
 #include "StringUtil.h"
 #ifdef _WIN32

diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/Src/PowerPC/JitCommon/JitBase.h
@@ -9,11 +9,21 @@
 //#define JIT_LOG_GPR     // Enables logging of the PPC general purpose regs
 //#define JIT_LOG_FPR     // Enables logging of the PPC floating point regs
 
-#include "../CPUCoreBase.h"
+#include "JitAsmCommon.h"
 #include "JitCache.h"
-#include "Jit_Util.h"  // for EmuCodeBlock
+#include "Jit_Util.h"      // for EmuCodeBlock
 #include "JitBackpatch.h"  // for EmuCodeBlock
-#include "JitAsmCommon.h"
+#include "x64ABI.h"
+#include "x64Analyzer.h"
+#include "x64Emitter.h"
+#include "../CPUCoreBase.h"
+#include "../PowerPC.h"
+#include "../PPCAnalyst.h"
+#include "../PPCTables.h"
+#include "../../Core.h"
+#include "../../CoreTiming.h"
+#include "../../HW/GPFifo.h"
+#include "../../HW/Memmap.h"
 
 #include <set>
 

diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp
@@ -15,21 +15,11 @@
 #include <windows.h>
 #endif
 
-#include "../../Core.h"
+#include "JitBase.h"
 #include "MemoryUtil.h"
+#include "disasm.h"
 
-#include "../../HW/Memmap.h"
 #include "../JitInterface.h"
-#include "../../CoreTiming.h"
-
-#include "../PowerPC.h"
-#include "../PPCTables.h"
-#include "../PPCAnalyst.h"
-
-#include "JitCache.h"
-#include "JitBase.h"
-
-#include "disasm.h"
 
 #if defined USE_OPROFILE && USE_OPROFILE
 #include <opagent.h>

diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp
@@ -5,13 +5,6 @@
 #include "Common.h"
 
 #include "CPUDetect.h"
-#include "../PowerPC.h"
-#include "../../Core.h"
-#include "../../HW/GPFifo.h"
-#include "../../HW/Memmap.h"
-#include "../PPCTables.h"
-#include "x64Emitter.h"
-#include "x64ABI.h"
 #include "JitBase.h"
 #include "Jit_Util.h"
 

diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.h
@@ -9,7 +9,8 @@
 #include <unordered_map>
 
 // Like XCodeBlock but has some utilities for memory access.
-class EmuCodeBlock : public Gen::XCodeBlock {
+class EmuCodeBlock : public Gen::XCodeBlock
+{
 public:
 	void UnsafeLoadRegToReg(Gen::X64Reg reg_addr, Gen::X64Reg reg_value, int accessSize, s32 offset = 0, bool signExtend = false);
 	void UnsafeLoadRegToRegNoSwap(Gen::X64Reg reg_addr, Gen::X64Reg reg_value, int accessSize, s32 offset);