Missing IPL checks, 68020 timing changes. Normal MUL and DIV appears to have static...

diff --git a/gencpu.cpp b/gencpu.cpp
index c5c9237c9c2d786ca858680c2c7f31eea1c02db8..d6a0825fd98a07b599cc6a3e11774d14d298a22b 100644 (file)
--- a/gencpu.cpp
+++ b/gencpu.cpp
@@ -296,7 +296,7 @@ static int insn_n_cycles;
 static int tail_ce020, total_ce020, head_in_ea_ce020;
 static bool head_ce020_cycs_done, tail_ce020_done;
 static int subhead_ce020;
-static instr *curi_ce020;
+static struct instr *curi_ce020;
 static bool no_prefetch_ce020;
 static bool got_ea_ce020;
 
@@ -461,6 +461,28 @@ static bool isprefetch020(void)
        return true;
 }
 
+static void check_ipl(void)
+{
+       if (ipl_fetched)
+               return;
+       if (using_ce || isce020() || using_prefetch_020)
+               out("ipl_fetch();\n");
+       ipl_fetched = 1;
+}
+
+static void check_ipl_always(void)
+{
+       if (using_ce || isce020())
+               out("ipl_fetch();\n");
+}
+
+static void addcycles_020(int cycles)
+{
+       if (using_prefetch_020 || using_ce020) {
+               out("%s(%d);\n", do_cycles, cycles);
+       }
+}
+
 static void addcycles_ce020 (int cycles, const char *s)
 {
        if (!isce020())
@@ -485,6 +507,7 @@ static void get_prefetch_020 (void)
 {
        if (!isprefetch020() || no_prefetch_ce020)
                return;
+       check_ipl();
        out("regs.irc = %s(%d);\n", prefetch_opcode, m68k_pc_offset);
 }
 static void get_prefetch_020_continue(void)
@@ -1023,22 +1046,6 @@ static void makefromsr_t0(void)
                out("regs.ipl_pin = intlev();\n");
 }
 
-static void check_ipl (void)
-{
-       if (ipl_fetched)
-               return;
-       if (using_ce || isce020())
-               out("ipl_fetch();\n");
-       ipl_fetched = 1;
-}
-
-static void check_ipl_always(void)
-{
-       if (using_ce || isce020())
-               out("ipl_fetch();\n");
-}
-
-
 static void irc2ir (bool dozero)
 {
        if (!using_prefetch)
@@ -4802,7 +4809,7 @@ static void resetvars (void)
                        dstw = "x_put_word";
                        srcb = "x_get_byte";
                        dstb = "x_put_byte";
-                       do_cycles = "do_cycles_ce020_internal";
+                       do_cycles = "do_cycles_020_internal";
                        nextw = "next_iword_020ce";
                        nextl = "next_ilong_020ce";
                } else if (using_ce020 == 2) {
@@ -4820,7 +4827,7 @@ static void resetvars (void)
                        dstw = "x_put_word";
                        srcb = "x_get_byte";
                        dstb = "x_put_byte";
-                       do_cycles = "do_cycles_ce020_internal";
+                       do_cycles = "do_cycles_020_internal";
                        nextw = "next_iword_030ce";
                        nextl = "next_ilong_030ce";
                } else if (using_ce020 == 3) {
@@ -4837,7 +4844,7 @@ static void resetvars (void)
                        dstw = "x_put_word";
                        srcb = "x_get_byte";
                        dstb = "x_put_byte";
-                       do_cycles = "do_cycles_ce020_internal";
+                       do_cycles = "do_cycles_020_internal";
                        nextw = "next_iword_cache040";
                        nextl = "next_ilong_cache040";
                } else if (using_prefetch_020 == 1) {
@@ -4855,6 +4862,7 @@ static void resetvars (void)
                        dstb = "x_put_byte";
                        nextw = "next_iword_020_prefetch";
                        nextl = "next_ilong_020_prefetch";
+                       do_cycles = "do_cycles_020_internal";
                } else if (using_prefetch_020 == 2) {
                        disp020 = "x_get_disp_ea_020";
                        prefetch_word = "get_word_030_prefetch";
@@ -4870,6 +4878,7 @@ static void resetvars (void)
                        dstb = "x_put_byte";
                        nextw = "next_iword_030_prefetch";
                        nextl = "next_ilong_030_prefetch";
+                       do_cycles = "do_cycles_020_internal";
                }
 #if 0
        } else if (using_ce020) {
@@ -7445,6 +7454,7 @@ bccl_not68020:
                if (!do_always_dynamic_cycles) {
                        insn_n_cycles += 136 - (136 - 76) / 3; /* average */
                }
+               addcycles_020(34);
                tail_ce020_done = false;
                returntail(false);
                next_level_020_to_010();
@@ -7490,6 +7500,7 @@ bccl_not68020:
                if (!do_always_dynamic_cycles) {
                        insn_n_cycles += 156 - (156 - 120) / 3; /* average */
                }
+               addcycles_020(48);
                tail_ce020_done = false;
                returntail(false);
                next_level_020_to_010();
@@ -7511,6 +7522,7 @@ bccl_not68020:
                if (cpu_level <= 1) {
                        addcycles000_nonces("getMulu68kCycles(src)");
                }
+               addcycles_020(20);
                genastore("newv", curi->dmode, "dstreg", sz_long, "dst");
                sync_m68k_pc();
                count_ncycles++;
@@ -7536,6 +7548,7 @@ bccl_not68020:
                if (cpu_level <= 1) {
                        addcycles000_nonces("getMuls68kCycles(src)");
                }
+               addcycles_020(20);
                genastore("newv", curi->dmode, "dstreg", sz_long, "dst");
                count_ncycles++;
                if (!do_always_dynamic_cycles) {

diff --git a/include/cpu_prefetch.h b/include/cpu_prefetch.h
index f30b95fef8374e6b782a6bb78170828de976b884..670009557f7962c3a595ca54c5b072e8c0cf9d2c 100644 (file)
--- a/include/cpu_prefetch.h
+++ b/include/cpu_prefetch.h
@@ -80,6 +80,13 @@ STATIC_INLINE void do_cycles_ce020_internal(int clocks)
        x_do_cycles (cycs);
 }
 
+STATIC_INLINE void do_cycles_020_internal(int clocks)
+{
+       if (currprefs.m68k_speed < 0)
+               return;
+       x_do_cycles(clocks * cpucycleunit);
+}
+
 STATIC_INLINE void do_cycles_ce020_mem (int clocks, uae_u32 val)
 {
        x_do_cycles_post (clocks * cpucycleunit, val);

diff --git a/newcpu.cpp b/newcpu.cpp
index 52f6c9e2e3e5b7f9b7dc729992f35bf24852aa61..d1626f4442d82153b5fbfa9eb5ef30d8fa792881 100644 (file)
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -29,6 +29,7 @@
 #include "disasm.h"
 #include "cpummu.h"
 #include "cpummu030.h"
+#include "cputbl.h"
 #include "cpu_prefetch.h"
 #include "autoconf.h"
 #include "traps.h"
@@ -2027,14 +2028,15 @@ static void update_68k_cycles (void)
        }
        if (cpucycleunit < 1)
                cpucycleunit = 1;
-       if (!currprefs.cpu_cycle_exact && currprefs.cpu_compatible) {
+#if 0
+       if (!currprefs.cpu_cycle_exact && !currprefs.cpu_memory_cycle_exact && currprefs.cpu_compatible) {
                if (cpucycleunit == CYCLE_UNIT / 2) {
                        cycles_mult = 0;
                } else {
                        cycles_mult = cpucycleunit * (CYCLES_DIV / (CYCLE_UNIT / 2));
                }
        }
-
+#endif
        if (currprefs.cpu_cycle_exact || currprefs.cpu_compatible)
                write_log (_T("CPU cycleunit: %d (%.3f)\n"), cpucycleunit, (float)cpucycleunit / CYCLE_UNIT);
        set_config_changed ();
@@ -6218,6 +6220,7 @@ void m68k_go (int may_quit)
                                build_cpufunctbl();
                                m68k_setpc_normal(pc);
                                fill_prefetch();
+                               update_68k_cycles();
                        }
                        if (cpu_prefs_changed_flag & 2) {
                                fixup_cpu(&changed_prefs);
@@ -9370,6 +9373,7 @@ void fill_prefetch_030_ntx(void)
                idx = add_prefetch_030(idx, regs.cacheholdingdata020 >> 16, pc2);
        }
 
+       ipl_fetch();
        if (currprefs.cpu_cycle_exact)
                regs.irc = get_word_ce030_prefetch_opcode (0);
        else
@@ -9424,6 +9428,7 @@ void fill_prefetch_030_ntx_continue (void)
                }
        }
 
+       ipl_fetch();
        if (currprefs.cpu_cycle_exact)
                regs.irc = get_word_ce030_prefetch_opcode (0);
        else
@@ -9455,6 +9460,7 @@ void fill_prefetch_020_ntx(void)
                idx = add_prefetch_030(idx, regs.cacheholdingdata020 >> 16, pc);
        }
 
+       ipl_fetch();
        if (currprefs.cpu_cycle_exact)
                regs.irc = get_word_ce020_prefetch_opcode (0);
        else