cpu/m68k: Try again for GCC [R. Belmont]

This commit is contained in:
arbee 2023-07-05 11:40:08 -04:00
parent 42c3fc08eb
commit 7d184d72bc
2 changed files with 11 additions and 11 deletions

View File

@ -1034,9 +1034,9 @@ void m68000_musashi_device::init_cpu_common(void)
/* disable all MMUs */
m_has_pmmu = false;
m_has_hmmu = 0;
m_has_hmmu = false;
m_pmmu_enabled = false;
m_hmmu_enabled = false;
m_hmmu_enabled = 0;
m_emmu_enabled = false;
m_instruction_restart = false;
@ -1110,7 +1110,7 @@ void m68000_musashi_device::device_reset()
{
/* Disable the PMMU/HMMU on reset, if any */
m_pmmu_enabled = false;
m_hmmu_enabled = false;
m_hmmu_enabled = 0;
m_emmu_enabled = false;
m_instruction_restart = false;
@ -1307,7 +1307,7 @@ void m68000_musashi_device::state_string_export(const device_state_entry &entry,
/* global access */
void m68000_musashi_device::set_hmmu_enable(bool enable)
void m68000_musashi_device::set_hmmu_enable(int enable)
{
m_hmmu_enabled = enable;
}
@ -1831,7 +1831,7 @@ void m68000_musashi_device::init_cpu_m68000(void)
m_cyc_shift = 2;
m_cyc_reset = 132;
m_has_pmmu = 0;
m_has_hmmu = 0;
m_has_hmmu = false;
m_has_fpu = 0;
define_state();
@ -1940,7 +1940,7 @@ void m68000_musashi_device::init_cpu_m68020hmmu(void)
{
init_cpu_m68020();
m_has_hmmu = 1;
m_has_hmmu = true;
m_has_fpu = 1;
@ -2333,9 +2333,9 @@ void m68000_musashi_device::clear_all()
m_instr_mode= 0;
m_run_mode= 0;
m_has_pmmu= false;
m_has_hmmu= 0;
m_has_hmmu= false;
m_pmmu_enabled= false;
m_hmmu_enabled= false;
m_hmmu_enabled= 0;
m_emmu_enabled= false;
m_instruction_restart= false;
m_has_fpu= 0;

View File

@ -124,7 +124,7 @@ protected:
public:
virtual u16 get_fc() const noexcept override;
void set_hmmu_enable(bool enable);
void set_hmmu_enable(int enable);
void set_emmu_enable(bool enable);
bool get_pmmu_enable() const {return m_pmmu_enabled;}
void set_fpu_enable(bool enable);
@ -174,9 +174,9 @@ protected:
u32 m_instr_mode; /* Stores whether we are in instruction mode or group 0/1 exception mode */
u32 m_run_mode; /* Stores whether we are processing a reset, bus error, address error, or something else */
bool m_has_pmmu; /* Indicates if a PMMU available (yes on 030, 040, no on EC030) */
int m_has_hmmu; /* Indicates if an Apple HMMU is available in place of the 68851 (020 only) */
bool m_has_hmmu; /* Indicates if an Apple HMMU is available in place of the 68851 (020 only) */
bool m_pmmu_enabled; /* Indicates if the PMMU is enabled */
bool m_hmmu_enabled; /* Indicates if the HMMU 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_fpu_just_reset; /* Indicates the FPU was just reset */