ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-20 03:46:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added continue until call for emulation (#599)

Browse Source 
* Added continue until call for emulation
* Updated r2
This commit is contained in:
fcasal 2018-07-30 07:55:58 +01:00 committed by xarkes
parent 94f417c1ff
commit d35f8f64f9
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radare2

@ -1 +1 @@
Subproject commit 3e55b5f57d3d8eb2c38e681f125e7b9517191fde Subproject commit 8255f2a96ccb286cad4708affba26822512037a0

6
src/Cutter.cpp
View File

@ -923,7 +923,11 @@ void CutterCore::continueUntilDebug(QString offset)
void CutterCore::continueUntilCall() void CutterCore::continueUntilCall()
{ {
if (currentlyDebugging) { if (currentlyDebugging) {
cmd("dcc"); if (currentlyEmulating) {
cmdEsil("aecc");
} else {
cmd("dcc");
}
QString programCounterValue = cmd("dr?`drn PC`").trimmed(); QString programCounterValue = cmd("dr?`drn PC`").trimmed();
seek(programCounterValue); seek(programCounterValue);
emit registersChanged(); emit registersChanged();

2
src/widgets/DebugToolbar.cpp
View File

@ -74,7 +74,6 @@ DebugToolbar::DebugToolbar(MainWindow *main, QWidget *parent) :
actionStartEmul->setVisible(true); actionStartEmul->setVisible(true);
actionAttach->setVisible(true); actionAttach->setVisible(true);
actionContinueUntilMain->setVisible(true); actionContinueUntilMain->setVisible(true);
actionContinueUntilCall->setVisible(true);
this->colorToolbar(false); this->colorToolbar(false);
}); });
connect(actionStep, &QAction::triggered, Core(), &CutterCore::stepDebug); connect(actionStep, &QAction::triggered, Core(), &CutterCore::stepDebug);
@ -99,7 +98,6 @@ DebugToolbar::DebugToolbar(MainWindow *main, QWidget *parent) :
actionStart->setVisible(false); actionStart->setVisible(false);
actionAttach->setVisible(false); actionAttach->setVisible(false);
actionContinueUntilMain->setVisible(false); actionContinueUntilMain->setVisible(false);
actionContinueUntilCall->setVisible(false);
continueUntilButton->setDefaultAction(actionContinueUntilSyscall); continueUntilButton->setDefaultAction(actionContinueUntilSyscall);
this->colorToolbar(true); this->colorToolbar(true);
}); });