Changeset 40892 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Apr 12, 2012 12:12:40 PM (13 years ago)

Author:

vboxsync

Message:

64-bit probe arguments (on mac)

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv-dtrace.cpp (modified) (5 diffs)
• SUPDrvTracer.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp

@@ -399 +399 @@
                 /** @todo mapping? */
                 pArgDesc->dtargd_ndx = uArg;
+SUPR0Printf("supdrvDtPOps_GetArgVal: returns dtargd_native = %s for #%u\n", pArgDesc->dtargd_native, uArg);
                 LOG_DTRACE(("supdrvDtPOps_GetArgVal: returns dtargd_native = %s\n", pArgDesc->dtargd_native));
                 return;
@@ -404 +405 @@
         }
     }
+SUPR0Printf("supdrvDtPOps_GetArgVal: returns faiure for #%u\n", uArg);
 }
 
@@ -469 +471 @@
     }
 
-    /* Get the stack data. */
+    /*
+     * Get the stack data. This is a wee bit complicated on 32-bit systems
+     * since we want to support 64-bit integer arguments.
+     */
 #if ARCH_BITS == 64
     uint64_t u64Ret = pData->pauStackArgs[iArg - 5];
@@ -479 +484 @@
     else
     {
-        /* wonder if this will work... */
+        /* Similar to what we did for mac in when calling dtrace_probe(). */
         uint32_t off = 0;
         for (int i = 5; i < iArg; i++)
-            if (   (pArgList->aArgs[i].fType & VTG_TYPE_FIXED_SIZED)
-                && (pArgList->aArgs[i].fType & VTG_TYPE_SIZE_MASK) == 8)
+            if (VTG_TYPE_IS_LARGE(pArgList->aArgs[iArg].fType))
                 off++;
         u64Ret = pData->pauStackArgs[iArg - 5 + off];
@@ -566 +570 @@
     SUPDRVDT_SETUP_STACK_DATA();
 
-    pStackData->pauStackArgs = &uArg4 + 1;
+    pStackData->pauStackArgs  = &uArg4 + 1;
+
+#if defined(RT_OS_DARWIN) && ARCH_BITS == 32
+    /*
+     * Convert arguments from uintptr_t to uint64_t.
+     */
+    PVTGDESCPROBE   pProbe   = (PVTGDESCPROBE)((PVTGPROBELOC)pVtgProbeLoc)->pbProbe;
+    AssertPtrReturnVoid(pProbe);
+    PVTGOBJHDR      pVtgHdr  = (PVTGOBJHDR)((uintptr_t)pProbe + pProbe->offObjHdr);
+    AssertPtrReturnVoid(pVtgHdr);
+    PVTGDESCARGLIST pArgList = (PVTGDESCARGLIST)((uintptr_t)pVtgHdr->paArgLists + pProbe->offArgList);
+    AssertPtrReturnVoid(pArgList);
+    if (!pArgList->fHaveLargeArgs)
+        dtrace_probe(pVtgProbeLoc->idProbe, uArg0, uArg1, uArg2, uArg3, uArg4);
+    else
+    {
+        uintptr_t *auSrcArgs = &uArg0;
+        uint32_t   iSrcArg   = 0;
+        uint32_t   iDstArg   = 0;
+        uint64_t   au64DstArgs[5];
+
+        while (   iDstArg < RT_ELEMENTS(au64DstArgs)
+               && iSrcArg < pArgList->cArgs)
+        {
+            au64DstArgs[iDstArg] = auSrcArgs[iSrcArg];
+            if (VTG_TYPE_IS_LARGE(pArgList->aArgs[iDstArg].fType))
+                au64DstArgs[iDstArg] |= (uint64_t)auSrcArgs[++iSrcArg] << 32;
+            iSrcArg++;
+            iDstArg++;
+        }
+        while (iDstArg < RT_ELEMENTS(au64DstArgs))
+            au64DstArgs[iDstArg++] = auSrcArgs[iSrcArg++];
+
+        pStackData->pauStackArgs  = &auSrcArgs[iSrcArg];
+        dtrace_probe(pVtgProbeLoc->idProbe, au64DstArgs[0], au64DstArgs[1], au64DstArgs[2], au64DstArgs[3], au64DstArgs[4]);
+    }
+#else
     dtrace_probe(pVtgProbeLoc->idProbe, uArg0, uArg1, uArg2, uArg3, uArg4);
+#endif
 
     SUPDRVDT_CLEAR_STACK_DATA();

trunk/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp

@@ -315 +315 @@
         if (pVtgHdr->paProbes[i].u32User)
             return VERR_SUPDRV_VTG_BAD_PROBE;
+        if (pVtgHdr->paProbes[i].u32User2)
+            return VERR_SUPDRV_VTG_BAD_PROBE;
+        if (   pVtgHdr->paProbes[i].offObjHdr
+            != (intptr_t)pVtgHdr - (intptr_t)&pVtgHdr->paProbes[i])
+        {
+            SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_TRACER_BAD_ARG_FLAGS - iProbe=%u offObjHdr=%d expected %zd\n",
+                        i, pVtgHdr->paProbes[i].offObjHdr, (intptr_t)pVtgHdr - (intptr_t)&pVtgHdr->paProbes[i]);
+            return VERR_SUPDRV_VTG_BAD_PROBE;
+        }
 
         /* The referenced argument list. */
@@ -320 +329 @@
         if (pArgList->cArgs > 16)
         {
-            SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_TRACER_BAD_ARG_FLAGS - iProbe=%u cArgs=%u\n", i, pArgList->fHaveLargeArgs, pArgList->cArgs);
+            SUPR0Printf("supdrvVtgValidate: VERR_SUPDRV_TRACER_BAD_ARG_FLAGS - iProbe=%u cArgs=%u\n", i, pArgList->cArgs);
             return VERR_SUPDRV_VTG_BAD_ARGLIST;
         }