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

DirectQueryAvailable fixes

Browse Source 
remaining_size was calculated incorrectly in cases where a free dmem_area had a base earlier than search_start, or an end after search_end.
This commit is contained in:
Stephen Miller 2025-04-17 21:33:13 -05:00
parent 8e351de4de
commit 84424088a4
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/memory.cpp
View File

@ -627,7 +627,8 @@ int MemoryManager::DirectQueryAvailable(PAddr search_start, PAddr search_end, si
auto dmem_area = FindDmemArea(search_start); auto dmem_area = FindDmemArea(search_start);
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()) {
if (!dmem_area->second.is_free) { if (!dmem_area->second.is_free) {
dmem_area++; dmem_area++;
continue; continue;
@ -636,8 +637,21 @@ int MemoryManager::DirectQueryAvailable(PAddr search_start, PAddr search_end, si
const auto aligned_base = alignment > 0 ? Common::AlignUp(dmem_area->second.base, alignment) const auto aligned_base = alignment > 0 ? Common::AlignUp(dmem_area->second.base, alignment)
: dmem_area->second.base; : dmem_area->second.base;
const auto alignment_size = aligned_base - dmem_area->second.base; const auto alignment_size = aligned_base - dmem_area->second.base;
const auto remaining_size = auto remaining_size =
dmem_area->second.size >= alignment_size ? dmem_area->second.size - alignment_size : 0; dmem_area->second.size >= alignment_size ? dmem_area->second.size - alignment_size : 0;
if (dmem_area->second.base < search_start) {
// We need to trim remaining_size to ignore addresses before search_start
remaining_size = remaining_size > (search_start - dmem_area->second.base) ?
remaining_size - (search_start - dmem_area->second.base) : 0;
}
if (dmem_area->second.GetEnd() > search_end) {
// We need to trim remaining_size to ignore addresses beyond search_end
remaining_size = remaining_size > (search_start - dmem_area->second.base) ?
remaining_size - (dmem_area->second.GetEnd() - search_end) : 0;
}
if (remaining_size > max_size) { if (remaining_size > max_size) {
paddr = aligned_base; paddr = aligned_base;
max_size = remaining_size; max_size = remaining_size;