Enable continue in emulation

This commit is contained in:
mandlebro 2018-08-06 12:48:26 +01:00 committed by xarkes
parent cb173aa616
commit ad9d3ccb5f
3 changed files with 9 additions and 8 deletions

View File

@ -964,7 +964,11 @@ void CutterCore::stopDebug()
void CutterCore::continueDebug() void CutterCore::continueDebug()
{ {
if (currentlyDebugging) { if (currentlyDebugging) {
if (currentlyEmulating) {
cmdEsil("aec");
} else {
cmd("dc"); cmd("dc");
}
emit registersChanged(); emit registersChanged();
emit refreshCodeViews(); emit refreshCodeViews();
} }

View File

@ -132,16 +132,16 @@ void MainWindow::initUI()
DebugToolbar *debugToolbar = new DebugToolbar(this); DebugToolbar *debugToolbar = new DebugToolbar(this);
ui->mainToolBar->addWidget(debugToolbar); ui->mainToolBar->addWidget(debugToolbar);
// Debug menu // Debug menu
// ui->menuDebug->addAction(debugToolbar->actionStart); ui->menuDebug->addAction(debugToolbar->actionStart);
ui->menuDebug->addAction(debugToolbar->actionStartEmul); ui->menuDebug->addAction(debugToolbar->actionStartEmul);
// ui->menuDebug->addAction(debugToolbar->actionAttach); ui->menuDebug->addAction(debugToolbar->actionAttach);
ui->menuDebug->addSeparator(); ui->menuDebug->addSeparator();
ui->menuDebug->addAction(debugToolbar->actionStep); ui->menuDebug->addAction(debugToolbar->actionStep);
ui->menuDebug->addAction(debugToolbar->actionStepOver); ui->menuDebug->addAction(debugToolbar->actionStepOver);
ui->menuDebug->addAction(debugToolbar->actionStepOut); ui->menuDebug->addAction(debugToolbar->actionStepOut);
ui->menuDebug->addSeparator(); ui->menuDebug->addSeparator();
// ui->menuDebug->addAction(debugToolbar->actionContinue); ui->menuDebug->addAction(debugToolbar->actionContinue);
// ui->menuDebug->addAction(debugToolbar->actionContinueUntilCall); ui->menuDebug->addAction(debugToolbar->actionContinueUntilCall);
ui->menuDebug->addAction(debugToolbar->actionContinueUntilSyscall); ui->menuDebug->addAction(debugToolbar->actionContinueUntilSyscall);
// Sepparator between undo/redo and goto lineEdit // Sepparator between undo/redo and goto lineEdit

View File

@ -299,9 +299,6 @@ void DisassemblyContextMenu::aboutToShowSlot()
// only show debug options if we are currently debugging // only show debug options if we are currently debugging
debugMenu->menuAction()->setVisible(Core()->currentlyDebugging); debugMenu->menuAction()->setVisible(Core()->currentlyDebugging);
// currently there are is no breakpoint support in ESIL so
// we dont show the option in case we are emulating
actionAddBreakpoint.setVisible(!Core()->currentlyEmulating);
QString progCounterName = Core()->getRegisterName("PC"); QString progCounterName = Core()->getRegisterName("PC");
actionSetPC.setText("Set " + progCounterName + " here"); actionSetPC.setText("Set " + progCounterName + " here");