From c233d992118088d2bd153ceae4c1ca1e30c7b3f5 Mon Sep 17 00:00:00 2001 From: RSDuck Date: Fri, 29 Oct 2021 12:09:00 +0200 Subject: [PATCH] dtcm not dtcb --- src/ARMJIT_Memory.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ARMJIT_Memory.cpp b/src/ARMJIT_Memory.cpp index d72a63c8..0f1dd25e 100644 --- a/src/ARMJIT_Memory.cpp +++ b/src/ARMJIT_Memory.cpp @@ -481,11 +481,11 @@ void RemapDTCM(u32 newBase, u32 newSize) // by unmapping DTCM first and then map the holes u32 oldDTCMBase = NDS::ARM9->DTCMBase; u32 oldDTCMSize = ~NDS::ARM9->DTCMMask + 1; - u32 oldDTCBEnd = oldDTCMBase + NDS::ARM9->DTCMMask; + u32 oldDTCMEnd = oldDTCMBase + NDS::ARM9->DTCMMask; u32 newEnd = newBase + newSize; - printf("remapping DTCM %x %x %x %x\n", newBase, newEnd, oldDTCMBase, oldDTCBEnd); + printf("remapping DTCM %x %x %x %x\n", newBase, newEnd, oldDTCMBase, oldDTCMEnd); // unmap all regions containing the old or the current DTCM mapping for (int region = 0; region < memregions_Count; region++) { @@ -501,7 +501,7 @@ void RemapDTCM(u32 newBase, u32 newSize) printf("unmapping %d %x %x %x %x\n", region, mapping.Addr, mapping.Size, mapping.Num, mapping.LocalOffset); - bool overlap = (oldDTCMSize > 0 && oldDTCMBase < end && oldDTCBEnd > start) + bool overlap = (oldDTCMSize > 0 && oldDTCMBase < end && oldDTCMEnd > start) || (newSize > 0 && newBase < end && newEnd > start); if (mapping.Num == 0 && overlap)