diff options
Diffstat (limited to 'src/devices/cpu/m68000/m68k_in.lst')
-rw-r--r-- | src/devices/cpu/m68000/m68k_in.lst | 182 |
1 files changed, 91 insertions, 91 deletions
diff --git a/src/devices/cpu/m68000/m68k_in.lst b/src/devices/cpu/m68000/m68k_in.lst index 7e163f3d488..3ad215a23ed 100644 --- a/src/devices/cpu/m68000/m68k_in.lst +++ b/src/devices/cpu/m68000/m68k_in.lst @@ -1657,7 +1657,7 @@ M68KMAKE_OP(asr, 8, s, .) uint32_t res = src >> shift; if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(GET_MSB_8(src)) res |= m68ki_shift_8_table[shift]; @@ -1679,7 +1679,7 @@ M68KMAKE_OP(asr, 16, s, .) uint32_t res = src >> shift; if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(GET_MSB_16(src)) res |= m68ki_shift_16_table[shift]; @@ -1701,7 +1701,7 @@ M68KMAKE_OP(asr, 32, s, .) uint32_t res = src >> shift; if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(GET_MSB_32(src)) res |= m68ki_shift_32_table[shift]; @@ -1724,7 +1724,7 @@ M68KMAKE_OP(asr, 8, r, .) if(shift != 0) { - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(shift < 8) { @@ -1776,7 +1776,7 @@ M68KMAKE_OP(asr, 16, r, .) if(shift != 0) { - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(shift < 16) { @@ -1828,7 +1828,7 @@ M68KMAKE_OP(asr, 32, r, .) if(shift != 0) { - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(shift < 32) { @@ -1897,7 +1897,7 @@ M68KMAKE_OP(asl, 8, s, .) uint32_t res = MASK_OUT_ABOVE_8(src << shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = MASK_OUT_BELOW_8(*r_dst) | res; @@ -1917,7 +1917,7 @@ M68KMAKE_OP(asl, 16, s, .) uint32_t res = MASK_OUT_ABOVE_16(src << shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; @@ -1937,7 +1937,7 @@ M68KMAKE_OP(asl, 32, s, .) uint32_t res = MASK_OUT_ABOVE_32(src << shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = res; @@ -1958,7 +1958,7 @@ M68KMAKE_OP(asl, 8, r, .) if(shift != 0) { - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(shift < 8) { @@ -1995,7 +1995,7 @@ M68KMAKE_OP(asl, 16, r, .) if(shift != 0) { - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(shift < 16) { @@ -2032,7 +2032,7 @@ M68KMAKE_OP(asl, 32, r, .) if(shift != 0) { - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(shift < 32) { @@ -2084,7 +2084,7 @@ M68KMAKE_OP(bcc, 8, ., .) m68ki_branch_8(MASK_OUT_ABOVE_8(m_ir)); return; } - m_remaining_cycles -= m_cyc_bcc_notake_b; + m_icount -= m_cyc_bcc_notake_b; } @@ -2099,7 +2099,7 @@ M68KMAKE_OP(bcc, 16, ., .) return; } m_pc += 2; - m_remaining_cycles -= m_cyc_bcc_notake_w; + m_icount -= m_cyc_bcc_notake_w; } @@ -2126,7 +2126,7 @@ M68KMAKE_OP(bcc, 32, ., .) m68ki_branch_8(MASK_OUT_ABOVE_8(m_ir)); return; } - m_remaining_cycles -= m_cyc_bcc_notake_b; + m_icount -= m_cyc_bcc_notake_b; } } @@ -2968,8 +2968,8 @@ M68KMAKE_OP(bra, 8, ., .) { m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_8(MASK_OUT_ABOVE_8(m_ir)); - if(m_pc == m_ppc && m_remaining_cycles > 0) - m_remaining_cycles = 0; + if(m_pc == m_ppc && m_icount > 0) + m_icount = 0; } @@ -2979,8 +2979,8 @@ M68KMAKE_OP(bra, 16, ., .) m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); - if(m_pc == m_ppc && m_remaining_cycles > 0) - m_remaining_cycles = 0; + if(m_pc == m_ppc && m_icount > 0) + m_icount = 0; } @@ -2992,16 +2992,16 @@ M68KMAKE_OP(bra, 32, ., .) m_pc -= 4; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_32(offset); - if(m_pc == m_ppc && m_remaining_cycles > 0) - m_remaining_cycles = 0; + if(m_pc == m_ppc && m_icount > 0) + m_icount = 0; return; } else { m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_8(MASK_OUT_ABOVE_8(m_ir)); - if(m_pc == m_ppc && m_remaining_cycles > 0) - m_remaining_cycles = 0; + if(m_pc == m_ppc && m_icount > 0) + m_icount = 0; } } @@ -3150,7 +3150,7 @@ M68KMAKE_OP(cas, 8, ., .) *compare = MASK_OUT_BELOW_8(*compare) | dest; else { - m_remaining_cycles -= 3; + m_icount -= 3; m68ki_write_8(ea, MASK_OUT_ABOVE_8(REG_D()[(word2 >> 6) & 7])); } return; @@ -3179,7 +3179,7 @@ M68KMAKE_OP(cas, 16, ., .) *compare = MASK_OUT_BELOW_16(*compare) | dest; else { - m_remaining_cycles -= 3; + m_icount -= 3; m68ki_write_16(ea, MASK_OUT_ABOVE_16(REG_D()[(word2 >> 6) & 7])); } return; @@ -3208,7 +3208,7 @@ M68KMAKE_OP(cas, 32, ., .) *compare = dest; else { - m_remaining_cycles -= 3; + m_icount -= 3; m68ki_write_32(ea, REG_D()[(word2 >> 6) & 7]); } return; @@ -3248,7 +3248,7 @@ M68KMAKE_OP(cas2, 16, ., .) if(COND_EQ()) { - m_remaining_cycles -= 3; + m_icount -= 3; m68ki_write_16(ea1, REG_D()[(word2 >> 22) & 7]); m68ki_write_16(ea2, REG_D()[(word2 >> 6) & 7]); return; @@ -3293,7 +3293,7 @@ M68KMAKE_OP(cas2, 32, ., .) if(COND_EQ()) { - m_remaining_cycles -= 3; + m_icount -= 3; m68ki_write_32(ea1, REG_D()[(word2 >> 22) & 7]); m68ki_write_32(ea2, REG_D()[(word2 >> 6) & 7]); return; @@ -4303,11 +4303,11 @@ M68KMAKE_OP(dbf, 16, ., .) m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); - m_remaining_cycles -= m_cyc_dbcc_f_noexp; + m_icount -= m_cyc_dbcc_f_noexp; return; } m_pc += 2; - m_remaining_cycles -= m_cyc_dbcc_f_exp; + m_icount -= m_cyc_dbcc_f_exp; } @@ -4325,11 +4325,11 @@ M68KMAKE_OP(dbcc, 16, ., .) m_pc -= 2; m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m68ki_branch_16(offset); - m_remaining_cycles -= m_cyc_dbcc_f_noexp; + m_icount -= m_cyc_dbcc_f_noexp; return; } m_pc += 2; - m_remaining_cycles -= m_cyc_dbcc_f_exp; + m_icount -= m_cyc_dbcc_f_exp; return; } m_pc += 2; @@ -4857,8 +4857,8 @@ M68KMAKE_OP(jmp, 32, ., .) { m68ki_jump(M68KMAKE_GET_EA_AY_32); m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ - if(m_pc == m_ppc && m_remaining_cycles > 0) - m_remaining_cycles = 0; + if(m_pc == m_ppc && m_icount > 0) + m_icount = 0; } @@ -4931,7 +4931,7 @@ M68KMAKE_OP(lsr, 8, s, .) uint32_t res = src >> shift; if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = MASK_OUT_BELOW_8(*r_dst) | res; @@ -4950,7 +4950,7 @@ M68KMAKE_OP(lsr, 16, s, .) uint32_t res = src >> shift; if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; @@ -4969,7 +4969,7 @@ M68KMAKE_OP(lsr, 32, s, .) uint32_t res = src >> shift; if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = res; @@ -4989,7 +4989,7 @@ M68KMAKE_OP(lsr, 8, r, .) if(shift != 0) { - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(shift <= 8) { @@ -5026,7 +5026,7 @@ M68KMAKE_OP(lsr, 16, r, .) if(shift != 0) { - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(shift <= 16) { @@ -5063,7 +5063,7 @@ M68KMAKE_OP(lsr, 32, r, .) if(shift != 0) { - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(shift < 32) { @@ -5113,7 +5113,7 @@ M68KMAKE_OP(lsl, 8, s, .) uint32_t res = MASK_OUT_ABOVE_8(src << shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = MASK_OUT_BELOW_8(*r_dst) | res; @@ -5132,7 +5132,7 @@ M68KMAKE_OP(lsl, 16, s, .) uint32_t res = MASK_OUT_ABOVE_16(src << shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; @@ -5151,7 +5151,7 @@ M68KMAKE_OP(lsl, 32, s, .) uint32_t res = MASK_OUT_ABOVE_32(src << shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = res; @@ -5171,7 +5171,7 @@ M68KMAKE_OP(lsl, 8, r, .) if(shift != 0) { - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(shift <= 8) { @@ -5208,7 +5208,7 @@ M68KMAKE_OP(lsl, 16, r, .) if(shift != 0) { - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(shift <= 16) { @@ -5245,7 +5245,7 @@ M68KMAKE_OP(lsl, 32, r, .) if(shift != 0) { - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; if(shift < 32) { @@ -6866,7 +6866,7 @@ M68KMAKE_OP(movem, 16, re, pd) } AY() = ea; - m_remaining_cycles -= count<<m_cyc_movem_w; + m_icount -= count<<m_cyc_movem_w; } @@ -6885,7 +6885,7 @@ M68KMAKE_OP(movem, 16, re, .) count++; } - m_remaining_cycles -= count<<m_cyc_movem_w; + m_icount -= count<<m_cyc_movem_w; } @@ -6906,7 +6906,7 @@ M68KMAKE_OP(movem, 32, re, pd) } AY() = ea; - m_remaining_cycles -= count<<m_cyc_movem_l; + m_icount -= count<<m_cyc_movem_l; } @@ -6925,7 +6925,7 @@ M68KMAKE_OP(movem, 32, re, .) count++; } - m_remaining_cycles -= count<<m_cyc_movem_l; + m_icount -= count<<m_cyc_movem_l; } @@ -6945,7 +6945,7 @@ M68KMAKE_OP(movem, 16, er, pi) } AY() = ea; - m_remaining_cycles -= count<<m_cyc_movem_w; + m_icount -= count<<m_cyc_movem_w; } @@ -6964,7 +6964,7 @@ M68KMAKE_OP(movem, 16, er, pcdi) count++; } - m_remaining_cycles -= count<<m_cyc_movem_w; + m_icount -= count<<m_cyc_movem_w; } @@ -6983,7 +6983,7 @@ M68KMAKE_OP(movem, 16, er, pcix) count++; } - m_remaining_cycles -= count<<m_cyc_movem_w; + m_icount -= count<<m_cyc_movem_w; } @@ -7002,7 +7002,7 @@ M68KMAKE_OP(movem, 16, er, .) count++; } - m_remaining_cycles -= count<<m_cyc_movem_w; + m_icount -= count<<m_cyc_movem_w; } @@ -7022,7 +7022,7 @@ M68KMAKE_OP(movem, 32, er, pi) } AY() = ea; - m_remaining_cycles -= count<<m_cyc_movem_l; + m_icount -= count<<m_cyc_movem_l; } @@ -7041,7 +7041,7 @@ M68KMAKE_OP(movem, 32, er, pcdi) count++; } - m_remaining_cycles -= count<<m_cyc_movem_l; + m_icount -= count<<m_cyc_movem_l; } @@ -7060,7 +7060,7 @@ M68KMAKE_OP(movem, 32, er, pcix) count++; } - m_remaining_cycles -= count<<m_cyc_movem_l; + m_icount -= count<<m_cyc_movem_l; } @@ -7079,7 +7079,7 @@ M68KMAKE_OP(movem, 32, er, .) count++; } - m_remaining_cycles -= count<<m_cyc_movem_l; + m_icount -= count<<m_cyc_movem_l; } @@ -7142,13 +7142,13 @@ M68KMAKE_OP(moves, 8, ., .) { REG_A()[(word2 >> 12) & 7] = MAKE_INT_8(m68ki_read_8_fc(ea, m_sfc)); if(CPU_TYPE_IS_020_VARIANT()) - m_remaining_cycles -= 2; + m_icount -= 2; return; } /* Memory to data register */ REG_D()[(word2 >> 12) & 7] = MASK_OUT_BELOW_8(REG_D()[(word2 >> 12) & 7]) | m68ki_read_8_fc(ea, m_sfc); if(CPU_TYPE_IS_020_VARIANT()) - m_remaining_cycles -= 2; + m_icount -= 2; return; } m68ki_exception_privilege_violation(); @@ -7177,13 +7177,13 @@ M68KMAKE_OP(moves, 16, ., .) { REG_A()[(word2 >> 12) & 7] = MAKE_INT_16(m68ki_read_16_fc(ea, m_sfc)); if(CPU_TYPE_IS_020_VARIANT()) - m_remaining_cycles -= 2; + m_icount -= 2; return; } /* Memory to data register */ REG_D()[(word2 >> 12) & 7] = MASK_OUT_BELOW_16(REG_D()[(word2 >> 12) & 7]) | m68ki_read_16_fc(ea, m_sfc); if(CPU_TYPE_IS_020_VARIANT()) - m_remaining_cycles -= 2; + m_icount -= 2; return; } m68ki_exception_privilege_violation(); @@ -7207,13 +7207,13 @@ M68KMAKE_OP(moves, 32, ., .) { m68ki_write_32_fc(ea, m_dfc, REG_DA()[(word2 >> 12) & 15]); if(CPU_TYPE_IS_020_VARIANT()) - m_remaining_cycles -= 2; + m_icount -= 2; return; } /* Memory to register */ REG_DA()[(word2 >> 12) & 15] = m68ki_read_32_fc(ea, m_sfc); if(CPU_TYPE_IS_020_VARIANT()) - m_remaining_cycles -= 2; + m_icount -= 2; return; } m68ki_exception_privilege_violation(); @@ -8091,7 +8091,7 @@ M68KMAKE_OP(reset, 0, ., .) if (!m_reset_instr_callback.isnull()) (m_reset_instr_callback)(1); m68k_reset_peripherals(); - m_remaining_cycles -= m_cyc_reset; + m_icount -= m_cyc_reset; return; } m68ki_exception_privilege_violation(); @@ -8107,7 +8107,7 @@ M68KMAKE_OP(ror, 8, s, .) uint32_t res = ROR_8(src, shift); if(orig_shift != 0) - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; *r_dst = MASK_OUT_BELOW_8(*r_dst) | res; @@ -8126,7 +8126,7 @@ M68KMAKE_OP(ror, 16, s, .) uint32_t res = ROR_16(src, shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; @@ -8145,7 +8145,7 @@ M68KMAKE_OP(ror, 32, s, .) uint32_t res = ROR_32(src, shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = res; @@ -8166,7 +8166,7 @@ M68KMAKE_OP(ror, 8, r, .) if(orig_shift != 0) { - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; *r_dst = MASK_OUT_BELOW_8(*r_dst) | res; m_c_flag = src << (8-((shift-1)&7)); @@ -8193,7 +8193,7 @@ M68KMAKE_OP(ror, 16, r, .) if(orig_shift != 0) { - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; m_c_flag = (src >> ((shift - 1) & 15)) << 8; @@ -8220,7 +8220,7 @@ M68KMAKE_OP(ror, 32, r, .) if(orig_shift != 0) { - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; *r_dst = res; m_c_flag = (src >> ((shift - 1) & 31)) << 8; @@ -8261,7 +8261,7 @@ M68KMAKE_OP(rol, 8, s, .) uint32_t res = ROL_8(src, shift); if(orig_shift != 0) - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; *r_dst = MASK_OUT_BELOW_8(*r_dst) | res; @@ -8280,7 +8280,7 @@ M68KMAKE_OP(rol, 16, s, .) uint32_t res = ROL_16(src, shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = MASK_OUT_BELOW_16(*r_dst) | res; @@ -8299,7 +8299,7 @@ M68KMAKE_OP(rol, 32, s, .) uint32_t res = ROL_32(src, shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; *r_dst = res; @@ -8320,7 +8320,7 @@ M68KMAKE_OP(rol, 8, r, .) if(orig_shift != 0) { - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; if(shift != 0) { @@ -8355,7 +8355,7 @@ M68KMAKE_OP(rol, 16, r, .) if(orig_shift != 0) { - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; if(shift != 0) { @@ -8390,7 +8390,7 @@ M68KMAKE_OP(rol, 32, r, .) if(orig_shift != 0) { - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; *r_dst = res; @@ -8431,7 +8431,7 @@ M68KMAKE_OP(roxr, 8, s, .) uint32_t res = ROR_9(src | (XFLAG_1() << 8), shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; m_c_flag = m_x_flag = res; res = MASK_OUT_ABOVE_8(res); @@ -8452,7 +8452,7 @@ M68KMAKE_OP(roxr, 16, s, .) uint32_t res = ROR_17(src | (XFLAG_1() << 16), shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -8473,7 +8473,7 @@ M68KMAKE_OP(roxr, 32, s, .) uint64_t res = src | (((uint64_t)XFLAG_1()) << 32); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; res = ROR_33_64(res, shift); @@ -8499,7 +8499,7 @@ M68KMAKE_OP(roxr, 8, r, .) uint32_t src = MASK_OUT_ABOVE_8(*r_dst); uint32_t res = ROR_9(src | (XFLAG_1() << 8), shift); - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; m_c_flag = m_x_flag = res; res = MASK_OUT_ABOVE_8(res); @@ -8529,7 +8529,7 @@ M68KMAKE_OP(roxr, 16, r, .) uint32_t src = MASK_OUT_ABOVE_16(*r_dst); uint32_t res = ROR_17(src | (XFLAG_1() << 16), shift); - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -8561,7 +8561,7 @@ M68KMAKE_OP(roxr, 32, r, .) res = ROR_33_64(res, shift); - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; m_c_flag = m_x_flag = res >> 24; res = MASK_OUT_ABOVE_32(res); @@ -8605,7 +8605,7 @@ M68KMAKE_OP(roxl, 8, s, .) uint32_t res = ROL_9(src | (XFLAG_1() << 8), shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; m_c_flag = m_x_flag = res; res = MASK_OUT_ABOVE_8(res); @@ -8626,7 +8626,7 @@ M68KMAKE_OP(roxl, 16, s, .) uint32_t res = ROL_17(src | (XFLAG_1() << 16), shift); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -8647,7 +8647,7 @@ M68KMAKE_OP(roxl, 32, s, .) uint64_t res = src | (((uint64_t)XFLAG_1()) << 32); if(shift != 0) - m_remaining_cycles -= shift<<m_cyc_shift; + m_icount -= shift<<m_cyc_shift; res = ROL_33_64(res, shift); @@ -8674,7 +8674,7 @@ M68KMAKE_OP(roxl, 8, r, .) uint32_t src = MASK_OUT_ABOVE_8(*r_dst); uint32_t res = ROL_9(src | (XFLAG_1() << 8), shift); - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; m_c_flag = m_x_flag = res; res = MASK_OUT_ABOVE_8(res); @@ -8704,7 +8704,7 @@ M68KMAKE_OP(roxl, 16, r, .) uint32_t src = MASK_OUT_ABOVE_16(*r_dst); uint32_t res = ROL_17(src | (XFLAG_1() << 16), shift); - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; m_c_flag = m_x_flag = res >> 8; res = MASK_OUT_ABOVE_16(res); @@ -8736,7 +8736,7 @@ M68KMAKE_OP(roxl, 32, r, .) res = ROL_33_64(res, shift); - m_remaining_cycles -= orig_shift<<m_cyc_shift; + m_icount -= orig_shift<<m_cyc_shift; m_c_flag = m_x_flag = res >> 24; res = MASK_OUT_ABOVE_32(res); @@ -9168,7 +9168,7 @@ M68KMAKE_OP(scc, 8, ., d) if(M68KMAKE_CC) { DY() |= 0xff; - m_remaining_cycles -= m_cyc_scc_r_true; + m_icount -= m_cyc_scc_r_true; return; } DY() &= 0xffffff00; @@ -9189,7 +9189,7 @@ M68KMAKE_OP(stop, 0, ., .) m68ki_trace_t0(); /* auto-disable (see m68kcpu.h) */ m_stopped |= STOP_LEVEL_STOP; m68ki_set_sr(new_sr); - m_remaining_cycles = 0; + m_icount = 0; return; } m68ki_exception_privilege_violation(); |