Merge r1835 (x86 support for pushfw, popfw) (#157748)

git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_3_BRANCH@1844

diff --git a/VEX/priv/guest-x86/toIR.c b/VEX/priv/guest-x86/toIR.c
index e6016ddf4fa4b1ae226d9ba667d0ad91811ddae1..041d3247f3e2d197469711635efb1a4e69c23ad7 100644 (file)
--- a/VEX/priv/guest-x86/toIR.c
+++ b/VEX/priv/guest-x86/toIR.c
@@ -12959,8 +12959,6 @@ DisResult disInstr_X86_WRK (
 
    case 0x9D: /* POPF */
       vassert(sz == 2 || sz == 4);
-      if (sz != 4) goto decode_failure;
-      vassert(sz == 4); // until we know a sz==2 test case exists
       t1 = newTemp(Ity_I32); t2 = newTemp(Ity_I32);
       assign(t2, getIReg(4, R_ESP));
       assign(t1, widenUto32(loadLE(szToITy(sz),mkexpr(t2))));
@@ -13087,8 +13085,6 @@ DisResult disInstr_X86_WRK (
 
    case 0x9C: /* PUSHF */ {
       vassert(sz == 2 || sz == 4);
-      if (sz != 4) goto decode_failure;
-      vassert(sz == 4);  // wait for sz==2 test case
 
       t1 = newTemp(Ity_I32);
       assign( t1, binop(Iop_Sub32,getIReg(4,R_ESP),mkU32(sz)) );