/* Basic C++ demangling support for GDB.
- Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- 2003, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1991-2019 Free Software Foundation, Inc.
Written by Fred Fish at Cygnus Support.
to a styles of demangling, and GDB specific. */
#include "defs.h"
+#include "cli/cli-utils.h" /* for skip_to_space */
#include "command.h"
#include "gdbcmd.h"
#include "demangle.h"
#include "gdb-demangle.h"
-#include "gdb_string.h"
+#include "language.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
"set demangle-style" command, printed as part of the output by the
"show demangle-style" command. */
-static char *current_demangling_style_string;
+static const char *current_demangling_style_string;
/* The array of names of the known demanglyng styles. Generated by
_initialize_demangler from libiberty_demanglers[] array. */
a malloc'd string, even if it is a null-string. */
static void
-set_demangling_command (char *ignore, int from_tty, struct cmd_list_element *c)
+set_demangling_command (const char *ignore,
+ int from_tty, struct cmd_list_element *c)
{
const struct demangler_engine *dem;
+ int i;
/* 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 = libiberty_demanglers;
+ for (dem = libiberty_demanglers, i = 0;
dem->demangling_style != unknown_demangling;
dem++)
{
dem->demangling_style_name) == 0)
{
current_demangling_style = dem->demangling_style;
+ current_demangling_style_string = demangling_style_names[i];
break;
}
+ i++;
}
- /* 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 == unknown_demangling)
- {
- if (*current_demangling_style_string != '\0')
- {
- printf_unfiltered (_("Unknown demangling style `%s'.\n"),
- current_demangling_style_string);
- }
- 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)
- {
- xfree (current_demangling_style_string);
- current_demangling_style_string =
- xstrdup (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 = libiberty_demanglers[0].demangling_style;
- current_demangling_style_string =
- xstrdup (libiberty_demanglers[0].demangling_style_name);
- warning (_("`%s' style demangling chosen as the default."),
- current_demangling_style_string);
- }
- }
-}
-
-/* See documentation in gdb-demangle.h. */
-
-void
-set_demangling_style (char *style)
-{
- if (current_demangling_style_string != NULL)
- {
- xfree (current_demangling_style_string);
- }
- current_demangling_style_string = xstrdup (style);
- set_demangling_command ((char *) NULL, 0, (struct cmd_list_element *) NULL);
+ /* We should have found a match, given we only add known styles to
+ the enumeration list. */
+ gdb_assert (dem->demangling_style != unknown_demangling);
}
/* G++ uses a special character to indicate certain internal names. Which
return c && strchr (cplus_markers, c) != NULL;
}
-extern initialize_file_ftype _initialize_demangler; /* -Wmissing-prototypes */
+/* Demangle the given string in the current language. */
+
+static void
+demangle_command (const char *args, int from_tty)
+{
+ char *demangled;
+ const char *name;
+ const char *arg_start;
+ int processing_args = 1;
+ const struct language_defn *lang;
+
+ std::string arg_buf = args != NULL ? args : "";
+ arg_start = arg_buf.c_str ();
+
+ std::string lang_name;
+ while (processing_args
+ && *arg_start == '-')
+ {
+ const char *p = skip_to_space (arg_start);
+
+ if (strncmp (arg_start, "-l", p - arg_start) == 0)
+ lang_name = extract_arg (&p);
+ else if (strncmp (arg_start, "--", p - arg_start) == 0)
+ processing_args = 0;
+ else
+ report_unrecognized_option_error ("demangle", arg_start);
+
+ arg_start = skip_spaces (p);
+ }
+
+ name = arg_start;
+
+ if (*name == '\0')
+ error (_("Usage: demangle [-l LANGUAGE] [--] NAME"));
+
+ if (!lang_name.empty ())
+ {
+ enum language lang_enum;
+
+ lang_enum = language_enum (lang_name.c_str ());
+ if (lang_enum == language_unknown)
+ error (_("Unknown language \"%s\""), lang_name.c_str ());
+ lang = language_def (lang_enum);
+ }
+ else
+ lang = current_language;
+
+ demangled = language_demangle (lang, name, DMGL_ANSI | DMGL_PARAMS);
+ if (demangled != NULL)
+ {
+ printf_filtered ("%s\n", demangled);
+ xfree (demangled);
+ }
+ else
+ error (_("Can't demangle \"%s\""), name);
+}
void
_initialize_demangler (void)
{
int i, ndems;
- /* Fill the demangling_style_names[] array. */
+ /* Fill the demangling_style_names[] array, and set the default
+ demangling style chosen at compilation time. */
for (ndems = 0;
libiberty_demanglers[ndems].demangling_style != unknown_demangling;
ndems++)
;
- demangling_style_names = xcalloc (ndems + 1, sizeof (char *));
+ demangling_style_names = XCNEWVEC (const char *, ndems + 1);
for (i = 0;
libiberty_demanglers[i].demangling_style != unknown_demangling;
i++)
- demangling_style_names[i] =
- xstrdup (libiberty_demanglers[i].demangling_style_name);
+ {
+ demangling_style_names[i]
+ = xstrdup (libiberty_demanglers[i].demangling_style_name);
+
+ if (current_demangling_style_string == NULL
+ && strcmp (DEFAULT_DEMANGLING_STYLE, demangling_style_names[i]) == 0)
+ current_demangling_style_string = demangling_style_names[i];
+ }
add_setshow_boolean_cmd ("demangle", class_support, &demangle, _("\
Set demangling of encoded C++/ObjC names when displaying symbols."), _("\
show_asm_demangle,
&setprintlist, &showprintlist);
- /* 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, _("\
+ ¤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."),
show_demangling_style_names,
&setlist, &showlist);
- /* Set the default demangling style chosen at compilation time. */
- set_demangling_style (DEFAULT_DEMANGLING_STYLE);
+ add_cmd ("demangle", class_support, demangle_command, _("\
+Demangle a mangled name.\n\
+Usage: demangle [-l LANGUAGE] [--] NAME\n\
+If LANGUAGE is not specified, NAME is demangled in the current language."),
+ &cmdlist);
}
projects / deliverable / binutils-gdb.git / blobdiff