Merge pull request #1326 from serpilliere/rename_lifter

Rename lifter

7 files changed, 12 insertions, 12 deletions

diff --git a/test/arch/arm/sem.py b/test/arch/arm/sem.py
index 49d46a4d..1dca9a6b 100755
--- a/test/arch/arm/sem.py
+++ b/test/arch/arm/sem.py
@@ -9,7 +9,7 @@ from future.utils import viewitems
 
 from miasm.ir.symbexec import SymbolicExecutionEngine
 from miasm.arch.arm.arch import mn_arm as mn
-from miasm.arch.arm.sem import ir_arml as ir_arch
+from miasm.arch.arm.sem import Lifter_Arml as ir_arch
 from miasm.arch.arm.regs import *
 from miasm.expression.expression import *
 from miasm.core.locationdb import LocationDB
diff --git a/test/arch/mep/ir/test_ir.py b/test/arch/mep/ir/test_ir.py
index 97a3ec1e..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.ira import ir_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
@@ -30,12 +30,12 @@ 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)
 
             # 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 c5bf36b9..e4b2df43 100644
--- a/test/arch/mep/ir/ut_helpers_ir.py
+++ b/test/arch/mep/ir/ut_helpers_ir.py
@@ -4,14 +4,14 @@
 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
 from miasm.core.locationdb import LocationDB
 from miasm.core.utils import Disasm_Exception
 from miasm.ir.ir import AssignBlock
-from miasm.arch.mep.ira import ir_a_mepb
+from miasm.arch.mep.lifter_model_call import LifterModelCallMepb
 from miasm.expression.expression import ExprId, ExprInt, ExprOp, ExprMem, \
     ExprAssign, ExprLoc
 
@@ -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
@@ -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:
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
diff --git a/test/arch/ppc32/sem.py b/test/arch/ppc32/sem.py
index 53c93369..c4b08485 100644
--- a/test/arch/ppc32/sem.py
+++ b/test/arch/ppc32/sem.py
@@ -9,7 +9,7 @@ from future.utils import viewitems
 
 from miasm.ir.symbexec import SymbolicExecutionEngine
 from miasm.arch.ppc.arch import mn_ppc as mn
-from miasm.arch.ppc.sem import ir_ppc32b as ir_arch
+from miasm.arch.ppc.sem import Lifter_PPC32b as ir_arch
 from miasm.arch.ppc.regs import *
 from miasm.expression.expression import *
 from miasm.core.locationdb import LocationDB
diff --git a/test/arch/x86/arch.py b/test/arch/x86/arch.py
index 0455462d..bedbc503 100644
--- a/test/arch/x86/arch.py
+++ b/test/arch/x86/arch.py
@@ -6,7 +6,7 @@ from miasm.core.utils import decode_hex, encode_hex
 import miasm.expression.expression as m2_expr
 from miasm.arch.x86.arch import mn_x86, deref_mem_ad, \
     base_expr, rmarg, print_size
-from miasm.arch.x86.sem import ir_x86_16, ir_x86_32, ir_x86_64
+from miasm.arch.x86.sem import Lifter_X86_16, Lifter_X86_32, Lifter_X86_64
 from miasm.core.bin_stream import bin_stream_str
 from miasm.core.locationdb import LocationDB
 
diff --git a/test/arch/x86/sem.py b/test/arch/x86/sem.py
index 9c7e972b..ecee5772 100755
--- a/test/arch/x86/sem.py
+++ b/test/arch/x86/sem.py
@@ -14,7 +14,7 @@ import copy
 
 from miasm.ir.symbexec import SymbolicExecutionEngine
 from miasm.arch.x86.arch import mn_x86 as mn
-from miasm.arch.x86.sem import ir_x86_32 as ir_32, ir_x86_64 as ir_64
+from miasm.arch.x86.sem import Lifter_X86_32 as ir_32, Lifter_X86_64 as ir_64
 from miasm.arch.x86.regs import *
 from miasm.expression.expression import *
 from miasm.expression.simplifications import expr_simp