Update file(s): 2024-05-15

horsicq · May 15, 2024 · 12a185c · 12a185c
1 parent 2a2c82d
commit 12a185c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/xdisasmview.cpp b/xdisasmview.cpp
@@ -919,6 +919,8 @@ XDisasmView::COLOR_RECORD XDisasmView::getOperandColor(QString sOperand)
                 result = g_mapColors.value(XOptions::ID_DISASM_COLOR_REGS);
                 if (bGeneralReg) {
                     result = g_mapColors.value(XOptions::ID_DISASM_COLOR_ARM_REGS_GENERAL);
+                } else if (bGeneralReg) {
+                    result = g_mapColors.value(XOptions::ID_DISASM_COLOR_ARM_REGS_STACK);
                 }
             }
         }

diff --git a/xdisasmviewoptionswidget.cpp b/xdisasmviewoptionswidget.cpp
@@ -105,6 +105,7 @@ void XDisasmViewOptionsWidget::setDefaultValues(XOptions *pOptions, MODE mode)
     if ((mode == MODE_ALL) || (mode == MODE_ARM)) {
         // ARM
         pOptions->addID(XOptions::ID_DISASM_COLOR_ARM_REGS_GENERAL, QString("%1|%2").arg(QColor(Qt::red).name(), ""));
+        pOptions->addID(XOptions::ID_DISASM_COLOR_ARM_REGS_STACK, QString("%1|%2").arg(QColor(Qt::red).name(), ""));
         pOptions->addID(XOptions::ID_DISASM_COLOR_ARM_OPCODE_B, QString("%1|%2").arg(QColor(Qt::red).name(), ""));
         pOptions->addID(XOptions::ID_DISASM_COLOR_ARM_OPCODE_BL, QString("%1|%2").arg(QColor(Qt::red).name(), ""));
         pOptions->addID(XOptions::ID_DISASM_COLOR_ARM_OPCODE_RET, QString("%1|%2").arg(QColor(Qt::red).name(), ""));
@@ -227,6 +228,10 @@ QList<DialogViewColors::RECORD> XDisasmViewOptionsWidget::getRecords(MODE mode)
             DialogViewColors::RECORD record = {sGroup, tr("General registers"), XOptions::ID_DISASM_COLOR_ARM_REGS_GENERAL};
             listResult.append(record);
         }
+        {
+            DialogViewColors::RECORD record = {sGroup, tr("Stack registers"), XOptions::ID_DISASM_COLOR_ARM_REGS_STACK};
+            listResult.append(record);
+        }
         {
             DialogViewColors::RECORD record = {sGroup, "B", XOptions::ID_DISASM_COLOR_ARM_OPCODE_B};
             listResult.append(record);

diff --git a/xmultidisasmwidget.cpp b/xmultidisasmwidget.cpp
@@ -103,7 +103,7 @@ void XMultiDisasmWidget::setData(QIODevice *pDevice, const OPTIONS &options)
     g_options = options;
 
     if (pDevice) {
-        XFormats::setFileTypeComboBox(options.fileType, pDevice, ui->comboBoxType);
+        XFormats::setFileTypeComboBox(options.fileType, pDevice, ui->comboBoxType, XBinary::TL_OPTION_EXECUTABLE);
     } else {
         ui->scrollAreaDisasm->setDevice(nullptr);
     }