2e4964adfc
* 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.
190 lines
6.2 KiB
C
190 lines
6.2 KiB
C
/* Basic C++ demangling support for GDB.
|
|
Copyright 1991, 1992 Free Software Foundation, Inc.
|
|
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
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
|
|
|
|
/* 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"
|
|
#include <string.h>
|
|
|
|
/* 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",
|
|
"lucid", "cfront", etc.) in which case gdb will never attempt to do auto
|
|
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
|
|
#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"},
|
|
{CFRONT_DEMANGLING_STYLE_STRING,
|
|
cfront_demangling,
|
|
"ARM (cfront) style demangling"},
|
|
{NULL, unknown_demangling, NULL}
|
|
};
|
|
|
|
/* show current demangling style. */
|
|
|
|
static void
|
|
show_demangling_command (ignore, from_tty)
|
|
char *ignore;
|
|
int from_tty;
|
|
{
|
|
/* done automatically by show command. */
|
|
}
|
|
|
|
|
|
/* 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
|
|
set_demangling_command (ignore, from_tty)
|
|
char *ignore;
|
|
int from_tty;
|
|
{
|
|
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++)
|
|
{
|
|
if (STREQ (current_demangling_style_string,
|
|
dem -> demangling_style_name))
|
|
{
|
|
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')
|
|
{
|
|
printf ("Unknown demangling style `%s'.\n",
|
|
current_demangling_style_string);
|
|
}
|
|
printf ("The currently understood settings are:\n\n");
|
|
for (dem = demanglers; dem -> demangling_style_name != NULL; dem++)
|
|
{
|
|
printf ("%-10s %s\n", dem -> demangling_style_name,
|
|
dem -> demangling_style_doc);
|
|
if (dem -> demangling_style == current_demangling_style)
|
|
{
|
|
free (current_demangling_style_string);
|
|
current_demangling_style_string =
|
|
strdup (dem -> demangling_style_name);
|
|
}
|
|
}
|
|
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 =
|
|
strdup (demanglers[0].demangling_style_name);
|
|
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);
|
|
}
|
|
current_demangling_style_string = strdup (style);
|
|
set_demangling_command ((char *) NULL, 0);
|
|
}
|
|
|
|
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,
|
|
"Set the current C++ demangling style.",
|
|
&setlist);
|
|
show = add_show_from_set (set, &showlist);
|
|
set -> function.cfunc = set_demangling_command;
|
|
show -> function.cfunc = show_demangling_command;
|
|
|
|
/* Set the default demangling style chosen at compilation time. */
|
|
set_demangling_style (DEFAULT_DEMANGLING_STYLE);
|
|
set_cplus_marker_for_demangling (CPLUS_MARKER);
|
|
}
|