about summary refs log tree commit diff stats
path: root/miasm2/expression/expression_helper.py
diff options
context:
space:
mode:
authorCamille Mougey <commial@gmail.com>2018-10-06 16:43:55 +0200
committerGitHub <noreply@github.com>2018-10-06 16:43:55 +0200
commit369371ca24c5f4fd6670cb36b80fbd29650de7d0 (patch)
tree7b9b319f3f365cb8b71b5dcf1f07f13559798513 /miasm2/expression/expression_helper.py
parent75b389f70e7cc6640cbfb62268ba89f8985be1ed (diff)
parent9c4c548e372311f6d685647b3cfed35e1579ad54 (diff)
downloadmiasm-369371ca24c5f4fd6670cb36b80fbd29650de7d0.tar.gz
miasm-369371ca24c5f4fd6670cb36b80fbd29650de7d0.zip
Merge pull request #855 from serpilliere/exprassign
Exprassign
Diffstat (limited to 'miasm2/expression/expression_helper.py')
-rw-r--r--miasm2/expression/expression_helper.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/miasm2/expression/expression_helper.py b/miasm2/expression/expression_helper.py
index 5de9e04f..7db41394 100644
--- a/miasm2/expression/expression_helper.py
+++ b/miasm2/expression/expression_helper.py
@@ -515,7 +515,7 @@ class CondConstraintZero(CondConstraint):
     operator = m2_expr.TOK_EQUAL
 
     def to_constraint(self):
-        return m2_expr.ExprAff(self.expr, m2_expr.ExprInt(0, self.expr.size))
+        return m2_expr.ExprAssign(self.expr, m2_expr.ExprInt(0, self.expr.size))
 
 
 class CondConstraintNotZero(CondConstraint):
@@ -525,7 +525,7 @@ class CondConstraintNotZero(CondConstraint):
 
     def to_constraint(self):
         cst1, cst2 = m2_expr.ExprInt(0, 1), m2_expr.ExprInt(1, 1)
-        return m2_expr.ExprAff(cst1, m2_expr.ExprCond(self.expr, cst1, cst2))
+        return m2_expr.ExprAssign(cst1, m2_expr.ExprCond(self.expr, cst1, cst2))
 
 
 ConstrainedValue = collections.namedtuple("ConstrainedValue",
@@ -568,7 +568,7 @@ def possible_values(expr):
                                          m2_expr.ExprMem(consval.value,
                                                          expr.size))
                         for consval in possible_values(expr.arg))
-    elif isinstance(expr, m2_expr.ExprAff):
+    elif isinstance(expr, m2_expr.ExprAssign):
         consvals.update(possible_values(expr.src))
     # Special case: constraint insertion
     elif isinstance(expr, m2_expr.ExprCond):