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

Debugger: Rework register handling

Browse Source 
Use register names as handle, not their index in the view.
Store the raw real values, not some stringified version
as primary data.  Use subentries to break down bigger
registers into smaller entities. Also remember the
previous value of a register and show it in a tooltip.

Change-Id: I8ae3cc8766a7b211bc7cc827c734e5cf6060825c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-12-17 13:14:29 +01:00
parent b2bb7ea2da
commit 3743211e54
23 changed files with 881 additions and 745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -1235,14 +1235,12 @@ void CdbEngine::executeRunToFunction(const QString &functionName)
continueInferior();
}
void CdbEngine::setRegisterValue(int regnr, const QString &value)
void CdbEngine::setRegisterValue(const QByteArray &name, const QString &value)
{
const Registers registers = registerHandler()->registers();
QTC_ASSERT(regnr < registers.size(), return);
// Value is decimal or 0x-hex-prefixed
QByteArray cmd;
ByteArrayInputStream str(cmd);
str << "r " << registers.at(regnr).name << '=' << value;
str << "r " << name << '=' << value;
postCommand(cmd, 0);
reloadRegisters();
}
@@ -1854,21 +1852,6 @@ void CdbEngine::handlePid(const CdbExtensionCommandPtr &reply)
}
}
// Parse CDB gdbmi register syntax.
static Register parseRegister(const GdbMi &gdbmiReg)
{
Register reg;
reg.name = gdbmiReg["name"].data();
const GdbMi description = gdbmiReg["description"];
if (description.type() != GdbMi::Invalid) {
reg.name += " (";
reg.name += description.data();
reg.name += ')';
}
reg.value = gdbmiReg["value"].data();
return reg;
}
void CdbEngine::handleModules(const CdbExtensionCommandPtr &reply)
{
if (reply->success) {
@@ -1906,11 +1889,17 @@ void CdbEngine::handleRegisters(const CdbExtensionCommandPtr &reply)
GdbMi value;
value.fromString(reply->reply);
if (value.type() == GdbMi::List) {
Registers registers;
registers.reserve(value.childCount());
foreach (const GdbMi &gdbmiReg, value.children())
registers.push_back(parseRegister(gdbmiReg));
registerHandler()->setAndMarkRegisters(registers);
RegisterHandler *handler = registerHandler();
foreach (const GdbMi &item, value.children()) {
Register reg;
reg.name = item["name"].data();
reg.description = item["description"].data();
reg.reportedType = item["type"].data();
reg.value = item["value"].data();
reg.size = item["size"].data().toInt();
handler->updateRegister(reg);
}
handler->commitUpdates();
} else {
showMessage(QString::fromLatin1("Parse error in registers response."), LogError);
qWarning("Parse error in registers response:\n%s", reply->reply.constData());