diff options
| author | Camille Mougey <commial@gmail.com> | 2017-03-14 08:27:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 08:27:13 +0100 |
| commit | 67117bf808b8348a103f91ca64749d46de3f2db5 (patch) | |
| tree | 0317a4ba83bd3fe0cc21a89855139271d04af318 /miasm2/jitter/codegen.py | |
| parent | 5ee794990ff30ca18909dd3815eda26ac267cbf4 (diff) | |
| parent | f1a2d7456c8a7482939d43ac5c1d6b829db4cdaf (diff) | |
| download | miasm-67117bf808b8348a103f91ca64749d46de3f2db5.tar.gz miasm-67117bf808b8348a103f91ca64749d46de3f2db5.zip | |
Merge pull request #497 from serpilliere/rename_symb
Rename symb
Diffstat (limited to 'miasm2/jitter/codegen.py')
| -rw-r--r-- | miasm2/jitter/codegen.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/miasm2/jitter/codegen.py b/miasm2/jitter/codegen.py index 2503e104..9d005451 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 irbloc +from miasm2.ir.ir import IRBlock from miasm2.ir.translators import Translator -from miasm2.core.asmbloc import expr_is_label, asm_block_bad, asm_label +from miasm2.core.asmblock import expr_is_label, AsmBlockBad, AsmLabel # Miasm to C translator translator = Translator.to_language("C") @@ -134,7 +134,7 @@ class CGen(object): instr.offset + instr.l, self.ir_arch.IRDst.size) - return irbloc(self.ir_arch.get_instr_label(instr), [assignblk]) + return IRBlock(self.ir_arch.get_instr_label(instr), [assignblk]) def block2assignblks(self, block): irblocks_list = [] @@ -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 @@ -545,7 +545,7 @@ class CGen(object): @log_regs: log registers """ - if isinstance(block, asm_block_bad): + if isinstance(block, AsmBlockBad): return self.gen_bad_block() irblocks_list = self.block2assignblks(block) |