/* Basic C++ demangling support for GDB.
- Copyright 1991, 1992, 1996, 1999 Free Software Foundation, Inc.
+
+ Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
+ 2001, 2003 Free Software Foundation, Inc.
+
Written by Fred Fish at Cygnus Support.
This file is part of GDB.
#define DEFAULT_DEMANGLING_STYLE AUTO_DEMANGLING_STYLE_STRING
#endif
-extern void _initialize_demangler PARAMS ((void));
+extern void _initialize_demangler (void);
/* String name for the current demangling style. Set by the
"set demangle-style" command, printed as part of the output by the
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. */
+/* The array of names of the known demanglyng styles. Generated by
+ _initialize_demangler from libiberty_demanglers[] array. */
-static const struct demangler
- {
- char *demangling_style_name;
- enum demangling_styles demangling_style;
- char *demangling_style_doc;
- }
-demanglers[] =
+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)
{
- {
- 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
- }
-};
+ fprintf_filtered (file, _("The current C++ demangling style is \"%s\".\n"),
+ value);
+}
-static void
-set_demangling_command PARAMS ((char *, int, struct cmd_list_element *));
+
+static void set_demangling_command (char *, int, struct cmd_list_element *);
/* Set current demangling style. Called by the "set demangle-style"
command after it has updated the current_demangling_style_string to
a malloc'd string, even if it is a null-string. */
static void
-set_demangling_command (ignore, from_tty, c)
- char *ignore;
- int from_tty;
- struct cmd_list_element *c;
+set_demangling_command (char *ignore, int from_tty, struct cmd_list_element *c)
{
- const struct demangler *dem;
+ const struct demangler_engine *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++)
+ for (dem = libiberty_demanglers;
+ 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;
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 == unknown_demangling)
{
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");
- for (dem = demanglers; dem->demangling_style_name != NULL; dem++)
+ printf_unfiltered (_("The currently understood settings are:\n\n"));
+ for (dem = libiberty_demanglers;
+ dem->demangling_style != unknown_demangling;
+ dem++)
{
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);
+ xfree (current_demangling_style_string);
current_demangling_style_string =
savestring (dem->demangling_style_name,
strlen (dem->demangling_style_name));
/* 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 = libiberty_demanglers[0].demangling_style;
current_demangling_style_string =
- savestring (demanglers[0].demangling_style_name,
- strlen (demanglers[0].demangling_style_name));
- warning ("`%s' style demangling chosen as the default.\n",
+ savestring (
+ libiberty_demanglers[0].demangling_style_name,
+ strlen (libiberty_demanglers[0].demangling_style_name));
+ warning (_("`%s' style demangling chosen as the default."),
current_demangling_style_string);
}
}
/* Fake a "set demangle-style" command. */
void
-set_demangling_style (style)
- char *style;
+set_demangling_style (char *style)
{
if (current_demangling_style_string != NULL)
{
- free (current_demangling_style_string);
+ xfree (current_demangling_style_string);
}
current_demangling_style_string = savestring (style, strlen (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<n>_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 (c)
- int c;
+is_cplus_marker (int c)
{
return c && strchr (cplus_markers, c) != NULL;
}
void
-_initialize_demangler ()
+_initialize_demangler (void)
{
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\
-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;
+ int i, ndems;
+
+ /* Fill the demangling_style_names[] array. */
+ for (ndems = 0;
+ libiberty_demanglers[ndems].demangling_style != unknown_demangling;
+ ndems++)
+ ;
+ demangling_style_names = xcalloc (ndems + 1, sizeof (char *));
+ for (i = 0;
+ libiberty_demanglers[i].demangling_style != unknown_demangling;
+ i++)
+ demangling_style_names[i] =
+ xstrdup (libiberty_demanglers[i].demangling_style_name);
+
+ /* 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);
}
projects / deliverable / binutils-gdb.git / blobdiff