make device_memory_interface slightly less of a special case, use a typedef to avoid nested templates everywhere (nw)

src/devices/bus/intellec4/intellec4.cpp

@@ -13,6 +13,10 @@ DEFINE_DEVICE_TYPE_NS(INTELLEC4_UNIV_BUS,  bus::intellec4, univ_bus_device,  "in
 
 namespace bus { namespace intellec4 {
 
+/***********************************************************************
+    SLOT DEVICE
+***********************************************************************/
+
 univ_slot_device::univ_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, INTELLEC4_UNIV_SLOT, tag, owner, clock)
 	, device_slot_interface(mconfig, *this)
@@ -31,8 +35,62 @@ void univ_slot_device::device_start()
 
 
 
+/***********************************************************************
+    BUS DEVICE
+***********************************************************************/
+
+/*----------------------------------
+  address space configuration
+----------------------------------*/
+
+void univ_bus_device::set_rom_space(device_t &device, char const *tag, int space)
+{
+	univ_bus_device &bus(downcast<univ_bus_device &>(device));
+	bus.m_rom_device.set_tag(tag);
+	bus.m_rom_space = space;
+}
+
+void univ_bus_device::set_rom_ports_space(device_t &device, char const *tag, int space)
+{
+	univ_bus_device &bus(downcast<univ_bus_device &>(device));
+	bus.m_rom_ports_device.set_tag(tag);
+	bus.m_rom_ports_space = space;
+}
+
+void univ_bus_device::set_memory_space(device_t &device, char const *tag, int space)
+{
+	univ_bus_device &bus(downcast<univ_bus_device &>(device));
+	bus.m_memory_device.set_tag(tag);
+	bus.m_memory_space = space;
+}
+
+void univ_bus_device::set_status_space(device_t &device, char const *tag, int space)
+{
+	univ_bus_device &bus(downcast<univ_bus_device &>(device));
+	bus.m_status_device.set_tag(tag);
+	bus.m_status_space = space;
+}
+
+void univ_bus_device::set_ram_ports_space(device_t &device, char const *tag, int space)
+{
+	univ_bus_device &bus(downcast<univ_bus_device &>(device));
+	bus.m_ram_ports_device.set_tag(tag);
+	bus.m_ram_ports_space = space;
+}
+
+
 univ_bus_device::univ_bus_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, INTELLEC4_UNIV_BUS, tag, owner, clock)
+	, m_rom_device(*this, finder_base::DUMMY_TAG)
+	, m_rom_ports_device(*this, finder_base::DUMMY_TAG)
+	, m_memory_device(*this, finder_base::DUMMY_TAG)
+	, m_status_device(*this, finder_base::DUMMY_TAG)
+	, m_ram_ports_device(*this, finder_base::DUMMY_TAG)
+	, m_rom_space(-1)
+	, m_rom_ports_space(-1)
+	, m_memory_space(-1)
+	, m_status_space(-1)
+	, m_ram_ports_space(-1)
 	, m_stop_out_cb(*this)
 	, m_test_out_cb(*this)
 	, m_reset_4002_out_cb(*this)
@@ -46,6 +104,10 @@ univ_bus_device::univ_bus_device(machine_config const &mconfig, char const *tag,
 }
 
 
+/*----------------------------------
+  input lines
+----------------------------------*/
+
 WRITE_LINE_MEMBER(univ_bus_device::sync_in)
 {
 	// FIXME: distribute to cards
@@ -89,6 +151,24 @@ WRITE_LINE_MEMBER(univ_bus_device::reset_4002_in)
 }
 
 
+/*----------------------------------
+  device_t implementation
+----------------------------------*/
+
+void univ_bus_device::device_validity_check(validity_checker &valid) const
+{
+	if (m_rom_device && !m_rom_device->space_config(m_rom_space))
+		osd_printf_error("ROM space device %s (%s) lacks address space %d config\n", m_rom_device->device().tag(), m_rom_device->device().name(), m_rom_space);
+	if (m_rom_ports_device && !m_rom_ports_device->space_config(m_rom_ports_space))
+		osd_printf_error("ROM ports space device %s (%s) lacks address space %d config\n", m_rom_ports_device->device().tag(), m_rom_ports_device->device().name(), m_rom_ports_space);
+	if (m_memory_device && !m_memory_device->space_config(m_memory_space))
+		osd_printf_error("Memory space device %s (%s) lacks address space %d config\n", m_memory_device->device().tag(), m_memory_device->device().name(), m_memory_space);
+	if (m_status_device && !m_status_device->space_config(m_status_space))
+		osd_printf_error("Status space device %s (%s) lacks address space %d config\n", m_status_device->device().tag(), m_status_device->device().name(), m_status_space);
+	if (m_ram_ports_device && !m_ram_ports_device->space_config(m_ram_ports_space))
+		osd_printf_error("RAM ports space device %s (%s) lacks address space %d config\n", m_ram_ports_device->device().tag(), m_ram_ports_device->device().name(), m_ram_ports_space);
+}
+
 void univ_bus_device::device_start()
 {
 	m_stop_out_cb.resolve_safe();

src/devices/bus/intellec4/intellec4.h

@@ -84,6 +84,29 @@ I/O 0...I/O 3           I/O lines to 4289 on CPU board (bidirectional I/O data)
 other pins connected between universal slots but not connected to CPU or control cards
 pins 73 and 74 are connected between cards but not otherwise used on MOD 4 systems
 interrupt request/acknowledge are supposedly connected somewhere on MOD 40 systems
+
+Cards can install handlers in the ROM, ROM ports, memory, status, and
+RAM ports spaces.
+
+For the ROM space, cards can install handlers for monitor and/or PROM
+mode:
+0x0000-0x0fff   /ENABLE MON PROM asserted
+0x1000-0x1fff   /PROM asserted
+
+For the ROM ports space, cards can install handlers for monitor mode,
+PROM mode, and/or neither (RAM mode or two switches pressed at once):
+0x0000-0x07ff   /ENABLE MON PROM asserted
+0x0800-0x0fff   /PROM asserted
+0x1000-0x17ff   neither asserted
+
+It's assumed that the memory, status and RAM ports space are only used
+for 4002 memories, and cards don't use the program storage selection
+lines to enable/disable them.  These spaces correspond directly to the
+CPU's view.
+
+Some of the cards can also be used in INTELLEC® 8 systems, using a
+different set of pins.  No provisions are made for using the same class
+to implement the card in both systems.
 */
 #ifndef MAME_BUS_INTELLEC4_INTELLEC4_H
 #define MAME_BUS_INTELLEC4_INTELLEC4_H
@@ -100,6 +123,21 @@ interrupt request/acknowledge are supposedly connected somewhere on MOD 40 syste
 		MCFG_DEVICE_REMOVE(slot_tag)
 
 
+#define MCFG_INTELLEC4_UNIV_BUS_ROM_SPACE(tag, space) \
+		bus::intellec4::univ_bus_device::set_rom_space(*device, "^" tag, space);
+
+#define MCFG_INTELLEC4_UNIV_BUS_ROM_PORTS_SPACE(tag, space) \
+		bus::intellec4::univ_bus_device::set_rom_ports_space(*device, "^" tag, space);
+
+#define MCFG_INTELLEC4_UNIV_BUS_MEMORY_SPACE(tag, space) \
+		bus::intellec4::univ_bus_device::set_memory_space(*device, "^" tag, space);
+
+#define MCFG_INTELLEC4_UNIV_BUS_STATUS_SPACE(tag, space) \
+		bus::intellec4::univ_bus_device::set_status_space(*device, "^" tag, space);
+
+#define MCFG_INTELLEC4_UNIV_BUS_RAM_PORTS_SPACE(tag, space) \
+		bus::intellec4::univ_bus_device::set_ram_ports_space(*device, "^" tag, space);
+
 #define MCFG_INTELLEC4_UNIV_BUS_STOP_CB(obj) \
 		bus::intellec4::univ_bus_device::set_stop_out_cb(*device, DEVCB_##obj);
 
@@ -137,7 +175,14 @@ protected:
 class univ_bus_device : public device_t
 {
 public:
-	// configuration helpers
+	// address space configuration
+	static void set_rom_space(device_t &device, char const *tag, int space);
+	static void set_rom_ports_space(device_t &device, char const *tag, int space);
+	static void set_memory_space(device_t &device, char const *tag, int space);
+	static void set_status_space(device_t &device, char const *tag, int space);
+	static void set_ram_ports_space(device_t &device, char const *tag, int space);
+
+	// callback configuration
 	template <typename Obj> static devcb_base &set_stop_out_cb(device_t &device, Obj &&cb)
 	{ return downcast<univ_bus_device &>(device).m_stop_out_cb.set_callback(std::forward<Obj>(cb)); }
 	template <typename Obj> static devcb_base &set_test_out_cb(device_t &device, Obj &&cb)
@@ -165,9 +210,16 @@ public:
 
 protected:
 	// device_t implementation
+	virtual void device_validity_check(validity_checker &valid) const override ATTR_COLD;
 	virtual void device_start() override;
 
 private:
+	// finding address spaces
+	required_device<device_memory_interface>    m_rom_device, m_rom_ports_device;
+	required_device<device_memory_interface>    m_memory_device, m_status_device, m_ram_ports_device;
+	int                                         m_rom_space, m_rom_ports_space;
+	int                                         m_memory_space, m_status_space, m_ram_ports_space;
+
 	// output line callbacks
 	devcb_write_line    m_stop_out_cb;
 	devcb_write_line    m_test_out_cb;

src/devices/bus/isa/isa.cpp

@@ -157,9 +157,9 @@ isa8_device::isa8_device(const machine_config &mconfig, device_type type, const
 	m_allocspaces = false;
 }
 
-std::vector<std::pair<int, const address_space_config *>> isa8_device::memory_space_config() const
+device_memory_interface::space_config_vector isa8_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_ISA_MEM,    &m_mem_config),
 		std::make_pair(AS_ISA_IO,     &m_io_config),
 		std::make_pair(AS_ISA_MEMALT, &m_mem16_config),
@@ -167,9 +167,9 @@ std::vector<std::pair<int, const address_space_config *>> isa8_device::memory_sp
 	};
 }
 
-std::vector<std::pair<int, const address_space_config *>> isa16_device::memory_space_config() const
+device_memory_interface::space_config_vector isa16_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_ISA_MEM,    &m_mem16_config),
 		std::make_pair(AS_ISA_IO,     &m_io16_config),
 		std::make_pair(AS_ISA_MEMALT, &m_mem_config),

src/devices/bus/isa/isa.h

@@ -211,7 +211,7 @@ public:
 	template <class Object> static devcb_base &set_out_drq3_callback(device_t &device, Object &&cb) { return downcast<isa8_device &>(device).m_out_drq3_cb.set_callback(std::forward<Object>(cb)); }
 
 	// for ISA8, put the 8-bit configs in the primary slots and the 16-bit configs in the secondary
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	void install_device(offs_t start, offs_t end, read8_delegate rhandler, write8_delegate whandler);
 	template<typename T> void install_device(offs_t addrstart, offs_t addrend, T &device, void (T::*map)(class address_map &map), int bits = 8)
@@ -369,7 +369,7 @@ public:
 	void install16_device(offs_t start, offs_t end, read16_delegate rhandler, write16_delegate whandler);
 
 	// for ISA16, put the 16-bit configs in the primary slots and the 8-bit configs in the secondary
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	DECLARE_WRITE_LINE_MEMBER( irq10_w );
 	DECLARE_WRITE_LINE_MEMBER( irq11_w );

src/devices/bus/vme/vme.cpp

@@ -205,9 +205,9 @@ SLOT_INTERFACE_END
 
 DEFINE_DEVICE_TYPE(VME, vme_device, "vme", "VME bus")
 
-std::vector<std::pair<int, const address_space_config *>> vme_device::memory_space_config() const
+device_memory_interface::space_config_vector vme_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_a32_config)
 	};
 }

src/devices/bus/vme/vme.h

@@ -142,7 +142,7 @@ public:
 	static void static_set_cputag(device_t &device, const char *tag);
 	static void static_use_owner_spaces(device_t &device);
 
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	const address_space_config m_a32_config;
 

src/devices/cpu/8x300/8x300.cpp

@@ -47,9 +47,9 @@ n8x300_cpu_device::n8x300_cpu_device(const machine_config &mconfig, const char *
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> n8x300_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector n8x300_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/8x300/8x300.h

@@ -60,7 +60,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_disasm_interface overrides
 	virtual uint32_t disasm_min_opcode_bytes() const override { return 2; }

src/devices/cpu/adsp2100/adsp2100.cpp

@@ -649,25 +649,25 @@ void adsp21xx_device::device_reset()
 //  the space doesn't exist
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> adsp2100_device::memory_space_config() const
+device_memory_interface::space_config_vector adsp2100_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config)
 	};
 }
 
-std::vector<std::pair<int, const address_space_config *>> adsp2101_device::memory_space_config() const
+device_memory_interface::space_config_vector adsp2101_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config)
 	};
 }
 
-std::vector<std::pair<int, const address_space_config *>> adsp2181_device::memory_space_config() const
+device_memory_interface::space_config_vector adsp2181_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config),
 		std::make_pair(AS_IO,      &m_io_config)

src/devices/cpu/adsp2100/adsp2100.h

@@ -494,7 +494,7 @@ protected:
 	virtual uint32_t execute_input_lines() const override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// interrupts
 	virtual bool generate_irq(int which, int indx) override;
@@ -517,7 +517,7 @@ protected:
 	virtual uint32_t execute_input_lines() const override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// interrupts
 	virtual bool generate_irq(int which, int indx) override;
@@ -538,7 +538,7 @@ protected:
 	virtual uint32_t execute_input_lines() const override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// interrupts
 	virtual bool generate_irq(int which, int indx) override;

src/devices/cpu/alph8201/alph8201.cpp

@@ -203,9 +203,9 @@ alpha8301_cpu_device::alpha8301_cpu_device(const machine_config &mconfig, const
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> alpha8201_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector alpha8201_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/alph8201/alph8201.h

@@ -75,7 +75,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/alto2/alto2cpu.cpp

@@ -794,9 +794,9 @@ static const prom_load_t pl_madr_a91 =
 // device_memory_interface overrides
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> alto2_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector alto2_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(0, &m_ucode_config),
 		std::make_pair(1, &m_const_config),
 		std::make_pair(2, &m_iomem_config)

src/devices/cpu/alto2/alto2cpu.h

@@ -230,7 +230,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	//! device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	//! device (P)ROMs
 	virtual const tiny_rom_entry *device_rom_region() const override;

src/devices/cpu/am29000/am29000.cpp

@@ -118,9 +118,9 @@ am29000_cpu_device::am29000_cpu_device(const machine_config &mconfig, const char
 	m_next_pc = 0;
 }
 
-std::vector<std::pair<int, const address_space_config *>> am29000_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector am29000_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config),
 		std::make_pair(AS_IO,      &m_io_config)

src/devices/cpu/am29000/am29000.h

@@ -451,7 +451,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/amis2000/amis2000.cpp

@@ -68,9 +68,9 @@ amis2152_cpu_device::amis2152_cpu_device(const machine_config &mconfig, const ch
 	: amis2000_base_device(mconfig, AMI_S2152, tag, owner, clock, 3, 11, 3, 13, ADDRESS_MAP_NAME(program_1_5k), 7, ADDRESS_MAP_NAME(data_80x4))
 { }
 
-std::vector<std::pair<int, const address_space_config *>> amis2000_base_device::memory_space_config() const
+device_memory_interface::space_config_vector amis2000_base_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config)
 	};

src/devices/cpu/amis2000/amis2000.h

@@ -84,7 +84,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_disasm_interface overrides
 	virtual u32 disasm_min_opcode_bytes() const override { return 1; }

src/devices/cpu/apexc/apexc.cpp

@@ -351,9 +351,9 @@ apexc_cpu_device::apexc_cpu_device(const machine_config &mconfig, const char *ta
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> apexc_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector apexc_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/apexc/apexc.h

@@ -34,7 +34,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/arc/arc.h

@@ -36,7 +36,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/arcompact/arcompact.cpp

@@ -56,9 +56,9 @@ arcompact_device::arcompact_device(const machine_config &mconfig, const char *ta
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> arcompact_device::memory_space_config() const
+device_memory_interface::space_config_vector arcompact_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/arcompact/arcompact.h

@@ -95,7 +95,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/arm/arm.cpp

@@ -228,9 +228,9 @@ DEFINE_DEVICE_TYPE(ARM,    arm_cpu_device,    "arm_le", "ARM (little)")
 DEFINE_DEVICE_TYPE(ARM_BE, arm_be_cpu_device, "arm_be", "ARM (big)")
 
 
-std::vector<std::pair<int, const address_space_config *>> arm_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector arm_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/arm/arm.h

@@ -58,7 +58,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

src/devices/cpu/arm7/arm7.cpp

@@ -118,9 +118,9 @@ sa1110_cpu_device::sa1110_cpu_device(const machine_config &mconfig, const char *
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> arm7_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector arm7_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/arm7/arm7.h

@@ -67,7 +67,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 	virtual bool memory_translate(int spacenum, int intention, offs_t &address) override;
 
 	// device_state_interface overrides

src/devices/cpu/arm7/lpc210x.cpp

@@ -66,9 +66,9 @@ WRITE32_MEMBER(lpc210x_device::flash_w)
 }
 
 
-std::vector<std::pair<int, const address_space_config *>> lpc210x_device::memory_space_config() const
+device_memory_interface::space_config_vector lpc210x_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/arm7/lpc210x.h

@@ -77,7 +77,7 @@ protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	uint32_t m_TxPR[2];
 

src/devices/cpu/asap/asap.cpp

@@ -235,9 +235,9 @@ void asap_device::device_reset()
 //  the space doesn't exist
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> asap_device::memory_space_config() const
+device_memory_interface::space_config_vector asap_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/asap/asap.h

@@ -81,7 +81,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/avr8/avr8.cpp

@@ -876,9 +876,9 @@ void avr8_device::device_reset()
 //  the space doesn't exist
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> avr8_device::memory_space_config() const
+device_memory_interface::space_config_vector avr8_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config),
 		std::make_pair(AS_IO,      &m_io_config)

src/devices/cpu/avr8/avr8.h

@@ -120,7 +120,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_disasm_interface overrides
 	virtual uint32_t disasm_min_opcode_bytes() const override;

src/devices/cpu/capricorn/capricorn.cpp

@@ -216,9 +216,9 @@ void capricorn_cpu_device::execute_set_input(int linenum, int state)
 	}
 }
 
-std::vector<std::pair<int, const address_space_config *>> capricorn_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector capricorn_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/capricorn/capricorn.h

@@ -33,7 +33,7 @@ protected:
 	virtual void execute_set_input(int linenum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

src/devices/cpu/ccpu/ccpu.cpp

@@ -72,9 +72,9 @@ ccpu_cpu_device::ccpu_cpu_device(const machine_config &mconfig, const char *tag,
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> ccpu_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector ccpu_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config),
 		std::make_pair(AS_IO,      &m_io_config)

src/devices/cpu/ccpu/ccpu.h

@@ -72,7 +72,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

src/devices/cpu/clipper/clipper.cpp

@@ -262,9 +262,9 @@ void clipper_device::execute_set_input(int inputnum, int state)
  * The CLIPPER has a true Harvard architecture. In the InterPro, these are tied back together
  * again by the MMU, which then directs the access to one of 3 address spaces: main, i/o or boot.
  */
-std::vector<std::pair<int, const address_space_config *>> clipper_device::memory_space_config() const
+device_memory_interface::space_config_vector clipper_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_insn_config),
 		std::make_pair(AS_DATA,    &m_data_config)
 	};

src/devices/cpu/clipper/clipper.h

@@ -195,7 +195,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 #if 0

src/devices/cpu/cop400/cop400.cpp

@@ -314,9 +314,9 @@ cop446c_cpu_device::cop446c_cpu_device(const machine_config &mconfig, const char
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> cop400_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector cop400_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config)
 	};

src/devices/cpu/cop400/cop400.h

@@ -157,7 +157,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/cosmac/cosmac.cpp

@@ -408,9 +408,9 @@ void cosmac_device::device_reset()
 //  the space doesn't exist
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> cosmac_device::memory_space_config() const
+device_memory_interface::space_config_vector cosmac_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/cosmac/cosmac.h

@@ -229,7 +229,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/cp1610/cp1610.cpp

@@ -3401,9 +3401,9 @@ cp1610_cpu_device::cp1610_cpu_device(const machine_config &mconfig, const char *
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> cp1610_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector cp1610_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/cp1610/cp1610.h

@@ -54,7 +54,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

src/devices/cpu/cubeqcpu/cubeqcpu.cpp

@@ -83,9 +83,9 @@ cquestsnd_cpu_device::cquestsnd_cpu_device(const machine_config &mconfig, const
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> cquestsnd_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector cquestsnd_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }
@@ -128,9 +128,9 @@ cquestlin_cpu_device::cquestlin_cpu_device(const machine_config &mconfig, const
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> cquestlin_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector cquestlin_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }
@@ -375,9 +375,9 @@ void cquestrot_cpu_device::state_string_export(const device_state_entry &entry,
 	}
 }
 
-std::vector<std::pair<int, const address_space_config *>> cquestrot_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector cquestrot_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/cubeqcpu/cubeqcpu.h

@@ -84,7 +84,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_disasm_interface overrides
 	virtual uint32_t disasm_min_opcode_bytes() const override { return 8; }
@@ -184,7 +184,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;
@@ -298,7 +298,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

src/devices/cpu/dsp16/dsp16.cpp

@@ -201,9 +201,9 @@ void dsp16_device::device_reset()
 //  the space doesn't exist
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> dsp16_device::memory_space_config() const
+device_memory_interface::space_config_vector dsp16_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config)
 	};

src/devices/cpu/dsp16/dsp16.h

@@ -77,7 +77,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

src/devices/cpu/dsp32/dsp32.cpp

@@ -305,9 +305,9 @@ void dsp32c_device::device_reset()
 //  the space doesn't exist
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> dsp32c_device::memory_space_config() const
+device_memory_interface::space_config_vector dsp32c_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/dsp32/dsp32.h

@@ -118,7 +118,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/dsp56k/dsp56k.cpp

@@ -127,9 +127,9 @@ dsp56k_device::dsp56k_device(const machine_config &mconfig, const char *tag, dev
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> dsp56k_device::memory_space_config() const
+device_memory_interface::space_config_vector dsp56k_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config)
 	};

src/devices/cpu/dsp56k/dsp56k.h

@@ -229,7 +229,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

src/devices/cpu/e0c6200/e0c6200.cpp

@@ -173,9 +173,9 @@ void e0c6200_cpu_device::do_interrupt()
 	standard_irq_callback(m_irq_id);
 }
 
-std::vector<std::pair<int, const address_space_config *>> e0c6200_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector e0c6200_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config)
 	};

src/devices/cpu/e0c6200/e0c6200.h

@@ -31,7 +31,7 @@ protected:
 	virtual void do_interrupt();
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_disasm_interface overrides
 	virtual u32 disasm_min_opcode_bytes() const override { return 2; }

src/devices/cpu/e132xs/e132xs.cpp

@@ -1883,9 +1883,9 @@ void hyperstone_device::device_stop()
 //  of the address spaces
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> hyperstone_device::memory_space_config() const
+device_memory_interface::space_config_vector hyperstone_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/e132xs/e132xs.h

@@ -115,7 +115,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_disasm_interface overrides
 	virtual uint32_t disasm_min_opcode_bytes() const override;

src/devices/cpu/es5510/es5510.cpp

@@ -569,9 +569,9 @@ void es5510_device::device_reset() {
 	memset(&ram_pp, 0, sizeof(ram_t));
 }
 
-std::vector<std::pair<int, const address_space_config *>> es5510_device::memory_space_config() const
+device_memory_interface::space_config_vector es5510_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 	};
 }
 

src/devices/cpu/es5510/es5510.h

@@ -124,7 +124,7 @@ public:
 protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 	virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const override;
 	virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override;
 	virtual uint32_t execute_min_cycles() const override;

src/devices/cpu/esrip/esrip.cpp

@@ -338,9 +338,9 @@ void esrip_device::device_stop()
 //  the space doesn't exist
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> esrip_device::memory_space_config() const
+device_memory_interface::space_config_vector esrip_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 	};
 }

src/devices/cpu/esrip/esrip.h

@@ -133,7 +133,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_disasm_interface overrides
 	virtual uint32_t disasm_min_opcode_bytes() const override;

src/devices/cpu/f8/f8.cpp

@@ -75,9 +75,9 @@ f8_cpu_device::f8_cpu_device(const machine_config &mconfig, const char *tag, dev
 	memset(m_r, 0x00, sizeof(m_r));
 }
 
-std::vector<std::pair<int, const address_space_config *>> f8_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector f8_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/f8/f8.h

@@ -48,7 +48,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

src/devices/cpu/g65816/g65816.cpp

@@ -117,9 +117,9 @@ g65816_device::g65816_device(const machine_config &mconfig, device_type type, co
 }
 
 
-std::vector<std::pair<int, const address_space_config *>> g65816_device::memory_space_config() const
+device_memory_interface::space_config_vector g65816_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/g65816/g65816.h

@@ -77,7 +77,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/h6280/h6280.cpp

@@ -169,9 +169,9 @@ h6280_device::h6280_device(const machine_config &mconfig, const char *tag, devic
 		m_opcode[op] = s_opcodetable[op];
 }
 
-std::vector<std::pair<int, const address_space_config *>> h6280_device::memory_space_config() const
+device_memory_interface::space_config_vector h6280_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/h6280/h6280.h

@@ -85,7 +85,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 	virtual bool memory_translate(int spacenum, int intention, offs_t &address) override;
 
 	// device_disasm_interface overrides

src/devices/cpu/h8/h8.cpp

@@ -236,9 +236,9 @@ void h8_device::internal_update()
 	internal_update(total_cycles());
 }
 
-std::vector<std::pair<int, const address_space_config *>> h8_device::memory_space_config() const
+device_memory_interface::space_config_vector h8_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &program_config),
 		std::make_pair(AS_IO,      &io_config)
 	};

src/devices/cpu/h8/h8.h

@@ -167,7 +167,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/hcd62121/hcd62121.cpp

@@ -73,9 +73,9 @@ hcd62121_cpu_device::hcd62121_cpu_device(const machine_config &mconfig, const ch
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> hcd62121_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector hcd62121_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/hcd62121/hcd62121.h

@@ -54,7 +54,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_export(const device_state_entry &entry) override;

src/devices/cpu/hd61700/hd61700.cpp

@@ -120,9 +120,9 @@ hd61700_cpu_device::hd61700_cpu_device(const machine_config &mconfig, const char
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> hd61700_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector hd61700_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/hd61700/hd61700.h

@@ -87,7 +87,7 @@ protected:
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_disasm_interface overrides
 	virtual uint32_t disasm_min_opcode_bytes() const override { return 1; }

src/devices/cpu/hmcs40/hmcs40.cpp

@@ -149,9 +149,9 @@ hd44828_device::hd44828_device(const machine_config &mconfig, const char *tag, d
 	: hmcs45_cpu_device(mconfig, HD44828, tag, owner, clock, IS_CMOS)
 { }
 
-std::vector<std::pair<int, const address_space_config *>> hmcs40_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector hmcs40_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config)
 	};

src/devices/cpu/hmcs40/hmcs40.h

@@ -155,7 +155,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_disasm_interface overrides
 	virtual u32 disasm_min_opcode_bytes() const override { return 2; }

src/devices/cpu/hphybrid/hphybrid.cpp

@@ -152,9 +152,9 @@ hp_hybrid_cpu_device::hp_hybrid_cpu_device(const machine_config &mconfig, device
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> hp_hybrid_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector hp_hybrid_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/hphybrid/hphybrid.h

@@ -79,7 +79,7 @@ protected:
 	virtual uint16_t execute_no_bpc_ioc(uint16_t opcode) = 0;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

src/devices/cpu/i386/i386.cpp

@@ -131,9 +131,9 @@ pentium4_device::pentium4_device(const machine_config &mconfig, const char *tag,
 	set_vtlb_dynamic_entries(196);
 }
 
-std::vector<std::pair<int, const address_space_config *>> i386_device::memory_space_config() const
+device_memory_interface::space_config_vector i386_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/i386/i386.h

@@ -59,7 +59,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 	virtual bool memory_translate(int spacenum, int intention, offs_t &address) override;
 
 	// device_state_interface overrides

src/devices/cpu/i8008/i8008.cpp

@@ -139,9 +139,9 @@ void i8008_device::device_reset()
 //  the space doesn't exist
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> i8008_device::memory_space_config() const
+device_memory_interface::space_config_vector i8008_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/i8008/i8008.h

@@ -35,7 +35,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/i8085/i8085.cpp

@@ -211,9 +211,9 @@ i8080a_cpu_device::i8080a_cpu_device(const machine_config &mconfig, const char *
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> i8085a_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector i8085a_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/i8085/i8085.h

@@ -91,7 +91,7 @@ protected:
 	virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 2); }
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

src/devices/cpu/i8089/i8089.cpp

@@ -135,9 +135,9 @@ void i8089_device::device_reset()
 //  space configurations
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> i8089_device::memory_space_config() const
+device_memory_interface::space_config_vector i8089_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/i8089/i8089.h

@@ -76,7 +76,7 @@ protected:
 	int m_icount;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	address_space_config m_program_config;
 	address_space_config m_io_config;

src/devices/cpu/i86/i186.cpp

@@ -149,16 +149,16 @@ i80186_cpu_device::i80186_cpu_device(const machine_config &mconfig, device_type
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> i80186_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector i80186_cpu_device::memory_space_config() const
 {
 	if(has_configured_map(AS_OPCODES))
-		return std::vector<std::pair<int, const address_space_config *>> {
+		return space_config_vector {
 			std::make_pair(AS_PROGRAM, &m_program_config),
 			std::make_pair(AS_OPCODES, &m_opcodes_config),
 			std::make_pair(AS_IO,      &m_io_config)
 		};
 	else
-		return std::vector<std::pair<int, const address_space_config *>> {
+		return space_config_vector {
 			std::make_pair(AS_PROGRAM, &m_program_config),
 			std::make_pair(AS_IO,      &m_io_config)
 		};

src/devices/cpu/i86/i186.h

@@ -32,7 +32,7 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(int3_w) { external_int(3, state); }
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 protected:
 	i80186_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int data_bus_size);

src/devices/cpu/i86/i286.cpp

@@ -282,16 +282,16 @@ void i80286_cpu_device::device_start()
 	m_out_shutdown_func.resolve_safe();
 }
 
-std::vector<std::pair<int, const address_space_config *>> i80286_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector i80286_cpu_device::memory_space_config() const
 {
 	if(has_configured_map(AS_OPCODES))
-		return std::vector<std::pair<int, const address_space_config *>> {
+		return space_config_vector {
 			std::make_pair(AS_PROGRAM, &m_program_config),
 			std::make_pair(AS_OPCODES, &m_opcodes_config),
 			std::make_pair(AS_IO,      &m_io_config)
 		};
 	else
-		return std::vector<std::pair<int, const address_space_config *>> {
+		return space_config_vector {
 			std::make_pair(AS_PROGRAM, &m_program_config),
 			std::make_pair(AS_IO,      &m_io_config)
 		};

src/devices/cpu/i86/i286.h

@@ -69,7 +69,7 @@ public:
 	i80286_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	typedef delegate<uint32_t (bool)> a20_cb;
 	static void static_set_a20_callback(device_t &device, a20_cb object) { downcast<i80286_cpu_device &>(device).m_a20_callback = object; }

src/devices/cpu/i86/i86.cpp

@@ -112,16 +112,16 @@ i8086_cpu_device::i8086_cpu_device(const machine_config &mconfig, device_type ty
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> i8086_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector i8086_cpu_device::memory_space_config() const
 {
 	if(has_configured_map(AS_OPCODES))
-		return std::vector<std::pair<int, const address_space_config *>> {
+		return space_config_vector {
 			std::make_pair(AS_PROGRAM, &m_program_config),
 			std::make_pair(AS_OPCODES, &m_opcodes_config),
 			std::make_pair(AS_IO,      &m_io_config)
 		};
 	else
-		return std::vector<std::pair<int, const address_space_config *>> {
+		return space_config_vector {
 			std::make_pair(AS_PROGRAM, &m_program_config),
 			std::make_pair(AS_IO,      &m_io_config)
 		};

src/devices/cpu/i86/i86.h

@@ -344,7 +344,7 @@ public:
 	i8086_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 protected:
 	i8086_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int data_bus_size);

src/devices/cpu/i860/i860.cpp

@@ -41,9 +41,9 @@ i860_cpu_device::i860_cpu_device(const machine_config &mconfig, const char *tag,
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> i860_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector i860_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/i860/i860.h

@@ -73,7 +73,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_export(const device_state_entry &entry) override;

src/devices/cpu/i960/i960.cpp

@@ -25,9 +25,9 @@ i960_cpu_device::i960_cpu_device(const machine_config &mconfig, const char *tag,
 }
 
 
-std::vector<std::pair<int, const address_space_config *>> i960_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector i960_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/i960/i960.h

@@ -91,7 +91,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

src/devices/cpu/ie15/ie15.cpp

@@ -88,9 +88,9 @@ void ie15_cpu_device::device_reset()
 //  the space doesn't exist
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> ie15_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector ie15_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_IO,      &m_io_config)
 	};

src/devices/cpu/ie15/ie15.h

@@ -36,7 +36,7 @@ protected:
 	virtual void execute_run() override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_import(const device_state_entry &entry) override;

src/devices/cpu/jaguar/jaguar.cpp

@@ -173,9 +173,9 @@ jaguardsp_cpu_device::jaguardsp_cpu_device(const machine_config &mconfig, const
 {
 }
 
-std::vector<std::pair<int, const address_space_config *>> jaguar_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector jaguar_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config)
 	};
 }

src/devices/cpu/jaguar/jaguar.h

@@ -115,7 +115,7 @@ protected:
 	virtual void execute_set_input(int inputnum, int state) override;
 
 	// device_memory_interface overrides
-	virtual std::vector<std::pair<int, const address_space_config *>> memory_space_config() const override;
+	virtual space_config_vector memory_space_config() const override;
 
 	// device_state_interface overrides
 	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;

src/devices/cpu/lc8670/lc8670.cpp

@@ -392,9 +392,9 @@ void lc8670_cpu_device::state_string_export(const device_state_entry &entry, std
 //  the space doesn't exist
 //-------------------------------------------------
 
-std::vector<std::pair<int, const address_space_config *>> lc8670_cpu_device::memory_space_config() const
+device_memory_interface::space_config_vector lc8670_cpu_device::memory_space_config() const
 {
-	return std::vector<std::pair<int, const address_space_config *>> {
+	return space_config_vector {
 		std::make_pair(AS_PROGRAM, &m_program_config),
 		std::make_pair(AS_DATA,    &m_data_config),
 		std::make_pair(AS_IO,      &m_io_config)