s390 back end: s390_isel_vec_expr_wrk: fix some enum type confusion. n-i-bz.

In s390_isel_vec_expr_wrk() there has been some assignments of enum-typed
values to variables of different enum types.  This fixes it.  It also adds a
few initialisations to variables of type HReg for safety against the
possibility of them being used uninitialised.  No functional change.  Tested
by Andreas Arnez.

diff --git a/VEX/priv/host_s390_defs.h b/VEX/priv/host_s390_defs.h
index 40f0472a2f3893005f9f60a0c0b9234f1d15a0f4..ed1f3cfb2e0142de967548004d828f9d458dc3ce 100644 (file)
--- a/VEX/priv/host_s390_defs.h
+++ b/VEX/priv/host_s390_defs.h
@@ -205,7 +205,8 @@ typedef enum {
    S390_VEC_COUNT_ONES,
    S390_VEC_FLOAT_NEG,
    S390_VEC_FLOAT_ABS,
-   S390_VEC_FLOAT_SQRT
+   S390_VEC_FLOAT_SQRT,
+   S390_UNOP_T_INVALID
 } s390_unop_t;
 
 /* The kind of ternary BFP operations */
@@ -347,7 +348,8 @@ typedef enum {
    S390_VEC_GET_ELEM,
    S390_VEC_ELEM_SHL_INT,
    S390_VEC_ELEM_SHRA_INT,
-   S390_VEC_ELEM_SHRL_INT
+   S390_VEC_ELEM_SHRL_INT,
+   S390_VEC_AMODEOP_T_INVALID
 } s390_vec_amodeop_t;
 
 /* The vector operations with three (vector, amode and integer) operands */
@@ -403,7 +405,8 @@ typedef enum {
    S390_VEC_FLOAT_DIV,
    S390_VEC_FLOAT_COMPARE_EQUAL,
    S390_VEC_FLOAT_COMPARE_LESS_OR_EQUAL,
-   S390_VEC_FLOAT_COMPARE_LESS
+   S390_VEC_FLOAT_COMPARE_LESS,
+   S390_VEC_BINOP_T_INVALID
 } s390_vec_binop_t;
 
 /* The vector operations with three operands */

diff --git a/VEX/priv/host_s390_isel.c b/VEX/priv/host_s390_isel.c
index 79581ff7aa0ce58b07a6155553eb3b0709bcc1d3..38989f217e80036ef7e32e5ef6b4a46378b0a3f4 100644 (file)
--- a/VEX/priv/host_s390_isel.c
+++ b/VEX/priv/host_s390_isel.c
@@ -3702,9 +3702,10 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
    /* --------- UNARY OP --------- */
    case Iex_Unop: {
       UChar size_for_int_arg = 0;
-      HReg dst;
-      HReg reg1;
-      s390_unop_t vec_op;
+      HReg dst = INVALID_HREG;
+      HReg reg1 = INVALID_HREG;
+      s390_unop_t vec_unop = S390_UNOP_T_INVALID;
+      s390_vec_binop_t vec_binop = S390_VEC_BINOP_T_INVALID;
       IROp op = expr->Iex.Unop.op;
       IRExpr* arg = expr->Iex.Unop.arg;
       switch(op) {
@@ -3762,46 +3763,46 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
 
       case Iop_Dup8x16:
          size = size_for_int_arg = 1;
-         vec_op = S390_VEC_DUPLICATE;
+         vec_unop = S390_VEC_DUPLICATE;
          goto Iop_V_int_wrk;
       case Iop_Dup16x8:
          size = size_for_int_arg = 2;
-         vec_op = S390_VEC_DUPLICATE;
+         vec_unop = S390_VEC_DUPLICATE;
          goto Iop_V_int_wrk;
       case Iop_Dup32x4:
          size = size_for_int_arg = 4;
-         vec_op = S390_VEC_DUPLICATE;
+         vec_unop = S390_VEC_DUPLICATE;
          goto Iop_V_int_wrk;
 
       case Iop_Widen8Sto16x8:
          size = 1;
          size_for_int_arg = 8;
-         vec_op = S390_VEC_UNPACKLOWS;
+         vec_unop = S390_VEC_UNPACKLOWS;
          goto Iop_V_int_wrk;
       case Iop_Widen16Sto32x4:
          size = 2;
          size_for_int_arg = 8;
-         vec_op = S390_VEC_UNPACKLOWS;
+         vec_unop = S390_VEC_UNPACKLOWS;
          goto Iop_V_int_wrk;
       case Iop_Widen32Sto64x2:
          size = 4;
          size_for_int_arg = 8;
-         vec_op = S390_VEC_UNPACKLOWS;
+         vec_unop = S390_VEC_UNPACKLOWS;
          goto Iop_V_int_wrk;
       case Iop_Widen8Uto16x8:
          size = 1;
          size_for_int_arg = 8;
-         vec_op = S390_VEC_UNPACKLOWU;
+         vec_unop = S390_VEC_UNPACKLOWU;
          goto Iop_V_int_wrk;
       case Iop_Widen16Uto32x4:
          size = 2;
          size_for_int_arg = 8;
-         vec_op = S390_VEC_UNPACKLOWU;
+         vec_unop = S390_VEC_UNPACKLOWU;
          goto Iop_V_int_wrk;
       case Iop_Widen32Uto64x2:
          size = 4;
          size_for_int_arg = 8;
-         vec_op = S390_VEC_UNPACKLOWU;
+         vec_unop = S390_VEC_UNPACKLOWU;
          goto Iop_V_int_wrk;
 
       Iop_V_int_wrk: {
@@ -3809,78 +3810,79 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
          s390_amode* amode2 = s390_isel_amode(env, IRExpr_Const(IRConst_U64(0)));
          reg1 = s390_isel_int_expr(env, arg);
 
+         vassert(vec_unop != S390_UNOP_T_INVALID);
          addInstr(env,
                   s390_insn_vec_amodeintop(size_for_int_arg, S390_VEC_SET_ELEM,
                                            vr1, amode2, reg1));
 
          dst = newVRegV(env);
-         addInstr(env, s390_insn_unop(size, vec_op, dst, s390_opnd_reg(vr1)));
+         addInstr(env, s390_insn_unop(size, vec_unop, dst, s390_opnd_reg(vr1)));
          return dst;
       }
 
       case Iop_Abs8x16:
          size = 1;
-         vec_op = S390_VEC_ABS;
+         vec_unop = S390_VEC_ABS;
          goto Iop_V_wrk;
       case Iop_Abs16x8:
          size = 2;
-         vec_op = S390_VEC_ABS;
+         vec_unop = S390_VEC_ABS;
          goto Iop_V_wrk;
       case Iop_Abs32x4:
          size = 4;
-         vec_op = S390_VEC_ABS;
+         vec_unop = S390_VEC_ABS;
          goto Iop_V_wrk;
       case Iop_Abs64x2:
          size = 8;
-         vec_op = S390_VEC_ABS;
+         vec_unop = S390_VEC_ABS;
          goto Iop_V_wrk;
 
       case Iop_Clz8x16:
          size = 1;
-         vec_op = S390_VEC_COUNT_LEADING_ZEROES;
+         vec_unop = S390_VEC_COUNT_LEADING_ZEROES;
          goto Iop_V_wrk;
       case Iop_Ctz8x16:
          size = 1;
-         vec_op = S390_VEC_COUNT_TRAILING_ZEROES;
+         vec_unop = S390_VEC_COUNT_TRAILING_ZEROES;
          goto Iop_V_wrk;
       case Iop_Clz16x8:
          size = 2;
-         vec_op = S390_VEC_COUNT_LEADING_ZEROES;
+         vec_unop = S390_VEC_COUNT_LEADING_ZEROES;
          goto Iop_V_wrk;
       case Iop_Ctz16x8:
          size = 2;
-         vec_op = S390_VEC_COUNT_TRAILING_ZEROES;
+         vec_unop = S390_VEC_COUNT_TRAILING_ZEROES;
          goto Iop_V_wrk;
       case Iop_Clz32x4:
          size = 4;
-         vec_op = S390_VEC_COUNT_LEADING_ZEROES;
+         vec_unop = S390_VEC_COUNT_LEADING_ZEROES;
          goto Iop_V_wrk;
       case Iop_Ctz32x4:
          size = 4;
-         vec_op = S390_VEC_COUNT_TRAILING_ZEROES;
+         vec_unop = S390_VEC_COUNT_TRAILING_ZEROES;
          goto Iop_V_wrk;
       case Iop_Clz64x2:
          size = 8;
-         vec_op = S390_VEC_COUNT_LEADING_ZEROES;
+         vec_unop = S390_VEC_COUNT_LEADING_ZEROES;
          goto Iop_V_wrk;
       case Iop_Ctz64x2:
          size = 8;
-         vec_op = S390_VEC_COUNT_TRAILING_ZEROES;
+         vec_unop = S390_VEC_COUNT_TRAILING_ZEROES;
          goto Iop_V_wrk;
 
       case Iop_Cnt8x16:
          size = 1;
-         vec_op = S390_VEC_COUNT_ONES;
+         vec_unop = S390_VEC_COUNT_ONES;
          goto Iop_V_wrk;
 
       case Iop_Neg64Fx2:
          size = 8;
-         vec_op = S390_VEC_FLOAT_NEG;
+         vec_unop = S390_VEC_FLOAT_NEG;
          goto Iop_V_wrk;
 
       case Iop_Abs64Fx2:
          size = 8;
-         vec_op = S390_VEC_FLOAT_ABS;
+         vec_unop = S390_VEC_FLOAT_ABS;
          goto Iop_V_wrk;
 
 
@@ -3888,8 +3890,9 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
          dst = newVRegV(env);
          reg1 = s390_isel_vec_expr(env, arg);
 
+         vassert(vec_unop != S390_UNOP_T_INVALID);
          addInstr(env,
-                  s390_insn_unop(size, vec_op, dst, s390_opnd_reg(reg1)));
+                  s390_insn_unop(size, vec_unop, dst, s390_opnd_reg(reg1)));
          return dst;
       }
 
@@ -3912,7 +3915,7 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
          } else {
             size = 2;
          }
-         vec_op = S390_VEC_PWSUM_W;
+         vec_binop = S390_VEC_PWSUM_W;
          goto Iop_Pairwise_wrk;
 
       case Iop_PwAddL32Ux4:
@@ -3922,7 +3925,7 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
          } else {
             size = 4;
          }
-         vec_op = S390_VEC_PWSUM_DW;
+         vec_binop = S390_VEC_PWSUM_DW;
          goto Iop_Pairwise_wrk;
 
       case Iop_PwAddL64Ux2:
@@ -3932,15 +3935,15 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
          } else {
             size = 8;
          }
-         vec_op = S390_VEC_PWSUM_QW;
+         vec_binop = S390_VEC_PWSUM_QW;
          goto Iop_Pairwise_wrk;
 
       Iop_Pairwise_wrk: {
          dst = newVRegV(env);
          reg1 = s390_isel_vec_expr(env, arg);
-
+         vassert(vec_binop != S390_VEC_BINOP_T_INVALID);
          addInstr(env,
-                  s390_insn_vec_binop(size, vec_op, dst, reg1,
+                  s390_insn_vec_binop(size, vec_binop, dst, reg1,
                                       vec_generate_zeroes(env)));
          return dst;
       }
@@ -3953,98 +3956,99 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
    /* --------- BINARY OP --------- */
    case Iex_Binop: {
       HReg dst = newVRegV(env);
-      HReg reg1, reg2;
+      HReg reg1 = INVALID_HREG, reg2 = INVALID_HREG;
       IROp op = expr->Iex.Binop.op;
-      s390_vec_binop_t vec_op = 0;
-      s390_vec_amodeop_t shift_op = 0;
+      s390_unop_t vec_unop = S390_UNOP_T_INVALID;
+      s390_vec_binop_t vec_binop = S390_VEC_BINOP_T_INVALID;
+      s390_vec_amodeop_t shift_op = S390_VEC_AMODEOP_T_INVALID;
       IRExpr* arg1 = expr->Iex.Binop.arg1;
       IRExpr* arg2 = expr->Iex.Binop.arg2;
       switch(op) {
       case Iop_QNarrowBin16Uto8Ux16:
          size = 2;
-         vec_op = S390_VEC_PACK_SATURU;
+         vec_binop = S390_VEC_PACK_SATURU;
          goto Iop_VV_wrk;
       case Iop_QNarrowBin16Sto8Sx16:
          size = 2;
-         vec_op = S390_VEC_PACK_SATURS;
+         vec_binop = S390_VEC_PACK_SATURS;
          goto Iop_VV_wrk;
       case Iop_QNarrowBin32Uto16Ux8:
          size = 4;
-         vec_op = S390_VEC_PACK_SATURU;
+         vec_binop = S390_VEC_PACK_SATURU;
          goto Iop_VV_wrk;
       case Iop_QNarrowBin32Sto16Sx8:
          size = 4;
-         vec_op = S390_VEC_PACK_SATURS;
+         vec_binop = S390_VEC_PACK_SATURS;
          goto Iop_VV_wrk;
       case Iop_QNarrowBin64Uto32Ux4:
          size = 8;
-         vec_op = S390_VEC_PACK_SATURU;
+         vec_binop = S390_VEC_PACK_SATURU;
          goto Iop_VV_wrk;
       case Iop_QNarrowBin64Sto32Sx4:
          size = 8;
-         vec_op = S390_VEC_PACK_SATURS;
+         vec_binop = S390_VEC_PACK_SATURS;
          goto Iop_VV_wrk;
 
       case Iop_NarrowBin16to8x16:
          size = 2;
-         vec_op = S390_VEC_PACK;
+         vec_binop = S390_VEC_PACK;
          goto Iop_VV_wrk;
       case Iop_NarrowBin32to16x8:
          size = 4;
-         vec_op = S390_VEC_PACK;
+         vec_binop = S390_VEC_PACK;
          goto Iop_VV_wrk;
       case Iop_NarrowBin64to32x4:
          size = 8;
-         vec_op = S390_VEC_PACK;
+         vec_binop = S390_VEC_PACK;
          goto Iop_VV_wrk;
 
       case Iop_OrV128:
          size = 16;
-         vec_op = S390_VEC_OR;
+         vec_binop = S390_VEC_OR;
          goto Iop_VV_wrk;
 
       case Iop_XorV128:
          size = 16;
-         vec_op = S390_VEC_XOR;
+         vec_binop = S390_VEC_XOR;
          goto Iop_VV_wrk;
 
       case Iop_AndV128:
          size = 16;
-         vec_op = S390_VEC_AND;
+         vec_binop = S390_VEC_AND;
          goto Iop_VV_wrk;
 
       case Iop_InterleaveLO8x16:
          size = 1;
-         vec_op = S390_VEC_MERGEL;
+         vec_binop = S390_VEC_MERGEL;
          goto Iop_VV_wrk;
       case Iop_InterleaveLO16x8:
          size = 2;
-         vec_op = S390_VEC_MERGEL;
+         vec_binop = S390_VEC_MERGEL;
          goto Iop_VV_wrk;
       case Iop_InterleaveLO32x4:
          size = 4;
-         vec_op = S390_VEC_MERGEL;
+         vec_binop = S390_VEC_MERGEL;
          goto Iop_VV_wrk;
       case Iop_InterleaveLO64x2:
          size = 8;
-         vec_op = S390_VEC_MERGEL;
+         vec_binop = S390_VEC_MERGEL;
          goto Iop_VV_wrk;
 
       case Iop_InterleaveHI8x16:
          size = 1;
-         vec_op = S390_VEC_MERGEH;
+         vec_binop = S390_VEC_MERGEH;
          goto Iop_VV_wrk;
       case Iop_InterleaveHI16x8:
          size = 2;
-         vec_op = S390_VEC_MERGEH;
+         vec_binop = S390_VEC_MERGEH;
          goto Iop_VV_wrk;
       case Iop_InterleaveHI32x4:
          size = 4;
-         vec_op = S390_VEC_MERGEH;
+         vec_binop = S390_VEC_MERGEH;
          goto Iop_VV_wrk;
       case Iop_InterleaveHI64x2:
          size = 8;
-         vec_op = S390_VEC_MERGEH;
+         vec_binop = S390_VEC_MERGEH;
          goto Iop_VV_wrk;
 
       case Iop_InterleaveEvenLanes8x16: {
@@ -4081,346 +4085,346 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
 
       case Iop_CmpEQ8x16:
          size = 1;
-         vec_op = S390_VEC_COMPARE_EQUAL;
+         vec_binop = S390_VEC_COMPARE_EQUAL;
          goto Iop_VV_wrk;
       case Iop_CmpEQ16x8:
          size = 2;
-         vec_op = S390_VEC_COMPARE_EQUAL;
+         vec_binop = S390_VEC_COMPARE_EQUAL;
          goto Iop_VV_wrk;
       case Iop_CmpEQ32x4:
          size = 4;
-         vec_op = S390_VEC_COMPARE_EQUAL;
+         vec_binop = S390_VEC_COMPARE_EQUAL;
          goto Iop_VV_wrk;
       case Iop_CmpEQ64x2:
          size = 8;
-         vec_op = S390_VEC_COMPARE_EQUAL;
+         vec_binop = S390_VEC_COMPARE_EQUAL;
          goto Iop_VV_wrk;
 
       case Iop_Add8x16:
          size = 1;
-         vec_op = S390_VEC_INT_ADD;
+         vec_binop = S390_VEC_INT_ADD;
          goto Iop_VV_wrk;
       case Iop_Add16x8:
          size = 2;
-         vec_op = S390_VEC_INT_ADD;
+         vec_binop = S390_VEC_INT_ADD;
          goto Iop_VV_wrk;
       case Iop_Add32x4:
          size = 4;
-         vec_op = S390_VEC_INT_ADD;
+         vec_binop = S390_VEC_INT_ADD;
          goto Iop_VV_wrk;
       case Iop_Add64x2:
          size = 8;
-         vec_op = S390_VEC_INT_ADD;
+         vec_binop = S390_VEC_INT_ADD;
          goto Iop_VV_wrk;
       case Iop_Add128x1:
          size = 16;
-         vec_op = S390_VEC_INT_ADD;
+         vec_binop = S390_VEC_INT_ADD;
          goto Iop_VV_wrk;
 
       case Iop_Sub8x16:
          size = 1;
-         vec_op = S390_VEC_INT_SUB;
+         vec_binop = S390_VEC_INT_SUB;
          goto Iop_VV_wrk;
       case Iop_Sub16x8:
          size = 2;
-         vec_op = S390_VEC_INT_SUB;
+         vec_binop = S390_VEC_INT_SUB;
          goto Iop_VV_wrk;
       case Iop_Sub32x4:
          size = 4;
-         vec_op = S390_VEC_INT_SUB;
+         vec_binop = S390_VEC_INT_SUB;
          goto Iop_VV_wrk;
       case Iop_Sub64x2:
          size = 8;
-         vec_op = S390_VEC_INT_SUB;
+         vec_binop = S390_VEC_INT_SUB;
          goto Iop_VV_wrk;
       case Iop_Sub128x1:
          size = 16;
-         vec_op = S390_VEC_INT_SUB;
+         vec_binop = S390_VEC_INT_SUB;
          goto Iop_VV_wrk;
 
       case Iop_Max8Ux16:
          size = 1;
-         vec_op = S390_VEC_MAXU;
+         vec_binop = S390_VEC_MAXU;
          goto Iop_VV_wrk;
       case Iop_Max8Sx16:
          size = 1;
-         vec_op = S390_VEC_MAXS;
+         vec_binop = S390_VEC_MAXS;
          goto Iop_VV_wrk;
       case Iop_Max16Ux8:
          size = 2;
-         vec_op = S390_VEC_MAXU;
+         vec_binop = S390_VEC_MAXU;
          goto Iop_VV_wrk;
       case Iop_Max16Sx8:
          size = 2;
-         vec_op = S390_VEC_MAXS;
+         vec_binop = S390_VEC_MAXS;
          goto Iop_VV_wrk;
       case Iop_Max32Ux4:
          size = 4;
-         vec_op = S390_VEC_MAXU;
+         vec_binop = S390_VEC_MAXU;
          goto Iop_VV_wrk;
       case Iop_Max32Sx4:
          size = 4;
-         vec_op = S390_VEC_MAXS;
+         vec_binop = S390_VEC_MAXS;
          goto Iop_VV_wrk;
       case Iop_Max64Ux2:
          size = 8;
-         vec_op = S390_VEC_MAXU;
+         vec_binop = S390_VEC_MAXU;
          goto Iop_VV_wrk;
       case Iop_Max64Sx2:
          size = 8;
-         vec_op = S390_VEC_MAXS;
+         vec_binop = S390_VEC_MAXS;
          goto Iop_VV_wrk;
 
       case Iop_Min8Ux16:
          size = 1;
-         vec_op = S390_VEC_MINU;
+         vec_binop = S390_VEC_MINU;
          goto Iop_VV_wrk;
       case Iop_Min8Sx16:
          size = 1;
-         vec_op = S390_VEC_MINS;
+         vec_binop = S390_VEC_MINS;
          goto Iop_VV_wrk;
       case Iop_Min16Ux8:
          size = 2;
-         vec_op = S390_VEC_MINU;
+         vec_binop = S390_VEC_MINU;
          goto Iop_VV_wrk;
       case Iop_Min16Sx8:
          size = 2;
-         vec_op = S390_VEC_MINS;
+         vec_binop = S390_VEC_MINS;
          goto Iop_VV_wrk;
       case Iop_Min32Ux4:
          size = 4;
-         vec_op = S390_VEC_MINU;
+         vec_binop = S390_VEC_MINU;
          goto Iop_VV_wrk;
       case Iop_Min32Sx4:
          size = 4;
-         vec_op = S390_VEC_MINS;
+         vec_binop = S390_VEC_MINS;
          goto Iop_VV_wrk;
       case Iop_Min64Ux2:
          size = 8;
-         vec_op = S390_VEC_MINU;
+         vec_binop = S390_VEC_MINU;
          goto Iop_VV_wrk;
       case Iop_Min64Sx2:
          size = 8;
-         vec_op = S390_VEC_MINS;
+         vec_binop = S390_VEC_MINS;
          goto Iop_VV_wrk;
 
       case Iop_Avg8Ux16:
          size = 1;
-         vec_op = S390_VEC_AVGU;
+         vec_binop = S390_VEC_AVGU;
          goto Iop_VV_wrk;
       case Iop_Avg8Sx16:
          size = 1;
-         vec_op = S390_VEC_AVGS;
+         vec_binop = S390_VEC_AVGS;
          goto Iop_VV_wrk;
       case Iop_Avg16Ux8:
          size = 2;
-         vec_op = S390_VEC_AVGU;
+         vec_binop = S390_VEC_AVGU;
          goto Iop_VV_wrk;
       case Iop_Avg16Sx8:
          size = 2;
-         vec_op = S390_VEC_AVGS;
+         vec_binop = S390_VEC_AVGS;
          goto Iop_VV_wrk;
       case Iop_Avg32Ux4:
          size = 4;
-         vec_op = S390_VEC_AVGU;
+         vec_binop = S390_VEC_AVGU;
          goto Iop_VV_wrk;
       case Iop_Avg32Sx4:
          size = 4;
-         vec_op = S390_VEC_AVGS;
+         vec_binop = S390_VEC_AVGS;
          goto Iop_VV_wrk;
       case Iop_Avg64Ux2:
          size = 8;
-         vec_op = S390_VEC_AVGU;
+         vec_binop = S390_VEC_AVGU;
          goto Iop_VV_wrk;
       case Iop_Avg64Sx2:
          size = 8;
-         vec_op = S390_VEC_AVGS;
+         vec_binop = S390_VEC_AVGS;
          goto Iop_VV_wrk;
 
       case Iop_CmpGT8Ux16:
          size = 1;
-         vec_op = S390_VEC_COMPARE_GREATERU;
+         vec_binop = S390_VEC_COMPARE_GREATERU;
          goto Iop_VV_wrk;
       case Iop_CmpGT8Sx16:
          size = 1;
-         vec_op = S390_VEC_COMPARE_GREATERS;
+         vec_binop = S390_VEC_COMPARE_GREATERS;
          goto Iop_VV_wrk;
       case Iop_CmpGT16Ux8:
          size = 2;
-         vec_op = S390_VEC_COMPARE_GREATERU;
+         vec_binop = S390_VEC_COMPARE_GREATERU;
          goto Iop_VV_wrk;
       case Iop_CmpGT16Sx8:
          size = 2;
-         vec_op = S390_VEC_COMPARE_GREATERS;
+         vec_binop = S390_VEC_COMPARE_GREATERS;
          goto Iop_VV_wrk;
       case Iop_CmpGT32Ux4:
          size = 4;
-         vec_op = S390_VEC_COMPARE_GREATERU;
+         vec_binop = S390_VEC_COMPARE_GREATERU;
          goto Iop_VV_wrk;
       case Iop_CmpGT32Sx4:
          size = 4;
-         vec_op = S390_VEC_COMPARE_GREATERS;
+         vec_binop = S390_VEC_COMPARE_GREATERS;
          goto Iop_VV_wrk;
       case Iop_CmpGT64Ux2:
          size = 8;
-         vec_op = S390_VEC_COMPARE_GREATERU;
+         vec_binop = S390_VEC_COMPARE_GREATERU;
          goto Iop_VV_wrk;
       case Iop_CmpGT64Sx2:
          size = 8;
-         vec_op = S390_VEC_COMPARE_GREATERS;
+         vec_binop = S390_VEC_COMPARE_GREATERS;
          goto Iop_VV_wrk;
 
       case Iop_MulHi8Ux16:
          size = 1;
-         vec_op = S390_VEC_INT_MUL_HIGHU;
+         vec_binop = S390_VEC_INT_MUL_HIGHU;
          goto Iop_VV_wrk;
       case Iop_MulHi8Sx16:
          size = 1;
-         vec_op = S390_VEC_INT_MUL_HIGHS;
+         vec_binop = S390_VEC_INT_MUL_HIGHS;
          goto Iop_VV_wrk;
       case Iop_MulHi16Ux8:
          size = 2;
-         vec_op = S390_VEC_INT_MUL_HIGHU;
+         vec_binop = S390_VEC_INT_MUL_HIGHU;
          goto Iop_VV_wrk;
       case Iop_MulHi16Sx8:
          size = 2;
-         vec_op = S390_VEC_INT_MUL_HIGHS;
+         vec_binop = S390_VEC_INT_MUL_HIGHS;
          goto Iop_VV_wrk;
       case Iop_MulHi32Ux4:
          size = 4;
-         vec_op = S390_VEC_INT_MUL_HIGHU;
+         vec_binop = S390_VEC_INT_MUL_HIGHU;
          goto Iop_VV_wrk;
       case Iop_MulHi32Sx4:
          size = 4;
-         vec_op = S390_VEC_INT_MUL_HIGHS;
+         vec_binop = S390_VEC_INT_MUL_HIGHS;
          goto Iop_VV_wrk;
 
       case Iop_Mul8x16:
          size = 1;
-         vec_op = S390_VEC_INT_MUL_LOW;
+         vec_binop = S390_VEC_INT_MUL_LOW;
          goto Iop_VV_wrk;
       case Iop_Mul16x8:
          size = 2;
-         vec_op = S390_VEC_INT_MUL_LOW;
+         vec_binop = S390_VEC_INT_MUL_LOW;
          goto Iop_VV_wrk;
       case Iop_Mul32x4:
          size = 4;
-         vec_op = S390_VEC_INT_MUL_LOW;
+         vec_binop = S390_VEC_INT_MUL_LOW;
          goto Iop_VV_wrk;
 
       case Iop_MullEven8Sx16:
          size = 1;
-         vec_op = S390_VEC_INT_MUL_EVENS;
+         vec_binop = S390_VEC_INT_MUL_EVENS;
          goto Iop_VV_wrk;
       case Iop_MullEven8Ux16:
          size = 1;
-         vec_op = S390_VEC_INT_MUL_EVENU;
+         vec_binop = S390_VEC_INT_MUL_EVENU;
          goto Iop_VV_wrk;
       case Iop_MullEven16Sx8:
          size = 2;
-         vec_op = S390_VEC_INT_MUL_EVENS;
+         vec_binop = S390_VEC_INT_MUL_EVENS;
          goto Iop_VV_wrk;
       case Iop_MullEven16Ux8:
          size = 2;
-         vec_op = S390_VEC_INT_MUL_EVENU;
+         vec_binop = S390_VEC_INT_MUL_EVENU;
          goto Iop_VV_wrk;
       case Iop_MullEven32Sx4:
          size = 4;
-         vec_op = S390_VEC_INT_MUL_EVENS;
+         vec_binop = S390_VEC_INT_MUL_EVENS;
          goto Iop_VV_wrk;
       case Iop_MullEven32Ux4:
          size = 4;
-         vec_op = S390_VEC_INT_MUL_EVENU;
+         vec_binop = S390_VEC_INT_MUL_EVENU;
          goto Iop_VV_wrk;
 
       case Iop_Shl8x16:
          size = 1;
-         vec_op = S390_VEC_ELEM_SHL_V;
+         vec_binop = S390_VEC_ELEM_SHL_V;
          goto Iop_VV_wrk;
       case Iop_Shl16x8:
          size = 2;
-         vec_op = S390_VEC_ELEM_SHL_V;
+         vec_binop = S390_VEC_ELEM_SHL_V;
          goto Iop_VV_wrk;
       case Iop_Shl32x4:
          size = 4;
-         vec_op = S390_VEC_ELEM_SHL_V;
+         vec_binop = S390_VEC_ELEM_SHL_V;
          goto Iop_VV_wrk;
       case Iop_Shl64x2:
          size = 8;
-         vec_op = S390_VEC_ELEM_SHL_V;
+         vec_binop = S390_VEC_ELEM_SHL_V;
          goto Iop_VV_wrk;
 
       case Iop_Shr8x16:
          size = 1;
-         vec_op = S390_VEC_ELEM_SHRL_V;
+         vec_binop = S390_VEC_ELEM_SHRL_V;
          goto Iop_VV_wrk;
       case Iop_Shr16x8:
          size = 2;
-         vec_op = S390_VEC_ELEM_SHRL_V;
+         vec_binop = S390_VEC_ELEM_SHRL_V;
          goto Iop_VV_wrk;
       case Iop_Shr32x4:
          size = 4;
-         vec_op = S390_VEC_ELEM_SHRL_V;
+         vec_binop = S390_VEC_ELEM_SHRL_V;
          goto Iop_VV_wrk;
       case Iop_Shr64x2:
          size = 8;
-         vec_op = S390_VEC_ELEM_SHRL_V;
+         vec_binop = S390_VEC_ELEM_SHRL_V;
          goto Iop_VV_wrk;
 
       case Iop_Sar8x16:
          size = 1;
-         vec_op = S390_VEC_ELEM_SHRA_V;
+         vec_binop = S390_VEC_ELEM_SHRA_V;
          goto Iop_VV_wrk;
       case Iop_Sar16x8:
          size = 2;
-         vec_op = S390_VEC_ELEM_SHRA_V;
+         vec_binop = S390_VEC_ELEM_SHRA_V;
          goto Iop_VV_wrk;
       case Iop_Sar32x4:
          size = 4;
-         vec_op = S390_VEC_ELEM_SHRA_V;
+         vec_binop = S390_VEC_ELEM_SHRA_V;
          goto Iop_VV_wrk;
       case Iop_Sar64x2:
          size = 8;
-         vec_op = S390_VEC_ELEM_SHRA_V;
+         vec_binop = S390_VEC_ELEM_SHRA_V;
          goto Iop_VV_wrk;
 
       case Iop_Rol8x16:
          size = 1;
-         vec_op = S390_VEC_ELEM_ROLL_V;
+         vec_binop = S390_VEC_ELEM_ROLL_V;
          goto Iop_VV_wrk;
       case Iop_Rol16x8:
          size = 2;
-         vec_op = S390_VEC_ELEM_ROLL_V;
+         vec_binop = S390_VEC_ELEM_ROLL_V;
          goto Iop_VV_wrk;
       case Iop_Rol32x4:
          size = 4;
-         vec_op = S390_VEC_ELEM_ROLL_V;
+         vec_binop = S390_VEC_ELEM_ROLL_V;
          goto Iop_VV_wrk;
       case Iop_Rol64x2:
          size = 8;
-         vec_op = S390_VEC_ELEM_ROLL_V;
+         vec_binop = S390_VEC_ELEM_ROLL_V;
          goto Iop_VV_wrk;
 
       case Iop_CmpEQ64Fx2:
          size = 8;
-         vec_op = S390_VEC_FLOAT_COMPARE_EQUAL;
+         vec_binop = S390_VEC_FLOAT_COMPARE_EQUAL;
          goto Iop_VV_wrk;
 
       case Iop_CmpLE64Fx2: {
          size = 8;
-         vec_op = S390_VEC_FLOAT_COMPARE_LESS_OR_EQUAL;
+         vec_binop = S390_VEC_FLOAT_COMPARE_LESS_OR_EQUAL;
          goto Iop_VV_wrk;
       }
 
       case Iop_CmpLT64Fx2: {
          size = 8;
-         vec_op = S390_VEC_FLOAT_COMPARE_LESS;
+         vec_binop = S390_VEC_FLOAT_COMPARE_LESS;
          goto Iop_VV_wrk;
       }
 
       case Iop_Sqrt64Fx2:
          size = 8;
-         vec_op = S390_VEC_FLOAT_SQRT;
+         vec_unop = S390_VEC_FLOAT_SQRT;
          goto Iop_irrm_V_wrk;
 
       case Iop_ShlN8x16:
@@ -4485,16 +4489,17 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
          }
 
       case Iop_ShlV128:
-         vec_op = S390_VEC_SHL_BITS;
+         vec_binop = S390_VEC_SHL_BITS;
          goto Iop_ShiftVV_wrk;
       case Iop_ShrV128:
-         vec_op = S390_VEC_SHRL_BITS;
+         vec_binop = S390_VEC_SHRL_BITS;
          goto Iop_ShiftVV_wrk;
       case Iop_SarV128:
-         vec_op = S390_VEC_SHRA_BITS;
+         vec_binop = S390_VEC_SHRA_BITS;
          goto Iop_ShiftVV_wrk;
 
       Iop_ShiftVV_wrk: {
+         vassert(vec_binop != S390_VEC_BINOP_T_INVALID);
          reg1 = s390_isel_vec_expr(env, arg1);
          reg2 = s390_isel_vec_expr(env, IRExpr_Unop(Iop_Dup8x16, arg2));
 
@@ -4502,37 +4507,39 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
          if (vec_is_bytes_only_shift(arg2))
          {
             /* In this case we skip the BITS shift step. */
-            addInstr(env, s390_insn_vec_binop(16, (vec_op + 1),
+            addInstr(env, s390_insn_vec_binop(16, (vec_binop + 1),
                      dst, reg1, reg2));
 
             return dst;
          }
 
          /* General case (BYTES shift & BITS shift) */
-         addInstr(env, s390_insn_vec_binop(16, (vec_op + 1),
+         addInstr(env, s390_insn_vec_binop(16, (vec_binop + 1),
                   dst, reg1, reg2));
 
-         addInstr(env, s390_insn_vec_binop(16, vec_op,
+         addInstr(env, s390_insn_vec_binop(16, vec_binop,
                   dst, dst, reg2));
 
          return dst;
       }
 
       Iop_VV_wrk: {
+         vassert(vec_binop != S390_VEC_BINOP_T_INVALID);
          reg1 = s390_isel_vec_expr(env, arg1);
          reg2 = s390_isel_vec_expr(env, arg2);
 
-         addInstr(env, s390_insn_vec_binop(size, vec_op,
+         addInstr(env, s390_insn_vec_binop(size, vec_binop,
                   dst, reg1, reg2));
 
          return dst;
       }
 
       Iop_irrm_V_wrk: {
+         vassert(vec_unop != S390_UNOP_T_INVALID);
          set_bfp_rounding_mode_in_fpc(env, arg1);
          reg1 = s390_isel_vec_expr(env, arg2);
 
-         addInstr(env, s390_insn_unop(size, vec_op, dst, s390_opnd_reg(reg1)));
+         addInstr(env, s390_insn_unop(size, vec_unop, dst, s390_opnd_reg(reg1)));
          return dst;
       }
 
@@ -4553,13 +4560,13 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
    /* --------- TERNARY OP --------- */
    case Iex_Triop: {
       HReg dst = newVRegV(env);
-      s390_amode* amode2;
-      HReg reg1, reg2, reg3;
+      s390_amode* amode2 = NULL;
+      HReg reg1 = INVALID_HREG, reg2 = INVALID_HREG, reg3 = INVALID_HREG;
       IROp op = expr->Iex.Triop.details->op;
       IRExpr* arg1 = expr->Iex.Triop.details->arg1;
       IRExpr* arg2 = expr->Iex.Triop.details->arg2;
       IRExpr* arg3 = expr->Iex.Triop.details->arg3;
-      IROp vec_op;
+      s390_vec_binop_t vec_binop = S390_VEC_BINOP_T_INVALID;
       switch (op) {
       case Iop_SetElem8x16:
          size = 1;
@@ -4597,29 +4604,30 @@ s390_isel_vec_expr_wrk(ISelEnv *env, IRExpr *expr)
 
       case Iop_Add64Fx2:
          size = 8;
-         vec_op = S390_VEC_FLOAT_ADD;
+         vec_binop = S390_VEC_FLOAT_ADD;
          goto Iop_irrm_VV_wrk;
 
       case Iop_Sub64Fx2:
          size = 8;
-         vec_op = S390_VEC_FLOAT_SUB;
+         vec_binop = S390_VEC_FLOAT_SUB;
          goto Iop_irrm_VV_wrk;
 
       case Iop_Mul64Fx2:
          size = 8;
-         vec_op = S390_VEC_FLOAT_MUL;
+         vec_binop = S390_VEC_FLOAT_MUL;
          goto Iop_irrm_VV_wrk;
       case Iop_Div64Fx2:
          size = 8;
-         vec_op = S390_VEC_FLOAT_DIV;
+         vec_binop = S390_VEC_FLOAT_DIV;
          goto Iop_irrm_VV_wrk;
 
       Iop_irrm_VV_wrk: {
+         vassert(vec_binop != S390_VEC_BINOP_T_INVALID);
          set_bfp_rounding_mode_in_fpc(env, arg1);
          reg1 = s390_isel_vec_expr(env, arg2);
          reg2 = s390_isel_vec_expr(env, arg3);
 
-         addInstr(env, s390_insn_vec_binop(size, vec_op,
+         addInstr(env, s390_insn_vec_binop(size, vec_binop,
                                            dst, reg1, reg2));
 
          return dst;