From 9128655e68e56261543aed5e15aa7df5ca24d2f8 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Wed, 5 Dec 2018 22:13:21 +0100 Subject: [PATCH] Added a few more CPU config checks on startup --- src/main.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index d8ff3804..0080d9ef 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -158,6 +158,11 @@ void fixup_cpu(struct uae_prefs *p) break; } + if (p->cpu_model < 68020 && p->cachesize) { + p->cachesize = 0; + error_log(_T("JIT requires 68020 or better CPU.")); + } + if (p->cpu_model >= 68020 && p->cachesize && p->cpu_compatible) p->cpu_compatible = false; @@ -166,6 +171,11 @@ void fixup_cpu(struct uae_prefs *p) p->fpu_no_unimplemented = false; } + if (p->cachesize && p->compfpu && p->fpu_mode > 0) { + error_log(_T("JIT FPU emulation is not compatible with softfloat FPU emulation.")); + p->fpu_mode = 0; + } + if (p->immediate_blits && p->waiting_blits) { error_log(_T("Immediate blitter and waiting blits can't be enabled simultaneously.\n")); p->waiting_blits = 0;