Skip to content

Commit

Permalink
LV2: Log allocated guest VM addresses
Browse files Browse the repository at this point in the history
  • Loading branch information
elad335 committed Jul 9, 2023
1 parent 040d5ac commit 7aae88b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
2 changes: 2 additions & 0 deletions rpcs3/Emu/Cell/lv2/sys_memory.cpp
Expand Up @@ -131,6 +131,8 @@ error_code sys_memory_allocate(cpu_thread& cpu, u32 size, u64 flags, vm::ptr<u32

if (alloc_addr)
{
sys_memory.notice("sys_mmapper_search_and_map(): Allocated 0x%x address (size=0x%x)", addr, size);

vm::lock_sudo(addr, size);
cpu.check_state();
*alloc_addr = addr;
Expand Down
5 changes: 4 additions & 1 deletion rpcs3/Emu/Cell/lv2/sys_mmapper.cpp
Expand Up @@ -174,6 +174,8 @@ error_code sys_mmapper_allocate_address(ppu_thread& ppu, u64 size, u64 flags, u6
{
if (const auto area = vm::find_map(static_cast<u32>(size), static_cast<u32>(alignment), flags & SYS_MEMORY_PAGE_SIZE_MASK))
{
sys_mmapper.warning("sys_mmapper_allocate_address(): Found VM 0x%x area (vsize=0x%x)", area->addr, size);

ppu.check_state();
*alloc_addr = area->addr;
return CELL_OK;
Expand Down Expand Up @@ -722,8 +724,9 @@ error_code sys_mmapper_search_and_map(ppu_thread& ppu, u32 start_addr, u32 mem_i
return CELL_ENOMEM;
}

vm::lock_sudo(addr, mem->size);
sys_mmapper.notice("sys_mmapper_search_and_map(): Found 0x%x address", addr);

vm::lock_sudo(addr, mem->size);
ppu.check_state();
*alloc_addr = addr;
return CELL_OK;
Expand Down
2 changes: 2 additions & 0 deletions rpcs3/Emu/Cell/lv2/sys_vm.cpp
Expand Up @@ -93,6 +93,8 @@ error_code sys_vm_memory_map(ppu_thread& ppu, u32 vsize, u32 psize, u32 cid, u64
// Look for unmapped space
if (const auto area = vm::find_map(0x10000000, 0x10000000, 2 | (flag & SYS_MEMORY_PAGE_SIZE_MASK)))
{
sys_vm.warning("sys_vm_memory_map(): Found VM 0x%x area (vsize=0x%x)", addr, vsize);

// Alloc all memory (shall not fail)
ensure(area->alloc(vsize));
vm::lock_sudo(area->addr, vsize);
Expand Down

0 comments on commit 7aae88b

Please sign in to comment.