Changeset 83810 in vbox for trunk

Timestamp:

Apr 19, 2020 12:03:08 AM (5 years ago)

Author:

vboxsync

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

137337

Message:

VBoxDTrace: VC++ 14.1 adjustments and a little fix/optimization. bugref:8489

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace

Files:

• Makefile.kmk (modified) (2 diffs)
• onnv/cmd/dtrace/dtrace.c (modified) (3 diffs)
• onnv/uts/common/dtrace/dtrace.c (modified) (1 diff)

trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

@@ -65 +65 @@
  TEMPLATE_VBoxR3ExtPackDTrace_INST = $(INST_EXTPACK_VBOXDTRACE)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
  TEMPLATE_VBoxR3ExtPackDTrace_DEFS = $(TEMPLATE_VBoxR3ExtPack_DEFS) VBOX_IN_DTRACE_EXTPACK
+ if "$(VBOX_VCC_TOOL_STEM)" >= "VCC141"
+  # -wd4456: declaration of 'rval' hides previous local declaration
+  # -wd4477: 'fprintf' : format string '%02lu' requires an argument of type 'unsigned long', but variadic argument 1 has type 'ulong_t'
+  # -wd4457: warning C4457: declaration of 'arg' hides function parameter
+  TEMPLATE_VBoxR3ExtPackDTrace_CFLAGS.win = $(TEMPLATE_VBoxR3ExtPack_CFLAGS.win) -wd4456 -wd4477 -wd4457
+ endif
 
  TEMPLATE_VBoxR0ExtPackDTrace = For the ring-0 context modules in the VBoxDTrace extension pack.
@@ -102 +108 @@
  DLLS += VBoxDTraceCmd
  VBoxDTraceCmd_TEMPLATE = VBoxR3ExtPackDTrace
+ ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
+ VBoxDTraceCmd_DEFS = RTMEM_WRAP_TO_EF_APIS VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME="$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)"
+ else
  VBoxDTraceCmd_DEFS = RTMEM_WRAP_TO_EF_APIS VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME=\"$(VBOX_EXTPACK_VBOXDTRACE_MANGLED_NAME)\"
+ endif
  #VBoxDTraceCmd_DEFS += YYDEBUG
  VBoxDTraceCmd_DEFS.linux = _XOPEN_SOURCE=700 _LARGEFILE64_SOURCE

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

@@ -915 +915 @@
         (void) printf("%s: %s%s\n", g_pname, hdr, strlen(hdr) > 0 ? ":" : "");
 
+#ifdef VBOX /* The orignal upsets VC++ 14.1 with variable 'c' shadowing variable in the function.
+             * This version is faster and does not try to print '\0' as that doesn't look like it's intentional */
+#define BUFDUMPSTR(ptr, field) do { \
+        const char *pszField = (ptr)->field; \
+        if (pszField) { \
+                const char *pszStart = pszField; \
+                char ch; \
+                printf("%s: %20s => \"", g_pname, #field); \
+                while ((ch = *pszField) != '\0') { \
+                        if (ch != '\n')  \
+                                pszField++; \
+                        else { \
+                                printf("%*.*s\\n", (int)(pszField - pszStart), \
+                                       (int)(pszField - pszStart), pszStart); \
+                                pszStart = ++pszField; \
+                        } \
+                } \
+                printf("%*.*s\"", (int)(pszField - pszStart), \
+                       (int)(pszField - pszStart), pszStart); \
+        } else {  \
+                printf("%s: %20s => <NULL>\n", g_pname, #field); \
+        } \
+} while (0)
+#else
 #define BUFDUMPSTR(ptr, field) \
         (void) printf("%s: %20s => ", g_pname, #field); \
@@ -932 +956 @@
                 (void) printf("<NULL>\n");              \
         }
+#endif
 
 #define BUFDUMPASSTR(ptr, field, str) \
@@ -1913 +1938 @@
 
                 if (g_ofile == NULL) {
+#ifndef VBOX
                         char *p;
+#endif
 
                         if (g_cmdc > 1) {

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

@@ -107 +107 @@
 # include <limits.h>
 
+# undef offsetof
+# define offsetof RT_OFFSETOF
+
 /*
  * Use asm.h to implemente some of the simple stuff in dtrace_asm.s.