merge from gcc

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

diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index fae7eddebb699053788875bcb52089e6577bb3c9..8ebd87e8ab98ec8ad8c86b80bbcf7d7cfdf474d2 100644 (file)
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -35,10 +35,11 @@
 #include "libiberty.h"
 #include "demangle.h"
 #include "bucomm.h"
+#include "budemang.h"
 
-static boolean with_functions; /* -f, show function names.  */
-static boolean do_demangle;    /* -C, demangle names.  */
-static boolean base_names;     /* -s, strip directory names.  */
+static bfd_boolean with_functions;     /* -f, show function names.  */
+static bfd_boolean do_demangle;                /* -C, demangle names.  */
+static bfd_boolean base_names;         /* -s, strip directory names.  */
 
 static int naddr;              /* Number of addresses to process.  */
 static char **addr;            /* Hex addresses to process.  */
@@ -95,19 +96,16 @@ static void
 slurp_symtab (abfd)
      bfd *abfd;
 {
-  long storage;
   long symcount;
+  unsigned int size;
 
   if ((bfd_get_file_flags (abfd) & HAS_SYMS) == 0)
     return;
 
-  storage = bfd_get_symtab_upper_bound (abfd);
-  if (storage < 0)
-    bfd_fatal (bfd_get_filename (abfd));
-
-  syms = (asymbol **) xmalloc (storage);
+  symcount = bfd_read_minisymbols (abfd, FALSE, (PTR) &syms, &size);
+  if (symcount == 0)
+    symcount = bfd_read_minisymbols (abfd, TRUE /* dynamic */, (PTR) &syms, &size);
 
-  symcount = bfd_canonicalize_symtab (abfd, syms);
   if (symcount < 0)
     bfd_fatal (bfd_get_filename (abfd));
 }
@@ -119,7 +117,7 @@ static bfd_vma pc;
 static const char *filename;
 static const char *functionname;
 static unsigned int line;
-static boolean found;
+static bfd_boolean found;
 
 /* Look for an address in a section.  This is called via
    bfd_map_over_sections.  */
@@ -178,7 +176,7 @@ translate_addresses (abfd)
          pc = bfd_scan_vma (*addr++, NULL, 16);
        }
 
-      found = false;
+      found = FALSE;
       bfd_map_over_sections (abfd, find_address_in_section, (PTR) NULL);
 
       if (! found)
@@ -191,23 +189,22 @@ translate_addresses (abfd)
        {
          if (with_functions)
            {
-             if (functionname == NULL || *functionname == '\0')
-               printf ("??\n");
-             else if (! do_demangle)
-               printf ("%s\n", functionname);
-             else
+             const char *name;
+             char *alloc = NULL;
+
+             name = functionname;
+             if (name == NULL || *name == '\0')
+               name = "??";
+             else if (do_demangle)
                {
-                 char *res;
-
-                 res = cplus_demangle (functionname, DMGL_ANSI | DMGL_PARAMS);
-                 if (res == NULL)
-                   printf ("%s\n", functionname);
-                 else
-                   {
-                     printf ("%s\n", res);
-                     free (res);
-                   }
+                 alloc = demangle (abfd, name);
+                 name = alloc;
                }
+
+             printf ("%s\n", name);
+
+             if (alloc != NULL)
+               free (alloc);
            }
 
          if (base_names && filename != NULL)
@@ -233,19 +230,19 @@ translate_addresses (abfd)
 /* Process a file.  */
 
 static void
-process_file (filename, target)
-     const char *filename;
+process_file (file_name, target)
+     const char *file_name;
      const char *target;
 {
   bfd *abfd;
   char **matching;
 
-  abfd = bfd_openr (filename, target);
+  abfd = bfd_openr (file_name, target);
   if (abfd == NULL)
-    bfd_fatal (filename);
+    bfd_fatal (file_name);
 
   if (bfd_check_format (abfd, bfd_archive))
-    fatal (_("%s: can not get addresses from archive"), filename);
+    fatal (_("%s: can not get addresses from archive"), file_name);
 
   if (! bfd_check_format_matches (abfd, bfd_object, &matching))
     {
@@ -278,7 +275,7 @@ main (argc, argv)
      int argc;
      char **argv;
 {
-  const char *filename;
+  const char *file_name;
   char *target;
   int c;
 
@@ -297,7 +294,7 @@ main (argc, argv)
   bfd_init ();
   set_default_bfd_target ();
 
-  filename = NULL;
+  file_name = NULL;
   target = NULL;
   while ((c = getopt_long (argc, argv, "b:Ce:sfHhVv", long_options, (int *) 0))
         != EOF)
@@ -310,7 +307,7 @@ main (argc, argv)
          target = optarg;
          break;
        case 'C':
-         do_demangle = true;
+         do_demangle = TRUE;
          if (optarg != NULL)
            {
              enum demangling_styles style;
@@ -324,13 +321,13 @@ main (argc, argv)
            }
          break;
        case 'e':
-         filename = optarg;
+         file_name = optarg;
          break;
        case 's':
-         base_names = true;
+         base_names = TRUE;
          break;
        case 'f':
-         with_functions = true;
+         with_functions = TRUE;
          break;
        case 'v':
        case 'V':
@@ -346,13 +343,13 @@ main (argc, argv)
        }
     }
 
-  if (filename == NULL)
-    filename = "a.out";
+  if (file_name == NULL)
+    file_name = "a.out";
 
   addr = argv + optind;
   naddr = argc - optind;
 
-  process_file (filename, target);
+  process_file (file_name, target);
 
   return 0;
 }