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

debugger: fix display of <MULTIPLE> breakpoints

Browse Source
This commit is contained in:
hjk
2011-05-11 15:51:35 +02:00
parent 1d77eb4af9
commit 6bcb4dbd5e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2198,6 +2198,8 @@ void GdbEngine::updateBreakpointDataFromOutput(BreakpointId id, const GdbMi &bkp
// fields named "addr" in the response and/or the address // fields named "addr" in the response and/or the address
// is called <MULTIPLE>. // is called <MULTIPLE>.
//qDebug() << "ADDR: " << child.data() << (child.data() == "<MULTIPLE>"); //qDebug() << "ADDR: " << child.data() << (child.data() == "<MULTIPLE>");
if (child.data() == "<MULTIPLE>")
response.multiple = true;
if (child.data().startsWith("0x")) { if (child.data().startsWith("0x")) {
response.address = child.toAddress(); response.address = child.toAddress();
} else { } else {
@@ -2380,8 +2382,13 @@ void GdbEngine::handleBreakInsert1(const GdbResponse &response)
changeBreakpoint(id); changeBreakpoint(id);
} else { } else {
handler->notifyBreakpointInsertOk(id); handler->notifyBreakpointInsertOk(id);
attemptAdjustBreakpointLocation(id);
} }
BreakpointResponse bresponse = handler->response(id);
if (bresponse.correctedLineNumber == 0)
attemptAdjustBreakpointLocation(id);
if (bresponse.multiple && bresponse.addresses.isEmpty())
postCommand("info break " + QByteArray::number(bresponse.number),
NeedsStop, CB(handleBreakListMultiple), QVariant(id));
} else if (response.data.findChild("msg").data().contains("Unknown option")) { } else if (response.data.findChild("msg").data().contains("Unknown option")) {
// Older version of gdb don't know the -a option to set tracepoints // Older version of gdb don't know the -a option to set tracepoints
// ^error,msg="mi_cmd_break_insert: Unknown option ``a''" // ^error,msg="mi_cmd_break_insert: Unknown option ``a''"