From 5493d1bae1e3e25e1a83bcd84e2a92f3309299f9 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Thu, 12 Jan 2023 13:46:02 +0200 Subject: [PATCH] Kernel: Add debug print to MMU and fix comment --- kernel/arch/i386/MMU.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/kernel/arch/i386/MMU.cpp b/kernel/arch/i386/MMU.cpp index e49f2a2715..f10a4b8853 100644 --- a/kernel/arch/i386/MMU.cpp +++ b/kernel/arch/i386/MMU.cpp @@ -5,6 +5,8 @@ #include +#define MMU_DEBUG_PRINT 1 + #define PRESENT (1 << 0) #define READ_WRITE (1 << 1) @@ -41,7 +43,7 @@ MMU::MMU() ASSERT(m_page_descriptor_pointer_table); ASSERT(((uintptr_t)m_page_descriptor_pointer_table % 32) == 0); - // create and zero out all page directories + // allocate all page directories for (int i = 0; i < 4; i++) { uint64_t* page_directory = allocate_page_aligned_page(); @@ -70,12 +72,14 @@ MMU::MMU() void MMU::AllocatePage(uintptr_t address) { +#if MMU_DEBUG_PRINT + dprintln("AllocatePage(0x{8H})", address & PAGE_MASK); +#endif + uint32_t pdpte = (address & 0xC0000000) >> 30; uint32_t pde = (address & 0x3FE00000) >> 21; uint32_t pte = (address & 0x001FF000) >> 12; - ASSERT(pdpte < 4); - uint64_t* page_directory = (uint64_t*)(m_page_descriptor_pointer_table[pdpte] & PAGE_MASK); if (!(page_directory[pde] & PRESENT)) { @@ -99,6 +103,10 @@ void MMU::AllocateRange(uintptr_t address, ptrdiff_t size) void MMU::UnAllocatePage(uintptr_t address) { +#if MMU_DEBUG_PRINT + dprintln("UnAllocatePage(0x{8H})", address & PAGE_MASK); +#endif + uint32_t pdpte = (address & 0xC0000000) >> 30; uint32_t pde = (address & 0x3FE00000) >> 21; uint32_t pte = (address & 0x001FF000) >> 12;