about summary refs log tree commit diff stats
path: root/example/expression
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 /example/expression
parent47811fe5a56c8071ab5064e1f84ca64389941eec (diff)
parent00a5a16d47a32f1a483ba625fa9bd5c6eb460542 (diff)
downloadmiasm-c2e52be18ddd2eeb86b413e851a3ade0ceeca1dc.tar.gz
miasm-c2e52be18ddd2eeb86b413e851a3ade0ceeca1dc.zip
Merge pull request #673 from serpilliere/fix_irs
irs => assignblks
Diffstat (limited to 'example/expression')
-rw-r--r--example/expression/access_c.py8
-rw-r--r--example/expression/get_read_write.py8
2 files changed, 8 insertions, 8 deletions
diff --git a/example/expression/access_c.py b/example/expression/access_c.py
index f285eb55..de158730 100644
--- a/example/expression/access_c.py
+++ b/example/expression/access_c.py
@@ -60,15 +60,15 @@ def find_call(ira):
 
     for irb in ira.blocks.values():
         out = set()
-        if len(irb.irs) < 2:
+        if len(irb) < 2:
             continue
-        assignblk = irb.irs[-2]
+        assignblk = irb[-2]
         for src in assignblk.itervalues():
             if not isinstance(src, ExprOp):
                 continue
             if not src.op.startswith('call_func'):
                 continue
-            out.add((irb, len(irb.irs) - 2))
+            out.add((irb, len(irb) - 2))
         if len(out) != 1:
             continue
         irb, index = out.pop()
@@ -98,7 +98,7 @@ def get_funcs_arg0(ctx, ira, lbl_head):
     element = ira.arch.regs.RSI
 
     for irb, index in find_call(ira):
-        instr = irb.irs[index].instr
+        instr = irb[index].instr
         print 'Analysing references from:', hex(instr.offset), instr
         g_list = g_dep.get(irb.label, set([element]), index, set([lbl_head]))
         for dep in g_list:
diff --git a/example/expression/get_read_write.py b/example/expression/get_read_write.py
index f4dde4b5..b4a0773b 100644
--- a/example/expression/get_read_write.py
+++ b/example/expression/get_read_write.py
@@ -16,10 +16,10 @@ l.offset, l.l = 0, 15
 ir_arch.add_instr(l)
 
 print '*' * 80
-for lbl, b in ir_arch.blocks.items():
-    print b
-    for irs in b.irs:
-        o_r, o_w = get_rw(irs)
+for lbl, irblock in ir_arch.blocks.items():
+    print irblock
+    for assignblk in irblock:
+        o_r, o_w = get_rw(assignblk)
         print 'read:   ', [str(x) for x in o_r]
         print 'written:', [str(x) for x in o_w]
         print