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

Debugger: Improve register check for memory layout.

Browse Source
This commit is contained in:
Friedemann Kleint
2011-04-21 13:04:43 +02:00
parent 8d4d88f072
commit 6484c14ab4
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,11 +295,18 @@ static inline MemoryMarkupList
return result; // Fixme: Exact size not known, no point in filling if no children. return result; // Fixme: Exact size not known, no point in filling if no children.
// Punch in registers as 1-byte markers on top. // Punch in registers as 1-byte markers on top.
const RegisterMapConstIt regcEnd = registerMap.constEnd(); const RegisterMapConstIt regcEnd = registerMap.constEnd();
for (RegisterMapConstIt it = registerMap.constBegin(); it != regcEnd; ++it) for (RegisterMapConstIt it = registerMap.constBegin(); it != regcEnd; ++it) {
if (it.key() - address < size) if (it.key() >= address) {
ranges[it.key() - address] = const quint64 offset = it.key() - address;
if (offset < size) {
ranges[offset] =
ColorNumberToolTipPair(registerColorNumber, ColorNumberToolTipPair(registerColorNumber,
WatchWindow::tr("Register <i>%1</i>").arg(it.value())); WatchWindow::tr("Register <i>%1</i>").arg(it.value()));
} else {
break; // Sorted.
}
}
} // for registers.
if (debug) { if (debug) {
QDebug dbg = qDebug().nospace(); QDebug dbg = qDebug().nospace();
dbg << rootToolTip << ' ' << address << ' ' << size << '\n'; dbg << rootToolTip << ' ' << address << ' ' << size << '\n';