Rename msp430 lifter

5 files changed, 8 insertions, 8 deletions

diff --git a/miasm/analysis/machine.py b/miasm/analysis/machine.py
index 96af9860..5038d63b 100644
--- a/miasm/analysis/machine.py
+++ b/miasm/analysis/machine.py
@@ -140,7 +140,7 @@ class Machine(object):
                 pass
             mn = arch.mn_msp430
             from miasm.arch.msp430.lifter_model_call import ir_a_msp430 as lifter_model_call
-            from miasm.arch.msp430.sem import ir_msp430 as ir
+            from miasm.arch.msp430.sem import Lifter_MSP430 as ir
             try:
                 from miasm.analysis.gdbserver import GdbServer_msp430 as gdbserver
             except ImportError:
diff --git a/miasm/arch/msp430/ira.py b/miasm/arch/msp430/ira.py
index a983f2e1..656eb320 100644
--- a/miasm/arch/msp430/ira.py
+++ b/miasm/arch/msp430/ira.py
@@ -1,14 +1,14 @@
 #-*- coding:utf-8 -*-
 
 from miasm.ir.analysis import LifterModelCall
-from miasm.arch.msp430.sem import ir_msp430
+from miasm.arch.msp430.sem import Lifter_MSP430
 from miasm.ir.ir import AssignBlock
 from miasm.expression.expression import *
 
-class ir_a_msp430_base(ir_msp430, LifterModelCall):
+class ir_a_msp430_base(Lifter_MSP430, LifterModelCall):
 
     def __init__(self, loc_db):
-        ir_msp430.__init__(self, loc_db)
+        Lifter_MSP430.__init__(self, loc_db)
         self.ret_reg = self.arch.regs.R15
 
     def call_effects(self, addr, instr):
diff --git a/miasm/arch/msp430/jit.py b/miasm/arch/msp430/jit.py
index 1212b338..ad767588 100644
--- a/miasm/arch/msp430/jit.py
+++ b/miasm/arch/msp430/jit.py
@@ -1,7 +1,7 @@
 from miasm.jitter.jitload import Jitter
 from miasm.core.locationdb import LocationDB
 from miasm.core.utils import pck16, upck16
-from miasm.arch.msp430.sem import ir_msp430
+from miasm.arch.msp430.sem import Lifter_MSP430
 
 import logging
 
@@ -14,7 +14,7 @@ log.setLevel(logging.CRITICAL)
 class jitter_msp430(Jitter):
 
     def __init__(self, loc_db, *args, **kwargs):
-        Jitter.__init__(self, ir_msp430(loc_db), *args, **kwargs)
+        Jitter.__init__(self, Lifter_MSP430(loc_db), *args, **kwargs)
         self.vm.set_little_endian()
 
     def push_uint16_t(self, value):
diff --git a/miasm/arch/msp430/sem.py b/miasm/arch/msp430/sem.py
index 93d46720..d4d3221b 100644
--- a/miasm/arch/msp430/sem.py
+++ b/miasm/arch/msp430/sem.py
@@ -473,7 +473,7 @@ def ComposeExprAssign(dst, src):
     return e
 
 
-class ir_msp430(Lifter):
+class Lifter_MSP430(Lifter):
 
     def __init__(self, loc_db):
         Lifter.__init__(self, mn_msp430, None, loc_db)
diff --git a/test/arch/msp430/sem.py b/test/arch/msp430/sem.py
index 2b3c4afe..e47c6f30 100755
--- a/test/arch/msp430/sem.py
+++ b/test/arch/msp430/sem.py
@@ -9,7 +9,7 @@ from future.utils import viewitems
 
 from miasm.ir.symbexec import SymbolicExecutionEngine
 from miasm.arch.msp430.arch import mn_msp430 as mn, mode_msp430 as mode
-from miasm.arch.msp430.sem import ir_msp430 as ir_arch
+from miasm.arch.msp430.sem import Lifter_MSP430 as ir_arch
 from miasm.arch.msp430.regs import *
 from miasm.expression.expression import *
 from miasm.core.locationdb import LocationDB