Changeset 9575 in vbox

Timestamp:

Jun 10, 2008 3:28:27 PM (17 years ago)

Author:

vboxsync

Message:

Missing mapping of amd64 cr3.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (5 diffs)

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

@@ -398 +398 @@
 {
 #if PGM_GST_TYPE == PGM_TYPE_32BIT \
- || PGM_GST_TYPE == PGM_TYPE_PAE
+ || PGM_GST_TYPE == PGM_TYPE_PAE \
+ || PGM_GST_TYPE == PGM_TYPE_AMD64
 
     LogFlow(("MapCR3: %VGp\n", GCPhysCR3));
@@ -418 +419 @@
             pVM->pgm.s.pGuestPDGC = (RCPTRTYPE(PX86PD))pVM->pgm.s.GCPtrCR3Mapping;
 
-# else /* PAE */
+# elif PGM_GST_TYPE == PGM_TYPE_PAE
             unsigned offset = GCPhysCR3 & GST_CR3_PAGE_MASK & PAGE_OFFSET_MASK;
             pVM->pgm.s.pGstPaePDPTHC = (R3R0PTRTYPE(PX86PDPT)) HCPtrGuestCR3;
@@ -454 +455 @@
                 PGM_INVL_PG(GCPtr);
             }
+# elif PGM_GST_TYPE == PGM_TYPE_AMD64
+            pVM->pgm.s.pGstPaePML4HC = (R3R0PTRTYPE(PX86PML4))HCPtrGuestCR3;
 # endif
         }
@@ -462 +465 @@
         AssertMsgFailed(("rc=%Vrc GCPhysGuestPD=%VGp\n", rc, GCPhysCR3));
 
-#else /* prot/real/amd64 mode stub */
+#else /* prot/real stub */
     int rc = VINF_SUCCESS;
 #endif
@@ -496 +499 @@
 
 #elif PGM_GST_TYPE == PGM_TYPE_AMD64
-    /* nothing to do; vt-x/amd-v only */
-
+    pVM->pgm.s.pGstPaePML4HC = 0;
 #else /* prot/real mode stub */
     /* nothing to do */