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

Debugger: Fix mixed+raw disassembly

Browse Source 
(gdb) help diass mentions "/r" and "/m" but doesn't give a hint that
the combination is written as "/rm".

Change-Id: I8baf56bd1e3c36ec43945ba0d572575c9e5e7fd5
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-05-02 17:01:39 +02:00
parent 158ef19cb3
commit 0ea6474262
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -3976,9 +3976,10 @@ void GdbEngine::fetchDisassembler(DisassemblerAgent *agent)
static inline QByteArray disassemblerCommand(const Location &location, bool mixed)
{
QByteArray command = "disassemble /r ";
QByteArray command = "disassemble /r";
if (mixed)
command += "/m ";
command += 'm';
command += ' ';
if (const quint64 address = location.address()) {
command += "0x";
command += QByteArray::number(address, 16);
@@ -4006,7 +4007,7 @@ void GdbEngine::fetchDisassemblerByCliRangeMixed(const DisassemblerAgentCookie &
const quint64 address = ac.agent->address();
QByteArray start = QByteArray::number(address - 20, 16);
QByteArray end = QByteArray::number(address + 100, 16);
QByteArray cmd = "disassemble /r /m 0x" + start + ",0x" + end;
QByteArray cmd = "disassemble /rm 0x" + start + ",0x" + end;
postCommand(cmd, Discardable|ConsoleCommand,
CB(handleFetchDisassemblerByCliRangeMixed), QVariant::fromValue(ac));
}