diff options
Diffstat (limited to 'src/emu/emumem_hep.h')
-rw-r--r-- | src/emu/emumem_hep.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/emu/emumem_hep.h b/src/emu/emumem_hep.h index 0b166d77698..bc8616cea2b 100644 --- a/src/emu/emumem_hep.h +++ b/src/emu/emumem_hep.h @@ -5,44 +5,44 @@ // parent class for handlers which want to tap the access and usually pass it on to another handler -template<int Width, int AddrShift, int Endian> class handler_entry_read_passthrough : public handler_entry_read<Width, AddrShift, Endian> +template<int Width, int AddrShift> class handler_entry_read_passthrough : public handler_entry_read<Width, AddrShift> { public: - using uX = typename emu::detail::handler_entry_size<Width>::uX; + using uX = emu::detail::handler_entry_size_t<Width>; - handler_entry_read_passthrough(address_space *space, memory_passthrough_handler &mph) : handler_entry_read<Width, AddrShift, Endian>(space, handler_entry::F_PASSTHROUGH), m_mph(mph), m_next(nullptr) {} + handler_entry_read_passthrough(address_space *space, emu::detail::memory_passthrough_handler_impl &mph, u32 prio) : handler_entry_read<Width, AddrShift>(space, handler_entry::f_pt(prio)), m_mph(mph), m_next(nullptr) {} ~handler_entry_read_passthrough(); - virtual handler_entry_read_passthrough<Width, AddrShift, Endian> *instantiate(handler_entry_read<Width, AddrShift, Endian> *next) const = 0; + virtual handler_entry_read_passthrough<Width, AddrShift> *instantiate(handler_entry_read<Width, AddrShift> *next) const = 0; - handler_entry_read<Width, AddrShift, Endian> *get_subhandler() const { return m_next; } + handler_entry_read<Width, AddrShift> *get_subhandler() const { return m_next; } void detach(const std::unordered_set<handler_entry *> &handlers) override; protected: - memory_passthrough_handler &m_mph; - handler_entry_read<Width, AddrShift, Endian> *m_next; + emu::detail::memory_passthrough_handler_impl &m_mph; + handler_entry_read<Width, AddrShift> *m_next; - handler_entry_read_passthrough(address_space *space, memory_passthrough_handler &mph, handler_entry_read<Width, AddrShift, Endian> *next) : handler_entry_read<Width, AddrShift, Endian>(space, handler_entry::F_PASSTHROUGH), m_mph(mph), m_next(next) { next->ref(); mph.add_handler(this); } + handler_entry_read_passthrough(address_space *space, emu::detail::memory_passthrough_handler_impl &mph, u32 prio, handler_entry_read<Width, AddrShift> *next) : handler_entry_read<Width, AddrShift>(space, handler_entry::f_pt(prio)), m_mph(mph), m_next(next) { next->ref(); mph.add_handler(this); } }; -template<int Width, int AddrShift, int Endian> class handler_entry_write_passthrough : public handler_entry_write<Width, AddrShift, Endian> +template<int Width, int AddrShift> class handler_entry_write_passthrough : public handler_entry_write<Width, AddrShift> { public: - using uX = typename emu::detail::handler_entry_size<Width>::uX; + using uX = emu::detail::handler_entry_size_t<Width>; - handler_entry_write_passthrough(address_space *space, memory_passthrough_handler &mph) : handler_entry_write<Width, AddrShift, Endian>(space, handler_entry::F_PASSTHROUGH), m_mph(mph), m_next(nullptr) {} + handler_entry_write_passthrough(address_space *space, emu::detail::memory_passthrough_handler_impl &mph, u32 prio) : handler_entry_write<Width, AddrShift>(space, handler_entry::f_pt(prio)), m_mph(mph), m_next(nullptr) {} ~handler_entry_write_passthrough(); - virtual handler_entry_write_passthrough<Width, AddrShift, Endian> *instantiate(handler_entry_write<Width, AddrShift, Endian> *next) const = 0; + virtual handler_entry_write_passthrough<Width, AddrShift> *instantiate(handler_entry_write<Width, AddrShift> *next) const = 0; - handler_entry_write<Width, AddrShift, Endian> *get_subhandler() const { return m_next; } + handler_entry_write<Width, AddrShift> *get_subhandler() const { return m_next; } void detach(const std::unordered_set<handler_entry *> &handlers) override; protected: - memory_passthrough_handler &m_mph; - handler_entry_write<Width, AddrShift, Endian> *m_next; + emu::detail::memory_passthrough_handler_impl &m_mph; + handler_entry_write<Width, AddrShift> *m_next; - handler_entry_write_passthrough(address_space *space, memory_passthrough_handler &mph, handler_entry_write<Width, AddrShift, Endian> *next) : handler_entry_write<Width, AddrShift, Endian>(space, handler_entry::F_PASSTHROUGH), m_mph(mph), m_next(next) { next->ref(); mph.add_handler(this); } + handler_entry_write_passthrough(address_space *space, emu::detail::memory_passthrough_handler_impl &mph, u32 prio, handler_entry_write<Width, AddrShift> *next) : handler_entry_write<Width, AddrShift>(space, handler_entry::f_pt(prio)), m_mph(mph), m_next(next) { next->ref(); mph.add_handler(this); } }; |