diff options
| -rw-r--r-- | miasm/analysis/machine.py | 4 | ||||
| -rw-r--r-- | miasm/arch/mips32/ira.py | 10 | ||||
| -rw-r--r-- | miasm/arch/mips32/jit.py | 6 | ||||
| -rw-r--r-- | miasm/arch/mips32/sem.py | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/miasm/analysis/machine.py b/miasm/analysis/machine.py index 1c4704c1..96af9860 100644 --- a/miasm/analysis/machine.py +++ b/miasm/analysis/machine.py @@ -155,7 +155,7 @@ class Machine(object): pass mn = arch.mn_mips32 from miasm.arch.mips32.lifter_model_call import ir_a_mips32b as lifter_model_call - from miasm.arch.mips32.sem import ir_mips32b as ir + from miasm.arch.mips32.sem import Lifter_Mips32b as ir elif machine_name == "mips32l": from miasm.arch.mips32.disasm import dis_mips32l as dis_engine from miasm.arch.mips32 import arch @@ -166,7 +166,7 @@ class Machine(object): pass mn = arch.mn_mips32 from miasm.arch.mips32.lifter_model_call import ir_a_mips32l as lifter_model_call - from miasm.arch.mips32.sem import ir_mips32l as ir + from miasm.arch.mips32.sem import Lifter_Mips32l as ir elif machine_name == "ppc32b": from miasm.arch.ppc.disasm import dis_ppc32b as dis_engine from miasm.arch.ppc import arch diff --git a/miasm/arch/mips32/ira.py b/miasm/arch/mips32/ira.py index d7c2af17..b9d0fe7e 100644 --- a/miasm/arch/mips32/ira.py +++ b/miasm/arch/mips32/ira.py @@ -3,11 +3,11 @@ from miasm.expression.expression import ExprAssign, ExprOp from miasm.ir.ir import IRBlock, AssignBlock from miasm.ir.analysis import LifterModelCall -from miasm.arch.mips32.sem import ir_mips32l, ir_mips32b +from miasm.arch.mips32.sem import Lifter_Mips32l, Lifter_Mips32b -class ir_a_mips32l(ir_mips32l, LifterModelCall): +class ir_a_mips32l(Lifter_Mips32l, LifterModelCall): def __init__(self, loc_db): - ir_mips32l.__init__(self, loc_db) + Lifter_Mips32l.__init__(self, loc_db) self.ret_reg = self.arch.regs.V0 def call_effects(self, ad, instr): @@ -98,7 +98,7 @@ class ir_a_mips32l(ir_mips32l, LifterModelCall): -class ir_a_mips32b(ir_mips32b, ir_a_mips32l): +class ir_a_mips32b(Lifter_Mips32b, ir_a_mips32l): def __init__(self, loc_db): - ir_mips32b.__init__(self, loc_db) + Lifter_Mips32b.__init__(self, loc_db) self.ret_reg = self.arch.regs.V0 diff --git a/miasm/arch/mips32/jit.py b/miasm/arch/mips32/jit.py index d8bd8c66..779c2b77 100644 --- a/miasm/arch/mips32/jit.py +++ b/miasm/arch/mips32/jit.py @@ -4,7 +4,7 @@ import logging from miasm.jitter.jitload import Jitter, named_arguments from miasm.core.locationdb import LocationDB from miasm.core.utils import pck32, upck32 -from miasm.arch.mips32.sem import ir_mips32l, ir_mips32b +from miasm.arch.mips32.sem import Lifter_Mips32l, Lifter_Mips32b from miasm.jitter.codegen import CGen from miasm.ir.ir import AssignBlock, IRBlock import miasm.expression.expression as m2_expr @@ -86,7 +86,7 @@ class jitter_mips32l(Jitter): C_Gen = mipsCGen def __init__(self, loc_db, *args, **kwargs): - Jitter.__init__(self, ir_mips32l(loc_db), *args, **kwargs) + Jitter.__init__(self, Lifter_Mips32l(loc_db), *args, **kwargs) self.vm.set_little_endian() def push_uint32_t(self, value): @@ -145,5 +145,5 @@ class jitter_mips32l(Jitter): class jitter_mips32b(jitter_mips32l): def __init__(self, loc_db, *args, **kwargs): - Jitter.__init__(self, ir_mips32b(loc_db), *args, **kwargs) + Jitter.__init__(self, Lifter_Mips32b(loc_db), *args, **kwargs) self.vm.set_big_endian() diff --git a/miasm/arch/mips32/sem.py b/miasm/arch/mips32/sem.py index 9445c27d..92302fa1 100644 --- a/miasm/arch/mips32/sem.py +++ b/miasm/arch/mips32/sem.py @@ -618,7 +618,7 @@ def get_mnemo_expr(ir, instr, *args): instr, extra_ir = mnemo_func[instr.name.lower()](ir, instr, *args) return instr, extra_ir -class ir_mips32l(Lifter): +class Lifter_Mips32l(Lifter): def __init__(self, loc_db): Lifter.__init__(self, mn_mips32, 'l', loc_db) @@ -652,7 +652,7 @@ class ir_mips32l(Lifter): def get_next_delay_loc_key(self, instr): return self.loc_db.get_or_create_offset_location(instr.offset + 16) -class ir_mips32b(ir_mips32l): +class Lifter_Mips32b(Lifter_Mips32l): def __init__(self, loc_db): self.addrsize = 32 Lifter.__init__(self, mn_mips32, 'b', loc_db) |