X-Git-Url: https://oss.titaniummirror.com/gitweb?p=msp430-binutils.git;a=blobdiff_plain;f=binutils%2Fobjdump.c;h=dd0d0ef50c27a1c1438694658376c509a4cc13ec;hp=03bc4d60ae12a887bb202ffd461f41bd0fd87b9e;hb=88750007d7869f178f0ba528f41efd3b74c424cf;hpb=6df9443a374e2b81278c61b8afc0a1eef7db280b diff --git a/binutils/objdump.c b/binutils/objdump.c index 03bc4d6..dd0d0ef 100644 --- 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 + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -52,6 +52,7 @@ #include "sysdep.h" #include "bfd.h" +#include "elf-bfd.h" #include "progress.h" #include "bucomm.h" #include "dwarf.h" @@ -60,6 +61,7 @@ #include "dis-asm.h" #include "libiberty.h" #include "demangle.h" +#include "filenames.h" #include "debug.h" #include "budbg.h" @@ -102,6 +104,7 @@ static bfd_boolean disassemble_all; /* -D */ static int disassemble_zeroes; /* --disassemble-zeroes */ static bfd_boolean formats_info; /* -i */ static int wide_output; /* -w */ +static int insn_width; /* --insn-width */ static bfd_vma start_address = (bfd_vma) -1; /* --start-address */ static bfd_vma stop_address = (bfd_vma) -1; /* --stop-address */ static int dump_debugging; /* --debugging */ @@ -109,6 +112,10 @@ static int dump_debugging_tags; /* --debugging-tags */ 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. */ @@ -171,6 +178,8 @@ static bfd_size_type stab_size; static char *strtab; static bfd_size_type stabstr_size; + +static bfd_boolean is_relocatable = FALSE; static void usage (FILE *stream, int status) @@ -191,7 +200,9 @@ usage (FILE *stream, int status) -g, --debugging Display debug information in object file\n\ -e, --debugging-tags Display debug information using ctags style\n\ -G, --stabs Display (in raw form) any STABS info in the file\n\ - -W, --dwarf Display DWARF info in the file\n\ + -W[lLiaprmfFsoR] or\n\ + --dwarf[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,=str,=loc,=Ranges]\n\ + Display DWARF info in the file\n\ -t, --syms Display the contents of the symbol table(s)\n\ -T, --dynamic-syms Display the contents of the dynamic symbol table\n\ -r, --reloc Display the relocation entries in the file\n\ @@ -214,6 +225,7 @@ usage (FILE *stream, int status) --file-start-context Include context from start of file (with -S)\n\ -I, --include=DIR Add DIR to search list for source files\n\ -l, --line-numbers Include line numbers and filenames in output\n\ + -F, --file-offsets Include file offsets when displaying information\n\ -C, --demangle[=STYLE] Decode mangled/processed symbol names\n\ The STYLE, if specified, can be `auto', `gnu',\n\ `lucid', `arm', `hp', `edg', `gnu-v3', `java'\n\ @@ -224,8 +236,11 @@ usage (FILE *stream, int status) --stop-address=ADDR Only process data whose address is <= ADDR\n\ --prefix-addresses Print complete address alongside disassembly\n\ --[no-]show-raw-insn Display hex alongside symbolic disassembly\n\ + --insn-width=WIDTH Display WIDTH bytes on a signle line for -d\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); @@ -243,6 +258,10 @@ enum option_values OPTION_ENDIAN=150, OPTION_START_ADDRESS, OPTION_STOP_ADDRESS, + OPTION_DWARF, + OPTION_PREFIX, + OPTION_PREFIX_STRIP, + OPTION_INSN_WIDTH, OPTION_ADJUST_VMA }; @@ -264,6 +283,7 @@ static struct option long_options[]= {"dynamic-syms", no_argument, NULL, 'T'}, {"endian", required_argument, NULL, OPTION_ENDIAN}, {"file-headers", no_argument, NULL, 'f'}, + {"file-offsets", no_argument, NULL, 'F'}, {"file-start-context", no_argument, &file_start_context, 1}, {"full-contents", no_argument, NULL, 's'}, {"headers", no_argument, NULL, 'h'}, @@ -279,7 +299,7 @@ static struct option long_options[]= {"source", no_argument, NULL, 'S'}, {"special-syms", no_argument, &dump_special_syms, 1}, {"include", required_argument, NULL, 'I'}, - {"dwarf", no_argument, NULL, 'W'}, + {"dwarf", optional_argument, NULL, OPTION_DWARF}, {"stabs", no_argument, NULL, 'G'}, {"start-address", required_argument, NULL, OPTION_START_ADDRESS}, {"stop-address", required_argument, NULL, OPTION_STOP_ADDRESS}, @@ -287,6 +307,9 @@ 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}, + {"insn-width", required_argument, NULL, OPTION_INSN_WIDTH}, {0, no_argument, 0, 0} }; @@ -297,6 +320,23 @@ nonfatal (const char *msg) exit_status = 1; } +/* Returns TRUE if the specified section should be dumped. */ + +static bfd_boolean +process_section_p (asection * section) +{ + size_t i; + + if (only == NULL) + return TRUE; + + for (i = 0; i < only_used; i++) + if (strcmp (only [i], section->name) == 0) + return TRUE; + + return FALSE; +} + static void dump_section_header (bfd *abfd, asection *section, void *ignored ATTRIBUTE_UNUSED) @@ -309,6 +349,10 @@ dump_section_header (bfd *abfd, asection *section, if (section->flags & SEC_LINKER_CREATED) return; + /* PR 10413: Skip sections that we are ignoring. */ + if (! process_section_p (section)) + return; + printf ("%3d %-13s %08lx ", section->index, bfd_get_section_name (abfd, section), (unsigned long) bfd_section_size (abfd, section) / opb); @@ -423,7 +467,7 @@ slurp_symtab (bfd *abfd) if (storage < 0) bfd_fatal (bfd_get_filename (abfd)); if (storage) - sy = xmalloc (storage); + sy = (asymbol **) xmalloc (storage); symcount = bfd_canonicalize_symtab (abfd, sy); if (symcount < 0) @@ -452,7 +496,7 @@ slurp_dynamic_symtab (bfd *abfd) bfd_fatal (bfd_get_filename (abfd)); } if (storage) - sy = xmalloc (storage); + sy = (asymbol **) xmalloc (storage); dynsymcount = bfd_canonicalize_dynamic_symtab (abfd, sy); if (dynsymcount < 0) @@ -703,7 +747,7 @@ find_symbol_for_address (bfd_vma vma, aux = (struct objdump_disasm_info *) info->application_data; abfd = aux->abfd; sec = aux->sec; - opb = bfd_octets_per_byte (abfd); + opb = info->octets_per_byte; /* Perform a binary search looking for the closest symbol to the required value. We are searching the range (min, max]. */ @@ -734,6 +778,27 @@ find_symbol_for_address (bfd_vma vma, == bfd_asymbol_value (sorted_syms[thisplace - 1]))) --thisplace; + /* Prefer a symbol in the current section if we have multple symbols + with the same value, as can occur with overlays or zero size + sections. */ + min = thisplace; + while (min < max + && (bfd_asymbol_value (sorted_syms[min]) + == bfd_asymbol_value (sorted_syms[thisplace]))) + { + if (sorted_syms[min]->section == sec + && info->symbol_is_valid (sorted_syms[min], info)) + { + thisplace = min; + + if (place != NULL) + *place = thisplace; + + return sorted_syms[thisplace]; + } + ++min; + } + /* If the file is relocatable, and the symbol could be from this section, prefer a symbol from this section over symbols from others, even if the other symbol's value might be closer. @@ -753,19 +818,9 @@ find_symbol_for_address (bfd_vma vma, || !info->symbol_is_valid (sorted_syms[thisplace], info)) { long i; - long newplace; - - for (i = thisplace + 1; i < sorted_symcount; i++) - { - if (bfd_asymbol_value (sorted_syms[i]) - != bfd_asymbol_value (sorted_syms[thisplace])) - break; - } + long newplace = sorted_symcount; - --i; - newplace = sorted_symcount; - - for (; i >= 0; i--) + for (i = min - 1; i >= 0; i--) { if ((sorted_syms[i]->section == sec || !want_section) && info->symbol_is_valid (sorted_syms[i], info)) @@ -856,6 +911,10 @@ objdump_print_addr_with_sym (bfd *abfd, asection *sec, asymbol *sym, } (*info->fprintf_func) (info->stream, ">"); } + + if (display_file_offsets) + info->fprintf_func (info->stream, _(" (File Offset: 0x%lx)"), + (long int)(sec->filepos + (vma - sec->vma))); } /* Print an address (VMA), symbolically if possible. @@ -867,18 +926,22 @@ objdump_print_addr (bfd_vma vma, bfd_boolean skip_zeroes) { struct objdump_disasm_info *aux; - asymbol *sym = NULL; /* Initialize to avoid compiler warning. */ + asymbol *sym = NULL; bfd_boolean skip_find = FALSE; + aux = (struct objdump_disasm_info *) info->application_data; + if (sorted_symcount < 1) { (*info->fprintf_func) (info->stream, "0x"); objdump_print_value (vma, info, skip_zeroes); + + if (display_file_offsets) + info->fprintf_func (info->stream, _(" (File Offset: 0x%lx)"), + (long int)(aux->sec->filepos + (vma - aux->sec->vma))); return; } - aux = (struct objdump_disasm_info *) info->application_data; - if (aux->reloc != NULL && aux->reloc->sym_ptr_ptr != NULL && * aux->reloc->sym_ptr_ptr != NULL) @@ -950,7 +1013,7 @@ static struct print_file_list *print_files; #define SHOW_PRECEDING_CONTEXT_LINES (5) -/* Read a complete file into memory. */ +/* Read a complete file into memory. */ static const char * slurp_file (const char *fn, size_t *size) @@ -961,7 +1024,7 @@ slurp_file (const char *fn, size_t *size) #endif const char *map; struct stat st; - int fd = open (fn, O_RDONLY); + int fd = open (fn, O_RDONLY | O_BINARY); if (fd < 0) return NULL; @@ -977,7 +1040,7 @@ slurp_file (const char *fn, size_t *size) return map; } #endif - map = malloc (*size); + map = (const char *) malloc (*size); if (!map || (size_t) read (fd, (char *)map, *size) != *size) { free ((void *)map); @@ -1032,7 +1095,7 @@ index_file (const char *map, size_t size, unsigned int *maxline) if (line_map_size < lineno + 1) line_map_size = lineno + 1; newsize = line_map_size * sizeof (char *); - linemap = xrealloc (linemap, newsize); + linemap = (const char **) xrealloc (linemap, newsize); } linemap[lineno++] = lstart; @@ -1051,7 +1114,7 @@ try_print_file_open (const char *origname, const char *modname) { struct print_file_list *p; - p = xmalloc (sizeof (struct print_file_list)); + p = (struct print_file_list *) xmalloc (sizeof (struct print_file_list)); p->map = slurp_file (modname, &p->mapsize); if (p->map == NULL) @@ -1130,14 +1193,17 @@ static void print_line (struct print_file_list *p, unsigned int line) { const char *l; + size_t len; --line; if (line >= p->maxline) return; l = p->linemap [line]; - fwrite (l, 1, strcspn (l, "\n\r"), stdout); - putchar ('\n'); -} + /* Test fwrite return value to quiet glibc warning. */ + len = strcspn (l, "\n\r"); + if (len == 0 || fwrite (l, len, 1, stdout) == 1) + putchar ('\n'); +} /* Print a range of source code lines. */ @@ -1162,6 +1228,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; @@ -1175,6 +1242,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 @@ -1198,7 +1303,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) { @@ -1224,7 +1333,7 @@ show_line (bfd *abfd, asection *section, bfd_vma addr_offset) { if (prev_functionname != NULL) free (prev_functionname); - prev_functionname = xmalloc (strlen (functionname) + 1); + prev_functionname = (char *) xmalloc (strlen (functionname) + 1); strcpy (prev_functionname, functionname); } @@ -1260,31 +1369,13 @@ objdump_sprintf (SFILE *f, const char *format, ...) break; f->alloc = (f->alloc + n) * 2; - f->buffer = xrealloc (f->buffer, f->alloc); + f->buffer = (char *) xrealloc (f->buffer, f->alloc); } f->pos += n; return n; } -/* Returns TRUE if the specified section should be dumped. */ - -static bfd_boolean -process_section_p (asection * section) -{ - size_t i; - - if (only == NULL) - return TRUE; - - for (i = 0; i < only_used; i++) - if (strcmp (only [i], section->name) == 0) - return TRUE; - - return FALSE; -} - - /* The number of zeroes we want to see before we start skipping them. The number is arbitrarily chosen. */ @@ -1328,10 +1419,12 @@ disassemble_bytes (struct disassemble_info * info, section = aux->sec; sfile.alloc = 120; - sfile.buffer = xmalloc (sfile.alloc); + sfile.buffer = (char *) xmalloc (sfile.alloc); sfile.pos = 0; - if (insns) + if (insn_width) + octets_per_line = insn_width; + else if (insns) octets_per_line = 4; else octets_per_line = 16; @@ -1344,19 +1437,18 @@ disassemble_bytes (struct disassemble_info * info, if (! prefix_addresses) { char buf[30]; - char *s; - - bfd_sprintf_vma - (aux->abfd, buf, - (section->vma - + bfd_section_size (section->owner, section) / opb)); - s = buf; - while (s[0] == '0' && s[1] == '0' && s[2] == '0' && s[3] == '0' - && s[4] == '0') - { - skip_addr_chars += 4; - s += 4; - } + + bfd_sprintf_vma (aux->abfd, buf, section->vma + section->size / opb); + + while (buf[skip_addr_chars] == '0') + ++skip_addr_chars; + + /* Don't discard zeros on overflow. */ + if (buf[skip_addr_chars] == '\0' && section->vma != 0) + skip_addr_chars = 0; + + if (skip_addr_chars != 0) + skip_addr_chars = (skip_addr_chars - 1) & -4; } info->insn_info_valid = 0; @@ -1385,8 +1477,6 @@ disassemble_bytes (struct disassemble_info * info, || (z == stop_offset * opb && z - addr_offset * opb < skip_zeroes_at_end))) { - printf ("\t...\n"); - /* If there are more nonzero octets to follow, we only skip zeroes in multiples of 4, to try to avoid running over the start of an instruction which happens to start with @@ -1395,6 +1485,17 @@ disassemble_bytes (struct disassemble_info * info, z = addr_offset * opb + ((z - addr_offset * opb) &~ 3); octets = z - addr_offset * opb; + + /* If we are going to display more data, and we are displaying + file offsets, then tell the user how many zeroes we skip + and the file offset from where we resume dumping. */ + if (display_file_offsets && ((addr_offset + (octets / opb)) < stop_offset)) + printf ("\t... (skipping %d zeroes, resuming at file offset: 0x%lx)\n", + octets / opb, + (unsigned long) (section->filepos + + (addr_offset + (octets / opb)))); + else + printf ("\t...\n"); } else { @@ -1433,7 +1534,9 @@ disassemble_bytes (struct disassemble_info * info, info->stream = &sfile; info->bytes_per_line = 0; info->bytes_per_chunk = 0; - info->flags = 0; + info->flags = disassemble_all ? DISASSEMBLE_DATA : 0; + if (machine) + info->flags |= USER_SPECIFIED_MACHINE_TYPE; if (info->disassembler_needs_relocs && (bfd_get_file_flags (aux->abfd) & EXEC_P) == 0 @@ -1462,7 +1565,7 @@ disassemble_bytes (struct disassemble_info * info, || (distance_to_rel > 0 && distance_to_rel < (bfd_signed_vma) (previous_octets/ opb))) { - info->flags = INSN_HAS_RELOC; + info->flags |= INSN_HAS_RELOC; aux->reloc = **relppp; } else @@ -1472,7 +1575,7 @@ disassemble_bytes (struct disassemble_info * info, octets = (*disassemble_fn) (section->vma + addr_offset, info); info->fprintf_func = (fprintf_ftype) fprintf; info->stream = stdout; - if (info->bytes_per_line != 0) + if (insn_width == 0 && info->bytes_per_line != 0) octets_per_line = info->bytes_per_line; if (octets < 0) { @@ -1672,6 +1775,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; @@ -1730,7 +1835,7 @@ disassemble_section (bfd *abfd, asection *section, void *info) if (relsize > 0) { - rel_ppstart = rel_pp = xmalloc (relsize); + rel_ppstart = rel_pp = (arelent **) xmalloc (relsize); rel_count = bfd_canonicalize_reloc (abfd, section, rel_pp, syms); if (rel_count < 0) bfd_fatal (bfd_get_filename (abfd)); @@ -1739,11 +1844,10 @@ disassemble_section (bfd *abfd, asection *section, void *info) qsort (rel_pp, rel_count, sizeof (arelent *), compare_relocs); } } - } rel_ppend = rel_pp + rel_count; - data = xmalloc (datasize); + data = (bfd_byte *) xmalloc (datasize); bfd_get_section_contents (abfd, section, data, 0, datasize); @@ -1777,13 +1881,24 @@ disassemble_section (bfd *abfd, asection *section, void *info) && (*rel_pp)->address < rel_offset + addr_offset) ++rel_pp; - printf (_("Disassembly of section %s:\n"), section->name); + if (addr_offset < stop_offset) + printf (_("\nDisassembly of section %s:\n"), section->name); /* Find the nearest symbol forwards from our current position. */ paux->require_sec = TRUE; - sym = find_symbol_for_address (section->vma + addr_offset, info, &place); + sym = (asymbol *) find_symbol_for_address (section->vma + addr_offset, + (struct disassemble_info *) info, + &place); paux->require_sec = FALSE; + /* PR 9774: If the target used signed 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 = (bfd_vma) 1 << (bed->s->arch_size - 1); + /* 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 @@ -1796,6 +1911,7 @@ disassemble_section (bfd *abfd, asection *section, void *info) bfd_boolean insns; addr = section->vma + addr_offset; + addr = ((addr & ((sign_adjust << 1) - 1)) ^ sign_adjust) - sign_adjust; if (sym != NULL && bfd_asymbol_value (sym) <= addr) { @@ -1858,7 +1974,8 @@ disassemble_section (bfd *abfd, asection *section, void *info) else nextstop_offset = bfd_asymbol_value (nextsym) - section->vma; - if (nextstop_offset > stop_offset) + if (nextstop_offset > stop_offset + || nextstop_offset <= addr_offset) nextstop_offset = stop_offset; /* If a symbol is explicitly marked as being an object @@ -1866,6 +1983,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") @@ -1880,7 +1998,7 @@ disassemble_section (bfd *abfd, asection *section, void *info) disassemble_bytes (pinfo, paux->disassemble_fn, insns, data, addr_offset, nextstop_offset, rel_offset, &rel_pp, rel_ppend); - + addr_offset = nextstop_offset; sym = nextsym; } @@ -1907,7 +2025,8 @@ disassemble_data (bfd *abfd) /* We make a copy of syms to sort. We don't want to sort syms because that will screw up the relocs. */ sorted_symcount = symcount ? symcount : dynsymcount; - sorted_syms = xmalloc ((sorted_symcount + synthcount) * sizeof (asymbol *)); + sorted_syms = (asymbol **) xmalloc ((sorted_symcount + synthcount) + * sizeof (asymbol *)); memcpy (sorted_syms, symcount ? syms : dynsyms, sorted_symcount * sizeof (asymbol *)); @@ -1948,7 +2067,7 @@ disassemble_data (bfd *abfd) { struct bfd_target *xvec; - xvec = xmalloc (sizeof (struct bfd_target)); + xvec = (struct bfd_target *) xmalloc (sizeof (struct bfd_target)); memcpy (xvec, abfd->xvec, sizeof (struct bfd_target)); xvec->byteorder = endian; abfd->xvec = xvec; @@ -1996,7 +2115,7 @@ disassemble_data (bfd *abfd) if (relsize > 0) { - aux.dynrelbuf = xmalloc (relsize); + aux.dynrelbuf = (arelent **) xmalloc (relsize); aux.dynrelcount = bfd_canonicalize_dynamic_reloc (abfd, aux.dynrelbuf, dynsyms); @@ -2018,38 +2137,24 @@ disassemble_data (bfd *abfd) free (sorted_syms); } -int -load_debug_section (enum dwarf_section_display_enum debug, void *file) +static int +load_specific_debug_section (enum dwarf_section_display_enum debug, + asection *sec, void *file) { struct dwarf_section *section = &debug_displays [debug].section; - bfd *abfd = file; - asection *sec; + bfd *abfd = (bfd *) file; bfd_boolean ret; + int section_is_compressed; /* If it is already loaded, do nothing. */ if (section->start != NULL) return 1; - /* Locate the debug section. */ - sec = bfd_get_section_by_name (abfd, section->name); - if (sec == NULL) - return 0; + section_is_compressed = section->name == section->compressed_name; - /* Compute a bias to be added to offsets found within the DWARF debug - information. These offsets are meant to be relative to the start of - the dwarf section, and hence the bias should be 0. For MACH-O however - a dwarf section is really just a region of a much larger section and so - the bias is the address of the start of that area within the larger - section. This test is important for PE and COFF based targets which - use DWARF debug information, since unlike ELF, they do not allow the - dwarf sections to be placed at address 0. */ - if (bfd_get_flavour (abfd) == bfd_target_mach_o_flavour) - section->address = bfd_get_section_vma (abfd, sec); - else - section->address = 0; - + section->address = 0; section->size = bfd_get_section_size (sec); - section->start = xmalloc (section->size); + section->start = (unsigned char *) xmalloc (section->size); if (is_relocatable && debug_displays [debug].relocate) ret = bfd_simple_get_relocated_section_contents (abfd, @@ -2060,14 +2165,54 @@ load_debug_section (enum dwarf_section_display_enum debug, void *file) ret = bfd_get_section_contents (abfd, sec, section->start, 0, section->size); - if (!ret) + if (! ret) { free_debug_section (debug); printf (_("\nCan't get contents for section '%s'.\n"), section->name); + return 0; + } + + if (section_is_compressed) + { + bfd_size_type size = section->size; + if (! bfd_uncompress_section_contents (§ion->start, &size)) + { + free_debug_section (debug); + printf (_("\nCan't uncompress section '%s'.\n"), section->name); + return 0; + } + section->size = size; } - return ret; + return 1; +} + +int +load_debug_section (enum dwarf_section_display_enum debug, void *file) +{ + struct dwarf_section *section = &debug_displays [debug].section; + bfd *abfd = (bfd *) file; + asection *sec; + + /* If it is already loaded, do nothing. */ + if (section->start != NULL) + return 1; + + /* Locate the debug section. */ + sec = bfd_get_section_by_name (abfd, section->uncompressed_name); + if (sec != NULL) + section->name = section->uncompressed_name; + else + { + sec = bfd_get_section_by_name (abfd, section->compressed_name); + if (sec != NULL) + section->name = section->compressed_name; + } + if (sec == NULL) + return 0; + + return load_specific_debug_section (debug, sec, file); } void @@ -2090,7 +2235,7 @@ dump_dwarf_section (bfd *abfd, asection *section, { const char *name = bfd_get_section_name (abfd, section); const char *match; - enum dwarf_section_display_enum i; + int i; if (CONST_STRNEQ (name, ".gnu.linkonce.wi.")) match = ".debug_info"; @@ -2098,69 +2243,29 @@ dump_dwarf_section (bfd *abfd, asection *section, match = name; for (i = 0; i < max; i++) - if (strcmp (debug_displays[i].section.name, match) == 0) + if ((strcmp (debug_displays [i].section.uncompressed_name, match) == 0 + || strcmp (debug_displays [i].section.compressed_name, match) == 0) + && debug_displays [i].enabled != NULL + && *debug_displays [i].enabled) { - if (!debug_displays[i].eh_frame) + struct dwarf_section *sec = &debug_displays [i].section; + + if (strcmp (sec->uncompressed_name, match) == 0) + sec->name = sec->uncompressed_name; + else + sec->name = sec->compressed_name; + if (load_specific_debug_section ((enum dwarf_section_display_enum) i, + section, abfd)) { - struct dwarf_section *sec = &debug_displays [i].section; - - if (load_debug_section (i, abfd)) - { - debug_displays[i].display (sec, abfd); - - if (i != info && i != abbrev) - free_debug_section (i); - } + debug_displays [i].display (sec, abfd); + + if (i != info && i != abbrev) + free_debug_section ((enum dwarf_section_display_enum) i); } break; } } -static const char *mach_o_dwarf_sections [] = { - "LC_SEGMENT.__DWARFA.__debug_abbrev", /* .debug_abbrev */ - "LC_SEGMENT.__DWARFA.__debug_aranges", /* .debug_aranges */ - "LC_SEGMENT.__DWARFA.__debug_frame", /* .debug_frame */ - "LC_SEGMENT.__DWARFA.__debug_info", /* .debug_info */ - "LC_SEGMENT.__DWARFA.__debug_line", /* .debug_line */ - "LC_SEGMENT.__DWARFA.__debug_pubnames", /* .debug_pubnames */ - ".eh_frame", /* .eh_frame */ - "LC_SEGMENT.__DWARFA.__debug_macinfo", /* .debug_macinfo */ - "LC_SEGMENT.__DWARFA.__debug_str", /* .debug_str */ - "LC_SEGMENT.__DWARFA.__debug_loc", /* .debug_loc */ - "LC_SEGMENT.__DWARFA.__debug_pubtypes", /* .debug_pubtypes */ - "LC_SEGMENT.__DWARFA.__debug_ranges", /* .debug_ranges */ - "LC_SEGMENT.__DWARFA.__debug_static_func", /* .debug_static_func */ - "LC_SEGMENT.__DWARFA.__debug_static_vars", /* .debug_static_vars */ - "LC_SEGMENT.__DWARFA.__debug_types", /* .debug_types */ - "LC_SEGMENT.__DWARFA.__debug_weaknames" /* .debug_weaknames */ -}; - -static const char *generic_dwarf_sections [max]; - -static void -check_mach_o_dwarf (bfd *abfd) -{ - static enum bfd_flavour old_flavour = bfd_target_unknown_flavour; - enum bfd_flavour current_flavour = bfd_get_flavour (abfd); - enum dwarf_section_display_enum i; - - if (generic_dwarf_sections [0] == NULL) - for (i = 0; i < max; i++) - generic_dwarf_sections [i] = debug_displays[i].section.name; - - if (old_flavour != current_flavour) - { - if (current_flavour == bfd_target_mach_o_flavour) - for (i = 0; i < max; i++) - debug_displays[i].section.name = mach_o_dwarf_sections [i]; - else if (old_flavour == bfd_target_mach_o_flavour) - for (i = 0; i < max; i++) - debug_displays[i].section.name = generic_dwarf_sections [i]; - - old_flavour = current_flavour; - } -} - /* Dump the dwarf debugging information. */ static void @@ -2179,7 +2284,11 @@ dump_dwarf (bfd *abfd) else abort (); - check_mach_o_dwarf (abfd); + if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) + { + const struct elf_backend_data *bed = get_elf_backend_data (abfd); + init_dwarf_regnames (bed->elf_machine_code); + } bfd_map_over_sections (abfd, dump_dwarf_section, NULL); @@ -2204,7 +2313,7 @@ read_section_stabs (bfd *abfd, const char *sect_name, bfd_size_type *size_ptr) } size = bfd_section_size (abfd, stabsect); - contents = xmalloc (size); + contents = (char *) xmalloc (size); if (! bfd_get_section_contents (abfd, stabsect, contents, 0, size)) { @@ -2371,6 +2480,10 @@ dump_stabs (bfd *abfd) dump_stabs_section (abfd, ".stab", ".stabstr"); dump_stabs_section (abfd, ".stab.excl", ".stab.exclstr"); dump_stabs_section (abfd, ".stab.index", ".stab.indexstr"); + + /* For Darwin. */ + dump_stabs_section (abfd, "LC_SYMTAB.stabs", "LC_SYMTAB.stabstr"); + dump_stabs_section (abfd, "$GDB_SYMBOLS$", "$GDB_STRINGS$"); } @@ -2436,12 +2549,6 @@ dump_section (bfd *abfd, asection *section, void *dummy ATTRIBUTE_UNUSED) if ((datasize = bfd_section_size (abfd, section)) == 0) return; - printf (_("Contents of section %s:\n"), section->name); - - data = xmalloc (datasize); - - bfd_get_section_contents (abfd, section, data, 0, datasize); - /* Compute the address range to display. */ if (start_address == (bfd_vma) -1 || start_address < section->vma) @@ -2462,6 +2569,19 @@ dump_section (bfd *abfd, asection *section, void *dummy ATTRIBUTE_UNUSED) stop_offset = datasize / opb; } + if (start_offset >= stop_offset) + return; + + printf (_("Contents of section %s:"), section->name); + if (display_file_offsets) + printf (_(" (Starting at file offset: 0x%lx)"), + (unsigned long) (section->filepos + start_offset)); + printf ("\n"); + + data = (bfd_byte *) xmalloc (datasize); + + bfd_get_section_contents (abfd, section, data, 0, datasize); + width = 4; bfd_sprintf_vma (abfd, buf, start_offset + section->vma); @@ -2699,8 +2819,11 @@ dump_reloc_set (bfd *abfd, asection *sec, arelent **relpp, long relcount) printf (" %-16s ", q->howto->name); else printf (" %-16d ", q->howto->type); + if (sym_name) - objdump_print_symname (abfd, NULL, *q->sym_ptr_ptr); + { + objdump_print_symname (abfd, NULL, *q->sym_ptr_ptr); + } else { if (section_name == NULL) @@ -2746,7 +2869,7 @@ dump_relocs_in_section (bfd *abfd, return; } - relpp = xmalloc (relsize); + relpp = (arelent **) xmalloc (relsize); relcount = bfd_canonicalize_reloc (abfd, section, relpp, syms); if (relcount < 0) @@ -2785,7 +2908,7 @@ dump_dynamic_relocs (bfd *abfd) printf (" (none)\n\n"); else { - relpp = xmalloc (relsize); + relpp = (arelent **) xmalloc (relsize); relcount = bfd_canonicalize_dynamic_reloc (abfd, relpp, dynsyms); if (relcount < 0) @@ -2810,8 +2933,8 @@ add_include_path (const char *path) if (path[0] == 0) return; include_path_count++; - include_paths = xrealloc (include_paths, - include_path_count * sizeof (*include_paths)); + include_paths = (const char **) + xrealloc (include_paths, include_path_count * sizeof (*include_paths)); #ifdef HAVE_DOS_BASED_FILE_SYSTEM if (path[1] == ':' && path[2] == 0) path = concat (path, ".", (const char *) 0); @@ -2899,7 +3022,7 @@ dump_bfd (bfd *abfd) { void *dhandle; - dhandle = read_debugging_info (abfd, syms, symcount); + dhandle = read_debugging_info (abfd, syms, symcount, TRUE); if (dhandle != NULL) { if (!print_debugging_info (stdout, dhandle, abfd, syms, @@ -2911,6 +3034,12 @@ dump_bfd (bfd *abfd) exit_status = 1; } } + /* PR 6483: If there was no STABS or IEEE debug + info in the file, try DWARF instead. */ + else if (! dump_dwarf_section_info) + { + dump_dwarf (abfd); + } } if (syms) @@ -3056,7 +3185,8 @@ main (int argc, char **argv) bfd_init (); set_default_bfd_target (); - while ((c = getopt_long (argc, argv, "pib:m:M:VvCdDlfaHhrRtTxsSI:j:wE:zgeGW", + while ((c = getopt_long (argc, argv, + "pib:m:M:VvCdDlfFaHhrRtTxsSI:j:wE:zgeGW::", long_options, (int *) 0)) != EOF) { @@ -3071,7 +3201,7 @@ main (int argc, char **argv) if (disassembler_options) /* Ignore potential memory leak for now. */ disassembler_options = concat (disassembler_options, ",", - optarg, NULL); + optarg, (const char *) NULL); else disassembler_options = optarg; break; @@ -3079,10 +3209,13 @@ main (int argc, char **argv) if (only_used == only_size) { only_size += 8; - only = xrealloc (only, only_size * sizeof (char *)); + only = (char **) xrealloc (only, only_size * sizeof (char *)); } only [only_used++] = optarg; break; + case 'F': + display_file_offsets = TRUE; + break; case 'l': with_line_numbers = TRUE; break; @@ -3111,9 +3244,30 @@ main (int argc, char **argv) break; case OPTION_START_ADDRESS: start_address = parse_vma (optarg, "--start-address"); + if ((stop_address != (bfd_vma) -1) && stop_address <= start_address) + fatal (_("error: the start address should be before the end address")); break; case OPTION_STOP_ADDRESS: stop_address = parse_vma (optarg, "--stop-address"); + 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 OPTION_INSN_WIDTH: + insn_width = strtoul (optarg, NULL, 0); + if (insn_width <= 0) + fatal (_("error: instruction width must be positive")); break; case 'E': if (strcmp (optarg, "B") == 0) @@ -3200,16 +3354,18 @@ main (int argc, char **argv) case 'W': dump_dwarf_section_info = TRUE; seenflag = TRUE; - do_debug_info = 1; - do_debug_abbrevs = 1; - do_debug_lines = 1; - do_debug_pubnames = 1; - do_debug_aranges = 1; - do_debug_ranges = 1; - do_debug_frames = 1; - do_debug_macinfo = 1; - do_debug_str = 1; - do_debug_loc = 1; + if (optarg) + dwarf_select_sections_by_letters (optarg); + else + dwarf_select_sections_all (); + break; + case OPTION_DWARF: + dump_dwarf_section_info = TRUE; + seenflag = TRUE; + if (optarg) + dwarf_select_sections_by_names (optarg); + else + dwarf_select_sections_all (); break; case 'G': dump_stab_section_info = TRUE;