Browse Source

kernel/vm_manager: Handle case of identical calls to HeapAllocate

In cases where HeapAllocate is called with the same size of the current
heap, we can simply do nothing and return successfully.

This avoids doing work where we otherwise don't have to. This is also
what the kernel itself does in this scenario.
nce_cpp
Lioncash 7 years ago
parent
commit
5d0d85ba55
  1. 5
      src/core/hle/kernel/vm_manager.cpp

5
src/core/hle/kernel/vm_manager.cpp

@ -261,6 +261,11 @@ ResultVal<VAddr> VMManager::HeapAllocate(u64 size) {
return ERR_OUT_OF_MEMORY; return ERR_OUT_OF_MEMORY;
} }
// No need to do any additional work if the heap is already the given size.
if (size == GetCurrentHeapSize()) {
return MakeResult(heap_region_base);
}
if (heap_memory == nullptr) { if (heap_memory == nullptr) {
// Initialize heap // Initialize heap
heap_memory = std::make_shared<std::vector<u8>>(size); heap_memory = std::make_shared<std::vector<u8>>(size);

Loading…
Cancel
Save