Track vex r2924 (Renaming of Iop_QSalN*, Iop_QShlN* and Iop_QShlN*S)

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

diff --git a/memcheck/mc_translate.c b/memcheck/mc_translate.c
index dc22439d12279a77c53bcd080a9d53c4128a9c7d..677390e01b9e83c060c409b30ba1497611aa02af 100644 (file)
--- a/memcheck/mc_translate.c
+++ b/memcheck/mc_translate.c
@@ -2965,27 +2965,27 @@ IRAtom* expr2vbits_Binop ( MCEnv* mce,
       case Iop_Sal64x1:
          return binary64Ix1(mce, vatom1, vatom2);
 
-      case Iop_QShlN8Sx8:
-      case Iop_QShlN8x8:
-      case Iop_QSalN8x8:
+      case Iop_QShlNsatSU8x8:
+      case Iop_QShlNsatUU8x8:
+      case Iop_QShlNsatSS8x8:
          complainIfUndefined(mce, atom2, NULL);
          return mkPCast8x8(mce, vatom1);
 
-      case Iop_QShlN16Sx4:
-      case Iop_QShlN16x4:
-      case Iop_QSalN16x4:
+      case Iop_QShlNsatSU16x4:
+      case Iop_QShlNsatUU16x4:
+      case Iop_QShlNsatSS16x4:
          complainIfUndefined(mce, atom2, NULL);
          return mkPCast16x4(mce, vatom1);
 
-      case Iop_QShlN32Sx2:
-      case Iop_QShlN32x2:
-      case Iop_QSalN32x2:
+      case Iop_QShlNsatSU32x2:
+      case Iop_QShlNsatUU32x2:
+      case Iop_QShlNsatSS32x2:
          complainIfUndefined(mce, atom2, NULL);
          return mkPCast32x2(mce, vatom1);
 
-      case Iop_QShlN64Sx1:
-      case Iop_QShlN64x1:
-      case Iop_QSalN64x1:
+      case Iop_QShlNsatSU64x1:
+      case Iop_QShlNsatUU64x1:
+      case Iop_QShlNsatSS64x1:
          complainIfUndefined(mce, atom2, NULL);
          return mkPCast32x2(mce, vatom1);
 
@@ -3335,27 +3335,27 @@ IRAtom* expr2vbits_Binop ( MCEnv* mce,
       case Iop_Add32F0x4:
          return binary32F0x4(mce, vatom1, vatom2);      
 
-      case Iop_QShlN8Sx16:
-      case Iop_QShlN8x16:
-      case Iop_QSalN8x16:
+      case Iop_QShlNsatSU8x16:
+      case Iop_QShlNsatUU8x16:
+      case Iop_QShlNsatSS8x16:
          complainIfUndefined(mce, atom2, NULL);
          return mkPCast8x16(mce, vatom1);
 
-      case Iop_QShlN16Sx8:
-      case Iop_QShlN16x8:
-      case Iop_QSalN16x8:
+      case Iop_QShlNsatSU16x8:
+      case Iop_QShlNsatUU16x8:
+      case Iop_QShlNsatSS16x8:
          complainIfUndefined(mce, atom2, NULL);
          return mkPCast16x8(mce, vatom1);
 
-      case Iop_QShlN32Sx4:
-      case Iop_QShlN32x4:
-      case Iop_QSalN32x4:
+      case Iop_QShlNsatSU32x4:
+      case Iop_QShlNsatUU32x4:
+      case Iop_QShlNsatSS32x4:
          complainIfUndefined(mce, atom2, NULL);
          return mkPCast32x4(mce, vatom1);
 
-      case Iop_QShlN64Sx2:
-      case Iop_QShlN64x2:
-      case Iop_QSalN64x2:
+      case Iop_QShlNsatSU64x2:
+      case Iop_QShlNsatUU64x2:
+      case Iop_QShlNsatSS64x2:
          complainIfUndefined(mce, atom2, NULL);
          return mkPCast32x4(mce, vatom1);
 

diff --git a/memcheck/tests/vbit-test/irops.c b/memcheck/tests/vbit-test/irops.c
index 9019750a1737898a7e9f1f2d5e2458c7140158cd..985d36b881d3e7bf64e8a0e80e899044618e00bb 100644 (file)
--- a/memcheck/tests/vbit-test/irops.c
+++ b/memcheck/tests/vbit-test/irops.c
@@ -425,18 +425,18 @@ static irop_t irops[] = {
   { DEFOP(Iop_QSal16x4, UNDEF_UNKNOWN), },
   { DEFOP(Iop_QSal32x2, UNDEF_UNKNOWN), },
   { DEFOP(Iop_QSal64x1, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN8Sx8, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN16Sx4, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN32Sx2, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN64Sx1, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN8x8, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN16x4, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN32x2, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN64x1, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QSalN8x8, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QSalN16x4, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QSalN32x2, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QSalN64x1, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSU8x8, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSU16x4, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSU32x2, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSU64x1, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatUU8x8, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatUU16x4, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatUU32x2, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatUU64x1, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSS8x8, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSS16x4, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSS32x2, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSS64x1, UNDEF_UNKNOWN), },
   { DEFOP(Iop_QNarrowBin16Sto8Ux8, UNDEF_UNKNOWN), },
   { DEFOP(Iop_QNarrowBin16Sto8Sx8, UNDEF_UNKNOWN), },
   { DEFOP(Iop_QNarrowBin32Sto16Sx4, UNDEF_UNKNOWN), },
@@ -802,18 +802,18 @@ static irop_t irops[] = {
   { DEFOP(Iop_QSal16x8, UNDEF_UNKNOWN), },
   { DEFOP(Iop_QSal32x4, UNDEF_UNKNOWN), },
   { DEFOP(Iop_QSal64x2, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN8Sx16, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN16Sx8, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN32Sx4, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN64Sx2, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN8x16, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN16x8, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN32x4, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QShlN64x2, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QSalN8x16, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QSalN16x8, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QSalN32x4, UNDEF_UNKNOWN), },
-  { DEFOP(Iop_QSalN64x2, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSU8x16, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSU16x8, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSU32x4, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSU64x2, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatUU8x16, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatUU16x8, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatUU32x4, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatUU64x2, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSS8x16, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSS16x8, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSS32x4, UNDEF_UNKNOWN), },
+  { DEFOP(Iop_QShlNsatSS64x2, UNDEF_UNKNOWN), },
   { DEFOP(Iop_QNarrowBin16Sto8Ux16, UNDEF_UNKNOWN), },
   { DEFOP(Iop_QNarrowBin32Sto16Ux8, UNDEF_UNKNOWN), },
   { DEFOP(Iop_QNarrowBin16Sto8Sx16, UNDEF_UNKNOWN), },

diff --git a/memcheck/tests/vbit-test/util.c b/memcheck/tests/vbit-test/util.c
index bd9f83178b3b1e310d3f06819917316bca19f31a..cb2a85272940728d7aa38143fd13b0d0713d7c21 100644 (file)
--- a/memcheck/tests/vbit-test/util.c
+++ b/memcheck/tests/vbit-test/util.c
@@ -316,12 +316,12 @@ typeof_primop(IROp op, IRType *t_dst, IRType *t_arg1, IRType *t_arg2,
       case Iop_ShlN32x2: case Iop_ShlN16x4: case Iop_ShlN8x8:
       case Iop_ShrN32x2: case Iop_ShrN16x4: case Iop_ShrN8x8:
       case Iop_SarN32x2: case Iop_SarN16x4: case Iop_SarN8x8:
-      case Iop_QShlN8x8: case Iop_QShlN16x4:
-      case Iop_QShlN32x2: case Iop_QShlN64x1:
-      case Iop_QShlN8Sx8: case Iop_QShlN16Sx4:
-      case Iop_QShlN32Sx2: case Iop_QShlN64Sx1:
-      case Iop_QSalN8x8: case Iop_QSalN16x4:
-      case Iop_QSalN32x2: case Iop_QSalN64x1:
+      case Iop_QShlNsatUU8x8:  case Iop_QShlNsatUU16x4:
+      case Iop_QShlNsatUU32x2: case Iop_QShlNsatUU64x1:
+      case Iop_QShlNsatSU8x8:  case Iop_QShlNsatSU16x4:
+      case Iop_QShlNsatSU32x2: case Iop_QShlNsatSU64x1:
+      case Iop_QShlNsatSS8x8:  case Iop_QShlNsatSS16x4:
+      case Iop_QShlNsatSS32x2: case Iop_QShlNsatSS64x1:
          BINARY(Ity_I64,Ity_I8, Ity_I64);
 
       case Iop_Shl8: case Iop_Shr8: case Iop_Sar8:
@@ -733,12 +733,12 @@ typeof_primop(IROp op, IRType *t_dst, IRType *t_arg1, IRType *t_arg2,
       case Iop_ShrN32x4: case Iop_ShrN64x2:
       case Iop_SarN8x16: case Iop_SarN16x8:
       case Iop_SarN32x4: case Iop_SarN64x2:
-      case Iop_QShlN8x16: case Iop_QShlN16x8:
-      case Iop_QShlN32x4: case Iop_QShlN64x2:
-      case Iop_QShlN8Sx16: case Iop_QShlN16Sx8:
-      case Iop_QShlN32Sx4: case Iop_QShlN64Sx2:
-      case Iop_QSalN8x16: case Iop_QSalN16x8:
-      case Iop_QSalN32x4: case Iop_QSalN64x2:
+      case Iop_QShlNsatUU8x16: case Iop_QShlNsatUU16x8:
+      case Iop_QShlNsatUU32x4: case Iop_QShlNsatUU64x2:
+      case Iop_QShlNsatSU8x16: case Iop_QShlNsatSU16x8:
+      case Iop_QShlNsatSU32x4: case Iop_QShlNsatSU64x2:
+      case Iop_QShlNsatSS8x16: case Iop_QShlNsatSS16x8:
+      case Iop_QShlNsatSS32x4: case Iop_QShlNsatSS64x2:
          BINARY(Ity_V128,Ity_I8, Ity_V128);
 
       case Iop_F32ToFixed32Ux4_RZ: