merge r1882: Handle redundant REX.W on PUNPCKHgg. #173751.

git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_4_BRANCH@1883

diff --git a/VEX/priv/guest-amd64/toIR.c b/VEX/priv/guest-amd64/toIR.c
index 9a870063e2c3d80446a95cfe4d4e0fe46a8fffa6..bebd44e70e20b6b03c6114fd824c4c1fbf9e61b9 100644 (file)
--- a/VEX/priv/guest-amd64/toIR.c
+++ b/VEX/priv/guest-amd64/toIR.c
@@ -6594,7 +6594,8 @@ ULong dis_MMX ( Bool* decode_ok,
       case 0x68: 
       case 0x69: 
       case 0x6A: /* PUNPCKHgg (src)mmxreg-or-mem, (dst)mmxreg */
-         if (sz != 4) 
+         if (sz != 4
+             && /*ignore redundant REX.W*/!(sz==8 && haveNo66noF2noF3(pfx))) 
             goto mmx_decode_failure;
          delta = dis_MMXop_regmem_to_reg ( vbi, pfx, delta, opc, "punpckh", True );
          break;