summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/svc.cpp2
-rw-r--r--src/core/hle/kernel/vm_manager.cpp7
-rw-r--r--src/core/hle/kernel/vm_manager.h6
3 files changed, 2 insertions, 13 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 59bc8d9f8..f689f745f 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -806,7 +806,7 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id)
806 return RESULT_SUCCESS; 806 return RESULT_SUCCESS;
807 807
808 case GetInfoType::TotalHeapUsage: 808 case GetInfoType::TotalHeapUsage:
809 *result = process->VMManager().GetTotalHeapUsage(); 809 *result = process->VMManager().GetCurrentHeapSize();
810 return RESULT_SUCCESS; 810 return RESULT_SUCCESS;
811 811
812 case GetInfoType::IsVirtualAddressMemoryEnabled: 812 case GetInfoType::IsVirtualAddressMemoryEnabled:
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index 9848a8ac6..04d58bbf7 100644
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@@ -285,7 +285,6 @@ ResultVal<VAddr> VMManager::HeapAllocate(u64 size) {
285 return mapping_result.Code(); 285 return mapping_result.Code();
286 } 286 }
287 287
288 heap_used = size;
289 return MakeResult<VAddr>(heap_region_base); 288 return MakeResult<VAddr>(heap_region_base);
290} 289}
291 290
@@ -303,7 +302,6 @@ ResultCode VMManager::HeapFree(VAddr target, u64 size) {
303 return result; 302 return result;
304 } 303 }
305 304
306 heap_used -= size;
307 return RESULT_SUCCESS; 305 return RESULT_SUCCESS;
308} 306}
309 307
@@ -596,6 +594,7 @@ void VMManager::InitializeMemoryRegionRanges(FileSys::ProgramAddressSpaceType ty
596 594
597 heap_region_base = map_region_end; 595 heap_region_base = map_region_end;
598 heap_region_end = heap_region_base + heap_region_size; 596 heap_region_end = heap_region_base + heap_region_size;
597 heap_end = heap_region_base;
599 598
600 new_map_region_base = heap_region_end; 599 new_map_region_base = heap_region_end;
601 new_map_region_end = new_map_region_base + new_map_region_size; 600 new_map_region_end = new_map_region_base + new_map_region_size;
@@ -690,10 +689,6 @@ u64 VMManager::GetTotalMemoryUsage() const {
690 return 0xF8000000; 689 return 0xF8000000;
691} 690}
692 691
693u64 VMManager::GetTotalHeapUsage() const {
694 return heap_used;
695}
696
697VAddr VMManager::GetAddressSpaceBaseAddress() const { 692VAddr VMManager::GetAddressSpaceBaseAddress() const {
698 return address_space_base; 693 return address_space_base;
699} 694}
diff --git a/src/core/hle/kernel/vm_manager.h b/src/core/hle/kernel/vm_manager.h
index 23edd6582..cb864ab31 100644
--- a/src/core/hle/kernel/vm_manager.h
+++ b/src/core/hle/kernel/vm_manager.h
@@ -418,9 +418,6 @@ public:
418 /// Gets the total memory usage, used by svcGetInfo 418 /// Gets the total memory usage, used by svcGetInfo
419 u64 GetTotalMemoryUsage() const; 419 u64 GetTotalMemoryUsage() const;
420 420
421 /// Gets the total heap usage, used by svcGetInfo
422 u64 GetTotalHeapUsage() const;
423
424 /// Gets the address space base address 421 /// Gets the address space base address
425 VAddr GetAddressSpaceBaseAddress() const; 422 VAddr GetAddressSpaceBaseAddress() const;
426 423
@@ -639,8 +636,5 @@ private:
639 // The end of the currently allocated heap. This is not an inclusive 636 // The end of the currently allocated heap. This is not an inclusive
640 // end of the range. This is essentially 'base_address + current_size'. 637 // end of the range. This is essentially 'base_address + current_size'.
641 VAddr heap_end = 0; 638 VAddr heap_end = 0;
642
643 // Indicates how many bytes from the current heap are currently used.
644 u64 heap_used = 0;
645}; 639};
646} // namespace Kernel 640} // namespace Kernel