Changeset 7740 in vbox for trunk/src/VBox

Timestamp:

Apr 4, 2008 1:18:03 PM (17 years ago)

Author:

vboxsync

Message:

PAE update

File:

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

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

@@ -395 +395 @@
     RTHCPHYS    HCPhysGuestCR3;
     RTHCPTR     HCPtrGuestCR3;
-    int rc = pgmRamGCPhys2HCPtrAndHCPhysWithFlags(&pVM->pgm.s, GCPhysCR3, &HCPtrGuestCR3, &HCPhysGuestCR3);
+    int rc = pgmRamGCPhys2HCPtrAndHCPhysWithFlags(&pVM->pgm.s, GCPhysCR3 & GST_CR3_PAGE_MASK, &HCPtrGuestCR3, &HCPhysGuestCR3);
     if (VBOX_SUCCESS(rc))
     {
-        rc = PGMMap(pVM, (RTGCUINTPTR)pVM->pgm.s.GCPtrCR3Mapping, HCPhysGuestCR3 & X86_PTE_PAE_PG_MASK, PAGE_SIZE, 0);
+        rc = PGMMap(pVM, (RTGCUINTPTR)pVM->pgm.s.GCPtrCR3Mapping, HCPhysGuestCR3, PAGE_SIZE, 0);
         if (VBOX_SUCCESS(rc))
         {
@@ -407 +407 @@
 
 #elif PGM_GST_TYPE == PGM_TYPE_PAE
-            const unsigned off = GCPhysCR3 & X86_CR3_PAE_PAGE_MASK;
-            pVM->pgm.s.pGstPaePDPTHC = (R3R0PTRTYPE(PX86PDPT))((RTHCUINTPTR)HCPtrGuestCR3 | off);
-            pVM->pgm.s.pGstPaePDPTGC = (GCPTRTYPE(PX86PDPT))((RTGCUINTPTR)pVM->pgm.s.GCPtrCR3Mapping | off);
+            pVM->pgm.s.pGstPaePDPTHC = (R3R0PTRTYPE(PX86PDPT))HCPtrGuestCR3;
+            pVM->pgm.s.pGstPaePDPTGC = (GCPTRTYPE(PX86PDPT))pVM->pgm.s.GCPtrCR3Mapping;
 
             /*