From 710256e9f194e8f3c3a285e1e28e9c18d10b9172 Mon Sep 17 00:00:00 2001
From: Fazana <52551480+FazanaJ@users.noreply.github.com>
Date: Mon, 23 Aug 2021 18:38:43 +0100
Subject: [PATCH] TLB clears fixed for real for real

man.
---
 src/engine/level_script.c | 10 +++++++---
 src/game/memory.c         |  7 ++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/engine/level_script.c b/src/engine/level_script.c
index 006f4701..6a4944c5 100644
--- a/src/engine/level_script.c
+++ b/src/engine/level_script.c
@@ -325,9 +325,13 @@ void unmap_tlbs(void)
     {
         if (gTlbSegments[i] && i != 0x17 && i != 0x16 && i != 0x13)
         {
-            osUnmapTLB(gTlbEntries);
-            gTlbSegments[i] = 0;
-            gTlbEntries--;
+            while (gTlbSegments[i] > 0)
+            {
+                osUnmapTLB(gTlbEntries);
+                gTlbSegments[i]--;
+                gTlbEntries--;
+            }
+
         }
 
     }
diff --git a/src/game/memory.c b/src/game/memory.c
index a4733879..c0668939 100644
--- a/src/game/memory.c
+++ b/src/game/memory.c
@@ -308,7 +308,7 @@ void *dynamic_dma_read(u8 *srcStart, u8 *srcEnd, u32 side, u32 alignment, u32 bs
 s32 gTlbEntries = 0;
 u8 gTlbSegments[32] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
 
-void mapTLBPages(uintptr_t virtualAddress, uintptr_t physicalAddress, s32 length)
+void mapTLBPages(uintptr_t virtualAddress, uintptr_t physicalAddress, s32 length, s32 segment)
 {
     while (length > 0)
     {
@@ -318,10 +318,12 @@ void mapTLBPages(uintptr_t virtualAddress, uintptr_t physicalAddress, s32 length
             virtualAddress += TLB_PAGE_SIZE;
             physicalAddress += TLB_PAGE_SIZE;
             length -= TLB_PAGE_SIZE;
+            gTlbSegments[segment]++;
         }
         else
         {
             osMapTLB(gTlbEntries++, OS_PM_4K, (void *)virtualAddress, physicalAddress, -1, -1);
+            gTlbSegments[segment]++;
         }
         virtualAddress += TLB_PAGE_SIZE;
         physicalAddress += TLB_PAGE_SIZE;
@@ -343,8 +345,7 @@ void *load_segment(s32 segment, u8 *srcStart, u8 *srcEnd, u32 side, u8 *bssStart
         if (addr != NULL) {
             u8 *realAddr = (u8 *)ALIGN((uintptr_t)addr, TLB_PAGE_SIZE);
             set_segment_base_addr(segment, realAddr);
-            mapTLBPages(segment << 24, VIRTUAL_TO_PHYSICAL(realAddr), (srcEnd - srcStart) + ((uintptr_t)bssEnd - (uintptr_t)bssStart));
-            gTlbSegments[segment] = gTlbEntries;
+            mapTLBPages(segment << 24, VIRTUAL_TO_PHYSICAL(realAddr), (srcEnd - srcStart) + ((uintptr_t)bssEnd - (uintptr_t)bssStart), segment);
         }
     }
     else