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

Debugger/Stack layout view: Exclude Dereferenced Pointers.

Browse Source 
by WatchData::referencingAddress as they are outside
the address range.
This commit is contained in:
Friedemann Kleint
2011-04-21 13:39:40 +02:00
parent 6484c14ab4
commit bbe9c6c023
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/debugger/watchwindow.cpp
View File

@@ -406,23 +406,25 @@ static inline void addStackLayoutMemoryView(DebuggerEngine *engine,
quint64 start = 0xFFFFFFFFFFFFFFFF;
quint64 end = 0;
const int rootItemCount = m->rowCount();
for (int r = 0; r < rootItemCount; r++) { // Note: Unsorted by default
// Note: Unsorted by default. Exclude 'Automatically dereferenced
// pointer' items as they are outside the address range.
for (int r = 0; r < rootItemCount; r++) {
const QModelIndex idx = m->index(r, 0);
const quint64 address = addressOf(idx);
if (address) {
if (address < start)
start = address;
if (const uint size = sizeOf(idx))
if (address + size > end)
end = address + size;
if (idx.data(LocalsReferencingAddressRole).toULongLong() == 0) {
const quint64 address = addressOf(idx);
if (address) {
if (address < start)
start = address;
if (const uint size = sizeOf(idx))
if (address + size > end)
end = address + size;
}
}
}
// Anything found and everything in a sensible range (static data in-between)?
if (end <= start || end - start > 100 * 1024) {
QMessageBox::information(parent, WatchWindow::tr("Cannot Display Stack Layout"),
WatchWindow::tr("Could not determine a suitable address range. "
"Unchecking the option 'Automatically Dereference Pointers' "
"might help."));
WatchWindow::tr("Could not determine a suitable address range."));
return;
}
// Take a look at the register values. Extend the range a bit if suitable