summary refs log tree commit diff stats
path: root/tcg/mips/tcg-target.inc.c
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2017-05-08 13:29:50 -0400
committerStefan Hajnoczi <stefanha@redhat.com>2017-05-08 13:29:50 -0400
commit7ed57b66221b5a3e23b3519824637b297dc92090 (patch)
treeedacd5cc3a819bea006bdfae95d883c25bb9b889 /tcg/mips/tcg-target.inc.c
parent1c5d5061019dadfaa9ca25d23c9688fc18c148fa (diff)
parent2f5a5f5774d95baacf86c03aa8a77a2d0390f2b2 (diff)
downloadfocaccia-qemu-7ed57b66221b5a3e23b3519824637b297dc92090.tar.gz
focaccia-qemu-7ed57b66221b5a3e23b3519824637b297dc92090.zip
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>
Diffstat (limited to 'tcg/mips/tcg-target.inc.c')
-rw-r--r--tcg/mips/tcg-target.inc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c
index 01ac7b2c81..2a7e1c7f5b 100644
--- a/tcg/mips/tcg-target.inc.c
+++ b/tcg/mips/tcg-target.inc.c
@@ -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: