From c3fb11c2c98a5c28ece6a27093a0f9def350ac64 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 7 Jul 2018 02:40:29 +1000 Subject: 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. --- src/mame/drivers/playch10.cpp | 52 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'src/mame/drivers/playch10.cpp') diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp index e4766016db5..5c1106e2b8d 100644 --- a/src/mame/drivers/playch10.cpp +++ b/src/mame/drivers/playch10.cpp @@ -646,27 +646,27 @@ WRITE_LINE_MEMBER(playch10_state::vblank_irq) MACHINE_CONFIG_START(playch10_state::playch10) // basic machine hardware - MCFG_DEVICE_ADD("maincpu", Z80, 8000000/2) // 4 MHz - MCFG_DEVICE_PROGRAM_MAP(bios_map) - MCFG_DEVICE_IO_MAP(bios_io_map) - - MCFG_DEVICE_ADD("cart", N2A03, NTSC_APU_CLOCK) - MCFG_DEVICE_PROGRAM_MAP(cart_map) - - MCFG_DEVICE_ADD("outlatch1", LS259, 0) // 7D - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, playch10_state, sdcs_w)) - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, playch10_state, cntrl_mask_w)) - MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, playch10_state, disp_mask_w)) - MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, playch10_state, sound_mask_w)) - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(INPUTLINE("cart", INPUT_LINE_RESET)) MCFG_DEVCB_INVERT // GAMERES - MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(INPUTLINE("cart", INPUT_LINE_HALT)) MCFG_DEVCB_INVERT // GAMESTOP - - MCFG_DEVICE_ADD("outlatch2", LS259, 0) // 7E - MCFG_ADDRESSABLE_LATCH_Q0_OUT_CB(WRITELINE(*this, playch10_state, nmi_enable_w)) - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, playch10_state, dog_di_w)) - MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(WRITELINE(*this, playch10_state, ppu_reset_w)) - MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, playch10_state, up8w_w)) - MCFG_ADDRESSABLE_LATCH_PARALLEL_OUT_CB(WRITE8(*this, playch10_state, cart_sel_w)) MCFG_DEVCB_MASK(0x78) MCFG_DEVCB_RSHIFT(-3) + Z80(config, m_maincpu, 8000000/2); // 4 MHz + m_maincpu->set_addrmap(AS_PROGRAM, &playch10_state::bios_map); + m_maincpu->set_addrmap(AS_IO, &playch10_state::bios_io_map); + + N2A03(config, m_cartcpu, NTSC_APU_CLOCK); + m_cartcpu->set_addrmap(AS_PROGRAM, &playch10_state::cart_map); + + ls259_device &outlatch1(LS259(config, "outlatch1")); // 7D + outlatch1.q_out_cb<0>().set(FUNC(playch10_state::sdcs_w)); + outlatch1.q_out_cb<1>().set(FUNC(playch10_state::cntrl_mask_w)); + outlatch1.q_out_cb<2>().set(FUNC(playch10_state::disp_mask_w)); + outlatch1.q_out_cb<3>().set(FUNC(playch10_state::sound_mask_w)); + outlatch1.q_out_cb<4>().set_inputline(m_cartcpu, INPUT_LINE_RESET).invert(); // GAMERES + outlatch1.q_out_cb<5>().set_inputline(m_cartcpu, INPUT_LINE_HALT).invert(); // GAMESTOP + + ls259_device &outlatch2(LS259(config, "outlatch2")); // 7E + outlatch2.q_out_cb<0>().set(FUNC(playch10_state::nmi_enable_w)); + outlatch2.q_out_cb<1>().set(FUNC(playch10_state::dog_di_w)); + outlatch2.q_out_cb<2>().set(FUNC(playch10_state::ppu_reset_w)); + outlatch2.q_out_cb<7>().set(FUNC(playch10_state::up8w_w)); + outlatch2.parallel_out_cb().set(FUNC(playch10_state::cart_sel_w)).rshift(3).mask(0x0f); // video hardware MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_playch10) @@ -687,11 +687,11 @@ MACHINE_CONFIG_START(playch10_state::playch10) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) MCFG_SCREEN_UPDATE_DRIVER(playch10_state, screen_update_playch10_bottom) - MCFG_PPU2C03B_ADD("ppu") - MCFG_PPU2C0X_SET_SCREEN("bottom") - MCFG_PPU2C0X_CPU("cart") - MCFG_PPU2C0X_INT_CALLBACK(INPUTLINE("cart", INPUT_LINE_NMI)) - MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, playch10_state, int_detect_w)) + PPU_2C03B(config, m_ppu, 0); + m_ppu->set_screen("bottom"); + m_ppu->set_cpu_tag("cart"); + m_ppu->int_callback().set_inputline(m_cartcpu, INPUT_LINE_NMI); + m_ppu->int_callback().append(FUNC(playch10_state::int_detect_w)); SPEAKER(config, "mono").front_center(); -- cgit v1.2.3