diff options
| -rw-r--r-- | miasm/analysis/machine.py | 8 | ||||
| -rw-r--r-- | miasm/arch/mep/lifter_model_call.py | 6 | ||||
| -rw-r--r-- | test/arch/mep/ir/test_ir.py | 4 | ||||
| -rw-r--r-- | test/arch/mep/ir/ut_helpers_ir.py | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/miasm/analysis/machine.py b/miasm/analysis/machine.py index 2d049795..b7e17087 100644 --- a/miasm/analysis/machine.py +++ b/miasm/analysis/machine.py @@ -187,8 +187,8 @@ class Machine(object): except ImportError: pass mn = arch.mn_mep - from miasm.arch.mep.lifter_model_call import ir_a_mepb as lifter_model_call - from miasm.arch.mep.sem import Lifter_MEPb as ir + from miasm.arch.mep.lifter_model_call import LifterModelCallMepb as lifter_model_call + from miasm.arch.mep.sem import Lifter_MEPb as lifter elif machine_name == "mepl": from miasm.arch.mep.disasm import dis_mepl as dis_engine from miasm.arch.mep import arch @@ -198,8 +198,8 @@ class Machine(object): except ImportError: pass mn = arch.mn_mep - from miasm.arch.mep.lifter_model_call import ir_a_mepl as lifter_model_call - from miasm.arch.mep.sem import Lifter_MEPl as ir + from miasm.arch.mep.lifter_model_call import LifterModelCallMepl as lifter_model_call + from miasm.arch.mep.sem import Lifter_MEPl as lifter else: raise ValueError('Unknown machine: %s' % machine_name) diff --git a/miasm/arch/mep/lifter_model_call.py b/miasm/arch/mep/lifter_model_call.py index 021c1951..db729ba0 100644 --- a/miasm/arch/mep/lifter_model_call.py +++ b/miasm/arch/mep/lifter_model_call.py @@ -5,7 +5,7 @@ from miasm.arch.mep.sem import Lifter_MEPb, Lifter_MEPl from miasm.ir.analysis import LifterModelCall -class ir_a_mepb(Lifter_MEPb, LifterModelCall): +class LifterModelCallMepb(Lifter_MEPb, LifterModelCall): """MeP high level IR manipulations - Big Endian Notes: @@ -38,8 +38,8 @@ class ir_a_mepb(Lifter_MEPb, LifterModelCall): return 32 -class ir_a_mepl(Lifter_MEPl, ir_a_mepb): +class LifterModelCallMepl(Lifter_MEPl, LifterModelCallMepb): """MeP high level IR manipulations - Little Endian""" def __init__(self, loc_db): - ir_a_mepb.__init__(self, loc_db) + LifterModelCallMepb.__init__(self, loc_db) diff --git a/test/arch/mep/ir/test_ir.py b/test/arch/mep/ir/test_ir.py index c62e5692..87389e30 100644 --- a/test/arch/mep/ir/test_ir.py +++ b/test/arch/mep/ir/test_ir.py @@ -6,7 +6,7 @@ from __future__ import print_function from miasm.core.utils import decode_hex from miasm.arch.mep.arch import mn_mep from miasm.arch.mep.regs import regs_init -from miasm.arch.mep.lifter_model_call import Lifter_MEPb, ir_a_mepb +from miasm.arch.mep.lifter_model_call import Lifter_MEPb, LifterModelCallMepb from miasm.expression.expression import ExprId, ExprInt, ExprMem from miasm.ir.symbexec import SymbolicExecutionEngine from miasm.core.locationdb import LocationDB @@ -35,7 +35,7 @@ class TestMisc(object): print("\nInternal representation:", iir) # Symbolic execution - sb = SymbolicExecutionEngine(ir_a_mepb(loc_db), regs_init) + sb = SymbolicExecutionEngine(LifterModelCallMepb(loc_db), regs_init) # Assign register values before symbolic evaluation for reg_expr_id, reg_expr_value in init_values: diff --git a/test/arch/mep/ir/ut_helpers_ir.py b/test/arch/mep/ir/ut_helpers_ir.py index 24b30abe..e4b2df43 100644 --- a/test/arch/mep/ir/ut_helpers_ir.py +++ b/test/arch/mep/ir/ut_helpers_ir.py @@ -11,7 +11,7 @@ from miasm.ir.symbexec import SymbolicExecutionEngine from miasm.core.locationdb import LocationDB from miasm.core.utils import Disasm_Exception from miasm.ir.ir import AssignBlock -from miasm.arch.mep.lifter_model_call import ir_a_mepb +from miasm.arch.mep.lifter_model_call import LifterModelCallMepb from miasm.expression.expression import ExprId, ExprInt, ExprOp, ExprMem, \ ExprAssign, ExprLoc @@ -44,7 +44,7 @@ def exec_instruction(mn_str, init_values, results, index=0, offset=0): ir.dst.name == "IRDst")] # Prepare symbolic execution - sb = SymbolicExecutionEngine(ir_a_mepb(loc_db), regs_init) + sb = SymbolicExecutionEngine(LifterModelCallMepb(loc_db), regs_init) # Assign int values before symbolic evaluation for expr_id, expr_value in init_values: |