LOG fixes.

libethereum/Executive.cpp

@@ -173,7 +173,10 @@ bool Executive::go(OnOpFunc const& _onOp)
 		{
 			m_out = m_vm->go(*m_ext, _onOp);
 			if (m_ext)
+			{
 				m_endGas += min((m_t.gas() - m_endGas) / 2, m_ext->sub.refunds);
+				m_logs = m_ext->sub.logs;
+			}
 			m_endGas = m_vm->gas();
 		}
 		catch (StepsDone const&)

libevm/VM.h

@@ -206,7 +206,7 @@ template <class Ext> dev::bytesConstRef dev::eth::VM::go(Ext& _ext, OnOpFunc con
 		{
 			unsigned n = (unsigned)inst - (unsigned)Instruction::LOG0;
 			require(n + 2);
-			newTempSize = memNeed(m_stack[m_stack.size() - 1 - n], m_stack[m_stack.size() - 2 - n]);
+			newTempSize = memNeed(m_stack[m_stack.size() - 1 ], m_stack[m_stack.size() - 2]);
 			break;
 		}
 

libevmcore/Instruction.cpp

@@ -282,11 +282,11 @@ static const std::map<Instruction, InstructionInfo> c_instructionInfo =
 	{ Instruction::SWAP14,		{ "SWAP14",			0, 15, 15, false } },
 	{ Instruction::SWAP15,		{ "SWAP15",			0, 16, 16, false } },
 	{ Instruction::SWAP16,		{ "SWAP16",			0, 17, 17, false } },
-	{ Instruction::LOG0,		{ "LOG0",			0, 1, 0, true } },
+	{ Instruction::LOG0,		{ "LOG0",			0, 2, 0, true } },
-	{ Instruction::LOG1,		{ "LOG1",			0, 2, 0, true } },
+	{ Instruction::LOG1,		{ "LOG1",			0, 3, 0, true } },
-	{ Instruction::LOG2,		{ "LOG2",			0, 3, 0, true } },
+	{ Instruction::LOG2,		{ "LOG2",			0, 4, 0, true } },
-	{ Instruction::LOG3,		{ "LOG3",			0, 4, 0, true } },
+	{ Instruction::LOG3,		{ "LOG3",			0, 5, 0, true } },
-	{ Instruction::LOG4,		{ "LOG4",			0, 5, 0, true } },
+	{ Instruction::LOG4,		{ "LOG4",			0, 6, 0, true } },
 	{ Instruction::CREATE,		{ "CREATE",			0, 3, 1, true } },
 	{ Instruction::CALL,		{ "CALL",			0, 7, 1, true } },
 	{ Instruction::CALLCODE,	{ "CALLCODE",		0, 7, 1, true } },