Changeset 11407 in vbox for trunk

Timestamp:

Aug 13, 2008 6:56:18 PM (16 years ago)

Author:

vboxsync

Message:

warnings, comments

File:

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

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

@@ -880 +880 @@
 # elif PGM_SHW_TYPE == PGM_TYPE_PAE
     const unsigned  iPDDst    = GCPtrPage >> SHW_PD_SHIFT;      /* no mask; flat index into the 2048 entry array. */
-    const unsigned  iPdpte    = (GCPtrPage >> X86_PDPT_SHIFT);
+    const unsigned  iPdpte    = (GCPtrPage >> X86_PDPT_SHIFT);  NOREF(iPdpte);
     PX86PDEPAE      pPdeDst   = &pVM->pgm.s.CTXMID(ap,PaePDs[0])->a[iPDDst];
-    PX86PDPT        pPdptDst  = pVM->pgm.s.CTXMID(p,PaePDPT);
-# else /* AMD64 */
+    PX86PDPT        pPdptDst  = pVM->pgm.s.CTXMID(p,PaePDPT);   NOREF(pPdptDst);
+# else /* PGM_SHW_TYPE == PGM_TYPE_AMD64 */
     /* PML4 */
     AssertReturn(pVM->pgm.s.pHCPaePML4, VERR_INTERNAL_ERROR);
@@ -915 +915 @@
     }
 
-# endif
+# endif /* PGM_SHW_TYPE == PGM_TYPE_AMD64 */
 
     const SHWPDE PdeDst = *pPdeDst;
@@ -931 +931 @@
     const unsigned  iPDSrc      = GCPtrPage >> GST_PD_SHIFT;
     GSTPDE          PdeSrc      = pPDSrc->a[iPDSrc];
-# else
+# else /* PGM_GST_TYPE != PGM_TYPE_32BIT */
     unsigned        iPDSrc;
 #  if PGM_GST_TYPE == PGM_TYPE_PAE
@@ -946 +946 @@
     else
         PdeSrc.u = 0;
-# endif
+# endif /* PGM_GST_TYPE != PGM_TYPE_32BIT */
 
 # if PGM_GST_TYPE == PGM_TYPE_AMD64
@@ -1066 +1066 @@
         PGM_INVL_GUEST_TLBS();
     }
-# endif /* PGM_GST_TYPE != PGM_TYPE_AMD64 */
+# endif /* PGM_GST_TYPE == PGM_TYPE_AMD64 */
 
 # if PGM_GST_TYPE == PGM_TYPE_PAE
@@ -1514 +1514 @@
 # elif PGM_SHW_TYPE == PGM_TYPE_PAE
     const unsigned  iPDDst   = GCPtrPage >> SHW_PD_SHIFT;
-    const unsigned  iPdpte   = (GCPtrPage >> X86_PDPT_SHIFT);   /* no mask; flat index into the 2048 entry array. */
-    PX86PDPT        pPdptDst = pVM->pgm.s.CTXMID(p,PaePDPT);
+    const unsigned  iPdpte   = (GCPtrPage >> X86_PDPT_SHIFT); NOREF(iPdpte); /* no mask; flat index into the 2048 entry array. */
+    PX86PDPT        pPdptDst = pVM->pgm.s.CTXMID(p,PaePDPT);  NOREF(pPdptDst);
     X86PDEPAE       PdeDst   = pVM->pgm.s.CTXMID(ap,PaePDs)[0]->a[iPDDst];
 # elif PGM_SHW_TYPE == PGM_TYPE_AMD64
@@ -1783 +1783 @@
 # elif PGM_SHW_TYPE == PGM_TYPE_AMD64
     const unsigned  iPDDst   = ((GCPtrPage >> SHW_PD_SHIFT) & SHW_PD_MASK);
-    const unsigned  iPdpte   = (GCPtrPage >> X86_PDPT_SHIFT) & X86_PDPT_MASK_AMD64;
+    const unsigned  iPdpte   = (GCPtrPage >> X86_PDPT_SHIFT) & X86_PDPT_MASK_AMD64; NOREF(iPdpte);
     PX86PDPAE       pPDDst;
     X86PDEPAE       PdeDst;
@@ -2227 +2227 @@
 # elif PGM_SHW_TYPE == PGM_TYPE_PAE
     const unsigned  iPDDst   = GCPtrPage >> SHW_PD_SHIFT;               /* no mask; flat index into the 2048 entry array. */
-    const unsigned  iPdpte   = (GCPtrPage >> X86_PDPT_SHIFT);
-    PX86PDPT        pPdptDst = pVM->pgm.s.CTXMID(p,PaePDPT);
+    const unsigned  iPdpte   = (GCPtrPage >> X86_PDPT_SHIFT); NOREF(iPdpte);
+    PX86PDPT        pPdptDst = pVM->pgm.s.CTXMID(p,PaePDPT);  NOREF(pPdptDst);
     PX86PDPAE       pPDDst   = pVM->pgm.s.CTXMID(ap,PaePDs)[0];
 # elif PGM_SHW_TYPE == PGM_TYPE_AMD64
@@ -3131 +3131 @@
             PX86PDEPAE      pPDEDst   = &pPDPAE->a[iPdpte * X86_PG_PAE_ENTRIES];
             PGSTPD          pPDSrc    = pgmGstGetPaePDPtr(&pVM->pgm.s, iPdpte << X86_PDPT_SHIFT, &iPDSrc);
-            PX86PDPT        pPdptDst  = pVM->pgm.s.CTXMID(p,PaePDPT);
+            PX86PDPT        pPdptDst  = pVM->pgm.s.CTXMID(p,PaePDPT);   NOREF(pPdptDst);
             X86PDPE         PdpeSrc   = CTXSUFF(pVM->pgm.s.pGstPaePDPT)->a[iPdpte];