about summary refs log tree commit diff stats
path: root/miasm2/arch/x86/arch.py
diff options
context:
space:
mode:
authorCamille Mougey <commial@gmail.com>2017-03-14 08:27:13 +0100
committerGitHub <noreply@github.com>2017-03-14 08:27:13 +0100
commit67117bf808b8348a103f91ca64749d46de3f2db5 (patch)
tree0317a4ba83bd3fe0cc21a89855139271d04af318 /miasm2/arch/x86/arch.py
parent5ee794990ff30ca18909dd3815eda26ac267cbf4 (diff)
parentf1a2d7456c8a7482939d43ac5c1d6b829db4cdaf (diff)
downloadmiasm-67117bf808b8348a103f91ca64749d46de3f2db5.tar.gz
miasm-67117bf808b8348a103f91ca64749d46de3f2db5.zip
Merge pull request #497 from serpilliere/rename_symb
Rename symb
Diffstat (limited to '')
-rw-r--r--miasm2/arch/x86/arch.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/miasm2/arch/x86/arch.py b/miasm2/arch/x86/arch.py
index 8ae6cd31..d686cd55 100644
--- a/miasm2/arch/x86/arch.py
+++ b/miasm2/arch/x86/arch.py
@@ -7,7 +7,7 @@ from miasm2.core.cpu import *
 from collections import defaultdict
 import miasm2.arch.x86.regs as regs_module
 from miasm2.arch.x86.regs import *
-from miasm2.core.asmbloc import asm_label
+from miasm2.core.asmblock import AsmLabel
 
 log = logging.getLogger("x86_arch")
 console_handler = logging.StreamHandler()
@@ -489,7 +489,7 @@ class instruction_x86(instruction):
             return
         expr = self.args[0]
         if isinstance(expr, ExprId):
-            if not isinstance(expr.name, asm_label) and expr not in all_regs_ids:
+            if not isinstance(expr.name, AsmLabel) and expr not in all_regs_ids:
                 raise ValueError("ExprId must be a label or a register")
         elif isinstance(expr, ExprInt):
             ad = expr.arg + int(self.offset)