Merge pull request #1398 from 0xeb/main

Fixed "POP reg_sp" in all modes
cea-sec · Nov 17, 2021 · ea5abb5 · ea5abb5
2 parents b825e90 + 3284421
commit ea5abb5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/miasm/arch/x86/sem.py b/miasm/arch/x86/sem.py
@@ -929,8 +929,8 @@ def pop_gen(ir, instr, src, size):
 
     sp = mRSP[instr.mode]
     new_sp = sp + m2_expr.ExprInt(src.size // 8, sp.size)
-    # don't generate ESP incrementation on POP ESP
-    if src != ir.sp:
+    # Don't generate SP/ESP/RSP incrementation on POP SP/ESP/RSP
+    if not (src in mRSP.values()):
         e.append(m2_expr.ExprAssign(sp, new_sp))
     # XXX FIX XXX for pop [esp]
     if isinstance(src, m2_expr.ExprMem):