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

Debugger[CDB]: Fix CDB disassembly for older Debugging Tools pre 6.12

Browse Source 
which mingle source code line and address when doing mixed
disassembly.

Task-number: QTCREATORBUG-5401
Change-Id: I7e3cd967fd4e11b8dcd4bab82fa89721d61274c0
Reviewed-on: http://codereview.qt.nokia.com/1528
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Friedemann Kleint
2011-07-12 15:07:17 +02:00
committed by hjk
parent 952afd5ddc
commit ebcd81136b
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins/debugger/cdb/cdbparsehelpers.cpp
View File

@@ -503,26 +503,41 @@ bool parseCdbDisassemblerFunctionLine(const QString &l,
return true;
}
// Parse an instruction line:
// ' 21 00000001`3fcebff1 8b4030 mov eax,dword ptr [rax+30h]'
// '<source_line> <address> <raw data> <instruction>
bool parseCdbDisassemblerLine(const QString &lineIn, DisassemblerLine *dLine, uint *sourceLine)
/* Parse an instruction line, CDB 6.12:
* 0123456
* ' 21 00000001`3fcebff1 8b4030 mov eax,dword ptr [rax+30h]'
* or CDB 6.11 (source line and address joined, 725 being the source line number):
* 0123456
* ' 725078bb291 8bec mov ebp,esp
* '<source_line>[ ]?<address> <raw data> <instruction> */
bool parseCdbDisassemblerLine(const QString &line, DisassemblerLine *dLine, uint *sourceLine)
{
*sourceLine = 0;
if (lineIn.size() < 6)
if (line.size() < 6)
return false;
// Check source line: right-padded 5 digits
const bool hasSourceLine = lineIn.at(4).isDigit();
const QString line = lineIn.trimmed();
int addressPos = 0;
const QChar blank = QLatin1Char(' ');
// Optional source line.
if (hasSourceLine) {
const int sourceLineEnd = line.indexOf(blank);
int addressPos = 0;
// Check for joined source and address in 6.11
const bool hasV611SourceLine = line.at(5).isDigit();
const bool hasV612SourceLine = !hasV611SourceLine && line.at(4).isDigit();
if (hasV611SourceLine) {
// v6.11: Fixed 5 source line columns, joined
*sourceLine = line.left(5).trimmed().toUInt();
addressPos = 5;
} else if (hasV612SourceLine) {
// v6.12: Free format columns
const int sourceLineEnd = line.indexOf(blank, 4);
if (sourceLineEnd == -1)
return false;
*sourceLine = line.left(sourceLineEnd).toUInt();
return false;
*sourceLine = line.left(sourceLineEnd).trimmed().toUInt();
addressPos = sourceLineEnd + 1;
} else {
// Skip source line column.
const int size = line.size();
for ( ; addressPos < size && line.at(addressPos).isSpace(); ++addressPos) ;
if (addressPos == size)
return false;
}
// Find positions of address/raw data/instruction
const int addressEnd = line.indexOf(blank, addressPos + 1);