WIP

Author: mrexodia

src/gui/Src/BasicView/Disassembly.cpp

@@ -1436,10 +1436,12 @@ void Disassembly::expandSelectionUpTo(dsint to)
     if(to < mSelection.firstSelectedIndex)
     {
         mSelection.fromIndex = to;
+        emit selectionChanged(mSelection.fromIndex);
     }
     else if(to > mSelection.firstSelectedIndex)
     {
         mSelection.toIndex = to;
+        emit selectionChanged(mSelection.fromIndex);
     }
     else if(to == mSelection.firstSelectedIndex)
     {
@@ -1484,6 +1486,11 @@ void Disassembly::selectionChangedSlot(dsint Va)
     }
     if(DbgIsDebugging())
         DbgXrefGet(Va, &mXrefInfo);
+
+    SELECTIONDATA sel;
+    sel.start = rvaToVa(mSelection.fromIndex);
+    sel.end = rvaToVa(mSelection.toIndex);
+    Bridge::getBridge()->selectionSet(GUI_DISASSEMBLY, sel);
 }
 
 void Disassembly::selectNext(bool expand)

src/gui/Src/Bridge/Bridge.cpp

@@ -18,13 +18,16 @@ static Bridge* mBridge;
 Bridge::Bridge(QObject* parent) : QObject(parent)
 {
     InitializeCriticalSection(&csBridge);
+    InitializeCriticalSection(&csSelection);
     hResultEvent = CreateEventW(nullptr, true, true, nullptr);;
     dwMainThreadId = GetCurrentThreadId();
 }
 
 Bridge::~Bridge()
 {
     CloseHandle(hResultEvent);
+    EnterCriticalSection(&csSelection);
+    DeleteCriticalSection(&csSelection);
     EnterCriticalSection(&csBridge);
     DeleteCriticalSection(&csBridge);
 }
@@ -83,6 +86,26 @@ void Bridge::setDbgStopped()
     dbgStopped = true;
 }
 
+void Bridge::selectionSet(int window, const SELECTIONDATA & data)
+{
+    if(window >= 0 && window < _countof(mSelections))
+    {
+        EnterCriticalSection(&csSelection);
+        memcpy(&mSelections[window], &data, sizeof(SELECTIONDATA));
+        LeaveCriticalSection(&csSelection);
+    }
+}
+
+void Bridge::selectionGet(int window, SELECTIONDATA & data)
+{
+    if(window >= 0 && window < _countof(mSelections))
+    {
+        EnterCriticalSection(&csSelection);
+        memcpy(&data, &mSelections[window], sizeof(SELECTIONDATA));
+        LeaveCriticalSection(&csSelection);
+    }
+}
+
 /************************************************************************************
                             Message processing
 ************************************************************************************/
@@ -375,31 +398,38 @@ void* Bridge::processMessage(GUIMSG type, void* param1, void* param2)
         SELECTIONDATA* selection = (SELECTIONDATA*)param2;
         if(!DbgIsDebugging())
             return (void*)false;
-        BridgeResult result;
-        switch(hWindow)
+        if(hWindow == GUI_DISASSEMBLY)
         {
-        case GUI_DISASSEMBLY:
-            emit selectionDisasmGet(selection);
-            break;
-        case GUI_DUMP:
-            emit selectionDumpGet(selection);
-            break;
-        case GUI_STACK:
-            emit selectionStackGet(selection);
-            break;
-        case GUI_GRAPH:
-            emit selectionGraphGet(selection);
-            break;
-        case GUI_MEMMAP:
-            emit selectionMemmapGet(selection);
-            break;
-        case GUI_SYMMOD:
-            emit selectionSymmodGet(selection);
-            break;
-        default:
-            return (void*)false;
+            selectionGet(hWindow, *selection);
+        }
+        else
+        {
+            BridgeResult result;
+            switch(hWindow)
+            {
+            case GUI_DISASSEMBLY:
+                emit selectionDisasmGet(selection);
+                break;
+            case GUI_DUMP:
+                emit selectionDumpGet(selection);
+                break;
+            case GUI_STACK:
+                emit selectionStackGet(selection);
+                break;
+            case GUI_GRAPH:
+                emit selectionGraphGet(selection);
+                break;
+            case GUI_MEMMAP:
+                emit selectionMemmapGet(selection);
+                break;
+            case GUI_SYMMOD:
+                emit selectionSymmodGet(selection);
+                break;
+            default:
+                return (void*)false;
+            }
+            result.Wait();
         }
-        result.Wait();
         if(selection->start > selection->end) //swap start and end
         {
             dsint temp = selection->end;

src/gui/Src/Bridge/Bridge.h

@@ -47,6 +47,10 @@ class Bridge : public QObject
     duint mLastCip = 0;
     SymbolView* symbolView = nullptr;
 
+    //Selection helpers
+    void selectionSet(int window, const SELECTIONDATA & data);
+    void selectionGet(int window, SELECTIONDATA & data);
+
 signals:
     void disassembleAt(dsint va, dsint eip);
     void updateDisassembly();
@@ -169,6 +173,8 @@ class Bridge : public QObject
     DWORD dwMainThreadId = 0;
     dsint bridgeResult = 0;
     volatile bool dbgStopped = false;
+    CRITICAL_SECTION csSelection;
+    SELECTIONDATA mSelections[GUI_SYMMOD + 1];
 };
 
 void DbgCmdExec(const QString & cmd);

src/gui/Src/Gui/CPUDisassembly.cpp

@@ -41,7 +41,7 @@ CPUDisassembly::CPUDisassembly(CPUWidget* parent) : Disassembly(parent)
     connect(Bridge::getBridge(), SIGNAL(disassembleAt(dsint, dsint)), this, SLOT(disassembleAt(dsint, dsint)));
     connect(Bridge::getBridge(), SIGNAL(selectionDisasmGet(SELECTIONDATA*)), this, SLOT(selectionGetSlot(SELECTIONDATA*)));
     connect(Bridge::getBridge(), SIGNAL(selectionDisasmSet(const SELECTIONDATA*)), this, SLOT(selectionSetSlot(const SELECTIONDATA*)));
-    connect(this, SIGNAL(selectionExpanded()), this, SLOT(selectionUpdatedSlot()));
+    connect(this, SIGNAL(selectionExpanded()), this, SLOT(selectionExpandedSlot()));
     connect(Bridge::getBridge(), SIGNAL(displayWarning(QString, QString)), this, SLOT(displayWarningSlot(QString, QString)));
     connect(Bridge::getBridge(), SIGNAL(focusDisasm()), this, SLOT(setFocus()));
 
@@ -1297,7 +1297,7 @@ void CPUDisassembly::selectionSetSlot(const SELECTIONDATA* selection)
     Bridge::getBridge()->setResult(1);
 }
 
-void CPUDisassembly::selectionUpdatedSlot()
+void CPUDisassembly::selectionExpandedSlot()
 {
     QString selStart = ToPtrString(rvaToVa(getSelectionStart()));
     QString selEnd = ToPtrString(rvaToVa(getSelectionEnd()));

src/gui/Src/Gui/CPUDisassembly.h

@@ -68,7 +68,7 @@ public slots:
     void findNamesSlot();
     void selectionGetSlot(SELECTIONDATA* selection);
     void selectionSetSlot(const SELECTIONDATA* selection);
-    void selectionUpdatedSlot();
+    void selectionExpandedSlot();
     void enableHighlightingModeSlot();
     void binaryEditSlot();
     void binaryFillSlot();