diff options
author | Nick Clifton <nickc@redhat.com> | 2019-09-10 15:20:58 +0100 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2019-09-10 15:20:58 +0100 |
commit | aebcfb76fc165795e67917cb67cf985c4dfdc577 (patch) | |
tree | 3c4539161437c15ad09750a9cfc7e0696f3a2986 /bfd/cpu-sparc.c | |
parent | efd0b3103f0fbbaa8dac86d82263b46a88b27461 (diff) | |
download | fsf-binutils-gdb-aebcfb76fc165795e67917cb67cf985c4dfdc577.zip fsf-binutils-gdb-aebcfb76fc165795e67917cb67cf985c4dfdc577.tar.gz fsf-binutils-gdb-aebcfb76fc165795e67917cb67cf985c4dfdc577.tar.bz2 |
Enhance the disassembler so that it will reliably determine whether a reloc applies to the middle of the next insn.
PR 24907
binutils* objdump.c (null_print): New function.
(disassemble_bytes): Delete previous_octets local and replace with
a test of the max_reloc_offset_into_insn field of the
bfd_arch_info structure. If a reloc is a potential match for the
next insn, then perform a dummy disassembly in order to calculate
its real length.
bfd * archures.c (bfd_arch_info_type): Add max_reloc_offset_into_insn
field.
(bfd_default_arch_struct): Initialise the new field.
* bfd-in2.h: Regenerate.
* cpu-aarch64.c: Initialise the new field.
* cpu-alpha.c: Likewise.
* cpu-arc.c: Likewise.
* cpu-arm.c: Likewise.
* cpu-avr.c: Likewise.
* cpu-bfin.c: Likewise.
* cpu-bpf.c: Likewise.
* cpu-cr16.c: Likewise.
* cpu-cr16c.c: Likewise.
* cpu-cris.c: Likewise.
* cpu-crx.c: Likewise.
* cpu-csky.c: Likewise.
* cpu-d10v.c: Likewise.
* cpu-d30v.c: Likewise.
* cpu-dlx.c: Likewise.
* cpu-epiphany.c: Likewise.
* cpu-fr30.c: Likewise.
* cpu-frv.c: Likewise.
* cpu-ft32.c: Likewise.
* cpu-h8300.c: Likewise.
* cpu-hppa.c: Likewise.
* cpu-i386.c: Likewise.
* cpu-ia64.c: Likewise.
* cpu-iamcu.c: Likewise.
* cpu-ip2k.c: Likewise.
* cpu-iq2000.c: Likewise.
* cpu-k1om.c: Likewise.
* cpu-l1om.c: Likewise.
* cpu-lm32.c: Likewise.
* cpu-m10200.c: Likewise.
* cpu-m10300.c: Likewise.
* cpu-m32c.c: Likewise.
* cpu-m32r.c: Likewise.
* cpu-m68hc11.c: Likewise.
* cpu-m68hc12.c: Likewise.
* cpu-m68k.c: Likewise.
* cpu-m9s12x.c: Likewise.
* cpu-m9s12xg.c: Likewise.
* cpu-mcore.c: Likewise.
* cpu-mep.c: Likewise.
* cpu-metag.c: Likewise.
* cpu-microblaze.c: Likewise.
* cpu-mips.c: Likewise.
* cpu-mmix.c: Likewise.
* cpu-moxie.c: Likewise.
* cpu-msp430.c: Likewise.
* cpu-mt.c: Likewise.
* cpu-nds32.c: Likewise.
* cpu-nfp.c: Likewise.
* cpu-nios2.c: Likewise.
* cpu-ns32k.c: Likewise.
* cpu-or1k.c: Likewise.
* cpu-pdp11.c: Likewise.
* cpu-pj.c: Likewise.
* cpu-plugin.c: Likewise.
* cpu-powerpc.c: Likewise.
* cpu-pru.c: Likewise.
* cpu-riscv.c: Likewise.
* cpu-rl78.c: Likewise.
* cpu-rs6000.c: Likewise.
* cpu-rx.c: Likewise.
* cpu-s12z.c: Likewise.
* cpu-s390.c: Likewise.
* cpu-score.c: Likewise.
* cpu-sh.c: Likewise.
* cpu-sparc.c: Likewise.
* cpu-spu.c: Likewise.
* cpu-tic30.c: Likewise.
* cpu-tic4x.c: Likewise.
* cpu-tic54x.c: Likewise.
* cpu-tic6x.c: Likewise.
* cpu-tic80.c: Likewise.
* cpu-tilegx.c: Likewise.
* cpu-tilepro.c: Likewise.
* cpu-v850.c: Likewise.
* cpu-v850_rh850.c: Likewise.
* cpu-vax.c: Likewise.
* cpu-visium.c: Likewise.
* cpu-wasm32.c: Likewise.
* cpu-xc16x.c: Likewise.
* cpu-xgate.c: Likewise.
* cpu-xstormy16.c: Likewise.
* cpu-xtensa.c: Likewise.
* cpu-z80.c: Likewise.
* cpu-z8k.c: Likewise.
gas * testsuite/gas/arm/pr24907.s: New test.
* testsuite/gas/arm/pr24907.d: Expected disassembly.
Diffstat (limited to 'bfd/cpu-sparc.c')
-rw-r--r-- | bfd/cpu-sparc.c | 370 |
1 files changed, 40 insertions, 330 deletions
diff --git a/bfd/cpu-sparc.c b/bfd/cpu-sparc.c index a1eb4c2..e7f30fb 100644 --- a/bfd/cpu-sparc.c +++ b/bfd/cpu-sparc.c @@ -22,338 +22,48 @@ #include "bfd.h" #include "libbfd.h" +#define N(BITS, NUMBER, PRINT, DEFAULT, NEXT) \ + { \ + BITS, /* Bits in a word. */ \ + BITS, /* Bits in an address. */ \ + 8, /* Bits in a byte. */ \ + bfd_arch_sparc, \ + NUMBER, \ + "sparc", \ + PRINT, \ + 3, /* Section alignment power. */ \ + DEFAULT, \ + bfd_default_compatible, \ + bfd_default_scan, \ + bfd_arch_default_fill, \ + NEXT, \ + 0 /* Maximum offset of a reloc from the start of an insn. */ \ + } + static const bfd_arch_info_type arch_info_struct[] = { - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_sparclet, - "sparc", - "sparc:sparclet", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[1], - }, - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_sparclite, - "sparc", - "sparc:sparclite", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[2], - }, - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v8plus, - "sparc", - "sparc:v8plus", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[3], - }, - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v8plusa, - "sparc", - "sparc:v8plusa", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[4], - }, - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_sparclite_le, - "sparc", - "sparc:sparclite_le", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[5], - }, - { - 64, /* bits in a word */ - 64, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v9, - "sparc", - "sparc:v9", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[6], - }, - { - 64, /* bits in a word */ - 64, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v9a, - "sparc", - "sparc:v9a", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[7], - }, - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v8plusb, - "sparc", - "sparc:v8plusb", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[8], - }, - { - 64, /* bits in a word */ - 64, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v9b, - "sparc", - "sparc:v9b", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[9], - }, - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v8plusc, - "sparc", - "sparc:v8plusc", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[10], - }, - { - 64, /* bits in a word */ - 64, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v9c, - "sparc", - "sparc:v9c", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[11], - }, - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v8plusd, - "sparc", - "sparc:v8plusd", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[12], - }, - { - 64, /* bits in a word */ - 64, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v9d, - "sparc", - "sparc:v9d", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[13], - }, - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v8pluse, - "sparc", - "sparc:v8pluse", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[14], - }, - { - 64, /* bits in a word */ - 64, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v9e, - "sparc", - "sparc:v9e", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[15], - }, - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v8plusv, - "sparc", - "sparc:v8plusv", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[16], - }, - { - 64, /* bits in a word */ - 64, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v9v, - "sparc", - "sparc:v9v", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[17], - }, - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v8plusm, - "sparc", - "sparc:v8plusm", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[18], - }, - { - 64, /* bits in a word */ - 64, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v9m, - "sparc", - "sparc:v9m", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[19], - }, - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v8plusm8, - "sparc", - "sparc:v8plusm8", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[20], - }, - { - 64, /* bits in a word */ - 64, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc_v9m8, - "sparc", - "sparc:v9m8", - 3, - FALSE, - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - 0, - } + N (32, bfd_mach_sparc_sparclet, "sparc:sparclet", FALSE, arch_info_struct + 1), + N (32, bfd_mach_sparc_sparclite, "sparc:sparclite", FALSE, arch_info_struct + 2), + N (32, bfd_mach_sparc_v8plus, "sparc:v8plus", FALSE, arch_info_struct + 3), + N (32, bfd_mach_sparc_v8plusa, "sparc:v8plusa", FALSE, arch_info_struct + 4), + N (32, bfd_mach_sparc_sparclite_le, "sparc:sparclite_le", FALSE, arch_info_struct + 5), + N (64, bfd_mach_sparc_v9, "sparc:v9", FALSE, arch_info_struct + 6), + N (64, bfd_mach_sparc_v9a, "sparc:v9a", FALSE, arch_info_struct + 7), + N (32, bfd_mach_sparc_v8plusb, "sparc:v8plusb", FALSE, arch_info_struct + 8), + N (64, bfd_mach_sparc_v9b, "sparc:v9b", FALSE, arch_info_struct + 9), + N (32, bfd_mach_sparc_v8plusc, "sparc:v8plusc", FALSE, arch_info_struct + 10), + N (64, bfd_mach_sparc_v9c, "sparc:v9c", FALSE, arch_info_struct + 11), + N (32, bfd_mach_sparc_v8plusd, "sparc:v8plusd", FALSE, arch_info_struct + 12), + N (64, bfd_mach_sparc_v9d, "sparc:v9d", FALSE, arch_info_struct + 13), + N (32, bfd_mach_sparc_v8pluse, "sparc:v8pluse", FALSE, arch_info_struct + 14), + N (64, bfd_mach_sparc_v9e, "sparc:v9e", FALSE, arch_info_struct + 15), + N (32, bfd_mach_sparc_v8plusv, "sparc:v8plusv", FALSE, arch_info_struct + 16), + N (64, bfd_mach_sparc_v9v, "sparc:v9v", FALSE, arch_info_struct + 17), + N (32, bfd_mach_sparc_v8plusm, "sparc:v8plusm", FALSE, arch_info_struct + 18), + N (64, bfd_mach_sparc_v9m, "sparc:v9m", FALSE, arch_info_struct + 19), + N (32, bfd_mach_sparc_v8plusm8, "sparc:v8plusm8", FALSE, arch_info_struct + 20), + N (64, bfd_mach_sparc_v9m8, "sparc:v9m8", FALSE, NULL) }; const bfd_arch_info_type bfd_sparc_arch = - { - 32, /* bits in a word */ - 32, /* bits in an address */ - 8, /* bits in a byte */ - bfd_arch_sparc, - bfd_mach_sparc, - "sparc", - "sparc", - 3, - TRUE, /* the default */ - bfd_default_compatible, - bfd_default_scan, - bfd_arch_default_fill, - &arch_info_struct[0], - }; + N (32, bfd_mach_sparc, "sparc", TRUE, arch_info_struct); |