Fix MIPS R2 hosts support

-----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCgAzFiEEd0YmQqnvlP0Pdxltupx4Bh3djJsFAlkNq9wVHGF1cmVsaWVu
 QGF1cmVsMzIubmV0AAoJELqceAYd3YybaWUQAIHb4N2E94nw8sFpiF4Fh7iXkbVF
 f9byOH0snn9rkdwTdx80HBK1jxAHtLZYfsHnk9m4RjIVcortjtgznfBBjX03Y84e
 7gt/j3KfbTMF6UsgJ64rJjshzVOQ5bO7zihvSzDD8pLc5THERivS4Ck2/phoTYjN
 ucjDKZXMJnb5GUCCvvYAkDIblilEC6eQe2v6wdfxgl1TJHXMWy2FUKMQ2dpyiZ/s
 IS8wozxxFmkWHlROKnmK19Z83ZQy7ydKFf1t9NZ7feR+AQgLd8COy0YO/ticGMTD
 ER70CVcRKZ5ZEPEZeJxbnR4QsSmifdzNfXCz9f6kJrEEQqakFM85tCWN/gYpdu0a
 3cMhu+Dof1PwSp2YUu4Bh0ipt1nOaH2+yDUwgp25ld52pIwuQ/dZgALLPF3XmVOI
 Aw8cauE5lB2mlxcjkz+lW/MCA802WwJPfwZzc9RQaCzBCUS3RqfpY68fNlb6nUkp
 qgbBHi+p4PNhqHoIiKIMHn+aRmAeJQY4P9r6sOPIi4C91GErZ5fsbxiRE0qSbirj
 QsrAq7tm2FaiX3P4nJ3kBJfrv/39Kj7BHDwCeGM1NR+ARpEmcnz1+HoiO/CfrKQb
 0X7pBvzd3SlrjFdWkp42Pcy9b5AI+fjAAm6Tosy1RQbLYCWkmjQHIcA2eoYUFkTd
 MHPNceRFEiyYpgxV
 =d4yl
 -----END PGP SIGNATURE-----

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: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2017-05-08 13:29:50 -04:00
commit 7ed57b6622

View file

@ -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: