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

Debugger: Add Disassembler to register window context menu.

Browse Source
This commit is contained in:
Friedemann Kleint
2011-05-04 12:06:21 +02:00
parent cfcfb82ce1
commit b8e6fd2b66
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/debugger/registerwindow.cpp
View File

@@ -33,6 +33,7 @@
#include "registerwindow.h" #include "registerwindow.h"
#include "memoryview.h" #include "memoryview.h"
#include "debuggeractions.h" #include "debuggeractions.h"
#include "debuggerdialogs.h"
#include "debuggerconstants.h" #include "debuggerconstants.h"
#include "debuggercore.h" #include "debuggercore.h"
#include "debuggerengine.h" #include "debuggerengine.h"
@@ -201,17 +202,26 @@ void RegisterWindow::contextMenuEvent(QContextMenuEvent *ev)
const quint64 address = addressV.type() == QVariant::ULongLong ? addressV.toULongLong() : 0; const quint64 address = addressV.type() == QVariant::ULongLong ? addressV.toULongLong() : 0;
QAction *actViewMemory = menu.addAction(QString()); QAction *actViewMemory = menu.addAction(QString());
QAction *actEditMemory = menu.addAction(QString()); QAction *actEditMemory = menu.addAction(QString());
QAction *actShowDisassemblerAt = menu.addAction(QString());
QAction *actShowDisassembler = menu.addAction(tr("Open Disassembler..."));
actShowDisassembler->setEnabled(engineCapabilities & DisassemblerCapability);
if (address) { if (address) {
const bool canShow = actionsEnabled && (engineCapabilities & ShowMemoryCapability); const bool canShow = actionsEnabled && (engineCapabilities & ShowMemoryCapability);
actEditMemory->setText(tr("Open Memory Editor at 0x%1").arg(address, 0, 16)); actEditMemory->setText(tr("Open Memory Editor at 0x%1").arg(address, 0, 16));
actEditMemory->setEnabled(canShow); actEditMemory->setEnabled(canShow);
actViewMemory->setText(tr("Open Memory View at Value of Register %1 0x%2") actViewMemory->setText(tr("Open Memory View at Value of Register %1 0x%2")
.arg(QString::fromAscii(aRegister.name)).arg(address, 0, 16)); .arg(QString::fromAscii(aRegister.name)).arg(address, 0, 16));
actShowDisassemblerAt->setText(tr("Open Disassembler at 0x%1").arg(address, 0, 16));
actShowDisassemblerAt->setEnabled(engineCapabilities & DisassemblerCapability);
} else { } else {
actEditMemory->setText(tr("Open Memory Editor")); actEditMemory->setText(tr("Open Memory Editor"));
actViewMemory->setText(tr("Open Memory View at Value of Register")); actViewMemory->setText(tr("Open Memory View at Value of Register"));
actEditMemory->setEnabled(false); actEditMemory->setEnabled(false);
actViewMemory->setEnabled(false); actViewMemory->setEnabled(false);
actShowDisassemblerAt->setText(tr("Open Disassembler"));
actShowDisassemblerAt->setEnabled(false);
} }
menu.addSeparator(); menu.addSeparator();
@@ -250,6 +260,14 @@ void RegisterWindow::contextMenuEvent(QContextMenuEvent *ev)
} else if (act == actViewMemory) { } else if (act == actViewMemory) {
engine->openMemoryView(idx.row(), DebuggerEngine::MemoryTrackRegister|DebuggerEngine::MemoryView, engine->openMemoryView(idx.row(), DebuggerEngine::MemoryTrackRegister|DebuggerEngine::MemoryView,
QList<MemoryMarkup>(), position, QString(), this); QList<MemoryMarkup>(), position, QString(), this);
} else if (act == actShowDisassembler) {
AddressDialog dialog;
if (address)
dialog.setAddress(address);
if (dialog.exec() == QDialog::Accepted)
currentEngine()->openDisassemblerView(Location(dialog.address()));
} else if (act == actShowDisassemblerAt) {
engine->openDisassemblerView(Location(address));
} else if (act == act16) } else if (act == act16)
handler->setNumberBase(16); handler->setNumberBase(16);
else if (act == act10) else if (act == act10)