elf_backend_init_file_header

[deliverable/binutils-gdb.git] / gdb / demangle.c

diff --git a/gdb/demangle.c b/gdb/demangle.c
index c6421ee77d74d122b42892b9b214093784b129be..d8b03104d780f799ca62389454075b24ce95c5c0 100644 (file)
--- a/gdb/demangle.c
+++ b/gdb/demangle.c
@@ -1,6 +1,6 @@
 /* Basic C++ demangling support for GDB.
 
-   Copyright (C) 1991-2014 Free Software Foundation, Inc.
+   Copyright (C) 1991-2019 Free Software Foundation, Inc.
 
    Written by Fred Fish at Cygnus Support.
 
@@ -24,11 +24,12 @@
    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 <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
@@ -43,7 +44,7 @@
 #endif
 
 /* See documentation in gdb-demangle.h.  */
-int demangle = 1;
+bool demangle = true;
 
 static void
 show_demangle (struct ui_file *file, int from_tty,
@@ -56,7 +57,7 @@ show_demangle (struct ui_file *file, int from_tty,
 }
 
 /* See documentation in gdb-demangle.h.  */
-int asm_demangle = 0;
+bool asm_demangle = false;
 
 static void
 show_asm_demangle (struct ui_file *file, int from_tty,
@@ -74,7 +75,7 @@ show_asm_demangle (struct ui_file *file, int from_tty,
 
 static const char *current_demangling_style_string;
 
-/* The array of names of the known demanglyng styles.  Generated by
+/* The array of names of the known demangling styles.  Generated by
    _initialize_demangler from libiberty_demanglers[] array.  */
 
 static const char **demangling_style_names;
@@ -103,7 +104,8 @@ show_demangling_style_names(struct ui_file *file, int from_tty,
    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;
@@ -153,7 +155,62 @@ is_cplus_marker (int c)
   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)
@@ -166,7 +223,7 @@ _initialize_demangler (void)
        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++)
@@ -202,4 +259,10 @@ Use `set demangle-style' without arguments for a list of demangling styles."),
                        set_demangling_command,
                        show_demangling_style_names,
                        &setlist, &showlist);
+
+  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);
 }