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

Debugger: Handle throw/catch/main as BreakpointType enum values.

Browse Source 
Remove BreakHandler::hasPendingBreakpoints, handle new types
in CDB and gdb. Start fixing Breakpoint-Dialog.
Add assignment of Breakpointresponse from BreakpointParameters.

Reviewed-by: hjk
This commit is contained in:
Friedemann Kleint
2010-11-16 10:23:20 +01:00
parent 3f366ef54b
commit 29beabd5a4
11 changed files with 187 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2156,25 +2156,32 @@ static QByteArray addressSpec(quint64 address)
QByteArray GdbEngine::breakpointLocation(BreakpointId id)
{
BreakHandler *handler = breakHandler();
QByteArray functionName = handler->functionName(id).toUtf8();
if (!functionName.isEmpty()) {
// FIXME: Use the types.
if (functionName == BreakpointData::throwFunction)
return "__cxa_throw";
if (functionName == BreakpointData::catchFunction)
return "__cxa_begin_catch";
const BreakpointData *data = handler->breakpointById(id);
QTC_ASSERT(data, return QByteArray());
const BreakpointParameters parameters = data->parameters();
// FIXME: Non-GCC-runtime
if (parameters.type == BreakpointAtThrow)
return "__cxa_throw";
if (parameters.type == BreakpointAtCatch)
return "__cxa_begin_catch";
if (parameters.type == BreakpointAtMain)
#ifdef Q_OS_WIN
return "qMain";
#else
return "main";
#endif
const QByteArray functionName = parameters.functionName.toUtf8();
if (!functionName.isEmpty())
return functionName;
}
quint64 address = handler->address(id);
if (address)
if (const quint64 address = handler->address(id))
return addressSpec(address);
// In this case, data->funcName is something like '*0xdeadbeef'
int lineNumber = handler->lineNumber(id);
const int lineNumber = handler->lineNumber(id);
if (lineNumber == 0)
return functionName;
QString fileName = handler->fileName(id);
if (handler->useFullPath(id))
fileName = breakLocation(fileName);
const QString fileName = parameters.useFullPath ?
breakLocation(parameters.fileName) :
parameters.fileName;
// The argument is simply a C-quoted version of the argument to the
// non-MI "break" command, including the "original" quoting it wants.
return "\"\\\"" + GdbMi::escapeCString(fileName).toLocal8Bit() + "\\\":"