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

Debugger: Fix stack layout display.

Browse Source 
Do not start at model root, since an additional layer
has been introduced. The check for root level in the recursion
is then no longer required.

Change-Id: I22c83b3eb4c07dacc3b5af45edeb340a02c01e3e
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2012-08-21 16:08:43 +02:00
committed by hjk
parent 7e884db7fb
commit 5bbaef6b10
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,16 +212,13 @@ static int memberVariableRecursion(const QAbstractItemModel *model,
ColorNumberToolTips *cnmv) ColorNumberToolTips *cnmv)
{ {
int childCount = 0; int childCount = 0;
// Recurse over top level items if modelIndex is invalid. QTC_ASSERT(modelIndex.isValid(), return childCount );
const bool isRoot = !modelIndex.isValid(); const int rowCount = model->rowCount(modelIndex);
const int rowCount = isRoot
? model->rowCount() : modelIndex.model()->rowCount(modelIndex);
if (!rowCount) if (!rowCount)
return childCount; return childCount;
const QString nameRoot = name.isEmpty() ? name : name + QLatin1Char('.'); const QString nameRoot = name.isEmpty() ? name : name + QLatin1Char('.');
for (int r = 0; r < rowCount; r++) { for (int r = 0; r < rowCount; r++) {
const QModelIndex childIndex = isRoot const QModelIndex childIndex = modelIndex.child(r, 0);
? model->index(r, 0) : modelIndex.child(r, 0);
const quint64 childAddress = addressOf(childIndex); const quint64 childAddress = addressOf(childIndex);
const uint childSize = sizeOf(childIndex); const uint childSize = sizeOf(childIndex);
if (childAddress && childAddress >= start if (childAddress && childAddress >= start
@@ -423,22 +420,26 @@ static void addStackLayoutMemoryView(DebuggerEngine *engine, bool separateView,
// Determine suitable address range from locals. // Determine suitable address range from locals.
quint64 start = Q_UINT64_C(0xFFFFFFFFFFFFFFFF); quint64 start = Q_UINT64_C(0xFFFFFFFFFFFFFFFF);
quint64 end = 0; quint64 end = 0;
const int rootItemCount = m->rowCount(); const QModelIndex localsIndex = m->index(0, 0);
QTC_ASSERT(localsIndex.data(LocalsINameRole).toString() == QLatin1String("local"), return);
const int localsItemCount = m->rowCount(localsIndex);
// Note: Unsorted by default. Exclude 'Automatically dereferenced // Note: Unsorted by default. Exclude 'Automatically dereferenced
// pointer' items as they are outside the address range. // pointer' items as they are outside the address range.
for (int r = 0; r < rootItemCount; r++) { for (int r = 0; r < localsItemCount; r++) {
const QModelIndex idx = m->index(r, 0); const QModelIndex idx = localsIndex.child(r, 0);
if (idx.data(LocalsReferencingAddressRole).toULongLong() == 0) { if (idx.data(LocalsReferencingAddressRole).toULongLong() == 0) {
const quint64 address = addressOf(idx); const quint64 address = addressOf(idx);
if (address) { if (address) {
if (address < start) if (address < start)
start = address; start = address;
if (const uint size = sizeOf(idx)) const uint size = qMax(1u, sizeOf(idx));
if (address + size > end) if (address + size > end)
end = address + size; end = address + size;
} }
} }
} }
if (const quint64 remainder = end % 8)
end += 8 - remainder;
// Anything found and everything in a sensible range (static data in-between)? // Anything found and everything in a sensible range (static data in-between)?
if (end <= start || end - start > 100 * 1024) { if (end <= start || end - start > 100 * 1024) {
QMessageBox::information(parent, QMessageBox::information(parent,
@@ -461,7 +462,7 @@ static void addStackLayoutMemoryView(DebuggerEngine *engine, bool separateView,
// Indicate all variables. // Indicate all variables.
const QColor background = parent->palette().color(QPalette::Normal, QPalette::Base); const QColor background = parent->palette().color(QPalette::Normal, QPalette::Base);
const MemoryMarkupList markup = const MemoryMarkupList markup =
variableMemoryMarkup(m, QModelIndex(), QString(), variableMemoryMarkup(m, localsIndex, QString(),
QString(), start, end - start, QString(), start, end - start,
regMap, true, background); regMap, true, background);
const unsigned flags = separateView const unsigned flags = separateView