diff options
| author | Camille Mougey <commial@gmail.com> | 2018-07-13 16:02:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 16:02:36 +0200 |
| commit | 4a1dc7ab1796f5aecb35c2e4633b08f68ab21cef (patch) | |
| tree | 399532846345e1aeccf7f9d1cffa1fb3956e15f7 | |
| parent | f6c74ba4178768398aa15ebc234875205ee80318 (diff) | |
| parent | 842fce6f09dbc81e83502c7f8c23a365382f80cc (diff) | |
| download | miasm-4a1dc7ab1796f5aecb35c2e4633b08f68ab21cef.tar.gz miasm-4a1dc7ab1796f5aecb35c2e4633b08f68ab21cef.zip | |
Merge pull request #799 from serpilliere/fix_mep_jit_import
Jitter: skip jit import on minimal install
| -rw-r--r-- | miasm2/analysis/machine.py | 16 |
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: |