Changeset 14149 in vbox for trunk/src/VBox

Timestamp:

Nov 12, 2008 11:23:27 PM (16 years ago)

Author:

vboxsync

Message:

PGM: HCPhysPaePDPT -> HCPhysShwPaePdpt.

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (4 diffs)
• PGMInternal.h (modified) (2 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.HCPhysShw32BitPD    = MMPage2Phys(pVM, 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]);
@@ -1457 +1457 @@
     pVM->pgm.s.aHCPhysPaePDs[2] = MMPage2Phys(pVM, pVM->pgm.s.apShwPaePDsR3[2]);
     pVM->pgm.s.aHCPhysPaePDs[3] = MMPage2Phys(pVM, pVM->pgm.s.apShwPaePDsR3[3]);
-    pVM->pgm.s.HCPhysPaePDPT    = MMPage2Phys(pVM, pVM->pgm.s.pShwPaePdptR3);
+    pVM->pgm.s.HCPhysShwPaePdpt = MMPage2Phys(pVM, pVM->pgm.s.pShwPaePdptR3);
     pVM->pgm.s.HCPhysNestedRoot = MMPage2Phys(pVM, pVM->pgm.s.pShwNestedRootR3);
 
@@ -1514 +1514 @@
         LogFlow(("pgmR3InitPaging: returns successfully\n"));
 #if HC_ARCH_BITS == 64
-        LogRel(("Debug: HCPhysShw32BitPD=%RHp aHCPhysPaePDs={%RHp,%RHp,%RHp,%RHp} HCPhysPaePDPT=%RHp HCPhysPaePML4=%RHp\n",
+        LogRel(("Debug: HCPhysShw32BitPD=%RHp aHCPhysPaePDs={%RHp,%RHp,%RHp,%RHp} HCPhysShwPaePdpt=%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,
+                pVM->pgm.s.HCPhysShwPaePdpt,
                 pVM->pgm.s.HCPhysPaePML4));
         LogRel(("Debug: HCPhysInterPD=%RHp HCPhysInterPaePDPT=%RHp HCPhysInterPaePML4=%RHp\n",
@@ -1835 +1835 @@
     GCPtr += PAGE_SIZE; /* reserved page */
 
-    rc = PGMMap(pVM, GCPtr, pVM->pgm.s.HCPhysPaePDPT, PAGE_SIZE, 0);
+    rc = PGMMap(pVM, GCPtr, pVM->pgm.s.HCPhysShwPaePdpt, PAGE_SIZE, 0);
     AssertRCReturn(rc, rc);
     pVM->pgm.s.pShwPaePdptRC = GCPtr;

trunk/src/VBox/VMM/PGMInternal.h

@@ -2073 +2073 @@
     RTHCPHYS                        aHCPhysPaePDs[4];
     /** The Physical Address (HC) of the PAE PDPT. */
-    RTHCPHYS                        HCPhysPaePDPT;
+    RTHCPHYS                        HCPhysShwPaePdpt;
     /** The PAE PDPT - R3 Ptr. */
     R3PTRTYPE(PX86PDPT)             pShwPaePdptR3;
@@ -3881 +3881 @@
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
     PX86PDPT pShwPdpt;
-    Assert(pPGM->HCPhysPaePDPT != 0 && pPGM->HCPhysPaePDPT != NIL_RTHCPHYS);
-    int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->HCPhysPaePDPT, &pShwPdpt);
+    Assert(pPGM->HCPhysShwPaePdpt != 0 && pPGM->HCPhysShwPaePdpt != NIL_RTHCPHYS);
+    int rc = PGM_HCPHYS_2_PTR(PGM2VM(pPGM), pPGM->HCPhysShwPaePdpt, &pShwPdpt);
     AssertRCReturn(rc, 0);
     return pShwPdpt;

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

@@ -1261 +1261 @@
         case PGMMODE_PAE:
         case PGMMODE_PAE_NX:
-            return pVM->pgm.s.HCPhysPaePDPT;
+            return pVM->pgm.s.HCPhysShwPaePdpt;
 
         case PGMMODE_AMD64:
@@ -1294 +1294 @@
         case PGMMODE_PAE:
         case PGMMODE_PAE_NX:
-            return pVM->pgm.s.HCPhysPaePDPT;
+            return pVM->pgm.s.HCPhysShwPaePdpt;
 
         case PGMMODE_AMD64:
@@ -1336 +1336 @@
 VMMDECL(RTHCPHYS) PGMGetHyperPaeCR3(PVM pVM)
 {
-    return pVM->pgm.s.HCPhysPaePDPT;
+    return pVM->pgm.s.HCPhysShwPaePdpt;
 }
 

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

@@ -150 +150 @@
             break;
         case PGMPOOL_IDX_PDPT:
-            HCPhys = pVM->pgm.s.HCPhysPaePDPT;
+            HCPhys = pVM->pgm.s.HCPhysShwPaePdpt;
             break;
         default:

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

@@ -428 +428 @@
     GEN_CHECK_OFF(PGM, pShwPaePdptR0);
     GEN_CHECK_OFF(PGM, pShwPaePdptRC);
-    GEN_CHECK_OFF(PGM, HCPhysPaePDPT);
+    GEN_CHECK_OFF(PGM, HCPhysShwPaePdpt);
     GEN_CHECK_OFF(PGM, pShwPaePml4R3);
 #ifndef VBOX_WITH_2X_4GB_ADDR_SPACE