Menu
▾
▴
[Valgrind-developers] valgrind: r6274 - trunk/coregrind/m_demangle
|
From: <sv...@va...> - 2006-10-17 01:44:39
|
Author: sewardj
Date: 2006-10-17 02:44:36 +0100 (Tue, 17 Oct 2006)
New Revision: 6274
Log:
Merge r6138:
Convert some VG_ names (global visibility) into ML_s (module scope).
and also handle Z-encoded 'ZL' =3D=3D ( and 'ZR' =3D=3D )
for intercept/wrapper fn names
Modified:
trunk/coregrind/m_demangle/cp-demangle.c
trunk/coregrind/m_demangle/cplus-dem.c
trunk/coregrind/m_demangle/demangle.c
trunk/coregrind/m_demangle/demangle.h
Modified: trunk/coregrind/m_demangle/cp-demangle.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_demangle/cp-demangle.c 2006-10-17 01:42:40 UTC (rev=
6273)
+++ trunk/coregrind/m_demangle/cp-demangle.c 2006-10-17 01:44:36 UTC (rev=
6274)
@@ -3749,7 +3749,7 @@
If the demangling failes, returns NULL. */
=20
char *
-VG_(cplus_demangle_v3) (mangled)
+ML_(cplus_demangle_v3) (mangled)
const char* mangled;
{
dyn_string_t demangled;
@@ -3797,7 +3797,7 @@
of JArray<TYPE> with TYPE[]. */
=20
char *
-VG_(java_demangle_v3) (mangled)
+ML_(java_demangle_v3) (mangled)
const char* mangled;
{
dyn_string_t demangled;
Modified: trunk/coregrind/m_demangle/cplus-dem.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_demangle/cplus-dem.c 2006-10-17 01:42:40 UTC (rev 6=
273)
+++ trunk/coregrind/m_demangle/cplus-dem.c 2006-10-17 01:44:36 UTC (rev 6=
274)
@@ -940,7 +940,7 @@
MANGLED. */
=20
char *
-VG_(cplus_demangle) (mangled, options)
+ML_(cplus_demangle) (mangled, options)
const char *mangled;
int options;
{
@@ -958,14 +958,14 @@
/* The V3 ABI demangling is implemented elsewhere. */
if (GNU_V3_DEMANGLING || AUTO_DEMANGLING)
{
- ret =3D VG_(cplus_demangle_v3) (mangled/*, work->options*/);
+ ret =3D ML_(cplus_demangle_v3) (mangled/*, work->options*/);
if (ret || GNU_V3_DEMANGLING)
return ret;
}
=20
if (JAVA_DEMANGLING)
{
- ret =3D VG_(java_demangle_v3) (mangled);
+ ret =3D ML_(java_demangle_v3) (mangled);
if (ret)
return ret;
}
@@ -2026,7 +2026,7 @@
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 =3D VG_(cplus_demangle) (p, work->options);
+ q =3D ML_(cplus_demangle) (p, work->options);
if (tk =3D=3D tk_pointer)
string_appendn (s, "&", 1);
/* FIXME: Pointer-to-member constants should get a
@@ -3135,7 +3135,7 @@
memcpy (recurse, *mangled, namelength);
recurse[namelength] =3D '\000';
=20
- recurse_dem =3D VG_(cplus_demangle) (recurse, work->options);
+ recurse_dem =3D ML_(cplus_demangle) (recurse, work->options);
=20
if (recurse_dem)
{
@@ -4134,7 +4134,7 @@
memcpy (recurse, *mangled, literal_len);
recurse[literal_len] =3D '\000';
=20
- recurse_dem =3D VG_(cplus_demangle) (recurse, work->options);
+ recurse_dem =3D ML_(cplus_demangle) (recurse, work->options);
=20
if (recurse_dem)
{
Modified: trunk/coregrind/m_demangle/demangle.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_demangle/demangle.c 2006-10-17 01:42:40 UTC (rev 62=
73)
+++ trunk/coregrind/m_demangle/demangle.c 2006-10-17 01:44:36 UTC (rev 62=
74)
@@ -94,7 +94,7 @@
=20
/* Possibly undo (1) */
if (do_cxx_demangle)
- demangled =3D VG_(cplus_demangle) ( orig, DMGL_ANSI | DMGL_PARAMS =
);
+ demangled =3D ML_(cplus_demangle) ( orig, DMGL_ANSI | DMGL_PARAMS =
);
else
demangled =3D NULL;
=20
@@ -116,7 +116,8 @@
// for "the frame below main()" screwing up the testsuite, change all
// known incarnations of said into a single name, "(below main)".
if (0=3D=3DVG_(strcmp)("__libc_start_main", result)
- || 0=3D=3DVG_(strcmp)("generic_start_main", result))
+ || 0=3D=3DVG_(strcmp)("generic_start_main", result)
+ || 0=3D=3DVG_(strcmp)("__start", result)) /* on AIX */
VG_(strncpy_safely)(result, "(below main)", 13);
=20
# undef N_ZBUF
@@ -219,6 +220,8 @@
case 's': EMITSO(' '); break;
case 'Z': EMITSO('Z'); break;
case 'A': EMITSO('@'); break;
+ case 'L': EMITSO('('); break;
+ case 'R': EMITSO(')'); break;
default: error =3D True; goto out;
}
i++;
@@ -265,6 +268,8 @@
case 's': EMITFN(' '); break;
case 'Z': EMITFN('Z'); break;
case 'A': EMITFN('@'); break;
+ case 'L': EMITSO('('); break;
+ case 'R': EMITSO(')'); break;
default: error =3D True; goto out;
}
i++;
Modified: trunk/coregrind/m_demangle/demangle.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_demangle/demangle.h 2006-10-17 01:42:40 UTC (rev 62=
73)
+++ trunk/coregrind/m_demangle/demangle.h 2006-10-17 01:44:36 UTC (rev 62=
74)
@@ -23,7 +23,7 @@
=20
#include "ansidecl.h"
=20
-#define current_demangling_style VG_(current_demangling_style)
+#define current_demangling_style ML_(current_demangling_style)
=20
/* Options passed to cplus_demangle (in 2nd parameter). */
=20
@@ -106,7 +106,7 @@
} libiberty_demanglers[];
=20
extern char *
-VG_(cplus_demangle) PARAMS ((const char *mangled, int options));
+ML_(cplus_demangle) PARAMS ((const char *mangled, int options));
=20
/*
extern int
@@ -137,10 +137,10 @@
=20
/* 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));
=20
extern char*
-VG_(java_demangle_v3) PARAMS ((const char* mangled));
+ML_(java_demangle_v3) PARAMS ((const char* mangled));
=20
=20
enum gnu_v3_ctor_kinds {
|
