From: Dejan Jevtic <dejan.jevtic@valgrind.org>
Date: Wed, 11 Sep 2013 15:34:37 +0000 (+0000)
Subject: mips64: fixed problem with Iop's for mips64.
X-Git-Tag: svn/VALGRIND_3_9_0^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b4d4a17186ed9f17697466aa5cce291c504a71a;p=thirdparty%2Fvalgrind.git

mips64: fixed problem with Iop's for mips64.

Fixed problem with some Iop's that was discovered while running vbit-test
on mips64. Fixed operations are: Iop_1Uto64, Iop_Left64 and Iop_CmpwNEZ64.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2757
---

diff --git a/VEX/priv/host_mips_isel.c b/VEX/priv/host_mips_isel.c
index 0078b75b16..d59b4ab166 100644
--- a/VEX/priv/host_mips_isel.c
+++ b/VEX/priv/host_mips_isel.c
@@ -1551,6 +1551,7 @@ static HReg iselWordExpr_R_wrk(ISelEnv * env, IRExpr * e)
             return r_dst;
          }
 
+         case Iop_1Uto64:
          case Iop_8Uto16:
          case Iop_8Uto64:
          case Iop_16Uto64: {
@@ -1574,10 +1575,6 @@ static HReg iselWordExpr_R_wrk(ISelEnv * env, IRExpr * e)
             return r_dst;
          }
 
-         case Iop_1Uto64:
-            vassert(mode64);
-            return iselWordExpr_R(env, e->Iex.Unop.arg);
-
          case Iop_64HIto32: {
             if (env->mode64) {
                HReg r_dst = newVRegI(env);
@@ -1685,8 +1682,13 @@ static HReg iselWordExpr_R_wrk(ISelEnv * env, IRExpr * e)
                goto irreducible;
             HReg r_dst = newVRegI(env);
             HReg r_src = iselWordExpr_R(env, e->Iex.Unop.arg);
-            addInstr(env, MIPSInstr_Alu(Malu_SUB, r_dst, hregMIPS_GPR0(mode64),
-                          MIPSRH_Reg(r_src)));
+            if (op_unop == Iop_Left64) {
+               addInstr(env, MIPSInstr_Alu(Malu_DSUB, r_dst, hregMIPS_GPR0(mode64),
+                             MIPSRH_Reg(r_src)));
+            } else {
+               addInstr(env, MIPSInstr_Alu(Malu_SUB, r_dst, hregMIPS_GPR0(mode64),
+                             MIPSRH_Reg(r_src)));
+            }
             addInstr(env, MIPSInstr_Alu(Malu_OR, r_dst, r_dst,
                           MIPSRH_Reg(r_src)));
             return r_dst;
@@ -1733,7 +1735,7 @@ static HReg iselWordExpr_R_wrk(ISelEnv * env, IRExpr * e)
             vassert(env->mode64);
             tmp1 = iselWordExpr_R(env, e->Iex.Unop.arg);
 
-            addInstr(env, MIPSInstr_Alu(Malu_SUB, tmp2, hregMIPS_GPR0(mode64),
+            addInstr(env, MIPSInstr_Alu(Malu_DSUB, tmp2, hregMIPS_GPR0(mode64),
                           MIPSRH_Reg(tmp1)));
 
             addInstr(env, MIPSInstr_Alu(Malu_OR, tmp2, tmp2, MIPSRH_Reg(tmp1)));