summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/settings.cpp8
-rw-r--r--src/common/settings.h14
2 files changed, 16 insertions, 6 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 4666bd0a0..88f509ba7 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -160,12 +160,16 @@ static bool is_nce_enabled = false;
void SetNceEnabled(bool is_39bit) {
const bool is_nce_selected = values.cpu_backend.GetValue() == CpuBackend::Nce;
- is_nce_enabled = IsFastmemEnabled() && is_nce_selected && is_39bit;
- if (is_nce_selected && !is_nce_enabled) {
+ if (is_nce_selected && !IsFastmemEnabled()) {
+ LOG_WARNING(Common, "Fastmem is required to natively execute code in a performant manner, "
+ "falling back to Dynarmic");
+ }
+ if (is_nce_selected && !is_39bit) {
LOG_WARNING(
Common,
"Program does not utilize 39-bit address space, unable to natively execute code");
}
+ is_nce_enabled = IsFastmemEnabled() && is_nce_selected && is_39bit;
}
bool IsNceEnabled() {
diff --git a/src/common/settings.h b/src/common/settings.h
index 98341ad96..7dc18fffe 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -180,14 +180,20 @@ struct Values {
&use_speed_limit};
// Cpu
- SwitchableSetting<CpuBackend, true> cpu_backend{
- linkage, CpuBackend::Dynarmic, CpuBackend::Dynarmic,
+ SwitchableSetting<CpuBackend, true> cpu_backend{linkage,
#ifdef HAS_NCE
- CpuBackend::Nce,
+ CpuBackend::Nce,
#else
CpuBackend::Dynarmic,
#endif
- "cpu_backend", Category::Cpu};
+ CpuBackend::Dynarmic,
+#ifdef HAS_NCE
+ CpuBackend::Nce,
+#else
+ CpuBackend::Dynarmic,
+#endif
+ "cpu_backend",
+ Category::Cpu};
SwitchableSetting<CpuAccuracy, true> cpu_accuracy{linkage, CpuAccuracy::Auto,
CpuAccuracy::Auto, CpuAccuracy::Paranoid,
"cpu_accuracy", Category::Cpu};