X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcoff-h8500.c;h=05a84015bff40dd2f289478352de32f705f02540;hb=90937f86aae6f5741008ccb551ac7cb3aad86ba3;hp=bc80a222a1284a85a949e4d0d8c80694c2867678;hpb=6812b6077e4a09eab08458428f09c28ec58fc514;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/coff-h8500.c b/bfd/coff-h8500.c index bc80a222a1..05a84015bf 100644 --- a/bfd/coff-h8500.c +++ b/bfd/coff-h8500.c @@ -1,5 +1,6 @@ /* BFD back-end for Hitachi H8/500 COFF binaries. - Copyright 1993, 1994 Free Software Foundation, Inc. + Copyright 1993, 1994, 1995, 1997, 1999, 2000, 2001 + Free Software Foundation, Inc. Contributed by Cygnus Support. Written by Steve Chamberlain, . @@ -17,17 +18,23 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "bfd.h" #include "sysdep.h" -#include "obstack.h" #include "libbfd.h" #include "bfdlink.h" #include "coff/h8500.h" #include "coff/internal.h" #include "libcoff.h" +static int coff_h8500_select_reloc PARAMS ((reloc_howto_type *)); +static void rtype2howto PARAMS ((arelent *, struct internal_reloc *)); +static void reloc_processing PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *)); +static void extra_case PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *, bfd_byte *, unsigned int *, unsigned int *)); + +#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1) + static reloc_howto_type r_imm8 = HOWTO (R_H8500_IMM8, 0, 1, 8, false, 0, complain_overflow_bitfield, 0, "r_imm8", true, 0x000000ff, 0x000000ff, false); @@ -44,7 +51,6 @@ static reloc_howto_type r_imm32 = HOWTO (R_H8500_IMM32, 0, 1, 32, false, 0, complain_overflow_bitfield, 0, "r_imm32", true, 0xffffffff, 0xffffffff, false); - static reloc_howto_type r_high8 = HOWTO (R_H8500_HIGH8, 0, 1, 8, false, 0, complain_overflow_dont, 0, "r_high8", true, 0x000000ff, 0x000000ff, false); @@ -56,18 +62,16 @@ HOWTO (R_H8500_LOW16, 0, 1, 16, false, 0, static reloc_howto_type r_pcrel8 = HOWTO (R_H8500_PCREL8, 0, 1, 8, true, 0, complain_overflow_signed, 0, "r_pcrel8", true, 0, 0, true); - static reloc_howto_type r_pcrel16 = HOWTO (R_H8500_PCREL16, 0, 1, 16, true, 0, complain_overflow_signed, 0, "r_pcrel16", true, 0, 0, true); static reloc_howto_type r_high16 = HOWTO (R_H8500_HIGH16, 0, 1, 8, false, 0, complain_overflow_dont, 0, "r_high16", true, 0x000ffff, 0x0000ffff, false); + +/* Turn a howto into a reloc number. */ - -/* Turn a howto into a reloc number */ - -static int +static int coff_h8500_select_reloc (howto) reloc_howto_type *howto; { @@ -76,31 +80,30 @@ coff_h8500_select_reloc (howto) #define SELECT_RELOC(x,howto) x.r_type = coff_h8500_select_reloc(howto) - #define BADMAG(x) H8500BADMAG(x) #define H8500 1 /* Customize coffcode.h */ #define __A_MAGIC_SET__ -/* Code to swap in the reloc */ -#define SWAP_IN_RELOC_OFFSET bfd_h_get_32 -#define SWAP_OUT_RELOC_OFFSET bfd_h_put_32 +/* Code to swap in the reloc. */ +#define SWAP_IN_RELOC_OFFSET H_GET_32 +#define SWAP_OUT_RELOC_OFFSET H_PUT_32 #define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \ dst->r_stuff[0] = 'S'; \ dst->r_stuff[1] = 'C'; -/* Code to turn a r_type into a howto ptr, uses the above howto table - */ +/* Code to turn a r_type into a howto ptr, uses the above howto table. */ static void -rtype2howto(internal, dst) +rtype2howto (internal, dst) arelent * internal; struct internal_reloc *dst; { switch (dst->r_type) { default: - fprintf (stderr, "BAD 0x%x\n", dst->r_type); + abort (); + break; case R_H8500_IMM8: internal->howto = &r_imm8; break; @@ -133,14 +136,11 @@ rtype2howto(internal, dst) #define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry) - -/* Perform any necessaru magic to the addend in a reloc entry */ - +/* Perform any necessary magic to the addend in a reloc entry. */ #define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \ cache_ptr->addend = ext_reloc.r_offset; - #define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \ reloc_processing(relent, reloc, symbols, abfd, section) @@ -155,14 +155,9 @@ static void reloc_processing (relent, reloc, symbols, abfd, section) rtype2howto (relent, reloc); if (reloc->r_symndx > 0) - { - relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx]; - } + relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx]; else - { - relent->sym_ptr_ptr = &(bfd_abs_symbol); - } - + relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr; relent->addend = reloc->r_offset; relent->address -= section->vma; @@ -180,6 +175,7 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr) { bfd_byte *d = data+*dst_ptr; asection *input_section = link_order->u.indirect.section; + switch (reloc->howto->type) { case R_H8500_IMM8: @@ -194,7 +190,7 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr) bfd_put_8 (in_abfd, (bfd_coff_reloc16_get_value (reloc, link_info, input_section) >> 16), - d ); + d); (*dst_ptr) += 1; (*src_ptr) += 1; break; @@ -202,7 +198,7 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr) case R_H8500_IMM16: bfd_put_16 (in_abfd, bfd_coff_reloc16_get_value (reloc, link_info, input_section), - d ); + d); (*dst_ptr) += 2; (*src_ptr) += 2; break; @@ -215,11 +211,11 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr) (*dst_ptr) += 2; (*src_ptr) += 2; break; - + case R_H8500_HIGH16: bfd_put_16 (in_abfd, (bfd_coff_reloc16_get_value (reloc, link_info, input_section) - >>16), + >> 16), d); (*dst_ptr) += 2; @@ -228,24 +224,23 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr) case R_H8500_IMM24: { - int v = bfd_coff_reloc16_get_value(reloc, link_info, input_section); - int o = bfd_get_32(in_abfd, data+ *dst_ptr -1); + int v = bfd_coff_reloc16_get_value (reloc, link_info, input_section); + int o = bfd_get_32 (in_abfd, data+ *dst_ptr -1); v = (v & 0x00ffffff) | (o & 0xff00000); - bfd_put_32 (in_abfd, v, data + *dst_ptr -1); - (*dst_ptr) +=3; - (*src_ptr)+=3;; + bfd_put_32 (in_abfd, (bfd_vma) v, data + *dst_ptr -1); + (*dst_ptr) += 3; + (*src_ptr) += 3;; } break; case R_H8500_IMM32: { - int v = bfd_coff_reloc16_get_value(reloc, link_info, input_section); - bfd_put_32 (in_abfd, v, data + *dst_ptr); - (*dst_ptr) +=4; - (*src_ptr)+=4;; + int v = bfd_coff_reloc16_get_value (reloc, link_info, input_section); + bfd_put_32 (in_abfd, (bfd_vma) v, data + *dst_ptr); + (*dst_ptr) += 4; + (*src_ptr) += 4;; } break; - case R_H8500_PCREL8: { bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info, @@ -254,7 +249,7 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr) + *dst_ptr + link_order->u.indirect.section->output_section->vma; int gap = dst - dot - 1; /* -1 since were in the odd byte of the - word and the pc's been incremented */ + word and the pc's been incremented. */ if (gap > 128 || gap < -128) { @@ -277,7 +272,7 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr) + *dst_ptr + link_order->u.indirect.section->output_section->vma; int gap = dst - dot - 1; /* -1 since were in the odd byte of the - word and the pc's been incremented */ + word and the pc's been incremented. */ if (gap > 32767 || gap < -32768) { @@ -287,9 +282,9 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr) input_section, reloc->address))) abort (); } - bfd_put_16 (in_abfd, gap, data + *dst_ptr); - (*dst_ptr)+=2; - (*src_ptr)+=2; + bfd_put_16 (in_abfd, (bfd_vma) gap, data + *dst_ptr); + (*dst_ptr) += 2; + (*src_ptr) += 2; break; } @@ -302,51 +297,10 @@ extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr) #include "coffcode.h" - #undef coff_bfd_get_relocated_section_contents #undef coff_bfd_relax_section #define coff_bfd_get_relocated_section_contents \ bfd_coff_reloc16_get_relocated_section_contents #define coff_bfd_relax_section bfd_coff_reloc16_relax_section -bfd_target h8500coff_vec = -{ - "coff-h8500", /* name */ - bfd_target_coff_flavour, - true, /* data byte order is big */ - true, /* header byte order is big */ - - (HAS_RELOC | EXEC_P | /* object flags */ - HAS_LINENO | HAS_DEBUG | - HAS_SYMS | HAS_LOCALS | WP_TEXT), - - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ - '_', /* leading symbol underscore */ - '/', /* ar_pad_char */ - 15, /* ar_max_namelen */ - 1, /* minimum section alignment */ - bfd_getb64, bfd_getb_signed_64, bfd_putb64, - bfd_getb32, bfd_getb_signed_32, bfd_putb32, - bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */ - bfd_getb64, bfd_getb_signed_64, bfd_putb64, - bfd_getb32, bfd_getb_signed_32, bfd_putb32, - bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */ - - {_bfd_dummy_target, coff_object_p, /* bfd_check_format */ - bfd_generic_archive_p, _bfd_dummy_target}, - {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */ - bfd_false}, - {bfd_false, coff_write_object_contents, /* bfd_write_contents */ - _bfd_write_archive_contents, bfd_false}, - - BFD_JUMP_TABLE_GENERIC (coff), - BFD_JUMP_TABLE_COPY (coff), - BFD_JUMP_TABLE_CORE (_bfd_nocore), - BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff), - BFD_JUMP_TABLE_SYMBOLS (coff), - BFD_JUMP_TABLE_RELOCS (coff), - BFD_JUMP_TABLE_WRITE (coff), - BFD_JUMP_TABLE_LINK (coff), - - COFF_SWAP_TABLE, -}; +CREATE_BIG_COFF_TARGET_VEC (h8500coff_vec, "coff-h8500", 0, 0, '_', NULL)