From 2ad50720237fdd19cf5ab45b8cb6bb21119c00b8 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Tue, 29 Mar 2011 15:50:04 +0000 Subject: BIG update. Remove redundant machine items from address_space and device_t. Neither machine nor m_machine are directly accessible anymore. Instead a new getter machine() is available which returns a machine reference. So: space->machine->xxx ==> space->machine().xxx device->machine->yyy ==> device->machine().yyy Globally changed all running_machine pointers to running_machine references. Any function/method that takes a running_machine takes it as a required parameter (1 or 2 exceptions). Being consistent here gets rid of a lot of odd &machine or *machine, but it does mean a very large bulk change across the project. Structs which have a running_machine * now have that variable renamed to m_machine, and now have a shiny new machine() method that works like the space and device methods above. Since most of these are things that should eventually be devices anyway, consider this a step in that direction. 98% of the update was done with regex searches. The changes are architected such that the compiler will catch the remaining errors: // find things that use an embedded machine directly and replace // with a machine() getter call S: ->machine-> R: ->machine\(\)\. // do the same if via a reference S: \.machine-> R: \.machine\(\)\. // convert function parameters to running_machine & S: running_machine \*machine([^;]) R: running_machine \&machine\1 // replace machine-> with machine. S: machine-> R: machine\. // replace &machine() with machine() S: \&([()->a-z0-9_]+machine\(\)) R: \1 // sanity check: look for this used as a cast (running_machine &) // and change to this: *(running_machine *) --- src/mame/drivers/tigeroad.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mame/drivers/tigeroad.c') diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c index 5a123e6e3d5..91ad5e6e5f7 100644 --- a/src/mame/drivers/tigeroad.c +++ b/src/mame/drivers/tigeroad.c @@ -81,7 +81,7 @@ static const int f1dream_2450_lookup[32] = { static void f1dream_protection_w(address_space *space) { - tigeroad_state *state = space->machine->driver_data(); + tigeroad_state *state = space->machine().driver_data(); int indx; int value = 255; int prevpc = cpu_get_previouspc(space->cpu); @@ -145,7 +145,7 @@ static void f1dream_protection_w(address_space *space) static WRITE16_HANDLER( f1dream_control_w ) { - tigeroad_state *state = space->machine->driver_data(); + tigeroad_state *state = space->machine().driver_data(); logerror("protection write, PC: %04x FFE1 Value:%01x\n",cpu_get_pc(space->cpu), state->ram16[0x3fe0/2]); f1dream_protection_w(space); } @@ -495,7 +495,7 @@ GFXDECODE_END /* handler called by the 2203 emulator when the internal timers cause an IRQ */ static void irqhandler(device_t *device, int irq) { - cputag_set_input_line(device->machine, "audiocpu", 0, irq ? ASSERT_LINE : CLEAR_LINE); + cputag_set_input_line(device->machine(), "audiocpu", 0, irq ? ASSERT_LINE : CLEAR_LINE); } static const ym2203_interface ym2203_config = @@ -766,12 +766,12 @@ ROM_END static DRIVER_INIT( tigeroad ) { - machine->device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfe4002, 0xfe4003, FUNC(tigeroad_soundcmd_w)); + machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfe4002, 0xfe4003, FUNC(tigeroad_soundcmd_w)); } static DRIVER_INIT( f1dream ) { - machine->device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfe4002, 0xfe4003, FUNC(f1dream_control_w)); + machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfe4002, 0xfe4003, FUNC(f1dream_control_w)); } -- cgit v1.2.3