VERY experimental Nintendo Switch 2 emulator
C++
revert 22847ec78a4369497855672db71977ead871c49d (#331)
Shinmegumieb80a30c42e9
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cppindex 798623a5fa..db159388bf 100644--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp@@ -269,13 +269,8 @@ std::shared_ptr<Dynarmic::A32::Jit> ArmDynarmic32::MakeJit(Common::PageTable* paconfig.check_halt_on_memory_access = true;}} else {-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun__)- config.fastmem_pointer = std::nullopt;- config.fastmem_exclusive_access = false;-#endif- switch (Settings::values.cpu_accuracy.GetValue()) {// Unsafe optimizations- case Settings::CpuAccuracy::Unsafe:+ if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Unsafe) {config.unsafe_optimizations = true;if (Settings::values.cpuopt_unsafe_unfuse_fma) {config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;@@ -292,22 +287,21 @@ std::shared_ptr<Dynarmic::A32::Jit> ArmDynarmic32::MakeJit(Common::PageTable* paif (Settings::values.cpuopt_unsafe_ignore_global_monitor) {config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_IgnoreGlobalMonitor;}- break;+ }+// Curated optimizations- case Settings::CpuAccuracy::Auto:+ if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Auto) {config.unsafe_optimizations = true;config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_IgnoreStandardFPCRValue;config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_InaccurateNaN;config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_IgnoreGlobalMonitor;- break;+ }+// Paranoia mode for debugging optimizations- case Settings::CpuAccuracy::Paranoid:+ if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Paranoid) {config.unsafe_optimizations = false;config.optimizations = Dynarmic::no_optimizations;- break;- default:- break;}}diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cppindex 7b59ce2633..dcff0ddf3f 100644--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp@@ -327,13 +327,8 @@ std::shared_ptr<Dynarmic::A64::Jit> ArmDynarmic64::MakeJit(Common::PageTable* paconfig.check_halt_on_memory_access = true;}} else {-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun__)- config.fastmem_pointer = std::nullopt;- config.fastmem_exclusive_access = false;-#endif// Unsafe optimizations- switch(Settings::values.cpu_accuracy.GetValue()) {- case Settings::CpuAccuracy::Unsafe:+ if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Unsafe) {config.unsafe_optimizations = true;if (Settings::values.cpuopt_unsafe_unfuse_fma) {config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;@@ -350,21 +345,20 @@ std::shared_ptr<Dynarmic::A64::Jit> ArmDynarmic64::MakeJit(Common::PageTable* paif (Settings::values.cpuopt_unsafe_ignore_global_monitor) {config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_IgnoreGlobalMonitor;}- break;+ }+// Curated optimizations- case Settings::CpuAccuracy::Auto:+ if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Auto) {config.unsafe_optimizations = true;config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;config.fastmem_address_space_bits = 64;config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_IgnoreGlobalMonitor;- break;+ }+// Paranoia mode for debugging optimizations- case Settings::CpuAccuracy::Paranoid:+ if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Paranoid) {config.unsafe_optimizations = false;config.optimizations = Dynarmic::no_optimizations;- break;- default:- break;}}