Merge pull request #1457 from W0ni/arm_handle_cf_shifters

[ARM] compute cf for shift/rotate
cea-sec · Mar 21, 2024 · 88432b0 · 88432b0
2 parents 2b1273e + 16cc7d3
commit 88432b0
Show file tree

Hide file tree

Showing 4 changed files with 270 additions and 79 deletions.
diff --git a/miasm/arch/arm/arch.py b/miasm/arch/arm/arch.py
@@ -1148,8 +1148,12 @@ def decode(self, v):
             shift_op = ExprInt(amount, 32)
         a = regs_expr[rm]
         if shift_op == ExprInt(0, 32):
+            #rrx
             if shift_type == 3:
                 self.expr = ExprOp(allshifts[4], a)
+            #asr, lsr
+            elif shift_type == 1 or shift_type == 2:
+                self.expr = ExprOp(allshifts[shift_type], a, ExprInt(32, 32))
             else:
                 self.expr = a
         else: