feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Fix jump to file/line breakpoint from disassembler

Browse Source 
Triggered by double-clicking a normal source file+line breakpoint
while looking at some disassembly: We want to jump to the original
source file in that case.

Change-Id: Ia6eddcaf27e4160c7a989ab757315f5314f65d1e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-04-17 11:19:58 +02:00
parent f60780881b
commit eea8e932f3
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/debugger/breakhandler.cpp
View File

@@ -33,11 +33,18 @@
#include "debuggeractions.h" #include "debuggeractions.h"
#include "debuggercore.h" #include "debuggercore.h"
#include "debuggerengine.h" #include "debuggerengine.h"
#include "debuggerinternalconstants.h"
#include "debuggerstringutils.h" #include "debuggerstringutils.h"
#include "simplifytype.h" #include "simplifytype.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/coreplugin.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/idocument.h>
#include <extensionsystem/invoker.h> #include <extensionsystem/invoker.h>
#include <texteditor/textmark.h> #include <texteditor/textmark.h>
#include <texteditor/texteditor.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
@@ -50,6 +57,7 @@
#include <QDir> #include <QDir>
#include <QDebug> #include <QDebug>
using namespace Core;
using namespace Utils; using namespace Utils;
namespace Debugger { namespace Debugger {
@@ -1171,10 +1179,15 @@ void BreakHandler::timerEvent(QTimerEvent *event)
void Breakpoint::gotoLocation() const void Breakpoint::gotoLocation() const
{ {
if (DebuggerEngine *engine = currentEngine()) { if (DebuggerEngine *engine = currentEngine()) {
if (b->m_params.type == BreakpointByAddress) if (b->m_params.type == BreakpointByAddress) {
engine->gotoLocation(b->m_params.address); engine->gotoLocation(b->m_params.address);
else } else {
engine->gotoLocation(Location(b->markerFileName(), b->markerLineNumber(), false)); // Don't use gotoLocation as this ends up in disassembly
// if OperateByInstruction is on.
const QString file = QDir::cleanPath(b->markerFileName());
IEditor *editor = EditorManager::openEditor(file);
editor->gotoLine(b->markerLineNumber(), 0);
}
} }
} }