about summary refs log tree commit diff stats
path: root/miasm2/core/cpu.py
diff options
context:
space:
mode:
authorFabrice Desclaux <fabrice.desclaux@cea.fr>2017-03-13 14:19:44 +0100
committerFabrice Desclaux <fabrice.desclaux@cea.fr>2017-03-13 15:07:28 +0100
commit1b3fcbdda83d6f248a11de30aaa7cfbf1f775b2e (patch)
treef2ed11ae52cff5c21617d239f54d9d99f696cff3 /miasm2/core/cpu.py
parent7a473f0df464b3134bad5ad028e92cf780cd2cc5 (diff)
downloadmiasm-1b3fcbdda83d6f248a11de30aaa7cfbf1f775b2e.tar.gz
miasm-1b3fcbdda83d6f248a11de30aaa7cfbf1f775b2e.zip
Core/asmbloc: move asmbloc to asmblock
Diffstat (limited to 'miasm2/core/cpu.py')
-rw-r--r--miasm2/core/cpu.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/miasm2/core/cpu.py b/miasm2/core/cpu.py
index 41ae822d..8b906027 100644
--- a/miasm2/core/cpu.py
+++ b/miasm2/core/cpu.py
@@ -8,7 +8,7 @@ from collections import defaultdict
 import pyparsing
 
 import miasm2.expression.expression as m2_expr
-from miasm2.core import asmbloc
+from miasm2.core import asmblock
 from miasm2.core.bin_stream import bin_stream, bin_stream_str
 from miasm2.core.utils import Disasm_Exception
 from miasm2.expression.simplifications import expr_simp
@@ -232,7 +232,7 @@ class ParseAst(object):
         if size is None:
             size = self.default_size
         assert value is not None
-        return m2_expr.ExprId(asmbloc.AsmLabel(value), size)
+        return m2_expr.ExprId(asmblock.AsmLabel(value), size)
 
     def ast_to_expr(self, size, ast):
         """Transform a typed ast into a Miasm expression
@@ -974,7 +974,7 @@ class instruction(object):
             ids = m2_expr.get_expr_ids(e)
             fixed_ids = {}
             for x in ids:
-                if isinstance(x.name, asmbloc.AsmLabel):
+                if isinstance(x.name, asmblock.AsmLabel):
                     name = x.name.name
                     # special symbol $
                     if name == '$':