From c94cb026628b831ef63e3455a66328749ff8a415 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 7 Jun 2022 22:43:20 +0930 Subject: HOWTO size encoding This changes the HOWTO macro to encode the howto.size field from a value given in bytes. This of course requires editing all target uses of HOWTO, a major pain, but makes it a little nicer to specify new target HOWTOs. Object files before/after this patch are unchanged in .data and .rodata. bfd/ * reloc.c (HOWTO_RSIZE): Encode size in bytes. (EMPTY_HOWTO): Adjust to keep it all zero. * aout-ns32k.c, * aoutx.h, * coff-alpha.c, * coff-arm.c, * coff-i386.c, * coff-mcore.c, * coff-mips.c, * coff-rs6000.c, * coff-sh.c, * coff-tic30.c, * coff-tic4x.c, * coff-tic54x.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c, * coff64-rs6000.c, * elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-bfin.c, * elf32-cr16.c, * elf32-cris.c, * elf32-crx.c, * elf32-csky.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c, * elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c, * elf32-gen.c, * elf32-h8300.c, * elf32-i386.c, * elf32-ip2k.c, * elf32-iq2000.c, * elf32-lm32.c, * elf32-m32c.c, * elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68k.c, * elf32-mcore.c, * elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c, * elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c, * elf32-ppc.c, * elf32-pru.c, * elf32-rl78.c, * elf32-rx.c, * elf32-s12z.c, * elf32-s390.c, * elf32-score.c, * elf32-score7.c, * elf32-sh-relocs.h, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilepro.c, * elf32-v850.c, * elf32-vax.c, * elf32-visium.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c, * elf32-xstormy16.c, * elf32-xtensa.c, * elf32-z80.c, * elf64-alpha.c, * elf64-bpf.c, * elf64-gen.c, * elf64-mips.c, * elf64-mmix.c, * elf64-nfp.c, * elf64-ppc.c, * elf64-s390.c, * elf64-x86-64.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfxx-ia64.c, * elfxx-loongarch.c, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c, * elfxx-tilegx.c, * mach-o-aarch64.c, * mach-o-arm.c, * mach-o-i386.c, * mach-o-x86-64.c, * pdp11.c, * reloc.c, * som.c, * vms-alpha.c: Adjust all uses of HOWTO. * bfd-in2.h: Regenerate. include/ * elf/arc-reloc.def: Adjust all uses of HOWTO. --- bfd/elf32-rl78.c | 112 +++++++++++++++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) (limited to 'bfd/elf32-rl78.c') diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c index 6c1b2d7..958bff0 100644 --- a/bfd/elf32-rl78.c +++ b/bfd/elf32-rl78.c @@ -44,25 +44,25 @@ static bfd_reloc_status_type rl78_special_reloc (bfd *, arelent *, asymbol *, vo static reloc_howto_type rl78_elf_howto_table [] = { - RL78REL (NONE, 3, 0, 0, 0, dont, false), - RL78REL (DIR32, 2, 32, 0xffffffff, 0, dont, false), - RL78REL (DIR24S, 2, 24, 0xffffff, 0, signed, false), - RL78REL (DIR16, 1, 16, 0xffff, 0, bitfield, false), - RL78REL (DIR16U, 1, 16, 0xffff, 0, unsigned, false), - RL78REL (DIR16S, 1, 16, 0xffff, 0, bitfield, false), - RL78REL (DIR8, 0, 8, 0xff, 0, dont, false), - RL78REL (DIR8U, 0, 8, 0xff, 0, unsigned, false), - RL78REL (DIR8S, 0, 8, 0xff, 0, bitfield, false), - RL78REL (DIR24S_PCREL, 2, 24, 0xffffff, 0, signed, true), - RL78REL (DIR16S_PCREL, 1, 16, 0xffff, 0, signed, true), - RL78REL (DIR8S_PCREL, 0, 8, 0xff, 0, signed, true), - RL78REL (DIR16UL, 1, 16, 0xffff, 2, unsigned, false), - RL78REL (DIR16UW, 1, 16, 0xffff, 1, unsigned, false), - RL78REL (DIR8UL, 0, 8, 0xff, 2, unsigned, false), - RL78REL (DIR8UW, 0, 8, 0xff, 1, unsigned, false), - RL78REL (DIR32_REV, 2, 32, 0xffffffff, 0, dont, false), - RL78REL (DIR16_REV, 1, 16, 0xffff, 0, bitfield, false), - RL78REL (DIR3U_PCREL, 0, 3, 0x7, 0, unsigned, true), + RL78REL (NONE, 0, 0, 0, 0, dont, false), + RL78REL (DIR32, 4, 32, 0xffffffff, 0, dont, false), + RL78REL (DIR24S, 4, 24, 0xffffff, 0, signed, false), + RL78REL (DIR16, 2, 16, 0xffff, 0, bitfield, false), + RL78REL (DIR16U, 2, 16, 0xffff, 0, unsigned, false), + RL78REL (DIR16S, 2, 16, 0xffff, 0, bitfield, false), + RL78REL (DIR8, 1, 8, 0xff, 0, dont, false), + RL78REL (DIR8U, 1, 8, 0xff, 0, unsigned, false), + RL78REL (DIR8S, 1, 8, 0xff, 0, bitfield, false), + RL78REL (DIR24S_PCREL, 4, 24, 0xffffff, 0, signed, true), + RL78REL (DIR16S_PCREL, 2, 16, 0xffff, 0, signed, true), + RL78REL (DIR8S_PCREL, 1, 8, 0xff, 0, signed, true), + RL78REL (DIR16UL, 2, 16, 0xffff, 2, unsigned, false), + RL78REL (DIR16UW, 2, 16, 0xffff, 1, unsigned, false), + RL78REL (DIR8UL, 1, 8, 0xff, 2, unsigned, false), + RL78REL (DIR8UW, 1, 8, 0xff, 1, unsigned, false), + RL78REL (DIR32_REV, 4, 32, 0xffffffff, 0, dont, false), + RL78REL (DIR16_REV, 2, 16, 0xffff, 0, bitfield, false), + RL78REL (DIR3U_PCREL, 1, 3, 0x7, 0, unsigned, true), EMPTY_HOWTO (0x13), EMPTY_HOWTO (0x14), @@ -92,9 +92,9 @@ static reloc_howto_type rl78_elf_howto_table [] = EMPTY_HOWTO (0x2b), EMPTY_HOWTO (0x2c), - RL78REL (RH_RELAX, 3, 0, 0, 0, dont, false), - RL78REL (RH_SFR, 0, 8, 0xff, 0, unsigned, false), - RL78REL (RH_SADDR, 0, 8, 0xff, 0, unsigned, false), + RL78REL (RH_RELAX, 0, 0, 0, 0, dont, false), + RL78REL (RH_SFR, 1, 8, 0xff, 0, unsigned, false), + RL78REL (RH_SADDR, 1, 8, 0xff, 0, unsigned, false), EMPTY_HOWTO (0x30), EMPTY_HOWTO (0x31), @@ -114,23 +114,23 @@ static reloc_howto_type rl78_elf_howto_table [] = EMPTY_HOWTO (0x3f), EMPTY_HOWTO (0x40), - RL78_OP_REL (ABS32, 2, 32, 0xffffffff, 0, dont, false), - RL78_OP_REL (ABS24S, 2, 24, 0xffffff, 0, signed, false), - RL78_OP_REL (ABS16, 1, 16, 0xffff, 0, bitfield, false), - RL78_OP_REL (ABS16U, 1, 16, 0xffff, 0, unsigned, false), - RL78_OP_REL (ABS16S, 1, 16, 0xffff, 0, signed, false), - RL78_OP_REL (ABS8, 0, 8, 0xff, 0, bitfield, false), - RL78_OP_REL (ABS8U, 0, 8, 0xff, 0, unsigned, false), - RL78_OP_REL (ABS8S, 0, 8, 0xff, 0, signed, false), - RL78_OP_REL (ABS24S_PCREL, 2, 24, 0xffffff, 0, signed, true), - RL78_OP_REL (ABS16S_PCREL, 1, 16, 0xffff, 0, signed, true), - RL78_OP_REL (ABS8S_PCREL, 0, 8, 0xff, 0, signed, true), - RL78_OP_REL (ABS16UL, 1, 16, 0xffff, 0, unsigned, false), - RL78_OP_REL (ABS16UW, 1, 16, 0xffff, 0, unsigned, false), - RL78_OP_REL (ABS8UL, 0, 8, 0xff, 0, unsigned, false), - RL78_OP_REL (ABS8UW, 0, 8, 0xff, 0, unsigned, false), - RL78_OP_REL (ABS32_REV, 2, 32, 0xffffffff, 0, dont, false), - RL78_OP_REL (ABS16_REV, 1, 16, 0xffff, 0, bitfield, false), + RL78_OP_REL (ABS32, 4, 32, 0xffffffff, 0, dont, false), + RL78_OP_REL (ABS24S, 4, 24, 0xffffff, 0, signed, false), + RL78_OP_REL (ABS16, 2, 16, 0xffff, 0, bitfield, false), + RL78_OP_REL (ABS16U, 2, 16, 0xffff, 0, unsigned, false), + RL78_OP_REL (ABS16S, 2, 16, 0xffff, 0, signed, false), + RL78_OP_REL (ABS8, 1, 8, 0xff, 0, bitfield, false), + RL78_OP_REL (ABS8U, 1, 8, 0xff, 0, unsigned, false), + RL78_OP_REL (ABS8S, 1, 8, 0xff, 0, signed, false), + RL78_OP_REL (ABS24S_PCREL, 4, 24, 0xffffff, 0, signed, true), + RL78_OP_REL (ABS16S_PCREL, 2, 16, 0xffff, 0, signed, true), + RL78_OP_REL (ABS8S_PCREL, 1, 8, 0xff, 0, signed, true), + RL78_OP_REL (ABS16UL, 2, 16, 0xffff, 0, unsigned, false), + RL78_OP_REL (ABS16UW, 2, 16, 0xffff, 0, unsigned, false), + RL78_OP_REL (ABS8UL, 1, 8, 0xff, 0, unsigned, false), + RL78_OP_REL (ABS8UW, 1, 8, 0xff, 0, unsigned, false), + RL78_OP_REL (ABS32_REV, 4, 32, 0xffffffff, 0, dont, false), + RL78_OP_REL (ABS16_REV, 2, 16, 0xffff, 0, bitfield, false), #define STACK_REL_P(x) ((x) <= R_RL78_ABS16_REV && (x) >= R_RL78_ABS32) @@ -182,29 +182,29 @@ static reloc_howto_type rl78_elf_howto_table [] = EMPTY_HOWTO (0x7e), EMPTY_HOWTO (0x7f), - RL78_OP_REL (SYM, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPneg, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPadd, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPsub, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPmul, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPdiv, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPshla, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPshra, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPsctsize, 3, 0, 0, 0, dont, false), + RL78_OP_REL (SYM, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPneg, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPadd, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPsub, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPmul, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPdiv, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPshla, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPshra, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPsctsize, 0, 0, 0, 0, dont, false), EMPTY_HOWTO (0x89), EMPTY_HOWTO (0x8a), EMPTY_HOWTO (0x8b), EMPTY_HOWTO (0x8c), - RL78_OP_REL (OPscttop, 3, 0, 0, 0, dont, false), + RL78_OP_REL (OPscttop, 0, 0, 0, 0, dont, false), EMPTY_HOWTO (0x8e), EMPTY_HOWTO (0x8f), - RL78_OP_REL (OPand, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPor, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPxor, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPnot, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPmod, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPromtop, 3, 0, 0, 0, dont, false), - RL78_OP_REL (OPramtop, 3, 0, 0, 0, dont, false) + RL78_OP_REL (OPand, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPor, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPxor, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPnot, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPmod, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPromtop, 0, 0, 0, 0, dont, false), + RL78_OP_REL (OPramtop, 0, 0, 0, 0, dont, false) }; /* Map BFD reloc types to RL78 ELF reloc types. */ -- cgit v1.1