--- uae/src/gencpu.c 2018/04/24 17:10:34 1.1.1.17 +++ uae/src/gencpu.c 2018/04/24 17:21:37 1.1.1.22 @@ -52,6 +52,8 @@ static int *opcode_next_clev; static int *opcode_last_postfix; static unsigned long *counts; +static int generate_stbl; + static void read_counts (void) { FILE *file; @@ -64,7 +66,7 @@ static void read_counts (void) if (file) { fscanf (file, "Total: %lu\n", &total); while (fscanf (file, "%lx: %lu %s\n", &opcode, &count, name) == 3) { - opcode_next_clev[nr] = 4; + opcode_next_clev[nr] = 6; opcode_last_postfix[nr] = -1; opcode_map[nr++] = opcode; counts[opcode] = count; @@ -77,7 +79,7 @@ static void read_counts (void) if (table68k[opcode].handler == -1 && table68k[opcode].mnemo != i_ILLG && counts[opcode] == 0) { - opcode_next_clev[nr] = 4; + opcode_next_clev[nr] = 6; opcode_last_postfix[nr] = -1; opcode_map[nr++] = opcode; counts[opcode] = count; @@ -97,8 +99,29 @@ static int insn_n_cycles; static void returncycles (char *s, int cycles) { - if (using_ce) return; - printf ("%sreturn %d * %d;\n", s, cycles, CYCLE_UNIT / 2); + if (using_ce) + return; + printf ("%sreturn CYCLE_UNIT / 2 * %d;\n", s, cycles); +} + +static void addcycles (int cycles) +{ + if (using_ce) + printf ("\tdo_cycles_ce (%d * CYCLE_UNIT / 2);\n", cycles); + else + insn_n_cycles += cycles; +} +static void addcycles2 (char *s, int cycles) +{ + if (using_ce) + printf ("%sdo_cycles_ce (%d * CYCLE_UNIT / 2);\n", s, cycles); + else + insn_n_cycles += cycles; +} +static void addcycles3 (char *s) +{ + if (!using_ce) return; + printf ("%sif (cycles > 0) do_cycles_ce (cycles);\n", s); } static int isreg (amodes mode) @@ -161,7 +184,7 @@ static void gen_nextilong (char *type, c m68k_pc_offset += 4; if (using_ce) { - printf ("\t%s %s;\n", type, name); + printf ("\t%s %s;\n", type, name); /* we must do this because execution order of (something | something2) is not defined */ if (norefill) { printf ("\t%s = get_word_ce_prefetch (%d) << 16;\n", name, r + 2); @@ -171,9 +194,9 @@ static void gen_nextilong (char *type, c printf ("\t%s |= get_word_ce_prefetch (%d);\n", name, r + 4); } } else { - if (using_prefetch) { + if (using_prefetch) { if (norefill) { - printf ("\t%s %s;\n", type, name); + printf ("\t%s %s;\n", type, name); printf ("\t%s = get_word_prefetch (%d) << 16;\n", name, r + 2); printf ("\t%s |= regs.irc;\n", name); insn_n_cycles += 4; @@ -208,7 +231,7 @@ static const char *gen_nextiword (int no } } else { sprintf (buffer, "get_iword (%d)", r); - insn_n_cycles += 4; + insn_n_cycles += 4; } } return buffer; @@ -226,17 +249,17 @@ static const char *gen_nextibyte (int no else sprintf (buffer, "(uae_u8)get_word_ce_prefetch (%d)", r + 2); } else { - insn_n_cycles += 4; + insn_n_cycles += 4; if (using_prefetch) { if (norefill) { sprintf (buffer, "(uae_u8)regs.irc", r); } else { sprintf (buffer, "(uae_u8)get_word_prefetch (%d)", r + 2); - insn_n_cycles += 4; + insn_n_cycles += 4; } } else { sprintf (buffer, "get_ibyte (%d)", r); - insn_n_cycles += 4; + insn_n_cycles += 4; } } return buffer; @@ -263,16 +286,12 @@ static void fill_prefetch_2 (void) insn_n_cycles += 4; } -static void fill_prefetch_1 (int o, int needcycles) +static void fill_prefetch_1 (int o) { if (!using_prefetch) return; if (using_ce) { - if (needcycles) { - printf ("\tlostcycles = get_word_ce_prefetch_cycles (%d);\n", o); - } else { - printf ("\tget_word_ce_prefetch (%d);\n", o); - } + printf ("\tget_word_ce_prefetch (%d);\n", o); } else { printf ("\tget_word_prefetch (%d);\n", o); } @@ -282,9 +301,9 @@ static void fill_prefetch_1 (int o, int static void fill_prefetch_full (void) { - fill_prefetch_1 (0, 0); + fill_prefetch_1 (0); irc2ir (); - fill_prefetch_1 (2, 0); + fill_prefetch_1 (2); } static void fill_prefetch_0 (void) @@ -297,50 +316,24 @@ static void fill_prefetch_0 (void) printf ("\tget_word_prefetch (0);\n"); did_prefetch = 1; insn_n_cycles += 4; -} +} -static void fill_prefetch_next_1 (needcycles) +static void fill_prefetch_next_1 (void) { - if (needcycles && using_ce) { - printf ("\tint lostcycles;\n"); - } irc2ir (); - fill_prefetch_1 (m68k_pc_offset + 2, needcycles); -} + fill_prefetch_1 (m68k_pc_offset + 2); +} static void fill_prefetch_next (void) { - fill_prefetch_next_1 (0); -} -static void fill_prefetch_next_cycles (void) -{ - fill_prefetch_next_1 (1); -} - -static void fill_prefetch_next_delay (int extracycles) -{ - if (!using_prefetch) - return; - if (using_ce) { - if (extracycles > 0) { - printf("\t{\n"); - fill_prefetch_next_cycles (); - printf("\tif ((%d + 4) * %d > lostcycles) do_cycles_ce ((%d + 4) * %d - lostcycles);\n", - extracycles, CYCLE_UNIT / 2, extracycles, CYCLE_UNIT / 2); - printf("\t}\n"); - } else { - fill_prefetch_next (); - } - } else { - fill_prefetch_next (); - } + fill_prefetch_next_1 (); } static void fill_prefetch_finish (void) { if (did_prefetch || !using_prefetch) return; - fill_prefetch_1 (m68k_pc_offset, 0); + fill_prefetch_1 (m68k_pc_offset); } static void sync_m68k_pc (void) @@ -372,20 +365,20 @@ static void genamode (amodes mode, char #if defined(AMIGA) && !defined(WARPUP) /* sam: I don't know why gcc.2.7.2.1 produces a code worse */ /* if it is not done like that: */ - printf ("\tuae_s8 %s = ((uae_u8*)&m68k_dreg(regs, %s))[3];\n", name, reg); + printf ("\tuae_s8 %s = ((uae_u8*)&m68k_dreg (regs, %s))[3];\n", name, reg); #else - printf ("\tuae_s8 %s = m68k_dreg(regs, %s);\n", name, reg); + printf ("\tuae_s8 %s = m68k_dreg (regs, %s);\n", name, reg); #endif break; case sz_word: #if defined(AMIGA) && !defined(WARPUP) - printf ("\tuae_s16 %s = ((uae_s16*)&m68k_dreg(regs, %s))[1];\n", name, reg); + printf ("\tuae_s16 %s = ((uae_s16*)&m68k_dreg (regs, %s))[1];\n", name, reg); #else - printf ("\tuae_s16 %s = m68k_dreg(regs, %s);\n", name, reg); + printf ("\tuae_s16 %s = m68k_dreg (regs, %s);\n", name, reg); #endif break; case sz_long: - printf ("\tuae_s32 %s = m68k_dreg(regs, %s);\n", name, reg); + printf ("\tuae_s32 %s = m68k_dreg (regs, %s);\n", name, reg); break; default: abort (); @@ -397,45 +390,46 @@ static void genamode (amodes mode, char if (getv == 1) switch (size) { case sz_word: - printf ("\tuae_s16 %s = m68k_areg(regs, %s);\n", name, reg); + printf ("\tuae_s16 %s = m68k_areg (regs, %s);\n", name, reg); break; case sz_long: - printf ("\tuae_s32 %s = m68k_areg(regs, %s);\n", name, reg); + printf ("\tuae_s32 %s = m68k_areg (regs, %s);\n", name, reg); break; default: abort (); } return; case Aind: - printf ("\tuaecptr %sa = m68k_areg(regs, %s);\n", name, reg); + printf ("\tuaecptr %sa = m68k_areg (regs, %s);\n", name, reg); break; case Aipi: - printf ("\tuaecptr %sa = m68k_areg(regs, %s);\n", name, reg); + printf ("\tuaecptr %sa = m68k_areg (regs, %s);\n", name, reg); break; case Apdi: - insn_n_cycles += 2; switch (size) { case sz_byte: if (movem) - printf ("\tuaecptr %sa = m68k_areg(regs, %s);\n", name, reg); + printf ("\tuaecptr %sa = m68k_areg (regs, %s);\n", name, reg); else - printf ("\tuaecptr %sa = m68k_areg(regs, %s) - areg_byteinc[%s];\n", name, reg, reg); + printf ("\tuaecptr %sa = m68k_areg (regs, %s) - areg_byteinc[%s];\n", name, reg, reg); break; case sz_word: - printf ("\tuaecptr %sa = m68k_areg(regs, %s) - %d;\n", name, reg, movem ? 0 : 2); + printf ("\tuaecptr %sa = m68k_areg (regs, %s) - %d;\n", name, reg, movem ? 0 : 2); break; case sz_long: - printf ("\tuaecptr %sa = m68k_areg(regs, %s) - %d;\n", name, reg, movem ? 0 : 4); + printf ("\tuaecptr %sa = m68k_areg (regs, %s) - %d;\n", name, reg, movem ? 0 : 4); break; default: abort (); } break; + if (!(flags & GF_APDI)) { + addcycles (2); + } case Ad16: - printf ("\tuaecptr %sa = m68k_areg(regs, %s) + (uae_s32)(uae_s16)%s;\n", name, reg, gen_nextiword (flags & GF_NOREFILL)); + printf ("\tuaecptr %sa = m68k_areg (regs, %s) + (uae_s32)(uae_s16)%s;\n", name, reg, gen_nextiword (flags & GF_NOREFILL)); break; case Ad8r: - insn_n_cycles += 2; if (cpu_level > 1) { if (next_cpu_level < 1) next_cpu_level = 1; @@ -443,17 +437,19 @@ static void genamode (amodes mode, char start_brace (); /* This would ordinarily be done in gen_nextiword, which we bypass. */ insn_n_cycles += 4; - printf ("\tuaecptr %sa = get_disp_ea_020(m68k_areg(regs, %s), next_iword());\n", name, reg); + printf ("\tuaecptr %sa = get_disp_ea_020(m68k_areg (regs, %s), next_iword());\n", name, reg); } else - printf ("\tuaecptr %sa = get_disp_ea_000(m68k_areg(regs, %s), %s);\n", name, reg, gen_nextiword (flags & GF_NOREFILL)); + printf ("\tuaecptr %sa = get_disp_ea_000(m68k_areg (regs, %s), %s);\n", name, reg, gen_nextiword (flags & GF_NOREFILL)); + if (!(flags & GF_AD8R)) { + addcycles (2); + } break; case PC16: printf ("\tuaecptr %sa = m68k_getpc () + %d;\n", name, m68k_pc_offset); printf ("\t%sa += (uae_s32)(uae_s16)%s;\n", name, gen_nextiword (flags & GF_NOREFILL)); break; case PC8r: - insn_n_cycles += 2; if (cpu_level > 1) { if (next_cpu_level < 1) next_cpu_level = 1; @@ -461,13 +457,16 @@ static void genamode (amodes mode, char start_brace (); /* This would ordinarily be done in gen_nextiword, which we bypass. */ insn_n_cycles += 4; - printf ("\tuaecptr tmppc = m68k_getpc();\n"); + printf ("\tuaecptr tmppc = m68k_getpc ();\n"); printf ("\tuaecptr %sa = get_disp_ea_020(tmppc, next_iword());\n", name); } else { - printf ("\tuaecptr tmppc = m68k_getpc() + %d;\n", m68k_pc_offset); + printf ("\tuaecptr tmppc = m68k_getpc () + %d;\n", m68k_pc_offset); printf ("\tuaecptr %sa = get_disp_ea_000(tmppc, %s);\n", name, gen_nextiword (flags & GF_NOREFILL)); } + if (!(flags & GF_PC8R)) { + addcycles (2); + } break; case absw: printf ("\tuaecptr %sa = (uae_s32)(uae_s16)%s;\n", name, gen_nextiword (flags & GF_NOREFILL)); @@ -519,12 +518,12 @@ static void genamode (amodes mode, char /* We get here for all non-reg non-immediate addressing modes to * actually fetch the value. */ - if (using_prefetch && using_exception_3 && getv != 0 && size != sz_byte) { + if (using_prefetch && using_exception_3 && getv != 0 && size != sz_byte) { printf ("\tif (%sa & 1) {\n", name); if (using_prefetch) - printf ("\t\texception3 (opcode, m68k_getpc() + %d, %sa);\n", m68k_pc_offset + 2, name); + printf ("\t\texception3 (opcode, m68k_getpc () + %d, %sa);\n", m68k_pc_offset + 2, name); else - printf ("\t\texception3 (opcode, m68k_getpc() + %d, %sa);\n", m68k_pc_offset_last, name); + printf ("\t\texception3 (opcode, m68k_getpc () + %d, %sa);\n", m68k_pc_offset_last, name); printf ("\t\tgoto %s;\n", endlabelstr); printf ("\t}\n"); need_endlabel = 1; @@ -543,9 +542,9 @@ static void genamode (amodes mode, char } start_brace (); switch (size) { - case sz_byte: printf ("\tuae_s8 %s = get_byte(%sa);\n", name, name); break; - case sz_word: printf ("\tuae_s16 %s = get_word(%sa);\n", name, name); break; - case sz_long: printf ("\tuae_s32 %s = get_long(%sa);\n", name, name); break; + case sz_byte: printf ("\tuae_s8 %s = get_byte (%sa);\n", name, name); break; + case sz_word: printf ("\tuae_s16 %s = get_word (%sa);\n", name, name); break; + case sz_long: printf ("\tuae_s32 %s = get_long (%sa);\n", name, name); break; default: abort (); } } @@ -557,13 +556,13 @@ static void genamode (amodes mode, char case Aipi: switch (size) { case sz_byte: - printf ("\tm68k_areg(regs, %s) += areg_byteinc[%s];\n", reg, reg); + printf ("\tm68k_areg (regs, %s) += areg_byteinc[%s];\n", reg, reg); break; case sz_word: - printf ("\tm68k_areg(regs, %s) += 2;\n", reg); + printf ("\tm68k_areg (regs, %s) += 2;\n", reg); break; case sz_long: - printf ("\tm68k_areg(regs, %s) += 4;\n", reg); + printf ("\tm68k_areg (regs, %s) += 4;\n", reg); break; default: abort (); @@ -583,13 +582,13 @@ static void genastore (char *from, amode case Dreg: switch (size) { case sz_byte: - printf ("\tm68k_dreg(regs, %s) = (m68k_dreg(regs, %s) & ~0xff) | ((%s) & 0xff);\n", reg, reg, from); + printf ("\tm68k_dreg (regs, %s) = (m68k_dreg (regs, %s) & ~0xff) | ((%s) & 0xff);\n", reg, reg, from); break; case sz_word: - printf ("\tm68k_dreg(regs, %s) = (m68k_dreg(regs, %s) & ~0xffff) | ((%s) & 0xffff);\n", reg, reg, from); + printf ("\tm68k_dreg (regs, %s) = (m68k_dreg (regs, %s) & ~0xffff) | ((%s) & 0xffff);\n", reg, reg, from); break; case sz_long: - printf ("\tm68k_dreg(regs, %s) = (%s);\n", reg, from); + printf ("\tm68k_dreg (regs, %s) = (%s);\n", reg, from); break; default: abort (); @@ -599,10 +598,10 @@ static void genastore (char *from, amode switch (size) { case sz_word: write_log ("Foo\n"); - printf ("\tm68k_areg(regs, %s) = (uae_s32)(uae_s16)(%s);\n", reg, from); + printf ("\tm68k_areg (regs, %s) = (uae_s32)(uae_s16)(%s);\n", reg, from); break; case sz_long: - printf ("\tm68k_areg(regs, %s) = (%s);\n", reg, from); + printf ("\tm68k_areg (regs, %s) = (%s);\n", reg, from); break; default: abort (); @@ -622,19 +621,19 @@ static void genastore (char *from, amode switch (size) { case sz_byte: insn_n_cycles += 4; - printf ("\tput_byte(%sa,%s);\n", to, from); + printf ("\tput_byte (%sa,%s);\n", to, from); break; case sz_word: insn_n_cycles += 4; if (cpu_level < 2 && (mode == PC16 || mode == PC8r)) abort (); - printf ("\tput_word(%sa,%s);\n", to, from); + printf ("\tput_word (%sa,%s);\n", to, from); break; case sz_long: insn_n_cycles += 8; if (cpu_level < 2 && (mode == PC16 || mode == PC8r)) abort (); - printf ("\tput_long(%sa,%s);\n", to, from); + printf ("\tput_long (%sa,%s);\n", to, from); break; default: abort (); @@ -658,22 +657,22 @@ static void genmovemel (uae_u16 opcode) int size = table68k[opcode].size == sz_long ? 4 : 2; if (table68k[opcode].size == sz_long) { - strcpy (getcode, "get_long(srca)"); + strcpy (getcode, "get_long (srca)"); } else { - strcpy (getcode, "(uae_s32)(uae_s16)get_word(srca)"); + strcpy (getcode, "(uae_s32)(uae_s16)get_word (srca)"); } printf ("\tuae_u16 mask = %s;\n", gen_nextiword (0)); printf ("\tunsigned int dmask = mask & 0xff, amask = (mask >> 8) & 0xff;\n"); genamode (table68k[opcode].dmode, "dstreg", table68k[opcode].size, "src", 2, 1, 0); start_brace (); - printf ("\twhile (dmask) { m68k_dreg(regs, movem_index1[dmask]) = %s; srca += %d; dmask = movem_next[dmask]; }\n", + printf ("\twhile (dmask) { m68k_dreg (regs, movem_index1[dmask]) = %s; srca += %d; dmask = movem_next[dmask]; }\n", getcode, size); - printf ("\twhile (amask) { m68k_areg(regs, movem_index1[amask]) = %s; srca += %d; amask = movem_next[amask]; }\n", + printf ("\twhile (amask) { m68k_areg (regs, movem_index1[amask]) = %s; srca += %d; amask = movem_next[amask]; }\n", getcode, size); if (table68k[opcode].dmode == Aipi) - printf ("\tm68k_areg(regs, dstreg) = srca;\n"); + printf ("\tm68k_areg (regs, dstreg) = srca;\n"); } static void genmovemle (uae_u16 opcode) @@ -681,9 +680,9 @@ static void genmovemle (uae_u16 opcode) char putcode[100]; int size = table68k[opcode].size == sz_long ? 4 : 2; if (table68k[opcode].size == sz_long) { - strcpy (putcode, "put_long(srca,"); + strcpy (putcode, "put_long (srca,"); } else { - strcpy (putcode, "put_word(srca,"); + strcpy (putcode, "put_word (srca,"); } printf ("\tuae_u16 mask = %s;\n", gen_nextiword (0)); @@ -694,16 +693,16 @@ static void genmovemle (uae_u16 opcode) start_brace (); if (table68k[opcode].dmode == Apdi) { printf ("\tuae_u16 amask = mask & 0xff, dmask = (mask >> 8) & 0xff;\n"); - printf ("\twhile (amask) { srca -= %d; %s m68k_areg(regs, movem_index2[amask])); amask = movem_next[amask]; }\n", + printf ("\twhile (amask) { srca -= %d; %s m68k_areg (regs, movem_index2[amask])); amask = movem_next[amask]; }\n", size, putcode); - printf ("\twhile (dmask) { srca -= %d; %s m68k_dreg(regs, movem_index2[dmask])); dmask = movem_next[dmask]; }\n", + printf ("\twhile (dmask) { srca -= %d; %s m68k_dreg (regs, movem_index2[dmask])); dmask = movem_next[dmask]; }\n", size, putcode); - printf ("\tm68k_areg(regs, dstreg) = srca;\n"); + printf ("\tm68k_areg (regs, dstreg) = srca;\n"); } else { printf ("\tuae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff;\n"); - printf ("\twhile (dmask) { %s m68k_dreg(regs, movem_index1[dmask])); srca += %d; dmask = movem_next[dmask]; }\n", + printf ("\twhile (dmask) { %s m68k_dreg (regs, movem_index1[dmask])); srca += %d; dmask = movem_next[dmask]; }\n", putcode, size); - printf ("\twhile (amask) { %s m68k_areg(regs, movem_index1[amask])); srca += %d; amask = movem_next[amask]; }\n", + printf ("\twhile (amask) { %s m68k_areg (regs, movem_index1[amask])); srca += %d; amask = movem_next[amask]; }\n", putcode, size); } } @@ -931,7 +930,7 @@ static void genflags (flagtypes type, wo case sz_long: printf ("\toptflag_cmpl ((uae_s32)(%s), (uae_s32)(%s));\n", src, dst); break; } return; - + default: break; } @@ -977,8 +976,7 @@ static int source_is_imm1_8 (struct inst static void gen_opcode (unsigned long int opcode) { struct instr *curi = table68k + opcode; - int tmpc = 0; - insn_n_cycles = 4; + insn_n_cycles = using_prefetch ? 0 : 4; start_brace (); #if 0 @@ -1017,8 +1015,8 @@ static void gen_opcode (unsigned long in printf ("\tsrc %c= dst;\n", curi->mnemo == i_OR ? '|' : curi->mnemo == i_AND ? '&' : '^'); genflags (flag_logical, curi->size, "src", "", ""); if (curi->size == sz_long && isreg (curi->dmode)) - tmpc += curi->mnemo == i_AND ? 2 : 4; - fill_prefetch_next_delay (tmpc); + addcycles (curi->mnemo == i_AND ? 2 : 4); + fill_prefetch_next (); genastore ("src", curi->dmode, "dstreg", curi->size, "dst"); break; case i_ORSR: @@ -1028,7 +1026,8 @@ static void gen_opcode (unsigned long in if (curi->size == sz_byte) { printf ("\tsrc &= 0xFF;\n"); } - fill_prefetch_next_delay (4); + addcycles (4); + fill_prefetch_next (); printf ("\tregs.sr %c= src;\n", curi->mnemo == i_EORSR ? '^' : '|'); printf ("\tMakeFromSR();\n"); break; @@ -1038,7 +1037,8 @@ static void gen_opcode (unsigned long in if (curi->size == sz_byte) { printf ("\tsrc |= 0xFF00;\n"); } - fill_prefetch_next_delay (4); + addcycles (4); + fill_prefetch_next (); printf ("\tregs.sr &= src;\n"); printf ("\tMakeFromSR();\n"); break; @@ -1047,9 +1047,9 @@ static void gen_opcode (unsigned long in genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, 0); if (isreg (curi->dmode)) { if (curi->dmode == Dreg && curi->size == sz_long) - tmpc += (curi->smode == imm || curi->smode == immi) ? 4 : 2; + addcycles ((curi->smode == imm || curi->smode == immi) ? 4 : 2); } - fill_prefetch_next_delay (tmpc); + fill_prefetch_next (); start_brace (); genflags (flag_sub, curi->size, "newv", "src", "dst"); genastore ("newv", curi->dmode, "dstreg", curi->size, "dst"); @@ -1058,11 +1058,12 @@ static void gen_opcode (unsigned long in genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); genamode (curi->dmode, "dstreg", sz_long, "dst", 1, 0, 0); if (isreg (curi->dmode) && curi->dmode == Areg) { - tmpc += curi->size == sz_long ? 2 : 4; + int tmpc = curi->size == sz_long ? 2 : 4; if (curi->size == sz_long) tmpc += (isreg (curi->smode) || curi->smode == imm) ? 2 : 0; + addcycles (tmpc); } - fill_prefetch_next_delay (tmpc); + fill_prefetch_next (); start_brace (); printf ("\tuae_u32 newv = dst - src;\n"); genastore ("newv", curi->dmode, "dstreg", sz_long, "dst"); @@ -1071,8 +1072,8 @@ static void gen_opcode (unsigned long in genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, GF_AA); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, GF_AA); if ((isreg (curi->smode) && curi->size == sz_long) || !isreg (curi->smode)) - tmpc += 2; - fill_prefetch_next_delay (tmpc); + addcycles (2); + fill_prefetch_next (); start_brace (); printf ("\tuae_u32 newv = dst - src - (GET_XFLG ? 1 : 0);\n"); genflags (flag_subx, curi->size, "newv", "src", "dst"); @@ -1082,7 +1083,7 @@ static void gen_opcode (unsigned long in case i_SBCD: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, GF_AA); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, GF_AA); - fill_prefetch_next (); + fill_prefetch_next (); start_brace (); printf ("\tuae_u16 newv_lo = (dst & 0xF) - (src & 0xF) - (GET_XFLG ? 1 : 0);\n"); printf ("\tuae_u16 newv_hi = (dst & 0xF0) - (src & 0xF0);\n"); @@ -1102,9 +1103,9 @@ static void gen_opcode (unsigned long in genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, 0); if (isreg (curi->dmode)) { if (curi->dmode == Dreg && curi->size == sz_long) - tmpc += (curi->smode == imm || curi->smode == immi) ? 4 : 2; + addcycles ((curi->smode == imm || curi->smode == immi) ? 4 : 2); } - fill_prefetch_next_delay (tmpc); + fill_prefetch_next (); start_brace (); genflags (flag_add, curi->size, "newv", "src", "dst"); genastore ("newv", curi->dmode, "dstreg", curi->size, "dst"); @@ -1113,11 +1114,12 @@ static void gen_opcode (unsigned long in genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); genamode (curi->dmode, "dstreg", sz_long, "dst", 1, 0, 0); if (isreg (curi->dmode) && curi->dmode == Areg) { - tmpc += curi->size == sz_long ? 2 : 4; + int tmpc = curi->size == sz_long ? 2 : 4; if (curi->size == sz_long) tmpc += (isreg (curi->smode) || curi->smode == imm) ? 2 : 0; + addcycles (tmpc); } - fill_prefetch_next_delay (tmpc); + fill_prefetch_next (); start_brace (); printf ("\tuae_u32 newv = dst + src;\n"); genastore ("newv", curi->dmode, "dstreg", sz_long, "dst"); @@ -1126,8 +1128,8 @@ static void gen_opcode (unsigned long in genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, GF_AA); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, GF_AA); if ((isreg (curi->smode) && curi->size == sz_long) || !isreg (curi->smode)) - tmpc += 2; - fill_prefetch_next_delay (tmpc); + addcycles (2); + fill_prefetch_next (); start_brace (); printf ("\tuae_u32 newv = dst + src + (GET_XFLG ? 1 : 0);\n"); genflags (flag_addx, curi->size, "newv", "src", "dst"); @@ -1137,7 +1139,7 @@ static void gen_opcode (unsigned long in case i_ABCD: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, GF_AA); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, GF_AA); - fill_prefetch_next (); + fill_prefetch_next (); start_brace (); printf ("\tuae_u16 newv_lo = (src & 0xF) + (dst & 0xF) + (GET_XFLG ? 1 : 0);\n"); printf ("\tuae_u16 newv_hi = (src & 0xF0) + (dst & 0xF0);\n"); @@ -1155,16 +1157,18 @@ static void gen_opcode (unsigned long in break; case i_NEG: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); - if (isreg (curi->smode) && curi->size == sz_long) tmpc += 2; - fill_prefetch_next_delay (tmpc); + if (isreg (curi->smode) && curi->size == sz_long) + addcycles (2); + fill_prefetch_next (); start_brace (); genflags (flag_sub, curi->size, "dst", "src", "0"); genastore ("dst", curi->smode, "srcreg", curi->size, "src"); break; case i_NEGX: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); - if (isreg (curi->smode) && curi->size == sz_long) tmpc += 2; - fill_prefetch_next_delay (tmpc); + if (isreg (curi->smode) && curi->size == sz_long) + addcycles (2); + fill_prefetch_next (); start_brace (); printf ("\tuae_u32 newv = 0 - src - (GET_XFLG ? 1 : 0);\n"); genflags (flag_subx, curi->size, "newv", "src", "0"); @@ -1173,8 +1177,9 @@ static void gen_opcode (unsigned long in break; case i_NBCD: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); - if (isreg (curi->smode)) tmpc += 2; - fill_prefetch_next_delay (tmpc); + if (isreg (curi->smode)) + addcycles (2); + fill_prefetch_next (); start_brace (); printf ("\tuae_u16 newv_lo = - (src & 0xF) - (GET_XFLG ? 1 : 0);\n"); printf ("\tuae_u16 newv_hi = - (src & 0xF0);\n"); @@ -1191,15 +1196,17 @@ static void gen_opcode (unsigned long in break; case i_CLR: genamode (curi->smode, "srcreg", curi->size, "src", cpu_level == 0 ? 1 : 2, 0, 0); - if (isreg (curi->smode) && curi->size == sz_long) tmpc += 2; - fill_prefetch_next_delay (tmpc); + if (isreg (curi->smode) && curi->size == sz_long) + addcycles (2); + fill_prefetch_next (); genflags (flag_logical, curi->size, "0", "", ""); genastore ("0", curi->smode, "srcreg", curi->size, "src"); break; case i_NOT: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); - if (isreg (curi->smode) && curi->size == sz_long) tmpc += 2; - fill_prefetch_next_delay (tmpc); + if (isreg (curi->smode) && curi->size == sz_long) + addcycles (2); + fill_prefetch_next (); start_brace (); printf ("\tuae_u32 dst = ~src;\n"); genflags (flag_logical, curi->size, "dst", "", ""); @@ -1207,14 +1214,15 @@ static void gen_opcode (unsigned long in break; case i_TST: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); - fill_prefetch_next (); + fill_prefetch_next (); genflags (flag_logical, curi->size, "src", "", ""); break; case i_BTST: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, 0); - if (isreg (curi->dmode)) tmpc += 2; - fill_prefetch_next_delay (tmpc); + if (isreg (curi->dmode)) + addcycles (2); + fill_prefetch_next (); if (curi->size == sz_byte) printf ("\tsrc &= 7;\n"); else @@ -1224,8 +1232,9 @@ static void gen_opcode (unsigned long in case i_BCHG: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, 0); - if (isreg (curi->dmode)) tmpc += 4; - fill_prefetch_next_delay (tmpc); + if (isreg (curi->dmode)) + addcycles (4); + fill_prefetch_next (); if (curi->size == sz_byte) printf ("\tsrc &= 7;\n"); else @@ -1237,8 +1246,9 @@ static void gen_opcode (unsigned long in case i_BCLR: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, 0); - if (isreg (curi->dmode)) tmpc += 4; - fill_prefetch_next_delay (tmpc); + if (isreg (curi->dmode)) + addcycles (4); + fill_prefetch_next (); if (curi->size == sz_byte) printf ("\tsrc &= 7;\n"); else @@ -1250,8 +1260,9 @@ static void gen_opcode (unsigned long in case i_BSET: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, 0); - if (isreg (curi->dmode)) tmpc += 4; - fill_prefetch_next_delay (tmpc); + if (isreg (curi->dmode)) + addcycles (4); + fill_prefetch_next (); if (curi->size == sz_byte) printf ("\tsrc &= 7;\n"); else @@ -1263,7 +1274,7 @@ static void gen_opcode (unsigned long in case i_CMPM: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, GF_AA); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, GF_AA); - fill_prefetch_next (); + fill_prefetch_next (); start_brace (); genflags (flag_cmp, curi->size, "newv", "src", "dst"); break; @@ -1272,9 +1283,9 @@ static void gen_opcode (unsigned long in genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, 0); if (isreg (curi->dmode)) { if (curi->dmode == Areg || (curi->dmode == Dreg && curi->size == sz_long)) - tmpc += 2; + addcycles (2); } - fill_prefetch_next_delay (tmpc); + fill_prefetch_next (); start_brace (); genflags (flag_cmp, curi->size, "newv", "src", "dst"); break; @@ -1283,9 +1294,9 @@ static void gen_opcode (unsigned long in genamode (curi->dmode, "dstreg", sz_long, "dst", 1, 0, 0); if (isreg (curi->dmode)) { if (curi->dmode == Areg || (curi->dmode == Dreg && curi->size == sz_long)) - tmpc += 2; + addcycles (2); } - fill_prefetch_next_delay (tmpc); + fill_prefetch_next (); start_brace (); genflags (flag_cmp, sz_long, "newv", "src", "dst"); break; @@ -1293,23 +1304,23 @@ static void gen_opcode (unsigned long in * weird things... */ case i_MVPRM: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); - printf ("\tuaecptr memp = m68k_areg(regs, dstreg) + (uae_s32)(uae_s16)%s;\n", gen_nextiword (0)); - fill_prefetch_next (); + printf ("\tuaecptr memp = m68k_areg (regs, dstreg) + (uae_s32)(uae_s16)%s;\n", gen_nextiword (0)); + fill_prefetch_next (); if (curi->size == sz_word) { - printf ("\tput_byte(memp, src >> 8); put_byte(memp + 2, src);\n"); + printf ("\tput_byte (memp, src >> 8); put_byte (memp + 2, src);\n"); } else { - printf ("\tput_byte(memp, src >> 24); put_byte(memp + 2, src >> 16);\n"); - printf ("\tput_byte(memp + 4, src >> 8); put_byte(memp + 6, src);\n"); + printf ("\tput_byte (memp, src >> 24); put_byte (memp + 2, src >> 16);\n"); + printf ("\tput_byte (memp + 4, src >> 8); put_byte (memp + 6, src);\n"); } break; case i_MVPMR: - printf ("\tuaecptr memp = m68k_areg(regs, srcreg) + (uae_s32)(uae_s16)%s;\n", gen_nextiword (0)); + printf ("\tuaecptr memp = m68k_areg (regs, srcreg) + (uae_s32)(uae_s16)%s;\n", gen_nextiword (0)); genamode (curi->dmode, "dstreg", curi->size, "dst", 2, 0, 0); if (curi->size == sz_word) { - printf ("\tuae_u16 val = (get_byte(memp) << 8) + get_byte(memp + 2);\n"); + printf ("\tuae_u16 val = (get_byte (memp) << 8) + get_byte (memp + 2);\n"); } else { - printf ("\tuae_u32 val = (get_byte(memp) << 24) + (get_byte(memp + 2) << 16)\n"); - printf (" + (get_byte(memp + 4) << 8) + get_byte(memp + 6);\n"); + printf ("\tuae_u32 val = (get_byte (memp) << 24) + (get_byte (memp + 2) << 16)\n"); + printf (" + (get_byte (memp + 4) << 8) + get_byte (memp + 6);\n"); } fill_prefetch_next (); genastore ("val", curi->dmode, "dstreg", curi->size, "dst"); @@ -1330,13 +1341,14 @@ static void gen_opcode (unsigned long in } else { printf ("\tuae_u32 val = src;\n"); } - fill_prefetch_next (); + fill_prefetch_next (); genastore ("val", curi->dmode, "dstreg", sz_long, "dst"); break; case i_MVSR2: genamode (curi->smode, "srcreg", sz_word, "src", 2, 0, 0); - if (isreg (curi->smode)) tmpc += 2; - fill_prefetch_next_delay (tmpc); + if (isreg (curi->smode)) + addcycles (2); + fill_prefetch_next (); printf ("\tMakeSR();\n"); if (curi->size == sz_byte) genastore ("regs.sr & 0xff", curi->smode, "srcreg", sz_word, "src"); @@ -1346,18 +1358,18 @@ static void gen_opcode (unsigned long in case i_MV2SR: genamode (curi->smode, "srcreg", sz_word, "src", 1, 0, 0); if (curi->size == sz_byte) { - tmpc += 8; - printf ("\tMakeSR();\n\tregs.sr &= 0xFF00;\n\tregs.sr |= src & 0xFF;\n"); + addcycles (8); + printf ("\tMakeSR ();\n\tregs.sr &= 0xFF00;\n\tregs.sr |= src & 0xFF;\n"); } else { - tmpc += 4; + addcycles (4); printf ("\tregs.sr = src;\n"); } - fill_prefetch_next_delay (tmpc); - printf ("\tMakeFromSR();\n"); + fill_prefetch_next (); + printf ("\tMakeFromSR ();\n"); break; case i_SWAP: genamode (curi->smode, "srcreg", sz_long, "src", 1, 0, 0); - fill_prefetch_next (); + fill_prefetch_next (); start_brace (); printf ("\tuae_u32 dst = ((src >> 16)&0xFFFF) | ((src&0xFFFF)<<16);\n"); genflags (flag_logical, sz_long, "dst", "", ""); @@ -1366,13 +1378,14 @@ static void gen_opcode (unsigned long in case i_EXG: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, 0); - fill_prefetch_next_delay (2); + addcycles (2); + fill_prefetch_next (); genastore ("dst", curi->smode, "srcreg", curi->size, "src"); genastore ("src", curi->dmode, "dstreg", curi->size, "dst"); break; case i_EXT: genamode (curi->smode, "srcreg", sz_long, "src", 1, 0, 0); - fill_prefetch_next (); + fill_prefetch_next (); start_brace (); switch (curi->size) { case sz_byte: printf ("\tuae_u32 dst = (uae_s32)(uae_s8)src;\n"); break; @@ -1387,11 +1400,11 @@ static void gen_opcode (unsigned long in break; case i_MVMEL: genmovemel (opcode); - fill_prefetch_next (); + fill_prefetch_next (); break; case i_MVMLE: genmovemle (opcode); - fill_prefetch_next (); + fill_prefetch_next (); break; case i_TRAP: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); @@ -1402,20 +1415,20 @@ static void gen_opcode (unsigned long in break; case i_MVR2USP: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); - fill_prefetch_next (); + fill_prefetch_next (); printf ("\tregs.usp = src;\n"); break; case i_MVUSP2R: genamode (curi->smode, "srcreg", curi->size, "src", 2, 0, 0); - fill_prefetch_next (); + fill_prefetch_next (); genastore ("regs.usp", curi->smode, "srcreg", curi->size, "src"); break; case i_RESET: - fill_prefetch_next (); + fill_prefetch_next (); printf ("\tcpureset();\n"); break; case i_NOP: - fill_prefetch_next (); + fill_prefetch_next (); break; case i_STOP: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); @@ -1442,17 +1455,18 @@ static void gen_opcode (unsigned long in printf ("\tnewsr = sr; newpc = pc;\n"); printf ("\tif ((format & 0xF000) == 0x0000) { break; }\n"); printf ("\telse if ((format & 0xF000) == 0x1000) { ; }\n"); - printf ("\telse if ((format & 0xF000) == 0x2000) { m68k_areg(regs, 7) += 4; break; }\n"); - printf ("\telse if ((format & 0xF000) == 0x8000) { m68k_areg(regs, 7) += 50; break; }\n"); - printf ("\telse if ((format & 0xF000) == 0x9000) { m68k_areg(regs, 7) += 12; break; }\n"); - printf ("\telse if ((format & 0xF000) == 0xa000) { m68k_areg(regs, 7) += 24; break; }\n"); - printf ("\telse if ((format & 0xF000) == 0xb000) { m68k_areg(regs, 7) += 84; break; }\n"); + printf ("\telse if ((format & 0xF000) == 0x2000) { m68k_areg (regs, 7) += 4; break; }\n"); + printf ("\telse if ((format & 0xF000) == 0x7000) { m68k_areg (regs, 7) += 52; break; }\n"); + printf ("\telse if ((format & 0xF000) == 0x8000) { m68k_areg (regs, 7) += 50; break; }\n"); + printf ("\telse if ((format & 0xF000) == 0x9000) { m68k_areg (regs, 7) += 12; break; }\n"); + printf ("\telse if ((format & 0xF000) == 0xa000) { m68k_areg (regs, 7) += 24; break; }\n"); + printf ("\telse if ((format & 0xF000) == 0xb000) { m68k_areg (regs, 7) += 84; break; }\n"); printf ("\telse { Exception(14,0); goto %s; }\n", endlabelstr); printf ("\tregs.sr = newsr; MakeFromSR();\n}\n"); pop_braces (old_brace_level); printf ("\tregs.sr = newsr; MakeFromSR();\n"); printf ("\tif (newpc & 1)\n"); - printf ("\t\texception3 (0x%04.4X, m68k_getpc(), newpc);\n", opcode); + printf ("\t\texception3 (0x%04.4X, m68k_getpc (), newpc);\n", opcode); printf ("\telse\n"); printf ("\t\tm68k_setpc (newpc);\n"); need_endlabel = 1; @@ -1464,10 +1478,10 @@ static void gen_opcode (unsigned long in case i_RTD: genamode (Aipi, "7", sz_long, "pc", 1, 0, 0); genamode (curi->smode, "srcreg", curi->size, "offs", 1, 0, 0); - printf ("\tm68k_areg(regs, 7) += offs;\n"); - printf ("\tif (pc & 1)\n"); - printf ("\t\texception3 (0x%04.4X, m68k_getpc(), pc);\n", opcode); - printf ("\telse\n"); + printf ("\tm68k_areg (regs, 7) += offs;\n"); + printf ("\tif (pc & 1)\n"); + printf ("\t\texception3 (0x%04.4X, m68k_getpc (), pc);\n", opcode); + printf ("\telse\n"); printf ("\t\tm68k_setpc (pc);\n"); /* PC is set and prefetch filled. */ m68k_pc_offset = 0; @@ -1477,16 +1491,16 @@ static void gen_opcode (unsigned long in genamode (Apdi, "7", sz_long, "old", 2, 0, 0); genamode (curi->smode, "srcreg", sz_long, "src", 1, 0, 0); genastore ("src", Apdi, "7", sz_long, "old"); - genastore ("m68k_areg(regs, 7)", curi->smode, "srcreg", sz_long, "src"); + genastore ("m68k_areg (regs, 7)", curi->smode, "srcreg", sz_long, "src"); genamode (curi->dmode, "dstreg", curi->size, "offs", 1, 0, 0); - printf ("\tm68k_areg(regs, 7) += offs;\n"); - fill_prefetch_next (); + printf ("\tm68k_areg (regs, 7) += offs;\n"); + fill_prefetch_next (); break; case i_UNLK: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); - printf ("\tm68k_areg(regs, 7) = src;\n"); + printf ("\tm68k_areg (regs, 7) = src;\n"); genamode (Aipi, "7", sz_long, "old", 1, 0, 0); - fill_prefetch_next (); + fill_prefetch_next (); genastore ("old", curi->smode, "srcreg", curi->size, "src"); break; case i_RTS: @@ -1500,7 +1514,7 @@ static void gen_opcode (unsigned long in printf ("\t\tException (7, m68k_getpc ());\n"); printf ("\t\tgoto %s;\n", endlabelstr); printf ("\t}\n"); - fill_prefetch_next (); + fill_prefetch_next (); need_endlabel = 1; break; case i_RTR: @@ -1508,7 +1522,7 @@ static void gen_opcode (unsigned long in genamode (Aipi, "7", sz_word, "sr", 1, 0, 0); genamode (Aipi, "7", sz_long, "pc", 1, 0, 0); printf ("\tregs.sr &= 0xFF00; sr &= 0xFF;\n"); - printf ("\tregs.sr |= sr; m68k_setpc(pc);\n"); + printf ("\tregs.sr |= sr; m68k_setpc (pc);\n"); printf ("\tMakeFromSR();\n"); m68k_pc_offset = 0; fill_prefetch_full (); @@ -1516,7 +1530,7 @@ static void gen_opcode (unsigned long in case i_JSR: genamode (curi->smode, "srcreg", curi->size, "src", 0, 0, GF_AA|GF_NOREFILL); start_brace (); - printf ("\tuaecptr oldpc = m68k_getpc() + %d;\n", m68k_pc_offset); + printf ("\tuaecptr oldpc = m68k_getpc () + %d;\n", m68k_pc_offset); if (using_exception_3) { printf ("\tif (srca & 1) {\n"); printf ("\t\texception3i (opcode, oldpc, srca);\n"); @@ -1526,21 +1540,23 @@ static void gen_opcode (unsigned long in } printf ("\tm68k_setpc (srca);\n"); m68k_pc_offset = 0; - fill_prefetch_1 (0, 0); - printf("\tm68k_areg (regs, 7) -= 4;\n"); + fill_prefetch_1 (0); + printf("\tm68k_areg (regs, 7) -= 4;\n"); printf("\tput_long (m68k_areg (regs, 7), oldpc);\n"); - fill_prefetch_next (); + fill_prefetch_next (); break; case i_JMP: genamode (curi->smode, "srcreg", curi->size, "src", 0, 0, GF_AA|GF_NOREFILL); if (using_exception_3) { printf ("\tif (srca & 1) {\n"); - printf ("\t\texception3i (opcode, m68k_getpc() + 6, srca);\n"); + printf ("\t\texception3i (opcode, m68k_getpc () + 6, srca);\n"); printf ("\t\tgoto %s;\n", endlabelstr); printf ("\t}\n"); need_endlabel = 1; } - printf ("\tm68k_setpc(srca);\n"); + if (curi->smode == Ad16 || curi->smode == Ad8r || curi->smode == absw || curi->smode == PC16 || curi->smode == PC8r) + addcycles (2); + printf ("\tm68k_setpc (srca);\n"); m68k_pc_offset = 0; fill_prefetch_full (); break; @@ -1549,24 +1565,26 @@ static void gen_opcode (unsigned long in printf ("\tuae_s32 s = (uae_s32)src + 2;\n"); if (using_exception_3) { printf ("\tif (src & 1) {\n"); - printf ("\t\texception3i (opcode, m68k_getpc() + 2, m68k_getpc() + s);\n"); + printf ("\t\texception3i (opcode, m68k_getpc () + 2, m68k_getpc () + s);\n"); printf ("\t\tgoto %s;\n", endlabelstr); printf ("\t}\n"); need_endlabel = 1; } - printf ("\tm68k_do_bsr(m68k_getpc() + %d, s);\n", m68k_pc_offset); + addcycles (2); + printf ("\tm68k_do_bsr(m68k_getpc () + %d, s);\n", m68k_pc_offset); m68k_pc_offset = 0; fill_prefetch_full (); break; case i_Bcc: if (curi->size == sz_long) { if (cpu_level < 2) { + addcycles (2); printf ("\tif (cctrue(%d)) {\n", curi->cc, endlabelstr); - printf ("\t\texception3i (opcode, m68k_getpc() + 2, m68k_getpc() + 1);\n"); + printf ("\t\texception3i (opcode, m68k_getpc () + 2, m68k_getpc () + 1);\n"); printf ("\t\tgoto %s;\n", endlabelstr); printf ("\t}\n"); sync_m68k_pc (); - irc2ir (); + irc2ir (); fill_prefetch_2 (); printf ("\tgoto %s;\n", endlabelstr); need_endlabel = 1; @@ -1575,11 +1593,12 @@ static void gen_opcode (unsigned long in next_cpu_level = 1; } } - genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, GF_AA|GF_NOREFILL); + genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, GF_AA | GF_NOREFILL); + addcycles (2); printf ("\tif (!cctrue(%d)) goto didnt_jump;\n", curi->cc); if (using_exception_3) { printf ("\tif (src & 1) {\n"); - printf ("\t\texception3i (opcode, m68k_getpc() + 2, m68k_getpc() + 2 + (uae_s32)src);\n"); + printf ("\t\texception3i (opcode, m68k_getpc () + 2, m68k_getpc () + 2 + (uae_s32)src);\n"); printf ("\t\tgoto %s;\n", endlabelstr); printf ("\t}\n"); need_endlabel = 1; @@ -1594,7 +1613,7 @@ static void gen_opcode (unsigned long in if (using_ce) printf ("\treturn;\n"); else - printf ("\treturn 10 * %d;\n", CYCLE_UNIT / 2); + printf ("\treturn 10 * CYCLE_UNIT / 2;\n"); } else { printf ("\tm68k_incpc ((uae_s32)src + 2);\n"); returncycles ("\t", 10); @@ -1603,6 +1622,7 @@ static void gen_opcode (unsigned long in need_endlabel = 1; sync_m68k_pc (); if (curi->size == sz_byte) { + addcycles (2); irc2ir (); fill_prefetch_2 (); } else @@ -1613,41 +1633,46 @@ static void gen_opcode (unsigned long in genamode (curi->smode, "srcreg", curi->size, "src", 0, 0, GF_AA); genamode (curi->dmode, "dstreg", curi->size, "dst", 2, 0, GF_AA); if (curi->smode == Ad8r || curi->smode == PC8r) - tmpc += 4; - fill_prefetch_next_delay (tmpc); + addcycles (4); + fill_prefetch_next (); genastore ("srca", curi->dmode, "dstreg", curi->size, "dst"); break; case i_PEA: genamode (curi->smode, "srcreg", curi->size, "src", 0, 0, GF_AA); genamode (Apdi, "7", sz_long, "dst", 2, 0, GF_AA); if (curi->smode == Ad8r || curi->smode == PC8r) - tmpc += 4; - fill_prefetch_next_delay (tmpc); + addcycles (4); + if (!(curi->smode == absw || curi->smode == absl)) + fill_prefetch_next (); genastore ("srca", Apdi, "7", sz_long, "dst"); + if ((curi->smode == absw || curi->smode == absl)) + fill_prefetch_next (); break; case i_DBcc: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, GF_AA|GF_NOREFILL); genamode (curi->dmode, "dstreg", curi->size, "offs", 1, 0, GF_AA|GF_NOREFILL); - printf ("\tuaecptr oldpc = m68k_getpc();\n"); + printf ("\tuaecptr oldpc = m68k_getpc ();\n"); + addcycles (2); printf ("\tif (!cctrue(%d)) {\n", curi->cc); - printf ("\t\tm68k_incpc((uae_s32)offs + 2);\n"); - printf ("\t"); fill_prefetch_1 (0, 0); + printf ("\t\tm68k_incpc ((uae_s32)offs + 2);\n"); + printf ("\t"); fill_prefetch_1 (0); printf ("\t"); genastore ("(src-1)", curi->smode, "srcreg", curi->size, "src"); printf ("\t\tif (src) {\n"); if (using_exception_3) { printf ("\t\t\tif (offs & 1) {\n"); - printf ("\t\t\t\texception3i (opcode, m68k_getpc() + 2, m68k_getpc() + 2 + (uae_s32)offs + 2);\n"); + printf ("\t\t\t\texception3i (opcode, m68k_getpc () + 2, m68k_getpc () + 2 + (uae_s32)offs + 2);\n"); printf ("\t\t\t\tgoto %s;\n", endlabelstr); printf ("\t\t\t}\n"); need_endlabel = 1; } irc2ir (); - fill_prefetch_1 (2, 0); + fill_prefetch_1 (2); returncycles ("\t\t\t", 12); printf ("\t\t}\n"); printf ("\t} else {\n"); + addcycles2 ("\t\t", 2); printf ("\t}\n"); printf ("\tm68k_setpc (oldpc + %d);\n", m68k_pc_offset); m68k_pc_offset = 0; @@ -1658,16 +1683,14 @@ static void gen_opcode (unsigned long in case i_Scc: genamode (curi->smode, "srcreg", curi->size, "src", cpu_level == 0 ? 1 : 2, 0, 0); start_brace (); - fill_prefetch_next_cycles (); + fill_prefetch_next (); printf ("\tint val = cctrue(%d) ? 0xff : 0;\n", curi->cc); genastore ("val", curi->smode, "srcreg", curi->size, "src"); break; case i_DIVU: - printf ("\tuaecptr oldpc = m68k_getpc();\n"); + printf ("\tuaecptr oldpc = m68k_getpc ();\n"); genamode (curi->smode, "srcreg", sz_word, "src", 1, 0, 0); genamode (curi->dmode, "dstreg", sz_long, "dst", 1, 0, 0); - fill_prefetch_next_cycles (); - sync_m68k_pc (); printf ("\tCLEAR_CZNV;\n"); printf ("\tif (src == 0) {\n"); if (cpu_level > 0) { @@ -1676,14 +1699,15 @@ static void gen_opcode (unsigned long in */ printf("\t\tSET_VFLG (1);\n"); printf("\t\tif (dst < 0) SET_NFLG (1);\n"); - } + } + printf ("\t\tm68k_incpc (%d);\n", m68k_pc_offset); printf ("\t\tException (5, oldpc);\n"); printf ("\t\tgoto %s;\n", endlabelstr); printf ("\t} else {\n"); printf ("\t\tuae_u32 newv = (uae_u32)dst / (uae_u32)(uae_u16)src;\n"); printf ("\t\tuae_u32 rem = (uae_u32)dst %% (uae_u32)(uae_u16)src;\n"); if (using_ce) { - printf ("\t\tint cycles = 138 * %d - lostcycles;\n", CYCLE_UNIT / 2); + printf ("\t\tint cycles = 138 * CYCLE_UNIT / 2 - lostcycles;\n"); } /* The N flag appears to be set each time there is an overflow. * Weird. but 68020 only sets N when dst is negative.. */ @@ -1700,16 +1724,16 @@ static void gen_opcode (unsigned long in printf ("\t\t\tnewv = (newv & 0xffff) | ((uae_u32)rem << 16);\n"); printf ("\t\t"); genastore ("newv", curi->dmode, "dstreg", sz_long, "dst"); printf ("\t\t}\n"); + fill_prefetch_next (); + sync_m68k_pc (); printf ("\t}\n"); insn_n_cycles += 136; need_endlabel = 1; break; case i_DIVS: - printf ("\tuaecptr oldpc = m68k_getpc();\n"); + printf ("\tuaecptr oldpc = m68k_getpc ();\n"); genamode (curi->smode, "srcreg", sz_word, "src", 1, 0, 0); genamode (curi->dmode, "dstreg", sz_long, "dst", 1, 0, 0); - fill_prefetch_next_cycles (); - sync_m68k_pc (); printf ("\tCLEAR_CZNV;\n"); printf ("\tif (src == 0) {\n"); if (cpu_level > 0) { @@ -1719,13 +1743,14 @@ static void gen_opcode (unsigned long in printf("\t\tSET_VFLG (1);\n"); printf("\t\tSET_ZFLG (1);\n"); } + printf ("\t\tm68k_incpc (%d);\n", m68k_pc_offset); printf ("\t\tException (5, oldpc);\n"); printf ("\t\tgoto %s;\n", endlabelstr); printf ("\t} else {\n"); printf ("\t\tuae_s32 newv = (uae_s32)dst / (uae_s32)(uae_s16)src;\n"); printf ("\t\tuae_u16 rem = (uae_s32)dst %% (uae_s32)(uae_s16)src;\n"); if (using_ce) { - printf ("\t\tint cycles = 156 * %d - lostcycles;\n", CYCLE_UNIT / 2); + printf ("\t\tint cycles = 156 * CYCLE_UNIT / 2 - lostcycles;\n"); } printf ("\t\tif ((newv & 0xffff8000) != 0 && (newv & 0xffff8000) != 0xffff8000) {\n"); printf ("\t\t\tSET_VFLG (1);\n"); @@ -1741,6 +1766,8 @@ static void gen_opcode (unsigned long in printf ("\t\t\tnewv = (newv & 0xffff) | ((uae_u32)rem << 16);\n"); printf ("\t\t"); genastore ("newv", curi->dmode, "dstreg", sz_long, "dst"); printf ("\t\t}\n"); + fill_prefetch_next (); + sync_m68k_pc (); printf ("\t}\n"); insn_n_cycles += 154; need_endlabel = 1; @@ -1748,7 +1775,7 @@ static void gen_opcode (unsigned long in case i_MULU: genamode (curi->smode, "srcreg", sz_word, "src", 1, 0, 0); genamode (curi->dmode, "dstreg", sz_word, "dst", 1, 0, 0); - fill_prefetch_next_cycles (); + fill_prefetch_next (); start_brace (); printf ("\tuae_u32 newv = (uae_u32)(uae_u16)dst * (uae_u32)(uae_u16)src;\n"); genflags (flag_logical, sz_long, "newv", "", ""); @@ -1759,7 +1786,7 @@ static void gen_opcode (unsigned long in case i_MULS: genamode (curi->smode, "srcreg", sz_word, "src", 1, 0, 0); genamode (curi->dmode, "dstreg", sz_word, "dst", 1, 0, 0); - fill_prefetch_next_cycles (); + fill_prefetch_next (); start_brace (); printf ("\tuae_u32 newv = (uae_s32)(uae_s16)dst * (uae_s32)(uae_s16)src;\n"); genflags (flag_logical, sz_long, "newv", "", ""); @@ -1767,11 +1794,12 @@ static void gen_opcode (unsigned long in insn_n_cycles += 66; break; case i_CHK: - printf ("\tuaecptr oldpc = m68k_getpc();\n"); + printf ("\tuaecptr oldpc = m68k_getpc ();\n"); genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, 0); sync_m68k_pc (); - fill_prefetch_next_delay (6); + addcycles (6); + fill_prefetch_next (); printf ("\tif ((uae_s32)dst < 0) {\n"); printf ("\t\tSET_NFLG (1);\n"); printf ("\t\tException (6, oldpc);\n"); @@ -1785,22 +1813,22 @@ static void gen_opcode (unsigned long in break; case i_CHK2: - printf ("\tuaecptr oldpc = m68k_getpc();\n"); + printf ("\tuaecptr oldpc = m68k_getpc ();\n"); genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "dst", 2, 0, 0); - fill_prefetch_0 (); + fill_prefetch_0 (); printf ("\t{uae_s32 upper,lower,reg = regs.regs[(extra >> 12) & 15];\n"); switch (curi->size) { case sz_byte: - printf ("\tlower=(uae_s32)(uae_s8)get_byte(dsta); upper = (uae_s32)(uae_s8)get_byte(dsta+1);\n"); + printf ("\tlower=(uae_s32)(uae_s8)get_byte (dsta); upper = (uae_s32)(uae_s8)get_byte (dsta+1);\n"); printf ("\tif ((extra & 0x8000) == 0) reg = (uae_s32)(uae_s8)reg;\n"); break; case sz_word: - printf ("\tlower=(uae_s32)(uae_s16)get_word(dsta); upper = (uae_s32)(uae_s16)get_word(dsta+2);\n"); + printf ("\tlower=(uae_s32)(uae_s16)get_word (dsta); upper = (uae_s32)(uae_s16)get_word (dsta+2);\n"); printf ("\tif ((extra & 0x8000) == 0) reg = (uae_s32)(uae_s16)reg;\n"); break; case sz_long: - printf ("\tlower=get_long(dsta); upper = get_long(dsta+4);\n"); + printf ("\tlower=get_long (dsta); upper = get_long (dsta+4);\n"); break; default: abort (); @@ -1814,7 +1842,7 @@ static void gen_opcode (unsigned long in case i_ASR: genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0, 0); - fill_prefetch_next_cycles (); + fill_prefetch_next (); start_brace (); switch (curi->size) { case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break; @@ -1848,7 +1876,7 @@ static void gen_opcode (unsigned long in case i_ASL: genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0, 0); - fill_prefetch_next_cycles (); + fill_prefetch_next (); start_brace (); switch (curi->size) { case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break; @@ -1885,7 +1913,7 @@ static void gen_opcode (unsigned long in case i_LSR: genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0, 0); - fill_prefetch_next_cycles (); + fill_prefetch_next (); start_brace (); switch (curi->size) { case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break; @@ -1915,7 +1943,7 @@ static void gen_opcode (unsigned long in case i_LSL: genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0, 0); - fill_prefetch_next_cycles (); + fill_prefetch_next (); start_brace (); switch (curi->size) { case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break; @@ -1946,7 +1974,7 @@ static void gen_opcode (unsigned long in case i_ROL: genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0, 0); - fill_prefetch_next_cycles (); + fill_prefetch_next (); start_brace (); switch (curi->size) { case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break; @@ -1974,7 +2002,7 @@ static void gen_opcode (unsigned long in case i_ROR: genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0, 0); - fill_prefetch_next_cycles (); + fill_prefetch_next (); start_brace (); switch (curi->size) { case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break; @@ -2002,7 +2030,7 @@ static void gen_opcode (unsigned long in case i_ROXL: genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0, 0); - fill_prefetch_next_cycles (); + fill_prefetch_next (); start_brace (); switch (curi->size) { case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break; @@ -2033,7 +2061,7 @@ static void gen_opcode (unsigned long in case i_ROXR: genamode (curi->smode, "srcreg", curi->size, "cnt", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "data", 1, 0, 0); - fill_prefetch_next_cycles (); + fill_prefetch_next (); start_brace (); switch (curi->size) { case sz_byte: printf ("\tuae_u32 val = (uae_u8)data;\n"); break; @@ -2232,15 +2260,15 @@ static void gen_opcode (unsigned long in start_brace (); printf ("\tint ru = (src >> 6) & 7;\n"); printf ("\tint rc = src & 7;\n"); - genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, rc)", "dst"); + genflags (flag_cmp, curi->size, "newv", "m68k_dreg (regs, rc)", "dst"); printf ("\tif (GET_ZFLG)"); old_brace_level = n_braces; start_brace (); - genastore ("(m68k_dreg(regs, ru))", curi->dmode, "dstreg", curi->size, "dst"); + genastore ("(m68k_dreg (regs, ru))", curi->dmode, "dstreg", curi->size, "dst"); pop_braces (old_brace_level); printf ("else"); start_brace (); - printf ("m68k_dreg(regs, rc) = dst;\n"); + printf ("m68k_dreg (regs, rc) = dst;\n"); pop_braces (old_brace_level); } break; @@ -2250,33 +2278,33 @@ static void gen_opcode (unsigned long in printf ("\tuae_u32 rn2 = regs.regs[(extra >> 12) & 15];\n"); if (curi->size == sz_word) { int old_brace_level = n_braces; - printf ("\tuae_u16 dst1 = get_word(rn1), dst2 = get_word(rn2);\n"); - genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, (extra >> 16) & 7)", "dst1"); + printf ("\tuae_u16 dst1 = get_word (rn1), dst2 = get_word (rn2);\n"); + genflags (flag_cmp, curi->size, "newv", "m68k_dreg (regs, (extra >> 16) & 7)", "dst1"); printf ("\tif (GET_ZFLG) {\n"); - genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, extra & 7)", "dst2"); + genflags (flag_cmp, curi->size, "newv", "m68k_dreg (regs, extra & 7)", "dst2"); printf ("\tif (GET_ZFLG) {\n"); - printf ("\tput_word(rn1, m68k_dreg(regs, (extra >> 22) & 7));\n"); - printf ("\tput_word(rn1, m68k_dreg(regs, (extra >> 6) & 7));\n"); + printf ("\tput_word (rn1, m68k_dreg (regs, (extra >> 22) & 7));\n"); + printf ("\tput_word (rn1, m68k_dreg (regs, (extra >> 6) & 7));\n"); printf ("\t}}\n"); pop_braces (old_brace_level); printf ("\tif (! GET_ZFLG) {\n"); - printf ("\tm68k_dreg(regs, (extra >> 22) & 7) = (m68k_dreg(regs, (extra >> 22) & 7) & ~0xffff) | (dst1 & 0xffff);\n"); - printf ("\tm68k_dreg(regs, (extra >> 6) & 7) = (m68k_dreg(regs, (extra >> 6) & 7) & ~0xffff) | (dst2 & 0xffff);\n"); + printf ("\tm68k_dreg (regs, (extra >> 22) & 7) = (m68k_dreg (regs, (extra >> 22) & 7) & ~0xffff) | (dst1 & 0xffff);\n"); + printf ("\tm68k_dreg (regs, (extra >> 6) & 7) = (m68k_dreg (regs, (extra >> 6) & 7) & ~0xffff) | (dst2 & 0xffff);\n"); printf ("\t}\n"); } else { int old_brace_level = n_braces; - printf ("\tuae_u32 dst1 = get_long(rn1), dst2 = get_long(rn2);\n"); - genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, (extra >> 16) & 7)", "dst1"); + printf ("\tuae_u32 dst1 = get_long (rn1), dst2 = get_long (rn2);\n"); + genflags (flag_cmp, curi->size, "newv", "m68k_dreg (regs, (extra >> 16) & 7)", "dst1"); printf ("\tif (GET_ZFLG) {\n"); - genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, extra & 7)", "dst2"); + genflags (flag_cmp, curi->size, "newv", "m68k_dreg (regs, extra & 7)", "dst2"); printf ("\tif (GET_ZFLG) {\n"); - printf ("\tput_long(rn1, m68k_dreg(regs, (extra >> 22) & 7));\n"); - printf ("\tput_long(rn1, m68k_dreg(regs, (extra >> 6) & 7));\n"); + printf ("\tput_long (rn1, m68k_dreg (regs, (extra >> 22) & 7));\n"); + printf ("\tput_long (rn1, m68k_dreg (regs, (extra >> 6) & 7));\n"); printf ("\t}}\n"); pop_braces (old_brace_level); printf ("\tif (! GET_ZFLG) {\n"); - printf ("\tm68k_dreg(regs, (extra >> 22) & 7) = dst1;\n"); - printf ("\tm68k_dreg(regs, (extra >> 6) & 7) = dst2;\n"); + printf ("\tm68k_dreg (regs, (extra >> 22) & 7) = dst1;\n"); + printf ("\tm68k_dreg (regs, (extra >> 6) & 7) = dst2;\n"); printf ("\t}\n"); } break; @@ -2296,9 +2324,9 @@ static void gen_opcode (unsigned long in genamode (curi->dmode, "dstreg", curi->size, "src", 1, 0, 0); printf ("\tif (extra & 0x8000) {\n"); switch (curi->size) { - case sz_byte: printf ("\tm68k_areg(regs, (extra >> 12) & 7) = (uae_s32)(uae_s8)src;\n"); break; - case sz_word: printf ("\tm68k_areg(regs, (extra >> 12) & 7) = (uae_s32)(uae_s16)src;\n"); break; - case sz_long: printf ("\tm68k_areg(regs, (extra >> 12) & 7) = src;\n"); break; + case sz_byte: printf ("\tm68k_areg (regs, (extra >> 12) & 7) = (uae_s32)(uae_s8)src;\n"); break; + case sz_word: printf ("\tm68k_areg (regs, (extra >> 12) & 7) = (uae_s32)(uae_s16)src;\n"); break; + case sz_long: printf ("\tm68k_areg (regs, (extra >> 12) & 7) = src;\n"); break; default: abort (); } printf ("\t} else {\n"); @@ -2323,13 +2351,13 @@ static void gen_opcode (unsigned long in if (curi->smode != am_unknown && curi->smode != am_illg) genamode (curi->smode, "srcreg", curi->size, "dummy", 1, 0, 0); fill_prefetch_0 (); - printf ("\tif (cctrue(%d)) { Exception(7,m68k_getpc()); goto %s; }\n", curi->cc, endlabelstr); + printf ("\tif (cctrue(%d)) { Exception(7,m68k_getpc ()); goto %s; }\n", curi->cc, endlabelstr); need_endlabel = 1; break; case i_DIVL: sync_m68k_pc (); start_brace (); - printf ("\tuaecptr oldpc = m68k_getpc();\n"); + printf ("\tuaecptr oldpc = m68k_getpc ();\n"); genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0, 0); genamode (curi->dmode, "dstreg", curi->size, "dst", 1, 0, 0); sync_m68k_pc (); @@ -2352,14 +2380,14 @@ static void gen_opcode (unsigned long in genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0, 0); genamode (curi->dmode, "dstreg", sz_long, "dst", 2, 0, 0); start_brace (); - printf ("\tuae_s32 offset = extra & 0x800 ? m68k_dreg(regs, (extra >> 6) & 7) : (extra >> 6) & 0x1f;\n"); - printf ("\tint width = (((extra & 0x20 ? m68k_dreg(regs, extra & 7) : extra) -1) & 0x1f) +1;\n"); + printf ("\tuae_s32 offset = extra & 0x800 ? m68k_dreg (regs, (extra >> 6) & 7) : (extra >> 6) & 0x1f;\n"); + printf ("\tint width = (((extra & 0x20 ? m68k_dreg (regs, extra & 7) : (uae_u32)extra) - 1) & 0x1f) + 1;\n"); if (curi->dmode == Dreg) { - printf ("\tuae_u32 tmp = m68k_dreg(regs, dstreg) << (offset & 0x1f);\n"); + printf ("\tuae_u32 tmp = m68k_dreg (regs, dstreg) << (offset & 0x1f);\n"); } else { printf ("\tuae_u32 tmp,bf0,bf1;\n"); printf ("\tdsta += (offset >> 3) | (offset & 0x80000000 ? ~0x1fffffff : 0);\n"); - printf ("\tbf0 = get_long(dsta);bf1 = get_byte(dsta+4) & 0xff;\n"); + printf ("\tbf0 = get_long (dsta);bf1 = get_byte (dsta+4) & 0xff;\n"); printf ("\ttmp = (bf0 << (offset & 7)) | (bf1 >> (8 - (offset & 7)));\n"); } printf ("\ttmp >>= (32 - width);\n"); @@ -2369,14 +2397,14 @@ static void gen_opcode (unsigned long in case i_BFTST: break; case i_BFEXTU: - printf ("\tm68k_dreg(regs, (extra >> 12) & 7) = tmp;\n"); + printf ("\tm68k_dreg (regs, (extra >> 12) & 7) = tmp;\n"); break; case i_BFCHG: printf ("\ttmp = ~tmp;\n"); break; case i_BFEXTS: printf ("\tif (GET_NFLG) tmp |= width == 32 ? 0 : (-1 << width);\n"); - printf ("\tm68k_dreg(regs, (extra >> 12) & 7) = tmp;\n"); + printf ("\tm68k_dreg (regs, (extra >> 12) & 7) = tmp;\n"); break; case i_BFCLR: printf ("\ttmp = 0;\n"); @@ -2384,13 +2412,13 @@ static void gen_opcode (unsigned long in case i_BFFFO: printf ("\t{ uae_u32 mask = 1 << (width-1);\n"); printf ("\twhile (mask) { if (tmp & mask) break; mask >>= 1; offset++; }}\n"); - printf ("\tm68k_dreg(regs, (extra >> 12) & 7) = offset;\n"); + printf ("\tm68k_dreg (regs, (extra >> 12) & 7) = offset;\n"); break; case i_BFSET: printf ("\ttmp = 0xffffffff;\n"); break; case i_BFINS: - printf ("\ttmp = m68k_dreg(regs, (extra >> 12) & 7);\n"); + printf ("\ttmp = m68k_dreg (regs, (extra >> 12) & 7);\n"); printf ("\tSET_NFLG (tmp & (1 << (width - 1)) ? 1 : 0);\n"); printf ("\tSET_ZFLG (tmp == 0);\n"); break; @@ -2404,61 +2432,61 @@ static void gen_opcode (unsigned long in { printf ("\ttmp <<= (32 - width);\n"); if (curi->dmode == Dreg) { - printf ("\tm68k_dreg(regs, dstreg) = (m68k_dreg(regs, dstreg) & ((offset & 0x1f) == 0 ? 0 :\n"); + printf ("\tm68k_dreg (regs, dstreg) = (m68k_dreg (regs, dstreg) & ((offset & 0x1f) == 0 ? 0 :\n"); printf ("\t\t(0xffffffff << (32 - (offset & 0x1f))))) |\n"); printf ("\t\t(tmp >> (offset & 0x1f)) |\n"); printf ("\t\t(((offset & 0x1f) + width) >= 32 ? 0 :\n"); - printf (" (m68k_dreg(regs, dstreg) & ((uae_u32)0xffffffff >> ((offset & 0x1f) + width))));\n"); + printf (" (m68k_dreg (regs, dstreg) & ((uae_u32)0xffffffff >> ((offset & 0x1f) + width))));\n"); } else { printf ("\tbf0 = (bf0 & (0xff000000 << (8 - (offset & 7)))) |\n"); printf ("\t\t(tmp >> (offset & 7)) |\n"); printf ("\t\t(((offset & 7) + width) >= 32 ? 0 :\n"); printf ("\t\t (bf0 & ((uae_u32)0xffffffff >> ((offset & 7) + width))));\n"); - printf ("\tput_long(dsta,bf0 );\n"); + printf ("\tput_long (dsta,bf0 );\n"); printf ("\tif (((offset & 7) + width) > 32) {\n"); printf ("\t\tbf1 = (bf1 & (0xff >> (width - 32 + (offset & 7)))) |\n"); printf ("\t\t\t(tmp << (8 - (offset & 7)));\n"); - printf ("\t\tput_byte(dsta+4,bf1);\n"); + printf ("\t\tput_byte (dsta+4,bf1);\n"); printf ("\t}\n"); } } break; case i_PACK: if (curi->smode == Dreg) { - printf ("\tuae_u16 val = m68k_dreg(regs, srcreg) + %s;\n", gen_nextiword (0)); - printf ("\tm68k_dreg(regs, dstreg) = (m68k_dreg(regs, dstreg) & 0xffffff00) | ((val >> 4) & 0xf0) | (val & 0xf);\n"); + printf ("\tuae_u16 val = m68k_dreg (regs, srcreg) + %s;\n", gen_nextiword (0)); + printf ("\tm68k_dreg (regs, dstreg) = (m68k_dreg (regs, dstreg) & 0xffffff00) | ((val >> 4) & 0xf0) | (val & 0xf);\n"); } else { printf ("\tuae_u16 val;\n"); - printf ("\tm68k_areg(regs, srcreg) -= areg_byteinc[srcreg];\n"); - printf ("\tval = (uae_u16)get_byte(m68k_areg(regs, srcreg));\n"); - printf ("\tm68k_areg(regs, srcreg) -= areg_byteinc[srcreg];\n"); - printf ("\tval = (val | ((uae_u16)get_byte(m68k_areg(regs, srcreg)) << 8)) + %s;\n", gen_nextiword (0)); - printf ("\tm68k_areg(regs, dstreg) -= areg_byteinc[dstreg];\n"); - printf ("\tput_byte(m68k_areg(regs, dstreg),((val >> 4) & 0xf0) | (val & 0xf));\n"); + printf ("\tm68k_areg (regs, srcreg) -= areg_byteinc[srcreg];\n"); + printf ("\tval = (uae_u16)get_byte (m68k_areg (regs, srcreg));\n"); + printf ("\tm68k_areg (regs, srcreg) -= areg_byteinc[srcreg];\n"); + printf ("\tval = (val | ((uae_u16)get_byte (m68k_areg (regs, srcreg)) << 8)) + %s;\n", gen_nextiword (0)); + printf ("\tm68k_areg (regs, dstreg) -= areg_byteinc[dstreg];\n"); + printf ("\tput_byte (m68k_areg (regs, dstreg),((val >> 4) & 0xf0) | (val & 0xf));\n"); } break; case i_UNPK: if (curi->smode == Dreg) { - printf ("\tuae_u16 val = m68k_dreg(regs, srcreg);\n"); + printf ("\tuae_u16 val = m68k_dreg (regs, srcreg);\n"); printf ("\tval = (((val << 4) & 0xf00) | (val & 0xf)) + %s;\n", gen_nextiword (0)); - printf ("\tm68k_dreg(regs, dstreg) = (m68k_dreg(regs, dstreg) & 0xffff0000) | (val & 0xffff);\n"); + printf ("\tm68k_dreg (regs, dstreg) = (m68k_dreg (regs, dstreg) & 0xffff0000) | (val & 0xffff);\n"); } else { printf ("\tuae_u16 val;\n"); - printf ("\tm68k_areg(regs, srcreg) -= areg_byteinc[srcreg];\n"); - printf ("\tval = (uae_u16)get_byte(m68k_areg(regs, srcreg));\n"); + printf ("\tm68k_areg (regs, srcreg) -= areg_byteinc[srcreg];\n"); + printf ("\tval = (uae_u16)get_byte (m68k_areg (regs, srcreg));\n"); printf ("\tval = (((val << 4) & 0xf00) | (val & 0xf)) + %s;\n", gen_nextiword (0)); - printf ("\tm68k_areg(regs, dstreg) -= areg_byteinc[dstreg];\n"); - printf ("\tput_byte(m68k_areg(regs, dstreg),val);\n"); - printf ("\tm68k_areg(regs, dstreg) -= areg_byteinc[dstreg];\n"); - printf ("\tput_byte(m68k_areg(regs, dstreg),val >> 8);\n"); + printf ("\tm68k_areg (regs, dstreg) -= areg_byteinc[dstreg];\n"); + printf ("\tput_byte (m68k_areg (regs, dstreg),val);\n"); + printf ("\tm68k_areg (regs, dstreg) -= areg_byteinc[dstreg];\n"); + printf ("\tput_byte (m68k_areg (regs, dstreg),val >> 8);\n"); } break; case i_TAS: genamode (curi->smode, "srcreg", curi->size, "src", 1, 0, 0); genflags (flag_logical, curi->size, "src", "", ""); if (!isreg (curi->smode)) - tmpc += 2; - fill_prefetch_next_delay (tmpc); + addcycles (2); + fill_prefetch_next (); printf ("\tsrc |= 0x80;\n"); genastore ("src", curi->smode, "srcreg", curi->size, "src"); break; @@ -2480,7 +2508,7 @@ static void gen_opcode (unsigned long in case i_FTRAPcc: sync_m68k_pc (); start_brace (); - printf ("\tuaecptr oldpc = m68k_getpc();\n"); + printf ("\tuaecptr oldpc = m68k_getpc ();\n"); if (curi->smode != am_unknown && curi->smode != am_illg) genamode (curi->smode, "srcreg", curi->size, "dummy", 1, 0, 0); sync_m68k_pc (); @@ -2489,7 +2517,7 @@ static void gen_opcode (unsigned long in case i_FBcc: sync_m68k_pc (); start_brace (); - printf ("\tuaecptr pc = m68k_getpc();\n"); + printf ("\tuaecptr pc = m68k_getpc ();\n"); genamode (curi->dmode, "srcreg", curi->size, "extra", 1, 0, 0); sync_m68k_pc (); printf ("\tfbcc_opp(opcode,pc,extra);\n"); @@ -2513,37 +2541,52 @@ static void gen_opcode (unsigned long in case i_MOVE16: if ((opcode & 0xfff8) == 0xf620) { /* MOVE16 (Ax)+,(Ay)+ */ - printf ("\tuaecptr mems = m68k_areg(regs, srcreg) & ~15, memd;\n"); + printf ("\tuaecptr mems = m68k_areg (regs, srcreg) & ~15, memd;\n"); printf ("\tdstreg = (%s >> 12) & 7;\n", gen_nextiword (0)); - printf ("\tmemd = m68k_areg(regs, dstreg) & ~15;\n"); - printf ("\tput_long(memd, get_long(mems));\n"); - printf ("\tput_long(memd+4, get_long(mems+4));\n"); - printf ("\tput_long(memd+8, get_long(mems+8));\n"); - printf ("\tput_long(memd+12, get_long(mems+12));\n"); + printf ("\tmemd = m68k_areg (regs, dstreg) & ~15;\n"); + printf ("\tput_long (memd, get_long (mems));\n"); + printf ("\tput_long (memd+4, get_long (mems+4));\n"); + printf ("\tput_long (memd+8, get_long (mems+8));\n"); + printf ("\tput_long (memd+12, get_long (mems+12));\n"); printf ("\tif (srcreg != dstreg)\n"); - printf ("\tm68k_areg(regs, srcreg) += 16;\n"); - printf ("\tm68k_areg(regs, dstreg) += 16;\n"); + printf ("\tm68k_areg (regs, srcreg) += 16;\n"); + printf ("\tm68k_areg (regs, dstreg) += 16;\n"); } else { /* Other variants */ genamode (curi->smode, "srcreg", curi->size, "mems", 0, 2, 0); genamode (curi->dmode, "dstreg", curi->size, "memd", 0, 2, 0); printf ("\tmemsa &= ~15;\n"); printf ("\tmemda &= ~15;\n"); - printf ("\tput_long(memda, get_long(memsa));\n"); - printf ("\tput_long(memda+4, get_long(memsa+4));\n"); - printf ("\tput_long(memda+8, get_long(memsa+8));\n"); - printf ("\tput_long(memda+12, get_long(memsa+12));\n"); + printf ("\tput_long (memda, get_long (memsa));\n"); + printf ("\tput_long (memda+4, get_long (memsa+4));\n"); + printf ("\tput_long (memda+8, get_long (memsa+8));\n"); + printf ("\tput_long (memda+12, get_long (memsa+12));\n"); if ((opcode & 0xfff8) == 0xf600) - printf ("\tm68k_areg(regs, srcreg) += 16;\n"); + printf ("\tm68k_areg (regs, srcreg) += 16;\n"); else if ((opcode & 0xfff8) == 0xf608) - printf ("\tm68k_areg(regs, dstreg) += 16;\n"); + printf ("\tm68k_areg (regs, dstreg) += 16;\n"); } break; case i_MMUOP: genamode (curi->smode, "srcreg", curi->size, "extra", 1, 0, 0); sync_m68k_pc (); - printf ("\tmmu_op(opcode,extra);\n"); + printf ("\tmmu_op (opcode, extra);\n"); + break; + case i_MMUOP30A: + printf ("\tuaecptr pc = m68k_getpc ();\n"); + if (curi->smode == Areg || curi->smode == Dreg) + printf("\tuae_u16 extraa = 0;\n"); + else + genamode (curi->smode, "srcreg", curi->size, "extra", 0, 0, 0); + sync_m68k_pc (); + printf ("\tmmu_op30 (pc, opcode, 1, extraa);\n"); + break; + case i_MMUOP30B: + printf ("\tuaecptr pc = m68k_getpc ();\n"); + genamode (curi->smode, "srcreg", curi->size, "extra", 0, 0, 0); + sync_m68k_pc (); + printf ("\tmmu_op30 (pc, opcode, 0, 0);\n"); break; default: abort (); @@ -2559,14 +2602,13 @@ static void generate_includes (FILE * f) { fprintf (f, "#include \"sysconfig.h\"\n"); fprintf (f, "#include \"sysdeps.h\"\n"); - fprintf (f, "#include \"config.h\"\n"); fprintf (f, "#include \"options.h\"\n"); fprintf (f, "#include \"memory.h\"\n"); fprintf (f, "#include \"custom.h\"\n"); fprintf (f, "#include \"newcpu.h\"\n"); fprintf (f, "#include \"cpu_prefetch.h\"\n"); fprintf (f, "#include \"cputbl.h\"\n"); - + fprintf (f, "#define CPUFUNC(x) x##_ff\n" "#ifdef NOFLAGS\n" "#include \"noflags.h\"\n" @@ -2593,12 +2635,14 @@ static void generate_one_opcode (int rp) if (table68k[opcode].handler != -1) return; - if (opcode_next_clev[rp] != cpu_level) { - fprintf (stblfile, "{ CPUFUNC(op_%lx_%d), 0, %ld }, /* %s */\n", opcode, opcode_last_postfix[rp], - opcode, lookuptab[i].name); - return; + if (generate_stbl) { + if (opcode_next_clev[rp] != cpu_level) { + fprintf (stblfile, "{ CPUFUNC(op_%lx_%d), 0, %ld }, /* %s */\n", opcode, opcode_last_postfix[rp], + opcode, lookuptab[i].name); + return; + } + fprintf (stblfile, "{ CPUFUNC(op_%lx_%d), 0, %ld }, /* %s */\n", opcode, postfix, opcode, lookuptab[i].name); } - fprintf (stblfile, "{ CPUFUNC(op_%lx_%d), 0, %ld }, /* %s */\n", opcode, postfix, opcode, lookuptab[i].name); fprintf (headerfile, "extern cpuop_func op_%lx_%d_nf;\n", opcode, postfix); fprintf (headerfile, "extern cpuop_func op_%lx_%d_ff;\n", opcode, postfix); printf ("unsigned long REGPARAM2 CPUFUNC(op_%lx_%d)(uae_u32 opcode) /* %s */\n{\n", opcode, postfix, lookuptab[i].name); @@ -2661,7 +2705,7 @@ static void generate_one_opcode (int rp) /* Check that we can do the little endian optimization safely. */ if (pos < 8 && (dmsk >> (8 - pos)) != 0) abort (); -#endif +#endif if (pos) printf ("\tuae_u32 dstreg = (opcode >> %d) & %d;\n", pos, dmsk); @@ -2675,7 +2719,7 @@ static void generate_one_opcode (int rp) gen_opcode (opcode); if (need_endlabel) printf ("%s: ;\n", endlabelstr); - printf ("return %d;\n", insn_n_cycles * CYCLE_UNIT / 2); + printf ("return %d * CYCLE_UNIT / 2;\n", insn_n_cycles); printf ("}\n"); opcode_next_clev[rp] = next_cpu_level; opcode_last_postfix[rp] = postfix; @@ -2687,9 +2731,9 @@ static void generate_func (void) using_prefetch = 0; using_exception_3 = 0; - for (i = 0; i < 6; i++) { - cpu_level = 4 - i; - if (i == 5) { + for (i = 0; i < 7; i++) { + cpu_level = 6 - i; + if (i == 6) { cpu_level = 0; using_prefetch = 1; using_exception_3 = 1; @@ -2698,37 +2742,39 @@ static void generate_func (void) } postfix = i; - fprintf (stblfile, "struct cputbl CPUFUNC(op_smalltbl_%d)[] = {\n", postfix); - - /* sam: this is for people with low memory (eg. me :)) */ - printf ("\n" - "#if !defined(PART_1) && !defined(PART_2) && " - "!defined(PART_3) && !defined(PART_4) && " + generate_stbl = i != 5; + if (generate_stbl) { + fprintf (stblfile, "const struct cputbl CPUFUNC(op_smalltbl_%d)[] = {\n", postfix); + + /* sam: this is for people with low memory (eg. me :)) */ + printf ("\n" + "#if !defined(PART_1) && !defined(PART_2) && " + "!defined(PART_3) && !defined(PART_4) && " "!defined(PART_5) && !defined(PART_6) && " "!defined(PART_7) && !defined(PART_8)" - "\n" - "#define PART_1 1\n" - "#define PART_2 1\n" - "#define PART_3 1\n" - "#define PART_4 1\n" - "#define PART_5 1\n" - "#define PART_6 1\n" - "#define PART_7 1\n" - "#define PART_8 1\n" - "#endif\n\n"); - + "\n" + "#define PART_1 1\n" + "#define PART_2 1\n" + "#define PART_3 1\n" + "#define PART_4 1\n" + "#define PART_5 1\n" + "#define PART_6 1\n" + "#define PART_7 1\n" + "#define PART_8 1\n" + "#endif\n\n"); + } rp = 0; - for(j=1;j<=8;++j) { - int k = (j*nr_cpuop_funcs)/8; - printf ("#ifdef PART_%d\n",j); - for (; rp < k; rp++) - generate_one_opcode (rp); - printf ("#endif\n\n"); + for(j = 1; j <= 8; ++j) { + int k = (j * nr_cpuop_funcs) / 8; + printf ("#ifdef PART_%d\n",j); + for (; rp < k; rp++) + generate_one_opcode (rp); + printf ("#endif\n\n"); } - fprintf (stblfile, "{ 0, 0, 0 }};\n"); + if (generate_stbl) + fprintf (stblfile, "{ 0, 0, 0 }};\n"); } - } int main (int argc, char **argv)