diff options
| author | Camille Mougey <commial@gmail.com> | 2015-05-01 12:43:33 +0200 |
|---|---|---|
| committer | Camille Mougey <commial@gmail.com> | 2015-05-01 12:43:33 +0200 |
| commit | f9bf6fbbce0d984549fb11e16cb9acfc7be00c86 (patch) | |
| tree | 9ea6261f9831c056ed471494b1664b3b93fbfbf6 | |
| parent | 9cae6a2fc2091a3488817dd70883f16c0919d6b1 (diff) | |
| parent | e3dd0a4c0cb398d569d0fbadb8f34f8fa727f254 (diff) | |
| download | miasm-f9bf6fbbce0d984549fb11e16cb9acfc7be00c86.tar.gz miasm-f9bf6fbbce0d984549fb11e16cb9acfc7be00c86.zip | |
Merge pull request #158 from mrphrazer/minor_fixes
Minor fixes
| -rw-r--r-- | miasm2/analysis/depgraph.py | 6 | ||||
| -rw-r--r-- | miasm2/ir/analysis.py | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/miasm2/analysis/depgraph.py b/miasm2/analysis/depgraph.py index 19f8e6e8..1b1d7ed4 100644 --- a/miasm2/analysis/depgraph.py +++ b/miasm2/analysis/depgraph.py @@ -495,8 +495,8 @@ class DependencyGraph(object): Following arguments define filters used to generate dependencies @apply_simp: (optional) Apply expr_simp - @follow_mem: (optional) Track memory syntaxically - @follow_call: (optional) Track throught "call" + @follow_mem: (optional) Track memory syntactically + @follow_call: (optional) Track through "call" """ # Init self._ira = ira @@ -562,7 +562,7 @@ class DependencyGraph(object): follow = set() nofollow = set() for expr in exprs: - if isinstance(expr, m2_expr.ExprOp) and expr.op.startswith('call'): + if expr.is_function_call(): nofollow.add(expr) else: follow.add(expr) diff --git a/miasm2/ir/analysis.py b/miasm2/ir/analysis.py index 87c53d44..51d2b2b7 100644 --- a/miasm2/ir/analysis.py +++ b/miasm2/ir/analysis.py @@ -40,7 +40,6 @@ class ira: def dst_trackback(self, b): dst = b.dst todo = set([dst]) - out = set() done = set() for irs in reversed(b.irs): @@ -63,7 +62,6 @@ class ira: if o not in found: follow.add(o) todo = follow - out = self.sort_dst(todo, done) return done |