Better debugging.

alethzero/Main.ui

@@ -162,6 +162,8 @@
      <string>Deb&amp;ug</string>
     </property>
     <addaction name="debugStep"/>
+    <addaction name="debugStepInto"/>
+    <addaction name="debugStepOut"/>
     <addaction name="debugStepback"/>
     <addaction name="dumpTrace"/>
     <addaction name="separator"/>
@@ -1445,7 +1447,7 @@ font-size: 14pt</string>
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>&amp;Single Step</string>
+    <string>&amp;Step Over</string>
    </property>
    <property name="shortcut">
     <string>F10</string>
@@ -1513,7 +1515,7 @@ font-size: 14pt</string>
     <bool>false</bool>
    </property>
    <property name="text">
-    <string>Single Step &amp;Backwards</string>
+    <string>Step &amp;Backwards</string>
    </property>
    <property name="shortcut">
     <string>Shift+F10</string>
@@ -1532,6 +1534,28 @@ font-size: 14pt</string>
     <string>&amp;Dump Standard Trace</string>
    </property>
   </action>
+  <action name="debugStepInto">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Step &amp;Into</string>
+   </property>
+   <property name="shortcut">
+    <string>F11</string>
+   </property>
+  </action>
+  <action name="debugStepOut">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Step &amp;Out</string>
+   </property>
+   <property name="shortcut">
+    <string>Shift+F11</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>

alethzero/MainWin.cpp

@@ -1297,11 +1297,34 @@ void Main::on_create_triggered()
 }
 
 void Main::on_debugStep_triggered()
+{
+	if (ui->debugTimeline->value() < m_history.size() && (m_history[ui->debugTimeline->value()].inst == Instruction::CALL || m_history[ui->debugTimeline->value()].inst == Instruction::CREATE))
+	{
+		on_debugStepInto_triggered();
+		on_debugStepOut_triggered();
+	}
+	else
+		on_debugStepInto_triggered();
+}
+
+void Main::on_debugStepInto_triggered()
 {
 	ui->debugTimeline->setValue(ui->debugTimeline->value() + 1);
 	ui->callStack->setCurrentRow(0);
 }
 
+void Main::on_debugStepOut_triggered()
+{
+	if (ui->debugTimeline->value() < m_history.size())
+	{
+		auto ls = m_history[ui->debugTimeline->value()].levels.size();
+		auto l = ui->debugTimeline->value();
+		for (; l < m_history.size() && m_history[l].levels.size() >= ls; ++l) {}
+		ui->debugTimeline->setValue(l);
+		ui->callStack->setCurrentRow(0);
+	}
+}
+
 void Main::on_debugStepback_triggered()
 {
 	ui->debugTimeline->setValue(ui->debugTimeline->value() - 1);
@@ -1337,6 +1360,8 @@ void Main::debugFinished()
 	ui->debugStateInfo->setText("");
 //	ui->send->setEnabled(true);
 	ui->debugStep->setEnabled(false);
+	ui->debugStepInto->setEnabled(false);
+	ui->debugStepOut->setEnabled(false);
 	ui->dumpTrace->setEnabled(false);
 	ui->debugStepback->setEnabled(false);
 	ui->debugPanel->setEnabled(false);
@@ -1349,11 +1374,13 @@ void Main::initDebugger()
 	{
 		ui->debugStep->setEnabled(true);
 		ui->dumpTrace->setEnabled(true);
+		ui->debugStepInto->setEnabled(true);
+		ui->debugStepOut->setEnabled(true);
 		ui->debugStepback->setEnabled(true);
 		ui->debugPanel->setEnabled(true);
 		ui->debugCode->setEnabled(false);
 		ui->debugTimeline->setMinimum(0);
-		ui->debugTimeline->setMaximum(m_history.size() - 1);
+		ui->debugTimeline->setMaximum(m_history.size());
 		ui->debugTimeline->setValue(0);
 	}
 }
@@ -1363,6 +1390,20 @@ void Main::on_debugTimeline_valueChanged()
 	updateDebugger();
 }
 
+QString prettyU256(eth::u256 _n)
+{
+	ostringstream s;
+	if (_n >> 32 == 0)
+		s << hex << "0x" << (unsigned)_n;
+	else if (_n >> 200 == 0)
+		s << "0x" << (h160)right160(_n);
+	else if (fromRaw((h256)_n).size())
+		s << "\"" << fromRaw((h256)_n).toStdString() << "\"";
+	else
+		s << "0x" << (h256)_n;
+	return QString::fromStdString(s.str());
+}
+
 void Main::updateDebugger()
 {
 	if (m_history.size())
@@ -1370,8 +1411,43 @@ void Main::updateDebugger()
 		QListWidget* ds = ui->debugStack;
 		ds->clear();
 
-		WorldState const& nws = m_history[ui->debugTimeline->value()];
+		WorldState const& nws = m_history[min((int)m_history.size() - 1, ui->debugTimeline->value())];
+		WorldState const& ws = ui->callStack->currentRow() > 0 ? *nws.levels[nws.levels.size() - ui->callStack->currentRow()] : nws;
 
+		if (ui->debugTimeline->value() >= m_history.size())
+		{
+			if (ws.gasCost > ws.gas)
+				ui->debugMemory->setHtml("<h3>OUT-OF-GAS</h3>");
+			else if (ws.inst == Instruction::RETURN && ws.stack.size() >= 2)
+			{
+				unsigned from = (unsigned)ws.stack.back();
+				unsigned size = (unsigned)ws.stack[ws.stack.size() - 2];
+				unsigned o = 0;
+				bytes out(size, 0);
+				for (; o < size && from + o < ws.memory.size(); ++o)
+					out[o] = ws.memory[from + o];
+				ui->debugMemory->setHtml("<h3>RETURN</h3>" + QString::fromStdString(eth::memDump(out, 16, true)));
+			}
+			else if (ws.inst == Instruction::STOP)
+				ui->debugMemory->setHtml("<h3>STOP</h3>");
+			else if (ws.inst == Instruction::SUICIDE && ws.stack.size() >= 1)
+				ui->debugMemory->setHtml("<h3>SUICIDE</h3>0x" + QString::fromStdString(toString(right160(ws.stack.back()))));
+			else
+				ui->debugMemory->setHtml("<h3>EXCEPTION</h3>");
+
+			ostringstream ss;
+			ss << dec << "EXIT  |  GAS: " << dec << max<eth::bigint>(0, (eth::bigint)ws.gas - ws.gasCost);
+			ui->debugStateInfo->setText(QString::fromStdString(ss.str()));
+			ui->debugStorage->setHtml("");
+			ui->debugCallData->setHtml("");
+			m_lastData = h256();
+			ui->callStack->clear();
+			m_lastLevels.clear();
+			ui->debugCode->clear();
+			m_lastCode = h256();
+		}
+		else
+		{
 			if (m_lastLevels != nws.levels || !ui->callStack->count())
 			{
 				m_lastLevels = nws.levels;
@@ -1387,8 +1463,6 @@ void Main::updateDebugger()
 				}
 			}
 
-		WorldState const& ws = ui->callStack->currentRow() > 0 ? *nws.levels[nws.levels.size() - ui->callStack->currentRow()] : nws;
-
 			if (ws.code != m_lastCode)
 			{
 				bytes const& code = m_codes[ws.code];
@@ -1428,18 +1502,7 @@ void Main::updateDebugger()
 			}
 
 			for (auto i: ws.stack)
-		{
+				ds->insertItem(0, prettyU256(i));
-			ostringstream s;
-			if (i >> 32 == 0)
-				s << hex << "0x" << (unsigned)i;
-			else if (i >> 200 == 0)
-				s << "0x" << (h160)right160(i);
-			else if (fromRaw((h256)i).size())
-				s << "\"" << fromRaw((h256)i).toStdString() << "\"";
-			else
-				s << "0x" << (h256)i;
-			ds->insertItem(0, QString::fromStdString(s.str()));
-		}
 			ui->debugMemory->setHtml(QString::fromStdString(eth::memDump(ws.memory, 16, true)));
 			assert(m_codes.count(ws.code));
 			assert(m_codes[ws.code].size() > (unsigned)ws.curPC);
@@ -1447,15 +1510,16 @@ void Main::updateDebugger()
 			ui->debugCode->setCurrentRow(max(0, l - 5));
 			ui->debugCode->setCurrentRow(min(ui->debugCode->count() - 1, l + 5));
 			ui->debugCode->setCurrentRow(l);
+
 			ostringstream ss;
 			ss << dec << "STEP: " << ws.steps << "  |  PC: 0x" << hex << ws.curPC << "  :  " << c_instructionInfo.at(ws.inst).name << "  |  ADDMEM: " << dec << ws.newMemSize << " words  |  COST: " << dec << ws.gasCost <<  "  |  GAS: " << dec << ws.gas;
 			ui->debugStateInfo->setText(QString::fromStdString(ss.str()));
-
 			stringstream s;
 			for (auto const& i: ws.storage)
-			s << "@" << showbase << hex << i.first << "&nbsp;&nbsp;&nbsp;&nbsp;" << showbase << hex << i.second << "<br/>";
+				s << "@" << prettyU256(i.first).toStdString() << "&nbsp;&nbsp;&nbsp;&nbsp;" << prettyU256(i.second).toStdString() << "<br/>";
 			ui->debugStorage->setHtml(QString::fromStdString(s.str()));
 		}
+	}
 }
 
 // extra bits needed to link on VS

alethzero/MainWin.h

@@ -124,6 +124,8 @@ private slots:
 	void on_blockChainFilter_textChanged();
 	void on_clearPending_triggered();
 	void on_dumpTrace_triggered();
+	void on_debugStepInto_triggered();
+	void on_debugStepOut_triggered();
 	void on_callStack_currentItemChanged();
 
 	void refresh(bool _override = false);