diff options
| -rw-r--r-- | miasm/analysis/disasm_cb.py | 2 | ||||
| -rw-r--r-- | miasm/analysis/machine.py | 16 | ||||
| -rw-r--r-- | miasm/arch/arm/lifter_model_call.py | 16 |
3 files changed, 17 insertions, 17 deletions
diff --git a/miasm/analysis/disasm_cb.py b/miasm/analysis/disasm_cb.py index f9274072..a3d7a68c 100644 --- a/miasm/analysis/disasm_cb.py +++ b/miasm/analysis/disasm_cb.py @@ -14,7 +14,7 @@ from miasm.core.utils import upck32 def get_lifter_model_call(arch, attrib): arch = arch.name, attrib if arch == ("arm", "arm"): - from miasm.arch.arm.lifter_model_call import ir_a_arm_base as lifter_model_call + from miasm.arch.arm.lifter_model_call import LifterModelCallArmlBase as lifter_model_call elif arch == ("x86", 32): from miasm.arch.x86.lifter_model_call import LifterModelCall_x86_32 as lifter_model_call elif arch == ("x86", 64): diff --git a/miasm/analysis/machine.py b/miasm/analysis/machine.py index 6591ff54..746fe1a6 100644 --- a/miasm/analysis/machine.py +++ b/miasm/analysis/machine.py @@ -38,8 +38,8 @@ class Machine(object): except ImportError: 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 Lifter_Arml as ir + from miasm.arch.arm.lifter_model_call import LifterModelCallArml as lifter_model_call + from miasm.arch.arm.sem import Lifter_Arml as lifter elif machine_name == "armb": from miasm.arch.arm.disasm import dis_armb as dis_engine from miasm.arch.arm import arch @@ -49,8 +49,8 @@ class Machine(object): except ImportError: 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 Lifter_Armb as ir + from miasm.arch.arm.lifter_model_call import LifterModelCallArmb as lifter_model_call + from miasm.arch.arm.sem import Lifter_Armb as lifter elif machine_name == "aarch64l": from miasm.arch.aarch64.disasm import dis_aarch64l as dis_engine from miasm.arch.aarch64 import arch @@ -77,8 +77,8 @@ class Machine(object): from miasm.arch.arm.disasm import dis_armtl as dis_engine 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 Lifter_Armtl as ir + from miasm.arch.arm.lifter_model_call import LifterModelCallArmtl as lifter_model_call + from miasm.arch.arm.sem import Lifter_Armtl as lifter try: from miasm.arch.arm import jit jitter = jit.jitter_armtl @@ -88,8 +88,8 @@ class Machine(object): from miasm.arch.arm.disasm import dis_armtb as dis_engine 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 Lifter_Armtb as ir + from miasm.arch.arm.lifter_model_call import LifterModelCallArmtb as lifter_model_call + from miasm.arch.arm.sem import Lifter_Armtb as lifter elif machine_name == "sh4": from miasm.arch.sh4 import arch mn = arch.mn_sh4 diff --git a/miasm/arch/arm/lifter_model_call.py b/miasm/arch/arm/lifter_model_call.py index 5053d269..f9c39ab6 100644 --- a/miasm/arch/arm/lifter_model_call.py +++ b/miasm/arch/arm/lifter_model_call.py @@ -6,21 +6,21 @@ from miasm.arch.arm.sem import Lifter_Arml, Lifter_Armtl, Lifter_Armb, Lifter_Ar from miasm.expression.expression import ExprAssign, ExprOp, ExprLoc, ExprCond from miasm.ir.ir import AssignBlock -class ir_a_arml_base(Lifter_Arml, LifterModelCall): +class LifterModelCallArmlBase(Lifter_Arml, LifterModelCall): def __init__(self, loc_db): Lifter_Arml.__init__(self, loc_db) self.ret_reg = self.arch.regs.R0 -class ir_a_armb_base(Lifter_Armb, LifterModelCall): +class LifterModelCallArmbBase(Lifter_Armb, LifterModelCall): def __init__(self, loc_db): Lifter_Armb.__init__(self, loc_db) self.ret_reg = self.arch.regs.R0 -class ir_a_arml(ir_a_arml_base): +class LifterModelCallArml(LifterModelCallArmlBase): def __init__(self, loc_db): - ir_a_arml_base.__init__(self, loc_db) + LifterModelCallArmlBase.__init__(self, loc_db) self.ret_reg = self.arch.regs.R0 def call_effects(self, ad, instr): @@ -88,19 +88,19 @@ class ir_a_arml(ir_a_arml_base): def sizeof_pointer(self): return 32 -class ir_a_armb(ir_a_armb_base, ir_a_arml): +class LifterModelCallArmb(LifterModelCallArmbBase, LifterModelCallArml): def __init__(self, loc_db): - ir_a_armb_base.__init__(self, loc_db) + LifterModelCallArmbBase.__init__(self, loc_db) self.ret_reg = self.arch.regs.R0 -class ir_a_armtl(Lifter_Armtl, ir_a_arml): +class LifterModelCallArmtl(Lifter_Armtl, LifterModelCallArml): def __init__(self, loc_db): Lifter_Armtl.__init__(self, loc_db) self.ret_reg = self.arch.regs.R0 -class ir_a_armtb(ir_a_armtl, Lifter_Armtb, ir_a_armb): +class LifterModelCallArmtb(LifterModelCallArmtl, Lifter_Armtb, LifterModelCallArmb): def __init__(self, loc_db): Lifter_Armtb.__init__(self, loc_db) self.ret_reg = self.arch.regs.R0 |