diff options
Diffstat (limited to 'miasm2/arch/mips32/ira.py')
| -rw-r--r-- | miasm2/arch/mips32/ira.py | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/miasm2/arch/mips32/ira.py b/miasm2/arch/mips32/ira.py index 8f7b2df3..dd02ff50 100644 --- a/miasm2/arch/mips32/ira.py +++ b/miasm2/arch/mips32/ira.py @@ -1,34 +1,28 @@ #-*- coding:utf-8 -*- -from miasm2.expression.expression import * -from miasm2.ir.ir import ir, irbloc, AssignBlock +from miasm2.expression.expression import ExprAff, ExprInt32, ExprId +from miasm2.ir.ir import IntermediateRepresentation, IRBlock, AssignBlock from miasm2.ir.analysis import ira from miasm2.arch.mips32.sem import ir_mips32l, ir_mips32b -from miasm2.arch.mips32.regs import * -from miasm2.core.asmbloc import expr_is_int_or_label, expr_is_label +from miasm2.core.asmblock import expr_is_int_or_label, expr_is_label class ir_a_mips32l(ir_mips32l, ira): def __init__(self, symbol_pool=None): ir_mips32l.__init__(self, symbol_pool) self.ret_reg = self.arch.regs.V0 - - # for test XXX TODO - def set_dead_regs(self, b): - pass - def pre_add_instr(self, block, instr, irb_cur, ir_blocks_all, gen_pc_updt): # Avoid adding side effects, already done in post_add_bloc return irb_cur - def post_add_bloc(self, bloc, ir_blocs): - ir.post_add_bloc(self, bloc, ir_blocs) - for irb in ir_blocs: + def post_add_bloc(self, block, ir_blocks): + IntermediateRepresentation.post_add_bloc(self, block, ir_blocks) + for irb in ir_blocks: pc_val = None lr_val = None for assignblk in irb.irs: - pc_val = assignblk.get(PC, pc_val) - lr_val = assignblk.get(RA, lr_val) + pc_val = assignblk.get(self.arch.regs.PC, pc_val) + lr_val = assignblk.get(self.arch.regs.RA, lr_val) if pc_val is None or lr_val is None: continue @@ -37,22 +31,22 @@ class ir_a_mips32l(ir_mips32l, ira): if expr_is_label(lr_val): lr_val = ExprInt32(lr_val.name.offset) - l = bloc.lines[-2] - if lr_val.arg != l.offset + 8: + line = block.lines[-2] + if lr_val.arg != line.offset + 8: raise ValueError("Wrong arg") # CALL - lbl = bloc.get_next() + lbl = block.get_next() new_lbl = self.gen_label() - irs = self.call_effects(pc_val, l) + irs = self.call_effects(pc_val, line) irs.append(AssignBlock([ExprAff(self.IRDst, ExprId(lbl, size=self.pc.size))])) - nbloc = irbloc(new_lbl, irs) - nbloc.lines = [l] * len(irs) - self.blocs[new_lbl] = nbloc + nblock = IRBlock(new_lbl, irs) + nblock.lines = [line] * len(irs) + self.blocks[new_lbl] = nblock irb.dst = ExprId(new_lbl, size=self.pc.size) - def get_out_regs(self, b): + def get_out_regs(self, _): return set([self.ret_reg, self.sp]) def sizeof_char(self): |