Merge remote-tracking branch 'upstream/develop' into evmjit

alethzero/MainWin.cpp

@@ -273,12 +273,12 @@ void Main::installWatches()
 
 Address Main::getNameReg() const
 {
-	return abiOut<Address>(ethereum()->call(c_newConfig, abiIn(1, (u256)1)));
+	return abiOut<Address>(ethereum()->call(c_newConfig, abiIn("lookup(uint256)", (u256)1)));
 }
 
 Address Main::getCurrencies() const
 {
-	return abiOut<Address>(ethereum()->call(c_newConfig, abiIn(1, (u256)2)));
+	return abiOut<Address>(ethereum()->call(c_newConfig, abiIn("lookup(uint256)", (u256)2)));
 }
 
 void Main::installNameRegWatch()
@@ -475,7 +475,7 @@ QString Main::pretty(dev::Address _a) const
 
 		if (g_newNameReg)
 		{
-			QString s = QString::fromStdString(toString(abiOut<string32>(ethereum()->call(g_newNameReg, abiIn(2, _a)))));
+			QString s = QString::fromStdString(toString(abiOut<string32>(ethereum()->call(g_newNameReg, abiIn("nameOf(address)", _a)))));
 //			s_memos[_a] = s;
 			if (s.size())
 				return s;
@@ -522,11 +522,11 @@ Address Main::fromString(QString const& _n) const
 	if (!s_memos.count(_n))
 	{*/
 //		if (!g_newNameReg)
-			auto g_newNameReg = abiOut<Address>(ethereum()->call(c_newConfig, abiIn(1, (u256)1)));
+			auto g_newNameReg = getNameReg();
 
 		if (g_newNameReg)
 		{
-			Address a = abiOut<Address>(ethereum()->call(g_newNameReg, abiIn(0, ::fromString(_n.toStdString()))));
+			Address a = abiOut<Address>(ethereum()->call(g_newNameReg, abiIn("addressOf(string32)", ::fromString(_n.toStdString()))));
 //			s_memos[_n] = a;
 			if (a)
 				return a;

evmjit/libevmjit/Cache.cpp

@@ -46,6 +46,7 @@ std::unique_ptr<llvm::Module> Cache::getObject(std::string const& id)
 		auto module = std::unique_ptr<llvm::Module>(new llvm::Module(id, llvm::getGlobalContext()));
 		auto mainFuncType = llvm::FunctionType::get(llvm::IntegerType::get(llvm::getGlobalContext(), 32), {}, false);
 		auto func = llvm::Function::Create(mainFuncType, llvm::Function::ExternalLinkage, id, module.get());
+		(void)func;
 	}
 	return nullptr;
 }
@@ -70,6 +71,7 @@ void ObjectCache::notifyObjectCompiled(llvm::Module const* _module, llvm::Memory
 
 llvm::MemoryBuffer* ObjectCache::getObject(llvm::Module const* _module)
 {
+	(void)_module;
 	auto o = lastObject;
 	lastObject = nullptr;
 	return o;

evmjit/libevmjit/Ext.cpp

@@ -22,9 +22,11 @@ namespace jit
 
 Ext::Ext(RuntimeManager& _runtimeManager, Memory& _memoryMan):
 	RuntimeHelper(_runtimeManager),
-	m_memoryMan(_memoryMan),
+	m_memoryMan(_memoryMan)
+	// TODO: fix: either initialise properly or don't specify in constructor.
+	/*,
 	m_funcs{},
-	m_argAllocas{}
+	m_argAllocas{}*/
 {
 	m_size = m_builder.CreateAlloca(Type::Size, nullptr, "env.size");
 }

libdevcore/vector_ref.h

@@ -28,7 +28,7 @@ public:
 
 	bool contentsEqual(std::vector<mutable_value_type> const& _c) const { return _c.size() == m_count && !memcmp(_c.data(), m_data, m_count); }
 	std::vector<mutable_value_type> toVector() const { return std::vector<mutable_value_type>(m_data, m_data + m_count); }
-	std::vector<unsigned char> toBytes() const { return std::vector<unsigned char>((unsigned char const*)m_data, m_data + m_count * sizeof(_T)); }
+	std::vector<unsigned char> toBytes() const { return std::vector<unsigned char>((unsigned char const*)m_data, (unsigned char const*)m_data + m_count * sizeof(_T)); }
 	std::string toString() const { return std::string((char const*)m_data, ((char const*)m_data) + m_count * sizeof(_T)); }
 	template <class _T2> operator vector_ref<_T2>() const { assert(m_count * sizeof(_T) / sizeof(_T2) * sizeof(_T2) / sizeof(_T) == m_count); return vector_ref<_T2>((_T2*)m_data, m_count * sizeof(_T) / sizeof(_T2)); }
 

libethereum/Client.h

@@ -119,9 +119,9 @@ template <class T, class ... U> bytes abiInAux(T const& _t, U const& ... _u)
 	return ABISerialiser<T>::serialise(_t) + abiInAux(_u ...);
 }
 
-template <class ... T> bytes abiIn(byte _id, T const& ... _t)
+template <class ... T> bytes abiIn(std::string _id, T const& ... _t)
 {
-	return bytes(1, _id) + abiInAux(_t ...);
+	return sha3(_id).ref().cropped(0, 4).toBytes() + abiInAux(_t ...);
 }
 
 template <class T> struct ABIDeserialiser {};

libethereum/Executive.cpp

@@ -146,9 +146,17 @@ bool Executive::create(Address _sender, u256 _endowment, u256 _gasPrice, u256 _g
 	m_s.m_cache[m_newAddress] = Account(m_s.balance(m_newAddress) + _endowment, Account::ContractConception);
 
 	// Execute _init.
-	m_vm = VMFactory::create(_gas);
-	m_ext = make_shared<ExtVM>(m_s, m_lastHashes, m_newAddress, _sender, _origin, _endowment, _gasPrice, bytesConstRef(), _init, m_depth);
-	return _init.empty();
+	if (_init.empty())
+	{
+		m_s.m_cache[m_newAddress].setCode({});
+		m_endGas = _gas;
+	}
+	else
+	{
+		m_vm = VMFactory::create(_gas);
+		m_ext = make_shared<ExtVM>(m_s, m_lastHashes, m_newAddress, _sender, _origin, _endowment, _gasPrice, bytesConstRef(), _init, m_depth);
+	}
+	return !m_ext;
 }
 
 OnOpFunc Executive::simpleTrace()

libevm/VM.h

@@ -202,9 +202,7 @@ inline bytesConstRef VM::go(ExtVMFace& _ext, OnOpFunc const& _onOp, uint64_t _st
 		case Instruction::CREATE:
 		{
 			require(3);
-			u256 inOff = m_stack[m_stack.size() - 2];
-			u256 inSize = m_stack[m_stack.size() - 3];
-			newTempSize = (bigint)inOff + inSize;
+			newTempSize = memNeed(m_stack[m_stack.size() - 2], m_stack[m_stack.size() - 3]);
 			runGas = c_createGas;
 			break;
 		}