Changeset 147 for trunk/hal/x86_64/core

Timestamp:

Jul 5, 2017, 11:19:36 AM (7 years ago)

Author:

max@…

Message:

less magic

Location:

trunk/hal/x86_64/core

Files:

• hal_boot.h (modified) (1 diff)
• hal_gpt.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_boot.h

@@ -108 +108 @@
 /* -------------------------------------------------------------------------- */
 
+#define VA_SIGN_MASK            0xffff000000000000
+#define VA_SIGN_POS(va)         ((va) & ~VA_SIGN_MASK)
+
+#define pl1_i(VA)       (((VA_SIGN_POS(VA)) & L1_FRAME) >> L1_SHIFT)
+#define pl2_i(VA)       (((VA_SIGN_POS(VA)) & L2_FRAME) >> L2_SHIFT)
+#define pl3_i(VA)       (((VA_SIGN_POS(VA)) & L3_FRAME) >> L3_SHIFT)
+#define pl4_i(VA)       (((VA_SIGN_POS(VA)) & L4_FRAME) >> L4_SHIFT)
+
 #define L4_SLOT_PTE             255
-#define L4_SLOT_KERNBASE        480
-
-/*
- * L3 = (KERNBASE % NBPD_L4) / NBPD_L3
- * L2 = (KERNBASE % NBPD_L3) / NBPD_L2
- */
-#define L3_SLOT_KERNBASE        0
-#define L2_SLOT_KERNBASE        0
+#define L4_SLOT_KERNBASE        pl4_i(KERNBASE)
+#define L3_SLOT_KERNBASE        (pl3_i(KERNBASE) % 512)
+#define L2_SLOT_KERNBASE        (pl2_i(KERNBASE) % 512)
 
 #define PDIR_SLOT_PTE   L4_SLOT_PTE

trunk/hal/x86_64/core/hal_gpt.c

@@ -35 +35 @@
 #include <ppm.h>
 #include <page.h>
-
-#define VA_SIGN_MASK            0xffff000000000000
-#define VA_SIGN_POS(va)         ((va) & ~VA_SIGN_MASK)
-
-#define pl1_i(VA)       (((VA_SIGN_POS(VA)) & L1_FRAME) >> L1_SHIFT)
-#define pl2_i(VA)       (((VA_SIGN_POS(VA)) & L2_FRAME) >> L2_SHIFT)
-#define pl3_i(VA)       (((VA_SIGN_POS(VA)) & L3_FRAME) >> L3_SHIFT)
-#define pl4_i(VA)       (((VA_SIGN_POS(VA)) & L4_FRAME) >> L4_SHIFT)
 
 extern vaddr_t __kernel_end;