about summary refs log tree commit diff stats
path: root/miasm2/core/asmblock.py
diff options
context:
space:
mode:
authorFabrice Desclaux <fabrice.desclaux@cea.fr>2017-03-13 15:17:52 +0100
committerFabrice Desclaux <fabrice.desclaux@cea.fr>2017-03-13 15:25:38 +0100
commitf1a2d7456c8a7482939d43ac5c1d6b829db4cdaf (patch)
tree0317a4ba83bd3fe0cc21a89855139271d04af318 /miasm2/core/asmblock.py
parent1b3fcbdda83d6f248a11de30aaa7cfbf1f775b2e (diff)
downloadmiasm-f1a2d7456c8a7482939d43ac5c1d6b829db4cdaf.tar.gz
miasm-f1a2d7456c8a7482939d43ac5c1d6b829db4cdaf.zip
Core/asmblock: rename asmbloc_final to asmblock_final
Diffstat (limited to 'miasm2/core/asmblock.py')
-rw-r--r--miasm2/core/asmblock.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/miasm2/core/asmblock.py b/miasm2/core/asmblock.py
index eb4e3ef8..72f259f9 100644
--- a/miasm2/core/asmblock.py
+++ b/miasm2/core/asmblock.py
@@ -1237,7 +1237,7 @@ def assemble_block(mnemo, block, symbol_pool, conservative=False):
         offset_i += instr.l
 
 
-def asmbloc_final(mnemo, blocks, blockChains, symbol_pool, conservative=False):
+def asmblock_final(mnemo, blocks, blockChains, symbol_pool, conservative=False):
     """Resolve and assemble @blockChains using @symbol_pool until fixed point is
     reached"""
 
@@ -1287,6 +1287,13 @@ def asmbloc_final(mnemo, blocks, blockChains, symbol_pool, conservative=False):
             assemble_block(mnemo, block, symbol_pool, conservative)
 
 
+def asmbloc_final(mnemo, blocks, blockChains, symbol_pool, conservative=False):
+    """Resolve and assemble @blockChains using @symbol_pool until fixed point is
+    reached"""
+
+    warnings.warn('DEPRECATION WARNING: use "asmblock_final" instead of "asmbloc_final"')
+    asmblock_final(mnemo, blocks, blockChains, symbol_pool, conservative)
+
 def asm_resolve_final(mnemo, blocks, symbol_pool, dst_interval=None):
     """Resolve and assemble @blocks using @symbol_pool into interval
     @dst_interval"""
@@ -1298,7 +1305,7 @@ def asm_resolve_final(mnemo, blocks, symbol_pool, dst_interval=None):
     resolved_blockChains = resolve_symbol(
         blockChains, symbol_pool, dst_interval)
 
-    asmbloc_final(mnemo, blocks, resolved_blockChains, symbol_pool)
+    asmblock_final(mnemo, blocks, resolved_blockChains, symbol_pool)
     patches = {}
     output_interval = interval()