From 80b4cb6cf3497612ded0404d6c9b6f34293f3edc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 18 Oct 2013 01:55:16 -0400 Subject: [PATCH] Clean out includes from regular JitCommon. --- .../Src/PowerPC/JitCommon/JitAsmCommon.cpp | 28 +++++++------------ .../Core/Src/PowerPC/JitCommon/JitAsmCommon.h | 2 +- .../Src/PowerPC/JitCommon/JitBackpatch.cpp | 10 ++----- .../Core/Core/Src/PowerPC/JitCommon/JitBase.h | 18 +++++++++--- .../Core/Src/PowerPC/JitCommon/JitCache.cpp | 16 ++--------- .../Core/Src/PowerPC/JitCommon/Jit_Util.cpp | 7 ----- .../Core/Src/PowerPC/JitCommon/Jit_Util.h | 3 +- 7 files changed, 32 insertions(+), 52 deletions(-) diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp index fc9f402603..269828f03d 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitAsmCommon.cpp @@ -2,24 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "x64ABI.h" -#include "CPUDetect.h" -#include "x64Emitter.h" - -#include "../../HW/Memmap.h" - -#include "../PowerPC.h" -#include "../../CoreTiming.h" -#include "MemoryUtil.h" - -#include "x64ABI.h" -#include "../JitCommon/JitCache.h" - -#include "../../HW/GPFifo.h" -#include "../../Core.h" #include "JitAsmCommon.h" #include "JitBase.h" +#include "CPUDetect.h" +#include "MemoryUtil.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 index 67398f6f6b..c593909c76 100644 --- 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 index 21ba92c100..696ca457ee 100644 --- 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 index 0260cf35b6..5ca630621f 100644 --- 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 "JitCache.h" -#include "Jit_Util.h" // for EmuCodeBlock -#include "JitBackpatch.h" // for EmuCodeBlock #include "JitAsmCommon.h" +#include "JitCache.h" +#include "Jit_Util.h" // for EmuCodeBlock +#include "JitBackpatch.h" // for EmuCodeBlock +#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 diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp index 48ba21e5aa..793702bed9 100644 --- a/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/Src/PowerPC/JitCommon/JitCache.cpp @@ -15,22 +15,12 @@ #include #endif -#include "../../Core.h" -#include "MemoryUtil.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 "MemoryUtil.h" #include "disasm.h" +#include "../JitInterface.h" + #if defined USE_OPROFILE && USE_OPROFILE #include diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp index fc699b2315..8205c2fea7 100644 --- 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 index 63a0fed0a5..4a51073d5a 100644 --- 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 // 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);