Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-24 06:30:04 +03:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Remove some straggling const address_space references, and get rid of

Browse Source 
explicit const_casts in memory.h.
This commit is contained in:
Aaron Giles 2011-03-17 07:47:05 +00:00
parent 2b47d0d5a4
commit 916b52e865
5 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emu/cpu/pps4/pps4.c
View File

@ -35,10 +35,10 @@ struct _pps4_state
UINT8 FF2; // Flip-flop 2
legacy_cpu_device *device;
const address_space *program;
address_space *program;
direct_read_data *direct;
const address_space *data;
const address_space *io;
address_space *data;
address_space *io;
int icount;
};

2
src/emu/machine/s3c2400.c
View File

@ -45,7 +45,7 @@ SCREEN_UPDATE( s3c2400 )
DEVICE_START( s3c2400 )
{
const address_space *space = cputag_get_address_space( device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
address_space *space = cputag_get_address_space( device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
DEVICE_START_CALL(s3c24xx);
memory_install_readwrite32_device_handler( space, device, 0x14000000, 0x1400003b, 0, 0, s3c24xx_memcon_r, s3c24xx_memcon_w);
memory_install_readwrite32_device_handler( space, device, 0x14200000, 0x1420005b, 0, 0, s3c24xx_usb_host_r, s3c24xx_usb_host_w);

2
src/emu/machine/s3c2410.c
View File

@ -45,7 +45,7 @@ SCREEN_UPDATE( s3c2410 )
DEVICE_START( s3c2410 )
{
const address_space *space = cputag_get_address_space( device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
address_space *space = cputag_get_address_space( device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
DEVICE_START_CALL(s3c24xx);
memory_install_readwrite32_device_handler( space, device, 0x48000000, 0x4800003b, 0, 0, s3c24xx_memcon_r, s3c24xx_memcon_w);
memory_install_readwrite32_device_handler( space, device, 0x49000000, 0x4900005b, 0, 0, s3c24xx_usb_host_r, s3c24xx_usb_host_w);

2
src/emu/machine/s3c2440.c
View File

@ -45,7 +45,7 @@ SCREEN_UPDATE( s3c2440 )
DEVICE_START( s3c2440 )
{
const address_space *space = cputag_get_address_space( device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
address_space *space = cputag_get_address_space( device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_install_readwrite32_device_handler( space, device, 0x48000000, 0x4800003b, 0, 0, s3c24xx_memcon_r, s3c24xx_memcon_w);
memory_install_readwrite32_device_handler( space, device, 0x49000000, 0x4900005b, 0, 0, s3c24xx_usb_host_r, s3c24xx_usb_host_w);
memory_install_readwrite32_device_handler( space, device, 0x4a000000, 0x4a00001f, 0, 0, s3c24xx_irq_r, s3c24xx_irq_w);

80
src/emu/memory.h
View File

@ -351,7 +351,7 @@ public:
int spacenum() const { return m_spacenum; }
address_map *map() const { return m_map; }
direct_read_data &direct() const { return const_cast<direct_read_data &>(m_direct); }
direct_read_data &direct() const { return m_direct; }
int data_width() const { return m_config.data_width(); }
int addr_width() const { return m_config.addr_width(); }
@ -620,93 +620,93 @@ protected:
// wrappers for dynamic read handler installation
#define memory_install_read8_handler(space, start, end, mask, mirror, rhandler) \
const_cast<address_space *>(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler)
(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler)
#define memory_install_read16_handler(space, start, end, mask, mirror, rhandler) \
const_cast<address_space *>(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler)
(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler)
#define memory_install_read32_handler(space, start, end, mask, mirror, rhandler) \
const_cast<address_space *>(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler)
(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler)
#define memory_install_read64_handler(space, start, end, mask, mirror, rhandler) \
const_cast<address_space *>(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler)
(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler)
#define memory_install_read8_device_handler(space, device, start, end, mask, mirror, rhandler) \
const_cast<address_space *>(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler)
(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler)
#define memory_install_read16_device_handler(space, device, start, end, mask, mirror, rhandler) \
const_cast<address_space *>(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler)
(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler)
#define memory_install_read32_device_handler(space, device, start, end, mask, mirror, rhandler) \
const_cast<address_space *>(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler)
(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler)
#define memory_install_read64_device_handler(space, device, start, end, mask, mirror, rhandler) \
const_cast<address_space *>(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler)
(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler)
#define memory_install_read_port(space, start, end, mask, mirror, rtag) \
const_cast<address_space *>(space)->install_port(start, end, mask, mirror, rtag, NULL)
(space)->install_port(start, end, mask, mirror, rtag, NULL)
#define memory_install_read_bank(space, start, end, mask, mirror, rtag) \
const_cast<address_space *>(space)->install_bank(start, end, mask, mirror, rtag, NULL)
(space)->install_bank(start, end, mask, mirror, rtag, NULL)
#define memory_install_rom(space, start, end, mask, mirror, baseptr) \
const_cast<address_space *>(space)->install_ram(start, end, mask, mirror, ROW_READ, baseptr)
(space)->install_ram(start, end, mask, mirror, ROW_READ, baseptr)
#define memory_unmap_read(space, start, end, mask, mirror) \
const_cast<address_space *>(space)->unmap(start, end, mask, mirror, ROW_READ, false)
(space)->unmap(start, end, mask, mirror, ROW_READ, false)
#define memory_nop_read(space, start, end, mask, mirror) \
const_cast<address_space *>(space)->unmap(start, end, mask, mirror, ROW_READ, true)
(space)->unmap(start, end, mask, mirror, ROW_READ, true)
// wrappers for dynamic write handler installation
#define memory_install_write8_handler(space, start, end, mask, mirror, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(start, end, mask, mirror, whandler, #whandler)
(space)->install_legacy_handler(start, end, mask, mirror, whandler, #whandler)
#define memory_install_write16_handler(space, start, end, mask, mirror, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(start, end, mask, mirror, whandler, #whandler)
(space)->install_legacy_handler(start, end, mask, mirror, whandler, #whandler)
#define memory_install_write32_handler(space, start, end, mask, mirror, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(start, end, mask, mirror, whandler, #whandler)
(space)->install_legacy_handler(start, end, mask, mirror, whandler, #whandler)
#define memory_install_write64_handler(space, start, end, mask, mirror, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(start, end, mask, mirror, whandler, #whandler)
(space)->install_legacy_handler(start, end, mask, mirror, whandler, #whandler)
#define memory_install_write8_device_handler(space, device, start, end, mask, mirror, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(*(device), start, end, mask, mirror, whandler, #whandler)
(space)->install_legacy_handler(*(device), start, end, mask, mirror, whandler, #whandler)
#define memory_install_write16_device_handler(space, device, start, end, mask, mirror, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(*(device), start, end, mask, mirror, whandler, #whandler)
(space)->install_legacy_handler(*(device), start, end, mask, mirror, whandler, #whandler)
#define memory_install_write32_device_handler(space, device, start, end, mask, mirror, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(*(device), start, end, mask, mirror, whandler, #whandler)
(space)->install_legacy_handler(*(device), start, end, mask, mirror, whandler, #whandler)
#define memory_install_write64_device_handler(space, device, start, end, mask, mirror, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(*(device), start, end, mask, mirror, whandler, #whandler)
(space)->install_legacy_handler(*(device), start, end, mask, mirror, whandler, #whandler)
#define memory_install_write_port(space, start, end, mask, mirror, wtag) \
const_cast<address_space *>(space)->install_port(start, end, mask, mirror, NULL, wtag)
(space)->install_port(start, end, mask, mirror, NULL, wtag)
#define memory_install_write_bank(space, start, end, mask, mirror, wtag) \
const_cast<address_space *>(space)->install_bank(start, end, mask, mirror, NULL, wtag)
(space)->install_bank(start, end, mask, mirror, NULL, wtag)
#define memory_install_writeonly(space, start, end, mask, mirror, baseptr) \
const_cast<address_space *>(space)->install_ram(start, end, mask, mirror, ROW_WRITE, baseptr)
(space)->install_ram(start, end, mask, mirror, ROW_WRITE, baseptr)
#define memory_unmap_write(space, start, end, mask, mirror) \
const_cast<address_space *>(space)->unmap(start, end, mask, mirror, ROW_WRITE, false)
(space)->unmap(start, end, mask, mirror, ROW_WRITE, false)
#define memory_nop_write(space, start, end, mask, mirror) \
const_cast<address_space *>(space)->unmap(start, end, mask, mirror, ROW_WRITE, true)
(space)->unmap(start, end, mask, mirror, ROW_WRITE, true)
// wrappers for dynamic read/write handler installation
#define memory_install_readwrite8_handler(space, start, end, mask, mirror, rhandler, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
#define memory_install_readwrite16_handler(space, start, end, mask, mirror, rhandler, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
#define memory_install_readwrite32_handler(space, start, end, mask, mirror, rhandler, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
#define memory_install_readwrite64_handler(space, start, end, mask, mirror, rhandler, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
(space)->install_legacy_handler(start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
#define memory_install_readwrite8_device_handler(space, device, start, end, mask, mirror, rhandler, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
#define memory_install_readwrite16_device_handler(space, device, start, end, mask, mirror, rhandler, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
#define memory_install_readwrite32_device_handler(space, device, start, end, mask, mirror, rhandler, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
#define memory_install_readwrite64_device_handler(space, device, start, end, mask, mirror, rhandler, whandler) \
const_cast<address_space *>(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
(space)->install_legacy_handler(*(device), start, end, mask, mirror, rhandler, #rhandler, whandler, #whandler)
#define memory_install_readwrite_port(space, start, end, mask, mirror, rtag, wtag) \
const_cast<address_space *>(space)->install_port(start, end, mask, mirror, rtag, wtag)
(space)->install_port(start, end, mask, mirror, rtag, wtag)
#define memory_install_readwrite_bank(space, start, end, mask, mirror, tag) \
const_cast<address_space *>(space)->install_bank(start, end, mask, mirror, tag, tag)
(space)->install_bank(start, end, mask, mirror, tag, tag)
#define memory_install_ram(space, start, end, mask, mirror, baseptr) \
const_cast<address_space *>(space)->install_ram(start, end, mask, mirror, ROW_READWRITE, baseptr)
(space)->install_ram(start, end, mask, mirror, ROW_READWRITE, baseptr)
#define memory_unmap_readwrite(space, start, end, mask, mirror) \
const_cast<address_space *>(space)->unmap(start, end, mask, mirror, ROW_READWRITE, false)
(space)->unmap(start, end, mask, mirror, ROW_READWRITE, false)
#define memory_nop_readwrite(space, start, end, mask, mirror) \
const_cast<address_space *>(space)->unmap(start, end, mask, mirror, ROW_READWRITE, true)
(space)->unmap(start, end, mask, mirror, ROW_READWRITE, true)