diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2020-12-07 17:36:36 +0100 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2020-12-24 17:15:46 +0100 |
| commit | 74cf8231d7b0380da6739b9c14187e0f5416af2f (patch) | |
| tree | d12875c5c050512619a6c74c55f37b817e9b0eb3 | |
| parent | 407387dfbe249181aa27a206939625870c2a90fa (diff) | |
| download | miasm-74cf8231d7b0380da6739b9c14187e0f5416af2f.tar.gz miasm-74cf8231d7b0380da6739b9c14187e0f5416af2f.zip | |
Rename ppc32 lifter
| -rw-r--r-- | miasm/analysis/machine.py | 2 | ||||
| -rw-r--r-- | miasm/arch/ppc/ira.py | 4 | ||||
| -rw-r--r-- | miasm/arch/ppc/jit.py | 4 | ||||
| -rw-r--r-- | miasm/arch/ppc/sem.py | 4 | ||||
| -rw-r--r-- | test/arch/ppc32/sem.py | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/miasm/analysis/machine.py b/miasm/analysis/machine.py index d4054d98..d74f42f8 100644 --- a/miasm/analysis/machine.py +++ b/miasm/analysis/machine.py @@ -177,7 +177,7 @@ class Machine(object): pass mn = arch.mn_ppc from miasm.arch.ppc.lifter_model_call import ir_a_ppc32b as lifter_model_call - from miasm.arch.ppc.sem import ir_ppc32b as ir + from miasm.arch.ppc.sem import Lifter_PPC32b as ir elif machine_name == "mepb": from miasm.arch.mep.disasm import dis_mepb as dis_engine from miasm.arch.mep import arch diff --git a/miasm/arch/ppc/ira.py b/miasm/arch/ppc/ira.py index aae6de83..8e8aa63d 100644 --- a/miasm/arch/ppc/ira.py +++ b/miasm/arch/ppc/ira.py @@ -1,10 +1,10 @@ from miasm.expression.expression import ExprAssign, ExprOp from miasm.ir.ir import AssignBlock from miasm.ir.analysis import LifterModelCall -from miasm.arch.ppc.sem import ir_ppc32b +from miasm.arch.ppc.sem import Lifter_PPC32b -class ir_a_ppc32b(ir_ppc32b, LifterModelCall): +class ir_a_ppc32b(Lifter_PPC32b, LifterModelCall): def __init__(self, loc_db, *args): super(ir_a_ppc32b, self).__init__(loc_db, *args) diff --git a/miasm/arch/ppc/jit.py b/miasm/arch/ppc/jit.py index ccdaab72..dcaff82c 100644 --- a/miasm/arch/ppc/jit.py +++ b/miasm/arch/ppc/jit.py @@ -1,6 +1,6 @@ from builtins import range from miasm.jitter.jitload import Jitter, named_arguments -from miasm.arch.ppc.sem import ir_ppc32b +from miasm.arch.ppc.sem import Lifter_PPC32b import struct import logging @@ -15,7 +15,7 @@ class jitter_ppc32b(Jitter): max_reg_arg = 8 def __init__(self, loc_db, *args, **kwargs): - super(jitter_ppc32b, self).__init__(ir_ppc32b(loc_db), + super(jitter_ppc32b, self).__init__(Lifter_PPC32b(loc_db), *args, **kwargs) self.vm.set_big_endian() diff --git a/miasm/arch/ppc/sem.py b/miasm/arch/ppc/sem.py index 8318ed89..7fbf61e6 100644 --- a/miasm/arch/ppc/sem.py +++ b/miasm/arch/ppc/sem.py @@ -897,10 +897,10 @@ sem_dir = { } -class ir_ppc32b(Lifter): +class Lifter_PPC32b(Lifter): def __init__(self, loc_db): - super(ir_ppc32b, self).__init__(mn_ppc, 'b', loc_db) + super(Lifter_PPC32b, self).__init__(mn_ppc, 'b', loc_db) self.pc = mn_ppc.getpc() self.sp = mn_ppc.getsp() self.IRDst = expr.ExprId('IRDst', 32) 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 |