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

debugger: fallback for assembler listing in the presence of bad debug info

Browse Source
This commit is contained in:
hjk
2010-02-01 13:59:30 +01:00
parent 5f8f61bb4d
commit 93876009e5
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3513,8 +3513,19 @@ void GdbEngine::handleFetchDisassemblerByLine(const GdbResponse &response)
else if (lines.children().size() == 1
&& lines.childAt(0).findChild("line").data() == "0")
fetchDisassemblerByAddress(ac.agent, true);
else
ac.agent->setContents(parseDisassembler(lines));
else {
QString contents = parseDisassembler(lines);
if (ac.agent->contentsCoversAddress(contents)) {
// All is well.
ac.agent->setContents(contents);
} else {
// Can happen e.g. for initializer list on symbian/rvct where
// we get a file name and line number but where the 'fully
// disassembled function' does not cover the code in the
// initializer list. Fall back needed:
fetchDisassemblerByAddress(ac.agent, true);
}
}
} else {
// 536^error,msg="mi_cmd_disassemble: Invalid line number"
QByteArray msg = response.data.findChild("msg").data();