From 29c920af73b9c62ee446437082b5ccf279912f93 Mon Sep 17 00:00:00 2001 From: Adam Billyard <41291895+Elektraglide@users.noreply.github.com> Date: Sun, 13 Oct 2024 23:44:34 +0100 Subject: cpu/m68000: Rename m_instruction_restart to m_can_instruction_restart to clearly distinguish from m_restart_instruction (#12869) --- src/devices/cpu/m68000/m68k_in.lst | 2 +- src/devices/cpu/m68000/m68kcpu.cpp | 14 +++++++------- src/devices/cpu/m68000/m68kmmu.h | 2 +- src/devices/cpu/m68000/m68kmusashi.h | 2 +- src/devices/cpu/m68000/m68kops.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/devices/cpu/m68000/m68k_in.lst b/src/devices/cpu/m68000/m68k_in.lst index 846172f61ff..baf931ffaca 100644 --- a/src/devices/cpu/m68000/m68k_in.lst +++ b/src/devices/cpu/m68000/m68k_in.lst @@ -5063,7 +5063,7 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 7:14 234fc:5 { m_pmmu_enabled = 0; } - m_instruction_restart = m_pmmu_enabled || m_emmu_enabled; + m_can_instruction_restart = m_pmmu_enabled || m_emmu_enabled; break; case 0x004: /* ITT0 */ m_mmu_itt0 = REG_DA()[(word2 >> 12) & 15]; diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp index 2ab2cb9fd43..cd4f351a8b0 100644 --- a/src/devices/cpu/m68000/m68kcpu.cpp +++ b/src/devices/cpu/m68000/m68kcpu.cpp @@ -901,7 +901,7 @@ void m68000_musashi_device::execute_run() try { - if (!m_instruction_restart) + if (!m_can_instruction_restart) { m_run_mode = RUN_MODE_NORMAL; /* Read an instruction and call its handler */ @@ -1038,7 +1038,7 @@ void m68000_musashi_device::init_cpu_common(void) m_pmmu_enabled = false; m_hmmu_enabled = 0; m_emmu_enabled = false; - m_instruction_restart = false; + m_can_instruction_restart = false; /* The first call to this function initializes the opcode handler jump table */ if(!emulation_initialized) @@ -1073,7 +1073,7 @@ void m68000_musashi_device::init_cpu_common(void) save_item(NAME(m_pmmu_enabled)); save_item(NAME(m_hmmu_enabled)); save_item(NAME(m_emmu_enabled)); - save_item(NAME(m_instruction_restart)); + save_item(NAME(m_can_instruction_restart)); save_item(NAME(m_restart_instruction)); save_item(NAME(m_mmu_crp_aptr)); @@ -1112,7 +1112,7 @@ void m68000_musashi_device::device_reset() m_pmmu_enabled = false; m_hmmu_enabled = 0; m_emmu_enabled = false; - m_instruction_restart = false; + m_can_instruction_restart = false; m_mmu_tc = 0; m_mmu_tt0 = 0; @@ -1316,7 +1316,7 @@ void m68000_musashi_device::set_hmmu_enable(int enable) void m68000_musashi_device::set_emmu_enable(bool enable) { m_emmu_enabled = enable; - m_instruction_restart = m_pmmu_enabled || m_emmu_enabled; + m_can_instruction_restart = m_pmmu_enabled || m_emmu_enabled; } void m68000_musashi_device::set_fpu_enable(bool enable) @@ -1688,7 +1688,7 @@ void m68000_musashi_device::init32hmmu(address_space &space, address_space &ospa // do not call set_input_line(M68K_LINE_BUSERROR) when using rerun flag void m68000_musashi_device::set_buserror_details(u32 fault_addr, u8 rw, u8 fc, bool rerun) { - if (m_instruction_restart && rerun) m_mmu_tmp_buserror_occurred = true; // hack for external MMU + if (m_can_instruction_restart && rerun) m_mmu_tmp_buserror_occurred = true; // hack for external MMU // save values for 68000 specific bus error m_aerr_address = fault_addr; @@ -2337,7 +2337,7 @@ void m68000_musashi_device::clear_all() m_pmmu_enabled= false; m_hmmu_enabled= 0; m_emmu_enabled= false; - m_instruction_restart= false; + m_can_instruction_restart= false; m_has_fpu= 0; m_fpu_just_reset= 0; diff --git a/src/devices/cpu/m68000/m68kmmu.h b/src/devices/cpu/m68000/m68kmmu.h index 28a4272f6b1..1f9c4062eb7 100644 --- a/src/devices/cpu/m68000/m68kmmu.h +++ b/src/devices/cpu/m68000/m68kmmu.h @@ -1086,7 +1086,7 @@ void m68851_pmove_put(u32 ea, u16 modes) m_pmmu_enabled = 0; MMULOG("PMMU disabled\n"); } - m_instruction_restart = m_pmmu_enabled || m_emmu_enabled; + m_can_instruction_restart = m_pmmu_enabled || m_emmu_enabled; if (!(modes & 0x100)) // flush ATC on moves to TC, SRP, CRP with FD bit clear { diff --git a/src/devices/cpu/m68000/m68kmusashi.h b/src/devices/cpu/m68000/m68kmusashi.h index a1e24c0af03..2fe19072fe5 100644 --- a/src/devices/cpu/m68000/m68kmusashi.h +++ b/src/devices/cpu/m68000/m68kmusashi.h @@ -171,7 +171,7 @@ protected: bool m_pmmu_enabled; /* Indicates if the PMMU is enabled */ int m_hmmu_enabled; /* Indicates if the HMMU is enabled */ bool m_emmu_enabled; /* Indicates if external MMU is enabled */ - bool m_instruction_restart; /* Save DA regs for potential instruction restart */ + bool m_can_instruction_restart; /* Save DA regs for potential instruction restart */ bool m_fpu_just_reset; /* Indicates the FPU was just reset */ bool m_restart_instruction; /* Indicates the instruction should be restarted */ diff --git a/src/devices/cpu/m68000/m68kops.cpp b/src/devices/cpu/m68000/m68kops.cpp index 79eadced2bb..0b0af3ff059 100644 --- a/src/devices/cpu/m68000/m68kops.cpp +++ b/src/devices/cpu/m68000/m68kops.cpp @@ -20216,7 +20216,7 @@ void m68000_musashi_device::x4e7b_movec_l_4() { m_pmmu_enabled = 0; } - m_instruction_restart = m_pmmu_enabled || m_emmu_enabled; + m_can_instruction_restart = m_pmmu_enabled || m_emmu_enabled; break; case 0x004: /* ITT0 */ m_mmu_itt0 = REG_DA()[(word2 >> 12) & 15]; -- cgit v1.2.3