mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-11-03 23:28:48 +00:00 
			
		
		
		
	common/log: Move Log namespace into the Common namespace
Forgot to move this over when I moved the rest of the source files with lacking namespaces over.
This commit is contained in:
		
							parent
							
								
									4fd0cbebdb
								
							
						
					
					
						commit
						b4c38372d1
					
				
					 18 changed files with 66 additions and 54 deletions
				
			
		| 
						 | 
				
			
			@ -203,7 +203,7 @@ void Process::Run(s32 main_thread_priority, u32 stack_size) {
 | 
			
		|||
 | 
			
		||||
    status = ProcessStatus::Running;
 | 
			
		||||
 | 
			
		||||
    vm_manager.LogLayout(Log::Level::Debug);
 | 
			
		||||
    vm_manager.LogLayout(Common::Log::Level::Debug);
 | 
			
		||||
    Kernel::SetupMainThread(kernel, codeset->entrypoint, main_thread_priority, SharedFrom(this));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -529,7 +529,7 @@ ResultCode SVC::ControlMemory(u32* out_addr, u32 addr0, u32 addr1, u32 size, u32
 | 
			
		|||
        return ERR_INVALID_COMBINATION;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    process.vm_manager.LogLayout(Log::Level::Trace);
 | 
			
		||||
    process.vm_manager.LogLayout(Common::Log::Level::Trace);
 | 
			
		||||
 | 
			
		||||
    return RESULT_SUCCESS;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -239,10 +239,10 @@ ResultCode VMManager::ReprotectRange(VAddr target, u32 size, VMAPermission new_p
 | 
			
		|||
    return RESULT_SUCCESS;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void VMManager::LogLayout(Log::Level log_level) const {
 | 
			
		||||
void VMManager::LogLayout(Common::Log::Level log_level) const {
 | 
			
		||||
    for (const auto& p : vma_map) {
 | 
			
		||||
        const VirtualMemoryArea& vma = p.second;
 | 
			
		||||
        LOG_GENERIC(::Log::Class::Kernel, log_level, "{:08X} - {:08X}  size: {:8X} {}{}{} {}",
 | 
			
		||||
        LOG_GENERIC(Common::Log::Class::Kernel, log_level, "{:08X} - {:08X}  size: {:8X} {}{}{} {}",
 | 
			
		||||
                    vma.base, vma.base + vma.size, vma.size,
 | 
			
		||||
                    (u8)vma.permissions & (u8)VMAPermission::Read ? 'R' : '-',
 | 
			
		||||
                    (u8)vma.permissions & (u8)VMAPermission::Write ? 'W' : '-',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -202,7 +202,7 @@ public:
 | 
			
		|||
    ResultCode ReprotectRange(VAddr target, u32 size, VMAPermission new_perms);
 | 
			
		||||
 | 
			
		||||
    /// Dumps the address space layout to the log, for debugging
 | 
			
		||||
    void LogLayout(Log::Level log_level) const;
 | 
			
		||||
    void LogLayout(Common::Log::Level log_level) const;
 | 
			
		||||
 | 
			
		||||
    /// Gets a list of backing memory blocks for the specified range
 | 
			
		||||
    ResultVal<std::vector<std::pair<MemoryRef, u32>>> GetBackingBlocksForRange(VAddr address,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue