From 43a85c48eff4f2fde228f643d4ad70faab9aa99a Mon Sep 17 00:00:00 2001 From: hap Date: Mon, 26 Apr 2021 11:34:50 +0200 Subject: [PATCH] risc2500/tasc: remove some unneeded variables --- src/mame/drivers/saitek_risc2500.cpp | 10 +++------- src/mame/drivers/tasc.cpp | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/mame/drivers/saitek_risc2500.cpp b/src/mame/drivers/saitek_risc2500.cpp index fc83f224cc9..1fa15750bca 100644 --- a/src/mame/drivers/saitek_risc2500.cpp +++ b/src/mame/drivers/saitek_risc2500.cpp @@ -321,13 +321,8 @@ u32 risc2500_state::rom_r(offs_t offset) if (!machine().side_effects_disabled()) { // handle dynamic cpu clock divider when accessing rom - u64 cur_cycle = m_maincpu->total_cycles(); - u64 prev_cycle = m_prev_cycle; - s64 diff = cur_cycle - prev_cycle; - + s64 diff = m_maincpu->total_cycles() - m_prev_cycle; u32 pc = m_maincpu->pc(); - u32 prev_pc = m_prev_pc; - m_prev_pc = pc; if (diff > 0) { @@ -336,13 +331,14 @@ u32 risc2500_state::rom_r(offs_t offset) static constexpr int divider = -8 + 1; // this takes care of almost all cases, otherwise, total cycles taken can't be determined - if (diff <= arm_branch_cycles || (diff <= arm_max_cycles && (pc - prev_pc) == 4 && (pc & ~0x02000000) == (offset * 4))) + if (diff <= arm_branch_cycles || (diff <= arm_max_cycles && (pc - m_prev_pc) == 4 && (pc & ~0x02000000) == (offset * 4))) m_maincpu->adjust_icount(divider * (int)diff); else m_maincpu->adjust_icount(divider); } m_prev_cycle = m_maincpu->total_cycles(); + m_prev_pc = pc; } return m_rom[offset]; diff --git a/src/mame/drivers/tasc.cpp b/src/mame/drivers/tasc.cpp index 7b7bc9f34a7..cf9cc406fe5 100644 --- a/src/mame/drivers/tasc.cpp +++ b/src/mame/drivers/tasc.cpp @@ -227,13 +227,8 @@ u32 tasc_state::rom_r(offs_t offset) if (!machine().side_effects_disabled()) { // handle dynamic cpu clock divider when accessing rom - u64 cur_cycle = m_maincpu->total_cycles(); - u64 prev_cycle = m_prev_cycle; - s64 diff = cur_cycle - prev_cycle; - + s64 diff = m_maincpu->total_cycles() - m_prev_cycle; u32 pc = m_maincpu->pc(); - u32 prev_pc = m_prev_pc; - m_prev_pc = pc; if (diff > 0) { @@ -242,13 +237,14 @@ u32 tasc_state::rom_r(offs_t offset) static constexpr int divider = -7 + 1; // this takes care of almost all cases, otherwise, total cycles taken can't be determined - if (diff <= arm_branch_cycles || (diff <= arm_max_cycles && (pc - prev_pc) == 4 && (pc & ~0x02000000) == (offset * 4))) + if (diff <= arm_branch_cycles || (diff <= arm_max_cycles && (pc - m_prev_pc) == 4 && (pc & ~0x02000000) == (offset * 4))) m_maincpu->adjust_icount(divider * (int)diff); else m_maincpu->adjust_icount(divider); } m_prev_cycle = m_maincpu->total_cycles(); + m_prev_pc = pc; } return m_rom[offset];