X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fdemangle.c;h=fe46f818c6a514d79cd052fc0496fa0d163ffcdd;hb=6aba47ca06d9150c6196a374b745c2711b46e045;hp=1fd69be4c58f5c15327bc1881c7aa2ba758d66c7;hpb=9f60d481c28a949dc41179ecee5320ba1905398f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/demangle.c b/gdb/demangle.c index 1fd69be4c5..fe46f818c6 100644 --- a/gdb/demangle.c +++ b/gdb/demangle.c @@ -1,6 +1,8 @@ /* Basic C++ demangling support for GDB. - Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 - Free Software Foundation, Inc. + + Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, + 2003, 2007 Free Software Foundation, Inc. + Written by Fred Fish at Cygnus Support. This file is part of GDB. @@ -17,8 +19,8 @@ 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* This file contains support code for C++ demangling that is common @@ -54,6 +56,14 @@ static char *current_demangling_style_string; _initialize_demangler from libiberty_demanglers[] array. */ static const char **demangling_style_names; +static void +show_demangling_style_names(struct ui_file *file, int from_tty, + struct cmd_list_element *c, const char *value) +{ + fprintf_filtered (file, _("The current C++ demangling style is \"%s\".\n"), + value); +} + static void set_demangling_command (char *, int, struct cmd_list_element *); @@ -87,8 +97,8 @@ set_demangling_command (char *ignore, int from_tty, struct cmd_list_element *c) dem->demangling_style != unknown_demangling; dem++) { - if (STREQ (current_demangling_style_string, - dem->demangling_style_name)) + if (strcmp (current_demangling_style_string, + dem->demangling_style_name) == 0) { current_demangling_style = dem->demangling_style; break; @@ -103,10 +113,10 @@ set_demangling_command (char *ignore, int from_tty, struct cmd_list_element *c) { if (*current_demangling_style_string != '\0') { - printf_unfiltered ("Unknown demangling style `%s'.\n", + printf_unfiltered (_("Unknown demangling style `%s'.\n"), current_demangling_style_string); } - printf_unfiltered ("The currently understood settings are:\n\n"); + printf_unfiltered (_("The currently understood settings are:\n\n")); for (dem = libiberty_demanglers; dem->demangling_style != unknown_demangling; dem++) @@ -131,7 +141,7 @@ set_demangling_command (char *ignore, int from_tty, struct cmd_list_element *c) savestring ( libiberty_demanglers[0].demangling_style_name, strlen (libiberty_demanglers[0].demangling_style_name)); - warning ("`%s' style demangling chosen as the default.\n", + warning (_("`%s' style demangling chosen as the default."), current_demangling_style_string); } } @@ -150,24 +160,18 @@ set_demangling_style (char *style) set_demangling_command ((char *) NULL, 0, (struct cmd_list_element *) NULL); } -/* 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_compiled - marker symbol (FIXME). */ - -static char cplus_markers[] = -{CPLUS_MARKER, '.', '$', '\0'}; +/* G++ uses a special character to indicate certain internal names. Which + character it is depends on the platform: + - Usually '$' on systems where the assembler will accept that + - Usually '.' otherwise (this includes most sysv4-like systems and most + ELF targets) + - Occasionally '_' if neither of the above is usable + + We check '$' first because it is the safest, and '.' often has another + meaning. We don't currently try to handle '_' because the precise forms + of the names are different on those targets. */ + +static char cplus_markers[] = {'$', '.', '\0'}; int is_cplus_marker (int c) @@ -193,16 +197,20 @@ _initialize_demangler (void) demangling_style_names[i] = xstrdup (libiberty_demanglers[i].demangling_style_name); - set = add_set_enum_cmd ("demangle-style", class_support, - demangling_style_names, - (const char **) ¤t_demangling_style_string, - "Set the current C++ demangling style.\n\ -Use `set demangle-style' without arguments for a list of demangling styles.", - &setlist); - show = add_show_from_set (set, &showlist); - set_cmd_sfunc (set, set_demangling_command); + /* FIXME: cagney/2005-02-20: The code implementing this variable are + malloc-ing and free-ing current_demangling_style_string when it + should instead just point to an element of + demangling_style_names. */ + add_setshow_enum_cmd ("demangle-style", class_support, + demangling_style_names, + (const char **) ¤t_demangling_style_string, _("\ +Set the current C++ demangling style."), _("\ +Show the current C++ demangling style."), _("\ +Use `set demangle-style' without arguments for a list of demangling styles."), + set_demangling_command, + show_demangling_style_names, + &setlist, &showlist); /* Set the default demangling style chosen at compilation time. */ set_demangling_style (DEFAULT_DEMANGLING_STYLE); - set_cplus_marker_for_demangling (CPLUS_MARKER); }