68010 cycle count updates.

diff --git a/gencpu.cpp b/gencpu.cpp
index e72f92703857a170e9eb55d352b68cd7a523d04f..8d8cc5b515535feff0e22c4ec4538db196e6aa16 100644 (file)
--- a/gencpu.cpp
+++ b/gencpu.cpp
@@ -4645,7 +4645,9 @@ static void gen_opcode (unsigned int opcode)
                        if (curi->dmode == Dreg) {
                                c += 2;
                                if (curi->smode == imm || curi->smode == Dreg) {
-                                       c += 2;
+                                       if (cpu_level == 0) {
+                                               c += 2;
+                                       }
                                        fill_prefetch_next_after(1, "\t\tccr_68000_long_move_ae_LZN(src);\n\t\tdreg_68000_long_replace_low(dstreg, src);\n");
                                } else {
                                        fill_prefetch_next_after(1, "\t\tdreg_68000_long_replace_low(dstreg, src);\n");
@@ -4705,7 +4707,9 @@ static void gen_opcode (unsigned int opcode)
                        if (curi->dmode == Dreg) {
                                c += 2;
                                if (curi->smode == imm || curi->smode == immi || curi->smode == Dreg || curi->smode == Areg) {
-                                       c += 2;
+                                       if (cpu_level == 0) {
+                                               c += 2;
+                                       }
                                        fill_prefetch_next_after(1,
                                                "\t\tuae_s16 bnewv = (uae_s16)dst - (uae_s16)src;\n"
                                                "\t\tint bflgs = ((uae_s16)(src)) < 0;\n"
@@ -4870,7 +4874,9 @@ static void gen_opcode (unsigned int opcode)
                        if (curi->dmode == Dreg) {
                                c += 2;
                                if (curi->smode == imm || curi->smode == immi || curi->smode == Dreg || curi->smode == Areg) {
-                                       c += 2;
+                                       if (cpu_level == 0) {
+                                               c += 2;
+                                       }
                                        fill_prefetch_next_after(1,
                                                "\t\tuae_s16 bnewv = (uae_s16)dst + (uae_s16)src;\n"
                                                "\t\tint bflgs = ((uae_s16)(src)) < 0;\n"
@@ -5577,6 +5583,10 @@ static void gen_opcode (unsigned int opcode)
                                                }
                                        }
                                        prefetch_done = 1;
+                                       // MOVE.L reg,-(an): 2 extra cycles if 68010
+                                       if (cpu_level == 1 && isreg(curi->smode) && curi->size == sz_long) {
+                                               addcycles000(2);
+                                       }
                                }
 
                                int storeflags = 0;
@@ -6494,7 +6504,7 @@ static void gen_opcode (unsigned int opcode)
                pop_ins_cnt();
                printf("\t}\n");
                sync_m68k_pc ();
-               if (cpu_level != 1 || curi->size != sz_byte) {
+               if (cpu_level != 1 && curi->size != sz_byte) {
                        addcycles000(2);
                }
                get_prefetch_020_continue ();
@@ -6636,9 +6646,11 @@ bccl_not68020:
                printf("\t\t}\n");
                add_head_cycs (10);
                addcycles000_nonce("\t\t", 2 + 2);
-               printf("\t} else {\n");
-               addcycles000_onlyce(2);
-               addcycles000_nonce("\t\t", 2);
+               if (cpu_level == 0) {
+                       printf("\t} else {\n");
+                       addcycles000_onlyce(2);
+                       addcycles000_nonce("\t\t", 2);
+               }
                printf("\t}\n");
                pop_ins_cnt();
                setpc ("oldpc + %d", m68k_pc_offset);
@@ -6690,20 +6702,19 @@ bccl_not68020:
                printf("\tuae_u32 newv = (uae_u32)dst / (uae_u32)(uae_u16)src;\n");
                printf("\tuae_u32 rem = (uae_u32)dst %% (uae_u32)(uae_u16)src;\n");
                if (using_ce) {
-                       start_brace();
-                       printf("\t\tint cycles = (getDivu68kCycles((uae_u32)dst, (uae_u16)src)) - 4;\n");
-                       addcycles000_3("\t\t");
+                       printf("\tint cycles = getDivu68kCycles((uae_u32)dst, (uae_u16)src);\n");
+                       addcycles000_3("\t");
                }
-               addcycles000_nonces("\t\t", "(getDivu68kCycles((uae_u32)dst, (uae_u16)src)) - 4");
-               printf("\t\tif (newv > 0xffff) {\n");
-               printf("\t\t\tsetdivuflags((uae_u32)dst, (uae_u16)src);\n");
-               printf("\t\t} else {\n");
-               printf("\t\t");
+               addcycles000_nonces("\t", "getDivu68kCycles((uae_u32)dst, (uae_u16)src)");
+               printf("\tif (newv > 0xffff) {\n");
+               printf("\t\tsetdivuflags((uae_u32)dst, (uae_u16)src);\n");
+               printf("\t} else {\n");
+               printf("\t");
                genflags (flag_logical, sz_word, "newv", "", "");
-               printf("\t\t\tnewv = (newv & 0xffff) | ((uae_u32)rem << 16);\n");
-               printf("\t\t");
+               printf("\t\tnewv = (newv & 0xffff) | ((uae_u32)rem << 16);\n");
+               printf("\t");
                genastore ("newv", curi->dmode, "dstreg", sz_long, "dst");
-               printf("\t\t}\n");
+               printf("\t}\n");
                fill_prefetch_next_t();
                sync_m68k_pc();
                count_ncycles++;
@@ -6723,11 +6734,10 @@ bccl_not68020:
                write_return_cycles("\t\t", 0);
                printf("\t}\n");
                if (using_ce) {
-                       start_brace();
-                       printf("\t\tint cycles = (getDivs68kCycles((uae_s32)dst, (uae_s16)src)) - 4;\n");
-                       addcycles000_3("\t\t");
+                       printf("\tint cycles = getDivs68kCycles((uae_s32)dst, (uae_s16)src);\n");
+                       addcycles000_3("\t");
                }
-               addcycles000_nonces("\t\t", "(getDivs68kCycles((uae_s32)dst, (uae_s16)src)) - 4");
+               addcycles000_nonces("\t", "getDivs68kCycles((uae_s32)dst, (uae_s16)src)");
                printf("\tif (dst == 0x80000000 && src == -1) {\n");
                printf("\t\tsetdivsflags((uae_s32)dst, (uae_s16)src);\n");
                printf("\t} else {\n");
@@ -6759,20 +6769,14 @@ bccl_not68020:
                        "\t\tSET_ZFLG(1);\n"
                        "\t\tm68k_dreg(regs, dstreg) &= 0xffff0000;\n");
                printf("\tuae_u32 newv = (uae_u32)(uae_u16)dst * (uae_u32)(uae_u16)src;\n");
-               if (using_ce)
-                       printf("\tint cycles = 38 - 4, bits;\n");
-               else if (using_prefetch)
-                       printf("\tint bits;\n");
                genflags (flag_logical, sz_long, "newv", "", "");
                if (using_ce) {
-                       printf("\tfor(bits = 0; bits < 16 && src; bits++, src >>= 1)\n");
-                       printf("\t\tif (src & 1) cycles += 2;\n");
-                       addcycles000_3 ("\t");
+                       printf("\tint cycles = getMulu68kCycles(src);\n");
+                       addcycles000_3("\t");
                }
-               addcycles000_nonce("\tfor(bits = 0; bits < 16 && src; bits++, src >>= 1)\n\t\tif (src & 1) ", 2);
+               addcycles000_nonces("\t", "getMulu68kCycles(src)");
                genastore ("newv", curi->dmode, "dstreg", sz_long, "dst");
                sync_m68k_pc ();
-               count_cycles += 38 - 4;
                count_ncycles++;
                insn_n_cycles += (70 - 38) / 2 + 38; /* average */
                break;
@@ -6785,23 +6789,13 @@ bccl_not68020:
                        "\t\tSET_ZFLG(1);\n"
                        "\t\tm68k_dreg(regs, dstreg) &= 0xffff0000;\n");
                printf("\tuae_u32 newv = (uae_s32)(uae_s16)dst * (uae_s32)(uae_s16)src;\n");
-               if (using_ce) {
-                       printf("\tint cycles = 38 - 4, bits;\n");
-                       printf("\tuae_u32 usrc;\n");
-               } else if (using_prefetch) {
-                       printf("\tint bits;\n");
-                       printf("\tuae_u32 usrc;\n");
-               }
                genflags (flag_logical, sz_long, "newv", "", "");
                if (using_ce) {
-                       printf("\tusrc = ((uae_u32)src) << 1;\n");
-                       printf("\tfor(bits = 0; bits < 16 && usrc; bits++, usrc >>= 1)\n");
-                       printf("\t\tif ((usrc & 3) == 1 || (usrc & 3) == 2) cycles += 2;\n");
-                       addcycles000_3 ("\t");
+                       printf("\tint cycles = getMuls68kCycles(src);\n");
+                       addcycles000_3("\t");
                }
-               addcycles000_nonce("\tusrc = ((uae_u32)src) << 1;\n\tfor(bits = 0; bits < 16 && usrc; bits++, usrc >>= 1)\n\t\tif ((usrc & 3) == 1 || (usrc & 3) == 2) ", 2);
+               addcycles000_nonces("\t", "getMuls68kCycles(src)");
                genastore ("newv", curi->dmode, "dstreg", sz_long, "dst");
-               count_cycles += 38 - 4;
                count_ncycles++;
                insn_n_cycles += (70 - 38) / 2 + 38; /* average */
                break;

diff --git a/include/newcpu.h b/include/newcpu.h
index 6ad514c00184575a26e9e1d748208885c560c81d..abbb0877460066621010c7e36fa3b36ec054e821 100644 (file)
--- a/include/newcpu.h
+++ b/include/newcpu.h
@@ -682,6 +682,8 @@ extern void init_m68k (void);
 extern void m68k_go (int);
 extern void m68k_dumpstate(uaecptr *, uaecptr);
 extern void m68k_dumpcache (bool);
+extern int getMulu68kCycles(uae_u16 src);
+extern int getMuls68kCycles(uae_u16 src);
 extern int getDivu68kCycles (uae_u32 dividend, uae_u16 divisor);
 extern int getDivs68kCycles (uae_s32 dividend, uae_s16 divisor);
 extern void divbyzero_special(bool issigned, uae_s32 dst);

diff --git a/newcpu_common.cpp b/newcpu_common.cpp
index 2d1b95aeaae6d4997c73b51b667f149cfdbee9ac..b9ec8d52da2ab51c308d8688db79e6f33008cf65 100644 (file)
--- a/newcpu_common.cpp
+++ b/newcpu_common.cpp
@@ -640,6 +640,40 @@ uae_u32 REGPARAM2 x_get_disp_ea_040(uae_u32 base, int idx)
 
 #endif
 
+
+int getMulu68kCycles(uae_u16 src)
+{
+       int cycles = 0;
+       if (currprefs.cpu_model == 68000) {
+               cycles = 38 - 4;
+       } else {
+               cycles = 8 - 4;
+       }
+       for (int bits = 0; bits < 16 && src; bits++, src >>= 1) {
+               if (src & 1)
+                       cycles += 2;
+       }
+       return cycles;
+}
+
+int getMuls68kCycles(uae_u16 src)
+{
+       int cycles;
+       if (currprefs.cpu_model == 68000) {
+               cycles = 38 - 4;
+       } else {
+               cycles = 10 - 4;
+       }
+       uae_u32 usrc = ((uae_u32)src) << 1;
+       for (int bits = 0; bits < 16 && usrc; bits++, usrc >>= 1) {
+               if ((usrc & 3) == 1 || (usrc & 3) == 2) {
+                       cycles += 2;
+               }
+       }
+       return cycles;
+}
+
+
 /*
 * Compute exact number of CPU cycles taken
 * by DIVU and DIVS on a 68000 processor.
@@ -709,9 +743,14 @@ int getDivu68kCycles (uae_u32 dividend, uae_u16 divisor)
 
        // Overflow
        if ((dividend >> 16) >= divisor)
-               return (mcycles = 5) * 2;
+               return (mcycles = 5) * 2 - 4;
+
+       if (currprefs.cpu_model == 68000) {
+               mcycles = 38;
+       } else {
+               mcycles = 22;
+       }
 
-       mcycles = 38;
        hdivisor = divisor << 16;
 
        for (i = 0; i < 15; i++) {
@@ -731,7 +770,7 @@ int getDivu68kCycles (uae_u32 dividend, uae_u16 divisor)
                        }
                }
        }
-       return mcycles * 2;
+       return mcycles * 2 - 4;
 }
 
 int getDivs68kCycles (uae_s32 dividend, uae_s16 divisor)
@@ -750,12 +789,16 @@ int getDivs68kCycles (uae_s32 dividend, uae_s16 divisor)
 
        // Check for absolute overflow
        if (((uae_u32)abs (dividend) >> 16) >= (uae_u16)abs (divisor))
-               return (mcycles + 2) * 2;
+               return (mcycles + 2) * 2 - 4;
 
        // Absolute quotient
        aquot = (uae_u32) abs (dividend) / (uae_u16)abs (divisor);
 
-       mcycles += 55;
+       if (currprefs.cpu_model == 68000) {
+               mcycles += 55;
+       } else {
+               mcycles += 37;
+       }
 
        if (divisor >= 0) {
                if (dividend >= 0)
@@ -772,7 +815,7 @@ int getDivs68kCycles (uae_s32 dividend, uae_s16 divisor)
                aquot <<= 1;
        }
 
-       return mcycles * 2;
+       return mcycles * 2 - 4;
 }
 
 /* DIV divide by zero

diff --git a/readcpu.cpp b/readcpu.cpp
index 56c9824b9ff2fc39fd1c7948638a86f29917d4de..0498c34e182caaac559a869e5d2d14a1867ded2c 100644 (file)
--- a/readcpu.cpp
+++ b/readcpu.cpp
@@ -909,8 +909,13 @@ bool opcode_loop_mode(uae_u16 opcode)
                        (!c->duse || (isreg(c->smode) && !isreg(c->dmode)) || (!isreg(c->smode) && isreg(c->dmode)) || (!isreg(c->smode) && !isreg(c->dmode)))) {
                        loopmode = true;
                }
-               if (c->mnemo == i_MOVE && isreg(c->dmode)) {
-                       loopmode = false;
+               if (c->mnemo == i_MOVE) {
+                       // move x,dn: not supported
+                       if (isreg(c->dmode))
+                               loopmode = false;
+                       // move reg,-(an): not supported
+                       if (isreg(c->smode) && c->dmode == Apdi)
+                               loopmode = false;
                }
        }
        return loopmode;