From 064c129afcbd3677c12396806404988bf1b30b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel.bylica@imapp.pl>
Date: Wed, 28 Jan 2015 17:03:50 +0100
Subject: [PATCH] Windows fixes: DLL exports and cmake options

---
 evmjit/CMakeLists.txt              |  2 +-
 evmjit/libevmjit/CMakeLists.txt    |  2 +-
 evmjit/libevmjit/Common.h          |  7 +++
 evmjit/libevmjit/ExecutionEngine.h |  2 +-
 evmjit/libevmjit/Runtime.h         | 98 ++++++++++++++----------------
 evmjit/libevmjit/interface.cpp     | 11 +++-
 6 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/evmjit/CMakeLists.txt b/evmjit/CMakeLists.txt
index 4888de523..a449f9a60 100644
--- a/evmjit/CMakeLists.txt
+++ b/evmjit/CMakeLists.txt
@@ -4,7 +4,7 @@ project(evmjit)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 else()
 	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra -fPIC")
 endif()
diff --git a/evmjit/libevmjit/CMakeLists.txt b/evmjit/libevmjit/CMakeLists.txt
index 7423b873b..0053bbf62 100644
--- a/evmjit/libevmjit/CMakeLists.txt
+++ b/evmjit/libevmjit/CMakeLists.txt
@@ -20,5 +20,5 @@ target_link_libraries(${TARGET_NAME} PRIVATE ${LLVM_LIBS})
 
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 
-install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION lib)
+install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
 #install(FILES ${INTERFACE_HEADERS} DESTINATION include/${TARGET_NAME})
diff --git a/evmjit/libevmjit/Common.h b/evmjit/libevmjit/Common.h
index 175cd1bcd..7383b9f93 100644
--- a/evmjit/libevmjit/Common.h
+++ b/evmjit/libevmjit/Common.h
@@ -2,6 +2,13 @@
 
 #include <vector>
 #include <tuple>
+#include <cstdint>
+
+#ifdef _MSC_VER
+#define EXPORT __declspec(dllexport)
+#else
+#define EXPORT
+#endif
 
 namespace dev
 {
diff --git a/evmjit/libevmjit/ExecutionEngine.h b/evmjit/libevmjit/ExecutionEngine.h
index 52e3b29fa..e8d1e1c05 100644
--- a/evmjit/libevmjit/ExecutionEngine.h
+++ b/evmjit/libevmjit/ExecutionEngine.h
@@ -16,7 +16,7 @@ public:
 	ExecutionEngine(ExecutionEngine const&) = delete;
 	void operator=(ExecutionEngine) = delete;
 
-	ReturnCode run(bytes const& _code, RuntimeData* _data, Env* _env);
+	EXPORT ReturnCode run(bytes const& _code, RuntimeData* _data, Env* _env);
 
 	/// Reference to returned data (RETURN opcode used)
 	bytes_ref returnData;
diff --git a/evmjit/libevmjit/Runtime.h b/evmjit/libevmjit/Runtime.h
index df1bde7fd..20cf56984 100644
--- a/evmjit/libevmjit/Runtime.h
+++ b/evmjit/libevmjit/Runtime.h
@@ -1,52 +1,46 @@
-
-#pragma once
-
-#include <csetjmp>
-#include "RuntimeData.h"
-
-#ifdef _MSC_VER
-	#define EXPORT __declspec(dllexport)
-#else
-	#define EXPORT
-#endif
-
-namespace dev
-{
-namespace eth
-{
-namespace jit
-{
-
-using StackImpl = std::vector<i256>;
-using MemoryImpl = bytes;
-using jmp_buf_ref = decltype(&std::jmp_buf{}[0]);
-
-class Runtime
-{
-public:
-	Runtime(RuntimeData* _data, Env* _env);
-
-	Runtime(const Runtime&) = delete;
-	Runtime& operator=(const Runtime&) = delete;
-
-	StackImpl& getStack() { return m_stack; }
-	MemoryImpl& getMemory() { return m_memory; }
-	Env* getEnvPtr() { return &m_env; }
-
-	bytes_ref getReturnData() const;
-	jmp_buf_ref getJmpBuf() { return m_jmpBuf; }
-
-private:
-	RuntimeData& m_data;		///< Pointer to data. Expected by compiled contract.
-	Env& m_env;					///< Pointer to environment proxy. Expected by compiled contract.
-	jmp_buf_ref m_currJmpBuf;	///< Pointer to jump buffer. Expected by compiled contract.
-	byte* m_memoryData = nullptr;
-	i256 m_memorySize;
-	std::jmp_buf m_jmpBuf;
-	StackImpl m_stack;
-	MemoryImpl m_memory;
-};
-
-}
-}
-}
+
+#pragma once
+
+#include <csetjmp>
+#include "RuntimeData.h"
+
+namespace dev
+{
+namespace eth
+{
+namespace jit
+{
+
+using StackImpl = std::vector<i256>;
+using MemoryImpl = bytes;
+using jmp_buf_ref = decltype(&std::jmp_buf{}[0]);
+
+class Runtime
+{
+public:
+	Runtime(RuntimeData* _data, Env* _env);
+
+	Runtime(const Runtime&) = delete;
+	Runtime& operator=(const Runtime&) = delete;
+
+	StackImpl& getStack() { return m_stack; }
+	MemoryImpl& getMemory() { return m_memory; }
+	Env* getEnvPtr() { return &m_env; }
+
+	bytes_ref getReturnData() const;
+	jmp_buf_ref getJmpBuf() { return m_jmpBuf; }
+
+private:
+	RuntimeData& m_data;		///< Pointer to data. Expected by compiled contract.
+	Env& m_env;					///< Pointer to environment proxy. Expected by compiled contract.
+	jmp_buf_ref m_currJmpBuf;	///< Pointer to jump buffer. Expected by compiled contract.
+	byte* m_memoryData = nullptr;
+	i256 m_memorySize;
+	std::jmp_buf m_jmpBuf;
+	StackImpl m_stack;
+	MemoryImpl m_memory;
+};
+
+}
+}
+}
diff --git a/evmjit/libevmjit/interface.cpp b/evmjit/libevmjit/interface.cpp
index 506647d13..6b0992dd4 100644
--- a/evmjit/libevmjit/interface.cpp
+++ b/evmjit/libevmjit/interface.cpp
@@ -5,17 +5,22 @@ extern "C"
 
 using namespace dev::eth::jit;
 
-void* evmjit_create() noexcept
+#ifdef _MSC_VER
+#define _ALLOW_KEYWORD_MACROS
+#define noexcept throw()
+#endif
+
+EXPORT void* evmjit_create() noexcept
 {
 	return new(std::nothrow) ExecutionEngine;
 }
 
-void evmjit_destroy(ExecutionEngine* _engine) noexcept
+EXPORT void evmjit_destroy(ExecutionEngine* _engine) noexcept
 {
 	delete _engine;
 }
 
-int evmjit_run(ExecutionEngine* _engine, RuntimeData* _data, Env* _env) noexcept
+EXPORT int evmjit_run(ExecutionEngine* _engine, RuntimeData* _data, Env* _env) noexcept
 {
 	try
 	{