mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-27 04:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move overwrite check to while condition

Browse Source
This commit is contained in:
Stephen Miller 2025-05-15 21:43:08 -05:00
parent 8258a4b66f
commit 1296c1fe80
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/memory.cpp
View File

@ -378,15 +378,12 @@ int MemoryManager::MapMemory(void** out_addr, VAddr virtual_addr, size_t size, M
auto unmap_size = size; auto unmap_size = size;
// If flag NoOverwrite is provided, don't overwrite mapped VMAs. // If flag NoOverwrite is provided, don't overwrite mapped VMAs.
// When it isn't provided, VMAs can be overwritten regardless of if they're mapped. // When it isn't provided, VMAs can be overwritten regardless of if they're mapped.
auto should_overwrite = False(flags & MemoryMapFlags::NoOverwrite) || !vma.IsMapped(); while ((False(flags & MemoryMapFlags::NoOverwrite) || !vma.IsMapped()) &&
while (should_overwrite && unmap_addr < mapped_addr + size && remaining_size < size) { unmap_addr < mapped_addr + size && remaining_size < size) {
auto unmapped = UnmapBytesFromEntry(unmap_addr, vma, unmap_size); auto unmapped = UnmapBytesFromEntry(unmap_addr, vma, unmap_size);
unmap_addr += unmapped; unmap_addr += unmapped;
unmap_size -= unmapped; unmap_size -= unmapped;
// Unmap addr should be the address of the next VMA
// if the previous VMA is fully unmapped.
vma = FindVMA(unmap_addr)->second; vma = FindVMA(unmap_addr)->second;
should_overwrite = False(flags & MemoryMapFlags::NoOverwrite) || !vma.IsMapped();
} }
vma = FindVMA(mapped_addr)->second; vma = FindVMA(mapped_addr)->second;