add option to hide hexdump

KDAB · Oct 30, 2023 · 163ea31 · 163ea31
1 parent cdc66a4
commit 163ea31
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 26 deletions.
diff --git a/src/disassemblysettingspage.ui b/src/disassemblysettingspage.ui
@@ -32,14 +32,14 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="1" column="0">
+   <item row="2" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Source Code Search Paths:</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
     <widget class="KEditListWidget" name="sourcePaths">
      <property name="buttons">
       <set>KEditListWidget::All</set>
@@ -60,6 +60,20 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Show hexdump:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QCheckBox" name="showHexdump">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>

diff --git a/src/models/disassemblymodel.cpp b/src/models/disassemblymodel.cpp
@@ -82,6 +82,8 @@ QVariant DisassemblyModel::headerData(int section, Qt::Orientation orientation,
         return tr("Address");
     else if (section == BranchColumn)
         return tr("Branches");
+    else if (section == HexdumpColumn)
+        return tr("Hexdump");
     else if (section == DisassemblyColumn)
         return tr("Assembly / Disassembly");
 
@@ -122,6 +124,8 @@ QVariant DisassemblyModel::data(const QModelIndex& index, int role) const
                 return QString::number(data.addr, 16);
             } else if (index.column() == BranchColumn) {
                 return data.branchVisualisation;
+            } else if (index.column() == HexdumpColumn) {
+                return data.hexdump;
             } else if (index.column() == DisassemblyColumn) {
                 const auto block = m_document->findBlockByLineNumber(index.row());
                 if (role == SyntaxHighlightRole)

diff --git a/src/models/disassemblymodel.h b/src/models/disassemblymodel.h
@@ -56,6 +56,7 @@ class DisassemblyModel : public QAbstractTableModel
     {
         AddrColumn,
         BranchColumn,
+        HexdumpColumn,
         DisassemblyColumn,
         COLUMN_COUNT
     };

diff --git a/src/models/disassemblyoutput.cpp b/src/models/disassemblyoutput.cpp
@@ -207,29 +207,25 @@ DisassemblyOutput::ObjectdumpOutput DisassemblyOutput::objdumpParse(const QByteA
             continue;
         }
 
-        // detect lines like:
-        //     4f616:\t<jumps>84 c0\ttest %al,%al
-        auto lineRest = QStringView(asmLine);
-
-        // <four spaces><hex addr>:\t
-        const auto addr = [&]() -> quint64 {
-            const auto prefix = QLatin1String("    ");
-            const auto suffix = QLatin1String(":\t");
-            if (!lineRest.startsWith(prefix))
-                return 0;
+        // a line looks like this:
+        // [spaces]addr:\t [branch visualisazion] [hexdump]\tdiassembly
+        // we can simplify parsing by splitting it into three parts
+
+        const auto parts = asmLine.split(QLatin1Char('\t'));
 
-            const auto addrEnd = lineRest.indexOf(suffix, prefix.size());
-            if (addrEnd == -1)
+        const auto addr = [addrString = parts.value(0).trimmed(), &asmLine]() -> uint64_t {
+            const auto suffix = QLatin1Char(':');
+            if (!addrString.endsWith(suffix))
                 return 0;
 
             bool ok = false;
-            auto ret = lineRest.mid(0, addrEnd).toULongLong(&ok, 16);
+            auto ret = addrString.toULongLong(&ok, 16);
+
             if (!ok) {
                 qCWarning(disassemblyoutput) << "unhandled asm line format:" << asmLine;
                 return 0;
             }
 
-            lineRest = lineRest.mid(addrEnd + suffix.size());
             return ret;
         }();
 
@@ -238,19 +234,23 @@ DisassemblyOutput::ObjectdumpOutput DisassemblyOutput::objdumpParse(const QByteA
         //    |   64 a3 ....
         //    \-> 65 23 ....
         // so we can simply skip all characters until we meet a letter or a number
-        const auto branchVisualisation = [&]() -> QStringView {
-            if (!addr)
-                return {};
-            auto firstHexIt = std::find_if(lineRest.cbegin(), lineRest.cend(), isHexCharacter);
-            auto size = std::distance(lineRest.cbegin(), firstHexIt);
-            auto ret = lineRest.mid(0, size);
-            lineRest = lineRest.mid(size);
-            return ret;
+        struct BranchesAndHexdump
+        {
+            QString branchVisualisation;
+            QString hexdump;
+        };
+        const auto [branchVisualisation, hexdump] = [branchesAndHex = parts.value(1)]() -> BranchesAndHexdump {
+            auto firstHexIt = std::find_if(branchesAndHex.cbegin(), branchesAndHex.cend(), isHexCharacter);
+            auto size = std::distance(branchesAndHex.cbegin(), firstHexIt);
+            auto branchVisualisation = branchesAndHex.mid(0, size);
+            auto hexdump = branchesAndHex.mid(size);
+            return {branchVisualisation, hexdump};
         }();
 
         disassemblyLines.push_back({addr,
-                                    lineRest.toString(),
-                                    branchVisualisation.toString(),
+                                    parts.value(3).trimmed(),
+                                    branchVisualisation,
+                                    hexdump,
                                     extractLinkedFunction(asmLine),
                                     {currentSourceFileName, sourceCodeLine}});
     }

diff --git a/src/models/disassemblyoutput.h b/src/models/disassemblyoutput.h
@@ -25,6 +25,7 @@ struct DisassemblyOutput
         quint64 addr = 0;
         QString disassembly;
         QString branchVisualisation;
+        QString hexdump;
         LinkedFunction linkedFunction;
         Data::FileLine fileLine;
     };

diff --git a/src/resultsdisassemblypage.cpp b/src/resultsdisassemblypage.cpp
@@ -411,11 +411,16 @@ ResultsDisassemblyPage::ResultsDisassemblyPage(CostContextMenu* costContextMenu,
                          m_disassemblyModel, &m_currentDisasmSearchIndex, 0);
 
     ui->assemblyView->setColumnHidden(DisassemblyModel::BranchColumn, !settings->showBranches());
+    ui->assemblyView->setColumnHidden(DisassemblyModel::HexdumpColumn, !settings->showHexdump());
 
     connect(settings, &Settings::showBranchesChanged, this, [this](bool showBranches) {
         ui->assemblyView->setColumnHidden(DisassemblyModel::BranchColumn, !showBranches);
     });
 
+    connect(settings, &Settings::showHexdumpChanged, this, [this](bool showHexdump) {
+        ui->assemblyView->setColumnHidden(DisassemblyModel::HexdumpColumn, !showHexdump);
+    });
+
 #if KFSyntaxHighlighting_FOUND
     QStringList schemes;
 
@@ -475,6 +480,7 @@ void ResultsDisassemblyPage::setupAsmViewModel()
     ui->assemblyView->header()->setStretchLastSection(false);
     ui->assemblyView->header()->setSectionResizeMode(DisassemblyModel::AddrColumn, QHeaderView::ResizeToContents);
     ui->assemblyView->header()->setSectionResizeMode(DisassemblyModel::BranchColumn, QHeaderView::Interactive);
+    ui->assemblyView->header()->setSectionResizeMode(DisassemblyModel::HexdumpColumn, QHeaderView::Interactive);
     ui->assemblyView->header()->setSectionResizeMode(DisassemblyModel::DisassemblyColumn, QHeaderView::Stretch);
 
     for (int col = DisassemblyModel::COLUMN_COUNT; col < m_disassemblyModel->columnCount(); col++) {

diff --git a/src/settings.cpp b/src/settings.cpp
@@ -243,6 +243,11 @@ void Settings::loadFromFile()
     connect(this, &Settings::showBranchesChanged, [sharedConfig](bool showBranches) {
         sharedConfig->group("Disassembly").writeEntry("showBranches", showBranches);
     });
+
+    setShowBranches(sharedConfig->group("Disassembly").readEntry("showHexdump", false));
+    connect(this, &Settings::showHexdumpChanged, [sharedConfig](bool showHexdump) {
+        sharedConfig->group("Disassembly").writeEntry("showHexdump", showHexdump);
+    });
 }
 
 void Settings::setSourceCodePaths(const QString& paths)
@@ -268,3 +273,11 @@ void Settings::setShowBranches(bool showBranches)
         emit showBranchesChanged(m_showBranches);
     }
 }
+
+void Settings::setShowHexdump(bool showHexdump)
+{
+    if (m_showHexdump != showHexdump) {
+        m_showHexdump = showHexdump;
+        emit showHexdumpChanged(m_showHexdump);
+    }
+}
diff --git a/src/settings.h b/src/settings.h
@@ -158,6 +158,10 @@ class Settings : public QObject
     {
         return m_showBranches;
     }
+    bool showHexdump() const
+    {
+        return m_showHexdump;
+    }
 
     void loadFromFile();
 
@@ -182,6 +186,7 @@ class Settings : public QObject
     void sourceCodePathsChanged(const QString& paths);
     void perfPathChanged(const QString& perfPath);
     void showBranchesChanged(bool showBranches);
+    void showHexdumpChanged(bool showHexdump);
 
 public slots:
     void setPrettifySymbols(bool prettifySymbols);
@@ -206,6 +211,7 @@ public slots:
     void setSourceCodePaths(const QString& paths);
     void setPerfPath(const QString& path);
     void setShowBranches(bool showBranches);
+    void setShowHexdump(bool showHexdump);
 
 private:
     Settings() = default;
@@ -230,6 +236,7 @@ public slots:
     QString m_sourceCodePaths;
     QString m_perfMapPath;
     bool m_showBranches = true;
+    bool m_showHexdump = false;
 
     QString m_lastUsedEnvironment;
 

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
@@ -336,9 +336,11 @@ void SettingsDialog::addSourcePathPage()
     setupMultiPath(disassemblyPage->sourcePaths, disassemblyPage->label, buttonBox()->button(QDialogButtonBox::Ok));
 
     disassemblyPage->showBranches->setChecked(settings->showBranches());
+    disassemblyPage->showHexdump->setChecked(settings->showHexdump());
 
     connect(buttonBox(), &QDialogButtonBox::accepted, this, [this, colon, settings] {
         settings->setSourceCodePaths(disassemblyPage->sourcePaths->items().join(colon));
         settings->setShowBranches(disassemblyPage->showBranches->isChecked());
+        settings->setShowHexdump(disassemblyPage->showHexdump->isChecked());
     });
 }