Merge remote-tracking branch 'ethereum/develop' into signextend_change

Conflicts:
	libevm/VM.h

libdevcore/FixedHash.h

@@ -158,7 +158,7 @@ public:
 		return ret;
 	}
 
-	template <unsigned P, unsigned M> inline FixedHash& shiftBloom(FixedHash<M> const& _h) { return (*this |= _h.nbloom<P, N>()); }
+	template <unsigned P, unsigned M> inline FixedHash& shiftBloom(FixedHash<M> const& _h) { return (*this |= _h.template nbloom<P, N>()); }
 
 	template <unsigned P, unsigned M> inline FixedHash<M> nbloom() const
 	{

libevm/VM.h

@@ -448,7 +448,6 @@ template <class Ext> dev::bytesConstRef dev::eth::VM::go(Ext& _ext, OnOpFunc con
 			m_stack.pop_back();
 			break;
 		case Instruction::SIGNEXTEND:
-		{
 			if (m_stack.back() < 31)
 			{
 				unsigned const testBit(m_stack.back() * 8 + 7);
@@ -461,7 +460,6 @@ template <class Ext> dev::bytesConstRef dev::eth::VM::go(Ext& _ext, OnOpFunc con
 			}
 			m_stack.pop_back();
 			break;
-		}
 		case Instruction::SHA3:
 		{
 			unsigned inOff = (unsigned)m_stack.back();

test/vm.cpp

@@ -359,9 +359,9 @@ void FakeExtVM::importExec(mObject& _o)
 	code = &thisTxCode;
 	if (_o["code"].type() == str_type)
 		if (_o["code"].get_str().find_first_of("0x") == 0)
-			thisTxCode = compileLLL(_o["code"].get_str());
-		else
 			thisTxCode = fromHex(_o["code"].get_str().substr(2));
+		else
+			thisTxCode = compileLLL(_o["code"].get_str());
 	else if (_o["code"].type() == array_type)
 		for (auto const& j: _o["code"].get_array())
 			thisTxCode.push_back(toByte(j));