diff options
| author | 2018-04-27 11:49:18 -0400 | |
|---|---|---|
| committer | 2018-04-27 11:57:52 -0400 | |
| commit | 843dd62c81cfdfedffb27ff475ce7a4e7d85ee79 (patch) | |
| tree | 80531b4168f9e110b14e7d46a9388111803d4538 | |
| parent | Merge pull request #409 from lioncash/assert (diff) | |
| download | yuzu-843dd62c81cfdfedffb27ff475ce7a4e7d85ee79.tar.gz yuzu-843dd62c81cfdfedffb27ff475ce7a4e7d85ee79.tar.xz yuzu-843dd62c81cfdfedffb27ff475ce7a4e7d85ee79.zip | |
core: Replace usages of LOG_GENERIC with new fmt-capable equivalents
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/vm_manager.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 751a0524d..b423a3477 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -134,7 +134,7 @@ void Process::Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size) { | |||
| 134 | HandleSpecialMapping(vm_manager, mapping); | 134 | HandleSpecialMapping(vm_manager, mapping); |
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | vm_manager.LogLayout(Log::Level::Debug); | 137 | vm_manager.LogLayout(); |
| 138 | status = ProcessStatus::Running; | 138 | status = ProcessStatus::Running; |
| 139 | 139 | ||
| 140 | Kernel::SetupMainThread(entry_point, main_thread_priority, this); | 140 | Kernel::SetupMainThread(entry_point, main_thread_priority, this); |
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index 7a5231fb7..06f143fb1 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <cinttypes> | ||
| 6 | #include <iterator> | 5 | #include <iterator> |
| 7 | #include "common/assert.h" | 6 | #include "common/assert.h" |
| 8 | #include "common/logging/log.h" | 7 | #include "common/logging/log.h" |
| @@ -225,11 +224,10 @@ void VMManager::RefreshMemoryBlockMappings(const std::vector<u8>* block) { | |||
| 225 | } | 224 | } |
| 226 | } | 225 | } |
| 227 | 226 | ||
| 228 | void VMManager::LogLayout(Log::Level log_level) const { | 227 | void VMManager::LogLayout() const { |
| 229 | for (const auto& p : vma_map) { | 228 | for (const auto& p : vma_map) { |
| 230 | const VirtualMemoryArea& vma = p.second; | 229 | const VirtualMemoryArea& vma = p.second; |
| 231 | LOG_GENERIC(Log::Class::Kernel, log_level, | 230 | NGLOG_DEBUG(Kernel, "{:016X} - {:016X} size: {:016X} {}{}{} {}", vma.base, |
| 232 | "%016" PRIx64 " - %016" PRIx64 " size: %16" PRIx64 " %c%c%c %s", vma.base, | ||
| 233 | vma.base + vma.size, vma.size, | 231 | vma.base + vma.size, vma.size, |
| 234 | (u8)vma.permissions & (u8)VMAPermission::Read ? 'R' : '-', | 232 | (u8)vma.permissions & (u8)VMAPermission::Read ? 'R' : '-', |
| 235 | (u8)vma.permissions & (u8)VMAPermission::Write ? 'W' : '-', | 233 | (u8)vma.permissions & (u8)VMAPermission::Write ? 'W' : '-', |
diff --git a/src/core/hle/kernel/vm_manager.h b/src/core/hle/kernel/vm_manager.h index 4d66146f6..38e4ebcd3 100644 --- a/src/core/hle/kernel/vm_manager.h +++ b/src/core/hle/kernel/vm_manager.h | |||
| @@ -187,7 +187,7 @@ public: | |||
| 187 | void RefreshMemoryBlockMappings(const std::vector<u8>* block); | 187 | void RefreshMemoryBlockMappings(const std::vector<u8>* block); |
| 188 | 188 | ||
| 189 | /// Dumps the address space layout to the log, for debugging | 189 | /// Dumps the address space layout to the log, for debugging |
| 190 | void LogLayout(Log::Level log_level) const; | 190 | void LogLayout() const; |
| 191 | 191 | ||
| 192 | /// Gets the total memory usage, used by svcGetInfo | 192 | /// Gets the total memory usage, used by svcGetInfo |
| 193 | u64 GetTotalMemoryUsage(); | 193 | u64 GetTotalMemoryUsage(); |