Changeset 14154 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Nov 12, 2008 11:34:50 PM (16 years ago)

Author:

vboxsync

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

39245

Message:

PGM: pGuestPD* -> pGst32BitPd*

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (2 diffs)
• PGMAllGst.h (modified) (2 diffs)

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

@@ -3575 +3575 @@
 # if !defined(IN_RING0) && PGM_GST_TYPE != PGM_TYPE_AMD64
 #  if PGM_GST_TYPE == PGM_TYPE_32BIT
-    rc = PGMShwGetPage(pVM, (RTGCPTR)pPGM->pGuestPDRC, NULL, &HCPhysShw);
+    rc = PGMShwGetPage(pVM, (RTGCPTR)pPGM->pGst32BitPdRC, NULL, &HCPhysShw);
 #  else
     rc = PGMShwGetPage(pVM, (RTGCPTR)pPGM->pGstPaePdptRC, NULL, &HCPhysShw);
@@ -3585 +3585 @@
 #  if PGM_GST_TYPE == PGM_TYPE_32BIT && defined(IN_RING3)
     RTGCPHYS GCPhys;
-    rc = PGMR3DbgR3Ptr2GCPhys(pVM, pPGM->pGuestPDR3, &GCPhys);
+    rc = PGMR3DbgR3Ptr2GCPhys(pVM, pPGM->pGst32BitPdR3, &GCPhys);
     AssertRCReturn(rc, 1);
     AssertMsgReturn((cr3 & GST_CR3_PAGE_MASK) == GCPhys, ("GCPhys=%RGp cr3=%RGp\n", GCPhys, (RTGCPHYS)cr3), false);

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

@@ -444 +444 @@
             PGM_INVL_PG(pVM->pgm.s.GCPtrCR3Mapping);
 # if PGM_GST_TYPE == PGM_TYPE_32BIT
-            pVM->pgm.s.pGuestPDR3 = (R3PTRTYPE(PX86PD))HCPtrGuestCR3;
+            pVM->pgm.s.pGst32BitPdR3 = (R3PTRTYPE(PX86PD))HCPtrGuestCR3;
 #  ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
-            pVM->pgm.s.pGuestPDR0 = (R0PTRTYPE(PX86PD))HCPtrGuestCR3;
+            pVM->pgm.s.pGst32BitPdR0 = (R0PTRTYPE(PX86PD))HCPtrGuestCR3;
 #  endif
-            pVM->pgm.s.pGuestPDRC = (RCPTRTYPE(PX86PD))pVM->pgm.s.GCPtrCR3Mapping;
+            pVM->pgm.s.pGst32BitPdRC = (RCPTRTYPE(PX86PD))pVM->pgm.s.GCPtrCR3Mapping;
 
 # elif PGM_GST_TYPE == PGM_TYPE_PAE
@@ -569 +569 @@
 
 #if PGM_GST_TYPE == PGM_TYPE_32BIT
-    pVM->pgm.s.pGuestPDR3 = 0;
+    pVM->pgm.s.pGst32BitPdR3 = 0;
 #ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
-    pVM->pgm.s.pGuestPDR0 = 0;
-#endif
-    pVM->pgm.s.pGuestPDRC = 0;
+    pVM->pgm.s.pGst32BitPdR0 = 0;
+#endif
+    pVM->pgm.s.pGst32BitPdRC = 0;
 
 #elif PGM_GST_TYPE == PGM_TYPE_PAE