about summary refs log tree commit diff stats
path: root/miasm2/expression/simplifications.py
diff options
context:
space:
mode:
authorCamille Mougey <commial@gmail.com>2019-02-12 16:10:33 +0100
committerGitHub <noreply@github.com>2019-02-12 16:10:33 +0100
commit1f884d4e08eef12207b66ab1b3baebac016afe68 (patch)
tree2a148c472ddf699fe4a7dbff53b37c68707f7f41 /miasm2/expression/simplifications.py
parent9b53aa5f888c84c069809ffae752ecb80c51c738 (diff)
parent15976e2f8c0a490d6c6b8c3ef02d38762ed8585c (diff)
downloadmiasm-1f884d4e08eef12207b66ab1b3baebac016afe68.tar.gz
miasm-1f884d4e08eef12207b66ab1b3baebac016afe68.zip
Merge pull request #958 from serpilliere/simp_cond_add
Add simplifications
Diffstat (limited to 'miasm2/expression/simplifications.py')
-rw-r--r--miasm2/expression/simplifications.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/miasm2/expression/simplifications.py b/miasm2/expression/simplifications.py
index 8ea9c41f..483331a6 100644
--- a/miasm2/expression/simplifications.py
+++ b/miasm2/expression/simplifications.py
@@ -55,6 +55,7 @@ class ExpressionSimplifier(object):
             simplifications_common.simp_zeroext_and_cst_eq_cst,
             simplifications_common.simp_test_signext_inf,
             simplifications_common.simp_test_zeroext_inf,
+            simplifications_common.simp_cond_inf_eq_unsigned_zero,
 
         ],
 
@@ -67,6 +68,7 @@ class ExpressionSimplifier(object):
         m2_expr.ExprCond: [
             simplifications_common.simp_cond,
             simplifications_common.simp_cond_zeroext,
+            simplifications_common.simp_cond_add,
             # CC op
             simplifications_common.simp_cond_flag,
             simplifications_common.simp_cmp_int_arg,
@@ -75,11 +77,13 @@ class ExpressionSimplifier(object):
             simplifications_common.simp_x_and_cst_eq_cst,
             simplifications_common.simp_cond_logic_ext,
             simplifications_common.simp_cond_sign_bit,
+            simplifications_common.simp_cond_eq_1_0,
         ],
         m2_expr.ExprMem: [simplifications_common.simp_mem],
 
     }
 
+
     # Heavy passes
     PASS_HEAVY = {}
 
@@ -193,8 +197,6 @@ class ExpressionSimplifier(object):
 expr_simp = ExpressionSimplifier()
 expr_simp.enable_passes(ExpressionSimplifier.PASS_COMMONS)
 
-
-
 expr_simp_high_to_explicit = ExpressionSimplifier()
 expr_simp_high_to_explicit.enable_passes(ExpressionSimplifier.PASS_HIGH_TO_EXPLICIT)