diff options
author | Lioncash <mathew1800@gmail.com> | 2019-03-24 21:28:04 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-03-24 22:08:30 +0100 |
commit | 99a163478be9ca285280ee59aa7800903b8571c2 (patch) | |
tree | 68d92d914872bd772cb5e2daa2cf3a5c2f1d0295 /src/core | |
parent | kernel/vm_manager: Handle case of identical calls to HeapAllocate (diff) | |
download | yuzu-99a163478be9ca285280ee59aa7800903b8571c2.tar yuzu-99a163478be9ca285280ee59aa7800903b8571c2.tar.gz yuzu-99a163478be9ca285280ee59aa7800903b8571c2.tar.bz2 yuzu-99a163478be9ca285280ee59aa7800903b8571c2.tar.lz yuzu-99a163478be9ca285280ee59aa7800903b8571c2.tar.xz yuzu-99a163478be9ca285280ee59aa7800903b8571c2.tar.zst yuzu-99a163478be9ca285280ee59aa7800903b8571c2.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/svc.cpp | 3 | ||||
-rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/vm_manager.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index f689f745f..6a8960c8d 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -175,8 +175,7 @@ static ResultCode SetHeapSize(VAddr* heap_addr, u64 heap_size) { } auto& vm_manager = Core::System::GetInstance().Kernel().CurrentProcess()->VMManager(); - const auto alloc_result = vm_manager.HeapAllocate(heap_size); - + const auto alloc_result = vm_manager.SetHeapSize(heap_size); if (alloc_result.Failed()) { return alloc_result.Code(); } diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index 16f48471e..523fe63e9 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp @@ -256,7 +256,7 @@ ResultCode VMManager::ReprotectRange(VAddr target, u64 size, VMAPermission new_p return RESULT_SUCCESS; } -ResultVal<VAddr> VMManager::HeapAllocate(u64 size) { +ResultVal<VAddr> VMManager::SetHeapSize(u64 size) { if (size > GetHeapRegionSize()) { return ERR_OUT_OF_MEMORY; } diff --git a/src/core/hle/kernel/vm_manager.h b/src/core/hle/kernel/vm_manager.h index ac5c33087..cab748364 100644 --- a/src/core/hle/kernel/vm_manager.h +++ b/src/core/hle/kernel/vm_manager.h @@ -380,7 +380,7 @@ public: /// Changes the permissions of a range of addresses, splitting VMAs as necessary. ResultCode ReprotectRange(VAddr target, u64 size, VMAPermission new_perms); - ResultVal<VAddr> HeapAllocate(u64 size); + ResultVal<VAddr> SetHeapSize(u64 size); ResultCode HeapFree(VAddr target, u64 size); ResultCode MirrorMemory(VAddr dst_addr, VAddr src_addr, u64 size, MemoryState state); |