Changeset 53994 in vbox for trunk/src/VBox/ExtPacks

Timestamp:

Jan 27, 2015 11:55:49 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

97899

Message:

darwin build fixes.

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0.cpp (modified) (4 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0.cpp

@@ -750 +750 @@
     RTNATIVETHREAD  hNativeSelf = RTThreadNativeSelf();
     RTPROCESS       uPid        = RTProcSelf();
-    uintptr_t       iHash       = (hNativeSelf * 2654435761) % RT_ELEMENTS(g_apThreadsHash);
+    uintptr_t       iHash       = (hNativeSelf * 2654435761U) % RT_ELEMENTS(g_apThreadsHash);
 
     RTSpinlockAcquire(g_hThreadSpinlock);
@@ -791 +791 @@
     if (pThread->hNative != NIL_RTNATIVETHREAD)
     {
-        uintptr_t   iHash2 = (pThread->hNative * 2654435761) % RT_ELEMENTS(g_apThreadsHash);
+        uintptr_t   iHash2 = (pThread->hNative * 2654435761U) % RT_ELEMENTS(g_apThreadsHash);
         if (g_apThreadsHash[iHash2] == pThread)
             g_apThreadsHash[iHash2] = pThread->pNext;
@@ -1800 +1800 @@
      * Convert arguments from uintptr_t to uint64_t.
      */
-    PVTGDESCPROBE   pProbe   = (PVTGDESCPROBE)((PVTGPROBELOC)pVtgProbeLoc)->pbProbe;
+    PVTGDESCPROBE   pProbe   = pVtgProbeLoc->pProbe;
     AssertPtrReturnVoid(pProbe);
     PVTGOBJHDR      pVtgHdr  = (PVTGOBJHDR)((uintptr_t)pProbe + pProbe->offObjHdr);
@@ -1827 +1827 @@
             au64DstArgs[iDstArg++] = auSrcArgs[iSrcArg++];
 
-        pStackData->u.ProbeFireK.pauStackArgs = &auSrcArgs[iSrcArg];
+        pStackData->u.ProbeFireKernel.pauStackArgs = &auSrcArgs[iSrcArg];
         dtrace_probe(pVtgProbeLoc->idProbe, au64DstArgs[0], au64DstArgs[1], au64DstArgs[2], au64DstArgs[3], au64DstArgs[4]);
     }