*** empty log message ***

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

diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index 1ece80aecd4ed6c0408fdb386497248f1440d589..5febaeae629230d9069f9b2c9f05f3dc3b1e5744 100644 (file)
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -139,6 +139,7 @@ static bfd_vma pc;
 static const char *filename;
 static const char *functionname;
 static unsigned int line;
+static unsigned int discriminator;
 static bfd_boolean found;
 
 /* Look for an address in a section.  This is called via
@@ -165,8 +166,9 @@ find_address_in_section (bfd *abfd, asection *section,
   if (pc >= vma + size)
     return;
 
-  found = bfd_find_nearest_line (abfd, section, syms, pc - vma,
-                                &filename, &functionname, &line);
+  found = bfd_find_nearest_line_discriminator (abfd, section, syms, pc - vma,
+                                               &filename, &functionname,
+                                               &line, &discriminator);
 }
 
 /* Look for an offset in a section.  This is directly called.  */
@@ -186,8 +188,9 @@ find_offset_in_section (bfd *abfd, asection *section)
   if (pc >= size)
     return;
 
-  found = bfd_find_nearest_line (abfd, section, syms, pc,
-                                &filename, &functionname, &line);
+  found = bfd_find_nearest_line_discriminator (abfd, section, syms, pc,
+                                               &filename, &functionname,
+                                               &line, &discriminator);
 }
 
 /* Read hexadecimal addresses from stdin, translate into
@@ -196,8 +199,6 @@ find_offset_in_section (bfd *abfd, asection *section)
 static void
 translate_addresses (bfd *abfd, asection *section)
 {
-  const struct elf_backend_data * bed;
-
   int read_stdin = (naddr == 0);
 
   for (;;)
@@ -218,11 +219,15 @@ translate_addresses (bfd *abfd, asection *section)
          pc = bfd_scan_vma (*addr++, NULL, 16);
        }
 
-      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
-         && (bed = get_elf_backend_data (abfd)) != NULL
-         && bed->sign_extend_vma
-         && (pc & (bfd_vma) 1 << (bed->s->arch_size - 1)))
-       pc |= ((bfd_vma) -1) << bed->s->arch_size;
+      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+       {
+         const struct elf_backend_data *bed = get_elf_backend_data (abfd);
+         bfd_vma sign = (bfd_vma) 1 << (bed->s->arch_size - 1);
+
+         pc &= (sign << 1) - 1;
+         if (bed->sign_extend_vma)
+           pc = (pc ^ sign) - sign;
+       }
 
       if (with_addresses)
         {
@@ -268,6 +273,11 @@ translate_addresses (bfd *abfd, asection *section)
 
                   printf ("%s", name);
                   if (pretty_print)
+                   /* Note for translators:  This printf is used to join the
+                      function name just printed above to the line number/
+                      file name pair that is about to be printed below.  Eg:
+
+                        foo at 123:bar.c  */
                     printf (_(" at "));
                   else
                     printf ("\n");
@@ -285,14 +295,30 @@ translate_addresses (bfd *abfd, asection *section)
                     filename = h + 1;
                 }
 
-              printf ("%s:%u\n", filename ? filename : "??", line);
+              printf ("%s:", filename ? filename : "??");
+             if (line != 0)
+                {
+                  if (discriminator != 0)
+                    printf ("%u (discriminator %u)\n", line, discriminator);
+                  else
+                    printf ("%u\n", line);
+                }
+             else
+               printf ("?\n");
               if (!unwind_inlines)
                 found = FALSE;
               else
-                found = bfd_find_inliner_info (abfd, &filename, &functionname, &line);
+                found = bfd_find_inliner_info (abfd, &filename, &functionname,
+                                              &line);
               if (! found)
                 break;
               if (pretty_print)
+               /* Note for translators: This printf is used to join the
+                  line number/file name pair that has just been printed with
+                  the line number/file name pair that is going to be printed
+                  by the next iteration of the while loop.  Eg:
+
+                    123:bar.c (inlined by) 456:main.c  */
                 printf (_(" (inlined by) "));
             }
        }