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/cclimber.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/cclimber.cpp')
-rw-r--r-- | src/mame/drivers/cclimber.cpp | 62 |
1 files changed, 30 insertions, 32 deletions
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp index ebd5258c9c1..2ecfd8f9d03 100644 --- a/src/mame/drivers/cclimber.cpp +++ b/src/mame/drivers/cclimber.cpp @@ -1138,56 +1138,55 @@ MACHINE_CONFIG_START(cclimber_state::root) MACHINE_CONFIG_END -MACHINE_CONFIG_START(cclimber_state::cclimber) +void cclimber_state::cclimber(machine_config &config) +{ root(config); - MCFG_DEVICE_MODIFY("mainlatch") // 7J on CCG-1 - MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(WRITELINE("cclimber_audio", cclimber_audio_device, sample_trigger)) + + // 7J on CCG-1 + m_mainlatch->q_out_cb<4>().set("cclimber_audio", FUNC(cclimber_audio_device::sample_trigger)); /* sound hardware */ SPEAKER(config, "speaker").front_center(); - MCFG_DEVICE_ADD("cclimber_audio", CCLIMBER_AUDIO, 0) -MACHINE_CONFIG_END + CCLIMBER_AUDIO(config, "cclimber_audio", 0); +} -MACHINE_CONFIG_START(cclimber_state::cclimberx) +void cclimber_state::cclimberx(machine_config &config) +{ cclimber(config); - MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map) -MACHINE_CONFIG_END + m_maincpu->set_addrmap(AS_OPCODES, &cclimber_state::decrypted_opcodes_map); +} -MACHINE_CONFIG_START(cclimber_state::ckongb) +void cclimber_state::ckongb(machine_config &config) +{ cclimber(config); - MCFG_DEVICE_MODIFY("mainlatch") - MCFG_ADDRESSABLE_LATCH_Q3_OUT_CB(WRITELINE(*this, cclimber_state, nmi_mask_w)) //used by Crazy Kong Bootleg with alt levels and speed up -MACHINE_CONFIG_END + m_mainlatch->q_out_cb<3>().set(FUNC(cclimber_state::nmi_mask_w)); //used by Crazy Kong Bootleg with alt levels and speed up +} MACHINE_CONFIG_START(cclimber_state::cannonb) cclimber(config); /* basic machine hardware */ - MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_PROGRAM_MAP(cannonb_map) + m_maincpu->set_addrmap(AS_PROGRAM, &cclimber_state::cannonb_map); - MCFG_DEVICE_MODIFY("mainlatch") - MCFG_ADDRESSABLE_LATCH_Q1_OUT_CB(WRITELINE(*this, cclimber_state, flip_screen_x_w)) - MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE(*this, cclimber_state, flip_screen_y_w)) - MCFG_ADDRESSABLE_LATCH_Q2_OUT_CB(NOOP) // not used + m_mainlatch->q_out_cb<1>().set(FUNC(cclimber_state::flip_screen_x_w)); + m_mainlatch->q_out_cb<1>().append(FUNC(cclimber_state::flip_screen_y_w)); + m_mainlatch->q_out_cb<2>().set_nop(); // not used /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_cannonb) MACHINE_CONFIG_END -MACHINE_CONFIG_START(cclimber_state::bagmanf) +void cclimber_state::bagmanf(machine_config &config) +{ cclimber(config); /* basic machine hardware */ - MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_PROGRAM_MAP(bagmanf_map) + m_maincpu->set_addrmap(AS_PROGRAM, &cclimber_state::bagmanf_map); - MCFG_DEVICE_MODIFY("screen") - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, cclimber_state, bagmanf_vblank_irq)) -MACHINE_CONFIG_END + subdevice<screen_device>("screen")->screen_vblank().set(FUNC(cclimber_state::bagmanf_vblank_irq)); +} MACHINE_CONFIG_START(cclimber_state::yamato) @@ -1233,9 +1232,8 @@ MACHINE_CONFIG_START(cclimber_state::toprollr) MCFG_SEGACRPT_SET_NUMBANKS(3) MCFG_SEGACRPT_SET_BANKSIZE(0x6000) - MCFG_DEVICE_MODIFY("mainlatch") - MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, cclimber_state, toprollr_rombank_w)) - MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, cclimber_state, toprollr_rombank_w)) + m_mainlatch->q_out_cb<5>().set(FUNC(cclimber_state::toprollr_rombank_w)); + m_mainlatch->q_out_cb<6>().set(FUNC(cclimber_state::toprollr_rombank_w)); /* video hardware */ MCFG_GFXDECODE_MODIFY("gfxdecode", gfx_toprollr) @@ -1295,12 +1293,12 @@ MACHINE_CONFIG_START(cclimber_state::swimmer) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.25) MACHINE_CONFIG_END -MACHINE_CONFIG_START(cclimber_state::guzzler) +void cclimber_state::guzzler(machine_config &config) +{ swimmer(config); /* basic machine hardware */ - MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_PROGRAM_MAP(guzzler_map) -MACHINE_CONFIG_END + m_maincpu->set_addrmap(AS_PROGRAM, &cclimber_state::guzzler_map); +} /*************************************************************************** |