diff options
author | 2012-09-19 19:48:09 +0000 | |
---|---|---|
committer | 2012-09-19 19:48:09 +0000 | |
commit | 621ac620ae1ca743a66bb52aaf5478da01c3bac6 (patch) | |
tree | 2743a87e9077417af7546970d1ea1cc3b8781a63 /src/mess/machine/genpc.c | |
parent | 33c77e65bbd4513957f2ece623cee476cf439248 (diff) |
Since nobody checks for NULLs anyway, make
device_memory_interface::space() assert against NULL and
return a reference, and pushed references throughout all
address space usage in the system. Added a has_space()
method to check for those rare case when it is ambiguous.
[Aaron Giles]
Also reinstated the generic space and added fatal error
handlers if anyone tries to actually read/write from it.
Diffstat (limited to 'src/mess/machine/genpc.c')
-rw-r--r-- | src/mess/machine/genpc.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mess/machine/genpc.c b/src/mess/machine/genpc.c index 57b4f972244..3c1408a3b90 100644 --- a/src/mess/machine/genpc.c +++ b/src/mess/machine/genpc.c @@ -71,9 +71,9 @@ READ8_MEMBER( ibm5160_mb_device::pc_dma_read_byte ) { if(m_dma_channel == -1) return 0xff; - address_space *spaceio = m_maincpu->space(AS_PROGRAM); + address_space &spaceio = m_maincpu->space(AS_PROGRAM); offs_t page_offset = (((offs_t) m_dma_offset[m_dma_channel]) << 16) & 0x0F0000; - return spaceio->read_byte( page_offset + offset); + return spaceio.read_byte( page_offset + offset); } @@ -81,10 +81,10 @@ WRITE8_MEMBER( ibm5160_mb_device::pc_dma_write_byte ) { if(m_dma_channel == -1) return; - address_space *spaceio = m_maincpu->space(AS_PROGRAM); + address_space &spaceio = m_maincpu->space(AS_PROGRAM); offs_t page_offset = (((offs_t) m_dma_offset[m_dma_channel]) << 16) & 0x0F0000; - spaceio->write_byte( page_offset + offset, data); + spaceio.write_byte( page_offset + offset, data); } @@ -574,10 +574,10 @@ void ibm5160_mb_device::install_device(device_t *dev, offs_t start, offs_t end, switch(buswidth) { case 8: - m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0); + m_maincpu->space(AS_IO).install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0); break; case 16: - m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff); + m_maincpu->space(AS_IO).install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff); break; default: fatalerror("IBM5160_MOTHERBOARD: Bus width %d not supported\n", buswidth); @@ -591,10 +591,10 @@ void ibm5160_mb_device::install_device_write(device_t *dev, offs_t start, offs_t switch(buswidth) { case 8: - m_maincpu->space(AS_IO)->install_legacy_write_handler(*dev, start, end, mask, mirror, whandler, whandler_name,0); + m_maincpu->space(AS_IO).install_legacy_write_handler(*dev, start, end, mask, mirror, whandler, whandler_name,0); break; case 16: - m_maincpu->space(AS_IO)->install_legacy_write_handler(*dev, start, end, mask, mirror, whandler, whandler_name, 0xffff); + m_maincpu->space(AS_IO).install_legacy_write_handler(*dev, start, end, mask, mirror, whandler, whandler_name, 0xffff); break; default: fatalerror("IBM5160_MOTHERBOARD: Bus width %d not supported\n", buswidth); @@ -608,10 +608,10 @@ void ibm5160_mb_device::install_device(offs_t start, offs_t end, offs_t mask, of switch(buswidth) { case 8: - m_maincpu->space(AS_IO)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0); + m_maincpu->space(AS_IO).install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0); break; case 16: - m_maincpu->space(AS_IO)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffff); + m_maincpu->space(AS_IO).install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffff); break; default: fatalerror("IBM5160_MOTHERBOARD: Bus width %d not supported\n", buswidth); @@ -635,10 +635,10 @@ void ibm5160_mb_device::device_start() switch(buswidth) { case 8: - m_maincpu->space(AS_IO)->install_readwrite_handler(0x0060, 0x0063, 0, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi8255), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi8255), 0); + m_maincpu->space(AS_IO).install_readwrite_handler(0x0060, 0x0063, 0, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi8255), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi8255), 0); break; case 16: - m_maincpu->space(AS_IO)->install_readwrite_handler(0x0060, 0x0063, 0, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi8255), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi8255), 0xffff); + m_maincpu->space(AS_IO).install_readwrite_handler(0x0060, 0x0063, 0, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi8255), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi8255), 0xffff); break; default: fatalerror("IBM5160_MOTHERBOARD: Bus width %d not supported\n", buswidth); |