From: Steve Chamberlain Date: Tue, 13 Jul 1993 19:08:25 +0000 (+0000) Subject: * coff-h8500.c (reloc_processing, rtype2howto): New relocation X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=46dd06224bedb1b95700732114263ea4d4b01937;p=binutils-gdb.git * coff-h8500.c (reloc_processing, rtype2howto): New relocation type R_H8500_HIGH_16. * coff-sh.c (r_imm32): Get the width of the reloc right. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 89770b3fb4e..41465d9b72f 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 13 12:03:00 1993 Steve Chamberlain (sac@phydeaux.cygnus.com) + + * coff-h8500.c (reloc_processing, rtype2howto): New relocation + type R_H8500_HIGH_16. + * coff-sh.c (r_imm32): Get the width of the reloc right. + Tue Jul 13 16:48:56 1993 Frederic Pierresteguy (F.Pierresteguy@frcl.bull.fr) * configure.in: Add new target m68k-coffun to the dpx/2. diff --git a/bfd/coff-h8500.c b/bfd/coff-h8500.c new file mode 100644 index 00000000000..e8e3a5ee588 --- /dev/null +++ b/bfd/coff-h8500.c @@ -0,0 +1,331 @@ +/* BFD back-end for Hitachi H8/500 COFF binaries. + Copyright 1993 Free Software Foundation, Inc. + Contributed by Cygnus Support. + Written by Steve Chamberlain, . + +This file is part of BFD, the Binary File Descriptor library. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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. */ + +#include "bfd.h" +#include "sysdep.h" +#include "libbfd.h" +#include "obstack.h" +#include "coff/h8500.h" +#include "coff/internal.h" +#include "libcoff.h" +#include "seclet.h" + +extern bfd_error_vector_type bfd_error_vector; + +static reloc_howto_type r_imm8 = +HOWTO (R_H8500_IMM8, 0, 1, 8, false, 0, true, + true, 0, "r_imm8", true, 0x000000ff, 0x000000ff, false); + +static reloc_howto_type r_imm16 = +HOWTO (R_H8500_IMM16, 0, 1, 16, false, 0, true, + true, 0, "r_imm16", true, 0x0000ffff, 0x0000ffff, false); + +static reloc_howto_type r_imm24 = +HOWTO (R_H8500_IMM24, 0, 1, 24, false, 0, true, + true, 0, "r_imm24", true, 0x00ffffff, 0x00ffffff, false); + +static reloc_howto_type r_imm32 = +HOWTO (R_H8500_IMM32, 0, 1, 32, false, 0, true, + true, 0, "r_imm32", true, 0xffffffff, 0xffffffff, false); + + +static reloc_howto_type r_high8 = +HOWTO (R_H8500_HIGH8, 0, 1, 8, false, 0, true, + true, 0, "r_high8", true, 0x000000ff, 0x000000ff, false); + +static reloc_howto_type r_low16 = +HOWTO (R_H8500_LOW16, 0, 1, 16, false, 0, true, + true, 0, "r_low16", true, 0x0000ffff, 0x0000ffff, false); + +static reloc_howto_type r_pcrel8 = +HOWTO (R_H8500_PCREL8, 0, 1, 8, true, 0, true, true, 0, "r_pcrel8", true, 0, 0, true); + + +static reloc_howto_type r_pcrel16 = +HOWTO (R_H8500_PCREL16, 0, 1, 16, true, 0, true, true, 0, "r_pcrel16", true, 0, 0, true); + +static reloc_howto_type r_high16 = +HOWTO (R_H8500_HIGH16, 0, 1, 8, false, 0, true, + true, 0, "r_high16", true, 0x000ffff, 0x0000ffff, false); + + +/* Turn a howto into a reloc number */ + +static int +coff_h8500_select_reloc (howto) + reloc_howto_type *howto; +{ + return howto->type; +} + +#define SELECT_RELOC(x,howto) x= 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 +#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 + */ + +static void +rtype2howto(internal, dst) + arelent * internal; + struct internal_reloc *dst; +{ + switch (dst->r_type) + { + default: + printf ("BAD 0x%x\n", dst->r_type); + case R_H8500_IMM8: + internal->howto = &r_imm8; + break; + case R_H8500_IMM16: + internal->howto = &r_imm16; + break; + case R_H8500_IMM24: + internal->howto = &r_imm24; + break; + case R_H8500_IMM32: + internal->howto = &r_imm32; + break; + case R_H8500_PCREL8: + internal->howto = &r_pcrel8; + break; + case R_H8500_PCREL16: + internal->howto = &r_pcrel16; + break; + case R_H8500_HIGH8: + internal->howto = &r_high8; + break; + case R_H8500_HIGH16: + internal->howto = &r_high16; + break; + case R_H8500_LOW16: + internal->howto = &r_low16; + break; + } +} + +#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry) + + +/* Perform any necessaru 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) + +static void reloc_processing (relent, reloc, symbols, abfd, section) + arelent * relent; + struct internal_reloc *reloc; + asymbol ** symbols; + bfd * abfd; + asection * section; +{ + relent->address = reloc->r_vaddr; + rtype2howto (relent, reloc); + + if (reloc->r_symndx > 0) + { + relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx]; + } + else + { + relent->sym_ptr_ptr = &(bfd_abs_symbol); + } + + + relent->addend = reloc->r_offset; + relent->address -= section->vma; +} + +static void +extra_case (in_abfd, seclet, reloc, data, src_ptr, dst_ptr) + bfd *in_abfd; + bfd_seclet_type *seclet; + arelent *reloc; + bfd_byte *data; + unsigned int *src_ptr; + unsigned int *dst_ptr; +{ + bfd_byte *d = data+*dst_ptr; + switch (reloc->howto->type) + { + case R_H8500_IMM8: + bfd_put_8 (in_abfd, + bfd_coff_reloc16_get_value (reloc, seclet), + d); + (*dst_ptr) += 1; + (*src_ptr) += 1; + break; + + case R_H8500_HIGH8: + bfd_put_8 (in_abfd, + (bfd_coff_reloc16_get_value (reloc, seclet)>>16), + d ); + (*dst_ptr) += 1; + (*src_ptr) += 1; + break; + + case R_H8500_IMM16: + bfd_put_16 (in_abfd, + bfd_coff_reloc16_get_value (reloc, seclet) , + d ); + (*dst_ptr) += 2; + (*src_ptr) += 2; + break; + + case R_H8500_LOW16: + bfd_put_16 (in_abfd, + bfd_coff_reloc16_get_value (reloc, seclet) , + d); + + (*dst_ptr) += 2; + (*src_ptr) += 2; + break; + + case R_H8500_HIGH16: + bfd_put_16 (in_abfd, + bfd_coff_reloc16_get_value (reloc, seclet)>>16 , + d); + + (*dst_ptr) += 2; + (*src_ptr) += 2; + break; + + case R_H8500_IMM24: + { + int v = bfd_coff_reloc16_get_value(reloc, seclet); + 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;; + } + break; + case R_H8500_IMM32: + { + int v = bfd_coff_reloc16_get_value(reloc, seclet); + bfd_put_32 (in_abfd, v, data + *dst_ptr); + (*dst_ptr) +=4; + (*src_ptr)+=4;; + } + break; + + + case R_H8500_PCREL8: + { + bfd_vma dst = bfd_coff_reloc16_get_value (reloc, seclet); + bfd_vma dot = seclet->offset + + *dst_ptr + + seclet->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 */ + + if (gap > 128 || gap < -128) + { + bfd_error_vector.reloc_value_truncated (reloc, seclet); + } + bfd_put_8 (in_abfd, gap, data + *dst_ptr); + (*dst_ptr)++; + (*src_ptr)++; + break; + } + case R_H8500_PCREL16: + { + bfd_vma dst = bfd_coff_reloc16_get_value (reloc, seclet); + bfd_vma dot = seclet->offset + + *dst_ptr + + seclet->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 */ + + if (gap > 32767 || gap < -32768) + { + bfd_error_vector.reloc_value_truncated (reloc, seclet); + } + bfd_put_16 (in_abfd, gap, data + *dst_ptr); + (*dst_ptr)+=2; + (*src_ptr)+=2; + break; + } + + default: + abort (); + } +} + +#define coff_reloc16_extra_cases extra_case + +#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 | DYNAMIC | 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 */ + _do_getb64, _do_getb_signed_64, _do_putb64, + _do_getb32, _do_getb_signed_32, _do_putb32, + _do_getb16, _do_getb_signed_16, _do_putb16, /* data */ + _do_getb64, _do_getb_signed_64, _do_putb64, + _do_getb32, _do_getb_signed_32, _do_putb32, + _do_getb16, _do_getb_signed_16, _do_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}, + + JUMP_TABLE (coff), + COFF_SWAP_TABLE, +}; diff --git a/bfd/coff-sh.c b/bfd/coff-sh.c new file mode 100644 index 00000000000..37f92edd652 --- /dev/null +++ b/bfd/coff-sh.c @@ -0,0 +1,186 @@ +/* BFD back-end for Hitachi Super-H COFF binaries. + Copyright 1993 Free Software Foundation, Inc. + Contributed by Cygnus Support. + Written by Steve Chamberlain, . + +This file is part of BFD, the Binary File Descriptor library. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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. */ + +#include "bfd.h" +#include "sysdep.h" +#include "libbfd.h" +#include "obstack.h" +#include "coff/sh.h" +#include "coff/internal.h" +#include "libcoff.h" +#include "seclet.h" + +extern bfd_error_vector_type bfd_error_vector; + +static reloc_howto_type r_imm32 = +HOWTO (R_SH_IMM32, 0,2, 32, false, 0, true, + true, 0, "r_imm32", false, 0x0, 0xffffffff, false); + + + +/* Turn a howto into a reloc number */ + +static int +coff_SH_select_reloc (howto) + reloc_howto_type *howto; +{ + return howto->type; +} + +#define SELECT_RELOC(x,howto) x= coff_SH_select_reloc(howto) + + +#define BADMAG(x) SHBADMAG(x) +#define SH 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 +#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 + */ + +static void +DEFUN (rtype2howto, (internal, dst), + arelent * internal AND + struct internal_reloc *dst) +{ + switch (dst->r_type) + { + default: + fprintf (stderr, "BAD 0x%x\n", dst->r_type); + case R_SH_IMM32: + internal->howto = &r_imm32; + break; + } +} + +#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry) + + +/* Perform any necessaru 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) + +static void +DEFUN (reloc_processing, (relent, reloc, symbols, abfd, section), + arelent * relent AND + struct internal_reloc *reloc AND + asymbol ** symbols AND + bfd * abfd AND + asection * section) +{ + relent->address = reloc->r_vaddr; + rtype2howto (relent, reloc); + + if (reloc->r_symndx > 0) + { + relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx]; + } + else + { + relent->sym_ptr_ptr = &(bfd_abs_symbol); + } + + + relent->addend = reloc->r_offset; + relent->address -= section->vma; +} + +static void +extra_case (in_abfd, seclet, reloc, data, src_ptr, dst_ptr) + bfd *in_abfd; + bfd_seclet_type *seclet; + arelent *reloc; + bfd_byte *data; + unsigned int *src_ptr; + unsigned int *dst_ptr; +{ + switch (reloc->howto->type) + { + case R_SH_IMM32: + { + int v = bfd_coff_reloc16_get_value(reloc, seclet); + bfd_put_32 (in_abfd, v, data + *dst_ptr); + (*dst_ptr) +=4; + (*src_ptr)+=4;; + } + break; + + default: + abort (); + } +} + +#define coff_reloc16_extra_cases extra_case + +#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 shcoff_vec = +{ + "coff-sh", /* 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 | DYNAMIC | WP_TEXT), + + (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ + '_', /* leading symbol underscore */ + '/', /* ar_pad_char */ + 15, /* ar_max_namelen */ + 2, /* minimum section alignment */ +_do_getb64, _do_getb_signed_64, _do_putb64, + _do_getb32, _do_getb_signed_32, _do_putb32, + _do_getb16, _do_getb_signed_16, _do_putb16, /* data */ +_do_getb64, _do_getb_signed_64, _do_putb64, + _do_getb32, _do_getb_signed_32, _do_putb32, + _do_getb16, _do_getb_signed_16, _do_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}, + + JUMP_TABLE(coff), + COFF_SWAP_TABLE, +};