core: Replace usages of LOG_GENERIC with new fmt-capable equivalents
This commit is contained in:
		
							parent
							
								
									acede1f1d3
								
							
						
					
					
						commit
						843dd62c81
					
				@ -134,7 +134,7 @@ void Process::Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size) {
 | 
				
			|||||||
        HandleSpecialMapping(vm_manager, mapping);
 | 
					        HandleSpecialMapping(vm_manager, mapping);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    vm_manager.LogLayout(Log::Level::Debug);
 | 
					    vm_manager.LogLayout();
 | 
				
			||||||
    status = ProcessStatus::Running;
 | 
					    status = ProcessStatus::Running;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Kernel::SetupMainThread(entry_point, main_thread_priority, this);
 | 
					    Kernel::SetupMainThread(entry_point, main_thread_priority, this);
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,6 @@
 | 
				
			|||||||
// Licensed under GPLv2 or any later version
 | 
					// Licensed under GPLv2 or any later version
 | 
				
			||||||
// Refer to the license.txt file included.
 | 
					// Refer to the license.txt file included.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <cinttypes>
 | 
					 | 
				
			||||||
#include <iterator>
 | 
					#include <iterator>
 | 
				
			||||||
#include "common/assert.h"
 | 
					#include "common/assert.h"
 | 
				
			||||||
#include "common/logging/log.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) {
 | 
					    for (const auto& p : vma_map) {
 | 
				
			||||||
        const VirtualMemoryArea& vma = p.second;
 | 
					        const VirtualMemoryArea& vma = p.second;
 | 
				
			||||||
        LOG_GENERIC(Log::Class::Kernel, log_level,
 | 
					        NGLOG_DEBUG(Kernel, "{:016X} - {:016X} size: {:016X} {}{}{} {}", vma.base,
 | 
				
			||||||
                    "%016" PRIx64 " - %016" PRIx64 "  size: %16" PRIx64 " %c%c%c %s", vma.base,
 | 
					 | 
				
			||||||
                    vma.base + vma.size, vma.size,
 | 
					                    vma.base + vma.size, vma.size,
 | 
				
			||||||
                    (u8)vma.permissions & (u8)VMAPermission::Read ? 'R' : '-',
 | 
					                    (u8)vma.permissions & (u8)VMAPermission::Read ? 'R' : '-',
 | 
				
			||||||
                    (u8)vma.permissions & (u8)VMAPermission::Write ? 'W' : '-',
 | 
					                    (u8)vma.permissions & (u8)VMAPermission::Write ? 'W' : '-',
 | 
				
			||||||
 | 
				
			|||||||
@ -187,7 +187,7 @@ public:
 | 
				
			|||||||
    void RefreshMemoryBlockMappings(const std::vector<u8>* block);
 | 
					    void RefreshMemoryBlockMappings(const std::vector<u8>* block);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /// Dumps the address space layout to the log, for debugging
 | 
					    /// 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
 | 
					    /// Gets the total memory usage, used by svcGetInfo
 | 
				
			||||||
    u64 GetTotalMemoryUsage();
 | 
					    u64 GetTotalMemoryUsage();
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user