diff options
author | Michael Scire <SciresM@gmail.com> | 2019-07-07 21:08:29 +0200 |
---|---|---|
committer | Michael Scire <SciresM@gmail.com> | 2019-07-07 21:08:29 +0200 |
commit | b901cd584e7c63ace5feb095279e1671fc605129 (patch) | |
tree | e0809a3b6356e9dcee4295b809deb7e59b051bc6 | |
parent | address review commentary (diff) | |
download | yuzu-b901cd584e7c63ace5feb095279e1671fc605129.tar yuzu-b901cd584e7c63ace5feb095279e1671fc605129.tar.gz yuzu-b901cd584e7c63ace5feb095279e1671fc605129.tar.bz2 yuzu-b901cd584e7c63ace5feb095279e1671fc605129.tar.lz yuzu-b901cd584e7c63ace5feb095279e1671fc605129.tar.xz yuzu-b901cd584e7c63ace5feb095279e1671fc605129.tar.zst yuzu-b901cd584e7c63ace5feb095279e1671fc605129.zip |
-rw-r--r-- | src/core/hle/kernel/process.cpp | 3 | ||||
-rw-r--r-- | src/core/hle/kernel/svc.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index b0690be34..db3ab14ce 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -134,7 +134,8 @@ u64 Process::GetTotalPhysicalMemoryAvailableWithoutSystemResource() const { } u64 Process::GetTotalPhysicalMemoryUsed() const { - return vm_manager.GetCurrentHeapSize() + main_thread_stack_size + code_memory_size + GetSystemResourceUsage(); + return vm_manager.GetCurrentHeapSize() + main_thread_stack_size + code_memory_size + + GetSystemResourceUsage(); } u64 Process::GetTotalPhysicalMemoryUsedWithoutSystemResource() const { diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 85e4512f0..f9fe7dce0 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -827,8 +827,7 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, u64 ha return RESULT_SUCCESS; case GetInfoType::SystemResourceUsage: - LOG_WARNING(Kernel_SVC, - "(STUBBED) Attempted to query system resource usage"); + LOG_WARNING(Kernel_SVC, "(STUBBED) Attempted to query system resource usage"); *result = process->GetSystemResourceUsage(); return RESULT_SUCCESS; |