diff options
| -rw-r--r-- | miasm/analysis/machine.py | 8 | ||||
| -rw-r--r-- | miasm/arch/arm/ira.py | 18 | ||||
| -rw-r--r-- | miasm/arch/arm/jit.py | 8 | ||||
| -rw-r--r-- | miasm/arch/arm/sem.py | 8 | ||||
| -rwxr-xr-x | test/arch/arm/sem.py | 2 |
5 files changed, 22 insertions, 22 deletions
diff --git a/miasm/analysis/machine.py b/miasm/analysis/machine.py index ba6a1fd3..0cb68fb7 100644 --- a/miasm/analysis/machine.py +++ b/miasm/analysis/machine.py @@ -39,7 +39,7 @@ class Machine(object): pass mn = arch.mn_arm from miasm.arch.arm.lifter_model_call import ir_a_arml as lifter_model_call - from miasm.arch.arm.sem import ir_arml as ir + from miasm.arch.arm.sem import Lifter_Arml as ir elif machine_name == "armb": from miasm.arch.arm.disasm import dis_armb as dis_engine from miasm.arch.arm import arch @@ -50,7 +50,7 @@ class Machine(object): pass mn = arch.mn_arm from miasm.arch.arm.lifter_model_call import ir_a_armb as lifter_model_call - from miasm.arch.arm.sem import ir_armb as ir + from miasm.arch.arm.sem import Lifter_Armb as ir elif machine_name == "aarch64l": from miasm.arch.aarch64.disasm import dis_aarch64l as dis_engine from miasm.arch.aarch64 import arch @@ -78,7 +78,7 @@ class Machine(object): from miasm.arch.arm import arch mn = arch.mn_armt from miasm.arch.arm.lifter_model_call import ir_a_armtl as lifter_model_call - from miasm.arch.arm.sem import ir_armtl as ir + from miasm.arch.arm.sem import Lifter_Armtl as ir try: from miasm.arch.arm import jit jitter = jit.jitter_armtl @@ -89,7 +89,7 @@ class Machine(object): from miasm.arch.arm import arch mn = arch.mn_armt from miasm.arch.arm.lifter_model_call import ir_a_armtb as lifter_model_call - from miasm.arch.arm.sem import ir_armtb as ir + from miasm.arch.arm.sem import Lifter_Armtb as ir elif machine_name == "sh4": from miasm.arch.sh4 import arch mn = arch.mn_sh4 diff --git a/miasm/arch/arm/ira.py b/miasm/arch/arm/ira.py index 2f47ea37..5053d269 100644 --- a/miasm/arch/arm/ira.py +++ b/miasm/arch/arm/ira.py @@ -2,18 +2,18 @@ from miasm.ir.analysis import LifterModelCall from miasm.ir.ir import IRBlock -from miasm.arch.arm.sem import ir_arml, ir_armtl, ir_armb, ir_armtb, tab_cond +from miasm.arch.arm.sem import Lifter_Arml, Lifter_Armtl, Lifter_Armb, Lifter_Armtb, tab_cond from miasm.expression.expression import ExprAssign, ExprOp, ExprLoc, ExprCond from miasm.ir.ir import AssignBlock -class ir_a_arml_base(ir_arml, LifterModelCall): +class ir_a_arml_base(Lifter_Arml, LifterModelCall): def __init__(self, loc_db): - ir_arml.__init__(self, loc_db) + Lifter_Arml.__init__(self, loc_db) self.ret_reg = self.arch.regs.R0 -class ir_a_armb_base(ir_armb, LifterModelCall): +class ir_a_armb_base(Lifter_Armb, LifterModelCall): def __init__(self, loc_db): - ir_armb.__init__(self, loc_db) + Lifter_Armb.__init__(self, loc_db) self.ret_reg = self.arch.regs.R0 @@ -95,12 +95,12 @@ class ir_a_armb(ir_a_armb_base, ir_a_arml): self.ret_reg = self.arch.regs.R0 -class ir_a_armtl(ir_armtl, ir_a_arml): +class ir_a_armtl(Lifter_Armtl, ir_a_arml): def __init__(self, loc_db): - ir_armtl.__init__(self, loc_db) + Lifter_Armtl.__init__(self, loc_db) self.ret_reg = self.arch.regs.R0 -class ir_a_armtb(ir_a_armtl, ir_armtb, ir_a_armb): +class ir_a_armtb(ir_a_armtl, Lifter_Armtb, ir_a_armb): def __init__(self, loc_db): - ir_armtb.__init__(self, loc_db) + Lifter_Armtb.__init__(self, loc_db) self.ret_reg = self.arch.regs.R0 diff --git a/miasm/arch/arm/jit.py b/miasm/arch/arm/jit.py index b4b7e793..78a69027 100644 --- a/miasm/arch/arm/jit.py +++ b/miasm/arch/arm/jit.py @@ -3,7 +3,7 @@ import logging from miasm.jitter.jitload import Jitter, named_arguments from miasm.core.utils import pck32, upck32 -from miasm.arch.arm.sem import ir_armb, ir_arml, ir_armtl, ir_armtb, cond_dct_inv, tab_cond +from miasm.arch.arm.sem import Lifter_Armb, Lifter_Arml, Lifter_Armtl, Lifter_Armtb, cond_dct_inv, tab_cond from miasm.jitter.codegen import CGen from miasm.expression.expression import ExprId, ExprAssign, ExprCond from miasm.ir.ir import IRBlock, AssignBlock @@ -65,7 +65,7 @@ class jitter_arml(Jitter): C_Gen = arm_CGen def __init__(self, loc_db, *args, **kwargs): - Jitter.__init__(self, ir_arml(loc_db), *args, **kwargs) + Jitter.__init__(self, Lifter_Arml(loc_db), *args, **kwargs) self.vm.set_little_endian() def push_uint32_t(self, value): @@ -132,7 +132,7 @@ class jitter_armb(jitter_arml): C_Gen = arm_CGen def __init__(self, loc_db, *args, **kwargs): - Jitter.__init__(self, ir_armb(loc_db), *args, **kwargs) + Jitter.__init__(self, Lifter_Armb(loc_db), *args, **kwargs) self.vm.set_big_endian() @@ -140,5 +140,5 @@ class jitter_armtl(jitter_arml): C_Gen = arm_CGen def __init__(self, loc_db, *args, **kwargs): - Jitter.__init__(self, ir_armtl(loc_db), *args, **kwargs) + Jitter.__init__(self, Lifter_Armtl(loc_db), *args, **kwargs) self.vm.set_little_endian() diff --git a/miasm/arch/arm/sem.py b/miasm/arch/arm/sem.py index b36d151a..e507a045 100644 --- a/miasm/arch/arm/sem.py +++ b/miasm/arch/arm/sem.py @@ -1932,7 +1932,7 @@ class arminfo(object): # offset -class ir_arml(Lifter): +class Lifter_Arml(Lifter): def __init__(self, loc_db): Lifter.__init__(self, mn_arm, "l", loc_db) self.pc = PC @@ -2129,7 +2129,7 @@ class ir_arml(Lifter): -class ir_armb(ir_arml): +class Lifter_Armb(Lifter_Arml): def __init__(self, loc_db): Lifter.__init__(self, mn_arm, "b", loc_db) self.pc = PC @@ -2138,7 +2138,7 @@ class ir_armb(ir_arml): self.addrsize = 32 -class ir_armtl(ir_arml): +class Lifter_Armtl(Lifter_Arml): def __init__(self, loc_db): Lifter.__init__(self, mn_armt, "l", loc_db) self.pc = PC @@ -2164,7 +2164,7 @@ class ir_armtl(ir_arml): lambda expr: expr.replace_expr(pc_fixed)) -class ir_armtb(ir_armtl): +class Lifter_Armtb(Lifter_Armtl): def __init__(self, loc_db): Lifter.__init__(self, mn_armt, "b", loc_db) self.pc = PC 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 |