Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix HD Remasters and tidy up. This should be the final commit for the preliminary support, no further coding style issues withstanding.

Browse source
This commit is contained in:
The Dax 2013-06-23 00:17:33 -04:00
parent 6b35340265
commit d11deba3cd
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/MemMap.cpp
View file

@ -84,6 +84,7 @@ static const int num_views = sizeof(views) / sizeof(MemoryView);
void Init()
{
int flags = 0;
Memory::g_MemoryMask = Memory::g_MemorySize - 1;
for(int i = 0; i < ARRAY_SIZE(views); i++) {
if(views[i].size == 0)

2
Core/MemMapFunctions.cpp
View file

@ -46,7 +46,6 @@ u8 *GetPointer(const u32 address)
if ((address & 0x3E000000) == 0x08000000) {
return m_pRAM + (address & g_MemoryMask);
}
else if ((address & 0x3F800000) == 0x04000000) {
return m_pVRAM + (address & VRAM_MASK);
}
@ -140,7 +139,6 @@ bool IsValidAddress(const u32 address)
if ((address & 0x3E000000) == 0x08000000) {
return true;
}
else if ((address & 0x3F800000) == 0x04000000) {
return true;
}

10
Core/PSPLoaders.cpp
View file

@ -46,14 +46,6 @@
// to determine if the emulator should enable extra memory and
// double-sized texture coordinates.
void InitMemoryForGameISO(std::string fileToStart) {
// Default memory settings
// Seems to be the safest place currently..
Memory::g_MemoryEnd = 0x0A000000;
Memory::g_MemorySize = 0x2000000;
g_RemasterMode = false;
g_DoubleTextureCoordinates = false;
Memory::g_MemoryMask = Memory::g_MemorySize - 1;
ISOFileSystem *umd2 = new ISOFileSystem(&pspFileSystem, constructBlockDevice(fileToStart.c_str()));
// Parse PARAM.SFO
@ -96,7 +88,7 @@ void InitMemoryForGameISO(std::string fileToStart) {
bool Load_PSP_ISO(const char *filename, std::string *error_string)
{
//Mounting stuff removed due to HD Remaster restructuring of code.
//Mounting stuff relocated to InitMemoryForGameISO due to HD Remaster restructuring of code.
std::string sfoPath("disc0:/PSP_GAME/PARAM.SFO");
PSPFileInfo fileInfo = pspFileSystem.GetFileInfo(sfoPath.c_str());

9
Core/System.cpp
View file

@ -74,7 +74,14 @@ bool PSP_Init(const CoreParameter &coreParam, std::string *error_string)
currentCPU = &mipsr4k;
numCPUs = 1;
std::string filename = coreParameter.fileToStart;
// Default memory settings
// Seems to be the safest place currently..
Memory::g_MemoryEnd = 0x0A000000; //End of PSP User space memory
Memory::g_MemorySize = 0x2000000; //32 MB of ram by default
g_RemasterMode = false;
g_DoubleTextureCoordinates = false;
std::string filename = coreParam.fileToStart;
EmuFileType type = Identify_File(filename);
if(type == FILETYPE_PSP_ISO || type == FILETYPE_PSP_ISO_NP)