From: Julian Seward <jseward@acm.org>
Date: Mon, 26 Jan 2009 15:54:03 +0000 (+0000)
Subject: merge r1882:  Handle redundant REX.W on PUNPCKHgg.  #173751.
X-Git-Tag: svn/VALGRIND_3_4_1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=690e6ae89b2423f5e48c83943c3288240828fcbf;p=thirdparty%2Fvalgrind.git

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 9a870063e2..bebd44e70e 100644
--- 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;