From 536b2153d995430def817091867b3cfde71e688a Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 10 Jul 2017 19:34:33 +1000 Subject: 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 | 80 +++++++++++++++++++++++++ src/devices/bus/intellec4/intellec4.h | 54 ++++++++++++++++- src/devices/bus/isa/isa.cpp | 8 +-- src/devices/bus/isa/isa.h | 4 +- src/devices/bus/vme/vme.cpp | 4 +- src/devices/bus/vme/vme.h | 2 +- src/devices/cpu/8x300/8x300.cpp | 4 +- src/devices/cpu/8x300/8x300.h | 2 +- src/devices/cpu/adsp2100/adsp2100.cpp | 12 ++-- src/devices/cpu/adsp2100/adsp2100.h | 6 +- src/devices/cpu/alph8201/alph8201.cpp | 4 +- src/devices/cpu/alph8201/alph8201.h | 2 +- src/devices/cpu/alto2/alto2cpu.cpp | 4 +- src/devices/cpu/alto2/alto2cpu.h | 2 +- src/devices/cpu/am29000/am29000.cpp | 4 +- src/devices/cpu/am29000/am29000.h | 2 +- src/devices/cpu/amis2000/amis2000.cpp | 4 +- src/devices/cpu/amis2000/amis2000.h | 2 +- src/devices/cpu/apexc/apexc.cpp | 4 +- src/devices/cpu/apexc/apexc.h | 2 +- src/devices/cpu/arc/arc.h | 2 +- src/devices/cpu/arcompact/arcompact.cpp | 4 +- src/devices/cpu/arcompact/arcompact.h | 2 +- src/devices/cpu/arm/arm.cpp | 4 +- src/devices/cpu/arm/arm.h | 2 +- src/devices/cpu/arm7/arm7.cpp | 4 +- src/devices/cpu/arm7/arm7.h | 2 +- src/devices/cpu/arm7/lpc210x.cpp | 4 +- src/devices/cpu/arm7/lpc210x.h | 2 +- src/devices/cpu/asap/asap.cpp | 4 +- src/devices/cpu/asap/asap.h | 2 +- src/devices/cpu/avr8/avr8.cpp | 4 +- src/devices/cpu/avr8/avr8.h | 2 +- src/devices/cpu/capricorn/capricorn.cpp | 4 +- src/devices/cpu/capricorn/capricorn.h | 2 +- src/devices/cpu/ccpu/ccpu.cpp | 4 +- src/devices/cpu/ccpu/ccpu.h | 2 +- src/devices/cpu/clipper/clipper.cpp | 4 +- src/devices/cpu/clipper/clipper.h | 2 +- src/devices/cpu/cop400/cop400.cpp | 4 +- src/devices/cpu/cop400/cop400.h | 2 +- src/devices/cpu/cosmac/cosmac.cpp | 4 +- src/devices/cpu/cosmac/cosmac.h | 2 +- src/devices/cpu/cp1610/cp1610.cpp | 4 +- src/devices/cpu/cp1610/cp1610.h | 2 +- src/devices/cpu/cubeqcpu/cubeqcpu.cpp | 12 ++-- src/devices/cpu/cubeqcpu/cubeqcpu.h | 6 +- src/devices/cpu/dsp16/dsp16.cpp | 4 +- src/devices/cpu/dsp16/dsp16.h | 2 +- src/devices/cpu/dsp32/dsp32.cpp | 4 +- src/devices/cpu/dsp32/dsp32.h | 2 +- src/devices/cpu/dsp56k/dsp56k.cpp | 4 +- src/devices/cpu/dsp56k/dsp56k.h | 2 +- src/devices/cpu/e0c6200/e0c6200.cpp | 4 +- src/devices/cpu/e0c6200/e0c6200.h | 2 +- src/devices/cpu/e132xs/e132xs.cpp | 4 +- src/devices/cpu/e132xs/e132xs.h | 2 +- src/devices/cpu/es5510/es5510.cpp | 4 +- src/devices/cpu/es5510/es5510.h | 2 +- src/devices/cpu/esrip/esrip.cpp | 4 +- src/devices/cpu/esrip/esrip.h | 2 +- src/devices/cpu/f8/f8.cpp | 4 +- src/devices/cpu/f8/f8.h | 2 +- src/devices/cpu/g65816/g65816.cpp | 4 +- src/devices/cpu/g65816/g65816.h | 2 +- src/devices/cpu/h6280/h6280.cpp | 4 +- src/devices/cpu/h6280/h6280.h | 2 +- src/devices/cpu/h8/h8.cpp | 4 +- src/devices/cpu/h8/h8.h | 2 +- src/devices/cpu/hcd62121/hcd62121.cpp | 4 +- src/devices/cpu/hcd62121/hcd62121.h | 2 +- src/devices/cpu/hd61700/hd61700.cpp | 4 +- src/devices/cpu/hd61700/hd61700.h | 2 +- src/devices/cpu/hmcs40/hmcs40.cpp | 4 +- src/devices/cpu/hmcs40/hmcs40.h | 2 +- src/devices/cpu/hphybrid/hphybrid.cpp | 4 +- src/devices/cpu/hphybrid/hphybrid.h | 2 +- src/devices/cpu/i386/i386.cpp | 4 +- src/devices/cpu/i386/i386.h | 2 +- src/devices/cpu/i8008/i8008.cpp | 4 +- src/devices/cpu/i8008/i8008.h | 2 +- src/devices/cpu/i8085/i8085.cpp | 4 +- src/devices/cpu/i8085/i8085.h | 2 +- src/devices/cpu/i8089/i8089.cpp | 4 +- src/devices/cpu/i8089/i8089.h | 2 +- src/devices/cpu/i86/i186.cpp | 6 +- src/devices/cpu/i86/i186.h | 2 +- src/devices/cpu/i86/i286.cpp | 6 +- src/devices/cpu/i86/i286.h | 2 +- src/devices/cpu/i86/i86.cpp | 6 +- src/devices/cpu/i86/i86.h | 2 +- src/devices/cpu/i860/i860.cpp | 4 +- src/devices/cpu/i860/i860.h | 2 +- src/devices/cpu/i960/i960.cpp | 4 +- src/devices/cpu/i960/i960.h | 2 +- src/devices/cpu/ie15/ie15.cpp | 4 +- src/devices/cpu/ie15/ie15.h | 2 +- src/devices/cpu/jaguar/jaguar.cpp | 4 +- src/devices/cpu/jaguar/jaguar.h | 2 +- src/devices/cpu/lc8670/lc8670.cpp | 4 +- src/devices/cpu/lc8670/lc8670.h | 2 +- src/devices/cpu/lh5801/lh5801.cpp | 4 +- src/devices/cpu/lh5801/lh5801.h | 2 +- src/devices/cpu/lr35902/lr35902.cpp | 4 +- src/devices/cpu/lr35902/lr35902.h | 2 +- src/devices/cpu/m37710/m37710.cpp | 4 +- src/devices/cpu/m37710/m37710.h | 2 +- src/devices/cpu/m6502/deco16.cpp | 6 +- src/devices/cpu/m6502/deco16.h | 2 +- src/devices/cpu/m6502/m3745x.cpp | 4 +- src/devices/cpu/m6502/m3745x.h | 2 +- src/devices/cpu/m6502/m5074x.h | 2 +- src/devices/cpu/m6502/m6502.cpp | 6 +- src/devices/cpu/m6502/m6502.h | 2 +- src/devices/cpu/m6800/m6800.cpp | 6 +- src/devices/cpu/m6800/m6800.h | 2 +- src/devices/cpu/m6800/m6801.cpp | 2 +- src/devices/cpu/m6800/m6801.h | 2 +- src/devices/cpu/m68000/m68000.h | 2 +- src/devices/cpu/m68000/m68kcpu.cpp | 6 +- src/devices/cpu/m6805/m6805.cpp | 4 +- src/devices/cpu/m6805/m6805.h | 2 +- src/devices/cpu/m6809/m6809.cpp | 6 +- src/devices/cpu/m6809/m6809.h | 2 +- src/devices/cpu/mb86233/mb86233.cpp | 4 +- src/devices/cpu/mb86233/mb86233.h | 2 +- src/devices/cpu/mb86235/mb86235.cpp | 4 +- src/devices/cpu/mb86235/mb86235.h | 2 +- src/devices/cpu/mb88xx/mb88xx.cpp | 4 +- src/devices/cpu/mb88xx/mb88xx.h | 2 +- src/devices/cpu/mc68hc11/mc68hc11.cpp | 4 +- src/devices/cpu/mc68hc11/mc68hc11.h | 2 +- src/devices/cpu/mcs40/mcs40.cpp | 4 +- src/devices/cpu/mcs40/mcs40.h | 2 +- src/devices/cpu/mcs48/mcs48.cpp | 4 +- src/devices/cpu/mcs48/mcs48.h | 2 +- src/devices/cpu/mcs51/mcs51.cpp | 4 +- src/devices/cpu/mcs51/mcs51.h | 2 +- src/devices/cpu/mcs96/i8x9x.cpp | 4 +- src/devices/cpu/mcs96/i8x9x.h | 2 +- src/devices/cpu/mcs96/mcs96.cpp | 4 +- src/devices/cpu/mcs96/mcs96.h | 2 +- src/devices/cpu/melps4/melps4.cpp | 4 +- src/devices/cpu/melps4/melps4.h | 2 +- src/devices/cpu/minx/minx.cpp | 4 +- src/devices/cpu/minx/minx.h | 2 +- src/devices/cpu/mips/mips3.cpp | 4 +- src/devices/cpu/mips/mips3.h | 2 +- src/devices/cpu/mips/r3000.cpp | 4 +- src/devices/cpu/mips/r3000.h | 2 +- src/devices/cpu/mn10200/mn10200.cpp | 4 +- src/devices/cpu/mn10200/mn10200.h | 2 +- src/devices/cpu/nanoprocessor/nanoprocessor.cpp | 4 +- src/devices/cpu/nanoprocessor/nanoprocessor.h | 2 +- src/devices/cpu/nec/nec.cpp | 4 +- src/devices/cpu/nec/nec.h | 2 +- src/devices/cpu/nec/v25.cpp | 4 +- src/devices/cpu/nec/v25.h | 2 +- src/devices/cpu/nec/v53.cpp | 2 +- src/devices/cpu/nec/v53.h | 2 +- src/devices/cpu/patinhofeio/patinho_feio.cpp | 4 +- src/devices/cpu/patinhofeio/patinhofeio_cpu.h | 2 +- src/devices/cpu/pdp1/pdp1.cpp | 4 +- src/devices/cpu/pdp1/pdp1.h | 2 +- src/devices/cpu/pdp1/tx0.cpp | 4 +- src/devices/cpu/pdp1/tx0.h | 2 +- src/devices/cpu/pdp8/pdp8.h | 2 +- src/devices/cpu/pic16c5x/pic16c5x.cpp | 4 +- src/devices/cpu/pic16c5x/pic16c5x.h | 2 +- src/devices/cpu/pic16c62x/pic16c62x.h | 2 +- src/devices/cpu/powerpc/ppc.h | 2 +- src/devices/cpu/powerpc/ppccom.cpp | 4 +- src/devices/cpu/pps4/pps4.cpp | 4 +- src/devices/cpu/pps4/pps4.h | 2 +- src/devices/cpu/psx/psx.cpp | 4 +- src/devices/cpu/psx/psx.h | 2 +- src/devices/cpu/rsp/rsp.cpp | 4 +- src/devices/cpu/rsp/rsp.h | 2 +- src/devices/cpu/s2650/s2650.cpp | 4 +- src/devices/cpu/s2650/s2650.h | 2 +- src/devices/cpu/saturn/saturn.cpp | 4 +- src/devices/cpu/saturn/saturn.h | 2 +- src/devices/cpu/sc61860/sc61860.cpp | 4 +- src/devices/cpu/sc61860/sc61860.h | 2 +- src/devices/cpu/scmp/scmp.cpp | 4 +- src/devices/cpu/scmp/scmp.h | 2 +- src/devices/cpu/score/score.cpp | 4 +- src/devices/cpu/score/score.h | 2 +- src/devices/cpu/scudsp/scudsp.cpp | 4 +- src/devices/cpu/scudsp/scudsp.h | 2 +- src/devices/cpu/se3208/se3208.cpp | 4 +- src/devices/cpu/se3208/se3208.h | 2 +- src/devices/cpu/sh2/sh2.cpp | 6 +- src/devices/cpu/sh2/sh2.h | 2 +- src/devices/cpu/sh4/sh4.cpp | 4 +- src/devices/cpu/sh4/sh4.h | 2 +- src/devices/cpu/sharc/sharc.cpp | 4 +- src/devices/cpu/sharc/sharc.h | 2 +- src/devices/cpu/sm510/sm510.h | 2 +- src/devices/cpu/sm510/sm510base.cpp | 4 +- src/devices/cpu/sm8500/sm8500.cpp | 4 +- src/devices/cpu/sm8500/sm8500.h | 2 +- src/devices/cpu/sparc/mb86901.cpp | 4 +- src/devices/cpu/sparc/sparc.h | 2 +- src/devices/cpu/spc700/spc700.cpp | 4 +- src/devices/cpu/spc700/spc700.h | 2 +- src/devices/cpu/ssem/ssem.cpp | 4 +- src/devices/cpu/ssem/ssem.h | 2 +- src/devices/cpu/ssp1601/ssp1601.cpp | 4 +- src/devices/cpu/ssp1601/ssp1601.h | 2 +- src/devices/cpu/superfx/superfx.cpp | 4 +- src/devices/cpu/superfx/superfx.h | 2 +- src/devices/cpu/t11/t11.cpp | 4 +- src/devices/cpu/t11/t11.h | 2 +- src/devices/cpu/tlcs870/tlcs870.cpp | 4 +- src/devices/cpu/tlcs870/tlcs870.h | 2 +- src/devices/cpu/tlcs90/tlcs90.cpp | 4 +- src/devices/cpu/tlcs90/tlcs90.h | 2 +- src/devices/cpu/tlcs900/tlcs900.cpp | 4 +- src/devices/cpu/tlcs900/tlcs900.h | 2 +- src/devices/cpu/tms1000/tms1k_base.cpp | 4 +- src/devices/cpu/tms1000/tms1k_base.h | 2 +- src/devices/cpu/tms32010/tms32010.cpp | 4 +- src/devices/cpu/tms32010/tms32010.h | 2 +- src/devices/cpu/tms32025/tms32025.cpp | 4 +- src/devices/cpu/tms32025/tms32025.h | 2 +- src/devices/cpu/tms32031/tms32031.cpp | 4 +- src/devices/cpu/tms32031/tms32031.h | 2 +- src/devices/cpu/tms32051/tms32051.cpp | 4 +- src/devices/cpu/tms32051/tms32051.h | 2 +- src/devices/cpu/tms32082/tms32082.cpp | 8 +-- src/devices/cpu/tms32082/tms32082.h | 4 +- src/devices/cpu/tms34010/tms34010.cpp | 4 +- src/devices/cpu/tms34010/tms34010.h | 2 +- src/devices/cpu/tms57002/tms57002.cpp | 4 +- src/devices/cpu/tms57002/tms57002.h | 2 +- src/devices/cpu/tms7000/tms7000.cpp | 4 +- src/devices/cpu/tms7000/tms7000.h | 2 +- src/devices/cpu/tms9900/ti990_10.cpp | 4 +- src/devices/cpu/tms9900/ti990_10.h | 2 +- src/devices/cpu/tms9900/tms9900.cpp | 4 +- src/devices/cpu/tms9900/tms9900.h | 2 +- src/devices/cpu/tms9900/tms9995.cpp | 4 +- src/devices/cpu/tms9900/tms9995.h | 2 +- src/devices/cpu/ucom4/ucom4.cpp | 4 +- src/devices/cpu/ucom4/ucom4.h | 2 +- src/devices/cpu/unsp/unsp.cpp | 4 +- src/devices/cpu/unsp/unsp.h | 2 +- src/devices/cpu/upd7725/upd7725.cpp | 4 +- src/devices/cpu/upd7725/upd7725.h | 2 +- src/devices/cpu/upd7810/upd7810.cpp | 4 +- src/devices/cpu/upd7810/upd7810.h | 2 +- src/devices/cpu/v30mz/v30mz.cpp | 4 +- src/devices/cpu/v30mz/v30mz.h | 2 +- src/devices/cpu/v60/v60.cpp | 4 +- src/devices/cpu/v60/v60.h | 2 +- src/devices/cpu/v810/v810.cpp | 4 +- src/devices/cpu/v810/v810.h | 2 +- src/devices/cpu/z180/z180.cpp | 6 +- src/devices/cpu/z180/z180.h | 2 +- src/devices/cpu/z8/z8.cpp | 4 +- src/devices/cpu/z8/z8.h | 2 +- src/devices/cpu/z80/tmpz84c011.cpp | 2 +- src/devices/cpu/z80/tmpz84c011.h | 2 +- src/devices/cpu/z80/tmpz84c015.cpp | 2 +- src/devices/cpu/z80/tmpz84c015.h | 2 +- src/devices/cpu/z80/z80.cpp | 6 +- src/devices/cpu/z80/z80.h | 2 +- src/devices/cpu/z8000/z8000.cpp | 8 +-- src/devices/cpu/z8000/z8000.h | 4 +- src/devices/machine/at28c16.cpp | 4 +- src/devices/machine/at28c16.h | 2 +- src/devices/machine/bankdev.cpp | 4 +- src/devices/machine/bankdev.h | 2 +- src/devices/machine/er2055.cpp | 4 +- src/devices/machine/er2055.h | 2 +- src/devices/machine/gt64xxx.cpp | 2 +- src/devices/machine/gt64xxx.h | 2 +- src/devices/machine/i8155.cpp | 4 +- src/devices/machine/i8155.h | 2 +- src/devices/machine/linflash.cpp | 4 +- src/devices/machine/linflash.h | 2 +- src/devices/machine/mcf5206e.cpp | 4 +- src/devices/machine/mcf5206e.h | 2 +- src/devices/machine/netlist.cpp | 4 +- src/devices/machine/netlist.h | 2 +- src/devices/machine/pci.cpp | 4 +- src/devices/machine/pci.h | 2 +- src/devices/machine/tc009xlvc.cpp | 4 +- src/devices/machine/tc009xlvc.h | 2 +- src/devices/machine/tmp68301.cpp | 4 +- src/devices/machine/tmp68301.h | 2 +- src/devices/machine/vrc4373.cpp | 2 +- src/devices/machine/vrc4373.h | 2 +- src/devices/machine/vrc5074.cpp | 2 +- src/devices/machine/vrc5074.h | 2 +- src/devices/machine/x2212.cpp | 4 +- src/devices/machine/x2212.h | 2 +- src/devices/sound/cdp1869.cpp | 4 +- src/devices/sound/cdp1869.h | 2 +- src/devices/sound/dave.cpp | 4 +- src/devices/sound/dave.h | 2 +- src/devices/sound/mos6560.cpp | 4 +- src/devices/sound/mos6560.h | 2 +- src/devices/sound/mos7360.cpp | 4 +- src/devices/sound/mos7360.h | 2 +- src/devices/sound/upd7752.cpp | 4 +- src/devices/sound/upd7752.h | 2 +- src/devices/video/315_5124.cpp | 4 +- src/devices/video/315_5124.h | 2 +- src/devices/video/cesblit.cpp | 4 +- src/devices/video/cesblit.h | 2 +- src/devices/video/crt9007.cpp | 4 +- src/devices/video/crt9007.h | 2 +- src/devices/video/ef9345.cpp | 4 +- src/devices/video/ef9345.h | 2 +- src/devices/video/ef9364.cpp | 4 +- src/devices/video/ef9364.h | 2 +- src/devices/video/ef9365.cpp | 4 +- src/devices/video/ef9365.h | 2 +- src/devices/video/hd61830.cpp | 4 +- src/devices/video/hd61830.h | 2 +- src/devices/video/hd63484.cpp | 4 +- src/devices/video/hd63484.h | 2 +- src/devices/video/hd66421.cpp | 4 +- src/devices/video/hd66421.h | 2 +- src/devices/video/huc6271.cpp | 4 +- src/devices/video/huc6271.h | 2 +- src/devices/video/huc6272.cpp | 4 +- src/devices/video/huc6272.h | 2 +- src/devices/video/m50458.cpp | 4 +- src/devices/video/m50458.h | 2 +- src/devices/video/mb90082.cpp | 4 +- src/devices/video/mb90082.h | 2 +- src/devices/video/mb_vcu.cpp | 4 +- src/devices/video/mb_vcu.h | 2 +- src/devices/video/mc6845.cpp | 4 +- src/devices/video/mc6845.h | 2 +- src/devices/video/mos6566.cpp | 4 +- src/devices/video/mos6566.h | 2 +- src/devices/video/msm6255.cpp | 4 +- src/devices/video/msm6255.h | 2 +- src/devices/video/ppu2c0x.cpp | 4 +- src/devices/video/ppu2c0x.h | 2 +- src/devices/video/ramdac.cpp | 4 +- src/devices/video/ramdac.h | 2 +- src/devices/video/scn2674.cpp | 4 +- src/devices/video/scn2674.h | 2 +- src/devices/video/sed1330.cpp | 4 +- src/devices/video/sed1330.h | 2 +- src/devices/video/tms3556.cpp | 4 +- src/devices/video/tms3556.h | 2 +- src/devices/video/tms9928a.cpp | 4 +- src/devices/video/tms9928a.h | 2 +- src/devices/video/upd7220.cpp | 4 +- src/devices/video/upd7220.h | 2 +- src/devices/video/upd7227.cpp | 4 +- src/devices/video/upd7227.h | 2 +- src/devices/video/v9938.cpp | 4 +- src/devices/video/v9938.h | 2 +- src/emu/dimemory.cpp | 33 +++++----- src/emu/dimemory.h | 7 ++- src/emu/dirom.cpp | 4 +- src/emu/dirom.h | 2 +- src/emu/emumem.cpp | 13 ---- src/emu/emumem.h | 1 - src/emu/machine.cpp | 6 +- src/emu/machine.h | 2 +- src/mame/audio/turrett.cpp | 4 +- src/mame/drivers/galgames.cpp | 6 +- src/mame/drivers/intellec4.cpp | 46 +++++--------- src/mame/drivers/pinkiri8.cpp | 6 +- src/mame/drivers/vgmplay.cpp | 6 +- src/mame/includes/turrett.h | 2 +- src/mame/machine/abc1600mac.cpp | 4 +- src/mame/machine/abc1600mac.h | 2 +- src/mame/machine/c117.cpp | 4 +- src/mame/machine/c117.h | 2 +- src/mame/machine/cammu.cpp | 4 +- src/mame/machine/cammu.h | 2 +- src/mame/machine/namco_c139.cpp | 4 +- src/mame/machine/namco_c139.h | 2 +- src/mame/machine/prof80mmu.cpp | 4 +- src/mame/machine/prof80mmu.h | 2 +- src/mame/machine/seicop.cpp | 4 +- src/mame/machine/seicop.h | 2 +- src/mame/machine/st0016.cpp | 4 +- src/mame/machine/st0016.h | 2 +- src/mame/video/abc1600.cpp | 4 +- src/mame/video/abc1600.h | 2 +- src/mame/video/c45.cpp | 4 +- src/mame/video/c45.h | 2 +- src/mame/video/gp9001.cpp | 4 +- src/mame/video/gp9001.h | 2 +- src/mame/video/igs017_igs031.cpp | 4 +- src/mame/video/igs017_igs031.h | 2 +- src/mame/video/nick.cpp | 4 +- src/mame/video/nick.h | 2 +- src/mame/video/seibu_crtc.cpp | 4 +- src/mame/video/seibu_crtc.h | 2 +- src/mame/video/ygv608.cpp | 4 +- src/mame/video/ygv608.h | 2 +- src/mame/video/zx8301.cpp | 4 +- src/mame/video/zx8301.h | 2 +- 404 files changed, 792 insertions(+), 690 deletions(-) diff --git a/src/devices/bus/intellec4/intellec4.cpp b/src/devices/bus/intellec4/intellec4.cpp index d45ba58a76f..249e18ca501 100644 --- a/src/devices/bus/intellec4/intellec4.cpp +++ b/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(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(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(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(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(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(); diff --git a/src/devices/bus/intellec4/intellec4.h b/src/devices/bus/intellec4/intellec4.h index b7b2d8d8704..2f5c418ec8d 100644 --- a/src/devices/bus/intellec4/intellec4.h +++ b/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 static devcb_base &set_stop_out_cb(device_t &device, Obj &&cb) { return downcast(device).m_stop_out_cb.set_callback(std::forward(cb)); } template 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 m_rom_device, m_rom_ports_device; + required_device 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; diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp index 88822b1f78e..bb7dc721d96 100644 --- a/src/devices/bus/isa/isa.cpp +++ b/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> isa8_device::memory_space_config() const +device_memory_interface::space_config_vector isa8_device::memory_space_config() const { - return std::vector> { + 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> isa8_device::memory_sp }; } -std::vector> isa16_device::memory_space_config() const +device_memory_interface::space_config_vector isa16_device::memory_space_config() const { - return std::vector> { + 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), diff --git a/src/devices/bus/isa/isa.h b/src/devices/bus/isa/isa.h index 2675d660b24..32b344fdbb3 100644 --- a/src/devices/bus/isa/isa.h +++ b/src/devices/bus/isa/isa.h @@ -211,7 +211,7 @@ public: template static devcb_base &set_out_drq3_callback(device_t &device, Object &&cb) { return downcast(device).m_out_drq3_cb.set_callback(std::forward(cb)); } // for ISA8, put the 8-bit configs in the primary slots and the 16-bit configs in the secondary - virtual std::vector> 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 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> 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 ); diff --git a/src/devices/bus/vme/vme.cpp b/src/devices/bus/vme/vme.cpp index 7c79fc99cf3..c27f4a44da4 100644 --- a/src/devices/bus/vme/vme.cpp +++ b/src/devices/bus/vme/vme.cpp @@ -205,9 +205,9 @@ SLOT_INTERFACE_END DEFINE_DEVICE_TYPE(VME, vme_device, "vme", "VME bus") -std::vector> vme_device::memory_space_config() const +device_memory_interface::space_config_vector vme_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_a32_config) }; } diff --git a/src/devices/bus/vme/vme.h b/src/devices/bus/vme/vme.h index 0352bc8c2f9..354a1f38978 100644 --- a/src/devices/bus/vme/vme.h +++ b/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> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; const address_space_config m_a32_config; diff --git a/src/devices/cpu/8x300/8x300.cpp b/src/devices/cpu/8x300/8x300.cpp index 63259adb8ae..44bb9b34fe6 100644 --- a/src/devices/cpu/8x300/8x300.cpp +++ b/src/devices/cpu/8x300/8x300.cpp @@ -47,9 +47,9 @@ n8x300_cpu_device::n8x300_cpu_device(const machine_config &mconfig, const char * { } -std::vector> n8x300_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector n8x300_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/8x300/8x300.h b/src/devices/cpu/8x300/8x300.h index 86910fdccca..5bba395cca6 100644 --- a/src/devices/cpu/8x300/8x300.h +++ b/src/devices/cpu/8x300/8x300.h @@ -60,7 +60,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; } diff --git a/src/devices/cpu/adsp2100/adsp2100.cpp b/src/devices/cpu/adsp2100/adsp2100.cpp index c9a049991b7..d0c10e06dce 100644 --- a/src/devices/cpu/adsp2100/adsp2100.cpp +++ b/src/devices/cpu/adsp2100/adsp2100.cpp @@ -649,25 +649,25 @@ void adsp21xx_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> adsp2100_device::memory_space_config() const +device_memory_interface::space_config_vector adsp2100_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; } -std::vector> adsp2101_device::memory_space_config() const +device_memory_interface::space_config_vector adsp2101_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; } -std::vector> adsp2181_device::memory_space_config() const +device_memory_interface::space_config_vector adsp2181_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/adsp2100/adsp2100.h b/src/devices/cpu/adsp2100/adsp2100.h index df8bb9f1bc8..faaddcdcc10 100644 --- a/src/devices/cpu/adsp2100/adsp2100.h +++ b/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> 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> 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> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // interrupts virtual bool generate_irq(int which, int indx) override; diff --git a/src/devices/cpu/alph8201/alph8201.cpp b/src/devices/cpu/alph8201/alph8201.cpp index 2a0e76ddbe4..5dc141d7d82 100644 --- a/src/devices/cpu/alph8201/alph8201.cpp +++ b/src/devices/cpu/alph8201/alph8201.cpp @@ -203,9 +203,9 @@ alpha8301_cpu_device::alpha8301_cpu_device(const machine_config &mconfig, const { } -std::vector> alpha8201_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector alpha8201_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/alph8201/alph8201.h b/src/devices/cpu/alph8201/alph8201.h index b355c6f514b..93640f17301 100644 --- a/src/devices/cpu/alph8201/alph8201.h +++ b/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> 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; diff --git a/src/devices/cpu/alto2/alto2cpu.cpp b/src/devices/cpu/alto2/alto2cpu.cpp index b6ea55047e4..fd7a1f6dede 100644 --- a/src/devices/cpu/alto2/alto2cpu.cpp +++ b/src/devices/cpu/alto2/alto2cpu.cpp @@ -794,9 +794,9 @@ static const prom_load_t pl_madr_a91 = // device_memory_interface overrides //------------------------------------------------- -std::vector> alto2_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector alto2_cpu_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/alto2/alto2cpu.h b/src/devices/cpu/alto2/alto2cpu.h index 04d37363ec4..f71b183b52a 100644 --- a/src/devices/cpu/alto2/alto2cpu.h +++ b/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> 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; diff --git a/src/devices/cpu/am29000/am29000.cpp b/src/devices/cpu/am29000/am29000.cpp index d3826de0c17..cd0d4624d9c 100644 --- a/src/devices/cpu/am29000/am29000.cpp +++ b/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> am29000_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector am29000_cpu_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/am29000/am29000.h b/src/devices/cpu/am29000/am29000.h index 4a58d5d4adb..084b0fdd995 100644 --- a/src/devices/cpu/am29000/am29000.h +++ b/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> 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; diff --git a/src/devices/cpu/amis2000/amis2000.cpp b/src/devices/cpu/amis2000/amis2000.cpp index 16f490d2453..457a99ead5d 100644 --- a/src/devices/cpu/amis2000/amis2000.cpp +++ b/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> amis2000_base_device::memory_space_config() const +device_memory_interface::space_config_vector amis2000_base_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/amis2000/amis2000.h b/src/devices/cpu/amis2000/amis2000.h index 1d90f1c64f1..e3caee13b14 100644 --- a/src/devices/cpu/amis2000/amis2000.h +++ b/src/devices/cpu/amis2000/amis2000.h @@ -84,7 +84,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; } diff --git a/src/devices/cpu/apexc/apexc.cpp b/src/devices/cpu/apexc/apexc.cpp index c0e7a99364f..e26c6c094b4 100644 --- a/src/devices/cpu/apexc/apexc.cpp +++ b/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> apexc_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector apexc_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/apexc/apexc.h b/src/devices/cpu/apexc/apexc.h index 9175ca92333..76a91a98207 100644 --- a/src/devices/cpu/apexc/apexc.h +++ b/src/devices/cpu/apexc/apexc.h @@ -34,7 +34,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/arc/arc.h b/src/devices/cpu/arc/arc.h index b240027716a..cf244c8f5b2 100644 --- a/src/devices/cpu/arc/arc.h +++ b/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> 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; diff --git a/src/devices/cpu/arcompact/arcompact.cpp b/src/devices/cpu/arcompact/arcompact.cpp index 01cf3746e38..79ae7c6d6c6 100644 --- a/src/devices/cpu/arcompact/arcompact.cpp +++ b/src/devices/cpu/arcompact/arcompact.cpp @@ -56,9 +56,9 @@ arcompact_device::arcompact_device(const machine_config &mconfig, const char *ta { } -std::vector> arcompact_device::memory_space_config() const +device_memory_interface::space_config_vector arcompact_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/arcompact/arcompact.h b/src/devices/cpu/arcompact/arcompact.h index 26868114a20..0a88fc119bf 100644 --- a/src/devices/cpu/arcompact/arcompact.h +++ b/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> 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; diff --git a/src/devices/cpu/arm/arm.cpp b/src/devices/cpu/arm/arm.cpp index 8b0fe10351a..077f693b144 100644 --- a/src/devices/cpu/arm/arm.cpp +++ b/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> arm_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector arm_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/arm/arm.h b/src/devices/cpu/arm/arm.h index 37f11f5fb9b..2de5fb3a39b 100644 --- a/src/devices/cpu/arm/arm.h +++ b/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> 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; diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp index 362fd95819c..314003c8bdb 100644 --- a/src/devices/cpu/arm7/arm7.cpp +++ b/src/devices/cpu/arm7/arm7.cpp @@ -118,9 +118,9 @@ sa1110_cpu_device::sa1110_cpu_device(const machine_config &mconfig, const char * { } -std::vector> arm7_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector arm7_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/arm7/arm7.h b/src/devices/cpu/arm7/arm7.h index 49379f4df6c..7ee80f91fdd 100644 --- a/src/devices/cpu/arm7/arm7.h +++ b/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> 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 diff --git a/src/devices/cpu/arm7/lpc210x.cpp b/src/devices/cpu/arm7/lpc210x.cpp index 87ad3310ed3..fd4a375a102 100644 --- a/src/devices/cpu/arm7/lpc210x.cpp +++ b/src/devices/cpu/arm7/lpc210x.cpp @@ -66,9 +66,9 @@ WRITE32_MEMBER(lpc210x_device::flash_w) } -std::vector> lpc210x_device::memory_space_config() const +device_memory_interface::space_config_vector lpc210x_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/arm7/lpc210x.h b/src/devices/cpu/arm7/lpc210x.h index 1b52af81f60..d00abe84536 100644 --- a/src/devices/cpu/arm7/lpc210x.h +++ b/src/devices/cpu/arm7/lpc210x.h @@ -77,7 +77,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; uint32_t m_TxPR[2]; diff --git a/src/devices/cpu/asap/asap.cpp b/src/devices/cpu/asap/asap.cpp index c235f45d5b5..e808f3fbb6c 100644 --- a/src/devices/cpu/asap/asap.cpp +++ b/src/devices/cpu/asap/asap.cpp @@ -235,9 +235,9 @@ void asap_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> asap_device::memory_space_config() const +device_memory_interface::space_config_vector asap_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/asap/asap.h b/src/devices/cpu/asap/asap.h index 0ddbf286d8c..55d78d5b6cf 100644 --- a/src/devices/cpu/asap/asap.h +++ b/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> 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; diff --git a/src/devices/cpu/avr8/avr8.cpp b/src/devices/cpu/avr8/avr8.cpp index e047e2c16c3..763cdad799e 100644 --- a/src/devices/cpu/avr8/avr8.cpp +++ b/src/devices/cpu/avr8/avr8.cpp @@ -876,9 +876,9 @@ void avr8_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> avr8_device::memory_space_config() const +device_memory_interface::space_config_vector avr8_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/avr8/avr8.h b/src/devices/cpu/avr8/avr8.h index 02d64216c87..0da73a4cc1c 100644 --- a/src/devices/cpu/avr8/avr8.h +++ b/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> 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; diff --git a/src/devices/cpu/capricorn/capricorn.cpp b/src/devices/cpu/capricorn/capricorn.cpp index 3faa132b5f3..b25800a6541 100644 --- a/src/devices/cpu/capricorn/capricorn.cpp +++ b/src/devices/cpu/capricorn/capricorn.cpp @@ -216,9 +216,9 @@ void capricorn_cpu_device::execute_set_input(int linenum, int state) } } -std::vector> capricorn_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector capricorn_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/capricorn/capricorn.h b/src/devices/cpu/capricorn/capricorn.h index 3519a5b95db..7cf11b7f0ae 100644 --- a/src/devices/cpu/capricorn/capricorn.h +++ b/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> 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; diff --git a/src/devices/cpu/ccpu/ccpu.cpp b/src/devices/cpu/ccpu/ccpu.cpp index bbace924e05..cc13d8e9125 100644 --- a/src/devices/cpu/ccpu/ccpu.cpp +++ b/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> ccpu_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector ccpu_cpu_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/ccpu/ccpu.h b/src/devices/cpu/ccpu/ccpu.h index 4b5753c9547..3a74c21a1fe 100644 --- a/src/devices/cpu/ccpu/ccpu.h +++ b/src/devices/cpu/ccpu/ccpu.h @@ -72,7 +72,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/clipper/clipper.cpp b/src/devices/cpu/clipper/clipper.cpp index ab98d1c8007..abbafaf2c72 100644 --- a/src/devices/cpu/clipper/clipper.cpp +++ b/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> clipper_device::memory_space_config() const +device_memory_interface::space_config_vector clipper_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_insn_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/clipper/clipper.h b/src/devices/cpu/clipper/clipper.h index a3756a5b7e1..0a95c77aa5d 100644 --- a/src/devices/cpu/clipper/clipper.h +++ b/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> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // device_state_interface overrides #if 0 diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp index 71e7b910444..630a93866ae 100644 --- a/src/devices/cpu/cop400/cop400.cpp +++ b/src/devices/cpu/cop400/cop400.cpp @@ -314,9 +314,9 @@ cop446c_cpu_device::cop446c_cpu_device(const machine_config &mconfig, const char { } -std::vector> cop400_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector cop400_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/cop400/cop400.h b/src/devices/cpu/cop400/cop400.h index 1d7b665291d..1db27e77228 100644 --- a/src/devices/cpu/cop400/cop400.h +++ b/src/devices/cpu/cop400/cop400.h @@ -157,7 +157,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/cosmac/cosmac.cpp b/src/devices/cpu/cosmac/cosmac.cpp index 6fe11bf4228..e2a9af45213 100644 --- a/src/devices/cpu/cosmac/cosmac.cpp +++ b/src/devices/cpu/cosmac/cosmac.cpp @@ -408,9 +408,9 @@ void cosmac_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> cosmac_device::memory_space_config() const +device_memory_interface::space_config_vector cosmac_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/cosmac/cosmac.h b/src/devices/cpu/cosmac/cosmac.h index 32c396e5a0b..44182d94224 100644 --- a/src/devices/cpu/cosmac/cosmac.h +++ b/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> 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; diff --git a/src/devices/cpu/cp1610/cp1610.cpp b/src/devices/cpu/cp1610/cp1610.cpp index 3b9be656b32..5a113b4e954 100644 --- a/src/devices/cpu/cp1610/cp1610.cpp +++ b/src/devices/cpu/cp1610/cp1610.cpp @@ -3401,9 +3401,9 @@ cp1610_cpu_device::cp1610_cpu_device(const machine_config &mconfig, const char * { } -std::vector> cp1610_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector cp1610_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/cp1610/cp1610.h b/src/devices/cpu/cp1610/cp1610.h index 22e9b06375b..c3a844189e3 100644 --- a/src/devices/cpu/cp1610/cp1610.h +++ b/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> 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; diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp index cc137ff5273..9c3652fd40e 100644 --- a/src/devices/cpu/cubeqcpu/cubeqcpu.cpp +++ b/src/devices/cpu/cubeqcpu/cubeqcpu.cpp @@ -83,9 +83,9 @@ cquestsnd_cpu_device::cquestsnd_cpu_device(const machine_config &mconfig, const { } -std::vector> cquestsnd_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector cquestsnd_cpu_device::memory_space_config() const { - return std::vector> { + 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> cquestlin_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector cquestlin_cpu_device::memory_space_config() const { - return std::vector> { + 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> cquestrot_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector cquestrot_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/cubeqcpu/cubeqcpu.h b/src/devices/cpu/cubeqcpu/cubeqcpu.h index 0f1ddc56b76..de80a2830d5 100644 --- a/src/devices/cpu/cubeqcpu/cubeqcpu.h +++ b/src/devices/cpu/cubeqcpu/cubeqcpu.h @@ -84,7 +84,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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> 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> 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; diff --git a/src/devices/cpu/dsp16/dsp16.cpp b/src/devices/cpu/dsp16/dsp16.cpp index fa8c3cb1d2e..4426502cdf7 100644 --- a/src/devices/cpu/dsp16/dsp16.cpp +++ b/src/devices/cpu/dsp16/dsp16.cpp @@ -201,9 +201,9 @@ void dsp16_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> dsp16_device::memory_space_config() const +device_memory_interface::space_config_vector dsp16_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/dsp16/dsp16.h b/src/devices/cpu/dsp16/dsp16.h index 75cda324cbc..fd41dd03ef1 100644 --- a/src/devices/cpu/dsp16/dsp16.h +++ b/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> 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; diff --git a/src/devices/cpu/dsp32/dsp32.cpp b/src/devices/cpu/dsp32/dsp32.cpp index abfdcee2953..e91a0fddf29 100644 --- a/src/devices/cpu/dsp32/dsp32.cpp +++ b/src/devices/cpu/dsp32/dsp32.cpp @@ -305,9 +305,9 @@ void dsp32c_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> dsp32c_device::memory_space_config() const +device_memory_interface::space_config_vector dsp32c_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/dsp32/dsp32.h b/src/devices/cpu/dsp32/dsp32.h index 1c27014a6d5..b11f5ad1d89 100644 --- a/src/devices/cpu/dsp32/dsp32.h +++ b/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> 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; diff --git a/src/devices/cpu/dsp56k/dsp56k.cpp b/src/devices/cpu/dsp56k/dsp56k.cpp index e5df7bec204..c84948701ef 100644 --- a/src/devices/cpu/dsp56k/dsp56k.cpp +++ b/src/devices/cpu/dsp56k/dsp56k.cpp @@ -127,9 +127,9 @@ dsp56k_device::dsp56k_device(const machine_config &mconfig, const char *tag, dev { } -std::vector> dsp56k_device::memory_space_config() const +device_memory_interface::space_config_vector dsp56k_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/dsp56k/dsp56k.h b/src/devices/cpu/dsp56k/dsp56k.h index 1cacdd75d2d..4ab93b9b9ca 100644 --- a/src/devices/cpu/dsp56k/dsp56k.h +++ b/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> 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; diff --git a/src/devices/cpu/e0c6200/e0c6200.cpp b/src/devices/cpu/e0c6200/e0c6200.cpp index 2a50105187d..ad4e99ba8c6 100644 --- a/src/devices/cpu/e0c6200/e0c6200.cpp +++ b/src/devices/cpu/e0c6200/e0c6200.cpp @@ -173,9 +173,9 @@ void e0c6200_cpu_device::do_interrupt() standard_irq_callback(m_irq_id); } -std::vector> e0c6200_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector e0c6200_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/e0c6200/e0c6200.h b/src/devices/cpu/e0c6200/e0c6200.h index 64b2d2974b6..2a8c02734ec 100644 --- a/src/devices/cpu/e0c6200/e0c6200.h +++ b/src/devices/cpu/e0c6200/e0c6200.h @@ -31,7 +31,7 @@ protected: virtual void do_interrupt(); // device_memory_interface overrides - virtual std::vector> 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; } diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp index a6ec074ce28..bfd8de0fc9a 100644 --- a/src/devices/cpu/e132xs/e132xs.cpp +++ b/src/devices/cpu/e132xs/e132xs.cpp @@ -1883,9 +1883,9 @@ void hyperstone_device::device_stop() // of the address spaces //------------------------------------------------- -std::vector> hyperstone_device::memory_space_config() const +device_memory_interface::space_config_vector hyperstone_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/e132xs/e132xs.h b/src/devices/cpu/e132xs/e132xs.h index 23c62f70e6f..fd168d9eb75 100644 --- a/src/devices/cpu/e132xs/e132xs.h +++ b/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> 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; diff --git a/src/devices/cpu/es5510/es5510.cpp b/src/devices/cpu/es5510/es5510.cpp index 71150b7974b..f8e81e4aeef 100644 --- a/src/devices/cpu/es5510/es5510.cpp +++ b/src/devices/cpu/es5510/es5510.cpp @@ -569,9 +569,9 @@ void es5510_device::device_reset() { memset(&ram_pp, 0, sizeof(ram_t)); } -std::vector> es5510_device::memory_space_config() const +device_memory_interface::space_config_vector es5510_device::memory_space_config() const { - return std::vector> { + return space_config_vector { }; } diff --git a/src/devices/cpu/es5510/es5510.h b/src/devices/cpu/es5510/es5510.h index acdb8f0ea05..56045a4e769 100644 --- a/src/devices/cpu/es5510/es5510.h +++ b/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> 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; diff --git a/src/devices/cpu/esrip/esrip.cpp b/src/devices/cpu/esrip/esrip.cpp index ae939ffe414..ee8416304c7 100644 --- a/src/devices/cpu/esrip/esrip.cpp +++ b/src/devices/cpu/esrip/esrip.cpp @@ -338,9 +338,9 @@ void esrip_device::device_stop() // the space doesn't exist //------------------------------------------------- -std::vector> esrip_device::memory_space_config() const +device_memory_interface::space_config_vector esrip_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), }; } diff --git a/src/devices/cpu/esrip/esrip.h b/src/devices/cpu/esrip/esrip.h index 086c2facafe..8aaa0f1d071 100644 --- a/src/devices/cpu/esrip/esrip.h +++ b/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> 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; diff --git a/src/devices/cpu/f8/f8.cpp b/src/devices/cpu/f8/f8.cpp index 6c34cde8c6c..4d5f420fe62 100644 --- a/src/devices/cpu/f8/f8.cpp +++ b/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> f8_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector f8_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/f8/f8.h b/src/devices/cpu/f8/f8.h index 336a86a124e..5be9090ec2b 100644 --- a/src/devices/cpu/f8/f8.h +++ b/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> 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; diff --git a/src/devices/cpu/g65816/g65816.cpp b/src/devices/cpu/g65816/g65816.cpp index 6eb6e0a568d..b121fba081a 100644 --- a/src/devices/cpu/g65816/g65816.cpp +++ b/src/devices/cpu/g65816/g65816.cpp @@ -117,9 +117,9 @@ g65816_device::g65816_device(const machine_config &mconfig, device_type type, co } -std::vector> g65816_device::memory_space_config() const +device_memory_interface::space_config_vector g65816_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/g65816/g65816.h b/src/devices/cpu/g65816/g65816.h index a9a48197155..67f21b780bc 100644 --- a/src/devices/cpu/g65816/g65816.h +++ b/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> 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; diff --git a/src/devices/cpu/h6280/h6280.cpp b/src/devices/cpu/h6280/h6280.cpp index 39d2f2d5b5a..c8a81af0532 100644 --- a/src/devices/cpu/h6280/h6280.cpp +++ b/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> h6280_device::memory_space_config() const +device_memory_interface::space_config_vector h6280_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/h6280/h6280.h b/src/devices/cpu/h6280/h6280.h index f2f1be5d86f..dc6a3ddb47f 100644 --- a/src/devices/cpu/h6280/h6280.h +++ b/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> 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 diff --git a/src/devices/cpu/h8/h8.cpp b/src/devices/cpu/h8/h8.cpp index 2631e7522e8..516c2253496 100644 --- a/src/devices/cpu/h8/h8.cpp +++ b/src/devices/cpu/h8/h8.cpp @@ -236,9 +236,9 @@ void h8_device::internal_update() internal_update(total_cycles()); } -std::vector> h8_device::memory_space_config() const +device_memory_interface::space_config_vector h8_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &program_config), std::make_pair(AS_IO, &io_config) }; diff --git a/src/devices/cpu/h8/h8.h b/src/devices/cpu/h8/h8.h index 8cc858109f2..3df33f8de1b 100644 --- a/src/devices/cpu/h8/h8.h +++ b/src/devices/cpu/h8/h8.h @@ -167,7 +167,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/hcd62121/hcd62121.cpp b/src/devices/cpu/hcd62121/hcd62121.cpp index 34a5f0cc768..92f3deaac88 100644 --- a/src/devices/cpu/hcd62121/hcd62121.cpp +++ b/src/devices/cpu/hcd62121/hcd62121.cpp @@ -73,9 +73,9 @@ hcd62121_cpu_device::hcd62121_cpu_device(const machine_config &mconfig, const ch { } -std::vector> hcd62121_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector hcd62121_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/hcd62121/hcd62121.h b/src/devices/cpu/hcd62121/hcd62121.h index 8b96502a6f3..ff43a2ac1dc 100644 --- a/src/devices/cpu/hcd62121/hcd62121.h +++ b/src/devices/cpu/hcd62121/hcd62121.h @@ -54,7 +54,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/hd61700/hd61700.cpp b/src/devices/cpu/hd61700/hd61700.cpp index 110366d4268..cc27d85850f 100644 --- a/src/devices/cpu/hd61700/hd61700.cpp +++ b/src/devices/cpu/hd61700/hd61700.cpp @@ -120,9 +120,9 @@ hd61700_cpu_device::hd61700_cpu_device(const machine_config &mconfig, const char { } -std::vector> hd61700_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector hd61700_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/hd61700/hd61700.h b/src/devices/cpu/hd61700/hd61700.h index dd7f78cfe37..dba81ba0205 100644 --- a/src/devices/cpu/hd61700/hd61700.h +++ b/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> 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; } diff --git a/src/devices/cpu/hmcs40/hmcs40.cpp b/src/devices/cpu/hmcs40/hmcs40.cpp index 265ca25b97d..2bc1860917c 100644 --- a/src/devices/cpu/hmcs40/hmcs40.cpp +++ b/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> hmcs40_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector hmcs40_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/hmcs40/hmcs40.h b/src/devices/cpu/hmcs40/hmcs40.h index 77004de1e24..33e439fc1f5 100644 --- a/src/devices/cpu/hmcs40/hmcs40.h +++ b/src/devices/cpu/hmcs40/hmcs40.h @@ -155,7 +155,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; } diff --git a/src/devices/cpu/hphybrid/hphybrid.cpp b/src/devices/cpu/hphybrid/hphybrid.cpp index 6cdfcaf945d..6eb3f4b83d6 100644 --- a/src/devices/cpu/hphybrid/hphybrid.cpp +++ b/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> 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> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/hphybrid/hphybrid.h b/src/devices/cpu/hphybrid/hphybrid.h index bdc096f90e7..5962942b64c 100644 --- a/src/devices/cpu/hphybrid/hphybrid.h +++ b/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> 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; diff --git a/src/devices/cpu/i386/i386.cpp b/src/devices/cpu/i386/i386.cpp index 10019d0c57b..4b4b8286818 100644 --- a/src/devices/cpu/i386/i386.cpp +++ b/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> i386_device::memory_space_config() const +device_memory_interface::space_config_vector i386_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/i386/i386.h b/src/devices/cpu/i386/i386.h index 6c8ba85f6eb..3701f6c6704 100644 --- a/src/devices/cpu/i386/i386.h +++ b/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> 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 diff --git a/src/devices/cpu/i8008/i8008.cpp b/src/devices/cpu/i8008/i8008.cpp index 5a17622b3e0..6baa28a766b 100644 --- a/src/devices/cpu/i8008/i8008.cpp +++ b/src/devices/cpu/i8008/i8008.cpp @@ -139,9 +139,9 @@ void i8008_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> i8008_device::memory_space_config() const +device_memory_interface::space_config_vector i8008_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/i8008/i8008.h b/src/devices/cpu/i8008/i8008.h index 80d4934f460..b6450fcf5e5 100644 --- a/src/devices/cpu/i8008/i8008.h +++ b/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> 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; diff --git a/src/devices/cpu/i8085/i8085.cpp b/src/devices/cpu/i8085/i8085.cpp index dcd27b68c39..75a2360dc63 100644 --- a/src/devices/cpu/i8085/i8085.cpp +++ b/src/devices/cpu/i8085/i8085.cpp @@ -211,9 +211,9 @@ i8080a_cpu_device::i8080a_cpu_device(const machine_config &mconfig, const char * { } -std::vector> i8085a_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector i8085a_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/i8085/i8085.h b/src/devices/cpu/i8085/i8085.h index 6cc71ca65e5..31d8b89e127 100644 --- a/src/devices/cpu/i8085/i8085.h +++ b/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> 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; diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp index 0be01115b6e..93a38ceea04 100644 --- a/src/devices/cpu/i8089/i8089.cpp +++ b/src/devices/cpu/i8089/i8089.cpp @@ -135,9 +135,9 @@ void i8089_device::device_reset() // space configurations //------------------------------------------------- -std::vector> i8089_device::memory_space_config() const +device_memory_interface::space_config_vector i8089_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/i8089/i8089.h b/src/devices/cpu/i8089/i8089.h index 0bb83c5d66d..3465c444e2a 100644 --- a/src/devices/cpu/i8089/i8089.h +++ b/src/devices/cpu/i8089/i8089.h @@ -76,7 +76,7 @@ protected: int m_icount; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp index 0ef1e83d732..ce8d0db83bd 100644 --- a/src/devices/cpu/i86/i186.cpp +++ b/src/devices/cpu/i86/i186.cpp @@ -149,16 +149,16 @@ i80186_cpu_device::i80186_cpu_device(const machine_config &mconfig, device_type { } -std::vector> 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> { + 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> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/i86/i186.h b/src/devices/cpu/i86/i186.h index 91d5f1c27bc..81990a481f6 100644 --- a/src/devices/cpu/i86/i186.h +++ b/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> 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); diff --git a/src/devices/cpu/i86/i286.cpp b/src/devices/cpu/i86/i286.cpp index 9d78bfc21e9..c3418b16efc 100644 --- a/src/devices/cpu/i86/i286.cpp +++ b/src/devices/cpu/i86/i286.cpp @@ -282,16 +282,16 @@ void i80286_cpu_device::device_start() m_out_shutdown_func.resolve_safe(); } -std::vector> 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> { + 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> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/i86/i286.h b/src/devices/cpu/i86/i286.h index 50aa61ec293..ad2447b78e7 100644 --- a/src/devices/cpu/i86/i286.h +++ b/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> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; typedef delegate a20_cb; static void static_set_a20_callback(device_t &device, a20_cb object) { downcast(device).m_a20_callback = object; } diff --git a/src/devices/cpu/i86/i86.cpp b/src/devices/cpu/i86/i86.cpp index aa0e2ab4266..d1fa1eb7f04 100644 --- a/src/devices/cpu/i86/i86.cpp +++ b/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> 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> { + 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> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/i86/i86.h b/src/devices/cpu/i86/i86.h index 38b0db568ab..8b7cc8138f5 100644 --- a/src/devices/cpu/i86/i86.h +++ b/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> 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); diff --git a/src/devices/cpu/i860/i860.cpp b/src/devices/cpu/i860/i860.cpp index 458b38389da..eb22a347f2a 100644 --- a/src/devices/cpu/i860/i860.cpp +++ b/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> i860_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector i860_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/i860/i860.h b/src/devices/cpu/i860/i860.h index a796723051b..3387244858e 100644 --- a/src/devices/cpu/i860/i860.h +++ b/src/devices/cpu/i860/i860.h @@ -73,7 +73,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/i960/i960.cpp b/src/devices/cpu/i960/i960.cpp index 946c5690ca5..dcffb837f95 100644 --- a/src/devices/cpu/i960/i960.cpp +++ b/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> i960_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector i960_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/i960/i960.h b/src/devices/cpu/i960/i960.h index 0ac065fbb68..76d60109cf4 100644 --- a/src/devices/cpu/i960/i960.h +++ b/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> 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; diff --git a/src/devices/cpu/ie15/ie15.cpp b/src/devices/cpu/ie15/ie15.cpp index 1a70df26a49..e09d99c51a8 100644 --- a/src/devices/cpu/ie15/ie15.cpp +++ b/src/devices/cpu/ie15/ie15.cpp @@ -88,9 +88,9 @@ void ie15_cpu_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> ie15_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector ie15_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/ie15/ie15.h b/src/devices/cpu/ie15/ie15.h index 50fbcb40f79..2a39a663fed 100644 --- a/src/devices/cpu/ie15/ie15.h +++ b/src/devices/cpu/ie15/ie15.h @@ -36,7 +36,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/jaguar/jaguar.cpp b/src/devices/cpu/jaguar/jaguar.cpp index 00055ffa6be..3b52ae1bfcc 100644 --- a/src/devices/cpu/jaguar/jaguar.cpp +++ b/src/devices/cpu/jaguar/jaguar.cpp @@ -173,9 +173,9 @@ jaguardsp_cpu_device::jaguardsp_cpu_device(const machine_config &mconfig, const { } -std::vector> jaguar_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector jaguar_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/jaguar/jaguar.h b/src/devices/cpu/jaguar/jaguar.h index 6d91160edb4..1bc5ddf8d64 100644 --- a/src/devices/cpu/jaguar/jaguar.h +++ b/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> 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; diff --git a/src/devices/cpu/lc8670/lc8670.cpp b/src/devices/cpu/lc8670/lc8670.cpp index 9b43643b4d6..0e851db758c 100644 --- a/src/devices/cpu/lc8670/lc8670.cpp +++ b/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> lc8670_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector lc8670_cpu_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/lc8670/lc8670.h b/src/devices/cpu/lc8670/lc8670.h index 10b4b155bc5..a6de4f7c98a 100644 --- a/src/devices/cpu/lc8670/lc8670.h +++ b/src/devices/cpu/lc8670/lc8670.h @@ -112,7 +112,7 @@ protected: virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; // device_memory_interface overrides - virtual std::vector> 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; } diff --git a/src/devices/cpu/lh5801/lh5801.cpp b/src/devices/cpu/lh5801/lh5801.cpp index 21d324474de..2b4a3708e44 100644 --- a/src/devices/cpu/lh5801/lh5801.cpp +++ b/src/devices/cpu/lh5801/lh5801.cpp @@ -74,9 +74,9 @@ lh5801_cpu_device::lh5801_cpu_device(const machine_config &mconfig, const char * { } -std::vector> lh5801_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector lh5801_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/lh5801/lh5801.h b/src/devices/cpu/lh5801/lh5801.h index 50e5775de21..bc9ce08cdd6 100644 --- a/src/devices/cpu/lh5801/lh5801.h +++ b/src/devices/cpu/lh5801/lh5801.h @@ -87,7 +87,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/lr35902/lr35902.cpp b/src/devices/cpu/lr35902/lr35902.cpp index dcfa1f34fa8..cab2e820802 100644 --- a/src/devices/cpu/lr35902/lr35902.cpp +++ b/src/devices/cpu/lr35902/lr35902.cpp @@ -86,9 +86,9 @@ lr35902_cpu_device::lr35902_cpu_device(const machine_config &mconfig, const char { } -std::vector> lr35902_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector lr35902_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/lr35902/lr35902.h b/src/devices/cpu/lr35902/lr35902.h index 9d6cc8c7149..9364599be27 100644 --- a/src/devices/cpu/lr35902/lr35902.h +++ b/src/devices/cpu/lr35902/lr35902.h @@ -83,7 +83,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/m37710/m37710.cpp b/src/devices/cpu/m37710/m37710.cpp index 754f1f0c2e9..4ca15275804 100644 --- a/src/devices/cpu/m37710/m37710.cpp +++ b/src/devices/cpu/m37710/m37710.cpp @@ -125,9 +125,9 @@ m37710s4_device::m37710s4_device(const machine_config &mconfig, const char *tag, { } -std::vector> m37710_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector m37710_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/m37710/m37710.h b/src/devices/cpu/m37710/m37710.h index 745f08fb42d..dfcfc92bd12 100644 --- a/src/devices/cpu/m37710/m37710.h +++ b/src/devices/cpu/m37710/m37710.h @@ -112,7 +112,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/m6502/deco16.cpp b/src/devices/cpu/m6502/deco16.cpp index 6d80bb6b5ab..163403228d9 100644 --- a/src/devices/cpu/m6502/deco16.cpp +++ b/src/devices/cpu/m6502/deco16.cpp @@ -40,16 +40,16 @@ void deco16_device::device_start() io = &space(AS_IO); } -std::vector> deco16_device::memory_space_config() const +device_memory_interface::space_config_vector deco16_device::memory_space_config() const { if(has_configured_map(AS_OPCODES)) - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &program_config), std::make_pair(AS_OPCODES, &sprogram_config), std::make_pair(AS_IO, &io_config) }; else - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &program_config), std::make_pair(AS_IO, &io_config) }; diff --git a/src/devices/cpu/m6502/deco16.h b/src/devices/cpu/m6502/deco16.h index 065937ea331..c3f55764553 100644 --- a/src/devices/cpu/m6502/deco16.h +++ b/src/devices/cpu/m6502/deco16.h @@ -27,7 +27,7 @@ protected: address_space *io; address_space_config io_config; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; virtual void device_start() override; #define O(o) void o ## _full(); void o ## _partial() diff --git a/src/devices/cpu/m6502/m3745x.cpp b/src/devices/cpu/m6502/m3745x.cpp index 62a4c3f655c..255de38af76 100644 --- a/src/devices/cpu/m6502/m3745x.cpp +++ b/src/devices/cpu/m6502/m3745x.cpp @@ -112,9 +112,9 @@ void m3745x_device::device_start() m_last_all_ints = 0; } -std::vector> m3745x_device::memory_space_config() const +device_memory_interface::space_config_vector m3745x_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/m6502/m3745x.h b/src/devices/cpu/m6502/m3745x.h index a9be38254f2..6805ee9e387 100644 --- a/src/devices/cpu/m6502/m3745x.h +++ b/src/devices/cpu/m6502/m3745x.h @@ -125,7 +125,7 @@ protected: virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void execute_set_input(int inputnum, int state) override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; void send_port(address_space &space, uint8_t offset, uint8_t data); uint8_t read_port(uint8_t offset); diff --git a/src/devices/cpu/m6502/m5074x.h b/src/devices/cpu/m6502/m5074x.h index 3947cb6d6f8..ee3ff0c0e23 100644 --- a/src/devices/cpu/m6502/m5074x.h +++ b/src/devices/cpu/m6502/m5074x.h @@ -101,7 +101,7 @@ protected: virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void execute_set_input(int inputnum, int state) override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; void send_port(address_space &space, uint8_t offset, uint8_t data); uint8_t read_port(uint8_t offset); diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp index 3e00e8b53da..f498ca87771 100644 --- a/src/devices/cpu/m6502/m6502.cpp +++ b/src/devices/cpu/m6502/m6502.cpp @@ -402,15 +402,15 @@ void m6502_device::execute_set_input(int inputnum, int state) } -std::vector> m6502_device::memory_space_config() const +device_memory_interface::space_config_vector m6502_device::memory_space_config() const { if(has_configured_map(AS_OPCODES)) - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &program_config), std::make_pair(AS_OPCODES, &sprogram_config) }; else - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &program_config) }; } diff --git a/src/devices/cpu/m6502/m6502.h b/src/devices/cpu/m6502/m6502.h index d636d5e9765..71bc63a534e 100644 --- a/src/devices/cpu/m6502/m6502.h +++ b/src/devices/cpu/m6502/m6502.h @@ -137,7 +137,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/m6800/m6800.cpp b/src/devices/cpu/m6800/m6800.cpp index 24f2d92eb6b..431421eb5eb 100644 --- a/src/devices/cpu/m6800/m6800.cpp +++ b/src/devices/cpu/m6800/m6800.cpp @@ -362,15 +362,15 @@ nsc8105_cpu_device::nsc8105_cpu_device(const machine_config &mconfig, const char { } -std::vector> m6800_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector m6800_cpu_device::memory_space_config() const { if(has_configured_map(AS_OPCODES)) - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_OPCODES, &m_decrypted_opcodes_config) }; else - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/m6800/m6800.h b/src/devices/cpu/m6800/m6800.h index 09ac5b86c98..d541deba9ac 100644 --- a/src/devices/cpu/m6800/m6800.h +++ b/src/devices/cpu/m6800/m6800.h @@ -59,7 +59,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/m6800/m6801.cpp b/src/devices/cpu/m6800/m6801.cpp index 0f806c448fa..185853cc7b4 100644 --- a/src/devices/cpu/m6800/m6801.cpp +++ b/src/devices/cpu/m6800/m6801.cpp @@ -294,7 +294,7 @@ hd6303y_cpu_device::hd6303y_cpu_device(const machine_config &mconfig, const char { } -std::vector> m6801_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector m6801_cpu_device::memory_space_config() const { auto r = m6800_cpu_device::memory_space_config(); r.emplace_back(std::make_pair(AS_IO, &m_io_config)); diff --git a/src/devices/cpu/m6800/m6801.h b/src/devices/cpu/m6800/m6801.h index 2211a4f0421..3d2098d1f94 100644 --- a/src/devices/cpu/m6800/m6801.h +++ b/src/devices/cpu/m6800/m6801.h @@ -84,7 +84,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // device_disasm_interface overrides virtual offs_t disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h index 0ad63651d6a..776f097967c 100644 --- a/src/devices/cpu/m68000/m68000.h +++ b/src/devices/cpu/m68000/m68000.h @@ -149,7 +149,7 @@ public: virtual void device_stop() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // address spaces const address_space_config m_program_config, m_oprogram_config; diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp index 0c03bb615fb..c4199ecdf15 100644 --- a/src/devices/cpu/m68000/m68kcpu.cpp +++ b/src/devices/cpu/m68000/m68kcpu.cpp @@ -2483,15 +2483,15 @@ void m68000_base_device::execute_set_input(int inputnum, int state) } -std::vector> m68000_base_device::memory_space_config() const +device_memory_interface::space_config_vector m68000_base_device::memory_space_config() const { if(has_configured_map(AS_OPCODES)) - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_OPCODES, &m_oprogram_config) }; else - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/m6805/m6805.cpp b/src/devices/cpu/m6805/m6805.cpp index 4d3009b0c8c..eb80246e368 100644 --- a/src/devices/cpu/m6805/m6805.cpp +++ b/src/devices/cpu/m6805/m6805.cpp @@ -319,9 +319,9 @@ void m6805_base_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> m6805_base_device::memory_space_config() const +device_memory_interface::space_config_vector m6805_base_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/m6805/m6805.h b/src/devices/cpu/m6805/m6805.h index b71aabb105a..fb8fc97dee3 100644 --- a/src/devices/cpu/m6805/m6805.h +++ b/src/devices/cpu/m6805/m6805.h @@ -116,7 +116,7 @@ protected: virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp index 573da2d477f..584af3e4912 100644 --- a/src/devices/cpu/m6809/m6809.cpp +++ b/src/devices/cpu/m6809/m6809.cpp @@ -292,15 +292,15 @@ void m6809_base_device::device_post_load() // the space doesn't exist //------------------------------------------------- -std::vector> m6809_base_device::memory_space_config() const +device_memory_interface::space_config_vector m6809_base_device::memory_space_config() const { if(has_configured_map(AS_OPCODES)) - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_OPCODES, &m_sprogram_config) }; else - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/m6809/m6809.h b/src/devices/cpu/m6809/m6809.h index 4d67d7977a2..29d1acbcf9e 100644 --- a/src/devices/cpu/m6809/m6809.h +++ b/src/devices/cpu/m6809/m6809.h @@ -68,7 +68,7 @@ protected: virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/mb86233/mb86233.cpp b/src/devices/cpu/mb86233/mb86233.cpp index b071a964c51..526ac63e208 100644 --- a/src/devices/cpu/mb86233/mb86233.cpp +++ b/src/devices/cpu/mb86233/mb86233.cpp @@ -37,9 +37,9 @@ mb86233_cpu_device::mb86233_cpu_device(const machine_config &mconfig, const char { } -std::vector> mb86233_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector mb86233_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/mb86233/mb86233.h b/src/devices/cpu/mb86233/mb86233.h index 3d1383e874d..c60aabd987e 100644 --- a/src/devices/cpu/mb86233/mb86233.h +++ b/src/devices/cpu/mb86233/mb86233.h @@ -71,7 +71,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/mb86235/mb86235.cpp b/src/devices/cpu/mb86235/mb86235.cpp index 781a848f712..223b27db6d3 100644 --- a/src/devices/cpu/mb86235/mb86235.cpp +++ b/src/devices/cpu/mb86235/mb86235.cpp @@ -215,9 +215,9 @@ mb86235_device::mb86235_device(const machine_config &mconfig, const char *tag, d { } -std::vector> mb86235_device::memory_space_config() const +device_memory_interface::space_config_vector mb86235_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_dataa_config), std::make_pair(AS_IO, &m_datab_config) diff --git a/src/devices/cpu/mb86235/mb86235.h b/src/devices/cpu/mb86235/mb86235.h index 99864e9aec5..ebe151213da 100644 --- a/src/devices/cpu/mb86235/mb86235.h +++ b/src/devices/cpu/mb86235/mb86235.h @@ -65,7 +65,7 @@ protected: //virtual void execute_set_input(int inputnum, int state); // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/mb88xx/mb88xx.cpp b/src/devices/cpu/mb88xx/mb88xx.cpp index eb0e3ebc422..b896a07c6cf 100644 --- a/src/devices/cpu/mb88xx/mb88xx.cpp +++ b/src/devices/cpu/mb88xx/mb88xx.cpp @@ -154,9 +154,9 @@ mb8844_cpu_device::mb8844_cpu_device(const machine_config &mconfig, const char * { } -std::vector> mb88_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector mb88_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/mb88xx/mb88xx.h b/src/devices/cpu/mb88xx/mb88xx.h index d3c5be393cc..f4485e47f26 100644 --- a/src/devices/cpu/mb88xx/mb88xx.h +++ b/src/devices/cpu/mb88xx/mb88xx.h @@ -157,7 +157,7 @@ protected: virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 6); } // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/mc68hc11/mc68hc11.cpp b/src/devices/cpu/mc68hc11/mc68hc11.cpp index 098d7c18c4d..1ecd2793529 100644 --- a/src/devices/cpu/mc68hc11/mc68hc11.cpp +++ b/src/devices/cpu/mc68hc11/mc68hc11.cpp @@ -53,9 +53,9 @@ mc68hc11_cpu_device::mc68hc11_cpu_device(const machine_config &mconfig, const ch { } -std::vector> mc68hc11_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector mc68hc11_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/mc68hc11/mc68hc11.h b/src/devices/cpu/mc68hc11/mc68hc11.h index 15d148cc6d5..e2a1f52f3d7 100644 --- a/src/devices/cpu/mc68hc11/mc68hc11.h +++ b/src/devices/cpu/mc68hc11/mc68hc11.h @@ -64,7 +64,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/mcs40/mcs40.cpp b/src/devices/cpu/mcs40/mcs40.cpp index 7c46fd09496..866587579d3 100644 --- a/src/devices/cpu/mcs40/mcs40.cpp +++ b/src/devices/cpu/mcs40/mcs40.cpp @@ -331,9 +331,9 @@ void mcs40_cpu_device_base::execute_run() device_memory_interface implementation ***********************************************************************/ -std::vector> mcs40_cpu_device_base::memory_space_config() const +device_memory_interface::space_config_vector mcs40_cpu_device_base::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_ROM, &m_space_config[AS_ROM]), std::make_pair(AS_RAM_MEMORY, &m_space_config[AS_RAM_MEMORY]), std::make_pair(AS_ROM_PORTS, &m_space_config[AS_ROM_PORTS]), diff --git a/src/devices/cpu/mcs40/mcs40.h b/src/devices/cpu/mcs40/mcs40.h index 30b83cd2c65..d768844e9f6 100644 --- a/src/devices/cpu/mcs40/mcs40.h +++ b/src/devices/cpu/mcs40/mcs40.h @@ -193,7 +193,7 @@ protected: virtual void execute_run() override; // device_memory_interface configuration - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // device_state_interface implementation virtual void state_import(device_state_entry const &entry) override; diff --git a/src/devices/cpu/mcs48/mcs48.cpp b/src/devices/cpu/mcs48/mcs48.cpp index 35072a38589..affcff6a09d 100644 --- a/src/devices/cpu/mcs48/mcs48.cpp +++ b/src/devices/cpu/mcs48/mcs48.cpp @@ -332,9 +332,9 @@ i8742_device::i8742_device(const machine_config &mconfig, const char *tag, devic { } -std::vector> mcs48_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector mcs48_cpu_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/mcs48/mcs48.h b/src/devices/cpu/mcs48/mcs48.h index dd1693558a2..4c915256152 100644 --- a/src/devices/cpu/mcs48/mcs48.h +++ b/src/devices/cpu/mcs48/mcs48.h @@ -172,7 +172,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp index 99ccb6774dc..255bbca2693 100644 --- a/src/devices/cpu/mcs51/mcs51.cpp +++ b/src/devices/cpu/mcs51/mcs51.cpp @@ -374,9 +374,9 @@ ds5002fp_device::ds5002fp_device(const machine_config &mconfig, const char *tag, { } -std::vector> mcs51_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector mcs51_cpu_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/mcs51/mcs51.h b/src/devices/cpu/mcs51/mcs51.h index 62f9840cec0..9651b7e77fd 100644 --- a/src/devices/cpu/mcs51/mcs51.h +++ b/src/devices/cpu/mcs51/mcs51.h @@ -107,7 +107,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/mcs96/i8x9x.cpp b/src/devices/cpu/mcs96/i8x9x.cpp index 4266aaf2a1f..c3a6c7876af 100644 --- a/src/devices/cpu/mcs96/i8x9x.cpp +++ b/src/devices/cpu/mcs96/i8x9x.cpp @@ -23,9 +23,9 @@ offs_t i8x9x_device::disasm_disassemble(std::ostream &stream, offs_t pc, const u return disasm_generic(stream, pc, oprom, opram, options, disasm_entries); } -std::vector> i8x9x_device::memory_space_config() const +device_memory_interface::space_config_vector i8x9x_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &program_config), std::make_pair(AS_IO, &io_config) }; diff --git a/src/devices/cpu/mcs96/i8x9x.h b/src/devices/cpu/mcs96/i8x9x.h index ef9c8b0ab74..8fda92de323 100644 --- a/src/devices/cpu/mcs96/i8x9x.h +++ b/src/devices/cpu/mcs96/i8x9x.h @@ -28,7 +28,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; static const disasm_entry disasm_entries[0x100]; diff --git a/src/devices/cpu/mcs96/mcs96.cpp b/src/devices/cpu/mcs96/mcs96.cpp index ff229b231ce..92a8ed23a37 100644 --- a/src/devices/cpu/mcs96/mcs96.cpp +++ b/src/devices/cpu/mcs96/mcs96.cpp @@ -116,9 +116,9 @@ void mcs96_device::execute_set_input(int inputnum, int state) } } -std::vector> mcs96_device::memory_space_config() const +device_memory_interface::space_config_vector mcs96_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &program_config) }; } diff --git a/src/devices/cpu/mcs96/mcs96.h b/src/devices/cpu/mcs96/mcs96.h index 1023b794e27..159d04bbdc3 100644 --- a/src/devices/cpu/mcs96/mcs96.h +++ b/src/devices/cpu/mcs96/mcs96.h @@ -88,7 +88,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/melps4/melps4.cpp b/src/devices/cpu/melps4/melps4.cpp index 6a888e5165d..bf386f1e30d 100644 --- a/src/devices/cpu/melps4/melps4.cpp +++ b/src/devices/cpu/melps4/melps4.cpp @@ -234,9 +234,9 @@ void melps4_cpu_device::device_start() m_icountptr = &m_icount; } -std::vector> melps4_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector melps4_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/melps4/melps4.h b/src/devices/cpu/melps4/melps4.h index f90c6f4bfa5..1f9a7752cd6 100644 --- a/src/devices/cpu/melps4/melps4.h +++ b/src/devices/cpu/melps4/melps4.h @@ -132,7 +132,7 @@ protected: virtual void execute_one(); // device_memory_interface overrides - virtual std::vector> 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; } diff --git a/src/devices/cpu/minx/minx.cpp b/src/devices/cpu/minx/minx.cpp index 0fa38b5db73..883abb6f843 100644 --- a/src/devices/cpu/minx/minx.cpp +++ b/src/devices/cpu/minx/minx.cpp @@ -81,9 +81,9 @@ minx_cpu_device::minx_cpu_device(const machine_config &mconfig, const char *tag, { } -std::vector> minx_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector minx_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/minx/minx.h b/src/devices/cpu/minx/minx.h index 0c146fb95da..babc3d182aa 100644 --- a/src/devices/cpu/minx/minx.h +++ b/src/devices/cpu/minx/minx.h @@ -33,7 +33,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/mips/mips3.cpp b/src/devices/cpu/mips/mips3.cpp index ca46c8a00ae..d55d26623d1 100644 --- a/src/devices/cpu/mips/mips3.cpp +++ b/src/devices/cpu/mips/mips3.cpp @@ -195,9 +195,9 @@ mips3_device::mips3_device(const machine_config &mconfig, device_type type, cons set_vtlb_fixed_entries(2 * m_tlbentries + 2); } -std::vector> mips3_device::memory_space_config() const +device_memory_interface::space_config_vector mips3_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/mips/mips3.h b/src/devices/cpu/mips/mips3.h index ea157c398b7..6d763c8792b 100644 --- a/src/devices/cpu/mips/mips3.h +++ b/src/devices/cpu/mips/mips3.h @@ -304,7 +304,7 @@ protected: virtual void execute_burn(int32_t cycles) override { m_totalcycles += cycles; } // device_memory_interface overrides - virtual std::vector> 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 diff --git a/src/devices/cpu/mips/r3000.cpp b/src/devices/cpu/mips/r3000.cpp index f60cb7bc9f0..2e29e967747 100644 --- a/src/devices/cpu/mips/r3000.cpp +++ b/src/devices/cpu/mips/r3000.cpp @@ -394,9 +394,9 @@ void r3000_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> r3000_device::memory_space_config() const +device_memory_interface::space_config_vector r3000_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, (m_endianness == ENDIANNESS_BIG) ? &m_program_config_be : &m_program_config_le) }; } diff --git a/src/devices/cpu/mips/r3000.h b/src/devices/cpu/mips/r3000.h index b4a339dc584..1d458d93de9 100644 --- a/src/devices/cpu/mips/r3000.h +++ b/src/devices/cpu/mips/r3000.h @@ -123,7 +123,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/mn10200/mn10200.cpp b/src/devices/cpu/mn10200/mn10200.cpp index c4ec36ba5d7..def87ca557f 100644 --- a/src/devices/cpu/mn10200/mn10200.cpp +++ b/src/devices/cpu/mn10200/mn10200.cpp @@ -58,9 +58,9 @@ mn1020012a_device::mn1020012a_device(const machine_config &mconfig, const char * { } -std::vector> mn10200_device::memory_space_config() const +device_memory_interface::space_config_vector mn10200_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/mn10200/mn10200.h b/src/devices/cpu/mn10200/mn10200.h index 71d00f7eb01..221625a60e3 100644 --- a/src/devices/cpu/mn10200/mn10200.h +++ b/src/devices/cpu/mn10200/mn10200.h @@ -81,7 +81,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/nanoprocessor/nanoprocessor.cpp b/src/devices/cpu/nanoprocessor/nanoprocessor.cpp index a210a531da1..655dfdb6af2 100644 --- a/src/devices/cpu/nanoprocessor/nanoprocessor.cpp +++ b/src/devices/cpu/nanoprocessor/nanoprocessor.cpp @@ -108,9 +108,9 @@ void hp_nanoprocessor_device::device_reset() dc_update(); } -std::vector> hp_nanoprocessor_device::memory_space_config() const +device_memory_interface::space_config_vector hp_nanoprocessor_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/nanoprocessor/nanoprocessor.h b/src/devices/cpu/nanoprocessor/nanoprocessor.h index 6d489896354..3518d80810b 100644 --- a/src/devices/cpu/nanoprocessor/nanoprocessor.h +++ b/src/devices/cpu/nanoprocessor/nanoprocessor.h @@ -85,7 +85,7 @@ public: virtual uint32_t execute_default_irq_vector() const override { return 0xff; } // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/nec/nec.cpp b/src/devices/cpu/nec/nec.cpp index 18dded0cdb4..a4410cc12e8 100644 --- a/src/devices/cpu/nec/nec.cpp +++ b/src/devices/cpu/nec/nec.cpp @@ -145,9 +145,9 @@ v30_device::v30_device(const machine_config &mconfig, const char *tag, device_t { } -std::vector> nec_common_device::memory_space_config() const +device_memory_interface::space_config_vector nec_common_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/nec/nec.h b/src/devices/cpu/nec/nec.h index 90e96b84f4d..4ec9e02459d 100644 --- a/src/devices/cpu/nec/nec.h +++ b/src/devices/cpu/nec/nec.h @@ -40,7 +40,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/nec/v25.cpp b/src/devices/cpu/nec/v25.cpp index 9c3a8ad007a..8d3a3c1b993 100644 --- a/src/devices/cpu/nec/v25.cpp +++ b/src/devices/cpu/nec/v25.cpp @@ -82,9 +82,9 @@ v35_device::v35_device(const machine_config &mconfig, const char *tag, device_t { } -std::vector> v25_common_device::memory_space_config() const +device_memory_interface::space_config_vector v25_common_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/nec/v25.h b/src/devices/cpu/nec/v25.h index 9ebbffe57e4..0090d658215 100644 --- a/src/devices/cpu/nec/v25.h +++ b/src/devices/cpu/nec/v25.h @@ -84,7 +84,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/nec/v53.cpp b/src/devices/cpu/nec/v53.cpp index cb4ff9cd84b..7a1d087c1b7 100644 --- a/src/devices/cpu/nec/v53.cpp +++ b/src/devices/cpu/nec/v53.cpp @@ -172,7 +172,7 @@ m_DST = 0x00; m_DMK = 0x0f; */ -std::vector> v53_base_device::memory_space_config() const +device_memory_interface::space_config_vector v53_base_device::memory_space_config() const { auto r = nec_common_device::memory_space_config(); r.emplace_back(std::make_pair(AS_IO, &m_io_space_config)); diff --git a/src/devices/cpu/nec/v53.h b/src/devices/cpu/nec/v53.h index 49fa66e5134..981ac0b733a 100644 --- a/src/devices/cpu/nec/v53.h +++ b/src/devices/cpu/nec/v53.h @@ -205,7 +205,7 @@ protected: const address_space_config m_io_space_config; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; uint8_t m_SCTL; uint8_t m_OPSEL; diff --git a/src/devices/cpu/patinhofeio/patinho_feio.cpp b/src/devices/cpu/patinhofeio/patinho_feio.cpp index 48cd8b3494c..6c4b84c4410 100644 --- a/src/devices/cpu/patinhofeio/patinho_feio.cpp +++ b/src/devices/cpu/patinhofeio/patinho_feio.cpp @@ -69,9 +69,9 @@ patinho_feio_cpu_device::patinho_feio_cpu_device(const machine_config &mconfig, { } -std::vector> patinho_feio_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector patinho_feio_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h index 065a21daec9..07b402871d0 100644 --- a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h +++ b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h @@ -119,7 +119,7 @@ protected: virtual uint32_t execute_max_cycles() const override { return 2; } // device_memory_interface overrides - virtual std::vector> 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; } diff --git a/src/devices/cpu/pdp1/pdp1.cpp b/src/devices/cpu/pdp1/pdp1.cpp index 56f6fb25c90..2a5368ae56f 100644 --- a/src/devices/cpu/pdp1/pdp1.cpp +++ b/src/devices/cpu/pdp1/pdp1.cpp @@ -387,9 +387,9 @@ pdp1_device::pdp1_device(const machine_config &mconfig, const char *tag, device_ m_program_config.m_is_octal = true; } -std::vector> pdp1_device::memory_space_config() const +device_memory_interface::space_config_vector pdp1_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/pdp1/pdp1.h b/src/devices/cpu/pdp1/pdp1.h index 546735f425b..174317d995e 100644 --- a/src/devices/cpu/pdp1/pdp1.h +++ b/src/devices/cpu/pdp1/pdp1.h @@ -106,7 +106,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/pdp1/tx0.cpp b/src/devices/cpu/pdp1/tx0.cpp index 3d3be72838e..89355ee2ef8 100644 --- a/src/devices/cpu/pdp1/tx0.cpp +++ b/src/devices/cpu/pdp1/tx0.cpp @@ -75,9 +75,9 @@ tx0_64kw_device::tx0_64kw_device(const machine_config &mconfig, const char *tag, { } -std::vector> tx0_device::memory_space_config() const +device_memory_interface::space_config_vector tx0_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/pdp1/tx0.h b/src/devices/cpu/pdp1/tx0.h index 8272fe478b4..52cc7f4091a 100644 --- a/src/devices/cpu/pdp1/tx0.h +++ b/src/devices/cpu/pdp1/tx0.h @@ -65,7 +65,7 @@ protected: virtual uint32_t execute_max_cycles() const override { return 3; } // device_memory_interface overrides - virtual std::vector> 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 4; } diff --git a/src/devices/cpu/pdp8/pdp8.h b/src/devices/cpu/pdp8/pdp8.h index 21d5a25a0cf..b21371fd181 100644 --- a/src/devices/cpu/pdp8/pdp8.h +++ b/src/devices/cpu/pdp8/pdp8.h @@ -37,7 +37,7 @@ public: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/pic16c5x/pic16c5x.cpp b/src/devices/cpu/pic16c5x/pic16c5x.cpp index cb162c58c09..52a9beeac77 100644 --- a/src/devices/cpu/pic16c5x/pic16c5x.cpp +++ b/src/devices/cpu/pic16c5x/pic16c5x.cpp @@ -175,9 +175,9 @@ pic1655_device::pic1655_device(const machine_config &mconfig, const char *tag, d { } -std::vector> pic16c5x_device::memory_space_config() const +device_memory_interface::space_config_vector pic16c5x_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/pic16c5x/pic16c5x.h b/src/devices/cpu/pic16c5x/pic16c5x.h index bbf9bb84486..593397e4847 100644 --- a/src/devices/cpu/pic16c5x/pic16c5x.h +++ b/src/devices/cpu/pic16c5x/pic16c5x.h @@ -125,7 +125,7 @@ protected: virtual void execute_set_input(int line, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/pic16c62x/pic16c62x.h b/src/devices/cpu/pic16c62x/pic16c62x.h index 35104d4e994..0c99e0e67e1 100644 --- a/src/devices/cpu/pic16c62x/pic16c62x.h +++ b/src/devices/cpu/pic16c62x/pic16c62x.h @@ -71,7 +71,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/powerpc/ppc.h b/src/devices/cpu/powerpc/ppc.h index 558f702b376..dd09cce15e4 100644 --- a/src/devices/cpu/powerpc/ppc.h +++ b/src/devices/cpu/powerpc/ppc.h @@ -259,7 +259,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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 diff --git a/src/devices/cpu/powerpc/ppccom.cpp b/src/devices/cpu/powerpc/ppccom.cpp index 50f69f0f035..56a7325c460 100644 --- a/src/devices/cpu/powerpc/ppccom.cpp +++ b/src/devices/cpu/powerpc/ppccom.cpp @@ -300,9 +300,9 @@ ppc405gp_device::ppc405gp_device(const machine_config &mconfig, const char *tag, { } -std::vector> ppc_device::memory_space_config() const +device_memory_interface::space_config_vector ppc_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/pps4/pps4.cpp b/src/devices/cpu/pps4/pps4.cpp index 7b9a9a6e52e..c0b5ad60aa8 100644 --- a/src/devices/cpu/pps4/pps4.cpp +++ b/src/devices/cpu/pps4/pps4.cpp @@ -108,9 +108,9 @@ pps4_2_device::pps4_2_device(const machine_config &mconfig, const char *tag, dev { } -std::vector> pps4_device::memory_space_config() const +device_memory_interface::space_config_vector pps4_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/pps4/pps4.h b/src/devices/cpu/pps4/pps4.h index 72100fb358b..ef3c4dee977 100644 --- a/src/devices/cpu/pps4/pps4.h +++ b/src/devices/cpu/pps4/pps4.h @@ -76,7 +76,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/psx/psx.cpp b/src/devices/cpu/psx/psx.cpp index b03c57c3a5e..6ce8ed7a7b1 100644 --- a/src/devices/cpu/psx/psx.cpp +++ b/src/devices/cpu/psx/psx.cpp @@ -3385,9 +3385,9 @@ void psxcpu_device::set_disable_rom_berr(bool mode) m_disable_rom_berr = mode; } -std::vector> psxcpu_device::memory_space_config() const +device_memory_interface::space_config_vector psxcpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), }; } diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h index d05495481a0..7b4793fc3bd 100644 --- a/src/devices/cpu/psx/psx.h +++ b/src/devices/cpu/psx/psx.h @@ -211,7 +211,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/rsp/rsp.cpp b/src/devices/cpu/rsp/rsp.cpp index 2f781344800..6565fa6924d 100644 --- a/src/devices/cpu/rsp/rsp.cpp +++ b/src/devices/cpu/rsp/rsp.cpp @@ -143,9 +143,9 @@ rsp_device::rsp_device(const machine_config &mconfig, const char *tag, device_t { } -std::vector> rsp_device::memory_space_config() const +device_memory_interface::space_config_vector rsp_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/rsp/rsp.h b/src/devices/cpu/rsp/rsp.h index 3c55ed00265..cf1a7019f92 100644 --- a/src/devices/cpu/rsp/rsp.h +++ b/src/devices/cpu/rsp/rsp.h @@ -152,7 +152,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override { } // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/s2650/s2650.cpp b/src/devices/cpu/s2650/s2650.cpp index e342f570b74..2afc7c5b261 100644 --- a/src/devices/cpu/s2650/s2650.cpp +++ b/src/devices/cpu/s2650/s2650.cpp @@ -50,9 +50,9 @@ offs_t s2650_device::disasm_disassemble(std::ostream &stream, offs_t pc, const u } -std::vector> s2650_device::memory_space_config() const +device_memory_interface::space_config_vector s2650_device::memory_space_config() const { - return std::vector> { + return space_config_vector { // Memory-mapped: M/~IO=1 std::make_pair(AS_PROGRAM, &m_program_config), diff --git a/src/devices/cpu/s2650/s2650.h b/src/devices/cpu/s2650/s2650.h index bd7838a94cc..4fd297b694a 100644 --- a/src/devices/cpu/s2650/s2650.h +++ b/src/devices/cpu/s2650/s2650.h @@ -60,7 +60,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/saturn/saturn.cpp b/src/devices/cpu/saturn/saturn.cpp index ac42fb2adf8..2368c16ef19 100644 --- a/src/devices/cpu/saturn/saturn.cpp +++ b/src/devices/cpu/saturn/saturn.cpp @@ -57,9 +57,9 @@ saturn_device::saturn_device(const machine_config &mconfig, const char *tag, dev { } -std::vector> saturn_device::memory_space_config() const +device_memory_interface::space_config_vector saturn_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/saturn/saturn.h b/src/devices/cpu/saturn/saturn.h index f291506d18a..d73745a31fb 100644 --- a/src/devices/cpu/saturn/saturn.h +++ b/src/devices/cpu/saturn/saturn.h @@ -101,7 +101,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/sc61860/sc61860.cpp b/src/devices/cpu/sc61860/sc61860.cpp index fabda561b1e..a4f82ccdedc 100644 --- a/src/devices/cpu/sc61860/sc61860.cpp +++ b/src/devices/cpu/sc61860/sc61860.cpp @@ -62,9 +62,9 @@ sc61860_device::sc61860_device(const machine_config &mconfig, const char *tag, d { } -std::vector> sc61860_device::memory_space_config() const +device_memory_interface::space_config_vector sc61860_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/sc61860/sc61860.h b/src/devices/cpu/sc61860/sc61860.h index 8bd1473102b..de7653b73be 100644 --- a/src/devices/cpu/sc61860/sc61860.h +++ b/src/devices/cpu/sc61860/sc61860.h @@ -101,7 +101,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/scmp/scmp.cpp b/src/devices/cpu/scmp/scmp.cpp index 0e270e0360b..94bcb3fcf6c 100644 --- a/src/devices/cpu/scmp/scmp.cpp +++ b/src/devices/cpu/scmp/scmp.cpp @@ -40,9 +40,9 @@ scmp_device::scmp_device(const machine_config &mconfig, device_type type, const { } -std::vector> scmp_device::memory_space_config() const +device_memory_interface::space_config_vector scmp_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/scmp/scmp.h b/src/devices/cpu/scmp/scmp.h index acdbff5af1b..553af2dad0f 100644 --- a/src/devices/cpu/scmp/scmp.h +++ b/src/devices/cpu/scmp/scmp.h @@ -48,7 +48,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/score/score.cpp b/src/devices/cpu/score/score.cpp index 031c76afaf9..f346fd93dc1 100644 --- a/src/devices/cpu/score/score.cpp +++ b/src/devices/cpu/score/score.cpp @@ -153,9 +153,9 @@ void score7_cpu_device::state_string_export(const device_state_entry &entry, std // the space doesn't exist //------------------------------------------------- -std::vector> score7_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector score7_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/score/score.h b/src/devices/cpu/score/score.h index de03eda5498..48d832f3ada 100644 --- a/src/devices/cpu/score/score.h +++ b/src/devices/cpu/score/score.h @@ -51,7 +51,7 @@ protected: virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; // device_memory_interface overrides - virtual std::vector> 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; } diff --git a/src/devices/cpu/scudsp/scudsp.cpp b/src/devices/cpu/scudsp/scudsp.cpp index f0d64863b4c..070dc4fbf1d 100644 --- a/src/devices/cpu/scudsp/scudsp.cpp +++ b/src/devices/cpu/scudsp/scudsp.cpp @@ -897,9 +897,9 @@ void scudsp_cpu_device::execute_run() } while( m_icount > 0 ); } -std::vector> scudsp_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector scudsp_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/scudsp/scudsp.h b/src/devices/cpu/scudsp/scudsp.h index 98af1ad9cd0..f0ae8df33de 100644 --- a/src/devices/cpu/scudsp/scudsp.h +++ b/src/devices/cpu/scudsp/scudsp.h @@ -82,7 +82,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/se3208/se3208.cpp b/src/devices/cpu/se3208/se3208.cpp index d2af5871258..45bb8a30c45 100644 --- a/src/devices/cpu/se3208/se3208.cpp +++ b/src/devices/cpu/se3208/se3208.cpp @@ -53,9 +53,9 @@ se3208_device::se3208_device(const machine_config &mconfig, const char *tag, dev , m_PC(0), m_SR(0), m_SP(0), m_ER(0), m_PPC(0), m_program(nullptr), m_direct(nullptr), m_IRQ(0), m_NMI(0), m_icount(0) { } -std::vector> se3208_device::memory_space_config() const +device_memory_interface::space_config_vector se3208_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/se3208/se3208.h b/src/devices/cpu/se3208/se3208.h index af40bf6d8d5..69cddd0175b 100644 --- a/src/devices/cpu/se3208/se3208.h +++ b/src/devices/cpu/se3208/se3208.h @@ -33,7 +33,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/sh2/sh2.cpp b/src/devices/cpu/sh2/sh2.cpp index a0de2a0b966..9b1cf8dcbbf 100644 --- a/src/devices/cpu/sh2/sh2.cpp +++ b/src/devices/cpu/sh2/sh2.cpp @@ -219,15 +219,15 @@ sh1_device::sh1_device(const machine_config &mconfig, const char *tag, device_t { } -std::vector> sh2_device::memory_space_config() const +device_memory_interface::space_config_vector sh2_device::memory_space_config() const { if(has_configured_map(AS_OPCODES)) - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_OPCODES, &m_decrypted_program_config) }; else - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/sh2/sh2.h b/src/devices/cpu/sh2/sh2.h index decec04c6ea..50ecf680c88 100644 --- a/src/devices/cpu/sh2/sh2.h +++ b/src/devices/cpu/sh2/sh2.h @@ -128,7 +128,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/sh4/sh4.cpp b/src/devices/cpu/sh4/sh4.cpp index 6c2271ddfea..cc7c333d9cc 100644 --- a/src/devices/cpu/sh4/sh4.cpp +++ b/src/devices/cpu/sh4/sh4.cpp @@ -119,9 +119,9 @@ sh34_base_device::sh34_base_device(const machine_config &mconfig, device_type ty #endif } -std::vector> sh34_base_device::memory_space_config() const +device_memory_interface::space_config_vector sh34_base_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/sh4/sh4.h b/src/devices/cpu/sh4/sh4.h index bb24712f7d1..fad1d326750 100644 --- a/src/devices/cpu/sh4/sh4.h +++ b/src/devices/cpu/sh4/sh4.h @@ -243,7 +243,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/sharc/sharc.cpp b/src/devices/cpu/sharc/sharc.cpp index 1b37cd1273f..adafc34332c 100644 --- a/src/devices/cpu/sharc/sharc.cpp +++ b/src/devices/cpu/sharc/sharc.cpp @@ -88,9 +88,9 @@ adsp21062_device::adsp21062_device(const machine_config &mconfig, const char *ta { } -std::vector> adsp21062_device::memory_space_config() const +device_memory_interface::space_config_vector adsp21062_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/sharc/sharc.h b/src/devices/cpu/sharc/sharc.h index 0eedd1e9297..806b3053ee4 100644 --- a/src/devices/cpu/sharc/sharc.h +++ b/src/devices/cpu/sharc/sharc.h @@ -217,7 +217,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // device_disasm_interface overrides static constexpr uint32_t OPCODE_BYTES = 8; // actually 6, but emulation requires padding to 64 bits diff --git a/src/devices/cpu/sm510/sm510.h b/src/devices/cpu/sm510/sm510.h index be2c3bb16c0..3f40547cad2 100644 --- a/src/devices/cpu/sm510/sm510.h +++ b/src/devices/cpu/sm510/sm510.h @@ -145,7 +145,7 @@ protected: virtual void execute_one() { } // -> child class // device_memory_interface overrides - virtual std::vector> 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; } diff --git a/src/devices/cpu/sm510/sm510base.cpp b/src/devices/cpu/sm510/sm510base.cpp index 4df1118db8a..bbf87000d3f 100644 --- a/src/devices/cpu/sm510/sm510base.cpp +++ b/src/devices/cpu/sm510/sm510base.cpp @@ -183,9 +183,9 @@ inline u16 sm510_base_device::get_lcd_row(int column, u8* ram) return rowdata; } -std::vector> sm510_base_device::memory_space_config() const +device_memory_interface::space_config_vector sm510_base_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/sm8500/sm8500.cpp b/src/devices/cpu/sm8500/sm8500.cpp index 1c7111a39f7..654cc0d0db0 100644 --- a/src/devices/cpu/sm8500/sm8500.cpp +++ b/src/devices/cpu/sm8500/sm8500.cpp @@ -45,9 +45,9 @@ sm8500_cpu_device::sm8500_cpu_device(const machine_config &mconfig, const char * { } -std::vector> sm8500_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector sm8500_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), }; } diff --git a/src/devices/cpu/sm8500/sm8500.h b/src/devices/cpu/sm8500/sm8500.h index ee2d4b3f2f2..485d3a70ad8 100644 --- a/src/devices/cpu/sm8500/sm8500.h +++ b/src/devices/cpu/sm8500/sm8500.h @@ -68,7 +68,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/sparc/mb86901.cpp b/src/devices/cpu/sparc/mb86901.cpp index b86f010062d..1f6430835f4 100644 --- a/src/devices/cpu/sparc/mb86901.cpp +++ b/src/devices/cpu/sparc/mb86901.cpp @@ -433,9 +433,9 @@ void mb86901_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> mb86901_device::memory_space_config() const +device_memory_interface::space_config_vector mb86901_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/sparc/sparc.h b/src/devices/cpu/sparc/sparc.h index f3274833fc2..5355a2ed005 100644 --- a/src/devices/cpu/sparc/sparc.h +++ b/src/devices/cpu/sparc/sparc.h @@ -40,7 +40,7 @@ public: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/spc700/spc700.cpp b/src/devices/cpu/spc700/spc700.cpp index 14c72f28c5c..cb44ce03c19 100644 --- a/src/devices/cpu/spc700/spc700.cpp +++ b/src/devices/cpu/spc700/spc700.cpp @@ -234,9 +234,9 @@ spc700_device::spc700_device(const machine_config &mconfig, const char *tag, dev { } -std::vector> spc700_device::memory_space_config() const +device_memory_interface::space_config_vector spc700_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/spc700/spc700.h b/src/devices/cpu/spc700/spc700.h index 52802d99e15..161ebea347c 100644 --- a/src/devices/cpu/spc700/spc700.h +++ b/src/devices/cpu/spc700/spc700.h @@ -25,7 +25,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/ssem/ssem.cpp b/src/devices/cpu/ssem/ssem.cpp index b441ff926d2..69c6ce66571 100644 --- a/src/devices/cpu/ssem/ssem.cpp +++ b/src/devices/cpu/ssem/ssem.cpp @@ -135,9 +135,9 @@ void ssem_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> ssem_device::memory_space_config() const +device_memory_interface::space_config_vector ssem_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/ssem/ssem.h b/src/devices/cpu/ssem/ssem.h index 233a9ead024..b9485678a18 100644 --- a/src/devices/cpu/ssem/ssem.h +++ b/src/devices/cpu/ssem/ssem.h @@ -38,7 +38,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/ssp1601/ssp1601.cpp b/src/devices/cpu/ssp1601/ssp1601.cpp index 7468e131040..0ee9139cc1c 100644 --- a/src/devices/cpu/ssp1601/ssp1601.cpp +++ b/src/devices/cpu/ssp1601/ssp1601.cpp @@ -200,9 +200,9 @@ ssp1601_device::ssp1601_device(const machine_config &mconfig, const char *tag, d { } -std::vector> ssp1601_device::memory_space_config() const +device_memory_interface::space_config_vector ssp1601_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/ssp1601/ssp1601.h b/src/devices/cpu/ssp1601/ssp1601.h index 51aed1f04b1..55a1184b5bb 100644 --- a/src/devices/cpu/ssp1601/ssp1601.h +++ b/src/devices/cpu/ssp1601/ssp1601.h @@ -37,7 +37,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/superfx/superfx.cpp b/src/devices/cpu/superfx/superfx.cpp index b39e4a98cc3..2879a6faeaf 100644 --- a/src/devices/cpu/superfx/superfx.cpp +++ b/src/devices/cpu/superfx/superfx.cpp @@ -16,9 +16,9 @@ superfx_device::superfx_device(const machine_config &mconfig, const char *tag, d { } -std::vector> superfx_device::memory_space_config() const +device_memory_interface::space_config_vector superfx_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/superfx/superfx.h b/src/devices/cpu/superfx/superfx.h index 724d588f3ae..172c51eb65b 100644 --- a/src/devices/cpu/superfx/superfx.h +++ b/src/devices/cpu/superfx/superfx.h @@ -119,7 +119,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/t11/t11.cpp b/src/devices/cpu/t11/t11.cpp index ceae5d9354d..dba6241b553 100644 --- a/src/devices/cpu/t11/t11.cpp +++ b/src/devices/cpu/t11/t11.cpp @@ -60,9 +60,9 @@ t11_device::t11_device(const machine_config &mconfig, const char *tag, device_t { } -std::vector> t11_device::memory_space_config() const +device_memory_interface::space_config_vector t11_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/t11/t11.h b/src/devices/cpu/t11/t11.h index 31e05c34464..47db0a9b144 100644 --- a/src/devices/cpu/t11/t11.h +++ b/src/devices/cpu/t11/t11.h @@ -60,7 +60,7 @@ protected: virtual uint32_t execute_default_irq_vector() const override { return -1; }; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/tlcs870/tlcs870.cpp b/src/devices/cpu/tlcs870/tlcs870.cpp index 591ef004b8b..c24b41da744 100644 --- a/src/devices/cpu/tlcs870/tlcs870.cpp +++ b/src/devices/cpu/tlcs870/tlcs870.cpp @@ -247,9 +247,9 @@ tmp87ph40an_device::tmp87ph40an_device(const machine_config &mconfig, const char { } -std::vector> tlcs870_device::memory_space_config() const +device_memory_interface::space_config_vector tlcs870_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/tlcs870/tlcs870.h b/src/devices/cpu/tlcs870/tlcs870.h index ca4e98ad6d5..ea57533e122 100644 --- a/src/devices/cpu/tlcs870/tlcs870.h +++ b/src/devices/cpu/tlcs870/tlcs870.h @@ -98,7 +98,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/tlcs90/tlcs90.cpp b/src/devices/cpu/tlcs90/tlcs90.cpp index c6a21d96c0b..89c03970f24 100644 --- a/src/devices/cpu/tlcs90/tlcs90.cpp +++ b/src/devices/cpu/tlcs90/tlcs90.cpp @@ -103,9 +103,9 @@ tmp90ph44_device::tmp90ph44_device(const machine_config &mconfig, const char *ta { } -std::vector> tlcs90_device::memory_space_config() const +device_memory_interface::space_config_vector tlcs90_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/tlcs90/tlcs90.h b/src/devices/cpu/tlcs90/tlcs90.h index a9b610b79cd..f2f1eec52da 100644 --- a/src/devices/cpu/tlcs90/tlcs90.h +++ b/src/devices/cpu/tlcs90/tlcs90.h @@ -125,7 +125,7 @@ protected: virtual void execute_burn(int32_t cycles) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/tlcs900/tlcs900.cpp b/src/devices/cpu/tlcs900/tlcs900.cpp index b5f6141cc5c..69eef7121e0 100644 --- a/src/devices/cpu/tlcs900/tlcs900.cpp +++ b/src/devices/cpu/tlcs900/tlcs900.cpp @@ -69,9 +69,9 @@ tmp95c061_device::tmp95c061_device(const machine_config &mconfig, const char *ta { } -std::vector> tlcs900h_device::memory_space_config() const +device_memory_interface::space_config_vector tlcs900h_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/tlcs900/tlcs900.h b/src/devices/cpu/tlcs900/tlcs900.h index ff3ad4b66ae..28552bd3c17 100644 --- a/src/devices/cpu/tlcs900/tlcs900.h +++ b/src/devices/cpu/tlcs900/tlcs900.h @@ -66,7 +66,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/tms1000/tms1k_base.cpp b/src/devices/cpu/tms1000/tms1k_base.cpp index da10efd063c..985784570e8 100644 --- a/src/devices/cpu/tms1000/tms1k_base.cpp +++ b/src/devices/cpu/tms1000/tms1k_base.cpp @@ -260,9 +260,9 @@ void tms1k_base_device::device_reset() m_power_off(0); } -std::vector> tms1k_base_device::memory_space_config() const +device_memory_interface::space_config_vector tms1k_base_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/tms1000/tms1k_base.h b/src/devices/cpu/tms1000/tms1k_base.h index aab5e9407c1..b8cd7e2a589 100644 --- a/src/devices/cpu/tms1000/tms1k_base.h +++ b/src/devices/cpu/tms1000/tms1k_base.h @@ -166,7 +166,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; } diff --git a/src/devices/cpu/tms32010/tms32010.cpp b/src/devices/cpu/tms32010/tms32010.cpp index c757ed91fc5..007cac7b0fc 100644 --- a/src/devices/cpu/tms32010/tms32010.cpp +++ b/src/devices/cpu/tms32010/tms32010.cpp @@ -125,9 +125,9 @@ tms32016_device::tms32016_device(const machine_config &mconfig, const char *tag, { } -std::vector> tms32010_device::memory_space_config() const +device_memory_interface::space_config_vector tms32010_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/tms32010/tms32010.h b/src/devices/cpu/tms32010/tms32010.h index 95fa2ce5c9c..2f2469330e5 100644 --- a/src/devices/cpu/tms32010/tms32010.h +++ b/src/devices/cpu/tms32010/tms32010.h @@ -64,7 +64,7 @@ protected: virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return (cycles * 4); } // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/tms32025/tms32025.cpp b/src/devices/cpu/tms32025/tms32025.cpp index 209d9ed368a..a9405d72f3d 100644 --- a/src/devices/cpu/tms32025/tms32025.cpp +++ b/src/devices/cpu/tms32025/tms32025.cpp @@ -244,9 +244,9 @@ tms32026_device::tms32026_device(const machine_config &mconfig, const char *tag, m_fixed_STR1 = 0x0100; } -std::vector> tms32025_device::memory_space_config() const +device_memory_interface::space_config_vector tms32025_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/tms32025/tms32025.h b/src/devices/cpu/tms32025/tms32025.h index 7a6df9e680b..a9ae17576c4 100644 --- a/src/devices/cpu/tms32025/tms32025.h +++ b/src/devices/cpu/tms32025/tms32025.h @@ -119,7 +119,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/tms32031/tms32031.cpp b/src/devices/cpu/tms32031/tms32031.cpp index b9b674c51e8..a924791cb71 100644 --- a/src/devices/cpu/tms32031/tms32031.cpp +++ b/src/devices/cpu/tms32031/tms32031.cpp @@ -456,9 +456,9 @@ void tms3203x_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> tms3203x_device::memory_space_config() const +device_memory_interface::space_config_vector tms3203x_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/tms32031/tms32031.h b/src/devices/cpu/tms32031/tms32031.h index 7cbdf9cf9ce..e654d4f2f5e 100644 --- a/src/devices/cpu/tms32031/tms32031.h +++ b/src/devices/cpu/tms32031/tms32031.h @@ -174,7 +174,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp index c5c198ff1ba..22abad952ff 100644 --- a/src/devices/cpu/tms32051/tms32051.cpp +++ b/src/devices/cpu/tms32051/tms32051.cpp @@ -82,9 +82,9 @@ tms32051_device::tms32051_device(const machine_config &mconfig, const char *tag, { } -std::vector> tms32051_device::memory_space_config() const +device_memory_interface::space_config_vector tms32051_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/tms32051/tms32051.h b/src/devices/cpu/tms32051/tms32051.h index bb678871db6..880741f5a66 100644 --- a/src/devices/cpu/tms32051/tms32051.h +++ b/src/devices/cpu/tms32051/tms32051.h @@ -77,7 +77,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; } diff --git a/src/devices/cpu/tms32082/tms32082.cpp b/src/devices/cpu/tms32082/tms32082.cpp index a405dd3da6a..e2a975ea995 100644 --- a/src/devices/cpu/tms32082/tms32082.cpp +++ b/src/devices/cpu/tms32082/tms32082.cpp @@ -50,16 +50,16 @@ tms32082_mp_device::tms32082_mp_device(const machine_config &mconfig, const char { } -std::vector> tms32082_mp_device::memory_space_config() const +device_memory_interface::space_config_vector tms32082_mp_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } -std::vector> tms32082_pp_device::memory_space_config() const +device_memory_interface::space_config_vector tms32082_pp_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/tms32082/tms32082.h b/src/devices/cpu/tms32082/tms32082.h index 384327c0fb6..c1d4674dbeb 100644 --- a/src/devices/cpu/tms32082/tms32082.h +++ b/src/devices/cpu/tms32082/tms32082.h @@ -87,7 +87,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; @@ -175,7 +175,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp index 0b7fd81df60..d442a2a2feb 100644 --- a/src/devices/cpu/tms34010/tms34010.cpp +++ b/src/devices/cpu/tms34010/tms34010.cpp @@ -59,9 +59,9 @@ tms34020_device::tms34020_device(const machine_config &mconfig, const char *tag, m_is_34020 = 1; } -std::vector> tms340x0_device::memory_space_config() const +device_memory_interface::space_config_vector tms340x0_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/tms34010/tms34010.h b/src/devices/cpu/tms34010/tms34010.h index 67efacdc008..9846d69625a 100644 --- a/src/devices/cpu/tms34010/tms34010.h +++ b/src/devices/cpu/tms34010/tms34010.h @@ -271,7 +271,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/tms57002/tms57002.cpp b/src/devices/cpu/tms57002/tms57002.cpp index 5152cef06fd..4b88669298b 100644 --- a/src/devices/cpu/tms57002/tms57002.cpp +++ b/src/devices/cpu/tms57002/tms57002.cpp @@ -908,9 +908,9 @@ offs_t tms57002_device::disasm_disassemble(std::ostream &stream, offs_t pc, cons return CPU_DISASSEMBLE_NAME(tms57002)(this, stream, pc, oprom, opram, options); } -std::vector> tms57002_device::memory_space_config() const +device_memory_interface::space_config_vector tms57002_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &program_config), std::make_pair(AS_DATA, &data_config) }; diff --git a/src/devices/cpu/tms57002/tms57002.h b/src/devices/cpu/tms57002/tms57002.h index 833728adef0..361c0b8a7d8 100644 --- a/src/devices/cpu/tms57002/tms57002.h +++ b/src/devices/cpu/tms57002/tms57002.h @@ -30,7 +30,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; virtual uint32_t execute_min_cycles() const override; virtual uint32_t execute_max_cycles() const override; virtual uint32_t execute_input_lines() const override; diff --git a/src/devices/cpu/tms7000/tms7000.cpp b/src/devices/cpu/tms7000/tms7000.cpp index 2610a129bcb..a54bac9e20f 100644 --- a/src/devices/cpu/tms7000/tms7000.cpp +++ b/src/devices/cpu/tms7000/tms7000.cpp @@ -174,9 +174,9 @@ tms70c46_device::tms70c46_device(const machine_config &mconfig, const char *tag, { } -std::vector> tms7000_device::memory_space_config() const +device_memory_interface::space_config_vector tms7000_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/tms7000/tms7000.h b/src/devices/cpu/tms7000/tms7000.h index 2e9380226c2..ef69bdb881e 100644 --- a/src/devices/cpu/tms7000/tms7000.h +++ b/src/devices/cpu/tms7000/tms7000.h @@ -76,7 +76,7 @@ protected: virtual void execute_set_input(int extline, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/tms9900/ti990_10.cpp b/src/devices/cpu/tms9900/ti990_10.cpp index 1b715deaa1c..3f9f60b4129 100644 --- a/src/devices/cpu/tms9900/ti990_10.cpp +++ b/src/devices/cpu/tms9900/ti990_10.cpp @@ -83,9 +83,9 @@ void ti990_10_device::device_reset() if (TRACE_EMU) logerror("ti990_10: Device reset by emulator\n"); } -std::vector> ti990_10_device::memory_space_config() const +device_memory_interface::space_config_vector ti990_10_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/tms9900/ti990_10.h b/src/devices/cpu/tms9900/ti990_10.h index 832b1d5dd86..bd2d6a65d43 100644 --- a/src/devices/cpu/tms9900/ti990_10.h +++ b/src/devices/cpu/tms9900/ti990_10.h @@ -38,7 +38,7 @@ protected: uint32_t disasm_max_opcode_bytes() const override; offs_t disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; const address_space_config m_program_config; const address_space_config m_io_config; diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp index 4860c0a172e..e0b207f3335 100644 --- a/src/devices/cpu/tms9900/tms9900.cpp +++ b/src/devices/cpu/tms9900/tms9900.cpp @@ -434,9 +434,9 @@ void tms99xx_device::write_workspace_register_debug(int reg, uint16_t data) m_icount = temp; } -std::vector> tms99xx_device::memory_space_config() const +device_memory_interface::space_config_vector tms99xx_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/tms9900/tms9900.h b/src/devices/cpu/tms9900/tms9900.h index 386a5af85f8..5486043aaa1 100644 --- a/src/devices/cpu/tms9900/tms9900.h +++ b/src/devices/cpu/tms9900/tms9900.h @@ -86,7 +86,7 @@ protected: virtual uint32_t disasm_max_opcode_bytes() const override; virtual offs_t disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // Let these methods be overloaded by the TMS9980. virtual void mem_read(void); diff --git a/src/devices/cpu/tms9900/tms9995.cpp b/src/devices/cpu/tms9900/tms9995.cpp index c9fd8ca4616..d6bab5aaa4b 100644 --- a/src/devices/cpu/tms9900/tms9995.cpp +++ b/src/devices/cpu/tms9900/tms9995.cpp @@ -484,9 +484,9 @@ void tms9995_device::write_workspace_register_debug(int reg, uint16_t data) m_icount = temp; } -std::vector> tms9995_device::memory_space_config() const +device_memory_interface::space_config_vector tms9995_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h index e6916c5bd41..a0ffa861f8c 100644 --- a/src/devices/cpu/tms9900/tms9995.h +++ b/src/devices/cpu/tms9900/tms9995.h @@ -98,7 +98,7 @@ protected: virtual uint32_t disasm_max_opcode_bytes() const override; virtual offs_t disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; uint64_t execute_clocks_to_cycles(uint64_t clocks) const override { return clocks / 4.0; } uint64_t execute_cycles_to_clocks(uint64_t cycles) const override { return cycles * 4.0; } diff --git a/src/devices/cpu/ucom4/ucom4.cpp b/src/devices/cpu/ucom4/ucom4.cpp index 381f779586f..81b4e8ae913 100644 --- a/src/devices/cpu/ucom4/ucom4.cpp +++ b/src/devices/cpu/ucom4/ucom4.cpp @@ -107,9 +107,9 @@ upd552_cpu_device::upd552_cpu_device(const machine_config &mconfig, const char * { } -std::vector> ucom4_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector ucom4_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/ucom4/ucom4.h b/src/devices/cpu/ucom4/ucom4.h index 1a9e5bc5dd5..a442e5c676a 100644 --- a/src/devices/cpu/ucom4/ucom4.h +++ b/src/devices/cpu/ucom4/ucom4.h @@ -131,7 +131,7 @@ protected: virtual void execute_run() override; // device_memory_interface overrides - virtual std::vector> 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; } diff --git a/src/devices/cpu/unsp/unsp.cpp b/src/devices/cpu/unsp/unsp.cpp index 70f12060f9e..cb14e9cdec4 100644 --- a/src/devices/cpu/unsp/unsp.cpp +++ b/src/devices/cpu/unsp/unsp.cpp @@ -23,9 +23,9 @@ unsp_device::unsp_device(const machine_config &mconfig, const char *tag, device_ { } -std::vector> unsp_device::memory_space_config() const +device_memory_interface::space_config_vector unsp_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/unsp/unsp.h b/src/devices/cpu/unsp/unsp.h index 4ed412c6973..5a445e05099 100644 --- a/src/devices/cpu/unsp/unsp.h +++ b/src/devices/cpu/unsp/unsp.h @@ -68,7 +68,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/upd7725/upd7725.cpp b/src/devices/cpu/upd7725/upd7725.cpp index a49ee9e9a96..697a8b075b7 100644 --- a/src/devices/cpu/upd7725/upd7725.cpp +++ b/src/devices/cpu/upd7725/upd7725.cpp @@ -206,9 +206,9 @@ void necdsp_device::device_reset() // the space doesn't exist //------------------------------------------------- -std::vector> necdsp_device::memory_space_config() const +device_memory_interface::space_config_vector necdsp_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/upd7725/upd7725.h b/src/devices/cpu/upd7725/upd7725.h index a1e3f55aa98..3210c4d6c3a 100644 --- a/src/devices/cpu/upd7725/upd7725.h +++ b/src/devices/cpu/upd7725/upd7725.h @@ -99,7 +99,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/upd7810/upd7810.cpp b/src/devices/cpu/upd7810/upd7810.cpp index 4247de124b3..e22050fa1f3 100644 --- a/src/devices/cpu/upd7810/upd7810.cpp +++ b/src/devices/cpu/upd7810/upd7810.cpp @@ -508,9 +508,9 @@ upd78c06_device::upd78c06_device(const machine_config &mconfig, const char *tag, { } -std::vector> upd7810_device::memory_space_config() const +device_memory_interface::space_config_vector upd7810_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/cpu/upd7810/upd7810.h b/src/devices/cpu/upd7810/upd7810.h index 2d3563ccc84..a7d9ec13793 100644 --- a/src/devices/cpu/upd7810/upd7810.h +++ b/src/devices/cpu/upd7810/upd7810.h @@ -221,7 +221,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/v30mz/v30mz.cpp b/src/devices/cpu/v30mz/v30mz.cpp index af89c09144b..718c07a2ec8 100644 --- a/src/devices/cpu/v30mz/v30mz.cpp +++ b/src/devices/cpu/v30mz/v30mz.cpp @@ -134,9 +134,9 @@ v30mz_cpu_device::v30mz_cpu_device(const machine_config &mconfig, const char *ta memset(&m_regs, 0x00, sizeof(m_regs)); } -std::vector> v30mz_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector v30mz_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/v30mz/v30mz.h b/src/devices/cpu/v30mz/v30mz.h index b9949878d68..1b8665fd0ea 100644 --- a/src/devices/cpu/v30mz/v30mz.h +++ b/src/devices/cpu/v30mz/v30mz.h @@ -41,7 +41,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/v60/v60.cpp b/src/devices/cpu/v60/v60.cpp index 1950b64c788..dbe8ed08599 100644 --- a/src/devices/cpu/v60/v60.cpp +++ b/src/devices/cpu/v60/v60.cpp @@ -106,9 +106,9 @@ v70_device::v70_device(const machine_config &mconfig, const char *tag, device_t { } -std::vector> v60_device::memory_space_config() const +device_memory_interface::space_config_vector v60_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/v60/v60.h b/src/devices/cpu/v60/v60.h index b69f15dbe90..b891630f048 100644 --- a/src/devices/cpu/v60/v60.h +++ b/src/devices/cpu/v60/v60.h @@ -103,7 +103,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/v810/v810.cpp b/src/devices/cpu/v810/v810.cpp index eb162d3af93..fc6aa5897fe 100644 --- a/src/devices/cpu/v810/v810.cpp +++ b/src/devices/cpu/v810/v810.cpp @@ -45,9 +45,9 @@ v810_device::v810_device(const machine_config &mconfig, const char *tag, device_ { } -std::vector> v810_device::memory_space_config() const +device_memory_interface::space_config_vector v810_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/v810/v810.h b/src/devices/cpu/v810/v810.h index 04c8c8882ea..e136259cc4a 100644 --- a/src/devices/cpu/v810/v810.h +++ b/src/devices/cpu/v810/v810.h @@ -98,7 +98,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/z180/z180.cpp b/src/devices/cpu/z180/z180.cpp index d28b9f45337..a1dda238c60 100644 --- a/src/devices/cpu/z180/z180.cpp +++ b/src/devices/cpu/z180/z180.cpp @@ -779,16 +779,16 @@ static std::unique_ptr SZHVC_sub; #include "z180op.hxx" -std::vector> z180_device::memory_space_config() const +device_memory_interface::space_config_vector z180_device::memory_space_config() const { if(has_configured_map(AS_OPCODES)) - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_OPCODES, &m_decrypted_opcodes_config), std::make_pair(AS_IO, &m_io_config) }; else - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/z180/z180.h b/src/devices/cpu/z180/z180.h index 96c0d812fad..dca5c963539 100644 --- a/src/devices/cpu/z180/z180.h +++ b/src/devices/cpu/z180/z180.h @@ -149,7 +149,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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 diff --git a/src/devices/cpu/z8/z8.cpp b/src/devices/cpu/z8/z8.cpp index b75f651cff1..992e87af860 100644 --- a/src/devices/cpu/z8/z8.cpp +++ b/src/devices/cpu/z8/z8.cpp @@ -204,9 +204,9 @@ offs_t z8_device::disasm_disassemble(std::ostream &stream, offs_t pc, const uint return CPU_DISASSEMBLE_NAME(z8)(this, stream, pc, oprom, opram, options); } -std::vector> z8_device::memory_space_config() const +device_memory_interface::space_config_vector z8_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_DATA, &m_data_config) }; diff --git a/src/devices/cpu/z8/z8.h b/src/devices/cpu/z8/z8.h index 17ec3525d82..7fca726a2dd 100644 --- a/src/devices/cpu/z8/z8.h +++ b/src/devices/cpu/z8/z8.h @@ -83,7 +83,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/z80/tmpz84c011.cpp b/src/devices/cpu/z80/tmpz84c011.cpp index d2e0a749a4a..c9adb52d97e 100644 --- a/src/devices/cpu/z80/tmpz84c011.cpp +++ b/src/devices/cpu/z80/tmpz84c011.cpp @@ -53,7 +53,7 @@ tmpz84c011_device::tmpz84c011_device(const machine_config &mconfig, const char * memset(m_pio_latch, 0, 5); } -std::vector> tmpz84c011_device::memory_space_config() const +device_memory_interface::space_config_vector tmpz84c011_device::memory_space_config() const { auto r = z80_device::memory_space_config(); r.back().second = &m_io_space_config; diff --git a/src/devices/cpu/z80/tmpz84c011.h b/src/devices/cpu/z80/tmpz84c011.h index c614ac2bc78..032db241960 100644 --- a/src/devices/cpu/z80/tmpz84c011.h +++ b/src/devices/cpu/z80/tmpz84c011.h @@ -131,7 +131,7 @@ protected: const address_space_config m_io_space_config; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: // devices/pointers diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp index 1af7fbedf16..55582957728 100644 --- a/src/devices/cpu/z80/tmpz84c015.cpp +++ b/src/devices/cpu/z80/tmpz84c015.cpp @@ -64,7 +64,7 @@ tmpz84c015_device::tmpz84c015_device(const machine_config &mconfig, const char * { } -std::vector> tmpz84c015_device::memory_space_config() const +device_memory_interface::space_config_vector tmpz84c015_device::memory_space_config() const { auto r = z80_device::memory_space_config(); r.back().second = &m_io_space_config; diff --git a/src/devices/cpu/z80/tmpz84c015.h b/src/devices/cpu/z80/tmpz84c015.h index e24ab6d33ec..9343e3aa1a6 100644 --- a/src/devices/cpu/z80/tmpz84c015.h +++ b/src/devices/cpu/z80/tmpz84c015.h @@ -183,7 +183,7 @@ protected: const address_space_config m_io_space_config; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: // devices/pointers diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp index 55c9f33c729..65657b5f363 100644 --- a/src/devices/cpu/z80/z80.cpp +++ b/src/devices/cpu/z80/z80.cpp @@ -3707,16 +3707,16 @@ z80_device::z80_device(const machine_config &mconfig, device_type type, const ch { } -std::vector> z80_device::memory_space_config() const +device_memory_interface::space_config_vector z80_device::memory_space_config() const { if(has_configured_map(AS_OPCODES)) - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_OPCODES, &m_decrypted_opcodes_config), std::make_pair(AS_IO, &m_io_config) }; else - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; diff --git a/src/devices/cpu/z80/z80.h b/src/devices/cpu/z80/z80.h index 85020b9a054..cf244e24d3c 100644 --- a/src/devices/cpu/z80/z80.h +++ b/src/devices/cpu/z80/z80.h @@ -58,7 +58,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/cpu/z8000/z8000.cpp b/src/devices/cpu/z8000/z8000.cpp index 5d006b5274b..ef2326ee80c 100644 --- a/src/devices/cpu/z8000/z8000.cpp +++ b/src/devices/cpu/z8000/z8000.cpp @@ -61,17 +61,17 @@ offs_t z8002_device::disasm_disassemble(std::ostream &stream, offs_t pc, const u return CPU_DISASSEMBLE_NAME(z8000)(this, stream, pc, oprom, opram, options); } -std::vector> z8002_device::memory_space_config() const +device_memory_interface::space_config_vector z8002_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config), std::make_pair(AS_IO, &m_io_config) }; } -std::vector> z8001_device::memory_space_config() const +device_memory_interface::space_config_vector z8001_device::memory_space_config() const { - return std::vector> { + 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) diff --git a/src/devices/cpu/z8000/z8000.h b/src/devices/cpu/z8000/z8000.h index 1feb973e2b4..aa9382e75d7 100644 --- a/src/devices/cpu/z8000/z8000.h +++ b/src/devices/cpu/z8000/z8000.h @@ -65,7 +65,7 @@ protected: virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual std::vector> 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; @@ -661,7 +661,7 @@ protected: virtual void device_reset() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // device_disasm_interface overrides virtual uint32_t disasm_max_opcode_bytes() const override { return 8; } diff --git a/src/devices/machine/at28c16.cpp b/src/devices/machine/at28c16.cpp index 7ebc30943f9..dd24cc7faed 100644 --- a/src/devices/machine/at28c16.cpp +++ b/src/devices/machine/at28c16.cpp @@ -57,9 +57,9 @@ at28c16_device::at28c16_device(const machine_config &mconfig, const char *tag, d // any address spaces owned by this device //------------------------------------------------- -std::vector> at28c16_device::memory_space_config() const +device_memory_interface::space_config_vector at28c16_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/machine/at28c16.h b/src/devices/machine/at28c16.h index 4edd2a00a46..047d0d6a18a 100644 --- a/src/devices/machine/at28c16.h +++ b/src/devices/machine/at28c16.h @@ -49,7 +49,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // device_nvram_interface overrides virtual void nvram_default() override; diff --git a/src/devices/machine/bankdev.cpp b/src/devices/machine/bankdev.cpp index 7a0e158d92b..7abd6e9f5c2 100644 --- a/src/devices/machine/bankdev.cpp +++ b/src/devices/machine/bankdev.cpp @@ -18,9 +18,9 @@ address_map_bank_device::address_map_bank_device( const machine_config &mconfig, { } -std::vector> address_map_bank_device::memory_space_config() const +device_memory_interface::space_config_vector address_map_bank_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/machine/bankdev.h b/src/devices/machine/bankdev.h index 11a90e33639..c51c46bc686 100644 --- a/src/devices/machine/bankdev.h +++ b/src/devices/machine/bankdev.h @@ -54,7 +54,7 @@ protected: virtual void device_config_complete() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: // internal state diff --git a/src/devices/machine/er2055.cpp b/src/devices/machine/er2055.cpp index 0053a13759e..41ba56cfd91 100644 --- a/src/devices/machine/er2055.cpp +++ b/src/devices/machine/er2055.cpp @@ -65,9 +65,9 @@ void er2055_device::device_start() // any address spaces owned by this device //------------------------------------------------- -std::vector> er2055_device::memory_space_config() const +device_memory_interface::space_config_vector er2055_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/machine/er2055.h b/src/devices/machine/er2055.h index eef642e5c29..20becf662aa 100644 --- a/src/devices/machine/er2055.h +++ b/src/devices/machine/er2055.h @@ -51,7 +51,7 @@ protected: virtual void device_start() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // device_nvram_interface overrides virtual void nvram_default() override; diff --git a/src/devices/machine/gt64xxx.cpp b/src/devices/machine/gt64xxx.cpp index e54aaa7c55a..8fa10938ea8 100644 --- a/src/devices/machine/gt64xxx.cpp +++ b/src/devices/machine/gt64xxx.cpp @@ -181,7 +181,7 @@ void gt64xxx_device::set_map(int id, const address_map_delegate &map, device_t * m_cs_devices[id] = device; } -std::vector> gt64xxx_device::memory_space_config() const +device_memory_interface::space_config_vector gt64xxx_device::memory_space_config() const { auto r = pci_bridge_device::memory_space_config(); r.emplace_back(std::make_pair(AS_PCI_MEM, &m_mem_config)); diff --git a/src/devices/machine/gt64xxx.h b/src/devices/machine/gt64xxx.h index 49daa47c35c..db4c5706eb1 100644 --- a/src/devices/machine/gt64xxx.h +++ b/src/devices/machine/gt64xxx.h @@ -107,7 +107,7 @@ public: protected: address_space *m_cpu_space; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; virtual void device_start() override; virtual void device_reset() override; diff --git a/src/devices/machine/i8155.cpp b/src/devices/machine/i8155.cpp index bc25d416878..721575f1468 100644 --- a/src/devices/machine/i8155.cpp +++ b/src/devices/machine/i8155.cpp @@ -344,9 +344,9 @@ void i8155_device::device_timer(emu_timer &timer, device_timer_id id, int param, // any address spaces owned by this device //------------------------------------------------- -std::vector> i8155_device::memory_space_config() const +device_memory_interface::space_config_vector i8155_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/machine/i8155.h b/src/devices/machine/i8155.h index b96527f629f..88c08f57082 100644 --- a/src/devices/machine/i8155.h +++ b/src/devices/machine/i8155.h @@ -100,7 +100,7 @@ protected: virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; inline uint8_t get_timer_mode(); inline void timer_output(); diff --git a/src/devices/machine/linflash.cpp b/src/devices/machine/linflash.cpp index 3c99d9297dc..a520829e57b 100644 --- a/src/devices/machine/linflash.cpp +++ b/src/devices/machine/linflash.cpp @@ -21,9 +21,9 @@ void linear_flash_pccard_device::device_start() m_space = &space(0); } -std::vector> linear_flash_pccard_device::memory_space_config() const +device_memory_interface::space_config_vector linear_flash_pccard_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/machine/linflash.h b/src/devices/machine/linflash.h index 39d6abd21c9..b877036446c 100644 --- a/src/devices/machine/linflash.h +++ b/src/devices/machine/linflash.h @@ -24,7 +24,7 @@ protected: virtual void device_start() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; address_space_config m_space_config; address_space *m_space; diff --git a/src/devices/machine/mcf5206e.cpp b/src/devices/machine/mcf5206e.cpp index b0b8254017d..e7604dd132a 100644 --- a/src/devices/machine/mcf5206e.cpp +++ b/src/devices/machine/mcf5206e.cpp @@ -836,9 +836,9 @@ mcf5206e_peripheral_device::mcf5206e_peripheral_device(const machine_config &mco { } -std::vector> mcf5206e_peripheral_device::memory_space_config() const +device_memory_interface::space_config_vector mcf5206e_peripheral_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/machine/mcf5206e.h b/src/devices/machine/mcf5206e.h index 36781c1c827..c9c46baf672 100644 --- a/src/devices/machine/mcf5206e.h +++ b/src/devices/machine/mcf5206e.h @@ -161,7 +161,7 @@ protected: virtual void device_reset() override; virtual void device_post_load() override { } virtual void device_clock_changed() override { } - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: TIMER_CALLBACK_MEMBER(timer1_callback); diff --git a/src/devices/machine/netlist.cpp b/src/devices/machine/netlist.cpp index b4f6b18fa1a..60c814ee45e 100644 --- a/src/devices/machine/netlist.cpp +++ b/src/devices/machine/netlist.cpp @@ -486,9 +486,9 @@ void netlist_mame_ram_pointer_device::device_timer(emu_timer &timer, device_time m_data = (*m_param)(); } -std::vector> netlist_mame_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector netlist_mame_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h index c83e10fb6a9..bf6fd084056 100644 --- a/src/devices/machine/netlist.h +++ b/src/devices/machine/netlist.h @@ -180,7 +180,7 @@ protected: ATTR_COLD virtual offs_t disasm_disassemble(std::ostream &stream, offs_t pc, const uint8_t *oprom, const uint8_t *opram, uint32_t options) override; // device_memory_interface overrides - virtual std::vector> 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; diff --git a/src/devices/machine/pci.cpp b/src/devices/machine/pci.cpp index 3f2dc2ff4bb..afebb141d6c 100644 --- a/src/devices/machine/pci.cpp +++ b/src/devices/machine/pci.cpp @@ -448,9 +448,9 @@ READ8_MEMBER(pci_bridge_device::header_type_r) return 0x01; } -std::vector> pci_bridge_device::memory_space_config() const +device_memory_interface::space_config_vector pci_bridge_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PCI_CONFIG, &configure_space_config) }; } diff --git a/src/devices/machine/pci.h b/src/devices/machine/pci.h index 53a171cbb21..0a8333e074f 100644 --- a/src/devices/machine/pci.h +++ b/src/devices/machine/pci.h @@ -209,7 +209,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; virtual device_t *bus_root(); virtual void regenerate_config_mapping(); diff --git a/src/devices/machine/tc009xlvc.cpp b/src/devices/machine/tc009xlvc.cpp index 96ca73a463e..5816c094831 100644 --- a/src/devices/machine/tc009xlvc.cpp +++ b/src/devices/machine/tc009xlvc.cpp @@ -281,9 +281,9 @@ void tc0091lvc_device::device_start() m_gfxdecode->set_gfx(m_gfx_index, std::make_unique(&palette, char_layout, (uint8_t *)m_pcg_ram, 0, palette.entries() / 16, 0)); } -std::vector> tc0091lvc_device::memory_space_config() const +device_memory_interface::space_config_vector tc0091lvc_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/machine/tc009xlvc.h b/src/devices/machine/tc009xlvc.h index e3388bf177c..b917dc4fc98 100644 --- a/src/devices/machine/tc009xlvc.h +++ b/src/devices/machine/tc009xlvc.h @@ -49,7 +49,7 @@ public: protected: virtual void device_start() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, uint8_t global_flip); diff --git a/src/devices/machine/tmp68301.cpp b/src/devices/machine/tmp68301.cpp index c2abfcdc018..8cbc9eaf5f9 100644 --- a/src/devices/machine/tmp68301.cpp +++ b/src/devices/machine/tmp68301.cpp @@ -159,9 +159,9 @@ void tmp68301_device::device_reset() // any address spaces owned by this device //------------------------------------------------- -std::vector> tmp68301_device::memory_space_config() const +device_memory_interface::space_config_vector tmp68301_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/machine/tmp68301.h b/src/devices/machine/tmp68301.h index 0471db112f5..f5c69181bca 100644 --- a/src/devices/machine/tmp68301.h +++ b/src/devices/machine/tmp68301.h @@ -58,7 +58,7 @@ protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: TIMER_CALLBACK_MEMBER( timer_callback ); diff --git a/src/devices/machine/vrc4373.cpp b/src/devices/machine/vrc4373.cpp index ac10b41a567..8aef5983ee9 100644 --- a/src/devices/machine/vrc4373.cpp +++ b/src/devices/machine/vrc4373.cpp @@ -99,7 +99,7 @@ vrc4373_device::vrc4373_device(const machine_config &mconfig, const char *tag, d { } -std::vector> vrc4373_device::memory_space_config() const +device_memory_interface::space_config_vector vrc4373_device::memory_space_config() const { auto r = pci_bridge_device::memory_space_config(); r.emplace_back(std::make_pair(AS_PCI_MEM, &m_mem_config)); diff --git a/src/devices/machine/vrc4373.h b/src/devices/machine/vrc4373.h index 5e14ee335a1..47ff76feb95 100644 --- a/src/devices/machine/vrc4373.h +++ b/src/devices/machine/vrc4373.h @@ -63,7 +63,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; TIMER_CALLBACK_MEMBER(dma_transfer); diff --git a/src/devices/machine/vrc5074.cpp b/src/devices/machine/vrc5074.cpp index 2936f696fd7..fd65170cb2e 100644 --- a/src/devices/machine/vrc5074.cpp +++ b/src/devices/machine/vrc5074.cpp @@ -163,7 +163,7 @@ void vrc5074_device::set_map(int id, const address_map_delegate &map, device_t * m_cs_devices[id - 2] = device; } -std::vector> vrc5074_device::memory_space_config() const +device_memory_interface::space_config_vector vrc5074_device::memory_space_config() const { auto r = pci_bridge_device::memory_space_config(); r.emplace_back(std::make_pair(AS_PCI_MEM, &m_mem_config)); diff --git a/src/devices/machine/vrc5074.h b/src/devices/machine/vrc5074.h index dcb1487de00..ac5bf548e49 100644 --- a/src/devices/machine/vrc5074.h +++ b/src/devices/machine/vrc5074.h @@ -67,7 +67,7 @@ public: protected: address_space *m_cpu_space; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; virtual void device_start() override; virtual void device_reset() override; diff --git a/src/devices/machine/x2212.cpp b/src/devices/machine/x2212.cpp index a13edde1824..04a9ee5a1c9 100644 --- a/src/devices/machine/x2212.cpp +++ b/src/devices/machine/x2212.cpp @@ -86,9 +86,9 @@ void x2212_device::device_start() // any address spaces owned by this device //------------------------------------------------- -std::vector> x2212_device::memory_space_config() const +device_memory_interface::space_config_vector x2212_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_sram_space_config), std::make_pair(1, &m_e2prom_space_config) }; diff --git a/src/devices/machine/x2212.h b/src/devices/machine/x2212.h index 8a3581a3308..2b27ff71efb 100644 --- a/src/devices/machine/x2212.h +++ b/src/devices/machine/x2212.h @@ -71,7 +71,7 @@ protected: virtual void device_start() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // device_nvram_interface overrides virtual void nvram_default() override; diff --git a/src/devices/sound/cdp1869.cpp b/src/devices/sound/cdp1869.cpp index da5ade9d6a3..2a352d01bd8 100644 --- a/src/devices/sound/cdp1869.cpp +++ b/src/devices/sound/cdp1869.cpp @@ -460,9 +460,9 @@ void cdp1869_device::device_timer(emu_timer &timer, device_timer_id id, int para // any address spaces owned by this device //------------------------------------------------- -std::vector> cdp1869_device::memory_space_config() const +device_memory_interface::space_config_vector cdp1869_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/sound/cdp1869.h b/src/devices/sound/cdp1869.h index 998a69dfa5c..a41da2eb072 100644 --- a/src/devices/sound/cdp1869.h +++ b/src/devices/sound/cdp1869.h @@ -224,7 +224,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // device_sound_interface callbacks virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; diff --git a/src/devices/sound/dave.cpp b/src/devices/sound/dave.cpp index 2cc9cfc25a3..d66dc8ad003 100644 --- a/src/devices/sound/dave.cpp +++ b/src/devices/sound/dave.cpp @@ -173,9 +173,9 @@ void dave_device::device_timer(emu_timer &timer, device_timer_id id, int param, // any address spaces owned by this device //------------------------------------------------- -std::vector> dave_device::memory_space_config() const +device_memory_interface::space_config_vector dave_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_space_config), std::make_pair(AS_IO, &m_io_space_config) }; diff --git a/src/devices/sound/dave.h b/src/devices/sound/dave.h index 90d4ec52f14..b6ce3827310 100644 --- a/src/devices/sound/dave.h +++ b/src/devices/sound/dave.h @@ -72,7 +72,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; diff --git a/src/devices/sound/mos6560.cpp b/src/devices/sound/mos6560.cpp index b8b7af6cc9b..e37c65ba8e5 100644 --- a/src/devices/sound/mos6560.cpp +++ b/src/devices/sound/mos6560.cpp @@ -722,9 +722,9 @@ mos656x_attack_ufo_device::mos656x_attack_ufo_device(const machine_config &mconf // any address spaces owned by this device //------------------------------------------------- -std::vector> mos6560_device::memory_space_config() const +device_memory_interface::space_config_vector mos6560_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_videoram_space_config), std::make_pair(1, &m_colorram_space_config) }; diff --git a/src/devices/sound/mos6560.h b/src/devices/sound/mos6560.h index 8d652204d3f..9f0ff2ee2c4 100644 --- a/src/devices/sound/mos6560.h +++ b/src/devices/sound/mos6560.h @@ -139,7 +139,7 @@ public: template static devcb_base &set_potx_rd_callback(device_t &device, Object &&cb) { return downcast(device).m_read_potx.set_callback(std::forward(cb)); } template static devcb_base &set_poty_rd_callback(device_t &device, Object &&cb) { return downcast(device).m_read_poty.set_callback(std::forward(cb)); } - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/devices/sound/mos7360.cpp b/src/devices/sound/mos7360.cpp index a312263bf36..d50368f3e54 100644 --- a/src/devices/sound/mos7360.cpp +++ b/src/devices/sound/mos7360.cpp @@ -180,9 +180,9 @@ ADDRESS_MAP_END // any address spaces owned by this device //------------------------------------------------- -std::vector> mos7360_device::memory_space_config() const +device_memory_interface::space_config_vector mos7360_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_videoram_space_config) }; } diff --git a/src/devices/sound/mos7360.h b/src/devices/sound/mos7360.h index 48353bca33a..c2ee5ffc198 100644 --- a/src/devices/sound/mos7360.h +++ b/src/devices/sound/mos7360.h @@ -102,7 +102,7 @@ public: m_read_k.set_callback(std::forward(k)); } - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; uint8_t read(address_space &space, offs_t offset, int &cs0, int &cs1); void write(address_space &space, offs_t offset, uint8_t data, int &cs0, int &cs1); diff --git a/src/devices/sound/upd7752.cpp b/src/devices/sound/upd7752.cpp index 250b4645257..632aee6a0a0 100644 --- a/src/devices/sound/upd7752.cpp +++ b/src/devices/sound/upd7752.cpp @@ -56,9 +56,9 @@ upd7752_device::upd7752_device(const machine_config &mconfig, const char *tag, d // any address spaces owned by this device //------------------------------------------------- -std::vector> upd7752_device::memory_space_config() const +device_memory_interface::space_config_vector upd7752_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/sound/upd7752.h b/src/devices/sound/upd7752.h index f25dc53a764..5861238ca51 100644 --- a/src/devices/sound/upd7752.h +++ b/src/devices/sound/upd7752.h @@ -36,7 +36,7 @@ protected: virtual void device_reset() override; virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: sound_stream *m_stream; diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp index 2a1f684ad88..3603e018953 100644 --- a/src/devices/video/315_5124.cpp +++ b/src/devices/video/315_5124.cpp @@ -200,9 +200,9 @@ sega315_5378_device::sega315_5378_device(const machine_config &mconfig, const ch } -std::vector> sega315_5124_device::memory_space_config() const +device_memory_interface::space_config_vector sega315_5124_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/315_5124.h b/src/devices/video/315_5124.h index cf0646987fa..4f2f618caed 100644 --- a/src/devices/video/315_5124.h +++ b/src/devices/video/315_5124.h @@ -92,7 +92,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void device_add_mconfig(machine_config &config) override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; void set_display_settings(); void set_frame_timing(); diff --git a/src/devices/video/cesblit.cpp b/src/devices/video/cesblit.cpp index 6acd772fb4c..0dcfb813c86 100644 --- a/src/devices/video/cesblit.cpp +++ b/src/devices/video/cesblit.cpp @@ -79,9 +79,9 @@ cesblit_device::cesblit_device(const machine_config &mconfig, const char *tag, d { } -std::vector> cesblit_device::memory_space_config() const +device_memory_interface::space_config_vector cesblit_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_space_config) }; } diff --git a/src/devices/video/cesblit.h b/src/devices/video/cesblit.h index 8125ec6eadd..33632f5abd8 100644 --- a/src/devices/video/cesblit.h +++ b/src/devices/video/cesblit.h @@ -59,7 +59,7 @@ protected: // device-level overrides virtual void device_start() override; virtual void device_stop() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; void do_blit(); diff --git a/src/devices/video/crt9007.cpp b/src/devices/video/crt9007.cpp index a8d37392034..b68317a7b57 100644 --- a/src/devices/video/crt9007.cpp +++ b/src/devices/video/crt9007.cpp @@ -656,9 +656,9 @@ void crt9007_device::device_timer(emu_timer &timer, device_timer_id id, int para // any address spaces owned by this device //------------------------------------------------- -std::vector> crt9007_device::memory_space_config() const +device_memory_interface::space_config_vector crt9007_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/crt9007.h b/src/devices/video/crt9007.h index d7d80900d4f..249333dc1dc 100644 --- a/src/devices/video/crt9007.h +++ b/src/devices/video/crt9007.h @@ -122,7 +122,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: enum diff --git a/src/devices/video/ef9345.cpp b/src/devices/video/ef9345.cpp index d3c58fb5670..66adfdfb12d 100644 --- a/src/devices/video/ef9345.cpp +++ b/src/devices/video/ef9345.cpp @@ -42,9 +42,9 @@ ADDRESS_MAP_END // any address spaces owned by this device //------------------------------------------------- -std::vector> ef9345_device::memory_space_config() const +device_memory_interface::space_config_vector ef9345_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/ef9345.h b/src/devices/video/ef9345.h index beece436015..9466f9a39d4 100644 --- a/src/devices/video/ef9345.h +++ b/src/devices/video/ef9345.h @@ -56,7 +56,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_config_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // address space configurations const address_space_config m_space_config; diff --git a/src/devices/video/ef9364.cpp b/src/devices/video/ef9364.cpp index 6ac4c8008ad..0bbde3e72d7 100644 --- a/src/devices/video/ef9364.cpp +++ b/src/devices/video/ef9364.cpp @@ -42,9 +42,9 @@ ADDRESS_MAP_END // any address spaces owned by this device //------------------------------------------------- -std::vector> ef9364_device::memory_space_config() const +device_memory_interface::space_config_vector ef9364_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/ef9364.h b/src/devices/video/ef9364.h index b33e19f6e93..db61d2199fa 100644 --- a/src/devices/video/ef9364.h +++ b/src/devices/video/ef9364.h @@ -60,7 +60,7 @@ protected: virtual void device_reset() override; // device_config_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // address space configurations const address_space_config m_space_config; diff --git a/src/devices/video/ef9365.cpp b/src/devices/video/ef9365.cpp index 3fc83abbf8b..d2ccde9205c 100644 --- a/src/devices/video/ef9365.cpp +++ b/src/devices/video/ef9365.cpp @@ -175,9 +175,9 @@ ADDRESS_MAP_END // any address spaces owned by this device //------------------------------------------------- -std::vector> ef9365_device::memory_space_config() const +device_memory_interface::space_config_vector ef9365_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/ef9365.h b/src/devices/video/ef9365.h index fdf084ffd7b..9d0903e7200 100644 --- a/src/devices/video/ef9365.h +++ b/src/devices/video/ef9365.h @@ -74,7 +74,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; // device_config_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // address space configurations const address_space_config m_space_config; diff --git a/src/devices/video/hd61830.cpp b/src/devices/video/hd61830.cpp index fcde5279b28..52fc9c4164b 100644 --- a/src/devices/video/hd61830.cpp +++ b/src/devices/video/hd61830.cpp @@ -148,9 +148,9 @@ void hd61830_device::device_timer(emu_timer &timer, device_timer_id id, int para // any address spaces owned by this device //------------------------------------------------- -std::vector> hd61830_device::memory_space_config() const +device_memory_interface::space_config_vector hd61830_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/hd61830.h b/src/devices/video/hd61830.h index 60d6cee9fd0..b33a538a475 100644 --- a/src/devices/video/hd61830.h +++ b/src/devices/video/hd61830.h @@ -55,7 +55,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; uint8_t readbyte(offs_t address) { return space().read_byte(address); } void writebyte(offs_t address, uint8_t data) { space().write_byte(address, data); } diff --git a/src/devices/video/hd63484.cpp b/src/devices/video/hd63484.cpp index b781000c9d6..854222d1efe 100644 --- a/src/devices/video/hd63484.cpp +++ b/src/devices/video/hd63484.cpp @@ -344,9 +344,9 @@ ROM_END // any address spaces owned by this device //------------------------------------------------- -std::vector> hd63484_device::memory_space_config() const +device_memory_interface::space_config_vector hd63484_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/hd63484.h b/src/devices/video/hd63484.h index 22c3ddbbb1a..3c228b512e0 100644 --- a/src/devices/video/hd63484.h +++ b/src/devices/video/hd63484.h @@ -61,7 +61,7 @@ public: uint32_t update_screen(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); virtual const tiny_rom_entry *device_rom_region() const override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; protected: // device-level overrides diff --git a/src/devices/video/hd66421.cpp b/src/devices/video/hd66421.cpp index 937bebd3996..2a22f4732e5 100644 --- a/src/devices/video/hd66421.cpp +++ b/src/devices/video/hd66421.cpp @@ -81,9 +81,9 @@ ADDRESS_MAP_END // any address spaces owned by this device //------------------------------------------------- -std::vector> hd66421_device::memory_space_config() const +device_memory_interface::space_config_vector hd66421_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/hd66421.h b/src/devices/video/hd66421.h index 23c65501c03..a9248f65d09 100644 --- a/src/devices/video/hd66421.h +++ b/src/devices/video/hd66421.h @@ -50,7 +50,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_config_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // address space configurations const address_space_config m_space_config; diff --git a/src/devices/video/huc6271.cpp b/src/devices/video/huc6271.cpp index c44d47cf3eb..d25ae59cd98 100644 --- a/src/devices/video/huc6271.cpp +++ b/src/devices/video/huc6271.cpp @@ -66,9 +66,9 @@ void huc6271_device::device_reset() { } -std::vector> huc6271_device::memory_space_config() const +device_memory_interface::space_config_vector huc6271_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_DATA, &m_data_space_config) }; } diff --git a/src/devices/video/huc6271.h b/src/devices/video/huc6271.h index 64311033520..89dd5874e71 100644 --- a/src/devices/video/huc6271.h +++ b/src/devices/video/huc6271.h @@ -41,7 +41,7 @@ protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: const address_space_config m_data_space_config; diff --git a/src/devices/video/huc6272.cpp b/src/devices/video/huc6272.cpp index bd28aa0baee..b817490e0f3 100644 --- a/src/devices/video/huc6272.cpp +++ b/src/devices/video/huc6272.cpp @@ -95,9 +95,9 @@ void huc6272_device::device_reset() // any address spaces owned by this device //------------------------------------------------- -std::vector> huc6272_device::memory_space_config() const +device_memory_interface::space_config_vector huc6272_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_space_config), std::make_pair(AS_DATA, &m_data_space_config) }; diff --git a/src/devices/video/huc6272.h b/src/devices/video/huc6272.h index 638aebdf0d6..bec5b0eba20 100644 --- a/src/devices/video/huc6272.h +++ b/src/devices/video/huc6272.h @@ -56,7 +56,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: const char *m_huc6271_tag; diff --git a/src/devices/video/m50458.cpp b/src/devices/video/m50458.cpp index bb79ba1faaa..0b756fbbb47 100644 --- a/src/devices/video/m50458.cpp +++ b/src/devices/video/m50458.cpp @@ -137,9 +137,9 @@ const tiny_rom_entry *m50458_device::device_rom_region() const // any address spaces owned by this device //------------------------------------------------- -std::vector> m50458_device::memory_space_config() const +device_memory_interface::space_config_vector m50458_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/m50458.h b/src/devices/video/m50458.h index dc2c7d7d70a..0d3d33bd9d2 100644 --- a/src/devices/video/m50458.h +++ b/src/devices/video/m50458.h @@ -63,7 +63,7 @@ protected: virtual void device_validity_check(validity_checker &valid) const override; virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; int m_latch; int m_reset_line; diff --git a/src/devices/video/mb90082.cpp b/src/devices/video/mb90082.cpp index 8007f283e2f..2afe3903593 100644 --- a/src/devices/video/mb90082.cpp +++ b/src/devices/video/mb90082.cpp @@ -50,9 +50,9 @@ const tiny_rom_entry *mb90082_device::device_rom_region() const // any address spaces owned by this device //------------------------------------------------- -std::vector> mb90082_device::memory_space_config() const +device_memory_interface::space_config_vector mb90082_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/mb90082.h b/src/devices/video/mb90082.h index 0bdeae355d2..b4de8293bc3 100644 --- a/src/devices/video/mb90082.h +++ b/src/devices/video/mb90082.h @@ -46,7 +46,7 @@ protected: virtual void device_validity_check(validity_checker &valid) const override; virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: enum diff --git a/src/devices/video/mb_vcu.cpp b/src/devices/video/mb_vcu.cpp index 08f082fa920..46087f9997f 100644 --- a/src/devices/video/mb_vcu.cpp +++ b/src/devices/video/mb_vcu.cpp @@ -91,9 +91,9 @@ WRITE8_MEMBER( mb_vcu_device::mb_vcu_paletteram_w ) // any address spaces owned by this device //------------------------------------------------- -std::vector> mb_vcu_device::memory_space_config() const +device_memory_interface::space_config_vector mb_vcu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_videoram_space_config), std::make_pair(1, &m_paletteram_space_config) }; diff --git a/src/devices/video/mb_vcu.h b/src/devices/video/mb_vcu.h index 2c2d820e238..efaad7c7f28 100644 --- a/src/devices/video/mb_vcu.h +++ b/src/devices/video/mb_vcu.h @@ -45,7 +45,7 @@ protected: virtual void device_validity_check(validity_checker &valid) const override; virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: inline uint8_t read_byte(offs_t address); diff --git a/src/devices/video/mc6845.cpp b/src/devices/video/mc6845.cpp index ee3b2ae291d..57ebab801c2 100644 --- a/src/devices/video/mc6845.cpp +++ b/src/devices/video/mc6845.cpp @@ -1425,9 +1425,9 @@ void mos8568_device::device_reset() { mos8563_device::device_reset(); } // any address spaces owned by this device //------------------------------------------------- -std::vector> mos8563_device::memory_space_config() const +device_memory_interface::space_config_vector mos8563_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_videoram_space_config), }; } diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h index 2d6f9761b2f..45c10eb980a 100644 --- a/src/devices/video/mc6845.h +++ b/src/devices/video/mc6845.h @@ -429,7 +429,7 @@ class mos8563_device : public mc6845_device, public: mos8563_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; DECLARE_WRITE8_MEMBER( address_w ); DECLARE_READ8_MEMBER( status_r ); diff --git a/src/devices/video/mos6566.cpp b/src/devices/video/mos6566.cpp index 81082d5a8c8..ab5a4b360e5 100644 --- a/src/devices/video/mos6566.cpp +++ b/src/devices/video/mos6566.cpp @@ -239,9 +239,9 @@ ADDRESS_MAP_END // any address spaces owned by this device //------------------------------------------------- -std::vector> mos6566_device::memory_space_config() const +device_memory_interface::space_config_vector mos6566_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_videoram_space_config), std::make_pair(1, &m_colorram_space_config) }; diff --git a/src/devices/video/mos6566.h b/src/devices/video/mos6566.h index 18e03743738..0da94f20aeb 100644 --- a/src/devices/video/mos6566.h +++ b/src/devices/video/mos6566.h @@ -218,7 +218,7 @@ public: template static devcb_base &set_aec_wr_callback(device_t &device, Object &&cb) { return downcast(device).m_write_aec.set_callback(std::forward(cb)); } template static devcb_base &set_k_wr_callback(device_t &device, Object &&cb) { return downcast(device).m_write_k.set_callback(std::forward(cb)); } - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); diff --git a/src/devices/video/msm6255.cpp b/src/devices/video/msm6255.cpp index 25618a69b10..1f546630e27 100644 --- a/src/devices/video/msm6255.cpp +++ b/src/devices/video/msm6255.cpp @@ -121,9 +121,9 @@ void msm6255_device::device_reset() // any address spaces owned by this device //------------------------------------------------- -std::vector> msm6255_device::memory_space_config() const +device_memory_interface::space_config_vector msm6255_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/msm6255.h b/src/devices/video/msm6255.h index 583b6da2b55..11c7d33996f 100644 --- a/src/devices/video/msm6255.h +++ b/src/devices/video/msm6255.h @@ -43,7 +43,7 @@ protected: virtual void device_reset() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: // registers diff --git a/src/devices/video/ppu2c0x.cpp b/src/devices/video/ppu2c0x.cpp index ff294c6f968..ae0d0618af4 100644 --- a/src/devices/video/ppu2c0x.cpp +++ b/src/devices/video/ppu2c0x.cpp @@ -98,9 +98,9 @@ ADDRESS_MAP_END // any address spaces owned by this device //------------------------------------------------- -std::vector> ppu2c0x_device::memory_space_config() const +device_memory_interface::space_config_vector ppu2c0x_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/ppu2c0x.h b/src/devices/video/ppu2c0x.h index 1dad69741e4..4fd5a2e27a5 100644 --- a/src/devices/video/ppu2c0x.h +++ b/src/devices/video/ppu2c0x.h @@ -203,7 +203,7 @@ protected: virtual void device_config_complete() override; // device_config_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // address space configurations const address_space_config m_space_config; diff --git a/src/devices/video/ramdac.cpp b/src/devices/video/ramdac.cpp index 7b9da1c54af..b2852915bd0 100644 --- a/src/devices/video/ramdac.cpp +++ b/src/devices/video/ramdac.cpp @@ -65,9 +65,9 @@ void ramdac_device::static_set_palette_tag(device_t &device, const char *tag) // any address spaces owned by this device //------------------------------------------------- -std::vector> ramdac_device::memory_space_config() const +device_memory_interface::space_config_vector ramdac_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/ramdac.h b/src/devices/video/ramdac.h index 4705f491089..36241c011fb 100644 --- a/src/devices/video/ramdac.h +++ b/src/devices/video/ramdac.h @@ -60,7 +60,7 @@ public: DECLARE_WRITE8_MEMBER( ramdac_rgb666_w ); DECLARE_WRITE8_MEMBER( ramdac_rgb888_w ); - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; protected: // device-level overrides diff --git a/src/devices/video/scn2674.cpp b/src/devices/video/scn2674.cpp index 78df5d1f939..2af0483b14c 100644 --- a/src/devices/video/scn2674.cpp +++ b/src/devices/video/scn2674.cpp @@ -53,9 +53,9 @@ scn2674_device::scn2674_device(const machine_config &mconfig, const char *tag, d { } -std::vector> scn2674_device::memory_space_config() const +device_memory_interface::space_config_vector scn2674_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/scn2674.h b/src/devices/video/scn2674.h index e1580e0a0b6..a79ac7d4738 100644 --- a/src/devices/video/scn2674.h +++ b/src/devices/video/scn2674.h @@ -42,7 +42,7 @@ public: DECLARE_WRITE8_MEMBER( buffer_w ) { m_buffer = data; } uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; protected: virtual void device_start() override; diff --git a/src/devices/video/sed1330.cpp b/src/devices/video/sed1330.cpp index 689ce522ad0..f80d8405bdf 100644 --- a/src/devices/video/sed1330.cpp +++ b/src/devices/video/sed1330.cpp @@ -219,9 +219,9 @@ void sed1330_device::device_reset() // any address spaces owned by this device //------------------------------------------------- -std::vector> sed1330_device::memory_space_config() const +device_memory_interface::space_config_vector sed1330_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/sed1330.h b/src/devices/video/sed1330.h index 73b6da22be4..755d660f126 100644 --- a/src/devices/video/sed1330.h +++ b/src/devices/video/sed1330.h @@ -56,7 +56,7 @@ protected: virtual void device_reset() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; inline uint8_t readbyte(offs_t address); inline void writebyte(offs_t address, uint8_t m_data); diff --git a/src/devices/video/tms3556.cpp b/src/devices/video/tms3556.cpp index c2043076204..c2900da30cd 100644 --- a/src/devices/video/tms3556.cpp +++ b/src/devices/video/tms3556.cpp @@ -66,9 +66,9 @@ ADDRESS_MAP_END // any address spaces owned by this device //------------------------------------------------- -std::vector> tms3556_device::memory_space_config() const +device_memory_interface::space_config_vector tms3556_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/tms3556.h b/src/devices/video/tms3556.h index bcdbc008d13..7d419b3b426 100644 --- a/src/devices/video/tms3556.h +++ b/src/devices/video/tms3556.h @@ -62,7 +62,7 @@ protected: virtual void device_start() override; // device_config_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // address space configurations const address_space_config m_space_config; diff --git a/src/devices/video/tms9928a.cpp b/src/devices/video/tms9928a.cpp index bbc543335eb..fc9898ebea4 100644 --- a/src/devices/video/tms9928a.cpp +++ b/src/devices/video/tms9928a.cpp @@ -110,9 +110,9 @@ tms9929a_device::tms9929a_device(const machine_config &mconfig, const char *tag, { } -std::vector> tms9928a_device::memory_space_config() const +device_memory_interface::space_config_vector tms9928a_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_DATA, &m_space_config) }; } diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h index 06b53962625..7662bcc3eeb 100644 --- a/src/devices/video/tms9928a.h +++ b/src/devices/video/tms9928a.h @@ -116,7 +116,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: void change_register(uint8_t reg, uint8_t val); diff --git a/src/devices/video/upd7220.cpp b/src/devices/video/upd7220.cpp index f1444738296..55f161edbe2 100644 --- a/src/devices/video/upd7220.cpp +++ b/src/devices/video/upd7220.cpp @@ -167,9 +167,9 @@ ROM_END // any address spaces owned by this device //------------------------------------------------- -std::vector> upd7220_device::memory_space_config() const +device_memory_interface::space_config_vector upd7220_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/upd7220.h b/src/devices/video/upd7220.h index 087789bdb58..75c3b2f7faa 100644 --- a/src/devices/video/upd7220.h +++ b/src/devices/video/upd7220.h @@ -101,7 +101,7 @@ public: uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); virtual const tiny_rom_entry *device_rom_region() const override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; protected: // device-level overrides diff --git a/src/devices/video/upd7227.cpp b/src/devices/video/upd7227.cpp index 88e9ac2d9ac..de456954d25 100644 --- a/src/devices/video/upd7227.cpp +++ b/src/devices/video/upd7227.cpp @@ -91,9 +91,9 @@ void upd7227_device::device_reset() // any address spaces owned by this device //------------------------------------------------- -std::vector> upd7227_device::memory_space_config() const +device_memory_interface::space_config_vector upd7227_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/devices/video/upd7227.h b/src/devices/video/upd7227.h index 73405b57818..9e8bb4a3647 100644 --- a/src/devices/video/upd7227.h +++ b/src/devices/video/upd7227.h @@ -53,7 +53,7 @@ protected: virtual void device_reset() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; address_space_config m_space_config; diff --git a/src/devices/video/v9938.cpp b/src/devices/video/v9938.cpp index ee69b1f26fc..d7a3dcb542a 100644 --- a/src/devices/video/v9938.cpp +++ b/src/devices/video/v9938.cpp @@ -132,9 +132,9 @@ v9958_device::v9958_device(const machine_config &mconfig, const char *tag, devic { } -std::vector> v99x8_device::memory_space_config() const +device_memory_interface::space_config_vector v99x8_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_DATA, &m_space_config) }; } diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h index 0cc6eb9a4cd..a177e7daa6e 100644 --- a/src/devices/video/v9938.h +++ b/src/devices/video/v9938.h @@ -129,7 +129,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; virtual void palette_init() = 0; diff --git a/src/emu/dimemory.cpp b/src/emu/dimemory.cpp index 03549cd876d..ee610b65d71 100644 --- a/src/emu/dimemory.cpp +++ b/src/emu/dimemory.cpp @@ -175,21 +175,6 @@ void device_memory_interface::set_address_space(int spacenum, address_space &spa } -//------------------------------------------------- -// load_configs - retrieve the space configs -//------------------------------------------------- - -void device_memory_interface::load_configs() -{ - auto r = memory_space_config(); - for (const auto &entry : r) { - if (entry.first >= int(m_address_config.size())) - m_address_config.resize(entry.first + 1); - m_address_config[entry.first] = entry.second; - } -} - - //------------------------------------------------- // memory_translate - translate from logical to // phyiscal addresses; designed to be overridden @@ -204,6 +189,22 @@ bool device_memory_interface::memory_translate(int spacenum, int intention, offs } +//------------------------------------------------- +// interface_config_complete - perform final +// memory configuration setup +//------------------------------------------------- + +void device_memory_interface::interface_config_complete() +{ + const space_config_vector r = memory_space_config(); + for (const auto &entry : r) { + if (entry.first >= int(m_address_config.size())) + m_address_config.resize(entry.first + 1); + m_address_config[entry.first] = entry.second; + } +} + + //------------------------------------------------- // interface_validity_check - perform validity // checks on the memory configuration @@ -211,8 +212,6 @@ bool device_memory_interface::memory_translate(int spacenum, int intention, offs void device_memory_interface::interface_validity_check(validity_checker &valid) const { - const_cast(this)->load_configs(); - // loop over all address spaces for (int spacenum = 0; spacenum < int(m_address_config.size()); ++spacenum) { diff --git a/src/emu/dimemory.h b/src/emu/dimemory.h index 40e123e2fb8..1daa5f19bf3 100644 --- a/src/emu/dimemory.h +++ b/src/emu/dimemory.h @@ -102,16 +102,17 @@ public: // just use it device_memory_interface &memory() { return *this; } - void load_configs(); - protected: + using space_config_vector = std::vector>; + // required overrides - virtual std::vector> memory_space_config() const = 0; + virtual space_config_vector memory_space_config() const = 0; // optional operation overrides virtual bool memory_translate(int spacenum, int intention, offs_t &address); // interface-level overrides + virtual void interface_config_complete() override; virtual void interface_validity_check(validity_checker &valid) const override; // configuration diff --git a/src/emu/dirom.cpp b/src/emu/dirom.cpp index b0caedc721a..161b7770c75 100644 --- a/src/emu/dirom.cpp +++ b/src/emu/dirom.cpp @@ -21,9 +21,9 @@ void device_rom_interface::static_set_device_rom_tag(device_t &device, const cha romintf->m_rom_tag = tag; } -std::vector> device_rom_interface::memory_space_config() const +device_memory_interface::space_config_vector device_rom_interface::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_rom_config) }; } diff --git a/src/emu/dirom.h b/src/emu/dirom.h index 345c58dbd5c..1e9efcca037 100644 --- a/src/emu/dirom.h +++ b/src/emu/dirom.h @@ -47,7 +47,7 @@ private: memory_bank *m_bank; int m_cur_bank, m_bank_count; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; virtual void interface_pre_start() override; DECLARE_READ8_MEMBER(z8_r); diff --git a/src/emu/emumem.cpp b/src/emu/emumem.cpp index 08e0bc3e02a..cda6eae02d1 100644 --- a/src/emu/emumem.cpp +++ b/src/emu/emumem.cpp @@ -1568,19 +1568,6 @@ void memory_manager::allocate(device_memory_interface &memory) } } -//------------------------------------------------- -// configure - configure the address spaces -//------------------------------------------------- - -void memory_manager::configure() -{ - // loop over devices to configure the address spaces - memory_interface_iterator iter(machine().root_device()); - for (device_memory_interface &memory : iter) - memory.load_configs(); - m_machine.m_dummy_space.load_configs(); -} - //------------------------------------------------- // initialize - initialize the memory system //------------------------------------------------- diff --git a/src/emu/emumem.h b/src/emu/emumem.h index 8b28aab8cfe..dd6ff5df38e 100644 --- a/src/emu/emumem.h +++ b/src/emu/emumem.h @@ -643,7 +643,6 @@ class memory_manager public: // construction/destruction memory_manager(running_machine &machine); - void configure(); void initialize(); // getters diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index a2f8ba48752..a700345a64a 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -139,6 +139,7 @@ running_machine::running_machine(const machine_config &_config, machine_manager memset(&m_base_time, 0, sizeof(m_base_time)); m_dummy_space.set_machine(*this); + m_dummy_space.config_complete(); // set the machine on all devices device_iterator iter(root_device()); @@ -238,7 +239,6 @@ void running_machine::start() // needs rom bases), and finally initialize CPUs (which needs // complete address spaces). These operations must proceed in this // order - m_memory.configure(); m_rom_load = make_unique_clear(*this); m_memory.initialize(); @@ -1304,9 +1304,9 @@ void dummy_space_device::device_start() // any address spaces owned by this device //------------------------------------------------- -std::vector> dummy_space_device::memory_space_config() const +device_memory_interface::space_config_vector dummy_space_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/emu/machine.h b/src/emu/machine.h index 584d2e419ba..5b1336407e6 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -127,7 +127,7 @@ protected: virtual void device_start() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: const address_space_config m_space_config; diff --git a/src/mame/audio/turrett.cpp b/src/mame/audio/turrett.cpp index 4f4e402e7a6..f875bfe3cf1 100644 --- a/src/mame/audio/turrett.cpp +++ b/src/mame/audio/turrett.cpp @@ -29,9 +29,9 @@ turrett_device::turrett_device(const machine_config &mconfig, const char *tag, d // memory_space_config - configure address space //------------------------------------------------- -std::vector> turrett_device::memory_space_config() const +device_memory_interface::space_config_vector turrett_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp index f915a2eb2e8..b3af5751f8b 100644 --- a/src/mame/drivers/galgames.cpp +++ b/src/mame/drivers/galgames.cpp @@ -277,7 +277,7 @@ protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; address_space_config m_space_config; address_space *m_space; @@ -300,9 +300,9 @@ protected: bool m_is_ram_active; }; -std::vector> galgames_slot_device::memory_space_config() const +device_memory_interface::space_config_vector galgames_slot_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_space_config) }; } diff --git a/src/mame/drivers/intellec4.cpp b/src/mame/drivers/intellec4.cpp index 06d3179ea49..affdac7d5c6 100644 --- a/src/mame/drivers/intellec4.cpp +++ b/src/mame/drivers/intellec4.cpp @@ -94,7 +94,6 @@ protected: , m_sw_mode(*this, "MODE") , m_program_banks(*this, "prgbank") , m_rom_port_banks(*this, "rpbank") - , m_ram_port_banks(*this, "mpbank") , m_tty(*this, "tty") , m_memory(*this, "memory"), m_status(*this, "status") , m_sw_control(*this, "CONTROL") @@ -115,13 +114,13 @@ private: enum { BANK_PRG_MON = 0, - BANK_PRG_RAM, BANK_PRG_PROM, + BANK_PRG_RAM, BANK_PRG_NONE, BANK_IO_MON = 0, - BANK_IO_NEITHER, BANK_IO_PROM, + BANK_IO_NEITHER, BIT_SW_RESET = 2, BIT_SW_RESET_MODE, @@ -151,7 +150,7 @@ private: void check_4002_reset(); void reset_panel(); - required_device m_program_banks, m_rom_port_banks, m_ram_port_banks; + required_device m_program_banks, m_rom_port_banks; required_device m_tty; required_shared_ptr m_memory, m_status; @@ -196,10 +195,10 @@ ADDRESS_MAP_START(intellec4_program_banks, mcs40_cpu_device_base::AS_ROM, 8, int // 0x0000...0x0fff MON AM_RANGE(0x0000, 0x03ff) AM_ROM AM_REGION("monitor", 0x0000) - // 0x1000...0x1fff RAM - AM_RANGE(0x1000, 0x1fff) AM_READONLY AM_SHARE("ram") + // 0x1000...0x1fff PROM - // 0x2000...0x2fff PROM + // 0x1000...0x1fff RAM + AM_RANGE(0x2000, 0x2fff) AM_READONLY AM_SHARE("ram") // 0x3000...0x3fff unmapped in case someone presses two mode switches at once ADDRESS_MAP_END @@ -212,25 +211,13 @@ ADDRESS_MAP_START(intellec4_rom_port_banks, mcs40_cpu_device_base::AS_ROM_PORTS, AM_RANGE(0x00e0, 0x00ef) AM_MIRROR(0x1f00) AM_READWRITE(rome_in, rome_out) AM_RANGE(0x00f0, 0x00ff) AM_MIRROR(0x1f00) AM_READWRITE(romf_in, romf_out) - // 0x0800...0x0fff neither + // 0x0800...0x0fff PROM - // 0x1000...0x17ff PROM + // 0x1000...0x17ff neither // 0x1800...0x1fff unused ADDRESS_MAP_END -ADDRESS_MAP_START(intellec4_ram_port_banks, mcs40_cpu_device_base::AS_RAM_PORTS, 8, intellec4_state) - // 0x00...0x1f MON - AM_RANGE(0x00, 0x00) AM_MIRROR(0x60) AM_WRITE(ram0_out) - AM_RANGE(0x00, 0x01) AM_MIRROR(0x60) AM_WRITE(ram1_out) - - // 0x20...0x3f neither - - // 0x40...0x5f PROM - - // 0x60...0x7f unused -ADDRESS_MAP_END - /*--------------------------------- CPU views of address spaces @@ -257,7 +244,8 @@ ADDRESS_MAP_START(intellec4_ram_status, mcs40_cpu_device_base::AS_RAM_STATUS, 8, ADDRESS_MAP_END ADDRESS_MAP_START(intellec4_ram_ports, mcs40_cpu_device_base::AS_RAM_PORTS, 8, intellec4_state) - AM_RANGE(0x00, 0x1f) AM_DEVICE("mpbank", address_map_bank_device, amap8) + AM_RANGE(0x00, 0x00) AM_WRITE(ram0_out) + AM_RANGE(0x01, 0x01) AM_WRITE(ram1_out) ADDRESS_MAP_END ADDRESS_MAP_START(intellec4_program_memory, mcs40_cpu_device_base::AS_PROGRAM_MEMORY, 8, intellec4_state) @@ -285,16 +273,14 @@ MACHINE_CONFIG_START(intellec4) MCFG_ADDRESS_MAP_BANK_ADDRBUS_WIDTH(14) MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000) - MCFG_DEVICE_ADD("mpbank", ADDRESS_MAP_BANK, 0) - MCFG_DEVICE_PROGRAM_MAP(intellec4_ram_port_banks) - MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE) - MCFG_ADDRESS_MAP_BANK_DATABUS_WIDTH(8) - MCFG_ADDRESS_MAP_BANK_ADDRBUS_WIDTH(7) - MCFG_ADDRESS_MAP_BANK_STRIDE(0x20) - MCFG_RS232_PORT_ADD("tty", default_rs232_devices, "terminal") MCFG_DEVICE_ADD("bus", INTELLEC4_UNIV_BUS, 518000. / 7) + MCFG_INTELLEC4_UNIV_BUS_ROM_SPACE("prgbank", AS_PROGRAM) + MCFG_INTELLEC4_UNIV_BUS_ROM_PORTS_SPACE("rpbank", AS_PROGRAM) + MCFG_INTELLEC4_UNIV_BUS_MEMORY_SPACE("maincpu", mcs40_cpu_device_base::AS_RAM_MEMORY) + MCFG_INTELLEC4_UNIV_BUS_STATUS_SPACE("maincpu", mcs40_cpu_device_base::AS_RAM_STATUS) + MCFG_INTELLEC4_UNIV_BUS_RAM_PORTS_SPACE("maincpu", mcs40_cpu_device_base::AS_RAM_PORTS) MCFG_INTELLEC4_UNIV_BUS_RESET_4002_CB(WRITELINE(intellec4_state, bus_reset_4002)) MCFG_INTELLEC4_UNIV_BUS_USER_RESET_CB(WRITELINE(intellec4_state, bus_user_reset)) MCFG_INTELLEC4_UNIV_SLOT_ADD("bus", "j7", 518000. / 7, intellec4_univ_cards, nullptr) @@ -568,7 +554,6 @@ template INPUT_CHANGED_MEMBER(intellec4_state::sw_prg_mode) { m_program_banks->set_bank(prg_banks[N]); m_rom_port_banks->set_bank(io_banks[N]); - m_ram_port_banks->set_bank(io_banks[N]); machine().output().set_value(mode_leds[N], m_ff_prg_mode[N] = true); } trigger_reset(); @@ -577,7 +562,6 @@ template INPUT_CHANGED_MEMBER(intellec4_state::sw_prg_mode) { m_program_banks->set_bank(BANK_PRG_NONE); m_rom_port_banks->set_bank(BANK_IO_NEITHER); - m_ram_port_banks->set_bank(BANK_IO_NEITHER); } if ((0U != N) && m_ff_prg_mode[0]) machine().output().set_value(mode_leds[0], m_ff_prg_mode[0] = false); diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp index ac875a38e91..849d42beb98 100644 --- a/src/mame/drivers/pinkiri8.cpp +++ b/src/mame/drivers/pinkiri8.cpp @@ -111,7 +111,7 @@ protected: virtual void device_validity_check(validity_checker &valid) const override; virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; address_space_config m_space_config; }; @@ -145,9 +145,9 @@ void janshi_vdp_device::device_validity_check(validity_checker &valid) const {} void janshi_vdp_device::device_start() {} void janshi_vdp_device::device_reset() {} -std::vector> janshi_vdp_device::memory_space_config() const +device_memory_interface::space_config_vector janshi_vdp_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index d035189528b..2ce89e12e32 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -84,7 +84,7 @@ public: virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; virtual void state_import(const device_state_entry &entry) override; virtual void state_export(const device_state_entry &entry) override; @@ -559,9 +559,9 @@ void vgmplay_device::execute_set_input(int inputnum, int state) { } -std::vector> vgmplay_device::memory_space_config() const +device_memory_interface::space_config_vector vgmplay_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_file_config), std::make_pair(AS_IO, &m_io_config), std::make_pair(AS_IO16, &m_io16_config) diff --git a/src/mame/includes/turrett.h b/src/mame/includes/turrett.h index c9b21f2115d..334219c23a8 100644 --- a/src/mame/includes/turrett.h +++ b/src/mame/includes/turrett.h @@ -113,7 +113,7 @@ protected: virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; const address_space_config m_space_config; diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp index 32bb4d41005..17de5e2c5de 100644 --- a/src/mame/machine/abc1600mac.cpp +++ b/src/mame/machine/abc1600mac.cpp @@ -159,9 +159,9 @@ void abc1600_mac_device::device_reset() // any address spaces owned by this device //------------------------------------------------- -std::vector> abc1600_mac_device::memory_space_config() const +device_memory_interface::space_config_vector abc1600_mac_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_space_config) }; } diff --git a/src/mame/machine/abc1600mac.h b/src/mame/machine/abc1600mac.h index f57e5233157..bd0addfbd8c 100644 --- a/src/mame/machine/abc1600mac.h +++ b/src/mame/machine/abc1600mac.h @@ -78,7 +78,7 @@ protected: virtual void device_reset() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // optional information overrides virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/mame/machine/c117.cpp b/src/mame/machine/c117.cpp index 44c9607f258..421974254a3 100644 --- a/src/mame/machine/c117.cpp +++ b/src/mame/machine/c117.cpp @@ -44,9 +44,9 @@ namco_c117_device::namco_c117_device(const machine_config &mconfig, const char * { } -std::vector> namco_c117_device::memory_space_config() const +device_memory_interface::space_config_vector namco_c117_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_config) }; } diff --git a/src/mame/machine/c117.h b/src/mame/machine/c117.h index 14a0867920a..cd35155823c 100644 --- a/src/mame/machine/c117.h +++ b/src/mame/machine/c117.h @@ -53,7 +53,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: // internal helpers diff --git a/src/mame/machine/cammu.cpp b/src/mame/machine/cammu.cpp index ba6f0fb8872..0c5c8b27b9d 100644 --- a/src/mame/machine/cammu.cpp +++ b/src/mame/machine/cammu.cpp @@ -149,9 +149,9 @@ void cammu_device::device_reset() { } -std::vector> cammu_device::memory_space_config() const +device_memory_interface::space_config_vector cammu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_main_space_config), std::make_pair(1, &m_io_space_config), std::make_pair(2, &m_boot_space_config) diff --git a/src/mame/machine/cammu.h b/src/mame/machine/cammu.h index 718df13e13c..9ea301f6896 100644 --- a/src/mame/machine/cammu.h +++ b/src/mame/machine/cammu.h @@ -29,7 +29,7 @@ protected: virtual void device_reset() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; virtual u32 get_pte(u32 va, int user, bool data) = 0; diff --git a/src/mame/machine/namco_c139.cpp b/src/mame/machine/namco_c139.cpp index aa0235012bc..da980609664 100644 --- a/src/mame/machine/namco_c139.cpp +++ b/src/mame/machine/namco_c139.cpp @@ -78,9 +78,9 @@ void namco_c139_device::device_reset() // any address spaces owned by this device //------------------------------------------------- -std::vector> namco_c139_device::memory_space_config() const +device_memory_interface::space_config_vector namco_c139_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_DATA, &m_space_config) }; } diff --git a/src/mame/machine/namco_c139.h b/src/mame/machine/namco_c139.h index 17881be76b1..ffbe2546e93 100644 --- a/src/mame/machine/namco_c139.h +++ b/src/mame/machine/namco_c139.h @@ -46,7 +46,7 @@ protected: // virtual void device_validity_check(validity_checker &valid) const; virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: const address_space_config m_space_config; uint16_t* m_ram; diff --git a/src/mame/machine/prof80mmu.cpp b/src/mame/machine/prof80mmu.cpp index b12b3f7d8c0..59fb7b304b4 100644 --- a/src/mame/machine/prof80mmu.cpp +++ b/src/mame/machine/prof80mmu.cpp @@ -60,9 +60,9 @@ void prof80_mmu_device::device_start() // any address spaces owned by this device //------------------------------------------------- -std::vector> prof80_mmu_device::memory_space_config() const +device_memory_interface::space_config_vector prof80_mmu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_program_space_config) }; } diff --git a/src/mame/machine/prof80mmu.h b/src/mame/machine/prof80mmu.h index a14f61a10a5..73fc3708712 100644 --- a/src/mame/machine/prof80mmu.h +++ b/src/mame/machine/prof80mmu.h @@ -45,7 +45,7 @@ protected: virtual void device_start() override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; DECLARE_READ8_MEMBER( program_r ); DECLARE_WRITE8_MEMBER( program_w ); diff --git a/src/mame/machine/seicop.cpp b/src/mame/machine/seicop.cpp index 26a01de3726..27f0769981d 100644 --- a/src/mame/machine/seicop.cpp +++ b/src/mame/machine/seicop.cpp @@ -254,9 +254,9 @@ seibu_cop_bootleg_device::seibu_cop_bootleg_device(const machine_config &mconfig -std::vector> seibu_cop_bootleg_device::memory_space_config() const +device_memory_interface::space_config_vector seibu_cop_bootleg_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/mame/machine/seicop.h b/src/mame/machine/seicop.h index e6ccaa94c6b..3f0f67385d6 100644 --- a/src/mame/machine/seicop.h +++ b/src/mame/machine/seicop.h @@ -32,7 +32,7 @@ protected: // device-level overrides virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: cpu_device *m_host_cpu; /**< reference to the host cpu */ diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp index 0d20a5112af..967ecf09415 100644 --- a/src/mame/machine/st0016.cpp +++ b/src/mame/machine/st0016.cpp @@ -49,9 +49,9 @@ st0016_cpu_device::st0016_cpu_device(const machine_config &mconfig, const char * } -std::vector> st0016_cpu_device::memory_space_config() const +device_memory_interface::space_config_vector st0016_cpu_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_PROGRAM, &m_space_config), std::make_pair(AS_IO, &m_io_space_config) }; diff --git a/src/mame/machine/st0016.h b/src/mame/machine/st0016.h index 3b177e5cfd8..322734dc44d 100644 --- a/src/mame/machine/st0016.h +++ b/src/mame/machine/st0016.h @@ -91,7 +91,7 @@ protected: const address_space_config m_space_config; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; required_device m_screen; diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp index 181a2d2bd2d..c3b598f8035 100644 --- a/src/mame/video/abc1600.cpp +++ b/src/mame/video/abc1600.cpp @@ -280,9 +280,9 @@ void abc1600_mover_device::device_reset() // any address spaces owned by this device //------------------------------------------------- -std::vector> abc1600_mover_device::memory_space_config() const +device_memory_interface::space_config_vector abc1600_mover_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/mame/video/abc1600.h b/src/mame/video/abc1600.h index e2b59049523..fb68297c890 100644 --- a/src/mame/video/abc1600.h +++ b/src/mame/video/abc1600.h @@ -54,7 +54,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: inline uint16_t get_drmsk(); diff --git a/src/mame/video/c45.cpp b/src/mame/video/c45.cpp index 5e06cfa802d..2eaca4bf0ee 100644 --- a/src/mame/video/c45.cpp +++ b/src/mame/video/c45.cpp @@ -245,9 +245,9 @@ void namco_c45_road_device::device_start() // any address spaces owned by this device //------------------------------------------------- -std::vector> namco_c45_road_device::memory_space_config() const +device_memory_interface::space_config_vector namco_c45_road_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/mame/video/c45.h b/src/mame/video/c45.h index 7559a90ecf3..7ff66f3274d 100644 --- a/src/mame/video/c45.h +++ b/src/mame/video/c45.h @@ -40,7 +40,7 @@ public: protected: // device-level overrides virtual void device_start() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: // constants diff --git a/src/mame/video/gp9001.cpp b/src/mame/video/gp9001.cpp index fe9ff86ddd4..2050bc6ff85 100644 --- a/src/mame/video/gp9001.cpp +++ b/src/mame/video/gp9001.cpp @@ -228,9 +228,9 @@ gp9001vdp_device::gp9001vdp_device(const machine_config &mconfig, const char *ta { } -std::vector> gp9001vdp_device::memory_space_config() const +device_memory_interface::space_config_vector gp9001vdp_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h index 97e2cb1bd4e..bd7d457973c 100644 --- a/src/mame/video/gp9001.h +++ b/src/mame/video/gp9001.h @@ -76,7 +76,7 @@ protected: virtual void device_reset() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; address_space_config m_space_config; diff --git a/src/mame/video/igs017_igs031.cpp b/src/mame/video/igs017_igs031.cpp index 3015eca1cd0..5a0681f8f21 100644 --- a/src/mame/video/igs017_igs031.cpp +++ b/src/mame/video/igs017_igs031.cpp @@ -92,9 +92,9 @@ igs017_igs031_device::igs017_igs031_device(const machine_config &mconfig, const m_revbits = 0; } -std::vector> igs017_igs031_device::memory_space_config() const +device_memory_interface::space_config_vector igs017_igs031_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/mame/video/igs017_igs031.h b/src/mame/video/igs017_igs031.h index 1812e819197..da2ca16e383 100644 --- a/src/mame/video/igs017_igs031.h +++ b/src/mame/video/igs017_igs031.h @@ -73,7 +73,7 @@ protected: virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; DECLARE_GFXDECODE_MEMBER(gfxinfo); diff --git a/src/mame/video/nick.cpp b/src/mame/video/nick.cpp index f25105b79f7..9c9fab7292d 100644 --- a/src/mame/video/nick.cpp +++ b/src/mame/video/nick.cpp @@ -204,9 +204,9 @@ void nick_device::device_timer(emu_timer &timer, device_timer_id id, int param, // any address spaces owned by this device //------------------------------------------------- -std::vector> nick_device::memory_space_config() const +device_memory_interface::space_config_vector nick_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/mame/video/nick.h b/src/mame/video/nick.h index e56fc6f0a21..6876102901e 100644 --- a/src/mame/video/nick.h +++ b/src/mame/video/nick.h @@ -89,7 +89,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; DECLARE_READ8_MEMBER( vram_r ); DECLARE_WRITE8_MEMBER( vram_w ); diff --git a/src/mame/video/seibu_crtc.cpp b/src/mame/video/seibu_crtc.cpp index 987dd0450ed..194b1bebdeb 100644 --- a/src/mame/video/seibu_crtc.cpp +++ b/src/mame/video/seibu_crtc.cpp @@ -322,9 +322,9 @@ void seibu_crtc_device::device_reset() // any address spaces owned by this device //------------------------------------------------- -std::vector> seibu_crtc_device::memory_space_config() const +device_memory_interface::space_config_vector seibu_crtc_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/mame/video/seibu_crtc.h b/src/mame/video/seibu_crtc.h index 444103d8f8c..072ad553155 100644 --- a/src/mame/video/seibu_crtc.h +++ b/src/mame/video/seibu_crtc.h @@ -71,7 +71,7 @@ protected: virtual void device_validity_check(validity_checker &valid) const override; virtual void device_start() override; virtual void device_reset() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; private: devcb_write16 m_decrypt_key_cb; diff --git a/src/mame/video/ygv608.cpp b/src/mame/video/ygv608.cpp index 5a97ce807d2..307030cd172 100644 --- a/src/mame/video/ygv608.cpp +++ b/src/mame/video/ygv608.cpp @@ -497,9 +497,9 @@ void ygv608_device::device_start() // any address spaces owned by this device //------------------------------------------------- -std::vector> ygv608_device::memory_space_config() const +device_memory_interface::space_config_vector ygv608_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(AS_IO, &m_io_space_config) }; } diff --git a/src/mame/video/ygv608.h b/src/mame/video/ygv608.h index b3867bf74e2..5e6699153f9 100644 --- a/src/mame/video/ygv608.h +++ b/src/mame/video/ygv608.h @@ -89,7 +89,7 @@ protected: // device-level overrides virtual void device_start() override; - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; address_space *m_iospace; diff --git a/src/mame/video/zx8301.cpp b/src/mame/video/zx8301.cpp index ac120d8dc6d..080b1eeba0e 100644 --- a/src/mame/video/zx8301.cpp +++ b/src/mame/video/zx8301.cpp @@ -66,9 +66,9 @@ ADDRESS_MAP_END // any address spaces owned by this device //------------------------------------------------- -std::vector> zx8301_device::memory_space_config() const +device_memory_interface::space_config_vector zx8301_device::memory_space_config() const { - return std::vector> { + return space_config_vector { std::make_pair(0, &m_space_config) }; } diff --git a/src/mame/video/zx8301.h b/src/mame/video/zx8301.h index fa777c8142f..deb416ce4c5 100644 --- a/src/mame/video/zx8301.h +++ b/src/mame/video/zx8301.h @@ -78,7 +78,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_config_memory_interface overrides - virtual std::vector> memory_space_config() const override; + virtual space_config_vector memory_space_config() const override; // address space configurations const address_space_config m_space_config; -- cgit v1.2.3