SIMD

.travis.yml

@@ -107,12 +107,12 @@ cache:
         # build external dependencies next build.
         - $TRAVIS_BUILD_DIR/deps
 install:
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then clang --version; brew install llvm; $(brew --prefix llvm)/bin/clang --version; export PATH=$(brew --prefix llvm)/bin:$PATH; export CC=$(brew --prefix llvm)/bin/clang; export CXX=$(brew --prefix llvm)/bin/clang++; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then clang --version; travis_wait 80 brew install llvm; $(brew --prefix llvm)/bin/clang --version; export PATH=$(brew --prefix llvm)/bin:$PATH; export CC=$(brew --prefix llvm)/bin/clang; export CXX=$(brew --prefix llvm)/bin/clang++; fi
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./scripts/install_cmake.sh; fi
     - ./scripts/install_deps.sh
 before_script:
     - ./scripts/prepare_ccache.sh
-    - ./scripts/build.sh $TRAVIS_BUILD_TYPE
+    - travis_wait 80 ./scripts/build.sh $TRAVIS_BUILD_TYPE
     - ./scripts/cleanup_ccache.sh
 script:
     - cd $TRAVIS_BUILD_DIR/build && ../scripts/tests.sh $TRAVIS_TESTS

cmake/ProjectBoost.cmake

@@ -23,7 +23,10 @@ ExternalProject_Add(boost
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ${BOOST_BOOTSTRAP_COMMAND}
     LOG_CONFIGURE 1
-    BUILD_COMMAND ${BOOST_BUILD_TOOL} stage
+    BUILD_COMMAND 
+        ${BOOST_BUILD_TOOL}
+        --ignore-site-config
+        stage
         ${BOOST_CXXFLAGS}
         threading=multi
         link=static

eth/main.cpp

@@ -336,7 +336,6 @@ int main(int argc, char** argv)
 
 	/// General params for Node operation
 	NodeMode nodeMode = NodeMode::Full;
-	bool interactive = false;
 
 	int jsonRPCURL = -1;
 	bool adminViaHttp = false;
@@ -616,56 +615,6 @@ int main(int argc, char** argv)
 			chainParams = ChainParams(genesisInfo(eth::Network::MainNetwork), genesisStateRoot(eth::Network::MainNetwork));
 		else if (arg == "--ropsten" || arg == "--testnet")
 			chainParams = ChainParams(genesisInfo(eth::Network::Ropsten), genesisStateRoot(eth::Network::Ropsten));
-		else if (arg == "--oppose-dao-fork")
-		{
-			chainParams = ChainParams(genesisInfo(eth::Network::MainNetwork), genesisStateRoot(eth::Network::MainNetwork));
-			chainParams.otherParams["daoHardforkBlock"] = toHex(u256(-1) - 10, HexPrefix::Add);
-		}
-		else if (arg == "--support-dao-fork")
-		{
-			// default
-		}
-		else if (arg == "--bob")
-		{
-			cout << "Asking Bob for blocks (this should work in theoreum)..." << endl;
-			while (true)
-			{
-				u256 x(h256::random());
-				u256 c;
-				for (; x != 1; ++c)
-				{
-					x = (x & 1) == 0 ? x / 2 : 3 * x + 1;
-					cout << toHex(x) << endl;
-					this_thread::sleep_for(chrono::seconds(1));
-				}
-				cout << "Block number: " << hex << c << endl;
-				exit(0);
-			}
-		}
-/*		else if ((arg == "-B" || arg == "--block-fees") && i + 1 < argc)
-		{
-			try
-			{
-				blockFees = stof(argv[++i]);
-			}
-			catch (...)
-			{
-				cerr << "Bad " << arg << " option: " << argv[i] << endl;
-				return -1;
-			}
-		}
-		else if ((arg == "-e" || arg == "--ether-price") && i + 1 < argc)
-		{
-			try
-			{
-				etherPrice = stof(argv[++i]);
-			}
-			catch (...)
-			{
-				cerr << "Bad " << arg << " option: " << argv[i] << endl;
-				return -1;
-			}
-		}*/
 		else if (arg == "--ask" && i + 1 < argc)
 		{
 			try
@@ -690,28 +639,6 @@ int main(int argc, char** argv)
 				return -1;
 			}
 		}
-/*		else if ((arg == "-P" || arg == "--priority") && i + 1 < argc)
-		{
-			string m = boost::to_lower_copy(string(argv[++i]));
-			if (m == "lowest")
-				priority = TransactionPriority::Lowest;
-			else if (m == "low")
-				priority = TransactionPriority::Low;
-			else if (m == "medium" || m == "mid" || m == "default" || m == "normal")
-				priority = TransactionPriority::Medium;
-			else if (m == "high")
-				priority = TransactionPriority::High;
-			else if (m == "highest")
-				priority = TransactionPriority::Highest;
-			else
-				try {
-					priority = (TransactionPriority)(max(0, min(100, stoi(m))) * 8 / 100);
-				}
-				catch (...) {
-					cerr << "Unknown " << arg << " option: " << m << endl;
-					return -1;
-				}
-		}*/
 		else if ((arg == "-m" || arg == "--mining") && i + 1 < argc)
 		{
 			string m = argv[++i];
@@ -747,8 +674,6 @@ int main(int argc, char** argv)
 			alwaysConfirm = false;
 		else if (arg == "--import-presale" && i + 1 < argc)
 			presaleImports.push_back(argv[++i]);
-		else if (arg == "--old-interactive")
-			interactive = true;
 
 		else if ((arg == "-j" || arg == "--json-rpc"))
 			jsonRPCURL = jsonRPCURL == -1 ? SensibleHttpPort : jsonRPCURL;
@@ -954,24 +879,6 @@ int main(int argc, char** argv)
 
 	string logbuf;
 	std::string additional;
-	if (interactive)
-		g_logPost = [&](std::string const& a, char const*){
-			static SpinLock s_lock;
-			SpinGuard l(s_lock);
-
-			if (g_silence)
-				logbuf += a + "\n";
-			else
-				cout << "\r           \r" << a << endl << additional << flush;
-
-			// helpful to use OutputDebugString on windows
-	#if defined(_WIN32)
-			{
-				OutputDebugStringA(a.data());
-				OutputDebugStringA("\n");
-			}
-	#endif
-		};
 
 	auto getPassword = [&](string const& prompt) {
 		bool s = g_silence;

libdevcore/Guards.h

@@ -69,18 +69,6 @@ struct GenericUnguardSharedBool
 	MutexType& m;
 };
 
-/** @brief Simple lock that waits for release without making context switch */
-class SpinLock
-{
-public:
-	SpinLock() { m_lock.clear(); }
-	void lock() { while (m_lock.test_and_set(std::memory_order_acquire)) {} }
-	void unlock() { m_lock.clear(std::memory_order_release); }
-private:
-	std::atomic_flag m_lock;
-};
-using SpinGuard = std::lock_guard<SpinLock>;
-
 template <class N>
 class Notified
 {

libdevcore/Log.cpp

@@ -162,11 +162,6 @@ string dev::ThreadContext::join(string const& _prior)
 	return g_logThreadContext.join(_prior);
 }
 
-// foward declare without all of Windows.h
-#if defined(_WIN32)
-extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char* lpOutputString);
-#endif
-
 string dev::getThreadName()
 {
 #if defined(__GLIBC__) || defined(__APPLE__)
@@ -190,20 +185,7 @@ void dev::setThreadName(string const& _n)
 #endif
 }
 
-void dev::simpleDebugOut(std::string const& _s, char const*)
+void dev::debugOut(std::string const& _s)
 {
-	static SpinLock s_lock;
-	SpinGuard l(s_lock);
-
-	cerr << _s << endl << flush;
-
-	// helpful to use OutputDebugString on windows
-	#if defined(_WIN32)
-	{
-		OutputDebugStringA(_s.data());
-		OutputDebugStringA("\n");
-	}
-	#endif
+	cerr << _s << '\n';
 }
-
-std::function<void(std::string const&, char const*)> dev::g_logPost = simpleDebugOut;

libdevcore/Log.h

@@ -45,14 +45,11 @@ class NullOutputStream
 };
 
 /// A simple log-output function that prints log messages to stdout.
-void simpleDebugOut(std::string const&, char const*);
+void debugOut(std::string const& _s);
 
 /// The logging system's current verbosity.
 extern int g_logVerbosity;
 
-/// The current method that the logging system uses to output the log messages. Defaults to simpleDebugOut().
-extern std::function<void(std::string const&, char const*)> g_logPost;
-
 class LogOverrideAux
 {
 protected:
@@ -264,8 +261,8 @@ class LogOutputStream: LogOutputStreamBase
 	/// If _term is true the the prefix info is terminated with a ']' character; if not it ends only with a '|' character.
 	LogOutputStream(): LogOutputStreamBase(Id::name(), &typeid(Id), Id::verbosity, _AutoSpacing) {}
 
-	/// Destructor. Posts the accrued log entry to the g_logPost function.
-	~LogOutputStream() { if (Id::verbosity <= g_logVerbosity) g_logPost(m_sstr.str(), Id::name()); }
+	/// Destructor. Posts the accrued log entry to the output stream.
+	~LogOutputStream() { if (Id::verbosity <= g_logVerbosity) debugOut(m_sstr.str()); }
 
 	LogOutputStream& operator<<(std::string const& _t) { if (Id::verbosity <= g_logVerbosity) { if (_AutoSpacing && m_sstr.str().size() && m_sstr.str().back() != ' ') m_sstr << " "; comment(_t); } return *this; }
 

libdevcore/OverlayDB.cpp

@@ -35,7 +35,7 @@ h256 const EmptyTrie = sha3(rlp(""));
 OverlayDB::~OverlayDB()
 {
 	if (m_db.use_count() == 1 && m_db.get())
-		ctrace << "Closing state DB";
+		clog(DBDetail) << "Closing state DB";
 }
 
 class WriteBatchNoter: public ldb::WriteBatch::Handler

libdevcore/OverlayDB.h

@@ -30,6 +30,8 @@
 namespace dev
 {
 
+struct DBDetail: public LogChannel { static const char* name() { return "DBDetail"; } static const int verbosity = 14; };
+
 class OverlayDB: public MemoryDB
 {
 public:

libethashseal/Ethash.cpp

@@ -159,7 +159,7 @@ void Ethash::verifyTransaction(ImportRequirements::value _ir, TransactionBase co
 			_t.checkChainId(-4);
 	}
 	if (_ir & ImportRequirements::TransactionBasic && _t.baseGasRequired(evmSchedule(_header.number())) > _t.gas())
-		BOOST_THROW_EXCEPTION(OutOfGasIntrinsic());
+		BOOST_THROW_EXCEPTION(OutOfGasIntrinsic() << RequirementError((bigint)(_t.baseGasRequired(evmSchedule(_header.number()))), (bigint)_t.gas()));
 
 	// Avoid transactions that would take us beyond the block gas limit.
 	if (_startGasUsed + (bigint)_t.gas() > _header.gasLimit())

libethereum/Block.cpp

@@ -375,6 +375,7 @@ pair<TransactionReceipts, bool> Block::sync(BlockChain const& _bc, TransactionQu
 					if (got > m_currentBlock.gasLimit())
 					{
 						clog(StateTrace) << t.sha3() << "Dropping over-gassy transaction (gas > block's gas limit)";
+						clog(StateTrace) << "got: " << got << " required: " << m_currentBlock.gasLimit();
 						_tq.drop(t.sha3());
 					}
 					else

libethereum/Executive.cpp

@@ -206,7 +206,7 @@ void Executive::initialize(Transaction const& _transaction)
 		}
 		if (m_t.nonce() != nonceReq)
 		{
-			clog(ExecutiveWarnChannel) << "Invalid Nonce: Require" << nonceReq << " Got" << m_t.nonce();
+			clog(ExecutiveWarnChannel) << "Sender: " << m_t.sender().hex() << " Invalid Nonce: Require" << nonceReq << " Got" << m_t.nonce();
 			m_excepted = TransactionException::InvalidNonce;
 			BOOST_THROW_EXCEPTION(InvalidNonce() << RequirementError((bigint)nonceReq, (bigint)m_t.nonce()));
 		}
@@ -218,7 +218,7 @@ void Executive::initialize(Transaction const& _transaction)
 		{
 			clog(ExecutiveWarnChannel) << "Not enough cash: Require >" << totalCost << "=" << m_t.gas() << "*" << m_t.gasPrice() << "+" << m_t.value() << " Got" << m_s.balance(m_t.sender()) << "for sender: " << m_t.sender();
 			m_excepted = TransactionException::NotEnoughCash;
-			BOOST_THROW_EXCEPTION(NotEnoughCash() << RequirementError(totalCost, (bigint)m_s.balance(m_t.sender())) << errinfo_comment(m_t.sender().abridged()));
+			BOOST_THROW_EXCEPTION(NotEnoughCash() << RequirementError(totalCost, (bigint)m_s.balance(m_t.sender())) << errinfo_comment(m_t.sender().hex()));
 		}
 		m_gasCost = (u256)gasCost;  // Convert back to 256-bit, safe now.
 	}

libethereum/State.cpp

@@ -88,7 +88,7 @@ OverlayDB State::openDB(std::string const& _basePath, h256 const& _genesisHash,
 
 	if (_we == WithExisting::Kill)
 	{
-		cnote << "Killing state database (WithExisting::Kill).";
+		clog(StateDetail) << "Killing state database (WithExisting::Kill).";
 		boost::filesystem::remove_all(path + "/state");
 	}
 
@@ -119,7 +119,7 @@ OverlayDB State::openDB(std::string const& _basePath, h256 const& _genesisHash,
 		}
 	}
 
-	ctrace << "Opened state DB.";
+	clog(StateDetail) << "Opened state DB.";
 	return OverlayDB(db);
 }
 

libevm/CMakeLists.txt

@@ -4,6 +4,7 @@ set(SOURCES
 	VM.cpp
 	VMOpt.cpp
 	VMCalls.cpp
+	VMSIMD.cpp
 	VMValidate.cpp
 	VMFactory.cpp
 )

libevm/JitVM.cpp

@@ -198,6 +198,7 @@ void call(evm_result* o_result, evm_env* _opaqueEnv, evm_message const* _msg) no
 	params.codeAddress = fromEvmC(_msg->address);
 	params.receiveAddress = _msg->kind == EVM_CALL ? params.codeAddress : env.myAddress;
 	params.data = {_msg->input, _msg->input_size};
+	params.staticCall = (_msg->flags & EVM_STATIC) != 0;
 	params.onOp = {};
 
 	bool success = false;
@@ -315,24 +316,25 @@ class EVM
 	{
 		auto env = reinterpret_cast<evm_env*>(&_ext);
 		auto mode = JitVM::scheduleToMode(_ext.evmSchedule());
+		uint32_t flags = _ext.staticCall ? EVM_STATIC : 0;
 		evm_message msg = {toEvmC(_ext.myAddress), toEvmC(_ext.caller),
 						   toEvmC(_ext.value), _ext.data.data(),
 						   _ext.data.size(), toEvmC(_ext.codeHash), gas,
-						   static_cast<int32_t>(_ext.depth), EVM_CALL};
+						   static_cast<int32_t>(_ext.depth), EVM_CALL, flags};
 		return Result{m_instance->execute(
 			m_instance, env, mode, &msg, _ext.code.data(), _ext.code.size()
 		)};
 	}
 
-	bool isCodeReady(evm_mode _mode, h256 _codeHash)
+	bool isCodeReady(evm_mode _mode, uint32_t _flags, h256 _codeHash)
 	{
-		return m_instance->get_code_status(m_instance, _mode, toEvmC(_codeHash)) == EVM_READY;
+		return m_instance->get_code_status(m_instance, _mode, _flags, toEvmC(_codeHash)) == EVM_READY;
 	}
 
-	void compile(evm_mode _mode, bytesConstRef _code, h256 _codeHash)
+	void compile(evm_mode _mode, uint32_t _flags, bytesConstRef _code, h256 _codeHash)
 	{
 		m_instance->prepare_code(
-			m_instance, _mode, toEvmC(_codeHash), _code.data(), _code.size()
+			m_instance, _mode, _flags, toEvmC(_codeHash), _code.data(), _code.size()
 		);
 	}
 
@@ -392,14 +394,14 @@ evm_mode JitVM::scheduleToMode(EVMSchedule const& _schedule)
 	return _schedule.haveDelegateCall ? EVM_HOMESTEAD : EVM_FRONTIER;
 }
 
-bool JitVM::isCodeReady(evm_mode _mode, h256 _codeHash)
+bool JitVM::isCodeReady(evm_mode _mode, uint32_t _flags, h256 _codeHash)
 {
-	return getJit().isCodeReady(_mode, _codeHash);
+	return getJit().isCodeReady(_mode, _flags, _codeHash);
 }
 
-void JitVM::compile(evm_mode _mode, bytesConstRef _code, h256 _codeHash)
+void JitVM::compile(evm_mode _mode, uint32_t _flags, bytesConstRef _code, h256 _codeHash)
 {
-	getJit().compile(_mode, _code, _codeHash);
+	getJit().compile(_mode, _flags, _code, _codeHash);
 }
 
 }

libevm/JitVM.h

@@ -14,8 +14,8 @@ class JitVM: public VMFace
 	owning_bytes_ref exec(u256& io_gas, ExtVMFace& _ext, OnOpFunc const& _onOp) override final;
 
 	static evm_mode scheduleToMode(EVMSchedule const& _schedule);
-	static bool isCodeReady(evm_mode _mode, h256 _codeHash);
-	static void compile(evm_mode _mode, bytesConstRef _code, h256 _codeHash);
+	static bool isCodeReady(evm_mode _mode, uint32_t _flags, h256 _codeHash);
+	static void compile(evm_mode _mode, uint32_t _flags, bytesConstRef _code, h256 _codeHash);
 };