diff options
| author | 2019-07-07 11:48:11 -0700 | |
|---|---|---|
| committer | 2019-07-07 11:48:11 -0700 | |
| commit | 1689784c198f6a7f3c389d4cd5edeccc74c1d9f3 (patch) | |
| tree | 66fed74508274f801f37e08d5bc405227776cf4c /src/core/hle/kernel/process.cpp | |
| parent | Implement MapPhysicalMemory/UnmapPhysicalMemory (diff) | |
| download | yuzu-1689784c198f6a7f3c389d4cd5edeccc74c1d9f3.tar.gz yuzu-1689784c198f6a7f3c389d4cd5edeccc74c1d9f3.tar.xz yuzu-1689784c198f6a7f3c389d4cd5edeccc74c1d9f3.zip | |
address review commentary
Diffstat (limited to 'src/core/hle/kernel/process.cpp')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 51245cbb4..b0690be34 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -129,20 +129,16 @@ u64 Process::GetTotalPhysicalMemoryAvailable() const { | |||
| 129 | return vm_manager.GetTotalPhysicalMemoryAvailable(); | 129 | return vm_manager.GetTotalPhysicalMemoryAvailable(); |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | u64 Process::GetTotalPhysicalMemoryAvailableWithoutMmHeap() const { | 132 | u64 Process::GetTotalPhysicalMemoryAvailableWithoutSystemResource() const { |
| 133 | // TODO: Subtract the personal heap size from this when the | 133 | return GetTotalPhysicalMemoryAvailable() - GetSystemResourceSize(); |
| 134 | // personal heap is implemented. | ||
| 135 | return GetTotalPhysicalMemoryAvailable(); | ||
| 136 | } | 134 | } |
| 137 | 135 | ||
| 138 | u64 Process::GetTotalPhysicalMemoryUsed() const { | 136 | u64 Process::GetTotalPhysicalMemoryUsed() const { |
| 139 | return vm_manager.GetCurrentHeapSize() + main_thread_stack_size + code_memory_size; | 137 | return vm_manager.GetCurrentHeapSize() + main_thread_stack_size + code_memory_size + GetSystemResourceUsage(); |
| 140 | } | 138 | } |
| 141 | 139 | ||
| 142 | u64 Process::GetTotalPhysicalMemoryUsedWithoutMmHeap() const { | 140 | u64 Process::GetTotalPhysicalMemoryUsedWithoutSystemResource() const { |
| 143 | // TODO: Subtract the personal heap size from this when the | 141 | return GetTotalPhysicalMemoryUsed() - GetSystemResourceUsage(); |
| 144 | // personal heap is implemented. | ||
| 145 | return GetTotalPhysicalMemoryUsed(); | ||
| 146 | } | 142 | } |
| 147 | 143 | ||
| 148 | void Process::RegisterThread(const Thread* thread) { | 144 | void Process::RegisterThread(const Thread* thread) { |