diff options
Diffstat (limited to 'gdb/demangle.c')
| -rw-r--r-- | gdb/demangle.c | 168 |
1 files changed, 95 insertions, 73 deletions
diff --git a/gdb/demangle.c b/gdb/demangle.c index 9c5e521d92..669d9abcd2 100644 --- a/gdb/demangle.c +++ b/gdb/demangle.c @@ -1,26 +1,26 @@ /* Basic C++ demangling support for GDB. - Copyright 1991, 1992, 1996 Free Software Foundation, Inc. + Copyright 1991, 1992, 1996, 1999 Free Software Foundation, Inc. Written by Fred Fish at Cygnus Support. -This file is part of GDB. + 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 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. + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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. */ /* This file contains support code for C++ demangling that is common - to a styles of demangling, and GDB specific. */ + to a styles of demangling, and GDB specific. */ #include "defs.h" #include "command.h" @@ -37,57 +37,79 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ the appropriate target configuration file. */ #ifndef DEFAULT_DEMANGLING_STYLE -# define DEFAULT_DEMANGLING_STYLE AUTO_DEMANGLING_STYLE_STRING +#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. */ +/* String name for the current demangling style. Set by the + "set demangle-style" command, printed as part of the output by the + "show demangle-style" 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[] = { - 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"}, - {ARM_DEMANGLING_STYLE_STRING, - arm_demangling, - "ARM style demangling"}, - {HP_DEMANGLING_STYLE_STRING, - hp_demangling, - "HP (aCC) style demangling"}, - {EDG_DEMANGLING_STYLE_STRING, - edg_demangling, - "EDG style demangling"}, - {NULL, unknown_demangling, NULL} + { + 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" + } + , + { + ARM_DEMANGLING_STYLE_STRING, + arm_demangling, + "ARM style demangling" + } + , + { + HP_DEMANGLING_STYLE_STRING, + hp_demangling, + "HP (aCC) style demangling" + } + , + { + EDG_DEMANGLING_STYLE_STRING, + edg_demangling, + "EDG style demangling" + } + , + { + NULL, unknown_demangling, NULL + } }; static void set_demangling_command PARAMS ((char *, int, struct cmd_list_element *)); -/* 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. +/* Set current demangling style. Called by the "set demangle-style" + 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 + 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 + 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. @@ -104,16 +126,16 @@ set_demangling_command (ignore, from_tty, c) 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. */ + 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++) + for (dem = demanglers; dem->demangling_style_name != NULL; dem++) { if (STREQ (current_demangling_style_string, - dem -> demangling_style_name)) + dem->demangling_style_name)) { - current_demangling_style = dem -> demangling_style; + current_demangling_style = dem->demangling_style; break; } } @@ -122,24 +144,24 @@ set_demangling_command (ignore, from_tty, c) 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 (dem->demangling_style_name == NULL) { if (*current_demangling_style_string != '\0') { printf_unfiltered ("Unknown demangling style `%s'.\n", - current_demangling_style_string); + current_demangling_style_string); } printf_unfiltered ("The currently understood settings are:\n\n"); - for (dem = demanglers; dem -> demangling_style_name != NULL; dem++) + for (dem = demanglers; dem->demangling_style_name != NULL; dem++) { - printf_unfiltered ("%-10s %s\n", dem -> demangling_style_name, - dem -> demangling_style_doc); - if (dem -> demangling_style == current_demangling_style) + printf_unfiltered ("%-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 = - savestring (dem -> demangling_style_name, - strlen (dem -> demangling_style_name)); + savestring (dem->demangling_style_name, + strlen (dem->demangling_style_name)); } } if (current_demangling_style == unknown_demangling) @@ -157,7 +179,7 @@ set_demangling_command (ignore, from_tty, c) } } -/* Fake a "set demangling" command. */ +/* Fake a "set demangle-style" command. */ void set_demangling_style (style) @@ -187,7 +209,7 @@ set_demangling_style (style) ensuring that it is the character that terminates the gcc<n>_compiled marker symbol (FIXME). */ -static char cplus_markers[] = { CPLUS_MARKER, '.', '$', '\0' }; +static char cplus_markers[] = {CPLUS_MARKER, '.', '$', '\0'}; int is_cplus_marker (c) @@ -199,17 +221,17 @@ is_cplus_marker (c) void _initialize_demangler () { - struct cmd_list_element *set, *show; + 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.\n\ + set = add_set_cmd ("demangle-style", class_support, var_string_noescape, + (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 -> function.sfunc = set_demangling_command; + &setlist); + show = add_show_from_set (set, &showlist); + set->function.sfunc = set_demangling_command; - /* Set the default demangling style chosen at compilation time. */ - set_demangling_style (DEFAULT_DEMANGLING_STYLE); - set_cplus_marker_for_demangling (CPLUS_MARKER); + /* Set the default demangling style chosen at compilation time. */ + set_demangling_style (DEFAULT_DEMANGLING_STYLE); + set_cplus_marker_for_demangling (CPLUS_MARKER); } |
