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

Debugger: Simplify code to open disassembler view from context menu

Browse Source 
Also, correct an off-by-one in column "computation" that always
resulted in "no function" here from the C++ model which assumes
column count starting at 1.

Change-Id: I9a34d4ffaaa25131d5a130c57ec10f1ce8e8a184
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-02-18 17:07:40 +01:00
parent 50b3f7c69a
commit 289e660fb7
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -903,15 +903,6 @@ public slots:
} }
} }
void slotDisassembleFunction()
{
const QAction *action = qobject_cast<const QAction *>(sender());
QTC_ASSERT(action, return);
const StackFrame frame = action->data().value<StackFrame>();
QTC_ASSERT(!frame.function.isEmpty(), return);
currentEngine()->openDisassemblerView(Location(frame));
}
void handleAddToWatchWindow() void handleAddToWatchWindow()
{ {
// Requires a selection, but that's the only case we want anyway. // Requires a selection, but that's the only case we want anyway.
@@ -1738,18 +1729,18 @@ void DebuggerPluginPrivate::requestContextMenu(TextEditorWidget *widget,
}); });
} }
// Disassemble current function in stopped state. // Disassemble current function in stopped state.
if (currentEngine()->state() == InferiorStopOk if (currentEngine()->hasCapability(DisassemblerCapability)) {
&& currentEngine()->hasCapability(DisassemblerCapability)) {
StackFrame frame; StackFrame frame;
frame.function = cppFunctionAt(args.fileName, lineNumber); frame.function = cppFunctionAt(args.fileName, lineNumber, 1);
frame.line = 42; // trick gdb into mixed mode. frame.line = 42; // trick gdb into mixed mode.
if (!frame.function.isEmpty()) { if (!frame.function.isEmpty()) {
const QString text = tr("Disassemble Function \"%1\"") const QString text = tr("Disassemble Function \"%1\"")
.arg(frame.function); .arg(frame.function);
QAction *disassembleAction = new QAction(text, menu); auto act = new QAction(text, menu);
disassembleAction->setData(QVariant::fromValue(frame)); connect(act, &QAction::triggered, [this, frame] {
connect(disassembleAction, &QAction::triggered, this, &DebuggerPluginPrivate::slotDisassembleFunction); currentEngine()->openDisassemblerView(Location(frame));
menu->addAction(disassembleAction ); });
menu->addAction(act);
} }
} }
} }