Changeset 8042 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

Timestamp:

Apr 16, 2008 1:50:43 PM (17 years ago)

Author:

vboxsync

Message:

corrected #if/#else/#endif comments.

File:

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

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

@@ -41 +41 @@
 /* Filter out some illegal combinations of guest and shadow paging, so we can remove redundant checks inside functions. */
 #if      PGM_GST_TYPE == PGM_TYPE_PAE && PGM_SHW_TYPE != PGM_TYPE_PAE
-#error "Invalid combination; PAE guest implies PAE shadow"
+# error "Invalid combination; PAE guest implies PAE shadow"
 #endif
 
 #if     (PGM_GST_TYPE == PGM_TYPE_REAL || PGM_GST_TYPE == PGM_TYPE_PROT) \
     && !(PGM_SHW_TYPE == PGM_TYPE_32BIT || PGM_SHW_TYPE == PGM_TYPE_PAE)
-#error "Invalid combination; real or protected mode without paging implies 32 bits or PAE shadow paging."
+# error "Invalid combination; real or protected mode without paging implies 32 bits or PAE shadow paging."
 #endif
 
 #if     (PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_PAE) \
     && !(PGM_SHW_TYPE == PGM_TYPE_32BIT || PGM_SHW_TYPE == PGM_TYPE_PAE)
-#error "Invalid combination; 32 bits guest paging or PAE implies 32 bits or PAE shadow paging."
+# error "Invalid combination; 32 bits guest paging or PAE implies 32 bits or PAE shadow paging."
 #endif
 
 #if    (PGM_GST_TYPE == PGM_TYPE_AMD64 && PGM_SHW_TYPE != PGM_TYPE_AMD64)
     || (PGM_SHW_TYPE == PGM_TYPE_AMD64 && PGM_GST_TYPE != PGM_TYPE_AMD64)
-#error "Invalid combination; AMD64 guest implies AMD64 shadow and vice versa"
+# error "Invalid combination; AMD64 guest implies AMD64 shadow and vice versa"
 #endif
 
 #ifdef IN_RING0 /* no mappings in VT-x and AMD-V mode */
-#define PGM_WITHOUT_MAPPINGS
+# define PGM_WITHOUT_MAPPINGS
 #endif
 
@@ -842 +842 @@
     PX86PDPAE       pPDSrc      = pgmGstGetPaePDPtr(&pVM->pgm.s, GCPtrPage, &iPDSrc);
     GSTPDE          PdeSrc;
-    
+
     if (pPDSrc)
         PdeSrc = pPDSrc->a[iPDSrc];
@@ -1671 +1671 @@
         ||  (fNoExecuteBitValid && (uErr & X86_TRAP_PF_ID) && pPdpeSrc->n.u1NoExecute)
         ||  (fWriteFault && !pPdpeSrc->n.u1Write && (fUserLevelFault || fWriteProtect))
-        ||  (fUserLevelFault && !pPdpeSrc->n.u1User) 
+        ||  (fUserLevelFault && !pPdpeSrc->n.u1User)
 # endif
        )
@@ -1995 +1995 @@
 # else  /* PGM_WITHOUT_MAPPINGS */
     Assert(!pgmMapAreMappingsEnabled(&pVM->pgm.s));
-# endif /* !PGM_WITHOUT_MAPPINGS */
+# endif /* PGM_WITHOUT_MAPPINGS */
     Assert(!PdeDst.n.u1Present); /* We're only supposed to call SyncPT on PDE!P and conflicts.*/
 
@@ -2736 +2736 @@
                 &&  (PdeSrc.n.u1User || fRawR0Enabled))
             {
-#  if    (PGM_GST_TYPE == PGM_TYPE_32BIT \
-      ||  PGM_GST_TYPE == PGM_TYPE_PAE)  \
+#  if    (   PGM_GST_TYPE == PGM_TYPE_32BIT \
+          || PGM_GST_TYPE == PGM_TYPE_PAE) \
       && !defined(PGM_WITHOUT_MAPPINGS)
 
@@ -2780 +2780 @@
 #   endif
                 }
-#  else  /* PGM_GST_TYPE != PGM_TYPE_32BIT && PGM_GST_TYPE != PGM_TYPE_PAE && PGM_WITHOUT_MAPPINGS */
+#  else  /* (PGM_GST_TYPE != PGM_TYPE_32BIT && PGM_GST_TYPE != PGM_TYPE_PAE) || PGM_WITHOUT_MAPPINGS */
                 Assert(!pgmMapAreMappingsEnabled(&pVM->pgm.s));
-#  endif /* (PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_PAE) && !PGM_WITHOUT_MAPPINGS */
+#  endif /* (PGM_GST_TYPE != PGM_TYPE_32BIT && PGM_GST_TYPE != PGM_TYPE_PAE) || PGM_WITHOUT_MAPPINGS */
                 /*
                  * Sync page directory entry.
@@ -2898 +2898 @@
             else
             {
-#  if    (PGM_GST_TYPE == PGM_TYPE_32BIT \
-      ||  PGM_GST_TYPE == PGM_TYPE_PAE)  \
+#  if    (   PGM_GST_TYPE == PGM_TYPE_32BIT \
+          || PGM_GST_TYPE == PGM_TYPE_PAE)  \
       && !defined(PGM_WITHOUT_MAPPINGS)
 
@@ -2961 +2961 @@
                 AssertCompile(PGM_GST_TYPE == PGM_TYPE_32BIT && PGM_SHW_TYPE == PGM_TYPE_PAE);
 #   endif
-#  else  /* PGM_GST_TYPE != PGM_TYPE_32BIT && PGM_GST_TYPE != PGM_TYPE_PAE && PGM_WITHOUT_MAPPINGS */
+#  else  /* (PGM_GST_TYPE != PGM_TYPE_32BIT && PGM_GST_TYPE != PGM_TYPE_PAE) || PGM_WITHOUT_MAPPINGS */
                 Assert(!pgmMapAreMappingsEnabled(&pVM->pgm.s));
-#  endif /* (PGM_GST_TYPE == PGM_TYPE_32BIT || PGM_GST_TYPE == PGM_TYPE_PAE) && !PGM_WITHOUT_MAPPINGS */
+#  endif /* (PGM_GST_TYPE != PGM_TYPE_32BIT && PGM_GST_TYPE != PGM_TYPE_PAE) || PGM_WITHOUT_MAPPINGS */
             }
 
@@ -3089 +3089 @@
             AssertMsg(   pVM->pgm.s.apGstPaePDsHC[i]    == (R3R0PTRTYPE(PX86PDPAE))HCPtr
                       && pVM->pgm.s.aGCPhysGstPaePDs[i] == GCPhys,
-                      ("idx %d apGstPaePDsHC %VHv vs %VHv aGCPhysGstPaePDs %VGp vs %VGp\n", 
+                      ("idx %d apGstPaePDsHC %VHv vs %VHv aGCPhysGstPaePDs %VGp vs %VGp\n",
                        i, pVM->pgm.s.apGstPaePDsHC[i], HCPtr, pVM->pgm.s.aGCPhysGstPaePDs[i], GCPhys));
         }