forked from qt-creator/qt-creator
debugger: register view and disassembler window cosmetics
This commit is contained in:
@@ -4002,12 +4002,12 @@ static QByteArray parseLine(const GdbMi &line)
|
||||
QByteArray ba;
|
||||
ba.reserve(200);
|
||||
QByteArray address = line.findChild("address").data();
|
||||
QByteArray funcName = line.findChild("func-name").data();
|
||||
QByteArray offset = line.findChild("offset").data();
|
||||
//QByteArray funcName = line.findChild("func-name").data();
|
||||
//QByteArray offset = line.findChild("offset").data();
|
||||
QByteArray inst = line.findChild("inst").data();
|
||||
ba += address + QByteArray(15 - address.size(), ' ');
|
||||
ba += funcName + "+" + offset + " ";
|
||||
ba += QByteArray(30 - funcName.size() - offset.size(), ' ');
|
||||
//ba += funcName + "+" + offset + " ";
|
||||
//ba += QByteArray(30 - funcName.size() - offset.size(), ' ');
|
||||
ba += inst;
|
||||
ba += '\n';
|
||||
return ba;
|
||||
|
@@ -77,9 +77,10 @@ QVariant RegisterHandler::data(const QModelIndex &index, int role) const
|
||||
const Register ® = m_registers.at(index.row());
|
||||
|
||||
if (role == Qt::UserRole + 1) {
|
||||
// return some address associated with the register
|
||||
bool ok = true;
|
||||
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 = " ";
|
||||
@@ -89,7 +90,7 @@ QVariant RegisterHandler::data(const QModelIndex &index, int role) const
|
||||
case 1: {
|
||||
bool ok = true;
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user