diff options
| -rw-r--r-- | miasm2/analysis/depgraph.py | 6 | ||||
| -rw-r--r-- | miasm2/ir/analysis.py | 2 | ||||
| -rw-r--r-- | test/test_all.py | 1 | ||||
| -rw-r--r-- | test/utils/testset.py | 2 |
4 files changed, 5 insertions, 6 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 diff --git a/test/test_all.py b/test/test_all.py index 7082e3d7..4e530669 100644 --- a/test/test_all.py +++ b/test/test_all.py @@ -1,6 +1,7 @@ import argparse import time import os +import tempfile from utils.test import Test from utils.testset import TestSet diff --git a/test/utils/testset.py b/test/utils/testset.py index 97ebeb3d..54df732c 100644 --- a/test/utils/testset.py +++ b/test/utils/testset.py @@ -202,7 +202,7 @@ class TestSet(object): """Add arguments to used on the test command line @args: list of str """ - self.add_additionnal_args += args + self.additional_args += args def run(self): "Launch tests" |