Commit e6533b57 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20170906' into staging 



Queued tcg patches

# gpg: Signature made Wed 06 Sep 2017 15:27:16 BST
# gpg:                using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg:                 aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B

* remotes/rth/tags/pull-tcg-20170906:
  tcg/s390: Use slbgr for setcond le and leu
  tcg/s390: Use load-on-condition-2 facility
  tcg/s390: Use distinct-operands facility
  tcg/s390: Merge ori+xori facilities check to tcg_target_op_def
  tcg/s390: Merge add2i facilities check to tcg_target_op_def
  tcg/s390: Merge muli facilities check to tcg_target_op_def
  tcg/s390: Merge cmpi facilities check to tcg_target_op_def
  tcg/s390: Fully convert tcg_target_op_def
  disas/i386: Add disassembly of rorx
  disas/i386: Add disassembly of vex.0f38.f5
  disas/i386: Fix disassembly of two-byte vex prefixes
  tcg: Implement implicit ordering semantics
  tcg: Add tcg target default memory ordering
  tcg: Remove support for ia64 as host

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8ee5f9b3 4609190b

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -1647,12 +1647,6 @@ S: Maintained 
F: tcg/i386/

F: disas/i386.c



IA64 target

M: Aurelien Jarno <aurelien@aurel32.net>

S: Maintained

F: tcg/ia64/

F: disas/ia64.c



MIPS target

M: Aurelien Jarno <aurelien@aurel32.net>

S: Maintained

configure

+0 −6
Original line number Diff line number Diff line
@@ -634,9 +634,6 @@ case "$cpu" in 
    cpu="$cpu"

    supported_cpu="yes"

  ;;

  ia64)

    cpu="$cpu"

  ;;

  i386|i486|i586|i686|i86pc|BePC)

    cpu="i386"

    supported_cpu="yes"
@@ -6459,9 +6456,6 @@ for i in $ARCH $TARGET_BASE_ARCH ; do 
  i386|x86_64|x32)

    disas_config "I386"

  ;;

  ia64*)

    disas_config "IA64"

  ;;

  lm32)

    disas_config "LM32"

  ;;

disas.c

+0 −2
Original line number Diff line number Diff line
@@ -313,8 +313,6 @@ void disas(FILE *out, void *code, unsigned long size) 
    print_insn = print_insn_s390;

#elif defined(__hppa__)

    print_insn = print_insn_hppa;

#elif defined(__ia64__)

    print_insn = print_insn_ia64;

#endif

    if (print_insn == NULL) {

        print_insn = print_insn_od_host;

disas/Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ arm-a64.o-cflags := -I$(libvixldir) -Wno-sign-compare 
common-obj-$(CONFIG_CRIS_DIS) += cris.o

common-obj-$(CONFIG_HPPA_DIS) += hppa.o

common-obj-$(CONFIG_I386_DIS) += i386.o

common-obj-$(CONFIG_IA64_DIS) += ia64.o

common-obj-$(CONFIG_M68K_DIS) += m68k.o

common-obj-$(CONFIG_MICROBLAZE_DIS) += microblaze.o

common-obj-$(CONFIG_MIPS_DIS) += mips.o

disas/i386.c

+24 −5
Original line number Diff line number Diff line
@@ -683,6 +683,8 @@ fetch_data(struct disassemble_info *info, bfd_byte *addr) 
#define PREGRP105 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 105 } }

#define PREGRP106 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 106 } }

#define PREGRP107 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 107 } }

#define PREGRP108 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 108 } }

#define PREGRP109 NULL, { { NULL, USE_PREFIX_USER_TABLE }, { NULL, 109 } }



#define X86_64_0  NULL, { { NULL, X86_64_SPECIAL }, { NULL, 0 } }

#define X86_64_1  NULL, { { NULL, X86_64_SPECIAL }, { NULL, 1 } }
@@ -1484,7 +1486,7 @@ static const unsigned char threebyte_0x38_uses_REPNZ_prefix[256] = { 
  /* c0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* cf */

  /* d0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* df */

  /* e0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* ef */

  /* f0 */ 1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0, /* ff */

  /* f0 */ 1,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0, /* ff */

  /*       -------------------------------        */

  /*       0 1 2 3 4 5 6 7 8 9 a b c d e f        */

};
@@ -1508,7 +1510,7 @@ static const unsigned char threebyte_0x38_uses_REPZ_prefix[256] = { 
  /* c0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* cf */

  /* d0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* df */

  /* e0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* ef */

  /* f0 */ 0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0, /* ff */

  /* f0 */ 0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0, /* ff */

  /*       -------------------------------        */

  /*       0 1 2 3 4 5 6 7 8 9 a b c d e f        */

};
@@ -1556,7 +1558,7 @@ static const unsigned char threebyte_0x3a_uses_REPNZ_prefix[256] = { 
  /* c0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* cf */

  /* d0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* df */

  /* e0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* ef */

  /* f0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* ff */

  /* f0 */ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* ff */

  /*       -------------------------------        */

  /*       0 1 2 3 4 5 6 7 8 9 a b c d e f        */

};
@@ -2808,6 +2810,22 @@ static const struct dis386 prefix_user_table[][4] = { 
    { "bsfS",	{ Gv, Ev } },

    { "(bad)",	{ XX } },

  },



  /* PREGRP108 */

  {

    { "bzhi",   { Gv, Ev, Bv } },

    { "pext",   { Gv, Bv, Ev } },

    { "(bad)",  { XX } },

    { "pdep",   { Gv, Bv, Ev } },

  },



  /* PREGRP109 */

  {

    { "(bad)",  { XX } },

    { "(bad)",  { XX } },

    { "(bad)",  { XX } },

    { "rorx",   { Gv, Ev, Ib } },

  },

};



static const struct dis386 x86_64_table[][2] = {
@@ -3108,7 +3126,7 @@ static const struct dis386 three_byte_table[][256] = { 
    { PREGRP105 },

    { "(bad)", { XX } },

    { "(bad)", { XX } },

    { "(bad)", { XX } },

    { PREGRP108 },

    { "(bad)", { XX } },

    { PREGRP106 },

    /* f8 */
@@ -3394,7 +3412,7 @@ static const struct dis386 three_byte_table[][256] = { 
    { "(bad)", { XX } },

    { "(bad)", { XX } },

    /* f0 */

    { "(bad)", { XX } },

    { PREGRP109 },

    { "(bad)", { XX } },

    { "(bad)", { XX } },

    { "(bad)", { XX } },
@@ -3559,6 +3577,7 @@ ckvexprefix (void) 
    } else {

        /* Two byte VEX prefix.  */

        newrex |= (vex2 & 0x80 ? 0 : REX_R);

        newpfx |= PREFIX_VEX_0F;

        codep += 2;

    }