Changeset 37426 in vbox for trunk/src/VBox/VMM/include/IOMInline.h

Timestamp:

Jun 12, 2011 7:35:28 PM (13 years ago)

Author:

vboxsync

Message:

IOMInline.h: Make sure we don't call PDMCritSectIsInitialized unncessarily in non-strict builds.

File:

• trunk/src/VBox/VMM/include/IOMInline.h (modified) (4 diffs)

trunk/src/VBox/VMM/include/IOMInline.h

@@ -35 +35 @@
 DECLINLINE(CTX_SUFF(PIOMIOPORTRANGE)) iomIOPortGetRange(PVM pVM, RTIOPORT Port)
 {
-#ifdef IN_RING3
-    if (PDMCritSectIsInitialized(&pVM->iom.s.EmtLock))
-#endif
-        Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock));
+    Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock) || !PDMCritSectIsInitialized(&pVM->iom.s.EmtLock));
     return (CTX_SUFF(PIOMIOPORTRANGE))RTAvlroIOPortRangeGet(&pVM->iom.s.CTX_SUFF(pTrees)->CTX_SUFF(IOPortTree), Port);
 }
@@ -54 +51 @@
 DECLINLINE(PIOMIOPORTRANGER3) iomIOPortGetRangeR3(PVM pVM, RTIOPORT Port)
 {
-#ifdef IN_RING3
-    if (PDMCritSectIsInitialized(&pVM->iom.s.EmtLock)) /** @todo Move the call into the assertion since the compiler cannot optimize it away in non-strict builds. */
-#endif
-        Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock));
+    Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock) || !PDMCritSectIsInitialized(&pVM->iom.s.EmtLock));
     return (PIOMIOPORTRANGER3)RTAvlroIOPortRangeGet(&pVM->iom.s.CTX_SUFF(pTrees)->IOPortTreeR3, Port);
 }
@@ -73 +67 @@
 DECLINLINE(PIOMMMIORANGE) iomMMIOGetRange(PVM pVM, RTGCPHYS GCPhys)
 {
-#ifdef IN_RING3
-    if (PDMCritSectIsInitialized(&pVM->iom.s.EmtLock))
-#endif
-        Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock));
+    Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock) || !PDMCritSectIsInitialized(&pVM->iom.s.EmtLock));
     PIOMMMIORANGE pRange = pVM->iom.s.CTX_SUFF(pMMIORangeLast);
     if (    !pRange
@@ -125 +116 @@
 {
     Assert(PDMCritSectIsOwner(&pVM->iom.s.EmtLock));
+
     /* For large ranges, we'll put everything on the first byte. */
     if (pRange->cb > PAGE_SIZE)