diff options
author | 2011-03-29 15:50:04 +0000 | |
---|---|---|
committer | 2011-03-29 15:50:04 +0000 | |
commit | 2ad50720237fdd19cf5ab45b8cb6bb21119c00b8 (patch) | |
tree | db21eee69668a06abc3f310ebbd51f5dbadf2de7 /src/emu/machine/timekpr.c | |
parent | b72cf3c5702b749c7bf26383ff05a9ab55022d31 (diff) |
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 *)
Diffstat (limited to 'src/emu/machine/timekpr.c')
-rw-r--r-- | src/emu/machine/timekpr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c index 2cce3bc68eb..79bd13627ca 100644 --- a/src/emu/machine/timekpr.c +++ b/src/emu/machine/timekpr.c @@ -62,7 +62,7 @@ #define TIMEKPR_DEVCFG_DERIVED_DEV_ALLOC(devtype) \ device_t *devtype##_device_config::alloc_device(running_machine &machine) const \ - { return auto_alloc(&machine, devtype##_device(machine, *this)); } + { return auto_alloc(machine, devtype##_device(machine, *this)); } #define TIMEKPR_DERIVE(devtype, name, shortname) \ TIMEKPR_DEV_DERIVED_CTOR(devtype) \ @@ -104,7 +104,7 @@ device_config *timekeeper_device_config::static_alloc_device_config(const machin device_t *timekeeper_device_config::alloc_device(running_machine &machine) const { - return auto_alloc(&machine, timekeeper_device(machine, *this)); + return auto_alloc(machine, timekeeper_device(machine, *this)); } /*************************************************************************** @@ -211,7 +211,7 @@ void timekeeper_device::device_start() m_month = make_bcd( systime.local_time.month + 1 ); m_year = make_bcd( systime.local_time.year % 100 ); m_century = make_bcd( systime.local_time.year / 100 ); - m_data = auto_alloc_array( &m_machine, UINT8, m_size ); + m_data = auto_alloc_array( m_machine, UINT8, m_size ); m_default_data = *region(); if (m_default_data) |