Changeset 14148 in vbox for trunk/src/VBox

Timestamp:

Nov 12, 2008 11:20:06 PM (16 years ago)

Author:

vboxsync

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

39239

Message:

PGM: HCPhys32BitPD -> HCPhysShw32BitPD

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (4 diffs)
• PGMInternal.h (modified) (4 diffs)
• VMMAll/PGMAll.cpp (modified) (3 diffs)
• VMMAll/PGMAllPool.cpp (modified) (1 diff)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGM.cpp

@@ -1451 +1451 @@
 
     /* get physical addresses. */
-    pVM->pgm.s.HCPhys32BitPD    = MMPage2Phys(pVM, pVM->pgm.s.pShw32BitPdR3);
-    Assert(MMPagePhys2Page(pVM, pVM->pgm.s.HCPhys32BitPD) == pVM->pgm.s.pShw32BitPdR3);
+    pVM->pgm.s.HCPhysShw32BitPD    = MMPage2Phys(pVM, pVM->pgm.s.pShw32BitPdR3);
+    Assert(MMPagePhys2Page(pVM, pVM->pgm.s.HCPhysShw32BitPD) == pVM->pgm.s.pShw32BitPdR3);
     pVM->pgm.s.aHCPhysPaePDs[0] = MMPage2Phys(pVM, pVM->pgm.s.apShwPaePDsR3[0]);
     pVM->pgm.s.aHCPhysPaePDs[1] = MMPage2Phys(pVM, pVM->pgm.s.apShwPaePDsR3[1]);
@@ -1473 +1473 @@
     }
 
-    CPUMSetHyperCR3(pVM, (uint32_t)pVM->pgm.s.HCPhys32BitPD);
+    CPUMSetHyperCR3(pVM, (uint32_t)pVM->pgm.s.HCPhysShw32BitPD);
 
     /*
@@ -1514 +1514 @@
         LogFlow(("pgmR3InitPaging: returns successfully\n"));
 #if HC_ARCH_BITS == 64
-        LogRel(("Debug: HCPhys32BitPD=%RHp aHCPhysPaePDs={%RHp,%RHp,%RHp,%RHp} HCPhysPaePDPT=%RHp HCPhysPaePML4=%RHp\n",
-                pVM->pgm.s.HCPhys32BitPD,
+        LogRel(("Debug: HCPhysShw32BitPD=%RHp aHCPhysPaePDs={%RHp,%RHp,%RHp,%RHp} HCPhysPaePDPT=%RHp HCPhysPaePML4=%RHp\n",
+                pVM->pgm.s.HCPhysShw32BitPD,
                 pVM->pgm.s.aHCPhysPaePDs[0], pVM->pgm.s.aHCPhysPaePDs[1], pVM->pgm.s.aHCPhysPaePDs[2], pVM->pgm.s.aHCPhysPaePDs[3],
                 pVM->pgm.s.HCPhysPaePDPT,
@@ -1816 +1816 @@
     AssertReleaseReturn(GCPtr, VERR_INTERNAL_ERROR);
 
-    int rc = PGMMap(pVM, GCPtr, pVM->pgm.s.HCPhys32BitPD, PAGE_SIZE, 0);
+    int rc = PGMMap(pVM, GCPtr, pVM->pgm.s.HCPhysShw32BitPD, PAGE_SIZE, 0);
     AssertRCReturn(rc, rc);
     pVM->pgm.s.pShw32BitPdRC = GCPtr;

trunk/src/VBox/VMM/PGMInternal.h

@@ -2052 +2052 @@
 #endif
     /** The Physical Address (HC) of the 32-Bit PD. */
-    RTHCPHYS                        HCPhys32BitPD;
+    RTHCPHYS                        HCPhysShw32BitPD;
     /** @} */
 
@@ -3812 +3812 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PX86PD          pShwPd;
-    Assert(pPGM->HCPhys32BitPD != 0 && pPGM->HCPhys32BitPD != NIL_RTHCPHYS);
-    int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->HCPhys32BitPD, &pShwPd);
+    Assert(pPGM->HCPhysShw32BitPD != 0 && pPGM->HCPhysShw32BitPD != NIL_RTHCPHYS);
+    int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->HCPhysShw32BitPD, &pShwPd);
     AssertRCReturn(rc, NULL);
     return pShwPd;
@@ -3834 +3834 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PCX86PD         pShwPd;
-    Assert(pPGM->HCPhys32BitPD != 0 && pPGM->HCPhys32BitPD != NIL_RTHCPHYS);
-    int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->HCPhys32BitPD, &pShwPd);
+    Assert(pPGM->HCPhysShw32BitPD != 0 && pPGM->HCPhysShw32BitPD != NIL_RTHCPHYS);
+    int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->HCPhysShw32BitPD, &pShwPd);
     if (RT_FAILURE(rc))
     {
@@ -3861 +3861 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PX86PD          pShwPd;
-    Assert(pPGM->HCPhys32BitPD != 0 && pPGM->HCPhys32BitPD != NIL_RTHCPHYS);
-    int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->HCPhys32BitPD, &pShwPd);
+    Assert(pPGM->HCPhysShw32BitPD != 0 && pPGM->HCPhysShw32BitPD != NIL_RTHCPHYS);
+    int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->HCPhysShw32BitPD, &pShwPd);
     AssertRCReturn(rc, NULL);
     return &pShwPd->a[iPd];

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -1257 +1257 @@
     {
         case PGMMODE_32_BIT:
-            return pVM->pgm.s.HCPhys32BitPD;
+            return pVM->pgm.s.HCPhysShw32BitPD;
 
         case PGMMODE_PAE:
@@ -1290 +1290 @@
     {
         case PGMMODE_32_BIT:
-            return pVM->pgm.s.HCPhys32BitPD;
+            return pVM->pgm.s.HCPhysShw32BitPD;
 
         case PGMMODE_PAE:
@@ -1325 +1325 @@
 VMMDECL(RTHCPHYS) PGMGetHyper32BitCR3(PVM pVM)
 {
-    return pVM->pgm.s.HCPhys32BitPD;
+    return pVM->pgm.s.HCPhysShw32BitPD;
 }
 

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -134 +134 @@
     {
         case PGMPOOL_IDX_PD:
-            HCPhys = pVM->pgm.s.HCPhys32BitPD;
+            HCPhys = pVM->pgm.s.HCPhysShw32BitPD;
             break;
         case PGMPOOL_IDX_PAE_PD:

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

@@ -418 +418 @@
 #endif
     GEN_CHECK_OFF(PGM, pShw32BitPdRC);
-    GEN_CHECK_OFF(PGM, HCPhys32BitPD);
+    GEN_CHECK_OFF(PGM, HCPhysShw32BitPD);
     GEN_CHECK_OFF(PGM, apShwPaePDsR3);
 #ifndef VBOX_WITH_2X_4GB_ADDR_SPACE