Track vex r2939 (renaming and arg-order change for Iop_Extract{64,V128}).

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14404

diff --git a/memcheck/mc_translate.c b/memcheck/mc_translate.c
index fef5b49b17632dbb3539b2583d05a1631bff9ac2..5efa5ade1328f4afc9057b61c8ec907c33e92883 100644 (file)
--- a/memcheck/mc_translate.c
+++ b/memcheck/mc_translate.c
@@ -2845,10 +2845,12 @@ IRAtom* expr2vbits_Triop ( MCEnv* mce,
       case Iop_SignificanceRoundD128:
          /* IRRoundingMode(I32) x I8 x D128 -> D128 */
          return mkLazy3(mce, Ity_I128, vatom1, vatom2, vatom3);
-      case Iop_ExtractV128:
+      case Iop_SliceV128:
+         /* (V128, V128, I8) -> V128 */
          complainIfUndefined(mce, atom3, NULL);
          return assignNew('V', mce, Ity_V128, triop(op, vatom1, vatom2, atom3));
-      case Iop_Extract64:
+      case Iop_Slice64:
+         /* (I64, I64, I8) -> I64 */
          complainIfUndefined(mce, atom3, NULL);
          return assignNew('V', mce, Ity_I64, triop(op, vatom1, vatom2, atom3));
       case Iop_SetElem8x8:

diff --git a/memcheck/tests/vbit-test/irops.c b/memcheck/tests/vbit-test/irops.c
index ca7044058321b95e56da0827f21922d54dbb280e..eb134a3b87c4ca485719b3554ed2ec36f3852320 100644 (file)
--- a/memcheck/tests/vbit-test/irops.c
+++ b/memcheck/tests/vbit-test/irops.c
@@ -465,7 +465,7 @@ static irop_t irops[] = {
   { DEFOP(Iop_Dup8x8, UNDEF_UNKNOWN), },
   { DEFOP(Iop_Dup16x4, UNDEF_UNKNOWN), },
   { DEFOP(Iop_Dup32x2, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_Extract64, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_Slice64, UNDEF_UNKNOWN), },
   { DEFOP(Iop_Reverse8sIn16_x4, UNDEF_UNKNOWN), },
   { DEFOP(Iop_Reverse8sIn32_x2, UNDEF_UNKNOWN), },
   { DEFOP(Iop_Reverse16sIn32_x2, UNDEF_UNKNOWN), },
@@ -927,7 +927,7 @@ static irop_t irops[] = {
   { DEFOP(Iop_Dup8x16, UNDEF_UNKNOWN), },
   { DEFOP(Iop_Dup16x8, UNDEF_UNKNOWN), },
   { DEFOP(Iop_Dup32x4, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_ExtractV128, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_SliceV128, UNDEF_UNKNOWN), },
   { DEFOP(Iop_Reverse8sIn16_x8, UNDEF_UNKNOWN), },
   { DEFOP(Iop_Reverse8sIn32_x4, UNDEF_UNKNOWN), },
   { DEFOP(Iop_Reverse16sIn32_x4, UNDEF_UNKNOWN), },

diff --git a/memcheck/tests/vbit-test/util.c b/memcheck/tests/vbit-test/util.c
index 3e017a08666b237169e09ef0c92acf037ccd2d29..170fb8aee919c2e17ca0dd1235326343e41b9fc6 100644 (file)
--- a/memcheck/tests/vbit-test/util.c
+++ b/memcheck/tests/vbit-test/util.c
@@ -772,9 +772,9 @@ typeof_primop(IROp op, IRType *t_dst, IRType *t_arg1, IRType *t_arg2,
       case Iop_SetElem32x2:
          TERNARY(Ity_I64, Ity_I8, Ity_I32, Ity_I64);
 
-      case Iop_Extract64:
+      case Iop_Slice64:
          TERNARY(Ity_I64, Ity_I64, Ity_I8, Ity_I64);
-      case Iop_ExtractV128:
+      case Iop_SliceV128:
          TERNARY(Ity_V128, Ity_V128, Ity_I8, Ity_V128);
 
       case Iop_QDMull16Sx4: case Iop_QDMull32Sx2: