From 8cdf1257c48409d1f58f1edccc53d433a1ee7831 Mon Sep 17 00:00:00 2001 From: Patrick Mackinlay Date: Sat, 27 May 2023 16:52:50 +0700 Subject: mips1: fix build --- src/devices/cpu/mips/mips1.cpp | 12 ++++++------ src/devices/cpu/mips/mips1.h | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/devices/cpu/mips/mips1.cpp b/src/devices/cpu/mips/mips1.cpp index f96daccfc85..c6665d13d01 100644 --- a/src/devices/cpu/mips/mips1.cpp +++ b/src/devices/cpu/mips/mips1.cpp @@ -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 std::enable_if_t std::enable_if_t &&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 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)) diff --git a/src/devices/cpu/mips/mips1.h b/src/devices/cpu/mips/mips1.h index 64b65d7d056..5128754e152 100644 --- a/src/devices/cpu/mips/mips1.h +++ b/src/devices/cpu/mips/mips1.h @@ -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 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; -- cgit v1.2.3