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

Adjust Reserve and Free functions for partial unmapping

Browse Source
This commit is contained in:
Borchev 2024-07-29 12:19:51 -07:00
parent 6513dbd775
commit dd56b1f4fd
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/memory.cpp
View File

@ -73,10 +73,11 @@ void MemoryManager::Free(PAddr phys_addr, size_t size) {
continue; continue;
} }
if (mapping.phys_base <= phys_addr && phys_addr < mapping.phys_base + mapping.size) { if (mapping.phys_base <= phys_addr && phys_addr < mapping.phys_base + mapping.size) {
LOG_INFO(Kernel_Vmm, "Unmaping direct mapping {:#x} with size {:#x}", addr, auto vma_segment_start_addr = phys_addr - mapping.phys_base + addr;
mapping.size); LOG_INFO(Kernel_Vmm, "Unmaping direct mapping {:#x} with size {:#x}",
vma_segment_start_addr, size);
// Unmaping might erase from vma_map. We can't do it here. // Unmaping might erase from vma_map. We can't do it here.
remove_list.emplace_back(addr, mapping.size); remove_list.emplace_back(vma_segment_start_addr, size);
} }
} }
for (const auto& [addr, size] : remove_list) { for (const auto& [addr, size] : remove_list) {
@ -103,8 +104,6 @@ int MemoryManager::Reserve(void** out_addr, VAddr virtual_addr, size_t size, Mem
const auto& vma = FindVMA(mapped_addr)->second; const auto& vma = FindVMA(mapped_addr)->second;
// If the VMA is mapped, unmap the region first. // If the VMA is mapped, unmap the region first.
if (vma.IsMapped()) { if (vma.IsMapped()) {
ASSERT_MSG(vma.base == mapped_addr && vma.size == size,
"Region must match when reserving a mapped region");
UnmapMemory(mapped_addr, size); UnmapMemory(mapped_addr, size);
} }
const size_t remaining_size = vma.base + vma.size - mapped_addr; const size_t remaining_size = vma.base + vma.size - mapped_addr;