Do CPU mode parameter updates later, just before starting emulation.

diff --git a/newcpu.cpp b/newcpu.cpp
index d64a94f2f5d34643bf2225c67274ddbc03ddc3f1..e94d165a2129aa5b7eed226998afe0853a168d72 100644 (file)
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -1625,15 +1625,6 @@ void init_m68k (void)
        do_merges ();
 
        write_log (_T("%d CPU functions\n"), nr_cpuop_funcs);
-
-       build_cpufunctbl ();
-       set_x_funcs ();
-
-#ifdef JIT
-       /* We need to check whether NATMEM settings have changed
-       * before starting the CPU */
-       check_prefs_changed_comp(false);
-#endif
 }
 
 struct regstruct regs, mmu_backup_regs;
@@ -5450,6 +5441,8 @@ void m68k_go (int may_quit)
                        if (cpu_hardreset)
                                m68k_reset_restore();
                        prefs_changed_cpu();
+                       build_cpufunctbl();
+                       set_x_funcs();
                        set_cycles (start_cycles);
                        custom_reset (cpu_hardreset != 0, cpu_keyboardreset);
                        m68k_reset2 (cpu_hardreset != 0);