From a993473c6e2b4225c629eeb88eae98f7ee655333 Mon Sep 17 00:00:00 2001
From: Ajax <commial@gmail.com>
Date: Wed, 23 Dec 2015 16:37:16 +0100
Subject: Ugly modification to have llvm work again

---
 test/test_all.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'test/test_all.py')

diff --git a/test/test_all.py b/test/test_all.py
index 62f1cd4b..78e97be1 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -55,7 +55,7 @@ class ArchUnitTest(RegressionTest):
 
 # script -> blacklisted jitter
 blacklist = {
-    "x86/unit/mn_float.py": ["python"],
+    "x86/unit/mn_float.py": ["python", "llvm"],
 }
 for script in ["x86/sem.py",
                "x86/unit/mn_strings.py",
@@ -684,7 +684,7 @@ By default, no tag is omitted." % ", ".join(TAGS.keys()), default="")
     # Handle llvm modularity
     llvm = True
     try:
-        import llvm
+        import llvmlite
     except ImportError:
         llvm = False
 
@@ -695,9 +695,6 @@ By default, no tag is omitted." % ", ".join(TAGS.keys()), default="")
     except ImportError:
         tcc = False
 
-    # TODO XXX: fix llvm jitter (deactivated for the moment)
-    llvm = False
-
     if llvm is False:
         print "%(red)s[LLVM]%(end)s Python" % cosmetics.colors + \
             "'py-llvm 3.2' module is required for llvm tests"
-- 
cgit 1.4.1


From c1c6774744766fbe82587ebade91e13e2bfc9f9b Mon Sep 17 00:00:00 2001
From: Ajax <commial@gmail.com>
Date: Fri, 16 Dec 2016 21:58:00 +0100
Subject: Update documentation for llvmlite

---
 README.md                    | 8 ++++----
 miasm2/jitter/llvmconvert.py | 2 +-
 test/test_all.py             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'test/test_all.py')

diff --git a/README.md b/README.md
index 3d0dda88..a57ef87f 100644
--- a/README.md
+++ b/README.md
@@ -454,7 +454,7 @@ Miasm uses:
 To enable code JIT, one of the following module is mandatory:
 * GCC
 * Clang
-* LLVM v3.2 with python-llvm, see below
+* LLVM with Numba llvmlite, see below
 * LibTCC [tinycc (ONLY version 0.9.26)](http://repo.or.cz/w/tinycc.git)
 
 'optional' Miasm can also use:
@@ -483,9 +483,9 @@ To use the jitter, GCC, TCC or LLVM is recommended
   * `sudo make install`
   * There may be an error on documentation generation
 * LLVM
-  * Debian (testing/unstable): install python-llvm
-  * Debian stable/Ubuntu/Kali/whatever: install from [llvmpy](http://www.llvmpy.org/)
-  * Windows: python-llvm is not supported :/
+  * Debian (testing/unstable): Not tested
+  * Debian stable/Ubuntu/Kali/whatever: `pip install llvmlite` or install from [llvmlite](https://github.com/numba/llvmlite)
+  * Windows: Not tested
 * Build and install Miasm:
 ```
 $ cd miasm_directory
diff --git a/miasm2/jitter/llvmconvert.py b/miasm2/jitter/llvmconvert.py
index 0d9ab356..db451b0e 100644
--- a/miasm2/jitter/llvmconvert.py
+++ b/miasm2/jitter/llvmconvert.py
@@ -5,7 +5,7 @@
 # - JiT                                                                        #
 #
 # Requires:                                                                    #
-# - llvmpy (tested on v0.11.2)                                                 #
+# - llvmlite (tested on v0.15)                                                 #
 #
 # Authors : Fabrice DESCLAUX (CEA/DAM), Camille MOUGEY (CEA/DAM)               #
 #
diff --git a/test/test_all.py b/test/test_all.py
index 78e97be1..7cc8f6eb 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -697,7 +697,7 @@ By default, no tag is omitted." % ", ".join(TAGS.keys()), default="")
 
     if llvm is False:
         print "%(red)s[LLVM]%(end)s Python" % cosmetics.colors + \
-            "'py-llvm 3.2' module is required for llvm tests"
+            "'llvmlite' module is required for llvm tests"
 
         # Remove llvm tests
         if TAGS["llvm"] not in exclude_tags:
-- 
cgit 1.4.1