Changeset 7702 in vbox

Timestamp:

Apr 2, 2008 3:07:15 PM (17 years ago)

Author:

vboxsync

Message:

Fixed a bunch of #else and #endif comments. The convention here is that on an #else we'll document what the criteria for the following body is, and for #endif the above body. So, the #else comment is the inverse of the #if and the #endif is the same as the #else, or if there isn't any #lese, the #if.

File:

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

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

@@ -1576 +1576 @@
     return VINF_SUCCESS;
 
-#else /* PGM_GST_TYPE != PGM_TYPE_32BIT */
+#else /* PGM_GST_TYPE == PGM_TYPE_AMD64 */
     AssertReleaseMsgFailed(("Shw=%d Gst=%d is not implemented!\n", PGM_GST_TYPE, PGM_SHW_TYPE));
     return VERR_INTERNAL_ERROR;
-#endif /* PGM_GST_TYPE != PGM_TYPE_32BIT */
+#endif /* PGM_GST_TYPE == PGM_TYPE_AMD64 */
 }
 
@@ -2247 +2247 @@
     return rc;
 
-#else /* PGM_GST_TYPE != PGM_TYPE_32BIT */
+#else /* PGM_GST_TYPE == PGM_TYPE_AMD64 */
     AssertReleaseMsgFailed(("Shw=%d Gst=%d is not implemented!\n", PGM_GST_TYPE, PGM_SHW_TYPE));
     STAM_PROFILE_STOP(&pVM->pgm.s.CTXMID(Stat,SyncPT), a);
     return VERR_INTERNAL_ERROR;
-#endif /* PGM_GST_TYPE != PGM_TYPE_32BIT */
+#endif /* PGM_GST_TYPE == PGM_TYPE_AMD64 */
 }
 
@@ -2325 +2325 @@
     return rc;
 
-#else /* PGM_GST_TYPE != PGM_TYPE_32BIT */
+#else /* PGM_GST_TYPE == PGM_TYPE_AMD64 */
 
     AssertReleaseMsgFailed(("Shw=%d Gst=%d is not implemented!\n", PGM_SHW_TYPE, PGM_GST_TYPE));
     return VERR_INTERNAL_ERROR;
-#endif /* PGM_GST_TYPE != PGM_TYPE_32BIT */
+#endif /* PGM_GST_TYPE == PGM_TYPE_AMD64 */
 }
 
@@ -2577 +2577 @@
     {
         unsigned        iPDSrc;
-#   if PGM_SHW_TYPE == PGM_TYPE_PAE 
+#   if PGM_SHW_TYPE == PGM_TYPE_PAE
         PX86PDPAE       pPDPAE    = pVM->pgm.s.CTXMID(ap,PaePDs)[iPDPTRE * X86_PG_PAE_ENTRIES];
 #   else
@@ -2592 +2592 @@
             continue;
         }
-#  else
-   {
-#  endif /* if PGM_GST_TYPE == PGM_TYPE_PAE || PGM_GST_TYPE == PGM_TYPE_AMD64 */
+#  else  /* PGM_GST_TYPE != PGM_TYPE_PAE && PGM_GST_TYPE != PGM_TYPE_AMD64 */
+    {
+#  endif /* PGM_GST_TYPE != PGM_TYPE_PAE && PGM_GST_TYPE != PGM_TYPE_AMD64 */
         for (unsigned iPD = 0; iPD < ELEMENTS(pPDSrc->a); iPD++)
         {
@@ -2639 +2639 @@
 #   endif
                 }
-#  else /* PGM_GST_TYPE == PGM_TYPE_32BIT */
+#  else /* PGM_GST_TYPE != PGM_TYPE_32BIT */
                 /* PAE and AMD64 modes are hardware accelerated only, so there are no mappings. */
                 Assert(iPD != iPdNoMapping);
-#  endif /* PGM_GST_TYPE == PGM_TYPE_32BIT */
+#  endif /* PGM_GST_TYPE != PGM_TYPE_32BIT */
                 /*
                  * Sync page directory entry.
@@ -2802 +2802 @@
                 iPD += cPTs - 1;
                 pPDEDst += cPTs + (PGM_SHW_TYPE != PGM_TYPE_32BIT) * cPTs;
-#  else /* PGM_GST_TYPE == PGM_TYPE_32BIT */
+#  else /* PGM_GST_TYPE != PGM_TYPE_32BIT */
                 /* PAE and AMD64 modes are hardware accelerated only, so there are no mappings. */
                 AssertFailed();
-#  endif /* PGM_GST_TYPE == PGM_TYPE_32BIT */
+#  endif /* PGM_GST_TYPE != PGM_TYPE_32BIT */
             }