about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAjax <commial@gmail.com>2016-03-23 11:27:17 +0100
committerAjax <commial@gmail.com>2016-03-23 11:27:17 +0100
commitd0c3c0898ef8a9070f984b0764d9bd98ef4e1e87 (patch)
treeebfda11189b3a0bc2b25a6f7a16bf6097c9afcd6
parenta004a1ee4f7c112d525e876447fbc1b6b3ddbd82 (diff)
downloadmiasm-d0c3c0898ef8a9070f984b0764d9bd98ef4e1e87.tar.gz
miasm-d0c3c0898ef8a9070f984b0764d9bd98ef4e1e87.zip
disasmEngine bin_stream argument must be provided
-rw-r--r--miasm2/core/asmbloc.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/miasm2/core/asmbloc.py b/miasm2/core/asmbloc.py
index 96c2f4ec..c5662389 100644
--- a/miasm2/core/asmbloc.py
+++ b/miasm2/core/asmbloc.py
@@ -1433,10 +1433,10 @@ def asm_resolve_final(mnemo, blocks, symbol_pool, dst_interval=None):
 
 class disasmEngine(object):
 
-    def __init__(self, arch, attrib, bs=None, **kwargs):
+    def __init__(self, arch, attrib, bin_stream, **kwargs):
         self.arch = arch
         self.attrib = attrib
-        self.bs = bs
+        self.bin_stream = bin_stream
         self.symbol_pool = asm_symbol_pool()
         self.dont_dis = []
         self.split_dis = []
@@ -1451,7 +1451,7 @@ class disasmEngine(object):
 
     def dis_bloc(self, offset):
         label = self.symbol_pool.getby_offset_create(offset)
-        current_block, _ = dis_bloc(self.arch, self.bs, label, offset,
+        current_block, _ = dis_bloc(self.arch, self.bin_stream, label, offset,
                                     self.job_done, self.symbol_pool,
                                     dont_dis=self.dont_dis,
                                     split_dis=self.split_dis,
@@ -1464,7 +1464,7 @@ class disasmEngine(object):
         return current_block
 
     def dis_multibloc(self, offset, blocs=None):
-        blocs = dis_bloc_all(self.arch, self.bs, offset, self.job_done,
+        blocs = dis_bloc_all(self.arch, self.bin_stream, offset, self.job_done,
                              self.symbol_pool,
                              dont_dis=self.dont_dis, split_dis=self.split_dis,
                              follow_call=self.follow_call,