Changeset 9039 in vbox for trunk/src/VBox

Timestamp:

May 21, 2008 9:28:34 PM (17 years ago)

Author:

vboxsync

Message:

spaces and inverted comments.

File:

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

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

@@ -114 +114 @@
 #if PGM_SHW_TYPE == PGM_TYPE_NESTED
     return VERR_PAGE_TABLE_NOT_PRESENT;
-#else
+
+#else /* PGM_SHW_TYPE != PGM_TYPE_NESTED */
     /*
      * Get the PDE.
      */
-#if PGM_SHW_TYPE == PGM_TYPE_AMD64
+# if PGM_SHW_TYPE == PGM_TYPE_AMD64
     bool      fNoExecuteBitValid = !!(CPUMGetGuestEFER(pVM) & MSR_K6_EFER_NXE);
     X86PDEPAE Pde;
@@ -152 +153 @@
     Pde.n.u1NoExecute &= Pml4e.n.u1NoExecute & Pdpe.lm.u1NoExecute;
 
-#elif PGM_SHW_TYPE == PGM_TYPE_PAE
+# elif PGM_SHW_TYPE == PGM_TYPE_PAE
     bool           fNoExecuteBitValid = !!(CPUMGetGuestEFER(pVM) & MSR_K6_EFER_NXE);
     const unsigned iPDPT = (GCPtr >> SHW_PDPT_SHIFT) & SHW_PDPT_MASK;
@@ -158 +159 @@
     X86PDEPAE      Pde = CTXMID(pVM->pgm.s.ap,PaePDs)[iPDPT]->a[iPd];
 
-#else /* PGM_TYPE_32BIT */
+# else /* PGM_TYPE_32BIT */
     const unsigned iPd = (GCPtr >> X86_PD_SHIFT) & X86_PD_MASK;
     X86PDE Pde = CTXMID(pVM->pgm.s.p,32BitPD)->a[iPd];
-#endif
+# endif
     if (!Pde.n.u1Present)
         return VERR_PAGE_TABLE_NOT_PRESENT;
@@ -179 +180 @@
     else /* mapping: */
     {
-#if PGM_SHW_TYPE == PGM_TYPE_AMD64
+# if PGM_SHW_TYPE == PGM_TYPE_AMD64
         AssertFailed(); /* can't happen */
-#else
+# else
         Assert(pgmMapAreMappingsEnabled(&pVM->pgm.s));
 
         PPGMMAPPING pMap = pgmGetMapping(pVM, (RTGCPTR)GCPtr);
         AssertMsgReturn(pMap, ("GCPtr=%VGv\n", GCPtr), VERR_INTERNAL_ERROR);
-# if PGM_SHW_TYPE == PGM_TYPE_32BIT
+#  if PGM_SHW_TYPE == PGM_TYPE_32BIT
         pPT = pMap->aPTs[(GCPtr - pMap->GCPtr) >> X86_PD_SHIFT].CTXALLSUFF(pPT);
-# else /* PAE */
+#  else /* PAE */
         pPT = pMap->aPTs[(GCPtr - pMap->GCPtr) >> X86_PD_SHIFT].CTXALLSUFF(paPaePTs);
+#  endif
 # endif
-#endif 
     }
     const unsigned iPt = (GCPtr >> SHW_PT_SHIFT) & SHW_PT_MASK;
@@ -218 +219 @@
 
     return VINF_SUCCESS;
-#endif /* PGM_SHW_TYPE == PGM_TYPE_NESTED */
+#endif /* PGM_SHW_TYPE != PGM_TYPE_NESTED */
 }
 
@@ -238 +239 @@
 PGM_SHW_DECL(int, ModifyPage)(PVM pVM, RTGCUINTPTR GCPtr, size_t cb, uint64_t fFlags, uint64_t fMask)
 {
-#if PGM_SHW_TYPE == PGM_TYPE_NESTED
+# if PGM_SHW_TYPE == PGM_TYPE_NESTED
     return VERR_PAGE_TABLE_NOT_PRESENT;
-#else
+
+# else /* PGM_SHW_TYPE != PGM_TYPE_NESTED */
     int rc;
 
@@ -251 +253 @@
          * Get the PDE.
          */
-#if PGM_SHW_TYPE == PGM_TYPE_AMD64
+# if PGM_SHW_TYPE == PGM_TYPE_AMD64
         X86PDEPAE Pde;
         /* PML4 */
@@ -277 +279 @@
         Pde = pPd->a[iPd];
 
-#elif PGM_SHW_TYPE == PGM_TYPE_PAE
+# elif PGM_SHW_TYPE == PGM_TYPE_PAE
         const unsigned iPDPT = (GCPtr >> SHW_PDPT_SHIFT) & SHW_PDPT_MASK;
         const unsigned iPd = (GCPtr >> X86_PD_PAE_SHIFT) & X86_PD_PAE_MASK;
         X86PDEPAE Pde = CTXMID(pVM->pgm.s.ap,PaePDs)[iPDPT]->a[iPd];
 
-#else /* PGM_TYPE_32BIT */
+# else /* PGM_TYPE_32BIT */
         const unsigned iPd = (GCPtr >> X86_PD_SHIFT) & X86_PD_MASK;
         X86PDE Pde = CTXMID(pVM->pgm.s.p,32BitPD)->a[iPd];
-#endif
+# endif
         if (!Pde.n.u1Present)
             return VERR_PAGE_TABLE_NOT_PRESENT;
@@ -315 +317 @@
         }
     }
-#endif /* PGM_SHW_TYPE == PGM_TYPE_NESTED */
+# endif /* PGM_SHW_TYPE != PGM_TYPE_NESTED */
 }