preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-09 22:23:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14397 from unknownbrackets/mem-validsize

Browse Source 
Core: Correct ValidSize outside scratchpad
This commit is contained in:
Henrik Rydgård
2021-04-22 08:00:54 +02:00
committed by GitHub
parent 0919f8a952 744d17e13c
commit fd2aecdbc2
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/MemMap.h
+4 -4
View File
@@ -301,8 +301,8 @@ inline bool IsValidAddress(const u32 address) {
return true;
} else if ((address & 0x3F800000) == 0x04000000) {
return true;
} else if ((address & 0xBFFF0000) == 0x00010000) {
return (address & 0x0000FFFF) < SCRATCHPAD_SIZE;
} else if ((address & 0xBFFFC000) == 0x00010000) {
return true;
} else if ((address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) {
return true;
} else {
@@ -316,8 +316,8 @@ inline u32 ValidSize(const u32 address, const u32 requested_size) {
max_size = 0x08000000 + g_MemorySize - (address & 0x3FFFFFFF);
} else if ((address & 0x3F800000) == 0x04000000) {
max_size = 0x04800000 - (address & 0x3FFFFFFF);
} else if ((address & 0xBFFF0000) == 0x00010000) {
max_size = 0x00014000 - (address & 0xBFFFFFFF);
} else if ((address & 0xBFFFC000) == 0x00010000) {
max_size = 0x00014000 - (address & 0x3FFFFFFF);
} else if ((address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) {
max_size = 0x08000000 + g_MemorySize - (address & 0x3FFFFFFF);
} else {
Core/MemMapFunctions.cpp
+4 -4
View File
@@ -35,7 +35,7 @@ u8 *GetPointer(const u32 address) {
} else if ((address & 0x3F800000) == 0x04000000) {
// VRAM
return GetPointerUnchecked(address);
} else if ((address & 0xBFFF0000) == 0x00010000 && (address & 0x0000FFFF) < SCRATCHPAD_SIZE) {
} else if ((address & 0xBFFFC000) == 0x00010000) {
// Scratchpad
return GetPointerUnchecked(address);
} else if ((address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) {
@@ -61,7 +61,7 @@ inline void ReadFromHardware(T &var, const u32 address) {
} else if ((address & 0x3F800000) == 0x04000000) {
// VRAM
var = *((const T*)GetPointerUnchecked(address));
} else if ((address & 0xBFFF0000) == 0x00010000 && (address & 0x0000FFFF) < SCRATCHPAD_SIZE) {
} else if ((address & 0xBFFFC000) == 0x00010000) {
// Scratchpad
var = *((const T*)GetPointerUnchecked(address));
} else if ((address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) {
@@ -86,7 +86,7 @@ inline void WriteToHardware(u32 address, const T data) {
} else if ((address & 0x3F800000) == 0x04000000) {
// VRAM
*(T*)GetPointerUnchecked(address) = data;
} else if ((address & 0xBFFF0000) == 0x00010000 && (address & 0x0000FFFF) < SCRATCHPAD_SIZE) {
} else if ((address & 0xBFFFC000) == 0x00010000) {
// Scratchpad
*(T*)GetPointerUnchecked(address) = data;
} else if ((address & 0x3F000000) >= 0x08000000 && (address & 0x3F000000) < 0x08000000 + g_MemorySize) {
@@ -113,7 +113,7 @@ bool IsRAMAddress(const u32 address) {
}
bool IsScratchpadAddress(const u32 address) {
return (address & 0xBFFF0000) == 0x00010000 && (address & 0x0000FFFF) < SCRATCHPAD_SIZE;
return (address & 0xBFFFC000) == 0x00010000;
}
u8 Read_U8(const u32 address) {
unittest/UnitTest.cpp
+5
View File
@@ -572,6 +572,11 @@ static bool TestMemMap() {
}
}
EXPECT_FALSE(Memory::IsValidAddress(0x00015000));
EXPECT_FALSE(Memory::IsValidAddress(0x04900000));
EXPECT_EQ_HEX(Memory::ValidSize(0x00015000, 4), 0);
EXPECT_EQ_HEX(Memory::ValidSize(0x04900000, 4), 0);
return true;
}