diff options
Diffstat (limited to 'miasm2/jitter')
| -rw-r--r-- | miasm2/jitter/codegen.py | 12 | ||||
| -rw-r--r-- | miasm2/jitter/llvmconvert.py | 9 |
2 files changed, 10 insertions, 11 deletions
diff --git a/miasm2/jitter/codegen.py b/miasm2/jitter/codegen.py index 15f172ee..61a9a784 100644 --- a/miasm2/jitter/codegen.py +++ b/miasm2/jitter/codegen.py @@ -577,18 +577,16 @@ class CGen(object): instr_attrib, irblocks_attributes = self.get_attributes(instr, irblocks, log_mn, log_regs) for index, irblock in enumerate(irblocks): - self.ir_arch.irbloc_fix_regs_for_mode( - irblock, self.ir_arch.attrib) - - if irblock.label.offset is None: + new_irblock = self.ir_arch.irbloc_fix_regs_for_mode(irblock, self.ir_arch.attrib) + if new_irblock.label.offset is None: out.append("%-40s // %.16X %s" % - (str(irblock.label.name) + ":", instr.offset, instr)) + (str(new_irblock.label.name) + ":", instr.offset, instr)) else: out.append("%-40s // %.16X %s" % - (self.label_to_jitlabel(irblock.label) + ":", instr.offset, instr)) + (self.label_to_jitlabel(new_irblock.label) + ":", instr.offset, instr)) if index == 0: out += self.gen_pre_code(instr_attrib) - out += self.gen_irblock(instr_attrib, irblocks_attributes[index], instr_offsets, irblock) + out += self.gen_irblock(instr_attrib, irblocks_attributes[index], instr_offsets, new_irblock) out += self.gen_finalize(block) return ['\t' + line for line in out] diff --git a/miasm2/jitter/llvmconvert.py b/miasm2/jitter/llvmconvert.py index ae018c18..ed55aff8 100644 --- a/miasm2/jitter/llvmconvert.py +++ b/miasm2/jitter/llvmconvert.py @@ -1299,7 +1299,8 @@ class LLVMFunction(): for instr, irblocks in zip(asmblock.lines, irblocks_list): - instr_attrib, irblocks_attributes = codegen.get_attributes(instr, irblocks, self.log_mn, + instr_attrib, irblocks_attributes = codegen.get_attributes(instr, irblocks, + self.log_mn, self.log_regs) # Pre-create basic blocks @@ -1308,16 +1309,16 @@ class LLVMFunction(): # Generate the corresponding code for index, irblock in enumerate(irblocks): - self.llvm_context.ir_arch.irbloc_fix_regs_for_mode( + new_irblock = self.llvm_context.ir_arch.irbloc_fix_regs_for_mode( irblock, self.llvm_context.ir_arch.attrib) # Set the builder at the begining of the correct bbl - name = self.canonize_label_name(irblock.label) + name = self.canonize_label_name(new_irblock.label) self.builder.position_at_end(self.get_basic_bloc_by_label(name)) if index == 0: self.gen_pre_code(instr_attrib) - self.gen_irblock(instr_attrib, irblocks_attributes[index], instr_offsets, irblock) + self.gen_irblock(instr_attrib, irblocks_attributes[index], instr_offsets, new_irblock) # Gen finalize (see codegen::CGen) is unrecheable, except with delayslot self.gen_finalize(asmblock, codegen) |