Breakpoint Menu and Debug Menu in the Decompiler Context Menu

src/menus/DecompilerContextMenu.cpp

@@ -1,6 +1,7 @@
 #include "DecompilerContextMenu.h"
 #include "dialogs/preferences/PreferencesDialog.h"
 #include "MainWindow.h"
+#include "dialogs/BreakpointsDialog.h"
 
 #include <QtCore>
 #include <QShortcut>
@@ -13,11 +14,20 @@ DecompilerContextMenu::DecompilerContextMenu(QWidget *parent, MainWindow *mainWi
     :   QMenu(parent),
         offset(0),
         mainWindow(mainWindow),
-        actionCopy(tr("Copy"), this)
+        actionCopy(tr("Copy"), this),
+        actionAddBreakpoint(tr("Add/remove breakpoint"), this),
+        actionAdvancedBreakpoint(tr("Advanced breakpoint"), this),
+        actionContinueUntil(tr("Continue until line"), this),
+        actionSetPC(tr("Set PC"), this)
 {
     setActionCopy();
     addSeparator();
 
+    addBreakpointMenu();
+    addDebugMenu();
+
+    setShortcutContextInActions(this);
+
     connect(this, &DecompilerContextMenu::aboutToShow,
             this, &DecompilerContextMenu::aboutToShowSlot);
 }
@@ -38,8 +48,30 @@ void DecompilerContextMenu::setCanCopy(bool enabled)
     actionCopy.setVisible(enabled);
 }
 
+void DecompilerContextMenu::setShortcutContextInActions(QMenu *menu)
+{
+    for(QAction *action: menu->actions()){
+        if(action->isSeparator()){
+             //Do nothing
+        }else if(action->menu()){
+            setShortcutContextInActions(action->menu());
+        }else{
+            action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+        }
+    }
+}
+
 void DecompilerContextMenu::aboutToShowSlot()
 {
+    // Only show debug options if we are currently debugging
+    debugMenu->menuAction()->setVisible(Core()->currentlyDebugging);
+    bool hasBreakpoint = Core()->breakpointIndexAt(offset) > -1;
+    actionAddBreakpoint.setText(hasBreakpoint ?
+                                     tr("Remove breakpoint") : tr("Add breakpoint"));
+    actionAdvancedBreakpoint.setText(hasBreakpoint ?
+                                     tr("Edit breakpoint") : tr("Advanced breakpoint"));
+    QString progCounterName = Core()->getRegisterName("PC").toUpper();
+    actionSetPC.setText(tr("Set %1 here").arg(progCounterName));
 }
 
 // Set up actions
@@ -48,7 +80,28 @@ void DecompilerContextMenu::setActionCopy(){
     connect(&actionCopy, &QAction::triggered, this, &DecompilerContextMenu::actionCopyTriggered);
     addAction(&actionCopy);
     actionCopy.setShortcut(QKeySequence::Copy);
-    actionCopy.setShortcutContext(Qt::WidgetWithChildrenShortcut);
+}
+
+void DecompilerContextMenu::setActionAddBreakpoint()
+{
+    connect(&actionAddBreakpoint, &QAction::triggered, this, &DecompilerContextMenu::actionAddBreakpointTriggered);
+    actionAddBreakpoint.setShortcuts({Qt::Key_F2, Qt::CTRL + Qt::Key_B});
+}
+
+void DecompilerContextMenu::setActionAdvancedBreakpoint()
+{
+    connect(&actionAdvancedBreakpoint, &QAction::triggered, this, &DecompilerContextMenu::actionAdvancedBreakpointTriggered);
+    actionAdvancedBreakpoint.setShortcut({Qt::CTRL + Qt::Key_F2});
+}
+
+void DecompilerContextMenu::setActionContinueUntil()
+{
+    connect(&actionContinueUntil, &QAction::triggered, this, &DecompilerContextMenu::actionContinueUntilTriggered);
+}
+
+void DecompilerContextMenu::setActionSetPC()
+{
+    connect(&actionSetPC, &QAction::triggered, this, &DecompilerContextMenu::actionSetPCTriggered);
 }
 
 // Set up action responses
@@ -57,3 +110,51 @@ void DecompilerContextMenu::actionCopyTriggered()
 {
     emit copy();
 }
+
+void DecompilerContextMenu::actionAddBreakpointTriggered()
+{
+    Core()->toggleBreakpoint(offset);
+}
+
+void DecompilerContextMenu::actionAdvancedBreakpointTriggered()
+{
+    int index = Core()->breakpointIndexAt(offset);
+    if (index >= 0) {
+        BreakpointsDialog::editBreakpoint(Core()->getBreakpointAt(offset), this);
+    } else {
+        BreakpointsDialog::createNewBreakpoint(offset, this);
+    }
+}
+
+void DecompilerContextMenu::actionContinueUntilTriggered()
+{
+    Core()->continueUntilDebug(RAddressString(offset));
+}
+
+void DecompilerContextMenu::actionSetPCTriggered()
+{
+    QString progCounterName = Core()->getRegisterName("PC");
+    Core()->setRegister(progCounterName, RAddressString(offset).toUpper());
+}
+
+// Set up menus
+
+void DecompilerContextMenu::addBreakpointMenu()
+{
+    breakpointMenu = addMenu(tr("Breakpoint"));
+
+    setActionAddBreakpoint();
+    breakpointMenu->addAction(&actionAddBreakpoint);
+    setActionAdvancedBreakpoint();
+    breakpointMenu->addAction(&actionAdvancedBreakpoint);
+}
+
+void DecompilerContextMenu::addDebugMenu()
+{
+    debugMenu = addMenu(tr("Debug"));
+
+    setActionContinueUntil();
+    debugMenu->addAction(&actionContinueUntil);
+    setActionSetPC();
+    debugMenu->addAction(&actionSetPC);
+}

src/menus/DecompilerContextMenu.h

@@ -12,7 +12,7 @@ class DecompilerContextMenu : public QMenu
 public:
     DecompilerContextMenu(QWidget *parent, MainWindow *mainWindow);
     ~DecompilerContextMenu();
-
+    
 signals:
     void copy();
 
@@ -24,18 +24,42 @@ private slots:
     void aboutToShowSlot();
 
     void actionCopyTriggered();
+
+    void actionAddBreakpointTriggered();
+    void actionAdvancedBreakpointTriggered();
+
+    void actionContinueUntilTriggered();
+    void actionSetPCTriggered();
 
 private:
-    QKeySequence getCopySequence() const;
+    void setShortcutContextInActions(QMenu *menu);
 
     RVA offset;
     MainWindow *mainWindow;
 
     QAction actionCopy;
     QAction *copySeparator;
 
+    QMenu *breakpointMenu;
+    QAction actionAddBreakpoint;
+    QAction actionAdvancedBreakpoint;
+
+    QMenu *debugMenu;
+    QAction actionContinueUntil;
+    QAction actionSetPC;
+
+    // Set actions
     void setActionCopy();
 
+    void setActionAddBreakpoint();
+    void setActionAdvancedBreakpoint();
+
+    void setActionContinueUntil();
+    void setActionSetPC();
+
+    // Add Menus
+    void addBreakpointMenu();
+    void addDebugMenu();
     // I left out the following part from RAnnotatedCode. Probably, we will be returning/passing annotations
     // from/to the function getThingUsedHere() and updateTargetMenuActions(). This block of comment will get removed in
     // future PRs.

src/widgets/DecompilerWidget.cpp

@@ -147,8 +147,7 @@ static ut64 offsetForPosition(RAnnotatedCode &codeDecompiled, size_t pos)
     void *annotationi;
     r_vector_foreach(&codeDecompiled.annotations, annotationi) {
         RCodeAnnotation *annotation = (RCodeAnnotation *)annotationi;
-        if (annotation->type != R_CODE_ANNOTATION_TYPE_OFFSET || annotation->start > pos
-                || annotation->end <= pos) {
+        if (annotation->type != R_CODE_ANNOTATION_TYPE_OFFSET || annotation->start > pos) {
             continue;
         }
         if (closestPos != SIZE_MAX && closestPos >= annotation->start) {