Skip to content

Commit 29c920a

Browse files
authored
cpu/m68000: Rename m_instruction_restart to m_can_instruction_restart to clearly distinguish from m_restart_instruction (#12869)
1 parent c6b72ab commit 29c920a

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

src/devices/cpu/m68000/m68k_in.lst

+1-1
Original file line numberDiff line numberDiff line change
@@ -5063,7 +5063,7 @@ e3c0 ffc0 lsl w A+-DXWL 01:8 7:14 234fc:5
50635063
{
50645064
m_pmmu_enabled = 0;
50655065
}
5066-
m_instruction_restart = m_pmmu_enabled || m_emmu_enabled;
5066+
m_can_instruction_restart = m_pmmu_enabled || m_emmu_enabled;
50675067
break;
50685068
case 0x004: /* ITT0 */
50695069
m_mmu_itt0 = REG_DA()[(word2 >> 12) & 15];

src/devices/cpu/m68000/m68kcpu.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ void m68000_musashi_device::execute_run()
901901

902902
try
903903
{
904-
if (!m_instruction_restart)
904+
if (!m_can_instruction_restart)
905905
{
906906
m_run_mode = RUN_MODE_NORMAL;
907907
/* Read an instruction and call its handler */
@@ -1038,7 +1038,7 @@ void m68000_musashi_device::init_cpu_common(void)
10381038
m_pmmu_enabled = false;
10391039
m_hmmu_enabled = 0;
10401040
m_emmu_enabled = false;
1041-
m_instruction_restart = false;
1041+
m_can_instruction_restart = false;
10421042

10431043
/* The first call to this function initializes the opcode handler jump table */
10441044
if(!emulation_initialized)
@@ -1073,7 +1073,7 @@ void m68000_musashi_device::init_cpu_common(void)
10731073
save_item(NAME(m_pmmu_enabled));
10741074
save_item(NAME(m_hmmu_enabled));
10751075
save_item(NAME(m_emmu_enabled));
1076-
save_item(NAME(m_instruction_restart));
1076+
save_item(NAME(m_can_instruction_restart));
10771077
save_item(NAME(m_restart_instruction));
10781078

10791079
save_item(NAME(m_mmu_crp_aptr));
@@ -1112,7 +1112,7 @@ void m68000_musashi_device::device_reset()
11121112
m_pmmu_enabled = false;
11131113
m_hmmu_enabled = 0;
11141114
m_emmu_enabled = false;
1115-
m_instruction_restart = false;
1115+
m_can_instruction_restart = false;
11161116

11171117
m_mmu_tc = 0;
11181118
m_mmu_tt0 = 0;
@@ -1316,7 +1316,7 @@ void m68000_musashi_device::set_hmmu_enable(int enable)
13161316
void m68000_musashi_device::set_emmu_enable(bool enable)
13171317
{
13181318
m_emmu_enabled = enable;
1319-
m_instruction_restart = m_pmmu_enabled || m_emmu_enabled;
1319+
m_can_instruction_restart = m_pmmu_enabled || m_emmu_enabled;
13201320
}
13211321

13221322
void m68000_musashi_device::set_fpu_enable(bool enable)
@@ -1688,7 +1688,7 @@ void m68000_musashi_device::init32hmmu(address_space &space, address_space &ospa
16881688
// do not call set_input_line(M68K_LINE_BUSERROR) when using rerun flag
16891689
void m68000_musashi_device::set_buserror_details(u32 fault_addr, u8 rw, u8 fc, bool rerun)
16901690
{
1691-
if (m_instruction_restart && rerun) m_mmu_tmp_buserror_occurred = true; // hack for external MMU
1691+
if (m_can_instruction_restart && rerun) m_mmu_tmp_buserror_occurred = true; // hack for external MMU
16921692

16931693
// save values for 68000 specific bus error
16941694
m_aerr_address = fault_addr;
@@ -2337,7 +2337,7 @@ void m68000_musashi_device::clear_all()
23372337
m_pmmu_enabled= false;
23382338
m_hmmu_enabled= 0;
23392339
m_emmu_enabled= false;
2340-
m_instruction_restart= false;
2340+
m_can_instruction_restart= false;
23412341
m_has_fpu= 0;
23422342
m_fpu_just_reset= 0;
23432343

src/devices/cpu/m68000/m68kmmu.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@ void m68851_pmove_put(u32 ea, u16 modes)
10861086
m_pmmu_enabled = 0;
10871087
MMULOG("PMMU disabled\n");
10881088
}
1089-
m_instruction_restart = m_pmmu_enabled || m_emmu_enabled;
1089+
m_can_instruction_restart = m_pmmu_enabled || m_emmu_enabled;
10901090

10911091
if (!(modes & 0x100)) // flush ATC on moves to TC, SRP, CRP with FD bit clear
10921092
{

src/devices/cpu/m68000/m68kmusashi.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class m68000_musashi_device : public m68000_base_device
171171
bool m_pmmu_enabled; /* Indicates if the PMMU is enabled */
172172
int m_hmmu_enabled; /* Indicates if the HMMU is enabled */
173173
bool m_emmu_enabled; /* Indicates if external MMU is enabled */
174-
bool m_instruction_restart; /* Save DA regs for potential instruction restart */
174+
bool m_can_instruction_restart; /* Save DA regs for potential instruction restart */
175175
bool m_fpu_just_reset; /* Indicates the FPU was just reset */
176176
bool m_restart_instruction; /* Indicates the instruction should be restarted */
177177

src/devices/cpu/m68000/m68kops.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20216,7 +20216,7 @@ void m68000_musashi_device::x4e7b_movec_l_4()
2021620216
{
2021720217
m_pmmu_enabled = 0;
2021820218
}
20219-
m_instruction_restart = m_pmmu_enabled || m_emmu_enabled;
20219+
m_can_instruction_restart = m_pmmu_enabled || m_emmu_enabled;
2022020220
break;
2022120221
case 0x004: /* ITT0 */
2022220222
m_mmu_itt0 = REG_DA()[(word2 >> 12) & 15];

0 commit comments

Comments
 (0)