From 4674ff50cc706c48f7357f200f44dabf80d5ae09 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 15 Mar 2014 10:37:13 -0700 Subject: [PATCH 1/8] Ingore literal-suffix on Android, the sdk has it. Just makes it hard to find real warnings. --- android/jni/Locals.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk index ebae82ba63..7c65651e51 100644 --- a/android/jni/Locals.mk +++ b/android/jni/Locals.mk @@ -3,7 +3,8 @@ LOCAL_CFLAGS := -DUSE_FFMPEG -DUSING_GLES2 -DMOBILE_DEVICE -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-unused-variable -fno-strict-aliasing -D__STDC_CONSTANT_MACROS # yes, it's really CPPFLAGS for C++ -LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder +# literal-suffix is generated by Android default code and causes noise. +LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder -Wno-literal-suffix LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/../../Common \ $(LOCAL_PATH)/../.. \ From 996fa396848fc0a390333e9d7ce781b564ee61f1 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 15 Mar 2014 10:38:46 -0700 Subject: [PATCH 2/8] Reduce some unnecessary includes in Core/. --- Core/Debugger/DebugInterface.h | 1 - Core/Dialog/PSPDialog.h | 1 - Core/Dialog/PSPGamedataInstallDialog.cpp | 1 + Core/Dialog/PSPGamedataInstallDialog.h | 1 - Core/Dialog/PSPMsgDialog.h | 3 ++- Core/Dialog/PSPNetconfDialog.cpp | 1 + Core/Dialog/SavedataParam.cpp | 1 + Core/HLE/sceUtility.cpp | 1 + Core/MemMap.cpp | 17 +++++++++-------- Core/MemMap.h | 1 - Core/PSPLoaders.cpp | 1 + Core/PSPLoaders.h | 2 -- Core/PSPMixer.h | 3 +-- Core/Reporting.h | 1 + Core/SaveState.h | 3 ++- Core/System.cpp | 1 + Core/Util/PPGeDraw.h | 2 ++ GPU/Directx9/VertexDecoderDX9.cpp | 1 + GPU/GLES/VertexDecoder.cpp | 1 + 19 files changed, 25 insertions(+), 18 deletions(-) diff --git a/Core/Debugger/DebugInterface.h b/Core/Debugger/DebugInterface.h index e356194269..75f802fbfe 100644 --- a/Core/Debugger/DebugInterface.h +++ b/Core/Debugger/DebugInterface.h @@ -17,7 +17,6 @@ #pragma once #include -#include #include "Common/CommonTypes.h" #include "native/math/expression_parser.h" diff --git a/Core/Dialog/PSPDialog.h b/Core/Dialog/PSPDialog.h index f3d71802f9..76eb19577f 100644 --- a/Core/Dialog/PSPDialog.h +++ b/Core/Dialog/PSPDialog.h @@ -19,7 +19,6 @@ #include "Common/Common.h" #include "Common/CommonTypes.h" -#include "Core/Config.h" class PointerWrap; diff --git a/Core/Dialog/PSPGamedataInstallDialog.cpp b/Core/Dialog/PSPGamedataInstallDialog.cpp index 155ddbc471..10430367ec 100644 --- a/Core/Dialog/PSPGamedataInstallDialog.cpp +++ b/Core/Dialog/PSPGamedataInstallDialog.cpp @@ -17,6 +17,7 @@ #include "Common/ChunkFile.h" #include "Core/MemMap.h" +#include "Core/System.h" #include "Core/FileSystems/MetaFileSystem.h" #include "Core/Dialog/PSPGamedataInstallDialog.h" diff --git a/Core/Dialog/PSPGamedataInstallDialog.h b/Core/Dialog/PSPGamedataInstallDialog.h index 61b439ea32..e557dd2776 100644 --- a/Core/Dialog/PSPGamedataInstallDialog.h +++ b/Core/Dialog/PSPGamedataInstallDialog.h @@ -18,7 +18,6 @@ #pragma once #include "Core/Dialog/PSPDialog.h" -#include "Core/System.h" struct SceUtilityGamedataInstallParam { pspUtilityDialogCommon common; diff --git a/Core/Dialog/PSPMsgDialog.h b/Core/Dialog/PSPMsgDialog.h index bed69579ed..43df9f477a 100644 --- a/Core/Dialog/PSPMsgDialog.h +++ b/Core/Dialog/PSPMsgDialog.h @@ -17,7 +17,8 @@ #pragma once -#include "PSPDialog.h" +#include +#include "Core/Dialog/PSPDialog.h" #define SCE_UTILITY_MSGDIALOG_OPTION_ERRORSOUND 0x00000000 #define SCE_UTILITY_MSGDIALOG_OPTION_TEXTSOUND 0x00000001 diff --git a/Core/Dialog/PSPNetconfDialog.cpp b/Core/Dialog/PSPNetconfDialog.cpp index ab01d93d54..616bebfbeb 100644 --- a/Core/Dialog/PSPNetconfDialog.cpp +++ b/Core/Dialog/PSPNetconfDialog.cpp @@ -17,6 +17,7 @@ #include "PSPNetconfDialog.h" #include "ChunkFile.h" +#include "Core/Config.h" #include "Core/MemMap.h" #include "Core/HLE/sceNetAdhoc.h" #include "Core/Util/PPGeDraw.h" diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index 58c4a9623f..2575663815 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -18,6 +18,7 @@ #include "base/logging.h" #include "Common/ChunkFile.h" +#include "Core/Config.h" #include "Core/Reporting.h" #include "Core/Dialog/SavedataParam.h" #include "Core/Dialog/PSPSaveDialog.h" diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index 773659574e..ebb6d66128 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -24,6 +24,7 @@ #include "Core/HLE/HLE.h" #include "Core/MIPS/MIPS.h" #include "Core/Reporting.h" +#include "Core/Config.h" #include "Core/HLE/sceKernel.h" #include "Core/HLE/sceKernelThread.h" diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp index 298aedc5ce..cced19089d 100644 --- a/Core/MemMap.cpp +++ b/Core/MemMap.cpp @@ -17,15 +17,16 @@ #include -#include "Common.h" -#include "MemoryUtil.h" -#include "MemArena.h" -#include "ChunkFile.h" +#include "Common/Common.h" +#include "Common/MemoryUtil.h" +#include "Common/MemArena.h" +#include "Common/ChunkFile.h" -#include "MemMap.h" -#include "MIPS/MIPS.h" -#include "MIPS/JitCommon/JitCommon.h" -#include "HLE/HLE.h" +#include "Core/MemMap.h" +#include "Core/HDRemaster.h" +#include "Core/MIPS/MIPS.h" +#include "Core/MIPS/JitCommon/JitCommon.h" +#include "Core/HLE/HLE.h" #include "Core/Core.h" #include "Core/Debugger/SymbolMap.h" diff --git a/Core/MemMap.h b/Core/MemMap.h index 0556b8361a..28db29a3f6 100644 --- a/Core/MemMap.h +++ b/Core/MemMap.h @@ -22,7 +22,6 @@ // Includes #include "Common/Common.h" #include "Common/CommonTypes.h" -#include "HDRemaster.h" #include "Core/Opcode.h" // PPSSPP is very aggressive about trying to do memory accesses directly, for speed. diff --git a/Core/PSPLoaders.cpp b/Core/PSPLoaders.cpp index 22ba595a53..511db5debe 100644 --- a/Core/PSPLoaders.cpp +++ b/Core/PSPLoaders.cpp @@ -29,6 +29,7 @@ #include "FileSystems/VirtualDiscFileSystem.h" #include "Core/MemMap.h" +#include "Core/HDRemaster.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSAnalyst.h" diff --git a/Core/PSPLoaders.h b/Core/PSPLoaders.h index 5463027cd7..4faa7287d9 100644 --- a/Core/PSPLoaders.h +++ b/Core/PSPLoaders.h @@ -19,8 +19,6 @@ #include -#include "MemMap.h" - bool Load_PSP_ISO(const char *filename, std::string *error_string); bool Load_PSP_ELF_PBP(const char *filename, std::string *error_string); void InitMemoryForGameISO(std::string fileToStart); diff --git a/Core/PSPMixer.h b/Core/PSPMixer.h index 240d073552..a47ca4b3ad 100644 --- a/Core/PSPMixer.h +++ b/Core/PSPMixer.h @@ -17,8 +17,7 @@ #pragma once -#include "MemMap.h" -#include "Host.h" +#include "Core/Host.h" class PSPMixer : public PMixer { diff --git a/Core/Reporting.h b/Core/Reporting.h index 69f3de465f..31694d3168 100644 --- a/Core/Reporting.h +++ b/Core/Reporting.h @@ -16,6 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include "Common/CommonTypes.h" +#include "Common/Log.h" #include #define DEBUG_LOG_REPORT(t,...) { DEBUG_LOG(t, __VA_ARGS__); Reporting::ReportMessage(__VA_ARGS__); } diff --git a/Core/SaveState.h b/Core/SaveState.h index d27eb0bb26..840c75fc66 100644 --- a/Core/SaveState.h +++ b/Core/SaveState.h @@ -16,8 +16,9 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. #include +#include -#include "ChunkFile.h" +#include "Common/ChunkFile.h" namespace SaveState { diff --git a/Core/System.cpp b/Core/System.cpp index 5fbd28c424..6d3eb91c92 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -30,6 +30,7 @@ #include "util/text/utf8.h" #include "Core/MemMap.h" +#include "Core/HDRemaster.h" #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSAnalyst.h" diff --git a/Core/Util/PPGeDraw.h b/Core/Util/PPGeDraw.h index ec74c1fa48..7bb195edcf 100644 --- a/Core/Util/PPGeDraw.h +++ b/Core/Util/PPGeDraw.h @@ -17,6 +17,8 @@ #pragma once +#include +#include #include "ppge_atlas.h" #include "Common/CommonTypes.h" diff --git a/GPU/Directx9/VertexDecoderDX9.cpp b/GPU/Directx9/VertexDecoderDX9.cpp index 929ada40de..16f9600195 100644 --- a/GPU/Directx9/VertexDecoderDX9.cpp +++ b/GPU/Directx9/VertexDecoderDX9.cpp @@ -19,6 +19,7 @@ #include "Core/Config.h" #include "Core/MemMap.h" +#include "Core/HDRemaster.h" #include "GPU/ge_constants.h" #include "GPU/Directx9/VertexDecoderDX9.h" diff --git a/GPU/GLES/VertexDecoder.cpp b/GPU/GLES/VertexDecoder.cpp index 66aef0634f..7bcab4bc35 100644 --- a/GPU/GLES/VertexDecoder.cpp +++ b/GPU/GLES/VertexDecoder.cpp @@ -21,6 +21,7 @@ #include "Common/CPUDetect.h" #include "Core/Config.h" #include "Core/MemMap.h" +#include "Core/HDRemaster.h" #include "GPU/ge_constants.h" #include "GPU/Math3D.h" From c9be2f606cf99c9ba82517bf513e2e8ae1a62e5c Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 15 Mar 2014 10:41:13 -0700 Subject: [PATCH 3/8] Fix a type conversion warning. --- UI/GameSettingsScreen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 300d4506d5..bd69816222 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -64,7 +64,7 @@ void GameSettingsScreen::CreateViews() { showDebugStats_ = g_Config.bShowDebugStats; iAlternateSpeedPercent_ = 3; - for (int i = 0; i < ARRAY_SIZE(alternateSpeedTable); i++) { + for (int i = 0; i < (int)ARRAY_SIZE(alternateSpeedTable); i++) { if (g_Config.iFpsLimit <= alternateSpeedTable[i]) { iAlternateSpeedPercent_ = i; break; From 8d29b583e88b980d4889ec0c7319ea45010b6547 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 15 Mar 2014 10:48:30 -0700 Subject: [PATCH 4/8] Reduce a few Core/Dialog/ includes. --- Core/Dialog/PSPNetconfDialog.h | 1 - Core/Dialog/PSPPlaceholderDialog.h | 2 +- Core/Dialog/PSPSaveDialog.h | 4 ++-- Core/Dialog/SavedataParam.cpp | 2 ++ Core/Dialog/SavedataParam.h | 5 ++--- Core/HLE/sceIo.cpp | 1 + Core/HLE/sceIo.h | 5 ++--- Core/HLE/sceRtc.h | 4 ++++ 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Core/Dialog/PSPNetconfDialog.h b/Core/Dialog/PSPNetconfDialog.h index 968963e2ae..f0a941007c 100644 --- a/Core/Dialog/PSPNetconfDialog.h +++ b/Core/Dialog/PSPNetconfDialog.h @@ -19,7 +19,6 @@ #include "Core/Dialog/PSPDialog.h" #include "Core/MemMap.h" -#include "Core/System.h" struct SceUtilityNetconfData { char groupName[8]; diff --git a/Core/Dialog/PSPPlaceholderDialog.h b/Core/Dialog/PSPPlaceholderDialog.h index a841facd88..42fba56520 100644 --- a/Core/Dialog/PSPPlaceholderDialog.h +++ b/Core/Dialog/PSPPlaceholderDialog.h @@ -17,7 +17,7 @@ #pragma once -#include "PSPDialog.h" +#include "Core/Dialog/PSPDialog.h" class PSPPlaceholderDialog: public PSPDialog { public: diff --git a/Core/Dialog/PSPSaveDialog.h b/Core/Dialog/PSPSaveDialog.h index d4e9dbc840..d1a51dcc7e 100644 --- a/Core/Dialog/PSPSaveDialog.h +++ b/Core/Dialog/PSPSaveDialog.h @@ -17,8 +17,8 @@ #pragma once -#include "PSPDialog.h" -#include "SavedataParam.h" +#include "Core/Dialog/PSPDialog.h" +#include "Core/Dialog/SavedataParam.h" #define SCE_UTILITY_SAVEDATA_ERROR_TYPE (0x80110300) diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index 2575663815..0208c2faa8 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -20,6 +20,7 @@ #include "Common/ChunkFile.h" #include "Core/Config.h" #include "Core/Reporting.h" +#include "Core/System.h" #include "Core/Dialog/SavedataParam.h" #include "Core/Dialog/PSPSaveDialog.h" #include "Core/FileSystems/MetaFileSystem.h" @@ -28,6 +29,7 @@ #include "Core/HLE/sceChnnlsv.h" #include "Core/ELF/ParamSFO.h" #include "Core/HW/MemoryStick.h" +#include "Core/Util/PPGeDraw.h" #include "image/png_load.h" diff --git a/Core/Dialog/SavedataParam.h b/Core/Dialog/SavedataParam.h index 5b89e9fd82..1aeffba75a 100644 --- a/Core/Dialog/SavedataParam.h +++ b/Core/Dialog/SavedataParam.h @@ -19,17 +19,16 @@ #include "Common/CommonTypes.h" #include "Core/MemMap.h" -#include "Core/HLE/sceKernel.h" #include "Core/HLE/sceRtc.h" -#include "Core/System.h" #include "Core/Dialog/PSPDialog.h" -#include "Core/Util/PPGeDraw.h" #undef st_ctime #undef st_atime #undef st_mtime +class PPGeImage; struct PSPFileInfo; +typedef u32_le SceSize_le; enum SceUtilitySavedataType { diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index 76ffc2cad0..44358e33f9 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -26,6 +26,7 @@ #include "Core/Host.h" #include "Core/SaveState.h" #include "Core/HLE/HLE.h" +#include "Core/HLE/sceKernel.h" #include "Core/MIPS/MIPS.h" #include "Core/HW/MemoryStick.h" #include "Core/HW/AsyncIOManager.h" diff --git a/Core/HLE/sceIo.h b/Core/HLE/sceIo.h index efcb4d4c52..a97dc0e0b0 100644 --- a/Core/HLE/sceIo.h +++ b/Core/HLE/sceIo.h @@ -19,9 +19,8 @@ #include -#include "Core/System.h" -#include "Core/HLE/HLE.h" -#include "Core/HLE/sceKernel.h" +class PointerWrap; +class KernelObject; void __IoInit(); void __IoDoState(PointerWrap &p); diff --git a/Core/HLE/sceRtc.h b/Core/HLE/sceRtc.h index 273aec2cdf..facb4b2d7c 100644 --- a/Core/HLE/sceRtc.h +++ b/Core/HLE/sceRtc.h @@ -17,6 +17,10 @@ #pragma once +#include "Common/Common.h" + +class PointerWrap; + struct PSPTimeval { s32_le tv_sec; s32_le tv_usec; From 05ab192c9c92dce744011af4cc07365e6208b8bd Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 15 Mar 2014 11:22:19 -0700 Subject: [PATCH 5/8] 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" From d65af7353bb4fbbca1a4be78aac59bd5e503e978 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 15 Mar 2014 11:32:57 -0700 Subject: [PATCH 6/8] Avoid some ChunkFile includes. --- Core/Font/PGF.cpp | 1 + Core/Font/PGF.h | 3 ++- Core/HLE/proAdhoc.h | 3 ++- Core/HLE/sceNet.h | 2 +- Core/HLE/sceNetAdhoc.cpp | 1 + Core/HLE/sceNetAdhoc.h | 2 +- Core/HW/MediaEngine.h | 2 +- Core/HW/MemoryStick.h | 2 +- Core/HW/MpegDemux.h | 3 ++- Core/HW/SasAudio.h | 3 ++- Core/MIPS/x86/Jit.h | 3 ++- 11 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Core/Font/PGF.cpp b/Core/Font/PGF.cpp index 8294525246..03be1407fc 100644 --- a/Core/Font/PGF.cpp +++ b/Core/Font/PGF.cpp @@ -20,6 +20,7 @@ // Thanks to the JPCSP project! This sceFont implementation is basically a C++ take on JPCSP's font code. // Some parts, especially in this file, were simply copied, so I guess this really makes this file GPL3. +#include "Common/ChunkFile.h" #include "Core/MemMap.h" #include "Core/Reporting.h" #include "Core/Font/PGF.h" diff --git a/Core/Font/PGF.h b/Core/Font/PGF.h index 3d79c107d6..b5b30c1dd9 100644 --- a/Core/Font/PGF.h +++ b/Core/Font/PGF.h @@ -23,9 +23,10 @@ #include #include "Common/Log.h" -#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" +class PointerWrap; + enum { FONT_FILETYPE_PGF = 0x00, FONT_FILETYPE_BWFON = 0x01, diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h index 955464164d..305603b83a 100644 --- a/Core/HLE/proAdhoc.h +++ b/Core/HLE/proAdhoc.h @@ -5,7 +5,6 @@ #include "thread/thread.h" #include "net/resolve.h" -#include "Common/ChunkFile.h" #include "Core/Config.h" #include "Core/CoreTiming.h" #include "Core/HLE/HLE.h" @@ -15,6 +14,8 @@ #include "Core/HLE/sceKernelMutex.h" #include "Core/HLE/sceUtility.h" +class PointerWrap; + // Net stuff #ifdef _XBOX #include diff --git a/Core/HLE/sceNet.h b/Core/HLE/sceNet.h index ae729911a3..48ca49f296 100644 --- a/Core/HLE/sceNet.h +++ b/Core/HLE/sceNet.h @@ -17,7 +17,7 @@ #pragma once -#include "Common/ChunkFile.h" +class PointerWrap; void Register_sceNet(); void Register_sceWlanDrv(); diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index f28972ca5b..8e57445d6c 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -20,6 +20,7 @@ // This is a direct port of Coldbird's code from http://code.google.com/p/aemu/ // All credit goes to him! +#include "Common/ChunkFile.h" #include "Core/HLE/FunctionWrappers.h" #include "Core/HLE/proAdhoc.h" #include "Core/MemMap.h" diff --git a/Core/HLE/sceNetAdhoc.h b/Core/HLE/sceNetAdhoc.h index 1529557593..e276af119f 100644 --- a/Core/HLE/sceNetAdhoc.h +++ b/Core/HLE/sceNetAdhoc.h @@ -17,7 +17,7 @@ #pragma once -#include "Common/ChunkFile.h" +class PointerWrap; void Register_sceNetAdhoc(); diff --git a/Core/HW/MediaEngine.h b/Core/HW/MediaEngine.h index 5ff3f2e0d8..ece2a32efc 100644 --- a/Core/HW/MediaEngine.h +++ b/Core/HW/MediaEngine.h @@ -26,10 +26,10 @@ #include #include "Common/CommonTypes.h" -#include "Common/ChunkFile.h" #include "Core/HLE/sceMpeg.h" #include "Core/HW/MpegDemux.h" +class PointerWrap; struct SimpleAT3; #ifdef USE_FFMPEG diff --git a/Core/HW/MemoryStick.h b/Core/HW/MemoryStick.h index 3f74c984a4..c574ca85fe 100644 --- a/Core/HW/MemoryStick.h +++ b/Core/HW/MemoryStick.h @@ -1,6 +1,6 @@ #pragma once -#include "Common/ChunkFile.h" +#include "Common/CommonTypes.h" class PointerWrap; diff --git a/Core/HW/MpegDemux.h b/Core/HW/MpegDemux.h index 28dfbbe762..bc7d31b7e8 100644 --- a/Core/HW/MpegDemux.h +++ b/Core/HW/MpegDemux.h @@ -4,9 +4,10 @@ #pragma once #include "Common/CommonTypes.h" -#include "Common/ChunkFile.h" #include "Core/HW/BufferQueue.h" +class PointerWrap; + class MpegDemux { public: diff --git a/Core/HW/SasAudio.h b/Core/HW/SasAudio.h index d0045394e6..f7e9b83f72 100644 --- a/Core/HW/SasAudio.h +++ b/Core/HW/SasAudio.h @@ -22,10 +22,11 @@ #pragma once -#include "Common/ChunkFile.h" #include "Common/CommonTypes.h" #include "Core/HW/BufferQueue.h" +class PointerWrap; + enum { PSP_SAS_VOICES_MAX = 32, diff --git a/Core/MIPS/x86/Jit.h b/Core/MIPS/x86/Jit.h index 4640289715..003c40455f 100644 --- a/Core/MIPS/x86/Jit.h +++ b/Core/MIPS/x86/Jit.h @@ -19,7 +19,6 @@ #include "Common/CommonTypes.h" #include "Common/Thunk.h" -#include "Common/ChunkFile.h" #include "Core/MIPS/x86/Asm.h" #if defined(ARM) @@ -32,6 +31,8 @@ #include "Core/MIPS/x86/RegCache.h" #include "Core/MIPS/x86/RegCacheFPU.h" +class PointerWrap; + namespace MIPSComp { From a843cbd58031d48a0c17a0e9173ca0357459354b Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 15 Mar 2014 11:44:02 -0700 Subject: [PATCH 7/8] Shrink the very common sceKernelThread.h include. --- Core/CoreTiming.cpp | 19 ++++++++++--------- Core/HLE/sceKernel.cpp | 2 ++ Core/HLE/sceKernelModule.h | 6 ++++-- Core/HLE/sceKernelThread.h | 6 +++--- Core/HLE/sceMpeg.cpp | 1 + Core/MIPS/JitCommon/JitState.h | 2 ++ Core/MIPS/MIPSCodeUtils.h | 3 +-- GPU/GLES/GLES_GPU.cpp | 1 + GPU/Software/SoftGpu.cpp | 1 + Windows/GEDebugger/VertexPreview.cpp | 8 ++++---- 10 files changed, 29 insertions(+), 20 deletions(-) diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp index 1d81b248dd..64847d1fae 100644 --- a/Core/CoreTiming.cpp +++ b/Core/CoreTiming.cpp @@ -19,15 +19,16 @@ #include #include -#include "MsgHandler.h" -#include "StdMutex.h" -#include "Atomics.h" -#include "CoreTiming.h" -#include "Core.h" -#include "Config.h" -#include "HLE/sceKernelThread.h" -#include "../Common/ChunkFile.h" -#include "HLE/sceDisplay.h" +#include "Common/MsgHandler.h" +#include "Common/StdMutex.h" +#include "Common/Atomics.h" +#include "Core/CoreTiming.h" +#include "Core/Core.h" +#include "Core/Config.h" +#include "Core/HLE/sceKernelThread.h" +#include "Core/HLE/sceDisplay.h" +#include "Core/MIPS/MIPS.h" +#include "Common/ChunkFile.h" int CPU_HZ = 222000000; diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp index 392f064c55..c639e44546 100644 --- a/Core/HLE/sceKernel.cpp +++ b/Core/HLE/sceKernel.cpp @@ -23,6 +23,7 @@ #include "Core/MIPS/MIPS.h" #include "Core/MIPS/MIPSCodeUtils.h" #include "Core/MIPS/MIPSInt.h" +#include "Core/MIPS/JitCommon/JitCommon.h" #include "Common/LogManager.h" #include "Core/FileSystems/FileSystem.h" @@ -50,6 +51,7 @@ #include "sceKernelInterrupt.h" #include "sceKernelThread.h" #include "sceKernelMemory.h" +#include "sceKernelModule.h" #include "sceKernelMutex.h" #include "sceKernelMbx.h" #include "sceKernelMsgPipe.h" diff --git a/Core/HLE/sceKernelModule.h b/Core/HLE/sceKernelModule.h index caa74f8413..0df80b797d 100644 --- a/Core/HLE/sceKernelModule.h +++ b/Core/HLE/sceKernelModule.h @@ -17,8 +17,10 @@ #pragma once -#include "sceKernel.h" -#include "HLE.h" +#include +#include "Core/HLE/sceKernel.h" + +class PointerWrap; KernelObject *__KernelModuleObject(); void __KernelModuleDoState(PointerWrap &p); diff --git a/Core/HLE/sceKernelThread.h b/Core/HLE/sceKernelThread.h index bcef04202f..67da2cc793 100644 --- a/Core/HLE/sceKernelThread.h +++ b/Core/HLE/sceKernelThread.h @@ -20,12 +20,12 @@ #include #include +#include "Common/CommonTypes.h" +#include "Core/HLE/sceKernel.h" + // There's a good description of the thread scheduling rules in: // http://code.google.com/p/jpcsp/source/browse/trunk/src/jpcsp/HLE/modules150/ThreadManForUser.java -#include "sceKernelModule.h" -#include "HLE.h" - int sceKernelChangeThreadPriority(SceUID threadID, int priority); int __KernelCreateThread(const char *threadName, SceUID moduleID, u32 entry, u32 prio, int stacksize, u32 attr, u32 optionAddr); int sceKernelCreateThread(const char *threadName, u32 entry, u32 prio, int stacksize, u32 attr, u32 optionAddr); diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp index bd4c07f4a1..354eac1ae0 100644 --- a/Core/HLE/sceMpeg.cpp +++ b/Core/HLE/sceMpeg.cpp @@ -21,6 +21,7 @@ #include #include "Core/HLE/sceMpeg.h" +#include "Core/HLE/sceKernelModule.h" #include "Core/HLE/sceKernelThread.h" #include "Core/HLE/HLE.h" #include "Core/HLE/FunctionWrappers.h" diff --git a/Core/MIPS/JitCommon/JitState.h b/Core/MIPS/JitCommon/JitState.h index 7dc1563042..ab50648775 100644 --- a/Core/MIPS/JitCommon/JitState.h +++ b/Core/MIPS/JitCommon/JitState.h @@ -18,6 +18,8 @@ #pragma once +#include "Common/Common.h" + struct JitBlock; namespace MIPSComp { diff --git a/Core/MIPS/MIPSCodeUtils.h b/Core/MIPS/MIPSCodeUtils.h index 4e2d20d437..119ae6fa8d 100644 --- a/Core/MIPS/MIPSCodeUtils.h +++ b/Core/MIPS/MIPSCodeUtils.h @@ -17,9 +17,8 @@ #pragma once -#include "JitCommon/JitCommon.h" #include "Common/CommonTypes.h" -#include "Core/HLE/HLE.h" +#include "Core/MIPS/MIPS.h" // Invalid branch target address #define INVALIDTARGET 0xFFFFFFFF diff --git a/GPU/GLES/GLES_GPU.cpp b/GPU/GLES/GLES_GPU.cpp index 28e1bbc26f..11bc63dbb8 100644 --- a/GPU/GLES/GLES_GPU.cpp +++ b/GPU/GLES/GLES_GPU.cpp @@ -37,6 +37,7 @@ #include "GPU/GLES/TransformPipeline.h" #include "GPU/GLES/TextureCache.h" +#include "Core/MIPS/MIPS.h" #include "Core/HLE/sceKernelThread.h" #include "Core/HLE/sceKernelInterrupt.h" #include "Core/HLE/sceGe.h" diff --git a/GPU/Software/SoftGpu.cpp b/GPU/Software/SoftGpu.cpp index 849306968c..9e6e3774c8 100644 --- a/GPU/Software/SoftGpu.cpp +++ b/GPU/Software/SoftGpu.cpp @@ -25,6 +25,7 @@ #include "Core/MemMap.h" #include "Core/HLE/sceKernelInterrupt.h" #include "Core/HLE/sceGe.h" +#include "Core/MIPS/MIPS.h" #include "Core/Reporting.h" #include "gfx/gl_common.h" #include "gfx_es2/gl_state.h" diff --git a/Windows/GEDebugger/VertexPreview.cpp b/Windows/GEDebugger/VertexPreview.cpp index d0827455f9..7c7d795ad6 100644 --- a/Windows/GEDebugger/VertexPreview.cpp +++ b/Windows/GEDebugger/VertexPreview.cpp @@ -179,8 +179,8 @@ void CGEDebugger::UpdatePrimPreview(u32 op) { glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendEquation(GL_FUNC_ADD); glBindTexture(GL_TEXTURE_2D, 0); - glViewport(x, y, fw, fh); - glScissor(x, y, fw, fh); + glViewport((GLint)x, (GLint)y, (GLsizei)fw, (GLsizei)fh); + glScissor((GLint)x, (GLint)y, (GLsizei)fw, (GLsizei)fh); BindPreviewProgram(previewProgram); float scale[] = { @@ -209,8 +209,8 @@ void CGEDebugger::UpdatePrimPreview(u32 op) { glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendEquation(GL_FUNC_ADD); glBindTexture(GL_TEXTURE_2D, 0); - glViewport(x, y, fw, fh); - glScissor(x, y, fw, fh); + glViewport((GLint)x, (GLint)y, (GLsizei)fw, (GLsizei)fh); + glScissor((GLint)x, (GLint)y, (GLsizei)fw, (GLsizei)fh); BindPreviewProgram(texPreviewProgram); // TODO: Probably there's a better way and place to do this. From abfa203520854e8d09cb0d161676955b14dd08d0 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 15 Mar 2014 11:49:35 -0700 Subject: [PATCH 8/8] Cut down on a few more includes in Core/HLE/. --- Core/HLE/sceCcc.h | 2 -- Core/HLE/sceGameUpdate.h | 2 -- Core/HLE/sceHprm.h | 2 -- Core/HLE/sceJpeg.h | 2 +- Core/HLE/sceMd5.h | 2 +- Core/HLE/sceMp3.h | 2 -- Core/HLE/sceMp4.h | 2 -- Core/HLE/sceMt19937.h | 2 -- Core/HLE/sceP3da.h | 2 -- Core/HLE/sceParseHttp.cpp | 5 ++--- Core/HLE/sceParseUri.cpp | 5 ++--- 11 files changed, 6 insertions(+), 22 deletions(-) diff --git a/Core/HLE/sceCcc.h b/Core/HLE/sceCcc.h index 0bc1979ea7..187c170f3c 100644 --- a/Core/HLE/sceCcc.h +++ b/Core/HLE/sceCcc.h @@ -17,8 +17,6 @@ #pragma once -#include "HLE.h" - class PointerWrap; void Register_sceCcc(); diff --git a/Core/HLE/sceGameUpdate.h b/Core/HLE/sceGameUpdate.h index dc62f01282..c164c3021f 100644 --- a/Core/HLE/sceGameUpdate.h +++ b/Core/HLE/sceGameUpdate.h @@ -17,6 +17,4 @@ #pragma once -#include "HLE.h" - void Register_sceGameUpdate(); diff --git a/Core/HLE/sceHprm.h b/Core/HLE/sceHprm.h index 43219239a0..24f2beb514 100644 --- a/Core/HLE/sceHprm.h +++ b/Core/HLE/sceHprm.h @@ -17,6 +17,4 @@ #pragma once -#include "HLE.h" - void Register_sceHprm(); \ No newline at end of file diff --git a/Core/HLE/sceJpeg.h b/Core/HLE/sceJpeg.h index 09d459f3b9..b2decf1ddc 100644 --- a/Core/HLE/sceJpeg.h +++ b/Core/HLE/sceJpeg.h @@ -17,7 +17,7 @@ #pragma once -#include "HLE.h" +class PointerWrap; void Register_sceJpeg(); void __JpegInit(); diff --git a/Core/HLE/sceMd5.h b/Core/HLE/sceMd5.h index 8acc5ad21e..311103d28c 100644 --- a/Core/HLE/sceMd5.h +++ b/Core/HLE/sceMd5.h @@ -17,7 +17,7 @@ #pragma once -#include "HLE.h" +#include "Common/CommonTypes.h" void Register_sceMd5(); diff --git a/Core/HLE/sceMp3.h b/Core/HLE/sceMp3.h index f4ca0b0b5e..84ff082dfb 100644 --- a/Core/HLE/sceMp3.h +++ b/Core/HLE/sceMp3.h @@ -17,8 +17,6 @@ #pragma once -#include "HLE.h" - class PointerWrap; void Register_sceMp3(); diff --git a/Core/HLE/sceMp4.h b/Core/HLE/sceMp4.h index 551d13b61f..5dfb300e6c 100644 --- a/Core/HLE/sceMp4.h +++ b/Core/HLE/sceMp4.h @@ -17,6 +17,4 @@ #pragma once -#include "HLE.h" - void Register_sceMp4(); diff --git a/Core/HLE/sceMt19937.h b/Core/HLE/sceMt19937.h index b3e7cf0496..71ed7afc5a 100644 --- a/Core/HLE/sceMt19937.h +++ b/Core/HLE/sceMt19937.h @@ -17,6 +17,4 @@ #pragma once -#include "HLE.h" - void Register_sceMt19937(); diff --git a/Core/HLE/sceP3da.h b/Core/HLE/sceP3da.h index b8d4e5b705..d7fc819d00 100644 --- a/Core/HLE/sceP3da.h +++ b/Core/HLE/sceP3da.h @@ -17,6 +17,4 @@ #pragma once -#include "HLE.h" - void Register_sceP3da(); diff --git a/Core/HLE/sceParseHttp.cpp b/Core/HLE/sceParseHttp.cpp index 19359552f7..3c78bd3727 100644 --- a/Core/HLE/sceParseHttp.cpp +++ b/Core/HLE/sceParseHttp.cpp @@ -15,9 +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 "sceParseHttp.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/sceParseHttp.h" const HLEFunction sceParseHttp [] = { diff --git a/Core/HLE/sceParseUri.cpp b/Core/HLE/sceParseUri.cpp index a44c9d4407..890ae1b99c 100644 --- a/Core/HLE/sceParseUri.cpp +++ b/Core/HLE/sceParseUri.cpp @@ -15,9 +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 "sceParseUri.h" +#include "Core/HLE/HLE.h" +#include "Core/HLE/sceParseUri.h" const HLEFunction sceParseUri[] = {