Changeset 14153 in vbox

Timestamp:

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

Author:

vboxsync

Message:

PGM: pGstPaePDPT -> pGstPaePdpt

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (2 diffs)
• PGMGst.h (modified) (2 diffs)
• PGMInternal.h (modified) (7 diffs)
• VMMAll/PGMAllBth.h (modified) (1 diff)
• VMMAll/PGMAllGst.h (modified) (2 diffs)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGM.cpp

@@ -1142 +1142 @@
     pVM->pgm.s.fA20Enabled      = true;
     pVM->pgm.s.GCPhys4MBPSEMask = RT_BIT_64(32) - 1; /* default; checked later */
-    pVM->pgm.s.pGstPaePDPTR3    = NULL;
+    pVM->pgm.s.pGstPaePdptR3    = NULL;
 #ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
-    pVM->pgm.s.pGstPaePDPTR0    = NIL_RTR0PTR;
+    pVM->pgm.s.pGstPaePdptR0    = NIL_RTR0PTR;
 #endif
-    pVM->pgm.s.pGstPaePDPTRC    = NIL_RTRCPTR;
+    pVM->pgm.s.pGstPaePdptRC    = NIL_RTRCPTR;
     for (unsigned i = 0; i < RT_ELEMENTS(pVM->pgm.s.apGstPaePDsR3); i++)
     {
@@ -1912 +1912 @@
         pVM->pgm.s.apGstPaePDsRC[i] += offDelta;
     }
-    pVM->pgm.s.pGstPaePDPTRC += offDelta;
+    pVM->pgm.s.pGstPaePdptRC += offDelta;
     pVM->pgm.s.pShwPaePdptRC += offDelta;
 

trunk/src/VBox/VMM/PGMGst.h

@@ -352 +352 @@
         for (unsigned i = 0; i < 4; i++)
         {
-            if (    pVM->pgm.s.pGstPaePDPTR3->a[i].n.u1Present
-                &&  (pVM->pgm.s.pGstPaePDPTR3->a[i].u & X86_PDPE_PG_MASK) != pVM->pgm.s.aGCPhysGstPaePDsMonitored[i])
+            if (    pVM->pgm.s.pGstPaePdptR3->a[i].n.u1Present
+                &&  (pVM->pgm.s.pGstPaePdptR3->a[i].u & X86_PDPE_PG_MASK) != pVM->pgm.s.aGCPhysGstPaePDsMonitored[i])
             {
                 Log(("pgmR3GstPAEWriteHandlerCR3: detected updated PDPE; [%d] = %#llx, Old GCPhys=%RGp\n",
-                     i, pVM->pgm.s.pGstPaePDPTR3->a[i].u, pVM->pgm.s.aGCPhysGstPaePDsMonitored[i]));
+                     i, pVM->pgm.s.pGstPaePdptR3->a[i].u, pVM->pgm.s.aGCPhysGstPaePDsMonitored[i]));
                 /*
                  * The PD has changed.
@@ -416 +416 @@
         unsigned i;
         for (i = 0; i < 4; i++)
-            if (pVM->pgm.s.pGstPaePDPTHC->a[i].u == (GCPhys & X86_PTE_PAE_PG_MASK))
+            if (pVM->pgm.s.pGstPaePdptHC->a[i].u == (GCPhys & X86_PTE_PAE_PG_MASK))
             {
                 PX86PDPAE       pPDSrc = pgmGstGetPaePD(&pVM->pgm.s, i << X86_PDPT_SHIFT);

trunk/src/VBox/VMM/PGMInternal.h

@@ -2003 +2003 @@
      * @{ */
     /** The guest's page directory pointer table, static GC mapping. */
-    RCPTRTYPE(PX86PDPT)             pGstPaePDPTRC;
+    RCPTRTYPE(PX86PDPT)             pGstPaePdptRC;
     /** The guest's page directory pointer table, R3 pointer. */
-    R3PTRTYPE(PX86PDPT)             pGstPaePDPTR3;
+    R3PTRTYPE(PX86PDPT)             pGstPaePdptR3;
 #ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
     /** The guest's page directory pointer table, R0 pointer. */
-    R0PTRTYPE(PX86PDPT)             pGstPaePDPTR0;
+    R0PTRTYPE(PX86PDPT)             pGstPaePdptR0;
 #endif
 
@@ -3366 +3366 @@
     return pGuestPDPT;
 #else
-    return pPGM->CTX_SUFF(pGstPaePDPT);
+    return pPGM->CTX_SUFF(pGstPaePdpt);
 #endif
 }
@@ -3389 +3389 @@
     return &pGuestPDPT->a[(GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE];
 #else
-    return &pPGM->CTX_SUFF(pGstPaePDPT)->a[(GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE];
+    return &pPGM->CTX_SUFF(pGstPaePdpt)->a[(GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE];
 #endif
 }
@@ -3410 +3410 @@
     AssertReturn(pGuestPDPT, 0);
 #else
-    PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePDPT);
+    PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePdpt);
 #endif
     const unsigned iPdPt = (GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE;
@@ -3448 +3448 @@
     AssertReturn(pGuestPDPT, 0);
 #else
-    PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePDPT);
+    PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePdpt);
 #endif
     const unsigned iPdPt = (GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE;
@@ -3487 +3487 @@
     if (RT_LIKELY(pGuestPDPT))
 #else
-    PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePDPT);
+    PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePdpt);
 #endif
     {
@@ -3531 +3531 @@
     AssertReturn(pGuestPDPT, 0);
 #else
-    PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePDPT);
+    PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePdpt);
 #endif
     const unsigned iPdPt = (GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE;

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

@@ -3577 +3577 @@
     rc = PGMShwGetPage(pVM, (RTGCPTR)pPGM->pGuestPDRC, NULL, &HCPhysShw);
 #  else
-    rc = PGMShwGetPage(pVM, (RTGCPTR)pPGM->pGstPaePDPTRC, NULL, &HCPhysShw);
+    rc = PGMShwGetPage(pVM, (RTGCPTR)pPGM->pGstPaePdptRC, NULL, &HCPhysShw);
 #  endif
     AssertRCReturn(rc, 1);

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

@@ -452 +452 @@
 # elif PGM_GST_TYPE == PGM_TYPE_PAE
             unsigned off = GCPhysCR3 & GST_CR3_PAGE_MASK & PAGE_OFFSET_MASK;
-            pVM->pgm.s.pGstPaePDPTR3 = (R3PTRTYPE(PX86PDPT))HCPtrGuestCR3;
+            pVM->pgm.s.pGstPaePdptR3 = (R3PTRTYPE(PX86PDPT))HCPtrGuestCR3;
 #  ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
-            pVM->pgm.s.pGstPaePDPTR0 = (R0PTRTYPE(PX86PDPT))HCPtrGuestCR3;
+            pVM->pgm.s.pGstPaePdptR0 = (R0PTRTYPE(PX86PDPT))HCPtrGuestCR3;
 #  endif
-            pVM->pgm.s.pGstPaePDPTRC = (RCPTRTYPE(PX86PDPT))((RCPTRTYPE(uint8_t *))pVM->pgm.s.GCPtrCR3Mapping + off);
-            Log(("Cached mapping %RGv\n", pVM->pgm.s.pGstPaePDPTRC));
+            pVM->pgm.s.pGstPaePdptRC = (RCPTRTYPE(PX86PDPT))((RCPTRTYPE(uint8_t *))pVM->pgm.s.GCPtrCR3Mapping + off);
+            Log(("Cached mapping %RGv\n", pVM->pgm.s.pGstPaePdptRC));
 
             /*
@@ -576 +576 @@
 
 #elif PGM_GST_TYPE == PGM_TYPE_PAE
-    pVM->pgm.s.pGstPaePDPTR3 = 0;
+    pVM->pgm.s.pGstPaePdptR3 = 0;
 # ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
-    pVM->pgm.s.pGstPaePDPTR0 = 0;
-# endif
-    pVM->pgm.s.pGstPaePDPTRC = 0;
+    pVM->pgm.s.pGstPaePdptR0 = 0;
+# endif
+    pVM->pgm.s.pGstPaePdptRC = 0;
     for (unsigned i = 0; i < X86_PG_PAE_PDPE_ENTRIES; i++)
     {

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -401 +401 @@
 #endif
     GEN_CHECK_OFF(PGM, pGuestPDRC);
-    GEN_CHECK_OFF(PGM, pGstPaePDPTR3);
+    GEN_CHECK_OFF(PGM, pGstPaePdptR3);
 #ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
-    GEN_CHECK_OFF(PGM, pGstPaePDPTR0);
-#endif
-    GEN_CHECK_OFF(PGM, pGstPaePDPTRC);
+    GEN_CHECK_OFF(PGM, pGstPaePdptR0);
+#endif
+    GEN_CHECK_OFF(PGM, pGstPaePdptRC);
     GEN_CHECK_OFF(PGM, apGstPaePDsR3);
 #ifndef VBOX_WITH_2X_4GB_ADDR_SPACE