X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=bfd%2Fcpu-i386.c;h=b727ac81909a69f17a93bbf07ca97e6b5188200e;hb=ec892a0718dc47c2d009532865c353daa749eaa1;hp=4001a05a4226a73ee7ce8d2a69baa4afe1219771;hpb=cd123cb70c845b890eed231a84e6e84c92c2ef92;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c index 4001a05a42..b727ac8190 100644 --- a/bfd/cpu-i386.c +++ b/bfd/cpu-i386.c @@ -1,6 +1,5 @@ /* BFD support for the Intel 386 architecture. - Copyright 1992, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2004, 2007 - Free Software Foundation, Inc. + Copyright (C) 1992-2015 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -22,8 +21,185 @@ #include "sysdep.h" #include "bfd.h" #include "libbfd.h" +#include "libiberty.h" -const bfd_arch_info_type bfd_x86_64_arch_intel_syntax = +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; +} + + +static const bfd_arch_info_type bfd_x64_32_nacl_arch = +{ + 64, /* 64 bits in a word */ + 64, /* 64 bits in an address */ + 8, /* 8 bits in a byte */ + bfd_arch_i386, + bfd_mach_x64_32_nacl, + "i386", + "i386:x64-32:nacl", + 3, + FALSE, + bfd_i386_compatible, + bfd_default_scan, + bfd_arch_i386_onebyte_nop_fill, + NULL +}; + +static const bfd_arch_info_type bfd_x86_64_nacl_arch = +{ + 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_nacl, + "i386", + "i386:x86-64:nacl", + 3, + FALSE, + bfd_i386_compatible, + bfd_default_scan, + bfd_arch_i386_onebyte_nop_fill, + &bfd_x64_32_nacl_arch +}; + +const bfd_arch_info_type bfd_i386_nacl_arch = +{ + 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_nacl, + "i386", + "i386:nacl", + 3, + TRUE, + bfd_i386_compatible, + bfd_default_scan, + bfd_arch_i386_onebyte_nop_fill, + &bfd_x86_64_nacl_arch +}; + +static const bfd_arch_info_type bfd_x64_32_arch_intel_syntax = +{ + 64, /* 64 bits in a word */ + 64, /* 64 bits in an address */ + 8, /* 8 bits in a byte */ + bfd_arch_i386, + bfd_mach_x64_32_intel_syntax, + "i386:intel", + "i386:x64-32:intel", + 3, + FALSE, + bfd_i386_compatible, + bfd_default_scan, + bfd_arch_i386_long_nop_fill, + &bfd_i386_nacl_arch +}; + +static const bfd_arch_info_type bfd_x86_64_arch_intel_syntax = { 64, /* 64 bits in a word */ 64, /* 64 bits in an address */ @@ -34,12 +210,13 @@ const bfd_arch_info_type bfd_x86_64_arch_intel_syntax = "i386:x86-64:intel", 3, FALSE, - bfd_default_compatible, + bfd_i386_compatible, bfd_default_scan, - 0 + bfd_arch_i386_long_nop_fill, + &bfd_x64_32_arch_intel_syntax, }; -const bfd_arch_info_type bfd_i386_arch_intel_syntax = +static const bfd_arch_info_type bfd_i386_arch_intel_syntax = { 32, /* 32 bits in a word */ 32, /* 32 bits in an address */ @@ -50,12 +227,13 @@ const bfd_arch_info_type bfd_i386_arch_intel_syntax = "i386:intel", 3, TRUE, - bfd_default_compatible, + bfd_i386_compatible, bfd_default_scan, + bfd_arch_i386_short_nop_fill, &bfd_x86_64_arch_intel_syntax }; -const bfd_arch_info_type i8086_arch = +static const bfd_arch_info_type i8086_arch = { 32, /* 32 bits in a word */ 32, /* 32 bits in an address (well, not really) */ @@ -66,15 +244,33 @@ const bfd_arch_info_type i8086_arch = "i8086", 3, FALSE, - bfd_default_compatible, + bfd_i386_compatible, bfd_default_scan, + bfd_arch_i386_short_nop_fill, &bfd_i386_arch_intel_syntax }; -const bfd_arch_info_type bfd_x86_64_arch = +static const bfd_arch_info_type bfd_x64_32_arch = +{ + 64, /* 64 bits in a word */ + 64, /* 64 bits in an address */ + 8, /* 8 bits in a byte */ + bfd_arch_i386, + bfd_mach_x64_32, + "i386", + "i386:x64-32", + 3, + FALSE, + bfd_i386_compatible, + bfd_default_scan, + bfd_arch_i386_long_nop_fill, + &i8086_arch +}; + +static const bfd_arch_info_type bfd_x86_64_arch = { - 64, /* 32 bits in a word */ - 64, /* 32 bits in an address */ + 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, @@ -82,9 +278,10 @@ const bfd_arch_info_type bfd_x86_64_arch = "i386:x86-64", 3, FALSE, - bfd_default_compatible, + bfd_i386_compatible, bfd_default_scan, - &i8086_arch + bfd_arch_i386_long_nop_fill, + &bfd_x64_32_arch }; const bfd_arch_info_type bfd_i386_arch = @@ -98,7 +295,8 @@ const bfd_arch_info_type bfd_i386_arch = "i386", 3, TRUE, - bfd_default_compatible, + bfd_i386_compatible, bfd_default_scan, + bfd_arch_i386_short_nop_fill, &bfd_x86_64_arch };