VERY experimental Nintendo Switch 2 emulator
C++
[jit] Disable fastmem (by default) on FreeBSD, Solaris and OpenBSD due to subpar timings of SIGSEGV (#319)
lizzie22847ec78a43
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cppindex db159388bf..798623a5fa 100644--- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp+++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp@@ -269,8 +269,13 @@ 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- if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Unsafe) {+ case Settings::CpuAccuracy::Unsafe:config.unsafe_optimizations = true;if (Settings::values.cpuopt_unsafe_unfuse_fma) {config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;@@ -287,21 +292,22 @@ 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- if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Auto) {+ case 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- if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Paranoid) {+ case 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 dcff0ddf3f..7b59ce2633 100644--- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp+++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp@@ -327,8 +327,13 @@ 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- if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Unsafe) {+ switch(Settings::values.cpu_accuracy.GetValue()) {+ case Settings::CpuAccuracy::Unsafe:config.unsafe_optimizations = true;if (Settings::values.cpuopt_unsafe_unfuse_fma) {config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;@@ -345,20 +350,21 @@ 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- if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Auto) {+ case 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- if (Settings::values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Paranoid) {+ case Settings::CpuAccuracy::Paranoid:config.unsafe_optimizations = false;config.optimizations = Dynarmic::no_optimizations;+ break;+ default:+ break;}}