diff options
Diffstat (limited to 'miasm/jitter/jitload.py')
| -rw-r--r-- | miasm/jitter/jitload.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/miasm/jitter/jitload.py b/miasm/jitter/jitload.py index 20d795e6..6f3af033 100644 --- a/miasm/jitter/jitload.py +++ b/miasm/jitter/jitload.py @@ -179,18 +179,18 @@ class Jitter(object): C_Gen = CGen - def __init__(self, ir_arch, jit_type="gcc"): + def __init__(self, lifter, jit_type="gcc"): """Init an instance of jitter. - @ir_arch: ir instance for this architecture + @lifter: Lifter instance for this architecture @jit_type: JiT backend to use. Available options are: - "gcc" - "llvm" - "python" """ - self.arch = ir_arch.arch - self.attrib = ir_arch.attrib - arch_name = ir_arch.arch.name # (ir_arch.arch.name, ir_arch.attrib) + self.arch = lifter.arch + self.attrib = lifter.attrib + arch_name = lifter.arch.name # (lifter.arch.name, lifter.attrib) try: if arch_name == "x86": @@ -199,7 +199,7 @@ class Jitter(object): from miasm.jitter.arch import JitCore_arm as jcore elif arch_name == "armt": from miasm.jitter.arch import JitCore_arm as jcore - ir_arch.arch.name = 'arm' + lifter.arch.name = 'arm' elif arch_name == "aarch64": from miasm.jitter.arch import JitCore_aarch64 as jcore elif arch_name == "msp430": @@ -217,12 +217,12 @@ class Jitter(object): self.vm = VmMngr.Vm() self.cpu = jcore.JitCpu() - self.ir_arch = ir_arch + self.lifter = lifter self.bs = bin_stream_vm(self.vm) - self.ircfg = self.ir_arch.new_ircfg() + self.ircfg = self.lifter.new_ircfg() self.symbexec = EmulatedSymbExec( - self.cpu, self.vm, self.ir_arch, {} + self.cpu, self.vm, self.lifter, {} ) self.symbexec.reset_regs() @@ -238,9 +238,9 @@ class Jitter(object): except ImportError: raise RuntimeError('Unsupported jitter: %s' % jit_type) - self.jit = JitCore(self.ir_arch, self.bs) + self.jit = JitCore(self.lifter, self.bs) if isinstance(self.jit, JitCore_Cc_Base): - self.jit.init_codegen(self.C_Gen(self.ir_arch)) + self.jit.init_codegen(self.C_Gen(self.lifter)) elif jit_type == "python": self.jit.set_cpu_vm(self.cpu, self.vm) @@ -498,7 +498,7 @@ class Jitter(object): log.debug('%r', fname) raise ValueError('unknown api', hex(jitter.pc), repr(fname)) ret = func(jitter) - jitter.pc = getattr(jitter.cpu, jitter.ir_arch.pc.name) + jitter.pc = getattr(jitter.cpu, jitter.lifter.pc.name) # Don't break on a None return if ret is None: |