about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--miasm/analysis/machine.py4
-rw-r--r--miasm/arch/mep/ira.py8
-rw-r--r--miasm/arch/mep/jit.py6
-rw-r--r--miasm/arch/mep/sem.py4
-rw-r--r--test/arch/mep/ir/test_ir.py4
-rw-r--r--test/arch/mep/ir/ut_helpers_ir.py4
6 files changed, 15 insertions, 15 deletions
diff --git a/miasm/analysis/machine.py b/miasm/analysis/machine.py
index d74f42f8..1c4704c1 100644
--- a/miasm/analysis/machine.py
+++ b/miasm/analysis/machine.py
@@ -188,7 +188,7 @@ class Machine(object):
                 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 ir_mepb as ir
+            from miasm.arch.mep.sem import Lifter_MEPb as ir
         elif machine_name == "mepl":
             from miasm.arch.mep.disasm import dis_mepl as dis_engine
             from miasm.arch.mep import arch
@@ -199,7 +199,7 @@ class Machine(object):
                 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 ir_mepl as ir
+            from miasm.arch.mep.sem import Lifter_MEPl as ir
         else:
             raise ValueError('Unknown machine: %s' % machine_name)
 
diff --git a/miasm/arch/mep/ira.py b/miasm/arch/mep/ira.py
index e1420168..021c1951 100644
--- a/miasm/arch/mep/ira.py
+++ b/miasm/arch/mep/ira.py
@@ -1,11 +1,11 @@
 # Toshiba MeP-c4 - miasm IR analysis
 # Guillaume Valadon <guillaume@valadon.net>
 
-from miasm.arch.mep.sem import ir_mepb, ir_mepl
+from miasm.arch.mep.sem import Lifter_MEPb, Lifter_MEPl
 from miasm.ir.analysis import LifterModelCall
 
 
-class ir_a_mepb(ir_mepb, LifterModelCall):
+class ir_a_mepb(Lifter_MEPb, LifterModelCall):
     """MeP high level IR manipulations - Big Endian
 
     Notes:
@@ -13,7 +13,7 @@ class ir_a_mepb(ir_mepb, LifterModelCall):
     """
 
     def __init__(self, loc_db):
-        ir_mepb.__init__(self, loc_db)
+        Lifter_MEPb.__init__(self, loc_db)
         self.ret_reg = self.arch.regs.R0
 
     # Note: the following are abstract method and must be implemented
@@ -38,7 +38,7 @@ class ir_a_mepb(ir_mepb, LifterModelCall):
         return 32
 
 
-class ir_a_mepl(ir_mepl, ir_a_mepb):
+class ir_a_mepl(Lifter_MEPl, ir_a_mepb):
     """MeP high level IR manipulations - Little Endian"""
 
     def __init__(self, loc_db):
diff --git a/miasm/arch/mep/jit.py b/miasm/arch/mep/jit.py
index cc1e56ac..e3cd2428 100644
--- a/miasm/arch/mep/jit.py
+++ b/miasm/arch/mep/jit.py
@@ -6,7 +6,7 @@ from miasm.jitter.jitload import Jitter
 from miasm.core.utils import *
 from miasm.jitter.codegen import CGen
 from miasm.ir.translators.C import TranslatorC
-from miasm.arch.mep.sem import ir_mepl, ir_mepb
+from miasm.arch.mep.sem import Lifter_MEPl, Lifter_MEPb
 
 import logging
 
@@ -77,7 +77,7 @@ class jitter_mepl(Jitter):
     C_Gen = mep_CGen
 
     def __init__(self, loc_db, *args, **kwargs):
-        Jitter.__init__(self, ir_mepl(loc_db), *args, **kwargs)
+        Jitter.__init__(self, Lifter_MEPl(loc_db), *args, **kwargs)
         self.vm.set_little_endian()
         self.ir_arch.jit_pc = self.ir_arch.arch.regs.PC
 
@@ -107,6 +107,6 @@ class jitter_mepl(Jitter):
 class jitter_mepb(jitter_mepl):
 
     def __init__(self, loc_db, *args, **kwargs):
-        Jitter.__init__(self, ir_mepb(loc_db), *args, **kwargs)
+        Jitter.__init__(self, Lifter_MEPb(loc_db), *args, **kwargs)
         self.vm.set_big_endian()
         self.ir_arch.jit_pc = self.ir_arch.arch.regs.PC
diff --git a/miasm/arch/mep/sem.py b/miasm/arch/mep/sem.py
index aac3613a..0ac50c58 100644
--- a/miasm/arch/mep/sem.py
+++ b/miasm/arch/mep/sem.py
@@ -1199,7 +1199,7 @@ def get_mnemo_expr(ir, instr, *args):
     return ir, extra_ir
 
 
-class ir_mepb(Lifter):
+class Lifter_MEPb(Lifter):
     """Toshiba MeP miasm IR - Big Endian
 
        It transforms an instructon into an IR.
@@ -1230,7 +1230,7 @@ class ir_mepb(Lifter):
         return l
 
 
-class ir_mepl(ir_mepb):
+class Lifter_MEPl(Lifter_MEPb):
     """Toshiba MeP miasm IR - Little Endian"""
 
     def __init__(self, loc_db):
diff --git a/test/arch/mep/ir/test_ir.py b/test/arch/mep/ir/test_ir.py
index c811988b..c62e5692 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 ir_mepb, ir_a_mepb
+from miasm.arch.mep.lifter_model_call import Lifter_MEPb, ir_a_mepb
 from miasm.expression.expression import ExprId, ExprInt, ExprMem
 from miasm.ir.symbexec import SymbolicExecutionEngine
 from miasm.core.locationdb import LocationDB
@@ -30,7 +30,7 @@ class TestMisc(object):
             loc_db = LocationDB()
 
             # Get the IR
-            im = ir_mepb(loc_db)
+            im = Lifter_MEPb(loc_db)
             iir, eiir, = im.get_ir(mn)
             print("\nInternal representation:", iir)
 
diff --git a/test/arch/mep/ir/ut_helpers_ir.py b/test/arch/mep/ir/ut_helpers_ir.py
index ddbfdffb..24b30abe 100644
--- a/test/arch/mep/ir/ut_helpers_ir.py
+++ b/test/arch/mep/ir/ut_helpers_ir.py
@@ -4,7 +4,7 @@
 from __future__ import print_function
 
 from miasm.arch.mep.arch import mn_mep
-from miasm.arch.mep.sem import ir_mepb
+from miasm.arch.mep.sem import Lifter_MEPb
 from miasm.arch.mep.regs import regs_init
 
 from miasm.ir.symbexec import SymbolicExecutionEngine
@@ -35,7 +35,7 @@ def exec_instruction(mn_str, init_values, results, index=0, offset=0):
         instr.dstflow2label(loc_db)
 
     # Get the IR
-    im = ir_mepb(loc_db)
+    im = Lifter_MEPb(loc_db)
     iir, eiir = im.get_ir(instr)
 
     # Filter out IRDst