From b8d8a898129e39546f8d8b0febdedf2c8e8a21d9 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Thu, 10 Nov 2016 09:21:56 +0100 Subject: [PATCH] addrmap: Dotify [O. Galibert] --- src/emu/addrmap.cpp | 66 +++++++------- src/emu/addrmap.h | 158 +++++++++++++++++----------------- src/mame/drivers/tranz330.cpp | 20 ++--- 3 files changed, 122 insertions(+), 122 deletions(-) diff --git a/src/emu/addrmap.cpp b/src/emu/addrmap.cpp index 5a24b98ee8e..4672f8bb59f 100644 --- a/src/emu/addrmap.cpp +++ b/src/emu/addrmap.cpp @@ -65,12 +65,12 @@ address_map_entry::address_map_entry(device_t &device, address_map &map, offs_t // set_mask - set the mask value //------------------------------------------------- -address_map_entry *address_map_entry::set_mask(offs_t _mask) +address_map_entry &address_map_entry::set_mask(offs_t _mask) { m_addrmask = _mask; if (m_map.m_globalmask != 0) m_addrmask &= m_map.m_globalmask; - return this; + return *this; } @@ -79,7 +79,7 @@ address_map_entry *address_map_entry::set_mask(offs_t _mask) // retrieve a submap from a device //------------------------------------------------- -address_map_entry *address_map_entry::set_submap(const char *tag, address_map_delegate func, int bits, uint64_t mask) +address_map_entry &address_map_entry::set_submap(const char *tag, address_map_delegate func, int bits, uint64_t mask) { if(!bits) bits = m_map.m_databits; @@ -94,7 +94,7 @@ address_map_entry *address_map_entry::set_submap(const char *tag, address_map_de m_write.m_mask = mask; m_submap_delegate = func; m_submap_bits = bits; - return this; + return *this; } @@ -103,7 +103,7 @@ address_map_entry *address_map_entry::set_submap(const char *tag, address_map_de // 8-bit read/write handlers //------------------------------------------------- -address_map_entry *address_map_entry::set_handler(read8_delegate func, uint64_t unitmask) +address_map_entry &address_map_entry::set_handler(read8_delegate func, uint64_t unitmask) { assert(!func.isnull()); assert(unitmask_is_appropriate(8, unitmask, func.name())); @@ -112,11 +112,11 @@ address_map_entry *address_map_entry::set_handler(read8_delegate func, uint64_t m_read.m_mask = unitmask; m_read.m_name = func.name(); m_rproto8 = func; - return this; + return *this; } -address_map_entry *address_map_entry::set_handler(write8_delegate func, uint64_t unitmask) +address_map_entry &address_map_entry::set_handler(write8_delegate func, uint64_t unitmask) { assert(!func.isnull()); assert(unitmask_is_appropriate(8, unitmask, func.name())); @@ -125,15 +125,15 @@ address_map_entry *address_map_entry::set_handler(write8_delegate func, uint64_t m_write.m_mask = unitmask; m_write.m_name = func.name(); m_wproto8 = func; - return this; + return *this; } -address_map_entry *address_map_entry::set_handler(read8_delegate rfunc, write8_delegate wfunc, uint64_t unitmask) +address_map_entry &address_map_entry::set_handler(read8_delegate rfunc, write8_delegate wfunc, uint64_t unitmask) { set_handler(rfunc, unitmask); set_handler(wfunc, unitmask); - return this; + return *this; } @@ -142,7 +142,7 @@ address_map_entry *address_map_entry::set_handler(read8_delegate rfunc, write8_d // 16-bit read/write handlers //------------------------------------------------- -address_map_entry *address_map_entry::set_handler(read16_delegate func, uint64_t unitmask) +address_map_entry &address_map_entry::set_handler(read16_delegate func, uint64_t unitmask) { assert(!func.isnull()); assert(unitmask_is_appropriate(16, unitmask, func.name())); @@ -151,11 +151,11 @@ address_map_entry *address_map_entry::set_handler(read16_delegate func, uint64_t m_read.m_mask = unitmask; m_read.m_name = func.name(); m_rproto16 = func; - return this; + return *this; } -address_map_entry *address_map_entry::set_handler(write16_delegate func, uint64_t unitmask) +address_map_entry &address_map_entry::set_handler(write16_delegate func, uint64_t unitmask) { assert(!func.isnull()); assert(unitmask_is_appropriate(16, unitmask, func.name())); @@ -164,15 +164,15 @@ address_map_entry *address_map_entry::set_handler(write16_delegate func, uint64_ m_write.m_mask = unitmask; m_write.m_name = func.name(); m_wproto16 = func; - return this; + return *this; } -address_map_entry *address_map_entry::set_handler(read16_delegate rfunc, write16_delegate wfunc, uint64_t unitmask) +address_map_entry &address_map_entry::set_handler(read16_delegate rfunc, write16_delegate wfunc, uint64_t unitmask) { set_handler(rfunc, unitmask); set_handler(wfunc, unitmask); - return this; + return *this; } @@ -181,7 +181,7 @@ address_map_entry *address_map_entry::set_handler(read16_delegate rfunc, write16 // 32-bit read/write handlers //------------------------------------------------- -address_map_entry *address_map_entry::set_handler(read32_delegate func, uint64_t unitmask) +address_map_entry &address_map_entry::set_handler(read32_delegate func, uint64_t unitmask) { assert(!func.isnull()); assert(unitmask_is_appropriate(32, unitmask, func.name())); @@ -190,11 +190,11 @@ address_map_entry *address_map_entry::set_handler(read32_delegate func, uint64_t m_read.m_mask = unitmask; m_read.m_name = func.name(); m_rproto32 = func; - return this; + return *this; } -address_map_entry *address_map_entry::set_handler(write32_delegate func, uint64_t unitmask) +address_map_entry &address_map_entry::set_handler(write32_delegate func, uint64_t unitmask) { assert(!func.isnull()); assert(unitmask_is_appropriate(32, unitmask, func.name())); @@ -203,15 +203,15 @@ address_map_entry *address_map_entry::set_handler(write32_delegate func, uint64_ m_write.m_mask = unitmask; m_write.m_name = func.name(); m_wproto32 = func; - return this; + return *this; } -address_map_entry *address_map_entry::set_handler(read32_delegate rfunc, write32_delegate wfunc, uint64_t unitmask) +address_map_entry &address_map_entry::set_handler(read32_delegate rfunc, write32_delegate wfunc, uint64_t unitmask) { set_handler(rfunc, unitmask); set_handler(wfunc, unitmask); - return this; + return *this; } @@ -220,7 +220,7 @@ address_map_entry *address_map_entry::set_handler(read32_delegate rfunc, write32 // 64-bit read/write handlers //------------------------------------------------- -address_map_entry *address_map_entry::set_handler(read64_delegate func, uint64_t unitmask) +address_map_entry &address_map_entry::set_handler(read64_delegate func, uint64_t unitmask) { assert(!func.isnull()); assert(unitmask_is_appropriate(64, unitmask, func.name())); @@ -229,11 +229,11 @@ address_map_entry *address_map_entry::set_handler(read64_delegate func, uint64_t m_read.m_mask = 0; m_read.m_name = func.name(); m_rproto64 = func; - return this; + return *this; } -address_map_entry *address_map_entry::set_handler(write64_delegate func, uint64_t unitmask) +address_map_entry &address_map_entry::set_handler(write64_delegate func, uint64_t unitmask) { assert(!func.isnull()); assert(unitmask_is_appropriate(64, unitmask, func.name())); @@ -242,15 +242,15 @@ address_map_entry *address_map_entry::set_handler(write64_delegate func, uint64_ m_write.m_mask = 0; m_write.m_name = func.name(); m_wproto64 = func; - return this; + return *this; } -address_map_entry *address_map_entry::set_handler(read64_delegate rfunc, write64_delegate wfunc, uint64_t unitmask) +address_map_entry &address_map_entry::set_handler(read64_delegate rfunc, write64_delegate wfunc, uint64_t unitmask) { set_handler(rfunc, unitmask); set_handler(wfunc, unitmask); - return this; + return *this; } @@ -258,7 +258,7 @@ address_map_entry *address_map_entry::set_handler(read64_delegate rfunc, write64 // set_handler - handler setter for setoffset //------------------------------------------------- -address_map_entry *address_map_entry::set_handler(setoffset_delegate func) +address_map_entry &address_map_entry::set_handler(setoffset_delegate func) { assert(!func.isnull()); m_setoffsethd.m_type = AMH_DEVICE_DELEGATE; @@ -266,7 +266,7 @@ address_map_entry *address_map_entry::set_handler(setoffset_delegate func) m_setoffsethd.m_mask = 0; m_setoffsethd.m_name = func.name(); m_soproto = func; - return this; + return *this; } //------------------------------------------------- @@ -380,7 +380,7 @@ address_map::address_map(const address_space &space, offs_t start, offs_t end, i m_unmapval(space.unmap()), m_globalmask(space.bytemask()) { - add(start, end)->set_submap(DEVICE_SELF, submap_delegate, bits, unitmask); + add(start, end).set_submap(DEVICE_SELF, submap_delegate, bits, unitmask); } @@ -427,11 +427,11 @@ void address_map::set_global_mask(offs_t mask) // add - add a new entry //------------------------------------------------- -address_map_entry *address_map::add(offs_t start, offs_t end) +address_map_entry &address_map::add(offs_t start, offs_t end) { address_map_entry *ptr = global_alloc(address_map_entry(*m_device, *this, start, end)); m_entrylist.append(*ptr); - return ptr; + return *ptr; } diff --git a/src/emu/addrmap.h b/src/emu/addrmap.h index cb6d05e1ced..a2467838c90 100644 --- a/src/emu/addrmap.h +++ b/src/emu/addrmap.h @@ -80,31 +80,31 @@ public: address_map_entry *next() const { return m_next; } // simple inline setters - address_map_entry *set_mirror(offs_t _mirror) { m_addrmirror = _mirror; return this; } - address_map_entry *set_select(offs_t _select) { m_addrselect = _select; return this; } - address_map_entry *set_read_type(map_handler_type _type) { m_read.m_type = _type; return this; } - address_map_entry *set_write_type(map_handler_type _type) { m_write.m_type = _type; return this; } - address_map_entry *set_region(const char *tag, offs_t offset) { m_region = tag; m_rgnoffs = offset; return this; } - address_map_entry *set_share(const char *tag) { m_share = tag; return this; } + address_map_entry &set_mirror(offs_t _mirror) { m_addrmirror = _mirror; return *this; } + address_map_entry &set_select(offs_t _select) { m_addrselect = _select; return *this; } + address_map_entry &set_read_type(map_handler_type _type) { m_read.m_type = _type; return *this; } + address_map_entry &set_write_type(map_handler_type _type) { m_write.m_type = _type; return *this; } + address_map_entry &set_region(const char *tag, offs_t offset) { m_region = tag; m_rgnoffs = offset; return *this; } + address_map_entry &set_share(const char *tag) { m_share = tag; return *this; } // mask setting - address_map_entry *set_mask(offs_t _mask); + address_map_entry &set_mask(offs_t _mask); // I/O port configuration - address_map_entry *set_read_port(const char *tag) { m_read.m_type = AMH_PORT; m_read.m_tag = tag; return this; } - address_map_entry *set_write_port(const char *tag) { m_write.m_type = AMH_PORT; m_write.m_tag = tag; return this; } - address_map_entry *set_readwrite_port(const char *tag) { set_read_port(tag); set_write_port(tag); return this; } + address_map_entry &set_read_port(const char *tag) { m_read.m_type = AMH_PORT; m_read.m_tag = tag; return *this; } + address_map_entry &set_write_port(const char *tag) { m_write.m_type = AMH_PORT; m_write.m_tag = tag; return *this; } + address_map_entry &set_readwrite_port(const char *tag) { set_read_port(tag); set_write_port(tag); return *this; } // memory bank configuration - address_map_entry *set_read_bank(const char *tag) { m_read.m_type = AMH_BANK; m_read.m_tag = tag; return this; } - address_map_entry *set_write_bank(const char *tag) { m_write.m_type = AMH_BANK; m_write.m_tag = tag; return this; } - address_map_entry *set_readwrite_bank(const char *tag) { set_read_bank(tag); set_write_bank(tag); return this; } + address_map_entry &set_read_bank(const char *tag) { m_read.m_type = AMH_BANK; m_read.m_tag = tag; return *this; } + address_map_entry &set_write_bank(const char *tag) { m_write.m_type = AMH_BANK; m_write.m_tag = tag; return *this; } + address_map_entry &set_readwrite_bank(const char *tag) { set_read_bank(tag); set_write_bank(tag); return *this; } // set offset handler (only one version, since there is no data width to consider) - address_map_entry *set_handler(setoffset_delegate func); + address_map_entry &set_handler(setoffset_delegate func); // submap referencing - address_map_entry *set_submap(const char *tag, address_map_delegate func, int bits, uint64_t mask); + address_map_entry &set_submap(const char *tag, address_map_delegate func, int bits, uint64_t mask); // public state address_map_entry * m_next; // pointer to the next entry @@ -146,24 +146,24 @@ public: offs_t m_bytemask; // byte-adjusted mask bits // handler setters for 8-bit functions - address_map_entry *set_handler(read8_delegate func, uint64_t mask = 0); - address_map_entry *set_handler(write8_delegate func, uint64_t mask = 0); - address_map_entry *set_handler(read8_delegate rfunc, write8_delegate wfunc, uint64_t mask = 0); + address_map_entry &set_handler(read8_delegate func, uint64_t mask = 0); + address_map_entry &set_handler(write8_delegate func, uint64_t mask = 0); + address_map_entry &set_handler(read8_delegate rfunc, write8_delegate wfunc, uint64_t mask = 0); // handler setters for 16-bit functions - address_map_entry *set_handler(read16_delegate func, uint64_t mask = 0); - address_map_entry *set_handler(write16_delegate func, uint64_t mask = 0); - address_map_entry *set_handler(read16_delegate rfunc, write16_delegate wfunc, uint64_t mask = 0); + address_map_entry &set_handler(read16_delegate func, uint64_t mask = 0); + address_map_entry &set_handler(write16_delegate func, uint64_t mask = 0); + address_map_entry &set_handler(read16_delegate rfunc, write16_delegate wfunc, uint64_t mask = 0); // handler setters for 32-bit functions - address_map_entry *set_handler(read32_delegate func, uint64_t mask = 0); - address_map_entry *set_handler(write32_delegate func, uint64_t mask = 0); - address_map_entry *set_handler(read32_delegate rfunc, write32_delegate wfunc, uint64_t mask = 0); + address_map_entry &set_handler(read32_delegate func, uint64_t mask = 0); + address_map_entry &set_handler(write32_delegate func, uint64_t mask = 0); + address_map_entry &set_handler(read32_delegate rfunc, write32_delegate wfunc, uint64_t mask = 0); // handler setters for 64-bit functions - address_map_entry *set_handler(read64_delegate func, uint64_t mask = 0); - address_map_entry *set_handler(write64_delegate func, uint64_t mask = 0); - address_map_entry *set_handler(read64_delegate rfunc, write64_delegate wfunc, uint64_t mask = 0); + address_map_entry &set_handler(read64_delegate func, uint64_t mask = 0); + address_map_entry &set_handler(write64_delegate func, uint64_t mask = 0); + address_map_entry &set_handler(read64_delegate rfunc, write64_delegate wfunc, uint64_t mask = 0); private: // helper functions @@ -190,7 +190,7 @@ public: void set_unmap_value(uint8_t value) { m_unmapval = value; } // add a new entry of the given type - address_map_entry *add(offs_t start, offs_t end); + address_map_entry &add(offs_t start, offs_t end); // public data address_spacenum m_spacenum; // space number of the map @@ -261,135 +261,135 @@ void _class :: _name(::address_map &map) \ #define AM_RANGE(_start, _end) \ ;map.add(_start, _end) #define AM_MASK(_mask) \ - ->set_mask(_mask) + .set_mask(_mask) #define AM_MIRROR(_mirror) \ - ->set_mirror(_mirror) + .set_mirror(_mirror) #define AM_SELECT(_select) \ - ->set_select(_select) + .set_select(_select) // driver data reads #define AM_READ(_handler) \ - ->set_handler(read_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr)) + .set_handler(read_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr)) #define AM_READ8(_handler, _unitmask) \ - ->set_handler(read8_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) + .set_handler(read8_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) #define AM_READ16(_handler, _unitmask) \ - ->set_handler(read16_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) + .set_handler(read16_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) #define AM_READ32(_handler, _unitmask) \ - ->set_handler(read32_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) + .set_handler(read32_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) // driver data writes #define AM_WRITE(_handler) \ - ->set_handler(write_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr)) + .set_handler(write_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr)) #define AM_WRITE8(_handler, _unitmask) \ - ->set_handler(write8_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) + .set_handler(write8_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) #define AM_WRITE16(_handler, _unitmask) \ - ->set_handler(write16_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) + .set_handler(write16_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) #define AM_WRITE32(_handler, _unitmask) \ - ->set_handler(write32_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) + .set_handler(write32_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) // driver data reads/writes #define AM_READWRITE(_rhandler, _whandler) \ - ->set_handler(read_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)nullptr), write_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)nullptr)) + .set_handler(read_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)nullptr), write_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)nullptr)) #define AM_READWRITE8(_rhandler, _whandler, _unitmask) \ - ->set_handler(read8_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)nullptr), write8_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) + .set_handler(read8_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)nullptr), write8_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) #define AM_READWRITE16(_rhandler, _whandler, _unitmask) \ - ->set_handler(read16_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)nullptr), write16_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) + .set_handler(read16_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)nullptr), write16_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) #define AM_READWRITE32(_rhandler, _whandler, _unitmask) \ - ->set_handler(read32_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)nullptr), write32_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) + .set_handler(read32_delegate(&drivdata_class::_rhandler, "driver_data::" #_rhandler, DEVICE_SELF, (drivdata_class *)nullptr), write32_delegate(&drivdata_class::_whandler, "driver_data::" #_whandler, DEVICE_SELF, (drivdata_class *)nullptr), _unitmask) // driver set offset. Upcast to base class because there are no data width variants, // and the compiler complains if we don't do it explicitly #define AM_SETOFFSET(_handler) \ - ->set_handler(setoffset_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr)) + .set_handler(setoffset_delegate(&drivdata_class::_handler, "driver_data::" #_handler, DEVICE_SELF, (drivdata_class *)nullptr)) // device reads #define AM_DEVREAD(_tag, _class, _handler) \ - ->set_handler(read_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr)) + .set_handler(read_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr)) #define AM_DEVREAD8(_tag, _class, _handler, _unitmask) \ - ->set_handler(read8_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr), _unitmask) + .set_handler(read8_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr), _unitmask) #define AM_DEVREAD16(_tag, _class, _handler, _unitmask) \ - ->set_handler(read16_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr), _unitmask) + .set_handler(read16_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr), _unitmask) #define AM_DEVREAD32(_tag, _class, _handler, _unitmask) \ - ->set_handler(read32_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr), _unitmask) + .set_handler(read32_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr), _unitmask) // device writes #define AM_DEVWRITE(_tag, _class, _handler) \ - ->set_handler(write_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr)) + .set_handler(write_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr)) #define AM_DEVWRITE8(_tag, _class, _handler, _unitmask) \ - ->set_handler(write8_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr), _unitmask) + .set_handler(write8_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr), _unitmask) #define AM_DEVWRITE16(_tag, _class, _handler, _unitmask) \ - ->set_handler(write16_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr), _unitmask) + .set_handler(write16_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr), _unitmask) #define AM_DEVWRITE32(_tag, _class, _handler, _unitmask) \ - ->set_handler(write32_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr), _unitmask) + .set_handler(write32_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr), _unitmask) // device reads/writes #define AM_DEVREADWRITE(_tag, _class, _rhandler, _whandler) \ - ->set_handler(read_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)nullptr), write_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)nullptr)) + .set_handler(read_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)nullptr), write_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)nullptr)) #define AM_DEVREADWRITE8(_tag, _class, _rhandler, _whandler, _unitmask) \ - ->set_handler(read8_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)nullptr), write8_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)nullptr), _unitmask) + .set_handler(read8_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)nullptr), write8_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)nullptr), _unitmask) #define AM_DEVREADWRITE16(_tag, _class, _rhandler, _whandler, _unitmask) \ - ->set_handler(read16_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)nullptr), write16_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)nullptr), _unitmask) + .set_handler(read16_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)nullptr), write16_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)nullptr), _unitmask) #define AM_DEVREADWRITE32(_tag, _class, _rhandler, _whandler, _unitmask) \ - ->set_handler(read32_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)nullptr), write32_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)nullptr), _unitmask) + .set_handler(read32_delegate(&_class::_rhandler, #_class "::" #_rhandler, _tag, (_class *)nullptr), write32_delegate(&_class::_whandler, #_class "::" #_whandler, _tag, (_class *)nullptr), _unitmask) // device set offset #define AM_DEVSETOFFSET(_tag, _class, _handler) \ - ->set_handler(setoffset_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr)) + .set_handler(setoffset_delegate(&_class::_handler, #_class "::" #_handler, _tag, (_class *)nullptr)) // device mapping #define AM_DEVICE(_tag, _class, _handler) \ - ->set_submap(_tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)nullptr), 0, 0) + .set_submap(_tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)nullptr), 0, 0) #define AM_DEVICE8(_tag, _class, _handler, _unitmask) \ - ->set_submap(_tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)nullptr), 8, _unitmask) + .set_submap(_tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)nullptr), 8, _unitmask) #define AM_DEVICE16(_tag, _class, _handler, _unitmask) \ - ->set_submap(_tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)nullptr), 16, _unitmask) + .set_submap(_tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)nullptr), 16, _unitmask) #define AM_DEVICE32(_tag, _class, _handler, _unitmask) \ - ->set_submap(_tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)nullptr), 32, _unitmask) + .set_submap(_tag, address_map_delegate(&_class::_handler, #_class "::" #_handler, (_class *)nullptr), 32, _unitmask) // special-case accesses #define AM_ROM \ - ->set_read_type(AMH_ROM) + .set_read_type(AMH_ROM) #define AM_RAM \ - ->set_read_type(AMH_RAM)->set_write_type(AMH_RAM) + .set_read_type(AMH_RAM).set_write_type(AMH_RAM) #define AM_READONLY \ - ->set_read_type(AMH_RAM) + .set_read_type(AMH_RAM) #define AM_WRITEONLY \ - ->set_write_type(AMH_RAM) + .set_write_type(AMH_RAM) #define AM_UNMAP \ - ->set_read_type(AMH_UNMAP)->set_write_type(AMH_UNMAP) + .set_read_type(AMH_UNMAP).set_write_type(AMH_UNMAP) #define AM_READUNMAP \ - ->set_read_type(AMH_UNMAP) + .set_read_type(AMH_UNMAP) #define AM_WRITEUNMAP \ - ->set_write_type(AMH_UNMAP) + .set_write_type(AMH_UNMAP) #define AM_NOP \ - ->set_read_type(AMH_NOP)->set_write_type(AMH_NOP) + .set_read_type(AMH_NOP).set_write_type(AMH_NOP) #define AM_READNOP \ - ->set_read_type(AMH_NOP) + .set_read_type(AMH_NOP) #define AM_WRITENOP \ - ->set_write_type(AMH_NOP) + .set_write_type(AMH_NOP) // port accesses #define AM_READ_PORT(_tag) \ - ->set_read_port(_tag) + .set_read_port(_tag) #define AM_WRITE_PORT(_tag) \ - ->set_write_port(_tag) + .set_write_port(_tag) #define AM_READWRITE_PORT(_tag) \ - ->set_readwrite_port(_tag) + .set_readwrite_port(_tag) // bank accesses #define AM_READ_BANK(_tag) \ - ->set_read_bank(_tag) + .set_read_bank(_tag) #define AM_WRITE_BANK(_tag) \ - ->set_write_bank(_tag) + .set_write_bank(_tag) #define AM_READWRITE_BANK(_tag) \ - ->set_readwrite_bank(_tag) + .set_readwrite_bank(_tag) // attributes for accesses #define AM_REGION(_tag, _offs) \ - ->set_region(_tag, _offs) + .set_region(_tag, _offs) #define AM_SHARE(_tag) \ - ->set_share(_tag) + .set_share(_tag) // common shortcuts #define AM_ROMBANK(_bank) AM_READ_BANK(_bank) diff --git a/src/mame/drivers/tranz330.cpp b/src/mame/drivers/tranz330.cpp index 1228b707a62..f6e1bbcc8f3 100644 --- a/src/mame/drivers/tranz330.cpp +++ b/src/mame/drivers/tranz330.cpp @@ -27,8 +27,8 @@ static void construct_address_map_tranz330_mem(address_map &map) { map.configure(AS_PROGRAM, 8); - map.add(0x0000, 0x7fff)->set_read_type(AMH_ROM); - map.add(0x8000, 0xffff)->set_read_type(AMH_RAM)->set_write_type(AMH_RAM); + map.add(0x0000, 0x7fff).set_read_type(AMH_ROM); + map.add(0x8000, 0xffff).set_read_type(AMH_RAM).set_write_type(AMH_RAM); } static void construct_address_map_tranz330_io(address_map &map) @@ -36,17 +36,17 @@ static void construct_address_map_tranz330_io(address_map &map) map.configure(AS_IO, 8); map.set_global_mask(0xff); - map.add(0x00, 0x03)->set_handler(read8_delegate(&z80pio_device::read_alt, "z80pio_device::read_alt", PIO_TAG, (z80pio_device *)nullptr), - write8_delegate(&z80pio_device::write_alt, "z80pio_device::write_alt", PIO_TAG, (z80pio_device *)nullptr)); + map.add(0x00, 0x03).set_handler(read8_delegate(&z80pio_device::read_alt, "z80pio_device::read_alt", PIO_TAG, (z80pio_device *)nullptr), + write8_delegate(&z80pio_device::write_alt, "z80pio_device::write_alt", PIO_TAG, (z80pio_device *)nullptr)); - map.add(0x10, 0x13)->set_handler(read8_delegate(&z80ctc_device::read, "z80ctc_device::read", CTC_TAG, (z80ctc_device *)nullptr), - write8_delegate(&z80ctc_device::write, "z80ctc_device::write", CTC_TAG, (z80ctc_device *)nullptr)); + map.add(0x10, 0x13).set_handler(read8_delegate(&z80ctc_device::read, "z80ctc_device::read", CTC_TAG, (z80ctc_device *)nullptr), + write8_delegate(&z80ctc_device::write, "z80ctc_device::write", CTC_TAG, (z80ctc_device *)nullptr)); - map.add(0x20, 0x23)->set_handler(read8_delegate(&z80dart_device::ba_cd_r, "z80dart_device::ba_cd_r", DART_TAG, (z80dart_device *)nullptr), - write8_delegate(&z80dart_device::ba_cd_w, "z80dart_device::ba_cd_w", DART_TAG, (z80dart_device *)nullptr)); + map.add(0x20, 0x23).set_handler(read8_delegate(&z80dart_device::ba_cd_r, "z80dart_device::ba_cd_r", DART_TAG, (z80dart_device *)nullptr), + write8_delegate(&z80dart_device::ba_cd_w, "z80dart_device::ba_cd_w", DART_TAG, (z80dart_device *)nullptr)); - map.add(0x30, 0x3f)->set_handler(read8_delegate(&msm6242_device::read, "msm6242_device::read", RTC_TAG, (msm6242_device *)nullptr), - write8_delegate(&msm6242_device::write, "msm6242_device::write", RTC_TAG, (msm6242_device *)nullptr)); + map.add(0x30, 0x3f).set_handler(read8_delegate(&msm6242_device::read, "msm6242_device::read", RTC_TAG, (msm6242_device *)nullptr), + write8_delegate(&msm6242_device::write, "msm6242_device::write", RTC_TAG, (msm6242_device *)nullptr)); } static void construct_ioport_tranz330(device_t &owner, ioport_list &portlist, std::string &errorbuf)