Implement execute until return

Author: Sightem

gui/qt/debugger.cpp

@@ -147,6 +147,9 @@ void MainWindow::debugEnable() {
 void MainWindow::debugStep(int mode) {
     if (mode == DBG_RUN_UNTIL) {
         debug_step(mode, m_runUntilAddr);
+    } else if (mode == DBG_UNTIL_RET) {
+        // no address needed, cpu checks for returns internally
+        debug_step(mode, 0);
     } else {
         disasm.base = static_cast<int32_t>(cpu.registers.PC);
         disasmGet(true);
@@ -679,6 +682,7 @@ void MainWindow::debugGuiState(bool state) const {
     ui->buttonStepOver->setEnabled(state);
     ui->buttonStepNext->setEnabled(state);
     ui->buttonStepOut->setEnabled(state);
+    ui->buttonUntilRet->setEnabled(state);
     ui->buttonCertID->setEnabled(state);
     ui->groupCPU->setEnabled(state);
     ui->groupFlags->setEnabled(state);
@@ -3003,6 +3007,17 @@ void MainWindow::stepOut() {
     debugStep(DBG_STEP_OUT);
 }
 
+void MainWindow::stepUntilRet() {
+    if (!guiDebug) {
+        return;
+    }
+
+    disconnect(m_shortcutStepUntilRet, &QShortcut::activated, this, &MainWindow::stepUntilRet);
+
+    debugSync();
+    debugStep(DBG_UNTIL_RET);
+}
+
 //------------------------------------------------
 // Other Functions
 //------------------------------------------------

gui/qt/mainwindow.cpp

@@ -170,6 +170,7 @@ MainWindow::MainWindow(CEmuOpts &cliOpts, QWidget *p) : QMainWindow(p), ui(new U
     connect(ui->buttonStepOver, &QPushButton::clicked, this, &MainWindow::stepOver);
     connect(ui->buttonStepNext, &QPushButton::clicked, this, &MainWindow::stepNext);
     connect(ui->buttonStepOut, &QPushButton::clicked, this, &MainWindow::stepOut);
+    connect(ui->buttonUntilRet, &QPushButton::clicked, this, &MainWindow::stepUntilRet);
     connect(ui->buttonGoto, &QPushButton::clicked, this, &MainWindow::gotoPressed);
     connect(ui->console, &QWidget::customContextMenuRequested, this, &MainWindow::contextConsole);
     connect(m_disasm, &QWidget::customContextMenuRequested, this, &MainWindow::contextDisasm);
@@ -521,6 +522,7 @@ MainWindow::MainWindow(CEmuOpts &cliOpts, QWidget *p) : QMainWindow(p), ui(new U
     m_shortcutStepOver = new QShortcut(QKeySequence(Qt::Key_F7), this);
     m_shortcutStepNext = new QShortcut(QKeySequence(Qt::Key_F8), this);
     m_shortcutStepOut = new QShortcut(QKeySequence(Qt::Key_F9), this);
+    m_shortcutStepUntilRet = new QShortcut(QKeySequence(Qt::SHIFT | Qt::Key_F9), this);
     m_shortcutNavBack = new QShortcut(QKeySequence(Qt::ALT | Qt::Key_Left), this);
     m_shortcutNavForward = new QShortcut(QKeySequence(Qt::ALT | Qt::Key_Right), this);
 
@@ -547,6 +549,7 @@ MainWindow::MainWindow(CEmuOpts &cliOpts, QWidget *p) : QMainWindow(p), ui(new U
     connect(m_shortcutStepOver, &QShortcut::activated, this, &MainWindow::stepOver);
     connect(m_shortcutStepNext, &QShortcut::activated, this, &MainWindow::stepNext);
     connect(m_shortcutStepOut, &QShortcut::activated, this, &MainWindow::stepOut);
+    connect(m_shortcutStepUntilRet, &QShortcut::activated, this, &MainWindow::stepUntilRet);
 
     setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
     setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);

gui/qt/mainwindow.h

@@ -354,6 +354,7 @@ private slots:
     void stepOver();
     void stepNext();
     void stepOut();
+    void stepUntilRet();
 
     // os view
     void osUpdate();
@@ -710,6 +711,7 @@ private slots:
     QShortcut *m_shortcutStepOver;
     QShortcut *m_shortcutStepNext;
     QShortcut *m_shortcutStepOut;
+    QShortcut *m_shortcutStepUntilRet;
     QShortcut *m_shortcutNavBack;
     QShortcut *m_shortcutNavForward;
     QShortcut *m_shortcutDebug;

gui/qt/mainwindow.ui

@@ -532,7 +532,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="buttonStepOut">
+          <widget class="QPushButton" name="buttonStepOut">
             <property name="enabled">
              <bool>false</bool>
             </property>
@@ -552,8 +552,31 @@
              <iconset resource="resources.qrc">
               <normaloff>:/icons/resources/icons/stepout.png</normaloff>:/icons/resources/icons/stepout.png</iconset>
             </property>
-           </widget>
-          </item>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="buttonUntilRet">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Maximum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+           </property>
+           <property name="text">
+            <string>Until RET</string>
+           </property>
+           <property name="icon">
+            <iconset resource="resources.qrc">
+             <normaloff>:/icons/resources/icons/untilret.png</normaloff>:/icons/resources/icons/untilret.png</iconset>
+           </property>
+          </widget>
+         </item>
           <item>
            <widget class="QToolButton" name="buttonToggleBreakpoints">
             <property name="enabled">

gui/qt/resources.qrc

@@ -72,6 +72,7 @@
         <file>resources/icons/stepout.png</file>
         <file>resources/icons/stepover.png</file>
         <file>resources/icons/stop.png</file>
+        <file>resources/icons/untilret.png</file>
         <file>resources/icons/timers.png</file>
         <file>resources/icons/toggle_console.png</file>
         <file>resources/icons/ui_edit.png</file>