Merge pull request #3517 from Sonicadvance1/remove_mman

FEXCore: Removes vestigial mman SMC checking
FEX-Emu · Mar 27, 2024 · 542f454 · 542f454
2 parents 4ea6305 + 6f29e75
commit 542f454
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/FEXCore/Source/Interface/Config/Config.json.in b/FEXCore/Source/Interface/Config/Config.json.in
@@ -379,9 +379,8 @@
         "Desc": [
           "Checks code for modification before execution.",
           "\tnone: No checks",
-          "\tmtrack: Page tracking based invalidation",
-          "\tfull: Validate code before every run (slow)",
-          "\tmman: Invalidate on mmap, mprotect, munmap (deprecated, use mtrack)"
+          "\tmtrack: Page tracking based invalidation (default)",
+          "\tfull: Validate code before every run (slow)"
         ]
       },
       "TSOEnabled": {

diff --git a/FEXCore/include/FEXCore/Config/Config.h b/FEXCore/include/FEXCore/Config/Config.h
@@ -35,8 +35,6 @@ namespace Handler {
       return "1";
     else if (Value == "full")
       return "2";
-    else if (Value == "mman")
-      return "3";
     return "0";
   }
   static inline std::optional<fextl::string> CacheObjectCodeHandler(std::string_view Value) {
@@ -67,7 +65,6 @@ namespace Handler {
     CONFIG_SMC_NONE,
     CONFIG_SMC_MTRACK,
     CONFIG_SMC_FULL,
-    CONFIG_SMC_MMAN,
   };
 
   enum ConfigObjectCodeHandler {

diff --git a/Source/Tools/FEXConfig/Main.cpp b/Source/Tools/FEXConfig/Main.cpp
@@ -568,7 +568,7 @@ namespace {
       }
 
       ImGui::Text("SMC Checks: ");
-      int SMCChecks = FEXCore::Config::CONFIG_SMC_MMAN;
+      int SMCChecks = FEXCore::Config::CONFIG_SMC_MTRACK;
 
       Value = LoadedConfig->Get(FEXCore::Config::ConfigOption::CONFIG_SMCCHECKS);
       if (Value.has_value()) {
@@ -578,16 +578,13 @@ namespace {
           SMCChecks = FEXCore::Config::CONFIG_SMC_MTRACK;
         } else if (**Value == "2") {
           SMCChecks = FEXCore::Config::CONFIG_SMC_FULL;
-        } else if (**Value == "3") {
-          SMCChecks = FEXCore::Config::CONFIG_SMC_MMAN;
         }
       }
 
       bool SMCChanged = false;
       SMCChanged |= ImGui::RadioButton("None", &SMCChecks, FEXCore::Config::CONFIG_SMC_NONE); ImGui::SameLine();
       SMCChanged |= ImGui::RadioButton("MTrack (Default)", &SMCChecks, FEXCore::Config::CONFIG_SMC_MTRACK); ImGui::SameLine();
       SMCChanged |= ImGui::RadioButton("Full", &SMCChecks, FEXCore::Config::CONFIG_SMC_FULL);
-      SMCChanged |= ImGui::RadioButton("MMan (Deprecated)", &SMCChecks, FEXCore::Config::CONFIG_SMC_MMAN); ImGui::SameLine();
 
       if (SMCChanged) {
         LoadedConfig->EraseSet(FEXCore::Config::ConfigOption::CONFIG_SMCCHECKS, std::to_string(SMCChecks));