Merge commit '271b4ccde44e491f7daae3a097e3345d9a856c0d' into evmjit

evmjit/.gitignore

@@ -0,0 +1 @@
+/build/

evmjit/CMakeLists.txt

@@ -4,8 +4,17 @@ project(evmjit)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+else ()
+	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unknown-pragmas -Wextra")
+endif()
+
+if(APPLE)
+	set(CMAKE_SHARED_LINKER_FLAGS "-undefined dynamic_lookup")
+endif()
+
 # LLVM
-if(LLVM_DIR)	# local LLVM build
+if(LLVM_DIR OR APPLE)	# local LLVM build
 	find_package(LLVM REQUIRED CONFIG)
 	message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 	message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
@@ -18,11 +27,19 @@ else()
 	execute_process(COMMAND llvm-config-3.5 --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS)
 	message(STATUS "LLVM include dirs: ${LLVM_INCLUDE_DIRS}")
 	set(LLVM_LIBS "-lLLVMBitWriter -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMX86AsmParser -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMMCJIT -lLLVMTarget -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser -lLLVMBitReader -lLLVMExecutionEngine -lLLVMMC -lLLVMCore -lLLVMSupport -lz -lpthread -lffi -ltinfo -ldl -lm")
+	add_definitions(-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS)
+	link_directories(/usr/lib/llvm-3.5/lib)
 endif()
 
 # Boost
 find_package(Boost REQUIRED)
 
 add_subdirectory(libevmjit)
-add_subdirectory(libevmjit-cpp)
-add_subdirectory(evmcc)
+
+if(EVMJIT_CPP)
+	add_subdirectory(libevmjit-cpp)
+endif()
+
+if(EVMJIT_TOOLS)
+	add_subdirectory(evmcc)
+endif()

evmjit/libevmjit/CMakeLists.txt

@@ -2,15 +2,16 @@ set(TARGET_NAME evmjit)
 
 file(GLOB SOURCES "*.cpp")
 file(GLOB HEADERS "*.h")
+set(INTERFACE_HEADERS interface.h)
 source_group("" FILES ${HEADERS})
 source_group("" FILES ${SOURCES})
 
 if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 	# Disable rtti for Cache as LLVM has no rtti
 	set_source_files_properties(Cache.cpp PROPERTIES COMPILE_FLAGS -fno-rtti)
-endif ()
+endif()
 
-add_library(${TARGET_NAME} ${SOURCES} ${HEADERS})
+add_library(${TARGET_NAME} SHARED ${SOURCES} ${HEADERS})
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "libs")
 
 include_directories(${LLVM_INCLUDE_DIRS})
@@ -20,5 +21,5 @@ target_link_libraries(${TARGET_NAME} ${LLVM_LIBS})
 
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 
-#install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
-#install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
+install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION lib)
+install(FILES ${INTERFACE_HEADERS} DESTINATION include/${TARGET_NAME})

evmjit/libevmjit/ExecutionEngine.cpp

@@ -49,7 +49,7 @@ ReturnCode runEntryFunc(EntryFuncPtr _mainFunc, Runtime* _runtime)
 
 std::string codeHash(bytes const& _code)
 {
-	std::array<dev::eth::jit::byte, 32> binHash;
+	std::array<byte, 32> binHash;
 	env_sha3(_code.data(), _code.size(), &binHash);
 
 	std::ostringstream os;

evmjit/libevmjit/interface.cpp

@@ -0,0 +1,34 @@
+#include "interface.h"
+#include <cstdio>
+#include "ExecutionEngine.h"
+
+extern "C"
+{
+
+evmjit_result evmjit_run(void* _data, void* _env)
+{
+	using namespace dev::eth::jit;
+
+	auto data = static_cast<RuntimeData*>(_data);
+
+	ExecutionEngine engine;
+
+	auto codePtr = data->code;
+	auto codeSize = data->elems[RuntimeData::CodeSize].a;
+	bytes bytecode;
+	bytecode.insert(bytecode.end(), codePtr, codePtr + codeSize);
+
+	auto returnCode = engine.run(bytecode, data, static_cast<Env*>(_env));
+	evmjit_result result = {static_cast<int32_t>(returnCode), 0, nullptr};
+	if (returnCode == ReturnCode::Return && !engine.returnData.empty())
+	{
+		// TODO: Optimized returning data. Allocating memory on client side by callback function might be a good idea
+		result.returnDataSize = engine.returnData.size();
+		result.returnData = std::malloc(result.returnDataSize);
+		std::memcpy(result.returnData, engine.returnData.data(), result.returnDataSize);
+	}
+
+	return result;
+}
+
+}

evmjit/libevmjit/interface.c → evmjit/libevmjit/interface.h

@@ -1,5 +1,20 @@
+#include <stddef.h>
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct evmjit_result
+{
+	int32_t  returnCode;
+	uint64_t returnDataSize;
+	void*    returnData;
+
+} evmjit_result;
+
+evmjit_result evmjit_run(void* _data, void* _env);
+
 // JIT object opaque type
 typedef struct evm_jit evm_jit;
 
@@ -9,6 +24,11 @@ typedef int evm_jit_return_code;
 // Host-endian 256-bit integer type
 typedef struct i256 i256;
 
+struct i256
+{
+	char b[33];
+};
+
 // Big-endian right aligned 256-bit hash
 typedef struct h256 h256;
 
@@ -28,3 +48,7 @@ evm_jit_return_code evm_jit_execute(evm_jit* _jit);
 void evm_jit_get_return_data(evm_jit* _jit, char* _return_data_offset, size_t* _return_data_size);
 
 void evm_jit_destroy(evm_jit* _jit);
+
+#ifdef __cplusplus
+}
+#endif