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

debugger: register view and disassembler window cosmetics

Browse Source
This commit is contained in:
hjk
2009-08-17 14:23:54 +02:00
parent 3089667d5a
commit 432ad0bfbc
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -4002,12 +4002,12 @@ static QByteArray parseLine(const GdbMi &line)
QByteArray ba; QByteArray ba;
ba.reserve(200); ba.reserve(200);
QByteArray address = line.findChild("address").data(); QByteArray address = line.findChild("address").data();
QByteArray funcName = line.findChild("func-name").data(); //QByteArray funcName = line.findChild("func-name").data();
QByteArray offset = line.findChild("offset").data(); //QByteArray offset = line.findChild("offset").data();
QByteArray inst = line.findChild("inst").data(); QByteArray inst = line.findChild("inst").data();
ba += address + QByteArray(15 - address.size(), ' '); ba += address + QByteArray(15 - address.size(), ' ');
ba += funcName + "+" + offset + " "; //ba += funcName + "+" + offset + " ";
ba += QByteArray(30 - funcName.size() - offset.size(), ' '); //ba += QByteArray(30 - funcName.size() - offset.size(), ' ');
ba += inst; ba += inst;
ba += '\n'; ba += '\n';
return ba; return ba;
@@ -4044,7 +4044,7 @@ static QString parseDisassembler(const GdbMi &lines)
fileLoaded = true; fileLoaded = true;
} }
if (line >= 0 && line < fileContents.size()) if (line >= 0 && line < fileContents.size())
ba += " " + fileContents.at(line) + '\n'; ba += " " + fileContents.at(line) + '\n';
GdbMi insn = child.findChild("line_asm_insn"); GdbMi insn = child.findChild("line_asm_insn");
foreach (const GdbMi &line, insn.children()) foreach (const GdbMi &line, insn.children())

5
src/plugins/debugger/registerhandler.cpp
View File

@@ -77,9 +77,10 @@ QVariant RegisterHandler::data(const QModelIndex &index, int role) const
const Register &reg = m_registers.at(index.row()); const Register &reg = m_registers.at(index.row());
if (role == Qt::UserRole + 1) { if (role == Qt::UserRole + 1) {
// return some address associated with the register
bool ok = true; bool ok = true;
qulonglong value = reg.value.toULongLong(&ok, 0); qulonglong value = reg.value.toULongLong(&ok, 0);
return QString::fromLatin1("0x") + QString::number(value, 16); return ok ? QString::fromLatin1("0x") + QString::number(value, 16) : QVariant();
} }
const QString padding = " "; const QString padding = " ";
@@ -89,7 +90,7 @@ QVariant RegisterHandler::data(const QModelIndex &index, int role) const
case 1: { case 1: {
bool ok = true; bool ok = true;
qulonglong value = reg.value.toULongLong(&ok, 0); qulonglong value = reg.value.toULongLong(&ok, 0);
return padding + QString::number(value, m_base) + padding; return ok ? padding + QString::number(value, m_base) + padding : reg.value;
} }
} }
} }