From 6c7aadab885d6b5bc142efe17bcc20f73ec8ec43 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Mon, 14 Feb 2011 13:37:03 +0000 Subject: [PATCH] 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 --- VEX/priv/guest_amd64_toIR.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- 2.47.2