diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2018-02-08 17:02:35 +0100 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2018-02-09 10:55:39 +0100 |
| commit | eca476334f93f023e57048453eb9ec4ee4fab9d2 (patch) | |
| tree | 08ea36af5f8f7f27222631cdbf0b9f18aa3248cc /example/ida | |
| parent | 47811fe5a56c8071ab5064e1f84ca64389941eec (diff) | |
| download | miasm-eca476334f93f023e57048453eb9ec4ee4fab9d2.tar.gz miasm-eca476334f93f023e57048453eb9ec4ee4fab9d2.zip | |
IRBlock: replace irs by assignblks
Diffstat (limited to 'example/ida')
| -rw-r--r-- | example/ida/ctype_propagation.py | 2 | ||||
| -rw-r--r-- | example/ida/depgraph.py | 10 | ||||
| -rw-r--r-- | example/ida/graph_ir.py | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/example/ida/ctype_propagation.py b/example/ida/ctype_propagation.py index 8c64c6d2..88036bcb 100644 --- a/example/ida/ctype_propagation.py +++ b/example/ida/ctype_propagation.py @@ -114,7 +114,7 @@ class SymbExecCTypeFix(SymbExecCType): """ offset2cmt = {} - for index, assignblk in enumerate(irb.irs): + for index, assignblk in enumerate(irb.assignblks): if set(assignblk) == set([self.ir_arch.IRDst, self.ir_arch.pc]): # Don't display on jxx continue diff --git a/example/ida/depgraph.py b/example/ida/depgraph.py index 915f14bc..aee0697e 100644 --- a/example/ida/depgraph.py +++ b/example/ida/depgraph.py @@ -34,7 +34,7 @@ class depGraphSettingsForm(ida_kernwin.Form): cur_block = block assert cur_block is not None line_nb = None - for line_nb, assignblk in enumerate(cur_block.irs): + for line_nb, assignblk in enumerate(cur_block.assignblks): if assignblk.instr.offset == self.address: break assert line_nb is not None @@ -110,13 +110,13 @@ Method to use: elif mode == 1: return value + 1 else: - return len(self.ira.blocks[self.label].irs) + return len(self.ira.blocks[self.label].assignblks) @property def elements(self): value = self.cbReg.value if value in self.stk_args: - line = self.ira.blocks[self.label].irs[self.line_nb].instr + line = self.ira.blocks[self.label].assignblks[self.line_nb].instr arg_num = self.stk_args[value] stk_high = m2_expr.ExprInt(idc.GetSpd(line.offset), ir_arch.sp.size) stk_off = m2_expr.ExprInt(self.ira.sp.size/8 * arg_num, ir_arch.sp.size) @@ -174,7 +174,7 @@ def treat_element(): for node in graph.relevant_nodes: try: - offset = ir_arch.blocks[node.label].irs[node.line_nb].instr.offset + offset = ir_arch.blocks[node.label].assignblks[node.line_nb].instr.offset except IndexError: print "Unable to highlight %s" % node continue @@ -229,7 +229,7 @@ def launch_depgraph(): for irb in ir_arch.blocks.values(): irs = [] fix_stack = irb.label.offset is not None and settings.unalias_stack - for assignblk in irb.irs: + for assignblk in irb.assignblks: if fix_stack: stk_high = m2_expr.ExprInt(idc.GetSpd(assignblk.instr.offset), ir_arch.sp.size) fix_dct = {ir_arch.sp: mn.regs.regs_init[ir_arch.sp] + stk_high} diff --git a/example/ida/graph_ir.py b/example/ida/graph_ir.py index 8d9dea4f..ca4ad55c 100644 --- a/example/ida/graph_ir.py +++ b/example/ida/graph_ir.py @@ -40,7 +40,7 @@ def color_irblock(irblock, ir_arch): out = [] lbl = idaapi.COLSTR(str(irblock.label), idaapi.SCOLOR_INSN) out.append(lbl) - for assignblk in irblock.irs: + for assignblk in irblock.assignblks: for dst, src in sorted(assignblk.iteritems()): dst_f = expr2colorstr(ir_arch.arch.regs.all_regs_ids, dst) src_f = expr2colorstr(ir_arch.arch.regs.all_regs_ids, src) @@ -148,7 +148,7 @@ def build_graph(verbose=False, simplify=False): for irb in ir_arch.blocks.itervalues(): irs = [] - for assignblk in irb.irs: + for assignblk in irb.assignblks: new_assignblk = { expr_simp(dst): expr_simp(src) for dst, src in assignblk.iteritems() |