forked from qt-creator/qt-creator
Debugger: Rework GDB disassembly display
- Use exclusively CLI to retrieve information. MI output misses parts. - Remove MI output handling - Re-order lines in ascending address order in mixed output. GDB orders by source line, but that's confusing when stepping - Introduce a new 'hunk' field for source lines to give a hint which part of a split source line we are looking at. Change-Id: I61a547503e9a18f95e99b897e26dbb207cabb8cf Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
@@ -44,9 +44,8 @@ namespace Internal {
|
||||
|
||||
class DisassemblerLine
|
||||
{
|
||||
//DisassemblerLine(const QString &unparsed);
|
||||
public:
|
||||
DisassemblerLine() : address(0), offset(0), lineNumber(0) {}
|
||||
DisassemblerLine() : address(0), offset(0), lineNumber(0), hunk(0) {}
|
||||
bool isAssembler() const { return address != 0; }
|
||||
bool isCode() const { return lineNumber != 0; }
|
||||
bool isComment() const { return lineNumber == 0 && address == 0; }
|
||||
@@ -61,6 +60,7 @@ public:
|
||||
QString function; // (ass) Function to which current instruction belongs.
|
||||
uint offset; // (ass) Offset of instruction in relation to current function.
|
||||
uint lineNumber; // (src) Line number in source.
|
||||
uint hunk; // (src) Number of hunk if source line was split
|
||||
QByteArray rawData; // (ass) Raw bytes of the instruction
|
||||
QString data; // (ass) Instruction text, (src) source text, (cmt) arbitrary.
|
||||
};
|
||||
@@ -80,6 +80,7 @@ public:
|
||||
int size() const { return m_data.size(); }
|
||||
const DisassemblerLine &at(int i) const { return m_data.at(i); }
|
||||
int lineForAddress(quint64 address) const;
|
||||
QVector<DisassemblerLine> data() const { return m_data; }
|
||||
|
||||
quint64 startAddress() const;
|
||||
quint64 endAddress() const;
|
||||
|
||||
Reference in New Issue
Block a user