debugger: create a disassembler view as main editor

"Stepping instruction wise" and "display disassembler" mode is now toggled by a
single action. This also allows to re-use F10 and F11 as keyboard shortcut.

Missing: caching of disassembler output, removal of old disassembler view.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h
index 01fe816d32..74928abe44 100644
--- a/src/plugins/debugger/debuggerplugin.h
+++ b/src/plugins/debugger/debuggerplugin.h
@@ -50,6 +50,8 @@ class IMode;
 
 namespace TextEditor {
 class ITextEditor;
+class ITextMark;
+class BaseTextMark;
 }
 
 namespace Debugger {
@@ -59,7 +61,8 @@ class BreakpointData;
 class DebuggerManager;
 class DebuggerRunner;
 class DebugMode;
-class LocationMark;
+class DisassemblerViewAgent;
+class StackFrame;
 
 class DebuggerPlugin : public ExtensionSystem::IPlugin
 {
@@ -94,7 +97,7 @@ private slots:
     void updateActions(int status);
 
     void resetLocation();
-    void gotoLocation(const QString &fileName, int line, bool setMarker);
+    void gotoLocation(const StackFrame &frame, bool setMarker);
 
     void breakpointSetRemoveMarginActionTriggered();
     void breakpointEnableDisableMarginActionTriggered();
@@ -127,7 +130,8 @@ private:
     DebuggerRunner *m_debuggerRunner;
 
     QString m_previousMode;
-    LocationMark *m_locationMark;
+    TextEditor::BaseTextMark *m_locationMark;
+    DisassemblerViewAgent *m_disassemblerViewAgent;
     int m_gdbRunningContext;
     unsigned m_cmdLineEnabledEngines;
     quint64 m_cmdLineAttachPid;