binutils/

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

diff --git a/binutils/objdump.c b/binutils/objdump.c
index ac5fa0d4afdd1cdff7ffacc0e8f1d381d38cd715..faae6edfddc329024c1dd0adbe304b86ae3a9768 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -1,6 +1,6 @@
 /* objdump.c -- dump information about an object file.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -61,6 +61,7 @@
 #include "dis-asm.h"
 #include "libiberty.h"
 #include "demangle.h"
+#include "filenames.h"
 #include "debug.h"
 #include "budbg.h"
 
@@ -111,6 +112,9 @@ static int dump_special_syms = 0;   /* --special-syms */
 static bfd_vma adjust_section_vma = 0; /* --adjust-vma */
 static int file_start_context = 0;      /* --file-start-context */
 static bfd_boolean display_file_offsets;/* -F */
+static const char *prefix;             /* --prefix */
+static int prefix_strip;               /* --prefix-strip */
+static size_t prefix_length;
 
 /* Pointer to an array of section names provided by
    one or more "-j secname" command line options.  */
@@ -231,6 +235,8 @@ usage (FILE *stream, int status)
       --[no-]show-raw-insn       Display hex alongside symbolic disassembly\n\
       --adjust-vma=OFFSET        Add OFFSET to all displayed section addresses\n\
       --special-syms             Include special symbols in symbol dumps\n\
+      --prefix=PREFIX            Add PREFIX to absolute paths for -S\n\
+      --prefix-strip=LEVEL       Strip initial directory names for -S\n\
 \n"));
       list_supported_targets (program_name, stream);
       list_supported_architectures (program_name, stream);
@@ -248,6 +254,8 @@ enum option_values
     OPTION_ENDIAN=150,
     OPTION_START_ADDRESS,
     OPTION_STOP_ADDRESS,
+    OPTION_PREFIX,
+    OPTION_PREFIX_STRIP,
     OPTION_ADJUST_VMA
   };
 
@@ -293,6 +301,8 @@ static struct option long_options[]=
   {"target", required_argument, NULL, 'b'},
   {"version", no_argument, NULL, 'V'},
   {"wide", no_argument, NULL, 'w'},
+  {"prefix", required_argument, NULL, OPTION_PREFIX},
+  {"prefix-strip", required_argument, NULL, OPTION_PREFIX_STRIP},
   {0, no_argument, 0, 0}
 };
 \f
@@ -1190,6 +1200,7 @@ show_line (bfd *abfd, asection *section, bfd_vma addr_offset)
   const char *filename;
   const char *functionname;
   unsigned int line;
+  bfd_boolean reloc;
 
   if (! with_line_numbers && ! with_source_code)
     return;
@@ -1203,6 +1214,44 @@ show_line (bfd *abfd, asection *section, bfd_vma addr_offset)
   if (functionname != NULL && *functionname == '\0')
     functionname = NULL;
 
+  if (filename
+      && IS_ABSOLUTE_PATH (filename)
+      && prefix)
+    {
+      char *path_up;
+      const char *fname = filename;
+      char *path = (char *) alloca (prefix_length + PATH_MAX + 1);
+
+      if (prefix_length)
+       memcpy (path, prefix, prefix_length);
+      path_up = path + prefix_length;
+
+      /* Build relocated filename, stripping off leading directories
+        from the initial filename if requested. */
+      if (prefix_strip > 0)
+       {
+         int level = 0;
+         const char *s;
+
+         /* Skip selected directory levels. */
+         for (s = fname + 1; *s != '\0' && level < prefix_strip; s++)
+           if (IS_DIR_SEPARATOR(*s))
+             {
+               fname = s;
+               level++;
+             }
+       }
+
+      /* Update complete filename. */
+      strncpy (path_up, fname, PATH_MAX);
+      path_up[PATH_MAX] = '\0';
+
+      filename = path;
+      reloc = TRUE;
+    }
+  else
+    reloc = FALSE;
+
   if (with_line_numbers)
     {
       if (functionname != NULL
@@ -1226,7 +1275,11 @@ show_line (bfd *abfd, asection *section, bfd_vma addr_offset)
       p = *pp;
 
       if (p == NULL)
+       {
+         if (reloc)
+           filename = xstrdup (filename);
          p = update_source_path (filename);
+       }
 
       if (p != NULL && line != p->last_line)
        {
@@ -1708,6 +1761,8 @@ disassemble_bytes (struct disassemble_info * info,
 static void
 disassemble_section (bfd *abfd, asection *section, void *info)
 {
+  const struct elf_backend_data * bed;
+  bfd_vma                      sign_adjust = 0;
   struct disassemble_info *    pinfo = (struct disassemble_info *) info;
   struct objdump_disasm_info * paux;
   unsigned int                 opb = pinfo->octets_per_byte;
@@ -1775,7 +1830,6 @@ disassemble_section (bfd *abfd, asection *section, void *info)
              qsort (rel_pp, rel_count, sizeof (arelent *), compare_relocs);
            }
        }
-
     }
   rel_ppend = rel_pp + rel_count;
 
@@ -1821,6 +1875,14 @@ disassemble_section (bfd *abfd, asection *section, void *info)
   sym = find_symbol_for_address (section->vma + addr_offset, info, &place);
   paux->require_sec = FALSE;
 
+  /* PR 9774: If the target used signed 32-bit addresses then we must make
+     sure that we sign extend the value that we calculate for 'addr' in the
+     loop below.  */
+  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
+      && (bed = get_elf_backend_data (abfd)) != NULL
+      && bed->sign_extend_vma)
+    sign_adjust = 0x80000000;
+
   /* Disassemble a block of instructions up to the address associated with
      the symbol we have just found.  Then print the symbol and find the
      next symbol on.  Repeat until we have disassembled the entire section
@@ -1833,6 +1895,7 @@ disassemble_section (bfd *abfd, asection *section, void *info)
       bfd_boolean insns;
 
       addr = section->vma + addr_offset;
+      addr = (addr ^ sign_adjust) - sign_adjust;
 
       if (sym != NULL && bfd_asymbol_value (sym) <= addr)
        {
@@ -1903,6 +1966,7 @@ disassemble_section (bfd *abfd, asection *section, void *info)
         disassembling them.  */
       if (disassemble_all
          || sym == NULL
+         || sym->section != section
          || bfd_asymbol_value (sym) > addr
          || ((sym->flags & BSF_OBJECT) == 0
              && (strstr (bfd_asymbol_name (sym), "gnu_compiled")
@@ -2722,8 +2786,6 @@ dump_reloc_set (bfd *abfd, asection *sec, arelent **relpp, long relcount)
       if (sym_name)
        {
          objdump_print_symname (abfd, NULL, *q->sym_ptr_ptr);
-         if ((*q->sym_ptr_ptr)->flags & BSF_INDIRECT_FUNCTION)
-           printf ("() ");
        }
       else
        {
@@ -3152,6 +3214,18 @@ main (int argc, char **argv)
          if ((start_address != (bfd_vma) -1) && stop_address <= start_address)
            fatal (_("error: the stop address should be after the start address"));
          break;
+       case OPTION_PREFIX:
+         prefix = optarg;
+         prefix_length = strlen (prefix);
+         /* Remove an unnecessary trailing '/' */
+         while (IS_DIR_SEPARATOR (prefix[prefix_length - 1]))
+           prefix_length--;
+         break;
+       case OPTION_PREFIX_STRIP:
+         prefix_strip = atoi (optarg);
+         if (prefix_strip < 0)
+           fatal (_("error: prefix strip must be non-negative"));
+         break;
        case 'E':
          if (strcmp (optarg, "B") == 0)
            endian = BFD_ENDIAN_BIG;