diff options
Diffstat (limited to '')
| -rw-r--r-- | example/ida/depgraph.py | 14 | ||||
| -rw-r--r-- | example/ida/graph_ir.py | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/example/ida/depgraph.py b/example/ida/depgraph.py index 002075ee..9024f2af 100644 --- a/example/ida/depgraph.py +++ b/example/ida/depgraph.py @@ -25,8 +25,8 @@ class depGraphSettingsForm(Form): for line_nb, l in enumerate(cur_bloc.lines): if l.offset == self.address: break - cur_label = str(cur_bloc.label) - labels = sorted(map(str, ira.blocs.keys())) + cur_label = str(cur_block.label) + labels = sorted(map(str, ira.blocks.keys())) regs = sorted(ir_arch.arch.regs.all_regs_ids_byname.keys()) regs += self.stk_args.keys() reg_default = regs[0] @@ -82,7 +82,7 @@ Method to use: @property def label(self): value = self.cbBBL.value - for real_label in self.ira.blocs: + for real_label in self.ira.blocks: if str(real_label) == value: return real_label raise ValueError("Bad label") @@ -96,13 +96,13 @@ Method to use: elif mode == 1: return value + 1 else: - return len(self.ira.blocs[self.label].irs) + return len(self.ira.blocks[self.label].irs) @property def elements(self): value = self.cbReg.value if value in self.stk_args: - line = self.ira.blocs[self.label].lines[self.line_nb] + line = self.ira.blocks[self.label].lines[self.line_nb] arg_num = self.stk_args[value] stk_high = m2_expr.ExprInt(GetSpd(line.offset), ir_arch.sp.size) stk_off = m2_expr.ExprInt(self.ira.sp.size/8 * arg_num, ir_arch.sp.size) @@ -163,7 +163,7 @@ settings.Execute() label, elements, line_nb = settings.label, settings.elements, settings.line_nb # Simplify affectations -for irb in ir_arch.blocs.values(): +for irb in ir_arch.blocks.values(): fix_stack = irb.label.offset is not None and settings.unalias_stack for i, assignblk in enumerate(irb.irs): if fix_stack: @@ -215,7 +215,7 @@ def treat_element(): for node in graph.relevant_nodes: try: - offset = ir_arch.blocs[node.label].lines[node.line_nb].offset + offset = ir_arch.blocks[node.label].lines[node.line_nb].offset except IndexError: print "Unable to highlight %s" % node continue diff --git a/example/ida/graph_ir.py b/example/ida/graph_ir.py index 188c8fa6..252dc612 100644 --- a/example/ida/graph_ir.py +++ b/example/ida/graph_ir.py @@ -48,11 +48,11 @@ class GraphMiasmIR(GraphViewer): print 'refresh' self.Clear() addr_id = {} - for irbloc in self.ir_arch.blocs.values(): + for irbloc in self.ir_arch.blocks.values(): id_irbloc = self.AddNode(color_irbloc(irbloc)) addr_id[irbloc] = id_irbloc - for irbloc in self.ir_arch.blocs.values(): + for irbloc in self.ir_arch.blocks.values(): if not irbloc: continue dst = ir_arch.dst_trackback(irbloc) @@ -61,9 +61,9 @@ class GraphMiasmIR(GraphViewer): continue d = d.name - if not d in self.ir_arch.blocs: + if not d in self.ir_arch.blocks: continue - b = self.ir_arch.blocs[d] + b = self.ir_arch.blocks[d] node1 = addr_id[irbloc] node2 = addr_id[b] self.AddEdge(node1, node2) @@ -133,7 +133,7 @@ for b in ab: print "IR ok... %x" % ad -for irb in ir_arch.blocs.values(): +for irb in ir_arch.blocks.values(): for assignblk in irb.irs: for dst, src in assignblk.items(): del(assignblk[dst]) @@ -201,7 +201,7 @@ def gen_bloc_data_flow_graph(ir_arch, in_str, ad): # arch, attrib, pool_bin, bl # ir_arch.dead_simp() irbloc_0 = None - for irbloc in ir_arch.blocs.values(): + for irbloc in ir_arch.blocks.values(): if irbloc.label.offset == ad: irbloc_0 = irbloc break @@ -212,11 +212,11 @@ def gen_bloc_data_flow_graph(ir_arch, in_str, ad): # arch, attrib, pool_bin, bl bloc2w = {} - for irbloc in ir_arch.blocs.values(): + for irbloc in ir_arch.blocks.values(): intra_bloc_flow_symbexec(ir_arch, flow_graph, irbloc) # intra_bloc_flow_symb(ir_arch, flow_graph, irbloc) - for irbloc in ir_arch.blocs.values(): + for irbloc in ir_arch.blocks.values(): print irbloc print 'IN', [str(x) for x in irbloc.in_nodes] print 'OUT', [str(x) for x in irbloc.out_nodes] |