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/romload.h | |
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/romload.h')
-rw-r--r-- | src/emu/romload.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/romload.h b/src/emu/romload.h index 68d842d1613..65451683ec7 100644 --- a/src/emu/romload.h +++ b/src/emu/romload.h @@ -266,13 +266,13 @@ struct rom_entry /* ----- ROM processing ----- */ /* load the ROMs and open the disk images associated with the given machine */ -void rom_init(running_machine *machine); +void rom_init(running_machine &machine); /* return the number of warnings we generated */ -int rom_load_warnings(running_machine *machine); +int rom_load_warnings(running_machine &machine); /* return the number of BAD_DUMP/NO_DUMP warnings we generated */ -int rom_load_knownbad(running_machine *machine); +int rom_load_knownbad(running_machine &machine); /* ----- Helpers ----- */ @@ -318,7 +318,7 @@ astring &rom_region_name(astring &result, const game_driver *drv, const rom_sour chd_error open_disk_image(emu_options &options, const game_driver *gamedrv, const rom_entry *romp, emu_file **image_file, chd_file **image_chd,const char *locationtag); /* return a pointer to the CHD file associated with the given region */ -chd_file *get_disk_handle(running_machine *machine, const char *region); +chd_file *get_disk_handle(running_machine &machine, const char *region); /* set a pointer to the CHD file associated with the given region */ void set_disk_handle(running_machine &machine, const char *region, emu_file &file, chd_file &chdfile); |