Changeset 9589 in vbox

Timestamp:

Jun 11, 2008 8:43:25 AM (17 years ago)

Author:

vboxsync

Message:

AMD64 paging updates

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (2 diffs)
• PGMAllBth.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -817 +817 @@
     pPml4e = &pPGM->pHCPaePML4->a[iPml4e];
     if (!pPml4e->n.u1Present)
-        return VERR_PAGE_TABLE_NOT_PRESENT;
+        return VERR_PAGE_MAP_LEVEL4_NOT_PRESENT;
 
     pShwPage = pgmPoolGetPage(pPool, pPml4e->u & X86_PML4E_PG_MASK);
@@ -828 +828 @@
     *ppPdpt = pPdpt;
     if (!pPdpe->n.u1Present)
-        return VERR_PAGE_TABLE_NOT_PRESENT;
+        return VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT;
 
     pShwPage = pgmPoolGetPage(pPool, pPdpe->u & X86_PDPE_PG_MASK);

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

@@ -2603 +2603 @@
         const unsigned  iPDDst = ((GCPtrPage >> SHW_PD_SHIFT) & SHW_PD_MASK);
         PX86PDPAE       pPDDst;
-        PX86PDPT        pPdptDst;
         X86PDEPAE       PdeDst;
 
-        int rc = PGMShwGetLongModePDPtr(pVM, GCPtrPage, &pPdptDst, &pPDDst);
+        int rc = PGMShwGetAllocLongModePDPtr(pVM, GCPtrPage, &pPDDst);
         if (rc != VINF_SUCCESS)
         {
-            AssertMsg(rc == VERR_PAGE_TABLE_NOT_PRESENT, ("Unexpected rc=%Vrc\n", rc));
+            AssertMsg(rc == VINF_PGM_SYNC_CR3, ("Unexpected rc=%Vrc\n", rc));
             return rc;
         }
@@ -2944 +2943 @@
             if (rc != VINF_SUCCESS)
             {
-                AssertMsg(rc == VERR_PAGE_TABLE_NOT_PRESENT, ("Unexpected rc=%Vrc\n", rc));
-                return rc;
+                if (rc == VERR_PAGE_MAP_LEVEL4_NOT_PRESENT)
+                    break; /* next PML4E */
+
+                AssertMsg(rc == VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT, ("Unexpected rc=%Vrc\n", rc));
+                continue;   /* next PDPTE */
             }
             Assert(pPDDst);
@@ -2965 +2967 @@
                             if (rc != VINF_SUCCESS)
                             {
-                                AssertMsg(rc == VERR_PAGE_TABLE_NOT_PRESENT, ("Unexpected rc=%Vrc\n", rc));
-                                return rc;
+                                AssertMsg(rc == VERR_PAGE_DIRECTORY_PTR_NOT_PRESENT, ("Unexpected rc=%Vrc\n", rc));
+                                continue;
                             }