diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2020-12-07 17:35:44 +0100 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2020-12-24 17:15:46 +0100 |
| commit | 407387dfbe249181aa27a206939625870c2a90fa (patch) | |
| tree | 751e8d4a00089d7df6f8118dac0570ddcc10930c | |
| parent | 400853a52f2507f7aff1c86c7c9fc8c13d88a426 (diff) | |
| download | miasm-407387dfbe249181aa27a206939625870c2a90fa.tar.gz miasm-407387dfbe249181aa27a206939625870c2a90fa.zip | |
Rename aarch64 lifter
| -rw-r--r-- | miasm/analysis/machine.py | 4 | ||||
| -rw-r--r-- | miasm/arch/aarch64/ira.py | 10 | ||||
| -rw-r--r-- | miasm/arch/aarch64/jit.py | 6 | ||||
| -rw-r--r-- | miasm/arch/aarch64/sem.py | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/miasm/analysis/machine.py b/miasm/analysis/machine.py index 0cb68fb7..d4054d98 100644 --- a/miasm/analysis/machine.py +++ b/miasm/analysis/machine.py @@ -61,7 +61,7 @@ class Machine(object): pass mn = arch.mn_aarch64 from miasm.arch.aarch64.lifter_model_call import ir_a_aarch64l as lifter_model_call - from miasm.arch.aarch64.sem import ir_aarch64l as ir + from miasm.arch.aarch64.sem import Lifter_Aarch64l as ir elif machine_name == "aarch64b": from miasm.arch.aarch64.disasm import dis_aarch64b as dis_engine from miasm.arch.aarch64 import arch @@ -72,7 +72,7 @@ class Machine(object): pass mn = arch.mn_aarch64 from miasm.arch.aarch64.lifter_model_call import ir_a_aarch64b as lifter_model_call - from miasm.arch.aarch64.sem import ir_aarch64b as ir + from miasm.arch.aarch64.sem import Lifter_Aarch64b as ir elif machine_name == "armtl": from miasm.arch.arm.disasm import dis_armtl as dis_engine from miasm.arch.arm import arch diff --git a/miasm/arch/aarch64/ira.py b/miasm/arch/aarch64/ira.py index 13c49943..62577cc0 100644 --- a/miasm/arch/aarch64/ira.py +++ b/miasm/arch/aarch64/ira.py @@ -1,20 +1,20 @@ #-*- coding:utf-8 -*- from miasm.ir.analysis import LifterModelCall -from miasm.arch.aarch64.sem import ir_aarch64l, ir_aarch64b +from miasm.arch.aarch64.sem import Lifter_Aarch64l, Lifter_Aarch64b -class ir_a_aarch64l_base(ir_aarch64l, LifterModelCall): +class ir_a_aarch64l_base(Lifter_Aarch64l, LifterModelCall): def __init__(self, loc_db): - ir_aarch64l.__init__(self, loc_db) + Lifter_Aarch64l.__init__(self, loc_db) self.ret_reg = self.arch.regs.X0 -class ir_a_aarch64b_base(ir_aarch64b, LifterModelCall): +class ir_a_aarch64b_base(Lifter_Aarch64b, LifterModelCall): def __init__(self, loc_db): - ir_aarch64b.__init__(self, loc_db) + Lifter_Aarch64b.__init__(self, loc_db) self.ret_reg = self.arch.regs.X0 diff --git a/miasm/arch/aarch64/jit.py b/miasm/arch/aarch64/jit.py index 52ef1ae7..f71ecae4 100644 --- a/miasm/arch/aarch64/jit.py +++ b/miasm/arch/aarch64/jit.py @@ -3,7 +3,7 @@ import logging from miasm.jitter.jitload import Jitter, named_arguments from miasm.core.utils import pck64, upck64 -from miasm.arch.aarch64.sem import ir_aarch64b, ir_aarch64l +from miasm.arch.aarch64.sem import Lifter_Aarch64b, Lifter_Aarch64l log = logging.getLogger('jit_aarch64') hnd = logging.StreamHandler() @@ -15,7 +15,7 @@ class jitter_aarch64l(Jitter): max_reg_arg = 8 def __init__(self, loc_db, *args, **kwargs): - Jitter.__init__(self, ir_aarch64l(loc_db), *args, **kwargs) + Jitter.__init__(self, Lifter_Aarch64l(loc_db), *args, **kwargs) self.vm.set_little_endian() def push_uint64_t(self, value): @@ -75,5 +75,5 @@ class jitter_aarch64l(Jitter): class jitter_aarch64b(jitter_aarch64l): def __init__(self, loc_db, *args, **kwargs): - Jitter.__init__(self, ir_aarch64b(loc_db), *args, **kwargs) + Jitter.__init__(self, Lifter_Aarch64b(loc_db), *args, **kwargs) self.vm.set_big_endian() diff --git a/miasm/arch/aarch64/sem.py b/miasm/arch/aarch64/sem.py index 7f7c861d..8a084ea7 100644 --- a/miasm/arch/aarch64/sem.py +++ b/miasm/arch/aarch64/sem.py @@ -2285,7 +2285,7 @@ class aarch64info(object): # offset -class ir_aarch64l(Lifter): +class Lifter_Aarch64l(Lifter): def __init__(self, loc_db): Lifter.__init__(self, mn_aarch64, "l", loc_db) @@ -2371,7 +2371,7 @@ class ir_aarch64l(Lifter): return instr_ir, new_irblocks -class ir_aarch64b(ir_aarch64l): +class Lifter_Aarch64b(Lifter_Aarch64l): def __init__(self, loc_db): Lifter.__init__(self, mn_aarch64, "b", loc_db) |