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/drivers/dkong.cpp | |
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/drivers/dkong.cpp')
-rw-r--r-- | src/mame/drivers/dkong.cpp | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp index c0252f2cbdf..c8e760fb189 100644 --- a/src/mame/drivers/dkong.cpp +++ b/src/mame/drivers/dkong.cpp @@ -1695,7 +1695,7 @@ WRITE_LINE_MEMBER(dkong_state::busreq_w ) MACHINE_CONFIG_START(dkong_state::dkong_base) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, CLOCK_1H) + MCFG_DEVICE_ADD(m_maincpu, Z80, CLOCK_1H) MCFG_DEVICE_PROGRAM_MAP(dkong_map) MCFG_MACHINE_START_OVERRIDE(dkong_state,dkong2b) @@ -1710,7 +1710,7 @@ MACHINE_CONFIG_START(dkong_state::dkong_base) MCFG_I8257_REVERSE_RW_MODE(1) // why? /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_ADD(m_screen, RASTER) MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) MCFG_SCREEN_UPDATE_DRIVER(dkong_state, screen_update_dkong) MCFG_SCREEN_PALETTE("palette") @@ -1791,7 +1791,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dkong_state::dkong3) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(8'000'000) / 2) /* verified in schematics */ + MCFG_DEVICE_ADD(m_maincpu, Z80, XTAL(8'000'000) / 2) /* verified in schematics */ MCFG_DEVICE_PROGRAM_MAP(dkong3_map) MCFG_DEVICE_IO_MAP(dkong3_io_map) @@ -1803,13 +1803,13 @@ MACHINE_CONFIG_START(dkong_state::dkong3) MCFG_Z80DMA_OUT_MREQ_CB(WRITE8(*this, dkong_state, memory_write_byte)) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART) - MCFG_SCREEN_UPDATE_DRIVER(dkong_state, screen_update_dkong) - MCFG_SCREEN_PALETTE("palette") - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dkong_state, vblank_irq)) - MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("n2a03a", INPUT_LINE_NMI)) - MCFG_DEVCB_CHAIN_OUTPUT(INPUTLINE("n2a03b", INPUT_LINE_NMI)) + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART); + m_screen->set_screen_update(FUNC(dkong_state::screen_update_dkong)); + m_screen->set_palette(m_palette); + m_screen->screen_vblank().set(FUNC(dkong_state::vblank_irq)); + m_screen->screen_vblank().append_inputline(m_dev_n2a03a, INPUT_LINE_NMI); + m_screen->screen_vblank().append_inputline(m_dev_n2a03b, INPUT_LINE_NMI); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dkong) MCFG_PALETTE_ADD("palette", DK3_PALETTE_LENGTH) @@ -1839,8 +1839,7 @@ MACHINE_CONFIG_START(dkong_state::pestplce) /* video hardware */ MCFG_PALETTE_MODIFY("palette") MCFG_PALETTE_INIT_OWNER(dkong_state,dkong2b) /* wrong! */ - MCFG_SCREEN_MODIFY("screen") - MCFG_SCREEN_UPDATE_DRIVER(dkong_state, screen_update_pestplce) + m_screen->set_screen_update(FUNC(dkong_state::screen_update_pestplce)); MACHINE_CONFIG_END MACHINE_CONFIG_START(dkong_state::dkong3b) @@ -1861,15 +1860,14 @@ MACHINE_CONFIG_START(dkong_state::s2650) dkong2b(config); /* basic machine hardware */ - MCFG_DEVICE_REPLACE("maincpu", S2650, CLOCK_1H / 2) /* ??? */ + MCFG_DEVICE_REPLACE(m_maincpu, S2650, CLOCK_1H / 2) /* ??? */ MCFG_DEVICE_PROGRAM_MAP(s2650_map) MCFG_DEVICE_IO_MAP(s2650_io_map) MCFG_DEVICE_DATA_MAP(s2650_data_map) MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank)) MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, dkong_state, s2650_fo_w)) - MCFG_DEVICE_MODIFY("screen") - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, dkong_state, s2650_interrupt)) + m_screen->screen_vblank().set(FUNC(dkong_state::s2650_interrupt)); MCFG_DEVICE_MODIFY("dma8257") MCFG_I8257_IN_MEMR_CB(READ8(*this, dkong_state, hb_dma_read_byte)) @@ -1878,11 +1876,11 @@ MACHINE_CONFIG_START(dkong_state::s2650) MCFG_MACHINE_START_OVERRIDE(dkong_state,s2650) MACHINE_CONFIG_END -MACHINE_CONFIG_START(dkong_state::herbiedk) +void dkong_state::herbiedk(machine_config &config) +{ s2650(config); - MCFG_DEVICE_MODIFY("maincpu") - MCFG_S2650_SENSE_INPUT(READLINE("screen", screen_device, vblank)) MCFG_DEVCB_INVERT // ??? -MACHINE_CONFIG_END + downcast<s2650_device &>(*m_maincpu).sense_handler().set(m_screen, FUNC(screen_device::vblank)).invert(); // ??? +} MACHINE_CONFIG_START(dkong_state::spclforc) herbiedk(config); @@ -1891,8 +1889,7 @@ MACHINE_CONFIG_START(dkong_state::spclforc) MCFG_DEVICE_REMOVE("soundcpu") /* video hardware */ - MCFG_SCREEN_MODIFY("screen") - MCFG_SCREEN_UPDATE_DRIVER(dkong_state, screen_update_spclforc) + m_screen->set_screen_update(FUNC(dkong_state::screen_update_spclforc)); MACHINE_CONFIG_END /************************************* |