Give informative failure messages if you try to use Helgrind or
Addrcheck. As a results, we are now building Addrcheck again, which
required commenting out lots of code.
BACKPORT TO 3_0_X, AND POSSIBLY TO 2_4_X (the Helgrind part, with
modifications)
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4384 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index fd7dbd2..4b19243 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,12 +12,11 @@
## addrcheck \
-# Temporary: we want to compile Helgrind, but not regtest it.
+# Temporary: we want to compile Helgrind and Addrcheck, but not regtest it.
# And we want to include Addrcheck in the distro, but not compile/test it.
# Put docs last because building the HTML is slow and we want to get
# everything else working before we try it.
-SUBDIRS = include coregrind . tests auxprogs $(TOOLS) helgrind docs
-DIST_SUBDIRS = $(SUBDIRS) addrcheck
+SUBDIRS = include coregrind . tests auxprogs $(TOOLS) helgrind addrcheck docs
SUPP_FILES = \
glibc-2.2.supp glibc-2.3.supp glibc-2.4.supp \
diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am
index 88c53f8..676903e 100644
--- a/addrcheck/Makefile.am
+++ b/addrcheck/Makefile.am
@@ -10,7 +10,7 @@
vgtool_addrcheck_so_LDADD = \
../memcheck/mac_leakcheck.o \
../memcheck/mac_malloc_wrappers.o \
- ../memcheck/mac_needs.o
+ ../memcheck/mac_shared.o
vgpreload_addrcheck_so_SOURCES =
vgpreload_addrcheck_so_LDADD = \
diff --git a/addrcheck/ac_main.c b/addrcheck/ac_main.c
index 5d2f67f..db05274 100644
--- a/addrcheck/ac_main.c
+++ b/addrcheck/ac_main.c
@@ -42,6 +42,7 @@
#include "mac_shared.h"
#include "memcheck.h"
+#if 0
/*------------------------------------------------------------*/
/*--- Comparing and printing errors ---*/
@@ -1306,19 +1307,29 @@
{
MAC_(print_common_debug_usage)();
}
-
+#endif
/*------------------------------------------------------------*/
/*--- Setup and finalisation ---*/
/*------------------------------------------------------------*/
+// dummy instrument() function
+static IRBB* ac_instrument(IRBB* bb_in, VexGuestLayout* layout,
+ IRType gWordTy, IRType hWordTy )
+{
+ tl_assert(0);
+}
+
static void ac_post_clo_init ( void )
{
}
static void ac_fini ( Int exitcode )
{
+ tl_assert(0); // turn leak checking back on
+#if 0
MAC_(common_fini)( ac_detect_memory_leaks );
+#endif
}
static void ac_pre_clo_init(void)
@@ -1335,6 +1346,18 @@
ac_instrument,
ac_fini);
+
+ VG_(printf)(
+"\n"
+"Addrcheck is currently not working, because:\n"
+" (a) it is not yet ready to handle the Vex IR and the use with 64-bit\n"
+" platforms introduced in Valgrind 3.0.0\n"
+"\n"
+"Sorry for the inconvenience. Let us know if this is a problem for you.\n");
+ VG_(exit)(1);
+
+
+#if 0
VG_(needs_core_errors) ();
VG_(needs_tool_errors) (MAC_(eq_Error),
ac_pp_Error,
@@ -1408,11 +1431,12 @@
init_shadow_memory();
MAC_(common_pre_clo_init)();
+#endif
}
VG_DETERMINE_INTERFACE_VERSION(ac_pre_clo_init, 1./8)
/*--------------------------------------------------------------------*/
-/*--- end ac_main.c ---*/
+/*--- end ---*/
/*--------------------------------------------------------------------*/
diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index 889d1d8..0b35dbe 100644
--- a/helgrind/hg_main.c
+++ b/helgrind/hg_main.c
@@ -2287,8 +2287,7 @@
static IRBB* hg_instrument ( IRBB* bb_in, VexGuestLayout* layout,
IRType gWordTy, IRType hWordTy )
{
- VG_(message)(Vg_DebugMsg, "Helgrind is not yet ready to handle Vex IR");
- VG_(exit)(1);
+ tl_assert(0); // Need to convert to Vex
}
/*--------------------------------------------------------------------*/
@@ -3374,6 +3373,17 @@
hg_instrument,
hg_fini);
+ VG_(printf)(
+"\n"
+"Helgrind is currently not working, because:\n"
+" (a) it is not yet ready to handle the Vex IR and the use with 64-bit\n"
+" platforms introduced in Valgrind 3.0.0\n"
+" (b) we need to get thread operation tracking working again after\n"
+" the changes added in Valgrind 2.4.0\n"
+"\n"
+"Sorry for the inconvenience. Let us know if this is a problem for you.\n");
+ VG_(exit)(1);
+
VG_(needs_core_errors) ();
VG_(needs_tool_errors) (hg_eq_Error,
hg_pp_Error,