aebcfb76fc
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.
192 lines
6.1 KiB
C
192 lines
6.1 KiB
C
/* BFD support for the Intel 386 architecture.
|
|
Copyright (C) 1992-2019 Free Software Foundation, Inc.
|
|
|
|
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 3 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., 51 Franklin Street - Fifth Floor, Boston,
|
|
MA 02110-1301, USA. */
|
|
|
|
#include "sysdep.h"
|
|
#include "bfd.h"
|
|
#include "libbfd.h"
|
|
#include "libiberty.h"
|
|
|
|
extern void * bfd_arch_i386_short_nop_fill (bfd_size_type, bfd_boolean,
|
|
bfd_boolean);
|
|
|
|
static const bfd_arch_info_type *
|
|
bfd_i386_compatible (const bfd_arch_info_type *a,
|
|
const bfd_arch_info_type *b)
|
|
{
|
|
const bfd_arch_info_type *compat = bfd_default_compatible (a, b);
|
|
|
|
/* Don't allow mixing x64_32 with x86_64. */
|
|
if (compat
|
|
&& (a->mach & bfd_mach_x64_32) != (b->mach & bfd_mach_x64_32))
|
|
compat = NULL;
|
|
|
|
return compat;
|
|
}
|
|
|
|
/* Fill the buffer with zero or nop instruction if CODE is TRUE. Use
|
|
multi byte nop instructions if LONG_NOP is TRUE. */
|
|
|
|
static void *
|
|
bfd_arch_i386_fill (bfd_size_type count, bfd_boolean code,
|
|
bfd_boolean long_nop)
|
|
{
|
|
/* nop */
|
|
static const char nop_1[] = { 0x90 };
|
|
/* xchg %ax,%ax */
|
|
static const char nop_2[] = { 0x66, 0x90 };
|
|
/* nopl (%[re]ax) */
|
|
static const char nop_3[] = { 0x0f, 0x1f, 0x00 };
|
|
/* nopl 0(%[re]ax) */
|
|
static const char nop_4[] = { 0x0f, 0x1f, 0x40, 0x00 };
|
|
/* nopl 0(%[re]ax,%[re]ax,1) */
|
|
static const char nop_5[] = { 0x0f, 0x1f, 0x44, 0x00, 0x00 };
|
|
/* nopw 0(%[re]ax,%[re]ax,1) */
|
|
static const char nop_6[] = { 0x66, 0x0f, 0x1f, 0x44, 0x00, 0x00 };
|
|
/* nopl 0L(%[re]ax) */
|
|
static const char nop_7[] = { 0x0f, 0x1f, 0x80, 0x00, 0x00, 0x00, 0x00 };
|
|
/* nopl 0L(%[re]ax,%[re]ax,1) */
|
|
static const char nop_8[] =
|
|
{ 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00};
|
|
/* nopw 0L(%[re]ax,%[re]ax,1) */
|
|
static const char nop_9[] =
|
|
{ 0x66, 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00 };
|
|
/* nopw %cs:0L(%[re]ax,%[re]ax,1) */
|
|
static const char nop_10[] =
|
|
{ 0x66, 0x2e, 0x0f, 0x1f, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00 };
|
|
static const char *const nops[] =
|
|
{ nop_1, nop_2, nop_3, nop_4, nop_5,
|
|
nop_6, nop_7, nop_8, nop_9, nop_10 };
|
|
bfd_size_type nop_size = long_nop ? ARRAY_SIZE (nops) : 2;
|
|
|
|
void *fill = bfd_malloc (count);
|
|
if (fill == NULL)
|
|
return fill;
|
|
|
|
if (code)
|
|
{
|
|
bfd_byte *p = fill;
|
|
while (count >= nop_size)
|
|
{
|
|
memcpy (p, nops[nop_size - 1], nop_size);
|
|
p += nop_size;
|
|
count -= nop_size;
|
|
}
|
|
if (count != 0)
|
|
memcpy (p, nops[count - 1], count);
|
|
}
|
|
else
|
|
memset (fill, 0, count);
|
|
|
|
return fill;
|
|
}
|
|
|
|
/* Fill the buffer with zero or short nop instruction if CODE is TRUE. */
|
|
|
|
void *
|
|
bfd_arch_i386_short_nop_fill (bfd_size_type count,
|
|
bfd_boolean is_bigendian ATTRIBUTE_UNUSED,
|
|
bfd_boolean code)
|
|
{
|
|
return bfd_arch_i386_fill (count, code, FALSE);
|
|
}
|
|
|
|
/* Fill the buffer with zero or long nop instruction if CODE is TRUE. */
|
|
|
|
static void *
|
|
bfd_arch_i386_long_nop_fill (bfd_size_type count,
|
|
bfd_boolean is_bigendian ATTRIBUTE_UNUSED,
|
|
bfd_boolean code)
|
|
{
|
|
return bfd_arch_i386_fill (count, code, TRUE);
|
|
}
|
|
|
|
/* Fill the buffer with zero, or one-byte nop instructions if CODE is TRUE. */
|
|
|
|
static void *
|
|
bfd_arch_i386_onebyte_nop_fill (bfd_size_type count,
|
|
bfd_boolean is_bigendian ATTRIBUTE_UNUSED,
|
|
bfd_boolean code)
|
|
{
|
|
void *fill = bfd_malloc (count);
|
|
if (fill != NULL)
|
|
memset (fill, code ? 0x90 : 0, count);
|
|
return fill;
|
|
}
|
|
|
|
#define N(BITS, MACH, NAME, PRINT, DEF, FILL, NEXT) \
|
|
{ BITS, /* Bits in a word. */ \
|
|
BITS, /* Bits in an address. */ \
|
|
8, /* Bits in a byte. */ \
|
|
bfd_arch_i386, \
|
|
MACH, /* Machine number. */ \
|
|
NAME, \
|
|
PRINT, \
|
|
3, /* Section alignment power. */ \
|
|
DEF, /* Default architecture version ? */ \
|
|
bfd_i386_compatible, \
|
|
bfd_default_scan, \
|
|
FILL, \
|
|
NEXT, \
|
|
0 /* Maximum instruction length. */ \
|
|
}
|
|
|
|
|
|
static const bfd_arch_info_type bfd_x64_32_nacl_arch =
|
|
N (64, bfd_mach_x64_32_nacl, "i386", "i386:x64-32:nacl",
|
|
FALSE, bfd_arch_i386_onebyte_nop_fill, NULL);
|
|
|
|
static const bfd_arch_info_type bfd_x86_64_nacl_arch =
|
|
N (64, bfd_mach_x86_64_nacl, "i386", "i386:x86-64:nacl",
|
|
FALSE, bfd_arch_i386_onebyte_nop_fill, &bfd_x64_32_nacl_arch);
|
|
|
|
const bfd_arch_info_type bfd_i386_nacl_arch =
|
|
N (32, bfd_mach_i386_i386_nacl, "i386", "i386:nacl",
|
|
TRUE, bfd_arch_i386_onebyte_nop_fill, &bfd_x86_64_nacl_arch);
|
|
|
|
|
|
static const bfd_arch_info_type bfd_x64_32_arch_intel_syntax =
|
|
N (64, bfd_mach_x64_32_intel_syntax, "i386:intel", "i386:x64-32:intel",
|
|
FALSE, bfd_arch_i386_long_nop_fill, &bfd_i386_nacl_arch);
|
|
|
|
static const bfd_arch_info_type bfd_x86_64_arch_intel_syntax =
|
|
N (64, bfd_mach_x86_64_intel_syntax, "i386:intel", "i386:x86-64:intel",
|
|
FALSE, bfd_arch_i386_long_nop_fill, &bfd_x64_32_arch_intel_syntax);
|
|
|
|
static const bfd_arch_info_type bfd_i386_arch_intel_syntax =
|
|
N (32, bfd_mach_i386_i386_intel_syntax, "i386:intel", "i386:intel",
|
|
TRUE, bfd_arch_i386_short_nop_fill, &bfd_x86_64_arch_intel_syntax);
|
|
|
|
|
|
static const bfd_arch_info_type i8086_arch =
|
|
N (32, bfd_mach_i386_i8086, "i8086", "i8086",
|
|
FALSE, bfd_arch_i386_short_nop_fill, &bfd_i386_arch_intel_syntax);
|
|
|
|
static const bfd_arch_info_type bfd_x64_32_arch =
|
|
N (64, bfd_mach_x64_32, "i386", "i386:x64-32",
|
|
FALSE, bfd_arch_i386_long_nop_fill, &i8086_arch);
|
|
|
|
static const bfd_arch_info_type bfd_x86_64_arch =
|
|
N (64, bfd_mach_x86_64, "i386", "i386:x86-64",
|
|
FALSE, bfd_arch_i386_long_nop_fill, &bfd_x64_32_arch);
|
|
|
|
const bfd_arch_info_type bfd_i386_arch =
|
|
N (32, bfd_mach_i386_i386, "i386", "i386",
|
|
TRUE, bfd_arch_i386_short_nop_fill, &bfd_x86_64_arch);
|