X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fmach-o.c;h=c1ef64eff015383e321a583532643923ff4bdb7f;hb=acdf84a65400f416c60a0c9c14953ba5a73fb0cd;hp=0c0d1ac1f1a008d97867bd38c5315c20c754b8b8;hpb=4a97a0e54cba4caa5d994260f9c8ac9548628790;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/mach-o.c b/bfd/mach-o.c index 0c0d1ac1f1..c1ef64eff0 100644 --- a/bfd/mach-o.c +++ b/bfd/mach-o.c @@ -1,7 +1,5 @@ /* Mach-O support for BFD. - Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 1999-2020 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -21,21 +19,27 @@ MA 02110-1301, USA. */ #include "sysdep.h" -#include "mach-o.h" +#include #include "bfd.h" #include "libbfd.h" #include "libiberty.h" +#include "mach-o.h" #include "aout/stab_gnu.h" +#include "mach-o/reloc.h" +#include "mach-o/external.h" #include +#include +#include #define bfd_mach_o_object_p bfd_mach_o_gen_object_p #define bfd_mach_o_core_p bfd_mach_o_gen_core_p #define bfd_mach_o_mkobject bfd_mach_o_gen_mkobject #define FILE_ALIGN(off, algn) \ - (((off) + ((file_ptr) 1 << (algn)) - 1) & ((file_ptr) -1 << (algn))) + (((off) + ((file_ptr) 1 << (algn)) - 1) & ((file_ptr) -1U << (algn))) -static int bfd_mach_o_read_symtab_symbols (bfd *); +static bfd_boolean +bfd_mach_o_read_dyld_content (bfd *abfd, bfd_mach_o_dyld_info_command *cmd); unsigned int bfd_mach_o_version (bfd *abfd) @@ -82,76 +86,298 @@ bfd_mach_o_wide_p (bfd *abfd) { return mach_o_wide_p (&bfd_mach_o_get_data (abfd)->header); } - + /* Tables to translate well known Mach-O segment/section names to bfd names. Use of canonical names (such as .text or .debug_frame) is required by gdb. */ -struct mach_o_section_name_xlat -{ - const char *bfd_name; - const char *mach_o_name; - flagword flags; -}; - -static const struct mach_o_section_name_xlat dwarf_section_names_xlat[] = +/* __TEXT Segment. */ +static const mach_o_section_name_xlat text_section_names_xlat[] = { - { ".debug_frame", "__debug_frame", SEC_DEBUGGING }, - { ".debug_info", "__debug_info", SEC_DEBUGGING }, - { ".debug_abbrev", "__debug_abbrev", SEC_DEBUGGING }, - { ".debug_aranges", "__debug_aranges", SEC_DEBUGGING }, - { ".debug_macinfo", "__debug_macinfo", SEC_DEBUGGING }, - { ".debug_line", "__debug_line", SEC_DEBUGGING }, - { ".debug_loc", "__debug_loc", SEC_DEBUGGING }, - { ".debug_pubnames", "__debug_pubnames", SEC_DEBUGGING }, - { ".debug_pubtypes", "__debug_pubtypes", SEC_DEBUGGING }, - { ".debug_str", "__debug_str", SEC_DEBUGGING }, - { ".debug_ranges", "__debug_ranges", SEC_DEBUGGING }, - { NULL, NULL, 0} + { ".text", "__text", + SEC_CODE | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS, 0}, + { ".const", "__const", + SEC_READONLY | SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NONE, 0}, + { ".static_const", "__static_const", + SEC_READONLY | SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NONE, 0}, + { ".cstring", "__cstring", + SEC_READONLY | SEC_DATA | SEC_LOAD | SEC_MERGE | SEC_STRINGS, + BFD_MACH_O_S_CSTRING_LITERALS, + BFD_MACH_O_S_ATTR_NONE, 0}, + { ".literal4", "__literal4", + SEC_READONLY | SEC_DATA | SEC_LOAD, BFD_MACH_O_S_4BYTE_LITERALS, + BFD_MACH_O_S_ATTR_NONE, 2}, + { ".literal8", "__literal8", + SEC_READONLY | SEC_DATA | SEC_LOAD, BFD_MACH_O_S_8BYTE_LITERALS, + BFD_MACH_O_S_ATTR_NONE, 3}, + { ".literal16", "__literal16", + SEC_READONLY | SEC_DATA | SEC_LOAD, BFD_MACH_O_S_16BYTE_LITERALS, + BFD_MACH_O_S_ATTR_NONE, 4}, + { ".constructor", "__constructor", + SEC_CODE | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NONE, 0}, + { ".destructor", "__destructor", + SEC_CODE | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NONE, 0}, + { ".eh_frame", "__eh_frame", + SEC_READONLY | SEC_DATA | SEC_LOAD, BFD_MACH_O_S_COALESCED, + BFD_MACH_O_S_ATTR_LIVE_SUPPORT + | BFD_MACH_O_S_ATTR_STRIP_STATIC_SYMS + | BFD_MACH_O_S_ATTR_NO_TOC, 2}, + { NULL, NULL, 0, 0, 0, 0} }; -static const struct mach_o_section_name_xlat text_section_names_xlat[] = +/* __DATA Segment. */ +static const mach_o_section_name_xlat data_section_names_xlat[] = { - { ".text", "__text", SEC_CODE | SEC_LOAD }, - { ".const", "__const", SEC_READONLY | SEC_DATA | SEC_LOAD }, - { ".cstring", "__cstring", SEC_READONLY | SEC_DATA | SEC_LOAD }, - { ".eh_frame", "__eh_frame", SEC_READONLY | SEC_LOAD }, - { NULL, NULL, 0} + { ".data", "__data", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NONE, 0}, + { ".bss", "__bss", + SEC_NO_FLAGS, BFD_MACH_O_S_ZEROFILL, + BFD_MACH_O_S_ATTR_NONE, 0}, + { ".const_data", "__const", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NONE, 0}, + { ".static_data", "__static_data", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NONE, 0}, + { ".mod_init_func", "__mod_init_func", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_MOD_INIT_FUNC_POINTERS, + BFD_MACH_O_S_ATTR_NONE, 2}, + { ".mod_term_func", "__mod_term_func", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_MOD_FINI_FUNC_POINTERS, + BFD_MACH_O_S_ATTR_NONE, 2}, + { ".dyld", "__dyld", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NONE, 0}, + { ".cfstring", "__cfstring", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NONE, 2}, + { NULL, NULL, 0, 0, 0, 0} }; -static const struct mach_o_section_name_xlat data_section_names_xlat[] = +/* __DWARF Segment. */ +static const mach_o_section_name_xlat dwarf_section_names_xlat[] = { - { ".data", "__data", SEC_DATA | SEC_LOAD }, - { ".const_data", "__const", SEC_DATA | SEC_LOAD }, - { ".dyld", "__dyld", SEC_DATA | SEC_LOAD }, - { ".lazy_symbol_ptr", "__la_symbol_ptr", SEC_DATA | SEC_LOAD }, - { ".non_lazy_symbol_ptr", "__nl_symbol_ptr", SEC_DATA | SEC_LOAD }, - { ".bss", "__bss", SEC_NO_FLAGS }, - { NULL, NULL, 0} + { ".debug_frame", "__debug_frame", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { ".debug_info", "__debug_info", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { ".debug_abbrev", "__debug_abbrev", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { ".debug_aranges", "__debug_aranges", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { ".debug_macinfo", "__debug_macinfo", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { ".debug_line", "__debug_line", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { ".debug_loc", "__debug_loc", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { ".debug_pubnames", "__debug_pubnames", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { ".debug_pubtypes", "__debug_pubtypes", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { ".debug_str", "__debug_str", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { ".debug_ranges", "__debug_ranges", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { ".debug_macro", "__debug_macro", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { ".debug_gdb_scripts", "__debug_gdb_scri", + SEC_DEBUGGING, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_DEBUG, 0}, + { NULL, NULL, 0, 0, 0, 0} }; -struct mach_o_segment_name_xlat -{ - const char *segname; - const struct mach_o_section_name_xlat *sections; -}; +/* __OBJC Segment. */ +static const mach_o_section_name_xlat objc_section_names_xlat[] = + { + { ".objc_class", "__class", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_meta_class", "__meta_class", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_cat_cls_meth", "__cat_cls_meth", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_cat_inst_meth", "__cat_inst_meth", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_protocol", "__protocol", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_string_object", "__string_object", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_cls_meth", "__cls_meth", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_inst_meth", "__inst_meth", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_cls_refs", "__cls_refs", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_LITERAL_POINTERS, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_message_refs", "__message_refs", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_LITERAL_POINTERS, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_symbols", "__symbols", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_category", "__category", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_class_vars", "__class_vars", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_instance_vars", "__instance_vars", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_module_info", "__module_info", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_selector_strs", "__selector_strs", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_CSTRING_LITERALS, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_image_info", "__image_info", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc_selector_fixup", "__sel_fixup", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + /* Objc V1 */ + { ".objc1_class_ext", "__class_ext", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc1_property_list", "__property", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { ".objc1_protocol_ext", "__protocol_ext", + SEC_DATA | SEC_LOAD, BFD_MACH_O_S_REGULAR, + BFD_MACH_O_S_ATTR_NO_DEAD_STRIP, 0}, + { NULL, NULL, 0, 0, 0, 0} + }; -static const struct mach_o_segment_name_xlat segsec_names_xlat[] = +static const mach_o_segment_name_xlat segsec_names_xlat[] = { - { "__DWARF", dwarf_section_names_xlat }, { "__TEXT", text_section_names_xlat }, { "__DATA", data_section_names_xlat }, + { "__DWARF", dwarf_section_names_xlat }, + { "__OBJC", objc_section_names_xlat }, { NULL, NULL } }; +static const char dsym_subdir[] = ".dSYM/Contents/Resources/DWARF"; -/* Mach-O to bfd names. */ +/* For both cases bfd-name => mach-o name and vice versa, the specific target + is checked before the generic. This allows a target (e.g. ppc for cstring) + to override the generic definition with a more specific one. */ -static void -bfd_mach_o_convert_section_name_to_bfd (bfd *abfd, bfd_mach_o_section *section, - char **name, flagword *flags) +/* Fetch the translation from a Mach-O section designation (segment, section) + as a bfd short name, if one exists. Otherwise return NULL. + + Allow the segment and section names to be unterminated 16 byte arrays. */ + +const mach_o_section_name_xlat * +bfd_mach_o_section_data_for_mach_sect (bfd *abfd, const char *segname, + const char *sectname) +{ + const struct mach_o_segment_name_xlat *seg; + const mach_o_section_name_xlat *sec; + bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd); + + /* First try any target-specific translations defined... */ + if (bed->segsec_names_xlat) + for (seg = bed->segsec_names_xlat; seg->segname; seg++) + if (strncmp (seg->segname, segname, BFD_MACH_O_SEGNAME_SIZE) == 0) + for (sec = seg->sections; sec->mach_o_name; sec++) + if (strncmp (sec->mach_o_name, sectname, + BFD_MACH_O_SECTNAME_SIZE) == 0) + return sec; + + /* ... and then the Mach-O generic ones. */ + for (seg = segsec_names_xlat; seg->segname; seg++) + if (strncmp (seg->segname, segname, BFD_MACH_O_SEGNAME_SIZE) == 0) + for (sec = seg->sections; sec->mach_o_name; sec++) + if (strncmp (sec->mach_o_name, sectname, + BFD_MACH_O_SECTNAME_SIZE) == 0) + return sec; + + return NULL; +} + +/* If the bfd_name for this section is a 'canonical' form for which we + know the Mach-O data, return the segment name and the data for the + Mach-O equivalent. Otherwise return NULL. */ + +const mach_o_section_name_xlat * +bfd_mach_o_section_data_for_bfd_name (bfd *abfd, const char *bfd_name, + const char **segname) { const struct mach_o_segment_name_xlat *seg; + const mach_o_section_name_xlat *sec; + bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd); + *segname = NULL; + + if (bfd_name[0] != '.') + return NULL; + + /* First try any target-specific translations defined... */ + if (bed->segsec_names_xlat) + for (seg = bed->segsec_names_xlat; seg->segname; seg++) + for (sec = seg->sections; sec->bfd_name; sec++) + if (strcmp (bfd_name, sec->bfd_name) == 0) + { + *segname = seg->segname; + return sec; + } + + /* ... and then the Mach-O generic ones. */ + for (seg = segsec_names_xlat; seg->segname; seg++) + for (sec = seg->sections; sec->bfd_name; sec++) + if (strcmp (bfd_name, sec->bfd_name) == 0) + { + *segname = seg->segname; + return sec; + } + + return NULL; +} + +/* Convert Mach-O section name to BFD. + + Try to use standard/canonical names, for which we have tables including + default flag settings - which are returned. Otherwise forge a new name + in the form "." this will be prefixed with + LC_SEGMENT. if the segment name does not begin with an underscore. + + SEGNAME and SECTNAME are 16 byte arrays (they do not need to be NUL- + terminated if the name length is exactly 16 bytes - but must be if the name + length is less than 16 characters). */ + +void +bfd_mach_o_convert_section_name_to_bfd (bfd *abfd, const char *segname, + const char *secname, const char **name, + flagword *flags) +{ + const mach_o_section_name_xlat *xlat; char *res; unsigned int len; const char *pfx = ""; @@ -159,36 +385,29 @@ bfd_mach_o_convert_section_name_to_bfd (bfd *abfd, bfd_mach_o_section *section, *name = NULL; *flags = SEC_NO_FLAGS; - for (seg = segsec_names_xlat; seg->segname; seg++) + /* First search for a canonical name... + xlat will be non-null if there is an entry for segname, secname. */ + xlat = bfd_mach_o_section_data_for_mach_sect (abfd, segname, secname); + if (xlat) { - if (strcmp (seg->segname, section->segname) == 0) - { - const struct mach_o_section_name_xlat *sec; - - for (sec = seg->sections; sec->mach_o_name; sec++) - { - if (strcmp (sec->mach_o_name, section->sectname) == 0) - { - len = strlen (sec->bfd_name); - res = bfd_alloc (abfd, len + 1); - - if (res == NULL) - return; - strcpy (res, sec->bfd_name); - *name = res; - *flags = sec->flags; - return; - } - } - } + len = strlen (xlat->bfd_name); + res = bfd_alloc (abfd, len + 1); + if (res == NULL) + return; + memcpy (res, xlat->bfd_name, len+1); + *name = res; + *flags = xlat->bfd_flags; + return; } - len = strlen (section->segname) + 1 - + strlen (section->sectname) + 1; + /* ... else we make up a bfd name from the segment concatenated with the + section. */ + + len = 16 + 1 + 16 + 1; /* Put "LC_SEGMENT." prefix if the segment name is weird (ie doesn't start with an underscore. */ - if (section->segname[0] != '_') + if (segname[0] != '_') { static const char seg_pfx[] = "LC_SEGMENT."; @@ -199,42 +418,46 @@ bfd_mach_o_convert_section_name_to_bfd (bfd *abfd, bfd_mach_o_section *section, res = bfd_alloc (abfd, len); if (res == NULL) return; - snprintf (res, len, "%s%s.%s", pfx, section->segname, section->sectname); + snprintf (res, len, "%s%.16s.%.16s", pfx, segname, secname); *name = res; } -/* Convert a bfd section name to a Mach-O segment + section name. */ +/* Convert a bfd section name to a Mach-O segment + section name. -static void + If the name is a canonical one for which we have a Darwin match + return the translation table - which contains defaults for flags, + type, attribute and default alignment data. + + Otherwise, expand the bfd_name (assumed to be in the form + "[LC_SEGMENT.].") and return NULL. */ + +static const mach_o_section_name_xlat * bfd_mach_o_convert_section_name_to_mach_o (bfd *abfd ATTRIBUTE_UNUSED, - asection *sect, - bfd_mach_o_section *section) + asection *sect, + bfd_mach_o_section *section) { - const struct mach_o_segment_name_xlat *seg; - const char *name = bfd_get_section_name (abfd, sect); + const mach_o_section_name_xlat *xlat; + const char *name = bfd_section_name (sect); + const char *segname; const char *dot; unsigned int len; unsigned int seglen; unsigned int seclen; - /* List of well known names. They all start with a dot. */ - if (name[0] == '.') - for (seg = segsec_names_xlat; seg->segname; seg++) - { - const struct mach_o_section_name_xlat *sec; - - for (sec = seg->sections; sec->mach_o_name; sec++) - { - if (strcmp (sec->bfd_name, name) == 0) - { - strcpy (section->segname, seg->segname); - strcpy (section->sectname, sec->mach_o_name); - return; - } - } - } + memset (section->segname, 0, BFD_MACH_O_SEGNAME_SIZE + 1); + memset (section->sectname, 0, BFD_MACH_O_SECTNAME_SIZE + 1); + + /* See if is a canonical name ... */ + xlat = bfd_mach_o_section_data_for_bfd_name (abfd, name, &segname); + if (xlat) + { + strcpy (section->segname, segname); + strcpy (section->sectname, xlat->mach_o_name); + return xlat; + } - /* Strip LC_SEGMENT. prefix. */ + /* .. else we convert our constructed one back to Mach-O. + Strip LC_SEGMENT. prefix, if present. */ if (strncmp (name, "LC_SEGMENT.", 11) == 0) name += 11; @@ -248,29 +471,37 @@ bfd_mach_o_convert_section_name_to_mach_o (bfd *abfd ATTRIBUTE_UNUSED, seglen = dot - name; seclen = len - (dot + 1 - name); - if (seglen < 16 && seclen < 16) - { - memcpy (section->segname, name, seglen); - section->segname[seglen] = 0; - memcpy (section->sectname, dot + 1, seclen); - section->sectname[seclen] = 0; - return; - } + if (seglen <= BFD_MACH_O_SEGNAME_SIZE + && seclen <= BFD_MACH_O_SECTNAME_SIZE) + { + memcpy (section->segname, name, seglen); + section->segname[seglen] = 0; + memcpy (section->sectname, dot + 1, seclen); + section->sectname[seclen] = 0; + return NULL; + } } + /* The segment and section names are both missing - don't make them + into dots. */ + if (dot && dot == name) + return NULL; + + /* Just duplicate the name into both segment and section. */ if (len > 16) len = 16; memcpy (section->segname, name, len); section->segname[len] = 0; memcpy (section->sectname, name, len); section->sectname[len] = 0; + return NULL; } /* Return the size of an entry for section SEC. 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) @@ -290,7 +521,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; @@ -302,16 +533,39 @@ bfd_mach_o_section_get_nbr_indirect (bfd *abfd, bfd_mach_o_section *sec) return sec->size / elsz; } +/* Append command CMD to ABFD. Note that header.ncmds is not updated. */ + +static void +bfd_mach_o_append_command (bfd *abfd, bfd_mach_o_load_command *cmd) +{ + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + + if (mdata->last_command != NULL) + mdata->last_command->next = cmd; + else + mdata->first_command = cmd; + mdata->last_command = cmd; + cmd->next = NULL; +} /* Copy any private info we understand from the input symbol to the output symbol. */ bfd_boolean bfd_mach_o_bfd_copy_private_symbol_data (bfd *ibfd ATTRIBUTE_UNUSED, - asymbol *isymbol ATTRIBUTE_UNUSED, + asymbol *isymbol, bfd *obfd ATTRIBUTE_UNUSED, - asymbol *osymbol ATTRIBUTE_UNUSED) + asymbol *osymbol) { + bfd_mach_o_asymbol *os, *is; + + os = (bfd_mach_o_asymbol *)osymbol; + is = (bfd_mach_o_asymbol *)isymbol; + os->n_type = is->n_type; + os->n_sect = is->n_sect; + os->n_desc = is->n_desc; + os->symbol.udata.i = is->symbol.udata.i; + return TRUE; } @@ -319,11 +573,141 @@ bfd_mach_o_bfd_copy_private_symbol_data (bfd *ibfd ATTRIBUTE_UNUSED, to the output section. */ bfd_boolean -bfd_mach_o_bfd_copy_private_section_data (bfd *ibfd ATTRIBUTE_UNUSED, - asection *isection ATTRIBUTE_UNUSED, - bfd *obfd ATTRIBUTE_UNUSED, - asection *osection ATTRIBUTE_UNUSED) +bfd_mach_o_bfd_copy_private_section_data (bfd *ibfd, asection *isection, + bfd *obfd, asection *osection) +{ + bfd_mach_o_section *os = bfd_mach_o_get_mach_o_section (osection); + bfd_mach_o_section *is = bfd_mach_o_get_mach_o_section (isection); + + if (ibfd->xvec->flavour != bfd_target_mach_o_flavour + || obfd->xvec->flavour != bfd_target_mach_o_flavour) + return TRUE; + + BFD_ASSERT (is != NULL && os != NULL); + + os->flags = is->flags; + os->reserved1 = is->reserved1; + os->reserved2 = is->reserved2; + os->reserved3 = is->reserved3; + + return TRUE; +} + +static const char * +cputype (unsigned long value) +{ + switch (value) + { + case BFD_MACH_O_CPU_TYPE_VAX: return "VAX"; + case BFD_MACH_O_CPU_TYPE_MC680x0: return "MC68k"; + case BFD_MACH_O_CPU_TYPE_I386: return "I386"; + case BFD_MACH_O_CPU_TYPE_MIPS: return "MIPS"; + case BFD_MACH_O_CPU_TYPE_MC98000: return "MC98k"; + case BFD_MACH_O_CPU_TYPE_HPPA: return "HPPA"; + case BFD_MACH_O_CPU_TYPE_ARM: return "ARM"; + case BFD_MACH_O_CPU_TYPE_MC88000: return "MC88K"; + case BFD_MACH_O_CPU_TYPE_SPARC: return "SPARC"; + case BFD_MACH_O_CPU_TYPE_I860: return "I860"; + case BFD_MACH_O_CPU_TYPE_ALPHA: return "ALPHA"; + case BFD_MACH_O_CPU_TYPE_POWERPC: return "PPC"; + case BFD_MACH_O_CPU_TYPE_POWERPC_64: return "PPC64"; + case BFD_MACH_O_CPU_TYPE_X86_64: return "X86_64"; + case BFD_MACH_O_CPU_TYPE_ARM64: return "ARM64"; + default: return _(""); + } +} + +static const char * +cpusubtype (unsigned long cpu_type, unsigned long cpu_subtype) +{ + static char buffer[128]; + + buffer[0] = 0; + switch (cpu_subtype & BFD_MACH_O_CPU_SUBTYPE_MASK) + { + case 0: + break; + case BFD_MACH_O_CPU_SUBTYPE_LIB64: + sprintf (buffer, " (LIB64)"); break; + default: + sprintf (buffer, _("")); break; + } + + cpu_subtype &= ~ BFD_MACH_O_CPU_SUBTYPE_MASK; + + switch (cpu_type) + { + case BFD_MACH_O_CPU_TYPE_X86_64: + case BFD_MACH_O_CPU_TYPE_I386: + switch (cpu_subtype) + { + case BFD_MACH_O_CPU_SUBTYPE_X86_ALL: + return strcat (buffer, " (X86_ALL)"); + default: + break; + } + break; + + case BFD_MACH_O_CPU_TYPE_ARM: + switch (cpu_subtype) + { + case BFD_MACH_O_CPU_SUBTYPE_ARM_ALL: + return strcat (buffer, " (ARM_ALL)"); + case BFD_MACH_O_CPU_SUBTYPE_ARM_V4T: + return strcat (buffer, " (ARM_V4T)"); + case BFD_MACH_O_CPU_SUBTYPE_ARM_V6: + return strcat (buffer, " (ARM_V6)"); + case BFD_MACH_O_CPU_SUBTYPE_ARM_V5TEJ: + return strcat (buffer, " (ARM_V5TEJ)"); + case BFD_MACH_O_CPU_SUBTYPE_ARM_XSCALE: + return strcat (buffer, " (ARM_XSCALE)"); + case BFD_MACH_O_CPU_SUBTYPE_ARM_V7: + return strcat (buffer, " (ARM_V7)"); + default: + break; + } + break; + + case BFD_MACH_O_CPU_TYPE_ARM64: + switch (cpu_subtype) + { + case BFD_MACH_O_CPU_SUBTYPE_ARM64_ALL: + return strcat (buffer, " (ARM64_ALL)"); + case BFD_MACH_O_CPU_SUBTYPE_ARM64_V8: + return strcat (buffer, " (ARM64_V8)"); + default: + break; + } + break; + + default: + break; + } + + if (cpu_subtype != 0) + return strcat (buffer, _(" ()")); + + return buffer; +} + +bfd_boolean +bfd_mach_o_bfd_print_private_bfd_data (bfd *abfd, void *ptr) { + FILE * file = (FILE *) ptr; + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + + fprintf (file, _(" MACH-O header:\n")); + fprintf (file, _(" magic: %#lx\n"), (long) mdata->header.magic); + fprintf (file, _(" cputype: %#lx (%s)\n"), (long) mdata->header.cputype, + cputype (mdata->header.cputype)); + fprintf (file, _(" cpusubtype: %#lx%s\n"), (long) mdata->header.cpusubtype, + cpusubtype (mdata->header.cputype, mdata->header.cpusubtype)); + fprintf (file, _(" filetype: %#lx\n"), (long) mdata->header.filetype); + fprintf (file, _(" ncmds: %#lx\n"), (long) mdata->header.ncmds); + fprintf (file, _(" sizeocmds: %#lx\n"), (long) mdata->header.sizeofcmds); + fprintf (file, _(" flags: %#lx\n"), (long) mdata->header.flags); + fprintf (file, _(" version: %x\n"), mdata->header.version); + return TRUE; } @@ -331,8 +715,12 @@ bfd_mach_o_bfd_copy_private_section_data (bfd *ibfd ATTRIBUTE_UNUSED, to the output bfd. */ bfd_boolean -bfd_mach_o_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd) +bfd_mach_o_bfd_copy_private_header_data (bfd *ibfd, bfd *obfd) { + bfd_mach_o_data_struct *imdata; + bfd_mach_o_data_struct *omdata; + bfd_mach_o_load_command *icmd; + if (bfd_get_flavour (ibfd) != bfd_target_mach_o_flavour || bfd_get_flavour (obfd) != bfd_target_mach_o_flavour) return TRUE; @@ -340,8 +728,144 @@ bfd_mach_o_bfd_copy_private_bfd_data (bfd *ibfd, bfd *obfd) BFD_ASSERT (bfd_mach_o_valid (ibfd)); BFD_ASSERT (bfd_mach_o_valid (obfd)); - /* FIXME: copy commands. */ + imdata = bfd_mach_o_get_data (ibfd); + omdata = bfd_mach_o_get_data (obfd); + + /* Copy header flags. */ + omdata->header.flags = imdata->header.flags; + + /* PR 23299. Copy the cputype. */ + if (imdata->header.cputype != omdata->header.cputype) + { + if (omdata->header.cputype == 0) + omdata->header.cputype = imdata->header.cputype; + else if (imdata->header.cputype != 0) + /* Urg - what has happened ? */ + _bfd_error_handler (_("incompatible cputypes in mach-o files: %ld vs %ld"), + (long) imdata->header.cputype, + (long) omdata->header.cputype); + } + + /* Copy the cpusubtype. */ + omdata->header.cpusubtype = imdata->header.cpusubtype; + + /* Copy commands. */ + for (icmd = imdata->first_command; icmd != NULL; icmd = icmd->next) + { + bfd_mach_o_load_command *ocmd; + + switch (icmd->type) + { + case BFD_MACH_O_LC_LOAD_DYLIB: + case BFD_MACH_O_LC_LOAD_DYLINKER: + case BFD_MACH_O_LC_DYLD_INFO: + /* Command is copied. */ + ocmd = bfd_alloc (obfd, sizeof (bfd_mach_o_load_command)); + if (ocmd == NULL) + return FALSE; + + /* Copy common fields. */ + ocmd->type = icmd->type; + ocmd->type_required = icmd->type_required; + ocmd->offset = 0; + ocmd->len = icmd->len; + break; + + default: + /* Command is not copied. */ + continue; + break; + } + + switch (icmd->type) + { + case BFD_MACH_O_LC_LOAD_DYLIB: + { + bfd_mach_o_dylib_command *idy = &icmd->command.dylib; + bfd_mach_o_dylib_command *ody = &ocmd->command.dylib; + + ody->name_offset = idy->name_offset; + ody->timestamp = idy->timestamp; + ody->current_version = idy->current_version; + ody->compatibility_version = idy->compatibility_version; + ody->name_str = idy->name_str; + } + break; + + case BFD_MACH_O_LC_LOAD_DYLINKER: + { + bfd_mach_o_dylinker_command *idy = &icmd->command.dylinker; + bfd_mach_o_dylinker_command *ody = &ocmd->command.dylinker; + + ody->name_offset = idy->name_offset; + ody->name_str = idy->name_str; + } + break; + + case BFD_MACH_O_LC_DYLD_INFO: + { + bfd_mach_o_dyld_info_command *idy = &icmd->command.dyld_info; + bfd_mach_o_dyld_info_command *ody = &ocmd->command.dyld_info; + + if (bfd_mach_o_read_dyld_content (ibfd, idy)) + { + ody->rebase_size = idy->rebase_size; + ody->rebase_content = idy->rebase_content; + + ody->bind_size = idy->bind_size; + ody->bind_content = idy->bind_content; + + ody->weak_bind_size = idy->weak_bind_size; + ody->weak_bind_content = idy->weak_bind_content; + + ody->lazy_bind_size = idy->lazy_bind_size; + ody->lazy_bind_content = idy->lazy_bind_content; + + ody->export_size = idy->export_size; + ody->export_content = idy->export_content; + } + /* PR 17512L: file: 730e492d. */ + else + { + ody->rebase_size = + ody->bind_size = + ody->weak_bind_size = + ody->lazy_bind_size = + ody->export_size = 0; + ody->rebase_content = + ody->bind_content = + ody->weak_bind_content = + ody->lazy_bind_content = + ody->export_content = NULL; + } + } + break; + default: + /* That command should be handled. */ + abort (); + } + + /* Insert command. */ + bfd_mach_o_append_command (obfd, ocmd); + } + + return TRUE; +} + +/* This allows us to set up to 32 bits of flags (unless we invent some + fiendish scheme to subdivide). For now, we'll just set the file flags + without error checking - just overwrite. */ + +bfd_boolean +bfd_mach_o_bfd_set_private_flags (bfd *abfd, flagword flags) +{ + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + + if (!mdata) + return FALSE; + + mdata->header.flags = flags; return TRUE; } @@ -376,9 +900,17 @@ bfd_mach_o_canonicalize_symtab (bfd *abfd, asymbol **alocation) if (nsyms < 0) return nsyms; - if (bfd_mach_o_read_symtab_symbols (abfd) != 0) + if (nsyms == 0) + { + /* Do not try to read symbols if there are none. */ + alocation[0] = NULL; + return 0; + } + + if (!bfd_mach_o_read_symtab_symbols (abfd)) { - (*_bfd_error_handler) (_("bfd_mach_o_canonicalize_symtab: unable to load symbols")); + _bfd_error_handler + (_("bfd_mach_o_canonicalize_symtab: unable to load symbols")); return 0; } @@ -392,49 +924,60 @@ bfd_mach_o_canonicalize_symtab (bfd *abfd, asymbol **alocation) return nsyms; } +/* Create synthetic symbols for indirect symbols. */ + long bfd_mach_o_get_synthetic_symtab (bfd *abfd, - long symcount ATTRIBUTE_UNUSED, - asymbol **syms ATTRIBUTE_UNUSED, - long dynsymcount ATTRIBUTE_UNUSED, - asymbol **dynsyms ATTRIBUTE_UNUSED, - asymbol **ret) + long symcount ATTRIBUTE_UNUSED, + asymbol **syms ATTRIBUTE_UNUSED, + long dynsymcount ATTRIBUTE_UNUSED, + asymbol **dynsyms ATTRIBUTE_UNUSED, + asymbol **ret) { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); bfd_mach_o_dysymtab_command *dysymtab = mdata->dysymtab; bfd_mach_o_symtab_command *symtab = mdata->symtab; asymbol *s; + char * s_start; + char * s_end; unsigned long count, i, j, n; size_t size; char *names; char *nul_name; + const char stub [] = "$stub"; *ret = NULL; - if (dysymtab == NULL || symtab == NULL || symtab->symbols == NULL) - return 0; - - if (dysymtab->nindirectsyms == 0) + /* Stop now if no symbols or no indirect symbols. */ + if (dysymtab == NULL || dysymtab->nindirectsyms == 0 + || symtab == NULL || symtab->symbols == NULL) return 0; + /* We need to allocate a bfd symbol for every indirect symbol and to + allocate the memory for its name. */ count = dysymtab->nindirectsyms; size = count * sizeof (asymbol) + 1; for (j = 0; j < count; j++) { + const char * strng; unsigned int isym = dysymtab->indirect_syms[j]; - - if (isym < symtab->nsyms && symtab->symbols[isym].symbol.name) - size += strlen (symtab->symbols[isym].symbol.name) + sizeof ("$stub"); + + /* Some indirect symbols are anonymous. */ + if (isym < symtab->nsyms && (strng = symtab->symbols[isym].symbol.name)) + /* PR 17512: file: f5b8eeba. */ + size += strnlen (strng, symtab->strsize - (strng - symtab->strtab)) + sizeof (stub); } - s = *ret = (asymbol *) bfd_malloc (size); + s_start = bfd_malloc (size); + s = *ret = (asymbol *) s_start; if (s == NULL) return -1; names = (char *) (s + count); nul_name = names; *names++ = 0; - + s_end = s_start + size; + n = 0; for (i = 0; i < mdata->nsects; i++) { @@ -442,52 +985,73 @@ bfd_mach_o_get_synthetic_symtab (bfd *abfd, unsigned int first, last; 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); - for (j = first; j < last; j++) - { - unsigned int isym = dysymtab->indirect_syms[j]; - - s->flags = BSF_GLOBAL | BSF_SYNTHETIC; - s->section = sec->bfdsection; - s->value = addr - sec->addr; - s->udata.p = NULL; - - if (isym < symtab->nsyms - && symtab->symbols[isym].symbol.name) - { - const char *sym = symtab->symbols[isym].symbol.name; - size_t len; - - s->name = names; - len = strlen (sym); - memcpy (names, sym, len); - names += len; - memcpy (names, "$stub", sizeof ("$stub")); - names += sizeof ("$stub"); - } - else - s->name = nul_name; - - addr += entry_size; - s++; - n++; - } - break; - default: - break; - } + { + case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS: + case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS: + case BFD_MACH_O_S_SYMBOL_STUBS: + /* Only these sections have indirect symbols. */ + 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); + + /* PR 17512: file: 08e15eec. */ + if (first >= count || last >= count || first > last) + goto fail; + + for (j = first; j < last; j++) + { + unsigned int isym = dysymtab->indirect_syms[j]; + + /* PR 17512: file: 04d64d9b. */ + if (((char *) s) + sizeof (* s) > s_end) + goto fail; + + s->flags = BSF_GLOBAL | BSF_SYNTHETIC; + s->section = sec->bfdsection; + s->value = addr - sec->addr; + s->udata.p = NULL; + + if (isym < symtab->nsyms + && symtab->symbols[isym].symbol.name) + { + const char *sym = symtab->symbols[isym].symbol.name; + size_t len; + + s->name = names; + len = strlen (sym); + /* PR 17512: file: 47dfd4d2. */ + if (names + len >= s_end) + goto fail; + memcpy (names, sym, len); + names += len; + /* PR 17512: file: 18f340a4. */ + if (names + sizeof (stub) >= s_end) + goto fail; + memcpy (names, stub, sizeof (stub)); + names += sizeof (stub); + } + else + s->name = nul_name; + + addr += entry_size; + s++; + n++; + } + break; + default: + break; + } } return n; + + fail: + free (s_start); + * ret = NULL; + return -1; } void @@ -521,7 +1085,10 @@ bfd_mach_o_print_symbol (bfd *abfd, switch (asym->n_type & BFD_MACH_O_N_TYPE) { case BFD_MACH_O_N_UNDF: - name = "UND"; + if (symbol->value == 0) + name = "UND"; + else + name = "COM"; break; case BFD_MACH_O_N_ABS: name = "ABS"; @@ -542,17 +1109,17 @@ bfd_mach_o_print_symbol (bfd *abfd, if (name == NULL) name = ""; fprintf (file, " %02x %-6s %02x %04x", - asym->n_type, name, asym->n_sect, asym->n_desc); + asym->n_type, name, asym->n_sect, asym->n_desc); if ((asym->n_type & BFD_MACH_O_N_STAB) == 0 && (asym->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_SECT) - fprintf (file, " %-5s", symbol->section->name); + fprintf (file, " [%s]", symbol->section->name); fprintf (file, " %s", symbol->name); } } static void bfd_mach_o_convert_architecture (bfd_mach_o_cpu_type mtype, - bfd_mach_o_cpu_subtype msubtype ATTRIBUTE_UNUSED, + bfd_mach_o_cpu_subtype msubtype, enum bfd_architecture *type, unsigned long *subtype) { @@ -560,8 +1127,12 @@ bfd_mach_o_convert_architecture (bfd_mach_o_cpu_type mtype, switch (mtype) { - case BFD_MACH_O_CPU_TYPE_VAX: *type = bfd_arch_vax; break; - case BFD_MACH_O_CPU_TYPE_MC680x0: *type = bfd_arch_m68k; break; + case BFD_MACH_O_CPU_TYPE_VAX: + *type = bfd_arch_vax; + break; + case BFD_MACH_O_CPU_TYPE_MC680x0: + *type = bfd_arch_m68k; + break; case BFD_MACH_O_CPU_TYPE_I386: *type = bfd_arch_i386; *subtype = bfd_mach_i386_i386; @@ -570,17 +1141,46 @@ bfd_mach_o_convert_architecture (bfd_mach_o_cpu_type mtype, *type = bfd_arch_i386; *subtype = bfd_mach_x86_64; break; - case BFD_MACH_O_CPU_TYPE_MIPS: *type = bfd_arch_mips; break; - case BFD_MACH_O_CPU_TYPE_MC98000: *type = bfd_arch_m98k; break; - case BFD_MACH_O_CPU_TYPE_HPPA: *type = bfd_arch_hppa; break; - case BFD_MACH_O_CPU_TYPE_ARM: *type = bfd_arch_arm; break; - case BFD_MACH_O_CPU_TYPE_MC88000: *type = bfd_arch_m88k; break; + case BFD_MACH_O_CPU_TYPE_MIPS: + *type = bfd_arch_mips; + break; + case BFD_MACH_O_CPU_TYPE_MC98000: + *type = bfd_arch_m98k; + break; + case BFD_MACH_O_CPU_TYPE_HPPA: + *type = bfd_arch_hppa; + break; + case BFD_MACH_O_CPU_TYPE_ARM: + *type = bfd_arch_arm; + switch (msubtype) + { + case BFD_MACH_O_CPU_SUBTYPE_ARM_V4T: + *subtype = bfd_mach_arm_4T; + break; + case BFD_MACH_O_CPU_SUBTYPE_ARM_V6: + *subtype = bfd_mach_arm_4T; /* Best fit ? */ + break; + case BFD_MACH_O_CPU_SUBTYPE_ARM_V5TEJ: + *subtype = bfd_mach_arm_5TE; + break; + case BFD_MACH_O_CPU_SUBTYPE_ARM_XSCALE: + *subtype = bfd_mach_arm_XScale; + break; + case BFD_MACH_O_CPU_SUBTYPE_ARM_V7: + *subtype = bfd_mach_arm_5TE; /* Best fit ? */ + break; + case BFD_MACH_O_CPU_SUBTYPE_ARM_ALL: + default: + break; + } + break; case BFD_MACH_O_CPU_TYPE_SPARC: *type = bfd_arch_sparc; *subtype = bfd_mach_sparc; break; - case BFD_MACH_O_CPU_TYPE_I860: *type = bfd_arch_i860; break; - case BFD_MACH_O_CPU_TYPE_ALPHA: *type = bfd_arch_alpha; break; + case BFD_MACH_O_CPU_TYPE_ALPHA: + *type = bfd_arch_alpha; + break; case BFD_MACH_O_CPU_TYPE_POWERPC: *type = bfd_arch_powerpc; *subtype = bfd_mach_ppc; @@ -589,161 +1189,442 @@ bfd_mach_o_convert_architecture (bfd_mach_o_cpu_type mtype, *type = bfd_arch_powerpc; *subtype = bfd_mach_ppc64; break; + case BFD_MACH_O_CPU_TYPE_ARM64: + *type = bfd_arch_aarch64; + *subtype = bfd_mach_aarch64; + break; default: *type = bfd_arch_unknown; break; } } -static bfd_boolean -bfd_mach_o_write_header (bfd *abfd, bfd_mach_o_header *header) -{ - unsigned char buf[32]; - unsigned int size; - - size = mach_o_wide_p (header) ? - BFD_MACH_O_HEADER_64_SIZE : BFD_MACH_O_HEADER_SIZE; - - bfd_h_put_32 (abfd, header->magic, buf + 0); - bfd_h_put_32 (abfd, header->cputype, buf + 4); - bfd_h_put_32 (abfd, header->cpusubtype, buf + 8); - bfd_h_put_32 (abfd, header->filetype, buf + 12); - bfd_h_put_32 (abfd, header->ncmds, buf + 16); - bfd_h_put_32 (abfd, header->sizeofcmds, buf + 20); - bfd_h_put_32 (abfd, header->flags, buf + 24); +/* Write n NUL bytes to ABFD so that LEN + n is a multiple of 4. Return the + number of bytes written or -1 in case of error. */ - if (mach_o_wide_p (header)) - bfd_h_put_32 (abfd, header->reserved, buf + 28); +static int +bfd_mach_o_pad4 (bfd *abfd, unsigned int len) +{ + if (len % 4 != 0) + { + char pad[4] = {0,0,0,0}; + unsigned int padlen = 4 - (len % 4); - if (bfd_seek (abfd, 0, SEEK_SET) != 0 - || bfd_bwrite ((void *) buf, size, abfd) != size) - return FALSE; + if (bfd_bwrite (pad, padlen, abfd) != padlen) + return -1; - return TRUE; + return padlen; + } + else + return 0; } +/* Likewise, but for a command. */ + static int +bfd_mach_o_pad_command (bfd *abfd, unsigned int len) +{ + unsigned int align = bfd_mach_o_wide_p (abfd) ? 8 : 4; + + if (len % align != 0) + { + char pad[8] = {0}; + unsigned int padlen = align - (len % align); + + if (bfd_bwrite (pad, padlen, abfd) != padlen) + return -1; + + return padlen; + } + else + return 0; +} + +static bfd_boolean +bfd_mach_o_write_header (bfd *abfd, bfd_mach_o_header *header) +{ + struct mach_o_header_external raw; + unsigned int size; + + size = mach_o_wide_p (header) ? + BFD_MACH_O_HEADER_64_SIZE : BFD_MACH_O_HEADER_SIZE; + + bfd_h_put_32 (abfd, header->magic, raw.magic); + bfd_h_put_32 (abfd, header->cputype, raw.cputype); + bfd_h_put_32 (abfd, header->cpusubtype, raw.cpusubtype); + bfd_h_put_32 (abfd, header->filetype, raw.filetype); + bfd_h_put_32 (abfd, header->ncmds, raw.ncmds); + bfd_h_put_32 (abfd, header->sizeofcmds, raw.sizeofcmds); + bfd_h_put_32 (abfd, header->flags, raw.flags); + + if (mach_o_wide_p (header)) + bfd_h_put_32 (abfd, header->reserved, raw.reserved); + + if (bfd_seek (abfd, 0, SEEK_SET) != 0 + || bfd_bwrite (&raw, size, abfd) != size) + return FALSE; + + return TRUE; +} + +static bfd_boolean bfd_mach_o_write_thread (bfd *abfd, bfd_mach_o_load_command *command) { bfd_mach_o_thread_command *cmd = &command->command.thread; unsigned int i; - unsigned char buf[8]; + struct mach_o_thread_command_external raw; unsigned int offset; BFD_ASSERT ((command->type == BFD_MACH_O_LC_THREAD) || (command->type == BFD_MACH_O_LC_UNIXTHREAD)); - offset = 8; + offset = BFD_MACH_O_LC_SIZE; for (i = 0; i < cmd->nflavours; i++) { BFD_ASSERT ((cmd->flavours[i].size % 4) == 0); - BFD_ASSERT (cmd->flavours[i].offset == (command->offset + offset + 8)); + BFD_ASSERT (cmd->flavours[i].offset == + (command->offset + offset + BFD_MACH_O_LC_SIZE)); - bfd_h_put_32 (abfd, cmd->flavours[i].flavour, buf); - bfd_h_put_32 (abfd, (cmd->flavours[i].size / 4), buf + 4); + bfd_h_put_32 (abfd, cmd->flavours[i].flavour, raw.flavour); + bfd_h_put_32 (abfd, (cmd->flavours[i].size / 4), raw.count); if (bfd_seek (abfd, command->offset + offset, SEEK_SET) != 0 - || bfd_bwrite ((void *) buf, 8, abfd) != 8) - return -1; + || bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - offset += cmd->flavours[i].size + 8; + offset += cmd->flavours[i].size + sizeof (raw); } - return 0; + return TRUE; +} + +static bfd_boolean +bfd_mach_o_write_dylinker (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_dylinker_command *cmd = &command->command.dylinker; + struct mach_o_str_command_external raw; + unsigned int namelen; + + bfd_h_put_32 (abfd, cmd->name_offset, raw.str); + + if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0 + || bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + namelen = strlen (cmd->name_str) + 1; + if (bfd_bwrite (cmd->name_str, namelen, abfd) != namelen) + return FALSE; + + if (bfd_mach_o_pad_command (abfd, namelen) < 0) + return FALSE; + + return TRUE; +} + +static bfd_boolean +bfd_mach_o_write_dylib (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_dylib_command *cmd = &command->command.dylib; + struct mach_o_dylib_command_external raw; + unsigned int namelen; + + bfd_h_put_32 (abfd, cmd->name_offset, raw.name); + bfd_h_put_32 (abfd, cmd->timestamp, raw.timestamp); + bfd_h_put_32 (abfd, cmd->current_version, raw.current_version); + bfd_h_put_32 (abfd, cmd->compatibility_version, raw.compatibility_version); + + if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0 + || bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + namelen = strlen (cmd->name_str) + 1; + if (bfd_bwrite (cmd->name_str, namelen, abfd) != namelen) + return FALSE; + + if (bfd_mach_o_pad_command (abfd, namelen) < 0) + return FALSE; + + return TRUE; +} + +static bfd_boolean +bfd_mach_o_write_main (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_main_command *cmd = &command->command.main; + struct mach_o_entry_point_command_external raw; + + bfd_h_put_64 (abfd, cmd->entryoff, raw.entryoff); + bfd_h_put_64 (abfd, cmd->stacksize, raw.stacksize); + + if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0 + || bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + return TRUE; +} + +static bfd_boolean +bfd_mach_o_write_dyld_info (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_dyld_info_command *cmd = &command->command.dyld_info; + struct mach_o_dyld_info_command_external raw; + + bfd_h_put_32 (abfd, cmd->rebase_off, raw.rebase_off); + bfd_h_put_32 (abfd, cmd->rebase_size, raw.rebase_size); + bfd_h_put_32 (abfd, cmd->bind_off, raw.bind_off); + bfd_h_put_32 (abfd, cmd->bind_size, raw.bind_size); + bfd_h_put_32 (abfd, cmd->weak_bind_off, raw.weak_bind_off); + bfd_h_put_32 (abfd, cmd->weak_bind_size, raw.weak_bind_size); + bfd_h_put_32 (abfd, cmd->lazy_bind_off, raw.lazy_bind_off); + bfd_h_put_32 (abfd, cmd->lazy_bind_size, raw.lazy_bind_size); + bfd_h_put_32 (abfd, cmd->export_off, raw.export_off); + bfd_h_put_32 (abfd, cmd->export_size, raw.export_size); + + if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0 + || bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + if (cmd->rebase_size != 0) + if (bfd_seek (abfd, cmd->rebase_off, SEEK_SET) != 0 + || (bfd_bwrite (cmd->rebase_content, cmd->rebase_size, abfd) != + cmd->rebase_size)) + return FALSE; + + if (cmd->bind_size != 0) + if (bfd_seek (abfd, cmd->bind_off, SEEK_SET) != 0 + || (bfd_bwrite (cmd->bind_content, cmd->bind_size, abfd) != + cmd->bind_size)) + return FALSE; + + if (cmd->weak_bind_size != 0) + if (bfd_seek (abfd, cmd->weak_bind_off, SEEK_SET) != 0 + || (bfd_bwrite (cmd->weak_bind_content, cmd->weak_bind_size, abfd) != + cmd->weak_bind_size)) + return FALSE; + + if (cmd->lazy_bind_size != 0) + if (bfd_seek (abfd, cmd->lazy_bind_off, SEEK_SET) != 0 + || (bfd_bwrite (cmd->lazy_bind_content, cmd->lazy_bind_size, abfd) != + cmd->lazy_bind_size)) + return FALSE; + + if (cmd->export_size != 0) + if (bfd_seek (abfd, cmd->export_off, SEEK_SET) != 0 + || (bfd_bwrite (cmd->export_content, cmd->export_size, abfd) != + cmd->export_size)) + return FALSE; + + return TRUE; } long bfd_mach_o_get_reloc_upper_bound (bfd *abfd ATTRIBUTE_UNUSED, - asection *asect) + asection *asect) { - return (asect->reloc_count + 1) * sizeof (arelent *); +#if SIZEOF_LONG == SIZEOF_INT + if (asect->reloc_count >= LONG_MAX / sizeof (arelent *)) + { + bfd_set_error (bfd_error_file_too_big); + return -1; + } +#endif + return (asect->reloc_count + 1) * sizeof (arelent *); } -static int -bfd_mach_o_canonicalize_one_reloc (bfd *abfd, char *buf, - arelent *res, asymbol **syms) +/* In addition to the need to byte-swap the symbol number, the bit positions + of the fields in the relocation information vary per target endian-ness. */ + +void +bfd_mach_o_swap_in_non_scattered_reloc (bfd *abfd, bfd_mach_o_reloc_info *rel, + unsigned char *fields) +{ + unsigned char info = fields[3]; + + if (bfd_big_endian (abfd)) + { + rel->r_value = (fields[0] << 16) | (fields[1] << 8) | fields[2]; + rel->r_type = (info >> BFD_MACH_O_BE_TYPE_SHIFT) & BFD_MACH_O_TYPE_MASK; + rel->r_pcrel = (info & BFD_MACH_O_BE_PCREL) ? 1 : 0; + rel->r_length = (info >> BFD_MACH_O_BE_LENGTH_SHIFT) + & BFD_MACH_O_LENGTH_MASK; + rel->r_extern = (info & BFD_MACH_O_BE_EXTERN) ? 1 : 0; + } + else + { + rel->r_value = (fields[2] << 16) | (fields[1] << 8) | fields[0]; + rel->r_type = (info >> BFD_MACH_O_LE_TYPE_SHIFT) & BFD_MACH_O_TYPE_MASK; + rel->r_pcrel = (info & BFD_MACH_O_LE_PCREL) ? 1 : 0; + rel->r_length = (info >> BFD_MACH_O_LE_LENGTH_SHIFT) + & BFD_MACH_O_LENGTH_MASK; + rel->r_extern = (info & BFD_MACH_O_LE_EXTERN) ? 1 : 0; + } +} + +/* Set syms_ptr_ptr and addend of RES. */ + +bfd_boolean +bfd_mach_o_canonicalize_non_scattered_reloc (bfd *abfd, + bfd_mach_o_reloc_info *reloc, + arelent *res, asymbol **syms) { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); - bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd); - bfd_mach_o_reloc_info reloc; - bfd_vma addr; - bfd_vma symnum; + unsigned int num; asymbol **sym; - addr = bfd_get_32 (abfd, buf + 0); - symnum = bfd_get_32 (abfd, buf + 4); - + /* Non-scattered relocation. */ + reloc->r_scattered = 0; + res->addend = 0; + + num = reloc->r_value; + + if (reloc->r_extern) + { + /* PR 17512: file: 8396-1185-0.004. */ + if (num >= (unsigned) bfd_mach_o_count_symbols (abfd)) + sym = bfd_und_section_ptr->symbol_ptr_ptr; + else if (syms == NULL) + sym = bfd_und_section_ptr->symbol_ptr_ptr; + else + /* An external symbol number. */ + sym = syms + num; + } + else if (num == 0x00ffffff || num == 0) + { + /* The 'symnum' in a non-scattered PAIR is 0x00ffffff. But as this + is generic code, we don't know wether this is really a PAIR. + This value is almost certainly not a valid section number, hence + this specific case to avoid an assertion failure. + Target specific swap_reloc_in routine should adjust that. */ + sym = bfd_abs_section_ptr->symbol_ptr_ptr; + } + else + { + /* PR 17512: file: 006-2964-0.004. */ + if (num > mdata->nsects) + { + _bfd_error_handler (_("\ +malformed mach-o reloc: section index is greater than the number of sections")); + return FALSE; + } + + /* A section number. */ + sym = mdata->sections[num - 1]->bfdsection->symbol_ptr_ptr; + /* For a symbol defined in section S, the addend (stored in the + binary) contains the address of the section. To comply with + bfd convention, subtract the section address. + Use the address from the header, so that the user can modify + the vma of the section. */ + res->addend = -mdata->sections[num - 1]->addr; + } + + /* Note: Pairs for PPC LO/HI/HA are not scattered, but contain the offset + in the lower 16bits of the address value. So we have to find the + 'symbol' from the preceding reloc. We do this even though the + section symbol is probably not needed here, because NULL symbol + values cause an assert in generic BFD code. This must be done in + the PPC swap_reloc_in routine. */ + res->sym_ptr_ptr = sym; + + return TRUE; +} + +/* Do most of the work for canonicalize_relocs on RAW: create internal + representation RELOC and set most fields of RES using symbol table SYMS. + Each target still has to set the howto of RES and possibly adjust other + fields. + Previously the Mach-O hook point was simply swap_in, but some targets + (like arm64) don't follow the generic rules (symnum is a value for the + non-scattered relocation ADDEND). */ + +bfd_boolean +bfd_mach_o_pre_canonicalize_one_reloc (bfd *abfd, + struct mach_o_reloc_info_external *raw, + bfd_mach_o_reloc_info *reloc, + arelent *res, asymbol **syms) +{ + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + bfd_vma addr; + + addr = bfd_get_32 (abfd, raw->r_address); + res->sym_ptr_ptr = NULL; + res->addend = 0; + if (addr & BFD_MACH_O_SR_SCATTERED) { unsigned int j; - - /* Scattered relocation. - Extract section and offset from r_value. */ - res->sym_ptr_ptr = NULL; - res->addend = 0; + bfd_vma symnum = bfd_get_32 (abfd, raw->r_symbolnum); + + /* Scattered relocation, can't be extern. */ + reloc->r_scattered = 1; + reloc->r_extern = 0; + + /* Extract section and offset from r_value (symnum). */ + reloc->r_value = symnum; + /* FIXME: This breaks when a symbol in a reloc exactly follows the + end of the data for the section (e.g. in a calculation of section + data length). At present, the symbol will end up associated with + the following section or, if it falls within alignment padding, as + null - which will assert later. */ for (j = 0; j < mdata->nsects; j++) - { - bfd_mach_o_section *sect = mdata->sections[j]; - if (symnum >= sect->addr && symnum < sect->addr + sect->size) - { - res->sym_ptr_ptr = sect->bfdsection->symbol_ptr_ptr; - res->addend = symnum - sect->addr; - break; - } - } + { + bfd_mach_o_section *sect = mdata->sections[j]; + if (symnum >= sect->addr && symnum < sect->addr + sect->size) + { + res->sym_ptr_ptr = sect->bfdsection->symbol_ptr_ptr; + res->addend = symnum - sect->addr; + break; + } + } + + /* Extract the info and address fields from r_address. */ + reloc->r_type = BFD_MACH_O_GET_SR_TYPE (addr); + reloc->r_length = BFD_MACH_O_GET_SR_LENGTH (addr); + reloc->r_pcrel = addr & BFD_MACH_O_SR_PCREL; + reloc->r_address = BFD_MACH_O_GET_SR_TYPE (addr); res->address = BFD_MACH_O_GET_SR_ADDRESS (addr); - reloc.r_type = BFD_MACH_O_GET_SR_TYPE (addr); - reloc.r_length = BFD_MACH_O_GET_SR_LENGTH (addr); - reloc.r_pcrel = addr & BFD_MACH_O_SR_PCREL; - reloc.r_scattered = 1; } else { - unsigned int num = BFD_MACH_O_GET_R_SYMBOLNUM (symnum); - res->addend = 0; + /* Non-scattered relocation. */ + reloc->r_scattered = 0; + reloc->r_address = addr; res->address = addr; - if (symnum & BFD_MACH_O_R_EXTERN) - { - sym = syms + num; - reloc.r_extern = 1; - } - else - { - BFD_ASSERT (num != 0); - BFD_ASSERT (num <= mdata->nsects); - sym = mdata->sections[num - 1]->bfdsection->symbol_ptr_ptr; - /* For a symbol defined in section S, the addend (stored in the - binary) contains the address of the section. To comply with - bfd conventio, substract the section address. - Use the address from the header, so that the user can modify - the vma of the section. */ - res->addend = -mdata->sections[num - 1]->addr; - reloc.r_extern = 0; - } - res->sym_ptr_ptr = sym; - reloc.r_type = BFD_MACH_O_GET_R_TYPE (symnum); - reloc.r_length = BFD_MACH_O_GET_R_LENGTH (symnum); - reloc.r_pcrel = (symnum & BFD_MACH_O_R_PCREL) ? 1 : 0; - reloc.r_scattered = 0; - } - - if (!(*bed->_bfd_mach_o_swap_reloc_in)(res, &reloc)) - return -1; - return 0; + + /* The value and info fields have to be extracted dependent on target + endian-ness. */ + bfd_mach_o_swap_in_non_scattered_reloc (abfd, reloc, raw->r_symbolnum); + + if (!bfd_mach_o_canonicalize_non_scattered_reloc (abfd, reloc, + res, syms)) + return FALSE; + } + + /* We have set up a reloc with all the information present, so the swapper + can modify address, value and addend fields, if necessary, to convey + information in the generic BFD reloc that is mach-o specific. */ + + return TRUE; } static int bfd_mach_o_canonicalize_relocs (bfd *abfd, unsigned long filepos, - unsigned long count, - arelent *res, asymbol **syms) + unsigned long count, + arelent *res, asymbol **syms) { + bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd); unsigned long i; - char *native_relocs; + struct mach_o_reloc_info_external *native_relocs = NULL; bfd_size_type native_size; /* Allocate and read relocs. */ native_size = count * BFD_MACH_O_RELENT_SIZE; - native_relocs = bfd_malloc (native_size); + + /* PR 17512: file: 09477b57. */ + if (native_size < count) + goto err; + + native_relocs = + (struct mach_o_reloc_info_external *) bfd_malloc (native_size); if (native_relocs == NULL) return -1; @@ -753,21 +1634,23 @@ bfd_mach_o_canonicalize_relocs (bfd *abfd, unsigned long filepos, for (i = 0; i < count; i++) { - char *buf = native_relocs + BFD_MACH_O_RELENT_SIZE * i; - - if (bfd_mach_o_canonicalize_one_reloc (abfd, buf, &res[i], syms) < 0) - goto err; + if (!(*bed->_bfd_mach_o_canonicalize_one_reloc)(abfd, &native_relocs[i], + &res[i], syms, res)) + goto err; } free (native_relocs); return i; + err: free (native_relocs); + if (bfd_get_error () == bfd_error_no_error) + bfd_set_error (bfd_error_invalid_operation); return -1; } long bfd_mach_o_canonicalize_reloc (bfd *abfd, asection *asect, - arelent **rels, asymbol **syms) + arelent **rels, asymbol **syms) { bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd); unsigned long i; @@ -777,24 +1660,30 @@ bfd_mach_o_canonicalize_reloc (bfd *abfd, asection *asect, return 0; /* No need to go further if we don't know how to read relocs. */ - if (bed->_bfd_mach_o_swap_reloc_in == NULL) + if (bed->_bfd_mach_o_canonicalize_one_reloc == NULL) return 0; - res = bfd_malloc (asect->reloc_count * sizeof (arelent)); - if (res == NULL) - return -1; - - if (bfd_mach_o_canonicalize_relocs (abfd, asect->rel_filepos, - asect->reloc_count, res, syms) < 0) + if (asect->relocation == NULL) { - free (res); - return -1; + if (asect->reloc_count * sizeof (arelent) < asect->reloc_count) + return -1; + res = bfd_malloc (asect->reloc_count * sizeof (arelent)); + if (res == NULL) + return -1; + + if (bfd_mach_o_canonicalize_relocs (abfd, asect->rel_filepos, + asect->reloc_count, res, syms) < 0) + { + free (res); + return -1; + } + asect->relocation = res; } + res = asect->relocation; for (i = 0; i < asect->reloc_count; i++) rels[i] = &res[i]; rels[i] = NULL; - asect->relocation = res; return i; } @@ -806,13 +1695,13 @@ bfd_mach_o_get_dynamic_reloc_upper_bound (bfd *abfd) if (mdata->dysymtab == NULL) return 1; - return (mdata->dysymtab->nextrel + mdata->dysymtab->nlocrel) + return (mdata->dysymtab->nextrel + mdata->dysymtab->nlocrel + 1) * sizeof (arelent *); } long bfd_mach_o_canonicalize_dynamic_reloc (bfd *abfd, arelent **rels, - struct bfd_symbol **syms) + struct bfd_symbol **syms) { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); bfd_mach_o_dysymtab_command *dysymtab = mdata->dysymtab; @@ -826,38 +1715,83 @@ bfd_mach_o_canonicalize_dynamic_reloc (bfd *abfd, arelent **rels, return 0; /* No need to go further if we don't know how to read relocs. */ - if (bed->_bfd_mach_o_swap_reloc_in == NULL) + if (bed->_bfd_mach_o_canonicalize_one_reloc == NULL) return 0; - res = bfd_malloc ((dysymtab->nextrel + dysymtab->nlocrel) * sizeof (arelent)); - if (res == NULL) - return -1; - - if (bfd_mach_o_canonicalize_relocs (abfd, dysymtab->extreloff, - dysymtab->nextrel, res, syms) < 0) + if (mdata->dyn_reloc_cache == NULL) { - free (res); - return -1; - } + if ((dysymtab->nextrel + dysymtab->nlocrel) * sizeof (arelent) + < (dysymtab->nextrel + dysymtab->nlocrel)) + return -1; - if (bfd_mach_o_canonicalize_relocs (abfd, dysymtab->locreloff, - dysymtab->nlocrel, - res + dysymtab->nextrel, syms) < 0) - { - free (res); - return -1; + res = bfd_malloc ((dysymtab->nextrel + dysymtab->nlocrel) + * sizeof (arelent)); + if (res == NULL) + return -1; + + if (bfd_mach_o_canonicalize_relocs (abfd, dysymtab->extreloff, + dysymtab->nextrel, res, syms) < 0) + { + free (res); + return -1; + } + + if (bfd_mach_o_canonicalize_relocs (abfd, dysymtab->locreloff, + dysymtab->nlocrel, + res + dysymtab->nextrel, syms) < 0) + { + free (res); + return -1; + } + + mdata->dyn_reloc_cache = res; } + res = mdata->dyn_reloc_cache; for (i = 0; i < dysymtab->nextrel + dysymtab->nlocrel; i++) rels[i] = &res[i]; rels[i] = NULL; return i; } +/* In addition to the need to byte-swap the symbol number, the bit positions + of the fields in the relocation information vary per target endian-ness. */ + +static void +bfd_mach_o_swap_out_non_scattered_reloc (bfd *abfd, unsigned char *fields, + bfd_mach_o_reloc_info *rel) +{ + unsigned char info = 0; + + BFD_ASSERT (rel->r_type <= 15); + BFD_ASSERT (rel->r_length <= 3); + + if (bfd_big_endian (abfd)) + { + fields[0] = (rel->r_value >> 16) & 0xff; + fields[1] = (rel->r_value >> 8) & 0xff; + fields[2] = rel->r_value & 0xff; + info |= rel->r_type << BFD_MACH_O_BE_TYPE_SHIFT; + info |= rel->r_pcrel ? BFD_MACH_O_BE_PCREL : 0; + info |= rel->r_length << BFD_MACH_O_BE_LENGTH_SHIFT; + info |= rel->r_extern ? BFD_MACH_O_BE_EXTERN : 0; + } + else + { + fields[2] = (rel->r_value >> 16) & 0xff; + fields[1] = (rel->r_value >> 8) & 0xff; + fields[0] = rel->r_value & 0xff; + info |= rel->r_type << BFD_MACH_O_LE_TYPE_SHIFT; + info |= rel->r_pcrel ? BFD_MACH_O_LE_PCREL : 0; + info |= rel->r_length << BFD_MACH_O_LE_LENGTH_SHIFT; + info |= rel->r_extern ? BFD_MACH_O_LE_EXTERN : 0; + } + fields[3] = info; +} + static bfd_boolean bfd_mach_o_write_relocs (bfd *abfd, bfd_mach_o_section *section) { - bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); unsigned int i; arelent **entries; asection *sec; @@ -870,13 +1804,6 @@ bfd_mach_o_write_relocs (bfd *abfd, bfd_mach_o_section *section) if (bed->_bfd_mach_o_swap_reloc_out == NULL) return TRUE; - /* Allocate relocation room. */ - mdata->filelen = FILE_ALIGN(mdata->filelen, 2); - section->nreloc = sec->reloc_count; - sec->rel_filepos = mdata->filelen; - section->reloff = sec->rel_filepos; - mdata->filelen += sec->reloc_count * BFD_MACH_O_RELENT_SIZE; - if (bfd_seek (abfd, section->reloff, SEEK_SET) != 0) return FALSE; @@ -885,484 +1812,1569 @@ bfd_mach_o_write_relocs (bfd *abfd, bfd_mach_o_section *section) for (i = 0; i < section->nreloc; i++) { arelent *rel = entries[i]; - char buf[8]; + struct mach_o_reloc_info_external raw; bfd_mach_o_reloc_info info, *pinfo = &info; /* Convert relocation to an intermediate representation. */ if (!(*bed->_bfd_mach_o_swap_reloc_out) (rel, pinfo)) - return FALSE; + return FALSE; /* Lower the relocation info. */ if (pinfo->r_scattered) - { - unsigned long v; - - v = BFD_MACH_O_SR_SCATTERED - | (pinfo->r_pcrel ? BFD_MACH_O_SR_PCREL : 0) - | BFD_MACH_O_SET_SR_LENGTH(pinfo->r_length) - | BFD_MACH_O_SET_SR_TYPE(pinfo->r_type) - | BFD_MACH_O_SET_SR_ADDRESS(pinfo->r_address); - bfd_put_32 (abfd, v, buf); - bfd_put_32 (abfd, pinfo->r_value, buf + 4); - } + { + unsigned long v; + + v = BFD_MACH_O_SR_SCATTERED + | (pinfo->r_pcrel ? BFD_MACH_O_SR_PCREL : 0) + | BFD_MACH_O_SET_SR_LENGTH (pinfo->r_length) + | BFD_MACH_O_SET_SR_TYPE (pinfo->r_type) + | BFD_MACH_O_SET_SR_ADDRESS (pinfo->r_address); + /* Note: scattered relocs have field in reverse order... */ + bfd_put_32 (abfd, v, raw.r_address); + bfd_put_32 (abfd, pinfo->r_value, raw.r_symbolnum); + } else - { - unsigned long v; - - bfd_put_32 (abfd, pinfo->r_address, buf); - v = BFD_MACH_O_SET_R_SYMBOLNUM (pinfo->r_value) - | (pinfo->r_pcrel ? BFD_MACH_O_R_PCREL : 0) - | BFD_MACH_O_SET_R_LENGTH (pinfo->r_length) - | (pinfo->r_extern ? BFD_MACH_O_R_EXTERN : 0) - | BFD_MACH_O_SET_R_TYPE (pinfo->r_type); - bfd_put_32 (abfd, v, buf + 4); - } + { + bfd_put_32 (abfd, pinfo->r_address, raw.r_address); + bfd_mach_o_swap_out_non_scattered_reloc (abfd, raw.r_symbolnum, + pinfo); + } - if (bfd_bwrite ((void *) buf, BFD_MACH_O_RELENT_SIZE, abfd) - != BFD_MACH_O_RELENT_SIZE) - return FALSE; + if (bfd_bwrite (&raw, BFD_MACH_O_RELENT_SIZE, abfd) + != BFD_MACH_O_RELENT_SIZE) + return FALSE; } return TRUE; } -static int +static bfd_boolean bfd_mach_o_write_section_32 (bfd *abfd, bfd_mach_o_section *section) { - unsigned char buf[BFD_MACH_O_SECTION_SIZE]; - - memcpy (buf, section->sectname, 16); - memcpy (buf + 16, section->segname, 16); - bfd_h_put_32 (abfd, section->addr, buf + 32); - bfd_h_put_32 (abfd, section->size, buf + 36); - bfd_h_put_32 (abfd, section->offset, buf + 40); - bfd_h_put_32 (abfd, section->align, buf + 44); - bfd_h_put_32 (abfd, section->reloff, buf + 48); - bfd_h_put_32 (abfd, section->nreloc, buf + 52); - bfd_h_put_32 (abfd, section->flags, buf + 56); - bfd_h_put_32 (abfd, section->reserved1, buf + 60); - bfd_h_put_32 (abfd, section->reserved2, buf + 64); - - if (bfd_bwrite ((void *) buf, BFD_MACH_O_SECTION_SIZE, abfd) + struct mach_o_section_32_external raw; + + memcpy (raw.sectname, section->sectname, 16); + memcpy (raw.segname, section->segname, 16); + bfd_h_put_32 (abfd, section->addr, raw.addr); + bfd_h_put_32 (abfd, section->size, raw.size); + bfd_h_put_32 (abfd, section->offset, raw.offset); + bfd_h_put_32 (abfd, section->align, raw.align); + bfd_h_put_32 (abfd, section->reloff, raw.reloff); + bfd_h_put_32 (abfd, section->nreloc, raw.nreloc); + bfd_h_put_32 (abfd, section->flags, raw.flags); + bfd_h_put_32 (abfd, section->reserved1, raw.reserved1); + bfd_h_put_32 (abfd, section->reserved2, raw.reserved2); + + if (bfd_bwrite (&raw, BFD_MACH_O_SECTION_SIZE, abfd) != BFD_MACH_O_SECTION_SIZE) - return -1; + return FALSE; - return 0; + return TRUE; } -static int +static bfd_boolean bfd_mach_o_write_section_64 (bfd *abfd, bfd_mach_o_section *section) { - unsigned char buf[BFD_MACH_O_SECTION_64_SIZE]; - - memcpy (buf, section->sectname, 16); - memcpy (buf + 16, section->segname, 16); - bfd_h_put_64 (abfd, section->addr, buf + 32); - bfd_h_put_64 (abfd, section->size, buf + 40); - bfd_h_put_32 (abfd, section->offset, buf + 48); - bfd_h_put_32 (abfd, section->align, buf + 52); - bfd_h_put_32 (abfd, section->reloff, buf + 56); - bfd_h_put_32 (abfd, section->nreloc, buf + 60); - bfd_h_put_32 (abfd, section->flags, buf + 64); - bfd_h_put_32 (abfd, section->reserved1, buf + 68); - bfd_h_put_32 (abfd, section->reserved2, buf + 72); - bfd_h_put_32 (abfd, section->reserved3, buf + 76); - - if (bfd_bwrite ((void *) buf, BFD_MACH_O_SECTION_64_SIZE, abfd) + struct mach_o_section_64_external raw; + + memcpy (raw.sectname, section->sectname, 16); + memcpy (raw.segname, section->segname, 16); + bfd_h_put_64 (abfd, section->addr, raw.addr); + bfd_h_put_64 (abfd, section->size, raw.size); + bfd_h_put_32 (abfd, section->offset, raw.offset); + bfd_h_put_32 (abfd, section->align, raw.align); + bfd_h_put_32 (abfd, section->reloff, raw.reloff); + bfd_h_put_32 (abfd, section->nreloc, raw.nreloc); + bfd_h_put_32 (abfd, section->flags, raw.flags); + bfd_h_put_32 (abfd, section->reserved1, raw.reserved1); + bfd_h_put_32 (abfd, section->reserved2, raw.reserved2); + bfd_h_put_32 (abfd, section->reserved3, raw.reserved3); + + if (bfd_bwrite (&raw, BFD_MACH_O_SECTION_64_SIZE, abfd) != BFD_MACH_O_SECTION_64_SIZE) - return -1; + return FALSE; - return 0; + return TRUE; } -static int +static bfd_boolean bfd_mach_o_write_segment_32 (bfd *abfd, bfd_mach_o_load_command *command) { - unsigned char buf[BFD_MACH_O_LC_SEGMENT_SIZE]; + struct mach_o_segment_command_32_external raw; bfd_mach_o_segment_command *seg = &command->command.segment; - unsigned long i; + bfd_mach_o_section *sec; BFD_ASSERT (command->type == BFD_MACH_O_LC_SEGMENT); - for (i = 0; i < seg->nsects; i++) - if (!bfd_mach_o_write_relocs (abfd, &seg->sections[i])) - return -1; + for (sec = seg->sect_head; sec != NULL; sec = sec->next) + if (!bfd_mach_o_write_relocs (abfd, sec)) + return FALSE; - memcpy (buf, seg->segname, 16); - bfd_h_put_32 (abfd, seg->vmaddr, buf + 16); - bfd_h_put_32 (abfd, seg->vmsize, buf + 20); - bfd_h_put_32 (abfd, seg->fileoff, buf + 24); - bfd_h_put_32 (abfd, seg->filesize, buf + 28); - bfd_h_put_32 (abfd, seg->maxprot, buf + 32); - bfd_h_put_32 (abfd, seg->initprot, buf + 36); - bfd_h_put_32 (abfd, seg->nsects, buf + 40); - bfd_h_put_32 (abfd, seg->flags, buf + 44); - - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || (bfd_bwrite ((void *) buf, BFD_MACH_O_LC_SEGMENT_SIZE - 8, abfd) - != BFD_MACH_O_LC_SEGMENT_SIZE - 8)) - return -1; + memcpy (raw.segname, seg->segname, 16); + bfd_h_put_32 (abfd, seg->vmaddr, raw.vmaddr); + bfd_h_put_32 (abfd, seg->vmsize, raw.vmsize); + bfd_h_put_32 (abfd, seg->fileoff, raw.fileoff); + bfd_h_put_32 (abfd, seg->filesize, raw.filesize); + bfd_h_put_32 (abfd, seg->maxprot, raw.maxprot); + bfd_h_put_32 (abfd, seg->initprot, raw.initprot); + bfd_h_put_32 (abfd, seg->nsects, raw.nsects); + bfd_h_put_32 (abfd, seg->flags, raw.flags); + + if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0 + || bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - for (i = 0; i < seg->nsects; i++) - if (bfd_mach_o_write_section_32 (abfd, &seg->sections[i])) - return -1; + for (sec = seg->sect_head; sec != NULL; sec = sec->next) + if (!bfd_mach_o_write_section_32 (abfd, sec)) + return FALSE; - return 0; + return TRUE; } -static int +static bfd_boolean bfd_mach_o_write_segment_64 (bfd *abfd, bfd_mach_o_load_command *command) { - unsigned char buf[BFD_MACH_O_LC_SEGMENT_64_SIZE]; + struct mach_o_segment_command_64_external raw; bfd_mach_o_segment_command *seg = &command->command.segment; - unsigned long i; + bfd_mach_o_section *sec; BFD_ASSERT (command->type == BFD_MACH_O_LC_SEGMENT_64); - for (i = 0; i < seg->nsects; i++) - if (!bfd_mach_o_write_relocs (abfd, &seg->sections[i])) - return -1; + for (sec = seg->sect_head; sec != NULL; sec = sec->next) + if (!bfd_mach_o_write_relocs (abfd, sec)) + return FALSE; - memcpy (buf, seg->segname, 16); - bfd_h_put_64 (abfd, seg->vmaddr, buf + 16); - bfd_h_put_64 (abfd, seg->vmsize, buf + 24); - bfd_h_put_64 (abfd, seg->fileoff, buf + 32); - bfd_h_put_64 (abfd, seg->filesize, buf + 40); - bfd_h_put_32 (abfd, seg->maxprot, buf + 48); - bfd_h_put_32 (abfd, seg->initprot, buf + 52); - bfd_h_put_32 (abfd, seg->nsects, buf + 56); - bfd_h_put_32 (abfd, seg->flags, buf + 60); - - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || (bfd_bwrite ((void *) buf, BFD_MACH_O_LC_SEGMENT_64_SIZE - 8, abfd) - != BFD_MACH_O_LC_SEGMENT_64_SIZE - 8)) - return -1; + memcpy (raw.segname, seg->segname, 16); + bfd_h_put_64 (abfd, seg->vmaddr, raw.vmaddr); + bfd_h_put_64 (abfd, seg->vmsize, raw.vmsize); + bfd_h_put_64 (abfd, seg->fileoff, raw.fileoff); + bfd_h_put_64 (abfd, seg->filesize, raw.filesize); + bfd_h_put_32 (abfd, seg->maxprot, raw.maxprot); + bfd_h_put_32 (abfd, seg->initprot, raw.initprot); + bfd_h_put_32 (abfd, seg->nsects, raw.nsects); + bfd_h_put_32 (abfd, seg->flags, raw.flags); + + if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0 + || bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - for (i = 0; i < seg->nsects; i++) - if (bfd_mach_o_write_section_64 (abfd, &seg->sections[i])) - return -1; + for (sec = seg->sect_head; sec != NULL; sec = sec->next) + if (!bfd_mach_o_write_section_64 (abfd, sec)) + return FALSE; - return 0; + return TRUE; } static bfd_boolean -bfd_mach_o_write_symtab (bfd *abfd, bfd_mach_o_load_command *command) +bfd_mach_o_write_symtab_content (bfd *abfd, bfd_mach_o_symtab_command *sym) { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); - bfd_mach_o_symtab_command *sym = &command->command.symtab; - unsigned char buf[16]; unsigned long i; unsigned int wide = bfd_mach_o_wide_p (abfd); - unsigned int symlen = wide ? BFD_MACH_O_NLIST_64_SIZE : BFD_MACH_O_NLIST_SIZE; struct bfd_strtab_hash *strtab; asymbol **symbols = bfd_get_outsymbols (abfd); - - BFD_ASSERT (command->type == BFD_MACH_O_LC_SYMTAB); + int padlen; /* Write the symbols first. */ - mdata->filelen = FILE_ALIGN(mdata->filelen, wide ? 3 : 2); - sym->symoff = mdata->filelen; if (bfd_seek (abfd, sym->symoff, SEEK_SET) != 0) return FALSE; - sym->nsyms = bfd_get_symcount (abfd); - mdata->filelen += sym->nsyms * symlen; - strtab = _bfd_stringtab_init (); if (strtab == NULL) return FALSE; + if (sym->nsyms > 0) + /* Although we don't strictly need to do this, for compatibility with + Darwin system tools, actually output an empty string for the index + 0 entry. */ + _bfd_stringtab_add (strtab, "", TRUE, FALSE); + for (i = 0; i < sym->nsyms; i++) { bfd_size_type str_index; bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i]; - /* Compute name index. */ - /* An index of 0 always means the empty string. */ if (s->symbol.name == 0 || s->symbol.name[0] == '\0') - str_index = 0; - else - { - str_index = _bfd_stringtab_add (strtab, s->symbol.name, TRUE, FALSE); - if (str_index == (bfd_size_type) -1) - goto err; - } - bfd_h_put_32 (abfd, str_index, buf); - bfd_h_put_8 (abfd, s->n_type, buf + 4); - bfd_h_put_8 (abfd, s->n_sect, buf + 5); - bfd_h_put_16 (abfd, s->n_desc, buf + 6); - if (wide) - bfd_h_put_64 (abfd, s->symbol.section->vma + s->symbol.value, buf + 8); + /* An index of 0 always means the empty string. */ + str_index = 0; else - bfd_h_put_32 (abfd, s->symbol.section->vma + s->symbol.value, buf + 8); + { + str_index = _bfd_stringtab_add (strtab, s->symbol.name, TRUE, FALSE); - if (bfd_bwrite ((void *) buf, symlen, abfd) != symlen) - goto err; - } - sym->strsize = _bfd_stringtab_size (strtab); + if (str_index == (bfd_size_type) -1) + goto err; + } + + if (wide) + { + struct mach_o_nlist_64_external raw; + + bfd_h_put_32 (abfd, str_index, raw.n_strx); + bfd_h_put_8 (abfd, s->n_type, raw.n_type); + bfd_h_put_8 (abfd, s->n_sect, raw.n_sect); + bfd_h_put_16 (abfd, s->n_desc, raw.n_desc); + bfd_h_put_64 (abfd, s->symbol.section->vma + s->symbol.value, + raw.n_value); + + if (bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw)) + goto err; + } + else + { + struct mach_o_nlist_external raw; + + bfd_h_put_32 (abfd, str_index, raw.n_strx); + bfd_h_put_8 (abfd, s->n_type, raw.n_type); + bfd_h_put_8 (abfd, s->n_sect, raw.n_sect); + bfd_h_put_16 (abfd, s->n_desc, raw.n_desc); + bfd_h_put_32 (abfd, s->symbol.section->vma + s->symbol.value, + raw.n_value); + + if (bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw)) + goto err; + } + } + sym->strsize = _bfd_stringtab_size (strtab); sym->stroff = mdata->filelen; mdata->filelen += sym->strsize; - if (_bfd_stringtab_emit (abfd, strtab) != TRUE) + if (bfd_seek (abfd, sym->stroff, SEEK_SET) != 0) + goto err; + + if (!_bfd_stringtab_emit (abfd, strtab)) goto err; + + /* Pad string table. */ + padlen = bfd_mach_o_pad4 (abfd, sym->strsize); + if (padlen < 0) + return FALSE; + mdata->filelen += padlen; + sym->strsize += padlen; + + return TRUE; + + err: _bfd_stringtab_free (strtab); + sym->strsize = 0; + return FALSE; +} + +static bfd_boolean +bfd_mach_o_write_symtab (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_symtab_command *sym = &command->command.symtab; + struct mach_o_symtab_command_external raw; + + BFD_ASSERT (command->type == BFD_MACH_O_LC_SYMTAB); + + /* The command. */ + bfd_h_put_32 (abfd, sym->symoff, raw.symoff); + bfd_h_put_32 (abfd, sym->nsyms, raw.nsyms); + bfd_h_put_32 (abfd, sym->stroff, raw.stroff); + bfd_h_put_32 (abfd, sym->strsize, raw.strsize); + + if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0 + || bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + return TRUE; +} + +/* Count the number of indirect symbols in the image. + Requires that the sections are in their final order. */ + +static unsigned int +bfd_mach_o_count_indirect_symbols (bfd *abfd, bfd_mach_o_data_struct *mdata) +{ + unsigned int i; + unsigned int nisyms = 0; + + for (i = 0; i < mdata->nsects; ++i) + { + bfd_mach_o_section *sec = mdata->sections[i]; + + 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: + nisyms += bfd_mach_o_section_get_nbr_indirect (abfd, sec); + break; + default: + break; + } + } + return nisyms; +} + +/* Create the dysymtab. */ + +static bfd_boolean +bfd_mach_o_build_dysymtab (bfd *abfd, bfd_mach_o_dysymtab_command *cmd) +{ + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + + /* TODO: + We are not going to try and fill these in yet and, moreover, we are + going to bail if they are already set. */ + if (cmd->nmodtab != 0 + || cmd->ntoc != 0 + || cmd->nextrefsyms != 0) + { + _bfd_error_handler (_("sorry: modtab, toc and extrefsyms are not yet" + " implemented for dysymtab commands.")); + return FALSE; + } + + cmd->ilocalsym = 0; + + if (bfd_get_symcount (abfd) > 0) + { + asymbol **symbols = bfd_get_outsymbols (abfd); + unsigned long i; + + /* Count the number of each kind of symbol. */ + for (i = 0; i < bfd_get_symcount (abfd); ++i) + { + bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i]; + if (s->n_type & (BFD_MACH_O_N_EXT | BFD_MACH_O_N_PEXT)) + break; + } + cmd->nlocalsym = i; + cmd->iextdefsym = i; + for (; i < bfd_get_symcount (abfd); ++i) + { + bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i]; + if ((s->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_UNDF) + break; + } + cmd->nextdefsym = i - cmd->nlocalsym; + cmd->iundefsym = cmd->nextdefsym + cmd->iextdefsym; + cmd->nundefsym = bfd_get_symcount (abfd) + - cmd->nlocalsym + - cmd->nextdefsym; + } + else + { + cmd->nlocalsym = 0; + cmd->iextdefsym = 0; + cmd->nextdefsym = 0; + cmd->iundefsym = 0; + cmd->nundefsym = 0; + } + + cmd->nindirectsyms = bfd_mach_o_count_indirect_symbols (abfd, mdata); + if (cmd->nindirectsyms > 0) + { + unsigned i; + unsigned n; + + mdata->filelen = FILE_ALIGN (mdata->filelen, 2); + cmd->indirectsymoff = mdata->filelen; + mdata->filelen += cmd->nindirectsyms * 4; + + if (cmd->nindirectsyms * 4 < cmd->nindirectsyms) + return FALSE; + cmd->indirect_syms = bfd_zalloc (abfd, cmd->nindirectsyms * 4); + if (cmd->indirect_syms == NULL) + return FALSE; + + n = 0; + for (i = 0; i < mdata->nsects; ++i) + { + bfd_mach_o_section *sec = mdata->sections[i]; + + 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: + { + unsigned j, num; + bfd_mach_o_asymbol **isyms = sec->indirect_syms; + + num = bfd_mach_o_section_get_nbr_indirect (abfd, sec); + if (isyms == NULL || num == 0) + break; + /* Record the starting index in the reserved1 field. */ + sec->reserved1 = n; + for (j = 0; j < num; j++, n++) + { + if (isyms[j] == NULL) + cmd->indirect_syms[n] = BFD_MACH_O_INDIRECT_SYM_LOCAL; + else if (isyms[j]->symbol.section == bfd_abs_section_ptr + && ! (isyms[j]->n_type & BFD_MACH_O_N_EXT)) + cmd->indirect_syms[n] = BFD_MACH_O_INDIRECT_SYM_LOCAL + | BFD_MACH_O_INDIRECT_SYM_ABS; + else + cmd->indirect_syms[n] = isyms[j]->symbol.udata.i; + } + } + break; + default: + break; + } + } + } + + return TRUE; +} + +/* Write a dysymtab command. + TODO: Possibly coalesce writes of smaller objects. */ + +static bfd_boolean +bfd_mach_o_write_dysymtab (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_dysymtab_command *cmd = &command->command.dysymtab; + + BFD_ASSERT (command->type == BFD_MACH_O_LC_DYSYMTAB); + + if (cmd->nmodtab != 0) + { + unsigned int i; + + if (bfd_seek (abfd, cmd->modtaboff, SEEK_SET) != 0) + return FALSE; + + for (i = 0; i < cmd->nmodtab; i++) + { + bfd_mach_o_dylib_module *module = &cmd->dylib_module[i]; + unsigned int iinit; + unsigned int ninit; + + iinit = module->iinit & 0xffff; + iinit |= ((module->iterm & 0xffff) << 16); + + ninit = module->ninit & 0xffff; + ninit |= ((module->nterm & 0xffff) << 16); + + if (bfd_mach_o_wide_p (abfd)) + { + struct mach_o_dylib_module_64_external w; + + bfd_h_put_32 (abfd, module->module_name_idx, &w.module_name); + bfd_h_put_32 (abfd, module->iextdefsym, &w.iextdefsym); + bfd_h_put_32 (abfd, module->nextdefsym, &w.nextdefsym); + bfd_h_put_32 (abfd, module->irefsym, &w.irefsym); + bfd_h_put_32 (abfd, module->nrefsym, &w.nrefsym); + bfd_h_put_32 (abfd, module->ilocalsym, &w.ilocalsym); + bfd_h_put_32 (abfd, module->nlocalsym, &w.nlocalsym); + bfd_h_put_32 (abfd, module->iextrel, &w.iextrel); + bfd_h_put_32 (abfd, module->nextrel, &w.nextrel); + bfd_h_put_32 (abfd, iinit, &w.iinit_iterm); + bfd_h_put_32 (abfd, ninit, &w.ninit_nterm); + bfd_h_put_64 (abfd, module->objc_module_info_addr, + &w.objc_module_info_addr); + bfd_h_put_32 (abfd, module->objc_module_info_size, + &w.objc_module_info_size); + + if (bfd_bwrite ((void *) &w, sizeof (w), abfd) != sizeof (w)) + return FALSE; + } + else + { + struct mach_o_dylib_module_external n; + + bfd_h_put_32 (abfd, module->module_name_idx, &n.module_name); + bfd_h_put_32 (abfd, module->iextdefsym, &n.iextdefsym); + bfd_h_put_32 (abfd, module->nextdefsym, &n.nextdefsym); + bfd_h_put_32 (abfd, module->irefsym, &n.irefsym); + bfd_h_put_32 (abfd, module->nrefsym, &n.nrefsym); + bfd_h_put_32 (abfd, module->ilocalsym, &n.ilocalsym); + bfd_h_put_32 (abfd, module->nlocalsym, &n.nlocalsym); + bfd_h_put_32 (abfd, module->iextrel, &n.iextrel); + bfd_h_put_32 (abfd, module->nextrel, &n.nextrel); + bfd_h_put_32 (abfd, iinit, &n.iinit_iterm); + bfd_h_put_32 (abfd, ninit, &n.ninit_nterm); + bfd_h_put_32 (abfd, module->objc_module_info_addr, + &n.objc_module_info_addr); + bfd_h_put_32 (abfd, module->objc_module_info_size, + &n.objc_module_info_size); + + if (bfd_bwrite ((void *) &n, sizeof (n), abfd) != sizeof (n)) + return FALSE; + } + } + } + + if (cmd->ntoc != 0) + { + unsigned int i; + + if (bfd_seek (abfd, cmd->tocoff, SEEK_SET) != 0) + return FALSE; + + for (i = 0; i < cmd->ntoc; i++) + { + struct mach_o_dylib_table_of_contents_external raw; + bfd_mach_o_dylib_table_of_content *toc = &cmd->dylib_toc[i]; + + bfd_h_put_32 (abfd, toc->symbol_index, &raw.symbol_index); + bfd_h_put_32 (abfd, toc->module_index, &raw.module_index); + + if (bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + } + } + + if (cmd->nindirectsyms > 0) + { + unsigned int i; + + if (bfd_seek (abfd, cmd->indirectsymoff, SEEK_SET) != 0) + return FALSE; + + for (i = 0; i < cmd->nindirectsyms; ++i) + { + unsigned char raw[4]; + + bfd_h_put_32 (abfd, cmd->indirect_syms[i], &raw); + if (bfd_bwrite (raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + } + } + + if (cmd->nextrefsyms != 0) + { + unsigned int i; + + if (bfd_seek (abfd, cmd->extrefsymoff, SEEK_SET) != 0) + return FALSE; + + for (i = 0; i < cmd->nextrefsyms; i++) + { + unsigned long v; + unsigned char raw[4]; + bfd_mach_o_dylib_reference *ref = &cmd->ext_refs[i]; + + /* Fields isym and flags are written as bit-fields, thus we need + a specific processing for endianness. */ + + if (bfd_big_endian (abfd)) + { + v = ((ref->isym & 0xffffff) << 8); + v |= ref->flags & 0xff; + } + else + { + v = ref->isym & 0xffffff; + v |= ((ref->flags & 0xff) << 24); + } + + bfd_h_put_32 (abfd, v, raw); + if (bfd_bwrite (raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + } + } /* The command. */ - bfd_h_put_32 (abfd, sym->symoff, buf); - bfd_h_put_32 (abfd, sym->nsyms, buf + 4); - bfd_h_put_32 (abfd, sym->stroff, buf + 8); - bfd_h_put_32 (abfd, sym->strsize, buf + 12); + if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0) + return FALSE; + else + { + struct mach_o_dysymtab_command_external raw; + + bfd_h_put_32 (abfd, cmd->ilocalsym, &raw.ilocalsym); + bfd_h_put_32 (abfd, cmd->nlocalsym, &raw.nlocalsym); + bfd_h_put_32 (abfd, cmd->iextdefsym, &raw.iextdefsym); + bfd_h_put_32 (abfd, cmd->nextdefsym, &raw.nextdefsym); + bfd_h_put_32 (abfd, cmd->iundefsym, &raw.iundefsym); + bfd_h_put_32 (abfd, cmd->nundefsym, &raw.nundefsym); + bfd_h_put_32 (abfd, cmd->tocoff, &raw.tocoff); + bfd_h_put_32 (abfd, cmd->ntoc, &raw.ntoc); + bfd_h_put_32 (abfd, cmd->modtaboff, &raw.modtaboff); + bfd_h_put_32 (abfd, cmd->nmodtab, &raw.nmodtab); + bfd_h_put_32 (abfd, cmd->extrefsymoff, &raw.extrefsymoff); + bfd_h_put_32 (abfd, cmd->nextrefsyms, &raw.nextrefsyms); + bfd_h_put_32 (abfd, cmd->indirectsymoff, &raw.indirectsymoff); + bfd_h_put_32 (abfd, cmd->nindirectsyms, &raw.nindirectsyms); + bfd_h_put_32 (abfd, cmd->extreloff, &raw.extreloff); + bfd_h_put_32 (abfd, cmd->nextrel, &raw.nextrel); + bfd_h_put_32 (abfd, cmd->locreloff, &raw.locreloff); + bfd_h_put_32 (abfd, cmd->nlocrel, &raw.nlocrel); + + if (bfd_bwrite (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + } + + return TRUE; +} + +static unsigned +bfd_mach_o_primary_symbol_sort_key (bfd_mach_o_asymbol *s) +{ + unsigned mtyp = s->n_type & BFD_MACH_O_N_TYPE; + + /* Just leave debug symbols where they are (pretend they are local, and + then they will just be sorted on position). */ + if (s->n_type & BFD_MACH_O_N_STAB) + return 0; + + /* Local (we should never see an undefined local AFAICT). */ + if (! (s->n_type & (BFD_MACH_O_N_EXT | BFD_MACH_O_N_PEXT))) + return 0; + + /* Common symbols look like undefined externs. */ + if (mtyp == BFD_MACH_O_N_UNDF) + return 2; + + /* A defined non-local, non-debug symbol. */ + return 1; +} + +static int +bfd_mach_o_cf_symbols (const void *a, const void *b) +{ + bfd_mach_o_asymbol *sa = *(bfd_mach_o_asymbol **) a; + bfd_mach_o_asymbol *sb = *(bfd_mach_o_asymbol **) b; + unsigned int soa, sob; + + soa = bfd_mach_o_primary_symbol_sort_key (sa); + sob = bfd_mach_o_primary_symbol_sort_key (sb); + if (soa < sob) + return -1; + + if (soa > sob) + return 1; + + /* If it's local or stab, just preserve the input order. */ + if (soa == 0) + { + if (sa->symbol.udata.i < sb->symbol.udata.i) + return -1; + if (sa->symbol.udata.i > sb->symbol.udata.i) + return 1; + + /* This is probably an error. */ + return 0; + } + + /* The second sort key is name. */ + return strcmp (sa->symbol.name, sb->symbol.name); +} + +/* Process the symbols. + + This should be OK for single-module files - but it is not likely to work + for multi-module shared libraries. + + (a) If the application has not filled in the relevant mach-o fields, make + an estimate. + + (b) Order them, like this: + ( i) local. + (unsorted) + ( ii) external defined + (by name) + (iii) external undefined/common + (by name) + ( iv) common + (by name) +*/ + +static bfd_boolean +bfd_mach_o_mangle_symbols (bfd *abfd) +{ + unsigned long i; + asymbol **symbols = bfd_get_outsymbols (abfd); + + if (symbols == NULL || bfd_get_symcount (abfd) == 0) + return TRUE; + + for (i = 0; i < bfd_get_symcount (abfd); i++) + { + bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i]; + + /* We use this value, which is out-of-range as a symbol index, to signal + that the mach-o-specific data are not filled in and need to be created + from the bfd values. It is much preferable for the application to do + this, since more meaningful diagnostics can be made that way. */ + + if (s->symbol.udata.i == SYM_MACHO_FIELDS_UNSET) + { + /* No symbol information has been set - therefore determine + it from the bfd symbol flags/info. */ + if (s->symbol.section == bfd_abs_section_ptr) + s->n_type = BFD_MACH_O_N_ABS; + else if (s->symbol.section == bfd_und_section_ptr) + { + s->n_type = BFD_MACH_O_N_UNDF; + if (s->symbol.flags & BSF_WEAK) + s->n_desc |= BFD_MACH_O_N_WEAK_REF; + /* mach-o automatically makes undefined symbols extern. */ + s->n_type |= BFD_MACH_O_N_EXT; + s->symbol.flags |= BSF_GLOBAL; + } + else if (s->symbol.section == bfd_com_section_ptr) + { + s->n_type = BFD_MACH_O_N_UNDF | BFD_MACH_O_N_EXT; + s->symbol.flags |= BSF_GLOBAL; + } + else + s->n_type = BFD_MACH_O_N_SECT; + } + + /* Update external symbol bit in case objcopy changed it. */ + if (s->symbol.flags & BSF_GLOBAL) + s->n_type |= BFD_MACH_O_N_EXT; + else + s->n_type &= ~BFD_MACH_O_N_EXT; + + /* Put the section index in, where required. */ + if ((s->symbol.section != bfd_abs_section_ptr + && s->symbol.section != bfd_und_section_ptr + && s->symbol.section != bfd_com_section_ptr) + || ((s->n_type & BFD_MACH_O_N_STAB) != 0 + && s->symbol.name == NULL)) + s->n_sect = s->symbol.section->output_section->target_index; + + /* Number to preserve order for local and debug syms. */ + s->symbol.udata.i = i; + } + + /* Sort the symbols. */ + qsort ((void *) symbols, (size_t) bfd_get_symcount (abfd), + sizeof (asymbol *), bfd_mach_o_cf_symbols); + + for (i = 0; i < bfd_get_symcount (abfd); ++i) + { + bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i]; + s->symbol.udata.i = i; /* renumber. */ + } - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || bfd_bwrite ((void *) buf, 16, abfd) != 16) + return TRUE; +} + +/* We build a flat table of sections, which can be re-ordered if necessary. + Fill in the section number and other mach-o-specific data. */ + +static bfd_boolean +bfd_mach_o_mangle_sections (bfd *abfd, bfd_mach_o_data_struct *mdata) +{ + asection *sec; + unsigned target_index; + unsigned nsect; + + nsect = bfd_count_sections (abfd); + + /* Don't do it if it's already set - assume the application knows what it's + doing. */ + if (mdata->nsects == nsect + && (mdata->nsects == 0 || mdata->sections != NULL)) + return TRUE; + + /* We need to check that this can be done... */ + if (nsect > 255) + { + _bfd_error_handler (_("mach-o: there are too many sections (%u)" + " maximum is 255,\n"), nsect); + return FALSE; + } + + mdata->nsects = nsect; + mdata->sections = bfd_alloc2 (abfd, + mdata->nsects, sizeof (bfd_mach_o_section *)); + if (mdata->sections == NULL) return FALSE; + /* Create Mach-O sections. + Section type, attribute and align should have been set when the + section was created - either read in or specified. */ + target_index = 0; + for (sec = abfd->sections; sec; sec = sec->next) + { + unsigned bfd_align = bfd_section_alignment (sec); + bfd_mach_o_section *msect = bfd_mach_o_get_mach_o_section (sec); + + mdata->sections[target_index] = msect; + + msect->addr = bfd_section_vma (sec); + msect->size = bfd_section_size (sec); + + /* Use the largest alignment set, in case it was bumped after the + section was created. */ + msect->align = msect->align > bfd_align ? msect->align : bfd_align; + + msect->offset = 0; + sec->target_index = ++target_index; + } + + return TRUE; +} + +bfd_boolean +bfd_mach_o_write_contents (bfd *abfd) +{ + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + bfd_mach_o_load_command *cmd; + bfd_mach_o_symtab_command *symtab = NULL; + bfd_mach_o_dysymtab_command *dysymtab = NULL; + bfd_mach_o_segment_command *linkedit = NULL; + + /* Make the commands, if not already present. */ + if (!abfd->output_has_begun && !bfd_mach_o_build_commands (abfd)) + return FALSE; + abfd->output_has_begun = TRUE; + + /* Write the header. */ + if (!bfd_mach_o_write_header (abfd, &mdata->header)) + return FALSE; + + /* First pass: allocate the linkedit segment. */ + for (cmd = mdata->first_command; cmd != NULL; cmd = cmd->next) + switch (cmd->type) + { + case BFD_MACH_O_LC_SEGMENT_64: + case BFD_MACH_O_LC_SEGMENT: + if (strcmp (cmd->command.segment.segname, "__LINKEDIT") == 0) + linkedit = &cmd->command.segment; + break; + case BFD_MACH_O_LC_SYMTAB: + symtab = &cmd->command.symtab; + break; + case BFD_MACH_O_LC_DYSYMTAB: + dysymtab = &cmd->command.dysymtab; + break; + case BFD_MACH_O_LC_DYLD_INFO: + { + bfd_mach_o_dyld_info_command *di = &cmd->command.dyld_info; + + if (di->rebase_size != 0) + { + di->rebase_off = mdata->filelen; + mdata->filelen += di->rebase_size; + } + if (di->bind_size != 0) + { + di->bind_off = mdata->filelen; + mdata->filelen += di->bind_size; + } + if (di->weak_bind_size != 0) + { + di->weak_bind_off = mdata->filelen; + mdata->filelen += di->weak_bind_size; + } + if (di->lazy_bind_size != 0) + { + di->lazy_bind_off = mdata->filelen; + mdata->filelen += di->lazy_bind_size; + } + if (di->export_size != 0) + { + di->export_off = mdata->filelen; + mdata->filelen += di->export_size; + } + } + break; + case BFD_MACH_O_LC_LOAD_DYLIB: + case BFD_MACH_O_LC_LOAD_DYLINKER: + case BFD_MACH_O_LC_MAIN: + /* Nothing to do. */ + break; + default: + _bfd_error_handler + (_("unable to allocate data for load command %#x"), + cmd->type); + break; + } + + /* Specially handle symtab and dysymtab. */ + + /* Pre-allocate the symbol table (but not the string table). The reason + is that the dysymtab is after the symbol table but before the string + table (required by the native strip tool). */ + if (symtab != NULL) + { + unsigned int symlen; + unsigned int wide = bfd_mach_o_wide_p (abfd); + + symlen = wide ? BFD_MACH_O_NLIST_64_SIZE : BFD_MACH_O_NLIST_SIZE; + + /* Align for symbols. */ + mdata->filelen = FILE_ALIGN (mdata->filelen, wide ? 3 : 2); + symtab->symoff = mdata->filelen; + + symtab->nsyms = bfd_get_symcount (abfd); + mdata->filelen += symtab->nsyms * symlen; + } + + /* Build the dysymtab. */ + if (dysymtab != NULL) + if (!bfd_mach_o_build_dysymtab (abfd, dysymtab)) + return FALSE; + + /* Write symtab and strtab. */ + if (symtab != NULL) + if (!bfd_mach_o_write_symtab_content (abfd, symtab)) + return FALSE; + + /* Adjust linkedit size. */ + if (linkedit != NULL) + { + /* bfd_vma pagemask = bfd_mach_o_get_backend_data (abfd)->page_size - 1; */ + + linkedit->vmsize = mdata->filelen - linkedit->fileoff; + /* linkedit->vmsize = (linkedit->vmsize + pagemask) & ~pagemask; */ + linkedit->filesize = mdata->filelen - linkedit->fileoff; + + linkedit->initprot = BFD_MACH_O_PROT_READ; + linkedit->maxprot = BFD_MACH_O_PROT_READ | BFD_MACH_O_PROT_WRITE + | BFD_MACH_O_PROT_EXECUTE; + } + + /* Second pass: write commands. */ + for (cmd = mdata->first_command; cmd != NULL; cmd = cmd->next) + { + struct mach_o_load_command_external raw; + unsigned long typeflag; + + typeflag = cmd->type | (cmd->type_required ? BFD_MACH_O_LC_REQ_DYLD : 0); + + bfd_h_put_32 (abfd, typeflag, raw.cmd); + bfd_h_put_32 (abfd, cmd->len, raw.cmdsize); + + if (bfd_seek (abfd, cmd->offset, SEEK_SET) != 0 + || bfd_bwrite (&raw, BFD_MACH_O_LC_SIZE, abfd) != 8) + return FALSE; + + switch (cmd->type) + { + case BFD_MACH_O_LC_SEGMENT: + if (!bfd_mach_o_write_segment_32 (abfd, cmd)) + return FALSE; + break; + case BFD_MACH_O_LC_SEGMENT_64: + if (!bfd_mach_o_write_segment_64 (abfd, cmd)) + return FALSE; + break; + case BFD_MACH_O_LC_SYMTAB: + if (!bfd_mach_o_write_symtab (abfd, cmd)) + return FALSE; + break; + case BFD_MACH_O_LC_DYSYMTAB: + if (!bfd_mach_o_write_dysymtab (abfd, cmd)) + return FALSE; + break; + case BFD_MACH_O_LC_THREAD: + case BFD_MACH_O_LC_UNIXTHREAD: + if (!bfd_mach_o_write_thread (abfd, cmd)) + return FALSE; + break; + case BFD_MACH_O_LC_LOAD_DYLIB: + if (!bfd_mach_o_write_dylib (abfd, cmd)) + return FALSE; + break; + case BFD_MACH_O_LC_LOAD_DYLINKER: + if (!bfd_mach_o_write_dylinker (abfd, cmd)) + return FALSE; + break; + case BFD_MACH_O_LC_MAIN: + if (!bfd_mach_o_write_main (abfd, cmd)) + return FALSE; + break; + case BFD_MACH_O_LC_DYLD_INFO: + if (!bfd_mach_o_write_dyld_info (abfd, cmd)) + return FALSE; + break; + default: + _bfd_error_handler + (_("unable to write unknown load command %#x"), + cmd->type); + return FALSE; + } + } + + return TRUE; +} + +static void +bfd_mach_o_append_section_to_segment (bfd_mach_o_segment_command *seg, + bfd_mach_o_section *s) +{ + if (seg->sect_head == NULL) + seg->sect_head = s; + else + seg->sect_tail->next = s; + seg->sect_tail = s; +} + +/* Create section Mach-O flags from BFD flags. */ + +static void +bfd_mach_o_set_section_flags_from_bfd (bfd *abfd ATTRIBUTE_UNUSED, + asection *sec) +{ + flagword bfd_flags; + bfd_mach_o_section *s = bfd_mach_o_get_mach_o_section (sec); + + /* Create default flags. */ + bfd_flags = bfd_section_flags (sec); + if ((bfd_flags & SEC_CODE) == SEC_CODE) + s->flags = BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS + | BFD_MACH_O_S_ATTR_SOME_INSTRUCTIONS + | BFD_MACH_O_S_REGULAR; + else if ((bfd_flags & (SEC_ALLOC | SEC_LOAD)) == SEC_ALLOC) + s->flags = BFD_MACH_O_S_ZEROFILL; + else if (bfd_flags & SEC_DEBUGGING) + s->flags = BFD_MACH_O_S_REGULAR | BFD_MACH_O_S_ATTR_DEBUG; + else + s->flags = BFD_MACH_O_S_REGULAR; +} + +static bfd_boolean +bfd_mach_o_build_obj_seg_command (bfd *abfd, bfd_mach_o_segment_command *seg) +{ + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + unsigned int i, j; + + seg->vmaddr = 0; + seg->fileoff = mdata->filelen; + seg->initprot = BFD_MACH_O_PROT_READ | BFD_MACH_O_PROT_WRITE + | BFD_MACH_O_PROT_EXECUTE; + seg->maxprot = seg->initprot; + + /* Append sections to the segment. + + This is a little tedious, we have to honor the need to account zerofill + sections after all the rest. This forces us to do the calculation of + total vmsize in three passes so that any alignment increments are + properly accounted. */ + for (i = 0; i < mdata->nsects; ++i) + { + bfd_mach_o_section *s = mdata->sections[i]; + asection *sec = s->bfdsection; + + /* Although we account for zerofill section sizes in vm order, they are + placed in the file in source sequence. */ + bfd_mach_o_append_section_to_segment (seg, s); + s->offset = 0; + + /* Zerofill sections have zero file size & offset, the only content + written to the file is the symbols. */ + if ((s->flags & BFD_MACH_O_SECTION_TYPE_MASK) == BFD_MACH_O_S_ZEROFILL + || ((s->flags & BFD_MACH_O_SECTION_TYPE_MASK) + == BFD_MACH_O_S_GB_ZEROFILL)) + continue; + + /* The Darwin system tools (in MH_OBJECT files, at least) always account + sections, even those with zero size. */ + if (s->size > 0) + { + seg->vmsize = FILE_ALIGN (seg->vmsize, s->align); + seg->vmsize += s->size; + + /* MH_OBJECT files have unaligned content. */ + if (1) + { + seg->filesize = FILE_ALIGN (seg->filesize, s->align); + mdata->filelen = FILE_ALIGN (mdata->filelen, s->align); + } + seg->filesize += s->size; + + /* The system tools write even zero-sized sections with an offset + field set to the current file position. */ + s->offset = mdata->filelen; + } + + sec->filepos = s->offset; + mdata->filelen += s->size; + } + + /* Now pass through again, for zerofill, only now we just update the + vmsize, and then for zerofill_GB. */ + for (j = 0; j < 2; j++) + { + unsigned int stype; + + if (j == 0) + stype = BFD_MACH_O_S_ZEROFILL; + else + stype = BFD_MACH_O_S_GB_ZEROFILL; + + for (i = 0; i < mdata->nsects; ++i) + { + bfd_mach_o_section *s = mdata->sections[i]; + + if ((s->flags & BFD_MACH_O_SECTION_TYPE_MASK) != stype) + continue; + + if (s->size > 0) + { + seg->vmsize = FILE_ALIGN (seg->vmsize, s->align); + seg->vmsize += s->size; + } + } + } + + /* Allocate space for the relocations. */ + mdata->filelen = FILE_ALIGN (mdata->filelen, 2); + + for (i = 0; i < mdata->nsects; ++i) + { + bfd_mach_o_section *ms = mdata->sections[i]; + asection *sec = ms->bfdsection; + + ms->nreloc = sec->reloc_count; + if (ms->nreloc == 0) + { + /* Clear nreloc and reloff if there is no relocs. */ + ms->reloff = 0; + continue; + } + sec->rel_filepos = mdata->filelen; + ms->reloff = sec->rel_filepos; + mdata->filelen += sec->reloc_count * BFD_MACH_O_RELENT_SIZE; + } + + return TRUE; +} + +static bfd_boolean +bfd_mach_o_build_exec_seg_command (bfd *abfd, bfd_mach_o_segment_command *seg) +{ + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + unsigned int i; + bfd_vma pagemask = bfd_mach_o_get_backend_data (abfd)->page_size - 1; + bfd_vma vma; + bfd_mach_o_section *s; + + seg->vmsize = 0; + + seg->fileoff = mdata->filelen; + seg->maxprot = 0; + seg->initprot = 0; + seg->flags = 0; + + /* Append sections to the segment. We assume they are properly ordered + by vma (but we check that). */ + vma = 0; + for (i = 0; i < mdata->nsects; ++i) + { + s = mdata->sections[i]; + + /* Consider only sections for this segment. */ + if (strcmp (seg->segname, s->segname) != 0) + continue; + + bfd_mach_o_append_section_to_segment (seg, s); + + if (s->addr < vma) + { + _bfd_error_handler + /* xgettext:c-format */ + (_("section address (%#" PRIx64 ") " + "below start of segment (%#" PRIx64 ")"), + (uint64_t) s->addr, (uint64_t) vma); + return FALSE; + } + + vma = s->addr + s->size; + } + + /* Set segment file offset: make it page aligned. */ + vma = seg->sect_head->addr; + seg->vmaddr = vma & ~pagemask; + if ((mdata->filelen & pagemask) > (vma & pagemask)) + mdata->filelen += pagemask + 1; + seg->fileoff = mdata->filelen & ~pagemask; + mdata->filelen = seg->fileoff + (vma & pagemask); + + /* Set section file offset. */ + for (s = seg->sect_head; s != NULL; s = s->next) + { + asection *sec = s->bfdsection; + flagword flags = bfd_section_flags (sec); + + /* Adjust segment size. */ + seg->vmsize = FILE_ALIGN (seg->vmsize, s->align); + seg->vmsize += s->size; + + /* File offset and length. */ + seg->filesize = FILE_ALIGN (seg->filesize, s->align); + + if ((s->flags & BFD_MACH_O_SECTION_TYPE_MASK) != BFD_MACH_O_S_ZEROFILL + && ((s->flags & BFD_MACH_O_SECTION_TYPE_MASK) + != BFD_MACH_O_S_GB_ZEROFILL)) + { + mdata->filelen = FILE_ALIGN (mdata->filelen, s->align); + + s->offset = mdata->filelen; + s->bfdsection->filepos = s->offset; + + seg->filesize += s->size; + mdata->filelen += s->size; + } + else + { + s->offset = 0; + s->bfdsection->filepos = 0; + } + + /* Set protection. */ + if (flags & SEC_LOAD) + { + if (flags & SEC_CODE) + seg->initprot |= BFD_MACH_O_PROT_READ | BFD_MACH_O_PROT_EXECUTE; + if ((flags & (SEC_DATA | SEC_READONLY)) == SEC_DATA) + seg->initprot |= BFD_MACH_O_PROT_WRITE | BFD_MACH_O_PROT_READ; + } + + /* Relocs shouldn't appear in non-object files. */ + if (s->bfdsection->reloc_count != 0) + return FALSE; + } + + /* Set maxprot. */ + if (seg->initprot != 0) + seg->maxprot = BFD_MACH_O_PROT_READ | BFD_MACH_O_PROT_WRITE + | BFD_MACH_O_PROT_EXECUTE; + else + seg->maxprot = 0; + + /* Round segment size (and file size). */ + seg->vmsize = (seg->vmsize + pagemask) & ~pagemask; + seg->filesize = (seg->filesize + pagemask) & ~pagemask; + mdata->filelen = (mdata->filelen + pagemask) & ~pagemask; + return TRUE; +} + +/* Layout the commands: set commands size and offset, set ncmds and sizeofcmds + fields in header. */ + +static bfd_boolean +bfd_mach_o_layout_commands (bfd_mach_o_data_struct *mdata) +{ + unsigned wide = mach_o_wide_p (&mdata->header); + unsigned int hdrlen; + ufile_ptr offset; + bfd_mach_o_load_command *cmd; + unsigned int align; + bfd_boolean ret = TRUE; + + hdrlen = wide ? BFD_MACH_O_HEADER_64_SIZE : BFD_MACH_O_HEADER_SIZE; + align = wide ? 8 - 1 : 4 - 1; + offset = hdrlen; + mdata->header.ncmds = 0; + + for (cmd = mdata->first_command; cmd; cmd = cmd->next) + { + mdata->header.ncmds++; + cmd->offset = offset; + + switch (cmd->type) + { + case BFD_MACH_O_LC_SEGMENT_64: + cmd->len = BFD_MACH_O_LC_SEGMENT_64_SIZE + + BFD_MACH_O_SECTION_64_SIZE * cmd->command.segment.nsects; + break; + case BFD_MACH_O_LC_SEGMENT: + cmd->len = BFD_MACH_O_LC_SEGMENT_SIZE + + BFD_MACH_O_SECTION_SIZE * cmd->command.segment.nsects; + break; + case BFD_MACH_O_LC_SYMTAB: + cmd->len = sizeof (struct mach_o_symtab_command_external) + + BFD_MACH_O_LC_SIZE; + break; + case BFD_MACH_O_LC_DYSYMTAB: + cmd->len = sizeof (struct mach_o_dysymtab_command_external) + + BFD_MACH_O_LC_SIZE; + break; + case BFD_MACH_O_LC_LOAD_DYLIB: + cmd->len = sizeof (struct mach_o_dylib_command_external) + + BFD_MACH_O_LC_SIZE; + cmd->command.dylib.name_offset = cmd->len; + cmd->len += strlen (cmd->command.dylib.name_str); + cmd->len = (cmd->len + align) & ~align; + break; + case BFD_MACH_O_LC_LOAD_DYLINKER: + cmd->len = sizeof (struct mach_o_str_command_external) + + BFD_MACH_O_LC_SIZE; + cmd->command.dylinker.name_offset = cmd->len; + cmd->len += strlen (cmd->command.dylinker.name_str); + cmd->len = (cmd->len + align) & ~align; + break; + case BFD_MACH_O_LC_MAIN: + cmd->len = sizeof (struct mach_o_entry_point_command_external) + + BFD_MACH_O_LC_SIZE; + break; + case BFD_MACH_O_LC_DYLD_INFO: + cmd->len = sizeof (struct mach_o_dyld_info_command_external) + + BFD_MACH_O_LC_SIZE; + break; + default: + _bfd_error_handler + (_("unable to layout unknown load command %#x"), + cmd->type); + ret = FALSE; + break; + } + + BFD_ASSERT (cmd->len % (align + 1) == 0); + offset += cmd->len; + } + mdata->header.sizeofcmds = offset - hdrlen; + mdata->filelen = offset; - err: - _bfd_stringtab_free (strtab); - return FALSE; + return ret; } -/* Process the symbols and generate Mach-O specific fields. - Number them. */ +/* Subroutine of bfd_mach_o_build_commands: set type, name and nsects of a + segment. */ -static bfd_boolean -bfd_mach_o_mangle_symbols (bfd *abfd) +static void +bfd_mach_o_init_segment (bfd_mach_o_data_struct *mdata, + bfd_mach_o_load_command *cmd, + const char *segname, unsigned int nbr_sect) { - unsigned long i; - asymbol **symbols = bfd_get_outsymbols (abfd); + bfd_mach_o_segment_command *seg = &cmd->command.segment; + unsigned wide = mach_o_wide_p (&mdata->header); - for (i = 0; i < bfd_get_symcount (abfd); i++) - { - bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i]; + /* Init segment command. */ + cmd->type = wide ? BFD_MACH_O_LC_SEGMENT_64 : BFD_MACH_O_LC_SEGMENT; + cmd->type_required = FALSE; - if (s->n_type == BFD_MACH_O_N_UNDF && !(s->symbol.flags & BSF_DEBUGGING)) - { - /* As genuine Mach-O symbols type shouldn't be N_UNDF (undefined - symbols should be N_UNDEF | N_EXT), we suppose the back-end - values haven't been set. */ - if (s->symbol.section == bfd_abs_section_ptr) - s->n_type = BFD_MACH_O_N_ABS; - else if (s->symbol.section == bfd_und_section_ptr) - { - s->n_type = BFD_MACH_O_N_UNDF; - if (s->symbol.flags & BSF_WEAK) - s->n_desc |= BFD_MACH_O_N_WEAK_REF; - } - else if (s->symbol.section == bfd_com_section_ptr) - s->n_type = BFD_MACH_O_N_UNDF | BFD_MACH_O_N_EXT; - else - s->n_type = BFD_MACH_O_N_SECT; - - if (s->symbol.flags & BSF_GLOBAL) - s->n_type |= BFD_MACH_O_N_EXT; - } - - /* Compute section index. */ - if (s->symbol.section != bfd_abs_section_ptr - && s->symbol.section != bfd_und_section_ptr - && s->symbol.section != bfd_com_section_ptr) - s->n_sect = s->symbol.section->target_index; - - /* Number symbols. */ - s->symbol.udata.i = i; - } - return TRUE; + strcpy (seg->segname, segname); + seg->nsects = nbr_sect; + + seg->vmaddr = 0; + seg->vmsize = 0; + + seg->fileoff = 0; + seg->filesize = 0; + seg->maxprot = 0; + seg->initprot = 0; + seg->flags = 0; + seg->sect_head = NULL; + seg->sect_tail = NULL; } +/* Build Mach-O load commands (currently assuming an MH_OBJECT file). + TODO: Other file formats, rebuilding symtab/dysymtab commands for strip + and copy functionality. */ + bfd_boolean -bfd_mach_o_write_contents (bfd *abfd) +bfd_mach_o_build_commands (bfd *abfd) { - unsigned int i; bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + unsigned wide = mach_o_wide_p (&mdata->header); + unsigned int nbr_segcmd = 0; + bfd_mach_o_load_command *commands; + unsigned int nbr_commands; + int symtab_idx = -1; + int dysymtab_idx = -1; + int main_idx = -1; + unsigned int i; - if (mdata->header.ncmds == 0) - if (!bfd_mach_o_build_commands (abfd)) - return FALSE; + /* Return now if already built. */ + if (mdata->header.ncmds != 0) + return TRUE; - /* Now write header information. */ + /* Fill in the file type, if not already set. */ if (mdata->header.filetype == 0) { if (abfd->flags & EXEC_P) - mdata->header.filetype = BFD_MACH_O_MH_EXECUTE; + mdata->header.filetype = BFD_MACH_O_MH_EXECUTE; else if (abfd->flags & DYNAMIC) - mdata->header.filetype = BFD_MACH_O_MH_DYLIB; + mdata->header.filetype = BFD_MACH_O_MH_DYLIB; else - mdata->header.filetype = BFD_MACH_O_MH_OBJECT; + mdata->header.filetype = BFD_MACH_O_MH_OBJECT; } - if (!bfd_mach_o_write_header (abfd, &mdata->header)) - return FALSE; - /* Assign a number to each symbols. */ + /* If hasn't already been done, flatten sections list, and sort + if/when required. Must be done before the symbol table is adjusted, + since that depends on properly numbered sections. */ + if (mdata->nsects == 0 || mdata->sections == NULL) + if (! bfd_mach_o_mangle_sections (abfd, mdata)) + return FALSE; + + /* Order the symbol table, fill-in/check mach-o specific fields and + partition out any indirect symbols. */ if (!bfd_mach_o_mangle_symbols (abfd)) return FALSE; - for (i = 0; i < mdata->header.ncmds; i++) + /* Segment commands. */ + if (mdata->header.filetype == BFD_MACH_O_MH_OBJECT) { - unsigned char buf[8]; - bfd_mach_o_load_command *cur = &mdata->commands[i]; - unsigned long typeflag; + /* Only one segment for all the sections. But the segment is + optional if there is no sections. */ + nbr_segcmd = (mdata->nsects > 0) ? 1 : 0; + } + else + { + bfd_mach_o_section *prev_sect = NULL; - typeflag = cur->type | (cur->type_required ? BFD_MACH_O_LC_REQ_DYLD : 0); + /* One pagezero segment and one linkedit segment. */ + nbr_segcmd = 2; - bfd_h_put_32 (abfd, typeflag, buf); - bfd_h_put_32 (abfd, cur->len, buf + 4); + /* Create one segment for associated segment name in sections. + Assume that sections with the same segment name are consecutive. */ + for (i = 0; i < mdata->nsects; i++) + { + bfd_mach_o_section *this_sect = mdata->sections[i]; - if (bfd_seek (abfd, cur->offset, SEEK_SET) != 0 - || bfd_bwrite ((void *) buf, 8, abfd) != 8) - return FALSE; + if (prev_sect == NULL + || strcmp (prev_sect->segname, this_sect->segname) != 0) + { + nbr_segcmd++; + prev_sect = this_sect; + } + } + } + + nbr_commands = nbr_segcmd; + + /* One command for the symbol table (only if there are symbols. */ + if (bfd_get_symcount (abfd) > 0) + symtab_idx = nbr_commands++; + + /* FIXME: + This is a rather crude test for whether we should build a dysymtab. */ + if (bfd_mach_o_should_emit_dysymtab () + && bfd_get_symcount (abfd)) + { + /* If there should be a case where a dysymtab could be emitted without + a symtab (seems improbable), this would need amending. */ + dysymtab_idx = nbr_commands++; + } + + /* Add an entry point command. */ + if (mdata->header.filetype == BFD_MACH_O_MH_EXECUTE + && bfd_get_start_address (abfd) != 0) + main_idx = nbr_commands++; + + /* Well, we must have a header, at least. */ + mdata->filelen = wide ? BFD_MACH_O_HEADER_64_SIZE : BFD_MACH_O_HEADER_SIZE; + + /* A bit unusual, but no content is valid; + as -n empty.s -o empty.o */ + if (nbr_commands == 0) + { + /* Layout commands (well none...) and set headers command fields. */ + return bfd_mach_o_layout_commands (mdata); + } + + /* Create commands for segments (and symtabs), prepend them. */ + commands = bfd_zalloc (abfd, nbr_commands * sizeof (bfd_mach_o_load_command)); + if (commands == NULL) + return FALSE; + for (i = 0; i < nbr_commands - 1; i++) + commands[i].next = &commands[i + 1]; + commands[nbr_commands - 1].next = mdata->first_command; + if (mdata->first_command == NULL) + mdata->last_command = &commands[nbr_commands - 1]; + mdata->first_command = &commands[0]; + + if (mdata->header.filetype == BFD_MACH_O_MH_OBJECT && nbr_segcmd != 0) + { + /* For object file, there is only one segment. */ + bfd_mach_o_init_segment (mdata, &commands[0], "", mdata->nsects); + } + else if (nbr_segcmd != 0) + { + bfd_mach_o_load_command *cmd; + + BFD_ASSERT (nbr_segcmd >= 2); - switch (cur->type) + /* The pagezero. */ + cmd = &commands[0]; + bfd_mach_o_init_segment (mdata, cmd, "__PAGEZERO", 0); + + /* Segments from sections. */ + cmd++; + for (i = 0; i < mdata->nsects;) { - case BFD_MACH_O_LC_SEGMENT: - if (bfd_mach_o_write_segment_32 (abfd, cur) != 0) - return FALSE; - break; - case BFD_MACH_O_LC_SEGMENT_64: - if (bfd_mach_o_write_segment_64 (abfd, cur) != 0) - return FALSE; - break; - case BFD_MACH_O_LC_SYMTAB: - if (!bfd_mach_o_write_symtab (abfd, cur)) - return FALSE; - break; - case BFD_MACH_O_LC_SYMSEG: - break; - case BFD_MACH_O_LC_THREAD: - case BFD_MACH_O_LC_UNIXTHREAD: - if (bfd_mach_o_write_thread (abfd, cur) != 0) - return FALSE; - break; - case BFD_MACH_O_LC_LOADFVMLIB: - case BFD_MACH_O_LC_IDFVMLIB: - case BFD_MACH_O_LC_IDENT: - case BFD_MACH_O_LC_FVMFILE: - case BFD_MACH_O_LC_PREPAGE: - case BFD_MACH_O_LC_DYSYMTAB: - case BFD_MACH_O_LC_LOAD_DYLIB: - case BFD_MACH_O_LC_LOAD_WEAK_DYLIB: - case BFD_MACH_O_LC_ID_DYLIB: - case BFD_MACH_O_LC_REEXPORT_DYLIB: - case BFD_MACH_O_LC_LOAD_DYLINKER: - case BFD_MACH_O_LC_ID_DYLINKER: - case BFD_MACH_O_LC_PREBOUND_DYLIB: - case BFD_MACH_O_LC_ROUTINES: - case BFD_MACH_O_LC_SUB_FRAMEWORK: - break; - default: - (*_bfd_error_handler) (_("unable to write unknown load command 0x%lx"), - (unsigned long) cur->type); - return FALSE; + const char *segname = mdata->sections[i]->segname; + unsigned int nbr_sect = 1; + + /* Count number of sections for this segment. */ + for (i++; i < mdata->nsects; i++) + if (strcmp (mdata->sections[i]->segname, segname) == 0) + nbr_sect++; + else + break; + + bfd_mach_o_init_segment (mdata, cmd, segname, nbr_sect); + cmd++; } + + /* The linkedit. */ + bfd_mach_o_init_segment (mdata, cmd, "__LINKEDIT", 0); } - return TRUE; -} + if (symtab_idx >= 0) + { + /* Init symtab command. */ + bfd_mach_o_load_command *cmd = &commands[symtab_idx]; -/* Build Mach-O load commands from the sections. */ + cmd->type = BFD_MACH_O_LC_SYMTAB; + cmd->type_required = FALSE; + } -bfd_boolean -bfd_mach_o_build_commands (bfd *abfd) -{ - bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); - unsigned int wide = mach_o_wide_p (&mdata->header); - bfd_mach_o_segment_command *seg; - bfd_mach_o_section *sections; - asection *sec; - bfd_mach_o_load_command *cmd; - bfd_mach_o_load_command *symtab_cmd; - int target_index; + /* If required, setup symtab command, see comment above about the quality + of this test. */ + if (dysymtab_idx >= 0) + { + bfd_mach_o_load_command *cmd = &commands[dysymtab_idx]; - /* Return now if commands are already built. */ - if (mdata->header.ncmds) - return FALSE; + cmd->type = BFD_MACH_O_LC_DYSYMTAB; + cmd->type_required = FALSE; + } - /* Very simple version: 1 command (segment) containing all sections. */ - mdata->header.ncmds = 2; - mdata->commands = bfd_alloc (abfd, mdata->header.ncmds - * sizeof (bfd_mach_o_load_command)); - if (mdata->commands == NULL) - return FALSE; - cmd = &mdata->commands[0]; - seg = &cmd->command.segment; + /* Create the main command. */ + if (main_idx >= 0) + { + bfd_mach_o_load_command *cmd = &commands[main_idx]; + + cmd->type = BFD_MACH_O_LC_MAIN; + cmd->type_required = TRUE; + + cmd->command.main.entryoff = 0; + cmd->command.main.stacksize = 0; + } - seg->nsects = bfd_count_sections (abfd); - sections = bfd_alloc (abfd, seg->nsects * sizeof (bfd_mach_o_section)); - if (sections == NULL) + /* Layout commands. */ + if (! bfd_mach_o_layout_commands (mdata)) return FALSE; - seg->sections = sections; - /* Set segment command. */ - if (wide) + /* So, now we have sized the commands and the filelen set to that. + Now we can build the segment command and set the section file offsets. */ + if (mdata->header.filetype == BFD_MACH_O_MH_OBJECT) { - cmd->type = BFD_MACH_O_LC_SEGMENT_64; - cmd->offset = BFD_MACH_O_HEADER_64_SIZE; - cmd->len = BFD_MACH_O_LC_SEGMENT_64_SIZE - + BFD_MACH_O_SECTION_64_SIZE * seg->nsects; + for (i = 0; i < nbr_segcmd; i++) + if (!bfd_mach_o_build_obj_seg_command + (abfd, &commands[i].command.segment)) + return FALSE; } else { - cmd->type = BFD_MACH_O_LC_SEGMENT; - cmd->offset = BFD_MACH_O_HEADER_SIZE; - cmd->len = BFD_MACH_O_LC_SEGMENT_SIZE - + BFD_MACH_O_SECTION_SIZE * seg->nsects; - } - cmd->type_required = FALSE; - mdata->header.sizeofcmds = cmd->len; - mdata->filelen = cmd->offset + cmd->len; - - /* Set symtab command. */ - symtab_cmd = &mdata->commands[1]; - - symtab_cmd->type = BFD_MACH_O_LC_SYMTAB; - symtab_cmd->offset = cmd->offset + cmd->len; - symtab_cmd->len = 6 * 4; - symtab_cmd->type_required = FALSE; - - mdata->header.sizeofcmds += symtab_cmd->len; - mdata->filelen += symtab_cmd->len; - - /* Fill segment command. */ - memset (seg->segname, 0, sizeof (seg->segname)); - seg->vmaddr = 0; - seg->fileoff = mdata->filelen; - seg->filesize = 0; - seg->maxprot = BFD_MACH_O_PROT_READ | BFD_MACH_O_PROT_WRITE - | BFD_MACH_O_PROT_EXECUTE; - seg->initprot = seg->maxprot; - seg->flags = 0; + bfd_vma maxvma = 0; - /* Create Mach-O sections. */ - target_index = 0; - for (sec = abfd->sections; sec; sec = sec->next) - { - sections->bfdsection = sec; - bfd_mach_o_convert_section_name_to_mach_o (abfd, sec, sections); - sections->addr = bfd_get_section_vma (abfd, sec); - sections->size = bfd_get_section_size (sec); - sections->align = bfd_get_section_alignment (abfd, sec); - - if (sections->size != 0) - { - mdata->filelen = FILE_ALIGN (mdata->filelen, sections->align); - sections->offset = mdata->filelen; - } - else - sections->offset = 0; - sections->reloff = 0; - sections->nreloc = 0; - sections->reserved1 = 0; - sections->reserved2 = 0; - sections->reserved3 = 0; - - sec->filepos = sections->offset; - sec->target_index = ++target_index; + /* Skip pagezero and linkedit segments. */ + for (i = 1; i < nbr_segcmd - 1; i++) + { + bfd_mach_o_segment_command *seg = &commands[i].command.segment; + + if (!bfd_mach_o_build_exec_seg_command (abfd, seg)) + return FALSE; + + if (seg->vmaddr + seg->vmsize > maxvma) + maxvma = seg->vmaddr + seg->vmsize; + } - mdata->filelen += sections->size; - sections++; + /* Set the size of __PAGEZERO. */ + commands[0].command.segment.vmsize = + commands[1].command.segment.vmaddr; + + /* Set the vma and fileoff of __LINKEDIT. */ + commands[nbr_segcmd - 1].command.segment.vmaddr = maxvma; + commands[nbr_segcmd - 1].command.segment.fileoff = mdata->filelen; + + /* Set entry point (once segments have been laid out). */ + if (main_idx >= 0) + commands[main_idx].command.main.entryoff = + bfd_get_start_address (abfd) - commands[1].command.segment.vmaddr; } - seg->filesize = mdata->filelen - seg->fileoff; - seg->vmsize = seg->filesize; return TRUE; } @@ -1378,9 +3390,9 @@ bfd_mach_o_set_section_contents (bfd *abfd, { file_ptr pos; - /* This must be done first, because bfd_set_section_contents is - going to set output_has_begun to TRUE. */ - if (! abfd->output_has_begun && ! bfd_mach_o_build_commands (abfd)) + /* Trying to write the first section contents will trigger the creation of + the load commands if they are not already present. */ + if (!abfd->output_has_begun && !bfd_mach_o_build_commands (abfd)) return FALSE; if (count == 0) @@ -1413,44 +3425,44 @@ bfd_mach_o_make_empty_symbol (bfd *abfd) if (new_symbol == NULL) return new_symbol; new_symbol->the_bfd = abfd; - new_symbol->udata.i = 0; + new_symbol->udata.i = SYM_MACHO_FIELDS_UNSET; return new_symbol; } static bfd_boolean -bfd_mach_o_read_header (bfd *abfd, bfd_mach_o_header *header) +bfd_mach_o_read_header (bfd *abfd, file_ptr hdr_off, bfd_mach_o_header *header) { - unsigned char buf[32]; + struct mach_o_header_external raw; unsigned int size; bfd_vma (*get32) (const void *) = NULL; /* Just read the magic number. */ - if (bfd_seek (abfd, 0, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 4, abfd) != 4) + if (bfd_seek (abfd, hdr_off, SEEK_SET) != 0 + || bfd_bread (raw.magic, sizeof (raw.magic), abfd) != 4) return FALSE; - if (bfd_getb32 (buf) == BFD_MACH_O_MH_MAGIC) + if (bfd_getb32 (raw.magic) == BFD_MACH_O_MH_MAGIC) { header->byteorder = BFD_ENDIAN_BIG; header->magic = BFD_MACH_O_MH_MAGIC; header->version = 1; get32 = bfd_getb32; } - else if (bfd_getl32 (buf) == BFD_MACH_O_MH_MAGIC) + else if (bfd_getl32 (raw.magic) == BFD_MACH_O_MH_MAGIC) { header->byteorder = BFD_ENDIAN_LITTLE; header->magic = BFD_MACH_O_MH_MAGIC; header->version = 1; get32 = bfd_getl32; } - else if (bfd_getb32 (buf) == BFD_MACH_O_MH_MAGIC_64) + else if (bfd_getb32 (raw.magic) == BFD_MACH_O_MH_MAGIC_64) { header->byteorder = BFD_ENDIAN_BIG; header->magic = BFD_MACH_O_MH_MAGIC_64; header->version = 2; get32 = bfd_getb32; } - else if (bfd_getl32 (buf) == BFD_MACH_O_MH_MAGIC_64) + else if (bfd_getl32 (raw.magic) == BFD_MACH_O_MH_MAGIC_64) { header->byteorder = BFD_ENDIAN_LITTLE; header->magic = BFD_MACH_O_MH_MAGIC_64; @@ -1467,60 +3479,103 @@ bfd_mach_o_read_header (bfd *abfd, bfd_mach_o_header *header) size = mach_o_wide_p (header) ? BFD_MACH_O_HEADER_64_SIZE : BFD_MACH_O_HEADER_SIZE; - if (bfd_seek (abfd, 0, SEEK_SET) != 0 - || bfd_bread ((void *) buf, size, abfd) != size) + if (bfd_seek (abfd, hdr_off, SEEK_SET) != 0 + || bfd_bread (&raw, size, abfd) != size) return FALSE; - header->cputype = (*get32) (buf + 4); - header->cpusubtype = (*get32) (buf + 8); - header->filetype = (*get32) (buf + 12); - header->ncmds = (*get32) (buf + 16); - header->sizeofcmds = (*get32) (buf + 20); - header->flags = (*get32) (buf + 24); + header->cputype = (*get32) (raw.cputype); + header->cpusubtype = (*get32) (raw.cpusubtype); + header->filetype = (*get32) (raw.filetype); + header->ncmds = (*get32) (raw.ncmds); + header->sizeofcmds = (*get32) (raw.sizeofcmds); + header->flags = (*get32) (raw.flags); if (mach_o_wide_p (header)) - header->reserved = (*get32) (buf + 28); + header->reserved = (*get32) (raw.reserved); + else + header->reserved = 0; return TRUE; } -static asection * -bfd_mach_o_make_bfd_section (bfd *abfd, bfd_mach_o_section *section, - unsigned long prot) +bfd_boolean +bfd_mach_o_new_section_hook (bfd *abfd, asection *sec) +{ + bfd_mach_o_section *s; + unsigned bfdalign = bfd_section_alignment (sec); + + s = bfd_mach_o_get_mach_o_section (sec); + if (s == NULL) + { + flagword bfd_flags; + static const mach_o_section_name_xlat * xlat; + + s = (bfd_mach_o_section *) bfd_zalloc (abfd, sizeof (*s)); + if (s == NULL) + return FALSE; + sec->used_by_bfd = s; + s->bfdsection = sec; + + /* Create the Darwin seg/sect name pair from the bfd name. + If this is a canonical name for which a specific paiting exists + there will also be defined flags, type, attribute and alignment + values. */ + xlat = bfd_mach_o_convert_section_name_to_mach_o (abfd, sec, s); + if (xlat != NULL) + { + s->flags = xlat->macho_sectype | xlat->macho_secattr; + s->align = xlat->sectalign > bfdalign ? xlat->sectalign + : bfdalign; + bfd_set_section_alignment (sec, s->align); + bfd_flags = bfd_section_flags (sec); + if (bfd_flags == SEC_NO_FLAGS) + bfd_set_section_flags (sec, xlat->bfd_flags); + } + else + /* Create default flags. */ + bfd_mach_o_set_section_flags_from_bfd (abfd, sec); + } + + return _bfd_generic_new_section_hook (abfd, sec); +} + +static void +bfd_mach_o_init_section_from_mach_o (asection *sec, unsigned long prot) { - asection *bfdsec; - char *sname; flagword flags; + bfd_mach_o_section *section; - bfd_mach_o_convert_section_name_to_bfd (abfd, section, &sname, &flags); - if (sname == NULL) - return NULL; + flags = bfd_section_flags (sec); + section = bfd_mach_o_get_mach_o_section (sec); + + /* TODO: see if we should use the xlat system for doing this by + preference and fall back to this for unknown sections. */ if (flags == SEC_NO_FLAGS) { /* Try to guess flags. */ if (section->flags & BFD_MACH_O_S_ATTR_DEBUG) - flags = SEC_DEBUGGING; + flags = SEC_DEBUGGING; else - { - flags = SEC_ALLOC; - if ((section->flags & BFD_MACH_O_SECTION_TYPE_MASK) - != BFD_MACH_O_S_ZEROFILL) - { - flags |= SEC_LOAD; - if (prot & BFD_MACH_O_PROT_EXECUTE) - flags |= SEC_CODE; - if (prot & BFD_MACH_O_PROT_WRITE) - flags |= SEC_DATA; - else if (prot & BFD_MACH_O_PROT_READ) - flags |= SEC_READONLY; - } - } + { + flags = SEC_ALLOC; + if ((section->flags & BFD_MACH_O_SECTION_TYPE_MASK) + != BFD_MACH_O_S_ZEROFILL) + { + flags |= SEC_LOAD; + if (prot & BFD_MACH_O_PROT_EXECUTE) + flags |= SEC_CODE; + if (prot & BFD_MACH_O_PROT_WRITE) + flags |= SEC_DATA; + else if (prot & BFD_MACH_O_PROT_READ) + flags |= SEC_READONLY; + } + } } else { if ((flags & SEC_DEBUGGING) == 0) - flags |= SEC_ALLOC; + flags |= SEC_ALLOC; } if (section->offset != 0) @@ -1528,117 +3583,142 @@ bfd_mach_o_make_bfd_section (bfd *abfd, bfd_mach_o_section *section, if (section->nreloc != 0) flags |= SEC_RELOC; - bfdsec = bfd_make_section_anyway_with_flags (abfd, sname, flags); - if (bfdsec == NULL) - return NULL; + bfd_set_section_flags (sec, flags); + + sec->vma = section->addr; + sec->lma = section->addr; + sec->size = section->size; + sec->filepos = section->offset; + sec->alignment_power = section->align; + sec->segment_mark = 0; + sec->reloc_count = section->nreloc; + sec->rel_filepos = section->reloff; +} + +static asection * +bfd_mach_o_make_bfd_section (bfd *abfd, + const unsigned char *segname, + const unsigned char *sectname) +{ + const char *sname; + flagword flags; - bfdsec->vma = section->addr; - bfdsec->lma = section->addr; - bfdsec->size = section->size; - bfdsec->filepos = section->offset; - bfdsec->alignment_power = section->align; - bfdsec->segment_mark = 0; - bfdsec->reloc_count = section->nreloc; - bfdsec->rel_filepos = section->reloff; + bfd_mach_o_convert_section_name_to_bfd + (abfd, (const char *)segname, (const char *)sectname, &sname, &flags); + if (sname == NULL) + return NULL; - return bfdsec; + return bfd_make_section_anyway_with_flags (abfd, sname, flags); } -static int -bfd_mach_o_read_section_32 (bfd *abfd, - bfd_mach_o_section *section, - unsigned int offset, - unsigned long prot) +static asection * +bfd_mach_o_read_section_32 (bfd *abfd, unsigned long prot) { - unsigned char buf[BFD_MACH_O_SECTION_SIZE]; + struct mach_o_section_32_external raw; + asection *sec; + bfd_mach_o_section *section; - if (bfd_seek (abfd, offset, SEEK_SET) != 0 - || (bfd_bread ((void *) buf, BFD_MACH_O_SECTION_SIZE, abfd) - != BFD_MACH_O_SECTION_SIZE)) - return -1; + if (bfd_bread (&raw, BFD_MACH_O_SECTION_SIZE, abfd) + != BFD_MACH_O_SECTION_SIZE) + return NULL; + + sec = bfd_mach_o_make_bfd_section (abfd, raw.segname, raw.sectname); + if (sec == NULL) + return NULL; - memcpy (section->sectname, buf, 16); - section->sectname[16] = '\0'; - memcpy (section->segname, buf + 16, 16); - section->segname[16] = '\0'; - section->addr = bfd_h_get_32 (abfd, buf + 32); - section->size = bfd_h_get_32 (abfd, buf + 36); - section->offset = bfd_h_get_32 (abfd, buf + 40); - section->align = bfd_h_get_32 (abfd, buf + 44); - section->reloff = bfd_h_get_32 (abfd, buf + 48); - section->nreloc = bfd_h_get_32 (abfd, buf + 52); - section->flags = bfd_h_get_32 (abfd, buf + 56); - section->reserved1 = bfd_h_get_32 (abfd, buf + 60); - section->reserved2 = bfd_h_get_32 (abfd, buf + 64); + section = bfd_mach_o_get_mach_o_section (sec); + memcpy (section->segname, raw.segname, sizeof (raw.segname)); + section->segname[BFD_MACH_O_SEGNAME_SIZE] = 0; + memcpy (section->sectname, raw.sectname, sizeof (raw.sectname)); + section->sectname[BFD_MACH_O_SECTNAME_SIZE] = 0; + section->addr = bfd_h_get_32 (abfd, raw.addr); + section->size = bfd_h_get_32 (abfd, raw.size); + section->offset = bfd_h_get_32 (abfd, raw.offset); + section->align = bfd_h_get_32 (abfd, raw.align); + /* PR 17512: file: 0017eb76. */ + if (section->align > 64) + { + _bfd_error_handler + (_("bfd_mach_o_read_section_32: overlarge alignment value: %#lx, " + "using 32 instead"), section->align); + section->align = 32; + } + section->reloff = bfd_h_get_32 (abfd, raw.reloff); + section->nreloc = bfd_h_get_32 (abfd, raw.nreloc); + section->flags = bfd_h_get_32 (abfd, raw.flags); + section->reserved1 = bfd_h_get_32 (abfd, raw.reserved1); + section->reserved2 = bfd_h_get_32 (abfd, raw.reserved2); section->reserved3 = 0; - section->bfdsection = bfd_mach_o_make_bfd_section (abfd, section, prot); - if (section->bfdsection == NULL) - return -1; + bfd_mach_o_init_section_from_mach_o (sec, prot); - return 0; + return sec; } -static int -bfd_mach_o_read_section_64 (bfd *abfd, - bfd_mach_o_section *section, - unsigned int offset, - unsigned long prot) +static asection * +bfd_mach_o_read_section_64 (bfd *abfd, unsigned long prot) { - unsigned char buf[BFD_MACH_O_SECTION_64_SIZE]; + struct mach_o_section_64_external raw; + asection *sec; + bfd_mach_o_section *section; - if (bfd_seek (abfd, offset, SEEK_SET) != 0 - || (bfd_bread ((void *) buf, BFD_MACH_O_SECTION_64_SIZE, abfd) - != BFD_MACH_O_SECTION_64_SIZE)) - return -1; + if (bfd_bread (&raw, BFD_MACH_O_SECTION_64_SIZE, abfd) + != BFD_MACH_O_SECTION_64_SIZE) + return NULL; - memcpy (section->sectname, buf, 16); - section->sectname[16] = '\0'; - memcpy (section->segname, buf + 16, 16); - section->segname[16] = '\0'; - section->addr = bfd_h_get_64 (abfd, buf + 32); - section->size = bfd_h_get_64 (abfd, buf + 40); - section->offset = bfd_h_get_32 (abfd, buf + 48); - section->align = bfd_h_get_32 (abfd, buf + 52); - section->reloff = bfd_h_get_32 (abfd, buf + 56); - section->nreloc = bfd_h_get_32 (abfd, buf + 60); - section->flags = bfd_h_get_32 (abfd, buf + 64); - section->reserved1 = bfd_h_get_32 (abfd, buf + 68); - section->reserved2 = bfd_h_get_32 (abfd, buf + 72); - section->reserved3 = bfd_h_get_32 (abfd, buf + 76); - section->bfdsection = bfd_mach_o_make_bfd_section (abfd, section, prot); - - if (section->bfdsection == NULL) - return -1; + sec = bfd_mach_o_make_bfd_section (abfd, raw.segname, raw.sectname); + if (sec == NULL) + return NULL; - return 0; + section = bfd_mach_o_get_mach_o_section (sec); + memcpy (section->segname, raw.segname, sizeof (raw.segname)); + section->segname[BFD_MACH_O_SEGNAME_SIZE] = 0; + memcpy (section->sectname, raw.sectname, sizeof (raw.sectname)); + section->sectname[BFD_MACH_O_SECTNAME_SIZE] = 0; + section->addr = bfd_h_get_64 (abfd, raw.addr); + section->size = bfd_h_get_64 (abfd, raw.size); + section->offset = bfd_h_get_32 (abfd, raw.offset); + section->align = bfd_h_get_32 (abfd, raw.align); + if (section->align > 64) + { + _bfd_error_handler + (_("bfd_mach_o_read_section_64: overlarge alignment value: %#lx, " + "using 32 instead"), section->align); + section->align = 32; + } + section->reloff = bfd_h_get_32 (abfd, raw.reloff); + section->nreloc = bfd_h_get_32 (abfd, raw.nreloc); + section->flags = bfd_h_get_32 (abfd, raw.flags); + section->reserved1 = bfd_h_get_32 (abfd, raw.reserved1); + section->reserved2 = bfd_h_get_32 (abfd, raw.reserved2); + section->reserved3 = bfd_h_get_32 (abfd, raw.reserved3); + + bfd_mach_o_init_section_from_mach_o (sec, prot); + + return sec; } -static int -bfd_mach_o_read_section (bfd *abfd, - bfd_mach_o_section *section, - unsigned int offset, - unsigned long prot, - unsigned int wide) +static asection * +bfd_mach_o_read_section (bfd *abfd, unsigned long prot, unsigned int wide) { if (wide) - return bfd_mach_o_read_section_64 (abfd, section, offset, prot); + return bfd_mach_o_read_section_64 (abfd, prot); else - return bfd_mach_o_read_section_32 (abfd, section, offset, prot); + return bfd_mach_o_read_section_32 (abfd, prot); } -static int +static bfd_boolean bfd_mach_o_read_symtab_symbol (bfd *abfd, - bfd_mach_o_symtab_command *sym, - bfd_mach_o_asymbol *s, - unsigned long i) + bfd_mach_o_symtab_command *sym, + bfd_mach_o_asymbol *s, + unsigned long i) { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); unsigned int wide = mach_o_wide_p (&mdata->header); unsigned int symwidth = wide ? BFD_MACH_O_NLIST_64_SIZE : BFD_MACH_O_NLIST_SIZE; unsigned int symoff = sym->symoff + (i * symwidth); - unsigned char buf[16]; + struct mach_o_nlist_64_external raw; unsigned char type = -1; unsigned char section = -1; short desc = -1; @@ -1649,36 +3729,40 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd, BFD_ASSERT (sym->strtab != NULL); if (bfd_seek (abfd, symoff, SEEK_SET) != 0 - || bfd_bread ((void *) buf, symwidth, abfd) != symwidth) + || bfd_bread (&raw, symwidth, abfd) != symwidth) { - (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %lu"), - symwidth, (unsigned long) symoff); - return -1; + _bfd_error_handler + /* xgettext:c-format */ + (_("bfd_mach_o_read_symtab_symbol: unable to read %d bytes at %u"), + symwidth, symoff); + return FALSE; } - stroff = bfd_h_get_32 (abfd, buf); - type = bfd_h_get_8 (abfd, buf + 4); + stroff = bfd_h_get_32 (abfd, raw.n_strx); + type = bfd_h_get_8 (abfd, raw.n_type); symtype = type & BFD_MACH_O_N_TYPE; - section = bfd_h_get_8 (abfd, buf + 5); - desc = bfd_h_get_16 (abfd, buf + 6); + section = bfd_h_get_8 (abfd, raw.n_sect); + desc = bfd_h_get_16 (abfd, raw.n_desc); if (wide) - value = bfd_h_get_64 (abfd, buf + 8); + value = bfd_h_get_64 (abfd, raw.n_value); else - value = bfd_h_get_32 (abfd, buf + 8); + value = bfd_h_get_32 (abfd, raw.n_value); if (stroff >= sym->strsize) { - (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbol: symbol name out of range (%lu >= %lu)"), - (unsigned long) stroff, - (unsigned long) sym->strsize); - return -1; + _bfd_error_handler + /* xgettext:c-format */ + (_("bfd_mach_o_read_symtab_symbol: name out of range (%lu >= %u)"), + stroff, + sym->strsize); + return FALSE; } s->symbol.the_bfd = abfd; s->symbol.name = sym->strtab + stroff; s->symbol.value = value; s->symbol.flags = 0x0; - s->symbol.udata.i = 0; + s->symbol.udata.i = i; s->n_type = type; s->n_sect = section; s->n_desc = desc; @@ -1702,38 +3786,34 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd, { s->symbol.section = mdata->sections[section - 1]->bfdsection; s->symbol.value = - s->symbol.value - mdata->sections[section - 1]->addr; + s->symbol.value - mdata->sections[section - 1]->addr; } break; } } else { - if (type & BFD_MACH_O_N_PEXT) - s->symbol.flags |= BSF_GLOBAL; - - if (type & BFD_MACH_O_N_EXT) + if (type & (BFD_MACH_O_N_PEXT | BFD_MACH_O_N_EXT)) s->symbol.flags |= BSF_GLOBAL; - - if (!(type & (BFD_MACH_O_N_PEXT | BFD_MACH_O_N_EXT))) + else s->symbol.flags |= BSF_LOCAL; switch (symtype) { case BFD_MACH_O_N_UNDF: - if (type == (BFD_MACH_O_N_UNDF | BFD_MACH_O_N_EXT) - && s->symbol.value != 0) - { - /* A common symbol. */ - s->symbol.section = bfd_com_section_ptr; - s->symbol.flags = BSF_NO_FLAGS; - } - else - { - s->symbol.section = bfd_und_section_ptr; - if (s->n_desc & BFD_MACH_O_N_WEAK_REF) - s->symbol.flags |= BSF_WEAK; - } + if (type == (BFD_MACH_O_N_UNDF | BFD_MACH_O_N_EXT) + && s->symbol.value != 0) + { + /* A common symbol. */ + s->symbol.section = bfd_com_section_ptr; + s->symbol.flags = BSF_NO_FLAGS; + } + else + { + s->symbol.section = bfd_und_section_ptr; + if (s->n_desc & BFD_MACH_O_N_WEAK_REF) + s->symbol.flags |= BSF_WEAK; + } break; case BFD_MACH_O_N_PBUD: s->symbol.section = bfd_und_section_ptr; @@ -1746,39 +3826,46 @@ bfd_mach_o_read_symtab_symbol (bfd *abfd, { s->symbol.section = mdata->sections[section - 1]->bfdsection; s->symbol.value = - s->symbol.value - mdata->sections[section - 1]->addr; + s->symbol.value - mdata->sections[section - 1]->addr; } else { /* Mach-O uses 0 to mean "no section"; not an error. */ if (section != 0) { - (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbol: " - "symbol \"%s\" specified invalid section %d (max %lu): setting to undefined"), - s->symbol.name, section, mdata->nsects); + _bfd_error_handler + /* xgettext:c-format */ + (_("bfd_mach_o_read_symtab_symbol: " + "symbol \"%s\" specified invalid section %d (max %lu): " + "setting to undefined"), + s->symbol.name, section, mdata->nsects); } s->symbol.section = bfd_und_section_ptr; } break; case BFD_MACH_O_N_INDR: - (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbol: " - "symbol \"%s\" is unsupported 'indirect' reference: setting to undefined"), - s->symbol.name); - s->symbol.section = bfd_und_section_ptr; + /* FIXME: we don't follow the BFD convention as this indirect symbol + won't be followed by the referenced one. This looks harmless + unless we start using the linker. */ + s->symbol.flags |= BSF_INDIRECT; + s->symbol.section = bfd_ind_section_ptr; + s->symbol.value = 0; break; default: - (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbol: " - "symbol \"%s\" specified invalid type field 0x%x: setting to undefined"), - s->symbol.name, symtype); + _bfd_error_handler + /* xgettext:c-format */ + (_("bfd_mach_o_read_symtab_symbol: " + "symbol \"%s\" specified invalid type field 0x%x: " + "setting to undefined"), s->symbol.name, symtype); s->symbol.section = bfd_und_section_ptr; break; } } - return 0; + return TRUE; } -static int +bfd_boolean bfd_mach_o_read_symtab_strtab (bfd *abfd) { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); @@ -1786,11 +3873,11 @@ bfd_mach_o_read_symtab_strtab (bfd *abfd) /* Fail if there is no symtab. */ if (sym == NULL) - return -1; + return FALSE; /* Success if already loaded. */ if (sym->strtab) - return 0; + return TRUE; if (abfd->flags & BFD_IN_MEMORY) { @@ -1801,83 +3888,69 @@ bfd_mach_o_read_symtab_strtab (bfd *abfd) if ((sym->stroff + sym->strsize) > b->size) { bfd_set_error (bfd_error_file_truncated); - return -1; + return FALSE; } sym->strtab = (char *) b->buffer + sym->stroff; } else { - sym->strtab = bfd_alloc (abfd, sym->strsize); + /* See PR 21840 for a reproducer. */ + if ((sym->strsize + 1) == 0) + return FALSE; + sym->strtab = bfd_alloc (abfd, sym->strsize + 1); if (sym->strtab == NULL) - return -1; + return FALSE; if (bfd_seek (abfd, sym->stroff, SEEK_SET) != 0 - || bfd_bread ((void *) sym->strtab, sym->strsize, abfd) != sym->strsize) - { - bfd_set_error (bfd_error_file_truncated); - return -1; - } + || bfd_bread (sym->strtab, sym->strsize, abfd) != sym->strsize) + { + /* PR 17512: file: 10888-1609-0.004. */ + bfd_release (abfd, sym->strtab); + sym->strtab = NULL; + bfd_set_error (bfd_error_file_truncated); + return FALSE; + } + /* Zero terminate the string table. */ + sym->strtab[sym->strsize] = 0; } - return 0; + return TRUE; } -static int +bfd_boolean bfd_mach_o_read_symtab_symbols (bfd *abfd) { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); bfd_mach_o_symtab_command *sym = mdata->symtab; unsigned long i; - int ret; - - if (sym->symbols) - return 0; - sym->symbols = bfd_alloc (abfd, sym->nsyms * sizeof (bfd_mach_o_asymbol)); + if (sym == NULL || sym->symbols) + /* Return now if there are no symbols or if already loaded. */ + return TRUE; + sym->symbols = bfd_alloc2 (abfd, sym->nsyms, sizeof (bfd_mach_o_asymbol)); if (sym->symbols == NULL) { - (*_bfd_error_handler) (_("bfd_mach_o_read_symtab_symbols: unable to allocate memory for symbols")); - return -1; + _bfd_error_handler (_("bfd_mach_o_read_symtab_symbols: " + "unable to allocate memory for symbols")); + sym->nsyms = 0; + return FALSE; } - ret = bfd_mach_o_read_symtab_strtab (abfd); - if (ret != 0) - return ret; + if (!bfd_mach_o_read_symtab_strtab (abfd)) + goto fail; for (i = 0; i < sym->nsyms; i++) - { - ret = bfd_mach_o_read_symtab_symbol (abfd, sym, &sym->symbols[i], i); - if (ret != 0) - return ret; - } - - return 0; -} - -int -bfd_mach_o_read_dysymtab_symbol (bfd *abfd, - bfd_mach_o_dysymtab_command *dysym, - bfd_mach_o_symtab_command *sym, - bfd_mach_o_asymbol *s, - unsigned long i) -{ - unsigned long isymoff = dysym->indirectsymoff + (i * 4); - unsigned long sym_index; - unsigned char buf[4]; + if (!bfd_mach_o_read_symtab_symbol (abfd, sym, &sym->symbols[i], i)) + goto fail; - BFD_ASSERT (i < dysym->nindirectsyms); - - if (bfd_seek (abfd, isymoff, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 4, abfd) != 4) - { - (*_bfd_error_handler) (_("bfd_mach_o_read_dysymtab_symbol: unable to read %lu bytes at %lu"), - (unsigned long) 4, isymoff); - return -1; - } - sym_index = bfd_h_get_32 (abfd, buf); + return TRUE; - return bfd_mach_o_read_symtab_symbol (abfd, sym, s, sym_index); + fail: + bfd_release (abfd, sym->symbols); + sym->symbols = NULL; + sym->nsyms = 0; + return FALSE; } static const char * @@ -1917,91 +3990,190 @@ bfd_mach_o_ppc_flavour_string (unsigned int flavour) } } -static int +static bfd_boolean bfd_mach_o_read_dylinker (bfd *abfd, bfd_mach_o_load_command *command) { bfd_mach_o_dylinker_command *cmd = &command->command.dylinker; - unsigned char buf[4]; + struct mach_o_str_command_external raw; unsigned int nameoff; + unsigned int namelen; - BFD_ASSERT ((command->type == BFD_MACH_O_LC_ID_DYLINKER) - || (command->type == BFD_MACH_O_LC_LOAD_DYLINKER)); - - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 4, abfd) != 4) - return -1; + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - nameoff = bfd_h_get_32 (abfd, buf + 0); + nameoff = bfd_h_get_32 (abfd, raw.str); + if (nameoff > command->len) + return FALSE; - cmd->name_offset = command->offset + nameoff; - cmd->name_len = command->len - nameoff; - cmd->name_str = bfd_alloc (abfd, cmd->name_len); + cmd->name_offset = nameoff; + namelen = command->len - nameoff; + nameoff += command->offset; + cmd->name_str = bfd_alloc (abfd, namelen); if (cmd->name_str == NULL) - return -1; - if (bfd_seek (abfd, cmd->name_offset, SEEK_SET) != 0 - || bfd_bread (cmd->name_str, cmd->name_len, abfd) != cmd->name_len) - return -1; - return 0; + return FALSE; + if (bfd_seek (abfd, nameoff, SEEK_SET) != 0 + || bfd_bread (cmd->name_str, namelen, abfd) != namelen) + return FALSE; + return TRUE; } -static int +static bfd_boolean bfd_mach_o_read_dylib (bfd *abfd, bfd_mach_o_load_command *command) { + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); bfd_mach_o_dylib_command *cmd = &command->command.dylib; - unsigned char buf[16]; + struct mach_o_dylib_command_external raw; unsigned int nameoff; + unsigned int namelen; + if (command->len < sizeof (raw) + 8) + return FALSE; switch (command->type) { case BFD_MACH_O_LC_LOAD_DYLIB: + case BFD_MACH_O_LC_LAZY_LOAD_DYLIB: case BFD_MACH_O_LC_LOAD_WEAK_DYLIB: case BFD_MACH_O_LC_ID_DYLIB: case BFD_MACH_O_LC_REEXPORT_DYLIB: + case BFD_MACH_O_LC_LOAD_UPWARD_DYLIB: break; default: BFD_FAIL (); - return -1; + return FALSE; } - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 16, abfd) != 16) - return -1; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - nameoff = bfd_h_get_32 (abfd, buf + 0); - cmd->timestamp = bfd_h_get_32 (abfd, buf + 4); - cmd->current_version = bfd_h_get_32 (abfd, buf + 8); - cmd->compatibility_version = bfd_h_get_32 (abfd, buf + 12); + nameoff = bfd_h_get_32 (abfd, raw.name); + if (nameoff > command->len) + return FALSE; + cmd->timestamp = bfd_h_get_32 (abfd, raw.timestamp); + cmd->current_version = bfd_h_get_32 (abfd, raw.current_version); + cmd->compatibility_version = bfd_h_get_32 (abfd, raw.compatibility_version); cmd->name_offset = command->offset + nameoff; - cmd->name_len = command->len - nameoff; - cmd->name_str = bfd_alloc (abfd, cmd->name_len); + namelen = command->len - nameoff; + cmd->name_str = bfd_alloc (abfd, namelen); if (cmd->name_str == NULL) - return -1; - if (bfd_seek (abfd, cmd->name_offset, SEEK_SET) != 0 - || bfd_bread (cmd->name_str, cmd->name_len, abfd) != cmd->name_len) - return -1; - return 0; + return FALSE; + if (bfd_seek (abfd, mdata->hdr_offset + cmd->name_offset, SEEK_SET) != 0 + || bfd_bread (cmd->name_str, namelen, abfd) != namelen) + return FALSE; + return TRUE; } -static int -bfd_mach_o_read_prebound_dylib (bfd *abfd ATTRIBUTE_UNUSED, - bfd_mach_o_load_command *command ATTRIBUTE_UNUSED) +static bfd_boolean +bfd_mach_o_read_prebound_dylib (bfd *abfd, + bfd_mach_o_load_command *command) { - /* bfd_mach_o_prebound_dylib_command *cmd = &command->command.prebound_dylib; */ + bfd_mach_o_prebound_dylib_command *cmd = &command->command.prebound_dylib; + struct mach_o_prebound_dylib_command_external raw; + unsigned int nameoff; + unsigned int modoff; + unsigned int str_len; + unsigned char *str; - BFD_ASSERT (command->type == BFD_MACH_O_LC_PREBOUND_DYLIB); - return 0; + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + nameoff = bfd_h_get_32 (abfd, raw.name); + modoff = bfd_h_get_32 (abfd, raw.linked_modules); + if (nameoff > command->len || modoff > command->len) + return FALSE; + + str_len = command->len - sizeof (raw); + str = bfd_alloc (abfd, str_len); + if (str == NULL) + return FALSE; + if (bfd_bread (str, str_len, abfd) != str_len) + return FALSE; + + cmd->name_offset = command->offset + nameoff; + cmd->nmodules = bfd_h_get_32 (abfd, raw.nmodules); + cmd->linked_modules_offset = command->offset + modoff; + + cmd->name_str = (char *)str + nameoff - (sizeof (raw) + BFD_MACH_O_LC_SIZE); + cmd->linked_modules = str + modoff - (sizeof (raw) + BFD_MACH_O_LC_SIZE); + return TRUE; } -static int +static bfd_boolean +bfd_mach_o_read_prebind_cksum (bfd *abfd, + bfd_mach_o_load_command *command) +{ + bfd_mach_o_prebind_cksum_command *cmd = &command->command.prebind_cksum; + struct mach_o_prebind_cksum_command_external raw; + + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + cmd->cksum = bfd_get_32 (abfd, raw.cksum); + return TRUE; +} + +static bfd_boolean +bfd_mach_o_read_twolevel_hints (bfd *abfd, + bfd_mach_o_load_command *command) +{ + bfd_mach_o_twolevel_hints_command *cmd = &command->command.twolevel_hints; + struct mach_o_twolevel_hints_command_external raw; + + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + cmd->offset = bfd_get_32 (abfd, raw.offset); + cmd->nhints = bfd_get_32 (abfd, raw.nhints); + return TRUE; +} + +static bfd_boolean +bfd_mach_o_read_fvmlib (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_fvmlib_command *fvm = &command->command.fvmlib; + struct mach_o_fvmlib_command_external raw; + unsigned int nameoff; + unsigned int namelen; + + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + nameoff = bfd_h_get_32 (abfd, raw.name); + if (nameoff > command->len) + return FALSE; + fvm->minor_version = bfd_h_get_32 (abfd, raw.minor_version); + fvm->header_addr = bfd_h_get_32 (abfd, raw.header_addr); + + fvm->name_offset = command->offset + nameoff; + namelen = command->len - nameoff; + fvm->name_str = bfd_alloc (abfd, namelen); + if (fvm->name_str == NULL) + return FALSE; + if (bfd_seek (abfd, fvm->name_offset, SEEK_SET) != 0 + || bfd_bread (fvm->name_str, namelen, abfd) != namelen) + return FALSE; + return TRUE; +} + +static bfd_boolean bfd_mach_o_read_thread (bfd *abfd, bfd_mach_o_load_command *command) { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); bfd_mach_o_thread_command *cmd = &command->command.thread; - unsigned char buf[8]; unsigned int offset; unsigned int nflavours; unsigned int i; + struct mach_o_thread_command_external raw; BFD_ASSERT ((command->type == BFD_MACH_O_LC_THREAD) || (command->type == BFD_MACH_O_LC_UNIXTHREAD)); @@ -2009,44 +4181,43 @@ bfd_mach_o_read_thread (bfd *abfd, bfd_mach_o_load_command *command) /* Count the number of threads. */ offset = 8; nflavours = 0; - while (offset != command->len) + while (offset + sizeof (raw) <= command->len) { - if (offset >= command->len) - return -1; + unsigned int count; if (bfd_seek (abfd, command->offset + offset, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 8, abfd) != 8) - return -1; + || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - offset += 8 + bfd_h_get_32 (abfd, buf + 4) * 4; + count = bfd_h_get_32 (abfd, raw.count); + if (count > (unsigned) -1 / 4 + || command->len - (offset + sizeof (raw)) < count * 4) + return FALSE; + offset += sizeof (raw) + count * 4; nflavours++; } + if (nflavours == 0 || offset != command->len) + return FALSE; /* Allocate threads. */ - cmd->flavours = bfd_alloc - (abfd, nflavours * sizeof (bfd_mach_o_thread_flavour)); + cmd->flavours = bfd_alloc2 (abfd, nflavours, + sizeof (bfd_mach_o_thread_flavour)); if (cmd->flavours == NULL) - return -1; + return FALSE; cmd->nflavours = nflavours; offset = 8; nflavours = 0; while (offset != command->len) { - if (offset >= command->len) - return -1; - - if (nflavours >= cmd->nflavours) - return -1; - if (bfd_seek (abfd, command->offset + offset, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 8, abfd) != 8) - return -1; + || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - cmd->flavours[nflavours].flavour = bfd_h_get_32 (abfd, buf); - cmd->flavours[nflavours].offset = command->offset + offset + 8; - cmd->flavours[nflavours].size = bfd_h_get_32 (abfd, buf + 4) * 4; - offset += cmd->flavours[nflavours].size + 8; + cmd->flavours[nflavours].flavour = bfd_h_get_32 (abfd, raw.flavour); + cmd->flavours[nflavours].offset = command->offset + offset + sizeof (raw); + cmd->flavours[nflavours].size = bfd_h_get_32 (abfd, raw.count) * 4; + offset += cmd->flavours[nflavours].size + sizeof (raw); nflavours++; } @@ -2063,11 +4234,13 @@ bfd_mach_o_read_thread (bfd *abfd, bfd_mach_o_load_command *command) { case BFD_MACH_O_CPU_TYPE_POWERPC: case BFD_MACH_O_CPU_TYPE_POWERPC_64: - flavourstr = bfd_mach_o_ppc_flavour_string (cmd->flavours[i].flavour); + flavourstr = + bfd_mach_o_ppc_flavour_string (cmd->flavours[i].flavour); break; case BFD_MACH_O_CPU_TYPE_I386: case BFD_MACH_O_CPU_TYPE_X86_64: - flavourstr = bfd_mach_o_i386_flavour_string (cmd->flavours[i].flavour); + flavourstr = + bfd_mach_o_i386_flavour_string (cmd->flavours[i].flavour); break; default: flavourstr = "UNKNOWN_ARCHITECTURE"; @@ -2077,7 +4250,7 @@ bfd_mach_o_read_thread (bfd *abfd, bfd_mach_o_load_command *command) snamelen = strlen (prefix) + 1 + 20 + 1 + strlen (flavourstr) + 1; sname = bfd_alloc (abfd, snamelen); if (sname == NULL) - return -1; + return FALSE; for (;;) { @@ -2098,40 +4271,44 @@ bfd_mach_o_read_thread (bfd *abfd, bfd_mach_o_load_command *command) cmd->section = bfdsec; } - return 0; + return TRUE; } -static int +static bfd_boolean bfd_mach_o_read_dysymtab (bfd *abfd, bfd_mach_o_load_command *command) { bfd_mach_o_dysymtab_command *cmd = &command->command.dysymtab; bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); - unsigned char buf[72]; BFD_ASSERT (command->type == BFD_MACH_O_LC_DYSYMTAB); - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 72, abfd) != 72) - return -1; + { + struct mach_o_dysymtab_command_external raw; + + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - cmd->ilocalsym = bfd_h_get_32 (abfd, buf + 0); - cmd->nlocalsym = bfd_h_get_32 (abfd, buf + 4); - cmd->iextdefsym = bfd_h_get_32 (abfd, buf + 8); - cmd->nextdefsym = bfd_h_get_32 (abfd, buf + 12); - cmd->iundefsym = bfd_h_get_32 (abfd, buf + 16); - cmd->nundefsym = bfd_h_get_32 (abfd, buf + 20); - cmd->tocoff = bfd_h_get_32 (abfd, buf + 24); - cmd->ntoc = bfd_h_get_32 (abfd, buf + 28); - cmd->modtaboff = bfd_h_get_32 (abfd, buf + 32); - cmd->nmodtab = bfd_h_get_32 (abfd, buf + 36); - cmd->extrefsymoff = bfd_h_get_32 (abfd, buf + 40); - cmd->nextrefsyms = bfd_h_get_32 (abfd, buf + 44); - cmd->indirectsymoff = bfd_h_get_32 (abfd, buf + 48); - cmd->nindirectsyms = bfd_h_get_32 (abfd, buf + 52); - cmd->extreloff = bfd_h_get_32 (abfd, buf + 56); - cmd->nextrel = bfd_h_get_32 (abfd, buf + 60); - cmd->locreloff = bfd_h_get_32 (abfd, buf + 64); - cmd->nlocrel = bfd_h_get_32 (abfd, buf + 68); + cmd->ilocalsym = bfd_h_get_32 (abfd, raw.ilocalsym); + cmd->nlocalsym = bfd_h_get_32 (abfd, raw.nlocalsym); + cmd->iextdefsym = bfd_h_get_32 (abfd, raw.iextdefsym); + cmd->nextdefsym = bfd_h_get_32 (abfd, raw.nextdefsym); + cmd->iundefsym = bfd_h_get_32 (abfd, raw.iundefsym); + cmd->nundefsym = bfd_h_get_32 (abfd, raw.nundefsym); + cmd->tocoff = bfd_h_get_32 (abfd, raw.tocoff); + cmd->ntoc = bfd_h_get_32 (abfd, raw.ntoc); + cmd->modtaboff = bfd_h_get_32 (abfd, raw.modtaboff); + cmd->nmodtab = bfd_h_get_32 (abfd, raw.nmodtab); + cmd->extrefsymoff = bfd_h_get_32 (abfd, raw.extrefsymoff); + cmd->nextrefsyms = bfd_h_get_32 (abfd, raw.nextrefsyms); + cmd->indirectsymoff = bfd_h_get_32 (abfd, raw.indirectsymoff); + cmd->nindirectsyms = bfd_h_get_32 (abfd, raw.nindirectsyms); + cmd->extreloff = bfd_h_get_32 (abfd, raw.extreloff); + cmd->nextrel = bfd_h_get_32 (abfd, raw.nextrel); + cmd->locreloff = bfd_h_get_32 (abfd, raw.locreloff); + cmd->nlocrel = bfd_h_get_32 (abfd, raw.nlocrel); + } if (cmd->nmodtab != 0) { @@ -2140,94 +4317,97 @@ bfd_mach_o_read_dysymtab (bfd *abfd, bfd_mach_o_load_command *command) unsigned int module_len = wide ? 56 : 52; cmd->dylib_module = - bfd_alloc (abfd, cmd->nmodtab * sizeof (bfd_mach_o_dylib_module)); + bfd_alloc2 (abfd, cmd->nmodtab, sizeof (bfd_mach_o_dylib_module)); if (cmd->dylib_module == NULL) - return -1; + return FALSE; if (bfd_seek (abfd, cmd->modtaboff, SEEK_SET) != 0) - return -1; + return FALSE; for (i = 0; i < cmd->nmodtab; i++) - { - bfd_mach_o_dylib_module *module = &cmd->dylib_module[i]; - unsigned long v; - - if (bfd_bread ((void *) buf, module_len, abfd) != module_len) - return -1; - - module->module_name_idx = bfd_h_get_32 (abfd, buf + 0); - module->iextdefsym = bfd_h_get_32 (abfd, buf + 4); - module->nextdefsym = bfd_h_get_32 (abfd, buf + 8); - module->irefsym = bfd_h_get_32 (abfd, buf + 12); - module->nrefsym = bfd_h_get_32 (abfd, buf + 16); - module->ilocalsym = bfd_h_get_32 (abfd, buf + 20); - module->nlocalsym = bfd_h_get_32 (abfd, buf + 24); - module->iextrel = bfd_h_get_32 (abfd, buf + 28); - module->nextrel = bfd_h_get_32 (abfd, buf + 32); - v = bfd_h_get_32 (abfd, buf +36); - module->iinit = v & 0xffff; - module->iterm = (v >> 16) & 0xffff; - v = bfd_h_get_32 (abfd, buf + 40); - module->ninit = v & 0xffff; - module->nterm = (v >> 16) & 0xffff; - if (wide) - { - module->objc_module_info_size = bfd_h_get_32 (abfd, buf + 44); - module->objc_module_info_addr = bfd_h_get_64 (abfd, buf + 48); - } - else - { - module->objc_module_info_addr = bfd_h_get_32 (abfd, buf + 44); - module->objc_module_info_size = bfd_h_get_32 (abfd, buf + 48); - } - } - } - + { + bfd_mach_o_dylib_module *module = &cmd->dylib_module[i]; + unsigned long v; + unsigned char buf[56]; + + if (bfd_bread ((void *) buf, module_len, abfd) != module_len) + return FALSE; + + module->module_name_idx = bfd_h_get_32 (abfd, buf + 0); + module->iextdefsym = bfd_h_get_32 (abfd, buf + 4); + module->nextdefsym = bfd_h_get_32 (abfd, buf + 8); + module->irefsym = bfd_h_get_32 (abfd, buf + 12); + module->nrefsym = bfd_h_get_32 (abfd, buf + 16); + module->ilocalsym = bfd_h_get_32 (abfd, buf + 20); + module->nlocalsym = bfd_h_get_32 (abfd, buf + 24); + module->iextrel = bfd_h_get_32 (abfd, buf + 28); + module->nextrel = bfd_h_get_32 (abfd, buf + 32); + v = bfd_h_get_32 (abfd, buf +36); + module->iinit = v & 0xffff; + module->iterm = (v >> 16) & 0xffff; + v = bfd_h_get_32 (abfd, buf + 40); + module->ninit = v & 0xffff; + module->nterm = (v >> 16) & 0xffff; + if (wide) + { + module->objc_module_info_size = bfd_h_get_32 (abfd, buf + 44); + module->objc_module_info_addr = bfd_h_get_64 (abfd, buf + 48); + } + else + { + module->objc_module_info_addr = bfd_h_get_32 (abfd, buf + 44); + module->objc_module_info_size = bfd_h_get_32 (abfd, buf + 48); + } + } + } + if (cmd->ntoc != 0) { - unsigned int i; + unsigned long i; - cmd->dylib_toc = bfd_alloc - (abfd, cmd->ntoc * sizeof (bfd_mach_o_dylib_table_of_content)); + cmd->dylib_toc = bfd_alloc2 + (abfd, cmd->ntoc, sizeof (bfd_mach_o_dylib_table_of_content)); if (cmd->dylib_toc == NULL) - return -1; + return FALSE; if (bfd_seek (abfd, cmd->tocoff, SEEK_SET) != 0) - return -1; + return FALSE; for (i = 0; i < cmd->ntoc; i++) - { - bfd_mach_o_dylib_table_of_content *toc = &cmd->dylib_toc[i]; + { + struct mach_o_dylib_table_of_contents_external raw; + bfd_mach_o_dylib_table_of_content *toc = &cmd->dylib_toc[i]; - if (bfd_bread ((void *) buf, 8, abfd) != 8) - return -1; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - toc->symbol_index = bfd_h_get_32 (abfd, buf + 0); - toc->module_index = bfd_h_get_32 (abfd, buf + 4); - } + toc->symbol_index = bfd_h_get_32 (abfd, raw.symbol_index); + toc->module_index = bfd_h_get_32 (abfd, raw.module_index); + } } if (cmd->nindirectsyms != 0) { unsigned int i; - cmd->indirect_syms = bfd_alloc - (abfd, cmd->nindirectsyms * sizeof (unsigned int)); + cmd->indirect_syms = bfd_alloc2 + (abfd, cmd->nindirectsyms, sizeof (unsigned int)); if (cmd->indirect_syms == NULL) - return -1; + return FALSE; if (bfd_seek (abfd, cmd->indirectsymoff, SEEK_SET) != 0) - return -1; + return FALSE; for (i = 0; i < cmd->nindirectsyms; i++) - { - unsigned int *is = &cmd->indirect_syms[i]; + { + unsigned char raw[4]; + unsigned int *is = &cmd->indirect_syms[i]; - if (bfd_bread ((void *) buf, 4, abfd) != 4) - return -1; + if (bfd_bread (raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - *is = bfd_h_get_32 (abfd, buf + 0); - } + *is = bfd_h_get_32 (abfd, raw); + } } if (cmd->nextrefsyms != 0) @@ -2235,61 +4415,63 @@ bfd_mach_o_read_dysymtab (bfd *abfd, bfd_mach_o_load_command *command) unsigned long v; unsigned int i; - cmd->ext_refs = bfd_alloc - (abfd, cmd->nextrefsyms * sizeof (bfd_mach_o_dylib_reference)); + cmd->ext_refs = bfd_alloc2 + (abfd, cmd->nextrefsyms, sizeof (bfd_mach_o_dylib_reference)); if (cmd->ext_refs == NULL) - return -1; + return FALSE; if (bfd_seek (abfd, cmd->extrefsymoff, SEEK_SET) != 0) - return -1; + return FALSE; for (i = 0; i < cmd->nextrefsyms; i++) - { - bfd_mach_o_dylib_reference *ref = &cmd->ext_refs[i]; - - if (bfd_bread ((void *) buf, 4, abfd) != 4) - return -1; - - /* Fields isym and flags are written as bit-fields, thus we need - a specific processing for endianness. */ - v = bfd_h_get_32 (abfd, buf + 0); - if (bfd_big_endian (abfd)) - { - ref->isym = (v >> 8) & 0xffffff; - ref->flags = v & 0xff; - } - else - { - ref->isym = v & 0xffffff; - ref->flags = (v >> 24) & 0xff; - } - } + { + unsigned char raw[4]; + bfd_mach_o_dylib_reference *ref = &cmd->ext_refs[i]; + + if (bfd_bread (raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + /* Fields isym and flags are written as bit-fields, thus we need + a specific processing for endianness. */ + v = bfd_h_get_32 (abfd, raw); + if (bfd_big_endian (abfd)) + { + ref->isym = (v >> 8) & 0xffffff; + ref->flags = v & 0xff; + } + else + { + ref->isym = v & 0xffffff; + ref->flags = (v >> 24) & 0xff; + } + } } if (mdata->dysymtab) - return -1; + return FALSE; mdata->dysymtab = cmd; - return 0; + return TRUE; } -static int +static bfd_boolean bfd_mach_o_read_symtab (bfd *abfd, bfd_mach_o_load_command *command) { bfd_mach_o_symtab_command *symtab = &command->command.symtab; bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); - unsigned char buf[16]; + struct mach_o_symtab_command_external raw; BFD_ASSERT (command->type == BFD_MACH_O_LC_SYMTAB); - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 16, abfd) != 16) - return -1; + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - symtab->symoff = bfd_h_get_32 (abfd, buf); - symtab->nsyms = bfd_h_get_32 (abfd, buf + 4); - symtab->stroff = bfd_h_get_32 (abfd, buf + 8); - symtab->strsize = bfd_h_get_32 (abfd, buf + 12); + symtab->symoff = bfd_h_get_32 (abfd, raw.symoff); + symtab->nsyms = bfd_h_get_32 (abfd, raw.nsyms); + symtab->stroff = bfd_h_get_32 (abfd, raw.stroff); + symtab->strsize = bfd_h_get_32 (abfd, raw.strsize); symtab->symbols = NULL; symtab->strtab = NULL; @@ -2297,393 +4479,658 @@ bfd_mach_o_read_symtab (bfd *abfd, bfd_mach_o_load_command *command) abfd->flags |= HAS_SYMS; if (mdata->symtab) - return -1; + return FALSE; mdata->symtab = symtab; - return 0; + return TRUE; } -static int +static bfd_boolean bfd_mach_o_read_uuid (bfd *abfd, bfd_mach_o_load_command *command) { bfd_mach_o_uuid_command *cmd = &command->command.uuid; BFD_ASSERT (command->type == BFD_MACH_O_LC_UUID); - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || bfd_bread ((void *) cmd->uuid, 16, abfd) != 16) - return -1; + if (command->len < 16 + 8) + return FALSE; + if (bfd_bread (cmd->uuid, 16, abfd) != 16) + return FALSE; + + return TRUE; +} + +static bfd_boolean +bfd_mach_o_read_linkedit (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_linkedit_command *cmd = &command->command.linkedit; + struct mach_o_linkedit_data_command_external raw; + + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + cmd->dataoff = bfd_get_32 (abfd, raw.dataoff); + cmd->datasize = bfd_get_32 (abfd, raw.datasize); + return TRUE; +} + +static bfd_boolean +bfd_mach_o_read_str (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_str_command *cmd = &command->command.str; + struct mach_o_str_command_external raw; + unsigned long off; + + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + off = bfd_get_32 (abfd, raw.str); + if (off > command->len) + return FALSE; + + cmd->stroff = command->offset + off; + cmd->str_len = command->len - off; + cmd->str = bfd_alloc (abfd, cmd->str_len); + if (cmd->str == NULL) + return FALSE; + if (bfd_seek (abfd, cmd->stroff, SEEK_SET) != 0 + || bfd_bread ((void *) cmd->str, cmd->str_len, abfd) != cmd->str_len) + return FALSE; + return TRUE; +} + +static unsigned char * +bfd_mach_o_alloc_and_read (bfd *abfd, unsigned int off, unsigned int size) +{ + unsigned char *buf; + + buf = bfd_alloc (abfd, size); + if (buf == NULL) + return NULL; + if (bfd_seek (abfd, off, SEEK_SET) != 0 + || bfd_bread (buf, size, abfd) != size) + return NULL; + return buf; +} + +static bfd_boolean +bfd_mach_o_read_dyld_content (bfd *abfd, bfd_mach_o_dyld_info_command *cmd) +{ + /* Read rebase content. */ + if (cmd->rebase_content == NULL && cmd->rebase_size != 0) + { + cmd->rebase_content = + bfd_mach_o_alloc_and_read (abfd, cmd->rebase_off, cmd->rebase_size); + if (cmd->rebase_content == NULL) + return FALSE; + } + + /* Read bind content. */ + if (cmd->bind_content == NULL && cmd->bind_size != 0) + { + cmd->bind_content = + bfd_mach_o_alloc_and_read (abfd, cmd->bind_off, cmd->bind_size); + if (cmd->bind_content == NULL) + return FALSE; + } + + /* Read weak bind content. */ + if (cmd->weak_bind_content == NULL && cmd->weak_bind_size != 0) + { + cmd->weak_bind_content = bfd_mach_o_alloc_and_read + (abfd, cmd->weak_bind_off, cmd->weak_bind_size); + if (cmd->weak_bind_content == NULL) + return FALSE; + } + + /* Read lazy bind content. */ + if (cmd->lazy_bind_content == NULL && cmd->lazy_bind_size != 0) + { + cmd->lazy_bind_content = bfd_mach_o_alloc_and_read + (abfd, cmd->lazy_bind_off, cmd->lazy_bind_size); + if (cmd->lazy_bind_content == NULL) + return FALSE; + } + + /* Read export content. */ + if (cmd->export_content == NULL && cmd->export_size != 0) + { + cmd->export_content = bfd_mach_o_alloc_and_read + (abfd, cmd->export_off, cmd->export_size); + if (cmd->export_content == NULL) + return FALSE; + } + + return TRUE; +} + +static bfd_boolean +bfd_mach_o_read_dyld_info (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_dyld_info_command *cmd = &command->command.dyld_info; + struct mach_o_dyld_info_command_external raw; + + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + cmd->rebase_off = bfd_get_32 (abfd, raw.rebase_off); + cmd->rebase_size = bfd_get_32 (abfd, raw.rebase_size); + cmd->rebase_content = NULL; + cmd->bind_off = bfd_get_32 (abfd, raw.bind_off); + cmd->bind_size = bfd_get_32 (abfd, raw.bind_size); + cmd->bind_content = NULL; + cmd->weak_bind_off = bfd_get_32 (abfd, raw.weak_bind_off); + cmd->weak_bind_size = bfd_get_32 (abfd, raw.weak_bind_size); + cmd->weak_bind_content = NULL; + cmd->lazy_bind_off = bfd_get_32 (abfd, raw.lazy_bind_off); + cmd->lazy_bind_size = bfd_get_32 (abfd, raw.lazy_bind_size); + cmd->lazy_bind_content = NULL; + cmd->export_off = bfd_get_32 (abfd, raw.export_off); + cmd->export_size = bfd_get_32 (abfd, raw.export_size); + cmd->export_content = NULL; + return TRUE; +} + +static bfd_boolean +bfd_mach_o_read_version_min (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_version_min_command *cmd = &command->command.version_min; + struct mach_o_version_min_command_external raw; + + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + cmd->version = bfd_get_32 (abfd, raw.version); + cmd->sdk = bfd_get_32 (abfd, raw.sdk); + return TRUE; +} + +static bfd_boolean +bfd_mach_o_read_encryption_info (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_encryption_info_command *cmd = &command->command.encryption_info; + struct mach_o_encryption_info_command_external raw; + + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + cmd->cryptoff = bfd_get_32 (abfd, raw.cryptoff); + cmd->cryptsize = bfd_get_32 (abfd, raw.cryptsize); + cmd->cryptid = bfd_get_32 (abfd, raw.cryptid); + return TRUE; +} + +static bfd_boolean +bfd_mach_o_read_encryption_info_64 (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_encryption_info_command *cmd = &command->command.encryption_info; + struct mach_o_encryption_info_64_command_external raw; + + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; + + cmd->cryptoff = bfd_get_32 (abfd, raw.cryptoff); + cmd->cryptsize = bfd_get_32 (abfd, raw.cryptsize); + cmd->cryptid = bfd_get_32 (abfd, raw.cryptid); + return TRUE; +} + +static bfd_boolean +bfd_mach_o_read_main (bfd *abfd, bfd_mach_o_load_command *command) +{ + bfd_mach_o_main_command *cmd = &command->command.main; + struct mach_o_entry_point_command_external raw; + + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - return 0; + cmd->entryoff = bfd_get_64 (abfd, raw.entryoff); + cmd->stacksize = bfd_get_64 (abfd, raw.stacksize); + return TRUE; } -static int -bfd_mach_o_read_linkedit (bfd *abfd, bfd_mach_o_load_command *command) +static bfd_boolean +bfd_mach_o_read_source_version (bfd *abfd, bfd_mach_o_load_command *command) { - bfd_mach_o_linkedit_command *cmd = &command->command.linkedit; - char buf[8]; + bfd_mach_o_source_version_command *cmd = &command->command.source_version; + struct mach_o_source_version_command_external raw; + bfd_uint64_t ver; - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 8, abfd) != 8) - return -1; + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - cmd->dataoff = bfd_get_32 (abfd, buf + 0); - cmd->datasize = bfd_get_32 (abfd, buf + 4); - return 0; + ver = bfd_get_64 (abfd, raw.version); + /* Note: we use a serie of shift to avoid shift > 32 (for which gcc + generates warnings) in case of the host doesn't support 64 bit + integers. */ + cmd->e = ver & 0x3ff; + ver >>= 10; + cmd->d = ver & 0x3ff; + ver >>= 10; + cmd->c = ver & 0x3ff; + ver >>= 10; + cmd->b = ver & 0x3ff; + ver >>= 10; + cmd->a = ver & 0xffffff; + return TRUE; } -static int -bfd_mach_o_read_str (bfd *abfd, bfd_mach_o_load_command *command) +static bfd_boolean +bfd_mach_o_read_note (bfd *abfd, bfd_mach_o_load_command *command) { - bfd_mach_o_str_command *cmd = &command->command.str; - char buf[4]; - unsigned long off; + bfd_mach_o_note_command *cmd = &command->command.note; + struct mach_o_note_command_external raw; - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 4, abfd) != 4) - return -1; + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - off = bfd_get_32 (abfd, buf + 0); - cmd->stroff = command->offset + off; - cmd->str_len = command->len - off; - cmd->str = bfd_alloc (abfd, cmd->str_len); - if (cmd->str == NULL) - return -1; - if (bfd_seek (abfd, cmd->stroff, SEEK_SET) != 0 - || bfd_bread ((void *) cmd->str, cmd->str_len, abfd) != cmd->str_len) - return -1; - return 0; + memcpy (cmd->data_owner, raw.data_owner, 16); + cmd->offset = bfd_get_64 (abfd, raw.offset); + cmd->size = bfd_get_64 (abfd, raw.size); + return TRUE; } -static int -bfd_mach_o_read_dyld_info (bfd *abfd, bfd_mach_o_load_command *command) +static bfd_boolean +bfd_mach_o_read_build_version (bfd *abfd, bfd_mach_o_load_command *command) { - bfd_mach_o_dyld_info_command *cmd = &command->command.dyld_info; - char buf[40]; + bfd_mach_o_build_version_command *cmd = &command->command.build_version; + struct mach_o_build_version_command_external raw; - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || bfd_bread ((void *) buf, sizeof (buf), abfd) != sizeof (buf)) - return -1; + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - cmd->rebase_off = bfd_get_32 (abfd, buf + 0); - cmd->rebase_size = bfd_get_32 (abfd, buf + 4); - cmd->bind_off = bfd_get_32 (abfd, buf + 8); - cmd->bind_size = bfd_get_32 (abfd, buf + 12); - cmd->weak_bind_off = bfd_get_32 (abfd, buf + 16); - cmd->weak_bind_size = bfd_get_32 (abfd, buf + 20); - cmd->lazy_bind_off = bfd_get_32 (abfd, buf + 24); - cmd->lazy_bind_size = bfd_get_32 (abfd, buf + 28); - cmd->export_off = bfd_get_32 (abfd, buf + 32); - cmd->export_size = bfd_get_32 (abfd, buf + 36); - return 0; + cmd->platform = bfd_get_32 (abfd, raw.platform); + cmd->minos = bfd_get_32 (abfd, raw.minos); + cmd->sdk = bfd_get_32 (abfd, raw.sdk); + cmd->ntools = bfd_get_32 (abfd, raw.ntools); + return TRUE; } -static int +static bfd_boolean bfd_mach_o_read_segment (bfd *abfd, - bfd_mach_o_load_command *command, - unsigned int wide) + bfd_mach_o_load_command *command, + unsigned int wide) { - unsigned char buf[64]; bfd_mach_o_segment_command *seg = &command->command.segment; unsigned long i; if (wide) { + struct mach_o_segment_command_64_external raw; + BFD_ASSERT (command->type == BFD_MACH_O_LC_SEGMENT_64); - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 64, abfd) != 64) - return -1; + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - memcpy (seg->segname, buf, 16); + memcpy (seg->segname, raw.segname, 16); seg->segname[16] = '\0'; - seg->vmaddr = bfd_h_get_64 (abfd, buf + 16); - seg->vmsize = bfd_h_get_64 (abfd, buf + 24); - seg->fileoff = bfd_h_get_64 (abfd, buf + 32); - seg->filesize = bfd_h_get_64 (abfd, buf + 40); - seg->maxprot = bfd_h_get_32 (abfd, buf + 48); - seg->initprot = bfd_h_get_32 (abfd, buf + 52); - seg->nsects = bfd_h_get_32 (abfd, buf + 56); - seg->flags = bfd_h_get_32 (abfd, buf + 60); + seg->vmaddr = bfd_h_get_64 (abfd, raw.vmaddr); + seg->vmsize = bfd_h_get_64 (abfd, raw.vmsize); + seg->fileoff = bfd_h_get_64 (abfd, raw.fileoff); + seg->filesize = bfd_h_get_64 (abfd, raw.filesize); + seg->maxprot = bfd_h_get_32 (abfd, raw.maxprot); + seg->initprot = bfd_h_get_32 (abfd, raw.initprot); + seg->nsects = bfd_h_get_32 (abfd, raw.nsects); + seg->flags = bfd_h_get_32 (abfd, raw.flags); } else { + struct mach_o_segment_command_32_external raw; + BFD_ASSERT (command->type == BFD_MACH_O_LC_SEGMENT); - if (bfd_seek (abfd, command->offset + 8, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 48, abfd) != 48) - return -1; + if (command->len < sizeof (raw) + 8) + return FALSE; + if (bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw)) + return FALSE; - memcpy (seg->segname, buf, 16); + memcpy (seg->segname, raw.segname, 16); seg->segname[16] = '\0'; - seg->vmaddr = bfd_h_get_32 (abfd, buf + 16); - seg->vmsize = bfd_h_get_32 (abfd, buf + 20); - seg->fileoff = bfd_h_get_32 (abfd, buf + 24); - seg->filesize = bfd_h_get_32 (abfd, buf + 28); - seg->maxprot = bfd_h_get_32 (abfd, buf + 32); - seg->initprot = bfd_h_get_32 (abfd, buf + 36); - seg->nsects = bfd_h_get_32 (abfd, buf + 40); - seg->flags = bfd_h_get_32 (abfd, buf + 44); + seg->vmaddr = bfd_h_get_32 (abfd, raw.vmaddr); + seg->vmsize = bfd_h_get_32 (abfd, raw.vmsize); + seg->fileoff = bfd_h_get_32 (abfd, raw.fileoff); + seg->filesize = bfd_h_get_32 (abfd, raw.filesize); + seg->maxprot = bfd_h_get_32 (abfd, raw.maxprot); + seg->initprot = bfd_h_get_32 (abfd, raw.initprot); + seg->nsects = bfd_h_get_32 (abfd, raw.nsects); + seg->flags = bfd_h_get_32 (abfd, raw.flags); } + seg->sect_head = NULL; + seg->sect_tail = NULL; - if (seg->nsects != 0) + for (i = 0; i < seg->nsects; i++) { - seg->sections = bfd_alloc (abfd, seg->nsects - * sizeof (bfd_mach_o_section)); - if (seg->sections == NULL) - return -1; + asection *sec; - for (i = 0; i < seg->nsects; i++) - { - bfd_vma segoff; - if (wide) - segoff = command->offset + BFD_MACH_O_LC_SEGMENT_64_SIZE - + (i * BFD_MACH_O_SECTION_64_SIZE); - else - segoff = command->offset + BFD_MACH_O_LC_SEGMENT_SIZE - + (i * BFD_MACH_O_SECTION_SIZE); + sec = bfd_mach_o_read_section (abfd, seg->initprot, wide); + if (sec == NULL) + return FALSE; - if (bfd_mach_o_read_section - (abfd, &seg->sections[i], segoff, seg->initprot, wide) != 0) - return -1; - } + bfd_mach_o_append_section_to_segment + (seg, bfd_mach_o_get_mach_o_section (sec)); } - return 0; + return TRUE; } -static int +static bfd_boolean bfd_mach_o_read_segment_32 (bfd *abfd, bfd_mach_o_load_command *command) { return bfd_mach_o_read_segment (abfd, command, 0); } -static int +static bfd_boolean bfd_mach_o_read_segment_64 (bfd *abfd, bfd_mach_o_load_command *command) { return bfd_mach_o_read_segment (abfd, command, 1); } -static int +static bfd_boolean bfd_mach_o_read_command (bfd *abfd, bfd_mach_o_load_command *command) { - unsigned char buf[8]; + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + struct mach_o_load_command_external raw; + unsigned int cmd; /* Read command type and length. */ - if (bfd_seek (abfd, command->offset, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 8, abfd) != 8) - return -1; + if (bfd_seek (abfd, mdata->hdr_offset + command->offset, SEEK_SET) != 0 + || bfd_bread (&raw, BFD_MACH_O_LC_SIZE, abfd) != BFD_MACH_O_LC_SIZE) + return FALSE; - command->type = bfd_h_get_32 (abfd, buf) & ~BFD_MACH_O_LC_REQ_DYLD; - command->type_required = (bfd_h_get_32 (abfd, buf) & BFD_MACH_O_LC_REQ_DYLD - ? TRUE : FALSE); - command->len = bfd_h_get_32 (abfd, buf + 4); + cmd = bfd_h_get_32 (abfd, raw.cmd); + command->type = cmd & ~BFD_MACH_O_LC_REQ_DYLD; + command->type_required = cmd & BFD_MACH_O_LC_REQ_DYLD ? TRUE : FALSE; + command->len = bfd_h_get_32 (abfd, raw.cmdsize); + if (command->len < 8 || command->len % 4 != 0) + return FALSE; switch (command->type) { case BFD_MACH_O_LC_SEGMENT: - if (bfd_mach_o_read_segment_32 (abfd, command) != 0) - return -1; + if (!bfd_mach_o_read_segment_32 (abfd, command)) + return FALSE; break; case BFD_MACH_O_LC_SEGMENT_64: - if (bfd_mach_o_read_segment_64 (abfd, command) != 0) - return -1; + if (!bfd_mach_o_read_segment_64 (abfd, command)) + return FALSE; break; case BFD_MACH_O_LC_SYMTAB: - if (bfd_mach_o_read_symtab (abfd, command) != 0) - return -1; + if (!bfd_mach_o_read_symtab (abfd, command)) + return FALSE; break; case BFD_MACH_O_LC_SYMSEG: break; case BFD_MACH_O_LC_THREAD: case BFD_MACH_O_LC_UNIXTHREAD: - if (bfd_mach_o_read_thread (abfd, command) != 0) - return -1; + if (!bfd_mach_o_read_thread (abfd, command)) + return FALSE; break; case BFD_MACH_O_LC_LOAD_DYLINKER: case BFD_MACH_O_LC_ID_DYLINKER: - if (bfd_mach_o_read_dylinker (abfd, command) != 0) - return -1; + case BFD_MACH_O_LC_DYLD_ENVIRONMENT: + if (!bfd_mach_o_read_dylinker (abfd, command)) + return FALSE; break; case BFD_MACH_O_LC_LOAD_DYLIB: + case BFD_MACH_O_LC_LAZY_LOAD_DYLIB: case BFD_MACH_O_LC_ID_DYLIB: case BFD_MACH_O_LC_LOAD_WEAK_DYLIB: case BFD_MACH_O_LC_REEXPORT_DYLIB: - if (bfd_mach_o_read_dylib (abfd, command) != 0) - return -1; + case BFD_MACH_O_LC_LOAD_UPWARD_DYLIB: + if (!bfd_mach_o_read_dylib (abfd, command)) + return FALSE; break; case BFD_MACH_O_LC_PREBOUND_DYLIB: - if (bfd_mach_o_read_prebound_dylib (abfd, command) != 0) - return -1; + if (!bfd_mach_o_read_prebound_dylib (abfd, command)) + return FALSE; break; case BFD_MACH_O_LC_LOADFVMLIB: case BFD_MACH_O_LC_IDFVMLIB: + if (!bfd_mach_o_read_fvmlib (abfd, command)) + return FALSE; + break; case BFD_MACH_O_LC_IDENT: case BFD_MACH_O_LC_FVMFILE: case BFD_MACH_O_LC_PREPAGE: case BFD_MACH_O_LC_ROUTINES: + case BFD_MACH_O_LC_ROUTINES_64: 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: - if (bfd_mach_o_read_str (abfd, command) != 0) - return -1; + if (!bfd_mach_o_read_str (abfd, command)) + return FALSE; break; case BFD_MACH_O_LC_DYSYMTAB: - if (bfd_mach_o_read_dysymtab (abfd, command) != 0) - return -1; + if (!bfd_mach_o_read_dysymtab (abfd, command)) + return FALSE; break; - case BFD_MACH_O_LC_TWOLEVEL_HINTS: case BFD_MACH_O_LC_PREBIND_CKSUM: + if (!bfd_mach_o_read_prebind_cksum (abfd, command)) + return FALSE; + break; + case BFD_MACH_O_LC_TWOLEVEL_HINTS: + if (!bfd_mach_o_read_twolevel_hints (abfd, command)) + return FALSE; break; case BFD_MACH_O_LC_UUID: - if (bfd_mach_o_read_uuid (abfd, command) != 0) - return -1; + if (!bfd_mach_o_read_uuid (abfd, command)) + return FALSE; break; case BFD_MACH_O_LC_CODE_SIGNATURE: case BFD_MACH_O_LC_SEGMENT_SPLIT_INFO: - if (bfd_mach_o_read_linkedit (abfd, command) != 0) - return -1; + case BFD_MACH_O_LC_FUNCTION_STARTS: + case BFD_MACH_O_LC_DATA_IN_CODE: + case BFD_MACH_O_LC_DYLIB_CODE_SIGN_DRS: + case BFD_MACH_O_LC_LINKER_OPTIMIZATION_HINT: + if (!bfd_mach_o_read_linkedit (abfd, command)) + return FALSE; + break; + case BFD_MACH_O_LC_ENCRYPTION_INFO: + if (!bfd_mach_o_read_encryption_info (abfd, command)) + return FALSE; + break; + case BFD_MACH_O_LC_ENCRYPTION_INFO_64: + if (!bfd_mach_o_read_encryption_info_64 (abfd, command)) + return FALSE; break; case BFD_MACH_O_LC_DYLD_INFO: - if (bfd_mach_o_read_dyld_info (abfd, command) != 0) - return -1; + if (!bfd_mach_o_read_dyld_info (abfd, command)) + return FALSE; break; - default: - (*_bfd_error_handler) (_("unable to read unknown load command 0x%lx"), - (unsigned long) command->type); + case BFD_MACH_O_LC_VERSION_MIN_MACOSX: + case BFD_MACH_O_LC_VERSION_MIN_IPHONEOS: + case BFD_MACH_O_LC_VERSION_MIN_WATCHOS: + case BFD_MACH_O_LC_VERSION_MIN_TVOS: + if (!bfd_mach_o_read_version_min (abfd, command)) + return FALSE; + break; + case BFD_MACH_O_LC_MAIN: + if (!bfd_mach_o_read_main (abfd, command)) + return FALSE; + break; + case BFD_MACH_O_LC_SOURCE_VERSION: + if (!bfd_mach_o_read_source_version (abfd, command)) + return FALSE; + break; + case BFD_MACH_O_LC_LINKER_OPTIONS: + break; + case BFD_MACH_O_LC_NOTE: + if (!bfd_mach_o_read_note (abfd, command)) + return FALSE; + break; + case BFD_MACH_O_LC_BUILD_VERSION: + if (!bfd_mach_o_read_build_version (abfd, command)) + return FALSE; break; + default: + command->len = 0; + _bfd_error_handler (_("%pB: unknown load command %#x"), + abfd, command->type); + return FALSE; } - return 0; + return TRUE; } static void bfd_mach_o_flatten_sections (bfd *abfd) { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + bfd_mach_o_load_command *cmd; long csect = 0; - unsigned long i, j; /* Count total number of sections. */ mdata->nsects = 0; - for (i = 0; i < mdata->header.ncmds; i++) + for (cmd = mdata->first_command; cmd != NULL; cmd = cmd->next) { - if (mdata->commands[i].type == BFD_MACH_O_LC_SEGMENT - || mdata->commands[i].type == BFD_MACH_O_LC_SEGMENT_64) + if (cmd->type == BFD_MACH_O_LC_SEGMENT + || cmd->type == BFD_MACH_O_LC_SEGMENT_64) { - bfd_mach_o_segment_command *seg; + bfd_mach_o_segment_command *seg = &cmd->command.segment; - seg = &mdata->commands[i].command.segment; mdata->nsects += seg->nsects; } } /* Allocate sections array. */ - mdata->sections = bfd_alloc (abfd, - mdata->nsects * sizeof (bfd_mach_o_section *)); + mdata->sections = bfd_alloc2 (abfd, + mdata->nsects, sizeof (bfd_mach_o_section *)); /* Fill the array. */ csect = 0; - for (i = 0; i < mdata->header.ncmds; i++) + for (cmd = mdata->first_command; cmd != NULL; cmd = cmd->next) { - if (mdata->commands[i].type == BFD_MACH_O_LC_SEGMENT - || mdata->commands[i].type == BFD_MACH_O_LC_SEGMENT_64) + if (cmd->type == BFD_MACH_O_LC_SEGMENT + || cmd->type == BFD_MACH_O_LC_SEGMENT_64) { - bfd_mach_o_segment_command *seg; + bfd_mach_o_segment_command *seg = &cmd->command.segment; + bfd_mach_o_section *sec; - seg = &mdata->commands[i].command.segment; BFD_ASSERT (csect + seg->nsects <= mdata->nsects); - for (j = 0; j < seg->nsects; j++) - mdata->sections[csect++] = &seg->sections[j]; + for (sec = seg->sect_head; sec != NULL; sec = sec->next) + mdata->sections[csect++] = sec; } } } -int +static bfd_boolean bfd_mach_o_scan_start_address (bfd *abfd) { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); - bfd_mach_o_thread_command *cmd = NULL; + bfd_mach_o_thread_command *thr = NULL; + bfd_mach_o_load_command *cmd; unsigned long i; - for (i = 0; i < mdata->header.ncmds; i++) - { - if ((mdata->commands[i].type == BFD_MACH_O_LC_THREAD) || - (mdata->commands[i].type == BFD_MACH_O_LC_UNIXTHREAD)) - { - if (cmd == NULL) - cmd = &mdata->commands[i].command.thread; - else - return 0; - } - } + for (cmd = mdata->first_command; cmd != NULL; cmd = cmd->next) + if (cmd->type == BFD_MACH_O_LC_THREAD + || cmd->type == BFD_MACH_O_LC_UNIXTHREAD) + { + thr = &cmd->command.thread; + break; + } + else if (cmd->type == BFD_MACH_O_LC_MAIN && mdata->nsects > 1) + { + bfd_mach_o_main_command *main_cmd = &cmd->command.main; + bfd_mach_o_section *text_sect = mdata->sections[0]; - if (cmd == NULL) - return 0; + if (text_sect) + { + abfd->start_address = main_cmd->entryoff + + (text_sect->addr - text_sect->offset); + return TRUE; + } + } - for (i = 0; i < cmd->nflavours; i++) + /* An object file has no start address, so do not fail if not found. */ + if (thr == NULL) + return TRUE; + + /* FIXME: create a subtarget hook ? */ + for (i = 0; i < thr->nflavours; i++) { if ((mdata->header.cputype == BFD_MACH_O_CPU_TYPE_I386) - && (cmd->flavours[i].flavour - == (unsigned long) BFD_MACH_O_x86_THREAD_STATE32)) + && (thr->flavours[i].flavour == BFD_MACH_O_x86_THREAD_STATE32)) { unsigned char buf[4]; - if (bfd_seek (abfd, cmd->flavours[i].offset + 40, SEEK_SET) != 0 - || bfd_bread (buf, 4, abfd) != 4) - return -1; + if (bfd_seek (abfd, thr->flavours[i].offset + 40, SEEK_SET) != 0 + || bfd_bread (buf, 4, abfd) != 4) + return FALSE; abfd->start_address = bfd_h_get_32 (abfd, buf); } else if ((mdata->header.cputype == BFD_MACH_O_CPU_TYPE_POWERPC) - && (cmd->flavours[i].flavour == BFD_MACH_O_PPC_THREAD_STATE)) + && (thr->flavours[i].flavour == BFD_MACH_O_PPC_THREAD_STATE)) { unsigned char buf[4]; - if (bfd_seek (abfd, cmd->flavours[i].offset + 0, SEEK_SET) != 0 - || bfd_bread (buf, 4, abfd) != 4) - return -1; + if (bfd_seek (abfd, thr->flavours[i].offset + 0, SEEK_SET) != 0 + || bfd_bread (buf, 4, abfd) != 4) + return FALSE; abfd->start_address = bfd_h_get_32 (abfd, buf); } else if ((mdata->header.cputype == BFD_MACH_O_CPU_TYPE_POWERPC_64) - && (cmd->flavours[i].flavour == BFD_MACH_O_PPC_THREAD_STATE64)) - { - unsigned char buf[8]; + && (thr->flavours[i].flavour == BFD_MACH_O_PPC_THREAD_STATE64)) + { + unsigned char buf[8]; - if (bfd_seek (abfd, cmd->flavours[i].offset + 0, SEEK_SET) != 0 - || bfd_bread (buf, 8, abfd) != 8) - return -1; + if (bfd_seek (abfd, thr->flavours[i].offset + 0, SEEK_SET) != 0 + || bfd_bread (buf, 8, abfd) != 8) + return FALSE; - abfd->start_address = bfd_h_get_64 (abfd, buf); - } + abfd->start_address = bfd_h_get_64 (abfd, buf); + } else if ((mdata->header.cputype == BFD_MACH_O_CPU_TYPE_X86_64) - && (cmd->flavours[i].flavour == BFD_MACH_O_x86_THREAD_STATE64)) - { - unsigned char buf[8]; + && (thr->flavours[i].flavour == BFD_MACH_O_x86_THREAD_STATE64)) + { + unsigned char buf[8]; - if (bfd_seek (abfd, cmd->flavours[i].offset + (16 * 8), SEEK_SET) != 0 - || bfd_bread (buf, 8, abfd) != 8) - return -1; + if (bfd_seek (abfd, thr->flavours[i].offset + (16 * 8), SEEK_SET) != 0 + || bfd_bread (buf, 8, abfd) != 8) + return FALSE; - abfd->start_address = bfd_h_get_64 (abfd, buf); - } + abfd->start_address = bfd_h_get_64 (abfd, buf); + } } - return 0; + return TRUE; } bfd_boolean bfd_mach_o_set_arch_mach (bfd *abfd, - enum bfd_architecture arch, - unsigned long machine) + enum bfd_architecture arch, + unsigned long machine) { bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd); @@ -2697,14 +5144,14 @@ bfd_mach_o_set_arch_mach (bfd *abfd, return bfd_default_set_arch_mach (abfd, arch, machine); } -int +static bfd_boolean bfd_mach_o_scan (bfd *abfd, bfd_mach_o_header *header, bfd_mach_o_data_struct *mdata) { unsigned int i; - enum bfd_architecture cputype; - unsigned long cpusubtype; + enum bfd_architecture cpu_type; + unsigned long cpu_subtype; unsigned int hdrsize; hdrsize = mach_o_wide_p (header) ? @@ -2730,45 +5177,54 @@ bfd_mach_o_scan (bfd *abfd, abfd->tdata.mach_o_data = mdata; bfd_mach_o_convert_architecture (header->cputype, header->cpusubtype, - &cputype, &cpusubtype); - if (cputype == bfd_arch_unknown) + &cpu_type, &cpu_subtype); + if (cpu_type == bfd_arch_unknown) { - (*_bfd_error_handler) (_("bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"), - header->cputype, header->cpusubtype); - return -1; + _bfd_error_handler + /* xgettext:c-format */ + (_("bfd_mach_o_scan: unknown architecture 0x%lx/0x%lx"), + header->cputype, header->cpusubtype); + return FALSE; } - bfd_set_arch_mach (abfd, cputype, cpusubtype); + bfd_set_arch_mach (abfd, cpu_type, cpu_subtype); if (header->ncmds != 0) { - mdata->commands = bfd_alloc - (abfd, header->ncmds * sizeof (bfd_mach_o_load_command)); - if (mdata->commands == NULL) - return -1; + bfd_mach_o_load_command *cmd; + + mdata->first_command = NULL; + mdata->last_command = NULL; + + cmd = bfd_alloc2 (abfd, header->ncmds, sizeof (bfd_mach_o_load_command)); + if (cmd == NULL) + return FALSE; for (i = 0; i < header->ncmds; i++) { - bfd_mach_o_load_command *cur = &mdata->commands[i]; + bfd_mach_o_load_command *cur = &cmd[i]; + + bfd_mach_o_append_command (abfd, cur); if (i == 0) cur->offset = hdrsize; else { - bfd_mach_o_load_command *prev = &mdata->commands[i - 1]; + bfd_mach_o_load_command *prev = &cmd[i - 1]; cur->offset = prev->offset + prev->len; } - if (bfd_mach_o_read_command (abfd, cur) < 0) - return -1; + if (!bfd_mach_o_read_command (abfd, cur)) + return FALSE; } } - if (bfd_mach_o_scan_start_address (abfd) < 0) - return -1; - + /* Sections should be flatten before scanning start address. */ bfd_mach_o_flatten_sections (abfd); - return 0; + if (!bfd_mach_o_scan_start_address (abfd)) + return FALSE; + + return TRUE; } bfd_boolean @@ -2776,7 +5232,7 @@ bfd_mach_o_mkobject_init (bfd *abfd) { bfd_mach_o_data_struct *mdata = NULL; - mdata = bfd_alloc (abfd, sizeof (bfd_mach_o_data_struct)); + mdata = bfd_zalloc (abfd, sizeof (bfd_mach_o_data_struct)); if (mdata == NULL) return FALSE; abfd->tdata.mach_o_data = mdata; @@ -2789,9 +5245,11 @@ bfd_mach_o_mkobject_init (bfd *abfd) mdata->header.sizeofcmds = 0; mdata->header.flags = 0; mdata->header.byteorder = BFD_ENDIAN_UNKNOWN; - mdata->commands = NULL; + mdata->first_command = NULL; + mdata->last_command = NULL; mdata->nsects = 0; mdata->sections = NULL; + mdata->dyn_reloc_cache = NULL; return TRUE; } @@ -2816,21 +5274,21 @@ bfd_mach_o_gen_mkobject (bfd *abfd) const bfd_target * bfd_mach_o_header_p (bfd *abfd, - bfd_mach_o_filetype filetype, - bfd_mach_o_cpu_type cputype) + file_ptr hdr_off, + bfd_mach_o_filetype file_type, + bfd_mach_o_cpu_type cpu_type) { - struct bfd_preserve preserve; bfd_mach_o_header header; + bfd_mach_o_data_struct *mdata; - preserve.marker = NULL; - if (!bfd_mach_o_read_header (abfd, &header)) + if (!bfd_mach_o_read_header (abfd, hdr_off, &header)) goto wrong; if (! (header.byteorder == BFD_ENDIAN_BIG || header.byteorder == BFD_ENDIAN_LITTLE)) { - (*_bfd_error_handler) (_("unknown header byte-order value 0x%lx"), - (unsigned long) header.byteorder); + _bfd_error_handler (_("unknown header byte-order value %#x"), + header.byteorder); goto wrong; } @@ -2845,70 +5303,93 @@ bfd_mach_o_header_p (bfd *abfd, /* Check cputype and filetype. In case of wildcard, do not accept magics that are handled by existing targets. */ - if (cputype) + if (cpu_type) { - if (header.cputype != cputype) - goto wrong; + if (header.cputype != cpu_type) + goto wrong; } else { - switch (header.cputype) - { - case BFD_MACH_O_CPU_TYPE_I386: - /* Handled by mach-o-i386 */ - goto wrong; - default: - break; - } +#ifndef BFD64 + /* Do not recognize 64 architectures if not configured for 64bit targets. + This could happen only for generic targets. */ + if (mach_o_wide_p (&header)) + goto wrong; +#endif } - if (filetype) + + if (file_type) { - if (header.filetype != filetype) - goto wrong; + if (header.filetype != file_type) + goto wrong; } else { switch (header.filetype) - { - case BFD_MACH_O_MH_CORE: - /* Handled by core_p */ - goto wrong; - default: - break; - } - } - - preserve.marker = bfd_zalloc (abfd, sizeof (bfd_mach_o_data_struct)); - if (preserve.marker == NULL - || !bfd_preserve_save (abfd, &preserve)) + { + case BFD_MACH_O_MH_CORE: + /* Handled by core_p */ + goto wrong; + default: + break; + } + } + + mdata = (bfd_mach_o_data_struct *) bfd_zalloc (abfd, sizeof (*mdata)); + if (mdata == NULL) goto fail; + mdata->hdr_offset = hdr_off; - if (bfd_mach_o_scan (abfd, &header, - (bfd_mach_o_data_struct *) preserve.marker) != 0) + if (!bfd_mach_o_scan (abfd, &header, mdata)) goto wrong; - bfd_preserve_finish (abfd, &preserve); return abfd->xvec; wrong: bfd_set_error (bfd_error_wrong_format); fail: - if (preserve.marker != NULL) - bfd_preserve_restore (abfd, &preserve); return NULL; } static const bfd_target * bfd_mach_o_gen_object_p (bfd *abfd) { - return bfd_mach_o_header_p (abfd, 0, 0); + return bfd_mach_o_header_p (abfd, 0, 0, 0); } static const bfd_target * bfd_mach_o_gen_core_p (bfd *abfd) { - return bfd_mach_o_header_p (abfd, BFD_MACH_O_MH_CORE, 0); + return bfd_mach_o_header_p (abfd, 0, BFD_MACH_O_MH_CORE, 0); +} + +/* Return the base address of ABFD, ie the address at which the image is + mapped. The possible initial pagezero is ignored. */ + +bfd_vma +bfd_mach_o_get_base_address (bfd *abfd) +{ + bfd_mach_o_data_struct *mdata; + bfd_mach_o_load_command *cmd; + + /* Check for Mach-O. */ + if (!bfd_mach_o_valid (abfd)) + return 0; + mdata = bfd_mach_o_get_data (abfd); + + for (cmd = mdata->first_command; cmd != NULL; cmd = cmd->next) + { + if ((cmd->type == BFD_MACH_O_LC_SEGMENT + || cmd->type == BFD_MACH_O_LC_SEGMENT_64)) + { + struct bfd_mach_o_segment_command *segcmd = &cmd->command.segment; + + if (segcmd->initprot != 0) + return segcmd->vmaddr; + } + } + return 0; } typedef struct mach_o_fat_archentry @@ -2928,22 +5409,22 @@ typedef struct mach_o_fat_data_struct } mach_o_fat_data_struct; const bfd_target * -bfd_mach_o_archive_p (bfd *abfd) +bfd_mach_o_fat_archive_p (bfd *abfd) { mach_o_fat_data_struct *adata = NULL; - unsigned char buf[20]; + struct mach_o_fat_header_external hdr; unsigned long i; if (bfd_seek (abfd, 0, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 8, abfd) != 8) + || bfd_bread (&hdr, sizeof (hdr), abfd) != sizeof (hdr)) goto error; adata = bfd_alloc (abfd, sizeof (mach_o_fat_data_struct)); if (adata == NULL) goto error; - adata->magic = bfd_getb32 (buf); - adata->nfat_arch = bfd_getb32 (buf + 4); + adata->magic = bfd_getb32 (hdr.magic); + adata->nfat_arch = bfd_getb32 (hdr.nfat_arch); if (adata->magic != 0xcafebabe) goto error; /* Avoid matching Java bytecode files, which have the same magic number. @@ -2953,23 +5434,24 @@ bfd_mach_o_archive_p (bfd *abfd) goto error; adata->archentries = - bfd_alloc (abfd, adata->nfat_arch * sizeof (mach_o_fat_archentry)); + bfd_alloc2 (abfd, adata->nfat_arch, sizeof (mach_o_fat_archentry)); if (adata->archentries == NULL) goto error; for (i = 0; i < adata->nfat_arch; i++) { - if (bfd_seek (abfd, 8 + 20 * i, SEEK_SET) != 0 - || bfd_bread ((void *) buf, 20, abfd) != 20) + struct mach_o_fat_arch_external arch; + if (bfd_bread (&arch, sizeof (arch), abfd) != sizeof (arch)) goto error; - adata->archentries[i].cputype = bfd_getb32 (buf); - adata->archentries[i].cpusubtype = bfd_getb32 (buf + 4); - adata->archentries[i].offset = bfd_getb32 (buf + 8); - adata->archentries[i].size = bfd_getb32 (buf + 12); - adata->archentries[i].align = bfd_getb32 (buf + 16); + adata->archentries[i].cputype = bfd_getb32 (arch.cputype); + adata->archentries[i].cpusubtype = bfd_getb32 (arch.cpusubtype); + adata->archentries[i].offset = bfd_getb32 (arch.offset); + adata->archentries[i].size = bfd_getb32 (arch.size); + adata->archentries[i].align = bfd_getb32 (arch.align); } abfd->tdata.mach_o_fat_data = adata; + return abfd->xvec; error: @@ -2979,8 +5461,52 @@ bfd_mach_o_archive_p (bfd *abfd) return NULL; } +/* Set the filename for a fat binary member ABFD, whose bfd architecture is + ARCH_TYPE/ARCH_SUBTYPE and corresponding entry in header is ENTRY. + Set arelt_data and origin fields too. */ + +static bfd_boolean +bfd_mach_o_fat_member_init (bfd *abfd, + enum bfd_architecture arch_type, + unsigned long arch_subtype, + mach_o_fat_archentry *entry) +{ + struct areltdata *areltdata; + /* Create the member filename. Use ARCH_NAME. */ + const bfd_arch_info_type *ap = bfd_lookup_arch (arch_type, arch_subtype); + char *filename; + + if (ap) + { + /* Use the architecture name if known. */ + filename = bfd_strdup (ap->printable_name); + if (filename == NULL) + return FALSE; + } + else + { + /* Forge a uniq id. */ + const size_t namelen = 2 + 8 + 1 + 2 + 8 + 1; + filename = bfd_malloc (namelen); + if (filename == NULL) + return FALSE; + snprintf (filename, namelen, "0x%lx-0x%lx", + entry->cputype, entry->cpusubtype); + } + bfd_set_filename (abfd, filename); + + areltdata = bfd_zmalloc (sizeof (struct areltdata)); + if (areltdata == NULL) + return FALSE; + areltdata->parsed_size = entry->size; + abfd->arelt_data = areltdata; + abfd->iostream = NULL; + abfd->origin = entry->offset; + return TRUE; +} + bfd * -bfd_mach_o_openr_next_archived_file (bfd *archive, bfd *prev) +bfd_mach_o_fat_openr_next_archived_file (bfd *archive, bfd *prev) { mach_o_fat_data_struct *adata; mach_o_fat_archentry *entry = NULL; @@ -2994,9 +5520,13 @@ bfd_mach_o_openr_next_archived_file (bfd *archive, bfd *prev) /* Find index of previous entry. */ if (prev == NULL) - i = 0; /* Start at first one. */ + { + /* Start at first one. */ + i = 0; + } else { + /* Find index of PREV. */ for (i = 0; i < adata->nfat_arch; i++) { if (adata->archentries[i].offset == prev->origin) @@ -3009,8 +5539,10 @@ bfd_mach_o_openr_next_archived_file (bfd *archive, bfd *prev) bfd_set_error (bfd_error_bad_value); return NULL; } - i++; /* Get next entry. */ - } + + /* Get next entry. */ + i++; + } if (i >= adata->nfat_arch) { @@ -3023,37 +5555,46 @@ bfd_mach_o_openr_next_archived_file (bfd *archive, bfd *prev) if (nbfd == NULL) return NULL; - nbfd->origin = entry->offset; - bfd_mach_o_convert_architecture (entry->cputype, entry->cpusubtype, &arch_type, &arch_subtype); - /* Create the member filename. - Use FILENAME:ARCH_NAME. */ - { - char *s = NULL; - const char *arch_name; - size_t arch_file_len = strlen (bfd_get_filename (archive)); - arch_name = bfd_printable_arch_mach (arch_type, arch_subtype); - s = bfd_malloc (arch_file_len + 1 + strlen (arch_name) + 1); - if (s == NULL) + if (!bfd_mach_o_fat_member_init (nbfd, arch_type, arch_subtype, entry)) + { + bfd_close (nbfd); return NULL; - memcpy (s, bfd_get_filename (archive), arch_file_len); - s[arch_file_len] = ':'; - strcpy (s + arch_file_len + 1, arch_name); - nbfd->filename = s; - } - nbfd->iostream = NULL; + } + bfd_set_arch_mach (nbfd, arch_type, arch_subtype); return nbfd; } +/* Analogous to stat call. */ + +static int +bfd_mach_o_fat_stat_arch_elt (bfd *abfd, struct stat *buf) +{ + if (abfd->arelt_data == NULL) + { + bfd_set_error (bfd_error_invalid_operation); + return -1; + } + + buf->st_mtime = 0; + buf->st_uid = 0; + buf->st_gid = 0; + buf->st_mode = 0644; + buf->st_size = arelt_size (abfd); + + return 0; +} + /* If ABFD format is FORMAT and architecture is ARCH, return it. If ABFD is a fat image containing a member that corresponds to FORMAT and ARCH, returns it. In other case, returns NULL. This function allows transparent uses of fat images. */ + bfd * bfd_mach_o_fat_extract (bfd *abfd, bfd_format format, @@ -3091,70 +5632,26 @@ bfd_mach_o_fat_extract (bfd *abfd, /* The architecture is found. */ res = _bfd_new_bfd_contained_in (abfd); if (res == NULL) - return NULL; - - res->origin = e->offset; - - res->filename = strdup (abfd->filename); - res->iostream = NULL; - - if (bfd_check_format (res, format)) - { - BFD_ASSERT (bfd_get_arch_info (res) == arch); - return res; - } - bfd_close (res); - return NULL; - } - - return NULL; -} - -int -bfd_mach_o_lookup_section (bfd *abfd, - asection *section, - bfd_mach_o_load_command **mcommand, - bfd_mach_o_section **msection) -{ - struct mach_o_data_struct *md = bfd_mach_o_get_data (abfd); - unsigned int i, j, num; - - bfd_mach_o_load_command *ncmd = NULL; - bfd_mach_o_section *nsect = NULL; - - BFD_ASSERT (mcommand != NULL); - BFD_ASSERT (msection != NULL); - - num = 0; - for (i = 0; i < md->header.ncmds; i++) - { - struct bfd_mach_o_load_command *cmd = &md->commands[i]; - struct bfd_mach_o_segment_command *seg = NULL; - - if (cmd->type != BFD_MACH_O_LC_SEGMENT - || cmd->type != BFD_MACH_O_LC_SEGMENT_64) - continue; - seg = &cmd->command.segment; + return NULL; - for (j = 0; j < seg->nsects; j++) + if (bfd_mach_o_fat_member_init (res, cpu_type, cpu_subtype, e) + && bfd_check_format (res, format)) { - struct bfd_mach_o_section *sect = &seg->sections[j]; - - if (sect->bfdsection == section) - { - if (num == 0) - { - nsect = sect; - ncmd = cmd; - } - num++; - } + BFD_ASSERT (bfd_get_arch_info (res) == arch); + return res; } + bfd_close (res); + return NULL; } - *mcommand = ncmd; - *msection = nsect; - return num; + return NULL; +} + +static bfd_boolean +bfd_mach_o_fat_close_and_cleanup (bfd *abfd) +{ + _bfd_unlink_from_archive_parent (abfd); + return TRUE; } int @@ -3162,27 +5659,24 @@ bfd_mach_o_lookup_command (bfd *abfd, bfd_mach_o_load_command_type type, bfd_mach_o_load_command **mcommand) { - struct mach_o_data_struct *md = bfd_mach_o_get_data (abfd); - bfd_mach_o_load_command *ncmd = NULL; - unsigned int i, num; + struct mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + struct bfd_mach_o_load_command *cmd; + unsigned int num; - BFD_ASSERT (md != NULL); + BFD_ASSERT (mdata != NULL); BFD_ASSERT (mcommand != NULL); num = 0; - for (i = 0; i < md->header.ncmds; i++) + for (cmd = mdata->first_command; cmd != NULL; cmd = cmd->next) { - struct bfd_mach_o_load_command *cmd = &md->commands[i]; - if (cmd->type != type) continue; if (num == 0) - ncmd = cmd; + *mcommand = cmd; num++; } - *mcommand = ncmd; return num; } @@ -3193,16 +5687,12 @@ bfd_mach_o_stack_addr (enum bfd_mach_o_cpu_type type) { case BFD_MACH_O_CPU_TYPE_MC680x0: return 0x04000000; - case BFD_MACH_O_CPU_TYPE_MC88000: - return 0xffffe000; case BFD_MACH_O_CPU_TYPE_POWERPC: return 0xc0000000; case BFD_MACH_O_CPU_TYPE_I386: return 0xc0000000; case BFD_MACH_O_CPU_TYPE_SPARC: return 0xf0000000; - case BFD_MACH_O_CPU_TYPE_I860: - return 0; case BFD_MACH_O_CPU_TYPE_HPPA: return 0xc0000000 - 0x04000000; default: @@ -3210,676 +5700,80 @@ 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 (const bfd_mach_o_xlat_name *table, unsigned long val) -{ - for (; table->name; table++) - if (table->val == val) - return table->name; - return "*UNKNOWN*"; -} - -static 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 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 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} -}; +/* The following two tables should be kept, as far as possible, in order of + most frequently used entries to optimize their use from gas. */ -static 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}, + { "coalesced", BFD_MACH_O_S_COALESCED}, { "zerofill", BFD_MACH_O_S_ZEROFILL}, { "cstring_literals", BFD_MACH_O_S_CSTRING_LITERALS}, { "4byte_literals", BFD_MACH_O_S_4BYTE_LITERALS}, { "8byte_literals", BFD_MACH_O_S_8BYTE_LITERALS}, + { "16byte_literals", BFD_MACH_O_S_16BYTE_LITERALS}, { "literal_pointers", BFD_MACH_O_S_LITERAL_POINTERS}, - { "non_lazy_symbol_pointers", BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS}, - { "lazy_symbol_pointers", BFD_MACH_O_S_LAZY_SYMBOL_POINTERS}, - { "symbol_stubs", BFD_MACH_O_S_SYMBOL_STUBS}, { "mod_init_func_pointers", BFD_MACH_O_S_MOD_INIT_FUNC_POINTERS}, { "mod_fini_func_pointers", BFD_MACH_O_S_MOD_FINI_FUNC_POINTERS}, - { "coalesced", BFD_MACH_O_S_COALESCED}, { "gb_zerofill", BFD_MACH_O_S_GB_ZEROFILL}, { "interposing", BFD_MACH_O_S_INTERPOSING}, - { "16byte_literals", BFD_MACH_O_S_16BYTE_LITERALS}, { "dtrace_dof", BFD_MACH_O_S_DTRACE_DOF}, + { "non_lazy_symbol_pointers", BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS}, + { "lazy_symbol_pointers", BFD_MACH_O_S_LAZY_SYMBOL_POINTERS}, + { "symbol_stubs", BFD_MACH_O_S_SYMBOL_STUBS}, { "lazy_dylib_symbol_pointers", BFD_MACH_O_S_LAZY_DYLIB_SYMBOL_POINTERS}, { NULL, 0} }; -static bfd_mach_o_xlat_name bfd_mach_o_section_attribute_name[] = +const bfd_mach_o_xlat_name bfd_mach_o_section_attribute_name[] = { + { "pure_instructions", BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS }, + { "some_instructions", BFD_MACH_O_S_ATTR_SOME_INSTRUCTIONS }, { "loc_reloc", BFD_MACH_O_S_ATTR_LOC_RELOC }, { "ext_reloc", BFD_MACH_O_S_ATTR_EXT_RELOC }, - { "some_instructions", BFD_MACH_O_S_ATTR_SOME_INSTRUCTIONS }, { "debug", BFD_MACH_O_S_ATTR_DEBUG }, - { "modifying_code", BFD_MACH_O_S_SELF_MODIFYING_CODE }, { "live_support", BFD_MACH_O_S_ATTR_LIVE_SUPPORT }, { "no_dead_strip", BFD_MACH_O_S_ATTR_NO_DEAD_STRIP }, { "strip_static_syms", BFD_MACH_O_S_ATTR_STRIP_STATIC_SYMS }, { "no_toc", BFD_MACH_O_S_ATTR_NO_TOC }, - { "pure_instructions", BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS }, - { NULL, 0} -}; - -static 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}, + { "self_modifying_code", BFD_MACH_O_S_SELF_MODIFYING_CODE }, + { "modifying_code", BFD_MACH_O_S_SELF_MODIFYING_CODE }, { NULL, 0} }; -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, j; - 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; - - 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 (j = 0; j < seg->nsects; j++) - { - bfd_mach_o_section *sec = &seg->sections[j]; - 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; - unsigned int i; +/* Get the section type from NAME. Return 256 if NAME is unknown. */ - 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 (i = 0; i < seg->nsects; i++) - bfd_mach_o_print_section (abfd, &seg->sections[i], file); -} - -static void -bfd_mach_o_print_dysymtab (bfd *abfd ATTRIBUTE_UNUSED, - bfd_mach_o_load_command *cmd, FILE *file) +unsigned int +bfd_mach_o_get_section_type_from_name (bfd *abfd, const char *name) { - 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"); - } - } + const bfd_mach_o_xlat_name *x; + bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd); + for (x = bfd_mach_o_section_type_name; x->name; x++) + if (strcmp (x->name, name) == 0) + { + /* We found it... does the target support it? */ + if (bed->bfd_mach_o_section_type_valid_for_target == NULL + || bed->bfd_mach_o_section_type_valid_for_target (x->val)) + return x->val; /* OK. */ + else + break; /* Not supported. */ + } + /* Maximum section ID = 0xff. */ + return 256; } -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); -} +/* Get the section attribute from NAME. Return -1 if NAME is unknown. */ -bfd_boolean -bfd_mach_o_bfd_print_private_bfd_data (bfd *abfd, void * ptr) +unsigned int +bfd_mach_o_get_section_attribute_from_name (const char *name) { - 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]; - - fprintf (file, "Load command %s:", - bfd_mach_o_get_name (bfd_mach_o_load_command_name, cmd->type)); - 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_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: - { - 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; - default: - fprintf (file, "\n"); - break; - } - fputc ('\n', file); - } - - bfd_mach_o_print_section_map (abfd, file); + const bfd_mach_o_xlat_name *x; - return TRUE; + for (x = bfd_mach_o_section_attribute_name; x->name; x++) + if (strcmp (x->name, name) == 0) + return x->val; + return (unsigned int)-1; } int @@ -3889,17 +5783,16 @@ bfd_mach_o_core_fetch_environment (bfd *abfd, { bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); unsigned long stackaddr = bfd_mach_o_stack_addr (mdata->header.cputype); - unsigned int i = 0; + bfd_mach_o_load_command *cmd; - for (i = 0; i < mdata->header.ncmds; i++) + for (cmd = mdata->first_command; cmd != NULL; cmd = cmd->next) { - bfd_mach_o_load_command *cur = &mdata->commands[i]; - bfd_mach_o_segment_command *seg = NULL; + bfd_mach_o_segment_command *seg; - if (cur->type != BFD_MACH_O_LC_SEGMENT) + if (cmd->type != BFD_MACH_O_LC_SEGMENT) continue; - seg = &cur->command.segment; + seg = &cmd->command.segment; if ((seg->vmaddr + seg->vmsize) == stackaddr) { @@ -3908,6 +5801,8 @@ bfd_mach_o_core_fetch_environment (bfd *abfd, unsigned char *buf = bfd_malloc (1024); unsigned long size = 1024; + if (buf == NULL) + return -1; for (;;) { bfd_size_type nread = 0; @@ -3922,10 +5817,10 @@ bfd_mach_o_core_fetch_environment (bfd *abfd, return -1; if (bfd_seek (abfd, end - size, SEEK_SET) != 0) - { - free (buf); - return -1; - } + { + free (buf); + return -1; + } nread = bfd_bread (buf, size, abfd); @@ -3953,6 +5848,8 @@ bfd_mach_o_core_fetch_environment (bfd *abfd, bottom = seg->fileoff + seg->filesize - offset; top = seg->fileoff + seg->filesize - 4; *rbuf = bfd_malloc (top - bottom); + if (*rbuf == NULL) + return -1; *rlen = top - bottom; memcpy (*rbuf, buf + size - *rlen, *rlen); @@ -3979,7 +5876,7 @@ bfd_mach_o_core_file_failing_command (bfd *abfd) { unsigned char *buf = NULL; unsigned int len = 0; - int ret = -1; + int ret; ret = bfd_mach_o_core_fetch_environment (abfd, &buf, &len); if (ret < 0) @@ -3994,65 +5891,291 @@ bfd_mach_o_core_file_failing_signal (bfd *abfd ATTRIBUTE_UNUSED) return 0; } -#define bfd_mach_o_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup +static bfd_mach_o_uuid_command * +bfd_mach_o_lookup_uuid_command (bfd *abfd) +{ + bfd_mach_o_load_command *uuid_cmd = NULL; + int ncmd = bfd_mach_o_lookup_command (abfd, BFD_MACH_O_LC_UUID, &uuid_cmd); + if (ncmd != 1 || uuid_cmd == NULL) + return FALSE; + return &uuid_cmd->command.uuid; +} + +/* Return true if ABFD is a dSYM file and its UUID matches UUID_CMD. */ + +static bfd_boolean +bfd_mach_o_dsym_for_uuid_p (bfd *abfd, const bfd_mach_o_uuid_command *uuid_cmd) +{ + bfd_mach_o_uuid_command *dsym_uuid_cmd; + + BFD_ASSERT (abfd); + BFD_ASSERT (uuid_cmd); + + if (!bfd_check_format (abfd, bfd_object)) + return FALSE; + + if (bfd_get_flavour (abfd) != bfd_target_mach_o_flavour + || bfd_mach_o_get_data (abfd) == NULL + || bfd_mach_o_get_data (abfd)->header.filetype != BFD_MACH_O_MH_DSYM) + return FALSE; + + dsym_uuid_cmd = bfd_mach_o_lookup_uuid_command (abfd); + if (dsym_uuid_cmd == NULL) + return FALSE; + + if (memcmp (uuid_cmd->uuid, dsym_uuid_cmd->uuid, + sizeof (uuid_cmd->uuid)) != 0) + return FALSE; + + return TRUE; +} + +/* Find a BFD in DSYM_FILENAME which matches ARCH and UUID_CMD. + The caller is responsible for closing the returned BFD object and + its my_archive if the returned BFD is in a fat dSYM. */ + +static bfd * +bfd_mach_o_find_dsym (const char *dsym_filename, + const bfd_mach_o_uuid_command *uuid_cmd, + const bfd_arch_info_type *arch) +{ + bfd *base_dsym_bfd, *dsym_bfd; + + BFD_ASSERT (uuid_cmd); + + base_dsym_bfd = bfd_openr (dsym_filename, NULL); + if (base_dsym_bfd == NULL) + return NULL; + + dsym_bfd = bfd_mach_o_fat_extract (base_dsym_bfd, bfd_object, arch); + if (bfd_mach_o_dsym_for_uuid_p (dsym_bfd, uuid_cmd)) + return dsym_bfd; + + bfd_close (dsym_bfd); + if (base_dsym_bfd != dsym_bfd) + bfd_close (base_dsym_bfd); + + return NULL; +} + +/* Return a BFD created from a dSYM file for ABFD. + The caller is responsible for closing the returned BFD object, its + filename, and its my_archive if the returned BFD is in a fat dSYM. */ + +static bfd * +bfd_mach_o_follow_dsym (bfd *abfd) +{ + char *dsym_filename; + bfd_mach_o_uuid_command *uuid_cmd; + bfd *dsym_bfd, *base_bfd = abfd; + const char *base_basename; + + if (abfd == NULL || bfd_get_flavour (abfd) != bfd_target_mach_o_flavour) + return NULL; + + if (abfd->my_archive && !bfd_is_thin_archive (abfd->my_archive)) + base_bfd = abfd->my_archive; + /* BFD may have been opened from a stream. */ + if (base_bfd->filename == NULL) + { + bfd_set_error (bfd_error_invalid_operation); + return NULL; + } + base_basename = lbasename (base_bfd->filename); + + uuid_cmd = bfd_mach_o_lookup_uuid_command (abfd); + if (uuid_cmd == NULL) + return NULL; + + /* TODO: We assume the DWARF file has the same as the binary's. + It seems apple's GDB checks all files in the dSYM bundle directory. + http://opensource.apple.com/source/gdb/gdb-1708/src/gdb/macosx/macosx-tdep.c + */ + dsym_filename = (char *)bfd_malloc (strlen (base_bfd->filename) + + strlen (dsym_subdir) + 1 + + strlen (base_basename) + 1); + if (dsym_filename == NULL) + return NULL; + + sprintf (dsym_filename, "%s%s/%s", + base_bfd->filename, dsym_subdir, base_basename); + + dsym_bfd = bfd_mach_o_find_dsym (dsym_filename, uuid_cmd, + bfd_get_arch_info (abfd)); + if (dsym_bfd == NULL) + free (dsym_filename); + + return dsym_bfd; +} + +bfd_boolean +bfd_mach_o_find_nearest_line (bfd *abfd, + asymbol **symbols, + asection *section, + bfd_vma offset, + const char **filename_ptr, + const char **functionname_ptr, + unsigned int *line_ptr, + unsigned int *discriminator_ptr) +{ + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + if (mdata == NULL) + return FALSE; + switch (mdata->header.filetype) + { + case BFD_MACH_O_MH_OBJECT: + break; + case BFD_MACH_O_MH_EXECUTE: + case BFD_MACH_O_MH_DYLIB: + case BFD_MACH_O_MH_BUNDLE: + case BFD_MACH_O_MH_KEXT_BUNDLE: + if (mdata->dwarf2_find_line_info == NULL) + { + mdata->dsym_bfd = bfd_mach_o_follow_dsym (abfd); + /* When we couldn't find dSYM for this binary, we look for + the debug information in the binary itself. In this way, + we won't try finding separated dSYM again because + mdata->dwarf2_find_line_info will be filled. */ + if (! mdata->dsym_bfd) + break; + if (! _bfd_dwarf2_slurp_debug_info (abfd, mdata->dsym_bfd, + dwarf_debug_sections, symbols, + &mdata->dwarf2_find_line_info, + FALSE)) + return FALSE; + } + break; + default: + return FALSE; + } + return _bfd_dwarf2_find_nearest_line (abfd, symbols, NULL, section, offset, + filename_ptr, functionname_ptr, + line_ptr, discriminator_ptr, + dwarf_debug_sections, + &mdata->dwarf2_find_line_info); +} + +bfd_boolean +bfd_mach_o_close_and_cleanup (bfd *abfd) +{ + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + if (bfd_get_format (abfd) == bfd_object && mdata != NULL) + { + _bfd_dwarf2_cleanup_debug_info (abfd, &mdata->dwarf2_find_line_info); + bfd_mach_o_free_cached_info (abfd); + if (mdata->dsym_bfd != NULL) + { + bfd *fat_bfd = mdata->dsym_bfd->my_archive; +#if 0 + /* FIXME: PR 19435: This calculation to find the memory allocated by + bfd_mach_o_follow_dsym for the filename does not always end up + selecting the correct pointer. Unfortunately this problem is + very hard to reproduce on a non Mach-O native system, so until it + can be traced and fixed on such a system, this code will remain + commented out. This does mean that there will be a memory leak, + but it is small, and happens when we are closing down, so it + should not matter too much. */ + char *dsym_filename = (char *)(fat_bfd + ? fat_bfd->filename + : mdata->dsym_bfd->filename); +#endif + bfd_close (mdata->dsym_bfd); + mdata->dsym_bfd = NULL; + if (fat_bfd) + bfd_close (fat_bfd); +#if 0 + free (dsym_filename); +#endif + } + } + + return _bfd_generic_close_and_cleanup (abfd); +} + +bfd_boolean +bfd_mach_o_free_cached_info (bfd *abfd) +{ + bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd); + asection *asect; + free (mdata->dyn_reloc_cache); + mdata->dyn_reloc_cache = NULL; + for (asect = abfd->sections; asect != NULL; asect = asect->next) + { + free (asect->relocation); + asect->relocation = NULL; + } + + return TRUE; +} + +#define bfd_mach_o_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup #define bfd_mach_o_bfd_reloc_name_lookup _bfd_norelocs_bfd_reloc_name_lookup -#define bfd_mach_o_swap_reloc_in NULL +#define bfd_mach_o_canonicalize_one_reloc NULL #define bfd_mach_o_swap_reloc_out NULL #define bfd_mach_o_print_thread NULL +#define bfd_mach_o_tgt_seg_table NULL +#define bfd_mach_o_section_type_valid_for_tgt NULL -#define TARGET_NAME mach_o_be_vec -#define TARGET_STRING "mach-o-be" +#define TARGET_NAME mach_o_be_vec +#define TARGET_STRING "mach-o-be" #define TARGET_ARCHITECTURE bfd_arch_unknown -#define TARGET_BIG_ENDIAN 1 -#define TARGET_ARCHIVE 0 +#define TARGET_PAGESIZE 1 +#define TARGET_BIG_ENDIAN 1 +#define TARGET_ARCHIVE 0 +#define TARGET_PRIORITY 1 #include "mach-o-target.c" #undef TARGET_NAME #undef TARGET_STRING #undef TARGET_ARCHITECTURE +#undef TARGET_PAGESIZE #undef TARGET_BIG_ENDIAN #undef TARGET_ARCHIVE +#undef TARGET_PRIORITY -#define TARGET_NAME mach_o_le_vec -#define TARGET_STRING "mach-o-le" +#define TARGET_NAME mach_o_le_vec +#define TARGET_STRING "mach-o-le" #define TARGET_ARCHITECTURE bfd_arch_unknown -#define TARGET_BIG_ENDIAN 0 -#define TARGET_ARCHIVE 0 +#define TARGET_PAGESIZE 1 +#define TARGET_BIG_ENDIAN 0 +#define TARGET_ARCHIVE 0 +#define TARGET_PRIORITY 1 #include "mach-o-target.c" #undef TARGET_NAME #undef TARGET_STRING #undef TARGET_ARCHITECTURE +#undef TARGET_PAGESIZE #undef TARGET_BIG_ENDIAN #undef TARGET_ARCHIVE +#undef TARGET_PRIORITY /* Not yet handled: creating an archive. */ -#define bfd_mach_o_mkarchive _bfd_noarchive_mkarchive +#define bfd_mach_o_mkarchive _bfd_noarchive_mkarchive + +#define bfd_mach_o_close_and_cleanup bfd_mach_o_fat_close_and_cleanup /* Not used. */ -#define bfd_mach_o_read_ar_hdr _bfd_noarchive_read_ar_hdr -#define bfd_mach_o_write_ar_hdr _bfd_noarchive_write_ar_hdr -#define bfd_mach_o_slurp_armap _bfd_noarchive_slurp_armap -#define bfd_mach_o_slurp_extended_name_table _bfd_noarchive_slurp_extended_name_table -#define bfd_mach_o_construct_extended_name_table _bfd_noarchive_construct_extended_name_table -#define bfd_mach_o_truncate_arname _bfd_noarchive_truncate_arname -#define bfd_mach_o_write_armap _bfd_noarchive_write_armap -#define bfd_mach_o_get_elt_at_index _bfd_noarchive_get_elt_at_index -#define bfd_mach_o_generic_stat_arch_elt _bfd_noarchive_generic_stat_arch_elt -#define bfd_mach_o_update_armap_timestamp _bfd_noarchive_update_armap_timestamp - -#define TARGET_NAME mach_o_fat_vec -#define TARGET_STRING "mach-o-fat" +#define bfd_mach_o_generic_stat_arch_elt bfd_mach_o_fat_stat_arch_elt +#define bfd_mach_o_openr_next_archived_file bfd_mach_o_fat_openr_next_archived_file +#define bfd_mach_o_archive_p bfd_mach_o_fat_archive_p + +#define TARGET_NAME mach_o_fat_vec +#define TARGET_STRING "mach-o-fat" #define TARGET_ARCHITECTURE bfd_arch_unknown -#define TARGET_BIG_ENDIAN 1 -#define TARGET_ARCHIVE 1 +#define TARGET_PAGESIZE 1 +#define TARGET_BIG_ENDIAN 1 +#define TARGET_ARCHIVE 1 +#define TARGET_PRIORITY 0 #include "mach-o-target.c" #undef TARGET_NAME #undef TARGET_STRING #undef TARGET_ARCHITECTURE +#undef TARGET_PAGESIZE #undef TARGET_BIG_ENDIAN #undef TARGET_ARCHIVE +#undef TARGET_PRIORITY