2 files changed, 50 insertions, 10 deletions

diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
index 0d4ab95b7..369a081cd 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp
@@ -142,10 +142,30 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable&
     // Timing
     config.wall_clock_cntpct = uses_wall_clock;
 
-    // Optimizations
-    if (Settings::values.disable_cpu_opt) {
-        config.enable_optimizations = false;
-        config.enable_fast_dispatch = false;
+    // Safe optimizations
+    if (!Settings::values.cpuopt_page_tables) {
+        config.page_table = nullptr;
+    }
+    if (!Settings::values.cpuopt_block_linking) {
+        config.optimizations &= ~Dynarmic::OptimizationFlag::BlockLinking;
+    }
+    if (!Settings::values.cpuopt_return_stack_buffer) {
+        config.optimizations &= ~Dynarmic::OptimizationFlag::ReturnStackBuffer;
+    }
+    if (!Settings::values.cpuopt_fast_dispatcher) {
+        config.optimizations &= ~Dynarmic::OptimizationFlag::FastDispatch;
+    }
+    if (!Settings::values.cpuopt_context_elimination) {
+        config.optimizations &= ~Dynarmic::OptimizationFlag::GetSetElimination;
+    }
+    if (!Settings::values.cpuopt_const_prop) {
+        config.optimizations &= ~Dynarmic::OptimizationFlag::ConstProp;
+    }
+    if (!Settings::values.cpuopt_misc_ir) {
+        config.optimizations &= ~Dynarmic::OptimizationFlag::MiscIROpt;
+    }
+    if (!Settings::values.cpuopt_reduce_misalign_checks) {
+        config.only_detect_misalignment_via_page_table_on_page_boundary = false;
     }
 
     return std::make_unique<Dynarmic::A32::Jit>(config);
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
index 790981034..e208a4aa7 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp
@@ -191,15 +191,35 @@ std::shared_ptr<Dynarmic::A64::Jit> ARM_Dynarmic_64::MakeJit(Common::PageTable&
     // Unpredictable instructions
     config.define_unpredictable_behaviour = true;
 
-    // Optimizations
-    if (Settings::values.disable_cpu_opt) {
-        config.enable_optimizations = false;
-        config.enable_fast_dispatch = false;
-    }
-
     // Timing
     config.wall_clock_cntpct = uses_wall_clock;
 
+    // Safe optimizations
+    if (!Settings::values.cpuopt_page_tables) {
+        config.page_table = nullptr;
+    }
+    if (!Settings::values.cpuopt_block_linking) {
+        config.optimizations &= ~Dynarmic::OptimizationFlag::BlockLinking;
+    }
+    if (!Settings::values.cpuopt_return_stack_buffer) {
+        config.optimizations &= ~Dynarmic::OptimizationFlag::ReturnStackBuffer;
+    }
+    if (!Settings::values.cpuopt_fast_dispatcher) {
+        config.optimizations &= ~Dynarmic::OptimizationFlag::FastDispatch;
+    }
+    if (!Settings::values.cpuopt_context_elimination) {
+        config.optimizations &= ~Dynarmic::OptimizationFlag::GetSetElimination;
+    }
+    if (!Settings::values.cpuopt_const_prop) {
+        config.optimizations &= ~Dynarmic::OptimizationFlag::ConstProp;
+    }
+    if (!Settings::values.cpuopt_misc_ir) {
+        config.optimizations &= ~Dynarmic::OptimizationFlag::MiscIROpt;
+    }
+    if (!Settings::values.cpuopt_reduce_misalign_checks) {
+        config.only_detect_misalignment_via_page_table_on_page_boundary = false;
+    }
+
     return std::make_shared<Dynarmic::A64::Jit>(config);
 }