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

Disassembler: Force disassembler reload when switching output flavor

Browse Source 
Change-Id: I8356cba5766a0afc519c66f120c24d1755c840e4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-05-26 15:24:27 +02:00
parent 7e47a8a453
commit ddfc1f8d27
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,8 +236,6 @@ GdbEngine::GdbEngine(const DebuggerStartParameters &startParameters)
SLOT(reloadLocals()));
connect(debuggerCore()->action(UseDynamicType), SIGNAL(valueChanged(QVariant)),
SLOT(reloadLocals()));
connect(debuggerCore()->action(IntelFlavor), SIGNAL(valueChanged(QVariant)),
SLOT(reloadDisassembly()));
}
GdbEngine::~GdbEngine()
@@ -3968,9 +3966,11 @@ public:
void GdbEngine::fetchDisassembler(DisassemblerAgent *agent)
{
// Doing that unconditionally seems to be the most robust
// solution given the richest output. Looks like GDB is
// a command line tool after all...
if (debuggerCore()->boolSetting(IntelFlavor))
postCommand("set disassembly-flavor intel");
else
postCommand("set disassembly-flavor att");
fetchDisassemblerByCliPointMixed(agent);
}
@@ -4078,12 +4078,6 @@ bool GdbEngine::handleCliDisassemblerResult(const QByteArray &output, Disassembl
return false;
}
void GdbEngine::reloadDisassembly()
{
setTokenBarrier();
updateLocals();
}
void GdbEngine::handleFetchDisassemblerByCliPointMixed(const GdbResponse &response)
{
DisassemblerAgentCookie ac = response.cookie.value<DisassemblerAgentCookie>();
@@ -4475,11 +4469,7 @@ void GdbEngine::handleInferiorPrepared()
}
}
if (debuggerCore()->boolSetting(IntelFlavor)) {
//postCommand("set follow-exec-mode new");
postCommand("set disassembly-flavor intel");
}
//postCommand("set follow-exec-mode new");
if (sp.breakOnMain) {
QByteArray cmd = "tbreak ";
cmd += sp.toolChainAbi.os() == Abi::WindowsOS ? "qMain" : "main";