diff options
Diffstat (limited to 'miasm/arch/arm/sem.py')
| -rw-r--r-- | miasm/arch/arm/sem.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/miasm/arch/arm/sem.py b/miasm/arch/arm/sem.py index 027c3a6a..1884abe8 100644 --- a/miasm/arch/arm/sem.py +++ b/miasm/arch/arm/sem.py @@ -804,7 +804,7 @@ def sdiv(ir, instr, a, b, c=None): do_except = [] do_except.append(ExprAssign(exception_flags, ExprInt(EXCEPT_DIV_BY_ZERO, exception_flags.size))) do_except.append(ExprAssign(ir.IRDst, loc_next)) - blk_except = IRBlock(loc_except.loc_key, [AssignBlock(do_except, instr)]) + blk_except = IRBlock(ir.loc_db, loc_except.loc_key, [AssignBlock(do_except, instr)]) @@ -816,7 +816,7 @@ def sdiv(ir, instr, a, b, c=None): do_div.append(ExprAssign(ir.IRDst, r)) do_div.append(ExprAssign(ir.IRDst, loc_next)) - blk_div = IRBlock(loc_div.loc_key, [AssignBlock(do_div, instr)]) + blk_div = IRBlock(ir.loc_db, loc_div.loc_key, [AssignBlock(do_div, instr)]) return e, [blk_div, blk_except] @@ -837,7 +837,7 @@ def udiv(ir, instr, a, b, c=None): do_except = [] do_except.append(ExprAssign(exception_flags, ExprInt(EXCEPT_DIV_BY_ZERO, exception_flags.size))) do_except.append(ExprAssign(ir.IRDst, loc_next)) - blk_except = IRBlock(loc_except.loc_key, [AssignBlock(do_except, instr)]) + blk_except = IRBlock(ir.loc_db, loc_except.loc_key, [AssignBlock(do_except, instr)]) r = ExprOp("udiv", b, c) @@ -848,7 +848,7 @@ def udiv(ir, instr, a, b, c=None): do_div.append(ExprAssign(ir.IRDst, r)) do_div.append(ExprAssign(ir.IRDst, loc_next)) - blk_div = IRBlock(loc_div.loc_key, [AssignBlock(do_div, instr)]) + blk_div = IRBlock(ir.loc_db, loc_div.loc_key, [AssignBlock(do_div, instr)]) return e, [blk_div, blk_except] @@ -1723,7 +1723,7 @@ def add_condition_expr(ir, instr, cond, instr_ir, extra_ir): break if not has_irdst: instr_ir.append(ExprAssign(ir.IRDst, loc_next_expr)) - e_do = IRBlock(loc_do, [AssignBlock(instr_ir, instr)]) + e_do = IRBlock(ir.loc_db, loc_do, [AssignBlock(instr_ir, instr)]) e = [ExprAssign(ir.IRDst, dst_cond)] return e, [e_do] + extra_ir @@ -2004,7 +2004,7 @@ class ir_arml(IntermediateRepresentation): dst = ExprAssign(self.IRDst, ExprLoc(loc_next, 32)) dst_blk = AssignBlock([dst], instr) assignments.append(dst_blk) - irblock = IRBlock(loc, assignments) + irblock = IRBlock(self.loc_db, loc, assignments) ir_blocks_all.append([irblock]) loc = loc_next @@ -2025,7 +2025,7 @@ class ir_arml(IntermediateRepresentation): dst = ExprAssign(self.IRDst, ExprCond(local_cond, ExprLoc(loc_do, 32), ExprLoc(loc_next, 32))) dst_blk = AssignBlock([dst], instr) assignments.append(dst_blk) - irblock = IRBlock(loc, assignments) + irblock = IRBlock(self.loc_db, loc, assignments) irblocks.append(irblock) @@ -2070,7 +2070,7 @@ class ir_arml(IntermediateRepresentation): assignment.instr ) out.append(assignment) - new_irblock = IRBlock(irblock.loc_key, out) + new_irblock = IRBlock(self.loc_db, irblock.loc_key, out) new_irblocks.append(new_irblock) it_instr_irblocks = new_irblocks @@ -2078,7 +2078,7 @@ class ir_arml(IntermediateRepresentation): dst = ExprAssign(self.IRDst, ExprLoc(loc_next, 32)) dst_blk = AssignBlock([dst], instr) assignments.append(dst_blk) - irblock = IRBlock(loc, assignments) + irblock = IRBlock(self.loc_db, loc, assignments) irblocks.append(irblock) loc = loc_next assignments = [] @@ -2116,11 +2116,11 @@ class ir_arml(IntermediateRepresentation): ir_blocks_all, gen_pc_updt ) if split: - ir_blocks_all.append(IRBlock(label, assignments)) + ir_blocks_all.append(IRBlock(self.loc_db, label, assignments)) label = None assignments = [] if label is not None: - ir_blocks_all.append(IRBlock(label, assignments)) + ir_blocks_all.append(IRBlock(self.loc_db, label, assignments)) new_ir_blocks_all = self.post_add_asmblock_to_ircfg(block, ircfg, ir_blocks_all) for irblock in new_ir_blocks_all: |