Relocate page mapping helpers and add PML5 support

xtoskrnl/mm/i686/init.c

@@ -49,48 +49,6 @@ MmInitializePageMapSupport(VOID)
     }
 }
 
-/**
- * Gets the address of the PDE (Page Directory Entry), that maps given address.
- *
- * @param Address
- *        Specifies the address to find the PDE for.
- *
- * @return This routine returns the address of the PDE.
- *
- * @since XT 1.0
- */
-XTAPI
-PMMPTE
-MmpGetPdeAddress(PVOID Address)
-{
-    ULONG Offset;
-
-    /* Calculate offset and return PTE address */
-    Offset = ((((ULONG)(Address)) >> MM_PDI_SHIFT) << MM_PTE_SHIFT);
-    return (PMMPTE)(MM_PDE_BASE + Offset);
-}
-
-/**
- * Gets the address of the PTE (Page Table Entry), that maps given address.
- *
- * @param Address
- *        Specifies the address to find the PTE for.
- *
- * @return This routine returns the address of the PTE.
- *
- * @since XT 1.0
- */
-XTAPI
-PMMPTE
-MmpGetPteAddress(PVOID Address)
-{
-    ULONG Offset;
-
-    /* Calculate offset and return PTE address */
-    Offset = ((((ULONG)(Address)) >> MM_PTI_SHIFT) << MM_PTE_SHIFT);
-    return (PMMPTE)(MM_PTE_BASE + Offset);
-}
-
 /**
  * Performs architecture specific initialization of the XTOS Memory Manager.
  *

xtoskrnl/mm/i686/pmap.c

@@ -23,3 +23,63 @@ MmpGetExtendedPhysicalAddressingStatus(VOID)
     /* Check if PAE is enabled */
     return ((ArReadControlRegister(4) & CR4_PAE) != 0) ? TRUE : FALSE;
 }
+
+/**
+ * Gets the address of the PDE (Page Directory Entry), that maps given address.
+ *
+ * @param Address
+ *        Specifies the virtual address for which to retrieve the corresponding PDE.
+ *
+ * @return This routine returns the address of the PDE.
+ *
+ * @since XT 1.0
+ */
+XTAPI
+PMMPDE
+MmpGetPdeAddress(PVOID Address)
+{
+    ULONG Offset;
+
+    /* Calculate offset and return PTE address */
+    Offset = ((((ULONG)(Address)) >> MmpPageMapInfo.PdiShift) << MmpPageMapInfo.PteShift);
+    return (PMMPTE)(MmpPageMapInfo.PdeBase + Offset);
+}
+
+/**
+ * Gets the address of the PPE (Page Directory Pointer Table Entry), that maps given address.
+ *
+ * @param Address
+ *        Specifies the virtual address for which to retrieve the corresponding PDE.
+ *
+ * @return This routine returns the address of the PPE.
+ *
+ * @since XT 1.0
+ */
+XTAPI
+PMMPPE
+MmpGetPpeAddress(PVOID Address)
+{
+    /* Return zero */
+    return 0;
+}
+
+/**
+ * Gets the address of the PTE (Page Table Entry), that maps given address.
+ *
+ * @param Address
+ *        Specifies the virtual address for which to retrieve the corresponding PTE.
+ *
+ * @return This routine returns the address of the PTE.
+ *
+ * @since XT 1.0
+ */
+XTAPI
+PMMPTE
+MmpGetPteAddress(PVOID Address)
+{
+    ULONG Offset;
+
+    /* Calculate offset and return PTE address */
+    Offset = ((((ULONG)(Address)) >> MM_PTI_SHIFT) << MmpPageMapInfo.PteShift);
+    return (PMMPTE)(MM_PTE_BASE + Offset);
+}