Changeset 57228 in vbox for trunk/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp

Timestamp:

Aug 6, 2015 11:27:10 PM (9 years ago)

Author:

vboxsync

Message:

IPRT/r0drv/darwin: More EFLAGS.AC paranoia.

File:

• trunk/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp

@@ -70 +70 @@
 {
     RT_ASSERT_PREEMPTIBLE();
+    IPRT_DARWIN_SAVE_EFL_AC();
     AssertReturn(fFlags == RTSPINLOCK_FLAGS_INTERRUPT_SAFE || fFlags == RTSPINLOCK_FLAGS_INTERRUPT_UNSAFE, VERR_INVALID_PARAMETER);
 
@@ -77 +78 @@
     AssertCompile(sizeof(RTSPINLOCKINTERNAL) > sizeof(void *));
     PRTSPINLOCKINTERNAL pThis = (PRTSPINLOCKINTERNAL)RTMemAlloc(sizeof(*pThis));
-    if (!pThis)
-        return VERR_NO_MEMORY;
+    if (pThis)
+    {
+        /*
+         * Initialize & return.
+         */
+        pThis->u32Magic  = RTSPINLOCK_MAGIC;
+        pThis->fIntSaved = 0;
+        pThis->fFlags    = fFlags;
+        pThis->pszName   = pszName;
+        Assert(g_pDarwinLockGroup);
+        pThis->pSpinLock = lck_spin_alloc_init(g_pDarwinLockGroup, LCK_ATTR_NULL);
+        if (pThis->pSpinLock)
+        {
+            *pSpinlock = pThis;
+            IPRT_DARWIN_RESTORE_EFL_AC();
+            return VINF_SUCCESS;
+        }
 
-    /*
-     * Initialize & return.
-     */
-    pThis->u32Magic  = RTSPINLOCK_MAGIC;
-    pThis->fIntSaved = 0;
-    pThis->fFlags    = fFlags;
-    pThis->pszName   = pszName;
-    Assert(g_pDarwinLockGroup);
-    pThis->pSpinLock = lck_spin_alloc_init(g_pDarwinLockGroup, LCK_ATTR_NULL);
-    if (!pThis->pSpinLock)
-    {
         RTMemFree(pThis);
-        return VERR_NO_MEMORY;
     }
-
-    *pSpinlock = pThis;
-    return VINF_SUCCESS;
+    IPRT_DARWIN_RESTORE_EFL_AC();
+    return VERR_NO_MEMORY;
 }
 
@@ -116 +119 @@
      */
     ASMAtomicIncU32(&pThis->u32Magic);
+    IPRT_DARWIN_SAVE_EFL_AC();
 
     Assert(g_pDarwinLockGroup);
@@ -122 +126 @@
 
     RTMemFree(pThis);
+
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return VINF_SUCCESS;
 }
@@ -138 +144 @@
         lck_spin_lock(pThis->pSpinLock);
         pThis->fIntSaved = fIntSaved;
+        IPRT_DARWIN_RESTORE_EFL_ONLY_AC_EX(fIntSaved);
     }
     else
+    {
+        IPRT_DARWIN_SAVE_EFL_AC();
         lck_spin_lock(pThis->pSpinLock);
+        IPRT_DARWIN_RESTORE_EFL_ONLY_AC();
+    }
 }
 
@@ -158 +169 @@
     }
     else
+    {
+        IPRT_DARWIN_SAVE_EFL_AC();
         lck_spin_unlock(pThis->pSpinLock);
+        IPRT_DARWIN_RESTORE_EFL_ONLY_AC();
+    }
 }