diff options
| -rw-r--r-- | miasm2/ir/analysis.py | 4 | ||||
| -rw-r--r-- | test/analysis/depgraph.py | 4 | ||||
| -rwxr-xr-x | test/ir/analysis.py | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/miasm2/ir/analysis.py b/miasm2/ir/analysis.py index aa8271df..9844f58f 100644 --- a/miasm2/ir/analysis.py +++ b/miasm2/ir/analysis.py @@ -4,6 +4,7 @@ import logging from miasm2.ir.symbexec import symbexec +from miasm2.ir.ir import ir from miasm2.expression.expression \ import ExprAff, ExprCond, ExprId, ExprInt, ExprMem @@ -13,7 +14,8 @@ console_handler.setFormatter(logging.Formatter("%(levelname)-5s: %(message)s")) log.addHandler(console_handler) log.setLevel(logging.WARNING) -class ira: + +class ira(ir): """IR Analysis This class provides higher level manipulations on IR, such as dead instruction removals. diff --git a/test/analysis/depgraph.py b/test/analysis/depgraph.py index 7120bd08..3f9b1a92 100644 --- a/test/analysis/depgraph.py +++ b/test/analysis/depgraph.py @@ -76,13 +76,13 @@ class Arch(object): return SP -class IRATest(ir, ira): +class IRATest(ira): """Fake IRA class for tests""" def __init__(self, symbol_pool=None): arch = Arch() - ir.__init__(self, arch, 32, symbol_pool) + super(IRATest, self).__init__(arch, 32, symbol_pool) self.IRDst = PC self.ret_reg = R diff --git a/test/ir/analysis.py b/test/ir/analysis.py index 92aa4aba..b18d1633 100755 --- a/test/ir/analysis.py +++ b/test/ir/analysis.py @@ -2,7 +2,7 @@ from miasm2.expression.expression import ExprId, ExprInt32, ExprAff, ExprMem from miasm2.core.asmbloc import asm_label from miasm2.ir.analysis import ira -from miasm2.ir.ir import ir, irbloc +from miasm2.ir.ir import irbloc a = ExprId("a") b = ExprId("b") @@ -52,11 +52,13 @@ class Arch(object): def getsp(self, _): return sp -class IRATest(ir, ira): +class IRATest(ira): + + """Fake IRA class for tests""" def __init__(self, symbol_pool=None): arch = Arch() - ir.__init__(self, arch, 32, symbol_pool) + super(IRATest, self).__init__(arch, 32, symbol_pool) self.IRDst = pc self.ret_reg = r |