diff options
author | 2018-07-07 02:40:29 +1000 | |
---|---|---|
committer | 2018-07-07 02:40:29 +1000 | |
commit | c3fb11c2c98a5c28ece6a27093a0f9def350ac64 (patch) | |
tree | c68b38f05ed1d32358add721fda7f45e8803479f /src/devices/bus/pet/user.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/devices/bus/pet/user.h')
-rw-r--r-- | src/devices/bus/pet/user.h | 57 |
1 files changed, 38 insertions, 19 deletions
diff --git a/src/devices/bus/pet/user.h b/src/devices/bus/pet/user.h index 651e121a2fa..71e1c19e799 100644 --- a/src/devices/bus/pet/user.h +++ b/src/devices/bus/pet/user.h @@ -28,61 +28,61 @@ #define MCFG_PET_USER_PORT_2_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_2_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_2_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_3_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_3_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_3_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_4_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_4_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_4_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_5_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_5_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_5_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_6_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_6_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_6_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_7_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_7_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_7_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_8_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_8_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_8_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_9_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_9_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_9_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_10_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_10_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_10_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_B_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_b_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_b_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_C_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_c_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_c_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_D_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_d_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_d_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_E_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_e_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_e_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_F_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_f_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_f_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_H_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_h_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_h_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_J_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_j_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_j_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_K_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_k_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_k_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_L_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_l_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_l_handler(DEVCB_##_devcb); #define MCFG_PET_USER_PORT_M_HANDLER(_devcb) \ - devcb = &downcast<pet_user_port_device &>(*device).set_m_handler(DEVCB_##_devcb); + downcast<pet_user_port_device &>(*device).set_m_handler(DEVCB_##_devcb); DECLARE_DEVICE_TYPE(PET_USER_PORT, pet_user_port_device) @@ -125,6 +125,25 @@ public: template <class Object> devcb_base &set_k_handler(Object &&cb) { return m_k_handler.set_callback(std::forward<Object>(cb)); } template <class Object> devcb_base &set_l_handler(Object &&cb) { return m_l_handler.set_callback(std::forward<Object>(cb)); } template <class Object> devcb_base &set_m_handler(Object &&cb) { return m_m_handler.set_callback(std::forward<Object>(cb)); } + auto p2_handler() { return m_2_handler.bind(); } + auto p3_handler() { return m_3_handler.bind(); } + auto p4_handler() { return m_4_handler.bind(); } + auto p5_handler() { return m_5_handler.bind(); } + auto p6_handler() { return m_6_handler.bind(); } + auto p7_handler() { return m_7_handler.bind(); } + auto p8_handler() { return m_8_handler.bind(); } + auto p9_handler() { return m_9_handler.bind(); } + auto p10_handler() { return m_10_handler.bind(); } + auto pb_handler() { return m_b_handler.bind(); } + auto pc_handler() { return m_c_handler.bind(); } + auto pd_handler() { return m_d_handler.bind(); } + auto pe_handler() { return m_e_handler.bind(); } + auto pf_handler() { return m_f_handler.bind(); } + auto ph_handler() { return m_h_handler.bind(); } + auto pj_handler() { return m_j_handler.bind(); } + auto pk_handler() { return m_k_handler.bind(); } + auto pl_handler() { return m_l_handler.bind(); } + auto pm_handler() { return m_m_handler.bind(); } DECLARE_WRITE_LINE_MEMBER( write_2 ); DECLARE_WRITE_LINE_MEMBER( write_3 ); |