about summary refs log tree commit diff stats
path: root/example
diff options
context:
space:
mode:
Diffstat (limited to 'example')
-rw-r--r--example/disasm/callback.py4
-rw-r--r--example/disasm/file.py2
-rw-r--r--example/disasm/full.py6
-rw-r--r--example/disasm/function.py2
-rw-r--r--example/expression/access_c.py4
-rw-r--r--example/expression/asm_to_ir.py2
-rw-r--r--example/expression/graph_dataflow.py4
-rw-r--r--example/expression/solve_condition_stp.py8
-rw-r--r--example/ida/ctype_propagation.py10
-rw-r--r--example/ida/depgraph.py4
-rw-r--r--example/ida/graph_ir.py4
-rw-r--r--example/ida/symbol_exec.py4
-rw-r--r--example/jitter/unpack_upx.py2
-rw-r--r--example/symbol_exec/depgraph.py4
-rw-r--r--example/symbol_exec/single_instr.py4
15 files changed, 32 insertions, 32 deletions
diff --git a/example/disasm/callback.py b/example/disasm/callback.py
index 06159138..5aae7f6f 100644
--- a/example/disasm/callback.py
+++ b/example/disasm/callback.py
@@ -46,7 +46,7 @@ bin_stream = bin_stream_str(shellcode)
 mdis = dis_x86_32(bin_stream)
 
 print "Without callback:\n"
-blocks = mdis.dis_multibloc(0)
+blocks = mdis.dis_multiblock(0)
 print "\n".join(str(block) for block in blocks)
 
 # Enable callback
@@ -59,7 +59,7 @@ mdis.job_done.clear()
 
 print "=" * 40
 print "With callback:\n"
-blocks_after = mdis.dis_multibloc(0)
+blocks_after = mdis.dis_multiblock(0)
 print "\n".join(str(block) for block in blocks_after)
 
 # Ensure the callback has been called
diff --git a/example/disasm/file.py b/example/disasm/file.py
index db5cd96b..88ba6162 100644
--- a/example/disasm/file.py
+++ b/example/disasm/file.py
@@ -13,6 +13,6 @@ cont = Container.from_stream(open(sys.argv[1]))
 mdis = dis_x86_32(cont.bin_stream)
 # Inform the engine to avoid disassembling null instructions
 mdis.dont_dis_nulstart_bloc = True
-blocks = mdis.dis_multibloc(addr)
+blocks = mdis.dis_multiblock(addr)
 
 open('graph.dot', 'w').write(blocks.dot())
diff --git a/example/disasm/full.py b/example/disasm/full.py
index dd0ac6cd..ad85f7dc 100644
--- a/example/disasm/full.py
+++ b/example/disasm/full.py
@@ -121,7 +121,7 @@ while not finish and todo:
         if ad in done:
             continue
         done.add(ad)
-        allblocks = mdis.dis_multibloc(ad)
+        allblocks = mdis.dis_multiblock(ad)
 
         log.info('func ok %.16x (%d)' % (ad, len(all_funcs)))
 
@@ -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/disasm/function.py b/example/disasm/function.py
index 1fe1754f..89f65abb 100644
--- a/example/disasm/function.py
+++ b/example/disasm/function.py
@@ -8,7 +8,7 @@ from miasm2.arch.x86.disasm import dis_x86_32
 # RET
 shellcode = '\xb8\xef\xbe7\x13\xb9\x04\x00\x00\x00\xc1\xc0\x08\xe2\xfb\xc3'
 mdis = dis_x86_32(shellcode)
-blocks = mdis.dis_multibloc(0)
+blocks = mdis.dis_multiblock(0)
 
 for block in blocks:
     print block
diff --git a/example/expression/access_c.py b/example/expression/access_c.py
index 9ba33822..7255e23a 100644
--- a/example/expression/access_c.py
+++ b/example/expression/access_c.py
@@ -157,12 +157,12 @@ dis_engine, ira = machine.dis_engine, machine.ira
 
 mdis = dis_engine(cont.bin_stream, symbol_pool=cont.symbol_pool)
 addr_head = 0
-blocks = mdis.dis_multibloc(addr_head)
+blocks = mdis.dis_multiblock(addr_head)
 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..120cd73a 100644
--- a/example/expression/graph_dataflow.py
+++ b/example/expression/graph_dataflow.py
@@ -151,7 +151,7 @@ ad = int(args.addr, 16)
 print 'disasm...'
 mdis = dis_x86_32(data)
 mdis.follow_call = True
-ab = mdis.dis_multibloc(ad)
+ab = mdis.dis_multiblock(ad)
 print 'ok'
 
 
@@ -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 27b0512f..c9d4c7af 100644
--- a/example/expression/solve_condition_stp.py
+++ b/example/expression/solve_condition_stp.py
@@ -37,9 +37,9 @@ def get_block(ir_arch, mdis, ad):
         l = mdis.symbol_pool.getby_offset_create(ad)
     if not l in ir_arch.blocks:
         ad = l.offset
-        b = mdis.dis_bloc(ad)
-        ir_arch.add_bloc(b)
-    b = ir_arch.get_bloc(l)
+        b = mdis.dis_block(ad)
+        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)
     return b
@@ -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 f4fdc3b5..a48179e9 100644
--- a/example/ida/ctype_propagation.py
+++ b/example/ida/ctype_propagation.py
@@ -60,9 +60,9 @@ def get_block(ir_arch, mdis, addr):
     mdis.job_done.clear()
     lbl = ir_arch.get_label(addr)
     if not lbl in ir_arch.blocks:
-        block = mdis.dis_bloc(lbl.offset)
-        ir_arch.add_bloc(block)
-    irblock = ir_arch.get_bloc(lbl)
+        block = mdis.dis_block(lbl.offset)
+        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)
     return irblock
@@ -165,10 +165,10 @@ def analyse_function():
     # Get the current function
     func = ida_funcs.get_func(idc.ScreenEA())
     addr = func.startEA
-    blocks = mdis.dis_multibloc(addr)
+    blocks = mdis.dis_multiblock(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..915f14bc 100644
--- a/example/ida/depgraph.py
+++ b/example/ida/depgraph.py
@@ -214,11 +214,11 @@ def launch_depgraph():
     # Get the current function
     addr = idc.ScreenEA()
     func = ida_funcs.get_func(addr)
-    blocks = mdis.dis_multibloc(func.startEA)
+    blocks = mdis.dis_multiblock(func.startEA)
 
     # 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..9a65617b 100644
--- a/example/ida/graph_ir.py
+++ b/example/ida/graph_ir.py
@@ -138,7 +138,7 @@ def build_graph(verbose=False, simplify=False):
     if verbose:
         print hex(addr)
 
-    blocks = mdis.dis_multibloc(addr)
+    blocks = mdis.dis_multiblock(addr)
 
     if verbose:
         print "generating graph"
@@ -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..3d4a64fa 100644
--- a/example/ida/symbol_exec.py
+++ b/example/ida/symbol_exec.py
@@ -87,10 +87,10 @@ def symbolic_exec():
     start, end = idc.SelStart(), idc.SelEnd()
 
     mdis.dont_dis = [end]
-    blocks = mdis.dis_multibloc(start)
+    blocks = mdis.dis_multiblock(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/jitter/unpack_upx.py b/example/jitter/unpack_upx.py
index 8160e51b..f9b0aed1 100644
--- a/example/jitter/unpack_upx.py
+++ b/example/jitter/unpack_upx.py
@@ -53,7 +53,7 @@ if options.verbose is True:
 # Ensure there is one and only one leave (for OEP discovering)
 mdis = sb.machine.dis_engine(sb.jitter.bs)
 mdis.dont_dis_nulstart_bloc = True
-ab = mdis.dis_multibloc(sb.entry_point)
+ab = mdis.dis_multiblock(sb.entry_point)
 
 leaves = list(ab.get_bad_blocks_predecessors())
 assert(len(leaves) == 1)
diff --git a/example/symbol_exec/depgraph.py b/example/symbol_exec/depgraph.py
index 56ca3f82..4d518cb3 100644
--- a/example/symbol_exec/depgraph.py
+++ b/example/symbol_exec/depgraph.py
@@ -59,11 +59,11 @@ if args.rename_args:
             init_ctx[e_mem] = ExprId("arg%d" % i)
 
 # Disassemble the targeted function
-blocks = mdis.dis_multibloc(int(args.func_addr, 0))
+blocks = mdis.dis_multiblock(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..263c0252 100644
--- a/example/symbol_exec/single_instr.py
+++ b/example/symbol_exec/single_instr.py
@@ -14,11 +14,11 @@ asm = machine.mn.asm(line)[0]
 # Get back block
 bin_stream = bin_stream_str(asm)
 mdis = machine.dis_engine(bin_stream)
-asm_block = mdis.dis_bloc(START_ADDR)
+asm_block = mdis.dis_block(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, ...