Changeset 53643 in vbox for trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts

Timestamp:

Jan 2, 2015 12:16:31 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: dtrace.c compiles on darwin. (r13)

File:

• trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/dtrace/dtrace.c (modified) (10 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/dtrace/dtrace.c

@@ -2247 +2247 @@
         dtrace_buffer_t *src, *dest;
         uintptr_t daddr, saddr, dlimit;
-        dtrace_speculation_state_t current, new;
+        dtrace_speculation_state_t current, new VBDTUNASS(-1);
         intptr_t offs;
 
@@ -2307 +2307 @@
 
                 default:
+#ifndef VBOX
                         ASSERT(0);
+#else
+                        AssertFatalMsgFailed(("%d\n",  current));
+#endif
                 }
         } while (dtrace_cas32((uint32_t *)&spec->dtsp_state,
@@ -2421 +2425 @@
 
                 default:
+#ifndef VBOX
                         ASSERT(0);
+#else
+                        AssertFatalMsgFailed(("%d\n", current));
+#endif
                 }
         } while (dtrace_cas32((uint32_t *)&spec->dtsp_state,
@@ -2545 +2553 @@
 {
         dtrace_speculation_t *spec;
-        dtrace_speculation_state_t current, new;
+        dtrace_speculation_state_t current, new VBDTUNASS(-1);
         dtrace_buffer_t *buf;
 
@@ -2595 +2603 @@
 
                 default:
+#ifndef VBOX
                         ASSERT(0);
+#else
+                        AssertFatalMsgFailed(("%d\n", current));
+#endif
                 }
         } while (dtrace_cas32((uint32_t *)&spec->dtsp_state,
@@ -3666 +3678 @@
                 uint64_t size = state->dts_options[DTRACEOPT_STRSIZE];
                 uintptr_t limit, toklimit = tokaddr + size;
-                uint8_t c, tokmap[32];   /* 256 / 8 */
+                uint8_t c VBDTUNASS(0), tokmap[32];      /* 256 / 8 */
                 char *dest = (char *)mstate->dtms_scratch_ptr;
                 VBDTTYPE(unsigned,int) i;
@@ -6609 +6621 @@
                  */
                 priv = DTRACE_PRIV_ALL;
+#ifdef VBOX
+                *uidp = ~0;
+                *zoneidp = 0;
+#endif
         } else {
                 *uidp = crgetuid(cr);
@@ -8014 +8030 @@
                 panic("attempt to unregister non-existent "
                     "dtrace meta-provider %p\n", (void *)old);
+#ifdef VBOX
+                return EINVAL;
+#endif
         }
 
@@ -9022 +9041 @@
                 default:
                         ASSERT(0);
+#ifdef VBOX
+                        continue;
+#endif
                 }
 
@@ -13392 +13414 @@
         uint64_t sarg0 = mstate->dtms_arg[0];
         uint64_t sarg1 = mstate->dtms_arg[1];
-        uint64_t rval;
+        uint64_t rval VBDTUNASS(666);
         dtrace_helpers_t *helpers = curproc->p_dtrace_helpers;
         dtrace_helper_action_t *helper;