Commit 7ed57b66 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'aurel32/tags/pull-tcg-mips-20170506' into staging 



Fix MIPS R2 hosts support

# gpg: Signature made Sat 06 May 2017 06:56:28 AM EDT
# gpg:                using RSA key 0xBA9C78061DDD8C9B
# gpg: Good signature from "Aurelien Jarno <aurelien@aurel32.net>"
# gpg:                 aka "Aurelien Jarno <aurelien@jarno.fr>"
# gpg:                 aka "Aurelien Jarno <aurel32@debian.org>"
# Primary key fingerprint: 7746 2642 A9EF 94FD 0F77  196D BA9C 7806 1DDD 8C9B

* aurel32/tags/pull-tcg-mips-20170506:
  tcg/mips: fix field extraction opcode

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 1c5d5061 2f5a5f57

tcg/mips/tcg-target.inc.c

+2 −2
Original line number Diff line number Diff line
@@ -2093,11 +2093,11 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, 
                         args[3] + args[4] - 1, args[3]);

        break;

    case INDEX_op_extract_i32:

        tcg_out_opc_bf(s, OPC_EXT, a0, a1, a2 + args[3] - 1, a2);

        tcg_out_opc_bf(s, OPC_EXT, a0, a1, args[3] - 1, a2);

        break;

    case INDEX_op_extract_i64:

        tcg_out_opc_bf64(s, OPC_DEXT, OPC_DEXTM, OPC_DEXTU, a0, a1,

                         a2 + args[3] - 1, a2);

                         args[3] - 1, a2);

        break;



    case INDEX_op_brcond_i32: