libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-12-03 14:40:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Start untangling our include mess a little.

Browse Source
This commit is contained in:
Henrik Rydgård 2013-12-29 23:28:31 +01:00
parent f3e550e8df
commit 79ff2f0ba8
39 changed files with 184 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -966,6 +966,7 @@ add_library(${CoreLibName} ${CoreLinkType}
Core/FileSystems/DirectoryFileSystem.cpp
Core/FileSystems/DirectoryFileSystem.h
Core/FileSystems/FileSystem.h
Core/FileSystems/FileSystem.cpp
Core/FileSystems/ISOFileSystem.cpp
Core/FileSystems/ISOFileSystem.h
Core/FileSystems/MetaFileSystem.cpp

3
Core/Core.vcxproj
View File

@ -188,6 +188,7 @@
<ClCompile Include="FileSystems\BlockDevices.cpp" />
<ClCompile Include="FileSystems\DirectoryFileSystem.cpp" />
<ClCompile Include="FileSystems\ISOFileSystem.cpp" />
<ClCompile Include="FileSystems\FileSystem.cpp" />
<ClCompile Include="FileSystems\MetaFileSystem.cpp" />
<ClCompile Include="FileSystems\tlzrc.cpp" />
<ClCompile Include="FileSystems\VirtualDiscFileSystem.cpp" />
@ -629,4 +630,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

5
Core/Core.vcxproj.filters
View File

@ -126,6 +126,9 @@
<ClCompile Include="FileSystems\ISOFileSystem.cpp">
<Filter>FileSystems</Filter>
</ClCompile>
<ClCompile Include="FileSystems\FileSystem.cpp">
<Filter>FileSystems</Filter>
</ClCompile>
<ClCompile Include="FileSystems\MetaFileSystem.cpp">
<Filter>FileSystems</Filter>
</ClCompile>
@ -958,4 +961,4 @@
<None Include="..\android\jni\Android.mk" />
<None Include="GameLogNotes.txt" />
</ItemGroup>
</Project>
</Project>

12
Core/CwCheat.cpp
View File

@ -1,11 +1,11 @@
#include "CwCheat.h"
#include "../Core/CoreTiming.h"
#include "../Core/CoreParameter.h"
#include "StringUtils.h"
#include "Common/StringUtils.h"
#include "Common/ChunkFile.h"
#include "Common/FileUtil.h"
#include "Config.h"
#include "MIPS/MIPS.h"
#include "Core/CoreTiming.h"
#include "Core/CoreParameter.h"
#include "Core/CwCheat.h"
#include "Core/Config.h"
#include "Core/MIPS/MIPS.h"
static int CheatEvent = -1;
std::string gameTitle;

9
Core/Dialog/PSPGamedataInstallDialog.cpp
View File

@ -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 "PSPGamedataInstallDialog.h"
#include "ChunkFile.h"
#include "../Core/MemMap.h"
#include "Common/ChunkFile.h"
#include "Core/MemMap.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "Core/Dialog/PSPGamedataInstallDialog.h"
std::string saveBasePath = "ms0:/PSP/SAVEDATA/";
@ -176,4 +177,4 @@ void PSPGamedataInstallDialog::DoState(PointerWrap &p) {
} else {
paramAddr = 0;
}
}
}

18
Core/Dialog/PSPSaveDialog.cpp
View File

@ -15,15 +15,19 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "PSPSaveDialog.h"
#include "../Util/PPGeDraw.h"
#include "../HLE/sceCtrl.h"
#include "../HLE/sceUtility.h"
#include "../Core/MemMap.h"
#include "../Config.h"
#include "i18n/i18n.h"
#include "Common/ChunkFile.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "Core/Util/PPGeDraw.h"
#include "Core/HLE/sceCtrl.h"
#include "Core/HLE/sceUtility.h"
#include "Core/MemMap.h"
#include "Core/Config.h"
#include "Core/Reporting.h"
#include "Core/HW/MemoryStick.h"
#include "i18n/i18n.h"
#include "Core/Dialog/PSPSaveDialog.h"
const float FONT_SCALE = 0.55f;

2
Core/Dialog/SavedataParam.cpp
View File

@ -17,9 +17,11 @@
#include "base/logging.h"
#include "Common/ChunkFile.h"
#include "Core/Reporting.h"
#include "Core/Dialog/SavedataParam.h"
#include "Core/Dialog/PSPSaveDialog.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "Core/HLE/sceIo.h"
#include "Core/HLE/sceKernelMemory.h"
#include "Core/HLE/sceChnnlsv.h"

2
Core/Dialog/SavedataParam.h
View File

@ -28,6 +28,8 @@
#undef st_atime
#undef st_mtime
struct PSPFileInfo;
enum SceUtilitySavedataType
{
SCE_UTILITY_SAVEDATA_TYPE_AUTOLOAD = 0,

39
Core/FileSystems/FileSystem.cpp Normal file
View File

@ -0,0 +1,39 @@
// Copyright (c) 2012- PPSSPP Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0 or later versions.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Common/ChunkFile.h"
#include "Core/FileSystems/FileSystem.h"
void PSPFileInfo::DoState(PointerWrap &p) {
auto s = p.Section("PSPFileInfo", 1);
if (!s)
return;
p.Do(name);
p.Do(size);
p.Do(access);
p.Do(exists);
p.Do(type);
p.Do(atime);
p.Do(ctime);
p.Do(mtime);
p.Do(isOnSectorSystem);
p.Do(startSector);
p.Do(numSectors);
p.Do(sectorSize);
}

24
Core/FileSystems/FileSystem.h
View File

@ -17,8 +17,6 @@
#pragma once
#include "../../Globals.h"
#include "Common/ChunkFile.h"
#include "Core/HLE/sceKernel.h"
enum FileAccess
@ -69,28 +67,10 @@ private:
struct PSPFileInfo
{
PSPFileInfo()
PSPFileInfo()
: size(0), access(0), exists(false), type(FILETYPE_NORMAL), isOnSectorSystem(false), startSector(0), numSectors(0) {}
void DoState(PointerWrap &p)
{
auto s = p.Section("PSPFileInfo", 1);
if (!s)
return;
p.Do(name);
p.Do(size);
p.Do(access);
p.Do(exists);
p.Do(type);
p.Do(atime);
p.Do(ctime);
p.Do(mtime);
p.Do(isOnSectorSystem);
p.Do(startSector);
p.Do(numSectors);
p.Do(sectorSize);
}
void DoState(PointerWrap &p);
std::string name;
s64 size;

8
Core/FileSystems/ISOFileSystem.cpp
View File

@ -15,15 +15,17 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <cstring>
#include <cstdio>
#include <ctype.h>
#include "Globals.h"
#include "Common/Common.h"
#include "Common/ChunkFile.h"
#include "Core/FileSystems/ISOFileSystem.h"
#include "Core/HLE/sceKernel.h"
#include "Core/MemMap.h"
#include "Core/Reporting.h"
#include <cstring>
#include <cstdio>
#include <ctype.h>
const int sectorSize = 2048;

4
Core/FileSystems/MetaFileSystem.cpp
View File

@ -15,8 +15,10 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <set>
#include <algorithm>
#include <set>
#include "Common/ChunkFile.h"
#include "Common/StringUtils.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "Core/HLE/sceKernelThread.h"

1
Core/HLE/sceCcc.cpp
View File

@ -19,6 +19,7 @@
#include "util/text/utf16.h"
#include "util/text/shiftjis.h"
#include "Common/ChunkFile.h"
#include "Core/HLE/HLE.h"
#include "Core/Reporting.h"

1
Core/HLE/sceDisplay.cpp
View File

@ -30,6 +30,7 @@
#include "gfx_es2/gl_state.h"
#endif
#include "Common/ChunkFile.h"
#include "Core/CoreTiming.h"
#include "Core/CoreParameter.h"
#include "Core/Reporting.h"

1
Core/HLE/sceDmac.cpp
View File

@ -16,6 +16,7 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Globals.h"
#include "Common/ChunkFile.h"
#include "Core/CoreTiming.h"
#include "Core/MemMap.h"
#include "Core/Reporting.h"

7
Core/HLE/sceFont.cpp
View File

@ -7,10 +7,11 @@
#include <map>
#include <algorithm>
#include "HLE.h"
#include "../MIPS/MIPS.h"
#include "ChunkFile.h"
#include "Common/ChunkFile.h"
#include "Core/HLE/HLE.h"
#include "Core/MIPS/MIPS.h"
#include "Core/FileSystems/FileSystem.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "Core/Reporting.h"
#include "Core/System.h"
#include "Core/HLE/sceKernel.h"

1
Core/HLE/sceGe.cpp
View File

@ -18,6 +18,7 @@
#include <map>
#include <vector>
#include "Common/ChunkFile.h"
#include "Core/HLE/HLE.h"
#include "Core/MIPS/MIPS.h"
#include "Core/System.h"

6
Core/HLE/sceJpeg.cpp
View File

@ -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 "native/ext/jpge/jpgd.h"
#include "Common.h"
#include "Common/ChunkFile.h"
#include "Core/HLE/HLE.h"
#include "Core/Reporting.h"
#include "Common.h"
#include "native/ext/jpge/jpgd.h"
//Uncomment if you want to dump JPEGs loaded through sceJpeg to a file
//#define JPEG_DEBUG

2
Core/HLE/sceKernelMemory.cpp
View File

@ -19,6 +19,8 @@
#include <string>
#include <vector>
#include <map>
#include "Common/ChunkFile.h"
#include "Core/HLE/HLE.h"
#include "Core/System.h"
#include "Core/MIPS/MIPS.h"

1
Core/HLE/sceKernelModule.cpp
View File

@ -20,6 +20,7 @@
#include <set>
#include "native/base/stringutil.h"
#include "Common/ChunkFile.h"
#include "Common/FileUtil.h"
#include "Core/Config.h"
#include "Core/HLE/HLE.h"

7
Core/HLE/scePauth.cpp
View File

@ -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 "scePauth.h"
#include "zlib.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "Core/HLE/scePauth.h"
#include "Core/HLE/HLE.h"
int scePauth_F7AA47F6(u32 srcPtr, int srcLength, u32 destLengthPtr, u32 workArea)
{
ERROR_LOG(HLE, "UNIMPL scePauth_F7AA47F6(%08x, %08x, %08x, %08x)", srcPtr, srcLength, destLengthPtr, workArea);

1
Core/HLE/scePsmf.cpp
View File

@ -19,6 +19,7 @@
#include "Common/ChunkFile.h"
#include "Core/Reporting.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "Core/HLE/scePsmf.h"
#include "Core/HLE/sceMpeg.h"
#include "Core/HW/MediaEngine.h"

1
Core/HLE/sceRtc.cpp
View File

@ -25,6 +25,7 @@
#include <time.h>
#include "base/timeutil.h"
#include "Common/ChunkFile.h"
#include "Core/HLE/HLE.h"
#include "Core/MIPS/MIPS.h"
#include "Core/Reporting.h"

1
Core/HLE/sceUmd.cpp
View File

@ -26,6 +26,7 @@
#include "Core/HLE/KernelWaitHelpers.h"
#include "Core/FileSystems/BlockDevices.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "Core/FileSystems/ISOFileSystem.h"
#include "Core/FileSystems/VirtualDiscFileSystem.h"

31
Core/HLE/sceUtility.cpp
View File

@ -17,24 +17,25 @@
#include <set>
#include "HLE.h"
#include "../MIPS/MIPS.h"
#include "file/ini_file.h"
#include "Common/ChunkFile.h"
#include "Core/HLE/HLE.h"
#include "Core/MIPS/MIPS.h"
#include "Core/Reporting.h"
#include "sceKernel.h"
#include "sceKernelThread.h"
#include "sceUtility.h"
#include "Core/HLE/sceKernel.h"
#include "Core/HLE/sceKernelThread.h"
#include "Core/HLE/sceUtility.h"
#include "sceCtrl.h"
#include "../Util/PPGeDraw.h"
#include "../Dialog/PSPSaveDialog.h"
#include "../Dialog/PSPMsgDialog.h"
#include "../Dialog/PSPPlaceholderDialog.h"
#include "../Dialog/PSPOskDialog.h"
#include "../Dialog/PSPGamedataInstallDialog.h"
#include "../Dialog/PSPNetconfDialog.h"
#include "../native/file/ini_file.h"
#include "Core/HLE/sceCtrl.h"
#include "Core/Util/PPGeDraw.h"
#include "Core/Dialog/PSPSaveDialog.h"
#include "Core/Dialog/PSPMsgDialog.h"
#include "Core/Dialog/PSPPlaceholderDialog.h"
#include "Core/Dialog/PSPOskDialog.h"
#include "Core/Dialog/PSPGamedataInstallDialog.h"
#include "Core/Dialog/PSPNetconfDialog.h"
const int SCE_ERROR_MODULE_BAD_ID = 0x80111101;
const int SCE_ERROR_MODULE_ALREADY_LOADED = 0x80111102;

1
Core/HW/AsyncIOManager.cpp
View File

@ -15,6 +15,7 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Common/ChunkFile.h"
#include "Core/Reporting.h"
#include "Core/System.h"
#include "Core/HW/AsyncIOManager.h"

19
Core/Loaders.cpp
View File

@ -16,16 +16,17 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "file/file_util.h"
#include "Common/FileUtil.h"
#include "MIPS/MIPS.h"
#include "MIPS/MIPSCodeUtils.h"
#include "HLE/HLE.h"
#include "HLE/sceKernelModule.h"
#include "PSPLoaders.h"
#include "MemMap.h"
#include "Loaders.h"
#include "System.h"
#include "Common/FileUtil.h"
#include "Core/MIPS/MIPS.h"
#include "Core/MIPS/MIPSCodeUtils.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "Core/HLE/HLE.h"
#include "Core/HLE/sceKernelModule.h"
#include "Core/PSPLoaders.h"
#include "Core/MemMap.h"
#include "Core/Loaders.h"
#include "Core/System.h"
// TODO : improve, look in the file more
IdentifiedFileType Identify_File(std::string &filename)

4
Core/MIPS/MIPS.cpp
View File

@ -19,7 +19,9 @@
#include <limits>
#include "math/math_util.h"
#include "Common.h"
#include "Common/ChunkFile.h"
#include "Core/MIPS/MIPS.h"
#include "Core/MIPS/MIPSTables.h"
#include "Core/MIPS/MIPSDebugInterface.h"
@ -337,4 +339,4 @@ const char *MIPSState::DisasmAt(u32 compilerPC) {
static char temp[256];
MIPSDisAsm(Memory::Read_Instruction(compilerPC), 0, temp);
return temp;
}
}

34
Core/PSPLoaders.cpp
View File

@ -15,33 +15,35 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "ELF/ElfReader.h"
#include "file/file_util.h"
#include "Common/StringUtils.h"
#include "Core/ELF/ElfReader.h"
#include "Core/ELF/ParamSFO.h"
#include "FileSystems/BlockDevices.h"
#include "FileSystems/DirectoryFileSystem.h"
#include "FileSystems/ISOFileSystem.h"
#include "FileSystems/MetaFileSystem.h"
#include "FileSystems/VirtualDiscFileSystem.h"
#include "MemMap.h"
#include "Core/MemMap.h"
#include "MIPS/MIPS.h"
#include "MIPS/MIPSAnalyst.h"
#include "MIPS/MIPSCodeUtils.h"
#include "file/file_util.h"
#include "StringUtils.h"
#include "Core/MIPS/MIPS.h"
#include "Core/MIPS/MIPSAnalyst.h"
#include "Core/MIPS/MIPSCodeUtils.h"
#include "Host.h"
#include "System.h"
#include "PSPLoaders.h"
#include "HLE/HLE.h"
#include "HLE/sceKernel.h"
#include "HLE/sceKernelThread.h"
#include "HLE/sceKernelModule.h"
#include "HLE/sceKernelMemory.h"
#include "ELF/ParamSFO.h"
#include "Core/Config.h"
#include "Core/System.h"
#include "Core/PSPLoaders.h"
#include "Core/HLE/HLE.h"
#include "Core/HLE/sceKernel.h"
#include "Core/HLE/sceKernelThread.h"
#include "Core/HLE/sceKernelModule.h"
#include "Core/HLE/sceKernelMemory.h"
// We gather the game info before actually loading/booting the ISO
// to determine if the emulator should enable extra memory and

9
Core/SaveState.cpp
View File

@ -17,8 +17,12 @@
#include <vector>
#include "base/timeutil.h"
#include "i18n/i18n.h"
#include "Common/StdMutex.h"
#include "Common/FileUtil.h"
#include "Common/ChunkFile.h"
#include "Core/SaveState.h"
#include "Core/Config.h"
@ -26,16 +30,15 @@
#include "Core/CoreTiming.h"
#include "Core/Host.h"
#include "Core/System.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "Core/HLE/HLE.h"
#include "Core/HLE/sceKernel.h"
#include "HW/MemoryStick.h"
#include "Core/MemMap.h"
#include "Core/MIPS/MIPS.h"
#include "Core/MIPS/JitCommon/JitCommon.h"
#include "HW/MemoryStick.h"
#include "GPU/GPUState.h"
#include "UI/OnScreenDisplay.h"
#include "base/timeutil.h"
#include "i18n/i18n.h"
namespace SaveState
{

7
Core/System.h
View File

@ -17,13 +17,14 @@
#pragma once
#include "../Globals.h"
#include "Globals.h"
#include "Core/MemMap.h"
#include "Core/Host.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "Core/CoreParameter.h"
#include "Core/ELF/ParamSFO.h"
class MetaFileSystem;
extern MetaFileSystem pspFileSystem;
extern ParamSFOData g_paramSFO;
@ -87,4 +88,4 @@ extern volatile CoreState coreState;
extern volatile bool coreStatePending;
void Core_UpdateState(CoreState newState);
CoreParameter &PSP_CoreParameter();
CoreParameter &PSP_CoreParameter();

12
Core/Util/PPGeDraw.cpp
View File

@ -16,17 +16,21 @@
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <algorithm>
#include "Core/Util/PPGeDraw.h"
#include "image/zim_load.h"
#include "image/png_load.h"
#include "util/text/utf8.h"
#include "Common/ChunkFile.h"
#include "GPU/ge_constants.h"
#include "GPU/GPUState.h"
#include "GPU/GPUInterface.h"
#include "Core/FileSystems/MetaFileSystem.h"
#include "Core/Util/PPGeDraw.h"
#include "Core/HLE/sceKernel.h"
#include "Core/HLE/sceKernelMemory.h"
#include "Core/HLE/sceGe.h"
#include "Core/MemMap.h"
#include "image/zim_load.h"
#include "image/png_load.h"
#include "util/text/utf8.h"
#include "Core/System.h"
static u32 atlasPtr;

2
GPU/GLES/GLES_GPU.cpp
View File

@ -18,6 +18,8 @@
#include "base/logging.h"
#include "gfx_es2/gl_state.h"
#include "Common/ChunkFile.h"
#include "Core/Debugger/Breakpoints.h"
#include "Core/MemMap.h"
#include "Core/Host.h"

5
UI/CwCheatScreen.h
View File

@ -15,6 +15,10 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include <string>
#include <deque>
#include <fstream>
#include "base/functional.h"
#include "ui/view.h"
#include "ui/ui_screen.h"
@ -22,6 +26,7 @@
#include "../Core/CwCheat.h"
#include "UI/MiscScreens.h"
#include "UI/GameSettingsScreen.h"
using namespace UI;
extern std::string activeCheatFile;
extern std::string gameTitle;

3
UI/GameSettingsScreen.cpp
View File

@ -35,6 +35,8 @@
#include "UI/TiltAnalogSettingsScreen.h"
#include "UI/TiltEventProcessor.h"
#include "Common/KeyMap.h"
#include "Common/FileUtil.h"
#include "Core/Config.h"
#include "Core/Host.h"
#include "Core/System.h"
@ -43,7 +45,6 @@
#include "android/jni/TestRunner.h"
#include "GPU/GPUInterface.h"
#include "GPU/GLES/Framebuffer.h"
#include "Common/KeyMap.h"
#ifdef _WIN32
namespace MainWindow {

1
android/jni/Android.mk
View File

@ -252,6 +252,7 @@ EXEC_AND_LIB_FILES := \
$(SRC)/Core/HLE/scePauth.cpp \
$(SRC)/Core/FileSystems/BlockDevices.cpp \
$(SRC)/Core/FileSystems/ISOFileSystem.cpp \
$(SRC)/Core/FileSystems/FileSystem.cpp \
$(SRC)/Core/FileSystems/MetaFileSystem.cpp \
$(SRC)/Core/FileSystems/DirectoryFileSystem.cpp \
$(SRC)/Core/FileSystems/VirtualDiscFileSystem.cpp \

3
android/jni/TestRunner.cpp
View File

@ -22,6 +22,7 @@
// It currently just runs one test but that can be easily changed.
#include <string>
#include <fstream>
#include <sstream>
#include <iostream>
@ -157,4 +158,4 @@ void RunTests()
PSP_CoreParameter().pixelHeight = pixel_yres;
PSP_CoreParameter().headLess = false;
g_Config.sReportHost = savedReportHost;
}
}

2
lang

@ -1 +1 @@
Subproject commit d8e1f6abb7e61e905e14e5d3dfe679ebfd58bc76
Subproject commit dbc1d95219486ca6f683f2b2032c437fe213464e

2
native

@ -1 +1 @@
Subproject commit 6670d0003a1960244993145703cd26c732b1c435
Subproject commit d9467bca85933f85e978d22da8c711d072513131