about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--example/disasm/full.py4
-rw-r--r--example/expression/access_c.py2
-rw-r--r--example/expression/asm_to_ir.py2
-rw-r--r--example/expression/graph_dataflow.py2
-rw-r--r--example/expression/solve_condition_stp.py4
-rw-r--r--example/ida/ctype_propagation.py4
-rw-r--r--example/ida/depgraph.py2
-rw-r--r--example/ida/graph_ir.py2
-rw-r--r--example/ida/symbol_exec.py2
-rw-r--r--example/symbol_exec/depgraph.py2
-rw-r--r--example/symbol_exec/single_instr.py2
-rw-r--r--miasm2/analysis/disasm_cb.py4
-rw-r--r--miasm2/analysis/dse.py2
-rw-r--r--miasm2/ir/ir.py12
-rw-r--r--miasm2/jitter/jitcore.py2
-rwxr-xr-xtest/arch/x86/sem.py2
16 files changed, 29 insertions, 21 deletions
diff --git a/example/disasm/full.py b/example/disasm/full.py
index dd0ac6cd..3e35ed6c 100644
--- a/example/disasm/full.py
+++ b/example/disasm/full.py
@@ -193,8 +193,8 @@ if args.gen_ir:
     for ad, all_block in all_funcs_blocks.items():
         log.info("generating IR... %x" % ad)
         for block in all_block:
-            ir_arch_a.add_bloc(block)
-            ir_arch.add_bloc(block)
+            ir_arch_a.add_block(block)
+            ir_arch.add_block(block)
 
     log.info("Print blocks (without analyse)")
     for label, block in ir_arch.blocks.iteritems():
diff --git a/example/expression/access_c.py b/example/expression/access_c.py
index 9ba33822..a3de66f7 100644
--- a/example/expression/access_c.py
+++ b/example/expression/access_c.py
@@ -162,7 +162,7 @@ lbl_head = mdis.symbol_pool.getby_offset(addr_head)
 
 ir_arch_a = ira(mdis.symbol_pool)
 for block in blocks:
-    ir_arch_a.add_bloc(block)
+    ir_arch_a.add_block(block)
 
 open('graph_irflow.dot', 'w').write(ir_arch_a.graph.dot())
 
diff --git a/example/expression/asm_to_ir.py b/example/expression/asm_to_ir.py
index 058910e3..786b860e 100644
--- a/example/expression/asm_to_ir.py
+++ b/example/expression/asm_to_ir.py
@@ -38,7 +38,7 @@ ir_arch = ir_a_x86_32(symbol_pool)
 for block in blocks:
     print 'add block'
     print block
-    ir_arch.add_bloc(block)
+    ir_arch.add_block(block)
 
 # Display IR
 for lbl, irblock in ir_arch.blocks.items():
diff --git a/example/expression/graph_dataflow.py b/example/expression/graph_dataflow.py
index 8fe39777..2661e72f 100644
--- a/example/expression/graph_dataflow.py
+++ b/example/expression/graph_dataflow.py
@@ -161,7 +161,7 @@ ir_arch = ir_a_x86_32(mdis.symbol_pool)
 blocks = ab
 for block in blocks:
     print block
-    ir_arch.add_bloc(block)
+    ir_arch.add_block(block)
 for irblock in ir_arch.blocks.values():
     print irblock
     if irblock.label.offset != 0:
diff --git a/example/expression/solve_condition_stp.py b/example/expression/solve_condition_stp.py
index 2552b28f..93ebdd4e 100644
--- a/example/expression/solve_condition_stp.py
+++ b/example/expression/solve_condition_stp.py
@@ -38,7 +38,7 @@ def get_block(ir_arch, mdis, ad):
     if not l in ir_arch.blocks:
         ad = l.offset
         b = mdis.dis_bloc(ad)
-        ir_arch.add_bloc(b)
+        ir_arch.add_block(b)
     b = ir_arch.get_block(l)
     if b is None:
         raise LookupError('no block found at that address: %s' % l)
@@ -168,7 +168,7 @@ if __name__ == '__main__':
     # add fake address and len to parsed instructions
     for i, line in enumerate(b.lines):
         line.offset, line.l = i, 1
-    ir_arch.add_bloc(b)
+    ir_arch.add_block(b)
     irb = get_block(ir_arch, mdis, 0)
     sb.emulbloc(irb)
     sb.dump_mem()
diff --git a/example/ida/ctype_propagation.py b/example/ida/ctype_propagation.py
index 808228e3..abeabfd8 100644
--- a/example/ida/ctype_propagation.py
+++ b/example/ida/ctype_propagation.py
@@ -61,7 +61,7 @@ def get_block(ir_arch, mdis, addr):
     lbl = ir_arch.get_label(addr)
     if not lbl in ir_arch.blocks:
         block = mdis.dis_bloc(lbl.offset)
-        ir_arch.add_bloc(block)
+        ir_arch.add_block(block)
     irblock = ir_arch.get_block(lbl)
     if irblock is None:
         raise LookupError('No block found at that address: %s' % lbl)
@@ -168,7 +168,7 @@ def analyse_function():
     blocks = mdis.dis_multibloc(addr)
     # Generate IR
     for block in blocks:
-        ir_arch.add_bloc(block)
+        ir_arch.add_block(block)
 
     # Get settings
     settings = TypePropagationForm(ir_arch)
diff --git a/example/ida/depgraph.py b/example/ida/depgraph.py
index 12d01af9..503ed2a3 100644
--- a/example/ida/depgraph.py
+++ b/example/ida/depgraph.py
@@ -218,7 +218,7 @@ def launch_depgraph():
 
     # Generate IR
     for block in blocks:
-        ir_arch.add_bloc(block)
+        ir_arch.add_block(block)
 
     # Get settings
     settings = depGraphSettingsForm(ir_arch)
diff --git a/example/ida/graph_ir.py b/example/ida/graph_ir.py
index 8c7e80f5..d9645748 100644
--- a/example/ida/graph_ir.py
+++ b/example/ida/graph_ir.py
@@ -150,7 +150,7 @@ def build_graph(verbose=False, simplify=False):
         if verbose:
             print 'ADD'
             print block
-        ir_arch.add_bloc(block)
+        ir_arch.add_block(block)
 
     if verbose:
         print "IR ok... %x" % addr
diff --git a/example/ida/symbol_exec.py b/example/ida/symbol_exec.py
index 7599dde7..d71a1646 100644
--- a/example/ida/symbol_exec.py
+++ b/example/ida/symbol_exec.py
@@ -90,7 +90,7 @@ def symbolic_exec():
     blocks = mdis.dis_multibloc(start)
     ira = machine.ira()
     for block in blocks:
-        ira.add_bloc(block)
+        ira.add_block(block)
 
     print "Run symbolic execution..."
     sb = SymbolicExecutionEngine(ira, machine.mn.regs.regs_init)
diff --git a/example/symbol_exec/depgraph.py b/example/symbol_exec/depgraph.py
index 56ca3f82..75942ec1 100644
--- a/example/symbol_exec/depgraph.py
+++ b/example/symbol_exec/depgraph.py
@@ -63,7 +63,7 @@ blocks = mdis.dis_multibloc(int(args.func_addr, 0))
 
 # Generate IR
 for block in blocks:
-    ir_arch.add_bloc(block)
+    ir_arch.add_block(block)
 
 # Get the instance
 dg = DependencyGraph(ir_arch, implicit=args.implicit,
diff --git a/example/symbol_exec/single_instr.py b/example/symbol_exec/single_instr.py
index c31de738..1d520d3a 100644
--- a/example/symbol_exec/single_instr.py
+++ b/example/symbol_exec/single_instr.py
@@ -18,7 +18,7 @@ asm_block = mdis.dis_bloc(START_ADDR)
 
 # Translate ASM -> IR
 ira = machine.ira(mdis.symbol_pool)
-ira.add_bloc(asm_block)
+ira.add_block(asm_block)
 
 # Instanciate a Symbolic Execution engine with default value for registers
 ## EAX = EAX_init, ...
diff --git a/miasm2/analysis/disasm_cb.py b/miasm2/analysis/disasm_cb.py
index f6385c9c..9a75603f 100644
--- a/miasm2/analysis/disasm_cb.py
+++ b/miasm2/analysis/disasm_cb.py
@@ -29,7 +29,7 @@ def arm_guess_subcall(
     ir_arch = ira(sp)
     print '###'
     print cur_bloc
-    ir_arch.add_bloc(cur_bloc)
+    ir_arch.add_block(cur_bloc)
 
     ir_blocks = ir_arch.blocks.values()
     # flow_graph = DiGraph()
@@ -76,7 +76,7 @@ def arm_guess_jump_table(
 
     sp = AsmSymbolPool()
     ir_arch = ira(sp)
-    ir_arch.add_bloc(cur_bloc)
+    ir_arch.add_block(cur_bloc)
 
     ir_blocks = ir_arch.blocks.values()
     for irblock in ir_blocks:
diff --git a/miasm2/analysis/dse.py b/miasm2/analysis/dse.py
index 56ed3292..a2cb205e 100644
--- a/miasm2/analysis/dse.py
+++ b/miasm2/analysis/dse.py
@@ -302,7 +302,7 @@ class DSEEngine(object):
 
             ## Update current state
             asm_block = self.mdis.dis_bloc(cur_addr)
-            self.ir_arch.add_bloc(asm_block)
+            self.ir_arch.add_block(asm_block)
             self.addr_to_cacheblocks[cur_addr] = dict(self.ir_arch.blocks)
 
         # Emulate the current instruction
diff --git a/miasm2/ir/ir.py b/miasm2/ir/ir.py
index 67881ae6..fca579d9 100644
--- a/miasm2/ir/ir.py
+++ b/miasm2/ir/ir.py
@@ -495,7 +495,7 @@ class IntermediateRepresentation(object):
     def add_instr(self, line, addr=0, gen_pc_updt=False):
         block = AsmBlock(self.gen_label())
         block.lines = [line]
-        self.add_bloc(block, gen_pc_updt)
+        self.add_block(block, gen_pc_updt)
 
     def getby_offset(self, offset):
         out = set()
@@ -560,7 +560,7 @@ class IntermediateRepresentation(object):
             return True
         return False
 
-    def add_bloc(self, block, gen_pc_updt=False):
+    def add_block(self, block, gen_pc_updt=False):
         """
         Add a native block to the current IR
         @block: native assembly block
@@ -587,6 +587,14 @@ class IntermediateRepresentation(object):
             self.blocks[irblock.label] = irblock
         return new_ir_blocks_all
 
+    def add_bloc(self, block, gen_pc_updt=False):
+        """
+        DEPRECATED function
+        Use add_block instead of add_block
+        """
+        warnings.warn('DEPRECATION WARNING: use "add_block" instead of "add_bloc"')
+        return self.add_block(block, gen_pc_updt)
+
     def expr_fix_regs_for_mode(self, expr, *args, **kwargs):
         return expr
 
diff --git a/miasm2/jitter/jitcore.py b/miasm2/jitter/jitcore.py
index 0ccbfcd7..22c9757b 100644
--- a/miasm2/jitter/jitcore.py
+++ b/miasm2/jitter/jitcore.py
@@ -122,7 +122,7 @@ class JitCore(object):
         @block: asm_bloc to add
         """
 
-        irblocks = self.ir_arch.add_bloc(block, gen_pc_updt = True)
+        irblocks = self.ir_arch.add_block(block, gen_pc_updt = True)
         block.blocks = irblocks
         self.jitirblocs(block.label, irblocks)
 
diff --git a/test/arch/x86/sem.py b/test/arch/x86/sem.py
index 7b6a20b7..c08cf3f6 100755
--- a/test/arch/x86/sem.py
+++ b/test/arch/x86/sem.py
@@ -50,7 +50,7 @@ def compute_txt(ir, mode, txt, inputstate={}, debug=False):
     patches = asmblock.asm_resolve_final(mn, blocks, symbol_pool)
     interm = ir(symbol_pool)
     for bbl in blocks:
-        interm.add_bloc(bbl)
+        interm.add_block(bbl)
     return symb_exec(interm, inputstate, debug)
 
 op_add = lambda a, b: a+b