Store processor extension selection between invocations

mortbopet · Jan 30, 2022 · 8bfe673 · 8bfe673
1 parent c1e6e11
commit 8bfe673
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/processorhandler.cpp b/src/processorhandler.cpp
@@ -20,6 +20,7 @@ ProcessorHandler::ProcessorHandler() {
     m_constructing = true;
 
     // Contruct the default processor
+    // Processor ID
     if (RipesSettings::value(RIPES_SETTING_PROCESSOR_ID).isNull()) {
         m_currentID = ProcessorID::RV32_5S;
     } else {
@@ -28,8 +29,15 @@ ProcessorHandler::ProcessorHandler() {
         // Some sanity checking
         m_currentID = m_currentID >= ProcessorID::NUM_PROCESSORS ? ProcessorID::RV32_5S : m_currentID;
     }
-    _selectProcessor(m_currentID, ProcessorRegistry::getDescription(m_currentID).isaInfo().isa->supportedExtensions(),
-                     ProcessorRegistry::getDescription(m_currentID).defaultRegisterVals);
+
+    // Processor extensions
+    QStringList extensions;
+    if (RipesSettings::value(RIPES_SETTING_PROCESSOR_EXTENSIONS).isNull())
+        extensions = ProcessorRegistry::getDescription(m_currentID).isaInfo().isa->supportedExtensions();
+    else
+        extensions = RipesSettings::value(RIPES_SETTING_PROCESSOR_EXTENSIONS).value<QStringList>();
+
+    _selectProcessor(m_currentID, extensions, ProcessorRegistry::getDescription(m_currentID).defaultRegisterVals);
 
     // The m_procStateChangeTimer limits maximum frequency of which the procStateChangedNonRun is emitted.
     m_procStateChangeTimer.setSingleShot(true);
@@ -248,6 +256,7 @@ void ProcessorHandler::_selectProcessor(const ProcessorID& id, const QStringList
     m_currentID = id;
     m_currentRegInits = setup;
     RipesSettings::setValue(RIPES_SETTING_PROCESSOR_ID, id);
+    RipesSettings::setValue(RIPES_SETTING_PROCESSOR_EXTENSIONS, extensions);
 
     // Keep current program if the ISA between the two processors are identical
     const bool keepProgram =

diff --git a/src/ripessettings.cpp b/src/ripessettings.cpp
@@ -53,6 +53,7 @@ const std::map<QString, QVariant> s_defaultSettings = {
     {RIPES_SETTING_VIEW_ZOOM, 250},
     {RIPES_SETTING_PERIPHERAL_SETTINGS, ""},
     {RIPES_SETTING_PROCESSOR_ID, QVariant() /* Let processorhandler define default */},
+    {RIPES_SETTING_PROCESSOR_EXTENSIONS, QVariant() /* Let processorhandler define default */},
     {RIPES_SETTING_PROCESSOR_LAYOUT_ID, 0},
     {RIPES_SETTING_FOLLOW_EXEC, "true"},
     {RIPES_SETTING_SOURCECODE, ""},

diff --git a/src/ripessettings.h b/src/ripessettings.h
@@ -42,6 +42,7 @@ namespace Ripes {
 #define RIPES_SETTING_SETTING_TAB ("settings_tab")
 #define RIPES_SETTING_VIEW_ZOOM ("view_zoom")
 #define RIPES_SETTING_PROCESSOR_ID ("processor_id")
+#define RIPES_SETTING_PROCESSOR_EXTENSIONS ("processor_extensions")
 #define RIPES_SETTING_PROCESSOR_LAYOUT_ID ("processor_layout_id")
 #define RIPES_SETTING_FOLLOW_EXEC ("follow_execution")
 #define RIPES_SETTING_INPUT_TYPE ("input_type")