Merge r6138:

Convert some VG_ names (global visibility) into ML_s (module scope).

and also handle Z-encoded 'ZL' == (   and 'ZR' == )
for intercept/wrapper fn names

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

diff --git a/coregrind/m_demangle/cp-demangle.c b/coregrind/m_demangle/cp-demangle.c
index 213d7e069b2faad8d5b17caa90039b0202581281..f9ed189ba8a2930e4dfdf71fc5f248e70e0baa38 100644 (file)
--- a/coregrind/m_demangle/cp-demangle.c
+++ b/coregrind/m_demangle/cp-demangle.c
@@ -3749,7 +3749,7 @@ __cxa_demangle (mangled_name, output_buffer, length, status)
    If the demangling failes, returns NULL.  */
 
 char *
-VG_(cplus_demangle_v3) (mangled)
+ML_(cplus_demangle_v3) (mangled)
      const char* mangled;
 {
   dyn_string_t demangled;
@@ -3797,7 +3797,7 @@ VG_(cplus_demangle_v3) (mangled)
    of JArray<TYPE> with TYPE[].  */
 
 char *
-VG_(java_demangle_v3) (mangled)
+ML_(java_demangle_v3) (mangled)
      const char* mangled;
 {
   dyn_string_t demangled;

diff --git a/coregrind/m_demangle/cplus-dem.c b/coregrind/m_demangle/cplus-dem.c
index f8af1de68e25464dc14ad8d57e92382c5e2451a1..2644cd78f869725bd647cfa706fa66b4b2e2a275 100644 (file)
--- a/coregrind/m_demangle/cplus-dem.c
+++ b/coregrind/m_demangle/cplus-dem.c
@@ -940,7 +940,7 @@ cplus_demangle_name_to_style (name)
    MANGLED.  */
 
 char *
-VG_(cplus_demangle) (mangled, options)
+ML_(cplus_demangle) (mangled, options)
      const char *mangled;
      int options;
 {
@@ -958,14 +958,14 @@ VG_(cplus_demangle) (mangled, options)
   /* The V3 ABI demangling is implemented elsewhere.  */
   if (GNU_V3_DEMANGLING || AUTO_DEMANGLING)
     {
-      ret = VG_(cplus_demangle_v3) (mangled/*, work->options*/);
+      ret = ML_(cplus_demangle_v3) (mangled/*, work->options*/);
       if (ret || GNU_V3_DEMANGLING)
        return ret;
     }
 
   if (JAVA_DEMANGLING)
     {
-      ret = VG_(java_demangle_v3) (mangled);
+      ret = ML_(java_demangle_v3) (mangled);
       if (ret)
         return ret;
     }
@@ -2026,7 +2026,7 @@ demangle_template_value_parm (work, mangled, s, tk)
                 mangled here does not make use of any of the squangling
                 or type-code information we have built up thus far; it is
                 mangled independently.  */
-             q = VG_(cplus_demangle) (p, work->options);
+             q = ML_(cplus_demangle) (p, work->options);
              if (tk == tk_pointer)
                string_appendn (s, "&", 1);
              /* FIXME: Pointer-to-member constants should get a
@@ -3135,7 +3135,7 @@ recursively_demangle(work, mangled, result, namelength)
   memcpy (recurse, *mangled, namelength);
   recurse[namelength] = '\000';
 
-  recurse_dem = VG_(cplus_demangle) (recurse, work->options);
+  recurse_dem = ML_(cplus_demangle) (recurse, work->options);
 
   if (recurse_dem)
     {
@@ -4134,7 +4134,7 @@ do_hpacc_template_literal (work, mangled, result)
   memcpy (recurse, *mangled, literal_len);
   recurse[literal_len] = '\000';
 
-  recurse_dem = VG_(cplus_demangle) (recurse, work->options);
+  recurse_dem = ML_(cplus_demangle) (recurse, work->options);
 
   if (recurse_dem)
     {

diff --git a/coregrind/m_demangle/demangle.c b/coregrind/m_demangle/demangle.c
index 90130157a27e672c8aa0d471e795a029a7618af4..1b308f7afcac165c07923ec6394dfc6c59677615 100644 (file)
--- a/coregrind/m_demangle/demangle.c
+++ b/coregrind/m_demangle/demangle.c
@@ -94,7 +94,7 @@ void VG_(demangle) ( Bool do_cxx_demangle,
 
    /* Possibly undo (1) */
    if (do_cxx_demangle)
-      demangled = VG_(cplus_demangle) ( orig, DMGL_ANSI | DMGL_PARAMS );
+      demangled = ML_(cplus_demangle) ( orig, DMGL_ANSI | DMGL_PARAMS );
    else
       demangled = NULL;
 
@@ -116,7 +116,8 @@ void VG_(demangle) ( Bool do_cxx_demangle,
    // for "the frame below main()" screwing up the testsuite, change all
    // known incarnations of said into a single name, "(below main)".
    if (0==VG_(strcmp)("__libc_start_main", result)
-       || 0==VG_(strcmp)("generic_start_main", result))
+       || 0==VG_(strcmp)("generic_start_main", result)
+       || 0==VG_(strcmp)("__start", result)) /* on AIX */
       VG_(strncpy_safely)(result, "(below main)", 13);
 
 #  undef N_ZBUF
@@ -219,6 +220,8 @@ Bool VG_(maybe_Z_demangle) ( const HChar* sym,
          case 's': EMITSO(' '); break;
          case 'Z': EMITSO('Z'); break;
          case 'A': EMITSO('@'); break;
+         case 'L': EMITSO('('); break;
+         case 'R': EMITSO(')'); break;
          default: error = True; goto out;
       }
       i++;
@@ -265,6 +268,8 @@ Bool VG_(maybe_Z_demangle) ( const HChar* sym,
          case 's': EMITFN(' '); break;
          case 'Z': EMITFN('Z'); break;
          case 'A': EMITFN('@'); break;
+         case 'L': EMITSO('('); break;
+         case 'R': EMITSO(')'); break;
          default: error = True; goto out;
       }
       i++;

diff --git a/coregrind/m_demangle/demangle.h b/coregrind/m_demangle/demangle.h
index 399b3ed2ed021488c61eab2427780f471f1c5123..833706c4dff8f59fcd5755491c4bf9252eb966bd 100644 (file)
--- a/coregrind/m_demangle/demangle.h
+++ b/coregrind/m_demangle/demangle.h
@@ -23,7 +23,7 @@
 
 #include "ansidecl.h"
 
-#define current_demangling_style VG_(current_demangling_style)
+#define current_demangling_style ML_(current_demangling_style)
 
 /* Options passed to cplus_demangle (in 2nd parameter). */
 
@@ -106,7 +106,7 @@ extern const struct demangler_engine
 } libiberty_demanglers[];
 
 extern char *
-VG_(cplus_demangle) PARAMS ((const char *mangled, int options));
+ML_(cplus_demangle) PARAMS ((const char *mangled, int options));
 
 /*
 extern int
@@ -137,10 +137,10 @@ cplus_demangle_name_to_style PARAMS ((const char *name));
 
 /* V3 ABI demangling entry points, defined in cp-demangle.c.  */
 extern char*
-VG_(cplus_demangle_v3) PARAMS ((const char* mangled));
+ML_(cplus_demangle_v3) PARAMS ((const char* mangled));
 
 extern char*
-VG_(java_demangle_v3) PARAMS ((const char* mangled));
+ML_(java_demangle_v3) PARAMS ((const char* mangled));
 
 
 enum gnu_v3_ctor_kinds {