about summary refs log tree commit diff stats
path: root/example
diff options
context:
space:
mode:
authorserpilliere <fabrice.desclaux@cea.fr>2015-02-21 21:09:07 +0100
committerserpilliere <fabrice.desclaux@cea.fr>2015-02-22 01:48:27 +0100
commitdd2da246f676ff827201c9eee3ae698081875bf7 (patch)
tree92f0b1839ac0398426ad0332cd973cf9b41ca8c9 /example
parentf26427471fb9cda89b36b1d2609a9f58f1d79d68 (diff)
downloadmiasm-dd2da246f676ff827201c9eee3ae698081875bf7.tar.gz
miasm-dd2da246f676ff827201c9eee3ae698081875bf7.zip
Expression: remove code which uses expression modifications
Diffstat (limited to 'example')
-rw-r--r--example/ida/depgraph.py6
-rw-r--r--example/ida/graph_ir.py4
2 files changed, 6 insertions, 4 deletions
diff --git a/example/ida/depgraph.py b/example/ida/depgraph.py
index 65a3c88f..33aaa6cb 100644
--- a/example/ida/depgraph.py
+++ b/example/ida/depgraph.py
@@ -3,6 +3,8 @@ import sys
 from idaapi import GraphViewer
 from miasm2.core.bin_stream_ida import bin_stream_ida
 from miasm2.core.asmbloc import *
+from miasm2.expression import expression as m2_expr
+
 from miasm2.expression.simplifications import expr_simp
 from miasm2.analysis.machine import Machine
 from miasm2.analysis.depgraph import DependencyGraph, DependencyGraph_NoMemory
@@ -133,8 +135,8 @@ for bloc in blocs:
 # Simplify affectations
 for irb in ir_arch.blocs.values():
     for irs in irb.irs:
-        for i, e in enumerate(irs):
-            e.dst, e.src = expr_simp(e.dst), expr_simp(e.src)
+        for i, expr in enumerate(irs):
+            irs[i] = m2_expr.ExprAff(expr_simp(expr.dst), expr_simp(expr.src))
 
 # Build the IRA Graph
 ir_arch.gen_graph()
diff --git a/example/ida/graph_ir.py b/example/ida/graph_ir.py
index a1db6cbd..3a936e37 100644
--- a/example/ida/graph_ir.py
+++ b/example/ida/graph_ir.py
@@ -139,8 +139,8 @@ print "IR ok... %x" % ad
 
 for irb in ir_arch.blocs.values():
     for irs in irb.irs:
-        for i, e in enumerate(irs):
-            e.dst, e.src = expr_simp(e.dst), expr_simp(e.src)
+        for i, expr in enumerate(irs):
+            irs[i] = ExprAff(expr_simp(expr.dst), expr_simp(expr.src))
 
 ir_arch.gen_graph()
 out = ir_arch.graph()