move limine to arch-specific directory.

untie boot code from non-boot code

1 files changed, 3 insertions, 17 deletions

diff --git a/arch/x86_64/memory/page_directory.c b/arch/x86_64/memory/page_directory.c
index 7030b05..11e4861 100644
--- a/arch/x86_64/memory/page_directory.c
+++ b/arch/x86_64/memory/page_directory.c
@@ -1,30 +1,16 @@
 #include "arch/x86_64/page.h"
-#include "arch/x86_64/object.h"
 #include "device/processor.h"
-#include "print.h"
 #include "memory.h"
+#include "boot.h"
 #include "object.h"
 #include "string.h"
 #include "jove.h"
 #include <stdint.h>
 
-physptr_t s_kpbase(void);
-
-#if defined(__limine__)
-
-#include "boot/limine/limine.h"
-static struct limine_kernel_address_request s_kaddr_req = {
-    .id = LIMINE_KERNEL_ADDRESS_REQUEST
-};
-
-physptr_t s_kpbase(void) { return s_kaddr_req.response->physical_base; }
-
-#endif
-
 physptr_t 
 vmem_tophys_koff(virtptr_t v)
 {
-    return v - (physptr_t)&_kernel_start + s_kpbase();
+    return v - (physptr_t)&_kernel_start + _boot_kernel_phys_base;
 }
 
 #define IDENTITY_BASE 0xFFFF800000000000
@@ -106,7 +92,7 @@ vmem_setup(void)
     s_kernel_pml3[kernel_pml3_i].value = kernel_pml2_base | 2 | 1;
     s_kernel_pml2[kernel_pml2_i].value = kernel_pml1_base | 2 | 1;
     for(pmli_t i = kernel_pml1_ib; i < kernel_pml1_ie; i++) {
-        s_kernel_pml1[i].value = ((i * 0x1000) + s_kpbase()) | 3;
+        s_kernel_pml1[i].value = ((i * 0x1000) + _boot_kernel_phys_base) | 3;
     }
 
     __asm__ volatile("mov %0, %%cr3":: "r"(kernel_pml4_base));