Browse Source
core: Replace usages of LOG_GENERIC with new fmt-capable equivalents
pull/15/merge
Lioncash
8 years ago
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
3 changed files with
4 additions and
6 deletions
-
src/core/hle/kernel/process.cpp
-
src/core/hle/kernel/vm_manager.cpp
-
src/core/hle/kernel/vm_manager.h
|
|
|
@ -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); |
|
|
|
|
|
|
|
@ -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' : '-', |
|
|
|
|
|
|
|
@ -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(); |
|
|
|
|