From: Toni Wilen Date: Wed, 13 Dec 2023 19:27:56 +0000 (+0200) Subject: Fix 68060 MMU MOVEM.L (An)+, if regs contain An. Small cleanup. X-Git-Tag: 5.1.0~11 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=283e985fdc0f423de5bad2005fe85a73b1225f77;p=francis%2Fwinuae.git Fix 68060 MMU MOVEM.L (An)+, if regs contain An. Small cleanup. --- diff --git a/cpuemu_31.cpp b/cpuemu_31.cpp index 23a3517a..b9954c8c 100644 --- a/cpuemu_31.cpp +++ b/cpuemu_31.cpp @@ -18663,14 +18663,12 @@ uae_u32 REGPARAM2 op_4890_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - int predec = 0; - put_word_mmu040(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_word_mmu040(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 2; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_word_mmu040(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_word_mmu040(srca, m68k_areg(regs, movem_index1[amask])); srca += 2; amask = movem_next[amask]; } @@ -18699,13 +18697,12 @@ uae_u32 REGPARAM2 op_48a0_31_ff(uae_u32 opcode) while (amask) { srca -= 2; int predec = movem_index2[amask] != dstreg ? 0 : 2; - put_word_mmu040(srca, m68k_areg (regs, movem_index2[amask]) - predec); + put_word_mmu040(srca, m68k_areg(regs, movem_index2[amask]) - predec); amask = movem_next[amask]; } while (dmask) { srca -= 2; - int predec = 0; - put_word_mmu040(srca, m68k_dreg (regs, movem_index2[dmask]) - predec); + put_word_mmu040(srca, m68k_dreg(regs, movem_index2[dmask])); dmask = movem_next[dmask]; } m68k_areg(regs, dstreg) = srca; @@ -18732,14 +18729,12 @@ uae_u32 REGPARAM2 op_48a8_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - int predec = 0; - put_word_mmu040(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_word_mmu040(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 2; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_word_mmu040(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_word_mmu040(srca, m68k_areg(regs, movem_index1[amask])); srca += 2; amask = movem_next[amask]; } @@ -18767,14 +18762,12 @@ uae_u32 REGPARAM2 op_48b0_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - int predec = 0; - put_word_mmu040(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_word_mmu040(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 2; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_word_mmu040(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_word_mmu040(srca, m68k_areg(regs, movem_index1[amask])); srca += 2; amask = movem_next[amask]; } @@ -18798,14 +18791,12 @@ uae_u32 REGPARAM2 op_48b8_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - int predec = 0; - put_word_mmu040(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_word_mmu040(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 2; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_word_mmu040(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_word_mmu040(srca, m68k_areg(regs, movem_index1[amask])); srca += 2; amask = movem_next[amask]; } @@ -18830,14 +18821,12 @@ uae_u32 REGPARAM2 op_48b9_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - int predec = 0; - put_word_mmu040(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_word_mmu040(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 2; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_word_mmu040(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_word_mmu040(srca, m68k_areg(regs, movem_index1[amask])); srca += 2; amask = movem_next[amask]; } @@ -18881,14 +18870,12 @@ uae_u32 REGPARAM2 op_48d0_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - int predec = 0; - put_long_mmu040(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_long_mmu040(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 4; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_long_mmu040(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_long_mmu040(srca, m68k_areg(regs, movem_index1[amask])); srca += 4; amask = movem_next[amask]; } @@ -18917,13 +18904,12 @@ uae_u32 REGPARAM2 op_48e0_31_ff(uae_u32 opcode) while (amask) { srca -= 4; int predec = movem_index2[amask] != dstreg ? 0 : 4; - put_long_mmu040(srca, m68k_areg (regs, movem_index2[amask]) - predec); + put_long_mmu040(srca, m68k_areg(regs, movem_index2[amask]) - predec); amask = movem_next[amask]; } while (dmask) { srca -= 4; - int predec = 0; - put_long_mmu040(srca, m68k_dreg (regs, movem_index2[dmask]) - predec); + put_long_mmu040(srca, m68k_dreg(regs, movem_index2[dmask])); dmask = movem_next[dmask]; } m68k_areg(regs, dstreg) = srca; @@ -18950,14 +18936,12 @@ uae_u32 REGPARAM2 op_48e8_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - int predec = 0; - put_long_mmu040(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_long_mmu040(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 4; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_long_mmu040(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_long_mmu040(srca, m68k_areg(regs, movem_index1[amask])); srca += 4; amask = movem_next[amask]; } @@ -18985,14 +18969,12 @@ uae_u32 REGPARAM2 op_48f0_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - int predec = 0; - put_long_mmu040(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_long_mmu040(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 4; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_long_mmu040(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_long_mmu040(srca, m68k_areg(regs, movem_index1[amask])); srca += 4; amask = movem_next[amask]; } @@ -19016,14 +18998,12 @@ uae_u32 REGPARAM2 op_48f8_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - int predec = 0; - put_long_mmu040(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_long_mmu040(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 4; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_long_mmu040(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_long_mmu040(srca, m68k_areg(regs, movem_index1[amask])); srca += 4; amask = movem_next[amask]; } @@ -19048,14 +19028,12 @@ uae_u32 REGPARAM2 op_48f9_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - int predec = 0; - put_long_mmu040(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_long_mmu040(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 4; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_long_mmu040(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_long_mmu040(srca, m68k_areg(regs, movem_index1[amask])); srca += 4; amask = movem_next[amask]; } @@ -20424,12 +20402,12 @@ uae_u32 REGPARAM2 op_4c90_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; amask = movem_next[amask]; } @@ -20456,12 +20434,12 @@ uae_u32 REGPARAM2 op_4c98_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; amask = movem_next[amask]; } @@ -20489,12 +20467,12 @@ uae_u32 REGPARAM2 op_4ca8_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; amask = movem_next[amask]; } @@ -20522,12 +20500,12 @@ uae_u32 REGPARAM2 op_4cb0_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; amask = movem_next[amask]; } @@ -20551,12 +20529,12 @@ uae_u32 REGPARAM2 op_4cb8_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; amask = movem_next[amask]; } @@ -20581,12 +20559,12 @@ uae_u32 REGPARAM2 op_4cb9_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; amask = movem_next[amask]; } @@ -20613,12 +20591,12 @@ uae_u32 REGPARAM2 op_4cba_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; amask = movem_next[amask]; } @@ -20646,12 +20624,12 @@ uae_u32 REGPARAM2 op_4cbb_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = (uae_s32)(uae_s16)get_word_mmu040(srca); srca += 2; amask = movem_next[amask]; } @@ -20677,12 +20655,12 @@ uae_u32 REGPARAM2 op_4cd0_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = get_long_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = get_long_mmu040(srca); srca += 4; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = get_long_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = get_long_mmu040(srca); srca += 4; amask = movem_next[amask]; } @@ -20709,12 +20687,12 @@ uae_u32 REGPARAM2 op_4cd8_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = get_long_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = get_long_mmu040(srca); srca += 4; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = get_long_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = get_long_mmu040(srca); srca += 4; amask = movem_next[amask]; } @@ -20742,12 +20720,12 @@ uae_u32 REGPARAM2 op_4ce8_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = get_long_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = get_long_mmu040(srca); srca += 4; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = get_long_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = get_long_mmu040(srca); srca += 4; amask = movem_next[amask]; } @@ -20775,12 +20753,12 @@ uae_u32 REGPARAM2 op_4cf0_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = get_long_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = get_long_mmu040(srca); srca += 4; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = get_long_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = get_long_mmu040(srca); srca += 4; amask = movem_next[amask]; } @@ -20804,12 +20782,12 @@ uae_u32 REGPARAM2 op_4cf8_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = get_long_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = get_long_mmu040(srca); srca += 4; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = get_long_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = get_long_mmu040(srca); srca += 4; amask = movem_next[amask]; } @@ -20834,12 +20812,12 @@ uae_u32 REGPARAM2 op_4cf9_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = get_long_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = get_long_mmu040(srca); srca += 4; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = get_long_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = get_long_mmu040(srca); srca += 4; amask = movem_next[amask]; } @@ -20866,12 +20844,12 @@ uae_u32 REGPARAM2 op_4cfa_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = get_long_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = get_long_mmu040(srca); srca += 4; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = get_long_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = get_long_mmu040(srca); srca += 4; amask = movem_next[amask]; } @@ -20899,12 +20877,12 @@ uae_u32 REGPARAM2 op_4cfb_31_ff(uae_u32 opcode) mmu040_movem = 1; mmu040_movem_ea = srca; while (dmask) { - m68k_dreg (regs, movem_index1[dmask]) = get_long_mmu040(srca); + m68k_dreg(regs, movem_index1[dmask]) = get_long_mmu040(srca); srca += 4; dmask = movem_next[dmask]; } while (amask) { - m68k_areg (regs, movem_index1[amask]) = get_long_mmu040(srca); + m68k_areg(regs, movem_index1[amask]) = get_long_mmu040(srca); srca += 4; amask = movem_next[amask]; } diff --git a/cpuemu_32.cpp b/cpuemu_32.cpp index 83b9c716..01ec7660 100644 --- a/cpuemu_32.cpp +++ b/cpuemu_32.cpp @@ -20782,7 +20782,7 @@ uae_u32 REGPARAM2 op_4c90_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -20798,7 +20798,7 @@ uae_u32 REGPARAM2 op_4c90_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -20833,7 +20833,7 @@ uae_u32 REGPARAM2 op_4c98_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -20849,7 +20849,7 @@ uae_u32 REGPARAM2 op_4c98_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -20885,7 +20885,7 @@ uae_u32 REGPARAM2 op_4ca8_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -20901,7 +20901,7 @@ uae_u32 REGPARAM2 op_4ca8_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -20937,7 +20937,7 @@ uae_u32 REGPARAM2 op_4cb0_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -20953,7 +20953,7 @@ uae_u32 REGPARAM2 op_4cb0_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -20985,7 +20985,7 @@ uae_u32 REGPARAM2 op_4cb8_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -21001,7 +21001,7 @@ uae_u32 REGPARAM2 op_4cb8_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -21034,7 +21034,7 @@ uae_u32 REGPARAM2 op_4cb9_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -21050,7 +21050,7 @@ uae_u32 REGPARAM2 op_4cb9_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -21085,7 +21085,7 @@ uae_u32 REGPARAM2 op_4cba_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -21101,7 +21101,7 @@ uae_u32 REGPARAM2 op_4cba_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -21137,7 +21137,7 @@ uae_u32 REGPARAM2 op_4cbb_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -21153,7 +21153,7 @@ uae_u32 REGPARAM2 op_4cbb_32_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -21187,7 +21187,7 @@ uae_u32 REGPARAM2 op_4cd0_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -21203,7 +21203,7 @@ uae_u32 REGPARAM2 op_4cd0_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -21238,7 +21238,7 @@ uae_u32 REGPARAM2 op_4cd8_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -21254,7 +21254,7 @@ uae_u32 REGPARAM2 op_4cd8_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -21290,7 +21290,7 @@ uae_u32 REGPARAM2 op_4ce8_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -21306,7 +21306,7 @@ uae_u32 REGPARAM2 op_4ce8_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -21342,7 +21342,7 @@ uae_u32 REGPARAM2 op_4cf0_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -21358,7 +21358,7 @@ uae_u32 REGPARAM2 op_4cf0_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -21390,7 +21390,7 @@ uae_u32 REGPARAM2 op_4cf8_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -21406,7 +21406,7 @@ uae_u32 REGPARAM2 op_4cf8_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -21439,7 +21439,7 @@ uae_u32 REGPARAM2 op_4cf9_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -21455,7 +21455,7 @@ uae_u32 REGPARAM2 op_4cf9_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -21490,7 +21490,7 @@ uae_u32 REGPARAM2 op_4cfa_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -21506,7 +21506,7 @@ uae_u32 REGPARAM2 op_4cfa_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -21542,7 +21542,7 @@ uae_u32 REGPARAM2 op_4cfb_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -21558,7 +21558,7 @@ uae_u32 REGPARAM2 op_4cfb_32_ff(uae_u32 opcode) } else { val = get_long_mmu030(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; diff --git a/cpuemu_33.cpp b/cpuemu_33.cpp index fac5fad3..b7eb1a22 100644 --- a/cpuemu_33.cpp +++ b/cpuemu_33.cpp @@ -17654,14 +17654,12 @@ uae_u32 REGPARAM2 op_4890_33_ff(uae_u32 opcode) srca = m68k_areg(regs, dstreg); uae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff; while (dmask) { - int predec = 0; - put_word_mmu060(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_word_mmu060(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 2; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_word_mmu060(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_word_mmu060(srca, m68k_areg(regs, movem_index1[amask])); srca += 2; amask = movem_next[amask]; } @@ -17683,13 +17681,12 @@ uae_u32 REGPARAM2 op_48a0_33_ff(uae_u32 opcode) while (amask) { srca -= 2; int predec = movem_index2[amask] != dstreg ? 0 : 2; - put_word_mmu060(srca, m68k_areg (regs, movem_index2[amask]) - predec); + put_word_mmu060(srca, m68k_areg(regs, movem_index2[amask]) - predec); amask = movem_next[amask]; } while (dmask) { srca -= 2; - int predec = 0; - put_word_mmu060(srca, m68k_dreg (regs, movem_index2[dmask]) - predec); + put_word_mmu060(srca, m68k_dreg(regs, movem_index2[dmask])); dmask = movem_next[dmask]; } m68k_areg(regs, dstreg) = srca; @@ -17709,14 +17706,12 @@ uae_u32 REGPARAM2 op_48a8_33_ff(uae_u32 opcode) srca = m68k_areg(regs, dstreg) + (uae_s32)(uae_s16)get_iword_mmu060(4); uae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff; while (dmask) { - int predec = 0; - put_word_mmu060(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_word_mmu060(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 2; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_word_mmu060(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_word_mmu060(srca, m68k_areg(regs, movem_index1[amask])); srca += 2; amask = movem_next[amask]; } @@ -17737,14 +17732,12 @@ uae_u32 REGPARAM2 op_48b0_33_ff(uae_u32 opcode) srca = x_get_disp_ea_020(m68k_areg(regs, dstreg), 0); uae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff; while (dmask) { - int predec = 0; - put_word_mmu060(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_word_mmu060(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 2; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_word_mmu060(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_word_mmu060(srca, m68k_areg(regs, movem_index1[amask])); srca += 2; amask = movem_next[amask]; } @@ -17761,14 +17754,12 @@ uae_u32 REGPARAM2 op_48b8_33_ff(uae_u32 opcode) srca = (uae_s32)(uae_s16)get_iword_mmu060(4); uae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff; while (dmask) { - int predec = 0; - put_word_mmu060(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_word_mmu060(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 2; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_word_mmu060(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_word_mmu060(srca, m68k_areg(regs, movem_index1[amask])); srca += 2; amask = movem_next[amask]; } @@ -17786,14 +17777,12 @@ uae_u32 REGPARAM2 op_48b9_33_ff(uae_u32 opcode) srca = get_ilong_mmu060(4); uae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff; while (dmask) { - int predec = 0; - put_word_mmu060(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_word_mmu060(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 2; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_word_mmu060(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_word_mmu060(srca, m68k_areg(regs, movem_index1[amask])); srca += 2; amask = movem_next[amask]; } @@ -17830,14 +17819,12 @@ uae_u32 REGPARAM2 op_48d0_33_ff(uae_u32 opcode) srca = m68k_areg(regs, dstreg); uae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff; while (dmask) { - int predec = 0; - put_long_mmu060(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_long_mmu060(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 4; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_long_mmu060(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_long_mmu060(srca, m68k_areg(regs, movem_index1[amask])); srca += 4; amask = movem_next[amask]; } @@ -17859,13 +17846,12 @@ uae_u32 REGPARAM2 op_48e0_33_ff(uae_u32 opcode) while (amask) { srca -= 4; int predec = movem_index2[amask] != dstreg ? 0 : 4; - put_long_mmu060(srca, m68k_areg (regs, movem_index2[amask]) - predec); + put_long_mmu060(srca, m68k_areg(regs, movem_index2[amask]) - predec); amask = movem_next[amask]; } while (dmask) { srca -= 4; - int predec = 0; - put_long_mmu060(srca, m68k_dreg (regs, movem_index2[dmask]) - predec); + put_long_mmu060(srca, m68k_dreg(regs, movem_index2[dmask])); dmask = movem_next[dmask]; } m68k_areg(regs, dstreg) = srca; @@ -17885,14 +17871,12 @@ uae_u32 REGPARAM2 op_48e8_33_ff(uae_u32 opcode) srca = m68k_areg(regs, dstreg) + (uae_s32)(uae_s16)get_iword_mmu060(4); uae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff; while (dmask) { - int predec = 0; - put_long_mmu060(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_long_mmu060(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 4; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_long_mmu060(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_long_mmu060(srca, m68k_areg(regs, movem_index1[amask])); srca += 4; amask = movem_next[amask]; } @@ -17913,14 +17897,12 @@ uae_u32 REGPARAM2 op_48f0_33_ff(uae_u32 opcode) srca = x_get_disp_ea_020(m68k_areg(regs, dstreg), 0); uae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff; while (dmask) { - int predec = 0; - put_long_mmu060(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_long_mmu060(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 4; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_long_mmu060(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_long_mmu060(srca, m68k_areg(regs, movem_index1[amask])); srca += 4; amask = movem_next[amask]; } @@ -17937,14 +17919,12 @@ uae_u32 REGPARAM2 op_48f8_33_ff(uae_u32 opcode) srca = (uae_s32)(uae_s16)get_iword_mmu060(4); uae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff; while (dmask) { - int predec = 0; - put_long_mmu060(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_long_mmu060(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 4; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_long_mmu060(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_long_mmu060(srca, m68k_areg(regs, movem_index1[amask])); srca += 4; amask = movem_next[amask]; } @@ -17962,14 +17942,12 @@ uae_u32 REGPARAM2 op_48f9_33_ff(uae_u32 opcode) srca = get_ilong_mmu060(4); uae_u16 dmask = mask & 0xff, amask = (mask >> 8) & 0xff; while (dmask) { - int predec = 0; - put_long_mmu060(srca, m68k_dreg (regs, movem_index1[dmask]) - predec); + put_long_mmu060(srca, m68k_dreg(regs, movem_index1[dmask])); srca += 4; dmask = movem_next[dmask]; } while (amask) { - int predec = 0; - put_long_mmu060(srca, m68k_areg (regs, movem_index1[amask]) - predec); + put_long_mmu060(srca, m68k_areg(regs, movem_index1[amask])); srca += 4; amask = movem_next[amask]; } @@ -19391,10 +19369,10 @@ uae_u32 REGPARAM2 op_4c98_33_ff(uae_u32 opcode) srca += 2; amask = movem_next[amask]; } - m68k_areg(regs, dstreg) = srca; while (--idx >= 0) { regs.regs[tmpreg[idx]] = tmp[idx]; } + m68k_areg(regs, dstreg) = srca; m68k_incpci(4); return (1 * 4 * CYCLE_UNIT / 2 + count_cycles) * 4; } @@ -19652,10 +19630,10 @@ uae_u32 REGPARAM2 op_4cd8_33_ff(uae_u32 opcode) srca += 4; amask = movem_next[amask]; } - m68k_areg(regs, dstreg) = srca; while (--idx >= 0) { regs.regs[tmpreg[idx]] = tmp[idx]; } + m68k_areg(regs, dstreg) = srca; m68k_incpci(4); return (1 * 4 * CYCLE_UNIT / 2 + count_cycles) * 4; } diff --git a/cpuemu_34.cpp b/cpuemu_34.cpp index 9954b74f..901df441 100644 --- a/cpuemu_34.cpp +++ b/cpuemu_34.cpp @@ -21706,7 +21706,7 @@ uae_u32 REGPARAM2 op_4c90_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -21722,7 +21722,7 @@ uae_u32 REGPARAM2 op_4c90_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -21758,7 +21758,7 @@ uae_u32 REGPARAM2 op_4c98_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -21774,7 +21774,7 @@ uae_u32 REGPARAM2 op_4c98_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -21811,7 +21811,7 @@ uae_u32 REGPARAM2 op_4ca8_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -21827,7 +21827,7 @@ uae_u32 REGPARAM2 op_4ca8_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -21864,7 +21864,7 @@ uae_u32 REGPARAM2 op_4cb0_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -21880,7 +21880,7 @@ uae_u32 REGPARAM2 op_4cb0_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -21913,7 +21913,7 @@ uae_u32 REGPARAM2 op_4cb8_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -21929,7 +21929,7 @@ uae_u32 REGPARAM2 op_4cb8_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -21963,7 +21963,7 @@ uae_u32 REGPARAM2 op_4cb9_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -21979,7 +21979,7 @@ uae_u32 REGPARAM2 op_4cb9_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -22015,7 +22015,7 @@ uae_u32 REGPARAM2 op_4cba_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -22031,7 +22031,7 @@ uae_u32 REGPARAM2 op_4cba_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -22068,7 +22068,7 @@ uae_u32 REGPARAM2 op_4cbb_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -22084,7 +22084,7 @@ uae_u32 REGPARAM2 op_4cbb_34_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -22119,7 +22119,7 @@ uae_u32 REGPARAM2 op_4cd0_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -22135,7 +22135,7 @@ uae_u32 REGPARAM2 op_4cd0_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -22171,7 +22171,7 @@ uae_u32 REGPARAM2 op_4cd8_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -22187,7 +22187,7 @@ uae_u32 REGPARAM2 op_4cd8_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -22224,7 +22224,7 @@ uae_u32 REGPARAM2 op_4ce8_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -22240,7 +22240,7 @@ uae_u32 REGPARAM2 op_4ce8_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -22277,7 +22277,7 @@ uae_u32 REGPARAM2 op_4cf0_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -22293,7 +22293,7 @@ uae_u32 REGPARAM2 op_4cf0_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -22326,7 +22326,7 @@ uae_u32 REGPARAM2 op_4cf8_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -22342,7 +22342,7 @@ uae_u32 REGPARAM2 op_4cf8_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -22376,7 +22376,7 @@ uae_u32 REGPARAM2 op_4cf9_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -22392,7 +22392,7 @@ uae_u32 REGPARAM2 op_4cf9_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -22428,7 +22428,7 @@ uae_u32 REGPARAM2 op_4cfa_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -22444,7 +22444,7 @@ uae_u32 REGPARAM2 op_4cfa_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -22481,7 +22481,7 @@ uae_u32 REGPARAM2 op_4cfb_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -22497,7 +22497,7 @@ uae_u32 REGPARAM2 op_4cfb_34_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; diff --git a/cpuemu_35.cpp b/cpuemu_35.cpp index 29d18a72..c7965617 100644 --- a/cpuemu_35.cpp +++ b/cpuemu_35.cpp @@ -23403,7 +23403,7 @@ void REGPARAM2 op_4c90_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -23419,7 +23419,7 @@ void REGPARAM2 op_4c90_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -23455,7 +23455,7 @@ void REGPARAM2 op_4c98_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -23471,7 +23471,7 @@ void REGPARAM2 op_4c98_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -23508,7 +23508,7 @@ void REGPARAM2 op_4ca8_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -23524,7 +23524,7 @@ void REGPARAM2 op_4ca8_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -23561,7 +23561,7 @@ void REGPARAM2 op_4cb0_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -23577,7 +23577,7 @@ void REGPARAM2 op_4cb0_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -23610,7 +23610,7 @@ void REGPARAM2 op_4cb8_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -23626,7 +23626,7 @@ void REGPARAM2 op_4cb8_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -23660,7 +23660,7 @@ void REGPARAM2 op_4cb9_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -23676,7 +23676,7 @@ void REGPARAM2 op_4cb9_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -23712,7 +23712,7 @@ void REGPARAM2 op_4cba_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -23728,7 +23728,7 @@ void REGPARAM2 op_4cba_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -23765,7 +23765,7 @@ void REGPARAM2 op_4cbb_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 2; @@ -23781,7 +23781,7 @@ void REGPARAM2 op_4cbb_35_ff(uae_u32 opcode) } else { val = (uae_s32)(uae_s16)get_word_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 2; @@ -23816,7 +23816,7 @@ void REGPARAM2 op_4cd0_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -23832,7 +23832,7 @@ void REGPARAM2 op_4cd0_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -23868,7 +23868,7 @@ void REGPARAM2 op_4cd8_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -23884,7 +23884,7 @@ void REGPARAM2 op_4cd8_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -23921,7 +23921,7 @@ void REGPARAM2 op_4ce8_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -23937,7 +23937,7 @@ void REGPARAM2 op_4ce8_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -23974,7 +23974,7 @@ void REGPARAM2 op_4cf0_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -23990,7 +23990,7 @@ void REGPARAM2 op_4cf0_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -24023,7 +24023,7 @@ void REGPARAM2 op_4cf8_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -24039,7 +24039,7 @@ void REGPARAM2 op_4cf8_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -24073,7 +24073,7 @@ void REGPARAM2 op_4cf9_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -24089,7 +24089,7 @@ void REGPARAM2 op_4cf9_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -24125,7 +24125,7 @@ void REGPARAM2 op_4cfa_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -24141,7 +24141,7 @@ void REGPARAM2 op_4cfa_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; @@ -24178,7 +24178,7 @@ void REGPARAM2 op_4cfb_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_dreg (regs, movem_index1[dmask]) = val; + m68k_dreg(regs, movem_index1[dmask]) = val; mmu030_state[0]++; } srca += 4; @@ -24194,7 +24194,7 @@ void REGPARAM2 op_4cfb_35_ff(uae_u32 opcode) } else { val = get_long_mmu030c(srca); } - m68k_areg (regs, movem_index1[amask]) = val; + m68k_areg(regs, movem_index1[amask]) = val; mmu030_state[0]++; } srca += 4; diff --git a/gencpu.cpp b/gencpu.cpp index 1c2bb89c..1420cfb9 100644 --- a/gencpu.cpp +++ b/gencpu.cpp @@ -4326,11 +4326,11 @@ static void movem_mmu060 (const char *code, int size, bool put, bool aipi, bool out("%cmask = movem_next[%cmask];\n", reg, reg); out("}\n"); } - if (aipi || apdi) - out("m68k_areg(regs, dstreg) = srca;\n"); out("while (--idx >= 0) {\n"); out("regs.regs[tmpreg[idx]] = tmp[idx];\n"); out("}\n"); + if (aipi || apdi) + out("m68k_areg(regs, dstreg) = srca;\n"); } else { for (int i = 0; i < 2; i++) { char reg; @@ -4344,12 +4344,12 @@ static void movem_mmu060 (const char *code, int size, bool put, bool aipi, bool if (put) { if (apdi && !i) { out("int predec = movem_index2[amask] != dstreg ? 0 : %d;\n", size); + out("%s, m68k_%creg(regs, %s[%cmask]) - predec);\n", code, reg, index, reg); } else { - out("int predec = 0;\n"); + out("%s, m68k_%creg(regs, %s[%cmask]));\n", code, reg, index, reg); } - out("%s, m68k_%creg (regs, %s[%cmask]) - predec);\n", code, reg, index, reg); } else { - out("m68k_%creg (regs, %s[%cmask]) = %s;\n", reg, index, reg, code); + out("m68k_%creg(regs, %s[%cmask]) = %s;\n", reg, index, reg, code); } if (!apdi) out("srca += %d;\n", size); @@ -4397,12 +4397,12 @@ static void movem_mmu040 (const char *code, int size, bool put, bool aipi, bool if (put) { if (apdi && !i) { out("int predec = movem_index2[amask] != dstreg ? 0 : %d;\n", size); + out("%s, m68k_%creg(regs, %s[%cmask]) - predec);\n", code, reg, index, reg); } else { - out("int predec = 0;\n"); + out("%s, m68k_%creg(regs, %s[%cmask]));\n", code, reg, index, reg); } - out("%s, m68k_%creg (regs, %s[%cmask]) - predec);\n", code, reg, index, reg); } else { - out("m68k_%creg (regs, %s[%cmask]) = %s;\n", reg, index, reg, code); + out("m68k_%creg(regs, %s[%cmask]) = %s;\n", reg, index, reg, code); } if (!apdi) out("srca += %d;\n", size); @@ -4484,7 +4484,7 @@ static void movem_mmu030 (const char *code, int size, bool put, bool aipi, bool } out("}\n"); if (!put) { - out("m68k_%creg (regs, %s[%cmask]) = val;\n", reg, index, reg); + out("m68k_%creg(regs, %s[%cmask]) = val;\n", reg, index, reg); } out("mmu030_state[0]++;\n"); out("}\n");