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

Debugger: Have Python dumper print type size information.

Browse Source 
For memory views. In the dumper, create a cache of TypeInfo
structs to contain type information and print the new entries
in each call of bb().

Collect the information in the gdb engine.
Replace WatchData::origAddress by WatchData::ReferencingAddress
to be able to correctly handle automatically dereferenced
pointers of the gdb engine. Whereas 'address' of a automatically
dereferenced used to be that of the pointer, it is now that
of the dereferenced item matching the size reported, enabling
memory views. Referencing address is now the address of the pointer.

Reviewed-by: hjk
This commit is contained in:
Friedemann Kleint
2011-04-12 15:56:03 +02:00
parent fc2e7263d5
commit 67d391019b
9 changed files with 79 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/debugger/watchutils.cpp
View File

@@ -732,26 +732,31 @@ static void setWatchDataExpression(WatchData &data, const GdbMi &mi)
data.exp = mi.data();
}
static void setWatchDataAddressHelper(WatchData &data, const QByteArray &addr)
static void setWatchDataAddress(WatchData &data, quint64 address , quint64 origAddress = 0)
{
if (addr.startsWith("0x")) { // Item model dumpers pull tricks
data.setHexAddress(addr);
if (origAddress) { // Gdb dumpers reports the dereferenced address as origAddress
data.address = origAddress;
data.referencingAddress = address;
} else {
data.dumperFlags = addr;
data.address = address;
}
if (data.exp.isEmpty() && !data.dumperFlags.startsWith('$'))
data.exp = "*(" + gdbQuoteTypes(data.type) + "*)" +data.hexAddress();
}
void setWatchDataAddress(WatchData &data, const GdbMi &mi)
void setWatchDataAddress(WatchData &data, const GdbMi &addressMi, const GdbMi &origAddressMi)
{
if (mi.isValid())
setWatchDataAddressHelper(data, mi.data());
}
static void setWatchDataOrigAddress(WatchData &data, const GdbMi &mi)
{
data.origAddress = mi.data().toULongLong(0, 16);
if (!addressMi.isValid())
return;
const QByteArray addressBA = addressMi.data();
if (!addressBA.startsWith("0x")) { // Item model dumpers pull tricks.
data.dumperFlags = addressBA;
return;
}
const quint64 address = addressBA.toULongLong(0, 16);
const quint64 origAddress = origAddressMi.isValid() ?
origAddressMi.data().toULongLong(0, 16) : quint64(0);
setWatchDataAddress(data, address, origAddress);
}
static void setWatchDataSize(WatchData &data, const GdbMi &mi)
@@ -811,8 +816,7 @@ void parseWatchData(const QSet<QByteArray> &expandedINames,
data.bitsize = mi.data().toInt();
setWatchDataValue(data, item);
setWatchDataAddress(data, item.findChild("addr"));
setWatchDataOrigAddress(data, item.findChild("origaddr"));
setWatchDataAddress(data, item.findChild("addr"), item.findChild("origaddr"));
setWatchDataSize(data, item.findChild("size"));
setWatchDataExpression(data, item.findChild("exp"));
setWatchDataValueEnabled(data, item.findChild("valueenabled"));
@@ -851,8 +855,7 @@ void parseWatchData(const QSet<QByteArray> &expandedINames,
if (!data1.name.isEmpty() && data1.name.at(0).isDigit())
data1.name = _c('[') + data1.name + _c(']');
if (addressStep) {
const QByteArray addr = "0x" + QByteArray::number(addressBase, 16);
setWatchDataAddressHelper(data1, addr);
setWatchDataAddress(data1, addressBase);
addressBase += addressStep;
}
QByteArray key = child.findChild("key").data();