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

core/memory: Fix available dmem query on non-free dmem areas

Browse Source
This commit is contained in:
Daniel R 2024-08-24 14:36:28 +02:00
parent 20ef4cc420
commit 7cd7323f98
No known key found for this signature in database
GPG Key ID: B8ADC8F57BA18DBA
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/memory.cpp
View File

@ -53,6 +53,9 @@ PAddr MemoryManager::Allocate(PAddr search_start, PAddr search_end, size_t size,
PAddr free_addr = dmem_area->second.base; PAddr free_addr = dmem_area->second.base;
free_addr = alignment > 0 ? Common::AlignUp(free_addr, alignment) : free_addr; free_addr = alignment > 0 ? Common::AlignUp(free_addr, alignment) : free_addr;
// Align size
size = alignment > 0 ? Common::AlignUp(size, alignment) : size;
// Add the allocated region to the list and commit its pages. // Add the allocated region to the list and commit its pages.
auto& area = CarveDmemArea(free_addr, size)->second; auto& area = CarveDmemArea(free_addr, size)->second;
area.memory_type = memory_type; area.memory_type = memory_type;
@ -328,6 +331,11 @@ int MemoryManager::DirectQueryAvailable(PAddr search_start, PAddr search_end, si
PAddr paddr{}; PAddr paddr{};
size_t max_size{}; size_t max_size{};
while (dmem_area != dmem_map.end() && dmem_area->second.GetEnd() <= search_end) { while (dmem_area != dmem_map.end() && dmem_area->second.GetEnd() <= search_end) {
if (!dmem_area->second.is_free) {
dmem_area++;
continue;
}
if (dmem_area->second.size > max_size) { if (dmem_area->second.size > max_size) {
paddr = dmem_area->second.base; paddr = dmem_area->second.base;
max_size = dmem_area->second.size; max_size = dmem_area->second.size;