6 files changed, 13 insertions, 17 deletions
diff --git a/miasm2/jitter/jitcore.py b/miasm2/jitter/jitcore.py
index c025c956..f1e34870 100644
--- a/miasm2/jitter/jitcore.py
+++ b/miasm2/jitter/jitcore.py
@@ -17,7 +17,7 @@
 #
 from miasm2.core import asmbloc
 from miasm2.core.interval import interval
-from csts import *
+from miasm2.jitter.csts import *
 
 
 class JitCore(object):
diff --git a/miasm2/jitter/jitcore_llvm.py b/miasm2/jitter/jitcore_llvm.py
index 2b828c80..acf91d15 100644
--- a/miasm2/jitter/jitcore_llvm.py
+++ b/miasm2/jitter/jitcore_llvm.py
@@ -1,8 +1,8 @@
 import os
 import importlib
 import hashlib
-from llvmconvert import *
-import jitcore
+from miasm2.jitter.llvmconvert import *
+import miasm2.jitter.jitcore as jitcore
 import Jitllvm
 
 
diff --git a/miasm2/jitter/jitcore_tcc.py b/miasm2/jitter/jitcore_tcc.py
index dd49f635..46b46184 100644
--- a/miasm2/jitter/jitcore_tcc.py
+++ b/miasm2/jitter/jitcore_tcc.py
@@ -4,7 +4,7 @@
 import os
 from miasm2.ir.ir2C import irblocs2C
 from subprocess import Popen, PIPE
-import jitcore
+import miasm2.jitter.jitcore as jitcore
 from distutils.sysconfig import get_python_inc
 import Jittcc
 
diff --git a/miasm2/jitter/jitload.py b/miasm2/jitter/jitload.py
index 0405b46d..525cda09 100644
--- a/miasm2/jitter/jitload.py
+++ b/miasm2/jitter/jitload.py
@@ -1,8 +1,5 @@
 #!/usr/bin/env python
 
-import os
-from miasm2.core import asmbloc
-
 from miasm2.jitter.csts import *
 from miasm2.core.utils import *
 from miasm2.core.bin_stream import bin_stream_vm
@@ -17,17 +14,17 @@ log.addHandler(hnd)
 log.setLevel(logging.CRITICAL)
 
 try:
-    from jitcore_tcc import JitCore_Tcc
+    from miasm2.jitter.jitcore_tcc import JitCore_Tcc
 except ImportError:
     log.error('cannot import jit tcc')
 
 try:
-    from jitcore_llvm import JitCore_LLVM
+    from miasm2.jitter.jitcore_llvm import JitCore_LLVM
 except ImportError:
     log.error('cannot import jit llvm')
 
 try:
-    from jitcore_python import JitCore_Python
+    from miasm2.jitter.jitcore_python import JitCore_Python
 except ImportError:
     log.error('cannot import jit python')
 
@@ -143,13 +140,13 @@ class jitter:
         self.attrib = ir_arch.attrib
         arch_name = ir_arch.arch.name  # (ir_arch.arch.name, ir_arch.attrib)
         if arch_name == "x86":
-            from arch import JitCore_x86 as jcore
+            from miasm2.jitter.arch import JitCore_x86 as jcore
         elif arch_name == "arm":
-            from arch import JitCore_arm as jcore
+            from miasm2.jitter.arch import JitCore_arm as jcore
         elif arch_name == "msp430":
-            from arch import JitCore_msp430 as jcore
+            from miasm2.jitter.arch import JitCore_msp430 as jcore
         elif arch_name == "mips32":
-            from arch import JitCore_mips32 as jcore
+            from miasm2.jitter.arch import JitCore_mips32 as jcore
         else:
             raise ValueError("unsupported jit arch!")
 
diff --git a/miasm2/jitter/loader/elf.py b/miasm2/jitter/loader/elf.py
index 3fd08725..916b37c4 100644
--- a/miasm2/jitter/loader/elf.py
+++ b/miasm2/jitter/loader/elf.py
@@ -1,11 +1,10 @@
 import struct
 from collections import defaultdict
 
-from elfesteem import pe
 from elfesteem import cstruct
 from elfesteem import *
 from miasm2.jitter.csts import *
-from utils import canon_libname_libfunc, libimp
+from miasm2.jitter.loader.utils import canon_libname_libfunc, libimp
 from miasm2.core.interval import interval
 
 import logging
diff --git a/miasm2/jitter/loader/pe.py b/miasm2/jitter/loader/pe.py
index 0b63583d..f7e93c52 100644
--- a/miasm2/jitter/loader/pe.py
+++ b/miasm2/jitter/loader/pe.py
@@ -266,7 +266,7 @@ def vm2pe(myjit, fname, libs=None, e_orig=None,
                 libbase, dllname = libs.fad2info[funcaddr]
                 libs.lib_get_add_func(libbase, dllname, addr)
 
-        new_dll = libs.gen_new_lib(mye, lambda x: mye.virt.is_addr_in(x))
+        new_dll = libs.gen_new_lib(mye, mye.virt.is_addr_in)
     else:
         new_dll = {}