xnu-2050.24.15.tar.gz

[apple/xnu.git] / osfmk / i386 / idle_pt.c

diff --git a/osfmk/i386/idle_pt.c b/osfmk/i386/idle_pt.c
index ebbfc556d9b95dea08f98bcd660dba0380b40415..4110c212ef841e2cb7621e5d3bf9f2ce17a7bda3 100644 (file)
--- a/osfmk/i386/idle_pt.c
+++ b/osfmk/i386/idle_pt.c
@@ -27,29 +27,26 @@
  */
 #include <i386/pmap.h>
 
  */
 #include <i386/pmap.h>
 

-pml4_entry_t           IdlePML4[PTE_PER_PAGE] __attribute__((section("__INITPT, __data"))) = {
-#ifdef __x86_64__
-               [  0] = ((uint64_t)(INITPT_SEG_BASE + PAGE_SIZE) | INTEL_PTE_VALID | INTEL_PTE_WRITE),
-               [KERNEL_PML4_INDEX] = ((uint64_t)(INITPT_SEG_BASE + PAGE_SIZE) | INTEL_PTE_VALID | INTEL_PTE_WRITE),
-#endif
-       };
+#define PML4_PROT (INTEL_PTE_VALID | INTEL_PTE_WRITE)
+pml4_entry_t   IdlePML4[PTE_PER_PAGE]
+               __attribute__((section("__INITPT, __data"))) = {
+};

 
 

-#if defined(__x86_64__)
-#define PDPT_PROT (INTEL_PTE_VALID | INTEL_PTE_WRITE)
-#elif defined(__i386__)

 #define PDPT_PROT (INTEL_PTE_VALID)
 #define PDPT_PROT (INTEL_PTE_VALID)

-#endif
-pdpt_entry_t           IdlePDPT[PTE_PER_PAGE] __attribute__((section("__INITPT, __data"))) = {
-               [0] = ((uint64_t)(INITPT_SEG_BASE + 2*PAGE_SIZE) | PDPT_PROT), 
-               [1] = ((uint64_t)(INITPT_SEG_BASE + 3*PAGE_SIZE) | PDPT_PROT), 
-               [2] = ((uint64_t)(INITPT_SEG_BASE + 4*PAGE_SIZE) | PDPT_PROT), 
-               [3] = ((uint64_t)(INITPT_SEG_BASE + 5*PAGE_SIZE) | PDPT_PROT), 
-       };
+pdpt_entry_t   IdlePDPT[PTE_PER_PAGE]
+               __attribute__((section("__INITPT, __data"))) = {
+       [0] = ((uint64_t)(INITPT_SEG_BASE + 2*PAGE_SIZE) | PDPT_PROT), 
+       [1] = ((uint64_t)(INITPT_SEG_BASE + 3*PAGE_SIZE) | PDPT_PROT), 
+       [2] = ((uint64_t)(INITPT_SEG_BASE + 4*PAGE_SIZE) | PDPT_PROT), 
+       [3] = ((uint64_t)(INITPT_SEG_BASE + 5*PAGE_SIZE) | PDPT_PROT), 
+};

 
 #if NPGPTD != 4
 #error Please update idle_pt.c to reflect the new value of NPGPTD
 #endif
 
 
 #if NPGPTD != 4
 #error Please update idle_pt.c to reflect the new value of NPGPTD
 #endif
 

+#if MACHINE_BOOTSTRAPPTD
+

 #define ID_MAP_2MEG(x) [(x)] = ((((uint64_t)(x)) << 21) | (INTEL_PTE_PS | INTEL_PTE_VALID | INTEL_PTE_WRITE)),
 
 #define L0(x,n) x(n)
 #define ID_MAP_2MEG(x) [(x)] = ((((uint64_t)(x)) << 21) | (INTEL_PTE_PS | INTEL_PTE_VALID | INTEL_PTE_WRITE)),
 
 #define L0(x,n) x(n)


@@ -67,6 +64,8 @@ pdpt_entry_t          IdlePDPT[PTE_PER_PAGE] __attribute__((section("__INITPT, __data"))
 
 #define FOR_0_TO_2047(x) L11(x,2047)
 
 
 #define FOR_0_TO_2047(x) L11(x,2047)
 

-pd_entry_t             BootstrapPTD[2048] __attribute__((section("__INITPT, __data"))) = {
+pd_entry_t     BootPTD[2048]
+               __attribute__((section("__INITPT, __data"))) = {

        FOR_0_TO_2047(ID_MAP_2MEG)
 };
        FOR_0_TO_2047(ID_MAP_2MEG)
 };

+#endif /* MACHINE_BOOTSTRAPPTD */