addrmap: Remove the now-unused macros [Vas Crabb, Robbbert]

This commit is contained in:
Olivier Galibert 2018-04-21 16:42:12 +02:00
parent 0c0e38ca58
commit 9ac8320ccc

View File

@ -512,166 +512,4 @@ public:
void map_validity_check(validity_checker &valid, int spacenum) const;
};
//**************************************************************************
// ADDRESS MAP MACROS
//**************************************************************************
#define ADDRESS_MAP_START(_name) void _name(address_map &map) {
#define ADDRESS_MAP_END ;}
// global controls
#define ADDRESS_MAP_GLOBAL_MASK(_mask) \
;map.global_mask(_mask)
#define ADDRESS_MAP_UNMAP_LOW \
;map.unmap_value_low()
#define ADDRESS_MAP_UNMAP_HIGH \
;map.unmap_value_high()
// importing data from other address maps
#define AM_IMPORT_FROM(_name) \
;_name(map)
// address ranges
#define AM_RANGE(_start, _end) \
;map(_start, _end)
#define AM_MASK(_mask) \
.mask(_mask)
#define AM_MIRROR(_mirror) \
.mirror(_mirror)
#define AM_SELECT(_select) \
.select(_select)
// driver data reads
#define AM_READ(_handler) \
.r(this, &std::remove_pointer_t<decltype(this)>::_handler, "driver_data::" #_handler)
#define AM_READ8(_handler, _unitmask) \
.r(this, &std::remove_pointer_t<decltype(this)>::_handler, "driver_data::" #_handler).umask64(_unitmask)
#define AM_READ16(_handler, _unitmask) \
.r(this, &std::remove_pointer_t<decltype(this)>::_handler, "driver_data::" #_handler).umask64(_unitmask)
#define AM_READ32(_handler, _unitmask) \
.r(this, &std::remove_pointer_t<decltype(this)>::_handler, "driver_data::" #_handler).umask64(_unitmask)
// driver data writes
#define AM_WRITE(_handler) \
.w(this, &std::remove_pointer_t<decltype(this)>::_handler, "driver_data::" #_handler)
#define AM_WRITE8(_handler, _unitmask) \
.w(this, &std::remove_pointer_t<decltype(this)>::_handler, "driver_data::" #_handler).umask64(_unitmask)
#define AM_WRITE16(_handler, _unitmask) \
.w(this, &std::remove_pointer_t<decltype(this)>::_handler, "driver_data::" #_handler).umask64(_unitmask)
#define AM_WRITE32(_handler, _unitmask) \
.w(this, &std::remove_pointer_t<decltype(this)>::_handler, "driver_data::" #_handler).umask64(_unitmask)
// driver data reads/writes
#define AM_READWRITE(_rhandler, _whandler) \
.rw(this, &std::remove_pointer_t<decltype(this)>::_rhandler, "driver_data::" #_rhandler, &std::remove_pointer_t<decltype(this)>::_whandler, "driver_data::" #_whandler)
#define AM_READWRITE8(_rhandler, _whandler, _unitmask) \
.rw(this, &std::remove_pointer_t<decltype(this)>::_rhandler, "driver_data::" #_rhandler, &std::remove_pointer_t<decltype(this)>::_whandler, "driver_data::" #_whandler).umask64(_unitmask)
#define AM_READWRITE16(_rhandler, _whandler, _unitmask) \
.rw(this, &std::remove_pointer_t<decltype(this)>::_rhandler, "driver_data::" #_rhandler, &std::remove_pointer_t<decltype(this)>::_whandler, "driver_data::" #_whandler).umask64(_unitmask)
#define AM_READWRITE32(_rhandler, _whandler, _unitmask) \
.rw(this, &std::remove_pointer_t<decltype(this)>::_rhandler, "driver_data::" #_rhandler, &std::remove_pointer_t<decltype(this)>::_whandler, "driver_data::" #_whandler).umask64(_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) \
.setoffset(this, &std::remove_pointer_t<decltype(this)>::_handler, "driver_data::" #_handler)
// device reads
#define AM_DEVREAD(_tag, _class, _handler) \
.r(_tag, &_class::_handler, #_class "::" #_handler)
#define AM_DEVREAD8(_tag, _class, _handler, _unitmask) \
.r(_tag, &_class::_handler, #_class "::" #_handler).umask64(_unitmask)
#define AM_DEVREAD16(_tag, _class, _handler, _unitmask) \
.r(_tag, &_class::_handler, #_class "::" #_handler).umask64(_unitmask)
#define AM_DEVREAD32(_tag, _class, _handler, _unitmask) \
.r(_tag, &_class::_handler, #_class "::" #_handler).umask64(_unitmask)
// device writes
#define AM_DEVWRITE(_tag, _class, _handler) \
.w(_tag, &_class::_handler, #_class "::" #_handler)
#define AM_DEVWRITE8(_tag, _class, _handler, _unitmask) \
.w(_tag, &_class::_handler, #_class "::" #_handler).umask64(_unitmask)
#define AM_DEVWRITE16(_tag, _class, _handler, _unitmask) \
.w(_tag, &_class::_handler, #_class "::" #_handler).umask64(_unitmask)
#define AM_DEVWRITE32(_tag, _class, _handler, _unitmask) \
.w(_tag, &_class::_handler, #_class "::" #_handler).umask64(_unitmask)
// device reads/writes
#define AM_DEVREADWRITE(_tag, _class, _rhandler, _whandler) \
.rw(_tag, &_class::_rhandler, #_class "::" #_rhandler, &_class::_whandler, #_class "::" #_whandler)
#define AM_DEVREADWRITE8(_tag, _class, _rhandler, _whandler, _unitmask) \
.rw(_tag, &_class::_rhandler, #_class "::" #_rhandler, &_class::_whandler, #_class "::" #_whandler).umask64(_unitmask)
#define AM_DEVREADWRITE16(_tag, _class, _rhandler, _whandler, _unitmask) \
.rw(_tag, &_class::_rhandler, #_class "::" #_rhandler, &_class::_whandler, #_class "::" #_whandler).umask64(_unitmask)
#define AM_DEVREADWRITE32(_tag, _class, _rhandler, _whandler, _unitmask) \
.rw(_tag, &_class::_rhandler, #_class "::" #_rhandler, &_class::_whandler, #_class "::" #_whandler).umask64(_unitmask)
// device set offset
#define AM_DEVSETOFFSET(_tag, _class, _handler) \
.setoffset(_tag, &_class::_handler, #_class "::" #_handler)
// device mapping
#define AM_DEVICE(_tag, _class, _handler) \
.m(_tag, address_map_constructor(&_class::_handler, #_class "::" #_handler, (_class *)nullptr))
#define AM_DEVICE8(_tag, _class, _handler, _unitmask) \
.m(_tag, address_map_constructor(&_class::_handler, #_class "::" #_handler, (_class *)nullptr)).umask64(_unitmask)
#define AM_DEVICE16(_tag, _class, _handler, _unitmask) \
.m(_tag, address_map_constructor(&_class::_handler, #_class "::" #_handler, (_class *)nullptr)).umask64(_unitmask)
#define AM_DEVICE32(_tag, _class, _handler, _unitmask) \
.m(_tag, address_map_constructor(&_class::_handler, #_class "::" #_handler, (_class *)nullptr)).umask64(_unitmask)
// special-case accesses
#define AM_ROM \
.rom()
#define AM_RAM \
.ram()
#define AM_READONLY \
.readonly()
#define AM_WRITEONLY \
.writeonly()
#define AM_UNMAP \
.unmaprw()
#define AM_READUNMAP \
.unmapr()
#define AM_WRITEUNMAP \
.unmapw()
#define AM_NOP \
.noprw()
#define AM_READNOP \
.nopr()
#define AM_WRITENOP \
.nopw()
// port accesses
#define AM_READ_PORT(_tag) \
.portr(_tag)
#define AM_WRITE_PORT(_tag) \
.portw(_tag)
#define AM_READWRITE_PORT(_tag) \
.portrw(_tag)
// bank accesses
#define AM_READ_BANK(_tag) \
.bankr(_tag)
#define AM_WRITE_BANK(_tag) \
.bankw(_tag)
#define AM_READWRITE_BANK(_tag) \
.bankrw(_tag)
// attributes for accesses
#define AM_REGION(_tag, _offs) \
.region(_tag, _offs)
#define AM_SHARE(_tag) \
.share(_tag)
// common shortcuts
#define AM_ROMBANK(_bank) .bankr(_bank)
#define AM_RAMBANK(_bank) .bankrw(_bank)
#define AM_RAM_READ(_read) AM_READ(_read) AM_WRITEONLY
#define AM_RAM_WRITE(_write) AM_READONLY AM_WRITE(_write)
#define AM_RAM_DEVREAD(_tag, _class, _read) AM_DEVREAD(_tag, _class, _read) AM_WRITEONLY
#define AM_RAM_DEVWRITE(_tag, _class, _write) AM_READONLY AM_DEVWRITE(_tag, _class, _write)
#endif /* __ADDRMAP_H__ */