summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/cidelsa.cpp
diff options
context:
space:
mode:
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
commitc3fb11c2c98a5c28ece6a27093a0f9def350ac64 (patch)
treec68b38f05ed1d32358add721fda7f45e8803479f /src/mame/drivers/cidelsa.cpp
parent5d9e33b786d7ef452317439359f3cbd8cc920513 (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/drivers/cidelsa.cpp')
-rw-r--r--src/mame/drivers/cidelsa.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/drivers/cidelsa.cpp b/src/mame/drivers/cidelsa.cpp
index 09337876144..5a9cb6a0ff0 100644
--- a/src/mame/drivers/cidelsa.cpp
+++ b/src/mame/drivers/cidelsa.cpp
@@ -405,7 +405,7 @@ MACHINE_CONFIG_START(cidelsa_state::destryer)
MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1)
MCFG_DEVICE_PROGRAM_MAP(destryer_map)
MCFG_DEVICE_IO_MAP(destryer_io_map)
- MCFG_COSMAC_WAIT_CALLBACK(VCC)
+ MCFG_COSMAC_WAIT_CALLBACK(CONSTANT(1))
MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, cidelsa_state, clear_r))
MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, cidelsa_state, q_w))
@@ -420,7 +420,7 @@ MACHINE_CONFIG_START(cidelsa_state::destryera)
MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, DESTRYER_CHR1)
MCFG_DEVICE_PROGRAM_MAP(destryera_map)
MCFG_DEVICE_IO_MAP(destryer_io_map)
- MCFG_COSMAC_WAIT_CALLBACK(VCC)
+ MCFG_COSMAC_WAIT_CALLBACK(CONSTANT(1))
MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, cidelsa_state, clear_r))
MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, cidelsa_state, q_w))
@@ -435,7 +435,7 @@ MACHINE_CONFIG_START(cidelsa_state::altair)
MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, ALTAIR_CHR1)
MCFG_DEVICE_PROGRAM_MAP(altair_map)
MCFG_DEVICE_IO_MAP(altair_io_map)
- MCFG_COSMAC_WAIT_CALLBACK(VCC)
+ MCFG_COSMAC_WAIT_CALLBACK(CONSTANT(1))
MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, cidelsa_state, clear_r))
MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, cidelsa_state, q_w))
@@ -443,16 +443,16 @@ MACHINE_CONFIG_START(cidelsa_state::altair)
/* input/output hardware */
MCFG_DEVICE_ADD("ic23", CDP1852, 0) // clock is really tied to CDP1869 CMSEL (pin 37)
- MCFG_CDP1852_MODE_CALLBACK(GND)
+ MCFG_CDP1852_MODE_CALLBACK(CONSTANT(0))
MCFG_CDP1852_DI_CALLBACK(IOPORT("IN0"))
MCFG_DEVICE_ADD("ic24", CDP1852, 0)
- MCFG_CDP1852_MODE_CALLBACK(GND)
+ MCFG_CDP1852_MODE_CALLBACK(CONSTANT(0))
MCFG_CDP1852_DI_CALLBACK(IOPORT("IN1"))
MCFG_DEVICE_ADD("ic25", CDP1852, 0)
- MCFG_CDP1852_MODE_CALLBACK(GND)
+ MCFG_CDP1852_MODE_CALLBACK(CONSTANT(0))
MCFG_CDP1852_DI_CALLBACK(IOPORT("IN2"))
MCFG_DEVICE_ADD("ic26", CDP1852, ALTAIR_CHR1 / 8) // clock is CDP1802 TPB
- MCFG_CDP1852_MODE_CALLBACK(VCC)
+ MCFG_CDP1852_MODE_CALLBACK(CONSTANT(1))
MCFG_CDP1852_DO_CALLBACK(WRITE8(*this, cidelsa_state, altair_out1_w))
/* sound and video hardware */
@@ -464,7 +464,7 @@ MACHINE_CONFIG_START(draco_state::draco)
MCFG_DEVICE_ADD(CDP1802_TAG, CDP1802, DRACO_CHR1)
MCFG_DEVICE_PROGRAM_MAP(draco_map)
MCFG_DEVICE_IO_MAP(draco_io_map)
- MCFG_COSMAC_WAIT_CALLBACK(VCC)
+ MCFG_COSMAC_WAIT_CALLBACK(CONSTANT(1))
MCFG_COSMAC_CLEAR_CALLBACK(READLINE(*this, cidelsa_state, clear_r))
MCFG_COSMAC_Q_CALLBACK(WRITELINE(*this, cidelsa_state, q_w))
@@ -481,16 +481,16 @@ MACHINE_CONFIG_START(draco_state::draco)
/* input/output hardware */
MCFG_DEVICE_ADD("ic29", CDP1852, 0) // clock is really tied to CDP1869 CMSEL (pin 37)
- MCFG_CDP1852_MODE_CALLBACK(GND)
+ MCFG_CDP1852_MODE_CALLBACK(CONSTANT(0))
MCFG_CDP1852_DI_CALLBACK(IOPORT("IN0"))
MCFG_DEVICE_ADD("ic30", CDP1852, 0)
- MCFG_CDP1852_MODE_CALLBACK(GND)
+ MCFG_CDP1852_MODE_CALLBACK(CONSTANT(0))
MCFG_CDP1852_DI_CALLBACK(IOPORT("IN1"))
MCFG_DEVICE_ADD("ic31", CDP1852, 0)
- MCFG_CDP1852_MODE_CALLBACK(GND)
+ MCFG_CDP1852_MODE_CALLBACK(CONSTANT(0))
MCFG_CDP1852_DI_CALLBACK(IOPORT("IN2"))
MCFG_DEVICE_ADD("ic32", CDP1852, ALTAIR_CHR1 / 8) // clock is CDP1802 TPB
- MCFG_CDP1852_MODE_CALLBACK(VCC)
+ MCFG_CDP1852_MODE_CALLBACK(CONSTANT(1))
MCFG_CDP1852_DO_CALLBACK(WRITE8(*this, draco_state, out1_w))
/* sound and video hardware */