Core: Do not set m_MemoryReadMap/m_MemoryWriteMap if tlb mapping is o…

…utside rdram
project64 · Nov 14, 2022 · 989827c · 989827c
1 parent 97e3f50
commit 989827c
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
@@ -1019,11 +1019,17 @@ void CMipsMemoryVM::TLB_Mapped(uint32_t VAddr, uint32_t Len, uint32_t PAddr, boo
     for (uint32_t Address = VAddr; Address < VEnd; Address += 0x1000)
     {
         size_t Index = Address >> 12;
-        m_MemoryReadMap[Index] = (size_t)((m_RDRAM + (Address - VAddr + PAddr)) - Address);
+        if ((Address - VAddr + PAddr) < m_AllocatedRdramSize)
+        {
+            m_MemoryReadMap[Index] = (size_t)((m_RDRAM + (Address - VAddr + PAddr)) - Address);
+        }
         m_TLB_ReadMap[Index] = ((size_t)(Address - VAddr + PAddr)) - Address;
         if (!bReadOnly)
         {
-            m_MemoryWriteMap[Index] = (size_t)((m_RDRAM + (Address - VAddr + PAddr)) - Address);
+            if ((Address - VAddr + PAddr) < m_AllocatedRdramSize)
+            {
+                m_MemoryWriteMap[Index] = (size_t)((m_RDRAM + (Address - VAddr + PAddr)) - Address);
+            }
             m_TLB_WriteMap[Index] = ((size_t)(Address - VAddr + PAddr)) - Address;
         }
     }