Merge branch 'develop' into evmjit-develop

Conflicts:
	evmjit/include/evmjit/JIT.h
	evmjit/libevmjit-cpp/Env.cpp
	evmjit/libevmjit-cpp/JitVM.h
	evmjit/libevmjit/ExecutionEngine.cpp
	evmjit/libevmjit/JIT.cpp

CMakeLists.txt

@@ -7,7 +7,7 @@ set(CMAKE_AUTOMOC OFF)
 
 if(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
 else()
-	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wconversion -Wno-sign-conversion -Wno-unknown-pragmas")
+	set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -Wconversion -Wno-sign-conversion -Wno-unknown-pragmas ${CMAKE_CXX_FLAGS}")
 endif()
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

libevmjit-cpp/Env.cpp

@@ -1,6 +1,6 @@
 
 #pragma GCC diagnostic ignored "-Wconversion"
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libevmcore/Params.h>
 #include <libevm/ExtVMFace.h>
 
@@ -63,19 +63,24 @@ extern "C"
 
 	EXPORT bool env_call(ExtVMFace* _env, int64_t* io_gas, int64_t _callGas, h256* _receiveAddress, i256* _value, byte* _inBeg, uint64_t _inSize, byte* _outBeg, uint64_t _outSize, h256* _codeAddress)
 	{
-		auto value = jit2eth(*_value);
-		auto receiveAddress = right160(*_receiveAddress);
-		auto codeAddress = right160(*_codeAddress);
-		const auto isCall = receiveAddress == codeAddress; // OPT: The same address pointer can be used if not CODECALL
+		CallParameters params;
+		params.value = jit2eth(*_value);
+		params.senderAddress = _env->myAddress;
+		params.receiveAddress = right160(*_receiveAddress);
+		params.codeAddress = right160(*_codeAddress);
+		params.data = {_inBeg, _inSize};
+		params.out = {_outBeg, _outSize};
+		params.onOp = {};
+		const auto isCall = params.receiveAddress == params.codeAddress; // OPT: The same address pointer can be used if not CODECALL
 
 		*io_gas -= _callGas;
 		if (*io_gas < 0)
 			return false;
 
-		if (isCall && !_env->exists(receiveAddress))
+		if (isCall && !_env->exists(params.receiveAddress))
 			*io_gas -= static_cast<int64_t>(c_callNewAccountGas); // no underflow, *io_gas non-negative before
 
-		if (value > 0) // value transfer
+		if (params.value > 0) // value transfer
 		{
 			/*static*/ assert(c_callValueTransferGas > c_callStipend && "Overflow possible");
 			*io_gas -= static_cast<int64_t>(c_callValueTransferGas); // no underflow
@@ -86,11 +91,11 @@ extern "C"
 			return false;
 
 		auto ret = false;
-		auto callGas = u256{_callGas};
-		if (_env->balance(_env->myAddress) >= value && _env->depth < 1024)
-			ret = _env->call(receiveAddress, value, {_inBeg, _inSize}, callGas, {_outBeg, _outSize}, {}, {}, codeAddress);
+		params.gas = u256{_callGas};
+		if (_env->balance(_env->myAddress) >= params.value && _env->depth < 1024)
+			ret = _env->call(params);
 
-		*io_gas += static_cast<int64_t>(callGas); // it is never more than initial _callGas
+		*io_gas += static_cast<int64_t>(params.gas); // it is never more than initial _callGas
 		return ret;
 	}
 

libevmjit-cpp/JitVM.cpp

@@ -4,7 +4,7 @@
 #include "JitVM.h"
 
 #include <libdevcore/Log.h>
-#include <libdevcrypto/SHA3.h>
+#include <libdevcore/SHA3.h>
 #include <libevm/VM.h>
 #include <libevm/VMFactory.h>
 

libevmjit-cpp/JitVM.h

@@ -12,10 +12,14 @@ class JitVM: public VMFace
 {
 	virtual bytesConstRef go(ExtVMFace& _ext, OnOpFunc const& _onOp = {}, uint64_t _steps = (uint64_t)-1) override final;
 
+	virtual u256 gas() const noexcept { return m_gas; }
+	virtual void reset(u256 const& _gas = 0) noexcept { m_gas = _gas; }
+
 private:
 	friend class VMFactory;
-	explicit JitVM(u256 _gas = 0) : VMFace(_gas) {}
+	explicit JitVM(u256 _gas = 0): m_gas(_gas) {}
 
+	u256 m_gas;
 	evmjit::RuntimeData m_data;
 	evmjit::ExecutionContext m_context;
 	std::unique_ptr<VMFace> m_fallbackVM; ///< VM used in case of input data rejected by JIT