Print suggested fix to avoid this panic:

VG_ASSUMED_EXE_BASE doesn't match reality

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

diff --git a/coregrind/vg_memory.c b/coregrind/vg_memory.c
index 13ae157951cfbf65d7cf65d4af884359b6c62126..eea86acd617b8507a3ab52068bb4766492abae8b 100644 (file)
--- a/coregrind/vg_memory.c
+++ b/coregrind/vg_memory.c
@@ -1514,6 +1514,14 @@ void init_memory_audit_callback (
                       "FATAL: executable base addr not as assumed.");
          VG_(message)(Vg_UserMsg, "name %s, actual %p, assumed %p.",
                       filename, start, VG_ASSUMED_EXE_BASE);
+         VG_(message)(Vg_UserMsg,
+            "One reason this could happen is that you have a shared object");
+         VG_(message)(Vg_UserMsg,
+            " whose name doesn't contain the characters \".so\", so Valgrind ");
+         VG_(message)(Vg_UserMsg,
+            "naively assumes it is the executable.  ");
+         VG_(message)(Vg_UserMsg,
+            "In that case, rename it appropriately.");
          VG_(panic)("VG_ASSUMED_EXE_BASE doesn't match reality");
       }
    }

diff --git a/vg_memory.c b/vg_memory.c
index 13ae157951cfbf65d7cf65d4af884359b6c62126..eea86acd617b8507a3ab52068bb4766492abae8b 100644 (file)
--- a/vg_memory.c
+++ b/vg_memory.c
@@ -1514,6 +1514,14 @@ void init_memory_audit_callback (
                       "FATAL: executable base addr not as assumed.");
          VG_(message)(Vg_UserMsg, "name %s, actual %p, assumed %p.",
                       filename, start, VG_ASSUMED_EXE_BASE);
+         VG_(message)(Vg_UserMsg,
+            "One reason this could happen is that you have a shared object");
+         VG_(message)(Vg_UserMsg,
+            " whose name doesn't contain the characters \".so\", so Valgrind ");
+         VG_(message)(Vg_UserMsg,
+            "naively assumes it is the executable.  ");
+         VG_(message)(Vg_UserMsg,
+            "In that case, rename it appropriately.");
          VG_(panic)("VG_ASSUMED_EXE_BASE doesn't match reality");
       }
    }