diff options
Diffstat (limited to 'miasm2/jitter')
| -rw-r--r-- | miasm2/jitter/codegen.py | 6 | ||||
| -rw-r--r-- | miasm2/jitter/jitcore.py | 4 | ||||
| -rw-r--r-- | miasm2/jitter/jitcore_cc_base.py | 4 | ||||
| -rw-r--r-- | miasm2/jitter/llvmconvert.py | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/miasm2/jitter/codegen.py b/miasm2/jitter/codegen.py index e9907071..09383f54 100644 --- a/miasm2/jitter/codegen.py +++ b/miasm2/jitter/codegen.py @@ -1,7 +1,7 @@ import miasm2.expression.expression as m2_expr from miasm2.ir.ir import IRBlock from miasm2.ir.translators import Translator -from miasm2.core.asmbloc import expr_is_label, AsmBlockBad, asm_label +from miasm2.core.asmbloc import expr_is_label, AsmBlockBad, AsmLabel # Miasm to C translator translator = Translator.to_language("C") @@ -324,11 +324,11 @@ class CGen(object): return out def gen_goto_code(self, attrib, instr_offsets, dst): - if isinstance(dst, asm_label) and dst.offset is None: + if isinstance(dst, AsmLabel) and dst.offset is None: # Generate goto for local labels return ['goto %s;' % dst.name] offset = None - if isinstance(dst, asm_label) and dst.offset is not None: + if isinstance(dst, AsmLabel) and dst.offset is not None: offset = dst.offset elif isinstance(dst, (int, long)): offset = dst diff --git a/miasm2/jitter/jitcore.py b/miasm2/jitter/jitcore.py index ecf55bd5..b0f911eb 100644 --- a/miasm2/jitter/jitcore.py +++ b/miasm2/jitter/jitcore.py @@ -128,12 +128,12 @@ class JitCore(object): def disbloc(self, addr, vm): """Disassemble a new block and JiT it - @addr: address of the block to disassemble (asm_label or int) + @addr: address of the block to disassemble (AsmLabel or int) @vm: VmMngr instance """ # Get the block - if isinstance(addr, asmbloc.asm_label): + if isinstance(addr, asmbloc.AsmLabel): addr = addr.offset # Prepare disassembler diff --git a/miasm2/jitter/jitcore_cc_base.py b/miasm2/jitter/jitcore_cc_base.py index 2c2d3d52..9d41d06c 100644 --- a/miasm2/jitter/jitcore_cc_base.py +++ b/miasm2/jitter/jitcore_cc_base.py @@ -88,14 +88,14 @@ class JitCore_Cc_Base(JitCore): def label2fname(self, label): """ Generate function name from @label - @label: asm_label instance + @label: AsmLabel instance """ return "block_%s" % label.name def gen_c_code(self, label, block): """ Return the C code corresponding to the @irblocks - @label: asm_label of the block to jit + @label: AsmLabel of the block to jit @irblocks: list of irblocks """ f_name = self.label2fname(label) diff --git a/miasm2/jitter/llvmconvert.py b/miasm2/jitter/llvmconvert.py index 6d8cdc18..e98d2133 100644 --- a/miasm2/jitter/llvmconvert.py +++ b/miasm2/jitter/llvmconvert.py @@ -508,7 +508,7 @@ class LLVMFunction(): @label: str or asmlabel instance""" if isinstance(label, str): return label - elif isinstance(label, m2_asmbloc.asm_label): + elif isinstance(label, m2_asmbloc.AsmLabel): return "label_%s" % label.name elif m2_asmbloc.expr_is_label(label): return "label_%s" % label.name.name |