IR: rename blocs to blocks

7 files changed, 53 insertions, 53 deletions

diff --git a/example/disasm/full.py b/example/disasm/full.py
index f15b59eb..6bea91cd 100644
--- a/example/disasm/full.py
+++ b/example/disasm/full.py
@@ -188,23 +188,23 @@ if args.gen_ir:
 
     ir_arch = ir(mdis.symbol_pool)
     ir_arch_a = ira(mdis.symbol_pool)
-    ir_arch.blocs = {}
-    ir_arch_a.blocs = {}
-    for ad, all_bloc in all_funcs_blocs.items():
+    ir_arch.blocks = {}
+    ir_arch_a.blocks = {}
+    for ad, all_block in all_funcs_blocks.items():
         log.info("generating IR... %x" % ad)
         for b in all_bloc:
             ir_arch_a.add_bloc(b)
             ir_arch.add_bloc(b)
 
-    log.info("Print blocs (without analyse)")
-    for label, bloc in ir_arch.blocs.iteritems():
-        print bloc
+    log.info("Print blocks (without analyse)")
+    for label, block in ir_arch.blocks.iteritems():
+        print block
 
     log.info("Gen Graph... %x" % ad)
 
-    log.info("Print blocs (with analyse)")
-    for label, bloc in ir_arch_a.blocs.iteritems():
-        print bloc
+    log.info("Print blocks (with analyse)")
+    for label, block in ir_arch_a.blocks.iteritems():
+        print block
 
     if args.simplify:
         ir_arch_a.dead_simp()
diff --git a/example/expression/asm_to_ir.py b/example/expression/asm_to_ir.py
index 2f8999a4..552ddd36 100644
--- a/example/expression/asm_to_ir.py
+++ b/example/expression/asm_to_ir.py
@@ -41,8 +41,8 @@ for b in blocs:
     ir_arch.add_bloc(b)
 
 # Display IR
-for lbl, b in ir_arch.blocs.items():
-    print b
+for lbl, irblock in ir_arch.blocks.items():
+    print irblock
 
 # Dead propagation
 open('graph.dot', 'w').write(ir_arch.graph.dot())
@@ -51,6 +51,6 @@ ir_arch.dead_simp()
 open('graph2.dot', 'w').write(ir_arch.graph.dot())
 
 # Display new IR
-print 'new ir blocs'
-for lbl, b in ir_arch.blocs.items():
-    print b
+print 'new ir blocks'
+for lbl, irblock in ir_arch.blocks.items():
+    print irblock
diff --git a/example/expression/get_read_write.py b/example/expression/get_read_write.py
index cb9e0900..f4dde4b5 100644
--- a/example/expression/get_read_write.py
+++ b/example/expression/get_read_write.py
@@ -16,7 +16,7 @@ l.offset, l.l = 0, 15
 ir_arch.add_instr(l)
 
 print '*' * 80
-for lbl, b in ir_arch.blocs.items():
+for lbl, b in ir_arch.blocks.items():
     print b
     for irs in b.irs:
         o_r, o_w = get_rw(irs)
diff --git a/example/expression/graph_dataflow.py b/example/expression/graph_dataflow.py
index 16dbcbb6..0b01956f 100644
--- a/example/expression/graph_dataflow.py
+++ b/example/expression/graph_dataflow.py
@@ -110,28 +110,28 @@ def node2str(self, node):
     return out
 
 
-def gen_bloc_data_flow_graph(ir_arch, ad, block_flow_cb):
-    for irbloc in ir_arch.blocs.values():
-        print irbloc
+def gen_block_data_flow_graph(ir_arch, ad, block_flow_cb):
+    for irblock in ir_arch.blocks.values():
+        print irblock
 
     ir_arch.dead_simp()
 
-    irbloc_0 = None
-    for irbloc in ir_arch.blocs.values():
-        if irbloc.label.offset == ad:
-            irbloc_0 = irbloc
+    irblock_0 = None
+    for irblock in ir_arch.blocks.values():
+        if irblock.label.offset == ad:
+            irblock_0 = irblock
             break
     assert(irbloc_0 is not None)
     flow_graph = DiGraph()
     flow_graph.node2str = lambda n: node2str(flow_graph, n)
 
-    for irbloc in ir_arch.blocs.values():
-        block_flow_cb(ir_arch, flow_graph, irbloc)
+    for irblock in ir_arch.blocks.values():
+        block_flow_cb(ir_arch, flow_graph, irblock)
 
-    for irbloc in ir_arch.blocs.values():
-        print irbloc
-        print 'IN', [str(x) for x in irbloc.in_nodes]
-        print 'OUT', [str(x) for x in irbloc.out_nodes]
+    for irblock in ir_arch.blocks.values():
+        print irblock
+        print 'IN', [str(x) for x in irblock.in_nodes]
+        print 'OUT', [str(x) for x in irblock.out_nodes]
 
     print '*' * 20, 'interbloc', '*' * 20
     inter_bloc_flow(ir_arch, flow_graph, irbloc_0.label)
@@ -154,13 +154,13 @@ print 'ok'
 print 'generating dataflow graph for:'
 ir_arch = ir_a_x86_32(mdis.symbol_pool)
 
-blocs = ab
-for bloc in blocs:
-    print bloc
-    ir_arch.add_bloc(bloc)
-for irbloc in ir_arch.blocs.values():
-    print irbloc
-    if irbloc.label.offset != 0:
+blocks = ab
+for block in blocks:
+    print block
+    ir_arch.add_bloc(block)
+for irblock in ir_arch.blocks.values():
+    print irblock
+    if irblock.label.offset != 0:
         continue
 
 
diff --git a/example/expression/solve_condition_stp.py b/example/expression/solve_condition_stp.py
index 841081b4..1f0f2967 100644
--- a/example/expression/solve_condition_stp.py
+++ b/example/expression/solve_condition_stp.py
@@ -40,7 +40,7 @@ def get_bloc(ir_arch, mdis, ad):
         l = ad
     else:
         l = mdis.symbol_pool.getby_offset_create(ad)
-    if not l in ir_arch.blocs:
+    if not l in ir_arch.blocks:
         ad = l.offset
         b = mdis.dis_bloc(ad)
         ir_arch.add_bloc(b)
@@ -178,8 +178,8 @@ if __name__ == '__main__':
     sb.emulbloc(irb)
     sb.dump_mem()
 
-    # reset ir_arch blocs
-    ir_arch.blocs = {}
+    # reset ir_arch blocks
+    ir_arch.blocks = {}
 
     states_todo = set()
     states_done = set()
diff --git a/example/ida/depgraph.py b/example/ida/depgraph.py
index 002075ee..9024f2af 100644
--- a/example/ida/depgraph.py
+++ b/example/ida/depgraph.py
@@ -25,8 +25,8 @@ class depGraphSettingsForm(Form):
         for line_nb, l in enumerate(cur_bloc.lines):
             if l.offset == self.address:
                 break
-        cur_label = str(cur_bloc.label)
-        labels = sorted(map(str, ira.blocs.keys()))
+        cur_label = str(cur_block.label)
+        labels = sorted(map(str, ira.blocks.keys()))
         regs = sorted(ir_arch.arch.regs.all_regs_ids_byname.keys())
         regs += self.stk_args.keys()
         reg_default = regs[0]
@@ -82,7 +82,7 @@ Method to use:
     @property
     def label(self):
         value = self.cbBBL.value
-        for real_label in self.ira.blocs:
+        for real_label in self.ira.blocks:
             if str(real_label) == value:
                 return real_label
         raise ValueError("Bad label")
@@ -96,13 +96,13 @@ Method to use:
         elif mode == 1:
             return value + 1
         else:
-            return len(self.ira.blocs[self.label].irs)
+            return len(self.ira.blocks[self.label].irs)
 
     @property
     def elements(self):
         value = self.cbReg.value
         if value in self.stk_args:
-            line = self.ira.blocs[self.label].lines[self.line_nb]
+            line = self.ira.blocks[self.label].lines[self.line_nb]
             arg_num = self.stk_args[value]
             stk_high = m2_expr.ExprInt(GetSpd(line.offset), ir_arch.sp.size)
             stk_off = m2_expr.ExprInt(self.ira.sp.size/8 * arg_num, ir_arch.sp.size)
@@ -163,7 +163,7 @@ settings.Execute()
 
 label, elements, line_nb = settings.label, settings.elements, settings.line_nb
 # Simplify affectations
-for irb in ir_arch.blocs.values():
+for irb in ir_arch.blocks.values():
     fix_stack = irb.label.offset is not None and settings.unalias_stack
     for i, assignblk in enumerate(irb.irs):
         if fix_stack:
@@ -215,7 +215,7 @@ def treat_element():
 
     for node in graph.relevant_nodes:
         try:
-            offset = ir_arch.blocs[node.label].lines[node.line_nb].offset
+            offset = ir_arch.blocks[node.label].lines[node.line_nb].offset
         except IndexError:
             print "Unable to highlight %s" % node
             continue
diff --git a/example/ida/graph_ir.py b/example/ida/graph_ir.py
index 188c8fa6..252dc612 100644
--- a/example/ida/graph_ir.py
+++ b/example/ida/graph_ir.py
@@ -48,11 +48,11 @@ class GraphMiasmIR(GraphViewer):
         print 'refresh'
         self.Clear()
         addr_id = {}
-        for irbloc in self.ir_arch.blocs.values():
+        for irbloc in self.ir_arch.blocks.values():
             id_irbloc = self.AddNode(color_irbloc(irbloc))
             addr_id[irbloc] = id_irbloc
 
-        for irbloc in self.ir_arch.blocs.values():
+        for irbloc in self.ir_arch.blocks.values():
             if not irbloc:
                 continue
             dst = ir_arch.dst_trackback(irbloc)
@@ -61,9 +61,9 @@ class GraphMiasmIR(GraphViewer):
                     continue
 
                 d = d.name
-                if not d in self.ir_arch.blocs:
+                if not d in self.ir_arch.blocks:
                     continue
-                b = self.ir_arch.blocs[d]
+                b = self.ir_arch.blocks[d]
                 node1 = addr_id[irbloc]
                 node2 = addr_id[b]
                 self.AddEdge(node1, node2)
@@ -133,7 +133,7 @@ for b in ab:
 
 print "IR ok... %x" % ad
 
-for irb in ir_arch.blocs.values():
+for irb in ir_arch.blocks.values():
     for assignblk in irb.irs:
         for dst, src in assignblk.items():
             del(assignblk[dst])
@@ -201,7 +201,7 @@ def gen_bloc_data_flow_graph(ir_arch, in_str, ad):  # arch, attrib, pool_bin, bl
     # ir_arch.dead_simp()
 
     irbloc_0 = None
-    for irbloc in ir_arch.blocs.values():
+    for irbloc in ir_arch.blocks.values():
         if irbloc.label.offset == ad:
             irbloc_0 = irbloc
             break
@@ -212,11 +212,11 @@ def gen_bloc_data_flow_graph(ir_arch, in_str, ad):  # arch, attrib, pool_bin, bl
 
     bloc2w = {}
 
-    for irbloc in ir_arch.blocs.values():
+    for irbloc in ir_arch.blocks.values():
         intra_bloc_flow_symbexec(ir_arch, flow_graph, irbloc)
         # intra_bloc_flow_symb(ir_arch, flow_graph, irbloc)
 
-    for irbloc in ir_arch.blocs.values():
+    for irbloc in ir_arch.blocks.values():
         print irbloc
         print 'IN', [str(x) for x in irbloc.in_nodes]
         print 'OUT', [str(x) for x in irbloc.out_nodes]