debugger: re-work DisassemblerLine structure

src/plugins/debugger/disassemblerlines.h

@@ -41,15 +41,31 @@
 namespace Debugger {
 namespace Internal {
 
+// A DisassemblerLine represents either
+//  - an assembler instruction (address, offset, function, data fields), or
+//  - a code line (lineNumber, data fields), or
+//  - a comment line.
+
 class DisassemblerLine
 {
+    //DisassemblerLine(const QString &unparsed);
 public:
-    DisassemblerLine() : address(0) {}
-    DisassemblerLine(const QString &unparsed);
+    DisassemblerLine() : address(0), offset(0), lineNumber(0) {}
+    bool isAssembler() const { return address != 0; }
+    bool isCode() const { return lineNumber != 0; }
+    bool isComment() const { return lineNumber == 0 && address == 0; }
+    QString toString() const;
+    void fromString(const QString &unparsed);
+
+    // Return address of an assembly line "0x0dfd  bla".
+    static quint64 addressFromDisassemblyLine(const QString &line);
 
 public:
-    quint64 address;
-    QString data;
+    quint64 address;  // (ass) Address of instruction in memory/in binary.
+    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.
+    QString data;     // (ass) Instruction text, (src) source text, (cmt) arbitrary.
 };
 
 class DisassemblerLines
@@ -58,13 +74,14 @@ public:
     DisassemblerLines() {}
 
     bool coversAddress(quint64 address) const;
+    void appendUnparsed(const QString &line);
     void appendLine(const DisassemblerLine &dl);
-    void appendComment(const QString &comment);
     int size() const { return m_data.size(); }
     const DisassemblerLine &at(int i) const { return m_data.at(i); }
     int lineForAddress(quint64 address) const;
 
 private:
+    QString m_lastFunction;
     QVector<DisassemblerLine> m_data;
     QHash<quint64, int> m_rowCache;
 };