INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-10 04:07:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2284 from lioncash/heap-alloc

Browse Source 
kernel/vm_manager: Unify heap allocation/freeing functions
This commit is contained in:
bunnei
2019-03-28 17:56:49 -04:00
committed by GitHub
parent 76f024865d 1e92ba2785
commit 16dc3a1dd5
3 changed files with 82 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/hle/kernel/svc.cpp
View File

@ -175,11 +175,8 @@ static ResultCode SetHeapSize(VAddr* heap_addr, u64 heap_size) {
return ERR_INVALID_SIZE;
}
auto& vm_manager = Core::CurrentProcess()->VMManager();
const VAddr heap_base = vm_manager.GetHeapRegionBaseAddress();
const auto alloc_result =
vm_manager.HeapAllocate(heap_base, heap_size, VMAPermission::ReadWrite);
auto& vm_manager = Core::System::GetInstance().Kernel().CurrentProcess()->VMManager();
const auto alloc_result = vm_manager.SetHeapSize(heap_size);
if (alloc_result.Failed()) {
return alloc_result.Code();
}
@ -809,7 +806,7 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id)
return RESULT_SUCCESS;
case GetInfoType::TotalHeapUsage:
*result = process->VMManager().GetTotalHeapUsage();
*result = process->VMManager().GetCurrentHeapSize();
return RESULT_SUCCESS;
case GetInfoType::IsVirtualAddressMemoryEnabled: