diff options
Diffstat (limited to 'src/emu/emumem_hedp.h')
-rw-r--r-- | src/emu/emumem_hedp.h | 70 |
1 files changed, 62 insertions, 8 deletions
diff --git a/src/emu/emumem_hedp.h b/src/emu/emumem_hedp.h index e9539bd21d9..af16088f21e 100644 --- a/src/emu/emumem_hedp.h +++ b/src/emu/emumem_hedp.h @@ -5,11 +5,10 @@ // Executes an access through called a delegate, usually containing a handler or a lambda -template<int Width, int AddrShift, int Endian> class handler_entry_read_delegate : public handler_entry_read_address<Width, AddrShift, Endian> +template<int Width, int AddrShift, int Endian, typename READ> class handler_entry_read_delegate : public handler_entry_read_address<Width, AddrShift, Endian> { public: - using uX = typename handler_entry_size<Width>::uX; - using READ = typename handler_entry_size<Width>::READ; + using uX = typename emu::detail::handler_entry_size<Width>::uX; using inh = handler_entry_read_address<Width, AddrShift, Endian>; handler_entry_read_delegate(address_space *space, READ delegate) : handler_entry_read_address<Width, AddrShift, Endian>(space, 0), m_delegate(delegate) {} @@ -21,13 +20,40 @@ public: private: READ m_delegate; + + template<typename R> + std::enable_if_t<std::is_same<R, read8_delegate>::value || + std::is_same<R, read16_delegate>::value || + std::is_same<R, read32_delegate>::value || + std::is_same<R, read64_delegate>::value, + uX> read_impl(offs_t offset, uX mem_mask); + + template<typename R> + std::enable_if_t<std::is_same<R, read8s_delegate>::value || + std::is_same<R, read16s_delegate>::value || + std::is_same<R, read32s_delegate>::value || + std::is_same<R, read64s_delegate>::value, + uX> read_impl(offs_t offset, uX mem_mask); + + template<typename R> + std::enable_if_t<std::is_same<R, read8sm_delegate>::value || + std::is_same<R, read16sm_delegate>::value || + std::is_same<R, read32sm_delegate>::value || + std::is_same<R, read64sm_delegate>::value, + uX> read_impl(offs_t offset, uX mem_mask); + + template<typename R> + std::enable_if_t<std::is_same<R, read8smo_delegate>::value || + std::is_same<R, read16smo_delegate>::value || + std::is_same<R, read32smo_delegate>::value || + std::is_same<R, read64smo_delegate>::value, + uX> read_impl(offs_t offset, uX mem_mask); }; -template<int Width, int AddrShift, int Endian> class handler_entry_write_delegate : public handler_entry_write_address<Width, AddrShift, Endian> +template<int Width, int AddrShift, int Endian, typename WRITE> class handler_entry_write_delegate : public handler_entry_write_address<Width, AddrShift, Endian> { public: - using uX = typename handler_entry_size<Width>::uX; - using WRITE = typename handler_entry_size<Width>::WRITE; + using uX = typename emu::detail::handler_entry_size<Width>::uX; using inh = handler_entry_write_address<Width, AddrShift, Endian>; handler_entry_write_delegate(address_space *space, WRITE delegate) : handler_entry_write_address<Width, AddrShift, Endian>(space, 0), m_delegate(delegate) {} @@ -39,6 +65,34 @@ public: private: WRITE m_delegate; + + template<typename W> + std::enable_if_t<std::is_same<W, write8_delegate>::value || + std::is_same<W, write16_delegate>::value || + std::is_same<W, write32_delegate>::value || + std::is_same<W, write64_delegate>::value, + void> write_impl(offs_t offset, uX data, uX mem_mask); + + template<typename W> + std::enable_if_t<std::is_same<W, write8s_delegate>::value || + std::is_same<W, write16s_delegate>::value || + std::is_same<W, write32s_delegate>::value || + std::is_same<W, write64s_delegate>::value, + void> write_impl(offs_t offset, uX data, uX mem_mask); + + template<typename W> + std::enable_if_t<std::is_same<W, write8sm_delegate>::value || + std::is_same<W, write16sm_delegate>::value || + std::is_same<W, write32sm_delegate>::value || + std::is_same<W, write64sm_delegate>::value, + void> write_impl(offs_t offset, uX data, uX mem_mask); + + template<typename W> + std::enable_if_t<std::is_same<W, write8smo_delegate>::value || + std::is_same<W, write16smo_delegate>::value || + std::is_same<W, write32smo_delegate>::value || + std::is_same<W, write64smo_delegate>::value, + void> write_impl(offs_t offset, uX data, uX mem_mask); }; @@ -49,7 +103,7 @@ private: template<int Width, int AddrShift, int Endian> class handler_entry_read_ioport : public handler_entry_read<Width, AddrShift, Endian> { public: - using uX = typename handler_entry_size<Width>::uX; + using uX = typename emu::detail::handler_entry_size<Width>::uX; using inh = handler_entry_read<Width, AddrShift, Endian>; handler_entry_read_ioport(address_space *space, ioport_port *port) : handler_entry_read<Width, AddrShift, Endian>(space, 0), m_port(port) {} @@ -66,7 +120,7 @@ private: template<int Width, int AddrShift, int Endian> class handler_entry_write_ioport : public handler_entry_write<Width, AddrShift, Endian> { public: - using uX = typename handler_entry_size<Width>::uX; + using uX = typename emu::detail::handler_entry_size<Width>::uX; using inh = handler_entry_write<Width, AddrShift, Endian>; handler_entry_write_ioport(address_space *space, ioport_port *port) : handler_entry_write<Width, AddrShift, Endian>(space, 0), m_port(port) {} |