diff options
| author | 2019-06-09 18:12:02 -0400 | |
|---|---|---|
| committer | 2019-06-09 18:12:05 -0400 | |
| commit | c1a8f684df76afc9d1b450da97e504b8d9d65a97 (patch) | |
| tree | e97e66ff0127c78174db6757363604a1a32f0699 /src | |
| parent | kernel/svc: Remove duplicate enum entry in svcGetInfo() (diff) | |
| download | yuzu-c1a8f684df76afc9d1b450da97e504b8d9d65a97.tar.gz yuzu-c1a8f684df76afc9d1b450da97e504b8d9d65a97.tar.xz yuzu-c1a8f684df76afc9d1b450da97e504b8d9d65a97.zip | |
kernel/svc: Amend naming for TotalMemoryUsage in svcGetInfo()
Disambiguates and makes the name a little more consistent with
TotalPhysicalMemoryUsed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 8 | ||||
| -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, 6 insertions, 6 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 1f8b0d92b..377a9bf48 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -710,7 +710,7 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, u64 ha | |||
| 710 | MapRegionSize = 3, | 710 | MapRegionSize = 3, |
| 711 | HeapRegionBaseAddr = 4, | 711 | HeapRegionBaseAddr = 4, |
| 712 | HeapRegionSize = 5, | 712 | HeapRegionSize = 5, |
| 713 | TotalMemoryUsage = 6, | 713 | TotalPhysicalMemoryAvailable = 6, |
| 714 | TotalPhysicalMemoryUsed = 7, | 714 | TotalPhysicalMemoryUsed = 7, |
| 715 | IsCurrentProcessBeingDebugged = 8, | 715 | IsCurrentProcessBeingDebugged = 8, |
| 716 | RegisterResourceLimit = 9, | 716 | RegisterResourceLimit = 9, |
| @@ -745,7 +745,7 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, u64 ha | |||
| 745 | case GetInfoType::ASLRRegionSize: | 745 | case GetInfoType::ASLRRegionSize: |
| 746 | case GetInfoType::NewMapRegionBaseAddr: | 746 | case GetInfoType::NewMapRegionBaseAddr: |
| 747 | case GetInfoType::NewMapRegionSize: | 747 | case GetInfoType::NewMapRegionSize: |
| 748 | case GetInfoType::TotalMemoryUsage: | 748 | case GetInfoType::TotalPhysicalMemoryAvailable: |
| 749 | case GetInfoType::TotalPhysicalMemoryUsed: | 749 | case GetInfoType::TotalPhysicalMemoryUsed: |
| 750 | case GetInfoType::IsVirtualAddressMemoryEnabled: | 750 | case GetInfoType::IsVirtualAddressMemoryEnabled: |
| 751 | case GetInfoType::PersonalMmHeapUsage: | 751 | case GetInfoType::PersonalMmHeapUsage: |
| @@ -803,8 +803,8 @@ static ResultCode GetInfo(Core::System& system, u64* result, u64 info_id, u64 ha | |||
| 803 | *result = process->VMManager().GetNewMapRegionSize(); | 803 | *result = process->VMManager().GetNewMapRegionSize(); |
| 804 | return RESULT_SUCCESS; | 804 | return RESULT_SUCCESS; |
| 805 | 805 | ||
| 806 | case GetInfoType::TotalMemoryUsage: | 806 | case GetInfoType::TotalPhysicalMemoryAvailable: |
| 807 | *result = process->VMManager().GetTotalMemoryUsage(); | 807 | *result = process->VMManager().GetTotalPhysicalMemoryAvailable(); |
| 808 | return RESULT_SUCCESS; | 808 | return RESULT_SUCCESS; |
| 809 | 809 | ||
| 810 | case GetInfoType::TotalPhysicalMemoryUsed: | 810 | case GetInfoType::TotalPhysicalMemoryUsed: |
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index 48b13cfdd..6d6980aba 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp | |||
| @@ -758,7 +758,7 @@ VMManager::CheckResults VMManager::CheckRangeState(VAddr address, u64 size, Memo | |||
| 758 | std::make_tuple(initial_state, initial_permissions, initial_attributes & ~ignore_mask)); | 758 | std::make_tuple(initial_state, initial_permissions, initial_attributes & ~ignore_mask)); |
| 759 | } | 759 | } |
| 760 | 760 | ||
| 761 | u64 VMManager::GetTotalMemoryUsage() const { | 761 | u64 VMManager::GetTotalPhysicalMemoryAvailable() const { |
| 762 | LOG_WARNING(Kernel, "(STUBBED) called"); | 762 | LOG_WARNING(Kernel, "(STUBBED) called"); |
| 763 | return 0xF8000000; | 763 | return 0xF8000000; |
| 764 | } | 764 | } |
diff --git a/src/core/hle/kernel/vm_manager.h b/src/core/hle/kernel/vm_manager.h index ec84d9a70..dfbf7a894 100644 --- a/src/core/hle/kernel/vm_manager.h +++ b/src/core/hle/kernel/vm_manager.h | |||
| @@ -499,7 +499,7 @@ public: | |||
| 499 | void LogLayout() const; | 499 | void LogLayout() const; |
| 500 | 500 | ||
| 501 | /// Gets the total memory usage, used by svcGetInfo | 501 | /// Gets the total memory usage, used by svcGetInfo |
| 502 | u64 GetTotalMemoryUsage() const; | 502 | u64 GetTotalPhysicalMemoryAvailable() const; |
| 503 | 503 | ||
| 504 | /// Gets the address space base address | 504 | /// Gets the address space base address |
| 505 | VAddr GetAddressSpaceBaseAddress() const; | 505 | VAddr GetAddressSpaceBaseAddress() const; |