From: Julian Seward <jseward@acm.org>
Date: Mon, 14 Feb 2011 13:37:03 +0000 (+0000)
Subject: Merge from trunk, r2079 (Tolerate redundant REX.W in POPQ m64.)
X-Git-Tag: svn/VALGRIND_3_6_1^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c7aadab885d6b5bc142efe17bcc20f73ec8ec43;p=thirdparty%2Fvalgrind.git

Merge from trunk, r2079 (Tolerate redundant REX.W in POPQ m64.)


git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_6_BRANCH@2095
---

diff --git a/VEX/priv/guest_amd64_toIR.c b/VEX/priv/guest_amd64_toIR.c
index da85c4961a..af0b2d3b79 100644
--- a/VEX/priv/guest_amd64_toIR.c
+++ b/VEX/priv/guest_amd64_toIR.c
@@ -16856,7 +16856,8 @@ DisResult disInstr_AMD64_WRK (
       /* There is no encoding for 32-bit pop in 64-bit mode.
          So sz==4 actually means sz==8. */
       if (haveF2orF3(pfx)) goto decode_failure;
-      vassert(sz == 2 || sz == 4);
+      vassert(sz == 2 || sz == 4
+              || /* tolerate redundant REX.W, see #210481 */ sz == 8);
       if (sz == 4) sz = 8;
       if (sz != 8) goto decode_failure; // until we know a sz==2 test case exists