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

CDB: Use maxStackDepth and implement reload full stack.

Browse Source 
Task-number: QTCREATORBUG-7320

Change-Id: I78bf8cf63fa892f2a6771911333c246839439bf4
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Friedemann Kleint
2013-01-31 14:34:16 +01:00
committed by hjk
parent 0a35cae99d
commit 2970a036d8
6 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1449,7 +1449,10 @@ void CdbEngine::activateFrame(int index)
if (index < 0)
return;
const StackFrames &frames = stackHandler()->frames();
QTC_ASSERT(index < frames.size(), return);
if (index >= frames.size()) {
reloadFullStack(); // Clicked on "More...".
return;
}
const StackFrame frame = frames.at(index);
if (debug || debugLocals)
@@ -2840,13 +2843,20 @@ CdbEngine::NormalizedSourceFileName CdbEngine::sourceMapNormalizeFileNameFromDeb
// Parse frame from GDBMI. Duplicate of the gdb code, but that
// has more processing.
static StackFrames parseFrames(const GdbMi &gdbmi)
static StackFrames parseFrames(const GdbMi &gdbmi, bool *incomplete = 0)
{
if (incomplete)
*incomplete = false;
StackFrames rc;
const int count = gdbmi.childCount();
rc.reserve(count);
for (int i = 0; i < count; i++) {
const GdbMi &frameMi = gdbmi.childAt(i);
if (!frameMi.childCount()) { // Empty item indicates "More...".
if (incomplete)
*incomplete = true;
break;
}
StackFrame frame;
frame.level = i;
const GdbMi fullName = frameMi.findChild("fullname");
@@ -2871,7 +2881,8 @@ unsigned CdbEngine::parseStackTrace(const GdbMi &data, bool sourceStepInto)
// 'ILT+'). If that is the case, execute another 't' to step into the actual function. .
// Note that executing 't 2' does not work since it steps 2 instructions on a non-call code line.
int current = -1;
StackFrames frames = parseFrames(data);
bool incomplete;
StackFrames frames = parseFrames(data, &incomplete);
const int count = frames.size();
for (int i = 0; i < count; i++) {
const bool hasFile = !frames.at(i).file.isEmpty();
@@ -2891,7 +2902,7 @@ unsigned CdbEngine::parseStackTrace(const GdbMi &data, bool sourceStepInto)
if (count && current == -1) // No usable frame, use assembly.
current = 0;
// Set
stackHandler()->setFrames(frames);
stackHandler()->setFrames(frames, incomplete);
activateFrame(current);
return 0;
}
@@ -2959,7 +2970,7 @@ void CdbEngine::postCommandSequence(unsigned mask)
return;
}
if (mask & CommandListStack) {
postExtensionCommand("stack", QByteArray(), 0, &CdbEngine::handleStackTrace, mask & ~CommandListStack);
postExtensionCommand("stack", "unlimited", 0, &CdbEngine::handleStackTrace, mask & ~CommandListStack);
return;
}
if (mask & CommandListRegisters) {