DBG+GUI: dont wanna talk about it...

Author: mrexodia

src/bridge/bridgemain.h

@@ -797,6 +797,7 @@ typedef struct
 {
     duint start;
     duint end;
+    duint view;
 } SELECTIONDATA;
 
 typedef struct

src/dbg/debugger.cpp

@@ -245,7 +245,7 @@ void DebugUpdateStack(duint dumpAddr, duint csp, bool forceDump)
     {
         SELECTIONDATA selection;
         if (GuiSelectionGet(GUI_STACK, &selection))
-            dumpAddr = selection.start;
+            dumpAddr = selection.view;
     }
     GuiStackDumpAt(dumpAddr, csp);
 }

src/gui/Src/BasicView/Disassembly.cpp

@@ -1451,6 +1451,12 @@ dsint Disassembly::getSize()
     return mMemPage->getSize();
 }
 
+duint Disassembly::getTableOffsetRva()
+{
+    return mInstBuffer.size() ? mInstBuffer.at(0).rva : 0;
+
+}
+
 void Disassembly::historyClear()
 {
     mVaHistory.clear(); //clear history for new targets

src/gui/Src/BasicView/Disassembly.h

@@ -75,6 +75,7 @@ class Disassembly : public AbstractTableView
     void disassembleClear();
     const dsint getBase() const;
     dsint getSize();
+    duint getTableOffsetRva();
 
     // history management
     void historyClear();

src/gui/Src/BasicView/HexDump.cpp

@@ -96,6 +96,11 @@ duint HexDump::rvaToVa(dsint rva)
     return mMemPage->va(rva);
 }
 
+duint HexDump::getTableOffsetRva()
+{
+    return getTableOffset() * getBytePerRowCount() - mByteOffset;
+}
+
 void HexDump::mouseMoveEvent(QMouseEvent* event)
 {
     bool wAccept = true;

src/gui/Src/BasicView/HexDump.h

@@ -132,6 +132,7 @@ class HexDump : public AbstractTableView
 
     void printDumpAt(dsint parVA, bool select, bool repaint = true);
     duint rvaToVa(dsint rva);
+    duint getTableOffsetRva();
 
 signals:
     void selectionUpdated();

src/gui/Src/Gui/CPUDisassembly.cpp

@@ -826,6 +826,7 @@ void CPUDisassembly::selectionGetSlot(SELECTIONDATA* selection)
 {
     selection->start = rvaToVa(getSelectionStart());
     selection->end = rvaToVa(getSelectionEnd());
+    selection->view = rvaToVa(getTableOffsetRva());
     Bridge::getBridge()->setResult(1);
 }
 

src/gui/Src/Gui/CPUDump.cpp

@@ -1173,6 +1173,7 @@ void CPUDump::selectionGet(SELECTIONDATA* selection)
 {
     selection->start = rvaToVa(getSelectionStart());
     selection->end = rvaToVa(getSelectionEnd());
+    selection->view = rvaToVa(getTableOffsetRva());
     Bridge::getBridge()->setResult(1);
 }
 

src/gui/Src/Gui/CPUStack.cpp

@@ -418,6 +418,7 @@ void CPUStack::selectionGet(SELECTIONDATA* selection)
 {
     selection->start = rvaToVa(getSelectionStart());
     selection->end = rvaToVa(getSelectionEnd());
+    selection->view = rvaToVa(getTableOffsetRva());
     Bridge::getBridge()->setResult(1);
 }