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/cpu/vtlb.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/cpu/vtlb.c')
-rw-r--r-- | src/emu/cpu/vtlb.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/emu/cpu/vtlb.c b/src/emu/cpu/vtlb.c index 80a5b9109f7..7cec6b3a90e 100644 --- a/src/emu/cpu/vtlb.c +++ b/src/emu/cpu/vtlb.c @@ -59,7 +59,7 @@ vtlb_state *vtlb_alloc(device_t *cpu, address_spacenum space, int fixed_entries, vtlb_state *vtlb; /* allocate memory for the core structure */ - vtlb = auto_alloc_clear(cpu->machine, vtlb_state); + vtlb = auto_alloc_clear(cpu->machine(), vtlb_state); /* fill in CPU information */ vtlb->cpudevice = downcast<cpu_device *>(cpu); @@ -76,17 +76,17 @@ vtlb_state *vtlb_alloc(device_t *cpu, address_spacenum space, int fixed_entries, assert(vtlb->addrwidth > vtlb->pageshift); /* allocate the entry array */ - vtlb->live = auto_alloc_array_clear(cpu->machine, offs_t, fixed_entries + dynamic_entries); + vtlb->live = auto_alloc_array_clear(cpu->machine(), offs_t, fixed_entries + dynamic_entries); cpu->save_pointer(NAME(vtlb->live), fixed_entries + dynamic_entries, space); /* allocate the lookup table */ - vtlb->table = auto_alloc_array_clear(cpu->machine, vtlb_entry, (size_t) 1 << (vtlb->addrwidth - vtlb->pageshift)); + vtlb->table = auto_alloc_array_clear(cpu->machine(), vtlb_entry, (size_t) 1 << (vtlb->addrwidth - vtlb->pageshift)); cpu->save_pointer(NAME(vtlb->table), 1 << (vtlb->addrwidth - vtlb->pageshift), space); /* allocate the fixed page count array */ if (fixed_entries > 0) { - vtlb->fixedpages = auto_alloc_array_clear(cpu->machine, int, fixed_entries); + vtlb->fixedpages = auto_alloc_array_clear(cpu->machine(), int, fixed_entries); cpu->save_pointer(NAME(vtlb->fixedpages), fixed_entries, space); } return vtlb; @@ -101,16 +101,16 @@ void vtlb_free(vtlb_state *vtlb) { /* free the fixed pages if allocated */ if (vtlb->fixedpages != NULL) - auto_free(vtlb->cpudevice->machine, vtlb->fixedpages); + auto_free(vtlb->cpudevice->machine(), vtlb->fixedpages); /* free the table and array if they exist */ if (vtlb->live != NULL) - auto_free(vtlb->cpudevice->machine, vtlb->live); + auto_free(vtlb->cpudevice->machine(), vtlb->live); if (vtlb->table != NULL) - auto_free(vtlb->cpudevice->machine, vtlb->table); + auto_free(vtlb->cpudevice->machine(), vtlb->table); /* and then the VTLB object itself */ - auto_free(vtlb->cpudevice->machine, vtlb); + auto_free(vtlb->cpudevice->machine(), vtlb); } |