X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fmach-o-i386.c;h=75901c65399fb77f9c73f2c03020c5ef5c19ae26;hb=04b865dc2ede2b8ca8c60f0487a179eb97895fee;hp=6b59ed24aa1bcfd0a21fd64b66c62af1addf92e6;hpb=4384b28422294779be111ac24fb34fb6bfe57b32;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/mach-o-i386.c b/bfd/mach-o-i386.c index 6b59ed24aa..75901c6539 100644 --- a/bfd/mach-o-i386.c +++ b/bfd/mach-o-i386.c @@ -1,5 +1,5 @@ /* Intel i386 Mach-O support for BFD. - Copyright (C) 2009-2014 Free Software Foundation, Inc. + Copyright (C) 2009-2019 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -19,10 +19,10 @@ MA 02110-1301, USA. */ #include "sysdep.h" -#include "mach-o.h" #include "bfd.h" #include "libbfd.h" #include "libiberty.h" +#include "mach-o.h" #include "mach-o/reloc.h" #define bfd_mach_o_object_p bfd_mach_o_i386_object_p @@ -32,14 +32,14 @@ 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, - BFD_MACH_O_MH_CORE, BFD_MACH_O_CPU_TYPE_I386); + return bfd_mach_o_header_p (abfd, 0, + BFD_MACH_O_MH_CORE, BFD_MACH_O_CPU_TYPE_I386); } static bfd_boolean @@ -112,84 +112,96 @@ static reloc_howto_type i386_howto_table[]= }; 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, + arelent * res_base) { - 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) - { - case BFD_MACH_O_GENERIC_RELOC_PAIR: - if (reloc->r_length == 2) - { + switch (reloc.r_type) + { + case BFD_MACH_O_GENERIC_RELOC_PAIR: + /* PR 21813: Check for a corrupt PAIR reloc at the start. */ + if (res == res_base) + return FALSE; + if (reloc.r_length == 2) + { res->howto = &i386_howto_table[7]; res->address = res[-1].address; return TRUE; - } - else if (reloc->r_length == 1) + } + 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) - { + 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) - { + } + 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; + case BFD_MACH_O_GENERIC_RELOC_LOCAL_SECTDIFF: + if (reloc.r_length == 2) + { res->howto = &i386_howto_table[6]; return TRUE; - } - else if (reloc->r_length == 1) - { + } + else if (reloc.r_length == 1) + { res->howto = &i386_howto_table[9]; return TRUE; - } - return FALSE; - default: - return FALSE; - } + } + return FALSE; + default: + break; + } } else { - switch (reloc->r_type) - { - case BFD_MACH_O_GENERIC_RELOC_VANILLA: - switch ((reloc->r_length << 1) | reloc->r_pcrel) - { - case 0: /* len = 0, pcrel = 0 */ - res->howto = &i386_howto_table[2]; - return TRUE; - case 2: /* len = 1, pcrel = 0 */ - res->howto = &i386_howto_table[1]; - return TRUE; - case 3: /* len = 1, pcrel = 1 */ - res->howto = &i386_howto_table[4]; - return TRUE; - case 4: /* len = 2, pcrel = 0 */ - res->howto = &i386_howto_table[0]; - return TRUE; - case 5: /* len = 2, pcrel = 1 */ - res->howto = &i386_howto_table[3]; - return TRUE; - default: - return FALSE; - } - break; - default: - return FALSE; - } + switch (reloc.r_type) + { + case BFD_MACH_O_GENERIC_RELOC_VANILLA: + switch ((reloc.r_length << 1) | reloc.r_pcrel) + { + case 0: /* len = 0, pcrel = 0 */ + res->howto = &i386_howto_table[2]; + return TRUE; + case 2: /* len = 1, pcrel = 0 */ + res->howto = &i386_howto_table[1]; + return TRUE; + case 3: /* len = 1, pcrel = 1 */ + res->howto = &i386_howto_table[4]; + return TRUE; + case 4: /* len = 2, pcrel = 0 */ + res->howto = &i386_howto_table[0]; + return TRUE; + case 5: /* len = 2, pcrel = 1 */ + res->howto = &i386_howto_table[3]; + return TRUE; + default: + return FALSE; + } + default: + break; + } } + return FALSE; } static bfd_boolean @@ -208,16 +220,16 @@ bfd_mach_o_i386_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo) rinfo->r_pcrel = rel->howto->pc_relative; rinfo->r_length = rel->howto->size; /* Correct in practice. */ if ((*rel->sym_ptr_ptr)->flags & BSF_SECTION_SYM) - { - rinfo->r_extern = 0; - rinfo->r_value = + { + rinfo->r_extern = 0; + rinfo->r_value = (*rel->sym_ptr_ptr)->section->output_section->target_index; - } + } else - { - rinfo->r_extern = 1; - rinfo->r_value = (*rel->sym_ptr_ptr)->udata.i; - } + { + rinfo->r_extern = 1; + rinfo->r_value = (*rel->sym_ptr_ptr)->udata.i; + } break; case BFD_RELOC_MACH_O_SECTDIFF: rinfo->r_scattered = 1; @@ -252,7 +264,7 @@ bfd_mach_o_i386_swap_reloc_out (arelent *rel, bfd_mach_o_reloc_info *rinfo) static reloc_howto_type * bfd_mach_o_i386_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, - bfd_reloc_code_real_type code) + bfd_reloc_code_real_type code) { unsigned int i; @@ -264,14 +276,14 @@ bfd_mach_o_i386_bfd_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, static reloc_howto_type * bfd_mach_o_i386_bfd_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED) + const char *name ATTRIBUTE_UNUSED) { return NULL; } static bfd_boolean bfd_mach_o_i386_print_thread (bfd *abfd, bfd_mach_o_thread_flavour *thread, - void *vfile, char *buf) + void *vfile, char *buf) { FILE *file = (FILE *)vfile; @@ -279,51 +291,51 @@ bfd_mach_o_i386_print_thread (bfd *abfd, bfd_mach_o_thread_flavour *thread, { case BFD_MACH_O_x86_THREAD_STATE: if (thread->size < (8 + 16 * 4)) - return FALSE; + return FALSE; fprintf (file, " x86_THREAD_STATE:\n"); fprintf (file, " flavor: 0x%08lx count: 0x%08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 0), - (unsigned long)bfd_get_32 (abfd, buf + 4)); + (unsigned long)bfd_get_32 (abfd, buf + 0), + (unsigned long)bfd_get_32 (abfd, buf + 4)); fprintf (file, " eax: %08lx ebx: %08lx ecx: %08lx edx: %08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 8), - (unsigned long)bfd_get_32 (abfd, buf + 12), - (unsigned long)bfd_get_32 (abfd, buf + 16), - (unsigned long)bfd_get_32 (abfd, buf + 20)); + (unsigned long)bfd_get_32 (abfd, buf + 8), + (unsigned long)bfd_get_32 (abfd, buf + 12), + (unsigned long)bfd_get_32 (abfd, buf + 16), + (unsigned long)bfd_get_32 (abfd, buf + 20)); fprintf (file, " edi: %08lx esi: %08lx ebp: %08lx esp: %08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 24), - (unsigned long)bfd_get_32 (abfd, buf + 28), - (unsigned long)bfd_get_32 (abfd, buf + 32), - (unsigned long)bfd_get_32 (abfd, buf + 36)); + (unsigned long)bfd_get_32 (abfd, buf + 24), + (unsigned long)bfd_get_32 (abfd, buf + 28), + (unsigned long)bfd_get_32 (abfd, buf + 32), + (unsigned long)bfd_get_32 (abfd, buf + 36)); fprintf (file, " ss: %08lx flg: %08lx eip: %08lx cs: %08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 40), - (unsigned long)bfd_get_32 (abfd, buf + 44), - (unsigned long)bfd_get_32 (abfd, buf + 48), - (unsigned long)bfd_get_32 (abfd, buf + 52)); + (unsigned long)bfd_get_32 (abfd, buf + 40), + (unsigned long)bfd_get_32 (abfd, buf + 44), + (unsigned long)bfd_get_32 (abfd, buf + 48), + (unsigned long)bfd_get_32 (abfd, buf + 52)); fprintf (file, " ds: %08lx es: %08lx fs: %08lx gs: %08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 56), - (unsigned long)bfd_get_32 (abfd, buf + 60), - (unsigned long)bfd_get_32 (abfd, buf + 64), - (unsigned long)bfd_get_32 (abfd, buf + 68)); + (unsigned long)bfd_get_32 (abfd, buf + 56), + (unsigned long)bfd_get_32 (abfd, buf + 60), + (unsigned long)bfd_get_32 (abfd, buf + 64), + (unsigned long)bfd_get_32 (abfd, buf + 68)); return TRUE; case BFD_MACH_O_x86_FLOAT_STATE: if (thread->size < 8) - return FALSE; + return FALSE; fprintf (file, " x86_FLOAT_STATE:\n"); fprintf (file, " flavor: 0x%08lx count: 0x%08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 0), - (unsigned long)bfd_get_32 (abfd, buf + 4)); + (unsigned long)bfd_get_32 (abfd, buf + 0), + (unsigned long)bfd_get_32 (abfd, buf + 4)); return TRUE; case BFD_MACH_O_x86_EXCEPTION_STATE: if (thread->size < 8 + 3 * 4) - return FALSE; + return FALSE; fprintf (file, " x86_EXCEPTION_STATE:\n"); fprintf (file, " flavor: 0x%08lx count: 0x%08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 0), - (unsigned long)bfd_get_32 (abfd, buf + 4)); + (unsigned long)bfd_get_32 (abfd, buf + 0), + (unsigned long)bfd_get_32 (abfd, buf + 4)); fprintf (file, " trapno: %08lx err: %08lx faultaddr: %08lx\n", - (unsigned long)bfd_get_32 (abfd, buf + 8), - (unsigned long)bfd_get_32 (abfd, buf + 12), - (unsigned long)bfd_get_32 (abfd, buf + 16)); + (unsigned long)bfd_get_32 (abfd, buf + 8), + (unsigned long)bfd_get_32 (abfd, buf + 12), + (unsigned long)bfd_get_32 (abfd, buf + 16)); return TRUE; default: break; @@ -384,9 +396,9 @@ 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_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_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 @@ -394,11 +406,11 @@ const mach_o_segment_name_xlat mach_o_i386_segsec_names_xlat[] = #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_STRING "mach-o-i386" +#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_BIG_ENDIAN 0 +#define TARGET_ARCHIVE 0 #define TARGET_PRIORITY 0 #include "mach-o-target.c"