about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCamille Mougey <commial@gmail.com>2014-12-03 11:15:07 +0100
committerCamille Mougey <commial@gmail.com>2014-12-03 11:15:07 +0100
commitc5aa711745449cabd5bc0171ad0ed56b8d3a6881 (patch)
tree6506eef180f0b566608883fb10a473855b360846
parentd68ce6faeaedb4081b4f7dc6a32131c843e411de (diff)
parentfee29de04d3b2cb91450088d655fc36968777f90 (diff)
downloadmiasm-c5aa711745449cabd5bc0171ad0ed56b8d3a6881.tar.gz
miasm-c5aa711745449cabd5bc0171ad0ed56b8d3a6881.zip
Merge pull request #8 from serpilliere/fix_tcc_dep
Fix tcc dep
Diffstat (limited to '')
-rw-r--r--miasm2/jitter/jitcore_llvm.py5
-rw-r--r--miasm2/jitter/jitload.py19
2 files changed, 17 insertions, 7 deletions
diff --git a/miasm2/jitter/jitcore_llvm.py b/miasm2/jitter/jitcore_llvm.py
index 9d139550..2b828c80 100644
--- a/miasm2/jitter/jitcore_llvm.py
+++ b/miasm2/jitter/jitcore_llvm.py
@@ -1,10 +1,7 @@
 import os
 import importlib
 import hashlib
-try:
-    from llvmconvert import *
-except ImportError:
-    pass
+from llvmconvert import *
 import jitcore
 import Jitllvm
 
diff --git a/miasm2/jitter/jitload.py b/miasm2/jitter/jitload.py
index e3b7e8d9..72e7eae7 100644
--- a/miasm2/jitter/jitload.py
+++ b/miasm2/jitter/jitload.py
@@ -10,9 +10,6 @@ from elfesteem import *
 
 from csts import *
 from miasm2.core.utils import *
-from jitcore_tcc import JitCore_Tcc
-from jitcore_llvm import JitCore_LLVM
-from jitcore_python import JitCore_Python
 from miasm2.core.bin_stream import bin_stream
 
 from miasm2.ir.ir2C import init_arch_C
@@ -27,6 +24,22 @@ hnd.setFormatter(logging.Formatter("[%(levelname)s]: %(message)s"))
 log.addHandler(hnd)
 log.setLevel(logging.CRITICAL)
 
+try:
+    from jitcore_tcc import JitCore_Tcc
+except ImportError:
+    log.error('cannot import jit tcc')
+
+try:
+    from jitcore_llvm import JitCore_LLVM
+except ImportError:
+    log.error('cannot import jit llvm')
+
+try:
+    from jitcore_python import JitCore_Python
+except ImportError:
+    log.error('cannot import jit python')
+
+
 def whoami():
     return inspect.stack()[2][3]