diff options
author | Alan Modra <amodra@gmail.com> | 2022-06-08 09:49:09 +0930 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2022-06-08 21:33:00 +0930 |
commit | 57698478b75319a962b899c3f8d3a03baa5eaab4 (patch) | |
tree | b8c1b2c7f1dcb060a535ac8a21745bdf55698a40 /bfd/reloc.c | |
parent | 5d2834cc7e943014cff0cef6a2a25972eb85d84a (diff) | |
download | binutils-57698478b75319a962b899c3f8d3a03baa5eaab4.zip binutils-57698478b75319a962b899c3f8d3a03baa5eaab4.tar.gz binutils-57698478b75319a962b899c3f8d3a03baa5eaab4.tar.bz2 |
Don't encode reloc.size
I expect the encoded reloc.size field originally came from aout
r_length ecoding, but somehow went wrong for 64-bit relocs (which
should have been encoded as 3). Toss all that out, just use a byte
size instead. The changes outside of reloc.c in this patch should
make the code independent of how reloc.size is encoded.
* reloc.c (struct reloc_howto_struct): Increase size field by
one bit. Comment.
(HOWTO_RSIZE): Don't encode size.
(bfd_get_reloc_size): Adjust, and make it an inline function.
(read_reloc, write_reloc): Adjust.
* bfd-in2.h: Regenerate.
* aout-ns32k.c: Include libbfd.h.
(put_reloc): Don't use howto->size directly. Calculate r_length
using bfd_log2 and bfd_get_reloc_size.
* aoutx.h (swap_std_reloc_out): Likewise.
(aout_link_reloc_link_order): Likewise.
* i386lynx.c (swap_std_reloc_out
* mach-o-i386.c (bfd_mach_o_i386_swap_reloc_out
* pdp11.c (aout_link_reloc_link_order
* coff-arm.c (coff_arm_reloc): Don't use howto->size directly,
use bfd_get_reloc_size instead and adjust switch cases.
* coff-i386.c (coff_i386_reloc): Similarly.
* coff-x86_64.c (coff_amd64_reloc): Likewise.
* cpu-ns32k.c (do_ns32k_reloc): Likewise.
* elf32-arc.c (arc_do_relocation): Likewise.
* elf32-arm.c (elf32_arm_final_link_relocate): Likewise.
* elf32-bfin.c (bfin_bfd_reloc): Likewise.
* elf32-cr16.c (cr16_elf_final_link_relocate): Likewise.
* elf32-cris.c (cris_elf_pcrel_reloc): Likewise.
* elf32-crx.c (crx_elf_final_link_relocate): Likewise.
* elf32-csky.c (csky_elf_relocate_section): Likewise.
* elf32-d10v.c (extract_rel_addend, insert_rel_addend): Likewise.
* elf32-i386.c (elf_i386_relocate_section): Likewise.
* elf32-m32r.c (m32r_elf_generic_reloc): Likewise.
* elf32-nds32.c (nds32_elf_generic_reloc): Likewise.
* syms.c (_bfd_stab_section_find_nearest_line): Likewise.
* coff-rs6000.c (xcoff_ppc_relocate_section): Adjust howto.size.
* coff64-rs6000.c (xcoff64_ppc_relocate_section): Likewise.
Diffstat (limited to 'bfd/reloc.c')
-rw-r--r-- | bfd/reloc.c | 77 |
1 files changed, 27 insertions, 50 deletions
diff --git a/bfd/reloc.c b/bfd/reloc.c index 4ad1b85..76c309b 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -288,10 +288,8 @@ CODE_FRAGMENT . an external reloc number is stored in this field. *} . unsigned int type; . -. {* The encoded size of the item to be relocated. This is *not* a -. power-of-two measure. Use bfd_get_reloc_size to find the size -. of the item in bytes. *} -. unsigned int size:3; +. {* The size of the item to be relocated in bytes. *} +. unsigned int size:4; . . {* The number of bits in the field to be relocated. This is used . when doing overflow checking. *} @@ -375,7 +373,7 @@ DESCRIPTION The HOWTO macro fills in a reloc_howto_type (a typedef for const struct reloc_howto_struct). -.#define HOWTO_RSIZE(sz) (sz == 1 || sz == -1 ? 0 : sz == 2 || sz == -2 ? 1 : sz == 4 || sz == -4 ? 2 : sz == 0 ? 3 : sz == 8 || sz == -8 ? 4 : sz == 3 || sz == -3 ? 5 : 0x777) +.#define HOWTO_RSIZE(sz) ((sz) < 0 ? -(sz) : (sz)) .#define HOWTO(type, right, size, bits, pcrel, left, ovf, func, name, \ . inplace, src_mask, dst_mask, pcrel_off) \ . { (unsigned) type, HOWTO_RSIZE (size), bits, right, left, ovf, \ @@ -388,36 +386,15 @@ DESCRIPTION . HOWTO ((C), 0, 1, 0, false, 0, complain_overflow_dont, NULL, \ . NULL, false, 0, 0, false) . +.static inline unsigned int +.bfd_get_reloc_size (reloc_howto_type *howto) +.{ +. return howto->size; +.} +. */ /* -FUNCTION - bfd_get_reloc_size - -SYNOPSIS - unsigned int bfd_get_reloc_size (reloc_howto_type *); - -DESCRIPTION - For a reloc_howto_type that operates on a fixed number of bytes, - this returns the number of bytes operated on. - */ - -unsigned int -bfd_get_reloc_size (reloc_howto_type *howto) -{ - switch (howto->size) - { - case 0: return 1; - case 1: return 2; - case 2: return 4; - case 3: return 0; - case 4: return 8; - case 5: return 3; - default: abort (); - } -} - -/* TYPEDEF arelent_chain @@ -557,28 +534,28 @@ bfd_reloc_offset_in_range (reloc_howto_type *howto, static bfd_vma read_reloc (bfd *abfd, bfd_byte *data, reloc_howto_type *howto) { - switch (howto->size) + switch (bfd_get_reloc_size (howto)) { case 0: - return bfd_get_8 (abfd, data); + break; case 1: - return bfd_get_16 (abfd, data); + return bfd_get_8 (abfd, data); case 2: - return bfd_get_32 (abfd, data); + return bfd_get_16 (abfd, data); case 3: - break; + return bfd_get_24 (abfd, data); -#ifdef BFD64 case 4: + return bfd_get_32 (abfd, data); + +#ifdef BFD64 + case 8: return bfd_get_64 (abfd, data); #endif - case 5: - return bfd_get_24 (abfd, data); - default: abort (); } @@ -591,32 +568,32 @@ read_reloc (bfd *abfd, bfd_byte *data, reloc_howto_type *howto) static void write_reloc (bfd *abfd, bfd_vma val, bfd_byte *data, reloc_howto_type *howto) { - switch (howto->size) + switch (bfd_get_reloc_size (howto)) { case 0: - bfd_put_8 (abfd, val, data); break; case 1: - bfd_put_16 (abfd, val, data); + bfd_put_8 (abfd, val, data); break; case 2: - bfd_put_32 (abfd, val, data); + bfd_put_16 (abfd, val, data); break; case 3: + bfd_put_24 (abfd, val, data); break; -#ifdef BFD64 case 4: - bfd_put_64 (abfd, val, data); + bfd_put_32 (abfd, val, data); break; -#endif - case 5: - bfd_put_24 (abfd, val, data); +#ifdef BFD64 + case 8: + bfd_put_64 (abfd, val, data); break; +#endif default: abort (); |