1992-07-14 04:13:12 +02:00
|
|
|
/* Basic C++ demangling support for GDB.
|
* demangle.c (is_cplus_marker): New function, checks if a
character is one of the commonly used C++ marker characters.
* defs.h (is_cplus_marker): Add prototype.
* c-typeprint.c (c_type_print_base), ch-lang.c (chill_demangle),
cp-valprint.c (cp_print_class_method), mdebugread.c (parse_symbol),
stabsread.c (define_symbol, read_member_functions, read_struct_fields),
symtab.h (OPNAME_PREFIX_P, VTBL_PREFIX_P, DESTRUCTOR_PREFIX_P),
values.c (vb_match): Use is_cplus_marker instead of comparison
with CPLUS_MARKER.
1996-02-16 07:14:15 +01:00
|
|
|
Copyright 1991, 1992, 1996 Free Software Foundation, Inc.
|
1992-07-14 04:13:12 +02:00
|
|
|
Written by Fred Fish at Cygnus Support.
|
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
1995-08-02 05:41:12 +02:00
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
1992-07-14 04:13:12 +02:00
|
|
|
|
|
|
|
|
|
|
|
/* This file contains support code for C++ demangling that is common
|
|
|
|
to a styles of demangling, and GDB specific. */
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "command.h"
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
#include "demangle.h"
|
* configure.in: Check for working mmap, ansi headers, string.h,
strings.h, and memory.h.
* configure: Regenerated.
* gdb_stat.h: New file, "portable" <sys/stat.h>.
* gdb_string.h: New file, "portable" <string.h>.
* altos-xdep.c, arm-tdep.c, arm-xdep.c, convex-tdep.c,
convex-xdep.c, coredep.c, cxux-nat.c, dbxread.c, exec.c,
gould-xdep.c, hppa-tdep.c, i386aix-nat.c, i386b-nat.c,
i386mach-nat.c, i386v-nat.c, infptrace.c, m88k-nat.c, main.c,
mdebugread.c, objfiles.c, os9kread.c, procfs.c, pyr-xdep.c,
rs6000-nat.c, source.c, standalone.c, stuff.c, sun386-nat.c,
symfile.c, symm-nat.c, symm-tdep.c, symtab.c, top.c, ultra3-nat.c,
ultra3-xdep.c, umax-xdep.c, xcoffread.c: Include "gdb_stat.h"
instead of <sys/stat.h>.
* alpha-tdep.c, breakpoint.c, buildsym.c, c-typeprint.c,
ch-typeprint.c, coffread.c, command.c, core-sol2.c, core-svr4.c,
core.c, corelow.c, cp-valprint.c, dbxread.c, dcache.c, demangle.c,
dpx2-nat.c, dstread.c, dwarfread.c, elfread.c, environ.c, eval.c,
exec.c, f-lang.c, f-typeprint.c, f-valprint.c, findvar.c,
fork-child.c, gdbtypes.c, hpread.c, i386-tdep.c, infcmd.c,
inflow.c, infptrace.c, infrun.c, irix5-nat.c, language.c,
m2-typeprint.c, main.c, mdebugread.c, minsyms.c, mipsread.c,
monitor.c, nlmread.c, objfiles.c, os9kread.c, osfsolib.c, parse.c,
printcmd.c, procfs.c, regex.c, remote-adapt.c, remote-arc.c,
remote-array.c, remote-bug.c, remote-e7000.c, remote-eb.c,
remote-es.c, remote-hms.c, remote-mm.c, remote-os9k.c,
remote-pa.c, remote-sim.c, remote-st.c, remote-udi.c,
remote-utils.c, remote-vx.c, remote-vx29k.c, remote-vx68.c,
remote-vx960.c, remote-vxmips.c, remote-vxsparc.c, remote.c,
solib.c, somread.c, source.c, stabsread.c, stack.c, symfile.c,
symmisc.c, symtab.c, target.c, top.c, typeprint.c, utils.c,
valarith.c, valops.c, valprint.c, values.c, xcoffread.c: Include
"gdb_string.h" instead of <string.h>.
* gdbtk.c: Likewise.
* config/xm-sysv4.h, i386/xm-ptx.h, m68k/xm-sun3os4.h,
sparc/xm-sun4os4.h (HAVE_MMAP): Removed.
* config/xm-lynx.h, config/i386/xm-ptx.h,
config/m68k/nm-apollo68b.h, config/m68k/xm-hp300hpux.h,
config/mips/xm-irix3.h, config/mips/xm-mips.h,
config/mips/xm-news-mips.h, config/mips/xm-riscos.h,
config/pa/hppah.h, config/rs6000/xm-rs6000.h,
config/sparc/xm-sun4os4.h, config/sparc/xm-sun4sol2.h,
config/vax/xm-vaxbsd.h, config/vax/xm-vaxult.h,
config/vax/xm-vaxult2.h (MEM_FNS_DECLARED): Removed.
* config/mips/xm-irix3.h, config/mips/xm-mips.h,
config/pa/xm-hppah.h (memcpy, memset): Removed declarations.
1995-08-01 22:14:27 +02:00
|
|
|
#include "gdb_string.h"
|
1992-07-14 04:13:12 +02:00
|
|
|
|
1992-07-15 21:33:21 +02:00
|
|
|
/* Select the default C++ demangling style to use. The default is "auto",
|
|
|
|
which allows gdb to attempt to pick an appropriate demangling style for
|
|
|
|
the executable it has loaded. It can be set to a specific style ("gnu",
|
1993-03-03 03:09:02 +01:00
|
|
|
"lucid", "arm", etc.) in which case gdb will never attempt to do auto
|
1992-07-15 21:33:21 +02:00
|
|
|
selection of the style unless you do an explicit "set demangle auto".
|
|
|
|
To select one of these as the default, set DEFAULT_DEMANGLING_STYLE in
|
|
|
|
the appropriate target configuration file. */
|
|
|
|
|
|
|
|
#ifndef DEFAULT_DEMANGLING_STYLE
|
|
|
|
# define DEFAULT_DEMANGLING_STYLE AUTO_DEMANGLING_STYLE_STRING
|
1992-07-14 04:13:12 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* String name for the current demangling style. Set by the "set demangling"
|
|
|
|
command, printed as part of the output by the "show demangling" command. */
|
|
|
|
|
|
|
|
static char *current_demangling_style_string;
|
|
|
|
|
|
|
|
/* List of supported demangling styles. Contains the name of the style as
|
|
|
|
seen by the user, and the enum value that corresponds to that style. */
|
|
|
|
|
|
|
|
static const struct demangler
|
|
|
|
{
|
|
|
|
char *demangling_style_name;
|
|
|
|
enum demangling_styles demangling_style;
|
|
|
|
char *demangling_style_doc;
|
|
|
|
} demanglers [] =
|
|
|
|
{
|
|
|
|
{AUTO_DEMANGLING_STYLE_STRING,
|
|
|
|
auto_demangling,
|
|
|
|
"Automatic selection based on executable"},
|
|
|
|
{GNU_DEMANGLING_STYLE_STRING,
|
|
|
|
gnu_demangling,
|
|
|
|
"GNU (g++) style demangling"},
|
|
|
|
{LUCID_DEMANGLING_STYLE_STRING,
|
|
|
|
lucid_demangling,
|
|
|
|
"Lucid (lcc) style demangling"},
|
1993-03-03 03:09:02 +01:00
|
|
|
{ARM_DEMANGLING_STYLE_STRING,
|
|
|
|
arm_demangling,
|
|
|
|
"ARM style demangling"},
|
1992-09-03 18:26:03 +02:00
|
|
|
{NULL, unknown_demangling, NULL}
|
1992-07-14 04:13:12 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/* set current demangling style. called by the "set demangling" command
|
|
|
|
after it has updated the current_demangling_style_string to match
|
|
|
|
what the user has entered.
|
|
|
|
|
|
|
|
if the user has entered a string that matches a known demangling style
|
|
|
|
name in the demanglers[] array then just leave the string alone and update
|
|
|
|
the current_demangling_style enum value to match.
|
|
|
|
|
|
|
|
if the user has entered a string that doesn't match, including an empty
|
|
|
|
string, then print a list of the currently known styles and restore
|
|
|
|
the current_demangling_style_string to match the current_demangling_style
|
|
|
|
enum value.
|
|
|
|
|
|
|
|
Note: Assumes that current_demangling_style_string always points to
|
|
|
|
a malloc'd string, even if it is a null-string. */
|
|
|
|
|
|
|
|
static void
|
1994-02-02 21:20:59 +01:00
|
|
|
set_demangling_command (ignore, from_tty, c)
|
|
|
|
char *ignore;
|
|
|
|
int from_tty;
|
|
|
|
struct cmd_list_element *c;
|
1992-07-14 04:13:12 +02:00
|
|
|
{
|
|
|
|
const struct demangler *dem;
|
|
|
|
|
|
|
|
/* First just try to match whatever style name the user supplied with
|
|
|
|
one of the known ones. Don't bother special casing for an empty
|
|
|
|
name, we just treat it as any other style name that doesn't match.
|
|
|
|
If we match, update the current demangling style enum. */
|
|
|
|
|
|
|
|
for (dem = demanglers; dem -> demangling_style_name != NULL; dem++)
|
|
|
|
{
|
* defs.h (STRCMP, STREQ, STREQN): New macros.
* defs.h (demangle_and_match): Remove prototype.
* dwarfread.c (STREQ, STREQN): Remove macros, replaced with STREQ
and STREQN defined in defs.h.
* dwarfread.c (set_cu_language): For completely unknown languages,
try to deduce the language from the filename. Retain behavior
that for known languages we don't know how to handle, we use
language_unknown.
* dwarfread.c (enum_type, symthesize_typedef): Initialize language
and demangled name fields in symbol.
* dwarfread.c, mipsread.c, partial-stab.h: For all usages of
ADD_PSYMBOL_TO_LIST, add language and objfile parameters.
* dwarfread.c (new_symbol): Attempt to demangle C++ symbol names
and cache the results in SYMBOL_DEMANGLED_NAME for the symbol.
* elfread.c (STREQ): Remove macro, use STREQ defined in defs.h.
Replace usages throughout.
* elfread.c (demangle.h): Include.
* elfread.c (record_minimal_symbol): Remove prototype and function.
* gdbtypes.h, symtab.h (B_SET, B_CLR, B_TST, B_TYPE, B_BYTES,
B_CLRALL): Moved from symtab.h to gdbtypes.h.
* infcmd.c (jump_command): Remove code to demangle name and add
it to a cleanup list. Now just use SYMBOL_DEMANGLED_NAME.
* minsyms.c (demangle.h): Include.
* minsyms.c (lookup_minimal_symbol): Indent comment to match code.
* minsyms.c (install_minimal_symbols): Attempt to demangle symbol
names as C++ names, and cache them in SYMBOL_DEMANGLED_NAME.
* mipsread.c (psymtab_language): Add static variable.
* stabsread.c (demangle.h): Include.
* stabsread.c (define_symbol): Attempt to demangle C++ symbol
names and cache them in the SYMBOL_DEMANGLED_NAME field.
* stack.c (return_command): Remove explicit demangling of name
and use of cleanups. Just use SYMBOL_DEMANGLED_NAME.
* symfile.c (demangle.h): Include.
* symfile.c (add_psymbol_to_list, add_psymbol_addr_to_list): Fix
to match macros in symfile.h and allow them to be compiled
if INLINE_ADD_PSYMBOL is not true.
* symfile.h (INLINE_ADD_PSYMBOL): Default to true if not set.
* symfile.h (ADD_PSYMBOL_*): Add language and objfile parameters.
Add code to demangle and cache C++ symbol names. Use macro form
if INLINE_ADD_PSYMBOL is true, otherwise use C function form.
* symmisc.c (add_psymbol_to_list, add_psymbol_addr_to_list):
Remove, also defined in symfile.c, which we already fixed.
* symtab.c (expensive_mangler): Remove prototype and function.
* symtab.c (find_methods): Remove physnames parameter and fix
prototype to match.
* symtab.c (completion_list_add_symbol): Name changed to
completion_list_add_name.
* symtab.c (COMPLETION_LIST_ADD_SYMBOL): New macro, adds both
the normal symbol name and the cached C++ demangled name.
* symtab.c (lookup_demangled_partial_symbol,
lookup_demangled_block_symbol): Remove prototypes and functions.
* symtab.c (lookup_symbol): Remove use of expensive_mangler,
use lookup_block_symbol instead of lookup_demangled_block_symbol.
Remove code to try demangling names and matching them.
* symtab.c (lookup_partial_symbol, lookup_block_symbol):
Fix to try matching the cached demangled name if no match is
found using the regular symbol name.
* symtab.c (find_methods): Remove unused physnames array.
* symtab.c (name_match, NAME_MATCH): Remove function and macro,
replaced with SYMBOL_MATCHES_REGEXP from symtab.h.
* symtab.c (completion_list_add_symbol): Rewrite to use cached
C++ demangled symbol names.
* symtab.h: Much reformatting of structures and such to add
whitespace to make them more readable, and make them more
consistent with other gdb structure definitions.
* symtab.h (general_symbol_info): New struct containing fields
common to all symbols.
* symtab.h (SYMBOL_LANGUAGE, SYMBOL_DEMANGLED_NAME,
SYMBOL_SOURCE_NAME, SYMBOL_LINKAGE_NAME, SYMBOL_MATCHES_NAME,
SYMBOL_MATCHES_REGEXP, MSYMBOL_INFO, MSYMBOL_TYPE): New macros.
* symtab. (struct minimal_symbol, struct partial_symbol, struct
symbol): Use general_symbol_info struct.
* utils.c (demangle_and_match): Remove, no longer used.
* valops.c (demangle.h): Include.
* xcoffexec.c (eq): Remove macro, replace usages with STREQ.
* blockframe.c, breakpoint.c, c-exp.y, c-valprint.c, dbxread.c,
infcmd.c, m2-exp.y, minsyms.c, objfiles.h, solib.c, stack.c,
symmisc.c, symtab.c, valops.c: Replace references to minimal
symbol fields with appropriate macros.
* breakpoint.c, buildsym.c, c-exp.y, c-typeprint.c, c-valprint.c,
coffread.c, command.c, convex-tdep.c, cp-valprint.c, dbxread.c,
demangle.c, elfread.c, energize.c, environ.c, exec.c,
gdbtypes.c, i960-tdep.c, infrun.c, infrun-hacked.c, language.c,
main.c, minsyms.c, mipsread.c, partial-stab.h, remote-es1800.c,
remote-nindy.c, remote-udi.c, rs6000-tdep.c, solib.c, source.c,
sparc-pinsn.c, stabsread.c, standalone.c, state.c, stuff.c,
symfile.c, symmisc.c, symtab.c, symtab.h, tm-sysv4.h,
tm-ultra3.h, values.c, xcoffexec.c, xcoffread.c: Replace strcmp
and strncmp usages with STREQ, STREQN, or STRCMP as appropriate.
* breakpoint.c, buildsym.c, c-typeprint.c, expprint.c, findvar.c,
mipsread.c, printcmd.c, source.c, stabsread.c, stack.c,
symmisc.c, tm-29k.h, valops.c, values.c: Replace SYMBOL_NAME
references with SYMBOL_SOURCE_NAME or SYMBOL_LINKAGE_NAME as
appropriate.
* buildsym.c (start_subfile, patch_subfile_names): Default the
source language to what can be deduced from the filename.
* buildsym.c (end_symtab): Update the source language in the
allocated symtab to match what we have been using.
* buildsym.h (struct subfile): Add a language field.
* c-typeprint.c (c_print_type): Remove code to do explicit
demangling.
* dbxread.c (psymtab_language): Add static variable.
* dbxread.c (start_psymtab): Initialize psymtab_language using
deduce_language_from_filename.
1992-12-23 07:34:57 +01:00
|
|
|
if (STREQ (current_demangling_style_string,
|
|
|
|
dem -> demangling_style_name))
|
1992-07-14 04:13:12 +02:00
|
|
|
{
|
|
|
|
current_demangling_style = dem -> demangling_style;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check to see if we found a match. If not, gripe about any non-empty
|
|
|
|
style name and supply a list of valid ones. FIXME: This should
|
|
|
|
probably be done with some sort of completion and with help. */
|
|
|
|
|
|
|
|
if (dem -> demangling_style_name == NULL)
|
|
|
|
{
|
|
|
|
if (*current_demangling_style_string != '\0')
|
|
|
|
{
|
1993-11-01 23:25:23 +01:00
|
|
|
printf_unfiltered ("Unknown demangling style `%s'.\n",
|
1992-07-14 04:13:12 +02:00
|
|
|
current_demangling_style_string);
|
|
|
|
}
|
1993-11-01 23:25:23 +01:00
|
|
|
printf_unfiltered ("The currently understood settings are:\n\n");
|
1992-07-14 04:13:12 +02:00
|
|
|
for (dem = demanglers; dem -> demangling_style_name != NULL; dem++)
|
|
|
|
{
|
1993-11-01 23:25:23 +01:00
|
|
|
printf_unfiltered ("%-10s %s\n", dem -> demangling_style_name,
|
1992-07-14 04:13:12 +02:00
|
|
|
dem -> demangling_style_doc);
|
|
|
|
if (dem -> demangling_style == current_demangling_style)
|
|
|
|
{
|
|
|
|
free (current_demangling_style_string);
|
|
|
|
current_demangling_style_string =
|
1994-03-26 05:26:26 +01:00
|
|
|
savestring (dem -> demangling_style_name,
|
|
|
|
strlen (dem -> demangling_style_name));
|
1992-07-14 04:13:12 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (current_demangling_style == unknown_demangling)
|
|
|
|
{
|
|
|
|
/* This can happen during initialization if gdb is compiled with
|
|
|
|
a DEMANGLING_STYLE value that is unknown, so pick the first
|
|
|
|
one as the default. */
|
|
|
|
current_demangling_style = demanglers[0].demangling_style;
|
|
|
|
current_demangling_style_string =
|
1994-03-26 05:26:26 +01:00
|
|
|
savestring (demanglers[0].demangling_style_name,
|
|
|
|
strlen (demanglers[0].demangling_style_name));
|
1992-07-14 04:13:12 +02:00
|
|
|
warning ("`%s' style demangling chosen as the default.\n",
|
|
|
|
current_demangling_style_string);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fake a "set demangling" command. */
|
|
|
|
|
|
|
|
void
|
|
|
|
set_demangling_style (style)
|
|
|
|
char *style;
|
|
|
|
{
|
|
|
|
if (current_demangling_style_string != NULL)
|
|
|
|
{
|
|
|
|
free (current_demangling_style_string);
|
|
|
|
}
|
1994-03-26 05:26:26 +01:00
|
|
|
current_demangling_style_string = savestring (style, strlen (style));
|
1992-07-14 04:13:12 +02:00
|
|
|
set_demangling_command ((char *) NULL, 0);
|
|
|
|
}
|
|
|
|
|
* demangle.c (is_cplus_marker): New function, checks if a
character is one of the commonly used C++ marker characters.
* defs.h (is_cplus_marker): Add prototype.
* c-typeprint.c (c_type_print_base), ch-lang.c (chill_demangle),
cp-valprint.c (cp_print_class_method), mdebugread.c (parse_symbol),
stabsread.c (define_symbol, read_member_functions, read_struct_fields),
symtab.h (OPNAME_PREFIX_P, VTBL_PREFIX_P, DESTRUCTOR_PREFIX_P),
values.c (vb_match): Use is_cplus_marker instead of comparison
with CPLUS_MARKER.
1996-02-16 07:14:15 +01:00
|
|
|
/* In order to allow a single demangler executable to demangle strings
|
|
|
|
using various common values of CPLUS_MARKER, as well as any specific
|
|
|
|
one set at compile time, we maintain a string containing all the
|
|
|
|
commonly used ones, and check to see if the marker we are looking for
|
|
|
|
is in that string. CPLUS_MARKER is usually '$' on systems where the
|
|
|
|
assembler can deal with that. Where the assembler can't, it's usually
|
|
|
|
'.' (but on many systems '.' is used for other things). We put the
|
|
|
|
current defined CPLUS_MARKER first (which defaults to '$'), followed
|
|
|
|
by the next most common value, followed by an explicit '$' in case
|
|
|
|
the value of CPLUS_MARKER is not '$'.
|
|
|
|
|
|
|
|
We could avoid this if we could just get g++ to tell us what the actual
|
|
|
|
cplus marker character is as part of the debug information, perhaps by
|
|
|
|
ensuring that it is the character that terminates the gcc<n>_compiled
|
|
|
|
marker symbol (FIXME). */
|
|
|
|
|
|
|
|
static char cplus_markers[] = { CPLUS_MARKER, '.', '$', '\0' };
|
|
|
|
|
|
|
|
int
|
|
|
|
is_cplus_marker (c)
|
|
|
|
int c;
|
|
|
|
{
|
|
|
|
return c && strchr (cplus_markers, c) != NULL;
|
|
|
|
}
|
|
|
|
|
1992-07-14 04:13:12 +02:00
|
|
|
void
|
|
|
|
_initialize_demangler ()
|
|
|
|
{
|
|
|
|
struct cmd_list_element *set, *show;
|
|
|
|
|
|
|
|
set = add_set_cmd ("demangle-style", class_support, var_string_noescape,
|
|
|
|
(char *) ¤t_demangling_style_string,
|
1993-07-23 19:25:20 +02:00
|
|
|
"Set the current C++ demangling style.\n\
|
|
|
|
Use `set demangle-style' without arguments for a list of demangling styles.",
|
1992-07-14 04:13:12 +02:00
|
|
|
&setlist);
|
|
|
|
show = add_show_from_set (set, &showlist);
|
1994-02-02 21:20:59 +01:00
|
|
|
set -> function.sfunc = set_demangling_command;
|
1992-07-14 04:13:12 +02:00
|
|
|
|
|
|
|
/* Set the default demangling style chosen at compilation time. */
|
1992-07-15 21:33:21 +02:00
|
|
|
set_demangling_style (DEFAULT_DEMANGLING_STYLE);
|
1992-09-02 00:32:28 +02:00
|
|
|
set_cplus_marker_for_demangling (CPLUS_MARKER);
|
1992-07-14 04:13:12 +02:00
|
|
|
}
|