Changeset 53647 in vbox for trunk/src/VBox/ExtPacks/VBoxDTrace/onnv

Timestamp:

Jan 2, 2015 12:17:41 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDTrace: darwin build fixes. (r17)

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv

Files:

• cmd/dtrace/dtrace.c (modified) (12 diffs)
• uts/common/dtrace/dtrace.c (modified) (2 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/cmd/dtrace/dtrace.c

@@ -149 +149 @@
 static char **g_argv;
 static int g_argc;
+#ifndef VBOX /* No linking. */
 static char **g_objv;
 static int g_objc;
+#endif
 static dtrace_cmd_t *g_cmdv;
 static int g_cmdc;
@@ -171 +173 @@
 static int g_grabanon = 0;
 static const char *g_ofile = NULL;
-#ifndef _MSC_VER /* stdout isn't a constant usable in C code. */
+#ifndef VBOX /* stdout isn't a necessarily constant usable like this in C code. */
 static FILE *g_ofp = stdout;
 #else
@@ -707 +709 @@
 }
 
+#ifndef VBOX
 /*
  * Link the specified D program in DOF form into an ELF file for use in either
@@ -735 +738 @@
                 dfatal("failed to link %s %s", dcp->dc_desc, dcp->dc_name);
 }
+#endif /* !VBOX */
 
 /*ARGSUSED*/
@@ -1252 +1256 @@
         int done = 0, mode = 0;
         int err, i;
+#ifndef VBOX
         char c, *p, **v;
+#else
+        int c;
+        char *p, **v;
+#endif
         struct ps_prochandle *P;
         pid_t pid;
@@ -1262 +1271 @@
         if (RT_FAILURE(err))
                 return RTMsgInitFailure(err);
-#endif
-#ifdef _MSC_VER
+
         g_ofp = stdout;
 #endif
@@ -1352 +1360 @@
 
                         case 'G':
+#ifndef VBOX
                                 g_mode = DMODE_LINK;
                                 g_oflags |= DTRACE_O_NODEV;
@@ -1358 +1367 @@
                                 mode++;
                                 break;
+#else
+                                fprintf(stderr, "%s: -G is not supported\n", g_pname);
+                                return (E_USAGE);
+#endif
 
                         case 'l':
@@ -1479 +1492 @@
          */
         if (g_mode == DMODE_LINK) {
+#ifndef VBOX /* No link mode. */
                 (void) dtrace_setopt(g_dtp, "linkmode", "dynamic");
                 (void) dtrace_setopt(g_dtp, "unodefs", NULL);
@@ -1493 +1507 @@
                  */
                 g_argc = 1;
+#else  /* VBOX */
+                AssertFailed();
+#endif /* VBOX */
         } else if (g_mode == DMODE_ANON)
                 (void) dtrace_setopt(g_dtp, "linkmode", "primary");
@@ -1812 +1829 @@
 
         case DMODE_LINK:
+#ifndef VBOX  /* No link mode. */
                 if (g_cmdc == 0) {
                         (void) fprintf(stderr, "%s: -G requires one or more "
@@ -1835 +1853 @@
                 dtrace_close(g_dtp);
                 return (g_status);
+#else  /* VBOX */
+                AssertFailed();
+                dtrace_close(g_dtp);
+                return (E_USAGE);
+#endif /* VBOX */
 
         case DMODE_LIST:

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

@@ -110 +110 @@
 # include <iprt/asm-amd64-x86.h>
 # define dtrace_casptr(a_ppvDst, a_pvOld, a_pvNew) \
-        VBoxDtCompareAndSwapPtr(a_ppvDst, a_pvOld, a_pvNew)
+        VBoxDtCompareAndSwapPtr((void * volatile *)a_ppvDst, a_pvOld, a_pvNew)
 DECLINLINE(void *) VBoxDtCompareAndSwapPtr(void * volatile *ppvDst, void *pvOld, void *pvNew)
 {
@@ -9794 +9794 @@
         dtrace_recdesc_t *rec;
         dtrace_state_t *state = ecb->dte_state;
-        dtrace_optval_t *opt = state->dts_options, nframes, strsize;
+        dtrace_optval_t *opt = state->dts_options, nframes VBDTUNASS(0), strsize;
         uint64_t arg = desc->dtad_arg;