From 8a9cde986a2cb7559285fc1d68ec2c9b33ed47c9 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 6 May 2011 14:10:44 +0200
Subject: [PATCH] debugger: fix output parsing for watchpoint on mac
Task-number: QTCREATORBUG-4797
---
src/plugins/debugger/gdb/gdbengine.cpp | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 585440eb254..bd70731afde 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -2304,18 +2304,28 @@ void GdbEngine::handleWatchInsert(const GdbResponse &response)
{
const int id = response.cookie.toInt();
if (response.resultClass == GdbResultDone) {
+ BreakHandler *handler = breakHandler();
+ BreakpointResponse bresponse = handler->response(id);
// "Hardware watchpoint 2: *0xbfffed40\n"
QByteArray ba = response.data.findChild("consolestreamoutput").data();
- if (ba.startsWith("Hardware watchpoint ")
+ GdbMi wpt = response.data.findChild("wpt");
+ if (wpt.isValid()) {
+ // Mac yields:
+ //>32^done,wpt={number="4",exp="*4355182176"}
+ bresponse.number = wpt.findChild("number").data().toInt();
+ bresponse.address = wpt.findChild("exp").data().toULongLong(0, 0);
+ handler->setResponse(id, bresponse);
+ QTC_ASSERT(!handler->needsChange(id), /**/);
+ handler->notifyBreakpointInsertOk(id);
+ } else if (ba.startsWith("Hardware watchpoint ")
|| ba.startsWith("Watchpoint ")) {
+ // Non-Mac: "Hardware watchpoint 2: *0xbfffed40\n"
const int end = ba.indexOf(':');
const int begin = ba.lastIndexOf(' ', end) + 1;
const QByteArray address = ba.mid(end + 3).trimmed();
- BreakHandler *handler = breakHandler();
- BreakpointResponse response = handler->response(id);
- response.number = ba.mid(begin, end - begin).toInt();
- response.address = address.toULongLong(0, 0);
- handler->setResponse(id, response);
+ bresponse.number = ba.mid(begin, end - begin).toInt();
+ bresponse.address = address.toULongLong(0, 0);
+ handler->setResponse(id, bresponse);
QTC_ASSERT(!handler->needsChange(id), /**/);
handler->notifyBreakpointInsertOk(id);
} else {
--
GitLab