From 05ab192c9c92dce744011af4cc07365e6208b8bd Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 15 Mar 2014 11:22:19 -0700 Subject: [PATCH] Reduce includes in Core/HLE/. Especially templates. --- Core/HLE/FunctionWrappers.h | 1 + Core/HLE/HLE.h | 8 +------- Core/HLE/HLETables.cpp | 6 +++--- Core/HLE/ReplaceTables.cpp | 1 + Core/HLE/sceAtrac.cpp | 2 ++ Core/HLE/sceAudio.cpp | 1 + Core/HLE/sceAudiocodec.cpp | 5 +++-- Core/HLE/sceCcc.cpp | 2 ++ Core/HLE/sceChnnlsv.cpp | 8 +++++--- Core/HLE/sceCtrl.cpp | 2 ++ Core/HLE/sceDeflt.cpp | 2 ++ Core/HLE/sceDisplay.cpp | 1 + Core/HLE/sceDmac.cpp | 1 + Core/HLE/sceFont.cpp | 2 ++ Core/HLE/sceGameUpdate.cpp | 4 ++-- Core/HLE/sceGe.cpp | 1 + Core/HLE/sceHeap.cpp | 6 ++++-- Core/HLE/sceHprm.cpp | 9 +++++---- Core/HLE/sceHttp.cpp | 5 +++-- Core/HLE/sceImpose.cpp | 13 +++++++------ Core/HLE/sceIo.cpp | 2 ++ Core/HLE/sceJpeg.cpp | 6 ++++-- Core/HLE/sceKernel.cpp | 1 + Core/HLE/sceKernelAlarm.cpp | 11 ++++++----- Core/HLE/sceKernelEventFlag.cpp | 1 + Core/HLE/sceKernelInterrupt.cpp | 1 + Core/HLE/sceKernelMbx.cpp | 1 + Core/HLE/sceKernelMemory.cpp | 1 + Core/HLE/sceKernelModule.cpp | 1 + Core/HLE/sceKernelMsgPipe.cpp | 1 + Core/HLE/sceKernelSemaphore.cpp | 1 + Core/HLE/sceKernelTime.cpp | 1 + Core/HLE/sceKernelVTimer.cpp | 13 +++++++------ Core/HLE/sceMd5.cpp | 2 ++ Core/HLE/sceMp3.cpp | 2 ++ Core/HLE/sceMp4.cpp | 1 + Core/HLE/sceMpeg.cpp | 1 + Core/HLE/sceMpeg.h | 3 +-- Core/HLE/sceMt19937.cpp | 2 ++ Core/HLE/sceNet.cpp | 2 ++ Core/HLE/sceNetAdhoc.cpp | 4 +++- Core/HLE/sceNp.cpp | 7 ++++--- Core/HLE/sceOpenPSID.cpp | 7 ++++--- Core/HLE/sceP3da.cpp | 2 ++ Core/HLE/scePauth.cpp | 2 ++ Core/HLE/scePower.cpp | 2 ++ Core/HLE/scePsmf.cpp | 1 + Core/HLE/scePspNpDrm_user.cpp | 3 ++- Core/HLE/sceRtc.cpp | 2 ++ Core/HLE/sceSas.cpp | 2 ++ Core/HLE/sceSsl.cpp | 8 +++++--- Core/HLE/sceUmd.cpp | 2 ++ Core/HLE/sceUsb.cpp | 9 +++++---- Core/HLE/sceUtility.cpp | 1 + Core/HLE/sceVaudio.cpp | 1 + Core/MIPS/ARM/ArmCompBranch.cpp | 1 + Core/MIPS/ARM/ArmCompFPU.cpp | 1 + Core/MIPS/ARM/ArmJit.cpp | 1 + Core/MIPS/MIPS.h | 3 ++- Core/MIPS/MIPSAnalyst.cpp | 1 + Core/MIPS/MIPSCodeUtils.cpp | 9 +++++---- Core/MIPS/MIPSInt.cpp | 1 + Core/MIPS/PPC/PpcCompBranch.cpp | 1 + Core/MIPS/PPC/PpcCompFpu.cpp | 1 + Core/MIPS/PPC/PpcJit.cpp | 1 + Core/MIPS/x86/CompBranch.cpp | 1 + Core/MIPS/x86/CompFPU.cpp | 1 + Core/MIPS/x86/Jit.cpp | 1 + 68 files changed, 144 insertions(+), 66 deletions(-) diff --git a/Core/HLE/FunctionWrappers.h b/Core/HLE/FunctionWrappers.h index 9c02d9d175..7d2b3cecbf 100644 --- a/Core/HLE/FunctionWrappers.h +++ b/Core/HLE/FunctionWrappers.h @@ -19,6 +19,7 @@ #include "Common/CommonTypes.h" #include "Core/HLE/HLE.h" +#include "Core/MemMap.h" // For easy parameter parsing and return value processing. diff --git a/Core/HLE/HLE.h b/Core/HLE/HLE.h index 85daff1fe8..78c6158a66 100644 --- a/Core/HLE/HLE.h +++ b/Core/HLE/HLE.h @@ -18,10 +18,9 @@ #pragma once #include "Common/CommonTypes.h" -#include "Common/ChunkFile.h" -#include "Core/MemMap.h" // TODO: Try to get rid of this include. #include "Core/MIPS/MIPS.h" +class PointerWrap; typedef void (* HLEFunc)(); enum { @@ -70,11 +69,6 @@ struct Syscall #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) #endif -#include "FunctionWrappers.h" - - -#define P_INT(n, name) const int name = currentMIPS->r[4+n]; - const char *GetFuncName(const char *module, u32 nib); const char *GetFuncName(int module, int func); const HLEFunction *GetFunc(const char *module, u32 nib); diff --git a/Core/HLE/HLETables.cpp b/Core/HLE/HLETables.cpp index a1e892fde4..2cc072bc6a 100644 --- a/Core/HLE/HLETables.cpp +++ b/Core/HLE/HLETables.cpp @@ -15,9 +15,9 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" - -#include "HLETables.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/HLETables.h" +#include "Core/HLE/FunctionWrappers.h" #include "sceAtrac.h" #include "sceAudio.h" diff --git a/Core/HLE/ReplaceTables.cpp b/Core/HLE/ReplaceTables.cpp index 4ca5d139c3..c8a8ca27d0 100644 --- a/Core/HLE/ReplaceTables.cpp +++ b/Core/HLE/ReplaceTables.cpp @@ -19,6 +19,7 @@ #include "base/basictypes.h" #include "base/logging.h" +#include "Core/MemMap.h" #include "Core/MIPS/JitCommon/JitCommon.h" #include "Core/MIPS/MIPSAnalyst.h" #include "Core/HLE/ReplaceTables.h" diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 08a802b406..87a3f04e25 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -17,8 +17,10 @@ #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/MIPS/MIPS.h" #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" #include "Core/Config.h" #include "Core/HW/MediaEngine.h" diff --git a/Core/HLE/sceAudio.cpp b/Core/HLE/sceAudio.cpp index 2e11988149..42f33b3785 100644 --- a/Core/HLE/sceAudio.cpp +++ b/Core/HLE/sceAudio.cpp @@ -20,6 +20,7 @@ #include "Core/Host.h" #include "Core/CoreTiming.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/HLE/sceKernelThread.h" #include "Core/HLE/sceAudio.h" #include "Core/HLE/__sceAudio.h" diff --git a/Core/HLE/sceAudiocodec.cpp b/Core/HLE/sceAudiocodec.cpp index cfc0f51de1..f714e4f03b 100644 --- a/Core/HLE/sceAudiocodec.cpp +++ b/Core/HLE/sceAudiocodec.cpp @@ -16,8 +16,9 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Core/HLE/HLE.h" - -#include "sceAudiocodec.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/HLE/sceAudiocodec.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" #include "Core/HW/SimpleMp3Dec.h" diff --git a/Core/HLE/sceCcc.cpp b/Core/HLE/sceCcc.cpp index e0a8d755ad..dcd6437f73 100644 --- a/Core/HLE/sceCcc.cpp +++ b/Core/HLE/sceCcc.cpp @@ -20,7 +20,9 @@ #include "util/text/shiftjis.h" #include "Common/ChunkFile.h" +#include "Core/MemMap.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/Reporting.h" typedef PSPPointer PSPCharPointer; diff --git a/Core/HLE/sceChnnlsv.cpp b/Core/HLE/sceChnnlsv.cpp index 10f3544a17..857ed8275c 100644 --- a/Core/HLE/sceChnnlsv.cpp +++ b/Core/HLE/sceChnnlsv.cpp @@ -15,10 +15,12 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" +#include "Core/MemMap.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" -#include "sceChnnlsv.h" -#include "sceKernel.h" +#include "Core/HLE/sceChnnlsv.h" +#include "Core/HLE/sceKernel.h" extern "C" { #include "ext/libkirk/kirk_engine.h" diff --git a/Core/HLE/sceCtrl.cpp b/Core/HLE/sceCtrl.cpp index 8365744ebb..58b80cd248 100644 --- a/Core/HLE/sceCtrl.cpp +++ b/Core/HLE/sceCtrl.cpp @@ -17,8 +17,10 @@ #include #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/MIPS/MIPS.h" #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Common/ChunkFile.h" #include "Common/StdMutex.h" #include "Core/HLE/sceCtrl.h" diff --git a/Core/HLE/sceDeflt.cpp b/Core/HLE/sceDeflt.cpp index 342b39c4d1..42dbdd0901 100644 --- a/Core/HLE/sceDeflt.cpp +++ b/Core/HLE/sceDeflt.cpp @@ -19,6 +19,8 @@ #include "Common/CommonTypes.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/MemMap.h" int sceZlibDecompress(u32 OutBuffer, int OutBufferLength, u32 InBuffer, u32 Crc32Addr) { DEBUG_LOG(HLE, "sceZlibDecompress(%08x, %x, %08x, %08x)", OutBuffer, OutBufferLength, InBuffer, Crc32Addr); diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp index ddc777692a..5ebfc459cf 100644 --- a/Core/HLE/sceDisplay.cpp +++ b/Core/HLE/sceDisplay.cpp @@ -37,6 +37,7 @@ #include "Core/Config.h" #include "Core/System.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/HLE/sceDisplay.h" #include "Core/HLE/sceKernel.h" #include "Core/HLE/sceKernelThread.h" diff --git a/Core/HLE/sceDmac.cpp b/Core/HLE/sceDmac.cpp index d28d7730df..d1fb479ba1 100644 --- a/Core/HLE/sceDmac.cpp +++ b/Core/HLE/sceDmac.cpp @@ -20,6 +20,7 @@ #include "Core/MemMap.h" #include "Core/Reporting.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/Debugger/Breakpoints.h" #include "GPU/GPUInterface.h" #include "GPU/GPUState.h" diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp index 2318e79b57..420a16a385 100644 --- a/Core/HLE/sceFont.cpp +++ b/Core/HLE/sceFont.cpp @@ -9,9 +9,11 @@ #include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/MIPS/MIPS.h" #include "Core/FileSystems/FileSystem.h" #include "Core/FileSystems/MetaFileSystem.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" #include "Core/System.h" #include "Core/HLE/sceKernel.h" diff --git a/Core/HLE/sceGameUpdate.cpp b/Core/HLE/sceGameUpdate.cpp index 20d61ee7e2..b44243bd14 100644 --- a/Core/HLE/sceGameUpdate.cpp +++ b/Core/HLE/sceGameUpdate.cpp @@ -15,8 +15,8 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" - +#include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" u32 sceGameUpdateInit() { diff --git a/Core/HLE/sceGe.cpp b/Core/HLE/sceGe.cpp index 66506725e6..ef168b2d5e 100644 --- a/Core/HLE/sceGe.cpp +++ b/Core/HLE/sceGe.cpp @@ -20,6 +20,7 @@ #include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/MIPS/MIPS.h" #include "Core/System.h" #include "Core/CoreParameter.h" diff --git a/Core/HLE/sceHeap.cpp b/Core/HLE/sceHeap.cpp index d957ffdcb5..b4087986fb 100644 --- a/Core/HLE/sceHeap.cpp +++ b/Core/HLE/sceHeap.cpp @@ -16,11 +16,13 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Common/ChunkFile.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" #include "Core/HLE/HLE.h" -#include "sceKernelMemory.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/HLE/sceKernelMemory.h" #include "Core/HLE/sceHeap.h" -#include "../Util/BlockAllocator.h" +#include "Core/Util/BlockAllocator.h" #include struct Heap { diff --git a/Core/HLE/sceHprm.cpp b/Core/HLE/sceHprm.cpp index eb03e7ba6b..8e782dd9e8 100644 --- a/Core/HLE/sceHprm.cpp +++ b/Core/HLE/sceHprm.cpp @@ -15,10 +15,11 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" -#include "../MIPS/MIPS.h" - -#include "sceCtrl.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/HLE/sceHprm.h" +#include "Core/MemMap.h" +#include "Core/MIPS/MIPS.h" u32 sceHprmPeekCurrentKey(u32 keyAddress) { DEBUG_LOG(HLE,"0=sceHprmPeekCurrentKey(ptr)"); diff --git a/Core/HLE/sceHttp.cpp b/Core/HLE/sceHttp.cpp index 9b58d96bea..4b7ec81ebd 100644 --- a/Core/HLE/sceHttp.cpp +++ b/Core/HLE/sceHttp.cpp @@ -15,9 +15,10 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" -#include "sceHttp.h" +#include "Core/HLE/sceHttp.h" #include "net/http_client.h" // If http isn't loaded (seems unlikely), most functions should return SCE_KERNEL_ERROR_LIBRARY_NOTFOUND diff --git a/Core/HLE/sceImpose.cpp b/Core/HLE/sceImpose.cpp index fb2f7af5c0..4ecae8a060 100644 --- a/Core/HLE/sceImpose.cpp +++ b/Core/HLE/sceImpose.cpp @@ -15,12 +15,13 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" -#include "FunctionWrappers.h" -#include "../MIPS/MIPS.h" -#include "../Config.h" -#include "ChunkFile.h" -#include "sceUtility.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/MIPS/MIPS.h" +#include "Core/Config.h" +#include "Core/MemMap.h" +#include "Common/ChunkFile.h" +#include "Core/HLE/sceUtility.h" const int PSP_UMD_POPUP_DISABLE = 0; const int PSP_UMD_POPUP_ENABLE = 1; diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index 44358e33f9..2024a7a7f6 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -22,10 +22,12 @@ #include "native/thread/threadutil.h" #include "Core/Core.h" #include "Core/Config.h" +#include "Core/MemMap.h" #include "Core/System.h" #include "Core/Host.h" #include "Core/SaveState.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/HLE/sceKernel.h" #include "Core/MIPS/MIPS.h" #include "Core/HW/MemoryStick.h" diff --git a/Core/HLE/sceJpeg.cpp b/Core/HLE/sceJpeg.cpp index 2b6e1676c7..67e6a058e0 100644 --- a/Core/HLE/sceJpeg.cpp +++ b/Core/HLE/sceJpeg.cpp @@ -17,11 +17,13 @@ #include "native/ext/jpge/jpgd.h" -#include "Common.h" +#include "Common/Common.h" #include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" -#include "sceMpeg.h" +#include "Core/HLE/sceMpeg.h" //Uncomment if you want to dump JPEGs loaded through sceJpeg to a file //#define JPEG_DEBUG diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp index 0a7b1a762c..392f064c55 100644 --- a/Core/HLE/sceKernel.cpp +++ b/Core/HLE/sceKernel.cpp @@ -19,6 +19,7 @@ #include "Core/Config.h" #include "Core/CwCheat.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSCodeUtils.h" #include "Core/MIPS/MIPSInt.h" diff --git a/Core/HLE/sceKernelAlarm.cpp b/Core/HLE/sceKernelAlarm.cpp index f6bfe6fd35..6b1891686e 100644 --- a/Core/HLE/sceKernelAlarm.cpp +++ b/Core/HLE/sceKernelAlarm.cpp @@ -15,12 +15,13 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "sceKernel.h" -#include "sceKernelAlarm.h" -#include "sceKernelInterrupt.h" -#include "HLE.h" +#include "Core/HLE/sceKernel.h" +#include "Core/HLE/sceKernelAlarm.h" +#include "Core/HLE/sceKernelInterrupt.h" +#include "Core/HLE/HLE.h" #include "Core/CoreTiming.h" -#include "ChunkFile.h" +#include "Core/MemMap.h" +#include "Common/ChunkFile.h" #include const int NATIVEALARM_SIZE = 20; diff --git a/Core/HLE/sceKernelEventFlag.cpp b/Core/HLE/sceKernelEventFlag.cpp index a517fb2429..8267aafe10 100644 --- a/Core/HLE/sceKernelEventFlag.cpp +++ b/Core/HLE/sceKernelEventFlag.cpp @@ -20,6 +20,7 @@ #include "Core/HLE/HLE.h" #include "Core/MIPS/MIPS.h" #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" #include "Common/ChunkFile.h" diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp index 289c3e375d..c3d82ad415 100644 --- a/Core/HLE/sceKernelInterrupt.cpp +++ b/Core/HLE/sceKernelInterrupt.cpp @@ -20,6 +20,7 @@ #include #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/MIPS/MIPS.h" #include "Common/ChunkFile.h" diff --git a/Core/HLE/sceKernelMbx.cpp b/Core/HLE/sceKernelMbx.cpp index a57d284326..3d3d4193fa 100644 --- a/Core/HLE/sceKernelMbx.cpp +++ b/Core/HLE/sceKernelMbx.cpp @@ -23,6 +23,7 @@ #include "Core/HLE/sceKernelMbx.h" #include "Core/HLE/HLE.h" #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" #include "Core/HLE/KernelWaitHelpers.h" diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp index cb9bc52dc1..664a2c92f2 100644 --- a/Core/HLE/sceKernelMemory.cpp +++ b/Core/HLE/sceKernelMemory.cpp @@ -22,6 +22,7 @@ #include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/System.h" #include "Core/MIPS/MIPS.h" #include "Core/MemMap.h" diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index b030195c75..92b800e6f0 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -24,6 +24,7 @@ #include "Common/FileUtil.h" #include "Core/Config.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/HLE/HLETables.h" #include "Core/Reporting.h" #include "Core/Host.h" diff --git a/Core/HLE/sceKernelMsgPipe.cpp b/Core/HLE/sceKernelMsgPipe.cpp index 10caba282e..7799569969 100644 --- a/Core/HLE/sceKernelMsgPipe.cpp +++ b/Core/HLE/sceKernelMsgPipe.cpp @@ -19,6 +19,7 @@ #include "Core/Reporting.h" #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Core/HLE/HLE.h" #include "Core/HLE/sceKernel.h" #include "Core/HLE/sceKernelMsgPipe.h" diff --git a/Core/HLE/sceKernelSemaphore.cpp b/Core/HLE/sceKernelSemaphore.cpp index 4a45eedb0e..544c5a09c0 100644 --- a/Core/HLE/sceKernelSemaphore.cpp +++ b/Core/HLE/sceKernelSemaphore.cpp @@ -19,6 +19,7 @@ #include "Core/HLE/HLE.h" #include "Core/MIPS/MIPS.h" #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" #include "Common/ChunkFile.h" #include "Core/HLE/sceKernel.h" diff --git a/Core/HLE/sceKernelTime.cpp b/Core/HLE/sceKernelTime.cpp index 8bc6474737..29e7cbd95e 100644 --- a/Core/HLE/sceKernelTime.cpp +++ b/Core/HLE/sceKernelTime.cpp @@ -30,6 +30,7 @@ #include "Core/HLE/sceKernelTime.h" #include "Core/HLE/sceKernelThread.h" #include "Core/HLE/sceRtc.h" +#include "Core/MemMap.h" // The time when the game started. static time_t start_time; diff --git a/Core/HLE/sceKernelVTimer.cpp b/Core/HLE/sceKernelVTimer.cpp index b7db9152f1..11244a0180 100644 --- a/Core/HLE/sceKernelVTimer.cpp +++ b/Core/HLE/sceKernelVTimer.cpp @@ -17,13 +17,14 @@ #include #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" -#include "sceKernel.h" -#include "sceKernelInterrupt.h" -#include "sceKernelMemory.h" -#include "sceKernelVTimer.h" -#include "HLE.h" -#include "ChunkFile.h" +#include "Core/HLE/sceKernel.h" +#include "Core/HLE/sceKernelInterrupt.h" +#include "Core/HLE/sceKernelMemory.h" +#include "Core/HLE/sceKernelVTimer.h" +#include "Core/HLE/HLE.h" +#include "Common/ChunkFile.h" static int vtimerTimer = -1; static SceUID runningVTimer = 0; diff --git a/Core/HLE/sceMd5.cpp b/Core/HLE/sceMd5.cpp index 33c7482ca5..811c41a61f 100644 --- a/Core/HLE/sceMd5.cpp +++ b/Core/HLE/sceMd5.cpp @@ -16,6 +16,8 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" #include "Common/Crypto/md5.h" #include "Common/Crypto/sha1.h" diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index 5c2d517f82..983c9fe3aa 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -20,8 +20,10 @@ #include "Core/Config.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/HLE/sceMp3.h" #include "Core/HW/MediaEngine.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" #ifdef USE_FFMPEG diff --git a/Core/HLE/sceMp4.cpp b/Core/HLE/sceMp4.cpp index 563d1ad0d5..bb41022251 100644 --- a/Core/HLE/sceMp4.cpp +++ b/Core/HLE/sceMp4.cpp @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/Reporting.h" diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp index 261e72b4e7..bd4c07f4a1 100644 --- a/Core/HLE/sceMpeg.cpp +++ b/Core/HLE/sceMpeg.cpp @@ -23,6 +23,7 @@ #include "Core/HLE/sceMpeg.h" #include "Core/HLE/sceKernelThread.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/HW/MediaEngine.h" #include "Core/Config.h" #include "Core/Reporting.h" diff --git a/Core/HLE/sceMpeg.h b/Core/HLE/sceMpeg.h index a1ebd83f30..443ba8590f 100644 --- a/Core/HLE/sceMpeg.h +++ b/Core/HLE/sceMpeg.h @@ -17,8 +17,7 @@ #pragma once -#include "Common/CommonTypes.h" -#include "Core/MIPS/MIPS.h" +#include "Common/Common.h" class PointerWrap; diff --git a/Core/HLE/sceMt19937.cpp b/Core/HLE/sceMt19937.cpp index 871be5008f..3b6a9c1cdd 100644 --- a/Core/HLE/sceMt19937.cpp +++ b/Core/HLE/sceMt19937.cpp @@ -16,6 +16,8 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" u32 sceMt19937Init(u32 mt19937Addr, u32 seed) diff --git a/Core/HLE/sceNet.cpp b/Core/HLE/sceNet.cpp index 11a8a81de1..bbffec9b69 100644 --- a/Core/HLE/sceNet.cpp +++ b/Core/HLE/sceNet.cpp @@ -20,8 +20,10 @@ #include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/MIPS/MIPS.h" #include "Core/Config.h" +#include "Core/MemMap.h" #include "sceKernel.h" #include "sceKernelThread.h" diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index f595507297..f28972ca5b 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -20,7 +20,9 @@ // This is a direct port of Coldbird's code from http://code.google.com/p/aemu/ // All credit goes to him! -#include "proAdhoc.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/HLE/proAdhoc.h" +#include "Core/MemMap.h" enum { ERROR_NET_ADHOC_INVALID_SOCKET_ID = 0x80410701, diff --git a/Core/HLE/sceNp.cpp b/Core/HLE/sceNp.cpp index 48e603491c..3dda6847a0 100644 --- a/Core/HLE/sceNp.cpp +++ b/Core/HLE/sceNp.cpp @@ -16,11 +16,12 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. // This is pretty much a stub implementation. Doesn't actually do anything, just tries to return values -// to keep games happy anyway. So, no ATRAC3 music until someone has reverse engineered Atrac3+. +// to keep games happy anyway. -#include "HLE.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" -#include "sceNp.h" +#include "Core/HLE/sceNp.h" int sceNp_857B47D3() { diff --git a/Core/HLE/sceOpenPSID.cpp b/Core/HLE/sceOpenPSID.cpp index 60161dcb57..d2136b25cc 100644 --- a/Core/HLE/sceOpenPSID.cpp +++ b/Core/HLE/sceOpenPSID.cpp @@ -15,9 +15,10 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" - -#include "sceOpenPSID.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/HLE/sceOpenPSID.h" +#include "Core/MemMap.h" int sceOpenPSIDGetOpenPSID(u32 OpenPSIDPtr) { diff --git a/Core/HLE/sceP3da.cpp b/Core/HLE/sceP3da.cpp index eb5ce97e17..77865bebe0 100644 --- a/Core/HLE/sceP3da.cpp +++ b/Core/HLE/sceP3da.cpp @@ -16,6 +16,8 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" diff --git a/Core/HLE/scePauth.cpp b/Core/HLE/scePauth.cpp index 4fcbdcf840..5bb185e201 100644 --- a/Core/HLE/scePauth.cpp +++ b/Core/HLE/scePauth.cpp @@ -18,10 +18,12 @@ #include "zlib.h" #include +#include "Core/MemMap.h" #include "Core/System.h" #include "Core/FileSystems/MetaFileSystem.h" #include "Core/HLE/scePauth.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" int scePauth_F7AA47F6(u32 srcPtr, int srcLength, u32 destLengthPtr, u32 workArea) { diff --git a/Core/HLE/scePower.cpp b/Core/HLE/scePower.cpp index 4d7c945333..135dc2b8af 100644 --- a/Core/HLE/scePower.cpp +++ b/Core/HLE/scePower.cpp @@ -18,7 +18,9 @@ #include #include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" #include "Core/Config.h" diff --git a/Core/HLE/scePsmf.cpp b/Core/HLE/scePsmf.cpp index 8f7ed077bc..eb5dc3ee4f 100644 --- a/Core/HLE/scePsmf.cpp +++ b/Core/HLE/scePsmf.cpp @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Common/ChunkFile.h" #include "Core/Reporting.h" diff --git a/Core/HLE/scePspNpDrm_user.cpp b/Core/HLE/scePspNpDrm_user.cpp index 61793a15da..12ddd5ee75 100644 --- a/Core/HLE/scePspNpDrm_user.cpp +++ b/Core/HLE/scePspNpDrm_user.cpp @@ -1,6 +1,7 @@ #include "scePspNpDrm_user.h" -#include "HLE.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" u32 sceIoIoctl(u32 id, u32 cmd, u32 indataPtr, u32 inlen, u32 outdataPtr, u32 outlen); diff --git a/Core/HLE/sceRtc.cpp b/Core/HLE/sceRtc.cpp index c3fe52d814..ad236efb75 100644 --- a/Core/HLE/sceRtc.cpp +++ b/Core/HLE/sceRtc.cpp @@ -30,9 +30,11 @@ #include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/MIPS/MIPS.h" #include "Core/Reporting.h" #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Core/HLE/sceKernel.h" #include "Core/HLE/sceRtc.h" diff --git a/Core/HLE/sceSas.cpp b/Core/HLE/sceSas.cpp index d94a9e3ef5..3b4abe1abb 100644 --- a/Core/HLE/sceSas.cpp +++ b/Core/HLE/sceSas.cpp @@ -30,8 +30,10 @@ #include "base/basictypes.h" #include "Common/Log.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/MIPS/MIPS.h" #include "Core/HW/SasAudio.h" +#include "Core/MemMap.h" #include "Core/Reporting.h" #include "Core/HLE/sceSas.h" diff --git a/Core/HLE/sceSsl.cpp b/Core/HLE/sceSsl.cpp index bb09d1454e..64da9fa75b 100644 --- a/Core/HLE/sceSsl.cpp +++ b/Core/HLE/sceSsl.cpp @@ -15,10 +15,12 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" -#include "ChunkFile.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/MemMap.h" +#include "Common/ChunkFile.h" -#include "sceSsl.h" +#include "Core/HLE/sceSsl.h" #define ERROR_SSL_NOT_INIT 0x80435001; #define ERROR_SSL_ALREADY_INIT 0x80435020; diff --git a/Core/HLE/sceUmd.cpp b/Core/HLE/sceUmd.cpp index a7e0557cd3..842c197aa1 100644 --- a/Core/HLE/sceUmd.cpp +++ b/Core/HLE/sceUmd.cpp @@ -20,11 +20,13 @@ #include "file/file_util.h" #include "Common/ChunkFile.h" +#include "Core/MemMap.h" #include "Core/System.h" #include "Core/CoreTiming.h" #include "Core/Reporting.h" #include "Core/MIPS/MIPS.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/HLE/sceUmd.h" #include "Core/HLE/sceKernelThread.h" #include "Core/HLE/sceKernelInterrupt.h" diff --git a/Core/HLE/sceUsb.cpp b/Core/HLE/sceUsb.cpp index 7f6eb912ef..4447fc10c1 100644 --- a/Core/HLE/sceUsb.cpp +++ b/Core/HLE/sceUsb.cpp @@ -15,11 +15,12 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "HLE.h" -#include "../MIPS/MIPS.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" +#include "Core/MIPS/MIPS.h" #include "Core/CoreTiming.h" -#include "ChunkFile.h" -#include "sceUsb.h" +#include "Common/ChunkFile.h" +#include "Core/HLE/sceUsb.h" bool usbActivated = false; diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index ebb6d66128..e961d67fda 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -22,6 +22,7 @@ #include "Common/ChunkFile.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/MIPS/MIPS.h" #include "Core/Reporting.h" #include "Core/Config.h" diff --git a/Core/HLE/sceVaudio.cpp b/Core/HLE/sceVaudio.cpp index 9a84e1b8e0..6f4b43c756 100644 --- a/Core/HLE/sceVaudio.cpp +++ b/Core/HLE/sceVaudio.cpp @@ -18,6 +18,7 @@ #include "Common/ChunkFile.h" #include "Core/Reporting.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/FunctionWrappers.h" #include "Core/HLE/sceVaudio.h" #include "Core/HLE/sceAudio.h" #include "Core/HLE/__sceAudio.h" diff --git a/Core/MIPS/ARM/ArmCompBranch.cpp b/Core/MIPS/ARM/ArmCompBranch.cpp index db96d78e13..78bd93c9d8 100644 --- a/Core/MIPS/ARM/ArmCompBranch.cpp +++ b/Core/MIPS/ARM/ArmCompBranch.cpp @@ -17,6 +17,7 @@ #include "Core/Reporting.h" #include "Core/Config.h" +#include "Core/MemMap.h" #include "Core/HLE/HLE.h" #include "Core/HLE/HLETables.h" diff --git a/Core/MIPS/ARM/ArmCompFPU.cpp b/Core/MIPS/ARM/ArmCompFPU.cpp index 19f11f2a37..8101891ea3 100644 --- a/Core/MIPS/ARM/ArmCompFPU.cpp +++ b/Core/MIPS/ARM/ArmCompFPU.cpp @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Core/Config.h" +#include "Core/MemMap.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSCodeUtils.h" #include "Core/MIPS/MIPSTables.h" diff --git a/Core/MIPS/ARM/ArmJit.cpp b/Core/MIPS/ARM/ArmJit.cpp index aac863da6a..cc37f25cc5 100644 --- a/Core/MIPS/ARM/ArmJit.cpp +++ b/Core/MIPS/ARM/ArmJit.cpp @@ -20,6 +20,7 @@ #include "Core/Reporting.h" #include "Core/Core.h" #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSCodeUtils.h" #include "Core/MIPS/MIPSInt.h" diff --git a/Core/MIPS/MIPS.h b/Core/MIPS/MIPS.h index 7b21402a11..91df61a513 100644 --- a/Core/MIPS/MIPS.h +++ b/Core/MIPS/MIPS.h @@ -19,9 +19,10 @@ #include "util/random/rng.h" #include "Common/CommonTypes.h" -#include "Common/ChunkFile.h" #include "Core/Opcode.h" +class PointerWrap; + typedef Memory::Opcode MIPSOpcode; enum MIPSGPReg diff --git a/Core/MIPS/MIPSAnalyst.cpp b/Core/MIPS/MIPSAnalyst.cpp index f5b95baa4e..9fc5a4c292 100644 --- a/Core/MIPS/MIPSAnalyst.cpp +++ b/Core/MIPS/MIPSAnalyst.cpp @@ -20,6 +20,7 @@ #include "ext/cityhash/city.h" #include "Common/FileUtil.h" #include "Core/Config.h" +#include "Core/MemMap.h" #include "Core/System.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSTables.h" diff --git a/Core/MIPS/MIPSCodeUtils.cpp b/Core/MIPS/MIPSCodeUtils.cpp index 7d52278f66..8e4203b541 100644 --- a/Core/MIPS/MIPSCodeUtils.cpp +++ b/Core/MIPS/MIPSCodeUtils.cpp @@ -15,10 +15,11 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include "MIPS.h" -#include "MIPSTables.h" -#include "MIPSCodeUtils.h" -#include "../Host.h" +#include "Core/MIPS/MIPS.h" +#include "Core/MIPS/MIPSTables.h" +#include "Core/MIPS/MIPSCodeUtils.h" +#include "Core/Host.h" +#include "Core/MemMap.h" namespace MIPSCodeUtils { diff --git a/Core/MIPS/MIPSInt.cpp b/Core/MIPS/MIPSInt.cpp index e8c6860244..e4c2dff2ee 100644 --- a/Core/MIPS/MIPSInt.cpp +++ b/Core/MIPS/MIPSInt.cpp @@ -25,6 +25,7 @@ #include "Core/Config.h" #include "Core/Core.h" #include "Core/Host.h" +#include "Core/MemMap.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSInt.h" #include "Core/MIPS/MIPSTables.h" diff --git a/Core/MIPS/PPC/PpcCompBranch.cpp b/Core/MIPS/PPC/PpcCompBranch.cpp index ed8d8da11f..c46e67fef9 100644 --- a/Core/MIPS/PPC/PpcCompBranch.cpp +++ b/Core/MIPS/PPC/PpcCompBranch.cpp @@ -1,6 +1,7 @@ #include "Common/ChunkFile.h" #include "Core/Core.h" #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSCodeUtils.h" #include "Core/MIPS/MIPSInt.h" diff --git a/Core/MIPS/PPC/PpcCompFpu.cpp b/Core/MIPS/PPC/PpcCompFpu.cpp index c8af1db478..7c8bee7cc5 100644 --- a/Core/MIPS/PPC/PpcCompFpu.cpp +++ b/Core/MIPS/PPC/PpcCompFpu.cpp @@ -2,6 +2,7 @@ #include "Core/Config.h" #include "Core/Core.h" #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSCodeUtils.h" #include "Core/MIPS/MIPSInt.h" diff --git a/Core/MIPS/PPC/PpcJit.cpp b/Core/MIPS/PPC/PpcJit.cpp index 7b21350250..8e4c67b6c6 100644 --- a/Core/MIPS/PPC/PpcJit.cpp +++ b/Core/MIPS/PPC/PpcJit.cpp @@ -1,6 +1,7 @@ #include "Common/ChunkFile.h" #include "Core/Core.h" #include "Core/CoreTiming.h" +#include "Core/MemMap.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSCodeUtils.h" #include "Core/MIPS/MIPSInt.h" diff --git a/Core/MIPS/x86/CompBranch.cpp b/Core/MIPS/x86/CompBranch.cpp index 4545f22b9e..fc1fde3ec1 100644 --- a/Core/MIPS/x86/CompBranch.cpp +++ b/Core/MIPS/x86/CompBranch.cpp @@ -20,6 +20,7 @@ #include "Core/HLE/HLE.h" #include "Core/HLE/HLETables.h" #include "Core/Host.h" +#include "Core/MemMap.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSCodeUtils.h" diff --git a/Core/MIPS/x86/CompFPU.cpp b/Core/MIPS/x86/CompFPU.cpp index 3c96fd0e60..abc8a1c520 100644 --- a/Core/MIPS/x86/CompFPU.cpp +++ b/Core/MIPS/x86/CompFPU.cpp @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Core/Config.h" +#include "Core/MemMap.h" #include "Common/Common.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSCodeUtils.h" diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp index abe7130b30..662b0a1f8c 100644 --- a/Core/MIPS/x86/Jit.cpp +++ b/Core/MIPS/x86/Jit.cpp @@ -22,6 +22,7 @@ #include "Common/ChunkFile.h" #include "Core/Core.h" +#include "Core/MemMap.h" #include "Core/System.h" #include "Core/CoreTiming.h" #include "Core/Config.h"