refactor

kernel/mem/init.c

@@ -2,6 +2,7 @@
 
 #include <common/utils.h>
 #include <kernel/alloc.h>
+#include <kernel/arch.h>
 #include <kernel/init.h>
 #include <kernel/panic.h>
 #include <kernel/print.h>
@@ -141,7 +142,7 @@ void mem_init(struct phys_mem* map, size_t map_len, uintptr_t kernel_virt, phys_
 
         const size_t num_pages = (map[i].length + pgsz - 1) / pgsz;
         const size_t metadata_size = num_pages * sizeof(struct page);
-        const uintptr_t metadata_start_vaddr = arch_vm_pfndb_addr() + (map[i].address / pgsz * sizeof(struct page));
+        const uintptr_t metadata_start_vaddr = arch_mem_pfndb_addr() + (map[i].address / pgsz * sizeof(struct page));
         const uintptr_t metadata_end_vaddr = metadata_start_vaddr + metadata_size;
 
         // Find the page-aligned boundaries that contain this metadata.
@@ -156,7 +157,7 @@ void mem_init(struct phys_mem* map, size_t map_len, uintptr_t kernel_virt, phys_
             pmap_map(&kernel_vas.pmap, vaddr + page, paddr, PTE_READ | PTE_WRITE, CACHE_NONE);
         }
     }
-    vm_pfndb = (struct page*)arch_vm_pfndb_addr();
+    vm_pfndb = (struct page*)arch_mem_pfndb_addr();
 
     // We don't need the bootstrap allocator from this point on.
     // Initialize the real page allocator.
@@ -164,5 +165,7 @@ void mem_init(struct phys_mem* map, size_t map_len, uintptr_t kernel_virt, phys_
 
     slab_init();
 
+    // TODO: Free `__init` memory.
+
     kprintf("Memory initialization complete\n");
 }