summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2018-09-14 11:55:37 +0200
committer Olivier Galibert <galibert@pobox.com>2019-04-29 22:04:15 +0200
commit9af12a54dce86be2ca6b025682fb7f8095623282 (patch)
tree85e30c9cb7cf150e2a0f25783c16b5558bfc42b9
parent6f0dd96e60600738e9057f7f5e7c2c38825f232a (diff)
m680x0: Rename remaining_cycles to icount in alignemnt with the rest of mame [O. Galibert]
-rw-r--r--src/devices/cpu/m68000/m68000.h2
-rw-r--r--src/devices/cpu/m68000/m68k_in.lst182
-rw-r--r--src/devices/cpu/m68000/m68kcpu.cpp34
-rw-r--r--src/devices/cpu/m68000/m68kcpu.h20
-rw-r--r--src/devices/cpu/m68000/m68kfpu.hxx62
-rw-r--r--src/devices/cpu/m68000/m68kops.cpp514
6 files changed, 407 insertions, 407 deletions
diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h
index d08edf4e44d..0a0635461a7 100644
--- a/src/devices/cpu/m68000/m68000.h
+++ b/src/devices/cpu/m68000/m68000.h
@@ -233,7 +233,7 @@ protected:
uint32_t m_cyc_reset;
int m_initial_cycles;
- int m_remaining_cycles; /* Number of clocks remaining */
+ int m_icount; /* Number of clocks remaining */
int m_reset_cycles;
uint32_t m_tracing;
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();
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp
index 82c68752639..c7401b61a85 100644
--- a/src/devices/cpu/m68000/m68kcpu.cpp
+++ b/src/devices/cpu/m68000/m68kcpu.cpp
@@ -762,15 +762,15 @@ bool m68000_base_device::memory_translate(int space, int intention, offs_t &addr
void m68000_base_device::execute_run()
{
- m_initial_cycles = m_remaining_cycles;
+ m_initial_cycles = m_icount;
/* eat up any reset cycles */
if (m_reset_cycles) {
int rc = m_reset_cycles;
m_reset_cycles = 0;
- m_remaining_cycles -= rc;
+ m_icount -= rc;
- if (m_remaining_cycles <= 0) return;
+ if (m_icount <= 0) return;
}
/* See if interrupts came in */
@@ -800,15 +800,15 @@ void m68000_base_device::execute_run()
}
if(m_stopped)
{
- if (m_remaining_cycles > 0)
- m_remaining_cycles = 0;
+ if (m_icount > 0)
+ m_icount = 0;
return;
}
}
/* Main loop. Keep going until we run out of clock cycles */
- while (m_remaining_cycles > 0)
+ while (m_icount > 0)
{
/* Set tracing accodring to T1. (T0 is done inside instruction) */
m68ki_trace_t1(); /* auto-disable (see m68kcpu.h) */
@@ -827,7 +827,7 @@ void m68000_base_device::execute_run()
/* Read an instruction and call its handler */
m_ir = m68ki_read_imm_16();
(this->*m_jump_table[m_ir])();
- m_remaining_cycles -= m_cyc_instruction[m_ir];
+ m_icount -= m_cyc_instruction[m_ir];
}
else
{
@@ -849,7 +849,7 @@ void m68000_base_device::execute_run()
if (!m_mmu_tmp_buserror_occurred)
{
(this->*m_jump_table[m_ir])();
- m_remaining_cycles -= m_cyc_instruction[m_ir];
+ m_icount -= m_cyc_instruction[m_ir];
}
if (m_mmu_tmp_buserror_occurred)
@@ -897,7 +897,7 @@ void m68000_base_device::execute_run()
// TODO:
/* Use up some clock cycles and undo the instruction's cycles */
- // m_remaining_cycles -= m_cyc_exception[EXCEPTION_BUS_ERROR] - m_cyc_instruction[m_ir];
+ // m_icount -= m_cyc_exception[EXCEPTION_BUS_ERROR] - m_cyc_instruction[m_ir];
}
}
}
@@ -920,8 +920,8 @@ void m68000_base_device::execute_run()
/* set previous PC to current PC for the next entry into the loop */
m_ppc = m_pc;
}
- else if (m_remaining_cycles > 0)
- m_remaining_cycles = 0;
+ else if (m_icount > 0)
+ m_icount = 0;
}
@@ -1004,8 +1004,8 @@ void m68000_base_device::init_cpu_common(void)
machine().save().register_presave(save_prepost_delegate(FUNC(m68000_base_device::presave), this));
machine().save().register_postload(save_prepost_delegate(FUNC(m68000_base_device::postload), this));
- set_icountptr(m_remaining_cycles);
- m_remaining_cycles = 0;
+ set_icountptr(m_icount);
+ m_icount = 0;
}
@@ -1021,8 +1021,8 @@ void m68000_base_device::device_reset()
/* Clear all stop levels and eat up all remaining cycles */
m_stopped = 0;
- if (m_remaining_cycles > 0)
- m_remaining_cycles = 0;
+ if (m_icount > 0)
+ m_icount = 0;
m_run_mode = RUN_MODE_BERR_AERR_RESET;
@@ -2197,7 +2197,7 @@ void m68000_base_device::m68ki_exception_interrupt(uint32_t int_level)
m68ki_jump(new_pc);
/* Defer cycle counting until later */
- m_remaining_cycles -= m_cyc_exception[vector];
+ m_icount -= m_cyc_exception[vector];
}
@@ -2286,7 +2286,7 @@ void m68000_base_device::clear_all()
m_cyc_reset = 0;
m_initial_cycles = 0;
- m_remaining_cycles = 0;
+ m_icount = 0;
m_reset_cycles = 0;
m_tracing = 0;
diff --git a/src/devices/cpu/m68000/m68kcpu.h b/src/devices/cpu/m68000/m68kcpu.h
index df409bd14c8..377d4da11d9 100644
--- a/src/devices/cpu/m68000/m68kcpu.h
+++ b/src/devices/cpu/m68000/m68kcpu.h
@@ -825,7 +825,7 @@ inline uint32_t m68ki_get_ea_ix(uint32_t An)
/* Full extension format */
- m_remaining_cycles -= m68ki_ea_idx_cycle_table[extension&0x3f];
+ m_icount -= m68ki_ea_idx_cycle_table[extension&0x3f];
/* Check if base register is present */
if(BIT_7(extension)) /* BS */
@@ -1464,7 +1464,7 @@ inline void m68ki_exception_trap(uint32_t vector)
m68ki_jump_vector(vector);
/* Use up some clock cycles */
- m_remaining_cycles -= m_cyc_exception[vector];
+ m_icount -= m_cyc_exception[vector];
}
/* Trap#n stacks a 0 frame but behaves like group2 otherwise */
@@ -1475,7 +1475,7 @@ inline void m68ki_exception_trapN(uint32_t vector)
m68ki_jump_vector(vector);
/* Use up some clock cycles */
- m_remaining_cycles -= m_cyc_exception[vector];
+ m_icount -= m_cyc_exception[vector];
}
/* Exception for trace mode */
@@ -1500,7 +1500,7 @@ inline void m68ki_exception_trace()
m_stopped &= ~STOP_LEVEL_STOP;
/* Use up some clock cycles */
- m_remaining_cycles -= m_cyc_exception[EXCEPTION_TRACE];
+ m_icount -= m_cyc_exception[EXCEPTION_TRACE];
}
/* Exception for privilege violation */
@@ -1517,7 +1517,7 @@ inline void m68ki_exception_privilege_violation()
m68ki_jump_vector(EXCEPTION_PRIVILEGE_VIOLATION);
/* Use up some clock cycles and undo the instruction's cycles */
- m_remaining_cycles -= m_cyc_exception[EXCEPTION_PRIVILEGE_VIOLATION] - m_cyc_instruction[m_ir];
+ m_icount -= m_cyc_exception[EXCEPTION_PRIVILEGE_VIOLATION] - m_cyc_instruction[m_ir];
}
/* Exception for A-Line instructions */
@@ -1530,7 +1530,7 @@ inline void m68ki_exception_1010()
m68ki_jump_vector(EXCEPTION_1010);
/* Use up some clock cycles and undo the instruction's cycles */
- m_remaining_cycles -= m_cyc_exception[EXCEPTION_1010] - m_cyc_instruction[m_ir];
+ m_icount -= m_cyc_exception[EXCEPTION_1010] - m_cyc_instruction[m_ir];
}
/* Exception for F-Line instructions */
@@ -1543,7 +1543,7 @@ inline void m68ki_exception_1111()
m68ki_jump_vector(EXCEPTION_1111);
/* Use up some clock cycles and undo the instruction's cycles */
- m_remaining_cycles -= m_cyc_exception[EXCEPTION_1111] - m_cyc_instruction[m_ir];
+ m_icount -= m_cyc_exception[EXCEPTION_1111] - m_cyc_instruction[m_ir];
}
/* Exception for illegal instructions */
@@ -1562,7 +1562,7 @@ inline void m68ki_exception_illegal()
m68ki_jump_vector(EXCEPTION_ILLEGAL_INSTRUCTION);
/* Use up some clock cycles and undo the instruction's cycles */
- m_remaining_cycles -= m_cyc_exception[EXCEPTION_ILLEGAL_INSTRUCTION] - m_cyc_instruction[m_ir];
+ m_icount -= m_cyc_exception[EXCEPTION_ILLEGAL_INSTRUCTION] - m_cyc_instruction[m_ir];
}
/* Exception for format errror in RTE */
@@ -1573,7 +1573,7 @@ inline void m68ki_exception_format_error()
m68ki_jump_vector(EXCEPTION_FORMAT_ERROR);
/* Use up some clock cycles and undo the instruction's cycles */
- m_remaining_cycles -= m_cyc_exception[EXCEPTION_FORMAT_ERROR] - m_cyc_instruction[m_ir];
+ m_icount -= m_cyc_exception[EXCEPTION_FORMAT_ERROR] - m_cyc_instruction[m_ir];
}
/* Exception for address error */
@@ -1623,7 +1623,7 @@ inline void m68ki_exception_address_error()
m_run_mode = RUN_MODE_BERR_AERR_RESET;
/* Use up some clock cycles and undo the instruction's cycles */
- m_remaining_cycles -= m_cyc_exception[EXCEPTION_ADDRESS_ERROR] - m_cyc_instruction[m_ir];
+ m_icount -= m_cyc_exception[EXCEPTION_ADDRESS_ERROR] - m_cyc_instruction[m_ir];
}
diff --git a/src/devices/cpu/m68000/m68kfpu.hxx b/src/devices/cpu/m68000/m68kfpu.hxx
index a0fe2c8a7f1..99be0b47173 100644
--- a/src/devices/cpu/m68000/m68kfpu.hxx
+++ b/src/devices/cpu/m68000/m68kfpu.hxx
@@ -1352,7 +1352,7 @@ void fpgen_rm_reg(uint16_t w2)
// handle it right here, the usual opmode bits aren't valid in the FMOVECR case
m_fpr[dst] = source;
- m_remaining_cycles -= 4;
+ m_icount -= 4;
return;
}
default: fatalerror("fmove_rm_reg: invalid source specifier %x at %08X\n", src, m_pc-4);
@@ -1371,7 +1371,7 @@ void fpgen_rm_reg(uint16_t w2)
{
m_fpr[dst] = source;
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 4;
+ m_icount -= 4;
break;
}
case 0x01: // FINT
@@ -1392,14 +1392,14 @@ void fpgen_rm_reg(uint16_t w2)
{
m_fpr[dst] = floatx80_sqrt(source);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 109;
+ m_icount -= 109;
break;
}
case 0x06: // FLOGNP1
{
m_fpr[dst] = floatx80_flognp1 (source);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 594; // for MC68881
+ m_icount -= 594; // for MC68881
break;
}
case 0x0e: // FSIN
@@ -1407,7 +1407,7 @@ void fpgen_rm_reg(uint16_t w2)
m_fpr[dst] = source;
floatx80_fsin(m_fpr[dst]);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 75;
+ m_icount -= 75;
break;
}
case 0x0f: // FTAN
@@ -1415,28 +1415,28 @@ void fpgen_rm_reg(uint16_t w2)
m_fpr[dst] = source;
floatx80_ftan(m_fpr[dst]);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 75;
+ m_icount -= 75;
break;
}
case 0x14: // FLOGN
{
m_fpr[dst] = floatx80_flogn (source);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 548; // for MC68881
+ m_icount -= 548; // for MC68881
break;
}
case 0x15: // FLOG10
{
m_fpr[dst] = floatx80_flog10 (source);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 604; // for MC68881
+ m_icount -= 604; // for MC68881
break;
}
case 0x16: // FLOG2
{
m_fpr[dst] = floatx80_flog2 (source);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 604; // for MC68881
+ m_icount -= 604; // for MC68881
break;
}
case 0x18: // FABS
@@ -1444,7 +1444,7 @@ void fpgen_rm_reg(uint16_t w2)
m_fpr[dst] = source;
m_fpr[dst].high &= 0x7fff;
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 3;
+ m_icount -= 3;
break;
}
case 0x1a: // FNEG
@@ -1452,7 +1452,7 @@ void fpgen_rm_reg(uint16_t w2)
m_fpr[dst] = source;
m_fpr[dst].high ^= 0x8000;
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 3;
+ m_icount -= 3;
break;
}
case 0x1d: // FCOS
@@ -1460,7 +1460,7 @@ void fpgen_rm_reg(uint16_t w2)
m_fpr[dst] = source;
floatx80_fcos(m_fpr[dst]);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 75;
+ m_icount -= 75;
break;
}
case 0x1e: // FGETEXP
@@ -1471,27 +1471,27 @@ void fpgen_rm_reg(uint16_t w2)
temp2 -= 0x3fff; // take off the bias
m_fpr[dst] = double_to_fx80((double)temp2);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 6;
+ m_icount -= 6;
break;
}
case 0x20: // FDIV
{
m_fpr[dst] = floatx80_div(m_fpr[dst], source);
- m_remaining_cycles -= 43;
+ m_icount -= 43;
break;
}
case 0x22: // FADD
{
m_fpr[dst] = floatx80_add(m_fpr[dst], source);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 9;
+ m_icount -= 9;
break;
}
case 0x23: // FMUL
{
m_fpr[dst] = floatx80_mul(m_fpr[dst], source);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 11;
+ m_icount -= 11;
break;
}
case 0x24: // FSGLDIV
@@ -1499,21 +1499,21 @@ void fpgen_rm_reg(uint16_t w2)
float32 a = floatx80_to_float32( m_fpr[dst] );
float32 b = floatx80_to_float32( source );
m_fpr[dst] = float32_to_floatx80( float32_div(a, b) );
- m_remaining_cycles -= 43; // // ? (value is from FDIV)
+ m_icount -= 43; // // ? (value is from FDIV)
break;
}
case 0x25: // FREM
{
m_fpr[dst] = floatx80_rem(m_fpr[dst], source);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 43; // guess
+ m_icount -= 43; // guess
break;
}
case 0x26: // FSCALE
{
m_fpr[dst] = floatx80_scale(m_fpr[dst], source);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 46; // (better?) guess
+ m_icount -= 46; // (better?) guess
break;
}
case 0x27: // FSGLMUL
@@ -1522,14 +1522,14 @@ void fpgen_rm_reg(uint16_t w2)
float32 b = floatx80_to_float32( source );
m_fpr[dst] = float32_to_floatx80( float32_mul(a, b) );
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 11; // ? (value is from FMUL)
+ m_icount -= 11; // ? (value is from FMUL)
break;
}
case 0x28: // FSUB
{
m_fpr[dst] = floatx80_sub(m_fpr[dst], source);
SET_CONDITION_CODES(m_fpr[dst]);
- m_remaining_cycles -= 9;
+ m_icount -= 9;
break;
}
case 0x38: // FCMP
@@ -1537,7 +1537,7 @@ void fpgen_rm_reg(uint16_t w2)
floatx80 res;
res = floatx80_sub(m_fpr[dst], source);
SET_CONDITION_CODES(res);
- m_remaining_cycles -= 7;
+ m_icount -= 7;
break;
}
case 0x3a: // FTST
@@ -1545,7 +1545,7 @@ void fpgen_rm_reg(uint16_t w2)
floatx80 res;
res = source;
SET_CONDITION_CODES(res);
- m_remaining_cycles -= 7;
+ m_icount -= 7;
break;
}
@@ -1622,7 +1622,7 @@ void fmove_reg_mem(uint16_t w2)
}
}
- m_remaining_cycles -= 12;
+ m_icount -= 12;
}
void fmove_fpcr(uint16_t w2)
@@ -1722,7 +1722,7 @@ void fmove_fpcr(uint16_t w2)
}
}
- m_remaining_cycles -= 10;
+ m_icount -= 10;
}
void fmovem(uint16_t w2)
@@ -1770,7 +1770,7 @@ void fmovem(uint16_t w2)
break;
}
- m_remaining_cycles -= 2;
+ m_icount -= 2;
}
}
break;
@@ -1794,7 +1794,7 @@ void fmovem(uint16_t w2)
break;
}
- m_remaining_cycles -= 2;
+ m_icount -= 2;
}
}
break;
@@ -1828,7 +1828,7 @@ void fmovem(uint16_t w2)
m_fpr[7-i] = READ_EA_FPE(ea);
break;
}
- m_remaining_cycles -= 2;
+ m_icount -= 2;
}
}
break;
@@ -1845,7 +1845,7 @@ void fscc()
int condition = (int16_t)(OPER_I_16());
WRITE_EA_8(ea, TEST_CONDITION(condition) ? 0xff : 0);
- m_remaining_cycles -= 7; // ???
+ m_icount -= 7; // ???
}
void fbcc16()
@@ -1862,7 +1862,7 @@ void fbcc16()
m68ki_branch_16(offset-2);
}
- m_remaining_cycles -= 7;
+ m_icount -= 7;
}
void fbcc32()
@@ -1879,7 +1879,7 @@ void fbcc32()
m68ki_branch_32(offset-4);
}
- m_remaining_cycles -= 7;
+ m_icount -= 7;
}
diff --git a/src/devices/cpu/m68000/m68kops.cpp b/src/devices/cpu/m68000/m68kops.cpp
index 7ac0d721fb0..87933bb0129 100644
--- a/src/devices/cpu/m68000/m68kops.cpp
+++ b/src/devices/cpu/m68000/m68kops.cpp
@@ -3436,7 +3436,7 @@ void m68000_base_device::m68k_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];
@@ -3458,7 +3458,7 @@ void m68000_base_device::m68k_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];
@@ -3480,7 +3480,7 @@ void m68000_base_device::m68k_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];
@@ -3503,7 +3503,7 @@ void m68000_base_device::m68k_op_asr_8_r()
if(shift != 0)
{
- m_remaining_cycles -= shift<<m_cyc_shift;
+ m_icount -= shift<<m_cyc_shift;
if(shift < 8)
{
@@ -3555,7 +3555,7 @@ void m68000_base_device::m68k_op_asr_16_r()
if(shift != 0)
{
- m_remaining_cycles -= shift<<m_cyc_shift;
+ m_icount -= shift<<m_cyc_shift;
if(shift < 16)
{
@@ -3607,7 +3607,7 @@ void m68000_base_device::m68k_op_asr_32_r()
if(shift != 0)
{
- m_remaining_cycles -= shift<<m_cyc_shift;
+ m_icount -= shift<<m_cyc_shift;
if(shift < 32)
{
@@ -3784,7 +3784,7 @@ void m68000_base_device::m68k_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;
@@ -3804,7 +3804,7 @@ void m68000_base_device::m68k_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;
@@ -3824,7 +3824,7 @@ void m68000_base_device::m68k_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;
@@ -3845,7 +3845,7 @@ void m68000_base_device::m68k_op_asl_8_r()
if(shift != 0)
{
- m_remaining_cycles -= shift<<m_cyc_shift;
+ m_icount -= shift<<m_cyc_shift;
if(shift < 8)
{
@@ -3882,7 +3882,7 @@ void m68000_base_device::m68k_op_asl_16_r()
if(shift != 0)
{
- m_remaining_cycles -= shift<<m_cyc_shift;
+ m_icount -= shift<<m_cyc_shift;
if(shift < 16)
{
@@ -3919,7 +3919,7 @@ void m68000_base_device::m68k_op_asl_32_r()
if(shift != 0)
{
- m_remaining_cycles -= shift<<m_cyc_shift;
+ m_icount -= shift<<m_cyc_shift;
if(shift < 32)
{
@@ -4067,7 +4067,7 @@ void m68000_base_device::m68k_op_bhi_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;
}
@@ -4079,7 +4079,7 @@ void m68000_base_device::m68k_op_bls_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;
}
@@ -4091,7 +4091,7 @@ void m68000_base_device::m68k_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;
}
@@ -4103,7 +4103,7 @@ void m68000_base_device::m68k_op_bcs_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;
}
@@ -4115,7 +4115,7 @@ void m68000_base_device::m68k_op_bne_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;
}
@@ -4127,7 +4127,7 @@ void m68000_base_device::m68k_op_beq_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;
}
@@ -4139,7 +4139,7 @@ void m68000_base_device::m68k_op_bvc_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;
}
@@ -4151,7 +4151,7 @@ void m68000_base_device::m68k_op_bvs_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;
}
@@ -4163,7 +4163,7 @@ void m68000_base_device::m68k_op_bpl_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;
}
@@ -4175,7 +4175,7 @@ void m68000_base_device::m68k_op_bmi_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;
}
@@ -4187,7 +4187,7 @@ void m68000_base_device::m68k_op_bge_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;
}
@@ -4199,7 +4199,7 @@ void m68000_base_device::m68k_op_blt_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;
}
@@ -4211,7 +4211,7 @@ void m68000_base_device::m68k_op_bgt_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;
}
@@ -4223,7 +4223,7 @@ void m68000_base_device::m68k_op_ble_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;
}
@@ -4238,7 +4238,7 @@ void m68000_base_device::m68k_op_bhi_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4253,7 +4253,7 @@ void m68000_base_device::m68k_op_bls_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4268,7 +4268,7 @@ void m68000_base_device::m68k_op_bcc_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4283,7 +4283,7 @@ void m68000_base_device::m68k_op_bcs_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4298,7 +4298,7 @@ void m68000_base_device::m68k_op_bne_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4313,7 +4313,7 @@ void m68000_base_device::m68k_op_beq_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4328,7 +4328,7 @@ void m68000_base_device::m68k_op_bvc_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4343,7 +4343,7 @@ void m68000_base_device::m68k_op_bvs_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4358,7 +4358,7 @@ void m68000_base_device::m68k_op_bpl_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4373,7 +4373,7 @@ void m68000_base_device::m68k_op_bmi_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4388,7 +4388,7 @@ void m68000_base_device::m68k_op_bge_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4403,7 +4403,7 @@ void m68000_base_device::m68k_op_blt_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4418,7 +4418,7 @@ void m68000_base_device::m68k_op_bgt_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4433,7 +4433,7 @@ void m68000_base_device::m68k_op_ble_16()
return;
}
m_pc += 2;
- m_remaining_cycles -= m_cyc_bcc_notake_w;
+ m_icount -= m_cyc_bcc_notake_w;
}
@@ -4460,7 +4460,7 @@ void m68000_base_device::m68k_op_bhi_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;
}
}
@@ -4488,7 +4488,7 @@ void m68000_base_device::m68k_op_bls_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;
}
}
@@ -4516,7 +4516,7 @@ void m68000_base_device::m68k_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;
}
}
@@ -4544,7 +4544,7 @@ void m68000_base_device::m68k_op_bcs_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;
}
}
@@ -4572,7 +4572,7 @@ void m68000_base_device::m68k_op_bne_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;
}
}
@@ -4600,7 +4600,7 @@ void m68000_base_device::m68k_op_beq_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;
}
}
@@ -4628,7 +4628,7 @@ void m68000_base_device::m68k_op_bvc_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;
}
}
@@ -4656,7 +4656,7 @@ void m68000_base_device::m68k_op_bvs_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;
}
}
@@ -4684,7 +4684,7 @@ void m68000_base_device::m68k_op_bpl_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;
}
}
@@ -4712,7 +4712,7 @@ void m68000_base_device::m68k_op_bmi_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;
}
}
@@ -4740,7 +4740,7 @@ void m68000_base_device::m68k_op_bge_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;
}
}
@@ -4768,7 +4768,7 @@ void m68000_base_device::m68k_op_blt_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;
}
}
@@ -4796,7 +4796,7 @@ void m68000_base_device::m68k_op_bgt_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;
}
}
@@ -4824,7 +4824,7 @@ void m68000_base_device::m68k_op_ble_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;
}
}
@@ -8202,8 +8202,8 @@ void m68000_base_device::m68k_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;
}
@@ -8213,8 +8213,8 @@ void m68000_base_device::m68k_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;
}
@@ -8226,16 +8226,16 @@ void m68000_base_device::m68k_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;
}
}
@@ -8814,7 +8814,7 @@ void m68000_base_device::m68k_op_cas_8_ai()
*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;
@@ -8843,7 +8843,7 @@ void m68000_base_device::m68k_op_cas_8_pi()
*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;
@@ -8872,7 +8872,7 @@ void m68000_base_device::m68k_op_cas_8_pi7()
*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;
@@ -8901,7 +8901,7 @@ void m68000_base_device::m68k_op_cas_8_pd()
*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;
@@ -8930,7 +8930,7 @@ void m68000_base_device::m68k_op_cas_8_pd7()
*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;
@@ -8959,7 +8959,7 @@ void m68000_base_device::m68k_op_cas_8_di()
*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;
@@ -8988,7 +8988,7 @@ void m68000_base_device::m68k_op_cas_8_ix()
*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;
@@ -9017,7 +9017,7 @@ void m68000_base_device::m68k_op_cas_8_aw()
*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;
@@ -9046,7 +9046,7 @@ void m68000_base_device::m68k_op_cas_8_al()
*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;
@@ -9075,7 +9075,7 @@ void m68000_base_device::m68k_op_cas_16_ai()
*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;
@@ -9104,7 +9104,7 @@ void m68000_base_device::m68k_op_cas_16_pi()
*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;
@@ -9133,7 +9133,7 @@ void m68000_base_device::m68k_op_cas_16_pd()
*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;
@@ -9162,7 +9162,7 @@ void m68000_base_device::m68k_op_cas_16_di()
*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;
@@ -9191,7 +9191,7 @@ void m68000_base_device::m68k_op_cas_16_ix()
*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;
@@ -9220,7 +9220,7 @@ void m68000_base_device::m68k_op_cas_16_aw()
*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;
@@ -9249,7 +9249,7 @@ void m68000_base_device::m68k_op_cas_16_al()
*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;
@@ -9278,7 +9278,7 @@ void m68000_base_device::m68k_op_cas_32_ai()
*compare = dest;
else
{
- m_remaining_cycles -= 3;
+ m_icount -= 3;
m68ki_write_32(ea, REG_D()[(word2 >> 6) & 7]);
}
return;
@@ -9307,7 +9307,7 @@ void m68000_base_device::m68k_op_cas_32_pi()
*compare = dest;
else
{
- m_remaining_cycles -= 3;
+ m_icount -= 3;
m68ki_write_32(ea, REG_D()[(word2 >> 6) & 7]);
}
return;
@@ -9336,7 +9336,7 @@ void m68000_base_device::m68k_op_cas_32_pd()
*compare = dest;
else
{
- m_remaining_cycles -= 3;
+ m_icount -= 3;
m68ki_write_32(ea, REG_D()[(word2 >> 6) & 7]);
}
return;
@@ -9365,7 +9365,7 @@ void m68000_base_device::m68k_op_cas_32_di()
*compare = dest;
else
{
- m_remaining_cycles -= 3;
+ m_icount -= 3;
m68ki_write_32(ea, REG_D()[(word2 >> 6) & 7]);
}
return;
@@ -9394,7 +9394,7 @@ void m68000_base_device::m68k_op_cas_32_ix()
*compare = dest;
else
{
- m_remaining_cycles -= 3;
+ m_icount -= 3;
m68ki_write_32(ea, REG_D()[(word2 >> 6) & 7]);
}
return;
@@ -9423,7 +9423,7 @@ void m68000_base_device::m68k_op_cas_32_aw()
*compare = dest;
else
{
- m_remaining_cycles -= 3;
+ m_icount -= 3;
m68ki_write_32(ea, REG_D()[(word2 >> 6) & 7]);
}
return;
@@ -9452,7 +9452,7 @@ void m68000_base_device::m68k_op_cas_32_al()
*compare = dest;
else
{
- m_remaining_cycles -= 3;
+ m_icount -= 3;
m68ki_write_32(ea, REG_D()[(word2 >> 6) & 7]);
}
return;
@@ -9492,7 +9492,7 @@ void m68000_base_device::m68k_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;
@@ -9537,7 +9537,7 @@ void m68000_base_device::m68k_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;
@@ -12535,11 +12535,11 @@ void m68000_base_device::m68k_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;
}
@@ -12557,11 +12557,11 @@ void m68000_base_device::m68k_op_dbhi_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;
@@ -12582,11 +12582,11 @@ void m68000_base_device::m68k_op_dbls_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;
@@ -12607,11 +12607,11 @@ void m68000_base_device::m68k_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;
@@ -12632,11 +12632,11 @@ void m68000_base_device::m68k_op_dbcs_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;
@@ -12657,11 +12657,11 @@ void m68000_base_device::m68k_op_dbne_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;
@@ -12682,11 +12682,11 @@ void m68000_base_device::m68k_op_dbeq_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;
@@ -12707,11 +12707,11 @@ void m68000_base_device::m68k_op_dbvc_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;
@@ -12732,11 +12732,11 @@ void m68000_base_device::m68k_op_dbvs_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;
@@ -12757,11 +12757,11 @@ void m68000_base_device::m68k_op_dbpl_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;
@@ -12782,11 +12782,11 @@ void m68000_base_device::m68k_op_dbmi_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;
@@ -12807,11 +12807,11 @@ void m68000_base_device::m68k_op_dbge_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;
@@ -12832,11 +12832,11 @@ void m68000_base_device::m68k_op_dblt_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;
@@ -12857,11 +12857,11 @@ void m68000_base_device::m68k_op_dbgt_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;
@@ -12882,11 +12882,11 @@ void m68000_base_device::m68k_op_dble_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;
@@ -15191,8 +15191,8 @@ void m68000_base_device::m68k_op_jmp_32_ai()
{
m68ki_jump(EA_AY_AI_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;
}
@@ -15200,8 +15200,8 @@ void m68000_base_device::m68k_op_jmp_32_di()
{
m68ki_jump(EA_AY_DI_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;
}
@@ -15209,8 +15209,8 @@ void m68000_base_device::m68k_op_jmp_32_ix()
{
m68ki_jump(EA_AY_IX_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;
}
@@ -15218,8 +15218,8 @@ void m68000_base_device::m68k_op_jmp_32_aw()
{
m68ki_jump(EA_AW_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;
}
@@ -15227,8 +15227,8 @@ void m68000_base_device::m68k_op_jmp_32_al()
{
m68ki_jump(EA_AL_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;
}
@@ -15236,8 +15236,8 @@ void m68000_base_device::m68k_op_jmp_32_pcdi()
{
m68ki_jump(EA_PCDI_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;
}
@@ -15245,8 +15245,8 @@ void m68000_base_device::m68k_op_jmp_32_pcix()
{
m68ki_jump(EA_PCIX_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;
}
@@ -15409,7 +15409,7 @@ void m68000_base_device::m68k_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;
@@ -15428,7 +15428,7 @@ void m68000_base_device::m68k_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;
@@ -15447,7 +15447,7 @@ void m68000_base_device::m68k_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;
@@ -15467,7 +15467,7 @@ void m68000_base_device::m68k_op_lsr_8_r()
if(shift != 0)
{
- m_remaining_cycles -= shift<<m_cyc_shift;
+ m_icount -= shift<<m_cyc_shift;
if(shift <= 8)
{
@@ -15504,7 +15504,7 @@ void m68000_base_device::m68k_op_lsr_16_r()
if(shift != 0)
{
- m_remaining_cycles -= shift<<m_cyc_shift;
+ m_icount -= shift<<m_cyc_shift;
if(shift <= 16)
{
@@ -15541,7 +15541,7 @@ void m68000_base_device::m68k_op_lsr_32_r()
if(shift != 0)
{
- m_remaining_cycles -= shift<<m_cyc_shift;
+ m_icount -= shift<<m_cyc_shift;
if(shift < 32)
{
@@ -15681,7 +15681,7 @@ void m68000_base_device::m68k_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;
@@ -15700,7 +15700,7 @@ void m68000_base_device::m68k_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;
@@ -15719,7 +15719,7 @@ void m68000_base_device::m68k_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;
@@ -15739,7 +15739,7 @@ void m68000_base_device::m68k_op_lsl_8_r()
if(shift != 0)
{
- m_remaining_cycles -= shift<<m_cyc_shift;
+ m_icount -= shift<<m_cyc_shift;
if(shift <= 8)
{
@@ -15776,7 +15776,7 @@ void m68000_base_device::m68k_op_lsl_16_r()
if(shift != 0)
{
- m_remaining_cycles -= shift<<m_cyc_shift;
+ m_icount -= shift<<m_cyc_shift;
if(shift <= 16)
{
@@ -15813,7 +15813,7 @@ void m68000_base_device::m68k_op_lsl_32_r()
if(shift != 0)
{
- m_remaining_cycles -= shift<<m_cyc_shift;
+ m_icount -= shift<<m_cyc_shift;
if(shift < 32)
{
@@ -21506,7 +21506,7 @@ void m68000_base_device::m68k_op_movem_16_re_pd()
}
AY() = ea;
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21525,7 +21525,7 @@ void m68000_base_device::m68k_op_movem_16_re_ai()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21544,7 +21544,7 @@ void m68000_base_device::m68k_op_movem_16_re_di()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21563,7 +21563,7 @@ void m68000_base_device::m68k_op_movem_16_re_ix()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21582,7 +21582,7 @@ void m68000_base_device::m68k_op_movem_16_re_aw()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21601,7 +21601,7 @@ void m68000_base_device::m68k_op_movem_16_re_al()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21622,7 +21622,7 @@ void m68000_base_device::m68k_op_movem_32_re_pd()
}
AY() = ea;
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -21641,7 +21641,7 @@ void m68000_base_device::m68k_op_movem_32_re_ai()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -21660,7 +21660,7 @@ void m68000_base_device::m68k_op_movem_32_re_di()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -21679,7 +21679,7 @@ void m68000_base_device::m68k_op_movem_32_re_ix()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -21698,7 +21698,7 @@ void m68000_base_device::m68k_op_movem_32_re_aw()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -21717,7 +21717,7 @@ void m68000_base_device::m68k_op_movem_32_re_al()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -21737,7 +21737,7 @@ void m68000_base_device::m68k_op_movem_16_er_pi()
}
AY() = ea;
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21756,7 +21756,7 @@ void m68000_base_device::m68k_op_movem_16_er_pcdi()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21775,7 +21775,7 @@ void m68000_base_device::m68k_op_movem_16_er_pcix()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21794,7 +21794,7 @@ void m68000_base_device::m68k_op_movem_16_er_ai()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21813,7 +21813,7 @@ void m68000_base_device::m68k_op_movem_16_er_di()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21832,7 +21832,7 @@ void m68000_base_device::m68k_op_movem_16_er_ix()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21851,7 +21851,7 @@ void m68000_base_device::m68k_op_movem_16_er_aw()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21870,7 +21870,7 @@ void m68000_base_device::m68k_op_movem_16_er_al()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_w;
+ m_icount -= count<<m_cyc_movem_w;
}
@@ -21890,7 +21890,7 @@ void m68000_base_device::m68k_op_movem_32_er_pi()
}
AY() = ea;
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -21909,7 +21909,7 @@ void m68000_base_device::m68k_op_movem_32_er_pcdi()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -21928,7 +21928,7 @@ void m68000_base_device::m68k_op_movem_32_er_pcix()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -21947,7 +21947,7 @@ void m68000_base_device::m68k_op_movem_32_er_ai()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -21966,7 +21966,7 @@ void m68000_base_device::m68k_op_movem_32_er_di()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -21985,7 +21985,7 @@ void m68000_base_device::m68k_op_movem_32_er_ix()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -22004,7 +22004,7 @@ void m68000_base_device::m68k_op_movem_32_er_aw()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -22023,7 +22023,7 @@ void m68000_base_device::m68k_op_movem_32_er_al()
count++;
}
- m_remaining_cycles -= count<<m_cyc_movem_l;
+ m_icount -= count<<m_cyc_movem_l;
}
@@ -22086,13 +22086,13 @@ void m68000_base_device::m68k_op_moves_8_ai()
{
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();
@@ -22121,13 +22121,13 @@ void m68000_base_device::m68k_op_moves_8_pi()
{
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();
@@ -22156,13 +22156,13 @@ void m68000_base_device::m68k_op_moves_8_pi7()
{
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();
@@ -22191,13 +22191,13 @@ void m68000_base_device::m68k_op_moves_8_pd()
{
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();
@@ -22226,13 +22226,13 @@ void m68000_base_device::m68k_op_moves_8_pd7()
{
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();
@@ -22261,13 +22261,13 @@ void m68000_base_device::m68k_op_moves_8_di()
{
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();
@@ -22296,13 +22296,13 @@ void m68000_base_device::m68k_op_moves_8_ix()
{
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();
@@ -22331,13 +22331,13 @@ void m68000_base_device::m68k_op_moves_8_aw()
{
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();
@@ -22366,13 +22366,13 @@ void m68000_base_device::m68k_op_moves_8_al()
{
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();
@@ -22401,13 +22401,13 @@ void m68000_base_device::m68k_op_moves_16_ai()
{
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();
@@ -22436,13 +22436,13 @@ void m68000_base_device::m68k_op_moves_16_pi()
{
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();
@@ -22471,13 +22471,13 @@ void m68000_base_device::m68k_op_moves_16_pd()
{
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();
@@ -22506,13 +22506,13 @@ void m68000_base_device::m68k_op_moves_16_di()
{
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();
@@ -22541,13 +22541,13 @@ void m68000_base_device::m68k_op_moves_16_ix()
{
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();
@@ -22576,13 +22576,13 @@ void m68000_base_device::m68k_op_moves_16_aw()
{
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();
@@ -22611,13 +22611,13 @@ void m68000_base_device::m68k_op_moves_16_al()
{
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();
@@ -22641,13 +22641,13 @@ void m68000_base_device::m68k_op_moves_32_ai()
{
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();
@@ -22671,13 +22671,13 @@ void m68000_base_device::m68k_op_moves_32_pi()
{
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();
@@ -22701,13 +22701,13 @@ void m68000_base_device::m68k_op_moves_32_pd()
{
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();
@@ -22731,13 +22731,13 @@ void m68000_base_device::m68k_op_moves_32_di()
{
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();
@@ -22761,13 +22761,13 @@ void m68000_base_device::m68k_op_moves_32_ix()
{
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();
@@ -22791,13 +22791,13 @@ void m68000_base_device::m68k_op_moves_32_aw()
{
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();
@@ -22821,13 +22821,13 @@ void m68000_base_device::m68k_op_moves_32_al()
{
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();
@@ -26532,7 +26532,7 @@ void m68000_base_device::m68k_op_reset()
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();
@@ -26548,7 +26548,7 @@ void m68000_base_device::m68k_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;
@@ -26567,7 +26567,7 @@ void m68000_base_device::m68k_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;
@@ -26586,7 +26586,7 @@ void m68000_base_device::m68k_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;
@@ -26607,7 +26607,7 @@ void m68000_base_device::m68k_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));
@@ -26634,7 +26634,7 @@ void m68000_base_device::m68k_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;
@@ -26661,7 +26661,7 @@ void m68000_base_device::m68k_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;
@@ -26792,7 +26792,7 @@ void m68000_base_device::m68k_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;
@@ -26811,7 +26811,7 @@ void m68000_base_device::m68k_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;
@@ -26830,7 +26830,7 @@ void m68000_base_device::m68k_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;
@@ -26851,7 +26851,7 @@ void m68000_base_device::m68k_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)
{
@@ -26886,7 +26886,7 @@ void m68000_base_device::m68k_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)
{
@@ -26921,7 +26921,7 @@ void m68000_base_device::m68k_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;
@@ -27052,7 +27052,7 @@ void m68000_base_device::m68k_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);
@@ -27073,7 +27073,7 @@ void m68000_base_device::m68k_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);
@@ -27094,7 +27094,7 @@ void m68000_base_device::m68k_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);
@@ -27120,7 +27120,7 @@ void m68000_base_device::m68k_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);
@@ -27150,7 +27150,7 @@ void m68000_base_device::m68k_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);
@@ -27182,7 +27182,7 @@ void m68000_base_device::m68k_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);
@@ -27328,7 +27328,7 @@ void m68000_base_device::m68k_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);
@@ -27349,7 +27349,7 @@ void m68000_base_device::m68k_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);
@@ -27370,7 +27370,7 @@ void m68000_base_device::m68k_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);
@@ -27397,7 +27397,7 @@ void m68000_base_device::m68k_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);
@@ -27427,7 +27427,7 @@ void m68000_base_device::m68k_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);
@@ -27459,7 +27459,7 @@ void m68000_base_device::m68k_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);
@@ -28089,7 +28089,7 @@ void m68000_base_device::m68k_op_shi_8_d()
if(COND_HI())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28101,7 +28101,7 @@ void m68000_base_device::m68k_op_sls_8_d()
if(COND_LS())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28113,7 +28113,7 @@ void m68000_base_device::m68k_op_scc_8_d()
if(COND_CC())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28125,7 +28125,7 @@ void m68000_base_device::m68k_op_scs_8_d()
if(COND_CS())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28137,7 +28137,7 @@ void m68000_base_device::m68k_op_sne_8_d()
if(COND_NE())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28149,7 +28149,7 @@ void m68000_base_device::m68k_op_seq_8_d()
if(COND_EQ())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28161,7 +28161,7 @@ void m68000_base_device::m68k_op_svc_8_d()
if(COND_VC())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28173,7 +28173,7 @@ void m68000_base_device::m68k_op_svs_8_d()
if(COND_VS())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28185,7 +28185,7 @@ void m68000_base_device::m68k_op_spl_8_d()
if(COND_PL())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28197,7 +28197,7 @@ void m68000_base_device::m68k_op_smi_8_d()
if(COND_MI())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28209,7 +28209,7 @@ void m68000_base_device::m68k_op_sge_8_d()
if(COND_GE())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28221,7 +28221,7 @@ void m68000_base_device::m68k_op_slt_8_d()
if(COND_LT())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28233,7 +28233,7 @@ void m68000_base_device::m68k_op_sgt_8_d()
if(COND_GT())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -28245,7 +28245,7 @@ void m68000_base_device::m68k_op_sle_8_d()
if(COND_LE())
{
DY() |= 0xff;
- m_remaining_cycles -= m_cyc_scc_r_true;
+ m_icount -= m_cyc_scc_r_true;
return;
}
DY() &= 0xffffff00;
@@ -29016,7 +29016,7 @@ void m68000_base_device::m68k_op_stop()
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();