forked from Imagelibrary/binutils-gdb
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.
This commit is contained in:
Nick Clifton
116
bfd/cpu-h8300.c
116
bfd/cpu-h8300.c
@@ -113,124 +113,30 @@ compatible (const bfd_arch_info_type *in, const bfd_arch_info_type *out)
|
||||
return in;
|
||||
}
|
||||
|
||||
#define N(word, addr, number, name, print, default, next) \
|
||||
{ word, addr, 8, bfd_arch_h8300, number, name, print, 1, default, \
|
||||
compatible, h8300_scan, bfd_arch_default_fill, next, 0 }
|
||||
|
||||
static const bfd_arch_info_type h8300sxn_info_struct =
|
||||
{
|
||||
32, /* 32 bits in a word */
|
||||
16, /* 16 bits in an address */
|
||||
8, /* 8 bits in a byte */
|
||||
bfd_arch_h8300,
|
||||
bfd_mach_h8300sxn,
|
||||
"h8300sxn", /* arch_name */
|
||||
"h8300sxn", /* printable name */
|
||||
1,
|
||||
FALSE, /* the default machine */
|
||||
compatible,
|
||||
h8300_scan,
|
||||
bfd_arch_default_fill,
|
||||
0
|
||||
};
|
||||
N (32, 16, bfd_mach_h8300sxn, "h8300sxn", "h8300sxn", FALSE, NULL);
|
||||
|
||||
static const bfd_arch_info_type h8300sx_info_struct =
|
||||
{
|
||||
32, /* 32 bits in a word */
|
||||
32, /* 32 bits in an address */
|
||||
8, /* 8 bits in a byte */
|
||||
bfd_arch_h8300,
|
||||
bfd_mach_h8300sx,
|
||||
"h8300sx", /* arch_name */
|
||||
"h8300sx", /* printable name */
|
||||
1,
|
||||
FALSE, /* the default machine */
|
||||
compatible,
|
||||
h8300_scan,
|
||||
bfd_arch_default_fill,
|
||||
&h8300sxn_info_struct
|
||||
};
|
||||
N (32, 32, bfd_mach_h8300sx, "h8300sx", "h8300sx", FALSE, &h8300sxn_info_struct);
|
||||
|
||||
static const bfd_arch_info_type h8300sn_info_struct =
|
||||
{
|
||||
32, /* 32 bits in a word. */
|
||||
16, /* 16 bits in an address. */
|
||||
8, /* 8 bits in a byte. */
|
||||
bfd_arch_h8300,
|
||||
bfd_mach_h8300sn,
|
||||
"h8300sn", /* Architecture name. */
|
||||
"h8300sn", /* Printable name. */
|
||||
1,
|
||||
FALSE, /* The default machine. */
|
||||
compatible,
|
||||
h8300_scan,
|
||||
bfd_arch_default_fill,
|
||||
&h8300sx_info_struct
|
||||
};
|
||||
N (32, 16, bfd_mach_h8300sn, "h8300sn", "h8300sn", FALSE, &h8300sx_info_struct);
|
||||
|
||||
static const bfd_arch_info_type h8300hn_info_struct =
|
||||
{
|
||||
32, /* 32 bits in a word. */
|
||||
16, /* 16 bits in an address. */
|
||||
8, /* 8 bits in a byte. */
|
||||
bfd_arch_h8300,
|
||||
bfd_mach_h8300hn,
|
||||
"h8300hn", /* Architecture name. */
|
||||
"h8300hn", /* Printable name. */
|
||||
1,
|
||||
FALSE, /* The default machine. */
|
||||
compatible,
|
||||
h8300_scan,
|
||||
bfd_arch_default_fill,
|
||||
&h8300sn_info_struct
|
||||
};
|
||||
N (32, 16, bfd_mach_h8300hn, "h8300hn", "h8300hn", FALSE, &h8300sn_info_struct);
|
||||
|
||||
static const bfd_arch_info_type h8300s_info_struct =
|
||||
{
|
||||
32, /* 32 bits in a word. */
|
||||
32, /* 32 bits in an address. */
|
||||
8, /* 8 bits in a byte. */
|
||||
bfd_arch_h8300,
|
||||
bfd_mach_h8300s,
|
||||
"h8300s", /* Architecture name. */
|
||||
"h8300s", /* Printable name. */
|
||||
1,
|
||||
FALSE, /* The default machine. */
|
||||
compatible,
|
||||
h8300_scan,
|
||||
bfd_arch_default_fill,
|
||||
& h8300hn_info_struct
|
||||
};
|
||||
N (32, 32, bfd_mach_h8300s, "h8300s", "h8300s", FALSE, & h8300hn_info_struct);
|
||||
|
||||
static const bfd_arch_info_type h8300h_info_struct =
|
||||
{
|
||||
32, /* 32 bits in a word. */
|
||||
32, /* 32 bits in an address. */
|
||||
8, /* 8 bits in a byte. */
|
||||
bfd_arch_h8300,
|
||||
bfd_mach_h8300h,
|
||||
"h8300h", /* Architecture name. */
|
||||
"h8300h", /* Printable name. */
|
||||
1,
|
||||
FALSE, /* The default machine. */
|
||||
compatible,
|
||||
h8300_scan,
|
||||
bfd_arch_default_fill,
|
||||
&h8300s_info_struct
|
||||
};
|
||||
N (32, 32, bfd_mach_h8300h, "h8300h", "h8300h", FALSE, &h8300s_info_struct);
|
||||
|
||||
const bfd_arch_info_type bfd_h8300_arch =
|
||||
{
|
||||
16, /* 16 bits in a word. */
|
||||
16, /* 16 bits in an address. */
|
||||
8, /* 8 bits in a byte. */
|
||||
bfd_arch_h8300,
|
||||
bfd_mach_h8300,
|
||||
"h8300", /* Architecture name. */
|
||||
"h8300", /* Printable name. */
|
||||
1,
|
||||
TRUE, /* The default machine. */
|
||||
compatible,
|
||||
h8300_scan,
|
||||
bfd_arch_default_fill,
|
||||
&h8300h_info_struct
|
||||
};
|
||||
N (16, 16, bfd_mach_h8300, "h8300", "h8300", TRUE, &h8300h_info_struct);
|
||||
|
||||
/* Pad the given address to 32 bits, converting 16-bit and 24-bit
|
||||
addresses into the values they would have had on a h8s target. */
|
||||
|
||||
Reference in New Issue
Block a user