From: Petar Jovanovic <mips32r2@gmail.com>
Date: Sat, 3 Feb 2018 22:28:30 +0000 (+0100)
Subject: mips: remove several compiler warnings
X-Git-Tag: VALGRIND_3_14_0~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=482e36cb6ebbb3c818b8213529fd6c2454bc2b33;p=thirdparty%2Fvalgrind.git

mips: remove several compiler warnings

A few warnings have showed up with recent changes on trunk:

warning: parameter names (without types) in function declaration
warning: no previous prototype for 'showRotxOp'
warning: unused variable 'src1' [-Wunused-variable]

Fixing it.
Thanks Paul Floyd for reporting one of the issues.
---

diff --git a/VEX/priv/host_mips_defs.c b/VEX/priv/host_mips_defs.c
index a88ad1a84e..64a769dcfd 100644
--- a/VEX/priv/host_mips_defs.c
+++ b/VEX/priv/host_mips_defs.c
@@ -975,6 +975,9 @@ const HChar *showRotxOp(MIPSRotxOp op) {
       case Rotx64:
          ret = "rotx64";
          break;
+      default:
+         vpanic("showRotxOp");
+         break;
    }
 
    return ret;
diff --git a/VEX/priv/host_mips_defs.h b/VEX/priv/host_mips_defs.h
index 8834ae9693..494ba4ea21 100644
--- a/VEX/priv/host_mips_defs.h
+++ b/VEX/priv/host_mips_defs.h
@@ -544,14 +544,14 @@ typedef enum {
 
 } MIPSFpOp;
 
-extern const HChar *showRotxOp(MIPSRotxOp);
+extern const HChar *showMIPSFpOp(MIPSFpOp);
 
 typedef enum {
    Rotx32,
    Rotx64
 } MIPSRotxOp;
 
-extern const HChar *showMIPSFpOp(MIPSFpOp);
+extern const HChar *showRotxOp(MIPSRotxOp);
 
 /* Move from/to fpr to/from gpr */
 typedef enum {
diff --git a/VEX/priv/host_mips_isel.c b/VEX/priv/host_mips_isel.c
index e3ada211ae..f1b6571751 100644
--- a/VEX/priv/host_mips_isel.c
+++ b/VEX/priv/host_mips_isel.c
@@ -2393,6 +2393,7 @@ static HReg iselWordExpr_R_wrk(ISelEnv * env, IRExpr * e)
       return r_dst;
    }
 
+#if (__mips_isa_rev >= 6)
    case Iex_Qop: {
       HReg dst = newVRegI(env);
       HReg src1 = iselWordExpr_R(env, e->Iex.Qop.details->arg1);
@@ -2400,19 +2401,18 @@ static HReg iselWordExpr_R_wrk(ISelEnv * env, IRExpr * e)
       HReg src3 = iselWordExpr_R(env, e->Iex.Qop.details->arg3);
       HReg src4 = iselWordExpr_R(env, e->Iex.Qop.details->arg4);
       switch (e->Iex.Qop.details->op) {
-#if (__mips_isa_rev >= 6)
         case Iop_Rotx32:
           addInstr(env, MIPSInstr_Bitswap(Rotx32, dst, src1, src2, src3, src4));
           break;
         case Iop_Rotx64:
           addInstr(env, MIPSInstr_Bitswap(Rotx64, dst, src1, src2, src3, src4));
           break;
-#endif
         default:
           break;
       }
       return dst;
    }
+#endif
 
    default:
       break;