Changeset 57274 in vbox

Timestamp:

Aug 11, 2015 1:46:14 PM (9 years ago)

Author:

vboxsync

Message:

iprt/r0drv/darwin: The remaining (hopefully) places where we might possibly need to preserve EFLAGS.AC.

Location:

trunk/src/VBox/Runtime/r0drv/darwin

Files:

• dbgkrnlinfo-r0drv-darwin.cpp (modified) (9 diffs)
• initterm-r0drv-darwin.cpp (modified) (4 diffs)
• memobj-r0drv-darwin.cpp (modified) (4 diffs)
• mp-r0drv-darwin.cpp (modified) (3 diffs)
• thread2-r0drv-darwin.cpp (modified) (2 diffs)

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

@@ -216 +216 @@
     if (!pThis)
         return VERR_NO_MEMORY;
+    IPRT_DARWIN_SAVE_EFL_AC();
 
     errno_t rc;
@@ -257 +258 @@
             default:
                 AssertMsgFailed(("RTFileOpen received an invalid RW value, fOpen=%#x\n", fOpen));
+                IPRT_DARWIN_RESTORE_EFL_AC();
                 return VERR_INVALID_PARAMETER;
         }
@@ -265 +267 @@
         {
             *phFile = pThis;
+            IPRT_DARWIN_RESTORE_EFL_AC();
             return VINF_SUCCESS;
         }
@@ -274 +277 @@
     RTMemFree(pThis);
 
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return rc;
 }
@@ -288 +292 @@
     pThis->u32Magic = ~RTFILE_MAGIC;
 
+    IPRT_DARWIN_SAVE_EFL_AC();
     errno_t rc = vnode_close(pThis->hVnode, pThis->fOpenMode & (FREAD | FWRITE), pThis->hVfsCtx);
+    IPRT_DARWIN_RESTORE_EFL_AC();
 
     RTMemFree(pThis);
@@ -303 +309 @@
     off_t offNative = (off_t)off;
     AssertReturn((RTFOFF)offNative == off, VERR_OUT_OF_RANGE);
+    IPRT_DARWIN_SAVE_EFL_AC();
 
 #if 0 /* Added in 10.6, grr. */
@@ -316 +323 @@
         *pcbRead = cbToRead - cbLeft;
     }
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return !rc ? VINF_SUCCESS : RTErrConvertFromErrno(rc);
 
@@ -321 +329 @@
     uio_t hUio = uio_create(1, offNative, UIO_SYSSPACE, UIO_READ);
     if (!hUio)
+    {
+        IPRT_DARWIN_RESTORE_EFL_AC();
         return VERR_NO_MEMORY;
+    }
     errno_t rc;
     if (uio_addiov(hUio, (user_addr_t)(uintptr_t)pvBuf, cbToRead) == 0)
@@ -334 +345 @@
         rc = VERR_INTERNAL_ERROR_3;
     uio_free(hUio);
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return rc;
 

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

@@ -52 +52 @@
 DECLHIDDEN(int) rtR0InitNative(void)
 {
+    IPRT_DARWIN_SAVE_EFL_AC();
+
     /*
      * Create the lock group.
@@ -86 +88 @@
         rtR0TermNative();
 
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return rc;
 }
@@ -92 +95 @@
 DECLHIDDEN(void) rtR0TermNative(void)
 {
+    IPRT_DARWIN_SAVE_EFL_AC();
+
     /*
      * Preemption hacks before the lock group.
@@ -105 +110 @@
         g_pDarwinLockGroup = NULL;
     }
+
+    IPRT_DARWIN_RESTORE_EFL_AC();
 }
 

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

@@ -1054 +1054 @@
 DECLHIDDEN(int) rtR0MemObjNativeProtect(PRTR0MEMOBJINTERNAL pMem, size_t offSub, size_t cbSub, uint32_t fProt)
 {
+    IPRT_DARWIN_SAVE_EFL_AC();
+
     /* Get the map for the object. */
     vm_map_t pVmMap = rtR0MemObjDarwinGetMap(pMem);
     if (!pVmMap)
+    {
+        IPRT_DARWIN_RESTORE_EFL_AC();
         return VERR_NOT_SUPPORTED;
-
-    IPRT_DARWIN_SAVE_EFL_AC();
+    }
 
     /*
@@ -1154 +1157 @@
     RTHCPHYS            PhysAddr;
     PRTR0MEMOBJDARWIN   pMemDarwin = (PRTR0MEMOBJDARWIN)pMem;
+    IPRT_DARWIN_SAVE_EFL_AC();
 
 #ifdef USE_VM_MAP_WIRE
@@ -1196 +1200 @@
         }
 
+        IPRT_DARWIN_RESTORE_EFL_AC();
         AssertReturn(PgNo, NIL_RTHCPHYS);
         PhysAddr = (RTHCPHYS)PgNo << PAGE_SHIFT;
@@ -1219 +1224 @@
         addr64_t Addr = pMemDesc->getPhysicalSegment64(iPage * PAGE_SIZE, NULL);
 #endif
+        IPRT_DARWIN_RESTORE_EFL_AC();
         AssertMsgReturn(Addr, ("iPage=%u\n", iPage), NIL_RTHCPHYS);
         PhysAddr = Addr;

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

@@ -49 +49 @@
 static int rtMpDarwinInitMaxCpus(void)
 {
+    IPRT_DARWIN_SAVE_EFL_AC();
+
     int32_t cCpus = -1;
     size_t  oldLen = sizeof(cCpus);
@@ -59 +61 @@
 
     ASMAtomicWriteS32(&g_cMaxCpus, cCpus);
+
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return cCpus;
 }
@@ -294 +298 @@
     if (g_pfnR0DarwinCpuInterrupt == NULL)
         return VERR_NOT_SUPPORTED;
+    IPRT_DARWIN_SAVE_EFL_AC(); /* paranoia */
     g_pfnR0DarwinCpuInterrupt(idCpu);
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return VINF_SUCCESS;
 }

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

@@ -173 +173 @@
 {
     RT_ASSERT_PREEMPTIBLE();
+    IPRT_DARWIN_SAVE_EFL_AC();
 
     thread_t NativeThread;
@@ -180 +181 @@
         *pNativeThread = (RTNATIVETHREAD)NativeThread;
         thread_deallocate(NativeThread);
+        IPRT_DARWIN_RESTORE_EFL_AC();
         return VINF_SUCCESS;
     }
+    IPRT_DARWIN_RESTORE_EFL_AC();
     return RTErrConvertFromMachKernReturn(kr);
 }