thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bugs when memory size is 0x04C00000/etc.

Browse source 
Was experimenting with trying to match my non-phat's ram size.
This commit is contained in:
Unknown W. Brackets 2013-09-09 00:19:26 -07:00
parent 74418c13bf
commit 38e30e5a67
4 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Core/MemMap.cpp
View file

@ -57,9 +57,9 @@ u8 *m_pUncachedVRAM;
// Holds the ending address of the PSP's user space. // Holds the ending address of the PSP's user space.
// Required for HD Remasters to work properly. // Required for HD Remasters to work properly.
// These replace RAM_SIZE and RAM_MASK, respectively. // These replace RAM_NORMAL_SIZE and RAM_NORMAL_MASK, respectively.
u32 g_MemoryMask;
u32 g_MemorySize; u32 g_MemorySize;
u32 g_MemoryMask;
// We don't declare the IO region in here since its handled by other means. // We don't declare the IO region in here since its handled by other means.
static MemoryView views[] = static MemoryView views[] =
@ -81,7 +81,10 @@ static const int num_views = sizeof(views) / sizeof(MemoryView);
void Init() void Init()
{ {
int flags = 0; int flags = 0;
Memory::g_MemoryMask = Memory::g_MemorySize - 1; // This mask is used ONLY after validating the address is in the correct range.
// So let's juse use a fixed mask to remove the uncached/user memory bits.
// Using (Memory::g_MemorySize - 1) won't work for e.g. 0x04C00000.
Memory::g_MemoryMask = 0x07FFFFFF;
for (size_t i = 0; i < ARRAY_SIZE(views); i++) { for (size_t i = 0; i < ARRAY_SIZE(views); i++) {
if (views[i].flags & MV_IS_PRIMARY_RAM) if (views[i].flags & MV_IS_PRIMARY_RAM)

4
Core/MemMap.h
View file

@ -79,6 +79,10 @@ extern u32 g_MemoryMask;
enum enum
{ {
// This may be adjusted by remaster games.
RAM_NORMAL_SIZE = 0x02000000,
RAM_NORMAL_MASK = RAM_NORMAL_SIZE - 1,
VRAM_SIZE = 0x200000, VRAM_SIZE = 0x200000,
VRAM_MASK = VRAM_SIZE - 1, VRAM_MASK = VRAM_SIZE - 1,

14
Core/MemMapFunctions.cpp
View file

@ -40,7 +40,7 @@ namespace Memory
u8 *GetPointer(const u32 address) u8 *GetPointer(const u32 address)
{ {
if ((address & 0x3E000000) == 0x08000000) { if ((address & 0x3E000000) == 0x08000000) {
return m_pRAM + (address & g_MemoryMask); return m_pRAM + (address & RAM_NORMAL_MASK);
} }
else if ((address & 0x3F800000) == 0x04000000) { else if ((address & 0x3F800000) == 0x04000000) {
return m_pVRAM + (address & VRAM_MASK); return m_pVRAM + (address & VRAM_MASK);
@ -48,7 +48,7 @@ u8 *GetPointer(const u32 address)
else if ((address & 0xBFFF0000) == 0x00010000) { else if ((address & 0xBFFF0000) == 0x00010000) {
return m_pScratchPad + (address & SCRATCHPAD_MASK); return m_pScratchPad + (address & SCRATCHPAD_MASK);
} }
else if (g_RemasterMode && (address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) { else if ((address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) {
return m_pRAM + (address & g_MemoryMask); return m_pRAM + (address & g_MemoryMask);
} }
else { else {
@ -75,7 +75,7 @@ inline void ReadFromHardware(T &var, const u32 address)
// Could just do a base-relative read, too.... TODO // Could just do a base-relative read, too.... TODO
if ((address & 0x3E000000) == 0x08000000) { if ((address & 0x3E000000) == 0x08000000) {
var = *((const T*)&m_pRAM[address & g_MemoryMask]); var = *((const T*)&m_pRAM[address & RAM_NORMAL_MASK]);
} }
else if ((address & 0x3F800000) == 0x04000000) { else if ((address & 0x3F800000) == 0x04000000) {
var = *((const T*)&m_pVRAM[address & VRAM_MASK]); var = *((const T*)&m_pVRAM[address & VRAM_MASK]);
@ -84,7 +84,7 @@ inline void ReadFromHardware(T &var, const u32 address)
// Scratchpad // Scratchpad
var = *((const T*)&m_pScratchPad[address & SCRATCHPAD_MASK]); var = *((const T*)&m_pScratchPad[address & SCRATCHPAD_MASK]);
} }
else if (g_RemasterMode && (address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) { else if ((address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) {
var = *((const T*)&m_pRAM[address & g_MemoryMask]); var = *((const T*)&m_pRAM[address & g_MemoryMask]);
} }
else else
@ -113,7 +113,7 @@ inline void WriteToHardware(u32 address, const T data)
// Could just do a base-relative write, too.... TODO // Could just do a base-relative write, too.... TODO
if ((address & 0x3E000000) == 0x08000000) { if ((address & 0x3E000000) == 0x08000000) {
*(T*)&m_pRAM[address & g_MemoryMask] = data; *(T*)&m_pRAM[address & RAM_NORMAL_MASK] = data;
} }
else if ((address & 0x3F800000) == 0x04000000) { else if ((address & 0x3F800000) == 0x04000000) {
*(T*)&m_pVRAM[address & VRAM_MASK] = data; *(T*)&m_pVRAM[address & VRAM_MASK] = data;
@ -121,7 +121,7 @@ inline void WriteToHardware(u32 address, const T data)
else if ((address & 0xBFFF0000) == 0x00010000) { else if ((address & 0xBFFF0000) == 0x00010000) {
*(T*)&m_pScratchPad[address & SCRATCHPAD_MASK] = data; *(T*)&m_pScratchPad[address & SCRATCHPAD_MASK] = data;
} }
else if (g_RemasterMode && (address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) { else if ((address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) {
*(T*)&m_pRAM[address & g_MemoryMask] = data; *(T*)&m_pRAM[address & g_MemoryMask] = data;
} }
else else
@ -156,7 +156,7 @@ bool IsValidAddress(const u32 address)
else if ((address & 0xBFFF0000) == 0x00010000) { else if ((address & 0xBFFF0000) == 0x00010000) {
return true; return true;
} }
else if (g_RemasterMode && (address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) { else if ((address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) {
return true; return true;
} }
else else

2
Core/System.cpp
View file

@ -136,7 +136,7 @@ void CPU_Init() {
// Default memory settings // Default memory settings
// Seems to be the safest place currently.. // Seems to be the safest place currently..
Memory::g_MemorySize = 0x02000000; // 32 MB of ram by default Memory::g_MemorySize = Memory::RAM_NORMAL_SIZE; // 32 MB of ram by default
g_RemasterMode = false; g_RemasterMode = false;
g_DoubleTextureCoordinates = false; g_DoubleTextureCoordinates = false;