mips1: fix build

This commit is contained in:
Patrick Mackinlay 2023-05-27 16:52:50 +07:00
parent 991ed996ef
commit 8cdf1257c4
2 changed files with 9 additions and 8 deletions

View file

@ -646,10 +646,10 @@ bool mips1core_device_base::memory_translate(int spacenum, int intention, offs_t
target_space = &space(spacenum);
if (spacenum != AS_PROGRAM)
return true;
return memory_translate(intention, address, true);
return translate(intention, address, true);
}
bool mips1core_device_base::memory_translate(int intention, offs_t &address, bool debug)
bool mips1core_device_base::translate(int intention, offs_t &address, bool debug)
{
// check for kernel memory address
if (BIT(address, 31))
@ -1108,7 +1108,7 @@ template <typename T, bool Aligned, typename U> std::enable_if_t<std::is_convert
return;
}
if (memory_translate(TR_READ, address, false))
if (translate(TR_READ, address, false))
{
// align address for ld[lr] instructions
if (!Aligned)
@ -1138,7 +1138,7 @@ template <typename T, bool Aligned, typename U> std::enable_if_t<std::is_convert
return;
}
if (memory_translate(TR_WRITE, address, false))
if (translate(TR_WRITE, address, false))
{
// align address for sd[lr] instructions
if (!Aligned)
@ -1162,7 +1162,7 @@ bool mips1core_device_base::fetch(u32 address, std::function<void(u32)> &&apply)
return false;
}
if (memory_translate(TR_FETCH, address, false))
if (translate(TR_FETCH, address, false))
{
u32 const data = space(AS_PROGRAM).read_dword(address);
@ -1952,7 +1952,7 @@ template <typename T> void mips1_device_base::set_cop1_reg(unsigned const reg, T
m_f[reg] = data;
}
bool mips1_device_base::memory_translate(int intention, offs_t &address, bool debug)
bool mips1_device_base::translate(int intention, offs_t &address, bool debug)
{
// check for kernel memory address
if (BIT(address, 31))

View file

@ -165,11 +165,12 @@ protected:
// device_memory_interface implementation
virtual space_config_vector memory_space_config() const override;
virtual bool memory_translate(int spacenum, int intention, offs_t &address, address_space *&target_space) override;
virtual bool memory_translate(int intention, offs_t &address, bool debug);
// device_disasm_interface implementation
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
virtual bool translate(int intention, offs_t &address, bool debug);
void icache_map(address_map &map);
void dcache_map(address_map &map);
@ -298,7 +299,7 @@ protected:
virtual void device_start() override;
virtual void device_reset() override;
virtual bool memory_translate(int intention, offs_t &address, bool debug) override;
virtual bool translate(int intention, offs_t &address, bool debug) override;
virtual void handle_cop0(u32 const op) override;
virtual u32 get_cop0_reg(unsigned const reg) override;