Mark Wielaard ff9a4a
commit b4ead6dd41c3234b491c803fe513580363f38998
Mark Wielaard ff9a4a
Author: sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c>
Mark Wielaard ff9a4a
Date:   Wed Jul 20 16:35:55 2016 +0000
Mark Wielaard ff9a4a
Mark Wielaard ff9a4a
    Enable PCMPxSTRx cases 0x70 and 0x19.  Fixes #359952.
Mark Wielaard ff9a4a
    
Mark Wielaard ff9a4a
    
Mark Wielaard ff9a4a
    git-svn-id: svn://svn.valgrind.org/vex/trunk@3228 8f6e269a-dfd6-0310-a8e1-e2731360e62c
Mark Wielaard ff9a4a
Mark Wielaard ff9a4a
diff --git a/VEX/priv/guest_amd64_toIR.c b/VEX/priv/guest_amd64_toIR.c
Mark Wielaard ff9a4a
index 936d16f..4c9a122 100644
Mark Wielaard ff9a4a
--- a/VEX/priv/guest_amd64_toIR.c
Mark Wielaard ff9a4a
+++ b/VEX/priv/guest_amd64_toIR.c
Mark Wielaard ff9a4a
@@ -18671,10 +18671,11 @@ static Long dis_PCMPxSTRx ( const VexAbiInfo* vbi, Prefix pfx,
Mark Wielaard ff9a4a
       case 0x12: case 0x14: case 0x18: case 0x1A:
Mark Wielaard ff9a4a
       case 0x30: case 0x34: case 0x38: case 0x3A:
Mark Wielaard ff9a4a
       case 0x40: case 0x42: case 0x44: case 0x46: case 0x4A:
Mark Wielaard ff9a4a
+      case 0x70:
Mark Wielaard ff9a4a
          break;
Mark Wielaard ff9a4a
       // the 16-bit character versions of the above
Mark Wielaard ff9a4a
       case 0x01: case 0x03: case 0x09: case 0x0B: case 0x0D:
Mark Wielaard ff9a4a
-      case 0x13:                       case 0x1B:
Mark Wielaard ff9a4a
+                 case 0x13: case 0x19: case 0x1B:
Mark Wielaard ff9a4a
                             case 0x39: case 0x3B:
Mark Wielaard ff9a4a
                             case 0x45:            case 0x4B:
Mark Wielaard ff9a4a
          break;
Mark Wielaard ff9a4a
diff --git a/VEX/priv/guest_generic_x87.c b/VEX/priv/guest_generic_x87.c
Mark Wielaard ff9a4a
index 2c9b25b..9a3c603 100644
Mark Wielaard ff9a4a
--- a/VEX/priv/guest_generic_x87.c
Mark Wielaard ff9a4a
+++ b/VEX/priv/guest_generic_x87.c
Mark Wielaard ff9a4a
@@ -799,6 +799,7 @@ Bool compute_PCMPxSTRx ( /*OUT*/V128* resV,
Mark Wielaard ff9a4a
       case 0x12: case 0x14: case 0x18: case 0x1A:
Mark Wielaard ff9a4a
       case 0x30: case 0x34: case 0x38: case 0x3A:
Mark Wielaard ff9a4a
       case 0x40: case 0x42: case 0x44: case 0x46: case 0x4A:
Mark Wielaard ff9a4a
+      case 0x70:
Mark Wielaard ff9a4a
          break;
Mark Wielaard ff9a4a
       default:
Mark Wielaard ff9a4a
          return False;
Mark Wielaard ff9a4a
@@ -1047,7 +1048,7 @@ Bool compute_PCMPxSTRx_wide ( /*OUT*/V128* resV,
Mark Wielaard ff9a4a
       unvalidated cases in the code base. */
Mark Wielaard ff9a4a
    switch (imm8) {
Mark Wielaard ff9a4a
       case 0x01: case 0x03: case 0x09: case 0x0B: case 0x0D:
Mark Wielaard ff9a4a
-      case 0x13:            case 0x1B:
Mark Wielaard ff9a4a
+                 case 0x13: case 0x19: case 0x1B:
Mark Wielaard ff9a4a
                             case 0x39: case 0x3B:
Mark Wielaard ff9a4a
                  case 0x45:            case 0x4B:
Mark Wielaard ff9a4a
          break;
Mark Wielaard ff9a4a
commit b5ca153e38556e9e4bef0a79c99e3ab6a7e47056
Mark Wielaard ff9a4a
Author: sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9>
Mark Wielaard ff9a4a
Date:   Wed Jul 20 16:37:09 2016 +0000
Mark Wielaard ff9a4a
Mark Wielaard ff9a4a
    Add test cases for PCMPxSTRx cases 0x70 and 0x19.  Pertains to #359952.
Mark Wielaard ff9a4a
    
Mark Wielaard ff9a4a
    
Mark Wielaard ff9a4a
    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15910 a5019735-40e9-0310-863c-91ae7b9d1cf9
Mark Wielaard ff9a4a
Mark Wielaard ff9a4a
diff --git a/none/tests/amd64/pcmpstr64.c b/none/tests/amd64/pcmpstr64.c
Mark Wielaard ff9a4a
index 0694012..2b48c72 100644
Mark Wielaard ff9a4a
--- a/none/tests/amd64/pcmpstr64.c
Mark Wielaard ff9a4a
+++ b/none/tests/amd64/pcmpstr64.c
Mark Wielaard ff9a4a
@@ -207,6 +207,7 @@ Bool pcmpXstrX_WRK ( /*OUT*/V128* resV,
Mark Wielaard ff9a4a
       case 0x12: case 0x14: case 0x18: case 0x1A:
Mark Wielaard ff9a4a
       case 0x30: case 0x34: case 0x38: case 0x3A:
Mark Wielaard ff9a4a
       case 0x40: case 0x42: case 0x44: case 0x46: case 0x4A:
Mark Wielaard ff9a4a
+      case 0x70:
Mark Wielaard ff9a4a
          break;
Mark Wielaard ff9a4a
       default:
Mark Wielaard ff9a4a
          return False;
Mark Wielaard ff9a4a
@@ -1971,6 +1972,86 @@ void istri_14 ( void )
Mark Wielaard ff9a4a
 
Mark Wielaard ff9a4a
 //////////////////////////////////////////////////////////
Mark Wielaard ff9a4a
 //                                                      //
Mark Wielaard ff9a4a
+//                       ISTRI_70                       //
Mark Wielaard ff9a4a
+//                                                      //
Mark Wielaard ff9a4a
+//////////////////////////////////////////////////////////
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+UInt h_pcmpistri_70 ( V128* argL, V128* argR )
Mark Wielaard ff9a4a
+{
Mark Wielaard ff9a4a
+   V128 block[2];
Mark Wielaard ff9a4a
+   memcpy(&block[0], argL, sizeof(V128));
Mark Wielaard ff9a4a
+   memcpy(&block[1], argR, sizeof(V128));
Mark Wielaard ff9a4a
+   ULong res, flags;
Mark Wielaard ff9a4a
+   __asm__ __volatile__(
Mark Wielaard ff9a4a
+      "subq      $1024,  %%rsp"             "\n\t"
Mark Wielaard ff9a4a
+      "movdqu    0(%2),  %%xmm2"            "\n\t"
Mark Wielaard ff9a4a
+      "movdqu    16(%2), %%xmm11"           "\n\t"
Mark Wielaard ff9a4a
+      "pcmpistri $0x70,  %%xmm2, %%xmm11"   "\n\t"
Mark Wielaard ff9a4a
+      "pushfq"                              "\n\t"
Mark Wielaard ff9a4a
+      "popq      %%rdx"                     "\n\t"
Mark Wielaard ff9a4a
+      "movq      %%rcx,  %0"                "\n\t"
Mark Wielaard ff9a4a
+      "movq      %%rdx,  %1"                "\n\t"
Mark Wielaard ff9a4a
+      "addq      $1024,  %%rsp"             "\n\t"
Mark Wielaard ff9a4a
+      : /*out*/ "=r"(res), "=r"(flags) : "r"/*in*/(&block[0])
Mark Wielaard ff9a4a
+      : "rcx","rdx","xmm0","xmm2","xmm11","cc","memory"
Mark Wielaard ff9a4a
+   );
Mark Wielaard ff9a4a
+   return ((flags & 0x8D5) << 16) | (res & 0xFFFF);
Mark Wielaard ff9a4a
+}
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+UInt s_pcmpistri_70 ( V128* argLU, V128* argRU )
Mark Wielaard ff9a4a
+{
Mark Wielaard ff9a4a
+   V128 resV;
Mark Wielaard ff9a4a
+   UInt resOSZACP, resECX;
Mark Wielaard ff9a4a
+   Bool ok
Mark Wielaard ff9a4a
+      = pcmpXstrX_WRK( &resV, &resOSZACP, argLU, argRU,
Mark Wielaard ff9a4a
+                       zmask_from_V128(argLU),
Mark Wielaard ff9a4a
+                       zmask_from_V128(argRU),
Mark Wielaard ff9a4a
+                       0x70, False/*!isSTRM*/
Mark Wielaard ff9a4a
+        );
Mark Wielaard ff9a4a
+   assert(ok);
Mark Wielaard ff9a4a
+   resECX = resV.uInt[0];
Mark Wielaard ff9a4a
+   return (resOSZACP << 16) | resECX;
Mark Wielaard ff9a4a
+}
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+void istri_70 ( void )
Mark Wielaard ff9a4a
+{
Mark Wielaard ff9a4a
+   char* wot = "70";
Mark Wielaard ff9a4a
+   UInt(*h)(V128*,V128*) = h_pcmpistri_70;
Mark Wielaard ff9a4a
+   UInt(*s)(V128*,V128*) = s_pcmpistri_70;
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "abcdacbdabcdabcd", "000000000000000a"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000000b"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "00000000000000ab"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "abcdabc0abcdabcd", "000000000000abcd"); 
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000abcd"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0bcdabcdabcdabcd", "000000000000abcd"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "abcdabcdabcda0cd", "000000000000abcd"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "abcdabcdabcdab0d", "000000000000abcd"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "abcdabcdabcdabc0", "000000000000abcd"); 
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000abcd"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000a0cd"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000ab0d"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000abc0"); 
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0000000000000000", "0000000000000000"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "aaaaaaaaaaaaaaaa"); 
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0000abcdabcdabcd", "000000000000abcd"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0000abcdabcdabcd", "000000000000dcba"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0000abcdabcdabcd", "000000000000bbbb"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0000abcdabcdabcd", "000000000000baba"); 
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0000abcdabcdabcd", "00000000000baba0"); 
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0ddc0ffeebadf00d", "00000000cafebabe"); 
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0ddc0ffeebadfeed", "00000000cafebabe"); 
Mark Wielaard ff9a4a
+}
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+//////////////////////////////////////////////////////////
Mark Wielaard ff9a4a
+//                                                      //
Mark Wielaard ff9a4a
 //                         main                         //
Mark Wielaard ff9a4a
 //                                                      //
Mark Wielaard ff9a4a
 //////////////////////////////////////////////////////////
Mark Wielaard ff9a4a
@@ -1995,5 +2076,6 @@ int main ( void )
Mark Wielaard ff9a4a
    istri_0E();
Mark Wielaard ff9a4a
    istri_14();
Mark Wielaard ff9a4a
    istri_34();
Mark Wielaard ff9a4a
+   istri_70();
Mark Wielaard ff9a4a
    return 0;
Mark Wielaard ff9a4a
 }
Mark Wielaard ff9a4a
diff --git a/none/tests/amd64/pcmpstr64.stdout.exp b/none/tests/amd64/pcmpstr64.stdout.exp
Mark Wielaard ff9a4a
index 4921586..55d7fe0 100644
Mark Wielaard ff9a4a
--- a/none/tests/amd64/pcmpstr64.stdout.exp
Mark Wielaard ff9a4a
+++ b/none/tests/amd64/pcmpstr64.stdout.exp
Mark Wielaard ff9a4a
@@ -458,3 +458,25 @@ istri 34  163887ec041a9b72 fcd75adb9b3e895a -> 08410000 08410000
Mark Wielaard ff9a4a
 istri 34  fc937cbfbf53f8e2 0d136bcb024d3fb7 -> 08810000 08810000 
Mark Wielaard ff9a4a
 istri 34  2ca34182c29a82ab 302ebd646775ab54 -> 08810000 08810000 
Mark Wielaard ff9a4a
 istri 34  3f2987608c11be6f a9ecb661f8e0a8cb -> 08c10000 08c10000 
Mark Wielaard ff9a4a
+istri 70  abcdacbdabcdabcd 000000000000000a -> 0881000e 0881000e 
Mark Wielaard ff9a4a
+istri 70  abcdabcdabcdabcd 000000000000000b -> 0881000f 0881000f 
Mark Wielaard ff9a4a
+istri 70  abcdabcdabcdabcd 00000000000000ab -> 0881000d 0881000d 
Mark Wielaard ff9a4a
+istri 70  abcdabc0abcdabcd 000000000000abcd -> 00c00010 00c00010 
Mark Wielaard ff9a4a
+istri 70  abcdabcdabcdabcd 000000000000abcd -> 00800010 00800010 
Mark Wielaard ff9a4a
+istri 70  0bcdabcdabcdabcd 000000000000abcd -> 00c00010 00c00010 
Mark Wielaard ff9a4a
+istri 70  abcdabcdabcda0cd 000000000000abcd -> 00c00010 00c00010 
Mark Wielaard ff9a4a
+istri 70  abcdabcdabcdab0d 000000000000abcd -> 00c00010 00c00010 
Mark Wielaard ff9a4a
+istri 70  abcdabcdabcdabc0 000000000000abcd -> 00c00010 00c00010 
Mark Wielaard ff9a4a
+istri 70  abcdabcdabcdabcd 000000000000abcd -> 00800010 00800010 
Mark Wielaard ff9a4a
+istri 70  abcdabcdabcdabcd 000000000000a0cd -> 0081000f 0081000f 
Mark Wielaard ff9a4a
+istri 70  abcdabcdabcdabcd 000000000000ab0d -> 0081000f 0081000f 
Mark Wielaard ff9a4a
+istri 70  abcdabcdabcdabcd 000000000000abc0 -> 0881000f 0881000f 
Mark Wielaard ff9a4a
+istri 70  0000000000000000 0000000000000000 -> 00c00010 00c00010 
Mark Wielaard ff9a4a
+istri 70  aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa -> 00000010 00000010 
Mark Wielaard ff9a4a
+istri 70  0000abcdabcdabcd 000000000000abcd -> 00c00010 00c00010 
Mark Wielaard ff9a4a
+istri 70  0000abcdabcdabcd 000000000000dcba -> 00c00010 00c00010 
Mark Wielaard ff9a4a
+istri 70  0000abcdabcdabcd 000000000000bbbb -> 08c1000b 08c1000b 
Mark Wielaard ff9a4a
+istri 70  0000abcdabcdabcd 000000000000baba -> 08c10009 08c10009 
Mark Wielaard ff9a4a
+istri 70  0000abcdabcdabcd 00000000000baba0 -> 08c1000b 08c1000b 
Mark Wielaard ff9a4a
+istri 70  0ddc0ffeebadf00d 00000000cafebabe -> 08c10000 08c10000 
Mark Wielaard ff9a4a
+istri 70  0ddc0ffeebadfeed 00000000cafebabe -> 08c10004 08c10004 
Mark Wielaard ff9a4a
diff --git a/none/tests/amd64/pcmpstr64w.c b/none/tests/amd64/pcmpstr64w.c
Mark Wielaard ff9a4a
index 858cfd8..6a1adad 100644
Mark Wielaard ff9a4a
--- a/none/tests/amd64/pcmpstr64w.c
Mark Wielaard ff9a4a
+++ b/none/tests/amd64/pcmpstr64w.c
Mark Wielaard ff9a4a
@@ -209,7 +209,7 @@ Bool pcmpXstrX_WRK_wide ( /*OUT*/V128* resV,
Mark Wielaard ff9a4a
       unvalidated cases in the code base. */
Mark Wielaard ff9a4a
    switch (imm8) {
Mark Wielaard ff9a4a
       case 0x01: case 0x03: case 0x09: case 0x0B: case 0x0D:
Mark Wielaard ff9a4a
-      case 0x13:            case 0x1B:
Mark Wielaard ff9a4a
+                 case 0x13: case 0x19: case 0x1B:
Mark Wielaard ff9a4a
                             case 0x39: case 0x3B:
Mark Wielaard ff9a4a
                  case 0x45:            case 0x4B:
Mark Wielaard ff9a4a
          break;
Mark Wielaard ff9a4a
@@ -1255,6 +1255,99 @@ void istri_39 ( void )
Mark Wielaard ff9a4a
 
Mark Wielaard ff9a4a
 //////////////////////////////////////////////////////////
Mark Wielaard ff9a4a
 //                                                      //
Mark Wielaard ff9a4a
+//                       ISTRI_19                       //
Mark Wielaard ff9a4a
+//                                                      //
Mark Wielaard ff9a4a
+//////////////////////////////////////////////////////////
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+UInt h_pcmpistri_19 ( V128* argL, V128* argR )
Mark Wielaard ff9a4a
+{
Mark Wielaard ff9a4a
+   V128 block[2];
Mark Wielaard ff9a4a
+   memcpy(&block[0], argL, sizeof(V128));
Mark Wielaard ff9a4a
+   memcpy(&block[1], argR, sizeof(V128));
Mark Wielaard ff9a4a
+   ULong res, flags;
Mark Wielaard ff9a4a
+   __asm__ __volatile__(
Mark Wielaard ff9a4a
+      "subq      $1024,  %%rsp"             "\n\t"
Mark Wielaard ff9a4a
+      "movdqu    0(%2),  %%xmm2"            "\n\t"
Mark Wielaard ff9a4a
+      "movdqu    16(%2), %%xmm11"           "\n\t"
Mark Wielaard ff9a4a
+      "pcmpistri $0x19,  %%xmm2, %%xmm11"   "\n\t"
Mark Wielaard ff9a4a
+      "pushfq"                              "\n\t"
Mark Wielaard ff9a4a
+      "popq      %%rdx"                     "\n\t"
Mark Wielaard ff9a4a
+      "movq      %%rcx,  %0"                "\n\t"
Mark Wielaard ff9a4a
+      "movq      %%rdx,  %1"                "\n\t"
Mark Wielaard ff9a4a
+      "addq      $1024,  %%rsp"             "\n\t"
Mark Wielaard ff9a4a
+      : /*out*/ "=r"(res), "=r"(flags) : "r"/*in*/(&block[0])
Mark Wielaard ff9a4a
+      : "rcx","rdx","xmm0","xmm2","xmm11","cc","memory"
Mark Wielaard ff9a4a
+   );
Mark Wielaard ff9a4a
+   return ((flags & 0x8D5) << 16) | (res & 0xFFFF);
Mark Wielaard ff9a4a
+}
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+UInt s_pcmpistri_19 ( V128* argLU, V128* argRU )
Mark Wielaard ff9a4a
+{
Mark Wielaard ff9a4a
+   V128 resV;
Mark Wielaard ff9a4a
+   UInt resOSZACP, resECX;
Mark Wielaard ff9a4a
+   Bool ok
Mark Wielaard ff9a4a
+      = pcmpXstrX_WRK_wide( &resV, &resOSZACP, argLU, argRU,
Mark Wielaard ff9a4a
+			    zmask_from_V128(argLU),
Mark Wielaard ff9a4a
+			    zmask_from_V128(argRU),
Mark Wielaard ff9a4a
+			    0x19, False/*!isSTRM*/
Mark Wielaard ff9a4a
+        );
Mark Wielaard ff9a4a
+   assert(ok);
Mark Wielaard ff9a4a
+   resECX = resV.uInt[0];
Mark Wielaard ff9a4a
+   return (resOSZACP << 16) | resECX;
Mark Wielaard ff9a4a
+}
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+void istri_19 ( void )
Mark Wielaard ff9a4a
+{
Mark Wielaard ff9a4a
+   char* wot = "19";
Mark Wielaard ff9a4a
+   UInt(*h)(V128*,V128*) = h_pcmpistri_19;
Mark Wielaard ff9a4a
+   UInt(*s)(V128*,V128*) = s_pcmpistri_19;
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0000000000000000", "0000000000000000");
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaa2aaaaaaaaaaa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaa2aaaaaa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaaa2aa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "aaaa2aaaaaaaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "aaaaaaaaa2aaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "aaaaaaaaaaaaaa2a");
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "baaaaaaaaaaaaaaa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "b9aaaaaaaaaaaaaa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "b9baaaaaaaaaaaaa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "b9baaaaaaaaaaaaa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "b9baaaaaaaaaaaaa", "aaaaaaaaaaaa7aaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "b9baaaaaaaaaaaaa", "aaaaaaaa2aaa4aaa");
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaa00aa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "aaaaaaaaaaaa00aa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaa00aa", "aaaaaaaaaaaa00aa");
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaa00aaaaaa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "aaaaaaaaaaaa00aa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaa00aaaaaa", "aaaaaaaaaaaa00aa");
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaa00aa", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "aaaaaaaa00aaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaa00aa", "aaaaaaaa00aaaaaa");
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0000000000000000", "aaaaaaaa00aaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "8000000000000000", "aaaaaaaa00aaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0000000000000001", "aaaaaaaa00aaaaaa");
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "0000000000000000", "aaaaaaaaaaaaaaaa");
Mark Wielaard ff9a4a
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "0000000000000000");
Mark Wielaard ff9a4a
+}
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+
Mark Wielaard ff9a4a
+//////////////////////////////////////////////////////////
Mark Wielaard ff9a4a
+//                                                      //
Mark Wielaard ff9a4a
 //                         main                         //
Mark Wielaard ff9a4a
 //                                                      //
Mark Wielaard ff9a4a
 //////////////////////////////////////////////////////////
Mark Wielaard ff9a4a
@@ -1271,5 +1364,6 @@ int main ( void )
Mark Wielaard ff9a4a
    istri_45();
Mark Wielaard ff9a4a
    istri_01();
Mark Wielaard ff9a4a
    istri_39();
Mark Wielaard ff9a4a
+   istri_19();
Mark Wielaard ff9a4a
    return 0;
Mark Wielaard ff9a4a
 }
Mark Wielaard ff9a4a
diff --git a/none/tests/amd64/pcmpstr64w.stdout.exp b/none/tests/amd64/pcmpstr64w.stdout.exp
Mark Wielaard ff9a4a
index 77d555d..c18184c 100644
Mark Wielaard ff9a4a
--- a/none/tests/amd64/pcmpstr64w.stdout.exp
Mark Wielaard ff9a4a
+++ b/none/tests/amd64/pcmpstr64w.stdout.exp
Mark Wielaard ff9a4a
@@ -258,3 +258,33 @@ istri 39  8000000000000000 aaaaaaaa00aaaaaa -> 00c10003 00c10003
Mark Wielaard ff9a4a
 istri 39  0000000000000001 aaaaaaaa00aaaaaa -> 08c10000 08c10000 
Mark Wielaard ff9a4a
 istri 39  0000000000000000 aaaaaaaaaaaaaaaa -> 00400008 00400008 
Mark Wielaard ff9a4a
 istri 39  aaaaaaaaaaaaaaaa 0000000000000000 -> 08810000 08810000 
Mark Wielaard ff9a4a
+istri 19  0000000000000000 0000000000000000 -> 00c00008 00c00008 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa -> 00000008 00000008 
Mark Wielaard ff9a4a
+istri 19  aaaa2aaaaaaaaaaa aaaaaaaaaaaaaaaa -> 00010005 00010005 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaa2aaaaaa aaaaaaaaaaaaaaaa -> 00010003 00010003 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaaa2aa aaaaaaaaaaaaaaaa -> 00010001 00010001 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaaaaaa aaaa2aaaaaaaaaaa -> 00010005 00010005 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaaaaaa aaaaaaaaa2aaaaaa -> 00010003 00010003 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaaaaaa aaaaaaaaaaaaaa2a -> 08010000 08010000 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa -> 00000008 00000008 
Mark Wielaard ff9a4a
+istri 19  baaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa -> 00010007 00010007 
Mark Wielaard ff9a4a
+istri 19  b9aaaaaaaaaaaaaa aaaaaaaaaaaaaaaa -> 00010007 00010007 
Mark Wielaard ff9a4a
+istri 19  b9baaaaaaaaaaaaa aaaaaaaaaaaaaaaa -> 00010006 00010006 
Mark Wielaard ff9a4a
+istri 19  b9baaaaaaaaaaaaa aaaaaaaaaaaaaaaa -> 00010006 00010006 
Mark Wielaard ff9a4a
+istri 19  b9baaaaaaaaaaaaa aaaaaaaaaaaa7aaa -> 00010001 00010001 
Mark Wielaard ff9a4a
+istri 19  b9baaaaaaaaaaaaa aaaaaaaa2aaa4aaa -> 00010001 00010001 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa -> 00000008 00000008 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaa00aa aaaaaaaaaaaaaaaa -> 00410001 00410001 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaaaaaa aaaaaaaaaaaa00aa -> 00810001 00810001 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaa00aa aaaaaaaaaaaa00aa -> 00c00008 00c00008 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaa00aaaaaa aaaaaaaaaaaaaaaa -> 00410003 00410003 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaaaaaa aaaaaaaaaaaa00aa -> 00810001 00810001 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaa00aaaaaa aaaaaaaaaaaa00aa -> 00c10001 00c10001 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaa00aa aaaaaaaaaaaaaaaa -> 00410001 00410001 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaaaaaa aaaaaaaa00aaaaaa -> 00810003 00810003 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaa00aa aaaaaaaa00aaaaaa -> 00c10001 00c10001 
Mark Wielaard ff9a4a
+istri 19  0000000000000000 aaaaaaaa00aaaaaa -> 08c10000 08c10000 
Mark Wielaard ff9a4a
+istri 19  8000000000000000 aaaaaaaa00aaaaaa -> 08c10000 08c10000 
Mark Wielaard ff9a4a
+istri 19  0000000000000001 aaaaaaaa00aaaaaa -> 08c10000 08c10000 
Mark Wielaard ff9a4a
+istri 19  0000000000000000 aaaaaaaaaaaaaaaa -> 08410000 08410000 
Mark Wielaard ff9a4a
+istri 19  aaaaaaaaaaaaaaaa 0000000000000000 -> 08810000 08810000