From e29fd3cd20ff775b197716403e03b30db6bd7923 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 23 Aug 2019 16:18:27 +0200 Subject: [PATCH] Kernel: Display virtual addresses as V%p instead of L%x The L was a leftover from when these were called linear addresses. --- AK/ELF/ELFLoader.cpp | 2 +- Kernel/Arch/i386/CPU.cpp | 2 +- Kernel/Devices/BXVGADevice.cpp | 2 +- Kernel/Devices/MBVGADevice.cpp | 2 +- Kernel/Process.cpp | 2 +- Kernel/VM/MemoryManager.cpp | 20 ++++++++++---------- Kernel/VM/PageDirectory.cpp | 2 +- Kernel/VM/Region.cpp | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/AK/ELF/ELFLoader.cpp b/AK/ELF/ELFLoader.cpp index e3c776eda1..163a4bcbb0 100644 --- a/AK/ELF/ELFLoader.cpp +++ b/AK/ELF/ELFLoader.cpp @@ -38,7 +38,7 @@ bool ELFLoader::layout() if (program_header.type() != PT_LOAD) return; #ifdef ELFLOADER_DEBUG - kprintf("PH: L%x %u r:%u w:%u\n", program_header.vaddr().get(), program_header.size_in_memory(), program_header.is_readable(), program_header.is_writable()); + kprintf("PH: V%p %u r:%u w:%u\n", program_header.vaddr().get(), program_header.size_in_memory(), program_header.is_readable(), program_header.is_writable()); #endif if (program_header.is_writable()) { alloc_section_hook( diff --git a/Kernel/Arch/i386/CPU.cpp b/Kernel/Arch/i386/CPU.cpp index 4a0bc9a1e0..3e40f85fd6 100644 --- a/Kernel/Arch/i386/CPU.cpp +++ b/Kernel/Arch/i386/CPU.cpp @@ -245,7 +245,7 @@ void exception_14_handler(RegisterDumpWithExceptionCode& regs) : "=a"(fault_page_directory)); #ifdef PAGE_FAULT_DEBUG - dbgprintf("%s(%u): ring%u %s page fault in PD=%x, %s L%x\n", + dbgprintf("%s(%u): ring%u %s page fault in PD=%x, %s V%08x\n", current->process().name().characters(), current->pid(), regs.cs & 3, diff --git a/Kernel/Devices/BXVGADevice.cpp b/Kernel/Devices/BXVGADevice.cpp index b971a31dfc..506160dd1a 100644 --- a/Kernel/Devices/BXVGADevice.cpp +++ b/Kernel/Devices/BXVGADevice.cpp @@ -94,7 +94,7 @@ KResultOr BXVGADevice::mmap(Process& process, FileDescription&, Virtual 0, "BXVGA Framebuffer", prot); - kprintf("BXVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr L%x\n", + kprintf("BXVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr V%p\n", process.name().characters(), process.pid(), region, region->size(), m_framebuffer_address.as_ptr(), region->vaddr().get()); ASSERT(region); diff --git a/Kernel/Devices/MBVGADevice.cpp b/Kernel/Devices/MBVGADevice.cpp index a730fd25b6..657914281d 100644 --- a/Kernel/Devices/MBVGADevice.cpp +++ b/Kernel/Devices/MBVGADevice.cpp @@ -34,7 +34,7 @@ KResultOr MBVGADevice::mmap(Process& process, FileDescription&, Virtual 0, "MBVGA Framebuffer", prot); - kprintf("MBVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr L%x\n", + kprintf("MBVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr V%p\n", process.name().characters(), process.pid(), region, region->size(), m_framebuffer_address.as_ptr(), region->vaddr().get()); ASSERT(region); diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index 84ea356185..e324aa836f 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -261,7 +261,7 @@ Process* Process::fork(RegisterDump& regs) for (auto& region : m_regions) { #ifdef FORK_DEBUG - dbgprintf("fork: cloning Region{%p} \"%s\" L%x\n", region.ptr(), region->name().characters(), region->vaddr().get()); + dbgprintf("fork: cloning Region{%p} \"%s\" V%08x\n", region.ptr(), region->name().characters(), region->vaddr().get()); #endif auto cloned_region = region.clone(); child->m_regions.append(move(cloned_region)); diff --git a/Kernel/VM/MemoryManager.cpp b/Kernel/VM/MemoryManager.cpp index 16f129b538..0498fd4ccd 100644 --- a/Kernel/VM/MemoryManager.cpp +++ b/Kernel/VM/MemoryManager.cpp @@ -170,7 +170,7 @@ PageTableEntry& MemoryManager::ensure_pte(PageDirectory& page_directory, Virtual PageDirectoryEntry& pde = page_directory.entries()[page_directory_index]; if (!pde.is_present()) { #ifdef MM_DEBUG - dbgprintf("MM: PDE %u not present (requested for L%x), allocating\n", page_directory_index, vaddr.get()); + dbgprintf("MM: PDE %u not present (requested for V%p), allocating\n", page_directory_index, vaddr.get()); #endif if (page_directory_index == 0) { ASSERT(&page_directory == m_kernel_page_directory); @@ -188,7 +188,7 @@ PageTableEntry& MemoryManager::ensure_pte(PageDirectory& page_directory, Virtual //ASSERT(&page_directory != m_kernel_page_directory.ptr()); auto page_table = allocate_page_table(page_directory, page_directory_index); #ifdef MM_DEBUG - dbgprintf("MM: PD K%x (%s) at P%x allocated page table #%u (for L%x) at P%x\n", + dbgprintf("MM: PD K%x (%s) at P%x allocated page table #%u (for V%p) at P%x\n", &page_directory, &page_directory == m_kernel_page_directory ? "Kernel" : "User", page_directory.cr3(), @@ -399,7 +399,7 @@ PageFaultResponse MemoryManager::handle_page_fault(const PageFault& fault) ASSERT_INTERRUPTS_DISABLED(); ASSERT(current); #ifdef PAGE_FAULT_DEBUG - dbgprintf("MM: handle_page_fault(%w) at L%x\n", fault.code(), fault.vaddr().get()); + dbgprintf("MM: handle_page_fault(%w) at V%p\n", fault.code(), fault.vaddr().get()); #endif ASSERT(fault.vaddr() != m_quickmap_addr); if (fault.type() == PageFault::Type::PageNotPresent && fault.vaddr().get() >= 0xc0000000) { @@ -417,7 +417,7 @@ PageFaultResponse MemoryManager::handle_page_fault(const PageFault& fault) } auto* region = region_from_vaddr(fault.vaddr()); if (!region) { - kprintf("NP(error) fault at invalid address L%x\n", fault.vaddr().get()); + kprintf("NP(error) fault at invalid address V%p\n", fault.vaddr().get()); return PageFaultResponse::ShouldCrash; } auto page_index_in_region = region->page_index_from_address(fault.vaddr()); @@ -444,7 +444,7 @@ PageFaultResponse MemoryManager::handle_page_fault(const PageFault& fault) ASSERT(success); return PageFaultResponse::Continue; } - kprintf("PV(error) fault in Region{%p}[%u] at L%x\n", region, page_index_in_region, fault.vaddr().get()); + kprintf("PV(error) fault in Region{%p}[%u] at V%p\n", region, page_index_in_region, fault.vaddr().get()); return PageFaultResponse::ShouldCrash; } @@ -624,7 +624,7 @@ u8* MemoryManager::quickmap_page(PhysicalPage& physical_page) flush_tlb(page_vaddr); ASSERT((u32)pte.physical_page_base() == physical_page.paddr().get()); #ifdef MM_DEBUG - dbgprintf("MM: >> quickmap_page L%x => P%x @ PTE=%p\n", page_vaddr, physical_page.paddr().get(), pte.ptr()); + dbgprintf("MM: >> quickmap_page V%p => P%x @ PTE=%p\n", page_vaddr, physical_page.paddr().get(), pte.ptr()); #endif return page_vaddr.as_ptr(); } @@ -643,7 +643,7 @@ void MemoryManager::unquickmap_page() pte.set_writable(false); flush_tlb(page_vaddr); #ifdef MM_DEBUG - dbgprintf("MM: >> unquickmap_page L%x =/> P%x\n", page_vaddr, old_physical_address); + dbgprintf("MM: >> unquickmap_page V%p =/> P%x\n", page_vaddr, old_physical_address); #endif m_quickmap_in_use = false; } @@ -665,7 +665,7 @@ void MemoryManager::remap_region_page(Region& region, unsigned page_index_in_reg pte.set_user_allowed(region.is_user_accessible()); region.page_directory()->flush(page_vaddr); #ifdef MM_DEBUG - dbgprintf("MM: >> remap_region_page (PD=%x, PTE=P%x) '%s' L%x => P%x (@%p)\n", region.page_directory()->cr3(), pte.ptr(), region.name().characters(), page_vaddr.get(), physical_page->paddr().get(), physical_page.ptr()); + dbgprintf("MM: >> remap_region_page (PD=%x, PTE=P%x) '%s' V%p => P%x (@%p)\n", region.page_directory()->cr3(), pte.ptr(), region.name().characters(), page_vaddr.get(), physical_page->paddr().get(), physical_page.ptr()); #endif } @@ -704,7 +704,7 @@ void MemoryManager::map_region_at_address(PageDirectory& page_directory, Region& pte.set_user_allowed(region.is_user_accessible()); page_directory.flush(page_vaddr); #ifdef MM_DEBUG - dbgprintf("MM: >> map_region_at_address (PD=%x) '%s' L%x => P%x (@%p)\n", &page_directory, region.name().characters(), page_vaddr, physical_page ? physical_page->paddr().get() : 0, physical_page.ptr()); + dbgprintf("MM: >> map_region_at_address (PD=%x) '%s' V%p => P%x (@%p)\n", &page_directory, region.name().characters(), page_vaddr, physical_page ? physical_page->paddr().get() : 0, physical_page.ptr()); #endif } } @@ -723,7 +723,7 @@ bool MemoryManager::unmap_region(Region& region) region.page_directory()->flush(vaddr); #ifdef MM_DEBUG auto& physical_page = region.vmo().physical_pages()[region.first_page_index() + i]; - dbgprintf("MM: >> Unmapped L%x => P%x <<\n", vaddr, physical_page ? physical_page->paddr().get() : 0); + dbgprintf("MM: >> Unmapped V%p => P%x <<\n", vaddr, physical_page ? physical_page->paddr().get() : 0); #endif } region.page_directory()->range_allocator().deallocate({ region.vaddr(), region.size() }); diff --git a/Kernel/VM/PageDirectory.cpp b/Kernel/VM/PageDirectory.cpp index 8283883fad..3533d6cfa9 100644 --- a/Kernel/VM/PageDirectory.cpp +++ b/Kernel/VM/PageDirectory.cpp @@ -50,7 +50,7 @@ PageDirectory::~PageDirectory() void PageDirectory::flush(VirtualAddress vaddr) { #ifdef MM_DEBUG - dbgprintf("MM: Flush page L%x\n", vaddr.get()); + dbgprintf("MM: Flush page V%p\n", vaddr.get()); #endif if (!current) return; diff --git a/Kernel/VM/Region.cpp b/Kernel/VM/Region.cpp index 180a293a22..537101cf8a 100644 --- a/Kernel/VM/Region.cpp +++ b/Kernel/VM/Region.cpp @@ -75,7 +75,7 @@ NonnullRefPtr Region::clone() if (m_shared || (is_readable() && !is_writable())) { #ifdef MM_DEBUG - dbgprintf("%s<%u> Region::clone(): sharing %s (L%x)\n", + dbgprintf("%s<%u> Region::clone(): sharing %s (V%p)\n", current->process().name().characters(), current->pid(), m_name.characters(), @@ -86,7 +86,7 @@ NonnullRefPtr Region::clone() } #ifdef MM_DEBUG - dbgprintf("%s<%u> Region::clone(): cowing %s (L%x)\n", + dbgprintf("%s<%u> Region::clone(): cowing %s (V%p)\n", current->process().name().characters(), current->pid(), m_name.characters(), @@ -102,7 +102,7 @@ int Region::commit() { InterruptDisabler disabler; #ifdef MM_DEBUG - dbgprintf("MM: commit %u pages in Region %p (VMO=%p) at L%x\n", vmo().page_count(), this, &vmo(), vaddr().get()); + dbgprintf("MM: commit %u pages in Region %p (VMO=%p) at V%p\n", vmo().page_count(), this, &vmo(), vaddr().get()); #endif for (size_t i = first_page_index(); i <= last_page_index(); ++i) { if (!vmo().physical_pages()[i].is_null())