Fixing gcc jitting on windows and adding msvc jitting support

miasm/jitter/jitcore_cc_base.py

@@ -75,7 +75,7 @@ def load(self):
         lib_dir = os.path.dirname(os.path.realpath(__file__))
         ext = sysconfig.get_config_var('EXT_SUFFIX')
         if ext is None:
-            ext = ".so" if not is_win else ".lib"
+            ext = self._get_ext()
 
         libs = [
             os.path.join(lib_dir, "VmMngr" + ext),
@@ -119,3 +119,6 @@ def gen_c_code(self, block):
     @staticmethod
     def gen_C_source(ir_arch, func_code):
         raise NotImplementedError()
+
+    def _get_ext(self):
+        raise NotImplementedError()

miasm/jitter/jitcore_gcc.py

@@ -64,50 +64,16 @@ def add_block(self, block):
 
             inc_dir = ["-I%s" % inc for inc in self.include_files]
             libs = ["%s" % lib for lib in self.libs]
-            if is_win:
-                libs.append(
-                    os.path.join(
-                        get_python_inc(),
-                        "..",
-                        "libs",
-                        "python27.lib"
-                    )
-                )
-                cl = [
-                    "cl", "/nologo", "/W3", "/MP",
-                    "/Od", "/DNDEBUG", "/D_WINDOWS", "/Gm-", "/EHsc",
-                    "/RTC1", "/MD", "/GS",
-                    fname_in
-                ] + inc_dir + libs
-                cl += ["/link", "/DLL", "/OUT:" + fname_tmp]
-                out_dir, _ = os.path.split(fname_tmp)
-                check_call(cl, cwd = out_dir)
-                basename_out, _ = os.path.splitext(fname_tmp)
-                basename_in, _ = os.path.splitext(os.path.basename(fname_in))
-                for ext in ('.obj', '.exp', '.lib'):
-                    artifact_out_path = os.path.join(
-                        out_dir,
-                        basename_out + ext
-                    )
-                    if os.path.isfile(artifact_out_path):
-                        os.remove(artifact_out_path)
-                    artifact_in_path = os.path.join(
-                        out_dir,
-                        basename_in + ext
-                    )
-                    if os.path.isfile(artifact_in_path):
-                        os.remove(artifact_in_path)
-            else:
-                args = [
-                    "cc",
-                    "-O3",
-                    "-shared",
-                    "-fPIC",
-                    fname_in,
-                    "-o",
-                    fname_tmp
-                ] + inc_dir + libs
-                check_call(args)
+            args = [
+                "cc" if not is_win else "gcc",
+                "-O3",
+                "-shared",
+                "-fPIC",
+                fname_in,
+                "-o",
+                fname_tmp
+            ] + inc_dir + libs
+            check_call(args)
 
             # Move temporary file to final file
             try:
@@ -139,3 +105,6 @@ def gen_C_source(ir_arch, func_code):
         c_source = gen_core(ir_arch.arch, ir_arch.attrib) + c_source
         c_source = "#define PARITY_IMPORT\n#include <Python.h>\n" + c_source
         return c_source
+
+    def _get_ext(self):
+        return ".so" if not is_win else ".pyd"

miasm/jitter/jitcore_msvc.py

@@ -0,0 +1,127 @@
+#-*- coding:utf-8 -*-
+
+import os
+import tempfile
+import ctypes
+import _ctypes
+import platform
+import sysconfig
+from subprocess import check_call
+from distutils.sysconfig import get_python_inc
+from miasm.jitter import Jitgcc
+from miasm.jitter.jitcore_cc_base import JitCore_Cc_Base, gen_core
+
+class JitCore_MSVC(JitCore_Cc_Base):
+    "JiT management, using a C compiler as backend"
+
+    def __init__(self, ir_arch, bin_stream):
+        super(JitCore_MSVC, self).__init__(ir_arch, bin_stream)
+        self.exec_wrapper = Jitgcc.gcc_exec_block
+
+    def deleteCB(self, offset):
+        """Free the state associated to @offset and delete it
+        @offset: msvc state offset
+        """
+        flib = None
+        flib = _ctypes.FreeLibrary
+        flib(self.states[offset]._handle)
+        del self.states[offset]
+
+    def load_code(self, label, fname_so):
+        lib = ctypes.cdll.LoadLibrary(fname_so)
+        func = getattr(lib, self.FUNCNAME)
+        addr = ctypes.cast(func, ctypes.c_void_p).value
+        offset = self.ir_arch.loc_db.get_location_offset(label)
+        self.offset_to_jitted_func[offset] = addr
+        self.states[offset] = lib
+
+    def add_block(self, block):
+        """Add a bloc to JiT and JiT it.
+        @block: block to jit
+        """
+        block_hash = self.hash_block(block)
+        ext = sysconfig.get_config_var('EXT_SUFFIX')
+        if ext is None:
+            ext = ".pyd"
+        fname_out = os.path.join(self.tempdir, "%s%s" % (block_hash, ext))
+
+        if not os.access(fname_out, os.R_OK | os.X_OK):
+            func_code = self.gen_c_code(block)
+
+            # Create unique C file
+            fdesc, fname_in = tempfile.mkstemp(suffix=".c")
+            os.write(fdesc, func_code.encode())
+            os.close(fdesc)
+
+            # Create unique SO file
+            fdesc, fname_tmp = tempfile.mkstemp(suffix=ext)
+            os.close(fdesc)
+
+            inc_dir = ["-I%s" % inc for inc in self.include_files]
+            libs = ["%s" % lib for lib in self.libs]
+            libs.append(
+                os.path.join(
+                    get_python_inc(),
+                    "..",
+                    "libs",
+                    "python27.lib"
+                )
+            )
+            cl = [
+                "cl", "/nologo", "/W3", "/MP",
+                "/Od", "/DNDEBUG", "/D_WINDOWS", "/Gm-", "/EHsc",
+                "/RTC1", "/MD", "/GS",
+                fname_in
+            ] + inc_dir + libs
+            cl += ["/link", "/DLL", "/OUT:" + fname_tmp]
+            out_dir, _ = os.path.split(fname_tmp)
+            check_call(cl, cwd = out_dir)
+            basename_out, _ = os.path.splitext(fname_tmp)
+            basename_in, _ = os.path.splitext(os.path.basename(fname_in))
+            for ext in ('.obj', '.exp', '.lib'):
+                artifact_out_path = os.path.join(
+                    out_dir,
+                    basename_out + ext
+                )
+                if os.path.isfile(artifact_out_path):
+                    os.remove(artifact_out_path)
+                artifact_in_path = os.path.join(
+                    out_dir,
+                    basename_in + ext
+                )
+                if os.path.isfile(artifact_in_path):
+                    os.remove(artifact_in_path)
+
+            # Move temporary file to final file
+            try:
+                os.rename(fname_tmp, fname_out)
+            except WindowsError as e:
+                # On Windows, os.rename works slightly differently than on
+                # Linux; quoting the documentation:
+                # "On Unix, if dst exists and is a file, it will be replaced
+                # silently if the user has permission.  The operation may fail
+                # on some Unix flavors if src and dst are on different
+                # filesystems.  If successful, the renaming will be an atomic
+                # operation (this is a POSIX requirement).  On Windows, if dst
+                # already exists, OSError will be raised even if it is a file;
+                # there may be no way to implement an atomic rename when dst
+                # names an existing file."
+                # [Error 183] Cannot create a file when that file already exists
+                if e.winerror != 183:
+                    raise
+                os.remove(fname_tmp)
+            os.remove(fname_in)
+
+        self.load_code(block.loc_key, fname_out)
+
+    @staticmethod
+    def gen_C_source(ir_arch, func_code):
+        c_source = ""
+        c_source += "\n".join(func_code)
+
+        c_source = gen_core(ir_arch.arch, ir_arch.attrib) + c_source
+        c_source = "#define PARITY_IMPORT\n#include <Python.h>\n" + c_source
+        return c_source
+
+    def _get_ext(self):
+        return ".lib"

miasm/jitter/jitload.py

@@ -181,6 +181,7 @@ def __init__(self, ir_arch, jit_type="gcc"):
         @jit_type: JiT backend to use. Available options are:
             - "gcc"
             - "llvm"
+            - "msvc"
             - "python"
         """
 
@@ -229,6 +230,8 @@ def __init__(self, ir_arch, jit_type="gcc"):
                 from miasm.jitter.jitcore_python import JitCore_Python as JitCore
             elif jit_type == "gcc":
                 from miasm.jitter.jitcore_gcc import JitCore_Gcc as JitCore
+            elif jit_type == "msvc":
+                from miasm.jitter.jitcore_msvc import JitCore_MSVC as JitCore
             else:
                 raise ValueError("Unknown jitter %s" % jit_type)
         except ImportError: