X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fcpu-i386.c;h=5df643551986c24308f64451da20a48e7178e8a9;hb=f1d293cc58bfe5f6b507dc2351f17632df8ab677;hp=f4928275727c8482a4645d79ead3bab4aa4ddae4;hpb=2ee563b53258d390d7446e90a67f465d504ae44c;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c index f492827572..5df6435519 100644 --- a/bfd/cpu-i386.c +++ b/bfd/cpu-i386.c @@ -1,101 +1,191 @@ /* BFD support for the Intel 386 architecture. - Copyright 1992, 1994, 1995, 1996, 1998, 2000, 2001, 2002 - Free Software Foundation, Inc. + Copyright (C) 1992-2019 Free Software Foundation, Inc. -This file is part of BFD, the Binary File Descriptor library. + 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 2 of the License, or -(at your option) any later version. + 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. + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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 "bfd.h" #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); -const bfd_arch_info_type bfd_i386_arch_intel_syntax = +static const bfd_arch_info_type * +bfd_i386_compatible (const bfd_arch_info_type *a, + const bfd_arch_info_type *b) { - 32, /* 32 bits in a word */ - 32, /* 32 bits in an address */ - 8, /* 8 bits in a byte */ - bfd_arch_i386, - bfd_mach_i386_i386_intel_syntax, - "i386:intel", - "i386:intel", - 3, - true, - bfd_default_compatible, - bfd_default_scan , - 0, -}; -const bfd_arch_info_type bfd_x86_64_arch_intel_syntax = + 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) { - 64, /* 64 bits in a word */ - 64, /* 64 bits in an address */ - 8, /* 8 bits in a byte */ - bfd_arch_i386, - bfd_mach_x86_64_intel_syntax, - "i386:intel", - "i386:x86-64:intel", - 3, - true, - bfd_default_compatible, - bfd_default_scan , - &bfd_i386_arch_intel_syntax, -}; -static const bfd_arch_info_type i8086_arch = + /* 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) { - 32, /* 32 bits in a word */ - 32, /* 32 bits in an address (well, not really) */ - 8, /* 8 bits in a byte */ - bfd_arch_i386, - bfd_mach_i386_i8086, - "i8086", - "i8086", - 3, - false, - bfd_default_compatible, - bfd_default_scan , - &bfd_x86_64_arch_intel_syntax, -}; - -const bfd_arch_info_type bfd_x86_64_arch = + 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) { - 64, /* 32 bits in a word */ - 64, /* 32 bits in an address */ - 8, /* 8 bits in a byte */ - bfd_arch_i386, - bfd_mach_x86_64, - "i386", - "i386:x86-64", - 3, - true, - bfd_default_compatible, - bfd_default_scan , - &i8086_arch, -}; + return bfd_arch_i386_fill (count, code, TRUE); +} -const bfd_arch_info_type bfd_i386_arch = +/* 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) { - 32, /* 32 bits in a word */ - 32, /* 32 bits in an address */ - 8, /* 8 bits in a byte */ - bfd_arch_i386, - bfd_mach_i386_i386, - "i386", - "i386", - 3, - true, - bfd_default_compatible, - bfd_default_scan , - &bfd_x86_64_arch -}; + 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);