diff options
| -rw-r--r-- | example/disasm/full.py | 8 | ||||
| -rw-r--r-- | example/ida/graph_ir.py | 8 | ||||
| -rw-r--r-- | miasm2/analysis/ssa.py | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/example/disasm/full.py b/example/disasm/full.py index 4da32f67..f4c50d9a 100644 --- a/example/disasm/full.py +++ b/example/disasm/full.py @@ -339,7 +339,7 @@ if args.propagexpr: ssa.transform(head) - all_ssa_vars.update(ssa._ssa_variable_to_expr) + all_ssa_vars.update(ssa.ssa_variable_to_expr) ssa_regs = [reg for reg in ssa.expressions if reg.is_id()] ssa_forbidden_regs.update(ssa_regs) @@ -347,7 +347,7 @@ if args.propagexpr: if args.verbose > 3: open("ssa_%d.dot" % index, "wb").write(ircfg_a.dot()) - ir_arch_a.ssa_var.update(ssa._ssa_variable_to_expr) + ir_arch_a.ssa_var.update(ssa.ssa_variable_to_expr) if args.verbose > 3: open("ssa_orig.dot", "wb").write(ircfg_a.dot()) @@ -392,9 +392,9 @@ if args.propagexpr: ssa = SSADiGraph(ircfg_a) ssa.immutable_ids.update(ssa_forbidden_regs) ssa.transform(head) - all_ssa_vars.update(ssa._ssa_variable_to_expr) + all_ssa_vars.update(ssa.ssa_variable_to_expr) print '*'*80, "Remove phi" - ssa._ssa_variable_to_expr = all_ssa_vars + ssa.ssa_variable_to_expr = all_ssa_vars if args.verbose > 3: open('final_ssa.dot', 'w').write(ircfg_a.dot()) remove_phi(ssa, head) diff --git a/example/ida/graph_ir.py b/example/ida/graph_ir.py index b204b2b8..31d1c21c 100644 --- a/example/ida/graph_ir.py +++ b/example/ida/graph_ir.py @@ -260,13 +260,13 @@ def build_graph(verbose=False, simplify=False, ssa=False, ssa_simplify=False): ssa.transform(head) - all_ssa_vars.update(ssa._ssa_variable_to_expr) + all_ssa_vars.update(ssa.ssa_variable_to_expr) ssa_regs = [reg for reg in ssa.expressions if reg.is_id()] ssa_forbidden_regs.update(ssa_regs) - ir_arch.ssa_var.update(ssa._ssa_variable_to_expr) + ir_arch.ssa_var.update(ssa.ssa_variable_to_expr) while modified: index += 1 @@ -290,8 +290,8 @@ def build_graph(verbose=False, simplify=False, ssa=False, ssa_simplify=False): ssa = SSADiGraph(ircfg) ssa.immutable_ids.update(ssa_forbidden_regs) ssa.transform(head) - all_ssa_vars.update(ssa._ssa_variable_to_expr) - ssa._ssa_variable_to_expr = all_ssa_vars + all_ssa_vars.update(ssa.ssa_variable_to_expr) + ssa.ssa_variable_to_expr = all_ssa_vars dead_simp(ir_arch, ssa.graph) title += " (SSA Simplified)" diff --git a/miasm2/analysis/ssa.py b/miasm2/analysis/ssa.py index c22aae59..aa978953 100644 --- a/miasm2/analysis/ssa.py +++ b/miasm2/analysis/ssa.py @@ -44,7 +44,7 @@ class SSA(object): # stack for LHS self._stack_lhs = {} - self._ssa_variable_to_expr = {} + self.ssa_variable_to_expr = {} # dict of SSA expressions self.expressions = {} @@ -78,7 +78,7 @@ class SSA(object): :param ssa_var: ExprId, variable in SSA form :return: ExprId, variable in non-SSA form """ - expr = self._ssa_variable_to_expr.get(ssa_var, ssa_var) + expr = self.ssa_variable_to_expr.get(ssa_var, ssa_var) return expr def reset(self): @@ -99,7 +99,7 @@ class SSA(object): index = stack[expr] name = "%s.%d" % (expr.name, index) ssa_var = ExprId(name, expr.size) - self._ssa_variable_to_expr[ssa_var] = expr + self.ssa_variable_to_expr[ssa_var] = expr return ssa_var |