about summary refs log tree commit diff stats
path: root/miasm2/analysis/data_analysis.py
diff options
context:
space:
mode:
authorCamille Mougey <commial@gmail.com>2018-02-09 15:25:25 +0100
committerGitHub <noreply@github.com>2018-02-09 15:25:25 +0100
commitc2e52be18ddd2eeb86b413e851a3ade0ceeca1dc (patch)
treeac0d8a4cc054b283f524846757344e556325a912 /miasm2/analysis/data_analysis.py
parent47811fe5a56c8071ab5064e1f84ca64389941eec (diff)
parent00a5a16d47a32f1a483ba625fa9bd5c6eb460542 (diff)
downloadfocaccia-miasm-c2e52be18ddd2eeb86b413e851a3ade0ceeca1dc.tar.gz
focaccia-miasm-c2e52be18ddd2eeb86b413e851a3ade0ceeca1dc.zip
Merge pull request #673 from serpilliere/fix_irs
irs => assignblks
Diffstat (limited to 'miasm2/analysis/data_analysis.py')
-rw-r--r--miasm2/analysis/data_analysis.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/miasm2/analysis/data_analysis.py b/miasm2/analysis/data_analysis.py
index b3e15ca6..130d45a4 100644
--- a/miasm2/analysis/data_analysis.py
+++ b/miasm2/analysis/data_analysis.py
@@ -14,7 +14,7 @@ def intra_block_flow_raw(ir_arch, flow_graph, irb, in_nodes, out_nodes):
     Create data flow for an irbloc using raw IR expressions
     """
     current_nodes = {}
-    for i, assignblk in enumerate(irb.irs):
+    for i, assignblk in enumerate(irb):
         dict_rw = assignblk.get_rw(cst_read=True)
         if irb.label.offset == 0x13:
             print irb.label
@@ -85,7 +85,7 @@ def intra_block_flow_symbexec(ir_arch, flow_graph, irb, in_nodes, out_nodes):
             continue
         read_values = v.get_r(cst_read=True)
         # print n_w, v, [str(x) for x in read_values]
-        node_n_w = get_node_name(irb.label, len(irb.irs), n_w)
+        node_n_w = get_node_name(irb.label, len(irb), n_w)
 
         for n_r in read_values:
             if n_r in current_nodes:
@@ -171,7 +171,7 @@ def create_implicit_flow(ir_arch, flow_graph, irb_in_nodes, irb_out_ndes):
                 # print "###", irb_son
                 # print "###", 'IN', [str(x) for x in irb_son.in_nodes]
 
-                node_n_w = irb.label, len(irb.irs), n_r
+                node_n_w = irb.label, len(irb), n_r
                 irb_out_nodes[irb.label][n_r] = node_n_w
                 if not n_r in irb_in_nodes[irb.label]:
                     irb_in_nodes[irb.label][n_r] = irb.label, 0, n_r