From c5012cd8d53be0c5a3b0b4ae2a054b0a3dadbca2 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Tue, 13 Dec 2011 09:13:15 +0000 Subject: [PATCH] bfd/ 2011-12-13 Tristan Gingold * mach-o.c (bfd_mach_o_read_symtab_symbols): Make global. Remove prototype. (bfd_mach_o_section_get_entry_size): Make global. (bfd_mach_o_section_get_nbr_indirect): Likewise. (bfd_mach_o_read_symtab_strtab): Likewise. (struct bfd_mach_o_xlat_name): Move to mach-o.h (bfd_mach_o_print_flags): Move to binutils/od-macho.c (bfd_mach_o_get_name_of_null, bfd_mach_o_get_name): Likewise. (bfd_mach_o_cpu_name, bfd_mach_o_filetype_name): Likewise. (bfd_mach_o_header_flags_name): Likewise. (bfd_mach_o_load_command_name): Likewise. (bfd_mach_o_print_private_header): Likewise. (bfd_mach_o_print_section_map, bfd_mach_o_print_section): Likwise. (bfd_mach_o_print_segment, bfd_mach_o_print_dysymtab): Likewise. (bfd_mach_o_print_dyld_info): Likewise. (bfd_mach_o_print_private_bfd_data): Remove. (bfd_mach_o_type_name): Make global. (bfd_mach_o_section_attribute_name): Likewise. * mach-o.h (bfd_mach_o_xlat_name): Added. (bfd_mach_o_section_get_nbr_indirect) (bfd_mach_o_section_get_entry_size) (bfd_mach_o_read_symtab_symbols) (bfd_mach_o_read_symtab_strtab) (bfd_mach_o_section_attribute_name) (bfd_mach_o_section_type_name): Likewise. * mach-o-target.c (bfd_mach_o_bfd_print_private_bfd_data): Define. binutils/ 2011-12-13 Tristan Gingold * od-macho.c: New file. * objdump.h (objdump_private_desc_mach_o): Add. * configure.in: Add Mach-O od_vectors. * Makefile.am (CFILES): Add od-macho.c * configure: Regenerate. * Makefile.in: Regenerate. --- bfd/ChangeLog | 29 ++ bfd/mach-o-target.c | 1 + bfd/mach-o.c | 686 +----------------------------------------- bfd/mach-o.h | 16 +- binutils/ChangeLog | 9 + binutils/Makefile.am | 2 +- binutils/configure | 7 +- binutils/configure.in | 7 +- binutils/objdump.h | 3 + 9 files changed, 76 insertions(+), 684 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f6f8300f6f..ce03f4b71e 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,32 @@ +2011-12-13 Tristan Gingold + + * mach-o.c (bfd_mach_o_read_symtab_symbols): Make global. Remove + prototype. + (bfd_mach_o_section_get_entry_size): Make global. + (bfd_mach_o_section_get_nbr_indirect): Likewise. + (bfd_mach_o_read_symtab_strtab): Likewise. + (struct bfd_mach_o_xlat_name): Move to mach-o.h + (bfd_mach_o_print_flags): Move to binutils/od-macho.c + (bfd_mach_o_get_name_of_null, bfd_mach_o_get_name): Likewise. + (bfd_mach_o_cpu_name, bfd_mach_o_filetype_name): Likewise. + (bfd_mach_o_header_flags_name): Likewise. + (bfd_mach_o_load_command_name): Likewise. + (bfd_mach_o_print_private_header): Likewise. + (bfd_mach_o_print_section_map, bfd_mach_o_print_section): Likwise. + (bfd_mach_o_print_segment, bfd_mach_o_print_dysymtab): Likewise. + (bfd_mach_o_print_dyld_info): Likewise. + (bfd_mach_o_print_private_bfd_data): Remove. + (bfd_mach_o_type_name): Make global. + (bfd_mach_o_section_attribute_name): Likewise. + * mach-o.h (bfd_mach_o_xlat_name): Added. + (bfd_mach_o_section_get_nbr_indirect) + (bfd_mach_o_section_get_entry_size) + (bfd_mach_o_read_symtab_symbols) + (bfd_mach_o_read_symtab_strtab) + (bfd_mach_o_section_attribute_name) + (bfd_mach_o_section_type_name): Likewise. + * mach-o-target.c (bfd_mach_o_bfd_print_private_bfd_data): Define. + 2011-12-13 Chung-Lin Tang * elfxx-mips.c (mips_elf_calculate_relocation): Correct diff --git a/bfd/mach-o-target.c b/bfd/mach-o-target.c index 29682c9e45..5e12f849f3 100644 --- a/bfd/mach-o-target.c +++ b/bfd/mach-o-target.c @@ -28,6 +28,7 @@ #define bfd_mach_o_close_and_cleanup _bfd_generic_close_and_cleanup #define bfd_mach_o_bfd_free_cached_info _bfd_generic_bfd_free_cached_info #define bfd_mach_o_get_section_contents_in_window _bfd_generic_get_section_contents_in_window +#define bfd_mach_o_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data #define bfd_mach_o_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false) #define bfd_mach_o_bfd_is_local_label_name bfd_generic_is_local_label_name #define bfd_mach_o_get_lineno _bfd_nosymbols_get_lineno diff --git a/bfd/mach-o.c b/bfd/mach-o.c index a3866046ad..0a614c30ce 100644 --- a/bfd/mach-o.c +++ b/bfd/mach-o.c @@ -37,8 +37,6 @@ #define FILE_ALIGN(off, algn) \ (((off) + ((file_ptr) 1 << (algn)) - 1) & ((file_ptr) -1 << (algn))) -static int bfd_mach_o_read_symtab_symbols (bfd *); - unsigned int bfd_mach_o_version (bfd *abfd) { @@ -289,7 +287,7 @@ bfd_mach_o_convert_section_name_to_mach_o (bfd *abfd ATTRIBUTE_UNUSED, Must be called only for symbol pointer section and symbol stubs sections. */ -static unsigned int +unsigned int bfd_mach_o_section_get_entry_size (bfd *abfd, bfd_mach_o_section *sec) { switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK) @@ -309,7 +307,7 @@ bfd_mach_o_section_get_entry_size (bfd *abfd, bfd_mach_o_section *sec) Must be called only for symbol pointer section and symbol stubs sections. */ -static unsigned int +unsigned int bfd_mach_o_section_get_nbr_indirect (bfd *abfd, bfd_mach_o_section *sec) { unsigned int elsz; @@ -1921,7 +1919,7 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd, return TRUE; } -static bfd_boolean +bfd_boolean bfd_mach_o_read_symtab_strtab (bfd *abfd) { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); @@ -1965,7 +1963,7 @@ bfd_mach_o_read_symtab_strtab (bfd *abfd) return TRUE; } -static bfd_boolean +bfd_boolean bfd_mach_o_read_symtab_symbols (bfd *abfd) { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); @@ -3307,126 +3305,7 @@ bfd_mach_o_stack_addr (enum bfd_mach_o_cpu_type type) } } -typedef struct bfd_mach_o_xlat_name -{ - const char *name; - unsigned long val; -} -bfd_mach_o_xlat_name; - -static void -bfd_mach_o_print_flags (const bfd_mach_o_xlat_name *table, - unsigned long val, - FILE *file) -{ - int first = 1; - - for (; table->name; table++) - { - if (table->val & val) - { - if (!first) - fprintf (file, "+"); - fprintf (file, "%s", table->name); - val &= ~table->val; - first = 0; - } - } - if (val) - { - if (!first) - fprintf (file, "+"); - fprintf (file, "0x%lx", val); - return; - } - if (first) - fprintf (file, "-"); -} - -static const char * -bfd_mach_o_get_name_or_null (const bfd_mach_o_xlat_name *table, - unsigned long val) -{ - for (; table->name; table++) - if (table->val == val) - return table->name; - return NULL; -} - -static const char * -bfd_mach_o_get_name (const bfd_mach_o_xlat_name *table, unsigned long val) -{ - const char *res = bfd_mach_o_get_name_or_null (table, val); - - if (res == NULL) - return "*UNKNOWN*"; - else - return res; -} - -static const bfd_mach_o_xlat_name bfd_mach_o_cpu_name[] = -{ - { "vax", BFD_MACH_O_CPU_TYPE_VAX }, - { "mc680x0", BFD_MACH_O_CPU_TYPE_MC680x0 }, - { "i386", BFD_MACH_O_CPU_TYPE_I386 }, - { "mips", BFD_MACH_O_CPU_TYPE_MIPS }, - { "mc98000", BFD_MACH_O_CPU_TYPE_MC98000 }, - { "hppa", BFD_MACH_O_CPU_TYPE_HPPA }, - { "arm", BFD_MACH_O_CPU_TYPE_ARM }, - { "mc88000", BFD_MACH_O_CPU_TYPE_MC88000 }, - { "sparc", BFD_MACH_O_CPU_TYPE_SPARC }, - { "i860", BFD_MACH_O_CPU_TYPE_I860 }, - { "alpha", BFD_MACH_O_CPU_TYPE_ALPHA }, - { "powerpc", BFD_MACH_O_CPU_TYPE_POWERPC }, - { "powerpc_64", BFD_MACH_O_CPU_TYPE_POWERPC_64 }, - { "x86_64", BFD_MACH_O_CPU_TYPE_X86_64 }, - { NULL, 0} -}; - -static const bfd_mach_o_xlat_name bfd_mach_o_filetype_name[] = -{ - { "object", BFD_MACH_O_MH_OBJECT }, - { "execute", BFD_MACH_O_MH_EXECUTE }, - { "fvmlib", BFD_MACH_O_MH_FVMLIB }, - { "core", BFD_MACH_O_MH_CORE }, - { "preload", BFD_MACH_O_MH_PRELOAD }, - { "dylib", BFD_MACH_O_MH_DYLIB }, - { "dylinker", BFD_MACH_O_MH_DYLINKER }, - { "bundle", BFD_MACH_O_MH_BUNDLE }, - { "dylib_stub", BFD_MACH_O_MH_DYLIB_STUB }, - { "dym", BFD_MACH_O_MH_DSYM }, - { "kext_bundle", BFD_MACH_O_MH_KEXT_BUNDLE }, - { NULL, 0} -}; - -static const bfd_mach_o_xlat_name bfd_mach_o_header_flags_name[] = -{ - { "noundefs", BFD_MACH_O_MH_NOUNDEFS }, - { "incrlink", BFD_MACH_O_MH_INCRLINK }, - { "dyldlink", BFD_MACH_O_MH_DYLDLINK }, - { "bindatload", BFD_MACH_O_MH_BINDATLOAD }, - { "prebound", BFD_MACH_O_MH_PREBOUND }, - { "split_segs", BFD_MACH_O_MH_SPLIT_SEGS }, - { "lazy_init", BFD_MACH_O_MH_LAZY_INIT }, - { "twolevel", BFD_MACH_O_MH_TWOLEVEL }, - { "force_flat", BFD_MACH_O_MH_FORCE_FLAT }, - { "nomultidefs", BFD_MACH_O_MH_NOMULTIDEFS }, - { "nofixprebinding", BFD_MACH_O_MH_NOFIXPREBINDING }, - { "prebindable", BFD_MACH_O_MH_PREBINDABLE }, - { "allmodsbound", BFD_MACH_O_MH_ALLMODSBOUND }, - { "subsections_via_symbols", BFD_MACH_O_MH_SUBSECTIONS_VIA_SYMBOLS }, - { "canonical", BFD_MACH_O_MH_CANONICAL }, - { "weak_defines", BFD_MACH_O_MH_WEAK_DEFINES }, - { "binds_to_weak", BFD_MACH_O_MH_BINDS_TO_WEAK }, - { "allow_stack_execution", BFD_MACH_O_MH_ALLOW_STACK_EXECUTION }, - { "root_safe", BFD_MACH_O_MH_ROOT_SAFE }, - { "setuid_safe", BFD_MACH_O_MH_SETUID_SAFE }, - { "no_reexported_dylibs", BFD_MACH_O_MH_NO_REEXPORTED_DYLIBS }, - { "pie", BFD_MACH_O_MH_PIE }, - { NULL, 0} -}; - -static const bfd_mach_o_xlat_name bfd_mach_o_section_type_name[] = +const bfd_mach_o_xlat_name bfd_mach_o_section_type_name[] = { { "regular", BFD_MACH_O_S_REGULAR}, { "zerofill", BFD_MACH_O_S_ZEROFILL}, @@ -3448,7 +3327,7 @@ static const bfd_mach_o_xlat_name bfd_mach_o_section_type_name[] = { NULL, 0} }; -static const bfd_mach_o_xlat_name bfd_mach_o_section_attribute_name[] = +const bfd_mach_o_xlat_name bfd_mach_o_section_attribute_name[] = { { "loc_reloc", BFD_MACH_O_S_ATTR_LOC_RELOC }, { "ext_reloc", BFD_MACH_O_S_ATTR_EXT_RELOC }, @@ -3463,50 +3342,6 @@ static const bfd_mach_o_xlat_name bfd_mach_o_section_attribute_name[] = { NULL, 0} }; -static const bfd_mach_o_xlat_name bfd_mach_o_load_command_name[] = -{ - { "segment", BFD_MACH_O_LC_SEGMENT}, - { "symtab", BFD_MACH_O_LC_SYMTAB}, - { "symseg", BFD_MACH_O_LC_SYMSEG}, - { "thread", BFD_MACH_O_LC_THREAD}, - { "unixthread", BFD_MACH_O_LC_UNIXTHREAD}, - { "loadfvmlib", BFD_MACH_O_LC_LOADFVMLIB}, - { "idfvmlib", BFD_MACH_O_LC_IDFVMLIB}, - { "ident", BFD_MACH_O_LC_IDENT}, - { "fvmfile", BFD_MACH_O_LC_FVMFILE}, - { "prepage", BFD_MACH_O_LC_PREPAGE}, - { "dysymtab", BFD_MACH_O_LC_DYSYMTAB}, - { "load_dylib", BFD_MACH_O_LC_LOAD_DYLIB}, - { "id_dylib", BFD_MACH_O_LC_ID_DYLIB}, - { "load_dylinker", BFD_MACH_O_LC_LOAD_DYLINKER}, - { "id_dylinker", BFD_MACH_O_LC_ID_DYLINKER}, - { "prebound_dylib", BFD_MACH_O_LC_PREBOUND_DYLIB}, - { "routines", BFD_MACH_O_LC_ROUTINES}, - { "sub_framework", BFD_MACH_O_LC_SUB_FRAMEWORK}, - { "sub_umbrella", BFD_MACH_O_LC_SUB_UMBRELLA}, - { "sub_client", BFD_MACH_O_LC_SUB_CLIENT}, - { "sub_library", BFD_MACH_O_LC_SUB_LIBRARY}, - { "twolevel_hints", BFD_MACH_O_LC_TWOLEVEL_HINTS}, - { "prebind_cksum", BFD_MACH_O_LC_PREBIND_CKSUM}, - { "load_weak_dylib", BFD_MACH_O_LC_LOAD_WEAK_DYLIB}, - { "segment_64", BFD_MACH_O_LC_SEGMENT_64}, - { "routines_64", BFD_MACH_O_LC_ROUTINES_64}, - { "uuid", BFD_MACH_O_LC_UUID}, - { "rpath", BFD_MACH_O_LC_RPATH}, - { "code_signature", BFD_MACH_O_LC_CODE_SIGNATURE}, - { "segment_split_info", BFD_MACH_O_LC_SEGMENT_SPLIT_INFO}, - { "reexport_dylib", BFD_MACH_O_LC_REEXPORT_DYLIB}, - { "lazy_load_dylib", BFD_MACH_O_LC_LAZY_LOAD_DYLIB}, - { "encryption_info", BFD_MACH_O_LC_ENCRYPTION_INFO}, - { "dyld_info", BFD_MACH_O_LC_DYLD_INFO}, - { "load_upward_lib", BFD_MACH_O_LC_LOAD_UPWARD_DYLIB}, - { "version_min_macosx", BFD_MACH_O_LC_VERSION_MIN_MACOSX}, - { "version_min_iphoneos", BFD_MACH_O_LC_VERSION_MIN_IPHONEOS}, - { "function_starts", BFD_MACH_O_LC_FUNCTION_STARTS}, - { "dyld_environment", BFD_MACH_O_LC_DYLD_ENVIRONMENT}, - { NULL, 0} -}; - /* Get the section type from NAME. Return -1 if NAME is unknown. */ unsigned int @@ -3533,515 +3368,6 @@ bfd_mach_o_get_section_attribute_from_name (const char *name) return (unsigned int)-1; } -static void -bfd_mach_o_print_private_header (bfd *abfd, FILE *file) -{ - bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); - bfd_mach_o_header *h = &mdata->header; - - fputs (_("Mach-O header:\n"), file); - fprintf (file, _(" magic : %08lx\n"), h->magic); - fprintf (file, _(" cputype : %08lx (%s)\n"), h->cputype, - bfd_mach_o_get_name (bfd_mach_o_cpu_name, h->cputype)); - fprintf (file, _(" cpusubtype: %08lx\n"), h->cpusubtype); - fprintf (file, _(" filetype : %08lx (%s)\n"), - h->filetype, - bfd_mach_o_get_name (bfd_mach_o_filetype_name, h->filetype)); - fprintf (file, _(" ncmds : %08lx (%lu)\n"), h->ncmds, h->ncmds); - fprintf (file, _(" sizeofcmds: %08lx\n"), h->sizeofcmds); - fprintf (file, _(" flags : %08lx ("), h->flags); - bfd_mach_o_print_flags (bfd_mach_o_header_flags_name, h->flags, file); - fputs (_(")\n"), file); - fprintf (file, _(" reserved : %08x\n"), h->reserved); -} - -static void -bfd_mach_o_print_section_map (bfd *abfd, FILE *file) -{ - bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); - unsigned int i; - unsigned int sec_nbr = 0; - - fputs (_("Segments and Sections:\n"), file); - fputs (_(" #: Segment name Section name Address\n"), file); - - for (i = 0; i < mdata->header.ncmds; i++) - { - bfd_mach_o_segment_command *seg; - bfd_mach_o_section *sec; - - if (mdata->commands[i].type != BFD_MACH_O_LC_SEGMENT - && mdata->commands[i].type != BFD_MACH_O_LC_SEGMENT_64) - continue; - - seg = &mdata->commands[i].command.segment; - - fprintf (file, "[Segment %-16s ", seg->segname); - fprintf_vma (file, seg->vmaddr); - fprintf (file, "-"); - fprintf_vma (file, seg->vmaddr + seg->vmsize - 1); - fputc (' ', file); - fputc (seg->initprot & BFD_MACH_O_PROT_READ ? 'r' : '-', file); - fputc (seg->initprot & BFD_MACH_O_PROT_WRITE ? 'w' : '-', file); - fputc (seg->initprot & BFD_MACH_O_PROT_EXECUTE ? 'x' : '-', file); - fprintf (file, "]\n"); - - for (sec = seg->sect_head; sec != NULL; sec = sec->next) - { - fprintf (file, "%02u: %-16s %-16s ", ++sec_nbr, - sec->segname, sec->sectname); - fprintf_vma (file, sec->addr); - fprintf (file, " "); - fprintf_vma (file, sec->size); - fprintf (file, " %08lx\n", sec->flags); - } - } -} - -static void -bfd_mach_o_print_section (bfd *abfd ATTRIBUTE_UNUSED, - bfd_mach_o_section *sec, FILE *file) -{ - fprintf (file, " Section: %-16s %-16s (bfdname: %s)\n", - sec->sectname, sec->segname, sec->bfdsection->name); - fprintf (file, " addr: "); - fprintf_vma (file, sec->addr); - fprintf (file, " size: "); - fprintf_vma (file, sec->size); - fprintf (file, " offset: "); - fprintf_vma (file, sec->offset); - fprintf (file, "\n"); - fprintf (file, " align: %ld", sec->align); - fprintf (file, " nreloc: %lu reloff: ", sec->nreloc); - fprintf_vma (file, sec->reloff); - fprintf (file, "\n"); - fprintf (file, " flags: %08lx (type: %s", sec->flags, - bfd_mach_o_get_name (bfd_mach_o_section_type_name, - sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)); - fprintf (file, " attr: "); - bfd_mach_o_print_flags (bfd_mach_o_section_attribute_name, - sec->flags & BFD_MACH_O_SECTION_ATTRIBUTES_MASK, - file); - fprintf (file, ")\n"); - switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK) - { - case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS: - case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS: - case BFD_MACH_O_S_SYMBOL_STUBS: - fprintf (file, " first indirect sym: %lu", sec->reserved1); - fprintf (file, " (%u entries)", - bfd_mach_o_section_get_nbr_indirect (abfd, sec)); - break; - default: - fprintf (file, " reserved1: 0x%lx", sec->reserved1); - break; - } - switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK) - { - case BFD_MACH_O_S_SYMBOL_STUBS: - fprintf (file, " stub size: %lu", sec->reserved2); - break; - default: - fprintf (file, " reserved2: 0x%lx", sec->reserved2); - break; - } - fprintf (file, " reserved3: 0x%lx\n", sec->reserved3); -} - -static void -bfd_mach_o_print_segment (bfd *abfd ATTRIBUTE_UNUSED, - bfd_mach_o_load_command *cmd, FILE *file) -{ - bfd_mach_o_segment_command *seg = &cmd->command.segment; - bfd_mach_o_section *sec; - - fprintf (file, " name: %s\n", *seg->segname ? seg->segname : "*none*"); - fprintf (file, " vmaddr: "); - fprintf_vma (file, seg->vmaddr); - fprintf (file, " vmsize: "); - fprintf_vma (file, seg->vmsize); - fprintf (file, "\n"); - fprintf (file, " fileoff: "); - fprintf_vma (file, seg->fileoff); - fprintf (file, " filesize: "); - fprintf_vma (file, (bfd_vma)seg->filesize); - fprintf (file, " endoff: "); - fprintf_vma (file, (bfd_vma)(seg->fileoff + seg->filesize)); - fprintf (file, "\n"); - fprintf (file, " nsects: %lu ", seg->nsects); - fprintf (file, " flags: %lx\n", seg->flags); - for (sec = seg->sect_head; sec != NULL; sec = sec->next) - bfd_mach_o_print_section (abfd, sec, file); -} - -static void -bfd_mach_o_print_dysymtab (bfd *abfd ATTRIBUTE_UNUSED, - bfd_mach_o_load_command *cmd, FILE *file) -{ - bfd_mach_o_dysymtab_command *dysymtab = &cmd->command.dysymtab; - bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); - unsigned int i; - - fprintf (file, " local symbols: idx: %10lu num: %-8lu", - dysymtab->ilocalsym, dysymtab->nlocalsym); - fprintf (file, " (nxtidx: %lu)\n", - dysymtab->ilocalsym + dysymtab->nlocalsym); - fprintf (file, " external symbols: idx: %10lu num: %-8lu", - dysymtab->iextdefsym, dysymtab->nextdefsym); - fprintf (file, " (nxtidx: %lu)\n", - dysymtab->iextdefsym + dysymtab->nextdefsym); - fprintf (file, " undefined symbols: idx: %10lu num: %-8lu", - dysymtab->iundefsym, dysymtab->nundefsym); - fprintf (file, " (nxtidx: %lu)\n", - dysymtab->iundefsym + dysymtab->nundefsym); - fprintf (file, " table of content: off: 0x%08lx num: %-8lu", - dysymtab->tocoff, dysymtab->ntoc); - fprintf (file, " (endoff: 0x%08lx)\n", - dysymtab->tocoff - + dysymtab->ntoc * BFD_MACH_O_TABLE_OF_CONTENT_SIZE); - fprintf (file, " module table: off: 0x%08lx num: %-8lu", - dysymtab->modtaboff, dysymtab->nmodtab); - fprintf (file, " (endoff: 0x%08lx)\n", - dysymtab->modtaboff + dysymtab->nmodtab - * (mach_o_wide_p (&mdata->header) ? - BFD_MACH_O_DYLIB_MODULE_64_SIZE : BFD_MACH_O_DYLIB_MODULE_SIZE)); - fprintf (file, " external reference table: off: 0x%08lx num: %-8lu", - dysymtab->extrefsymoff, dysymtab->nextrefsyms); - fprintf (file, " (endoff: 0x%08lx)\n", - dysymtab->extrefsymoff - + dysymtab->nextrefsyms * BFD_MACH_O_REFERENCE_SIZE); - fprintf (file, " indirect symbol table: off: 0x%08lx num: %-8lu", - dysymtab->indirectsymoff, dysymtab->nindirectsyms); - fprintf (file, " (endoff: 0x%08lx)\n", - dysymtab->indirectsymoff - + dysymtab->nindirectsyms * BFD_MACH_O_INDIRECT_SYMBOL_SIZE); - fprintf (file, " external relocation table: off: 0x%08lx num: %-8lu", - dysymtab->extreloff, dysymtab->nextrel); - fprintf (file, " (endoff: 0x%08lx)\n", - dysymtab->extreloff + dysymtab->nextrel * BFD_MACH_O_RELENT_SIZE); - fprintf (file, " local relocation table: off: 0x%08lx num: %-8lu", - dysymtab->locreloff, dysymtab->nlocrel); - fprintf (file, " (endoff: 0x%08lx)\n", - dysymtab->locreloff + dysymtab->nlocrel * BFD_MACH_O_RELENT_SIZE); - - if (dysymtab->ntoc > 0 - || dysymtab->nindirectsyms > 0 - || dysymtab->nextrefsyms > 0) - { - /* Try to read the symbols to display the toc or indirect symbols. */ - bfd_mach_o_read_symtab_symbols (abfd); - } - else if (dysymtab->nmodtab > 0) - { - /* Try to read the strtab to display modules name. */ - bfd_mach_o_read_symtab_strtab (abfd); - } - - for (i = 0; i < dysymtab->nmodtab; i++) - { - bfd_mach_o_dylib_module *module = &dysymtab->dylib_module[i]; - fprintf (file, " module %u:\n", i); - fprintf (file, " name: %lu", module->module_name_idx); - if (mdata->symtab && mdata->symtab->strtab) - fprintf (file, ": %s", - mdata->symtab->strtab + module->module_name_idx); - fprintf (file, "\n"); - fprintf (file, " extdefsym: idx: %8lu num: %lu\n", - module->iextdefsym, module->nextdefsym); - fprintf (file, " refsym: idx: %8lu num: %lu\n", - module->irefsym, module->nrefsym); - fprintf (file, " localsym: idx: %8lu num: %lu\n", - module->ilocalsym, module->nlocalsym); - fprintf (file, " extrel: idx: %8lu num: %lu\n", - module->iextrel, module->nextrel); - fprintf (file, " init: idx: %8u num: %u\n", - module->iinit, module->ninit); - fprintf (file, " term: idx: %8u num: %u\n", - module->iterm, module->nterm); - fprintf (file, " objc_module_info: addr: "); - fprintf_vma (file, module->objc_module_info_addr); - fprintf (file, " size: %lu\n", module->objc_module_info_size); - } - - if (dysymtab->ntoc > 0) - { - bfd_mach_o_symtab_command *symtab = mdata->symtab; - - fprintf (file, " table of content: (symbol/module)\n"); - for (i = 0; i < dysymtab->ntoc; i++) - { - bfd_mach_o_dylib_table_of_content *toc = &dysymtab->dylib_toc[i]; - - fprintf (file, " %4u: ", i); - if (symtab && symtab->symbols && toc->symbol_index < symtab->nsyms) - { - const char *name = symtab->symbols[toc->symbol_index].symbol.name; - fprintf (file, "%s (%lu)", name ? name : "*invalid*", - toc->symbol_index); - } - else - fprintf (file, "%lu", toc->symbol_index); - - fprintf (file, " / "); - if (symtab && symtab->strtab - && toc->module_index < dysymtab->nmodtab) - { - bfd_mach_o_dylib_module *mod; - mod = &dysymtab->dylib_module[toc->module_index]; - fprintf (file, "%s (%lu)", - symtab->strtab + mod->module_name_idx, - toc->module_index); - } - else - fprintf (file, "%lu", toc->module_index); - - fprintf (file, "\n"); - } - } - - if (dysymtab->nindirectsyms != 0) - { - fprintf (file, " indirect symbols:\n"); - - for (i = 0; i < mdata->nsects; i++) - { - bfd_mach_o_section *sec = mdata->sections[i]; - unsigned int j, first, last; - bfd_mach_o_symtab_command *symtab = mdata->symtab; - bfd_vma addr; - bfd_vma entry_size; - - switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK) - { - case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS: - case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS: - case BFD_MACH_O_S_SYMBOL_STUBS: - first = sec->reserved1; - last = first + bfd_mach_o_section_get_nbr_indirect (abfd, sec); - addr = sec->addr; - entry_size = bfd_mach_o_section_get_entry_size (abfd, sec); - fprintf (file, " for section %s.%s:\n", - sec->segname, sec->sectname); - for (j = first; j < last; j++) - { - unsigned int isym = dysymtab->indirect_syms[j]; - - fprintf (file, " "); - fprintf_vma (file, addr); - fprintf (file, " %5u: 0x%08x", j, isym); - if (isym & BFD_MACH_O_INDIRECT_SYMBOL_LOCAL) - fprintf (file, " LOCAL"); - if (isym & BFD_MACH_O_INDIRECT_SYMBOL_ABS) - fprintf (file, " ABSOLUTE"); - if (symtab && symtab->symbols - && isym < symtab->nsyms - && symtab->symbols[isym].symbol.name) - fprintf (file, " %s", symtab->symbols[isym].symbol.name); - fprintf (file, "\n"); - addr += entry_size; - } - break; - default: - break; - } - } - } - if (dysymtab->nextrefsyms > 0) - { - bfd_mach_o_symtab_command *symtab = mdata->symtab; - - fprintf (file, " external reference table: (symbol flags)\n"); - for (i = 0; i < dysymtab->nextrefsyms; i++) - { - bfd_mach_o_dylib_reference *ref = &dysymtab->ext_refs[i]; - - fprintf (file, " %4u: %5lu 0x%02lx", i, ref->isym, ref->flags); - if (symtab && symtab->symbols - && ref->isym < symtab->nsyms - && symtab->symbols[ref->isym].symbol.name) - fprintf (file, " %s", symtab->symbols[ref->isym].symbol.name); - fprintf (file, "\n"); - } - } - -} - -static void -bfd_mach_o_print_dyld_info (bfd *abfd ATTRIBUTE_UNUSED, - bfd_mach_o_load_command *cmd, FILE *file) -{ - bfd_mach_o_dyld_info_command *info = &cmd->command.dyld_info; - - fprintf (file, " rebase: off: 0x%08x size: %-8u\n", - info->rebase_off, info->rebase_size); - fprintf (file, " bind: off: 0x%08x size: %-8u\n", - info->bind_off, info->bind_size); - fprintf (file, " weak bind: off: 0x%08x size: %-8u\n", - info->weak_bind_off, info->weak_bind_size); - fprintf (file, " lazy bind: off: 0x%08x size: %-8u\n", - info->lazy_bind_off, info->lazy_bind_size); - fprintf (file, " export: off: 0x%08x size: %-8u\n", - info->export_off, info->export_size); -} - -bfd_boolean -bfd_mach_o_bfd_print_private_bfd_data (bfd *abfd, void * ptr) -{ - bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); - FILE *file = (FILE *) ptr; - unsigned int i; - - bfd_mach_o_print_private_header (abfd, file); - fputc ('\n', file); - - for (i = 0; i < mdata->header.ncmds; i++) - { - bfd_mach_o_load_command *cmd = &mdata->commands[i]; - const char *cmd_name; - - cmd_name = bfd_mach_o_get_name_or_null - (bfd_mach_o_load_command_name, cmd->type); - fprintf (file, "Load command "); - if (cmd_name == NULL) - fprintf (file, "0x%02x:", cmd->type); - else - fprintf (file, "%s:", cmd_name); - - switch (cmd->type) - { - case BFD_MACH_O_LC_SEGMENT: - case BFD_MACH_O_LC_SEGMENT_64: - bfd_mach_o_print_segment (abfd, cmd, file); - break; - case BFD_MACH_O_LC_UUID: - { - bfd_mach_o_uuid_command *uuid = &cmd->command.uuid; - unsigned int j; - - for (j = 0; j < sizeof (uuid->uuid); j ++) - fprintf (file, " %02x", uuid->uuid[j]); - fputc ('\n', file); - } - break; - case BFD_MACH_O_LC_LOAD_DYLIB: - case BFD_MACH_O_LC_LOAD_WEAK_DYLIB: - case BFD_MACH_O_LC_REEXPORT_DYLIB: - case BFD_MACH_O_LC_LOAD_UPWARD_DYLIB: - case BFD_MACH_O_LC_ID_DYLIB: - { - bfd_mach_o_dylib_command *dylib = &cmd->command.dylib; - fprintf (file, " %s\n", dylib->name_str); - fprintf (file, " time stamp: 0x%08lx\n", - dylib->timestamp); - fprintf (file, " current version: 0x%08lx\n", - dylib->current_version); - fprintf (file, " comptibility version: 0x%08lx\n", - dylib->compatibility_version); - break; - } - case BFD_MACH_O_LC_LOAD_DYLINKER: - case BFD_MACH_O_LC_ID_DYLINKER: - fprintf (file, " %s\n", cmd->command.dylinker.name_str); - break; - case BFD_MACH_O_LC_SYMTAB: - { - bfd_mach_o_symtab_command *symtab = &cmd->command.symtab; - fprintf (file, - "\n" - " symoff: 0x%08x nsyms: %8u (endoff: 0x%08x)\n", - symtab->symoff, symtab->nsyms, - symtab->symoff + symtab->nsyms - * (mach_o_wide_p (&mdata->header) - ? BFD_MACH_O_NLIST_64_SIZE : BFD_MACH_O_NLIST_SIZE)); - fprintf (file, - " stroff: 0x%08x strsize: %8u (endoff: 0x%08x)\n", - symtab->stroff, symtab->strsize, - symtab->stroff + symtab->strsize); - break; - } - case BFD_MACH_O_LC_DYSYMTAB: - fprintf (file, "\n"); - bfd_mach_o_print_dysymtab (abfd, cmd, file); - break; - case BFD_MACH_O_LC_CODE_SIGNATURE: - case BFD_MACH_O_LC_SEGMENT_SPLIT_INFO: - case BFD_MACH_O_LC_FUNCTION_STARTS: - { - bfd_mach_o_linkedit_command *linkedit = &cmd->command.linkedit; - fprintf - (file, "\n" - " dataoff: 0x%08lx datasize: 0x%08lx (endoff: 0x%08lx)\n", - linkedit->dataoff, linkedit->datasize, - linkedit->dataoff + linkedit->datasize); - break; - } - case BFD_MACH_O_LC_SUB_FRAMEWORK: - case BFD_MACH_O_LC_SUB_UMBRELLA: - case BFD_MACH_O_LC_SUB_LIBRARY: - case BFD_MACH_O_LC_SUB_CLIENT: - case BFD_MACH_O_LC_RPATH: - { - bfd_mach_o_str_command *str = &cmd->command.str; - fprintf (file, " %s\n", str->str); - break; - } - case BFD_MACH_O_LC_THREAD: - case BFD_MACH_O_LC_UNIXTHREAD: - { - bfd_mach_o_thread_command *thread = &cmd->command.thread; - unsigned int j; - bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd); - - fprintf (file, " nflavours: %lu\n", thread->nflavours); - for (j = 0; j < thread->nflavours; j++) - { - bfd_mach_o_thread_flavour *flavour = &thread->flavours[j]; - - fprintf (file, " %2u: flavour: 0x%08lx offset: 0x%08lx" - " size: 0x%08lx\n", - j, flavour->flavour, flavour->offset, - flavour->size); - if (bed->_bfd_mach_o_print_thread) - { - char *buf = bfd_malloc (flavour->size); - - if (buf - && bfd_seek (abfd, flavour->offset, SEEK_SET) == 0 - && (bfd_bread (buf, flavour->size, abfd) - == flavour->size)) - (*bed->_bfd_mach_o_print_thread)(abfd, flavour, - file, buf); - free (buf); - } - } - break; - } - case BFD_MACH_O_LC_DYLD_INFO: - fprintf (file, "\n"); - bfd_mach_o_print_dyld_info (abfd, cmd, file); - break; - case BFD_MACH_O_LC_VERSION_MIN_MACOSX: - case BFD_MACH_O_LC_VERSION_MIN_IPHONEOS: - { - bfd_mach_o_version_min_command *ver = &cmd->command.version_min; - - fprintf (file, " %u.%u.%u\n", ver->rel, ver->maj, ver->min); - } - break; - default: - fprintf (file, "\n"); - fprintf (file, " offset: 0x%08lx\n", (unsigned long)cmd->offset); - fprintf (file, " size: 0x%08lx\n", (unsigned long)cmd->len); - break; - } - fputc ('\n', file); - } - - bfd_mach_o_print_section_map (abfd, file); - - return TRUE; -} - int bfd_mach_o_core_fetch_environment (bfd *abfd, unsigned char **rbuf, diff --git a/bfd/mach-o.h b/bfd/mach-o.h index f19901651b..d85224e9f7 100644 --- a/bfd/mach-o.h +++ b/bfd/mach-o.h @@ -519,6 +519,13 @@ typedef struct mach_o_data_struct } bfd_mach_o_data_struct; +typedef struct bfd_mach_o_xlat_name +{ + const char *name; + unsigned long val; +} +bfd_mach_o_xlat_name; + /* Target specific routines. */ typedef struct bfd_mach_o_backend_data { @@ -565,7 +572,6 @@ long bfd_mach_o_canonicalize_dynamic_reloc (bfd *, arelent **, asymbol **); asymbol *bfd_mach_o_make_empty_symbol (bfd *); void bfd_mach_o_get_symbol_info (bfd *, asymbol *, symbol_info *); void bfd_mach_o_print_symbol (bfd *, PTR, asymbol *, bfd_print_symbol_type); -bfd_boolean bfd_mach_o_bfd_print_private_bfd_data (bfd *, PTR); int bfd_mach_o_sizeof_headers (bfd *, struct bfd_link_info *); unsigned long bfd_mach_o_stack_addr (enum bfd_mach_o_cpu_type); int bfd_mach_o_core_fetch_environment (bfd *, unsigned char **, unsigned int *); @@ -585,6 +591,14 @@ unsigned int bfd_mach_o_get_section_attribute_from_name (const char *); void bfd_mach_o_normalize_section_name (const char *, const char *, const char **, flagword *); +unsigned int bfd_mach_o_section_get_nbr_indirect (bfd *, bfd_mach_o_section *); +unsigned int bfd_mach_o_section_get_entry_size (bfd *, bfd_mach_o_section *); +bfd_boolean bfd_mach_o_read_symtab_symbols (bfd *); +bfd_boolean bfd_mach_o_read_symtab_strtab (bfd *abfd); + +extern const bfd_mach_o_xlat_name bfd_mach_o_section_attribute_name[]; +extern const bfd_mach_o_xlat_name bfd_mach_o_section_type_name[]; + extern const bfd_target mach_o_fat_vec; #endif /* _BFD_MACH_O_H_ */ diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 56f2b8b50c..aeab175e9c 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,12 @@ +2011-12-13 Tristan Gingold + + * od-macho.c: New file. + * objdump.h (objdump_private_desc_mach_o): Add. + * configure.in: Add Mach-O od_vectors. + * Makefile.am (CFILES): Add od-macho.c + * configure: Regenerate. + * Makefile.in: Regenerate. + 2011-12-06 David Daney * readelf.c (dynamic_section_mips_val): Factor out trailing '\n' diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 59f759fcce..8d191d7d50 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -102,7 +102,7 @@ CFILES = \ ieee.c is-ranlib.c is-strip.c maybe-ranlib.c maybe-strip.c \ nlmconv.c nm.c not-ranlib.c not-strip.c \ objcopy.c objdump.c prdbg.c \ - od-xcoff.c \ + od-xcoff.c od-macho.c \ rclex.c rdcoff.c rddbg.c readelf.c rename.c \ resbin.c rescoff.c resrc.c resres.c \ size.c srconv.c stabs.c strings.c sysdump.c \ diff --git a/binutils/configure b/binutils/configure index 1a4a1efdcd..b46a30bc56 100755 --- a/binutils/configure +++ b/binutils/configure @@ -13945,7 +13945,10 @@ do # Add objdump private vectors. case $targ in powerpc-*-aix*) - od_vectors="$od_vectors objdump_private_desc_xcoff" + od_vectors="$od_vectors objdump_private_desc_xcoff" + ;; + *-*-darwin*) + od_vectors="$od_vectors objdump_private_desc_mach_o" ;; esac fi @@ -13963,6 +13966,8 @@ for i in $od_vectors ; do case $i in objdump_private_desc_xcoff) od_files="$od_files od-xcoff" ;; + objdump_private_desc_mach_o) + od_files="$od_files od-macho" ;; *) as_fn_error "*** unknown private vector $i" "$LINENO" 5 ;; esac ;; diff --git a/binutils/configure.in b/binutils/configure.in index 965d66c168..1f3b25d6bb 100644 --- a/binutils/configure.in +++ b/binutils/configure.in @@ -354,7 +354,10 @@ changequote([,])dnl # Add objdump private vectors. case $targ in powerpc-*-aix*) - od_vectors="$od_vectors objdump_private_desc_xcoff" + od_vectors="$od_vectors objdump_private_desc_xcoff" + ;; + *-*-darwin*) + od_vectors="$od_vectors objdump_private_desc_mach_o" ;; esac fi @@ -372,6 +375,8 @@ for i in $od_vectors ; do case $i in objdump_private_desc_xcoff) od_files="$od_files od-xcoff" ;; + objdump_private_desc_mach_o) + od_files="$od_files od-macho" ;; *) AC_MSG_ERROR(*** unknown private vector $i) ;; esac ;; diff --git a/binutils/objdump.h b/binutils/objdump.h index 511898c495..d935c60a65 100644 --- a/binutils/objdump.h +++ b/binutils/objdump.h @@ -48,3 +48,6 @@ struct objdump_private_desc /* XCOFF specific target. */ extern const struct objdump_private_desc objdump_private_desc_xcoff; + +/* Mach-O specific target. */ +extern const struct objdump_private_desc objdump_private_desc_mach_o; -- 2.34.1