|
From: <sv...@va...> - 2011-02-14 13:37:11
|
Author: sewardj
Date: 2011-02-14 13:37:03 +0000 (Mon, 14 Feb 2011)
New Revision: 2095
Log:
Merge from trunk, r2079 (Tolerate redundant REX.W in POPQ m64.)
Modified:
branches/VEX_3_6_BRANCH/priv/guest_amd64_toIR.c
Modified: branches/VEX_3_6_BRANCH/priv/guest_amd64_toIR.c
===================================================================
--- branches/VEX_3_6_BRANCH/priv/guest_amd64_toIR.c 2011-02-14 13:33:36 UTC (rev 2094)
+++ branches/VEX_3_6_BRANCH/priv/guest_amd64_toIR.c 2011-02-14 13:37:03 UTC (rev 2095)
@@ -16856,7 +16856,8 @@
/* 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
|