Changeset 609 for branches/GNU/src/binutils/libiberty/cplus-dem.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/libiberty/cplus-dem.c (modified) (45 diffs, 1 prop)

branches/GNU/src/binutils/libiberty/cplus-dem.c

@@ -1 +1 @@
 /* Demangler for GNU C++
    Copyright 1989, 1991, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000 Free Software Foundation, Inc.
+   2000, 2001 Free Software Foundation, Inc.
    Written by James Clark (jjc@jclark.uucp)
    Rewritten by Fred Fish (fnf@cygnus.com) for ARM and Lucid demangling
@@ -11 +11 @@
 License as published by the Free Software Foundation; either
 version 2 of the License, or (at your option) any later version.
+
+In addition to the permissions in the GNU Library General Public
+License, the Free Software Foundation gives you unlimited permission
+to link the compiled version of this file into combinations with other
+programs, and to distribute those combinations without any restriction
+coming from the use of this file.  (The Library Public License
+restrictions do apply in other respects; for example, they cover
+modification of the file, and distribution when not linked into a
+combined executable.)
 
 Libiberty is distributed in the hope that it will be useful,
@@ -63 +72 @@
 
 extern void fancy_abort PARAMS ((void)) ATTRIBUTE_NORETURN;
-
-static const char *mystrstr PARAMS ((const char *, const char *));
-
-static const char *
-mystrstr (s1, s2)
-     const char *s1, *s2;
-{
-  register const char *p = s1;
-  register int len = strlen (s2);
-
-  for (; (p = strchr (p, *s2)) != 0; p++)
-    {
-      if (strncmp (p, s2, len) == 0)
-        {
-          return (p);
-        }
-    }
-  return (0);
-}
 
 /* In order to allow a single demangler executable to demangle strings
@@ -158 +148 @@
 static const struct optable
 {
-  const char *in;
-  const char *out;
-  int flags;
+  const char *const in;
+  const char *const out;
+  const int flags;
 } optable[] = {
   {"nw",          " new",       DMGL_ANSI},     /* new (1.92,    ansi) */
@@ -257 +247 @@
 } type_kind_t;
 
-struct demangler_engine libiberty_demanglers[] =
-{
+const struct demangler_engine libiberty_demanglers[] =
+{
+  {
+    NO_DEMANGLING_STYLE_STRING,
+    no_demangling,
+    "Demangling disabled"
+  }
+  ,
   {
     AUTO_DEMANGLING_STYLE_STRING,
@@ -319 +315 @@
 
 #define STRING_EMPTY(str)       ((str) -> b == (str) -> p)
-#define PREPEND_BLANK(str)      {if (!STRING_EMPTY(str)) \
-    string_prepend(str, " ");}
 #define APPEND_BLANK(str)       {if (!STRING_EMPTY(str)) \
     string_append(str, " ");}
@@ -530 +524 @@
 
 static void
-grow_vect PARAMS ((void **, size_t *, size_t, int));
+grow_vect PARAMS ((char **, size_t *, size_t, int));
 
 /* Translate count to integer, consuming tokens in the process.
@@ -568 +562 @@
       (*type)++;
     }
+
+  if (count < 0)
+    count = -1;
 
   return (count);
@@ -848 +845 @@
      enum demangling_styles style;
 {
-  struct demangler_engine *demangler = libiberty_demanglers; 
+  const struct demangler_engine *demangler = libiberty_demanglers; 
 
   for (; demangler->demangling_style != unknown_demangling; ++demangler)
@@ -866 +863 @@
      const char *name;
 {
-  struct demangler_engine *demangler = libiberty_demanglers; 
+  const struct demangler_engine *demangler = libiberty_demanglers; 
 
   for (; demangler->demangling_style != unknown_demangling; ++demangler)
@@ -878 +875 @@
 
    If MANGLED is a mangled function name produced by GNU C++, then
-   a pointer to a malloced string giving a C++ representation
+   a pointer to a @code{malloc}ed string giving a C++ representation
    of the name will be returned; otherwise NULL will be returned.
    It is the caller's responsibility to free the string which
@@ -910 +907 @@
   char *ret;
   struct work_stuff work[1];
+
+  if (current_demangling_style == no_demangling)
+    return xstrdup (mangled);
+
   memset ((char *) work, 0, sizeof (work));
   work->options = options;
@@ -918 +919 @@
   if (GNU_V3_DEMANGLING || AUTO_DEMANGLING)
     {
-      ret = cplus_demangle_v3 (mangled);
+      ret = cplus_demangle_v3 (mangled, work->options);
       if (ret || GNU_V3_DEMANGLING)
         return ret;
+    }
+
+  if (JAVA_DEMANGLING)
+    {
+      ret = java_demangle_v3 (mangled);
+      if (ret)
+        return ret;
     }
 
@@ -938 +946 @@
 static void
 grow_vect (old_vect, size, min_size, element_size)
-     void **old_vect;
+     char **old_vect;
      size_t *size;
      size_t min_size;
@@ -948 +956 @@
       if (*size < min_size)
         *size = min_size;
-      *old_vect = xrealloc (*old_vect, *size * element_size);
+      *old_vect = (void *) xrealloc (*old_vect, *size * element_size);
     }
 }
@@ -971 +979 @@
   int at_start_name;
   int changed;
-  char *demangling_buffer = NULL;
-  size_t demangling_buffer_size = 0;
+  size_t demangled_size = 0;
   
   changed = 0;
@@ -1000 +1007 @@
   
   /* Make demangled big enough for possible expansion by operator name.  */
-  grow_vect ((void **) &(demangling_buffer),
-             &demangling_buffer_size,  2 * len0 + 1,
+  grow_vect (&demangled,
+             &demangled_size,  2 * len0 + 1,
              sizeof (char));
-  demangled = demangling_buffer;
   
   if (ISDIGIT ((unsigned char) mangled[len0 - 1])) {
@@ -1053 +1059 @@
   
  Suppress:
-  grow_vect ((void **) &(demangling_buffer),
-             &demangling_buffer_size,  strlen (mangled) + 3,
+  grow_vect (&demangled,
+             &demangled_size,  strlen (mangled) + 3,
              sizeof (char));
-  demangled = demangling_buffer;
+
   if (mangled[0] == '<')
      strcpy (demangled, mangled);
@@ -1068 +1074 @@
    to be able to demangle a name with a B, K or n code, we need to
    have a longer term memory of what types have been seen. The original
-   now intializes and cleans up the squangle code info, while internal
+   now initializes and cleans up the squangle code info, while internal
    calls go directly to this routine to avoid resetting that info. */
 
@@ -1208 +1214 @@
   if (from->ntmpl_args)
     to->tmpl_argvec
-      = xmalloc (from->ntmpl_args * sizeof (to->tmpl_argvec[0]));
+      = (char **) xmalloc (from->ntmpl_args * sizeof (to->tmpl_argvec[0]));
 
   for (i = 0; i < from->ntmpl_args; i++)
@@ -1433 +1439 @@
                 string_append (&s, SCOPE_STRING (work));
                 string_prepends (declp, &s);
+                string_delete (&s);
               }
             oldmangled = NULL;
@@ -1512 +1519 @@
               /* Read the return type. */
               string return_type;
-              string_init (&return_type);
 
               (*mangled)++;
@@ -1787 +1793 @@
       /* By default, we let the number decide whether we shall consume an
          underscore.  */
-      int consume_following_underscore = 0;
+      int multidigit_without_leading_underscore = 0;
       int leave_following_underscore = 0;
 
       success = 0;
 
-      /* Negative numbers are indicated with a leading `m'.  */
-      if (**mangled == 'm')
-        {
-          string_appendn (s, "-", 1);
-          (*mangled)++;
-        }
-      else if (mangled[0][0] == '_' && mangled[0][1] == 'm')
-        {
-          /* Since consume_count_with_underscores does not handle the
-             `m'-prefix we must do it here, using consume_count and
-             adjusting underscores: we have to consume the underscore
-             matching the prepended one.  */
-          consume_following_underscore = 1;
-          string_appendn (s, "-", 1);
-          (*mangled) += 2;
-        }
-      else if (**mangled == '_')
-        {
-          /* Do not consume a following underscore;
-             consume_following_underscore will consume what should be
-             consumed.  */
+      if (**mangled == '_')
+        {
+          if (mangled[0][1] == 'm')
+            {
+              /* Since consume_count_with_underscores does not handle the
+                 `m'-prefix we must do it here, using consume_count and
+                 adjusting underscores: we have to consume the underscore
+                 matching the prepended one.  */
+              multidigit_without_leading_underscore = 1;
+              string_appendn (s, "-", 1);
+              (*mangled) += 2;
+            }
+          else
+            {
+              /* Do not consume a following underscore;
+                 consume_count_with_underscores will consume what
+                 should be consumed.  */
+              leave_following_underscore = 1;
+            }
+        }
+      else
+        {
+          /* Negative numbers are indicated with a leading `m'.  */
+          if (**mangled == 'm')
+          {
+            string_appendn (s, "-", 1);
+            (*mangled)++;
+          }
+          /* Since consume_count_with_underscores does not handle
+             multi-digit numbers that do not start with an underscore,
+             and this number can be an integer template parameter,
+             we have to call consume_count. */
+          multidigit_without_leading_underscore = 1;
+          /* These multi-digit numbers never end on an underscore,
+             so if there is one then don't eat it. */
           leave_following_underscore = 1;
         }
@@ -1820 +1840 @@
          the leading underscore (that we consumed) if it is to handle
          multi-digit numbers.  */
-      if (consume_following_underscore)
+      if (multidigit_without_leading_underscore)
         value = consume_count (mangled);
       else
@@ -1838 +1858 @@
              underscore, we need to do something more radical.  */
 
-          if ((value > 9 || consume_following_underscore)
+          if ((value > 9 || multidigit_without_leading_underscore)
               && ! leave_following_underscore
               && **mangled == '_')
@@ -1846 +1866 @@
           success = 1;
         }
-    }
+      }
 
   return success;
@@ -2234 +2254 @@
   /* Check if ARM template with "__pt__" in it ("parameterized type") */
   /* Allow HP also here, because HP's cfront compiler follows ARM to some extent */
-  if ((ARM_DEMANGLING || HP_DEMANGLING) && (*anchor = mystrstr (mangled, "__pt__")))
+  if ((ARM_DEMANGLING || HP_DEMANGLING) && (*anchor = strstr (mangled, "__pt__")))
     {
       int len;
@@ -2249 +2269 @@
   if (AUTO_DEMANGLING || EDG_DEMANGLING)
     {
-      if ((*anchor = mystrstr (mangled, "__tm__"))
-          || (*anchor = mystrstr (mangled, "__ps__"))
-          || (*anchor = mystrstr (mangled, "__pt__")))
+      if ((*anchor = strstr (mangled, "__tm__"))
+          || (*anchor = strstr (mangled, "__ps__"))
+          || (*anchor = strstr (mangled, "__pt__")))
         {
           int len;
@@ -2264 +2284 @@
             }
         }
-      else if ((*anchor = mystrstr (mangled, "__S")))
+      else if ((*anchor = strstr (mangled, "__S")))
         {
           int len;
@@ -2314 +2334 @@
       while (1)
         {
-          string_clear (&arg);
+          string_delete (&arg);
           switch (**mangled)
             {
@@ -2371 +2391 @@
       /* should do error checking here */
       while (args < e) {
-        string_clear (&arg);
+        string_delete (&arg);
 
         /* Check for type or literal here */
@@ -2386 +2406 @@
             string_append (&arg, "(");
             string_appends (&arg, &type_str);
+            string_delete (&type_str);
             string_append (&arg, ")");
             if (*args != 'L')
@@ -2403 +2424 @@
           default:
             /* Not handling other HP cfront stuff */
-            if (!do_type (work, &args, &arg))
-              goto cfront_template_args_done;
+            {
+              const char* old_args = args;
+              if (!do_type (work, &args, &arg))
+                goto cfront_template_args_done;
+
+              /* Fail if we didn't make any progress: prevent infinite loop. */
+              if (args == old_args)
+                return;
+            }
           }
         string_appends (declp, &arg);
@@ -2565 +2593 @@
      "__"-sequence.  This is the normal case.  */
   if (ARM_DEMANGLING || LUCID_DEMANGLING || HP_DEMANGLING || EDG_DEMANGLING
-      || mystrstr (scan + 2, "__") == NULL)
+      || strstr (scan + 2, "__") == NULL)
     {
       demangle_function_name (work, mangled, declp, scan);
@@ -2708 +2736 @@
   /*  This block of code is a reduction in strength time optimization
       of:
-      scan = mystrstr (*mangled, "__"); */
+      scan = strstr (*mangled, "__"); */
 
   {
@@ -2800 +2828 @@
               scan++;
             }
-          if ((scan = mystrstr (scan, "__")) == NULL || (*(scan + 2) == '\0'))
+          if ((scan = strstr (scan, "__")) == NULL || (*(scan + 2) == '\0'))
             {
               /* No separator (I.E. "__not_mangled"), or empty signature
@@ -3336 +3364 @@
           else
             {
+              string_delete (&last_name);
               success = do_type (work, mangled, &last_name);
               if (!success)
@@ -3478 +3507 @@
   const char *remembered_type;
   int type_quals;
-  string btype;
   type_kind_t tk = tk_none;
 
-  string_init (&btype);
   string_init (&decl);
   string_init (result);
@@ -3599 +3626 @@
                 do_type (work, mangled, &temp);
                 string_prepends (&decl, &temp);
+                string_delete (&temp);
               }
             else if (**mangled == 't')
@@ -3609 +3637 @@
                   {
                     string_prependn (&decl, temp.b, temp.p - temp.b);
-                    string_clear (&temp);
+                    string_delete (&temp);
                   }
                 else
@@ -3789 +3817 @@
   char buf[10];
   unsigned int dec = 0;
-  string btype;
   type_kind_t tk = tk_integral;
-
-  string_init (&btype);
 
   /* First pick off any type qualifiers.  There can be more than one.  */
@@ -3965 +3990 @@
     case 't':
       {
+        string btype;
+        string_init (&btype);
         success = demangle_template (work, mangled, &btype, 0, 1, 1);
         string_appends (result, &btype);
+        string_delete (&btype);
         break;
       }
@@ -4168 +4196 @@
      type vector when processing a repeated type.  */
   if (work->previous_argument)
-    string_clear (work->previous_argument);
+    string_delete (work->previous_argument);
   else
-    {
-      work->previous_argument = (string*) xmalloc (sizeof (string));
-      string_init (work->previous_argument);
-    }
+    work->previous_argument = (string*) xmalloc (sizeof (string));
 
   if (!do_type (work, mangled, work->previous_argument))
@@ -4537 +4562 @@
   /* Restore the previous_argument field.  */
   if (work->previous_argument)
-    string_delete (work->previous_argument);
+    {
+      string_delete (work->previous_argument);
+      free ((char *) work->previous_argument);
+    }
   work->previous_argument = saved_previous_argument;
   --work->forgetting_types;
@@ -4862 +4890 @@
   string_append (s, buf);
 }
-
-/* To generate a standalone demangler program for testing purposes,
-   just compile and link this file with -DMAIN and libiberty.a.  When
-   run, it demangles each command line arg, or each stdin string, and
-   prints the result on stdout.  */
-
-#ifdef MAIN
-
-#include "getopt.h"
-
-static const char *program_name;
-static const char *program_version = VERSION;
-static int flags = DMGL_PARAMS | DMGL_ANSI;
-
-static void demangle_it PARAMS ((char *));
-static void usage PARAMS ((FILE *, int)) ATTRIBUTE_NORETURN;
-static void fatal PARAMS ((const char *)) ATTRIBUTE_NORETURN;
-static void print_demangler_list PARAMS ((FILE *));
-
-static void
-demangle_it (mangled_name)
-     char *mangled_name;
-{
-  char *result;
-
-  result = cplus_demangle (mangled_name, flags);
-  if (result == NULL)
-    {
-      printf ("%s\n", mangled_name);
-    }
-  else
-    {
-      printf ("%s\n", result);
-      free (result);
-    }
-}
-
-static void 
-print_demangler_list (stream)
-     FILE *stream;
-{
-  struct demangler_engine *demangler; 
-
-  fprintf (stream, "{%s", libiberty_demanglers->demangling_style_name);
-  
-  for (demangler = libiberty_demanglers + 1;
-       demangler->demangling_style != unknown_demangling;
-       ++demangler)
-    fprintf (stream, ",%s", demangler->demangling_style_name);
-
-  fprintf (stream, "}");
-}
-
-static void
-usage (stream, status)
-     FILE *stream;
-     int status;
-{
-  fprintf (stream, "\
-Usage: %s [-_] [-n] [--strip-underscores] [--no-strip-underscores] \n",
-           program_name);
-
-  fprintf (stream, "\
-       [-s ");
-  print_demangler_list (stream);
-  fprintf (stream, "]\n");
-
-  fprintf (stream, "\
-       [--format ");
-  print_demangler_list (stream);
-  fprintf (stream, "]\n");
-
-  fprintf (stream, "\
-       [--help] [--version] [arg...]\n");
-  exit (status);
-}
-
-#define MBUF_SIZE 32767
-char mbuffer[MBUF_SIZE];
-
-/* Defined in the automatically-generated underscore.c.  */
-extern int prepends_underscore;
-
-int strip_underscore = 0;
-
-static struct option long_options[] = {
-  {"strip-underscores", no_argument, 0, '_'},
-  {"format", required_argument, 0, 's'},
-  {"help", no_argument, 0, 'h'},
-  {"java", no_argument, 0, 'j'},
-  {"no-strip-underscores", no_argument, 0, 'n'},
-  {"version", no_argument, 0, 'v'},
-  {0, no_argument, 0, 0}
-};
-
-/* More 'friendly' abort that prints the line and file.
-   config.h can #define abort fancy_abort if you like that sort of thing.  */
-
-void
-fancy_abort ()
-{
-  fatal ("Internal gcc abort.");
-}
-
-
-static const char *
-standard_symbol_characters PARAMS ((void));
-
-static const char *
-hp_symbol_characters PARAMS ((void));
-
-static const char *
-gnu_v3_symbol_characters PARAMS ((void));
-
-/* Return the string of non-alnum characters that may occur 
-   as a valid symbol component, in the standard assembler symbol
-   syntax.  */
-
-static const char *
-standard_symbol_characters ()
-{
-  return "_$.";
-}
-
-
-/* Return the string of non-alnum characters that may occur
-   as a valid symbol name component in an HP object file.
-
-   Note that, since HP's compiler generates object code straight from
-   C++ source, without going through an assembler, its mangled
-   identifiers can use all sorts of characters that no assembler would
-   tolerate, so the alphabet this function creates is a little odd.
-   Here are some sample mangled identifiers offered by HP:
-
-        typeid*__XT24AddressIndExpClassMember_
-        [Vftptr]key:__dt__32OrdinaryCompareIndExpClassMemberFv
-        __ct__Q2_9Elf64_Dyn18{unnamed.union.#1}Fv
-
-   This still seems really weird to me, since nowhere else in this
-   file is there anything to recognize curly brackets, parens, etc.
-   I've talked with Srikanth <srikanth@cup.hp.com>, and he assures me
-   this is right, but I still strongly suspect that there's a
-   misunderstanding here.
-
-   If we decide it's better for c++filt to use HP's assembler syntax
-   to scrape identifiers out of its input, here's the definition of
-   the symbol name syntax from the HP assembler manual:
-
-       Symbols are composed of uppercase and lowercase letters, decimal
-       digits, dollar symbol, period (.), ampersand (&), pound sign(#) and
-       underscore (_). A symbol can begin with a letter, digit underscore or
-       dollar sign. If a symbol begins with a digit, it must contain a
-       non-digit character.
-
-   So have fun.  */
-static const char *
-hp_symbol_characters ()
-{
-  return "_$.<>#,*&[]:(){}";
-}
-
-
-/* Return the string of non-alnum characters that may occur 
-   as a valid symbol component in the GNU C++ V3 ABI mangling
-   scheme.  */
-
-static const char *
-gnu_v3_symbol_characters ()
-{
-  return "_$.";
-}
-
-
-extern int main PARAMS ((int, char **));
-
-int
-main (argc, argv)
-     int argc;
-     char **argv;
-{
-  char *result;
-  int c;
-  const char *valid_symbols;
-
-  program_name = argv[0];
-
-  strip_underscore = prepends_underscore;
-
-  while ((c = getopt_long (argc, argv, "_ns:j", long_options, (int *) 0)) != EOF)
-    {
-      switch (c)
-        {
-        case '?':
-          usage (stderr, 1);
-          break;
-        case 'h':
-          usage (stdout, 0);
-        case 'n':
-          strip_underscore = 0;
-          break;
-        case 'v':
-          printf ("GNU %s (C++ demangler), version %s\n", program_name, program_version);
-          return (0);
-        case '_':
-          strip_underscore = 1;
-          break;
-        case 'j':
-          flags |= DMGL_JAVA;
-          break;
-        case 's':
-          {
-            enum demangling_styles style;
-
-            style = cplus_demangle_name_to_style (optarg);
-            if (style == unknown_demangling)
-              {
-                fprintf (stderr, "%s: unknown demangling style `%s'\n",
-                         program_name, optarg);
-                return (1);
-              }
-            else
-              cplus_demangle_set_style (style);
-          }
-          break;
-        }
-    }
-
-  if (optind < argc)
-    {
-      for ( ; optind < argc; optind++)
-        {
-          demangle_it (argv[optind]);
-        }
-    }
-  else
-    {
-      switch (current_demangling_style)
-        {
-        case gnu_demangling:
-        case lucid_demangling:
-        case arm_demangling:
-        case java_demangling:
-        case edg_demangling:
-        case gnat_demangling:
-        case auto_demangling:
-          valid_symbols = standard_symbol_characters ();
-          break;
-        case hp_demangling:
-          valid_symbols = hp_symbol_characters ();
-          break;
-        case gnu_v3_demangling:
-          valid_symbols = gnu_v3_symbol_characters ();
-          break;
-        default:
-          /* Folks should explicitly indicate the appropriate alphabet for
-             each demangling.  Providing a default would allow the
-             question to go unconsidered.  */
-          abort ();
-        }
-
-      for (;;)
-        {
-          int i = 0;
-          c = getchar ();
-          /* Try to read a label.  */
-          while (c != EOF && (ISALNUM (c) || strchr (valid_symbols, c)))
-            {
-              if (i >= MBUF_SIZE-1)
-                break;
-              mbuffer[i++] = c;
-              c = getchar ();
-            }
-          if (i > 0)
-            {
-              int skip_first = 0;
-
-              if (mbuffer[0] == '.')
-                ++skip_first;
-              if (strip_underscore && mbuffer[skip_first] == '_')
-                ++skip_first;
-
-              if (skip_first > i)
-                skip_first = i;
-
-              mbuffer[i] = 0;
-
-              result = cplus_demangle (mbuffer + skip_first, flags);
-              if (result)
-                {
-                  if (mbuffer[0] == '.')
-                    putc ('.', stdout);
-                  fputs (result, stdout);
-                  free (result);
-                }
-              else
-                fputs (mbuffer, stdout);
-
-              fflush (stdout);
-            }
-          if (c == EOF)
-            break;
-          putchar (c);
-          fflush (stdout);
-        }
-    }
-
-  return (0);
-}
-
-static void
-fatal (str)
-     const char *str;
-{
-  fprintf (stderr, "%s: %s\n", program_name, str);
-  exit (1);
-}
-
-PTR
-xmalloc (size)
-  size_t size;
-{
-  register PTR value = (PTR) malloc (size);
-  if (value == 0)
-    fatal ("virtual memory exhausted");
-  return value;
-}
-
-PTR
-xrealloc (ptr, size)
-  PTR ptr;
-  size_t size;
-{
-  register PTR value = (PTR) realloc (ptr, size);
-  if (value == 0)
-    fatal ("virtual memory exhausted");
-  return value;
-}
-#endif  /* main */