Don't show VEX emulation warnings by default; they are just too tiresome.

If you want to see them, use --show-emwarns=yes.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3387

diff --git a/coregrind/core.h b/coregrind/core.h
index 5ccf02913482a279cb3c5c91801242eae9c17709..c70f9b738ecdbb8a6dc297081f5d1b45f6474b3a 100644 (file)
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -265,6 +265,9 @@ extern Bool VG_(clo_model_pthreads);
 /* HACK: Use hacked version of clone for Quadrics Elan3 drivers */
 extern Bool VG_(clo_support_elan3);
 
+/* Should we show VEX emulation warnings?  Default: NO */
+extern Bool VG_(clo_show_emwarns);
+
 /* Set up the libc freeres wrapper */
 extern void VGA_(intercept_libc_freeres_wrapper)(Addr);
 

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 88383e734acec502dd69865e0f5f0150abc052bb..41f5c0f437bdb4fbd5b3fd65e81f28f60445db51 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -1454,6 +1454,7 @@ Bool   VG_(clo_pointercheck)   = True;
 Bool   VG_(clo_support_elan3)  = False;
 Bool   VG_(clo_branchpred)     = False;
 Bool   VG_(clo_model_pthreads) = False;
+Bool   VG_(clo_show_emwarns)   = False;
 
 static Bool   VG_(clo_wait_for_gdb)   = False;
 
@@ -1479,6 +1480,7 @@ static void usage ( Bool debug_help )
 "    --weird-hacks=hack1,hack2,...  recognised hacks: lax-ioctls,ioctl-mmap [none]\n"
 "    --pointercheck=no|yes     enforce client address space limits [yes]\n"
 "    --support-elan3=no|yes    hacks for Quadrics Elan3 support [no]\n"
+"    --show-emwarns=no|yes     show warnings about emulation limits? [no]\n"
 "\n"
 "  user options for Valgrind tools that report errors:\n"
 "    --log-fd=<number>         log messages to file descriptor [2=stderr]\n"
@@ -1685,6 +1687,7 @@ static void process_cmd_line_options( UInt* client_auxv, const char* toolname )
       else VG_BOOL_CLO("--error-limit",      VG_(clo_error_limit))
       else VG_BOOL_CLO("--pointercheck",     VG_(clo_pointercheck))
       else VG_BOOL_CLO("--support-elan3",    VG_(clo_support_elan3))
+      else VG_BOOL_CLO("--show-emwarns",     VG_(clo_show_emwarns))
       else VG_BOOL_CLO("--profile",          VG_(clo_profile))
       else VG_BOOL_CLO("--run-libc-freeres", VG_(clo_run_libc_freeres))
       else VG_BOOL_CLO("--show-below-main",  VG_(clo_show_below_main))

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index 524c7eb8d69b42015ec05e251842f73806fabed1..c26f5139daf35ea7a47819f076a502741a054515 100644 (file)
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -845,7 +845,7 @@ VgSchedReturnCode VG_(scheduler) ( ThreadId tid )
          show = (ew < 0 || ew >= EmWarn_NUMBER)
                    ? True
                    : counts[ew]++ < 3;
-         if (show) {
+         if (show && VG_(clo_show_emwarns)) {
             VG_(message)( Vg_UserMsg,
                           "Emulation warning: unsupported action:");
             VG_(message)( Vg_UserMsg, "  %s", what);