lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Debugger improvements.

cl-refactor
Gav Wood 11 years ago
parent
927f014a4f
commit
938636fbbb
3 changed files with 142 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 62
      alethzero/Main.ui
  2. 102
      alethzero/MainWin.cpp
  3. 8
      alethzero/MainWin.h

62
alethzero/Main.ui
View File

@ -161,16 +161,26 @@
<property name="title">
<string>Deb&amp;ug</string>
</property>
<widget class="QMenu" name="menuDump_Trace">
<property name="title">
<string>&amp;Dump Trace</string>
</property>
<addaction name="dumpTrace"/>
<addaction name="dumpTraceStorage"/>
</widget>
<addaction name="debugStep"/>
<addaction name="debugStepInto"/>
<addaction name="debugStepOut"/>
<addaction name="debugStepback"/>
<addaction name="dumpTrace"/>
<addaction name="debugStepBack"/>
<addaction name="debugStepBackInto"/>
<addaction name="debugStepBackOut"/>
<addaction name="menuDump_Trace"/>
<addaction name="separator"/>
<addaction name="paranoia"/>
<addaction name="killBlockchain"/>
<addaction name="inject"/>
<addaction name="clearPending"/>
<addaction name="debugCurrent"/>
</widget>
<addaction name="menu_File"/>
<addaction name="menu_Network"/>
@ -1527,15 +1537,15 @@ font-size: 14pt</string>
<string>&amp;Load Javascript...</string>
</property>
</action>
<action name="debugStepback">
<action name="debugStepBack">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Step &amp;Backwards</string>
<string>Step Over &amp;Backwards</string>
</property>
<property name="shortcut">
<string>Shift+F10</string>
<string>Ctrl+F10</string>
</property>
</action>
<action name="clearPending">
@ -1543,12 +1553,12 @@ font-size: 14pt</string>
<string>&amp;Clear Pending</string>
</property>
</action>
<action name="dumpTrace">
<action name="dumpTraceStorage">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>&amp;Dump Standard Trace</string>
<string>Standard with &amp;Storage...</string>
</property>
</action>
<action name="debugStepInto">
@ -1573,6 +1583,44 @@ font-size: 14pt</string>
<string>Shift+F11</string>
</property>
</action>
<action name="dumpTrace">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>S&amp;tandard...</string>
</property>
</action>
<action name="debugStepBackInto">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Step Into Backwards</string>
</property>
<property name="shortcut">
<string>Ctrl+F11</string>
</property>
</action>
<action name="debugStepBackOut">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Step Out Backwards</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+F11</string>
</property>
</action>
<action name="debugCurrent">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Debu&amp;g Current Transaction</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>

102
alethzero/MainWin.cpp
View File

@ -839,6 +839,7 @@ void Main::on_inject_triggered()
void Main::on_blocks_currentItemChanged()
{
ui->info->clear();
ui->debugCurrent->setEnabled(false);
eth::ClientGuard g(m_client.get());
if (auto item = ui->blocks->currentItem())
{
@ -906,19 +907,39 @@ void Main::on_blocks_currentItemChanged()
s << eth::memDump(tx.data, 16, true);
}
auto st = eth::State(m_client->state().db(), m_client->blockChain(), h);
s << renderDiff(st.pendingDiff(txi));
eth::State before = st.fromPending(txi);
eth::State after = st.fromPending(txi + 1);
s << renderDiff(before.diff(after));
// cerr << "State dump *********************************" << endl << after << "*********************************************" << endl;
ui->debugCurrent->setEnabled(true);
}
ui->info->appendHtml(QString::fromStdString(s.str()));
}
}
void Main::on_debugCurrent_triggered()
{
eth::ClientGuard g(m_client.get());
if (auto item = ui->blocks->currentItem())
{
auto hba = item->data(Qt::UserRole).toByteArray();
assert(hba.size() == 32);
auto h = h256((byte const*)hba.data(), h256::ConstructFromPointer);
if (!item->data(Qt::UserRole + 1).isNull())
{
eth::State st(m_client->state().db(), m_client->blockChain(), h);
unsigned txi = item->data(Qt::UserRole + 1).toInt();
m_executiveState = st.fromPending(txi);
m_currentExecution = unique_ptr<Executive>(new Executive(m_executiveState));
Transaction t = st.pending()[txi];
auto r = t.rlp();
populateDebugger(&r);
m_currentExecution.reset();
}
ui->info->appendHtml(QString::fromStdString(s.str()));
}
}
@ -1303,10 +1324,10 @@ 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))
{
auto l = m_history[ui->debugTimeline->value()].levels.size();
if (ui->debugTimeline->value() < m_history.size() && m_history[ui->debugTimeline->value() + 1].levels.size() > l)
{
on_debugStepInto_triggered();
if (m_history[ui->debugTimeline->value()].levels.size() > l)
on_debugStepOut_triggered();
@ -1333,23 +1354,57 @@ void Main::on_debugStepOut_triggered()
}
}
void Main::on_debugStepback_triggered()
void Main::on_debugStepBackInto_triggered()
{
ui->debugTimeline->setValue(ui->debugTimeline->value() - 1);
ui->callStack->setCurrentRow(0);
}
void Main::on_debugStepBack_triggered()
{
auto l = m_history[ui->debugTimeline->value()].levels.size();
if (ui->debugTimeline->value() > 0 && m_history[ui->debugTimeline->value() - 1].levels.size() > l)
{
on_debugStepBackInto_triggered();
if (m_history[ui->debugTimeline->value()].levels.size() > l)
on_debugStepBackOut_triggered();
}
else
on_debugStepBackInto_triggered();
}
void Main::on_debugStepBackOut_triggered()
{
if (ui->debugTimeline->value() > 0)
{
auto ls = m_history[ui->debugTimeline->value()].levels.size();
int l = ui->debugTimeline->value();
for (; l > 0 && m_history[l].levels.size() >= ls; --l) {}
ui->debugTimeline->setValue(l);
ui->callStack->setCurrentRow(0);
}
}
void Main::on_dumpTrace_triggered()
{
QString fn = QFileDialog::getSaveFileName(this, "Select file to output EVM trace");
ofstream f(fn.toStdString());
if (f.is_open())
for (WorldState const& ws: m_history)
f << ws.cur << " " << hex << toHex(eth::toCompactBigEndian(ws.curPC, 1)) << " " << hex << toHex(eth::toCompactBigEndian((int)(byte)ws.inst, 1)) << " " << hex << toHex(eth::toCompactBigEndian((uint64_t)ws.gas, 1)) << endl;
}
void Main::on_dumpTraceStorage_triggered()
{
QString fn = QFileDialog::getSaveFileName(this, "Select file to output EVM trace");
ofstream f(fn.toStdString());
if (f.is_open())
for (WorldState const& ws: m_history)
{
/* if (ws.inst == Instruction::STOP || ws.inst == Instruction::RETURN || ws.inst == Instruction::SUICIDE)
if (ws.inst == Instruction::STOP || ws.inst == Instruction::RETURN || ws.inst == Instruction::SUICIDE)
for (auto i: ws.storage)
f << toHex(eth::toCompactBigEndian(i.first, 1)) << " " << toHex(eth::toCompactBigEndian(i.second, 1)) << endl;
*/ f << ws.cur << " " << hex << toHex(eth::toCompactBigEndian(ws.curPC, 1)) << " " << hex << toHex(eth::toCompactBigEndian((int)(byte)ws.inst, 1)) << " " << hex << toHex(eth::toCompactBigEndian((uint64_t)ws.gas, 1)) << endl;
f << ws.cur << " " << hex << toHex(eth::toCompactBigEndian(ws.curPC, 1)) << " " << hex << toHex(eth::toCompactBigEndian((int)(byte)ws.inst, 1)) << " " << hex << toHex(eth::toCompactBigEndian((uint64_t)ws.gas, 1)) << endl;
}
}
@ -1358,6 +1413,19 @@ void Main::on_callStack_currentItemChanged()
updateDebugger();
}
void Main::alterDebugStateGroup(bool _enable) const
{
ui->debugStep->setEnabled(_enable);
ui->debugStepInto->setEnabled(_enable);
ui->debugStepOut->setEnabled(_enable);
ui->debugStepBackInto->setEnabled(_enable);
ui->debugStepBackOut->setEnabled(_enable);
ui->dumpTrace->setEnabled(_enable);
ui->dumpTraceStorage->setEnabled(_enable);
ui->debugStepBack->setEnabled(_enable);
ui->debugPanel->setEnabled(_enable);
}
void Main::debugFinished()
{
m_codes.clear();
@ -1371,13 +1439,8 @@ void Main::debugFinished()
ui->debugMemory->setHtml("");
ui->debugStorage->setHtml("");
ui->debugStateInfo->setText("");
alterDebugStateGroup(false);
// 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);
}
void Main::initDebugger()
@ -1385,12 +1448,7 @@ void Main::initDebugger()
// ui->send->setEnabled(false);
if (m_history.size())
{
ui->debugStep->setEnabled(true);
ui->dumpTrace->setEnabled(true);
ui->debugStepInto->setEnabled(true);
ui->debugStepOut->setEnabled(true);
ui->debugStepback->setEnabled(true);
ui->debugPanel->setEnabled(true);
alterDebugStateGroup(true);
ui->debugCode->setEnabled(false);
ui->debugTimeline->setMinimum(0);
ui->debugTimeline->setMaximum(m_history.size());

8
alethzero/MainWin.h
View File

@ -110,7 +110,7 @@ private slots:
void on_quit_triggered() { close(); }
void on_urlEdit_returnPressed();
void on_debugStep_triggered();
void on_debugStepback_triggered();
void on_debugStepBack_triggered();
void on_debug_clicked();
void on_debugTimeline_valueChanged();
void on_jsInput_returnPressed();
@ -124,9 +124,13 @@ private slots:
void on_blockChainFilter_textChanged();
void on_clearPending_triggered();
void on_dumpTrace_triggered();
void on_dumpTraceStorage_triggered();
void on_debugStepInto_triggered();
void on_debugStepOut_triggered();
void on_debugStepBackOut_triggered();
void on_debugStepBackInto_triggered();
void on_callStack_currentItemChanged();
void on_debugCurrent_triggered();
void refresh(bool _override = false);
void refreshNetwork();
@ -150,6 +154,8 @@ private:
eth::Address fromString(QString const& _a) const;
std::string renderDiff(eth::StateDiff const& _d) const;
void alterDebugStateGroup(bool _enable) const;
eth::State const& state() const;
void updateFee();

Write Preview
Loading…
Cancel
Save