X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fmach-o-i386.c;h=55f0c04bc3f05a415592834ea6839bf844f22666;hb=22347e554cd7ba2a0bf36dc81ebfcbe2e2fd74af;hp=3dadcb82789b29ef2514b54c9cabd8f1ebd5d584;hpb=b93a1992f4b3668cae4682e16a8add34f8411a8c;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/mach-o-i386.c b/bfd/mach-o-i386.c index 3dadcb8278..55f0c04bc3 100644 --- a/bfd/mach-o-i386.c +++ b/bfd/mach-o-i386.c @@ -1,6 +1,5 @@ /* Intel i386 Mach-O support for BFD. - Copyright 2009 - Free Software Foundation, Inc. + Copyright (C) 2009-2016 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -33,13 +32,13 @@ static const bfd_target * bfd_mach_o_i386_object_p (bfd *abfd) { - return bfd_mach_o_header_p (abfd, 0, BFD_MACH_O_CPU_TYPE_I386); + return bfd_mach_o_header_p (abfd, 0, 0, BFD_MACH_O_CPU_TYPE_I386); } static const bfd_target * bfd_mach_o_i386_core_p (bfd *abfd) { - return bfd_mach_o_header_p (abfd, + return bfd_mach_o_header_p (abfd, 0, BFD_MACH_O_MH_CORE, BFD_MACH_O_CPU_TYPE_I386); } @@ -63,6 +62,7 @@ bfd_mach_o_i386_mkobject (bfd *abfd) static reloc_howto_type i386_howto_table[]= { + /* 0 */ HOWTO(BFD_RELOC_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, NULL, "32", @@ -79,6 +79,7 @@ static reloc_howto_type i386_howto_table[]= complain_overflow_bitfield, NULL, "DISP32", FALSE, 0xffffffff, 0xffffffff, TRUE), + /* 4 */ HOWTO(BFD_RELOC_16_PCREL, 0, 1, 16, TRUE, 0, complain_overflow_bitfield, NULL, "DISP16", @@ -87,41 +88,91 @@ static reloc_howto_type i386_howto_table[]= complain_overflow_bitfield, NULL, "SECTDIFF_32", FALSE, 0xffffffff, 0xffffffff, FALSE), + HOWTO(BFD_RELOC_MACH_O_LOCAL_SECTDIFF, 0, 2, 32, FALSE, 0, + complain_overflow_bitfield, + NULL, "LSECTDIFF_32", + FALSE, 0xffffffff, 0xffffffff, FALSE), HOWTO(BFD_RELOC_MACH_O_PAIR, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, NULL, "PAIR_32", FALSE, 0xffffffff, 0xffffffff, FALSE), + /* 8 */ + HOWTO(BFD_RELOC_MACH_O_SECTDIFF, 0, 1, 16, FALSE, 0, + complain_overflow_bitfield, + NULL, "SECTDIFF_16", + FALSE, 0xffff, 0xffff, FALSE), + HOWTO(BFD_RELOC_MACH_O_LOCAL_SECTDIFF, 0, 1, 16, FALSE, 0, + complain_overflow_bitfield, + NULL, "LSECTDIFF_16", + FALSE, 0xffff, 0xffff, FALSE), + HOWTO(BFD_RELOC_MACH_O_PAIR, 0, 1, 16, FALSE, 0, + complain_overflow_bitfield, + NULL, "PAIR_16", + FALSE, 0xffff, 0xffff, FALSE), }; static bfd_boolean -bfd_mach_o_i386_swap_reloc_in (arelent *res, bfd_mach_o_reloc_info *reloc) +bfd_mach_o_i386_canonicalize_one_reloc (bfd *abfd, + struct mach_o_reloc_info_external *raw, + arelent *res, asymbol **syms) { - if (reloc->r_scattered) + bfd_mach_o_reloc_info reloc; + + if (!bfd_mach_o_pre_canonicalize_one_reloc (abfd, raw, &reloc, res, syms)) + return FALSE; + + if (reloc.r_scattered) { - switch (reloc->r_type) + switch (reloc.r_type) { case BFD_MACH_O_GENERIC_RELOC_PAIR: - if (reloc->r_length != 2) - return FALSE; - res->howto = &i386_howto_table[6]; - res->address = res[-1].address; - return TRUE; + if (reloc.r_length == 2) + { + res->howto = &i386_howto_table[7]; + res->address = res[-1].address; + return TRUE; + } + else if (reloc.r_length == 1) + { + res->howto = &i386_howto_table[10]; + res->address = res[-1].address; + return TRUE; + } + return FALSE; case BFD_MACH_O_GENERIC_RELOC_SECTDIFF: + if (reloc.r_length == 2) + { + res->howto = &i386_howto_table[5]; + return TRUE; + } + else if (reloc.r_length == 1) + { + res->howto = &i386_howto_table[8]; + return TRUE; + } + return FALSE; case BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF: - if (reloc->r_length != 2) - return FALSE; - res->howto = &i386_howto_table[5]; - return TRUE; + if (reloc.r_length == 2) + { + res->howto = &i386_howto_table[6]; + return TRUE; + } + else if (reloc.r_length == 1) + { + res->howto = &i386_howto_table[9]; + return TRUE; + } + return FALSE; default: return FALSE; } } else { - switch (reloc->r_type) + switch (reloc.r_type) { case BFD_MACH_O_GENERIC_RELOC_VANILLA: - switch ((reloc->r_length << 1) | reloc->r_pcrel) + switch ((reloc.r_length << 1) | reloc.r_pcrel) { case 0: /* len = 0, pcrel = 0 */ res->howto = &i386_howto_table[2]; @@ -166,7 +217,8 @@ bfd_mach_o_i386_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo) if ((*rel->sym_ptr_ptr)->flags & BSF_SECTION_SYM) { rinfo->r_extern = 0; - rinfo->r_value = (*rel->sym_ptr_ptr)->section->target_index; + rinfo->r_value = + (*rel->sym_ptr_ptr)->section->output_section->target_index; } else { @@ -178,20 +230,26 @@ bfd_mach_o_i386_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo) rinfo->r_scattered = 1; rinfo->r_type = BFD_MACH_O_GENERIC_RELOC_SECTDIFF; rinfo->r_pcrel = 0; - rinfo->r_length = 2; + rinfo->r_length = rel->howto->size; + rinfo->r_extern = 0; + rinfo->r_value = rel->addend; + break; + case BFD_RELOC_MACH_O_LOCAL_SECTDIFF: + rinfo->r_scattered = 1; + rinfo->r_type = BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF; + rinfo->r_pcrel = 0; + rinfo->r_length = rel->howto->size; rinfo->r_extern = 0; - rinfo->r_value = (*rel->sym_ptr_ptr)->value - + (*rel->sym_ptr_ptr)->section->vma; + rinfo->r_value = rel->addend; break; case BFD_RELOC_MACH_O_PAIR: rinfo->r_address = 0; rinfo->r_scattered = 1; rinfo->r_type = BFD_MACH_O_GENERIC_RELOC_PAIR; rinfo->r_pcrel = 0; - rinfo->r_length = 2; + rinfo->r_length = rel->howto->size; rinfo->r_extern = 0; - rinfo->r_value = (*rel->sym_ptr_ptr)->value - + (*rel->sym_ptr_ptr)->section->vma; + rinfo->r_value = rel->addend; break; default: return FALSE; @@ -283,11 +341,11 @@ bfd_mach_o_i386_print_thread (bfd *abfd, bfd_mach_o_thread_flavour *thread, static const mach_o_section_name_xlat text_section_names_xlat[] = { { ".symbol_stub", "__symbol_stub", - SEC_DATA | SEC_LOAD, BFD_MACH_O_S_SYMBOL_STUBS, + SEC_CODE | SEC_LOAD, BFD_MACH_O_S_SYMBOL_STUBS, BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS, 0}, { ".picsymbol_stub", "__picsymbol_stub", - SEC_DATA | SEC_LOAD, BFD_MACH_O_S_SYMBOL_STUBS, + SEC_CODE | SEC_LOAD, BFD_MACH_O_S_SYMBOL_STUBS, BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS, 0}, { NULL, NULL, 0, 0, 0, 0} @@ -315,8 +373,8 @@ static const mach_o_section_name_xlat data_section_names_xlat[] = static const mach_o_section_name_xlat import_section_names_xlat[] = { { ".picsymbol_stub3", "__jump_table", - SEC_DATA | SEC_LOAD, BFD_MACH_O_S_SYMBOL_STUBS, - BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS + SEC_CODE | SEC_LOAD, BFD_MACH_O_S_SYMBOL_STUBS, + BFD_MACH_O_S_ATTR_PURE_INSTRUCTIONS | BFD_MACH_O_S_SELF_MODIFYING_CODE, 6}, { ".non_lazy_symbol_pointer_x86", "__pointers", @@ -333,18 +391,20 @@ const mach_o_segment_name_xlat mach_o_i386_segsec_names_xlat[] = { NULL, NULL } }; -#define bfd_mach_o_swap_reloc_in bfd_mach_o_i386_swap_reloc_in +#define bfd_mach_o_canonicalize_one_reloc bfd_mach_o_i386_canonicalize_one_reloc #define bfd_mach_o_swap_reloc_out bfd_mach_o_i386_swap_reloc_out #define bfd_mach_o_print_thread bfd_mach_o_i386_print_thread #define bfd_mach_o_tgt_seg_table mach_o_i386_segsec_names_xlat +#define bfd_mach_o_section_type_valid_for_tgt NULL -#define bfd_mach_o_bfd_reloc_type_lookup bfd_mach_o_i386_bfd_reloc_type_lookup +#define bfd_mach_o_bfd_reloc_type_lookup bfd_mach_o_i386_bfd_reloc_type_lookup #define bfd_mach_o_bfd_reloc_name_lookup bfd_mach_o_i386_bfd_reloc_name_lookup -#define TARGET_NAME mach_o_i386_vec +#define TARGET_NAME i386_mach_o_vec #define TARGET_STRING "mach-o-i386" #define TARGET_ARCHITECTURE bfd_arch_i386 +#define TARGET_PAGESIZE 4096 #define TARGET_BIG_ENDIAN 0 #define TARGET_ARCHIVE 0 #define TARGET_PRIORITY 0