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

Merge branch 'shadps4-emu:main' into nba-fix

Browse Source
This commit is contained in:
Stephen Miller 2025-04-18 10:43:30 -05:00 committed by GitHub
commit 273faba1bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/libraries/kernel/memory.cpp
View File

@ -19,7 +19,7 @@
namespace Libraries::Kernel { namespace Libraries::Kernel {
u64 PS4_SYSV_ABI sceKernelGetDirectMemorySize() { u64 PS4_SYSV_ABI sceKernelGetDirectMemorySize() {
LOG_WARNING(Kernel_Vmm, "called"); LOG_TRACE(Kernel_Vmm, "called");
const auto* memory = Core::Memory::Instance(); const auto* memory = Core::Memory::Instance();
return memory->GetTotalDirectSize(); return memory->GetTotalDirectSize();
} }

65
src/core/memory.cpp
View File

@ -139,35 +139,35 @@ PAddr MemoryManager::Allocate(PAddr search_start, PAddr search_end, size_t size,
alignment = alignment > 0 ? alignment : 16_KB; alignment = alignment > 0 ? alignment : 16_KB;
auto dmem_area = FindDmemArea(search_start); auto dmem_area = FindDmemArea(search_start);
auto mapping_start = search_start > dmem_area->second.base
? Common::AlignUp(search_start, alignment)
: Common::AlignUp(dmem_area->second.base, alignment);
auto mapping_end = Common::AlignUp(mapping_start + size, alignment);
const auto is_suitable = [&] { // Find the first free, large enough dmem area in the range.
if (dmem_area == dmem_map.end()) { while ((!dmem_area->second.is_free || dmem_area->second.GetEnd() < mapping_end) &&
return false; dmem_area != dmem_map.end()) {
} // The current dmem_area isn't suitable, move to the next one.
const auto aligned_base = Common::AlignUp(dmem_area->second.base, alignment); dmem_area++;
const auto alignment_size = aligned_base - dmem_area->second.base;
const auto remaining_size = // Update local variables based on the new dmem_area
dmem_area->second.size >= alignment_size ? dmem_area->second.size - alignment_size : 0; mapping_start = search_start > dmem_area->second.base
return dmem_area->second.is_free && remaining_size >= size; ? Common::AlignUp(search_start, alignment)
}; : Common::AlignUp(dmem_area->second.base, alignment);
while (dmem_area != dmem_map.end() && !is_suitable() && mapping_end = Common::AlignUp(mapping_start + size, alignment);
dmem_area->second.GetEnd() <= search_end) {
++dmem_area;
} }
if (!is_suitable()) {
if (dmem_area == dmem_map.end()) {
// There are no suitable mappings in this range
LOG_ERROR(Kernel_Vmm, "Unable to find free direct memory area: size = {:#x}", size); LOG_ERROR(Kernel_Vmm, "Unable to find free direct memory area: size = {:#x}", size);
return -1; return -1;
} }
// Align free position
PAddr free_addr = dmem_area->second.base;
free_addr = Common::AlignUp(free_addr, alignment);
// 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(mapping_start, size)->second;
area.memory_type = memory_type; area.memory_type = memory_type;
area.is_free = false; area.is_free = false;
return free_addr; return mapping_start;
} }
void MemoryManager::Free(PAddr phys_addr, size_t size) { void MemoryManager::Free(PAddr phys_addr, size_t size) {
@ -632,17 +632,34 @@ 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;
} }
const auto aligned_base = alignment > 0 ? Common::AlignUp(dmem_area->second.base, alignment) 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;
aligned_base = alignment > 0 ? Common::AlignUp(search_start, alignment) : search_start;
}
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;