Merge pull request #855 from serpilliere/exprassign

Exprassign

5 files changed, 12 insertions, 12 deletions

diff --git a/example/expression/solve_condition_stp.py b/example/expression/solve_condition_stp.py
index acb3abf4..6962e2ef 100644
--- a/example/expression/solve_condition_stp.py
+++ b/example/expression/solve_condition_stp.py
@@ -5,7 +5,7 @@ from pdb import pm
 
 from miasm2.analysis.machine import Machine
 from miasm2.expression.expression import ExprInt, ExprCond, ExprId, \
-    get_expr_ids, ExprAff, ExprLoc
+    get_expr_ids, ExprAssign, ExprLoc
 from miasm2.core.bin_stream import bin_stream_str
 from miasm2.ir.symbexec import SymbolicExecutionEngine, get_block
 from miasm2.expression.simplifications import expr_simp
@@ -166,7 +166,7 @@ if __name__ == '__main__':
             expr_test = ExprCond(expr,
                                  ExprInt(1, value.size),
                                  ExprInt(0, value.size))
-            cond = translator_smt2.from_expr(ExprAff(expr_test, value))
+            cond = translator_smt2.from_expr(ExprAssign(expr_test, value))
             conditions.append(cond)
 
         for name in all_ids:
diff --git a/example/ida/ctype_propagation.py b/example/ida/ctype_propagation.py
index a3d6df8b..6a655fa8 100644
--- a/example/ida/ctype_propagation.py
+++ b/example/ida/ctype_propagation.py
@@ -10,7 +10,7 @@ from miasm2.arch.x86.ctype import CTypeAMD64_unk, CTypeX86_unk
 from miasm2.arch.msp430.ctype import CTypeMSP430_unk
 from miasm2.core.objc import CTypesManagerNotPacked, ExprToAccessC, CHandler
 from miasm2.core.ctypesmngr import CAstTypes
-from miasm2.expression.expression import ExprLoc, ExprInt, ExprOp, ExprAff
+from miasm2.expression.expression import ExprLoc, ExprInt, ExprOp, ExprAssign
 from miasm2.ir.symbexec_types import SymbExecCType
 from miasm2.expression.parser import str_to_expr
 from miasm2.analysis.cst_propag import add_state, propagate_cst_expr
@@ -232,8 +232,8 @@ def get_ira_call_fixer(ira):
             print hex(stk_diff)
             call_assignblk = AssignBlock(
                 [
-                    ExprAff(self.ret_reg, ExprOp('call_func_ret', ad)),
-                    ExprAff(self.sp, self.sp + ExprInt(stk_diff, self.sp.size))
+                    ExprAssign(self.ret_reg, ExprOp('call_func_ret', ad)),
+                    ExprAssign(self.sp, self.sp + ExprInt(stk_diff, self.sp.size))
                 ],
                 instr
             )
@@ -314,8 +314,8 @@ def analyse_function():
 
     assignblk_head = AssignBlock(
         [
-            ExprAff(ir_arch.IRDst, ExprLoc(lbl_real_start, ir_arch.IRDst.size)),
-            ExprAff(ir_arch.sp, ir_arch.arch.regs.regs_init[ir_arch.sp])
+            ExprAssign(ir_arch.IRDst, ExprLoc(lbl_real_start, ir_arch.IRDst.size)),
+            ExprAssign(ir_arch.sp, ir_arch.arch.regs.regs_init[ir_arch.sp])
         ],
         first_block.lines[0]
     )
diff --git a/example/ida/symbol_exec.py b/example/ida/symbol_exec.py
index ffaa9b27..e004b1b6 100644
--- a/example/ida/symbol_exec.py
+++ b/example/ida/symbol_exec.py
@@ -3,7 +3,7 @@ import operator
 import idaapi
 import idc
 from miasm2.expression.expression_helper import Variables_Identifier
-from miasm2.expression.expression import ExprAff
+from miasm2.expression.expression import ExprAssign
 
 from utils import expr2colorstr, translatorForm
 
@@ -64,7 +64,7 @@ class symbolicexec_t(idaapi.simplecustviewer_t):
 
     def translate_expr(self, line_nb):
         element = self.line2eq[line_nb]
-        expr = ExprAff(*element)
+        expr = ExprAssign(*element)
         form = translatorForm(expr)
         form.Compile()
         form.Execute()
diff --git a/example/ida/utils.py b/example/ida/utils.py
index c66475f2..4f4f01fe 100644
--- a/example/ida/utils.py
+++ b/example/ida/utils.py
@@ -145,7 +145,7 @@ class TranslatorIDA(Translator):
                     for arg in expr._args
                 ) + ')')
 
-    def from_ExprAff(self, expr):
+    def from_ExprAssign(self, expr):
         return "%s = %s" % tuple(map(expr.from_expr, (expr.dst, expr.src)))
 
 
diff --git a/example/symbol_exec/dse_strategies.py b/example/symbol_exec/dse_strategies.py
index 5a4be321..67b63aea 100644
--- a/example/symbol_exec/dse_strategies.py
+++ b/example/symbol_exec/dse_strategies.py
@@ -22,7 +22,7 @@ from argparse import ArgumentParser
 from miasm2.analysis.machine import Machine
 from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
 from miasm2.analysis.dse import DSEPathConstraint
-from miasm2.expression.expression import ExprMem, ExprId, ExprInt, ExprAff
+from miasm2.expression.expression import ExprMem, ExprId, ExprInt, ExprAssign
 
 # Argument handling
 parser = ArgumentParser("DSE Example")
@@ -102,7 +102,7 @@ while todo:
     jitter.init_run(run_addr)
 
     # Set the argument value in the jitter context
-    jitter.eval_expr(ExprAff(arg_addr, arg_value))
+    jitter.eval_expr(ExprAssign(arg_addr, arg_value))
 
     # Launch
     jitter.continue_run()