about summary refs log tree commit diff stats
path: root/example/ida
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2017-07-20 19:35:49 +0200
committerGitHub <noreply@github.com>2017-07-20 19:35:49 +0200
commit4dfca940e75ad8af65b69dd9bab9ff503141984b (patch)
treeaad96a02c272397eae9fd7377ea86a713814516a /example/ida
parente45256e15c62aba315ab1e2db5697a14837f5827 (diff)
parent4fcd0faa925d8d33db3622430548e932443d6f02 (diff)
downloadmiasm-4dfca940e75ad8af65b69dd9bab9ff503141984b.tar.gz
miasm-4dfca940e75ad8af65b69dd9bab9ff503141984b.zip
Merge pull request #579 from serpilliere/fix_get_bloc
Fix get bloc
Diffstat (limited to 'example/ida')
-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
4 files changed, 11 insertions, 11 deletions
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)