Changeset 9589 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

Timestamp:

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

Author:

vboxsync

Message:

AMD64 paging updates

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (3 diffs)

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;
                             }