From c6200a5b07eb3a978975ddf06d873a33e85106f8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 2 Mar 2017 12:15:02 -0500 Subject: [PATCH] JitInterface: Convert includes into forward declarations where applicable --- Source/Core/Core/Core.cpp | 6 +----- Source/Core/Core/HW/DSP.cpp | 1 + Source/Core/Core/MemTools.cpp | 12 ++++++------ .../PowerPC/Interpreter/Interpreter_LoadStore.cpp | 5 +++-- Source/Core/Core/PowerPC/Jit64/Jit.cpp | 1 + Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp | 4 +++- Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp | 1 - .../Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp | 3 +-- Source/Core/Core/PowerPC/JitCommon/JitCache.cpp | 2 -- Source/Core/Core/PowerPC/JitInterface.cpp | 10 +++++++++- Source/Core/Core/PowerPC/JitInterface.h | 9 ++++++--- Source/Core/Core/PowerPC/PPCTables.cpp | 3 +++ Source/Core/Core/PowerPC/PowerPC.cpp | 2 ++ Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 1 + .../Core/DolphinWX/Debugger/CodeWindowFunctions.cpp | 1 + 15 files changed, 38 insertions(+), 23 deletions(-) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index acb17a4434..d48d67a237 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -22,8 +22,8 @@ #include "Common/CommonTypes.h" #include "Common/Flag.h" #include "Common/Logging/LogManager.h" -#include "Common/MathUtil.h" #include "Common/MemoryUtil.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "Common/Thread.h" #include "Common/Timer.h" @@ -41,16 +41,12 @@ #include "Core/Boot/Boot.h" #include "Core/FifoPlayer/FifoPlayer.h" #include "Core/HLE/HLE.h" -#include "Core/HW/AudioInterface.h" #include "Core/HW/CPU.h" #include "Core/HW/DSP.h" #include "Core/HW/EXI/EXI.h" #include "Core/HW/GCKeyboard.h" #include "Core/HW/GCPad.h" -#include "Core/HW/GPFifo.h" #include "Core/HW/HW.h" -#include "Core/HW/Memmap.h" -#include "Core/HW/ProcessorInterface.h" #include "Core/HW/SystemTimers.h" #include "Core/HW/VideoInterface.h" #include "Core/HW/Wiimote.h" diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp index 38fb513875..e97377f8bd 100644 --- a/Source/Core/Core/HW/DSP.cpp +++ b/Source/Core/Core/HW/DSP.cpp @@ -25,6 +25,7 @@ #include #include "AudioCommon/AudioCommon.h" +#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Common/MemoryUtil.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp index e9392dcd23..92101bd8b4 100644 --- a/Source/Core/Core/MemTools.cpp +++ b/Source/Core/Core/MemTools.cpp @@ -2,21 +2,21 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/MemTools.h" + #include +#include +#include #include #include "Common/CommonFuncs.h" #include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" #include "Common/Thread.h" -#include "Core/HW/Memmap.h" #include "Core/MachineContext.h" -#include "Core/MemTools.h" #include "Core/PowerPC/JitInterface.h" -#include "Core/PowerPC/PowerPC.h" -#ifndef _M_GENERIC -#include "Core/PowerPC/JitCommon/JitBase.h" -#endif + #ifdef __FreeBSD__ #include #endif diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp index 7d16ff2ec4..39b1a0db36 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStore.cpp @@ -2,11 +2,12 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "Common/MathUtil.h" +#include "Common/Logging/Log.h" +#include "Common/MsgHandler.h" #include "Core/ConfigManager.h" -#include "Core/HW/DSP.h" #include "Core/PowerPC/Interpreter/Interpreter.h" #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h" #include "Core/PowerPC/JitInterface.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index 580b20c5a1..74ca3ffd96 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -13,6 +13,7 @@ #endif #include "Common/CommonTypes.h" +#include "Common/FileUtil.h" #include "Common/Logging/Log.h" #include "Common/MemoryUtil.h" #include "Common/StringUtil.h" diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp index 0ab42bcd47..23eaee35b6 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp @@ -6,15 +6,17 @@ // Should give a very noticable speed boost to paired single heavy code. #include "Core/PowerPC/Jit64/Jit.h" + +#include "Common/Assert.h" #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/CPU.h" -#include "Core/HW/DSP.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/Jit64/JitRegCache.h" #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp index 254c5961d5..8eac56e38f 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64Cache.cpp @@ -6,7 +6,6 @@ #include "Common/CommonTypes.h" #include "Core/PowerPC/JitArm64/Jit.h" #include "Core/PowerPC/JitCommon/JitBase.h" -#include "Core/PowerPC/JitInterface.h" JitArm64BlockCache::JitArm64BlockCache(JitBase& jit) : JitBaseBlockCache{jit} { diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp index e3d2020fa2..e6141476ab 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp @@ -4,9 +4,8 @@ #include "Core/PowerPC/JitArm64/Jit.h" +#include #include "Core/PowerPC/Gekko.h" -#include "Core/PowerPC/JitInterface.h" -#include "Core/PowerPC/PPCAnalyst.h" #include "Core/PowerPC/PPCTables.h" // Should be moved in to the Jit class diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp index d04b4d22ac..6c19a81c22 100644 --- a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp @@ -18,9 +18,7 @@ #include "Common/JitRegister.h" #include "Core/ConfigManager.h" #include "Core/Core.h" -#include "Core/CoreTiming.h" #include "Core/PowerPC/JitCommon/JitBase.h" -#include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/PowerPC.h" #ifdef _WIN32 diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp index c1cb26a450..bc1c7c8d89 100644 --- a/Source/Core/Core/PowerPC/JitInterface.cpp +++ b/Source/Core/Core/PowerPC/JitInterface.cpp @@ -2,8 +2,11 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Core/PowerPC/JitInterface.h" + #include #include +#include #include #ifdef _WIN32 @@ -12,10 +15,15 @@ #include "Common/PerformanceCounter.h" #endif +#include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" +#include "Common/FileUtil.h" +#include "Common/MsgHandler.h" + #include "Core/Core.h" +#include "Core/PowerPC/CPUCoreBase.h" #include "Core/PowerPC/CachedInterpreter/CachedInterpreter.h" #include "Core/PowerPC/JitCommon/JitBase.h" -#include "Core/PowerPC/JitInterface.h" #include "Core/PowerPC/PPCSymbolDB.h" #include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/Profiler.h" diff --git a/Source/Core/Core/PowerPC/JitInterface.h b/Source/Core/Core/PowerPC/JitInterface.h index ac664db470..03aaa9ba7b 100644 --- a/Source/Core/Core/PowerPC/JitInterface.h +++ b/Source/Core/Core/PowerPC/JitInterface.h @@ -5,10 +5,13 @@ #pragma once #include -#include "Common/ChunkFile.h" + +#include "Common/CommonTypes.h" #include "Core/MachineContext.h" -#include "Core/PowerPC/CPUCoreBase.h" -#include "Core/PowerPC/Profiler.h" + +class CPUCoreBase; +class PointerWrap; +struct ProfileStats; namespace JitInterface { diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp index e27c949799..5bfc188fd3 100644 --- a/Source/Core/Core/PowerPC/PPCTables.cpp +++ b/Source/Core/Core/PowerPC/PPCTables.cpp @@ -8,10 +8,13 @@ #include #include #include +#include #include +#include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Core/PowerPC/Interpreter/Interpreter.h" diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp index 7cb616fbc9..b7c91f3de2 100644 --- a/Source/Core/Core/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/PowerPC/PowerPC.cpp @@ -4,6 +4,8 @@ #include "Core/PowerPC/PowerPC.h" +#include + #include "Common/Assert.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 1bcd6f6928..75ff5c16dc 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -26,6 +26,7 @@ // clang-format on #include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "Common/SymbolDB.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp index 6db5c36619..f3e1d72f5e 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindowFunctions.cpp @@ -21,6 +21,7 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/IniFile.h" +#include "Common/MsgHandler.h" #include "Common/SymbolDB.h" #include "Core/Boot/Boot.h"