diff options
| author | Léo Lam <leo@leolam.fr> | 2021-03-05 11:49:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-05 11:49:55 +0100 |
| commit | 5f7d935b0a40f5cece7341927bd92b6a8d5debbe (patch) | |
| tree | 545a5ee40fd6d1897505f8a0ea688ffae0010031 /Source/Core | |
| parent | fc86e554e03916c8f9144f8dba9048977fb21300 (diff) | |
| parent | 6982832f8220ba69d4f7190a00841efc80b7768d (diff) | |
Merge pull request #9533 from sepalani/mmu-is-ram
MMU: Fix IsRAMAddress not working
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/PowerPC/MMU.cpp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp index 8ab9c34078..9714af5bc7 100644 --- a/Source/Core/Core/PowerPC/MMU.cpp +++ b/Source/Core/Core/PowerPC/MMU.cpp @@ -207,7 +207,7 @@ static T ReadFromHardware(u32 em_address) // TODO: Make sure these are safe for unaligned addresses. - if ((em_address & 0xF8000000) == 0x00000000) + if (Memory::m_pRAM && (em_address & 0xF8000000) == 0x00000000) { // Handle RAM; the masking intentionally discards bits (essentially creating // mirrors of memory). @@ -226,7 +226,8 @@ static T ReadFromHardware(u32 em_address) } // Locked L1 technically doesn't have a fixed address, but games all use 0xE0000000. - if ((em_address >> 28) == 0xE && (em_address < (0xE0000000 + Memory::GetL1CacheSize()))) + if (Memory::m_pL1Cache && (em_address >> 28) == 0xE && + (em_address < (0xE0000000 + Memory::GetL1CacheSize()))) { T value; std::memcpy(&value, &Memory::m_pL1Cache[em_address & 0x0FFFFFFF], sizeof(T)); @@ -296,7 +297,7 @@ static void WriteToHardware(u32 em_address, const T data) // TODO: Make sure these are safe for unaligned addresses. - if ((em_address & 0xF8000000) == 0x00000000) + if (Memory::m_pRAM && (em_address & 0xF8000000) == 0x00000000) { // Handle RAM; the masking intentionally discards bits (essentially creating // mirrors of memory). @@ -315,7 +316,8 @@ static void WriteToHardware(u32 em_address, const T data) } // Locked L1 technically doesn't have a fixed address, but games all use 0xE0000000. - if ((em_address >> 28 == 0xE) && (em_address < (0xE0000000 + Memory::GetL1CacheSize()))) + if (Memory::m_pL1Cache && (em_address >> 28 == 0xE) && + (em_address < (0xE0000000 + Memory::GetL1CacheSize()))) { const T swapped_data = bswap(data); std::memcpy(&Memory::m_pL1Cache[em_address & 0x0FFFFFFF], &swapped_data, sizeof(T)); @@ -665,15 +667,24 @@ static bool IsRAMAddress(u32 address, bool translate) } u32 segment = address >> 28; - if (segment == 0x0 && (address & 0x0FFFFFFF) < Memory::GetRamSizeReal()) + if (Memory::m_pRAM && segment == 0x0 && (address & 0x0FFFFFFF) < Memory::GetRamSizeReal()) + { return true; + } else if (Memory::m_pEXRAM && segment == 0x1 && (address & 0x0FFFFFFF) < Memory::GetExRamSizeReal()) + { return true; + } else if (Memory::m_pFakeVMEM && ((address & 0xFE000000) == 0x7E000000)) + { return true; - else if (segment == 0xE && (address < (0xE0000000 + Memory::GetL1CacheSize()))) + } + else if (Memory::m_pL1Cache && segment == 0xE && + (address < (0xE0000000 + Memory::GetL1CacheSize()))) + { return true; + } return false; } |