summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-04-27 17:49:18 +0200
committerLioncash <mathew1800@gmail.com>2018-04-27 17:57:52 +0200
commit843dd62c81cfdfedffb27ff475ce7a4e7d85ee79 (patch)
tree80531b4168f9e110b14e7d46a9388111803d4538
parentMerge pull request #409 from lioncash/assert (diff)
downloadyuzu-843dd62c81cfdfedffb27ff475ce7a4e7d85ee79.tar
yuzu-843dd62c81cfdfedffb27ff475ce7a4e7d85ee79.tar.gz
yuzu-843dd62c81cfdfedffb27ff475ce7a4e7d85ee79.tar.bz2
yuzu-843dd62c81cfdfedffb27ff475ce7a4e7d85ee79.tar.lz
yuzu-843dd62c81cfdfedffb27ff475ce7a4e7d85ee79.tar.xz
yuzu-843dd62c81cfdfedffb27ff475ce7a4e7d85ee79.tar.zst
yuzu-843dd62c81cfdfedffb27ff475ce7a4e7d85ee79.zip
-rw-r--r--src/core/hle/kernel/process.cpp2
-rw-r--r--src/core/hle/kernel/vm_manager.cpp6
-rw-r--r--src/core/hle/kernel/vm_manager.h2
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) {
HandleSpecialMapping(vm_manager, mapping);
}
- vm_manager.LogLayout(Log::Level::Debug);
+ vm_manager.LogLayout();
status = ProcessStatus::Running;
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 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include <cinttypes>
#include <iterator>
#include "common/assert.h"
#include "common/logging/log.h"
@@ -225,11 +224,10 @@ void VMManager::RefreshMemoryBlockMappings(const std::vector<u8>* block) {
}
}
-void VMManager::LogLayout(Log::Level log_level) const {
+void VMManager::LogLayout() const {
for (const auto& p : vma_map) {
const VirtualMemoryArea& vma = p.second;
- LOG_GENERIC(Log::Class::Kernel, log_level,
- "%016" PRIx64 " - %016" PRIx64 " size: %16" PRIx64 " %c%c%c %s", vma.base,
+ NGLOG_DEBUG(Kernel, "{:016X} - {:016X} size: {:016X} {}{}{} {}", vma.base,
vma.base + vma.size, vma.size,
(u8)vma.permissions & (u8)VMAPermission::Read ? 'R' : '-',
(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:
void RefreshMemoryBlockMappings(const std::vector<u8>* block);
/// Dumps the address space layout to the log, for debugging
- void LogLayout(Log::Level log_level) const;
+ void LogLayout() const;
/// Gets the total memory usage, used by svcGetInfo
u64 GetTotalMemoryUsage();