mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-05 08:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log errors in map/unmap memory functions

Browse Source
This commit is contained in:
mailwl 2025-01-16 16:22:26 +03:00
parent 988f66d326
commit 6287085c1a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/memory.cpp
View File

@ -287,13 +287,14 @@ int MemoryManager::MapMemory(void** out_addr, VAddr virtual_addr, size_t size, M
// Fixed mapping means the virtual address must exactly match the provided one. // Fixed mapping means the virtual address must exactly match the provided one.
if (True(flags & MemoryMapFlags::Fixed)) { if (True(flags & MemoryMapFlags::Fixed)) {
// This should return SCE_KERNEL_ERROR_ENOMEM but shouldn't normally happen.
const auto& vma = FindVMA(mapped_addr)->second; const auto& vma = FindVMA(mapped_addr)->second;
const size_t remaining_size = vma.base + vma.size - mapped_addr; const size_t remaining_size = vma.base + vma.size - mapped_addr;
if (vma.IsMapped()) { if (vma.IsMapped()) {
LOG_ERROR(Kernel_Vmm, "Attempted to map already mapped memory at {:#x}", virtual_addr);
return ORBIS_KERNEL_ERROR_EBUSY; return ORBIS_KERNEL_ERROR_EBUSY;
} }
if (remaining_size < size) { if (remaining_size < size) {
LOG_ERROR(Kernel_Vmm, "Could not map memory with size {:#x}", size);
return ORBIS_KERNEL_ERROR_ENOMEM; return ORBIS_KERNEL_ERROR_ENOMEM;
} }
} }
@ -398,6 +399,7 @@ s32 MemoryManager::UnmapMemoryImpl(VAddr virtual_addr, size_t size) {
const auto it = FindVMA(virtual_addr); const auto it = FindVMA(virtual_addr);
const auto& vma_base = it->second; const auto& vma_base = it->second;
if (!vma_base.Contains(virtual_addr, size)) { if (!vma_base.Contains(virtual_addr, size)) {
LOG_ERROR(Kernel_Vmm, "Attempted to unmap not mapped memory at {:#x}", virtual_addr);
return ORBIS_KERNEL_ERROR_EINVAL; return ORBIS_KERNEL_ERROR_EINVAL;
} }