diff options
| -rw-r--r-- | example/sandbox_pe_x86_32.py | 8 | ||||
| -rw-r--r-- | example/test_jit_arm.py | 9 | ||||
| -rw-r--r-- | example/test_jit_x86_32.py | 6 |
3 files changed, 10 insertions, 13 deletions
diff --git a/example/sandbox_pe_x86_32.py b/example/sandbox_pe_x86_32.py index 0f660668..26d492f9 100644 --- a/example/sandbox_pe_x86_32.py +++ b/example/sandbox_pe_x86_32.py @@ -1,13 +1,11 @@ import sys import os from argparse import ArgumentParser -from miasm2.arch.x86.arch import mn_x86 -from miasm2.jitter.jitload import jitter_x86_32, vm_load_pe, preload_pe, libimp +from miasm2.jitter.jitload import vm_load_pe, preload_pe, libimp from miasm2.jitter.jitload import bin_stream_vm from miasm2.jitter.csts import * from miasm2.jitter.os_dep import win_api_x86_32 -from miasm2.analysis import debugging, gdbserver -import inspect +from miasm2.analysis import debugging, gdbserver, machine # Debug settings # from pdb import pm @@ -73,7 +71,7 @@ def code_sentinelle(jitter): return True # x86 32 bits engine instanciation -myjit = jitter_x86_32(jit_type=args.jitter) +myjit = machine.Machine("x86_32").jitter(jit_type=args.jitter) myjit.init_stack() libs = libimp() diff --git a/example/test_jit_arm.py b/example/test_jit_arm.py index 3908fbfc..e73f22db 100644 --- a/example/test_jit_arm.py +++ b/example/test_jit_arm.py @@ -3,9 +3,8 @@ from argparse import ArgumentParser from miasm2.analysis import debugging, gdbserver -from miasm2.arch.arm.arch import mn_arm -from miasm2.jitter.jitload import * - +from miasm2.jitter.jitload import vm_load_elf, libimp, preload_elf +from miasm2.analysis.machine import Machine parser = ArgumentParser( description="""Sandbox an elf binary with arm engine @@ -30,11 +29,11 @@ parser.add_argument("binary", parser.add_argument("addr", help="start exec on addr") - +machine = Machine("arm") def jit_arm_binary(args): filepath, entryp = args.binary, int(args.addr, 16) - myjit = jitter_arm(jit_type = args.jitter) + myjit = machine.jitter(jit_type = args.jitter) myjit.init_stack() # Log level (if available with jitter engine) diff --git a/example/test_jit_x86_32.py b/example/test_jit_x86_32.py index 158c0685..977b90fe 100644 --- a/example/test_jit_x86_32.py +++ b/example/test_jit_x86_32.py @@ -1,10 +1,9 @@ import sys import os from argparse import ArgumentParser -from miasm2.arch.x86.arch import mn_x86 -from miasm2.jitter.jitload import jitter_x86_32 from miasm2.jitter.jitload import bin_stream_vm from miasm2.jitter.csts import * +from miasm2.analysis.machine import Machine from pdb import pm @@ -25,7 +24,8 @@ def code_sentinelle(jitter): jitter.pc = 0 return True -myjit = jitter_x86_32(args.jitter) + +myjit = Machine("x86_32").jitter(args.jitter) myjit.init_stack() data = open(args.filename).read() |