diff options
author | Vas Crabb <vas@vastheman.com> | 2018-07-07 02:40:29 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-07-07 02:40:29 +1000 |
commit | c3fb11c2c98a5c28ece6a27093a0f9def350ac64 (patch) | |
tree | c68b38f05ed1d32358add721fda7f45e8803479f /src/mame/machine/taitoio.h | |
parent | 5d9e33b786d7ef452317439359f3cbd8cc920513 (diff) |
devcb3
There are multiple issues with the current device callbacks:
* They always dispatch through a pointer-to-member
* Chained callbacks are a linked list so the branch unit can't predict the early
* There's a runtime decision made on the left/right shift direction
* There are runtime NULL checks on various objects
* Binding a lambda isn't practical
* Arbitrary transformations are not supported
* When chaining callbacks it isn't clear what the MCFG_DEVCB_ modifiers apply to
* It isn't possible to just append to a callback in derived configuration
* The macros need a magic, hidden local called devcb
* Moving code that uses the magic locals around is error-prone
* Writing the MCFG_ macros to make a device usable is a pain
* You can't discover applicable MCFG_ macros with intellisense
* Macros are not scoped
* Using an inappropriate macro isn't detected at compile time
* Lots of other things
This changeset overcomes the biggest obstacle to remving MCFG_ macros
altogether. Essentially, to allow a devcb to be configured, call
.bind() and expose the result (a bind target for the callback). Bind
target methods starting with "set" repace the current callbacks; methods
starting with "append" append to them. You can't reconfigure a callback
after resolving it. There's no need to use a macro matching the
handler signatures - use FUNC for everything. Current device is implied
if no tag/finder is supplied (no need for explicit this).
Lambdas are supported, and the memory space and offset are optional.
These kinds of things work:
* .read_cb().set([this] () { return something; });
* .read_cb().set([this] (offs_t offset) { return ~offset; });
* .write_cb().set([this] (offs_t offset, u8 data) { m_array[offset] = data; });
* .write_cb().set([this] (int state) { some_var = state; });
Arbitrary transforms are allowed, and they can modify offset/mask for example:
* .read_cb().set(FUNC(my_state::handler)).transform([] (u8 data) { return bitswap<4>(data, 1, 3, 0, 2); });
* .read_cb().set(m_dev, FUNC(some_device::member)).transform([] (offs_t &offset, u8 data) { offset ^= 3; return data; });
It's possible to stack arbitrary transforms, at the cost of compile
time (the whole transform stack gets inlined at compile time). Shifts
count as an arbitrary transform, but mask/exor does not.
Order of mask/shift/exor now matters. Modifications are applied in the
specified order. These are NOT EQUIVALENT:
* .read_cb().set(FUNC(my_state::handler)).mask(0x06).lshift(2);
* .read_cb().set(FUNC(my_state::handler)).lshift(2).mask(0x06);
The bit helper no longer reverses its behaviour for read callbacks, and
I/O ports are no longer aware of the field mask. Binding a read
callback to no-op is not supported - specify a constant. The GND and
VCC aliases have been removed intentionally - they're TTL-centric, and
were already being abused.
Other quirks have been preserved, including write logger only logging
when the data is non-zero (quite unhelpful in many of the cases where
it's used). Legacy syntax is still supported for simple cases, but will
be phased out. New devices should not have MCFG_ macros.
I don't think I've missed any fundamental issues, but if I've broken
something, let me know.
Diffstat (limited to 'src/mame/machine/taitoio.h')
-rw-r--r-- | src/mame/machine/taitoio.h | 140 |
1 files changed, 26 insertions, 114 deletions
diff --git a/src/mame/machine/taitoio.h b/src/mame/machine/taitoio.h index 63b843b8f28..06bd5868d2d 100644 --- a/src/mame/machine/taitoio.h +++ b/src/mame/machine/taitoio.h @@ -21,12 +21,12 @@ class tc0040ioc_device : public device_t public: tc0040ioc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> devcb_base &set_read_0_callback(Object &&cb) { return m_read_0_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_1_callback(Object &&cb) { return m_read_1_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_2_callback(Object &&cb) { return m_read_2_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_3_callback(Object &&cb) { return m_read_3_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_write_4_callback(Object &&cb) { return m_write_4_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_7_callback(Object &&cb) { return m_read_7_cb.set_callback(std::forward<Object>(cb)); } + auto read_0_callback() { return m_read_0_cb.bind(); } + auto read_1_callback() { return m_read_1_cb.bind(); } + auto read_2_callback() { return m_read_2_cb.bind(); } + auto read_3_callback() { return m_read_3_cb.bind(); } + auto write_4_callback() { return m_write_4_cb.bind(); } + auto read_7_callback() { return m_read_7_cb.bind(); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -64,13 +64,13 @@ class tc0220ioc_device : public device_t public: tc0220ioc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> devcb_base &set_read_0_callback(Object &&cb) { return m_read_0_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_1_callback(Object &&cb) { return m_read_1_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_2_callback(Object &&cb) { return m_read_2_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_3_callback(Object &&cb) { return m_read_3_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_write_3_callback(Object &&cb) { return m_write_3_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_write_4_callback(Object &&cb) { return m_write_4_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_7_callback(Object &&cb) { return m_read_7_cb.set_callback(std::forward<Object>(cb)); } + auto read_0_callback() { return m_read_0_cb.bind(); } + auto read_1_callback() { return m_read_1_cb.bind(); } + auto read_2_callback() { return m_read_2_cb.bind(); } + auto read_3_callback() { return m_read_3_cb.bind(); } + auto write_3_callback() { return m_write_3_cb.bind(); } + auto write_4_callback() { return m_write_4_cb.bind(); } + auto read_7_callback() { return m_read_7_cb.bind(); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -103,13 +103,13 @@ class tc0510nio_device : public device_t public: tc0510nio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> devcb_base &set_read_0_callback(Object &&cb) { return m_read_0_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_1_callback(Object &&cb) { return m_read_1_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_2_callback(Object &&cb) { return m_read_2_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_3_callback(Object &&cb) { return m_read_3_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_write_3_callback(Object &&cb) { return m_write_3_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_write_4_callback(Object &&cb) { return m_write_4_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_7_callback(Object &&cb) { return m_read_7_cb.set_callback(std::forward<Object>(cb)); } + auto read_0_callback() { return m_read_0_cb.bind(); } + auto read_1_callback() { return m_read_1_cb.bind(); } + auto read_2_callback() { return m_read_2_cb.bind(); } + auto read_3_callback() { return m_read_3_cb.bind(); } + auto write_3_callback() { return m_write_3_cb.bind(); } + auto write_4_callback() { return m_write_4_cb.bind(); } + auto read_7_callback() { return m_read_7_cb.bind(); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -146,13 +146,12 @@ class tc0640fio_device : public device_t public: tc0640fio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> devcb_base &set_read_0_callback(Object &&cb) { return m_read_0_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_1_callback(Object &&cb) { return m_read_1_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_2_callback(Object &&cb) { return m_read_2_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_3_callback(Object &&cb) { return m_read_3_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_write_4_callback(Object &&cb) { return m_write_4_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_read_7_callback(Object &&cb) { return m_read_7_cb.set_callback(std::forward<Object>(cb)); } - + auto read_0_callback() { return m_read_0_cb.bind(); } + auto read_1_callback() { return m_read_1_cb.bind(); } + auto read_2_callback() { return m_read_2_cb.bind(); } + auto read_3_callback() { return m_read_3_cb.bind(); } + auto write_4_callback() { return m_write_4_cb.bind(); } + auto read_7_callback() { return m_read_7_cb.bind(); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -183,91 +182,4 @@ protected: DECLARE_DEVICE_TYPE(TC0640FIO, tc0640fio_device) - -/*************************************************************************** - DEVICE CONFIGURATION MACROS -***************************************************************************/ - -#define MCFG_TC0040IOC_READ_0_CB(_devcb) \ - devcb = &downcast<tc0040ioc_device &>(*device).set_read_0_callback(DEVCB_##_devcb); - -#define MCFG_TC0040IOC_READ_1_CB(_devcb) \ - devcb = &downcast<tc0040ioc_device &>(*device).set_read_1_callback(DEVCB_##_devcb); - -#define MCFG_TC0040IOC_READ_2_CB(_devcb) \ - devcb = &downcast<tc0040ioc_device &>(*device).set_read_2_callback(DEVCB_##_devcb); - -#define MCFG_TC0040IOC_READ_3_CB(_devcb) \ - devcb = &downcast<tc0040ioc_device &>(*device).set_read_3_callback(DEVCB_##_devcb); - -#define MCFG_TC0040IOC_WRITE_4_CB(_devcb) \ - devcb = &downcast<tc0040ioc_device &>(*device).set_write_4_callback(DEVCB_##_devcb); - -#define MCFG_TC0040IOC_READ_7_CB(_devcb) \ - devcb = &downcast<tc0040ioc_device &>(*device).set_read_7_callback(DEVCB_##_devcb); - - -#define MCFG_TC0220IOC_READ_0_CB(_devcb) \ - devcb = &downcast<tc0220ioc_device &>(*device).set_read_0_callback(DEVCB_##_devcb); - -#define MCFG_TC0220IOC_READ_1_CB(_devcb) \ - devcb = &downcast<tc0220ioc_device &>(*device).set_read_1_callback(DEVCB_##_devcb); - -#define MCFG_TC0220IOC_READ_2_CB(_devcb) \ - devcb = &downcast<tc0220ioc_device &>(*device).set_read_2_callback(DEVCB_##_devcb); - -#define MCFG_TC0220IOC_READ_3_CB(_devcb) \ - devcb = &downcast<tc0220ioc_device &>(*device).set_read_3_callback(DEVCB_##_devcb); - -#define MCFG_TC0220IOC_WRITE_3_CB(_devcb) \ - devcb = &downcast<tc0220ioc_device &>(*device).set_write_3_callback(DEVCB_##_devcb); - -#define MCFG_TC0220IOC_WRITE_4_CB(_devcb) \ - devcb = &downcast<tc0220ioc_device &>(*device).set_write_4_callback(DEVCB_##_devcb); - -#define MCFG_TC0220IOC_READ_7_CB(_devcb) \ - devcb = &downcast<tc0220ioc_device &>(*device).set_read_7_callback(DEVCB_##_devcb); - - -#define MCFG_TC0510NIO_READ_0_CB(_devcb) \ - devcb = &downcast<tc0510nio_device &>(*device).set_read_0_callback(DEVCB_##_devcb); - -#define MCFG_TC0510NIO_READ_1_CB(_devcb) \ - devcb = &downcast<tc0510nio_device &>(*device).set_read_1_callback(DEVCB_##_devcb); - -#define MCFG_TC0510NIO_READ_2_CB(_devcb) \ - devcb = &downcast<tc0510nio_device &>(*device).set_read_2_callback(DEVCB_##_devcb); - -#define MCFG_TC0510NIO_READ_3_CB(_devcb) \ - devcb = &downcast<tc0510nio_device &>(*device).set_read_3_callback(DEVCB_##_devcb); - -#define MCFG_TC0510NIO_WRITE_3_CB(_devcb) \ - devcb = &downcast<tc0510nio_device &>(*device).set_write_3_callback(DEVCB_##_devcb); - -#define MCFG_TC0510NIO_WRITE_4_CB(_devcb) \ - devcb = &downcast<tc0510nio_device &>(*device).set_write_4_callback(DEVCB_##_devcb); - -#define MCFG_TC0510NIO_READ_7_CB(_devcb) \ - devcb = &downcast<tc0510nio_device &>(*device).set_read_7_callback(DEVCB_##_devcb); - - -#define MCFG_TC0640FIO_READ_0_CB(_devcb) \ - devcb = &downcast<tc0640fio_device &>(*device).set_read_0_callback(DEVCB_##_devcb); - -#define MCFG_TC0640FIO_READ_1_CB(_devcb) \ - devcb = &downcast<tc0640fio_device &>(*device).set_read_1_callback(DEVCB_##_devcb); - -#define MCFG_TC0640FIO_READ_2_CB(_devcb) \ - devcb = &downcast<tc0640fio_device &>(*device).set_read_2_callback(DEVCB_##_devcb); - -#define MCFG_TC0640FIO_READ_3_CB(_devcb) \ - devcb = &downcast<tc0640fio_device &>(*device).set_read_3_callback(DEVCB_##_devcb); - -#define MCFG_TC0640FIO_WRITE_4_CB(_devcb) \ - devcb = &downcast<tc0640fio_device &>(*device).set_write_4_callback(DEVCB_##_devcb); - -#define MCFG_TC0640FIO_READ_7_CB(_devcb) \ - devcb = &downcast<tc0640fio_device &>(*device).set_read_7_callback(DEVCB_##_devcb); - - #endif // MAME_MACHINE_TAITOIO_H |