Asmblock: fix dis_block_callback

6 files changed, 25 insertions, 16 deletions

diff --git a/example/disasm/callback.py b/example/disasm/callback.py
index 63987e85..a9bef20b 100644
--- a/example/disasm/callback.py
+++ b/example/disasm/callback.py
@@ -52,7 +52,7 @@ print "\n".join(str(block) for block in blocks)
 # Enable callback
 cb_x86_funcs.append(cb_x86_callpop)
 ## Other method:
-## mdis.dis_bloc_callback = cb_x86_callpop
+## mdis.dis_block_callback = cb_x86_callpop
 
 print "=" * 40
 print "With callback:\n"
diff --git a/miasm2/arch/aarch64/disasm.py b/miasm2/arch/aarch64/disasm.py
index a8604fe5..17eec414 100644
--- a/miasm2/arch/aarch64/disasm.py
+++ b/miasm2/arch/aarch64/disasm.py
@@ -14,7 +14,7 @@ class dis_aarch64b(disasmEngine):
     def __init__(self, bs=None, **kwargs):
         super(dis_aarch64b, self).__init__(
             mn_aarch64, self.attrib, bs,
-            dis_bloc_callback = cb_aarch64_disasm,
+            dis_block_callback = cb_aarch64_disasm,
             **kwargs)
 
 
@@ -23,5 +23,5 @@ class dis_aarch64l(disasmEngine):
     def __init__(self, bs=None, **kwargs):
         super(dis_aarch64l, self).__init__(
             mn_aarch64, self.attrib, bs,
-            dis_bloc_callback = cb_aarch64_disasm,
+            dis_block_callback = cb_aarch64_disasm,
             **kwargs)
diff --git a/miasm2/arch/arm/disasm.py b/miasm2/arch/arm/disasm.py
index 3f6ea4d5..586fa903 100644
--- a/miasm2/arch/arm/disasm.py
+++ b/miasm2/arch/arm/disasm.py
@@ -39,13 +39,13 @@ class dis_armb(disasmEngine):
     attrib = 'b'
     def __init__(self, bs=None, **kwargs):
         super(dis_armb, self).__init__(mn_arm, self.attrib, bs, **kwargs)
-        self.dis_bloc_callback = cb_arm_disasm
+        self.dis_block_callback = cb_arm_disasm
 
 class dis_arml(disasmEngine):
     attrib = 'l'
     def __init__(self, bs=None, **kwargs):
         super(dis_arml, self).__init__(mn_arm, self.attrib, bs, **kwargs)
-        self.dis_bloc_callback = cb_arm_disasm
+        self.dis_block_callback = cb_arm_disasm
 
 class dis_armtb(disasmEngine):
     attrib = 'b'
diff --git a/miasm2/arch/x86/disasm.py b/miasm2/arch/x86/disasm.py
index fc981c09..ecb1b8da 100644
--- a/miasm2/arch/x86/disasm.py
+++ b/miasm2/arch/x86/disasm.py
@@ -15,7 +15,7 @@ class dis_x86(disasmEngine):
 
     def __init__(self, bs=None, **kwargs):
         super(dis_x86, self).__init__(mn_x86, self.attrib, bs, **kwargs)
-        self.dis_bloc_callback = cb_x86_disasm
+        self.dis_block_callback = cb_x86_disasm
 
 
 class dis_x86_16(dis_x86):
diff --git a/miasm2/core/asmblock.py b/miasm2/core/asmblock.py
index 5b95976f..7d18c4f5 100644
--- a/miasm2/core/asmblock.py
+++ b/miasm2/core/asmblock.py
@@ -1350,7 +1350,7 @@ class disasmEngine(object):
 
     + callback(arch, attrib, pool_bin, cur_bloc, offsets_to_dis,
                symbol_pool)
-     - dis_bloc_callback: callback after each new disassembled block
+     - dis_block_callback: callback after each new disassembled block
     """
 
     def __init__(self, arch, attrib, bin_stream, **kwargs):
@@ -1372,7 +1372,7 @@ class disasmEngine(object):
         self.dontdis_retcall = False
         self.lines_wd = None
         self.blocs_wd = None
-        self.dis_bloc_callback = None
+        self.dis_block_callback = None
         self.dont_dis_nulstart_bloc = False
         self.dont_dis_retcall_funcs = set()
 
@@ -1387,9 +1387,18 @@ class disasmEngine(object):
         warnings.warn("""DEPRECATION WARNING: "job_done" is not needed anymore, support is dropped.""")
         return
 
+    def get_dis_bloc_callback(self):
+        warnings.warn("""DEPRECATION WARNING: "dis_bloc_callback" use dis_block_callback.""")
+        return self.dis_block_callback
+
+    def set_dis_bloc_callback(self, function):
+        warnings.warn("""DEPRECATION WARNING: "dis_bloc_callback" use dis_block_callback.""")
+        self.dis_block_callback = function
+
 
     # Deprecated
     job_done = property(get_job_done, set_job_done)
+    dis_bloc_callback = property(get_dis_bloc_callback, set_dis_bloc_callback)
 
     def _dis_block(self, offset, job_done=None):
         """Disassemble the block at offset @offset
@@ -1520,11 +1529,11 @@ class disasmEngine(object):
         # Fix multiple constraints
         cur_block.fix_constraints()
 
-        if self.dis_bloc_callback is not None:
-            self.dis_bloc_callback(mn=self.arch, attrib=self.attrib,
-                                   pool_bin=self.bin_stream, cur_bloc=cur_block,
-                                   offsets_to_dis=offsets_to_dis,
-                                   symbol_pool=self.symbol_pool)
+        if self.dis_block_callback is not None:
+            self.dis_block_callback(mn=self.arch, attrib=self.attrib,
+                                    pool_bin=self.bin_stream, cur_bloc=cur_block,
+                                    offsets_to_dis=offsets_to_dis,
+                                    symbol_pool=self.symbol_pool)
         return cur_block, offsets_to_dis
 
     def dis_block(self, offset):
@@ -1573,7 +1582,7 @@ class disasmEngine(object):
             blocks.add_node(cur_block)
 
         blocks.apply_splitting(self.symbol_pool,
-                               dis_block_callback=self.dis_bloc_callback,
+                               dis_block_callback=self.dis_block_callback,
                                mn=self.arch, attrib=self.attrib,
                                pool_bin=self.bin_stream)
         return blocks
diff --git a/miasm2/jitter/jitcore.py b/miasm2/jitter/jitcore.py
index 9c35f829..f2b1375d 100644
--- a/miasm2/jitter/jitcore.py
+++ b/miasm2/jitter/jitcore.py
@@ -63,7 +63,7 @@ class JitCore(object):
                                           follow_call=False,
                                           dontdis_retcall=False,
                                           split_dis=self.split_dis,
-                                          dis_bloc_callback=self.disasm_cb)
+                                          dis_block_callback=self.disasm_cb)
 
 
     def set_options(self, **kwargs):
@@ -140,7 +140,7 @@ class JitCore(object):
 
         # Prepare disassembler
         self.mdis.lines_wd = self.options["jit_maxline"]
-        self.mdis.dis_bloc_callback = self.disasm_cb
+        self.mdis.dis_block_callback = self.disasm_cb
 
         # Disassemble it
         try: