Changeset 9754 in vbox

Timestamp:

Jun 17, 2008 11:05:07 AM (17 years ago)

Author:

vboxsync

Message:

Naming again

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (8 diffs)

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

@@ -2185 +2185 @@
 
 # if PGM_GST_TYPE == PGM_GST_PAE || PGM_GST_TYPE == PGM_GST_AMD64
-    PPGMPOOLPAGE pShwPde = NULL;
     /* Fetch the pgm pool shadow descriptor. */
-    pShwPde = pgmPoolGetPage(pPool, pPdptDst->a[iPdPte].u & SHW_PDE_PG_MASK);
+    PPGMPOOLPAGE pShwPde = pgmPoolGetPage(pPool, pPdptDst->a[iPdPte].u & SHW_PDE_PG_MASK);
     Assert(pShwPde);
 # endif
@@ -3012 +3011 @@
     for (uint64_t iPML4E = 0; iPML4E < X86_PG_PAE_ENTRIES; iPML4E++)
     {
-        PPGMPOOLPAGE pShwPml4e = NULL;
+        PPGMPOOLPAGE pShwPdpt = NULL;
 
         /* Fetch the pgm pool shadow descriptor if the shadow pml4e is present. */
         if (pVM->pgm.s.CTXMID(p,PaePML4)->a[iPML4E].n.u1Present)
-            pShwPml4e = pgmPoolGetPage(pPool, pVM->pgm.s.CTXMID(p,PaePML4)->a[iPML4E].u & SHW_PDE_PG_MASK);
+            pShwPdpt = pgmPoolGetPage(pPool, pVM->pgm.s.CTXMID(p,PaePML4)->a[iPML4E].u & SHW_PDE_PG_MASK);
 
         /* Guest PML4E not present (anymore). */
@@ -3025 +3024 @@
             {
                 /* Shadow PML4 present, so free it. */
-                pgmPoolFreeByPage(pPool, pShwPml4e, PGMPOOL_IDX_PML4, iPML4E);
+                pgmPoolFreeByPage(pPool, pShwPdpt, PGMPOOL_IDX_PML4, iPML4E);
                 pVM->pgm.s.CTXMID(p,PaePML4)->a[iPML4E].u = 0;
             }
@@ -3038 +3037 @@
         {
             unsigned        iPDSrc;
-            PPGMPOOLPAGE    pShwPdpte = NULL;
+            PPGMPOOLPAGE    pShwPde = NULL;
 #   if PGM_GST_TYPE == PGM_TYPE_PAE
             PX86PDPAE       pPDPAE    = pVM->pgm.s.CTXMID(ap,PaePDs)[0];
@@ -3069 +3068 @@
             /* Fetch the pgm pool shadow descriptor if the shadow pdpte is present. */
             if (pPdptDst->a[iPDPTE].n.u1Present) 
-                pShwPdpte = pgmPoolGetPage(pPool, pPdptDst->a[iPDPTE].u & SHW_PDE_PG_MASK);
+                pShwPde = pgmPoolGetPage(pPool, pPdptDst->a[iPDPTE].u & SHW_PDE_PG_MASK);
             else
                 Assert(pPDSrc == NULL);
@@ -3084 +3083 @@
                         {
 #   if PGM_GST_TYPE == PGM_TYPE_AMD64
-                            Assert(pShwPml4e);
-                            pgmPoolFreeByPage(pPool, pShwPdpte, pShwPml4e->idx, iPDPTE);
+                            Assert(pShwPde);
+                            pgmPoolFreeByPage(pPool, pShwPde, pShwPde->idx, iPDPTE);
 #   else
                             AssertFailed(); /* can't happen; the 4 pdpt pages are fixed! */
@@ -3242 +3241 @@
                             {
 #  if PGM_GST_TYPE == PGM_TYPE_PAE || PGM_GST_TYPE == PGM_TYPE_AMD64
-                                pgmPoolFreeByPage(pPool, pShwPage, pShwPdpte->idx, iPdShw);
+                                pgmPoolFreeByPage(pPool, pShwPage, pShwPde->idx, iPdShw);
 #  else
                                 pgmPoolFreeByPage(pPool, pShwPage, SHW_POOL_ROOT_IDX, iPdShw);
@@ -3273 +3272 @@
                         {
 #  if PGM_GST_TYPE == PGM_TYPE_PAE || PGM_GST_TYPE == PGM_TYPE_AMD64
-                            pgmPoolFreeByPage(pPool, pgmPoolGetPage(pPool, pPDEDst->u & SHW_PDE_PG_MASK), pShwPdpte->idx, iPdShw);
+                            pgmPoolFreeByPage(pPool, pgmPoolGetPage(pPool, pPDEDst->u & SHW_PDE_PG_MASK), pShwPde->idx, iPdShw);
 #  else
                             pgmPoolFreeByPage(pPool, pgmPoolGetPage(pPool, pPDEDst->u & SHW_PDE_PG_MASK), SHW_POOL_ROOT_IDX, iPdShw);