Phase 1 of the ptid_t changes.

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

diff --git a/gdb/demangle.c b/gdb/demangle.c
index b4a76a1c169158b9fe4f80c4928584c865ecc746..0104d8f3f6e92a53fca907913b74ee9a0dc1273c 100644 (file)
--- a/gdb/demangle.c
+++ b/gdb/demangle.c
@@ -1,5 +1,6 @@
 /* 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
+   Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support.
 
    This file is part of GDB.
@@ -49,57 +50,10 @@ extern void _initialize_demangler (void);
 
 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[] =
-{
-  {
-    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 const char **demangling_style_names;
 
 static void set_demangling_command (char *, int, struct cmd_list_element *);
 
@@ -122,14 +76,16 @@ static void set_demangling_command (char *, int, struct cmd_list_element *);
 static void
 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))
@@ -143,7 +99,7 @@ set_demangling_command (char *ignore, int from_tty, struct cmd_list_element *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 == unknown_demangling)
     {
       if (*current_demangling_style_string != '\0')
        {
@@ -151,13 +107,15 @@ set_demangling_command (char *ignore, int from_tty, struct cmd_list_element *c)
                             current_demangling_style_string);
        }
       printf_unfiltered ("The currently understood settings are:\n\n");
-      for (dem = demanglers; dem->demangling_style_name != NULL; dem++)
+      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));
@@ -168,10 +126,11 @@ set_demangling_command (char *ignore, int from_tty, struct cmd_list_element *c)
          /* 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));
+           savestring (
+              libiberty_demanglers[0].demangling_style_name,
+             strlen (libiberty_demanglers[0].demangling_style_name));
          warning ("`%s' style demangling chosen as the default.\n",
                   current_demangling_style_string);
        }
@@ -185,7 +144,7 @@ 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);
@@ -220,12 +179,26 @@ void
 _initialize_demangler (void)
 {
   struct cmd_list_element *set, *show;
-
-  set = add_set_cmd ("demangle-style", class_support, var_string_noescape,
-                    (char *) &current_demangling_style_string,
-                    "Set the current C++ demangling style.\n\
+  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);
+
+  set = add_set_enum_cmd ("demangle-style", class_support,
+                         demangling_style_names,
+                         (const char **) &current_demangling_style_string,
+                         "Set the current C++ demangling style.\n\
 Use `set demangle-style' without arguments for a list of demangling styles.",
-                    &setlist);
+                         &setlist);
   show = add_show_from_set (set, &showlist);
   set->function.sfunc = set_demangling_command;