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

debugger: introduce the concept of a 'Location', used by gotoLocation

Browse Source
This commit is contained in:
hjk
2010-12-16 19:06:33 +01:00
parent 39c145bf93
commit 9757e22113
14 changed files with 112 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/debugger/debuggerengine.cpp
View File

@@ -512,14 +512,21 @@ void DebuggerEngine::resetLocation()
d->removeLocationMark();
}
void DebuggerEngine::gotoLocation(const QString &file, int line, bool setMarker)
void DebuggerEngine::gotoLocation(const Location &loc)
{
if (debuggerCore()->boolSetting(OperateByInstruction) || !loc.hasDebugInfo()) {
d->m_disassemblerAgent.setTryMixed(true);
d->m_disassemblerAgent.setLocation(loc);
return;
}
// CDB might hit on breakpoints while shutting down.
//if (m_shuttingDown)
// return;
d->doRemoveLocationMark();
const QString file = loc.fileName();
const int line = loc.lineNumber();
EditorManager *editorManager = EditorManager::instance();
QList<IEditor *> editors = editorManager->editorsForFileName(file);
if (editors.isEmpty()) {
@@ -531,23 +538,15 @@ void DebuggerEngine::gotoLocation(const QString &file, int line, bool setMarker)
if (texteditor)
texteditor->gotoLine(line, 0);
if (setMarker)
if (loc.needsMarker())
d->m_locationMark.reset(new LocationMark(file, line));
// FIXME: Breaks with split views.
if (!d->m_memoryAgent.hasVisibleEditor())
if (!d->m_memoryAgent.hasVisibleEditor() || loc.needsRaise())
editorManager->activateEditor(editors.back());
//qDebug() << "MEMORY: " << d->m_memoryAgent.hasVisibleEditor();
}
void DebuggerEngine::gotoLocation(const StackFrame &frame, bool setMarker)
{
if (debuggerCore()->boolSetting(OperateByInstruction) || !frame.isUsable())
d->m_disassemblerAgent.setFrame(frame, true, setMarker);
else
gotoLocation(frame.file, frame.line, setMarker);
}
// Called from RunControl.
void DebuggerEngine::handleStartFailed()
{
@@ -1469,10 +1468,11 @@ void DebuggerEngine::updateMemoryViews()
d->m_memoryAgent.updateContents();
}
void DebuggerEngine::openDisassemblerView(const StackFrame &frame)
void DebuggerEngine::openDisassemblerView(const Location &location)
{
DisassemblerAgent *agent = new DisassemblerAgent(this);
agent->setFrame(frame, true, false);
agent->setTryMixed(true);
agent->setLocation(location);
}
void DebuggerEngine::handleRemoteSetupDone(int gdbServerPort, int qmlPort)