Changeset 62659 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jul 28, 2016 10:36:23 PM (8 years ago)

Author:

vboxsync

Message:

VMMR3: warnings

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EM.cpp (modified) (1 diff)
• EMRaw.cpp (modified) (1 diff)
• PGMPhys.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -2721 +2721 @@
     }
 
-    /* (won't ever get here). */
-    AssertFailed();
+    /* not reached */
 }
 

trunk/src/VBox/VMM/VMMR3/EMRaw.cpp

@@ -1493 +1493 @@
             ||  VMCPU_FF_IS_PENDING(pVCpu, ~VMCPU_FF_HIGH_PRIORITY_PRE_RAW_MASK))
         {
-            Assert(pCtx->eflags.Bits.u1VM || (pCtx->ss.Sel & X86_SEL_RPL) != (EMIsRawRing1Enabled(pVM) ? 2 : 1));
+            Assert(pCtx->eflags.Bits.u1VM || (pCtx->ss.Sel & X86_SEL_RPL) != (EMIsRawRing1Enabled(pVM) ? 2U : 1U));
 
             STAM_REL_PROFILE_ADV_SUSPEND(&pVCpu->em.s.StatRAWTotal, a);

trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp

@@ -4351 +4351 @@
             RTAssertMsg2Weak("i=%d iClear=%d cHandyPages=%d\n", i, iClear, pVM->pgm.s.cHandyPages);
             for (uint32_t j = iClear; j < pVM->pgm.s.cHandyPages; j++)
-                RTAssertMsg2Add(("%03d: idPage=%d HCPhysGCPhys=%RHp idSharedPage=%d%\n", j,
-                                 pVM->pgm.s.aHandyPages[j].idPage,
-                                 pVM->pgm.s.aHandyPages[j].HCPhysGCPhys,
-                                 pVM->pgm.s.aHandyPages[j].idSharedPage,
-                                 j == i ? " <---" : ""));
+                RTAssertMsg2Add("%03d: idPage=%d HCPhysGCPhys=%RHp idSharedPage=%d%\n", j,
+                                pVM->pgm.s.aHandyPages[j].idPage,
+                                pVM->pgm.s.aHandyPages[j].HCPhysGCPhys,
+                                pVM->pgm.s.aHandyPages[j].idSharedPage,
+                                j == i ? " <---" : "");
             RTAssertPanic();
         }