- Stop using inheritance for CPU, instead use composition.

- Introduce KAIZEN_JIT_ENABLED optional define instead of relying on __aarch64__ and the like. - More cache work
2026-04-28 18:01:43 +02:00
parent 68e613057e
commit e140a6d124
19 changed files with 2868 additions and 2835 deletions
@@ -4,40 +4,41 @@
 #include <imgui.h>

 CPUSettings::CPUSettings() {
-  if (Options::GetInstance().GetValue<std::string>("cpu", "type") == "jit") {
-    selectedCpuTypeIndex = 1;
-  } else {
-    selectedCpuTypeIndex = 0;
-  }
+    if (Options::GetInstance().GetValue<std::string>("cpu", "type") == "jit") {
+        selectedCpuTypeIndex = 1;
+    } else {
+        selectedCpuTypeIndex = 0;
+    }
 }

 void CPUSettings::render() {
-  const char* items[] = {
-    "Interpreter",
-    "Dynamic Recompiler"
-  };
+    const char *items[] = {"Interpreter",
+#ifdef KAIZEN_JIT_ENABLED
+                           "Dynamic Recompiler"
+#endif
+    };

-  const char* combo_preview_value = items[selectedCpuTypeIndex];
-  if (ImGui::BeginCombo("CPU Type", combo_preview_value)) {
-    for (int n = 0; n < IM_ARRAYSIZE(items); n++) {      
-      const bool is_selected = (selectedCpuTypeIndex == n);
-      if (ImGui::Selectable(items[n], is_selected)) {
-        selectedCpuTypeIndex = n;
-        modified = true;
-      }
-      
-      // Set the initial focus when opening the combo (scrolling + keyboard navigation focus)
-      if (is_selected)
-        ImGui::SetItemDefaultFocus();
-    }
-    ImGui::EndCombo();
-  }
+    const char *combo_preview_value = items[selectedCpuTypeIndex];
+    if (ImGui::BeginCombo("CPU Type", combo_preview_value)) {
+        for (int n = 0; n < IM_ARRAYSIZE(items); n++) {
+            const bool is_selected = (selectedCpuTypeIndex == n);
+            if (ImGui::Selectable(items[n], is_selected)) {
+                selectedCpuTypeIndex = n;
+                modified = true;
+            }

-  if(modified) {
-    if(selectedCpuTypeIndex == 0) {
-      Options::GetInstance().SetValue<std::string>("cpu", "type", "interpreter");
-    } else {
-      Options::GetInstance().SetValue<std::string>("cpu", "type", "jit");
+            // Set the initial focus when opening the combo (scrolling + keyboard navigation focus)
+            if (is_selected)
+                ImGui::SetItemDefaultFocus();
+        }
+        ImGui::EndCombo();
+    }
+
+    if (modified) {
+        if (selectedCpuTypeIndex == 0) {
+            Options::GetInstance().SetValue<std::string>("cpu", "type", "interpreter");
+        } else {
+            Options::GetInstance().SetValue<std::string>("cpu", "type", "jit");
+        }
    }
-  }
 }