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

Debugger: don't auto-continue on SIGTRAP if the user ordered a stop

Browse Source 
Task-number: QTCREATORBUG-4968
Change-Id: I48d49c3098be3392c9ef7e6b0112149c7def22f9
Reviewed-on: http://codereview.qt.nokia.com/97
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2011-05-25 08:58:25 +02:00
committed by hjk
parent 96cde1e9de
commit 184b079557
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,6 +216,7 @@ GdbEngine::GdbEngine(const DebuggerStartParameters &startParameters,
m_preparedForQmlBreak = false;
m_disassembleUsesComma = false;
m_qFatalBreakpointNumber = 0;
m_actingOnExpectedStop = false;
invalidateSourcesList();
@@ -1201,6 +1202,7 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
{
// This is gdb 7+'s initial *stopped in response to attach.
// For consistency, we just discard it.
m_actingOnExpectedStop = false;
if (state() == InferiorSetupRequested)
return;
@@ -1271,6 +1273,7 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
if (!m_commandsToRunOnTemporaryBreak.isEmpty()) {
QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state())
m_actingOnExpectedStop = true;
notifyInferiorStopOk();
flushQueuedCommands();
if (state() == InferiorStopOk) {
@@ -1299,6 +1302,7 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
// That's expected.
} else {
QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state());
m_actingOnExpectedStop = true;
notifyInferiorStopOk();
}
@@ -1497,9 +1501,7 @@ void GdbEngine::handleStop1(const GdbMi &data)
&& reason == "signal-received"
&& data.findChild("signal-name").data() == "SIGTRAP")
{
const GdbMi frame = data.findChild("frame");
const QByteArray func = frame.findChild("func").data();
if (func != "ntdll!DbgUiConnectToDbg" && func != "ntdll|DbgBreakPoint") {
if (!m_actingOnExpectedStop) {
// Ignore signals from command line start up traps.
showMessage(_("INTERNAL CONTINUE"), LogMisc);
continueInferiorInternal();