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/emu/machine/devhelpr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/emu/machine/devhelpr.h') diff --git a/src/emu/machine/devhelpr.h b/src/emu/machine/devhelpr.h index 8d35dc7a295..97ee11a08d4 100644 --- a/src/emu/machine/devhelpr.h +++ b/src/emu/machine/devhelpr.h @@ -47,7 +47,7 @@ { return global_alloc(devname##_device_config(mconfig, tag, owner, clock)); } \ \ device_t *devname##_device_config::alloc_device(running_machine &machine) const \ - { return auto_alloc(&machine, devname##_device(machine, *this)); } + { return auto_alloc(machine, devname##_device(machine, *this)); } #define GENERIC_DEVICE_DERIVED_CONFIG(basename, devname) \ class devname##_device_config : public basename##_device_config \ -- cgit v1.2.3-70-g09d2