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

Fix assertions

Browse Source
This commit is contained in:
Borchev 2024-07-27 14:39:58 -07:00
parent 671b1359be
commit 6513dbd775
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/address_space.cpp
View File

@ -463,7 +463,7 @@ void AddressSpace::Unmap(VAddr virtual_addr, size_t size, VAddr start_in_vma, VA
impl->Unmap(virtual_addr, size, has_backing); impl->Unmap(virtual_addr, size, has_backing);
// TODO: Determine if any titles require partial unmapping support for flexible allocations. // TODO: Determine if any titles require partial unmapping support for flexible allocations.
ASSERT_MSG(!has_backing && (start_in_vma != 0 || end_in_vma != size), ASSERT_MSG(has_backing || (start_in_vma == 0 && end_in_vma == size),
"Partial unmapping of flexible allocations is not supported"); "Partial unmapping of flexible allocations is not supported");
if (start_in_vma != 0) { if (start_in_vma != 0) {

3
src/core/memory.cpp
View File

@ -416,8 +416,7 @@ MemoryManager::DMemHandle MemoryManager::CarveDmemArea(PAddr addr, size_t size)
ASSERT_MSG(dmem_handle != dmem_map.end(), "Physical address not in dmem_map"); ASSERT_MSG(dmem_handle != dmem_map.end(), "Physical address not in dmem_map");
const DirectMemoryArea& area = dmem_handle->second; const DirectMemoryArea& area = dmem_handle->second;
ASSERT_MSG(area.is_free && area.base <= addr, ASSERT_MSG(area.base <= addr, "Adding an allocation to already allocated region");
"Adding an allocation to already allocated region");
const PAddr start_in_area = addr - area.base; const PAddr start_in_area = addr - area.base;
const PAddr end_in_vma = start_in_area + size; const PAddr end_in_vma = start_in_area + size;