Changeset 8458 in vbox for trunk/src/VBox

Timestamp:

Apr 29, 2008 12:00:53 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

30321

Message:

Finished up the Gst part of longmode paging

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAllGst.h (modified) (4 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -3401 +3401 @@
     return 0ULL;
 }
+
+/**
+ * Gets the page directory entry for the specified address.
+ *
+ * @returns Pointer to the page directory entry in question.
+ * @returns NULL if the page directory is not present or on an invalid page.
+ * @param   pPGM        Pointer to the PGM instance data.
+ * @param   GCPtr       The address.
+ */
+DECLINLINE(PX86PDEPAE) pgmGstGetLongModePDEPtr(PPGM pPGM, RTGCUINTPTR64 GCPtr)
+{
+    const unsigned iPml4e = (GCPtr >> X86_PML4_SHIFT) & X86_PML4_MASK;
+
+    if (pPGM->pHCPaePML4->a[iPml4e].n.u1Present)
+    {
+        PX86PDPT pPdptTemp;
+        int rc = PGM_GCPHYS_2_PTR(PGM2VM(pPGM), pPGM->pHCPaePML4->a[iPml4e].u & X86_PML4E_PG_MASK, &pPdptTemp);
+        if (VBOX_FAILURE(rc))
+        {
+            AssertFailed();
+            return NULL;
+        }
+
+        const unsigned iPdPt  = (GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_AMD64;
+        if (pPdptTemp->a[iPdPt].n.u1Present)
+        {
+            PX86PDPAE pPD;
+
+            rc = PGM_GCPHYS_2_PTR(PGM2VM(pPGM), pPdptTemp->a[iPdPt].u & X86_PDPE_PG_MASK, &pPD);
+            if (VBOX_FAILURE(rc))
+            {
+                AssertFailed();
+                return NULL;
+            }
+            const unsigned iPD = (GCPtr >> X86_PD_PAE_SHIFT) & X86_PD_PAE_MASK;
+            return &pPD->a[iPD];
+        }
+    }
+    return NULL;
+}
+
 #endif /* !IN_GC */
 

trunk/src/VBox/VMM/VMMAll/PGMAllGst.h

@@ -271 +271 @@
  || PGM_GST_TYPE == PGM_TYPE_AMD64
 
-#if PGM_GST_TYPE == PGM_TYPE_AMD64
-    /* later */
-    /* check level 3 & 4 bits as well (r/w, u/s, nxe) */
-    AssertFailed();
-    return VERR_NOT_IMPLEMENTED;
-#endif
-
     for (;;)
     {
@@ -285 +278 @@
 #if PGM_GST_TYPE == PGM_TYPE_32BIT
         PX86PDE pPde = &CTXSUFF(pVM->pgm.s.pGuestPD)->a[GCPtr >> X86_PD_SHIFT];
-#else /* PAE */
+#elif PGM_GST_TYPE == PGM_TYPE_PAE
         /* pgmGstGetPaePDEPtr will return 0 if the PDPTE is marked as not present
          * All the other bits in the PDPTE are only valid in long mode (r/w, u/s, nx)
          */
         PX86PDEPAE pPde = pgmGstGetPaePDEPtr(&pVM->pgm.s, GCPtr);
+        Assert(pPde);
+        if (!pPde)
+            return VERR_PAGE_TABLE_NOT_PRESENT;
+#elif PGM_GST_TYPE == PGM_TYPE_AMD64
+        /** @todo Setting the r/w, u/s & nx bits might have no effect depending on the pdpte & pml4 values */
+        PX86PDEPAE pPde = pgmGstGetLongModePDEPtr(&pVM->pgm.s, GCPtr);
         Assert(pPde);
         if (!pPde)
@@ -375 +374 @@
     Pde.u = pgmGstGetPaePDE(&pVM->pgm.s, GCPtr);
 # elif PGM_GST_TYPE == PGM_TYPE_AMD64
-    X86PDEPAE    Pde;
+    X86PDEPAE Pde;
     Pde.u = pgmGstGetLongModePDE(&pVM->pgm.s, GCPtr);
 # endif
@@ -731 +730 @@
         Pde.u = pgmGstGetPaePDE(&pState->pVM->pgm.s, GCPtr);
 #elif PGM_GST_TYPE == PGM_TYPE_AMD64
-        X86PDEPAE    Pde;
+        X86PDEPAE   Pde;
         Pde.u = pgmGstGetLongModePDE(&pState->pVM->pgm.s, GCPtr);
 #endif