about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorFabrice Desclaux <fabrice.desclaux@cea.fr>2018-07-13 13:21:11 +0200
committerFabrice Desclaux <fabrice.desclaux@cea.fr>2018-07-13 13:21:11 +0200
commit842fce6f09dbc81e83502c7f8c23a365382f80cc (patch)
treeaaeba3c37d31e1cd2550ea83ddc0c28bfbb4d926
parentcc9c0c70af3a91157226440ae3b64199711ee0db (diff)
downloadmiasm-842fce6f09dbc81e83502c7f8c23a365382f80cc.tar.gz
miasm-842fce6f09dbc81e83502c7f8c23a365382f80cc.zip
Jitter: skip jit import on minimal install
-rw-r--r--miasm2/analysis/machine.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/miasm2/analysis/machine.py b/miasm2/analysis/machine.py
index 03d19503..7b24328a 100644
--- a/miasm2/analysis/machine.py
+++ b/miasm2/analysis/machine.py
@@ -180,16 +180,24 @@ class Machine(object):
             from miasm2.arch.ppc.sem import ir_ppc32b as ir
         elif machine_name == "mepb":
             from miasm2.arch.mep.disasm import dis_mepb as dis_engine
-            from miasm2.arch.mep import arch, jit
+            from miasm2.arch.mep import arch
+            try:
+                from miasm2.arch.mep import jit
+                jitter = jit.jitter_mepb
+            except ImportError:
+                pass
             mn = arch.mn_mep
-            jitter = jit.jitter_mepb
             from miasm2.arch.mep.ira import ir_a_mepb as ira
             from miasm2.arch.mep.sem import ir_mepb as ir
         elif machine_name == "mepl":
             from miasm2.arch.mep.disasm import dis_mepl as dis_engine
-            from miasm2.arch.mep import arch, jit
+            from miasm2.arch.mep import arch
+            try:
+                from miasm2.arch.mep import jit
+                jitter = jit.jitter_mepl
+            except ImportError:
+                pass
             mn = arch.mn_mep
-            jitter = jit.jitter_mepl
             from miasm2.arch.mep.ira import ir_a_mepl as ira
             from miasm2.arch.mep.sem import ir_mepl as ir
         else: