summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/cpu/adsp2100/adsp2100.c6
-rw-r--r--src/emu/cpu/alph8201/alph8201.c2
-rw-r--r--src/emu/cpu/am29000/am29000.c6
-rw-r--r--src/emu/cpu/apexc/apexc.c4
-rw-r--r--src/emu/cpu/arm/arm.c6
-rw-r--r--src/emu/cpu/arm7/arm7.c2
-rw-r--r--src/emu/cpu/arm7/arm7core.c2
-rw-r--r--src/emu/cpu/asap/asap.c2
-rw-r--r--src/emu/cpu/avr8/avr8.c4
-rw-r--r--src/emu/cpu/ccpu/ccpu.c6
-rw-r--r--src/emu/cpu/cop400/cop400.c6
-rw-r--r--src/emu/cpu/cosmac/cosmac.c4
-rw-r--r--src/emu/cpu/cp1610/cp1610.c2
-rw-r--r--src/emu/cpu/cubeqcpu/cubeqcpu.c6
-rw-r--r--src/emu/cpu/drcfe.h2
-rw-r--r--src/emu/cpu/drcuml.c8
-rw-r--r--src/emu/cpu/dsp16/dsp16.c2
-rw-r--r--src/emu/cpu/dsp32/dsp32.c2
-rw-r--r--src/emu/cpu/dsp56k/dsp56k.c4
-rw-r--r--src/emu/cpu/e132xs/e132xs.c8
-rw-r--r--src/emu/cpu/esrip/esrip.c2
-rw-r--r--src/emu/cpu/f8/f8.c8
-rw-r--r--src/emu/cpu/g65816/g65816.c2
-rw-r--r--src/emu/cpu/h6280/h6280.c8
-rw-r--r--src/emu/cpu/h83002/h8_16.c4
-rw-r--r--src/emu/cpu/h83002/h8_8.c4
-rw-r--r--src/emu/cpu/hcd62121/hcd62121.c4
-rw-r--r--src/emu/cpu/hd61700/hd61700.c2
-rw-r--r--src/emu/cpu/hd6309/hd6309.c2
-rw-r--r--src/emu/cpu/i386/i386.c40
-rw-r--r--src/emu/cpu/i4004/i4004.c6
-rw-r--r--src/emu/cpu/i8008/i8008.c4
-rw-r--r--src/emu/cpu/i8085/i8085.c4
-rw-r--r--src/emu/cpu/i86/i286.c4
-rw-r--r--src/emu/cpu/i86/i86.c8
-rw-r--r--src/emu/cpu/i860/i860.c2
-rw-r--r--src/emu/cpu/i960/i960.c2
-rw-r--r--src/emu/cpu/jaguar/jaguar.c2
-rw-r--r--src/emu/cpu/konami/konami.c2
-rw-r--r--src/emu/cpu/lh5801/lh5801.c4
-rw-r--r--src/emu/cpu/lr35902/lr35902.c2
-rw-r--r--src/emu/cpu/m37710/m37710.c4
-rw-r--r--src/emu/cpu/m6502/m4510.c2
-rw-r--r--src/emu/cpu/m6502/m6502.c4
-rw-r--r--src/emu/cpu/m6502/m6509.c2
-rw-r--r--src/emu/cpu/m6502/m65ce02.c2
-rw-r--r--src/emu/cpu/m6800/m6800.c48
-rw-r--r--src/emu/cpu/m68000/m68kcpu.c6
-rw-r--r--src/emu/cpu/m6805/m6805.c4
-rw-r--r--src/emu/cpu/m6809/m6809.c2
-rw-r--r--src/emu/cpu/mb86233/mb86233.c2
-rw-r--r--src/emu/cpu/mb88xx/mb88xx.c6
-rw-r--r--src/emu/cpu/mc68hc11/mc68hc11.c4
-rw-r--r--src/emu/cpu/mcs48/mcs48.c6
-rw-r--r--src/emu/cpu/mcs51/mcs51.c6
-rw-r--r--src/emu/cpu/minx/minx.c2
-rw-r--r--src/emu/cpu/mips/mips3com.c2
-rw-r--r--src/emu/cpu/mips/r3000.c2
-rw-r--r--src/emu/cpu/mn10200/mn10200.c4
-rw-r--r--src/emu/cpu/nec/nec.c4
-rw-r--r--src/emu/cpu/nec/v25.c4
-rw-r--r--src/emu/cpu/pdp1/pdp1.c2
-rw-r--r--src/emu/cpu/pdp1/tx0.c2
-rw-r--r--src/emu/cpu/pic16c5x/pic16c5x.c6
-rw-r--r--src/emu/cpu/pic16c62x/pic16c62x.c6
-rw-r--r--src/emu/cpu/powerpc/ppc.c14
-rw-r--r--src/emu/cpu/powerpc/ppccom.c2
-rw-r--r--src/emu/cpu/pps4/pps4.c6
-rw-r--r--src/emu/cpu/psx/psx.c2
-rw-r--r--src/emu/cpu/rsp/rsp.c2
-rw-r--r--src/emu/cpu/rsp/rspdrc.c2
-rw-r--r--src/emu/cpu/s2650/s2650.c8
-rw-r--r--src/emu/cpu/saturn/saturn.c2
-rw-r--r--src/emu/cpu/sc61860/sc61860.c2
-rw-r--r--src/emu/cpu/scmp/scmp.c2
-rw-r--r--src/emu/cpu/se3208/se3208.c4
-rw-r--r--src/emu/cpu/sh2/sh2comn.c4
-rw-r--r--src/emu/cpu/sh4/sh4.c12
-rw-r--r--src/emu/cpu/sharc/sharc.c4
-rw-r--r--src/emu/cpu/sm8500/sm8500.c2
-rw-r--r--src/emu/cpu/spc700/spc700.c2
-rw-r--r--src/emu/cpu/ssem/ssem.c2
-rw-r--r--src/emu/cpu/ssp1601/ssp1601.c4
-rw-r--r--src/emu/cpu/superfx/superfx.c2
-rw-r--r--src/emu/cpu/t11/t11.c2
-rw-r--r--src/emu/cpu/tlcs90/tlcs90.c4
-rw-r--r--src/emu/cpu/tlcs900/tlcs900.c2
-rw-r--r--src/emu/cpu/tms0980/tms0980.c4
-rw-r--r--src/emu/cpu/tms32010/tms32010.c6
-rw-r--r--src/emu/cpu/tms32025/tms32025.c6
-rw-r--r--src/emu/cpu/tms32031/tms32031.c2
-rw-r--r--src/emu/cpu/tms32051/tms32051.c4
-rw-r--r--src/emu/cpu/tms34010/tms34010.c8
-rw-r--r--src/emu/cpu/tms57002/tms57002.c4
-rw-r--r--src/emu/cpu/tms7000/tms7000.c4
-rw-r--r--src/emu/cpu/tms9900/99xxcore.h4
-rw-r--r--src/emu/cpu/tms9900/tms9900.c4
-rw-r--r--src/emu/cpu/tms9900/tms9995.c4
-rw-r--r--src/emu/cpu/unsp/unsp.c2
-rwxr-xr-xsrc/emu/cpu/upd7725/upd7725.c4
-rw-r--r--src/emu/cpu/upd7810/upd7810.c8
-rw-r--r--src/emu/cpu/v30mz/v30mz.c4
-rw-r--r--src/emu/cpu/v60/v60.c8
-rw-r--r--src/emu/cpu/v810/v810.c4
-rw-r--r--src/emu/cpu/z180/z180.c4
-rw-r--r--src/emu/cpu/z8/z8.c6
-rw-r--r--src/emu/cpu/z80/z80.c4
-rw-r--r--src/emu/cpu/z8000/z8000.c16
-rw-r--r--src/emu/debug/debugcmd.c4
-rw-r--r--src/emu/debug/debugcpu.c66
-rw-r--r--src/emu/debug/debugcpu.h2
-rw-r--r--src/emu/debug/dvdisasm.c62
-rw-r--r--src/emu/debug/dvdisasm.h4
-rw-r--r--src/emu/debug/dvmemory.c17
-rw-r--r--src/emu/devcb.c6
-rw-r--r--src/emu/device.h8
-rw-r--r--src/emu/dimemory.h6
-rw-r--r--src/emu/driver.c47
-rw-r--r--src/emu/driver.h16
-rw-r--r--src/emu/drivers/testcpu.c2
-rw-r--r--src/emu/machine.c2
-rw-r--r--src/emu/machine/6821pia.h8
-rw-r--r--src/emu/machine/6840ptm.h4
-rw-r--r--src/emu/machine/amigafdc.c4
-rw-r--r--src/emu/machine/i8155.c4
-rw-r--r--src/emu/machine/i8355.c2
-rw-r--r--src/emu/machine/idectrl.c4
-rw-r--r--src/emu/machine/microtch.c2
-rw-r--r--src/emu/machine/s3c2400.c2
-rw-r--r--src/emu/machine/s3c2410.c2
-rw-r--r--src/emu/machine/s3c2440.c2
-rw-r--r--src/emu/machine/s3c24xx.c8
-rw-r--r--src/emu/sound/bsmt2000.c2
-rw-r--r--src/emu/sound/c352.c2
-rw-r--r--src/emu/sound/cdp1869.c4
-rw-r--r--src/emu/sound/disc_inp.c4
-rw-r--r--src/emu/sound/es5503.c2
-rw-r--r--src/emu/sound/mos6560.c4
-rw-r--r--src/emu/sound/nes_apu.c2
-rw-r--r--src/emu/sound/okim6295.c4
-rw-r--r--src/emu/sound/okim9810.c2
-rw-r--r--src/emu/sound/qs1000.c2
-rw-r--r--src/emu/video/315_5124.c62
-rw-r--r--src/emu/video/crt9007.c2
-rw-r--r--src/emu/video/h63484.c4
-rw-r--r--src/emu/video/hd61830.c4
-rw-r--r--src/emu/video/huc6261.c2
-rw-r--r--src/emu/video/huc6272.c4
-rw-r--r--src/emu/video/m50458.c4
-rw-r--r--src/emu/video/mb90082.c4
-rw-r--r--src/emu/video/mc6845.c4
-rw-r--r--src/emu/video/pc_cga.c26
-rw-r--r--src/emu/video/ramdac.c4
-rw-r--r--src/emu/video/sed1330.c4
-rw-r--r--src/emu/video/tms9928a.c2
-rw-r--r--src/emu/video/v9938.c2
-rw-r--r--src/mame/audio/8080bw.c4
-rw-r--r--src/mame/audio/amiga.c2
-rw-r--r--src/mame/audio/atarijsa.c2
-rw-r--r--src/mame/audio/cage.c2
-rw-r--r--src/mame/audio/cinemat.c2
-rw-r--r--src/mame/audio/dcs.c18
-rw-r--r--src/mame/audio/harddriv.c4
-rw-r--r--src/mame/audio/hyprolyb.c2
-rw-r--r--src/mame/audio/jaguar.c2
-rw-r--r--src/mame/audio/leland.c18
-rw-r--r--src/mame/audio/m72.c2
-rw-r--r--src/mame/audio/mario.c4
-rw-r--r--src/mame/audio/scramble.c2
-rw-r--r--src/mame/audio/seibu.c2
-rw-r--r--src/mame/audio/williams.c8
-rw-r--r--src/mame/drivers/1943.c2
-rw-r--r--src/mame/drivers/39in1.c12
-rw-r--r--src/mame/drivers/8080bw.c2
-rw-r--r--src/mame/drivers/adp.c2
-rw-r--r--src/mame/drivers/airbustr.c2
-rw-r--r--src/mame/drivers/alpha68k.c2
-rw-r--r--src/mame/drivers/appoooh.c2
-rw-r--r--src/mame/drivers/arcadia.c4
-rw-r--r--src/mame/drivers/arkanoid.c10
-rw-r--r--src/mame/drivers/armedf.c20
-rw-r--r--src/mame/drivers/artmagic.c2
-rw-r--r--src/mame/drivers/asteroid.c6
-rw-r--r--src/mame/drivers/astrocde.c78
-rw-r--r--src/mame/drivers/astrof.c12
-rw-r--r--src/mame/drivers/atarig1.c2
-rw-r--r--src/mame/drivers/atarig42.c12
-rw-r--r--src/mame/drivers/atarigt.c4
-rw-r--r--src/mame/drivers/atarigx2.c2
-rw-r--r--src/mame/drivers/atarisy2.c6
-rw-r--r--src/mame/drivers/atarisy4.c10
-rw-r--r--src/mame/drivers/ataxx.c36
-rw-r--r--src/mame/drivers/attckufo.c4
-rw-r--r--src/mame/drivers/atvtrack.c7
-rw-r--r--src/mame/drivers/backfire.c2
-rw-r--r--src/mame/drivers/badlands.c2
-rw-r--r--src/mame/drivers/bagman.c2
-rw-r--r--src/mame/drivers/balsente.c16
-rw-r--r--src/mame/drivers/beathead.c4
-rw-r--r--src/mame/drivers/berzerk.c8
-rw-r--r--src/mame/drivers/bfm_sc2.c2
-rw-r--r--src/mame/drivers/btime.c10
-rw-r--r--src/mame/drivers/bublbobl.c2
-rw-r--r--src/mame/drivers/bzone.c2
-rw-r--r--src/mame/drivers/cabal.c2
-rw-r--r--src/mame/drivers/calchase.c4
-rw-r--r--src/mame/drivers/calorie.c2
-rw-r--r--src/mame/drivers/cd32.c2
-rw-r--r--src/mame/drivers/cham24.c4
-rw-r--r--src/mame/drivers/chihiro.c22
-rw-r--r--src/mame/drivers/cinemat.c16
-rw-r--r--src/mame/drivers/cischeat.c2
-rw-r--r--src/mame/drivers/cninja.c4
-rw-r--r--src/mame/drivers/combatsc.c4
-rw-r--r--src/mame/drivers/commando.c4
-rw-r--r--src/mame/drivers/coolpool.c2
-rw-r--r--src/mame/drivers/coolridr.c4
-rw-r--r--src/mame/drivers/cosmic.c12
-rw-r--r--src/mame/drivers/cps1.c30
-rw-r--r--src/mame/drivers/cps2.c6
-rw-r--r--src/mame/drivers/cps3.c4
-rw-r--r--src/mame/drivers/crbaloon.c2
-rw-r--r--src/mame/drivers/crgolf.c2
-rw-r--r--src/mame/drivers/crimfght.c6
-rw-r--r--src/mame/drivers/crystal.c8
-rw-r--r--src/mame/drivers/cshooter.c2
-rw-r--r--src/mame/drivers/csplayh5.c2
-rw-r--r--src/mame/drivers/darkmist.c2
-rw-r--r--src/mame/drivers/ddealer.c2
-rw-r--r--src/mame/drivers/ddenlovr.c4
-rw-r--r--src/mame/drivers/ddragon.c4
-rw-r--r--src/mame/drivers/deadang.c4
-rw-r--r--src/mame/drivers/dec0.c8
-rw-r--r--src/mame/drivers/dec8.c4
-rw-r--r--src/mame/drivers/deco32.c8
-rw-r--r--src/mame/drivers/deco_mlc.c2
-rw-r--r--src/mame/drivers/decocass.c12
-rw-r--r--src/mame/drivers/deshoros.c2
-rw-r--r--src/mame/drivers/dfruit.c8
-rw-r--r--src/mame/drivers/dgpix.c4
-rw-r--r--src/mame/drivers/dkong.c22
-rw-r--r--src/mame/drivers/dynax.c2
-rw-r--r--src/mame/drivers/eolith.c10
-rw-r--r--src/mame/drivers/eprom.c4
-rw-r--r--src/mame/drivers/equites.c6
-rw-r--r--src/mame/drivers/exidy.c4
-rw-r--r--src/mame/drivers/exidy440.c14
-rw-r--r--src/mame/drivers/exprraid.c4
-rw-r--r--src/mame/drivers/famibox.c4
-rw-r--r--src/mame/drivers/fastfred.c20
-rw-r--r--src/mame/drivers/firebeat.c6
-rw-r--r--src/mame/drivers/fitfight.c6
-rw-r--r--src/mame/drivers/flstory.c2
-rw-r--r--src/mame/drivers/freekick.c2
-rw-r--r--src/mame/drivers/funworld.c4
-rw-r--r--src/mame/drivers/gaiden.c8
-rw-r--r--src/mame/drivers/galaga.c8
-rw-r--r--src/mame/drivers/galaxian.c72
-rw-r--r--src/mame/drivers/galgame.c20
-rw-r--r--src/mame/drivers/galivan.c16
-rw-r--r--src/mame/drivers/galpani2.c80
-rw-r--r--src/mame/drivers/gameplan.c4
-rw-r--r--src/mame/drivers/gamtor.c2
-rw-r--r--src/mame/drivers/gauntlet.c2
-rw-r--r--src/mame/drivers/gei.c2
-rw-r--r--src/mame/drivers/ghosteo.c2
-rw-r--r--src/mame/drivers/gladiatr.c2
-rw-r--r--src/mame/drivers/glass.c2
-rw-r--r--src/mame/drivers/gng.c2
-rw-r--r--src/mame/drivers/goldstar.c44
-rw-r--r--src/mame/drivers/gottlieb.c8
-rw-r--r--src/mame/drivers/groundfx.c2
-rw-r--r--src/mame/drivers/gstream.c2
-rw-r--r--src/mame/drivers/gstriker.c12
-rw-r--r--src/mame/drivers/gsword.c4
-rw-r--r--src/mame/drivers/guab.c2
-rw-r--r--src/mame/drivers/gunbustr.c2
-rw-r--r--src/mame/drivers/harddriv.c194
-rw-r--r--src/mame/drivers/highvdeo.c4
-rw-r--r--src/mame/drivers/hng64.c2
-rw-r--r--src/mame/drivers/homedata.c12
-rw-r--r--src/mame/drivers/hshavoc.c2
-rw-r--r--src/mame/drivers/hyprduel.c8
-rw-r--r--src/mame/drivers/igs011.c14
-rw-r--r--src/mame/drivers/igs017.c4
-rw-r--r--src/mame/drivers/iqblock.c4
-rw-r--r--src/mame/drivers/ironhors.c2
-rw-r--r--src/mame/drivers/itech32.c44
-rw-r--r--src/mame/drivers/itech8.c34
-rw-r--r--src/mame/drivers/jack.c6
-rw-r--r--src/mame/drivers/jaguar.c24
-rw-r--r--src/mame/drivers/jalmah.c20
-rw-r--r--src/mame/drivers/jangou.c2
-rw-r--r--src/mame/drivers/jchan.c4
-rw-r--r--src/mame/drivers/kaneko16.c2
-rw-r--r--src/mame/drivers/kangaroo.c2
-rw-r--r--src/mame/drivers/kchamp.c2
-rw-r--r--src/mame/drivers/konamigv.c30
-rw-r--r--src/mame/drivers/konamigx.c12
-rw-r--r--src/mame/drivers/ksys573.c16
-rw-r--r--src/mame/drivers/kyugo.c8
-rw-r--r--src/mame/drivers/ladybug.c2
-rw-r--r--src/mame/drivers/lastbank.c8
-rw-r--r--src/mame/drivers/leland.c62
-rw-r--r--src/mame/drivers/lethalj.c6
-rw-r--r--src/mame/drivers/liberate.c14
-rw-r--r--src/mame/drivers/limenko.c10
-rw-r--r--src/mame/drivers/littlerb.c12
-rw-r--r--src/mame/drivers/lkage.c6
-rw-r--r--src/mame/drivers/lockon.c40
-rw-r--r--src/mame/drivers/looping.c2
-rw-r--r--src/mame/drivers/m107.c2
-rw-r--r--src/mame/drivers/m72.c44
-rw-r--r--src/mame/drivers/m90.c6
-rw-r--r--src/mame/drivers/m92.c6
-rw-r--r--src/mame/drivers/macrossp.c4
-rw-r--r--src/mame/drivers/magictg.c10
-rw-r--r--src/mame/drivers/magtouch.c2
-rw-r--r--src/mame/drivers/mappy.c10
-rw-r--r--src/mame/drivers/maygay1b.c2
-rw-r--r--src/mame/drivers/mcr.c18
-rw-r--r--src/mame/drivers/mcr3.c34
-rw-r--r--src/mame/drivers/mcr68.c20
-rw-r--r--src/mame/drivers/mediagx.c2
-rw-r--r--src/mame/drivers/megadrvb.c26
-rw-r--r--src/mame/drivers/megaplay.c6
-rw-r--r--src/mame/drivers/megasys1.c40
-rw-r--r--src/mame/drivers/megatech.c8
-rw-r--r--src/mame/drivers/meritm.c10
-rw-r--r--src/mame/drivers/metalmx.c12
-rw-r--r--src/mame/drivers/metro.c8
-rw-r--r--src/mame/drivers/midqslvr.c4
-rw-r--r--src/mame/drivers/midvunit.c26
-rw-r--r--src/mame/drivers/midyunit.c4
-rw-r--r--src/mame/drivers/midzeus.c6
-rw-r--r--src/mame/drivers/missile.c6
-rw-r--r--src/mame/drivers/mitchell.c6
-rw-r--r--src/mame/drivers/model2.c20
-rw-r--r--src/mame/drivers/model3.c106
-rw-r--r--src/mame/drivers/mouser.c2
-rw-r--r--src/mame/drivers/mpu3.c2
-rw-r--r--src/mame/drivers/mpu4hw.c10
-rw-r--r--src/mame/drivers/mquake.c4
-rw-r--r--src/mame/drivers/multigam.c60
-rw-r--r--src/mame/drivers/namcona1.c2
-rw-r--r--src/mame/drivers/namcos11.c56
-rw-r--r--src/mame/drivers/namcos12.c6
-rw-r--r--src/mame/drivers/namcos22.c28
-rw-r--r--src/mame/drivers/naughtyb.c8
-rw-r--r--src/mame/drivers/nbmj9195.c4
-rw-r--r--src/mame/drivers/neodrvr.c20
-rw-r--r--src/mame/drivers/neogeo.c10
-rw-r--r--src/mame/drivers/ninjakd2.c2
-rw-r--r--src/mame/drivers/niyanpai.c4
-rw-r--r--src/mame/drivers/nmk16.c4
-rw-r--r--src/mame/drivers/nyny.c2
-rw-r--r--src/mame/drivers/offtwall.c12
-rw-r--r--src/mame/drivers/omegrace.c2
-rw-r--r--src/mame/drivers/pachifev.c4
-rw-r--r--src/mame/drivers/pacman.c20
-rw-r--r--src/mame/drivers/pangofun.c2
-rw-r--r--src/mame/drivers/paradise.c4
-rw-r--r--src/mame/drivers/pasha2.c2
-rw-r--r--src/mame/drivers/pbaction.c2
-rw-r--r--src/mame/drivers/pcat_dyn.c2
-rw-r--r--src/mame/drivers/pcat_nit.c2
-rw-r--r--src/mame/drivers/pcktgal.c2
-rw-r--r--src/mame/drivers/pengadvb.c24
-rw-r--r--src/mame/drivers/pengo.c2
-rw-r--r--src/mame/drivers/phoenix.c2
-rw-r--r--src/mame/drivers/photoply.c2
-rw-r--r--src/mame/drivers/pingpong.c20
-rw-r--r--src/mame/drivers/pinkiri8.c13
-rw-r--r--src/mame/drivers/pipedrm.c6
-rw-r--r--src/mame/drivers/pirates.c2
-rw-r--r--src/mame/drivers/plygonet.c2
-rw-r--r--src/mame/drivers/pntnpuzl.c2
-rw-r--r--src/mame/drivers/polepos.c10
-rw-r--r--src/mame/drivers/policetr.c8
-rw-r--r--src/mame/drivers/progolf.c4
-rw-r--r--src/mame/drivers/psikyo.c40
-rw-r--r--src/mame/drivers/psikyo4.c2
-rw-r--r--src/mame/drivers/psikyosh.c2
-rw-r--r--src/mame/drivers/pturn.c6
-rw-r--r--src/mame/drivers/qix.c8
-rw-r--r--src/mame/drivers/queen.c2
-rw-r--r--src/mame/drivers/r2dtank.c2
-rw-r--r--src/mame/drivers/r2dx_v33.c2
-rw-r--r--src/mame/drivers/raiden.c2
-rw-r--r--src/mame/drivers/renegade.c2
-rw-r--r--src/mame/drivers/rmhaihai.c2
-rw-r--r--src/mame/drivers/safarir.c4
-rw-r--r--src/mame/drivers/sangho.c56
-rw-r--r--src/mame/drivers/saturn.c38
-rw-r--r--src/mame/drivers/savquest.c2
-rw-r--r--src/mame/drivers/seattle.c18
-rw-r--r--src/mame/drivers/segac2.c28
-rw-r--r--src/mame/drivers/segae.c8
-rw-r--r--src/mame/drivers/segag80r.c62
-rw-r--r--src/mame/drivers/segag80v.c76
-rw-r--r--src/mame/drivers/segahang.c6
-rw-r--r--src/mame/drivers/segas16a.c22
-rw-r--r--src/mame/drivers/segas16b.c10
-rw-r--r--src/mame/drivers/segas32.c42
-rw-r--r--src/mame/drivers/segaxbd.c6
-rw-r--r--src/mame/drivers/seibuspi.c32
-rw-r--r--src/mame/drivers/seta.c24
-rw-r--r--src/mame/drivers/shootout.c2
-rw-r--r--src/mame/drivers/sidepckt.c8
-rw-r--r--src/mame/drivers/simpl156.c10
-rw-r--r--src/mame/drivers/skydiver.c2
-rw-r--r--src/mame/drivers/slapfght.c16
-rw-r--r--src/mame/drivers/snesb.c38
-rw-r--r--src/mame/drivers/snk.c2
-rw-r--r--src/mame/drivers/snowbros.c8
-rw-r--r--src/mame/drivers/spacefb.c2
-rw-r--r--src/mame/drivers/sprint2.c2
-rw-r--r--src/mame/drivers/srumbler.c2
-rw-r--r--src/mame/drivers/starwars.c8
-rw-r--r--src/mame/drivers/statriv2.c4
-rw-r--r--src/mame/drivers/strnskil.c8
-rw-r--r--src/mame/drivers/stv.c22
-rw-r--r--src/mame/drivers/su2000.c4
-rw-r--r--src/mame/drivers/suna16.c2
-rw-r--r--src/mame/drivers/suna8.c12
-rw-r--r--src/mame/drivers/superchs.c4
-rw-r--r--src/mame/drivers/supertnk.c2
-rw-r--r--src/mame/drivers/suprnova.c30
-rw-r--r--src/mame/drivers/system1.c48
-rw-r--r--src/mame/drivers/system16.c2
-rw-r--r--src/mame/drivers/taito_f3.c4
-rw-r--r--src/mame/drivers/taito_x.c2
-rw-r--r--src/mame/drivers/taitogn.c18
-rw-r--r--src/mame/drivers/taitojc.c4
-rw-r--r--src/mame/drivers/taitosj.c12
-rw-r--r--src/mame/drivers/taitowlf.c2
-rw-r--r--src/mame/drivers/tcl.c2
-rw-r--r--src/mame/drivers/tecmo.c6
-rw-r--r--src/mame/drivers/terracre.c2
-rw-r--r--src/mame/drivers/thepit.c2
-rw-r--r--src/mame/drivers/tiamc1.c2
-rw-r--r--src/mame/drivers/tigeroad.c4
-rw-r--r--src/mame/drivers/tmaster.c2
-rw-r--r--src/mame/drivers/toki.c2
-rw-r--r--src/mame/drivers/trackfld.c2
-rw-r--r--src/mame/drivers/tumbleb.c10
-rw-r--r--src/mame/drivers/turbo.c2
-rw-r--r--src/mame/drivers/tx1.c8
-rw-r--r--src/mame/drivers/umipoker.c6
-rw-r--r--src/mame/drivers/upscope.c4
-rw-r--r--src/mame/drivers/vamphalf.c46
-rw-r--r--src/mame/drivers/vcombat.c6
-rw-r--r--src/mame/drivers/vegaeo.c2
-rw-r--r--src/mame/drivers/vegas.c4
-rw-r--r--src/mame/drivers/vendetta.c2
-rw-r--r--src/mame/drivers/videopin.c4
-rw-r--r--src/mame/drivers/viper.c6
-rw-r--r--src/mame/drivers/voyager.c2
-rw-r--r--src/mame/drivers/williams.c18
-rw-r--r--src/mame/drivers/witch.c2
-rw-r--r--src/mame/drivers/wiz.c6
-rw-r--r--src/mame/drivers/xtom3d.c2
-rw-r--r--src/mame/drivers/yunsun16.c2
-rw-r--r--src/mame/drivers/zaxxon.c12
-rw-r--r--src/mame/drivers/zn.c114
-rw-r--r--src/mame/includes/jaguar.h2
-rw-r--r--src/mame/machine/amiga.c14
-rw-r--r--src/mame/machine/archimds.c6
-rw-r--r--src/mame/machine/asic65.c2
-rw-r--r--src/mame/machine/asteroid.c4
-rw-r--r--src/mame/machine/atari.c6
-rw-r--r--src/mame/machine/atarigen.c8
-rw-r--r--src/mame/machine/bagman.c2
-rw-r--r--src/mame/machine/balsente.c2
-rw-r--r--src/mame/machine/cclimber.c2
-rw-r--r--src/mame/machine/cd32.c2
-rw-r--r--src/mame/machine/cps2crpt.c2
-rw-r--r--src/mame/machine/cx4fn.c2
-rw-r--r--src/mame/machine/cx4oam.c2
-rw-r--r--src/mame/machine/dc.c4
-rw-r--r--src/mame/machine/dec0.c6
-rw-r--r--src/mame/machine/deco102.c2
-rw-r--r--src/mame/machine/fd1089.c6
-rw-r--r--src/mame/machine/fd1094.c4
-rw-r--r--src/mame/machine/fddebug.c6
-rw-r--r--src/mame/machine/galaxold.c20
-rw-r--r--src/mame/machine/irobot.c4
-rw-r--r--src/mame/machine/kabuki.c4
-rw-r--r--src/mame/machine/kaneko_calc3.c12
-rw-r--r--src/mame/machine/kaneko_toybox.c12
-rw-r--r--src/mame/machine/konami1.c2
-rw-r--r--src/mame/machine/konamigx.c2
-rw-r--r--src/mame/machine/mc8123.c2
-rw-r--r--src/mame/machine/mcr68.c2
-rw-r--r--src/mame/machine/md_cart.c152
-rw-r--r--src/mame/machine/mega32x.c46
-rw-r--r--src/mame/machine/megacd.c24
-rw-r--r--src/mame/machine/megadriv.c28
-rw-r--r--src/mame/machine/megasvp.c10
-rw-r--r--src/mame/machine/megavdp.c2
-rw-r--r--src/mame/machine/mhavoc.c6
-rw-r--r--src/mame/machine/micro3d.c4
-rw-r--r--src/mame/machine/midtunit.c40
-rw-r--r--src/mame/machine/midwunit.c6
-rw-r--r--src/mame/machine/midyunit.c16
-rw-r--r--src/mame/machine/n64.c2
-rw-r--r--src/mame/machine/namcos1.c10
-rw-r--r--src/mame/machine/namcos2.c2
-rw-r--r--src/mame/machine/naomi.c28
-rw-r--r--src/mame/machine/neoboot.c16
-rw-r--r--src/mame/machine/neoprot.c30
-rw-r--r--src/mame/machine/nmk004.c10
-rw-r--r--src/mame/machine/pgmprot.c4
-rw-r--r--src/mame/machine/pgmprot1.c48
-rw-r--r--src/mame/machine/pgmprot2.c12
-rw-r--r--src/mame/machine/pgmprot3.c4
-rw-r--r--src/mame/machine/pgmprot4.c4
-rw-r--r--src/mame/machine/pgmprot5.c2
-rw-r--r--src/mame/machine/pgmprot6.c4
-rw-r--r--src/mame/machine/pitnrun.c6
-rw-r--r--src/mame/machine/playch10.c40
-rw-r--r--src/mame/machine/qix.c6
-rw-r--r--src/mame/machine/scramble.c38
-rw-r--r--src/mame/machine/segacrp2.c2
-rw-r--r--src/mame/machine/segacrpt.c6
-rw-r--r--src/mame/machine/segaic16.c2
-rw-r--r--src/mame/machine/segamsys.c40
-rw-r--r--src/mame/machine/segas32.c4
-rw-r--r--src/mame/machine/snes.c24
-rw-r--r--src/mame/machine/snescx4.c2
-rw-r--r--src/mame/machine/stfight.c4
-rw-r--r--src/mame/machine/stvprot.c16
-rw-r--r--src/mame/machine/taitosj.c10
-rw-r--r--src/mame/machine/tatsumi.c16
-rw-r--r--src/mame/machine/tnzs.c12
-rw-r--r--src/mame/machine/toaplan1.c17
-rw-r--r--src/mame/machine/twincobr.c34
-rw-r--r--src/mame/machine/vectrex.c2
-rw-r--r--src/mame/machine/vsnes.c60
-rw-r--r--src/mame/machine/williams.c12
-rw-r--r--src/mame/video/amiga.c4
-rw-r--r--src/mame/video/astrocde.c2
-rw-r--r--src/mame/video/atari.c6
-rw-r--r--src/mame/video/atarisy1.c2
-rw-r--r--src/mame/video/avgdvg.c2
-rw-r--r--src/mame/video/blstroid.c2
-rw-r--r--src/mame/video/cischeat.c2
-rw-r--r--src/mame/video/combatsc.c2
-rw-r--r--src/mame/video/dc.c2
-rw-r--r--src/mame/video/dogfgt.c2
-rw-r--r--src/mame/video/gp9001.c4
-rw-r--r--src/mame/video/gtia.c2
-rw-r--r--src/mame/video/hng64.c2
-rw-r--r--src/mame/video/leland.c2
-rw-r--r--src/mame/video/namcos22.c4
-rw-r--r--src/mame/video/ojankohs.c2
-rw-r--r--src/mame/video/popeye.c2
-rw-r--r--src/mame/video/ppu2c0x.c4
-rw-r--r--src/mame/video/simpsons.c2
-rw-r--r--src/mame/video/skydiver.c2
-rw-r--r--src/mame/video/taito_b.c2
-rw-r--r--src/mame/video/toaplan1.c4
-rw-r--r--src/mame/video/vdc.c2
-rw-r--r--src/mame/video/vrender0.c2
-rw-r--r--src/mess/audio/mos7360.c4
-rw-r--r--src/mess/audio/svision.c2
-rw-r--r--src/mess/drivers/a2600.c10
-rw-r--r--src/mess/drivers/a310.c2
-rw-r--r--src/mess/drivers/a5105.c36
-rw-r--r--src/mess/drivers/a7000.c4
-rw-r--r--src/mess/drivers/abc1600.c14
-rw-r--r--src/mess/drivers/abc80x.c48
-rw-r--r--src/mess/drivers/ace.c8
-rw-r--r--src/mess/drivers/adam.c30
-rw-r--r--src/mess/drivers/amiga.c8
-rw-r--r--src/mess/drivers/apexc.c2
-rw-r--r--src/mess/drivers/apollo.c2
-rw-r--r--src/mess/drivers/apricot.c6
-rw-r--r--src/mess/drivers/apricotf.c4
-rw-r--r--src/mess/drivers/aquarius.c2
-rw-r--r--src/mess/drivers/astrocde.c10
-rw-r--r--src/mess/drivers/atari400.c60
-rw-r--r--src/mess/drivers/atarist.c22
-rw-r--r--src/mess/drivers/atm.c2
-rw-r--r--src/mess/drivers/atom.c6
-rw-r--r--src/mess/drivers/avigo.c20
-rw-r--r--src/mess/drivers/basic52.c2
-rw-r--r--src/mess/drivers/bebox.c2
-rw-r--r--src/mess/drivers/bigbord2.c2
-rw-r--r--src/mess/drivers/bml3.c58
-rw-r--r--src/mess/drivers/bw12.c12
-rw-r--r--src/mess/drivers/bw2.c44
-rw-r--r--src/mess/drivers/c64.c4
-rw-r--r--src/mess/drivers/camplynx.c42
-rw-r--r--src/mess/drivers/cat.c2
-rw-r--r--src/mess/drivers/cd2650.c2
-rw-r--r--src/mess/drivers/cosmicos.c18
-rw-r--r--src/mess/drivers/crvision.c24
-rw-r--r--src/mess/drivers/cxhumax.c4
-rw-r--r--src/mess/drivers/d6800.c2
-rw-r--r--src/mess/drivers/dc.c4
-rw-r--r--src/mess/drivers/dectalk.c2
-rw-r--r--src/mess/drivers/elf.c6
-rw-r--r--src/mess/drivers/elwro800.c12
-rw-r--r--src/mess/drivers/enterp.c2
-rw-r--r--src/mess/drivers/exp85.c6
-rw-r--r--src/mess/drivers/fk1.c10
-rw-r--r--src/mess/drivers/fm7.c4
-rw-r--r--src/mess/drivers/fmtowns.c8
-rw-r--r--src/mess/drivers/fp1100.c4
-rw-r--r--src/mess/drivers/gba.c24
-rw-r--r--src/mess/drivers/gp32.c2
-rw-r--r--src/mess/drivers/homelab.c2
-rw-r--r--src/mess/drivers/ht68k.c2
-rw-r--r--src/mess/drivers/indiana.c2
-rw-r--r--src/mess/drivers/instruct.c2
-rw-r--r--src/mess/drivers/ip22.c2
-rw-r--r--src/mess/drivers/itt3030.c2
-rw-r--r--src/mess/drivers/kyocera.c68
-rw-r--r--src/mess/drivers/lc80.c22
-rw-r--r--src/mess/drivers/lynx.c2
-rw-r--r--src/mess/drivers/m5.c4
-rw-r--r--src/mess/drivers/mc10.c2
-rw-r--r--src/mess/drivers/mc1000.c24
-rw-r--r--src/mess/drivers/mc80.c4
-rw-r--r--src/mess/drivers/micronic.c6
-rw-r--r--src/mess/drivers/mikromik.c4
-rw-r--r--src/mess/drivers/mpf1.c2
-rw-r--r--src/mess/drivers/mpz80.c4
-rw-r--r--src/mess/drivers/ms0515.c2
-rw-r--r--src/mess/drivers/msbc1.c2
-rw-r--r--src/mess/drivers/mstation.c14
-rw-r--r--src/mess/drivers/nanos.c2
-rw-r--r--src/mess/drivers/nc.c2
-rw-r--r--src/mess/drivers/newbrain.c12
-rw-r--r--src/mess/drivers/next.c2
-rw-r--r--src/mess/drivers/ng_aes.c8
-rw-r--r--src/mess/drivers/ob68k1a.c8
-rw-r--r--src/mess/drivers/osi.c16
-rw-r--r--src/mess/drivers/p8k.c4
-rw-r--r--src/mess/drivers/palm.c2
-rw-r--r--src/mess/drivers/pasopia7.c8
-rw-r--r--src/mess/drivers/pc1512.c12
-rw-r--r--src/mess/drivers/pc6001.c2
-rw-r--r--src/mess/drivers/pc8001.c30
-rw-r--r--src/mess/drivers/pc8401a.c28
-rw-r--r--src/mess/drivers/pc88va.c2
-rw-r--r--src/mess/drivers/pc9801.c2
-rw-r--r--src/mess/drivers/pce220.c12
-rw-r--r--src/mess/drivers/pcfx.c8
-rw-r--r--src/mess/drivers/pcw.c2
-rw-r--r--src/mess/drivers/pcw16.c4
-rw-r--r--src/mess/drivers/pdp1.c8
-rw-r--r--src/mess/drivers/pentagon.c2
-rw-r--r--src/mess/drivers/pes.c2
-rw-r--r--src/mess/drivers/pipbug.c2
-rw-r--r--src/mess/drivers/plus4.c4
-rw-r--r--src/mess/drivers/poly.c6
-rw-r--r--src/mess/drivers/portfoli.c22
-rw-r--r--src/mess/drivers/prestige.c18
-rw-r--r--src/mess/drivers/prof80.c14
-rw-r--r--src/mess/drivers/psx.c4
-rw-r--r--src/mess/drivers/px4.c2
-rw-r--r--src/mess/drivers/px8.c12
-rw-r--r--src/mess/drivers/ql.c26
-rw-r--r--src/mess/drivers/rex6000.c24
-rw-r--r--src/mess/drivers/rx78.c4
-rw-r--r--src/mess/drivers/sage2.c4
-rw-r--r--src/mess/drivers/samcoupe.c6
-rw-r--r--src/mess/drivers/scorpion.c2
-rw-r--r--src/mess/drivers/sg1000.c38
-rw-r--r--src/mess/drivers/sgi_ip2.c2
-rw-r--r--src/mess/drivers/spc1000.c2
-rw-r--r--src/mess/drivers/specpls3.c2
-rw-r--r--src/mess/drivers/spectrum.c4
-rw-r--r--src/mess/drivers/super6.c56
-rw-r--r--src/mess/drivers/supracan.c52
-rw-r--r--src/mess/drivers/tandy2k.c12
-rw-r--r--src/mess/drivers/tek405x.c18
-rw-r--r--src/mess/drivers/ti89.c8
-rw-r--r--src/mess/drivers/tiki100.c22
-rw-r--r--src/mess/drivers/timex.c2
-rw-r--r--src/mess/drivers/tmc1800.c24
-rw-r--r--src/mess/drivers/tmc600.c6
-rw-r--r--src/mess/drivers/tvc.c2
-rw-r--r--src/mess/drivers/unixpc.c4
-rw-r--r--src/mess/drivers/v1050.c26
-rw-r--r--src/mess/drivers/vboy.c4
-rw-r--r--src/mess/drivers/vc4000.c14
-rw-r--r--src/mess/drivers/vcs80.c4
-rw-r--r--src/mess/drivers/vg5k.c4
-rw-r--r--src/mess/drivers/vic10.c6
-rw-r--r--src/mess/drivers/victor9k.c8
-rw-r--r--src/mess/drivers/vii.c14
-rw-r--r--src/mess/drivers/vixen.c16
-rw-r--r--src/mess/drivers/vt520.c2
-rw-r--r--src/mess/drivers/vtech1.c14
-rw-r--r--src/mess/drivers/wangpc.c8
-rw-r--r--src/mess/drivers/x07.c6
-rw-r--r--src/mess/drivers/x1.c4
-rw-r--r--src/mess/drivers/x1twin.c2
-rw-r--r--src/mess/drivers/x68k.c4
-rw-r--r--src/mess/drivers/xerox820.c22
-rw-r--r--src/mess/drivers/xor100.c32
-rw-r--r--src/mess/drivers/z1013.c2
-rw-r--r--src/mess/drivers/z88.c22
-rw-r--r--src/mess/drivers/z9001.c4
-rw-r--r--src/mess/formats/ace_ace.c2
-rw-r--r--src/mess/formats/atom_atm.c2
-rw-r--r--src/mess/formats/cbm_snqk.c12
-rw-r--r--src/mess/formats/comx35_comx.c12
-rw-r--r--src/mess/formats/m65_snqk.c2
-rw-r--r--src/mess/formats/spec_snqk.c32
-rw-r--r--src/mess/formats/trs_cmd.c4
-rw-r--r--src/mess/formats/z80bin.c6
-rw-r--r--src/mess/machine/6883sam.c2
-rw-r--r--src/mess/machine/990_hd.c8
-rw-r--r--src/mess/machine/990_tap.c2
-rw-r--r--src/mess/machine/a7800.c4
-rw-r--r--src/mess/machine/advision.c2
-rw-r--r--src/mess/machine/aim65.c2
-rw-r--r--src/mess/machine/amigacd.c10
-rw-r--r--src/mess/machine/amigacrt.c32
-rw-r--r--src/mess/machine/amstrad.c12
-rw-r--r--src/mess/machine/apollo.c4
-rw-r--r--src/mess/machine/apple1.c4
-rw-r--r--src/mess/machine/apple2.c2
-rw-r--r--src/mess/machine/apple2gs.c6
-rw-r--r--src/mess/machine/apple3.c4
-rw-r--r--src/mess/machine/at.c2
-rw-r--r--src/mess/machine/ataricrt.c56
-rw-r--r--src/mess/machine/b2m.c2
-rw-r--r--src/mess/machine/bbc.c6
-rw-r--r--src/mess/machine/bebox.c20
-rw-r--r--src/mess/machine/c128.c14
-rw-r--r--src/mess/machine/c64.c16
-rw-r--r--src/mess/machine/c65.c26
-rw-r--r--src/mess/machine/cgenie.c6
-rw-r--r--src/mess/machine/coco.c10
-rw-r--r--src/mess/machine/coco_multi.c2
-rw-r--r--src/mess/machine/coco_vhd.c2
-rw-r--r--src/mess/machine/compis.c12
-rw-r--r--src/mess/machine/comx_clm.c4
-rw-r--r--src/mess/machine/cpc_ssa1.c4
-rw-r--r--src/mess/machine/cs4031.c2
-rw-r--r--src/mess/machine/cybiko.c4
-rw-r--r--src/mess/machine/dgn_beta.c14
-rw-r--r--src/mess/machine/electron.c2
-rw-r--r--src/mess/machine/galaxy.c6
-rw-r--r--src/mess/machine/gb.c6
-rw-r--r--src/mess/machine/genpc.c24
-rw-r--r--src/mess/machine/hd63450.c4
-rw-r--r--src/mess/machine/hp48.c2
-rw-r--r--src/mess/machine/i82439tx.c2
-rw-r--r--src/mess/machine/intv.c10
-rw-r--r--src/mess/machine/iq151_staper.c4
-rw-r--r--src/mess/machine/isa.c71
-rw-r--r--src/mess/machine/kaypro.c38
-rw-r--r--src/mess/machine/kc.c18
-rw-r--r--src/mess/machine/kc_d004.c2
-rw-r--r--src/mess/machine/lisa.c6
-rw-r--r--src/mess/machine/llc.c18
-rw-r--r--src/mess/machine/lviv.c12
-rw-r--r--src/mess/machine/lynx.c6
-rw-r--r--src/mess/machine/mac.c12
-rw-r--r--src/mess/machine/mbc55x.c4
-rw-r--r--src/mess/machine/mbee.c128
-rw-r--r--src/mess/machine/mface2.c4
-rw-r--r--src/mess/machine/microtan.c2
-rw-r--r--src/mess/machine/mpc105.c2
-rw-r--r--src/mess/machine/msx.c2
-rw-r--r--src/mess/machine/msx_slot.c22
-rw-r--r--src/mess/machine/mtx.c24
-rw-r--r--src/mess/machine/mz700.c96
-rw-r--r--src/mess/machine/nascom1.c28
-rw-r--r--src/mess/machine/nes.c8
-rw-r--r--src/mess/machine/northbridge.c2
-rw-r--r--src/mess/machine/nubus.c22
-rw-r--r--src/mess/machine/ondra.c10
-rw-r--r--src/mess/machine/oric.c16
-rw-r--r--src/mess/machine/orion.c6
-rw-r--r--src/mess/machine/osborne1.c4
-rw-r--r--src/mess/machine/partner.c4
-rw-r--r--src/mess/machine/pc.c18
-rw-r--r--src/mess/machine/pc1350.c2
-rw-r--r--src/mess/machine/pc_lpt.c4
-rw-r--r--src/mess/machine/pce.c8
-rw-r--r--src/mess/machine/pecom.c22
-rw-r--r--src/mess/machine/pet.c10
-rw-r--r--src/mess/machine/pk8020.c2
-rw-r--r--src/mess/machine/pmd85.c12
-rw-r--r--src/mess/machine/pokemini.c2
-rw-r--r--src/mess/machine/poly88.c2
-rw-r--r--src/mess/machine/pp01.c2
-rw-r--r--src/mess/machine/primo.c6
-rw-r--r--src/mess/machine/radio86.c4
-rw-r--r--src/mess/machine/rm380z.c20
-rw-r--r--src/mess/machine/rmnimbus.c50
-rw-r--r--src/mess/machine/s100_wunderbus.c12
-rw-r--r--src/mess/machine/s3c44b0.c2
-rw-r--r--src/mess/machine/samcoupe.c10
-rw-r--r--src/mess/machine/sms.c4
-rw-r--r--src/mess/machine/snescart.c6
-rw-r--r--src/mess/machine/sorcerer.c8
-rw-r--r--src/mess/machine/southbridge.c24
-rw-r--r--src/mess/machine/special.c4
-rw-r--r--src/mess/machine/sym1.c24
-rw-r--r--src/mess/machine/tf20.c12
-rw-r--r--src/mess/machine/thomson.c24
-rw-r--r--src/mess/machine/ti85.c12
-rw-r--r--src/mess/machine/ti99/datamux.c2
-rw-r--r--src/mess/machine/ti99/ti_rs232.c2
-rw-r--r--src/mess/machine/ti99/tn_ide.c16
-rw-r--r--src/mess/machine/trs80.c90
-rw-r--r--src/mess/machine/upd71071.c2
-rw-r--r--src/mess/machine/vector06.c2
-rw-r--r--src/mess/machine/vtech2.c12
-rw-r--r--src/mess/machine/wswan.c14
-rw-r--r--src/mess/machine/x68k_neptunex.c2
-rw-r--r--src/mess/machine/x68k_scsiext.c2
-rw-r--r--src/mess/machine/z80ne.c22
-rw-r--r--src/mess/machine/z88_flash.c2
-rw-r--r--src/mess/machine/zx.c12
-rw-r--r--src/mess/video/a7800.c4
-rw-r--r--src/mess/video/ac1.c4
-rw-r--r--src/mess/video/apple3.c2
-rw-r--r--src/mess/video/atarist.c14
-rw-r--r--src/mess/video/cirrus.c2
-rw-r--r--src/mess/video/dai.c2
-rw-r--r--src/mess/video/ef9345.c2
-rw-r--r--src/mess/video/galaxy.c2
-rw-r--r--src/mess/video/gb.c4
-rw-r--r--src/mess/video/hd66421.c4
-rw-r--r--src/mess/video/hp48.c2
-rw-r--r--src/mess/video/iq151_grafik.c4
-rw-r--r--src/mess/video/irisha.c2
-rw-r--r--src/mess/video/isa_cga.c6
-rw-r--r--src/mess/video/kramermc.c2
-rw-r--r--src/mess/video/mos6566.c4
-rw-r--r--src/mess/video/newbrain.c4
-rw-r--r--src/mess/video/oric.c4
-rw-r--r--src/mess/video/pc_aga.c24
-rw-r--r--src/mess/video/pc_t1t.c12
-rw-r--r--src/mess/video/primo.c2
-rw-r--r--src/mess/video/ti85.c2
-rw-r--r--src/mess/video/tms3556.c4
-rw-r--r--src/mess/video/upd7220.c4
-rw-r--r--src/mess/video/zx8301.c4
848 files changed, 4375 insertions, 4323 deletions
diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/emu/cpu/adsp2100/adsp2100.c
index bdc335e1057..95e2e31f852 100644
--- a/src/emu/cpu/adsp2100/adsp2100.c
+++ b/src/emu/cpu/adsp2100/adsp2100.c
@@ -445,10 +445,10 @@ UINT16 adsp2181_device::idma_data_r()
void adsp21xx_device::device_start()
{
// get our address spaces
- m_program = space(AS_PROGRAM);
+ m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
- m_data = space(AS_DATA);
- m_io = space(AS_IO);
+ m_data = &space(AS_DATA);
+ m_io = has_space(AS_IO) ? &space(AS_IO) : NULL;
// "core"
save_item(NAME(m_core.ax0.u));
diff --git a/src/emu/cpu/alph8201/alph8201.c b/src/emu/cpu/alph8201/alph8201.c
index 363401bf7ba..a783087fc76 100644
--- a/src/emu/cpu/alph8201/alph8201.c
+++ b/src/emu/cpu/alph8201/alph8201.c
@@ -668,7 +668,7 @@ static CPU_INIT( alpha8201 )
alpha8201_state *cpustate = get_safe_token(device);
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
device->save_item(NAME(cpustate->RAM));
diff --git a/src/emu/cpu/am29000/am29000.c b/src/emu/cpu/am29000/am29000.c
index 5506a668af6..84ad9f23250 100644
--- a/src/emu/cpu/am29000/am29000.c
+++ b/src/emu/cpu/am29000/am29000.c
@@ -154,11 +154,11 @@ static CPU_INIT( am29000 )
{
am29000_state *am29000 = get_safe_token(device);
- am29000->program = device->space(AS_PROGRAM);
+ am29000->program = &device->space(AS_PROGRAM);
am29000->direct = &am29000->program->direct();
- am29000->data = device->space(AS_DATA);
+ am29000->data = &device->space(AS_DATA);
am29000->datadirect = &am29000->data->direct();
- am29000->io = device->space(AS_IO);
+ am29000->io = &device->space(AS_IO);
am29000->cfg = (PRL_AM29000 | PRL_REV_D) << CFG_PRL_SHIFT;
/* Register state for saving */
diff --git a/src/emu/cpu/apexc/apexc.c b/src/emu/cpu/apexc/apexc.c
index 7d1957b5ccc..5adf71dd1f6 100644
--- a/src/emu/cpu/apexc/apexc.c
+++ b/src/emu/cpu/apexc/apexc.c
@@ -800,8 +800,8 @@ static CPU_INIT( apexc )
apexc_state *cpustate = get_safe_token(device);
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
- cpustate->io = device->space(AS_IO);
+ cpustate->program = &device->space(AS_PROGRAM);
+ cpustate->io = &device->space(AS_IO);
device->save_item(NAME(cpustate->a));
device->save_item(NAME(cpustate->r));
diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c
index cb99f0347fa..eea2cd3ac08 100644
--- a/src/emu/cpu/arm/arm.c
+++ b/src/emu/cpu/arm/arm.c
@@ -345,7 +345,7 @@ static CPU_RESET( arm )
cpustate->irq_callback = save_irqcallback;
cpustate->endian = save_endian;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
/* start up in SVC mode with interrupts disabled. */
@@ -528,7 +528,7 @@ static CPU_INIT( arm )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->endian = ENDIANNESS_LITTLE;
device->save_item(NAME(cpustate->sArmRegister));
@@ -544,7 +544,7 @@ static CPU_INIT( arm_be )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->endian = ENDIANNESS_BIG;
device->save_item(NAME(cpustate->sArmRegister));
diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c
index 343fc8b1e11..b02b005ab21 100644
--- a/src/emu/cpu/arm7/arm7.c
+++ b/src/emu/cpu/arm7/arm7.c
@@ -427,7 +427,7 @@ static CPU_INIT( arm7 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
// setup co-proc callbacks
diff --git a/src/emu/cpu/arm7/arm7core.c b/src/emu/cpu/arm7/arm7core.c
index b15fb7217a7..a8bfaa300fb 100644
--- a/src/emu/cpu/arm7/arm7core.c
+++ b/src/emu/cpu/arm7/arm7core.c
@@ -140,7 +140,7 @@ static void arm7_core_reset(legacy_cpu_device *device)
memset(cpustate, 0, sizeof(arm_state));
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->endian = ENDIANNESS_LITTLE;
cpustate->direct = &cpustate->program->direct();
diff --git a/src/emu/cpu/asap/asap.c b/src/emu/cpu/asap/asap.c
index 115278ec9a9..2487321cb01 100644
--- a/src/emu/cpu/asap/asap.c
+++ b/src/emu/cpu/asap/asap.c
@@ -211,7 +211,7 @@ asap_device::asap_device(const machine_config &mconfig, const char *tag, device_
void asap_device::device_start()
{
// get our address spaces
- m_program = space(AS_PROGRAM);
+ m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
// register our state for the debugger
diff --git a/src/emu/cpu/avr8/avr8.c b/src/emu/cpu/avr8/avr8.c
index 8c7867e4102..2760706d257 100644
--- a/src/emu/cpu/avr8/avr8.c
+++ b/src/emu/cpu/avr8/avr8.c
@@ -188,8 +188,8 @@ static CPU_INIT( avr8 )
cpustate->pc = 0;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
- cpustate->io = device->space(AS_IO);
+ cpustate->program = &device->space(AS_PROGRAM);
+ cpustate->io = &device->space(AS_IO);
WRITE_IO_8(cpustate, AVR8_IO_SREG, 0);
diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c
index 921c71a07ac..b46faffc255 100644
--- a/src/emu/cpu/ccpu/ccpu.c
+++ b/src/emu/cpu/ccpu/ccpu.c
@@ -130,10 +130,10 @@ static CPU_INIT( ccpu )
cpustate->external_input = configdata->external_input ? configdata->external_input : read_jmi;
cpustate->vector_callback = configdata->vector_callback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
device->save_item(NAME(cpustate->PC));
device->save_item(NAME(cpustate->A));
diff --git a/src/emu/cpu/cop400/cop400.c b/src/emu/cpu/cop400/cop400.c
index 263e62a447b..e931c5efacd 100644
--- a/src/emu/cpu/cop400/cop400.c
+++ b/src/emu/cpu/cop400/cop400.c
@@ -872,10 +872,10 @@ static void cop400_init(legacy_cpu_device *device, UINT8 g_mask, UINT8 d_mask, U
/* find address spaces */
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
/* set output pin masks */
diff --git a/src/emu/cpu/cosmac/cosmac.c b/src/emu/cpu/cosmac/cosmac.c
index 5149be749c9..463e36825c2 100644
--- a/src/emu/cpu/cosmac/cosmac.c
+++ b/src/emu/cpu/cosmac/cosmac.c
@@ -231,9 +231,9 @@ void cosmac_device::device_config_complete()
void cosmac_device::device_start()
{
// get our address spaces
- m_program = space(AS_PROGRAM);
+ m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
- m_io = space(AS_IO);
+ m_io = &space(AS_IO);
// register our state for the debugger
state_add(STATE_GENPC, "GENPC", m_pc).callimport().callexport().noshow();
diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/emu/cpu/cp1610/cp1610.c
index 7f65df18830..4d0b111f1e4 100644
--- a/src/emu/cpu/cp1610/cp1610.c
+++ b/src/emu/cpu/cp1610/cp1610.c
@@ -3388,7 +3388,7 @@ static CPU_INIT( cp1610 )
cpustate->intrm_pending = 0;
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
device->save_item(NAME(cpustate->r));
device->save_item(NAME(cpustate->flags));
diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/emu/cpu/cubeqcpu/cubeqcpu.c
index bc4064093a5..cd60864229d 100644
--- a/src/emu/cpu/cubeqcpu/cubeqcpu.c
+++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c
@@ -282,7 +282,7 @@ static CPU_INIT( cquestsnd )
cpustate->sound_data = (UINT16*)device->machine().root_device().memregion(_config->sound_data_region)->base();
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
/* Allocate RAM shared with 68000 */
@@ -350,7 +350,7 @@ static CPU_INIT( cquestrot )
cpustate->device = device;
cpustate->lindevice = device->machine().device<legacy_cpu_device>(rotconfig->lin_cpu_tag);
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
cquestrot_state_register(device);
@@ -429,7 +429,7 @@ static CPU_INIT( cquestlin )
cpustate->device = device;
cpustate->rotdevice = device->machine().device<legacy_cpu_device>(linconfig->rot_cpu_tag);
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
cquestlin_state_register(device);
diff --git a/src/emu/cpu/drcfe.h b/src/emu/cpu/drcfe.h
index 68b94ffd481..ddf617ccd85 100644
--- a/src/emu/cpu/drcfe.h
+++ b/src/emu/cpu/drcfe.h
@@ -180,7 +180,7 @@ private:
// CPU parameters
cpu_device & m_cpudevice; // CPU device object
- address_space * m_program; // program address space for this CPU
+ address_space & m_program; // program address space for this CPU
offs_t m_pageshift; // shift to convert address to a page index
// opcode descriptor arrays
diff --git a/src/emu/cpu/drcuml.c b/src/emu/cpu/drcuml.c
index 4e671565815..626b55538e6 100644
--- a/src/emu/cpu/drcuml.c
+++ b/src/emu/cpu/drcuml.c
@@ -121,11 +121,11 @@ drcbe_interface::drcbe_interface(drcuml_state &drcuml, drc_cache &cache, device_
device_memory_interface *memory;
if (device.interface(memory))
for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_space); spacenum++)
- {
- m_space[spacenum] = memory->space(spacenum);
- if (m_space[spacenum] != NULL)
+ if (memory->has_space(spacenum))
+ {
+ m_space[spacenum] = &memory->space(spacenum);
m_space[spacenum]->accessors(m_accessors[spacenum]);
- }
+ }
}
diff --git a/src/emu/cpu/dsp16/dsp16.c b/src/emu/cpu/dsp16/dsp16.c
index 61c160a3366..a75529471f5 100644
--- a/src/emu/cpu/dsp16/dsp16.c
+++ b/src/emu/cpu/dsp16/dsp16.c
@@ -42,7 +42,7 @@ dsp16_device::dsp16_device(const machine_config &mconfig, const char *tag, devic
void dsp16_device::device_start()
{
// get our address spaces
- m_program = space(AS_PROGRAM);
+ m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
save_item(NAME(m_pc));
diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c
index e029657b3d5..8a097610c02 100644
--- a/src/emu/cpu/dsp32/dsp32.c
+++ b/src/emu/cpu/dsp32/dsp32.c
@@ -231,7 +231,7 @@ void dsp32c_device::static_set_config(device_t &device, const dsp32_config &conf
void dsp32c_device::device_start()
{
// get our address spaces
- m_program = space(AS_PROGRAM);
+ m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
// register our state for the debugger
diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/emu/cpu/dsp56k/dsp56k.c
index 7dd60176cdb..7ac2c4a2c53 100644
--- a/src/emu/cpu/dsp56k/dsp56k.c
+++ b/src/emu/cpu/dsp56k/dsp56k.c
@@ -232,9 +232,9 @@ static CPU_INIT( dsp56k )
//cpustate->config = device->static_config();
//cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
+ cpustate->data = &device->space(AS_DATA);
/* Setup the direct memory handler for this CPU */
/* NOTE: Be sure to grab this guy and call him if you ever install another direct_update_hander in a driver! */
diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/emu/cpu/e132xs/e132xs.c
index c5a532a0741..31a3f12f1b2 100644
--- a/src/emu/cpu/e132xs/e132xs.c
+++ b/src/emu/cpu/e132xs/e132xs.c
@@ -1542,9 +1542,9 @@ static void hyperstone_init(legacy_cpu_device *device, device_irq_acknowledge_ca
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->timer = device->machine().scheduler().timer_alloc(FUNC(e132xs_timer_callback), (void *)device);
cpustate->clock_scale_mask = scale_mask;
}
@@ -1650,9 +1650,9 @@ static CPU_RESET( hyperstone )
cpustate->irq_callback = save_irqcallback;
cpustate->opcodexor = save_opcodexor;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->timer = save_timer;
cpustate->tr_clocks_per_tick = 2;
diff --git a/src/emu/cpu/esrip/esrip.c b/src/emu/cpu/esrip/esrip.c
index a93a120a313..9a32ff4b4a9 100644
--- a/src/emu/cpu/esrip/esrip.c
+++ b/src/emu/cpu/esrip/esrip.c
@@ -264,7 +264,7 @@ static CPU_INIT( esrip )
cpustate->ipt_ram = auto_alloc_array(device->machine(), UINT16, IPT_RAM_SIZE/2);
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
/* Create the instruction decode lookup table */
diff --git a/src/emu/cpu/f8/f8.c b/src/emu/cpu/f8/f8.c
index 616c7322c4c..be67cf7a2ac 100644
--- a/src/emu/cpu/f8/f8.c
+++ b/src/emu/cpu/f8/f8.c
@@ -1619,9 +1619,9 @@ static CPU_RESET( f8 )
memset(cpustate, 0, sizeof(f8_Regs));
cpustate->irq_callback = save_callback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->iospace = device->space(AS_IO);
+ cpustate->iospace = &device->space(AS_IO);
cpustate->w&=~I;
/* save PC0 to PC1 and reset PC0 */
@@ -1967,9 +1967,9 @@ static CPU_INIT( f8 )
f8_Regs *cpustate = get_safe_token(device);
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->iospace = device->space(AS_IO);
+ cpustate->iospace = &device->space(AS_IO);
device->save_item(NAME(cpustate->pc0));
device->save_item(NAME(cpustate->pc1));
diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c
index 1211686a145..1453109a544 100644
--- a/src/emu/cpu/g65816/g65816.c
+++ b/src/emu/cpu/g65816/g65816.c
@@ -338,7 +338,7 @@ static CPU_INIT( g65816 )
g65816_set_irq_callback(cpustate, irqcallback);
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->cpu_type = CPU_TYPE_G65816;
device->save_item(NAME(cpustate->a));
diff --git a/src/emu/cpu/h6280/h6280.c b/src/emu/cpu/h6280/h6280.c
index 9d303120f70..6398a35e4d0 100644
--- a/src/emu/cpu/h6280/h6280.c
+++ b/src/emu/cpu/h6280/h6280.c
@@ -161,9 +161,9 @@ static CPU_INIT( h6280 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
}
static CPU_RESET( h6280 )
@@ -178,9 +178,9 @@ static CPU_RESET( h6280 )
memset(cpustate, 0, sizeof(h6280_Regs));
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
/* set I and B flags */
P = _fI | _fB;
diff --git a/src/emu/cpu/h83002/h8_16.c b/src/emu/cpu/h83002/h8_16.c
index 511ba2f7b48..d50dfdfafd5 100644
--- a/src/emu/cpu/h83002/h8_16.c
+++ b/src/emu/cpu/h83002/h8_16.c
@@ -217,9 +217,9 @@ static CPU_INIT(h8)
h8->mode_8bit = 0;
- h8->program = device->space(AS_PROGRAM);
+ h8->program = &device->space(AS_PROGRAM);
h8->direct = &h8->program->direct();
- h8->io = device->space(AS_IO);
+ h8->io = &device->space(AS_IO);
device->save_item(NAME(h8->h8err));
device->save_item(NAME(h8->regs));
diff --git a/src/emu/cpu/h83002/h8_8.c b/src/emu/cpu/h83002/h8_8.c
index 3102c6e7d0f..dcfef2cca4d 100644
--- a/src/emu/cpu/h83002/h8_8.c
+++ b/src/emu/cpu/h83002/h8_8.c
@@ -234,9 +234,9 @@ static CPU_INIT(h8bit)
h8->mode_8bit = 1;
- h8->program = device->space(AS_PROGRAM);
+ h8->program = &device->space(AS_PROGRAM);
h8->direct = &h8->program->direct();
- h8->io = device->space(AS_IO);
+ h8->io = &device->space(AS_IO);
h8->timer[0] = h8->device->machine().scheduler().timer_alloc(FUNC(h8_timer_0_cb), h8);
h8->timer[1] = h8->device->machine().scheduler().timer_alloc(FUNC(h8_timer_1_cb), h8);
diff --git a/src/emu/cpu/hcd62121/hcd62121.c b/src/emu/cpu/hcd62121/hcd62121.c
index 9a892590883..fe74b62c663 100644
--- a/src/emu/cpu/hcd62121/hcd62121.c
+++ b/src/emu/cpu/hcd62121/hcd62121.c
@@ -316,8 +316,8 @@ static CPU_INIT( hcd62121 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
- cpustate->io = device->space(AS_IO);
+ cpustate->program = &device->space(AS_PROGRAM);
+ cpustate->io = &device->space(AS_IO);
}
diff --git a/src/emu/cpu/hd61700/hd61700.c b/src/emu/cpu/hd61700/hd61700.c
index 31b3b88d266..a2b0b863522 100644
--- a/src/emu/cpu/hd61700/hd61700.c
+++ b/src/emu/cpu/hd61700/hd61700.c
@@ -124,7 +124,7 @@ void hd61700_cpu_device::static_set_config(device_t &device, const hd61700_confi
void hd61700_cpu_device::device_start()
{
- m_program = this->space(AS_PROGRAM);
+ m_program = &space(AS_PROGRAM);
m_sec_timer = timer_alloc(SEC_TIMER);
m_sec_timer->adjust(attotime::from_seconds(1), 0, attotime::from_seconds(1));
diff --git a/src/emu/cpu/hd6309/hd6309.c b/src/emu/cpu/hd6309/hd6309.c
index 8ceeee347fc..3742fcf83b3 100644
--- a/src/emu/cpu/hd6309/hd6309.c
+++ b/src/emu/cpu/hd6309/hd6309.c
@@ -518,7 +518,7 @@ static CPU_INIT( hd6309 )
m68_state->irq_callback = irqcallback;
m68_state->device = device;
- m68_state->program = device->space(AS_PROGRAM);
+ m68_state->program = &device->space(AS_PROGRAM);
m68_state->direct = &m68_state->program->direct();
/* setup regtable */
diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c
index f192c55c5da..bb97001e6dc 100644
--- a/src/emu/cpu/i386/i386.c
+++ b/src/emu/cpu/i386/i386.c
@@ -2882,9 +2882,9 @@ static CPU_INIT( i386 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
device->save_item(NAME( cpustate->reg.d));
device->save_item(NAME(cpustate->sreg[ES].selector));
@@ -3006,9 +3006,9 @@ static CPU_RESET( i386 )
memset( cpustate, 0, sizeof(*cpustate) );
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->sreg[CS].selector = 0xf000;
cpustate->sreg[CS].base = 0xffff0000;
@@ -3497,9 +3497,9 @@ static CPU_RESET( i486 )
memset( cpustate, 0, sizeof(*cpustate) );
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->sreg[CS].selector = 0xf000;
cpustate->sreg[CS].base = 0xffff0000;
@@ -3604,9 +3604,9 @@ static CPU_RESET( pentium )
memset( cpustate, 0, sizeof(*cpustate) );
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->sreg[CS].selector = 0xf000;
cpustate->sreg[CS].base = 0xffff0000;
@@ -3727,9 +3727,9 @@ static CPU_RESET( mediagx )
memset( cpustate, 0, sizeof(*cpustate) );
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->sreg[CS].selector = 0xf000;
cpustate->sreg[CS].base = 0xffff0000;
@@ -3842,9 +3842,9 @@ static CPU_RESET( pentium_pro )
memset( cpustate, 0, sizeof(*cpustate) );
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->sreg[CS].selector = 0xf000;
cpustate->sreg[CS].base = 0xffff0000;
@@ -3938,9 +3938,9 @@ static CPU_RESET( pentium_mmx )
memset( cpustate, 0, sizeof(*cpustate) );
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->sreg[CS].selector = 0xf000;
cpustate->sreg[CS].base = 0xffff0000;
@@ -4034,9 +4034,9 @@ static CPU_RESET( pentium2 )
memset( cpustate, 0, sizeof(*cpustate) );
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->sreg[CS].selector = 0xf000;
cpustate->sreg[CS].base = 0xffff0000;
@@ -4130,9 +4130,9 @@ static CPU_RESET( pentium3 )
memset( cpustate, 0, sizeof(*cpustate) );
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->sreg[CS].selector = 0xf000;
cpustate->sreg[CS].base = 0xffff0000;
@@ -4226,9 +4226,9 @@ static CPU_RESET( pentium4 )
memset( cpustate, 0, sizeof(*cpustate) );
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->sreg[CS].selector = 0xf000;
cpustate->sreg[CS].base = 0xffff0000;
diff --git a/src/emu/cpu/i4004/i4004.c b/src/emu/cpu/i4004/i4004.c
index 2e497928ae1..424212714a9 100644
--- a/src/emu/cpu/i4004/i4004.c
+++ b/src/emu/cpu/i4004/i4004.c
@@ -462,10 +462,10 @@ static CPU_INIT( i4004 )
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
device->save_item(NAME(cpustate->PC));
device->save_item(NAME(cpustate->A));
diff --git a/src/emu/cpu/i8008/i8008.c b/src/emu/cpu/i8008/i8008.c
index 5acc80b864d..63f4103fe3f 100644
--- a/src/emu/cpu/i8008/i8008.c
+++ b/src/emu/cpu/i8008/i8008.c
@@ -51,9 +51,9 @@ i8008_device::i8008_device(const machine_config &mconfig, const char *tag, devic
void i8008_device::device_start()
{
// find address spaces
- m_program = space(AS_PROGRAM);
+ m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
- m_io = space(AS_IO);
+ m_io = &space(AS_IO);
// save state
save_item(NAME(m_PC));
diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c
index 6c1251d5c4e..0b799c2407a 100644
--- a/src/emu/cpu/i8085/i8085.c
+++ b/src/emu/cpu/i8085/i8085.c
@@ -1006,9 +1006,9 @@ static void init_808x_common(legacy_cpu_device *device, device_irq_acknowledge_c
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
/* resolve callbacks */
cpustate->out_status_func.resolve(cpustate->config.out_status_func, *device);
diff --git a/src/emu/cpu/i86/i286.c b/src/emu/cpu/i86/i286.c
index be3832c73d2..95b075a2616 100644
--- a/src/emu/cpu/i86/i286.c
+++ b/src/emu/cpu/i86/i286.c
@@ -310,8 +310,8 @@ static CPU_INIT( i80286 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
- cpustate->io = device->space(AS_IO);
+ cpustate->program = &device->space(AS_PROGRAM);
+ cpustate->io = &device->space(AS_IO);
cpustate->direct = &cpustate->program->direct();
/* If a reset parameter is given, take it as pointer to an address mask */
diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c
index bafca70648f..910bf09b509 100644
--- a/src/emu/cpu/i86/i86.c
+++ b/src/emu/cpu/i86/i86.c
@@ -165,9 +165,9 @@ static CPU_INIT( i8086 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
/* set up the state table */
{
@@ -236,9 +236,9 @@ static CPU_RESET( i8086 )
memset(cpustate, 0, sizeof(*cpustate));
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->sregs[CS] = 0xffff;
cpustate->base[CS] = SegBase(CS);
diff --git a/src/emu/cpu/i860/i860.c b/src/emu/cpu/i860/i860.c
index 11801209d50..92cf61fea1c 100644
--- a/src/emu/cpu/i860/i860.c
+++ b/src/emu/cpu/i860/i860.c
@@ -30,7 +30,7 @@ static CPU_INIT( i860 )
{
i860_state_t *cpustate = get_safe_token(device);
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
reset_i860(cpustate);
i860_set_pin(device, DEC_PIN_BUS_HOLD, 0);
i860_set_pin(device, DEC_PIN_RESET, 0);
diff --git a/src/emu/cpu/i960/i960.c b/src/emu/cpu/i960/i960.c
index fdbf19378e7..059f262e312 100644
--- a/src/emu/cpu/i960/i960.c
+++ b/src/emu/cpu/i960/i960.c
@@ -2067,7 +2067,7 @@ static CPU_INIT( i960 )
i960->irq_cb = irqcallback;
i960->device = device;
- i960->program = device->space(AS_PROGRAM);
+ i960->program = &device->space(AS_PROGRAM);
i960->direct = &i960->program->direct();
device->save_item(NAME(i960->PIP));
diff --git a/src/emu/cpu/jaguar/jaguar.c b/src/emu/cpu/jaguar/jaguar.c
index 76d43b156b3..f5fdaec6d11 100644
--- a/src/emu/cpu/jaguar/jaguar.c
+++ b/src/emu/cpu/jaguar/jaguar.c
@@ -417,7 +417,7 @@ static void init_common(int isdsp, legacy_cpu_device *device, device_irq_acknowl
jaguar->irq_callback = irqcallback;
jaguar->device = device;
- jaguar->program = device->space(AS_PROGRAM);
+ jaguar->program = &device->space(AS_PROGRAM);
jaguar->direct = &jaguar->program->direct();
if (configdata != NULL)
jaguar->cpu_interrupt = configdata->cpu_int_callback;
diff --git a/src/emu/cpu/konami/konami.c b/src/emu/cpu/konami/konami.c
index 7fa2ebc27d8..1a11ec36bb1 100644
--- a/src/emu/cpu/konami/konami.c
+++ b/src/emu/cpu/konami/konami.c
@@ -403,7 +403,7 @@ static CPU_INIT( konami )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
device->save_item(NAME(PC));
diff --git a/src/emu/cpu/lh5801/lh5801.c b/src/emu/cpu/lh5801/lh5801.c
index ee0ee95c259..56c37e05184 100644
--- a/src/emu/cpu/lh5801/lh5801.c
+++ b/src/emu/cpu/lh5801/lh5801.c
@@ -117,8 +117,8 @@ static CPU_INIT( lh5801 )
memset(cpustate, 0, sizeof(*cpustate));
cpustate->config = (const lh5801_cpu_core *) device->static_config();
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
- cpustate->io = device->space(AS_IO);
+ cpustate->program = &device->space(AS_PROGRAM);
+ cpustate->io = &device->space(AS_IO);
cpustate->direct = &cpustate->program->direct();
}
diff --git a/src/emu/cpu/lr35902/lr35902.c b/src/emu/cpu/lr35902/lr35902.c
index 63323c60b45..0940542c656 100644
--- a/src/emu/cpu/lr35902/lr35902.c
+++ b/src/emu/cpu/lr35902/lr35902.c
@@ -117,7 +117,7 @@ inline void lr35902_cpu_device::mem_write_word( UINT16 addr, UINT16 data )
void lr35902_cpu_device::device_start()
{
m_device = this;
- m_program = this->space(AS_PROGRAM);
+ m_program = &space(AS_PROGRAM);
save_item(NAME(m_A));
save_item(NAME(m_F));
diff --git a/src/emu/cpu/m37710/m37710.c b/src/emu/cpu/m37710/m37710.c
index 598980dd0a8..3c0232657d9 100644
--- a/src/emu/cpu/m37710/m37710.c
+++ b/src/emu/cpu/m37710/m37710.c
@@ -978,8 +978,8 @@ static CPU_INIT( m37710 )
INT_ACK = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
- cpustate->io = device->space(AS_IO);
+ cpustate->program = &device->space(AS_PROGRAM);
+ cpustate->io = &device->space(AS_IO);
cpustate->ICount = 0;
diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c
index 1c259efe054..aef6c8a8196 100644
--- a/src/emu/cpu/m6502/m4510.c
+++ b/src/emu/cpu/m6502/m4510.c
@@ -191,7 +191,7 @@ static CPU_INIT( m4510 )
cpustate->interrupt_inhibit = 0;
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->space = device->space(AS_PROGRAM);
+ cpustate->space = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->space->direct();
if ( intf )
diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c
index 38bd935763e..d7dd22e8d5d 100644
--- a/src/emu/cpu/m6502/m6502.c
+++ b/src/emu/cpu/m6502/m6502.c
@@ -136,7 +136,7 @@ static void m6502_common_init(legacy_cpu_device *device, device_irq_acknowledge_
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->space = device->space(AS_PROGRAM);
+ cpustate->space = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->space->direct();
cpustate->subtype = subtype;
cpustate->insn = insn;
@@ -548,7 +548,7 @@ static CPU_INIT( deco16 )
{
m6502_Regs *cpustate = get_safe_token(device);
m6502_common_init(device, irqcallback, SUBTYPE_DECO16, insndeco16, "deco16");
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
}
diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c
index 405452cddf8..1eb652f108b 100644
--- a/src/emu/cpu/m6502/m6509.c
+++ b/src/emu/cpu/m6502/m6509.c
@@ -141,7 +141,7 @@ static CPU_INIT( m6509 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->space = device->space(AS_PROGRAM);
+ cpustate->space = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->space->direct();
if ( intf )
diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c
index 4eae03063a4..082e17ba6e3 100644
--- a/src/emu/cpu/m6502/m65ce02.c
+++ b/src/emu/cpu/m6502/m65ce02.c
@@ -101,7 +101,7 @@ static CPU_INIT( m65ce02 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->space = device->space(AS_PROGRAM);
+ cpustate->space = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->space->direct();
if ( intf )
diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c
index 448c5787aa3..2c8b6086482 100644
--- a/src/emu/cpu/m6800/m6800.c
+++ b/src/emu/cpu/m6800/m6800.c
@@ -1046,10 +1046,10 @@ static CPU_INIT( m6800 )
{
m6800_state *cpustate = get_safe_token(device);
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
// cpustate->subtype = SUBTYPE_M6800;
cpustate->insn = m6800_insn;
@@ -1199,10 +1199,10 @@ static CPU_INIT( m6801 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
cpustate->clock = device->clock() / 4;
cpustate->sci_timer = device->machine().scheduler().timer_alloc(FUNC(sci_tick), cpustate);
@@ -1234,10 +1234,10 @@ static CPU_INIT( m6802 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
state_register(cpustate, "m6802");
}
@@ -1254,10 +1254,10 @@ static CPU_INIT( m6803 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
cpustate->clock = device->clock() / 4;
cpustate->sci_timer = device->machine().scheduler().timer_alloc(FUNC(sci_tick), cpustate);
@@ -1296,10 +1296,10 @@ static CPU_INIT( m6808 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
state_register(cpustate, "m6808");
}
@@ -1317,10 +1317,10 @@ static CPU_INIT( hd6301 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
cpustate->clock = device->clock() / 4;
cpustate->sci_timer = device->machine().scheduler().timer_alloc(FUNC(sci_tick), cpustate);
@@ -1342,10 +1342,10 @@ static CPU_INIT( hd63701 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
cpustate->clock = device->clock() / 4;
cpustate->sci_timer = device->machine().scheduler().timer_alloc(FUNC(sci_tick), cpustate);
@@ -1377,10 +1377,10 @@ static CPU_INIT( nsc8105 )
// cpustate->subtype = SUBTYPE_NSC8105;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
cpustate->insn = nsc8105_insn;
cpustate->cycles = cycles_nsc8105;
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c
index 60894d717b7..157c72da02c 100644
--- a/src/emu/cpu/m68000/m68kcpu.c
+++ b/src/emu/cpu/m68000/m68kcpu.c
@@ -898,7 +898,7 @@ static CPU_INIT( m68k )
m68ki_cpu_core *m68k = m68k_get_safe_token(device);
m68k->device = device;
- m68k->program = device->space(AS_PROGRAM);
+ m68k->program = &device->space(AS_PROGRAM);
m68k->int_ack_callback = irqcallback;
/* disable all MMUs */
@@ -2065,7 +2065,7 @@ static CPU_INIT( m68307 )
m68k->m68307SERIAL->reset();
m68k->m68307TIMER->reset();
- m68k->internal = device->space(AS_PROGRAM);
+ m68k->internal = &device->space(AS_PROGRAM);
m68k->m68307_base = 0xbfff;
m68k->m68307_scrhigh = 0x0007;
m68k->m68307_scrlow = 0xf010;
@@ -2862,7 +2862,7 @@ static CPU_INIT( m68340 )
m68k->m68340_base = 0x00000000;
- m68k->internal = device->space(AS_PROGRAM);
+ m68k->internal = &device->space(AS_PROGRAM);
define_state(device);
}
diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c
index 0ac3fb2b549..b759981e145 100644
--- a/src/emu/cpu/m6805/m6805.c
+++ b/src/emu/cpu/m6805/m6805.c
@@ -479,7 +479,7 @@ static CPU_INIT( m6805 )
state_register(cpustate, "m6805", device);
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
}
@@ -493,7 +493,7 @@ static CPU_RESET( m6805 )
cpustate->iCount=50000; /* Used to be global */
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
/* Force CPU sub-type and relevant masks */
diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c
index 318ec6e568e..2989dbdeb55 100644
--- a/src/emu/cpu/m6809/m6809.c
+++ b/src/emu/cpu/m6809/m6809.c
@@ -377,7 +377,7 @@ static CPU_INIT( m6809 )
m68_state->irq_callback = irqcallback;
m68_state->device = device;
- m68_state->program = device->space(AS_PROGRAM);
+ m68_state->program = &device->space(AS_PROGRAM);
m68_state->direct = &m68_state->program->direct();
/* setup regtable */
diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/emu/cpu/mb86233/mb86233.c
index 28a69ed67bb..0369412ae87 100644
--- a/src/emu/cpu/mb86233/mb86233.c
+++ b/src/emu/cpu/mb86233/mb86233.c
@@ -111,7 +111,7 @@ static CPU_INIT( mb86233 )
memset(cpustate, 0, sizeof( *cpustate ) );
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
if ( _config )
diff --git a/src/emu/cpu/mb88xx/mb88xx.c b/src/emu/cpu/mb88xx/mb88xx.c
index a02799c1da5..9d5227d5ee7 100644
--- a/src/emu/cpu/mb88xx/mb88xx.c
+++ b/src/emu/cpu/mb88xx/mb88xx.c
@@ -143,10 +143,10 @@ static CPU_INIT( mb88 )
cpustate->irqcallback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
cpustate->serial = device->machine().scheduler().timer_alloc(FUNC(serial_timer), (void *)device);
diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/emu/cpu/mc68hc11/mc68hc11.c
index 6e12288a570..3c9882972f4 100644
--- a/src/emu/cpu/mc68hc11/mc68hc11.c
+++ b/src/emu/cpu/mc68hc11/mc68hc11.c
@@ -446,9 +446,9 @@ static CPU_INIT( hc11 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
device->save_item(NAME(cpustate->pc));
device->save_item(NAME(cpustate->ix));
diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c
index a1b273c1660..5567026d267 100644
--- a/src/emu/cpu/mcs48/mcs48.c
+++ b/src/emu/cpu/mcs48/mcs48.c
@@ -858,10 +858,10 @@ static void mcs48_init(legacy_cpu_device *device, device_irq_acknowledge_callbac
cpustate->int_rom_size = romsize;
cpustate->feature_mask = feature_mask;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
/* set up the state table */
{
diff --git a/src/emu/cpu/mcs51/mcs51.c b/src/emu/cpu/mcs51/mcs51.c
index 4f231851d0e..23eabc3708a 100644
--- a/src/emu/cpu/mcs51/mcs51.c
+++ b/src/emu/cpu/mcs51/mcs51.c
@@ -2075,10 +2075,10 @@ static CPU_INIT( mcs51 )
mcs51_state->irq_callback = irqcallback;
mcs51_state->device = device;
- mcs51_state->program = device->space(AS_PROGRAM);
+ mcs51_state->program = &device->space(AS_PROGRAM);
mcs51_state->direct = &mcs51_state->program->direct();
- mcs51_state->data = device->space(AS_DATA);
- mcs51_state->io = device->space(AS_IO);
+ mcs51_state->data = &device->space(AS_DATA);
+ mcs51_state->io = &device->space(AS_IO);
mcs51_state->features = FEATURE_NONE;
mcs51_state->ram_mask = 0x7F; /* 128 bytes of ram */
diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c
index 5e82dde3cff..52de6cdc71f 100644
--- a/src/emu/cpu/minx/minx.c
+++ b/src/emu/cpu/minx/minx.c
@@ -119,7 +119,7 @@ static CPU_INIT( minx )
minx_state *minx = get_safe_token(device);
minx->irq_callback = irqcallback;
minx->device = device;
- minx->program = device->space(AS_PROGRAM);
+ minx->program = &device->space(AS_PROGRAM);
if ( device->static_config() != NULL )
{
}
diff --git a/src/emu/cpu/mips/mips3com.c b/src/emu/cpu/mips/mips3com.c
index 24e5548e7b0..1fe4829efc9 100644
--- a/src/emu/cpu/mips/mips3com.c
+++ b/src/emu/cpu/mips/mips3com.c
@@ -81,7 +81,7 @@ void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, legacy
mips->cpu_clock = device->clock();
mips->irq_callback = irqcallback;
mips->device = device;
- mips->program = device->space(AS_PROGRAM);
+ mips->program = &device->space(AS_PROGRAM);
mips->direct = &mips->program->direct();
mips->icache_size = config->icache;
mips->dcache_size = config->dcache;
diff --git a/src/emu/cpu/mips/r3000.c b/src/emu/cpu/mips/r3000.c
index 5c210db49cb..ead2f6ead04 100644
--- a/src/emu/cpu/mips/r3000.c
+++ b/src/emu/cpu/mips/r3000.c
@@ -311,7 +311,7 @@ static CPU_INIT( r3000 )
r3000->irq_callback = irqcallback;
r3000->device = device;
- r3000->program = device->space(AS_PROGRAM);
+ r3000->program = &device->space(AS_PROGRAM);
r3000->direct = &r3000->program->direct();
}
diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c
index c63e1a11ca5..85e1478912c 100644
--- a/src/emu/cpu/mn10200/mn10200.c
+++ b/src/emu/cpu/mn10200/mn10200.c
@@ -274,8 +274,8 @@ static CPU_INIT(mn10200)
memset(cpustate, 0, sizeof(mn102_info));
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
- cpustate->io = device->space(AS_IO);
+ cpustate->program = &device->space(AS_PROGRAM);
+ cpustate->io = &device->space(AS_IO);
device->save_item(NAME(cpustate->pc));
device->save_item(NAME(cpustate->d));
diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c
index 722ab7b96a3..822478316b9 100644
--- a/src/emu/cpu/nec/nec.c
+++ b/src/emu/cpu/nec/nec.c
@@ -367,9 +367,9 @@ static void nec_init(legacy_cpu_device *device, device_irq_acknowledge_callback
nec_state->irq_callback = irqcallback;
nec_state->device = device;
- nec_state->program = device->space(AS_PROGRAM);
+ nec_state->program = &device->space(AS_PROGRAM);
nec_state->direct = &nec_state->program->direct();
- nec_state->io = device->space(AS_IO);
+ nec_state->io = &device->space(AS_IO);
}
diff --git a/src/emu/cpu/nec/v25.c b/src/emu/cpu/nec/v25.c
index 0323bfd7bfc..6a32dec72c2 100644
--- a/src/emu/cpu/nec/v25.c
+++ b/src/emu/cpu/nec/v25.c
@@ -486,9 +486,9 @@ static void v25_init(legacy_cpu_device *device, device_irq_acknowledge_callback
nec_state->irq_callback = irqcallback;
nec_state->device = device;
- nec_state->program = device->space(AS_PROGRAM);
+ nec_state->program = &device->space(AS_PROGRAM);
nec_state->direct = &nec_state->program->direct();
- nec_state->io = device->space(AS_IO);
+ nec_state->io = &device->space(AS_IO);
}
diff --git a/src/emu/cpu/pdp1/pdp1.c b/src/emu/cpu/pdp1/pdp1.c
index 272a8e8b4d5..0a1f4e6b340 100644
--- a/src/emu/cpu/pdp1/pdp1.c
+++ b/src/emu/cpu/pdp1/pdp1.c
@@ -543,7 +543,7 @@ static CPU_INIT( pdp1 )
/* clean-up */
memset (cpustate, 0, sizeof (*cpustate));
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
/* set up params and callbacks */
for (i=0; i<64; i++)
diff --git a/src/emu/cpu/pdp1/tx0.c b/src/emu/cpu/pdp1/tx0.c
index dadf0cde60f..a4e31b2099b 100644
--- a/src/emu/cpu/pdp1/tx0.c
+++ b/src/emu/cpu/pdp1/tx0.c
@@ -135,7 +135,7 @@ static void tx0_init_common(legacy_cpu_device *device, device_irq_acknowledge_ca
cpustate->ir_mask = is_64kw ? 03 : 037;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
}
static CPU_INIT( tx0_64kw )
diff --git a/src/emu/cpu/pic16c5x/pic16c5x.c b/src/emu/cpu/pic16c5x/pic16c5x.c
index b5a215f575a..48c3022206e 100644
--- a/src/emu/cpu/pic16c5x/pic16c5x.c
+++ b/src/emu/cpu/pic16c5x/pic16c5x.c
@@ -727,10 +727,10 @@ static CPU_INIT( pic16c5x )
pic16c5x_state *cpustate = get_safe_token(device);
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
/* ensure the internal ram pointers are set before get_info is called */
update_internalram_ptr(cpustate);
diff --git a/src/emu/cpu/pic16c62x/pic16c62x.c b/src/emu/cpu/pic16c62x/pic16c62x.c
index 4894e428db3..6d62c6e9e5f 100644
--- a/src/emu/cpu/pic16c62x/pic16c62x.c
+++ b/src/emu/cpu/pic16c62x/pic16c62x.c
@@ -834,10 +834,10 @@ static CPU_INIT( pic16c62x )
pic16c62x_state *cpustate = get_safe_token(device);
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
cpustate->CONFIG = 0x3fff;
diff --git a/src/emu/cpu/powerpc/ppc.c b/src/emu/cpu/powerpc/ppc.c
index 50dae022440..ef9cc57ef19 100644
--- a/src/emu/cpu/powerpc/ppc.c
+++ b/src/emu/cpu/powerpc/ppc.c
@@ -963,7 +963,7 @@ static CPU_INIT( ppc403 )
ppc.irq_callback = irqcallback;
ppc.device = device;
- ppc.program = device->space(AS_PROGRAM);
+ ppc.program = &device->space(AS_PROGRAM);
ppc.pvr = configdata->pvr;
}
@@ -1009,7 +1009,7 @@ static CPU_INIT( ppc405 )
ppc.irq_callback = irqcallback;
ppc.device = device;
- ppc.program = device->space(AS_PROGRAM);
+ ppc.program = &device->space(AS_PROGRAM);
ppc.pvr = configdata->pvr;
}
@@ -1134,7 +1134,7 @@ static CPU_INIT( ppc603 )
ppc.irq_callback = irqcallback;
ppc.device = device;
- ppc.program = device->space(AS_PROGRAM);
+ ppc.program = &device->space(AS_PROGRAM);
ppc.pvr = configdata->pvr;
@@ -1282,7 +1282,7 @@ static CPU_INIT( ppc602 )
ppc.irq_callback = irqcallback;
ppc.device = device;
- ppc.program = device->space(AS_PROGRAM);
+ ppc.program = &device->space(AS_PROGRAM);
ppc.pvr = configdata->pvr;
@@ -1423,7 +1423,7 @@ static CPU_INIT( mpc8240 )
ppc.irq_callback = irqcallback;
ppc.device = device;
- ppc.program = device->space(AS_PROGRAM);
+ ppc.program = &device->space(AS_PROGRAM);
ppc.pvr = configdata->pvr;
@@ -1549,7 +1549,7 @@ static CPU_INIT( ppc601 )
ppc.irq_callback = irqcallback;
ppc.device = device;
- ppc.program = device->space(AS_PROGRAM);
+ ppc.program = &device->space(AS_PROGRAM);
ppc.pvr = configdata->pvr;
@@ -1679,7 +1679,7 @@ static CPU_INIT( ppc604 )
ppc.irq_callback = irqcallback;
ppc.device = device;
- ppc.program = device->space(AS_PROGRAM);
+ ppc.program = &device->space(AS_PROGRAM);
ppc.pvr = configdata->pvr;
diff --git a/src/emu/cpu/powerpc/ppccom.c b/src/emu/cpu/powerpc/ppccom.c
index b3c4345d39f..fc7c60413dd 100644
--- a/src/emu/cpu/powerpc/ppccom.c
+++ b/src/emu/cpu/powerpc/ppccom.c
@@ -317,7 +317,7 @@ void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT32 cap, int tb_d
ppc->cpu_clock = device->clock();
ppc->irq_callback = irqcallback;
ppc->device = device;
- ppc->program = device->space(AS_PROGRAM);
+ ppc->program = &device->space(AS_PROGRAM);
ppc->direct = &ppc->program->direct();
ppc->system_clock = (config != NULL) ? config->bus_frequency : device->clock();
ppc->dcr_read_func = (config != NULL) ? config->dcr_read_func : NULL;
diff --git a/src/emu/cpu/pps4/pps4.c b/src/emu/cpu/pps4/pps4.c
index 7aa44f631fe..f55cb26c735 100644
--- a/src/emu/cpu/pps4/pps4.c
+++ b/src/emu/cpu/pps4/pps4.c
@@ -337,10 +337,10 @@ static CPU_INIT( pps4 )
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
device->save_item(NAME(cpustate->A));
device->save_item(NAME(cpustate->X));
diff --git a/src/emu/cpu/psx/psx.c b/src/emu/cpu/psx/psx.c
index 7684ae6648a..b32712d8e0d 100644
--- a/src/emu/cpu/psx/psx.c
+++ b/src/emu/cpu/psx/psx.c
@@ -1629,7 +1629,7 @@ cxd8606cq_device::cxd8606cq_device(const machine_config &mconfig, const char *ta
void psxcpu_device::device_start()
{
// get our address spaces
- m_program = space(AS_PROGRAM);
+ m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
save_item( NAME(m_op) );
diff --git a/src/emu/cpu/rsp/rsp.c b/src/emu/cpu/rsp/rsp.c
index 98db04b393d..6edd8693c84 100644
--- a/src/emu/cpu/rsp/rsp.c
+++ b/src/emu/cpu/rsp/rsp.c
@@ -281,7 +281,7 @@ static CPU_INIT( rsp )
rsp->irq_callback = irqcallback;
rsp->device = device;
- rsp->program = device->space(AS_PROGRAM);
+ rsp->program = &device->space(AS_PROGRAM);
rsp->direct = &rsp->program->direct();
#if 1
diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c
index 2c59f23a47b..3b7a7208134 100644
--- a/src/emu/cpu/rsp/rspdrc.c
+++ b/src/emu/cpu/rsp/rspdrc.c
@@ -588,7 +588,7 @@ static void rspcom_init(rsp_state *rsp, legacy_cpu_device *device, device_irq_ac
rsp->config = (const rsp_config *)device->static_config();
rsp->irq_callback = irqcallback;
rsp->device = device;
- rsp->program = device->space(AS_PROGRAM);
+ rsp->program = &device->space(AS_PROGRAM);
rsp->direct = &rsp->program->direct();
#if 1
diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c
index 20a99fca9be..0e4d9bec2f5 100644
--- a/src/emu/cpu/s2650/s2650.c
+++ b/src/emu/cpu/s2650/s2650.c
@@ -795,9 +795,9 @@ static CPU_INIT( s2650 )
s2650c->irq_callback = irqcallback;
s2650c->device = device;
- s2650c->program = device->space(AS_PROGRAM);
+ s2650c->program = &device->space(AS_PROGRAM);
s2650c->direct = &s2650c->program->direct();
- s2650c->io = device->space(AS_IO);
+ s2650c->io = &device->space(AS_IO);
device->save_item(NAME(s2650c->ppc));
device->save_item(NAME(s2650c->page));
@@ -828,9 +828,9 @@ static CPU_RESET( s2650 )
memset(s2650c->ras, 0, sizeof(s2650c->ras));
s2650c->device = device;
- s2650c->program = device->space(AS_PROGRAM);
+ s2650c->program = &device->space(AS_PROGRAM);
s2650c->direct = &s2650c->program->direct();
- s2650c->io = device->space(AS_IO);
+ s2650c->io = &device->space(AS_IO);
s2650c->psl = COM | WC;
/* force write */
s2650c->psu = 0xff;
diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c
index ab953b6a6dd..736deb4c8cb 100644
--- a/src/emu/cpu/saturn/saturn.c
+++ b/src/emu/cpu/saturn/saturn.c
@@ -114,7 +114,7 @@ static CPU_INIT( saturn )
cpustate->config = (saturn_cpu_core *) device->static_config();
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
device->save_item(NAME(cpustate->reg[R0]));
diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c
index 377d81a337f..b5fc806e270 100644
--- a/src/emu/cpu/sc61860/sc61860.c
+++ b/src/emu/cpu/sc61860/sc61860.c
@@ -105,7 +105,7 @@ static CPU_INIT( sc61860 )
cpustate->config = (sc61860_cpu_core *) device->static_config();
device->machine().scheduler().timer_pulse(attotime::from_hz(500), FUNC(sc61860_2ms_tick), 0, cpustate);
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
}
diff --git a/src/emu/cpu/scmp/scmp.c b/src/emu/cpu/scmp/scmp.c
index 90d22cdba17..2d7a72e655a 100644
--- a/src/emu/cpu/scmp/scmp.c
+++ b/src/emu/cpu/scmp/scmp.c
@@ -513,7 +513,7 @@ static CPU_INIT( scmp )
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
/* resolve callbacks */
diff --git a/src/emu/cpu/se3208/se3208.c b/src/emu/cpu/se3208/se3208.c
index 039b38f98dc..aa25186196b 100644
--- a/src/emu/cpu/se3208/se3208.c
+++ b/src/emu/cpu/se3208/se3208.c
@@ -1717,7 +1717,7 @@ static CPU_RESET( se3208 )
memset(se3208_state,0,sizeof(se3208_state_t));
se3208_state->irq_callback = save_irqcallback;
se3208_state->device = device;
- se3208_state->program = device->space(AS_PROGRAM);
+ se3208_state->program = &device->space(AS_PROGRAM);
se3208_state->direct = &se3208_state->program->direct();
se3208_state->PC=SE3208_Read32(se3208_state, 0);
se3208_state->SR=0;
@@ -1788,7 +1788,7 @@ static CPU_INIT( se3208 )
se3208_state->irq_callback = irqcallback;
se3208_state->device = device;
- se3208_state->program = device->space(AS_PROGRAM);
+ se3208_state->program = &device->space(AS_PROGRAM);
se3208_state->direct = &se3208_state->program->direct();
}
diff --git a/src/emu/cpu/sh2/sh2comn.c b/src/emu/cpu/sh2/sh2comn.c
index 586c8fd0291..ed95852cbb3 100644
--- a/src/emu/cpu/sh2/sh2comn.c
+++ b/src/emu/cpu/sh2/sh2comn.c
@@ -961,9 +961,9 @@ void sh2_common_init(sh2_state *sh2, legacy_cpu_device *device, device_irq_ackno
}
sh2->irq_callback = irqcallback;
sh2->device = device;
- sh2->program = device->space(AS_PROGRAM);
+ sh2->program = &device->space(AS_PROGRAM);
sh2->direct = &sh2->program->direct();
- sh2->internal = device->space(AS_PROGRAM);
+ sh2->internal = &device->space(AS_PROGRAM);
device->save_item(NAME(sh2->pc));
device->save_item(NAME(sh2->sr));
diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c
index 7b19754994c..f6110aeb807 100644
--- a/src/emu/cpu/sh4/sh4.c
+++ b/src/emu/cpu/sh4/sh4.c
@@ -2868,10 +2868,10 @@ static CPU_RESET( common_sh4_reset )
sh4->ftcsr_read_callback = f;
sh4->irq_callback = save_irqcallback;
sh4->device = device;
- sh4->internal = device->space(AS_PROGRAM);
- sh4->program = device->space(AS_PROGRAM);
+ sh4->internal = &device->space(AS_PROGRAM);
+ sh4->program = &device->space(AS_PROGRAM);
sh4->direct = &sh4->program->direct();
- sh4->io = device->space(AS_IO);
+ sh4->io = &device->space(AS_IO);
sh4->dma_timer[0] = tsaved[0];
sh4->dma_timer[1] = tsaved[1];
@@ -3216,9 +3216,9 @@ static CPU_INIT( sh4 )
sh4->irq_callback = irqcallback;
sh4->device = device;
- sh4->internal = device->space(AS_PROGRAM);
- sh4->program = device->space(AS_PROGRAM);
- sh4->io = device->space(AS_IO);
+ sh4->internal = &device->space(AS_PROGRAM);
+ sh4->program = &device->space(AS_PROGRAM);
+ sh4->io = &device->space(AS_IO);
sh4_default_exception_priorities(sh4);
sh4->irln = 15;
sh4->test_irq = 0;
diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c
index 19522662862..cbe1db9a9c0 100644
--- a/src/emu/cpu/sharc/sharc.c
+++ b/src/emu/cpu/sharc/sharc.c
@@ -425,8 +425,8 @@ static CPU_INIT( sharc )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
- cpustate->data = device->space(AS_DATA);
+ cpustate->program = &device->space(AS_PROGRAM);
+ cpustate->data = &device->space(AS_DATA);
build_opcode_table();
diff --git a/src/emu/cpu/sm8500/sm8500.c b/src/emu/cpu/sm8500/sm8500.c
index aaeed029360..574d7d56d90 100644
--- a/src/emu/cpu/sm8500/sm8500.c
+++ b/src/emu/cpu/sm8500/sm8500.c
@@ -124,7 +124,7 @@ static CPU_INIT( sm8500 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
if ( device->static_config() != NULL ) {
cpustate->config.handle_dma = ((SM8500_CONFIG *)device->static_config())->handle_dma;
cpustate->config.handle_timers = ((SM8500_CONFIG *)device->static_config())->handle_timers;
diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c
index c716d1a8aa1..e1267e57d33 100644
--- a/src/emu/cpu/spc700/spc700.c
+++ b/src/emu/cpu/spc700/spc700.c
@@ -1286,7 +1286,7 @@ static CPU_INIT( spc700 )
INT_ACK = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
}
diff --git a/src/emu/cpu/ssem/ssem.c b/src/emu/cpu/ssem/ssem.c
index 73aacfb6da3..2e6a6aa744a 100644
--- a/src/emu/cpu/ssem/ssem.c
+++ b/src/emu/cpu/ssem/ssem.c
@@ -149,7 +149,7 @@ static CPU_INIT( ssem )
cpustate->halt = 0;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
}
static CPU_EXIT( ssem )
diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/emu/cpu/ssp1601/ssp1601.c
index 59e4cf34a8f..9fdfe14f784 100644
--- a/src/emu/cpu/ssp1601/ssp1601.c
+++ b/src/emu/cpu/ssp1601/ssp1601.c
@@ -528,9 +528,9 @@ static CPU_INIT( ssp1601 )
memset(ssp1601_state, 0, sizeof(ssp1601_state_t));
ssp1601_state->gr[0].w.h = 0xffff; // constant reg
ssp1601_state->device = device;
- ssp1601_state->program = device->space(AS_PROGRAM);
+ ssp1601_state->program = &device->space(AS_PROGRAM);
ssp1601_state->direct = &ssp1601_state->program->direct();
- ssp1601_state->io = device->space(AS_IO);
+ ssp1601_state->io = &device->space(AS_IO);
}
diff --git a/src/emu/cpu/superfx/superfx.c b/src/emu/cpu/superfx/superfx.c
index ef761deddf3..e4bceb0b4f8 100644
--- a/src/emu/cpu/superfx/superfx.c
+++ b/src/emu/cpu/superfx/superfx.c
@@ -751,7 +751,7 @@ static CPU_INIT( superfx )
superfx_update_speed(cpustate);
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
if (device->static_config() != NULL)
{
diff --git a/src/emu/cpu/t11/t11.c b/src/emu/cpu/t11/t11.c
index 78b242dd72c..0b087e97841 100644
--- a/src/emu/cpu/t11/t11.c
+++ b/src/emu/cpu/t11/t11.c
@@ -264,7 +264,7 @@ static CPU_INIT( t11 )
cpustate->initial_pc = initial_pc[setup->mode >> 13];
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
device->save_item(NAME(cpustate->ppc.w.l));
diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c
index 64045b74947..1544e6ba93d 100644
--- a/src/emu/cpu/tlcs90/tlcs90.c
+++ b/src/emu/cpu/tlcs90/tlcs90.c
@@ -2713,8 +2713,8 @@ static CPU_INIT( t90 )
memset(cpustate, 0, sizeof(t90_Regs));
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
- cpustate->io = device->space(AS_IO);
+ cpustate->program = &device->space(AS_PROGRAM);
+ cpustate->io = &device->space(AS_IO);
cpustate->timer_period = attotime::from_hz(device->unscaled_clock()) * 8;
diff --git a/src/emu/cpu/tlcs900/tlcs900.c b/src/emu/cpu/tlcs900/tlcs900.c
index 630cff01cef..b316b75947e 100644
--- a/src/emu/cpu/tlcs900/tlcs900.c
+++ b/src/emu/cpu/tlcs900/tlcs900.c
@@ -222,7 +222,7 @@ static CPU_INIT( tlcs900 )
cpustate->intf = (const tlcs900_interface *)device->static_config();
cpustate->irqcallback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space( AS_PROGRAM );
+ cpustate->program = &device->space( AS_PROGRAM );
cpustate->to1.resolve(cpustate->intf->to1, *device );
cpustate->to3.resolve(cpustate->intf->to3, *device );
diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c
index 7fadebee03b..985456731b0 100644
--- a/src/emu/cpu/tms0980/tms0980.c
+++ b/src/emu/cpu/tms0980/tms0980.c
@@ -503,8 +503,8 @@ static void cpu_init_tms_common( legacy_cpu_device *device, const UINT32* decode
cpustate->pc_size = pc_size;
cpustate->byte_size = byte_size;
- cpustate->program = device->space( AS_PROGRAM );
- cpustate->data = device->space( AS_PROGRAM );
+ cpustate->program = &device->space( AS_PROGRAM );
+ cpustate->data = &device->space( AS_PROGRAM );
device->save_item( NAME(cpustate->prev_pc) );
device->save_item( NAME(cpustate->prev_pa) );
diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/emu/cpu/tms32010/tms32010.c
index 7ce87d70a2e..b74e876cc8c 100644
--- a/src/emu/cpu/tms32010/tms32010.c
+++ b/src/emu/cpu/tms32010/tms32010.c
@@ -826,10 +826,10 @@ static CPU_INIT( tms32010 )
device->save_item(NAME(cpustate->addr_mask));
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
}
diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/emu/cpu/tms32025/tms32025.c
index 53976a27757..7d38abb827a 100644
--- a/src/emu/cpu/tms32025/tms32025.c
+++ b/src/emu/cpu/tms32025/tms32025.c
@@ -1676,10 +1676,10 @@ static CPU_INIT( tms32025 )
cpustate->intRAM = auto_alloc_array(device->machine(), UINT16, 0x800);
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
device->save_item(NAME(cpustate->PC));
device->save_item(NAME(cpustate->STR0));
diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c
index dcb6f0c8d5a..f81fc2c3bdf 100644
--- a/src/emu/cpu/tms32031/tms32031.c
+++ b/src/emu/cpu/tms32031/tms32031.c
@@ -368,7 +368,7 @@ inline void tms3203x_device::WMEM(offs_t addr, UINT32 data)
void tms3203x_device::device_start()
{
// find address spaces
- m_program = space(AS_PROGRAM);
+ m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
// save state
diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c
index d22f28beafb..9ae5294329e 100644
--- a/src/emu/cpu/tms32051/tms32051.c
+++ b/src/emu/cpu/tms32051/tms32051.c
@@ -223,9 +223,9 @@ static CPU_INIT( tms )
tms32051_state *cpustate = get_safe_token(device);
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
+ cpustate->data = &device->space(AS_DATA);
cpustate->pcstack_ptr = 0;
}
diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c
index 2f884388bbd..a265c1a39ef 100644
--- a/src/emu/cpu/tms34010/tms34010.c
+++ b/src/emu/cpu/tms34010/tms34010.c
@@ -626,7 +626,7 @@ static CPU_INIT( tms34010 )
tms->config = configdata;
tms->irq_callback = irqcallback;
tms->device = device;
- tms->program = device->space(AS_PROGRAM);
+ tms->program = &device->space(AS_PROGRAM);
tms->direct = &tms->program->direct();
tms->screen = downcast<screen_device *>(device->machine().device(configdata->screen_tag));
@@ -688,7 +688,7 @@ static CPU_RESET( tms34010 )
tms->irq_callback = save_irqcallback;
tms->scantimer = save_scantimer;
tms->device = device;
- tms->program = device->space(AS_PROGRAM);
+ tms->program = &device->space(AS_PROGRAM);
tms->direct = &tms->program->direct();
/* fetch the initial PC and reset the state */
@@ -699,7 +699,7 @@ static CPU_RESET( tms34010 )
/* the first time we are run */
tms->reset_deferred = tms->config->halt_on_reset;
if (tms->config->halt_on_reset)
- tms34010_io_register_w(*device->space(AS_PROGRAM), REG_HSTCTLH, 0x8000, 0xffff);
+ tms34010_io_register_w(device->space(AS_PROGRAM), REG_HSTCTLH, 0x8000, 0xffff);
}
@@ -1630,7 +1630,7 @@ void tms34010_host_w(device_t *cpu, int reg, int data)
case TMS34010_HOST_CONTROL:
{
tms->external_host_access = TRUE;
- address_space &space = *tms->device->space(AS_PROGRAM);
+ address_space &space = tms->device->space(AS_PROGRAM);
tms34010_io_register_w(space, REG_HSTCTLH, data & 0xff00, 0xffff);
tms34010_io_register_w(space, REG_HSTCTLL, data & 0x00ff, 0xffff);
tms->external_host_access = FALSE;
diff --git a/src/emu/cpu/tms57002/tms57002.c b/src/emu/cpu/tms57002/tms57002.c
index 615169acab5..83051044b5c 100644
--- a/src/emu/cpu/tms57002/tms57002.c
+++ b/src/emu/cpu/tms57002/tms57002.c
@@ -787,8 +787,8 @@ void tms57002_device::execute_run()
void tms57002_device::device_start()
{
sti = S_IDLE;
- program = space(AS_PROGRAM);
- data = space(AS_DATA);
+ program = &space(AS_PROGRAM);
+ data = &space(AS_DATA);
state_add(STATE_GENPC,"GENPC", pc).noshow();
diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c
index 2ab1e66531a..867ccb4dbfa 100644
--- a/src/emu/cpu/tms7000/tms7000.c
+++ b/src/emu/cpu/tms7000/tms7000.c
@@ -165,9 +165,9 @@ static CPU_INIT( tms7000 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
memset(cpustate->pf, 0, 0x100);
memset(cpustate->rf, 0, 0x80);
diff --git a/src/emu/cpu/tms9900/99xxcore.h b/src/emu/cpu/tms9900/99xxcore.h
index 5d9bf06e7b5..46f0fce2eab 100644
--- a/src/emu/cpu/tms9900/99xxcore.h
+++ b/src/emu/cpu/tms9900/99xxcore.h
@@ -1294,8 +1294,8 @@ static CPU_INIT( tms99xx )
cpustate->irq_level = 16;
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
- cpustate->io = device->space(AS_IO);
+ cpustate->program = &device->space(AS_PROGRAM);
+ cpustate->io = &device->space(AS_IO);
#if (TMS99XX_MODEL == TMS9995_ID)
cpustate->timer = device->machine().scheduler().timer_alloc(FUNC(decrementer_callback), cpustate);
diff --git a/src/emu/cpu/tms9900/tms9900.c b/src/emu/cpu/tms9900/tms9900.c
index 69c7aeb6984..dd63344e277 100644
--- a/src/emu/cpu/tms9900/tms9900.c
+++ b/src/emu/cpu/tms9900/tms9900.c
@@ -167,8 +167,8 @@ void tms99xx_device::device_start()
// TODO: Restore state save feature
- m_prgspace = space(AS_PROGRAM); // dimemory.h
- m_cru = space(AS_IO);
+ m_prgspace = &space(AS_PROGRAM); // dimemory.h
+ m_cru = &space(AS_IO);
// Resolve our external connections
m_external_operation.resolve(conf->external_callback, *this);
diff --git a/src/emu/cpu/tms9900/tms9995.c b/src/emu/cpu/tms9900/tms9995.c
index 12ea815c502..12b3eee9cf1 100644
--- a/src/emu/cpu/tms9900/tms9995.c
+++ b/src/emu/cpu/tms9900/tms9995.c
@@ -148,8 +148,8 @@ void tms9995_device::device_start()
// TODO: Restore save state suport
- m_prgspace = space(AS_PROGRAM); // dimemory.h
- m_cru = space(AS_IO);
+ m_prgspace = &space(AS_PROGRAM); // dimemory.h
+ m_cru = &space(AS_IO);
// Resolve our external connections
m_external_operation.resolve(conf->external_callback, *this);
diff --git a/src/emu/cpu/unsp/unsp.c b/src/emu/cpu/unsp/unsp.c
index ff251174238..9fa918e6ca2 100644
--- a/src/emu/cpu/unsp/unsp.c
+++ b/src/emu/cpu/unsp/unsp.c
@@ -114,7 +114,7 @@ static CPU_INIT( unsp )
memset(unsp->r, 0, sizeof(UINT16) * UNSP_GPR_COUNT);
unsp->device = device;
- unsp->program = device->space(AS_PROGRAM);
+ unsp->program = &device->space(AS_PROGRAM);
}
static CPU_RESET( unsp )
diff --git a/src/emu/cpu/upd7725/upd7725.c b/src/emu/cpu/upd7725/upd7725.c
index 090b242197d..7918c454f58 100755
--- a/src/emu/cpu/upd7725/upd7725.c
+++ b/src/emu/cpu/upd7725/upd7725.c
@@ -80,8 +80,8 @@ void necdsp_device::device_config_complete()
void necdsp_device::device_start()
{
// get our address spaces
- m_program = space(AS_PROGRAM);
- m_data = space(AS_DATA);
+ m_program = &space(AS_PROGRAM);
+ m_data = &space(AS_DATA);
m_direct = &m_program->direct();
// register our state for the debugger
diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c
index 7957ead8f33..cc563879bc6 100644
--- a/src/emu/cpu/upd7810/upd7810.c
+++ b/src/emu/cpu/upd7810/upd7810.c
@@ -1702,9 +1702,9 @@ static CPU_INIT( upd7810 )
cpustate->config = *(const UPD7810_CONFIG*) device->static_config();
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
device->save_item(NAME(cpustate->ppc.w.l));
device->save_item(NAME(cpustate->pc.w.l));
@@ -1787,9 +1787,9 @@ static CPU_RESET( upd7810 )
cpustate->config = save_config;
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->opXX = opXX_7810;
cpustate->op48 = op48;
diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c
index 793ba36034c..085a718ce99 100644
--- a/src/emu/cpu/v30mz/v30mz.c
+++ b/src/emu/cpu/v30mz/v30mz.c
@@ -130,9 +130,9 @@ v30mz_cpu_device::v30mz_cpu_device(const machine_config &mconfig, const char *ta
void v30mz_cpu_device::device_start()
{
m_irq_callback = static_standard_irq_callback;
- m_program = space(AS_PROGRAM);
+ m_program = &space(AS_PROGRAM);
m_direct = &m_program->direct();
- m_io = space(AS_IO);
+ m_io = &space(AS_IO);
save_item(NAME(m_regs.w));
save_item(NAME(m_sregs));
diff --git a/src/emu/cpu/v60/v60.c b/src/emu/cpu/v60/v60.c
index c712b013dba..9d3eeae0379 100644
--- a/src/emu/cpu/v60/v60.c
+++ b/src/emu/cpu/v60/v60.c
@@ -353,9 +353,9 @@ static CPU_INIT( v60 )
cpustate->fetch_xor = BYTE_XOR_LE(0);
cpustate->start_pc = 0xfffff0;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
}
static CPU_INIT( v70 )
@@ -369,9 +369,9 @@ static CPU_INIT( v70 )
cpustate->fetch_xor = BYTE4_XOR_LE(0);
cpustate->start_pc = 0xfffffff0;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
}
static CPU_RESET( v60 )
diff --git a/src/emu/cpu/v810/v810.c b/src/emu/cpu/v810/v810.c
index 2d319d96798..04a182176cc 100644
--- a/src/emu/cpu/v810/v810.c
+++ b/src/emu/cpu/v810/v810.c
@@ -1254,9 +1254,9 @@ static CPU_INIT( v810 )
cpustate->nmi_line = CLEAR_LINE;
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
device->save_item(NAME(cpustate->reg));
device->save_item(NAME(cpustate->irq_line));
diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c
index 17c9475f33c..dc313efacc6 100644
--- a/src/emu/cpu/z180/z180.c
+++ b/src/emu/cpu/z180/z180.c
@@ -2212,9 +2212,9 @@ static CPU_RESET( z180 )
cpustate->irq_state[2] = CLEAR_LINE;
cpustate->after_EI = 0;
cpustate->ea = 0;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->iospace = device->space(AS_IO);
+ cpustate->iospace = &device->space(AS_IO);
cpustate->device = device;
memcpy(cpustate->cc, (UINT8 *)cc_default, sizeof(cpustate->cc));
diff --git a/src/emu/cpu/z8/z8.c b/src/emu/cpu/z8/z8.c
index a0771fe8477..f3a897c66cb 100644
--- a/src/emu/cpu/z8/z8.c
+++ b/src/emu/cpu/z8/z8.c
@@ -661,10 +661,10 @@ static CPU_INIT( z8 )
cpustate->clock = device->clock();
/* find address spaces */
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->data = device->space(AS_DATA);
- cpustate->io = device->space(AS_IO);
+ cpustate->data = &device->space(AS_DATA);
+ cpustate->io = &device->space(AS_IO);
/* allocate timers */
cpustate->t0_timer = device->machine().scheduler().timer_alloc(FUNC(t0_tick), cpustate);
diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c
index 2f7033e98a8..43edf4f52f9 100644
--- a/src/emu/cpu/z80/z80.c
+++ b/src/emu/cpu/z80/z80.c
@@ -3477,9 +3477,9 @@ static CPU_INIT( z80 )
z80->daisy.init(device, (const z80_daisy_config *)device->static_config());
z80->irq_callback = irqcallback;
z80->device = device;
- z80->program = device->space(AS_PROGRAM);
+ z80->program = &device->space(AS_PROGRAM);
z80->direct = &z80->program->direct();
- z80->io = device->space(AS_IO);
+ z80->io = &device->space(AS_IO);
z80->IX = z80->IY = 0xffff; /* IX and IY are FFFF after a reset! */
z80->F = ZF; /* Zero flag is set */
diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c
index 47a79ca2d57..d554b679925 100644
--- a/src/emu/cpu/z8000/z8000.c
+++ b/src/emu/cpu/z8000/z8000.c
@@ -478,9 +478,9 @@ static CPU_INIT( z8001 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
/* already initialized? */
if(z8000_exec == NULL)
@@ -493,9 +493,9 @@ static CPU_INIT( z8002 )
cpustate->irq_callback = irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
/* already initialized? */
if(z8000_exec == NULL)
@@ -510,9 +510,9 @@ static CPU_RESET( z8001 )
memset(cpustate, 0, sizeof(*cpustate));
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->fcw = RDMEM_W(cpustate, 2); /* get reset cpustate->fcw */
if(cpustate->fcw & F_SEG)
{
@@ -532,9 +532,9 @@ static CPU_RESET( z8002 )
memset(cpustate, 0, sizeof(*cpustate));
cpustate->irq_callback = save_irqcallback;
cpustate->device = device;
- cpustate->program = device->space(AS_PROGRAM);
+ cpustate->program = &device->space(AS_PROGRAM);
cpustate->direct = &cpustate->program->direct();
- cpustate->io = device->space(AS_IO);
+ cpustate->io = &device->space(AS_IO);
cpustate->fcw = RDMEM_W(cpustate, 2); /* get reset cpustate->fcw */
cpustate->pc = RDMEM_W(cpustate, 4); /* get reset cpustate->pc */
}
diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c
index f06fb261457..3df869a3a69 100644
--- a/src/emu/debug/debugcmd.c
+++ b/src/emu/debug/debugcmd.c
@@ -566,12 +566,12 @@ int debug_command_parameter_cpu_space(running_machine &machine, const char *para
return FALSE;
/* fetch the space pointer */
- result = cpu->memory().space(spacenum);
- if (result == NULL)
+ if (!cpu->memory().has_space(spacenum))
{
debug_console_printf(machine, "No matching memory space found for CPU '%s'\n", cpu->tag());
return FALSE;
}
+ result = &cpu->memory().space(spacenum);
return TRUE;
}
diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index d24ad7282ca..e129a51de53 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -1155,7 +1155,6 @@ static UINT64 expression_read_memory(void *param, const char *name, expression_s
running_machine &machine = *(running_machine *)param;
UINT64 result = ~(UINT64)0 >> (64 - 8*size);
device_t *device = NULL;
- address_space *space;
switch (spacenum)
{
@@ -1167,9 +1166,11 @@ static UINT64 expression_read_memory(void *param, const char *name, expression_s
device = expression_get_device(machine, name);
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- space = device->memory().space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL));
- if (space != NULL)
- result = debug_read_memory(*space, space->address_to_byte(address), size, true);
+ if (device->memory().has_space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL)))
+ {
+ address_space &space = device->memory().space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL));
+ result = debug_read_memory(space, space.address_to_byte(address), size, true);
+ }
break;
case EXPSPACE_PROGRAM_PHYSICAL:
@@ -1180,9 +1181,11 @@ static UINT64 expression_read_memory(void *param, const char *name, expression_s
device = expression_get_device(machine, name);
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- space = device->memory().space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_PHYSICAL));
- if (space != NULL)
- result = debug_read_memory(*space, space->address_to_byte(address), size, false);
+ if (device->memory().has_space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL)))
+ {
+ address_space &space = device->memory().space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL));
+ result = debug_read_memory(space, space.address_to_byte(address), size, false);
+ }
break;
case EXPSPACE_OPCODE:
@@ -1191,7 +1194,7 @@ static UINT64 expression_read_memory(void *param, const char *name, expression_s
device = expression_get_device(machine, name);
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- result = expression_read_program_direct(*device->memory().space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size);
+ result = expression_read_program_direct(device->memory().space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size);
break;
case EXPSPACE_REGION:
@@ -1321,7 +1324,6 @@ static void expression_write_memory(void *param, const char *name, expression_sp
{
running_machine &machine = *(running_machine *)param;
device_t *device = NULL;
- address_space *space;
switch (spacenum)
{
@@ -1333,9 +1335,11 @@ static void expression_write_memory(void *param, const char *name, expression_sp
device = expression_get_device(machine, name);
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- space = device->memory().space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL));
- if (space != NULL)
- debug_write_memory(*space, space->address_to_byte(address), data, size, true);
+ if (device->memory().has_space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL)))
+ {
+ address_space &space = device->memory().space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL));
+ debug_write_memory(space, space.address_to_byte(address), data, size, true);
+ }
break;
case EXPSPACE_PROGRAM_PHYSICAL:
@@ -1346,9 +1350,11 @@ static void expression_write_memory(void *param, const char *name, expression_sp
device = expression_get_device(machine, name);
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- space = device->memory().space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_PHYSICAL));
- if (space != NULL)
- debug_write_memory(*space, space->address_to_byte(address), data, size, false);
+ if (device->memory().has_space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL)))
+ {
+ address_space &space = device->memory().space(AS_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL));
+ debug_write_memory(space, space.address_to_byte(address), data, size, false);
+ }
break;
case EXPSPACE_OPCODE:
@@ -1357,7 +1363,7 @@ static void expression_write_memory(void *param, const char *name, expression_sp
device = expression_get_device(machine, name);
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- expression_write_program_direct(*device->memory().space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size, data);
+ expression_write_program_direct(device->memory().space(AS_PROGRAM), (spacenum == EXPSPACE_OPCODE), address, size, data);
break;
case EXPSPACE_REGION:
@@ -1515,7 +1521,7 @@ static expression_error::error_code expression_validate(void *param, const char
}
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- if (device->memory().space(AS_PROGRAM + (space - EXPSPACE_PROGRAM_LOGICAL)) == NULL)
+ if (!device->memory().has_space(AS_PROGRAM + (space - EXPSPACE_PROGRAM_LOGICAL)))
return expression_error::NO_SUCH_MEMORY_SPACE;
break;
@@ -1531,7 +1537,7 @@ static expression_error::error_code expression_validate(void *param, const char
}
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- if (device->memory().space(AS_PROGRAM + (space - EXPSPACE_PROGRAM_PHYSICAL)) == NULL)
+ if (!device->memory().has_space(AS_PROGRAM + (space - EXPSPACE_PROGRAM_PHYSICAL)))
return expression_error::NO_SUCH_MEMORY_SPACE;
break;
@@ -1545,7 +1551,7 @@ static expression_error::error_code expression_validate(void *param, const char
}
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- if (device->memory().space(AS_PROGRAM) == NULL)
+ if (!device->memory().has_space(AS_PROGRAM))
return expression_error::NO_SUCH_MEMORY_SPACE;
break;
@@ -1674,12 +1680,12 @@ device_debug::device_debug(device_t &device)
// add entries to enable/disable unmap reporting for each space
if (m_memory != NULL)
{
- if (m_memory->space(AS_PROGRAM) != NULL)
- m_symtable.add("logunmap", (void *)m_memory->space(AS_PROGRAM), get_logunmap, set_logunmap);
- if (m_memory->space(AS_DATA) != NULL)
- m_symtable.add("logunmapd", (void *)m_memory->space(AS_DATA), get_logunmap, set_logunmap);
- if (m_memory->space(AS_IO) != NULL)
- m_symtable.add("logunmapi", (void *)m_memory->space(AS_IO), get_logunmap, set_logunmap);
+ if (m_memory->has_space(AS_PROGRAM))
+ m_symtable.add("logunmap", (void *)&m_memory->space(AS_PROGRAM), get_logunmap, set_logunmap);
+ if (m_memory->has_space(AS_DATA))
+ m_symtable.add("logunmapd", (void *)&m_memory->space(AS_DATA), get_logunmap, set_logunmap);
+ if (m_memory->has_space(AS_IO))
+ m_symtable.add("logunmapi", (void *)&m_memory->space(AS_IO), get_logunmap, set_logunmap);
}
// add all registers into it
@@ -2039,7 +2045,7 @@ offs_t device_debug::disassemble(char *buffer, offs_t pc, const UINT8 *oprom, co
#ifdef MAME_DEBUG
if (m_memory != NULL && m_disasm != NULL)
{
- address_space &space = *m_memory->space(AS_PROGRAM);
+ address_space &space = m_memory->space(AS_PROGRAM);
int bytes = space.address_to_byte(result & DASMFLAG_LENGTHMASK);
assert(bytes >= m_disasm->min_opcode_bytes());
assert(bytes <= m_disasm->max_opcode_bytes());
@@ -2467,8 +2473,8 @@ void device_debug::hotspot_track(int numspots, int threshhold)
}
// update the watchpoint flags to include us
- if (m_memory != NULL && m_memory->space(AS_PROGRAM) != NULL)
- watchpoint_update_flags(*m_memory->space(AS_PROGRAM));
+ if (m_memory != NULL && m_memory->has_space(AS_PROGRAM))
+ watchpoint_update_flags(m_memory->space(AS_PROGRAM));
}
@@ -2666,7 +2672,7 @@ UINT32 device_debug::compute_opcode_crc32(offs_t address) const
return 0;
// no program interface, just fail
- address_space &space = *m_memory->space(AS_PROGRAM);
+ address_space &space = m_memory->space(AS_PROGRAM);
// zero out the buffers
UINT8 opbuf[64], argbuf[64];
@@ -3016,7 +3022,7 @@ UINT32 device_debug::dasm_wrapped(astring &buffer, offs_t pc)
assert(m_memory != NULL && m_disasm != NULL);
// determine the adjusted PC
- address_space &space = *m_memory->space(AS_PROGRAM);
+ address_space &space = m_memory->space(AS_PROGRAM);
offs_t pcbyte = space.address_to_byte(pc) & space.bytemask();
// fetch the bytes up to the maximum
diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h
index 86d0106d7ad..1805b8101d4 100644
--- a/src/emu/debug/debugcpu.h
+++ b/src/emu/debug/debugcpu.h
@@ -146,7 +146,7 @@ public:
// commonly-used pass-throughs
offs_t pc() const { return (m_state != NULL) ? m_state->pc() : 0; }
- int logaddrchars(address_spacenum spacenum = AS_0) const { return (m_memory != NULL && m_memory->space(spacenum) != NULL) ? m_memory->space(spacenum)->logaddrchars() : 8; }
+ int logaddrchars(address_spacenum spacenum = AS_0) const { return (m_memory != NULL && m_memory->has_space(spacenum)) ? m_memory->space(spacenum).logaddrchars() : 8; }
int min_opcode_bytes() const { return (m_disasm != NULL) ? m_disasm->max_opcode_bytes() : 1; }
int max_opcode_bytes() const { return (m_disasm != NULL) ? m_disasm->max_opcode_bytes() : 1; }
diff --git a/src/emu/debug/dvdisasm.c b/src/emu/debug/dvdisasm.c
index 96820a82eb9..735a85d98be 100644
--- a/src/emu/debug/dvdisasm.c
+++ b/src/emu/debug/dvdisasm.c
@@ -56,7 +56,7 @@ debug_view_disasm_source::debug_view_disasm_source(const char *name, device_t &d
: debug_view_source(name, &device),
m_device(device),
m_disasmintf(dynamic_cast<device_disasm_interface *>(&device)),
- m_space(dynamic_cast<device_memory_interface *>(&device)->space(AS_PROGRAM))
+ m_space(device.memory().space(AS_PROGRAM))
{
}
@@ -202,7 +202,7 @@ void debug_view_disasm::view_char(int chval)
case DCH_HOME: // set the active column to the PC
{
const debug_view_disasm_source &source = downcast<const debug_view_disasm_source &>(*m_source);
- offs_t pc = source.m_space->address_to_byte(source.m_device.safe_pc()) & source.m_space->logbytemask();
+ offs_t pc = source.m_space.address_to_byte(source.m_device.safe_pc()) & source.m_space.logbytemask();
// figure out which row the pc is on
for (int curline = 0; curline < m_allocated.y; curline++)
@@ -241,9 +241,9 @@ offs_t debug_view_disasm::find_pc_backwards(offs_t targetpc, int numinstrs)
const debug_view_disasm_source &source = downcast<const debug_view_disasm_source &>(*m_source);
// compute the increment
- int minlen = source.m_space->byte_to_address(source.m_disasmintf->min_opcode_bytes());
+ int minlen = source.m_space.byte_to_address(source.m_disasmintf->min_opcode_bytes());
if (minlen == 0) minlen = 1;
- int maxlen = source.m_space->byte_to_address(source.m_disasmintf->max_opcode_bytes());
+ int maxlen = source.m_space.byte_to_address(source.m_disasmintf->max_opcode_bytes());
if (maxlen == 0) maxlen = 1;
// start off numinstrs back
@@ -252,19 +252,19 @@ offs_t debug_view_disasm::find_pc_backwards(offs_t targetpc, int numinstrs)
curpc = 0;
/* loop until we find what we are looking for */
- offs_t targetpcbyte = source.m_space->address_to_byte(targetpc) & source.m_space->logbytemask();
+ offs_t targetpcbyte = source.m_space.address_to_byte(targetpc) & source.m_space.logbytemask();
offs_t fillpcbyte = targetpcbyte;
offs_t lastgoodpc = targetpc;
while (1)
{
// fill the buffer up to the target
- offs_t curpcbyte = source.m_space->address_to_byte(curpc) & source.m_space->logbytemask();
+ offs_t curpcbyte = source.m_space.address_to_byte(curpc) & source.m_space.logbytemask();
UINT8 opbuf[1024], argbuf[1024];
while (curpcbyte < fillpcbyte)
{
fillpcbyte--;
- opbuf[1000 + fillpcbyte - targetpcbyte] = debug_read_opcode(*source.m_space, fillpcbyte, 1, FALSE);
- argbuf[1000 + fillpcbyte - targetpcbyte] = debug_read_opcode(*source.m_space, fillpcbyte, 1, TRUE);
+ opbuf[1000 + fillpcbyte - targetpcbyte] = debug_read_opcode(source.m_space, fillpcbyte, 1, FALSE);
+ argbuf[1000 + fillpcbyte - targetpcbyte] = debug_read_opcode(source.m_space, fillpcbyte, 1, TRUE);
}
// loop until we get past the target instruction
@@ -273,12 +273,12 @@ offs_t debug_view_disasm::find_pc_backwards(offs_t targetpc, int numinstrs)
offs_t scanpc;
for (scanpc = curpc; scanpc < targetpc; scanpc += instlen)
{
- offs_t scanpcbyte = source.m_space->address_to_byte(scanpc) & source.m_space->logbytemask();
+ offs_t scanpcbyte = source.m_space.address_to_byte(scanpc) & source.m_space.logbytemask();
offs_t physpcbyte = scanpcbyte;
// get the disassembly, but only if mapped
instlen = 1;
- if (debug_cpu_translate(*source.m_space, TRANSLATE_FETCH, &physpcbyte))
+ if (debug_cpu_translate(source.m_space, TRANSLATE_FETCH, &physpcbyte))
{
char dasmbuffer[100];
instlen = source.m_device.debug()->disassemble(dasmbuffer, scanpc, &opbuf[1000 + scanpcbyte - targetpcbyte], &argbuf[1000 + scanpcbyte - targetpcbyte]) & DASMFLAG_LENGTHMASK;
@@ -322,12 +322,12 @@ void debug_view_disasm::generate_bytes(offs_t pcbyte, int numbytes, int minbytes
// output the first value
int offset = 0;
if (maxchars >= char_num * minbytes)
- offset = sprintf(string, "%s", core_i64_format(debug_read_opcode(*source.m_space, pcbyte, minbytes, FALSE), minbytes * char_num, source.is_octal()));
+ offset = sprintf(string, "%s", core_i64_format(debug_read_opcode(source.m_space, pcbyte, minbytes, FALSE), minbytes * char_num, source.is_octal()));
// output subsequent values
int byte;
for (byte = minbytes; byte < numbytes && offset + 1 + char_num * minbytes < maxchars; byte += minbytes)
- offset += sprintf(&string[offset], " %s", core_i64_format(debug_read_opcode(*source.m_space, pcbyte + byte, minbytes, encrypted), minbytes * char_num, source.is_octal()));
+ offset += sprintf(&string[offset], " %s", core_i64_format(debug_read_opcode(source.m_space, pcbyte + byte, minbytes, encrypted), minbytes * char_num, source.is_octal()));
// if we ran out of room, indicate more
string[maxchars - 1] = 0;
@@ -348,7 +348,7 @@ bool debug_view_disasm::recompute(offs_t pc, int startline, int lines)
int char_num = source.is_octal() ? 3 : 2;
// determine how many characters we need for an address and set the divider
- m_divider1 = 1 + (source.m_space->logaddrchars()/2*char_num) + 1;
+ m_divider1 = 1 + (source.m_space.logaddrchars()/2*char_num) + 1;
// assume a fixed number of characters for the disassembly
m_divider2 = m_divider1 + 1 + m_dasm_width + 1;
@@ -358,7 +358,7 @@ bool debug_view_disasm::recompute(offs_t pc, int startline, int lines)
int maxbytes = source.m_disasmintf->max_opcode_bytes();
// ensure that the PC is aligned to the minimum opcode size
- pc &= ~source.m_space->byte_to_address_end(minbytes - 1);
+ pc &= ~source.m_space.byte_to_address_end(minbytes - 1);
// set the width of the third column according to display mode
if (m_right_column == DASM_RIGHTCOL_RAW || m_right_column == DASM_RIGHTCOL_ENCRYPTED)
@@ -390,7 +390,7 @@ bool debug_view_disasm::recompute(offs_t pc, int startline, int lines)
for (int line = 0; line < lines; line++)
{
// convert PC to a byte offset
- offs_t pcbyte = source.m_space->address_to_byte(pc) & source.m_space->logbytemask();
+ offs_t pcbyte = source.m_space.address_to_byte(pc) & source.m_space.logbytemask();
// save a copy of the previous line as a backup if we're only doing one line
int instr = startline + line;
@@ -401,25 +401,25 @@ bool debug_view_disasm::recompute(offs_t pc, int startline, int lines)
// convert back and set the address of this instruction
m_byteaddress[instr] = pcbyte;
- sprintf(&destbuf[0], " %s ", core_i64_format(source.m_space->byte_to_address(pcbyte), source.m_space->logaddrchars()/2*char_num, source.is_octal()));
+ sprintf(&destbuf[0], " %s ", core_i64_format(source.m_space.byte_to_address(pcbyte), source.m_space.logaddrchars()/2*char_num, source.is_octal()));
// make sure we can translate the address, and then disassemble the result
char buffer[100];
int numbytes = 0;
offs_t physpcbyte = pcbyte;
- if (debug_cpu_translate(*source.m_space, TRANSLATE_FETCH_DEBUG, &physpcbyte))
+ if (debug_cpu_translate(source.m_space, TRANSLATE_FETCH_DEBUG, &physpcbyte))
{
UINT8 opbuf[64], argbuf[64];
// fetch the bytes up to the maximum
for (numbytes = 0; numbytes < maxbytes; numbytes++)
{
- opbuf[numbytes] = debug_read_opcode(*source.m_space, pcbyte + numbytes, 1, FALSE);
- argbuf[numbytes] = debug_read_opcode(*source.m_space, pcbyte + numbytes, 1, TRUE);
+ opbuf[numbytes] = debug_read_opcode(source.m_space, pcbyte + numbytes, 1, FALSE);
+ argbuf[numbytes] = debug_read_opcode(source.m_space, pcbyte + numbytes, 1, TRUE);
}
// disassemble the result
- pc += numbytes = source.m_device.debug()->disassemble(buffer, pc & source.m_space->logaddrmask(), opbuf, argbuf) & DASMFLAG_LENGTHMASK;
+ pc += numbytes = source.m_device.debug()->disassemble(buffer, pc & source.m_space.logaddrmask(), opbuf, argbuf) & DASMFLAG_LENGTHMASK;
}
else
strcpy(buffer, "<unmapped>");
@@ -431,13 +431,13 @@ bool debug_view_disasm::recompute(offs_t pc, int startline, int lines)
if (m_right_column == DASM_RIGHTCOL_RAW || m_right_column == DASM_RIGHTCOL_ENCRYPTED)
{
// get the bytes
- numbytes = source.m_space->address_to_byte(numbytes) & source.m_space->logbytemask();
+ numbytes = source.m_space.address_to_byte(numbytes) & source.m_space.logbytemask();
generate_bytes(pcbyte, numbytes, minbytes, &destbuf[m_divider2], m_allocated.x - m_divider2, m_right_column == DASM_RIGHTCOL_ENCRYPTED);
}
else if (m_right_column == DASM_RIGHTCOL_COMMENTS)
{
// get and add the comment, if present
- offs_t comment_address = source.m_space->byte_to_address(m_byteaddress[instr]);
+ offs_t comment_address = source.m_space.byte_to_address(m_byteaddress[instr]);
const char *text = source.m_device.debug()->comment_text(comment_address);
if (text != NULL)
sprintf(&destbuf[m_divider2], "// %.*s", m_allocated.x - m_divider2 - 1, text);
@@ -449,8 +449,8 @@ bool debug_view_disasm::recompute(offs_t pc, int startline, int lines)
}
// update opcode base information
- m_last_direct_decrypted = source.m_space->direct().decrypted();
- m_last_direct_raw = source.m_space->direct().raw();
+ m_last_direct_decrypted = source.m_space.direct().decrypted();
+ m_last_direct_raw = source.m_space.direct().raw();
m_last_change_count = source.m_device.debug()->comment_change_count();
// now longer need to recompute
@@ -469,7 +469,7 @@ void debug_view_disasm::view_update()
const debug_view_disasm_source &source = downcast<const debug_view_disasm_source &>(*m_source);
offs_t pc = source.m_device.safe_pc();
- offs_t pcbyte = source.m_space->address_to_byte(pc) & source.m_space->logbytemask();
+ offs_t pcbyte = source.m_space.address_to_byte(pc) & source.m_space.logbytemask();
// update our context; if the expression is dirty, recompute
if (m_expression.dirty())
@@ -480,7 +480,7 @@ void debug_view_disasm::view_update()
UINT64 result = m_expression.value();
if (result != previous)
{
- offs_t resultbyte = source.m_space->address_to_byte(result) & source.m_space->logbytemask();
+ offs_t resultbyte = source.m_space.address_to_byte(result) & source.m_space.logbytemask();
// see if the new result is an address we already have
UINT32 row;
@@ -498,7 +498,7 @@ void debug_view_disasm::view_update()
}
// if the opcode base has changed, rework things
- if (source.m_space->direct().decrypted() != m_last_direct_decrypted || source.m_space->direct().raw() != m_last_direct_raw)
+ if (source.m_space.direct().decrypted() != m_last_direct_decrypted || source.m_space.direct().raw() != m_last_direct_raw)
m_recompute = true;
// if the comments have changed, redo it
@@ -517,7 +517,7 @@ recompute:
m_topleft.x = 0;
// recompute from where we last recomputed!
- recompute(source.m_space->byte_to_address(m_byteaddress[0]), 0, m_total.y);
+ recompute(source.m_space.byte_to_address(m_byteaddress[0]), 0, m_total.y);
}
else
{
@@ -579,7 +579,7 @@ recompute:
else
{
for (device_debug::breakpoint *bp = source.m_device.debug()->breakpoint_first(); bp != NULL; bp = bp->next())
- if (m_byteaddress[effrow] == (source.m_space->address_to_byte(bp->address()) & source.m_space->logbytemask()))
+ if (m_byteaddress[effrow] == (source.m_space.address_to_byte(bp->address()) & source.m_space.logbytemask()))
attrib = DCA_CHANGED;
}
@@ -627,7 +627,7 @@ recompute:
offs_t debug_view_disasm::selected_address()
{
flush_updates();
- return downcast<const debug_view_disasm_source &>(*m_source).m_space->byte_to_address(m_byteaddress[m_cursor.y]);
+ return downcast<const debug_view_disasm_source &>(*m_source).m_space.byte_to_address(m_byteaddress[m_cursor.y]);
}
@@ -695,7 +695,7 @@ void debug_view_disasm::set_disasm_width(UINT32 width)
void debug_view_disasm::set_selected_address(offs_t address)
{
const debug_view_disasm_source &source = downcast<const debug_view_disasm_source &>(*m_source);
- offs_t byteaddress = source.m_space->address_to_byte(address) & source.m_space->logbytemask();
+ offs_t byteaddress = source.m_space.address_to_byte(address) & source.m_space.logbytemask();
for (int line = 0; line < m_total.y; line++)
if (m_byteaddress[line] == byteaddress)
{
diff --git a/src/emu/debug/dvdisasm.h b/src/emu/debug/dvdisasm.h
index a1cd81b008b..f7caac74c66 100644
--- a/src/emu/debug/dvdisasm.h
+++ b/src/emu/debug/dvdisasm.h
@@ -73,13 +73,13 @@ class debug_view_disasm_source : public debug_view_source
public:
// getters
device_t &device() const { return m_device; }
- address_space *space() const { return m_space; }
+ address_space &space() const { return m_space; }
private:
// internal state
device_t & m_device; // underlying device
device_disasm_interface *m_disasmintf; // disassembly interface
- address_space * m_space; // address space to display
+ address_space & m_space; // address space to display
};
diff --git a/src/emu/debug/dvmemory.c b/src/emu/debug/dvmemory.c
index a8ebc452702..06c788c671a 100644
--- a/src/emu/debug/dvmemory.c
+++ b/src/emu/debug/dvmemory.c
@@ -154,15 +154,14 @@ void debug_view_memory::enumerate_sources()
// first add all the devices' address spaces
memory_interface_iterator iter(machine().root_device());
for (device_memory_interface *memintf = iter.first(); memintf != NULL; memintf = iter.next())
- for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; spacenum++)
- {
- address_space *space = memintf->space(spacenum);
- if (space != NULL)
- {
- name.printf("%s '%s' %s space memory", memintf->device().name(), memintf->device().tag(), space->name());
- m_source_list.append(*auto_alloc(machine(), debug_view_memory_source(name, *space)));
- }
- }
+ if (&memintf->device() != &machine().root_device())
+ for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; spacenum++)
+ if (memintf->has_space(spacenum))
+ {
+ address_space &space = memintf->space(spacenum);
+ name.printf("%s '%s' %s space memory", memintf->device().name(), memintf->device().tag(), space.name());
+ m_source_list.append(*auto_alloc(machine(), debug_view_memory_source(name, space)));
+ }
// then add all the memory regions
for (memory_region *region = machine().memory().first_region(); region != NULL; region = region->next())
diff --git a/src/emu/devcb.c b/src/emu/devcb.c
index 64268282245..b1f3c5b0dbe 100644
--- a/src/emu/devcb.c
+++ b/src/emu/devcb.c
@@ -144,11 +144,9 @@ address_space &devcb_resolver::resolve_space(int index, const char *tag, device_
throw emu_fatalerror("Device '%s' (requested by %s '%s') has no memory interface", tag, current.name(), current.tag());
// set the real target and function, then prime a delegate
- address_space *result = memory->space(index);
- if (result == NULL)
+ if (!memory->has_space(index))
throw emu_fatalerror("Unable to find device '%s' space %d (requested by %s '%s')", tag, index, current.name(), current.tag());
-
- return *result;
+ return memory->space(index);
}
diff --git a/src/emu/device.h b/src/emu/device.h
index d18ab58fa91..b0c1c8658e9 100644
--- a/src/emu/device.h
+++ b/src/emu/device.h
@@ -984,8 +984,12 @@ inline device_t *device_t::siblingdevice(const char *tag) const
// leading caret implies the owner, just skip it
if (tag[0] == '^') tag++;
- // query relative to the parent
- return (m_owner != NULL) ? m_owner->subdevice(tag) : NULL;
+ // query relative to the parent, if we have one
+ if (m_owner != NULL)
+ return m_owner->subdevice(tag);
+
+ // otherwise, it's NULL unless the tag is absolute
+ return (tag[0] == ':') ? subdevice(tag) : NULL;
}
diff --git a/src/emu/dimemory.h b/src/emu/dimemory.h
index fa1df6c8382..9fd75532a07 100644
--- a/src/emu/dimemory.h
+++ b/src/emu/dimemory.h
@@ -109,8 +109,10 @@ public:
static void static_set_addrmap(device_t &device, address_spacenum spacenum, address_map_constructor map);
// basic information getters
- address_space *space(int index = 0) const { return m_addrspace[index]; }
- address_space *space(address_spacenum index) const { return m_addrspace[static_cast<int>(index)]; }
+ bool has_space(int index = 0) const { return (m_addrspace[index] != NULL); }
+ bool has_space(address_spacenum index) const { return (m_addrspace[int(index)] != NULL); }
+ address_space &space(int index = 0) const { assert(m_addrspace[index] != NULL); return *m_addrspace[index]; }
+ address_space &space(address_spacenum index) const { assert(m_addrspace[int(index)] != NULL); return *m_addrspace[int(index)]; }
// address space accessors
void set_address_space(address_spacenum spacenum, address_space &space);
diff --git a/src/emu/driver.c b/src/emu/driver.c
index 3798b24c830..618c37aeb94 100644
--- a/src/emu/driver.c
+++ b/src/emu/driver.c
@@ -42,6 +42,17 @@
//**************************************************************************
+// ADDRESS_MAPS
+//**************************************************************************
+
+// default address map
+static ADDRESS_MAP_START( generic, AS_0, 8, driver_device )
+ AM_RANGE(0x00000000, 0xffffffff) AM_DEVREADWRITE(":", driver_device, fatal_generic_read, fatal_generic_write)
+ADDRESS_MAP_END
+
+
+
+//**************************************************************************
// DRIVER DEVICE
//**************************************************************************
@@ -51,12 +62,14 @@
driver_device::driver_device(const machine_config &mconfig, device_type type, const char *tag)
: device_t(mconfig, type, "Driver Device", tag, NULL, 0),
+ device_memory_interface(mconfig, *this),
m_generic_paletteram_8(*this, "paletteram"),
m_generic_paletteram2_8(*this, "paletteram2"),
m_generic_paletteram_16(*this, "paletteram"),
m_generic_paletteram2_16(*this, "paletteram2"),
m_generic_paletteram_32(*this, "paletteram"),
m_generic_paletteram2_32(*this, "paletteram2"),
+ m_space_config("generic", ENDIANNESS_LITTLE, 8, 32, 0, NULL, *ADDRESS_MAP_NAME(generic)),
m_system(NULL),
m_latch_clear_value(0),
m_flip_screen_x(0),
@@ -313,6 +326,18 @@ void driver_device::device_reset_after_children()
}
+//-------------------------------------------------
+// memory_space_config - return a description of
+// any address spaces owned by this device
+//-------------------------------------------------
+
+const address_space_config *driver_device::memory_space_config(address_spacenum spacenum) const
+{
+ return (spacenum == 0) ? &m_space_config : NULL;
+}
+
+
+
//**************************************************************************
// INTERRUPT ENABLE AND VECTOR HELPERS
//**************************************************************************
@@ -737,3 +762,25 @@ WRITE16_MEMBER( driver_device::paletteram_RRRRGGGGBBBBRGBx_word_w )
// 8-8-8 RGB palette write handlers
WRITE16_MEMBER( driver_device::paletteram_xrgb_word_be_w ) { palette_32bit_word_be_w<8,8,8, 16,8,0>(space, offset, data, mem_mask); }
WRITE16_MEMBER( driver_device::paletteram_xbgr_word_be_w ) { palette_32bit_word_be_w<8,8,8, 0,8,16>(space, offset, data, mem_mask); }
+
+
+
+//**************************************************************************
+// MISC READ/WRITE HANDLERS
+//**************************************************************************
+
+//-------------------------------------------------
+// generic space fatal error handlers
+//-------------------------------------------------
+
+READ8_MEMBER( driver_device::fatal_generic_read )
+{
+ throw emu_fatalerror("Attempted to read from generic address space (offs %X)\n", offset);
+}
+
+WRITE8_MEMBER( driver_device::fatal_generic_write )
+{
+ throw emu_fatalerror("Attempted to write to generic address space (offs %X = %02X)\n", offset, data);
+}
+
+
diff --git a/src/emu/driver.h b/src/emu/driver.h
index 61d5352642b..df2e9854c60 100644
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@@ -166,7 +166,8 @@ typedef void (*legacy_callback_func)(running_machine &machine);
// ======================> driver_device
// base class for machine driver-specific devices
-class driver_device : public device_t
+class driver_device : public device_t,
+ public device_memory_interface
{
public:
// construction/destruction
@@ -205,7 +206,7 @@ public:
void init_0() { }
// memory helpers
- address_space &generic_space() const { return *machine().memory().first_space(); }
+ address_space &generic_space() const { return space(AS_PROGRAM); }
// generic interrupt generators
void generic_pulse_irq_line(device_execute_interface &exec, int irqline, int cycles);
@@ -380,9 +381,12 @@ public:
DECLARE_WRITE16_MEMBER( paletteram_xbgr_word_be_w );
// generic input port helpers
- // custom handler
DECLARE_CUSTOM_INPUT_MEMBER( custom_port_read );
+ // general fatal error handlers
+ DECLARE_READ8_MEMBER( fatal_generic_read );
+ DECLARE_WRITE8_MEMBER( fatal_generic_write );
+
protected:
// helpers called at startup
virtual void driver_start();
@@ -403,6 +407,9 @@ protected:
virtual void device_start();
virtual void device_reset_after_children();
+ // device_memory_interface overrides
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
+
// internal helpers
inline UINT16 paletteram16_le(offs_t offset) const { return m_generic_paletteram_8[offset & ~1] | (m_generic_paletteram_8[offset | 1] << 8); }
inline UINT16 paletteram16_be(offs_t offset) const { return m_generic_paletteram_8[offset | 1] | (m_generic_paletteram_8[offset & ~1] << 8); }
@@ -424,6 +431,9 @@ private:
void soundlatch_sync_callback(void *ptr, INT32 param);
void updateflip();
+ // configuration state
+ const address_space_config m_space_config;
+
// internal state
const game_driver * m_system; // pointer to the game driver
driver_callback_delegate m_callbacks[CB_COUNT]; // start/reset callbacks
diff --git a/src/emu/drivers/testcpu.c b/src/emu/drivers/testcpu.c
index eb70134cb98..08e141f2ffc 100644
--- a/src/emu/drivers/testcpu.c
+++ b/src/emu/drivers/testcpu.c
@@ -123,7 +123,7 @@ public:
virtual void machine_start()
{
// find the CPU's address space
- m_space = m_cpu->space(AS_PROGRAM);
+ m_space = &m_cpu->space(AS_PROGRAM);
// configure DRC in the most compatible mode
ppcdrc_set_options(m_cpu, PPCDRC_COMPATIBLE_OPTIONS);
diff --git a/src/emu/machine.c b/src/emu/machine.c
index b3cda2d0fdc..5db01476ce2 100644
--- a/src/emu/machine.c
+++ b/src/emu/machine.c
@@ -224,7 +224,7 @@ const char *running_machine::describe_context()
{
cpu_device *cpu = downcast<cpu_device *>(&executing->device());
if (cpu != NULL)
- m_context.printf("'%s' (%s)", cpu->tag(), core_i64_format(cpu->pc(), cpu->space(AS_PROGRAM)->logaddrchars(), cpu->is_octal()));
+ m_context.printf("'%s' (%s)", cpu->tag(), core_i64_format(cpu->pc(), cpu->space(AS_PROGRAM).logaddrchars(), cpu->is_octal()));
}
else
m_context.cpy("(no context)");
diff --git a/src/emu/machine/6821pia.h b/src/emu/machine/6821pia.h
index 4cb7099dc83..0fee70c6889 100644
--- a/src/emu/machine/6821pia.h
+++ b/src/emu/machine/6821pia.h
@@ -94,9 +94,9 @@ public:
void set_port_a_z_mask(UINT8 data) { m_port_a_z_mask = data; }// see second note in .c
DECLARE_READ8_MEMBER( porta_r );
- UINT8 porta_r() { return porta_r(*machine().memory().first_space(), 0); }
+ UINT8 porta_r() { return porta_r(machine().driver_data()->generic_space(), 0); }
DECLARE_WRITE8_MEMBER( porta_w );
- void porta_w(UINT8 data) { porta_w(*machine().memory().first_space(), 0, data); }
+ void porta_w(UINT8 data) { porta_w(machine().driver_data()->generic_space(), 0, data); }
void set_a_input(UINT8 data, UINT8 z_mask);
UINT8 a_output();
@@ -109,9 +109,9 @@ public:
int ca2_output_z();
DECLARE_READ8_MEMBER( portb_r );
- UINT8 portb_r() { return portb_r(*machine().memory().first_space(), 0); }
+ UINT8 portb_r() { return portb_r(machine().driver_data()->generic_space(), 0); }
DECLARE_WRITE8_MEMBER( portb_w );
- void portb_w(UINT8 data) { portb_w(*machine().memory().first_space(), 0, data); }
+ void portb_w(UINT8 data) { portb_w(machine().driver_data()->generic_space(), 0, data); }
UINT8 b_output();
DECLARE_READ_LINE_MEMBER( cb1_r );
diff --git a/src/emu/machine/6840ptm.h b/src/emu/machine/6840ptm.h
index ea10790e98e..ff714a62465 100644
--- a/src/emu/machine/6840ptm.h
+++ b/src/emu/machine/6840ptm.h
@@ -61,9 +61,9 @@ public:
int ext_clock(int counter) const { return m_external_clock[counter]; } // get clock frequency
DECLARE_WRITE8_MEMBER( write );
- void write(offs_t offset, UINT8 data) { write(*machine().memory().first_space(), offset, data); }
+ void write(offs_t offset, UINT8 data) { write(machine().driver_data()->generic_space(), offset, data); }
DECLARE_READ8_MEMBER( read );
- UINT8 read(offs_t offset) { return read(*machine().memory().first_space(), offset); }
+ UINT8 read(offs_t offset) { return read(machine().driver_data()->generic_space(), offset); }
void set_gate(int idx, int state);
DECLARE_WRITE_LINE_MEMBER( set_g1 );
diff --git a/src/emu/machine/amigafdc.c b/src/emu/machine/amigafdc.c
index 21dcca3f916..84451aff234 100644
--- a/src/emu/machine/amigafdc.c
+++ b/src/emu/machine/amigafdc.c
@@ -96,7 +96,7 @@ void amiga_fdc::device_reset()
void amiga_fdc::dma_done()
{
dma_state = DMA_IDLE;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
amiga_custom_w(space, REG_INTREQ, 0x8000 | INTENA_DSKBLK, 0xffff);
}
@@ -233,7 +233,7 @@ void amiga_fdc::live_run(attotime limit)
cur_live.bit_counter = 0;
}
dskbyt |= 0x1000;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
amiga_custom_w(space, REG_INTREQ, 0x8000 | INTENA_DSKSYN, 0xffff);
} else
dskbyt &= ~0x1000;
diff --git a/src/emu/machine/i8155.c b/src/emu/machine/i8155.c
index 5f7a230b3f6..98d62844dd3 100644
--- a/src/emu/machine/i8155.c
+++ b/src/emu/machine/i8155.c
@@ -538,7 +538,7 @@ WRITE8_MEMBER( i8155_device::io_w )
READ8_MEMBER( i8155_device::memory_r )
{
- return this->space()->read_byte(offset);
+ return this->space().read_byte(offset);
}
@@ -548,7 +548,7 @@ READ8_MEMBER( i8155_device::memory_r )
WRITE8_MEMBER( i8155_device::memory_w )
{
- this->space()->write_byte(offset, data);
+ this->space().write_byte(offset, data);
}
diff --git a/src/emu/machine/i8355.c b/src/emu/machine/i8355.c
index 5b28fd76bf8..946be0de39a 100644
--- a/src/emu/machine/i8355.c
+++ b/src/emu/machine/i8355.c
@@ -227,5 +227,5 @@ WRITE8_MEMBER( i8355_device::io_w )
READ8_MEMBER( i8355_device::memory_r )
{
- return this->space()->read_byte(offset);
+ return this->space().read_byte(offset);
}
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 03f0dde9d70..45e9b83ddf8 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -1859,9 +1859,7 @@ static DEVICE_START( ide_controller )
device_memory_interface *memory;
if (!bmtarget->interface(memory))
throw emu_fatalerror("IDE controller '%s' bus master target '%s' has no memory!", device->tag(), config->bmcpu);
- ide->dma_space = memory->space(config->bmspace);
- if (ide->dma_space == NULL)
- throw emu_fatalerror("IDE controller '%s' bus master target '%s' does not have specified space %d!", device->tag(), config->bmcpu, config->bmspace);
+ ide->dma_space = &memory->space(config->bmspace);
ide->dma_address_xor = (ide->dma_space->endianness() == ENDIANNESS_LITTLE) ? 0 : 3;
}
diff --git a/src/emu/machine/microtch.c b/src/emu/machine/microtch.c
index 7315cdbd7fe..37453b56b5b 100644
--- a/src/emu/machine/microtch.c
+++ b/src/emu/machine/microtch.c
@@ -343,5 +343,5 @@ void microtouch_serial_device::tra_complete()
void microtouch_serial_device::rcv_complete()
{
receive_register_extract();
- microtouch_device::rx(*machine().memory().first_space(), 0, get_received_char());
+ microtouch_device::rx(machine().driver_data()->generic_space(), 0, get_received_char());
}
diff --git a/src/emu/machine/s3c2400.c b/src/emu/machine/s3c2400.c
index 6b222481689..01359553535 100644
--- a/src/emu/machine/s3c2400.c
+++ b/src/emu/machine/s3c2400.c
@@ -38,7 +38,7 @@ UINT32 s3c2400_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
DEVICE_START( s3c2400 )
{
- address_space &space = *device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
+ address_space &space = device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
DEVICE_START_CALL(s3c24xx);
space.install_legacy_readwrite_handler( *device, 0x14000000, 0x1400003b, FUNC(s3c24xx_memcon_r), FUNC(s3c24xx_memcon_w));
space.install_legacy_readwrite_handler( *device, 0x14200000, 0x1420005b, FUNC(s3c24xx_usb_host_r), FUNC(s3c24xx_usb_host_w));
diff --git a/src/emu/machine/s3c2410.c b/src/emu/machine/s3c2410.c
index be7895d919d..cb404c03853 100644
--- a/src/emu/machine/s3c2410.c
+++ b/src/emu/machine/s3c2410.c
@@ -38,7 +38,7 @@ UINT32 s3c2410_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
DEVICE_START( s3c2410 )
{
- address_space &space = *device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
+ address_space &space = device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
DEVICE_START_CALL(s3c24xx);
space.install_legacy_readwrite_handler( *device, 0x48000000, 0x4800003b, FUNC(s3c24xx_memcon_r), FUNC(s3c24xx_memcon_w));
space.install_legacy_readwrite_handler( *device, 0x49000000, 0x4900005b, FUNC(s3c24xx_usb_host_r), FUNC(s3c24xx_usb_host_w));
diff --git a/src/emu/machine/s3c2440.c b/src/emu/machine/s3c2440.c
index 9539931ae6a..c5bf9408255 100644
--- a/src/emu/machine/s3c2440.c
+++ b/src/emu/machine/s3c2440.c
@@ -38,7 +38,7 @@ UINT32 s3c2440_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
DEVICE_START( s3c2440 )
{
- address_space &space = *device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
+ address_space &space = device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
space.install_legacy_readwrite_handler( *device, 0x48000000, 0x4800003b, FUNC(s3c24xx_memcon_r), FUNC(s3c24xx_memcon_w));
space.install_legacy_readwrite_handler( *device, 0x49000000, 0x4900005b, FUNC(s3c24xx_usb_host_r), FUNC(s3c24xx_usb_host_w));
space.install_legacy_readwrite_handler( *device, 0x4a000000, 0x4a00001f, FUNC(s3c24xx_irq_r), FUNC(s3c24xx_irq_w));
diff --git a/src/emu/machine/s3c24xx.c b/src/emu/machine/s3c24xx.c
index 12f4931dc33..bb09f9c7867 100644
--- a/src/emu/machine/s3c24xx.c
+++ b/src/emu/machine/s3c24xx.c
@@ -301,7 +301,7 @@ static void s3c24xx_lcd_dma_init( device_t *device)
static UINT32 s3c24xx_lcd_dma_read( device_t *device)
{
s3c24xx_t *s3c24xx = get_token( device);
- address_space& space = *device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
+ address_space& space = device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
UINT8 *vram, data[4];
vram = (UINT8 *)space.get_read_ptr( s3c24xx->lcd.vramaddr_cur);
for (int i = 0; i < 2; i++)
@@ -345,7 +345,7 @@ static UINT32 s3c24xx_lcd_dma_read( device_t *device)
static UINT32 s3c24xx_lcd_dma_read( device_t *device)
{
s3c24xx_t *s3c24xx = get_token( device);
- address_space& space = *device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
+ address_space& space = device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
UINT8 *vram, data[4];
vram = (UINT8 *)space.get_read_ptr( s3c24xx->lcd.vramaddr_cur);
for (int i = 0; i < 2; i++)
@@ -1611,7 +1611,7 @@ static void s3c24xx_dma_trigger( device_t *device, int ch)
s3c24xx_t *s3c24xx = get_token( device);
s3c24xx_dma_regs_t *regs = &s3c24xx->dma[ch].regs;
UINT32 curr_tc, curr_src, curr_dst;
- address_space &space = *device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
+ address_space &space = device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
int dsz, inc_src, inc_dst, servmode, tsz;
const UINT32 ch_int[] = { S3C24XX_INT_DMA0, S3C24XX_INT_DMA1, S3C24XX_INT_DMA2, S3C24XX_INT_DMA3};
verboselog( device->machine(), 5, "DMA %d trigger\n", ch);
@@ -3701,7 +3701,7 @@ static DEVICE_START( s3c24xx )
int om1 = iface_core_pin_r( device, S3C24XX_CORE_PIN_OM1);
if ((om0 == 0) && (om1 == 0))
{
- address_space &space = *device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
+ address_space &space = device->machine().device( "maincpu")->memory().space( AS_PROGRAM);
space.install_ram( 0x00000000, 0x00000fff, s3c24xx->steppingstone);
space.install_ram( 0x40000000, 0x40000fff, s3c24xx->steppingstone);
}
diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c
index 6884d5a17d5..d6a0b48350f 100644
--- a/src/emu/sound/bsmt2000.c
+++ b/src/emu/sound/bsmt2000.c
@@ -171,7 +171,7 @@ void bsmt2000_device::device_start()
m_cpu = subdevice<tms32015_device>("bsmt2000");
// find our direct access
- m_direct = &space()->direct();
+ m_direct = &space().direct();
// create the stream; BSMT typically runs at 24MHz and writes to a DAC, so
// in theory we should generate a 24MHz stream, but that's certainly overkill
diff --git a/src/emu/sound/c352.c b/src/emu/sound/c352.c
index fb7f3498a71..28090a0dcaa 100644
--- a/src/emu/sound/c352.c
+++ b/src/emu/sound/c352.c
@@ -461,7 +461,7 @@ void c352_device::device_start()
double u = 10.0;
// find our direct access
- m_direct = &space()->direct();
+ m_direct = &space().direct();
m_sample_rate_base = clock() / 288;
diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c
index 5bc32ba542a..c1915687f45 100644
--- a/src/emu/sound/cdp1869.c
+++ b/src/emu/sound/cdp1869.c
@@ -87,7 +87,7 @@ inline bool cdp1869_device::is_ntsc()
inline UINT8 cdp1869_device::read_page_ram_byte(offs_t pma)
{
- return space()->read_byte(pma);
+ return space().read_byte(pma);
}
@@ -98,7 +98,7 @@ inline UINT8 cdp1869_device::read_page_ram_byte(offs_t pma)
inline void cdp1869_device::write_page_ram_byte(offs_t pma, UINT8 data)
{
- space()->write_byte(pma, data);
+ space().write_byte(pma, data);
}
diff --git a/src/emu/sound/disc_inp.c b/src/emu/sound/disc_inp.c
index e07f4bfbbdf..7f7cba46ed5 100644
--- a/src/emu/sound/disc_inp.c
+++ b/src/emu/sound/disc_inp.c
@@ -23,14 +23,14 @@
READ8_DEVICE_HANDLER(discrete_sound_r)
{
discrete_device *disc_device = downcast<discrete_device *>(device);
- return disc_device->read( *disc_device->machine().firstcpu->space(), offset, 0xff);
+ return disc_device->read( disc_device->machine().firstcpu->space(), offset, 0xff);
}
WRITE8_DEVICE_HANDLER(discrete_sound_w)
{
discrete_device *disc_device = downcast<discrete_device *>(device);
- disc_device->write(*disc_device->machine().firstcpu->space(), offset, data, 0xff);
+ disc_device->write(disc_device->machine().firstcpu->space(), offset, data, 0xff);
}
/************************************************************************
diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c
index 587bbe79063..1296ff5ba36 100644
--- a/src/emu/sound/es5503.c
+++ b/src/emu/sound/es5503.c
@@ -248,7 +248,7 @@ void es5503_device::device_start()
int osc;
// find our direct access
- m_direct = &space()->direct();
+ m_direct = &space().direct();
rege0 = 0xff;
diff --git a/src/emu/sound/mos6560.c b/src/emu/sound/mos6560.c
index 141930fc98b..92a2fefd25f 100644
--- a/src/emu/sound/mos6560.c
+++ b/src/emu/sound/mos6560.c
@@ -155,14 +155,14 @@ static const rgb_t PALETTE[] =
inline UINT8 mos6560_device::read_videoram(offs_t offset)
{
- m_last_data = space(AS_0)->read_byte(offset & 0x3fff);
+ m_last_data = space(AS_0).read_byte(offset & 0x3fff);
return m_last_data;
}
inline UINT8 mos6560_device::read_colorram(offs_t offset)
{
- return space(AS_1)->read_byte(offset & 0x3ff);
+ return space(AS_1).read_byte(offset & 0x3ff);
}
/*-------------------------------------------------
diff --git a/src/emu/sound/nes_apu.c b/src/emu/sound/nes_apu.c
index 49586758a91..a5875faf521 100644
--- a/src/emu/sound/nes_apu.c
+++ b/src/emu/sound/nes_apu.c
@@ -703,7 +703,7 @@ static DEVICE_START( nesapu )
info->buffer_size+=info->samps_per_sync;
/* Initialize individual chips */
- (info->APU.dpcm).memory = device->machine().device(intf->cpu_tag)->memory().space(AS_PROGRAM);
+ (info->APU.dpcm).memory = &device->machine().device(intf->cpu_tag)->memory().space(AS_PROGRAM);
info->stream = device->machine().sound().stream_alloc(*device, 0, 1, rate, info, nes_psg_update_sound);
diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c
index 6ab23e55857..21444b9ac2e 100644
--- a/src/emu/sound/okim6295.c
+++ b/src/emu/sound/okim6295.c
@@ -118,7 +118,7 @@ void okim6295_device::static_set_pin7(device_t &device, int pin7)
void okim6295_device::device_start()
{
// find our direct access
- m_direct = &space()->direct();
+ m_direct = &space().direct();
// create the stream
int divisor = m_pin7_state ? 132 : 165;
@@ -220,7 +220,7 @@ void okim6295_device::set_bank_base(offs_t base, bool bDontUpdateStream)
if (!m_bank_installed && base != 0)
{
// override our memory map with a bank
- space()->install_read_bank(0x00000, 0x3ffff, tag());
+ space().install_read_bank(0x00000, 0x3ffff, tag());
m_bank_installed = true;
}
diff --git a/src/emu/sound/okim9810.c b/src/emu/sound/okim9810.c
index c67bd670031..928ee2687db 100644
--- a/src/emu/sound/okim9810.c
+++ b/src/emu/sound/okim9810.c
@@ -96,7 +96,7 @@ okim9810_device::okim9810_device(const machine_config &mconfig, const char *tag,
void okim9810_device::device_start()
{
// find our direct access
- m_direct = &space()->direct();
+ m_direct = &space().direct();
// create the stream
//int divisor = m_pin7 ? 132 : 165;
diff --git a/src/emu/sound/qs1000.c b/src/emu/sound/qs1000.c
index 49b473b5cb1..c2e90028129 100644
--- a/src/emu/sound/qs1000.c
+++ b/src/emu/sound/qs1000.c
@@ -222,7 +222,7 @@ machine_config_constructor qs1000_device::device_mconfig_additions() const
void qs1000_device::device_start()
{
// Find our direct access
- m_direct = &space()->direct();
+ m_direct = &space().direct();
// The QS1000 operates at 24MHz. Creating a stream at that rate
// would be overkill so we opt for a fraction of that rate which
diff --git a/src/emu/video/315_5124.c b/src/emu/video/315_5124.c
index 18dd71434d1..d7262749a6b 100644
--- a/src/emu/video/315_5124.c
+++ b/src/emu/video/315_5124.c
@@ -496,7 +496,7 @@ READ8_MEMBER( sega315_5124_device::vram_read )
if ( !space.debugger_access() )
{
/* Load read buffer */
- m_buffer = this->space()->read_byte(m_addr & 0x3fff);
+ m_buffer = this->space().read_byte(m_addr & 0x3fff);
/* Bump internal addthis->ress register */
m_addr += 1;
@@ -543,7 +543,7 @@ WRITE8_MEMBER( sega315_5124_device::vram_write )
case 0x00:
case 0x01:
case 0x02:
- this->space()->write_byte(m_addr & 0x3fff, data);
+ this->space().write_byte(m_addr & 0x3fff, data);
break;
case 0x03:
@@ -582,7 +582,7 @@ WRITE8_MEMBER( sega315_5124_device::register_write )
switch (m_addrmode)
{
case 0: /* VRAM reading mode */
- m_buffer = this->space()->read_byte(m_addr & 0x3fff);
+ m_buffer = this->space().read_byte(m_addr & 0x3fff);
m_addr += 1;
break;
@@ -691,7 +691,7 @@ void sega315_5124_device::draw_scanline_mode4( int *line_buffer, int *priority_s
y_scroll = ((m_reg[0x00] & 0x80) && (tile_column > 23)) ? 0 : m_reg9copy;
tile_line = ((tile_column + x_scroll_start_column) & 0x1f) * 2;
- tile_data = space()->read_word(name_table_address + ((((line + y_scroll) % scroll_mod) >> 3) << 6) + tile_line);
+ tile_data = space().read_word(name_table_address + ((((line + y_scroll) % scroll_mod) >> 3) << 6) + tile_line);
tile_selected = (tile_data & 0x01ff);
priority_select = tile_data & PRIORITY_BIT;
@@ -703,10 +703,10 @@ void sega315_5124_device::draw_scanline_mode4( int *line_buffer, int *priority_s
if (vert_selected)
tile_line = 0x07 - tile_line;
- bit_plane_0 = space()->read_byte(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x00);
- bit_plane_1 = space()->read_byte(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x01);
- bit_plane_2 = space()->read_byte(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x02);
- bit_plane_3 = space()->read_byte(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x03);
+ bit_plane_0 = space().read_byte(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x00);
+ bit_plane_1 = space().read_byte(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x01);
+ bit_plane_2 = space().read_byte(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x02);
+ bit_plane_3 = space().read_byte(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x03);
for (pixel_x = 0; pixel_x < 8 ; pixel_x++)
{
@@ -765,9 +765,9 @@ void sega315_5124_device::select_sprites( int pixel_plot_y, int line )
if (m_reg[0x01] & 0x01) /* Check if MAG is set */
m_sprite_height = m_sprite_height * 2;
- for (sprite_index = 0; (sprite_index < 32 * 4) && (space()->read_byte( m_sprite_base + sprite_index ) != 0xd0) && (m_sprite_count < max_sprites + 1); sprite_index += 4)
+ for (sprite_index = 0; (sprite_index < 32 * 4) && (space().read_byte( m_sprite_base + sprite_index ) != 0xd0) && (m_sprite_count < max_sprites + 1); sprite_index += 4)
{
- int sprite_y = space()->read_byte( m_sprite_base + sprite_index ) + 1;
+ int sprite_y = space().read_byte( m_sprite_base + sprite_index ) + 1;
if (sprite_y > 240)
{
@@ -794,9 +794,9 @@ void sega315_5124_device::select_sprites( int pixel_plot_y, int line )
m_sprite_height = (m_reg[0x01] & 0x02) ? 16 : 8;
m_sprite_zoom = (m_reg[0x01] & 0x01) ? 2 : 1;
- for (sprite_index = 0; (sprite_index < 64) && (space()->read_byte(m_sprite_base + sprite_index ) != 0xd0 || m_y_pixels != 192) && (m_sprite_count < max_sprites + 1); sprite_index++)
+ for (sprite_index = 0; (sprite_index < 64) && (space().read_byte(m_sprite_base + sprite_index ) != 0xd0 || m_y_pixels != 192) && (m_sprite_count < max_sprites + 1); sprite_index++)
{
- int sprite_y = space()->read_byte( m_sprite_base + sprite_index ) + 1; /* sprite y position starts at line 1 */
+ int sprite_y = space().read_byte( m_sprite_base + sprite_index ) + 1; /* sprite y position starts at line 1 */
if (sprite_y > 240)
{
@@ -844,9 +844,9 @@ void sega315_5124_device::draw_sprites_mode4( int *line_buffer, int *priority_se
for (int sprite_buffer_index = m_sprite_count - 1; sprite_buffer_index >= 0; sprite_buffer_index--)
{
int sprite_index = m_selected_sprite[sprite_buffer_index];
- int sprite_y = space()->read_byte( m_sprite_base + sprite_index ) + 1; /* sprite y position starts at line 1 */
- int sprite_x = space()->read_byte( m_sprite_base + 0x80 + (sprite_index << 1) );
- int sprite_tile_selected = space()->read_byte( m_sprite_base + 0x81 + (sprite_index << 1) );
+ int sprite_y = space().read_byte( m_sprite_base + sprite_index ) + 1; /* sprite y position starts at line 1 */
+ int sprite_x = space().read_byte( m_sprite_base + 0x80 + (sprite_index << 1) );
+ int sprite_tile_selected = space().read_byte( m_sprite_base + 0x81 + (sprite_index << 1) );
if (sprite_y > 240)
{
@@ -875,10 +875,10 @@ void sega315_5124_device::draw_sprites_mode4( int *line_buffer, int *priority_se
sprite_tile_selected += 1;
}
- UINT8 bit_plane_0 = space()->read_byte(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x00);
- UINT8 bit_plane_1 = space()->read_byte(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x01);
- UINT8 bit_plane_2 = space()->read_byte(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x02);
- UINT8 bit_plane_3 = space()->read_byte(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x03);
+ UINT8 bit_plane_0 = space().read_byte(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x00);
+ UINT8 bit_plane_1 = space().read_byte(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x01);
+ UINT8 bit_plane_2 = space().read_byte(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x02);
+ UINT8 bit_plane_3 = space().read_byte(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x03);
for (int pixel_x = 0; pixel_x < 8 ; pixel_x++)
{
@@ -1002,9 +1002,9 @@ void sega315_5124_device::draw_sprites_tms9918_mode( int *line_buffer, int pixel
for (int sprite_buffer_index = m_sprite_count - 1; sprite_buffer_index >= 0; sprite_buffer_index--)
{
int sprite_index = m_selected_sprite[sprite_buffer_index];
- int sprite_y = space()->read_byte( m_sprite_base + sprite_index ) + 1;
- int sprite_x = space()->read_byte( m_sprite_base + sprite_index + 1 );
- UINT8 flags = space()->read_byte( m_sprite_base + sprite_index + 3 );
+ int sprite_y = space().read_byte( m_sprite_base + sprite_index ) + 1;
+ int sprite_x = space().read_byte( m_sprite_base + sprite_index + 1 );
+ UINT8 flags = space().read_byte( m_sprite_base + sprite_index + 3 );
int pen_selected = m_palette_offset + ( flags & 0x0f );
if (sprite_y > 240)
@@ -1013,7 +1013,7 @@ void sega315_5124_device::draw_sprites_tms9918_mode( int *line_buffer, int pixel
if (flags & 0x80)
sprite_x -= 32;
- int sprite_tile_selected = space()->read_byte( m_sprite_base + sprite_index + 2 );
+ int sprite_tile_selected = space().read_byte( m_sprite_base + sprite_index + 2 );
int sprite_line = line - sprite_y;
if (m_reg[0x01] & 0x01)
@@ -1030,7 +1030,7 @@ void sega315_5124_device::draw_sprites_tms9918_mode( int *line_buffer, int pixel
}
}
- UINT8 pattern = space()->read_byte( sprite_pattern_base + sprite_tile_selected * 8 + sprite_line );
+ UINT8 pattern = space().read_byte( sprite_pattern_base + sprite_tile_selected * 8 + sprite_line );
for (int pixel_x = 0; pixel_x < 8; pixel_x++)
{
@@ -1099,7 +1099,7 @@ void sega315_5124_device::draw_sprites_tms9918_mode( int *line_buffer, int pixel
if (m_reg[0x01] & 0x02)
{
sprite_tile_selected += 2;
- pattern = space()->read_byte( sprite_pattern_base + sprite_tile_selected * 8 + sprite_line );
+ pattern = space().read_byte( sprite_pattern_base + sprite_tile_selected * 8 + sprite_line );
sprite_x += (m_reg[0x01] & 0x01 ? 16 : 8);
for (int pixel_x = 0; pixel_x < 8; pixel_x++)
@@ -1191,12 +1191,12 @@ void sega315_5124_device::draw_scanline_mode2( int *line_buffer, int line )
for (tile_column = 0; tile_column < 32; tile_column++)
{
- UINT8 name = space()->read_byte( name_table_base + tile_column );
+ UINT8 name = space().read_byte( name_table_base + tile_column );
UINT8 pattern;
UINT8 colors;
- pattern = space()->read_byte(pattern_base + (((pattern_offset + name) & pattern_mask) * 8) + (line & 0x07) );
- colors = space()->read_byte(color_base + (((pattern_offset + name) & color_mask) * 8) + (line & 0x07) );
+ pattern = space().read_byte(pattern_base + (((pattern_offset + name) & pattern_mask) * 8) + (line & 0x07) );
+ colors = space().read_byte(color_base + (((pattern_offset + name) & color_mask) * 8) + (line & 0x07) );
for (pixel_x = 0; pixel_x < 8; pixel_x++)
{
@@ -1237,12 +1237,12 @@ void sega315_5124_device::draw_scanline_mode0( int *line_buffer, int line )
for (tile_column = 0; tile_column < 32; tile_column++)
{
- UINT8 name = space()->read_byte( name_base + tile_column );
+ UINT8 name = space().read_byte( name_base + tile_column );
UINT8 pattern;
UINT8 colors;
- pattern = space()->read_byte( pattern_base + (name * 8) + (line & 0x07) );
- colors = space()->read_byte( color_base + ( name >> 3 ) );
+ pattern = space().read_byte( pattern_base + (name * 8) + (line & 0x07) );
+ colors = space().read_byte( color_base + ( name >> 3 ) );
for (pixel_x = 0; pixel_x < 8; pixel_x++)
{
diff --git a/src/emu/video/crt9007.c b/src/emu/video/crt9007.c
index 62a2f089df5..02195c56f38 100644
--- a/src/emu/video/crt9007.c
+++ b/src/emu/video/crt9007.c
@@ -231,7 +231,7 @@ ADDRESS_MAP_END
inline UINT8 crt9007_device::readbyte(offs_t address)
{
- return space()->read_byte(address);
+ return space().read_byte(address);
}
diff --git a/src/emu/video/h63484.c b/src/emu/video/h63484.c
index 1327162b9dd..4182c2fd988 100644
--- a/src/emu/video/h63484.c
+++ b/src/emu/video/h63484.c
@@ -365,7 +365,7 @@ const rom_entry *h63484_device::device_rom_region() const
inline UINT8 h63484_device::readbyte(offs_t address)
{
- return space()->read_byte(address);
+ return space().read_byte(address);
}
@@ -375,7 +375,7 @@ inline UINT8 h63484_device::readbyte(offs_t address)
inline void h63484_device::writebyte(offs_t address, UINT8 data)
{
- space()->write_byte(address, data);
+ space().write_byte(address, data);
}
diff --git a/src/emu/video/hd61830.c b/src/emu/video/hd61830.c
index 1e67270a80e..59a82818607 100644
--- a/src/emu/video/hd61830.c
+++ b/src/emu/video/hd61830.c
@@ -82,7 +82,7 @@ ROM_END
inline UINT8 hd61830_device::readbyte(offs_t address)
{
- return space()->read_byte(address);
+ return space().read_byte(address);
}
@@ -92,7 +92,7 @@ inline UINT8 hd61830_device::readbyte(offs_t address)
inline void hd61830_device::writebyte(offs_t address, UINT8 data)
{
- space()->write_byte(address, data);
+ space().write_byte(address, data);
}
diff --git a/src/emu/video/huc6261.c b/src/emu/video/huc6261.c
index fd35d54d619..b9d3b0b61be 100644
--- a/src/emu/video/huc6261.c
+++ b/src/emu/video/huc6261.c
@@ -96,7 +96,7 @@ void huc6261_device::device_timer(emu_timer &timer, device_timer_id id, int para
{
g_profiler.start( PROFILER_VIDEO );
/* Get next pixel information */
- m_pixel_data = m_huc6270_b->next_pixel( *machine().memory().first_space(), 0, 0xffff );
+ m_pixel_data = m_huc6270_b->next_pixel( machine().driver_data()->generic_space(), 0, 0xffff );
g_profiler.stop();
}
diff --git a/src/emu/video/huc6272.c b/src/emu/video/huc6272.c
index b72c20b9ef8..ec4faee84eb 100644
--- a/src/emu/video/huc6272.c
+++ b/src/emu/video/huc6272.c
@@ -42,7 +42,7 @@ const address_space_config *huc6272_device::memory_space_config(address_spacenum
inline UINT32 huc6272_device::read_dword(offs_t address)
{
- return space()->read_dword(address << 2);
+ return space().read_dword(address << 2);
}
@@ -52,7 +52,7 @@ inline UINT32 huc6272_device::read_dword(offs_t address)
inline void huc6272_device::write_dword(offs_t address, UINT32 data)
{
- space()->write_dword(address << 2, data);
+ space().write_dword(address << 2, data);
}
//**************************************************************************
diff --git a/src/emu/video/m50458.c b/src/emu/video/m50458.c
index 2f0b66e2f00..7e339f35f4e 100644
--- a/src/emu/video/m50458.c
+++ b/src/emu/video/m50458.c
@@ -148,7 +148,7 @@ const address_space_config *m50458_device::memory_space_config(address_spacenum
inline UINT16 m50458_device::read_word(offs_t address)
{
- return space()->read_word(address << 1);
+ return space().read_word(address << 1);
}
//-------------------------------------------------
@@ -157,7 +157,7 @@ inline UINT16 m50458_device::read_word(offs_t address)
inline void m50458_device::write_word(offs_t address, UINT16 data)
{
- space()->write_word(address << 1, data);
+ space().write_word(address << 1, data);
}
diff --git a/src/emu/video/mb90082.c b/src/emu/video/mb90082.c
index 491e3111ebf..8983c44d848 100644
--- a/src/emu/video/mb90082.c
+++ b/src/emu/video/mb90082.c
@@ -63,7 +63,7 @@ const address_space_config *mb90082_device::memory_space_config(address_spacenum
inline UINT16 mb90082_device::read_word(offs_t address)
{
- return space()->read_word(address << 1);
+ return space().read_word(address << 1);
}
//-------------------------------------------------
@@ -72,7 +72,7 @@ inline UINT16 mb90082_device::read_word(offs_t address)
inline void mb90082_device::write_word(offs_t address, UINT16 data)
{
- space()->write_word(address << 1, data);
+ space().write_word(address << 1, data);
}
//**************************************************************************
diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c
index 1a05a77aa5b..2555908f4f5 100644
--- a/src/emu/video/mc6845.c
+++ b/src/emu/video/mc6845.c
@@ -418,12 +418,12 @@ WRITE8_MEMBER( mos8563_device::register_w )
inline UINT8 mos8563_device::read_videoram(offs_t offset)
{
- return space(AS_0)->read_byte(offset);
+ return space(AS_0).read_byte(offset);
}
inline void mos8563_device::write_videoram(offs_t offset, UINT8 data)
{
- space(AS_0)->write_byte(offset, data);
+ space(AS_0).write_byte(offset, data);
}
diff --git a/src/emu/video/pc_cga.c b/src/emu/video/pc_cga.c
index 3373c1f38eb..5f85ac68114 100644
--- a/src/emu/video/pc_cga.c
+++ b/src/emu/video/pc_cga.c
@@ -329,8 +329,8 @@ static int internal_pc_cga_video_start(running_machine &machine)
static VIDEO_START( pc_cga )
{
int buswidth;
- address_space &space = *machine.firstcpu->space(AS_PROGRAM);
- address_space *spaceio = machine.firstcpu->space(AS_IO);
+ address_space &space = machine.firstcpu->space(AS_PROGRAM);
+ address_space &spaceio = machine.firstcpu->space(AS_IO);
space.install_readwrite_bank(0xb8000, 0xbbfff, 0, 0x04000, "bank11" );
buswidth = machine.firstcpu->space_config(AS_PROGRAM)->m_databus_width;
@@ -357,7 +357,7 @@ static VIDEO_START( pc_cga )
fatalerror("CGA: Bus width %d not supported\n", buswidth);
break;
}
- spaceio->install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_cga8_r), FUNC(pc_cga8_w), mask );
+ spaceio.install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_cga8_r), FUNC(pc_cga8_w), mask );
internal_pc_cga_video_start(machine);
cga.videoram_size = 0x4000;
cga.videoram = auto_alloc_array(machine, UINT8, 0x4000);
@@ -370,8 +370,8 @@ static VIDEO_START( pc_cga )
static VIDEO_START( pc_cga32k )
{
int buswidth;
- address_space &space = *machine.firstcpu->space(AS_PROGRAM);
- address_space *spaceio = machine.firstcpu->space(AS_IO);
+ address_space &space = machine.firstcpu->space(AS_PROGRAM);
+ address_space &spaceio = machine.firstcpu->space(AS_IO);
space.install_readwrite_bank(0xb8000, 0xbffff, "bank11" );
@@ -399,7 +399,7 @@ static VIDEO_START( pc_cga32k )
fatalerror("CGA: Bus width %d not supported\n", buswidth);
break;
}
- spaceio->install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_cga8_r), FUNC(pc_cga8_w), mask );
+ spaceio.install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_cga8_r), FUNC(pc_cga8_w), mask );
internal_pc_cga_video_start(machine);
@@ -1202,7 +1202,7 @@ static WRITE8_HANDLER( pc_cga8_w )
// Not sure if some all CGA cards have ability to upload char definition
// The original CGA card had a char rom
UINT8 buswidth = space.machine().firstcpu->space_config(AS_PROGRAM)->m_databus_width;
- address_space *space_prg = space.machine().firstcpu->space(AS_PROGRAM);
+ address_space &space_prg = space.machine().firstcpu->space(AS_PROGRAM);
cga.p3df = data;
if (data & 1) {
UINT64 mask = 0;
@@ -1228,12 +1228,12 @@ static WRITE8_HANDLER( pc_cga8_w )
fatalerror("CGA: Bus width %d not supported\n", buswidth);
break;
}
- space_prg->install_legacy_readwrite_handler(0xb8000, 0xb9fff, FUNC(char_ram_r),FUNC(char_ram_w), mask );
+ space_prg.install_legacy_readwrite_handler(0xb8000, 0xb9fff, FUNC(char_ram_r),FUNC(char_ram_w), mask );
} else {
if (cga.videoram_size== 0x4000) {
- space_prg->install_readwrite_bank(0xb8000, 0xbbfff, 0, 0x04000, "bank11" );
+ space_prg.install_readwrite_bank(0xb8000, 0xbbfff, 0, 0x04000, "bank11" );
} else {
- space_prg->install_readwrite_bank(0xb8000, 0xbffff, "bank11" );
+ space_prg.install_readwrite_bank(0xb8000, 0xbffff, "bank11" );
}
}
break;
@@ -1635,14 +1635,14 @@ static VIDEO_START( pc1512 )
cga.videoram_size = 0x10000;
cga.videoram = auto_alloc_array(machine, UINT8, 0x10000 );
- address_space &space = *machine.firstcpu->space( AS_PROGRAM );
- address_space *io_space = machine.firstcpu->space( AS_IO );
+ address_space &space = machine.firstcpu->space( AS_PROGRAM );
+ address_space &io_space = machine.firstcpu->space( AS_IO );
space.install_read_bank( 0xb8000, 0xbbfff, 0, 0x0C000, "bank1" );
machine.root_device().membank("bank1")->set_base(cga.videoram + videoram_offset[0]);
space.install_legacy_write_handler( 0xb8000, 0xbbfff, 0, 0x0C000, FUNC(pc1512_videoram_w), 0xffff);
- io_space->install_legacy_readwrite_handler( 0x3d0, 0x3df, FUNC(pc1512_r), FUNC(pc1512_w), 0xffff);
+ io_space.install_legacy_readwrite_handler( 0x3d0, 0x3df, FUNC(pc1512_r), FUNC(pc1512_w), 0xffff);
}
diff --git a/src/emu/video/ramdac.c b/src/emu/video/ramdac.c
index 6521079e8a9..1d40fe76a7c 100644
--- a/src/emu/video/ramdac.c
+++ b/src/emu/video/ramdac.c
@@ -61,7 +61,7 @@ const address_space_config *ramdac_device::memory_space_config(address_spacenum
inline UINT8 ramdac_device::readbyte(offs_t address)
{
- return space()->read_byte(address);
+ return space().read_byte(address);
}
@@ -71,7 +71,7 @@ inline UINT8 ramdac_device::readbyte(offs_t address)
inline void ramdac_device::writebyte(offs_t address, UINT8 data)
{
- space()->write_byte(address, data);
+ space().write_byte(address, data);
}
//-------------------------------------------------
diff --git a/src/emu/video/sed1330.c b/src/emu/video/sed1330.c
index 5312b4d62e3..48b52f4cf31 100644
--- a/src/emu/video/sed1330.c
+++ b/src/emu/video/sed1330.c
@@ -89,7 +89,7 @@ ROM_END
inline UINT8 sed1330_device::readbyte(offs_t address)
{
- return space()->read_byte(address);
+ return space().read_byte(address);
}
@@ -99,7 +99,7 @@ inline UINT8 sed1330_device::readbyte(offs_t address)
inline void sed1330_device::writebyte(offs_t address, UINT8 data)
{
- space()->write_byte(address, data);
+ space().write_byte(address, data);
}
diff --git a/src/emu/video/tms9928a.c b/src/emu/video/tms9928a.c
index 4702e6f028a..491fa45174f 100644
--- a/src/emu/video/tms9928a.c
+++ b/src/emu/video/tms9928a.c
@@ -619,7 +619,7 @@ void tms9928a_device::device_start()
m_irq_changed.resolve( m_out_int_line, *this );
// Video RAM is allocated as an own address space
- m_vram_space = space(AS_DATA);
+ m_vram_space = &space(AS_DATA);
/* back bitmap */
m_tmpbmp.allocate(TMS9928A_TOTAL_HORZ, TMS9928A_TOTAL_VERT_PAL);
diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c
index e33519f876d..74f8f3e0eea 100644
--- a/src/emu/video/v9938.c
+++ b/src/emu/video/v9938.c
@@ -614,7 +614,7 @@ void v99x8_device::device_start()
m_size_old = -1;
// Video RAM is allocated as an own address space
- m_vram_space = space(AS_DATA);
+ m_vram_space = &space(AS_DATA);
// allocate VRAM
assert(m_vram_size > 0);
diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c
index 562158d3802..6b38ce0ffdd 100644
--- a/src/mame/audio/8080bw.c
+++ b/src/mame/audio/8080bw.c
@@ -897,7 +897,7 @@ static TIMER_CALLBACK( schaser_effect_555_cb )
static void schaser_reinit_555_time_remain(_8080bw_state *state)
{
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
state->m_schaser_effect_555_time_remain = attotime::from_double(state->m_schaser_effect_555_time_remain_savable);
state->schaser_sh_port_2_w(space, 0, state->m_port_2_last_extra);
}
@@ -918,7 +918,7 @@ MACHINE_START_MEMBER(_8080bw_state,schaser_sh)
MACHINE_RESET_MEMBER(_8080bw_state,schaser_sh)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
m_schaser_effect_555_is_low = 0;
m_schaser_effect_555_timer->adjust(attotime::never);
diff --git a/src/mame/audio/amiga.c b/src/mame/audio/amiga.c
index c66c754952a..5b9d4d069fb 100644
--- a/src/mame/audio/amiga.c
+++ b/src/mame/audio/amiga.c
@@ -76,7 +76,7 @@ INLINE amiga_audio *get_safe_token( device_t *device )
static TIMER_CALLBACK( signal_irq )
{
- amiga_custom_w(*machine.device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | (0x80 << param), 0xffff);
+ amiga_custom_w(machine.device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | (0x80 << param), 0xffff);
}
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index 01c4601a0b0..dd212980712 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -147,7 +147,7 @@ void atarijsa_init(running_machine &machine, const char *testport, int testmask)
/* install POKEY memory handlers */
if (pokey != NULL)
- jsacpu->space(AS_PROGRAM)->install_readwrite_handler(0x2c00, 0x2c0f, read8_delegate(FUNC(pokey_device::read),pokey), write8_delegate(FUNC(pokey_device::write),pokey));
+ jsacpu->space(AS_PROGRAM).install_readwrite_handler(0x2c00, 0x2c0f, read8_delegate(FUNC(pokey_device::read),pokey), write8_delegate(FUNC(pokey_device::write),pokey));
init_save_state(machine);
atarijsa_reset();
diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c
index a7a5e954d14..384f566cbe5 100644
--- a/src/mame/audio/cage.c
+++ b/src/mame/audio/cage.c
@@ -177,7 +177,7 @@ void cage_init(running_machine &machine, offs_t speedup)
state->timer[1] = machine.device<timer_device>("cage_timer1");
if (speedup)
- state->speedup_ram = state->cpu->space(AS_PROGRAM)->install_legacy_write_handler(speedup, speedup, FUNC(speedup_w));
+ state->speedup_ram = state->cpu->space(AS_PROGRAM).install_legacy_write_handler(speedup, speedup, FUNC(speedup_w));
for (chan = 0; chan < DAC_BUFFER_CHANNELS; chan++)
{
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index d966c83c80e..7e49507b57f 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -1491,7 +1491,7 @@ static SOUND_RESET( qb3_sound )
{
cinemat_state *state = machine.driver_data<cinemat_state>();
SOUND_RESET_CALL(demon_sound);
- machine.device("maincpu")->memory().space(AS_IO)->install_write_handler(0x04, 0x04, write8_delegate(FUNC(cinemat_state::qb3_sound_w),state));
+ machine.device("maincpu")->memory().space(AS_IO).install_write_handler(0x04, 0x04, write8_delegate(FUNC(cinemat_state::qb3_sound_w),state));
/* this patch prevents the sound ROM from eating itself when command $0A is sent */
/* on a cube rotate */
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index 753f0b7e3d9..d2f4a7add30 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -944,8 +944,8 @@ void dcs_init(running_machine &machine)
/* find the DCS CPU and the sound ROMs */
dcs.cpu = machine.device<adsp21xx_device>("dcs");
- dcs.program = dcs.cpu->space(AS_PROGRAM);
- dcs.data = dcs.cpu->space(AS_DATA);
+ dcs.program = &dcs.cpu->space(AS_PROGRAM);
+ dcs.data = &dcs.cpu->space(AS_DATA);
dcs.rev = 1;
dcs.channels = 1;
dcs.dmadac[0] = machine.device<dmadac_sound_device>("dac");
@@ -997,8 +997,8 @@ void dcs2_init(running_machine &machine, int dram_in_mb, offs_t polling_offset)
dcs.rev = 4;
soundbank_words = 0x800;
}
- dcs.program = dcs.cpu->space(AS_PROGRAM);
- dcs.data = dcs.cpu->space(AS_DATA);
+ dcs.program = &dcs.cpu->space(AS_PROGRAM);
+ dcs.data = &dcs.cpu->space(AS_DATA);
dcs.channels = 2;
dcs.dmadac[0] = machine.device<dmadac_sound_device>("dac1");
dcs.dmadac[1] = machine.device<dmadac_sound_device>("dac2");
@@ -1036,7 +1036,7 @@ void dcs2_init(running_machine &machine, int dram_in_mb, offs_t polling_offset)
/* install the speedup handler */
dcs.polling_offset = polling_offset;
if (polling_offset)
- dcs.polling_base = dcs.cpu->space(AS_DATA)->install_legacy_readwrite_handler(dcs.polling_offset, dcs.polling_offset, FUNC(dcs_polling_r), FUNC(dcs_polling_w));
+ dcs.polling_base = dcs.cpu->space(AS_DATA).install_legacy_readwrite_handler(dcs.polling_offset, dcs.polling_offset, FUNC(dcs_polling_r), FUNC(dcs_polling_w));
/* allocate a watchdog timer for HLE transfers */
dcs.transfer.hle_enabled = (ENABLE_HLE_TRANSFERS && dram_in_mb != 0);
@@ -1175,7 +1175,7 @@ static void sdrc_remap_memory(running_machine &machine)
/* reinstall the polling hotspot */
if (dcs.polling_offset)
- dcs.polling_base = dcs.cpu->space(AS_DATA)->install_legacy_readwrite_handler(dcs.polling_offset, dcs.polling_offset, FUNC(dcs_polling_r), FUNC(dcs_polling_w));
+ dcs.polling_base = dcs.cpu->space(AS_DATA).install_legacy_readwrite_handler(dcs.polling_offset, dcs.polling_offset, FUNC(dcs_polling_r), FUNC(dcs_polling_w));
}
@@ -2137,7 +2137,7 @@ static TIMER_CALLBACK( s1_ack_callback2 )
machine.scheduler().timer_set(attotime::from_usec(1), FUNC(s1_ack_callback2), param);
return;
}
- output_latch_w(*dcs.cpu->space(AS_PROGRAM), 0, 0x000a, 0xffff);
+ output_latch_w(dcs.cpu->space(AS_PROGRAM), 0, 0x000a, 0xffff);
}
@@ -2149,7 +2149,7 @@ static TIMER_CALLBACK( s1_ack_callback1 )
machine.scheduler().timer_set(attotime::from_usec(1), FUNC(s1_ack_callback1), param);
return;
}
- output_latch_w(*dcs.cpu->space(AS_PROGRAM), 0, param, 0xffff);
+ output_latch_w(dcs.cpu->space(AS_PROGRAM), 0, param, 0xffff);
/* chain to the next word we need to write back */
machine.scheduler().timer_set(attotime::from_usec(1), FUNC(s1_ack_callback2));
@@ -2281,7 +2281,7 @@ static int preprocess_stage_1(running_machine &machine, UINT16 data)
static TIMER_CALLBACK( s2_ack_callback )
{
- address_space &space = *dcs.cpu->space(AS_PROGRAM);
+ address_space &space = dcs.cpu->space(AS_PROGRAM);
/* if the output is full, stall for a usec */
if (IS_OUTPUT_FULL())
diff --git a/src/mame/audio/harddriv.c b/src/mame/audio/harddriv.c
index 0f47974f0b4..7b7f908c794 100644
--- a/src/mame/audio/harddriv.c
+++ b/src/mame/audio/harddriv.c
@@ -231,13 +231,13 @@ WRITE16_MEMBER(harddriv_state::hdsnd68k_320ram_w)
READ16_MEMBER(harddriv_state::hdsnd68k_320ports_r)
{
- return m_sounddsp->space(AS_IO)->read_word((offset & 7) << 1);
+ return m_sounddsp->space(AS_IO).read_word((offset & 7) << 1);
}
WRITE16_MEMBER(harddriv_state::hdsnd68k_320ports_w)
{
- m_sounddsp->space(AS_IO)->write_word((offset & 7) << 1, data);
+ m_sounddsp->space(AS_IO).write_word((offset & 7) << 1, data);
}
diff --git a/src/mame/audio/hyprolyb.c b/src/mame/audio/hyprolyb.c
index 8ed7102f7aa..e62a35c1b81 100644
--- a/src/mame/audio/hyprolyb.c
+++ b/src/mame/audio/hyprolyb.c
@@ -24,7 +24,7 @@ static DEVICE_START( hyprolyb_adpcm )
{
hyprolyb_adpcm_state *state = get_safe_token(device);
- state->m_space = device->machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ state->m_space = &device->machine().device("audiocpu")->memory().space(AS_PROGRAM);
state->m_msm = device->machine().device("msm");
device->save_item(NAME(state->m_adpcm_ready)); // only bootlegs
device->save_item(NAME(state->m_adpcm_busy));
diff --git a/src/mame/audio/jaguar.c b/src/mame/audio/jaguar.c
index 161851b5dfc..660069a25bc 100644
--- a/src/mame/audio/jaguar.c
+++ b/src/mame/audio/jaguar.c
@@ -202,7 +202,7 @@ void jaguar_state::sound_start()
#if ENABLE_SPEEDUP_HACKS
if (m_hacks_enabled)
- m_dsp->space(AS_PROGRAM)->install_write_handler(0xf1a100, 0xf1a103, write32_delegate(FUNC(jaguar_state::dsp_flags_w), this));
+ m_dsp->space(AS_PROGRAM).install_write_handler(0xf1a100, 0xf1a103, write32_delegate(FUNC(jaguar_state::dsp_flags_w), this));
#endif
}
diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c
index fd842def0ad..ad3ca46a23f 100644
--- a/src/mame/audio/leland.c
+++ b/src/mame/audio/leland.c
@@ -385,7 +385,7 @@ static STREAM_UPDATE( leland_80186_dac_update )
static STREAM_UPDATE( leland_80186_dma_update )
{
leland_sound_state *state = get_safe_token(device);
- address_space *dmaspace = (address_space *)param;
+ address_space &dmaspace = *(address_space *)param;
stream_sample_t *buffer = outputs[0];
int i, j;
@@ -434,7 +434,7 @@ static STREAM_UPDATE( leland_80186_dma_update )
/* sample-rate convert to the output frequency */
for (j = 0; j < samples && count > 0; j++)
{
- buffer[j] += ((int)dmaspace->read_byte(source) - 0x80) * volume;
+ buffer[j] += ((int)dmaspace.read_byte(source) - 0x80) * volume;
frac += step;
source += frac >> 24;
count -= frac >> 24;
@@ -521,14 +521,14 @@ static DEVICE_START( common_sh_start )
{
leland_sound_state *state = get_safe_token(device);
running_machine &machine = device->machine();
- address_space *dmaspace = machine.device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &dmaspace = machine.device("audiocpu")->memory().space(AS_PROGRAM);
int i;
/* determine which sound hardware is installed */
state->m_has_ym2151 = (device->machine().device("ymsnd") != NULL);
/* allocate separate streams for the DMA and non-DMA DACs */
- state->m_dma_stream = device->machine().sound().stream_alloc(*device, 0, 1, OUTPUT_RATE, (void *)dmaspace, leland_80186_dma_update);
+ state->m_dma_stream = device->machine().sound().stream_alloc(*device, 0, 1, OUTPUT_RATE, (void *)&dmaspace, leland_80186_dma_update);
state->m_nondma_stream = device->machine().sound().stream_alloc(*device, 0, 1, OUTPUT_RATE, NULL, leland_80186_dac_update);
/* if we have a 2151, install an externally driven DAC stream */
@@ -539,7 +539,7 @@ static DEVICE_START( common_sh_start )
}
/* create timers here so they stick around */
- state->m_i80186.cpu = &dmaspace->device();
+ state->m_i80186.cpu = &dmaspace.device();
state->m_i80186.timer[0].int_timer = machine.scheduler().timer_alloc(FUNC(internal_timer_int), device);
state->m_i80186.timer[1].int_timer = machine.scheduler().timer_alloc(FUNC(internal_timer_int), device);
state->m_i80186.timer[2].int_timer = machine.scheduler().timer_alloc(FUNC(internal_timer_int), device);
@@ -1591,12 +1591,12 @@ static WRITE16_DEVICE_HANDLER( i80186_internal_port_w )
temp = (state->m_i80186.mem.peripheral & 0xffc0) << 4;
if (state->m_i80186.mem.middle_size & 0x0040)
{
- state->m_i80186.cpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(*device, temp, temp + 0x2ff, FUNC(peripheral_r), FUNC(peripheral_w));
+ state->m_i80186.cpu->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(*device, temp, temp + 0x2ff, FUNC(peripheral_r), FUNC(peripheral_w));
}
else
{
temp &= 0xffff;
- state->m_i80186.cpu->memory().space(AS_IO)->install_legacy_readwrite_handler(*device, temp, temp + 0x2ff, FUNC(peripheral_r), FUNC(peripheral_w));
+ state->m_i80186.cpu->memory().space(AS_IO).install_legacy_readwrite_handler(*device, temp, temp + 0x2ff, FUNC(peripheral_r), FUNC(peripheral_w));
}
/* we need to do this at a time when the 80186 context is swapped in */
@@ -1662,12 +1662,12 @@ static WRITE16_DEVICE_HANDLER( i80186_internal_port_w )
temp = (data & 0x0fff) << 8;
if (data & 0x1000)
{
- state->m_i80186.cpu->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(*device, temp, temp + 0xff, FUNC(i80186_internal_port_r), FUNC(i80186_internal_port_w));
+ state->m_i80186.cpu->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(*device, temp, temp + 0xff, FUNC(i80186_internal_port_r), FUNC(i80186_internal_port_w));
}
else
{
temp &= 0xffff;
- state->m_i80186.cpu->memory().space(AS_IO)->install_legacy_readwrite_handler(*device, temp, temp + 0xff, FUNC(i80186_internal_port_r), FUNC(i80186_internal_port_w));
+ state->m_i80186.cpu->memory().space(AS_IO).install_legacy_readwrite_handler(*device, temp, temp + 0xff, FUNC(i80186_internal_port_r), FUNC(i80186_internal_port_w));
}
/* popmessage("Sound CPU reset");*/
break;
diff --git a/src/mame/audio/m72.c b/src/mame/audio/m72.c
index 21e392b4382..3e9c30a813c 100644
--- a/src/mame/audio/m72.c
+++ b/src/mame/audio/m72.c
@@ -125,7 +125,7 @@ static DEVICE_START( m72_audio )
state->samples = device->machine().root_device().memregion("samples")->base();
state->samples_size = device->machine().root_device().memregion("samples")->bytes();
- state->space = device->machine().device("soundcpu")->memory().space(AS_IO);
+ state->space = &device->machine().device("soundcpu")->memory().space(AS_IO);
state->dac = device->machine().device<dac_device>("dac");
device->save_item(NAME(state->irqvector));
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 301f066da89..7f01dd1f7d1 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -425,7 +425,7 @@ static SOUND_START( mario )
if (audiocpu != NULL && audiocpu->type() != Z80)
{
state->m_eabank = "bank1";
- audiocpu->memory().space(AS_PROGRAM)->install_read_bank(0x000, 0x7ff, "bank1");
+ audiocpu->memory().space(AS_PROGRAM).install_read_bank(0x000, 0x7ff, "bank1");
state->membank("bank1")->configure_entry(0, state->memregion("audiocpu")->base());
state->membank("bank1")->configure_entry(1, state->memregion("audiocpu")->base() + 0x1000);
}
@@ -437,7 +437,7 @@ static SOUND_START( mario )
static SOUND_RESET( mario )
{
mario_state *state = machine.driver_data<mario_state>();
- address_space &space = *machine.device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("audiocpu")->memory().space(AS_PROGRAM);
#if USE_8039
set_ea(machine, 1);
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index 33e833aa0a8..2228d7ab0d8 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -127,7 +127,7 @@ READ8_DEVICE_HANDLER( hotshock_soundlatch_r )
{
driver_device *drvstate = space.machine().driver_data<driver_device>();
space.machine().device("audiocpu")->execute().set_input_line(0, CLEAR_LINE);
- return drvstate->soundlatch_byte_r(*space.machine().device("audiocpu")->memory().space(AS_PROGRAM),0);
+ return drvstate->soundlatch_byte_r(space.machine().device("audiocpu")->memory().space(AS_PROGRAM),0);
}
static void filter_w(device_t *device, int data)
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index a17a2953f25..f1a95c28ca7 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -104,7 +104,7 @@ static UINT8 decrypt_opcode(int a,int src)
void seibu_sound_decrypt(running_machine &machine,const char *cpu,int length)
{
- address_space &space = *machine.device(cpu)->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(cpu)->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine, UINT8, length);
UINT8 *rom = machine.root_device().memregion(cpu)->base();
int i;
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index b1e2b80ad4c..81fdd42f742 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -129,7 +129,7 @@ WRITE_LINE_MEMBER(williams_cvsd_sound_device::reset_write)
// going high halts the CPU
if (state)
{
- bank_select_w(*m_cpu->space(), 0, 0);
+ bank_select_w(m_cpu->space(), 0, 0);
device_reset();
m_cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
@@ -404,8 +404,8 @@ WRITE_LINE_MEMBER(williams_narc_sound_device::reset_write)
// going high halts the CPU
if (state)
{
- master_bank_select_w(*m_cpu0->space(), 0, 0);
- slave_bank_select_w(*m_cpu1->space(), 0, 0);
+ master_bank_select_w(m_cpu0->space(), 0, 0);
+ slave_bank_select_w(m_cpu1->space(), 0, 0);
device_reset();
m_cpu0->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
m_cpu1->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
@@ -772,7 +772,7 @@ WRITE_LINE_MEMBER(williams_adpcm_sound_device::reset_write)
// going high halts the CPU
if (state)
{
- bank_select_w(*m_cpu->space(), 0, 0);
+ bank_select_w(m_cpu->space(), 0, 0);
device_reset();
m_cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c
index 3c03db0f443..358d3157a8d 100644
--- a/src/mame/drivers/1943.c
+++ b/src/mame/drivers/1943.c
@@ -650,7 +650,7 @@ DRIVER_INIT_MEMBER(_1943_state,1943b)
DRIVER_INIT_CALL(1943);
//it expects 0x00 to be returned from the protection reads because the protection has been patched out.
//AM_RANGE(0xc007, 0xc007) AM_READ(c1943_protection_r)
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc007, 0xc007, read8_delegate(FUNC(_1943_state::_1943b_c007_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc007, 0xc007, read8_delegate(FUNC(_1943_state::_1943b_c007_r),this));
}
diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c
index 6b98d85e599..56d4dff1d14 100644
--- a/src/mame/drivers/39in1.c
+++ b/src/mame/drivers/39in1.c
@@ -280,7 +280,7 @@ static void pxa255_dma_load_descriptor_and_start(running_machine& machine, int c
// Load the next descriptor
- address_space &space = *machine.device<pxa255_device>("maincpu")->space(AS_PROGRAM);
+ address_space &space = machine.device<pxa255_device>("maincpu")->space(AS_PROGRAM);
dma_regs->dsadr[channel] = space.read_dword(dma_regs->ddadr[channel] + 0x4);
dma_regs->dtadr[channel] = space.read_dword(dma_regs->ddadr[channel] + 0x8);
dma_regs->dcmd[channel] = space.read_dword(dma_regs->ddadr[channel] + 0xc);
@@ -320,7 +320,7 @@ static TIMER_CALLBACK( pxa255_dma_dma_end )
UINT16 temp16;
UINT32 temp32;
- address_space &space = *machine.device<pxa255_device>("maincpu")->space(AS_PROGRAM);
+ address_space &space = machine.device<pxa255_device>("maincpu")->space(AS_PROGRAM);
switch(param)
{
case 3:
@@ -1113,7 +1113,7 @@ static void pxa255_lcd_dma_kickoff(running_machine& machine, int channel)
if(lcd_regs->dma[channel].ldcmd & PXA255_LDCMD_PAL)
{
- address_space &space = *machine.device<pxa255_device>("maincpu")->space(AS_PROGRAM);
+ address_space &space = machine.device<pxa255_device>("maincpu")->space(AS_PROGRAM);
int length = lcd_regs->dma[channel].ldcmd & 0x000fffff;
int index = 0;
for(index = 0; index < length; index += 2)
@@ -1125,7 +1125,7 @@ static void pxa255_lcd_dma_kickoff(running_machine& machine, int channel)
}
else
{
- address_space &space = *machine.device<pxa255_device>("maincpu")->space(AS_PROGRAM);
+ address_space &space = machine.device<pxa255_device>("maincpu")->space(AS_PROGRAM);
int length = lcd_regs->dma[channel].ldcmd & 0x000fffff;
int index = 0;
for(index = 0; index < length; index++)
@@ -1145,7 +1145,7 @@ static void pxa255_lcd_check_load_next_branch(running_machine& machine, int chan
{
verboselog( machine, 4, "pxa255_lcd_check_load_next_branch: Taking branch\n" );
lcd_regs->fbr[channel] &= ~1;
- address_space &space = *machine.device<pxa255_device>("maincpu")->space(AS_PROGRAM);
+ address_space &space = machine.device<pxa255_device>("maincpu")->space(AS_PROGRAM);
//lcd_regs->fbr[channel] = (space.read_dword(lcd_regs->fbr[channel] & 0xfffffff0) & 0xfffffff0) | (lcd_regs->fbr[channel] & 0x00000003);
//printf( "%08x\n", lcd_regs->fbr[channel] );
pxa255_lcd_load_dma_descriptor(space, lcd_regs->fbr[channel] & 0xfffffff0, 0);
@@ -1466,7 +1466,7 @@ DRIVER_INIT_MEMBER(_39in1_state,39in1)
m_dmadac[1] = machine().device<dmadac_sound_device>("dac2");
m_eeprom = machine().device<eeprom_device>("eeprom");
- address_space &space = *machine().device<pxa255_device>("maincpu")->space(AS_PROGRAM);
+ address_space &space = machine().device<pxa255_device>("maincpu")->space(AS_PROGRAM);
space.install_read_handler (0xa0151648, 0xa015164b, read32_delegate(FUNC(_39in1_state::prot_cheater_r), this));
}
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index 05ee0b431bd..1433fe75b5b 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -2532,7 +2532,7 @@ WRITE8_MEMBER(_8080bw_state::invmulti_bank_w)
MACHINE_RESET_MEMBER(_8080bw_state,invmulti)
{
- invmulti_bank_w(*m_maincpu->space(AS_PROGRAM), 0, 0);
+ invmulti_bank_w(m_maincpu->space(AS_PROGRAM), 0, 0);
MACHINE_RESET_CALL_MEMBER(mw8080bw);
}
diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c
index 5770b1a3280..c94a671e084 100644
--- a/src/mame/drivers/adp.c
+++ b/src/mame/drivers/adp.c
@@ -280,7 +280,7 @@ static void duart_tx( device_t *device, int channel, UINT8 data )
adp_state *state = device->machine().driver_data<adp_state>();
if (channel == 0)
{
- state->m_microtouch->rx(*device->machine().memory().first_space(), 0, data);
+ state->m_microtouch->rx(device->machine().driver_data()->generic_space(), 0, data);
}
}
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 3b74e1aa5a8..eb18935dee2 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -783,7 +783,7 @@ ROM_END
DRIVER_INIT_MEMBER(airbustr_state,airbustr)
{
- machine().device("master")->memory().space(AS_PROGRAM)->install_read_handler(0xe000, 0xefff, read8_delegate(FUNC(airbustr_state::devram_r),this)); // protection device lives here
+ machine().device("master")->memory().space(AS_PROGRAM).install_read_handler(0xe000, 0xefff, read8_delegate(FUNC(airbustr_state::devram_r),this)); // protection device lives here
}
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index b952fe37bbf..fb7ef91a3be 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -3151,7 +3151,7 @@ DRIVER_INIT_MEMBER(alpha68k_state,kyros)
DRIVER_INIT_MEMBER(alpha68k_state,jongbou)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0c0000, 0x0c0001, read16_delegate(FUNC(alpha68k_state::jongbou_inputs_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0c0000, 0x0c0001, read16_delegate(FUNC(alpha68k_state::jongbou_inputs_r),this));
m_invert_controls = 0;
m_microcontroller_id = 0x00ff;
m_coin_id = 0x23 | (0x24 << 8);
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index 4bc50c4204a..c7baf38dc84 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -612,7 +612,7 @@ DRIVER_INIT_MEMBER(appoooh_state,robowres)
DRIVER_INIT_MEMBER(appoooh_state,robowresb)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.set_decrypted_region(0x0000, 0x7fff, machine().root_device().memregion("maincpu")->base() + 0x1c000);
}
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index 4912e4ab055..dcc50186df1 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -122,11 +122,11 @@ WRITE8_MEMBER(arcadia_amiga_state::arcadia_cia_0_porta_w)
/* swap the write handlers between ROM and bank 1 based on the bit */
if ((data & 1) == 0)
/* overlay disabled, map RAM on 0x000000 */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x000000, 0x07ffff, "bank1");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x000000, 0x07ffff, "bank1");
else
/* overlay enabled, map Amiga system ROM on 0x000000 */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x000000, 0x07ffff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x000000, 0x07ffff);
/* bit 2 = Power Led on Amiga */
set_led_status(machine(), 0, (data & 2) ? 0 : 1);
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 6016478c4e4..14a7d9524f3 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -1572,10 +1572,10 @@ ROM_END
static void arkanoid_bootleg_init( running_machine &machine )
{
arkanoid_state *state = machine.driver_data<arkanoid_state>();
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xf000, 0xf000, read8_delegate(FUNC(arkanoid_state::arkanoid_bootleg_f000_r),state) );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xf002, 0xf002, read8_delegate(FUNC(arkanoid_state::arkanoid_bootleg_f002_r),state) );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xd018, 0xd018, write8_delegate(FUNC(arkanoid_state::arkanoid_bootleg_d018_w),state) );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd008, 0xd008, read8_delegate(FUNC(arkanoid_state::arkanoid_bootleg_d008_r),state) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xf000, 0xf000, read8_delegate(FUNC(arkanoid_state::arkanoid_bootleg_f000_r),state) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xf002, 0xf002, read8_delegate(FUNC(arkanoid_state::arkanoid_bootleg_f002_r),state) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xd018, 0xd018, write8_delegate(FUNC(arkanoid_state::arkanoid_bootleg_d018_w),state) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd008, 0xd008, read8_delegate(FUNC(arkanoid_state::arkanoid_bootleg_d008_r),state) );
}
DRIVER_INIT_MEMBER(arkanoid_state,arkangc)
@@ -1660,7 +1660,7 @@ DRIVER_INIT_MEMBER(arkanoid_state,tetrsark)
ROM[x] = ROM[x] ^ 0x94;
}
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xd008, 0xd008, write8_delegate(FUNC(arkanoid_state::tetrsark_d008_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xd008, 0xd008, write8_delegate(FUNC(arkanoid_state::tetrsark_d008_w),this));
}
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index de4ea0773f9..a200c056eae 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -2036,24 +2036,24 @@ DRIVER_INIT_MEMBER(armedf_state,terraf)
{
m_scroll_type = 0;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::bootleg_io_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07c006, 0x07c007, write16_delegate(FUNC(armedf_state::terraf_fg_scrolly_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07c008, 0x07c009, write16_delegate(FUNC(armedf_state::terraf_fg_scrollx_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0c0000, 0x0c0001, write16_delegate(FUNC(armedf_state::terraf_fg_scroll_msb_arm_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::bootleg_io_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x07c006, 0x07c007, write16_delegate(FUNC(armedf_state::terraf_fg_scrolly_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x07c008, 0x07c009, write16_delegate(FUNC(armedf_state::terraf_fg_scrollx_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0c0001, write16_delegate(FUNC(armedf_state::terraf_fg_scroll_msb_arm_w),this));
}
DRIVER_INIT_MEMBER(armedf_state,terrafu)
{
m_scroll_type = 0;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::terraf_io_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::terraf_io_w),this));
}
DRIVER_INIT_MEMBER(armedf_state,terrafb)
{
m_scroll_type = 0;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::terrafb_io_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::terrafb_io_w),this));
}
DRIVER_INIT_MEMBER(armedf_state,armedf)
@@ -2066,7 +2066,7 @@ DRIVER_INIT_MEMBER(armedf_state,kozure)
{
m_scroll_type = 0;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::terraf_io_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::terraf_io_w),this));
}
@@ -2081,7 +2081,7 @@ DRIVER_INIT_MEMBER(armedf_state,legion)
RAM[0x000488 / 2] = 0x4e71;
#endif
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::terraf_io_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::terraf_io_w),this));
m_scroll_type = 2;
}
@@ -2096,7 +2096,7 @@ DRIVER_INIT_MEMBER(armedf_state,legiono)
/* No need to patch the checksum routine (see notes) ! */
#endif
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::bootleg_io_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::bootleg_io_w),this));
m_scroll_type = 2;
}
@@ -2104,7 +2104,7 @@ DRIVER_INIT_MEMBER(armedf_state,legiono)
DRIVER_INIT_MEMBER(armedf_state,cclimbr2)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::terraf_io_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x07c000, 0x07c001, write16_delegate(FUNC(armedf_state::terraf_io_w),this));
m_scroll_type = 3;
}
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index 28d80cf0871..443be53df01 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -1164,7 +1164,7 @@ DRIVER_INIT_MEMBER(artmagic_state,ultennis)
m_protection_handler = ultennis_protection;
/* additional (protection?) hack */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x300000, 0x300001, read16_delegate(FUNC(artmagic_state::ultennis_hack_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x300000, 0x300001, read16_delegate(FUNC(artmagic_state::ultennis_hack_r),this));
}
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index 52cbfbde550..a503034739e 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -951,14 +951,14 @@ ROM_END
DRIVER_INIT_MEMBER(asteroid_state,asteroidb)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x2000, 0x2000, "IN0");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x2003, 0x2003, "HS");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x2000, 0x2000, "IN0");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x2003, 0x2003, "HS");
}
DRIVER_INIT_MEMBER(asteroid_state,asterock)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x2000, 0x2007, read8_delegate(FUNC(asteroid_state::asterock_IN0_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x2000, 0x2007, read8_delegate(FUNC(asteroid_state::asterock_IN0_r),this));
}
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 9e404c1fae2..6cc23c755c7 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -421,18 +421,18 @@ WRITE8_MEMBER(astrocde_state::profpac_banksw_w)
int bank = (data >> 5) & 3;
/* this is accessed from I/O &space but modifies program &space, so we normalize here */
- address_space *prog_space = space.device().memory().space(AS_PROGRAM);
+ address_space &prog_space = space.device().memory().space(AS_PROGRAM);
/* remember the banking bits for save state support */
m_profpac_bank = data;
/* set the main banking */
- prog_space->install_read_bank(0x4000, 0xbfff, "bank1");
+ prog_space.install_read_bank(0x4000, 0xbfff, "bank1");
membank("bank1")->set_base(machine().root_device().memregion("user1")->base() + 0x8000 * bank);
/* bank 0 reads video RAM in the 4000-7FFF range */
if (bank == 0)
- prog_space->install_read_handler(0x4000, 0x7fff, read8_delegate(FUNC(astrocde_state::profpac_videoram_r),this));
+ prog_space.install_read_handler(0x4000, 0x7fff, read8_delegate(FUNC(astrocde_state::profpac_videoram_r),this));
/* if we have a 640k EPROM board, map that on top of the 4000-7FFF range if specified */
if ((data & 0x80) && memregion("user2")->base() != NULL)
@@ -443,11 +443,11 @@ WRITE8_MEMBER(astrocde_state::profpac_banksw_w)
/* if the bank is in range, map the appropriate bank */
if (bank < 0x28)
{
- prog_space->install_read_bank(0x4000, 0x7fff, "bank2");
+ prog_space.install_read_bank(0x4000, 0x7fff, "bank2");
membank("bank2")->set_base(machine().root_device().memregion("user2")->base() + 0x4000 * bank);
}
else
- prog_space->unmap_read(0x4000, 0x7fff);
+ prog_space.unmap_read(0x4000, 0x7fff);
}
}
@@ -455,7 +455,7 @@ WRITE8_MEMBER(astrocde_state::profpac_banksw_w)
static void profbank_banksw_restore(running_machine &machine)
{
astrocde_state *state = machine.driver_data<astrocde_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_IO);
+ address_space &space = machine.device("maincpu")->memory().space(AS_IO);
state->profpac_banksw_w(space, 0, state->m_profpac_bank);
}
@@ -1734,98 +1734,98 @@ ROM_END
DRIVER_INIT_MEMBER(astrocde_state,seawolf2)
{
m_video_config = 0x00;
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x40, 0x40, 0, 0xff18, write8_delegate(FUNC(astrocde_state::seawolf2_sound_1_w),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x41, 0x41, 0, 0xff18, write8_delegate(FUNC(astrocde_state::seawolf2_sound_2_w),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x42, 0x43, 0, 0xff18, write8_delegate(FUNC(astrocde_state::seawolf2_lamps_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x40, 0x40, 0, 0xff18, write8_delegate(FUNC(astrocde_state::seawolf2_sound_1_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x41, 0x41, 0, 0xff18, write8_delegate(FUNC(astrocde_state::seawolf2_sound_2_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x42, 0x43, 0, 0xff18, write8_delegate(FUNC(astrocde_state::seawolf2_lamps_w),this));
}
DRIVER_INIT_MEMBER(astrocde_state,ebases)
{
m_video_config = AC_SOUND_PRESENT;
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x20, 0x20, 0, 0xff07, write8_delegate(FUNC(astrocde_state::ebases_coin_w),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x28, 0x28, 0, 0xff07, write8_delegate(FUNC(astrocde_state::ebases_trackball_select_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x20, 0x20, 0, 0xff07, write8_delegate(FUNC(astrocde_state::ebases_coin_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x28, 0x28, 0, 0xff07, write8_delegate(FUNC(astrocde_state::ebases_trackball_select_w),this));
}
DRIVER_INIT_MEMBER(astrocde_state,spacezap)
{
m_video_config = AC_SOUND_PRESENT | AC_MONITOR_BW;
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x13, 0x13, 0x03ff, 0xff00, read8_delegate(FUNC(astrocde_state::spacezap_io_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x13, 0x13, 0x03ff, 0xff00, read8_delegate(FUNC(astrocde_state::spacezap_io_r),this));
}
DRIVER_INIT_MEMBER(astrocde_state,wow)
{
m_video_config = AC_SOUND_PRESENT | AC_LIGHTPEN_INTS | AC_STARS;
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x15, 0x15, 0x0fff, 0xff00, read8_delegate(FUNC(astrocde_state::wow_io_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_legacy_read_handler(0x17, 0x17, 0xffff, 0xff00, FUNC(wow_speech_r));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x15, 0x15, 0x0fff, 0xff00, read8_delegate(FUNC(astrocde_state::wow_io_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_legacy_read_handler(0x17, 0x17, 0xffff, 0xff00, FUNC(wow_speech_r));
}
DRIVER_INIT_MEMBER(astrocde_state,gorf)
{
m_video_config = AC_SOUND_PRESENT | AC_LIGHTPEN_INTS | AC_STARS;
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x15, 0x15, 0x0fff, 0xff00, read8_delegate(FUNC(astrocde_state::gorf_io_1_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x16, 0x16, 0x0fff, 0xff00, read8_delegate(FUNC(astrocde_state::gorf_io_2_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_legacy_read_handler(0x17, 0x17, 0xffff, 0xff00, FUNC(gorf_speech_r));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x15, 0x15, 0x0fff, 0xff00, read8_delegate(FUNC(astrocde_state::gorf_io_1_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x16, 0x16, 0x0fff, 0xff00, read8_delegate(FUNC(astrocde_state::gorf_io_2_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_legacy_read_handler(0x17, 0x17, 0xffff, 0xff00, FUNC(gorf_speech_r));
}
DRIVER_INIT_MEMBER(astrocde_state,robby)
{
m_video_config = AC_SOUND_PRESENT;
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x15, 0x15, 0x0fff, 0xff00, read8_delegate(FUNC(astrocde_state::robby_io_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x15, 0x15, 0x0fff, 0xff00, read8_delegate(FUNC(astrocde_state::robby_io_r),this));
}
DRIVER_INIT_MEMBER(astrocde_state,profpac)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
m_video_config = AC_SOUND_PRESENT;
- iospace->install_read_handler(0x14, 0x14, 0x0fff, 0xff00, read8_delegate(FUNC(astrocde_state::profpac_io_1_r),this));
- iospace->install_read_handler(0x15, 0x15, 0x77ff, 0xff00, read8_delegate(FUNC(astrocde_state::profpac_io_2_r),this));
+ iospace.install_read_handler(0x14, 0x14, 0x0fff, 0xff00, read8_delegate(FUNC(astrocde_state::profpac_io_1_r),this));
+ iospace.install_read_handler(0x15, 0x15, 0x77ff, 0xff00, read8_delegate(FUNC(astrocde_state::profpac_io_2_r),this));
/* reset banking */
- profpac_banksw_w(*iospace, 0, 0);
+ profpac_banksw_w(iospace, 0, 0);
machine().save().register_postload(save_prepost_delegate(FUNC(profbank_banksw_restore), &machine()));
}
DRIVER_INIT_MEMBER(astrocde_state,demndrgn)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
m_video_config = 0x00;
- iospace->install_read_handler(0x14, 0x14, 0x1fff, 0xff00, read8_delegate(FUNC(astrocde_state::demndrgn_io_r),this));
- iospace->install_read_port(0x1c, 0x1c, 0x0000, 0xff00, "FIREX");
- iospace->install_read_port(0x1d, 0x1d, 0x0000, 0xff00, "FIREY");
- iospace->install_write_handler(0x97, 0x97, 0x0000, 0xff00, write8_delegate(FUNC(astrocde_state::demndrgn_sound_w),this));
+ iospace.install_read_handler(0x14, 0x14, 0x1fff, 0xff00, read8_delegate(FUNC(astrocde_state::demndrgn_io_r),this));
+ iospace.install_read_port(0x1c, 0x1c, 0x0000, 0xff00, "FIREX");
+ iospace.install_read_port(0x1d, 0x1d, 0x0000, 0xff00, "FIREY");
+ iospace.install_write_handler(0x97, 0x97, 0x0000, 0xff00, write8_delegate(FUNC(astrocde_state::demndrgn_sound_w),this));
/* reset banking */
- profpac_banksw_w(*iospace, 0, 0);
+ profpac_banksw_w(iospace, 0, 0);
machine().save().register_postload(save_prepost_delegate(FUNC(profbank_banksw_restore), &machine()));
}
DRIVER_INIT_MEMBER(astrocde_state,tenpindx)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
m_video_config = 0x00;
- iospace->install_read_port(0x60, 0x60, 0x0000, 0xff00, "P60");
- iospace->install_read_port(0x61, 0x61, 0x0000, 0xff00, "P61");
- iospace->install_read_port(0x62, 0x62, 0x0000, 0xff00, "P62");
- iospace->install_read_port(0x63, 0x63, 0x0000, 0xff00, "P63");
- iospace->install_read_port(0x64, 0x64, 0x0000, 0xff00, "P64");
- iospace->install_write_handler(0x65, 0x66, 0x0000, 0xff00, write8_delegate(FUNC(astrocde_state::tenpindx_lamp_w),this));
- iospace->install_write_handler(0x67, 0x67, 0x0000, 0xff00, write8_delegate(FUNC(astrocde_state::tenpindx_counter_w),this));
- iospace->install_write_handler(0x68, 0x68, 0x0000, 0xff00, write8_delegate(FUNC(astrocde_state::tenpindx_lights_w),this));
- iospace->install_write_handler(0x97, 0x97, 0x0000, 0xff00, write8_delegate(FUNC(astrocde_state::tenpindx_sound_w),this));
+ iospace.install_read_port(0x60, 0x60, 0x0000, 0xff00, "P60");
+ iospace.install_read_port(0x61, 0x61, 0x0000, 0xff00, "P61");
+ iospace.install_read_port(0x62, 0x62, 0x0000, 0xff00, "P62");
+ iospace.install_read_port(0x63, 0x63, 0x0000, 0xff00, "P63");
+ iospace.install_read_port(0x64, 0x64, 0x0000, 0xff00, "P64");
+ iospace.install_write_handler(0x65, 0x66, 0x0000, 0xff00, write8_delegate(FUNC(astrocde_state::tenpindx_lamp_w),this));
+ iospace.install_write_handler(0x67, 0x67, 0x0000, 0xff00, write8_delegate(FUNC(astrocde_state::tenpindx_counter_w),this));
+ iospace.install_write_handler(0x68, 0x68, 0x0000, 0xff00, write8_delegate(FUNC(astrocde_state::tenpindx_lights_w),this));
+ iospace.install_write_handler(0x97, 0x97, 0x0000, 0xff00, write8_delegate(FUNC(astrocde_state::tenpindx_sound_w),this));
/* reset banking */
- profpac_banksw_w(*iospace, 0, 0);
+ profpac_banksw_w(iospace, 0, 0);
machine().save().register_postload(save_prepost_delegate(FUNC(profbank_banksw_restore), &machine()));
}
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index a620a9a21cf..52d713499d3 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -1290,8 +1290,8 @@ DRIVER_INIT_MEMBER(astrof_state,abattle)
rom[i] = prom[rom[i]];
/* set up protection handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xa003, 0xa003, read8_delegate(FUNC(astrof_state::shoot_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xa004, 0xa004, read8_delegate(FUNC(astrof_state::abattle_coin_prot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8_delegate(FUNC(astrof_state::shoot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8_delegate(FUNC(astrof_state::abattle_coin_prot_r),this));
}
@@ -1304,8 +1304,8 @@ DRIVER_INIT_MEMBER(astrof_state,afire)
rom[i] = ~rom[i];
/* set up protection handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xa003, 0xa003, read8_delegate(FUNC(astrof_state::shoot_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xa004, 0xa004, read8_delegate(FUNC(astrof_state::afire_coin_prot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8_delegate(FUNC(astrof_state::shoot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8_delegate(FUNC(astrof_state::afire_coin_prot_r),this));
}
@@ -1318,8 +1318,8 @@ DRIVER_INIT_MEMBER(astrof_state,sstarbtl)
rom[i] = ~rom[i];
/* set up protection handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xa003, 0xa003, read8_delegate(FUNC(astrof_state::shoot_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xa004, 0xa004, read8_delegate(FUNC(astrof_state::abattle_coin_prot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8_delegate(FUNC(astrof_state::shoot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8_delegate(FUNC(astrof_state::abattle_coin_prot_r),this));
}
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index 1c2281f0212..910f1e051a5 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -184,7 +184,7 @@ static void pitfightb_cheap_slapstic_init(running_machine &machine)
atarig1_state *state = machine.driver_data<atarig1_state>();
/* install a read handler */
- state->m_bslapstic_base = machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x038000, 0x03ffff, read16_delegate(FUNC(atarig1_state::pitfightb_cheap_slapstic_r),state));
+ state->m_bslapstic_base = machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x038000, 0x03ffff, read16_delegate(FUNC(atarig1_state::pitfightb_cheap_slapstic_r),state));
/* allocate memory for a copy of bank 0 */
state->m_bslapstic_bank0 = auto_alloc_array(machine, UINT8, 0x2000);
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index 12d9f12eb5a..376312cfb19 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -786,9 +786,9 @@ DRIVER_INIT_MEMBER(atarig42_state,roadriot)
m_playfield_base = 0x400;
- address_space *main = machine().device<m68000_device>("maincpu")->space(AS_PROGRAM);
- m_sloop_base = main->install_readwrite_handler(0x000000, 0x07ffff, read16_delegate(FUNC(atarig42_state::roadriot_sloop_data_r),this), write16_delegate(FUNC(atarig42_state::roadriot_sloop_data_w),this));
- main->set_direct_update_handler(direct_update_delegate(FUNC(atarig42_state::atarig42_sloop_direct_handler), this));
+ address_space &main = machine().device<m68000_device>("maincpu")->space(AS_PROGRAM);
+ m_sloop_base = main.install_readwrite_handler(0x000000, 0x07ffff, read16_delegate(FUNC(atarig42_state::roadriot_sloop_data_r),this), write16_delegate(FUNC(atarig42_state::roadriot_sloop_data_w),this));
+ main.set_direct_update_handler(direct_update_delegate(FUNC(atarig42_state::atarig42_sloop_direct_handler), this));
asic65_config(machine(), ASIC65_ROMBASED);
/*
@@ -824,9 +824,9 @@ DRIVER_INIT_MEMBER(atarig42_state,guardian)
/* put an RTS there so we don't die */
*(UINT16 *)&memregion("maincpu")->base()[0x80000] = 0x4E75;
- address_space *main = machine().device<m68000_device>("maincpu")->space(AS_PROGRAM);
- m_sloop_base = main->install_readwrite_handler(0x000000, 0x07ffff, read16_delegate(FUNC(atarig42_state::guardians_sloop_data_r),this), write16_delegate(FUNC(atarig42_state::guardians_sloop_data_w),this));
- main->set_direct_update_handler(direct_update_delegate(FUNC(atarig42_state::atarig42_sloop_direct_handler), this));
+ address_space &main = machine().device<m68000_device>("maincpu")->space(AS_PROGRAM);
+ m_sloop_base = main.install_readwrite_handler(0x000000, 0x07ffff, read16_delegate(FUNC(atarig42_state::guardians_sloop_data_r),this), write16_delegate(FUNC(atarig42_state::guardians_sloop_data_w),this));
+ main.set_direct_update_handler(direct_update_delegate(FUNC(atarig42_state::atarig42_sloop_direct_handler), this));
asic65_config(machine(), ASIC65_GUARDIANS);
/*
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index e4869b338e8..861e2742496 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -80,7 +80,7 @@ MACHINE_RESET_MEMBER(atarigt_state,atarigt)
static void cage_irq_callback(running_machine &machine, int reason)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (reason)
atarigen_sound_int_gen(machine.device("maincpu"));
@@ -1274,7 +1274,7 @@ DRIVER_INIT_MEMBER(atarigt_state,tmek)
m_protection_w = tmek_protection_w;
/* temp hack */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xd72000, 0xd75fff, write32_delegate(FUNC(atarigt_state::tmek_pf_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xd72000, 0xd75fff, write32_delegate(FUNC(atarigt_state::tmek_pf_w),this));
}
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index 8f93e26edbd..56dd3ce6d0c 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -2236,7 +2236,7 @@ DRIVER_INIT_MEMBER(atarigx2_state,rrreveng)
m_playfield_base = 0x000;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xca0fc0, 0xca0fc3, read32_delegate(FUNC(atarigx2_state::rrreveng_prot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xca0fc0, 0xca0fc3, read32_delegate(FUNC(atarigx2_state::rrreveng_prot_r),this));
}
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index 7099a43ce98..6342cd4b27b 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -242,8 +242,8 @@ MACHINE_RESET_MEMBER(atarisy2_state,atarisy2)
atarigen_sound_io_reset(machine().device("soundcpu"));
atarigen_scanline_timer_reset(*machine().primary_screen, scanline_update, 64);
- address_space *main = machine().device<t11_device>("maincpu")->space(AS_PROGRAM);
- main->set_direct_update_handler(direct_update_delegate(FUNC(atarisy2_state::atarisy2_direct_handler), this));
+ address_space &main = machine().device<t11_device>("maincpu")->space(AS_PROGRAM);
+ main.set_direct_update_handler(direct_update_delegate(FUNC(atarisy2_state::atarisy2_direct_handler), this));
m_p2portwr_state = 0;
m_p2portrd_state = 0;
@@ -340,7 +340,7 @@ WRITE16_MEMBER(atarisy2_state::bankselect_w)
static void bankselect_postload(running_machine &machine)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
atarisy2_state *state = machine.driver_data<atarisy2_state>();
state->bankselect_w(space, 0, state->m_bankselect[0], 0xffff);
diff --git a/src/mame/drivers/atarisy4.c b/src/mame/drivers/atarisy4.c
index b9b14ec227d..9b9277539f6 100644
--- a/src/mame/drivers/atarisy4.c
+++ b/src/mame/drivers/atarisy4.c
@@ -964,7 +964,7 @@ next_line:
DRIVER_INIT_MEMBER(atarisy4_state,laststar)
{
- address_space &main = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &main = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* Allocate 16kB of shared RAM */
m_shared_ram[0] = auto_alloc_array_clear(machine(), UINT16, 0x2000);
@@ -976,7 +976,7 @@ DRIVER_INIT_MEMBER(atarisy4_state,laststar)
/* Set up the DSP */
membank("dsp0_bank0")->set_base(m_shared_ram[0]);
membank("dsp0_bank1")->set_base(&m_shared_ram[0][0x800]);
- load_ldafile(*machine().device("dsp0")->memory().space(AS_PROGRAM), memregion("dsp")->base());
+ load_ldafile(machine().device("dsp0")->memory().space(AS_PROGRAM), memregion("dsp")->base());
}
DRIVER_INIT_MEMBER(atarisy4_state,airrace)
@@ -986,17 +986,17 @@ DRIVER_INIT_MEMBER(atarisy4_state,airrace)
m_shared_ram[1] = auto_alloc_array_clear(machine(), UINT16, 0x4000);
/* Populate RAM with data from the HEX files */
- load_hexfile(*machine().device("maincpu")->memory().space(AS_PROGRAM), memregion("code")->base());
+ load_hexfile(machine().device("maincpu")->memory().space(AS_PROGRAM), memregion("code")->base());
/* Set up the first DSP */
membank("dsp0_bank0")->set_base(m_shared_ram[0]);
membank("dsp0_bank1")->set_base(&m_shared_ram[0][0x800]);
- load_ldafile(*machine().device("dsp0")->memory().space(AS_PROGRAM), memregion("dsp")->base());
+ load_ldafile(machine().device("dsp0")->memory().space(AS_PROGRAM), memregion("dsp")->base());
/* Set up the second DSP */
membank("dsp1_bank0")->set_base(m_shared_ram[1]);
membank("dsp1_bank1")->set_base(&m_shared_ram[1][0x800]);
- load_ldafile(*machine().device("dsp1")->memory().space(AS_PROGRAM), memregion("dsp")->base());
+ load_ldafile(machine().device("dsp1")->memory().space(AS_PROGRAM), memregion("dsp")->base());
}
void atarisy4_state::machine_reset()
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index 5a7f8e0e750..8fffcd00064 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -711,7 +711,7 @@ DRIVER_INIT_MEMBER(leland_state,ataxx)
leland_rotate_memory(machine(), "slave");
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0x00, 0x03, read8_delegate(FUNC(leland_state::ataxx_trackball_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0x00, 0x03, read8_delegate(FUNC(leland_state::ataxx_trackball_r),this));
}
@@ -721,7 +721,7 @@ DRIVER_INIT_MEMBER(leland_state,ataxxj)
leland_rotate_memory(machine(), "slave");
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0x00, 0x03, read8_delegate(FUNC(leland_state::ataxx_trackball_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0x00, 0x03, read8_delegate(FUNC(leland_state::ataxx_trackball_r),this));
}
@@ -731,9 +731,9 @@ DRIVER_INIT_MEMBER(leland_state,wsf)
leland_rotate_memory(machine(), "slave");
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x0d, 0x0d, "P1_P2");
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x0e, 0x0e, "P3_P4");
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x0f, 0x0f, "BUTTONS");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x0d, 0x0d, "P1_P2");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x0e, 0x0e, "P3_P4");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x0f, 0x0f, "BUTTONS");
}
@@ -743,14 +743,14 @@ DRIVER_INIT_MEMBER(leland_state,indyheat)
leland_rotate_memory(machine(), "slave");
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0x00, 0x02, read8_delegate(FUNC(leland_state::indyheat_wheel_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0x08, 0x0b, read8_delegate(FUNC(leland_state::indyheat_analog_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x0d, 0x0d, "P1");
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x0e, 0x0e, "P2");
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x0f, 0x0f, "P3");
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0x00, 0x02, read8_delegate(FUNC(leland_state::indyheat_wheel_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0x08, 0x0b, read8_delegate(FUNC(leland_state::indyheat_analog_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x0d, 0x0d, "P1");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x0e, 0x0e, "P2");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x0f, 0x0f, "P3");
/* set up additional output ports */
- machine().device("master")->memory().space(AS_IO)->install_write_handler(0x08, 0x0b, write8_delegate(FUNC(leland_state::indyheat_analog_w),this));
+ machine().device("master")->memory().space(AS_IO).install_write_handler(0x08, 0x0b, write8_delegate(FUNC(leland_state::indyheat_analog_w),this));
}
@@ -760,9 +760,9 @@ DRIVER_INIT_MEMBER(leland_state,brutforc)
leland_rotate_memory(machine(), "slave");
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x0d, 0x0d, "P2");
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x0e, 0x0e, "P1");
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x0f, 0x0f, "P3");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x0d, 0x0d, "P2");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x0e, 0x0e, "P1");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x0f, 0x0f, "P3");
}
@@ -772,12 +772,12 @@ DRIVER_INIT_MEMBER(leland_state,asylum)
leland_rotate_memory(machine(), "slave");
/* asylum appears to have some extra RAM for the slave CPU */
- machine().device("slave")->memory().space(AS_PROGRAM)->install_ram(0xf000, 0xfffb);
+ machine().device("slave")->memory().space(AS_PROGRAM).install_ram(0xf000, 0xfffb);
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x0d, 0x0d, "P2");
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x0e, 0x0e, "P1");
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x0f, 0x0f, "P3");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x0d, 0x0d, "P2");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x0e, 0x0e, "P1");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x0f, 0x0f, "P3");
}
diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c
index 2ca49518587..1cce3dd737a 100644
--- a/src/mame/drivers/attckufo.c
+++ b/src/mame/drivers/attckufo.c
@@ -96,12 +96,12 @@ WRITE8_MEMBER(attckufo_state::attckufo_io_w)
READ8_MEMBER(attckufo_state::vic_videoram_r)
{
- return m_maincpu->space(AS_PROGRAM)->read_byte(offset);
+ return m_maincpu->space(AS_PROGRAM).read_byte(offset);
}
READ8_MEMBER(attckufo_state::vic_colorram_r)
{
- return m_maincpu->space(AS_PROGRAM)->read_byte(offset + 0x400);
+ return m_maincpu->space(AS_PROGRAM).read_byte(offset + 0x400);
}
static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 8, attckufo_state )
diff --git a/src/mame/drivers/atvtrack.c b/src/mame/drivers/atvtrack.c
index 76dc617eaf4..209d2d0e394 100644
--- a/src/mame/drivers/atvtrack.c
+++ b/src/mame/drivers/atvtrack.c
@@ -327,12 +327,11 @@ UINT32 atvtrack_state::screen_update_atvtrack(screen_device &screen, bitmap_rgb3
void atvtrack_state::machine_start()
{
UINT8 *src, *dst;
- address_space *as;
nandaddressstep = 0;
nandregion = machine().root_device().memregion("maincpu");
- as = machine().device("maincpu")->memory().space(AS_PROGRAM);
- dst = (UINT8 *)(as->get_write_ptr(0x0c7f0000));
+ address_space &as = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ dst = (UINT8 *)(as.get_write_ptr(0x0c7f0000));
src = nandregion->base()+0x10;
// copy 0x10000 bytes from region "maincpu" offset 0x10 to 0x0c7f0000
memcpy(dst, src, 0x10000);
@@ -344,7 +343,7 @@ void atvtrack_state::machine_reset()
// The routine initializes the cpu, copies the boot program from the flash memories into the cpu sdram
// and finally executes it.
// Here there is the setup of the cpu, the boot program is copied in machine_start
- address_space &as = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &as = machine().device("maincpu")->memory().space(AS_PROGRAM);
// set cpu PC register to 0x0c7f0000
machine().device("maincpu")->state().set_pc(0x0c7f0000);
// set BCR2 to 1
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 75f7c5d9e58..df69ec76310 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -714,7 +714,7 @@ DRIVER_INIT_MEMBER(backfire_state,backfire)
deco156_decrypt(machine());
machine().device("maincpu")->set_clock_scale(4.0f); /* core timings aren't accurate */
descramble_sound(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0170018, 0x017001b, read32_delegate(FUNC(backfire_state::backfire_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0170018, 0x017001b, read32_delegate(FUNC(backfire_state::backfire_speedup_r), this));
}
GAME( 1995, backfire, 0, backfire, backfire, backfire_state, backfire, ROT0, "Data East Corporation", "Backfire! (set 1)", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c
index 75d094adbd6..7e2e9a1dbdb 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -187,7 +187,7 @@ static void update_interrupts(running_machine &machine)
static void scanline_update(screen_device &screen, int scanline)
{
- address_space &space = *screen.machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &space = screen.machine().device("audiocpu")->memory().space(AS_PROGRAM);
/* sound IRQ is on 32V */
if (scanline & 32)
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index 906f795ece1..36e43c5a841 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -932,7 +932,7 @@ DRIVER_INIT_MEMBER(bagman_state,bagman)
/* Unmap video enable register, not available on earlier hardware revision(s)
Bagman is supposed to have glitches during screen transitions */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xa003, 0xa003);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xa003, 0xa003);
*m_video_enable = 1;
}
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index 9b809130ef4..f94b4f5a413 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -2163,48 +2163,48 @@ DRIVER_INIT_MEMBER(balsente_state,minigolf2) { expand_roms(machine(), 0x0c);
DRIVER_INIT_MEMBER(balsente_state,toggle) { expand_roms(machine(), EXPAND_ALL); config_shooter_adc(machine(), FALSE, 0 /* noanalog */); }
DRIVER_INIT_MEMBER(balsente_state,nametune)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_write_handler(0x9f00, 0x9f00, write8_delegate(FUNC(balsente_state::balsente_rombank2_select_w),this));
expand_roms(machine(), EXPAND_NONE | SWAP_HALVES); config_shooter_adc(machine(), FALSE, 0 /* noanalog */);
}
DRIVER_INIT_MEMBER(balsente_state,nstocker)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_write_handler(0x9f00, 0x9f00, write8_delegate(FUNC(balsente_state::balsente_rombank2_select_w),this));
expand_roms(machine(), EXPAND_NONE | SWAP_HALVES); config_shooter_adc(machine(), TRUE, 1);
}
DRIVER_INIT_MEMBER(balsente_state,sfootbal)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_write_handler(0x9f00, 0x9f00, write8_delegate(FUNC(balsente_state::balsente_rombank2_select_w),this));
expand_roms(machine(), EXPAND_ALL | SWAP_HALVES); config_shooter_adc(machine(), FALSE, 0);
}
DRIVER_INIT_MEMBER(balsente_state,spiker)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_readwrite_handler(0x9f80, 0x9f8f, read8_delegate(FUNC(balsente_state::spiker_expand_r),this), write8_delegate(FUNC(balsente_state::spiker_expand_w),this));
space.install_write_handler(0x9f00, 0x9f00, write8_delegate(FUNC(balsente_state::balsente_rombank2_select_w),this));
expand_roms(machine(), EXPAND_ALL | SWAP_HALVES); config_shooter_adc(machine(), FALSE, 1);
}
DRIVER_INIT_MEMBER(balsente_state,stompin)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_write_handler(0x9f00, 0x9f00, write8_delegate(FUNC(balsente_state::balsente_rombank2_select_w),this));
expand_roms(machine(), 0x0c | SWAP_HALVES); config_shooter_adc(machine(), FALSE, 32);
}
DRIVER_INIT_MEMBER(balsente_state,rescraid) { expand_roms(machine(), EXPAND_NONE); config_shooter_adc(machine(), FALSE, 0 /* noanalog */); }
DRIVER_INIT_MEMBER(balsente_state,grudge)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_read_handler(0x9400, 0x9400, read8_delegate(FUNC(balsente_state::grudge_steering_r),this));
expand_roms(machine(), EXPAND_NONE); config_shooter_adc(machine(), FALSE, 0);
}
DRIVER_INIT_MEMBER(balsente_state,shrike)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_readwrite_handler(0x9e00, 0x9fff, read8_delegate(FUNC(balsente_state::shrike_shared_6809_r),this), write8_delegate(FUNC(balsente_state::shrike_shared_6809_w),this));
space.install_write_handler(0x9e01, 0x9e01, write8_delegate(FUNC(balsente_state::shrike_sprite_select_w),this));
- machine().device("68k")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x10000, 0x1001f, read16_delegate(FUNC(balsente_state::shrike_io_68k_r),this), write16_delegate(FUNC(balsente_state::shrike_io_68k_w),this));
+ machine().device("68k")->memory().space(AS_PROGRAM).install_readwrite_handler(0x10000, 0x1001f, read16_delegate(FUNC(balsente_state::shrike_io_68k_r),this), write16_delegate(FUNC(balsente_state::shrike_io_68k_w),this));
expand_roms(machine(), EXPAND_ALL); config_shooter_adc(machine(), FALSE, 32);
}
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index 5e56d8d318e..276d358add3 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -532,8 +532,8 @@ DRIVER_INIT_MEMBER(beathead_state,beathead)
atarijsa_init(machine(), "IN2", 0x0040);
/* prepare the speedups */
- m_speedup_data = m_maincpu->space(AS_PROGRAM)->install_read_handler(0x00000ae8, 0x00000aeb, 0, 0, read32_delegate(FUNC(beathead_state::speedup_r), this));
- m_movie_speedup_data = m_maincpu->space(AS_PROGRAM)->install_read_handler(0x00000804, 0x00000807, 0, 0, read32_delegate(FUNC(beathead_state::movie_speedup_r), this));
+ m_speedup_data = m_maincpu->space(AS_PROGRAM).install_read_handler(0x00000ae8, 0x00000aeb, 0, 0, read32_delegate(FUNC(beathead_state::speedup_r), this));
+ m_movie_speedup_data = m_maincpu->space(AS_PROGRAM).install_read_handler(0x00000804, 0x00000807, 0, 0, read32_delegate(FUNC(beathead_state::movie_speedup_r), this));
}
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index 9caf42c5a6b..cc6102b0da6 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -582,7 +582,7 @@ READ8_MEMBER(berzerk_state::berzerk_audio_r)
static SOUND_RESET(berzerk)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_IO);
+ address_space &space = machine.device("maincpu")->memory().space(AS_IO);
berzerk_state *state = machine.driver_data<berzerk_state>();
/* clears the flip-flop controlling the volume and freq on the speech chip */
state->berzerk_audio_w(space, 4, 0x40);
@@ -1234,9 +1234,9 @@ ROM_END
DRIVER_INIT_MEMBER(berzerk_state,moonwarp)
{
- address_space *io = machine().device("maincpu")->memory().space(AS_IO);
- io->install_read_handler (0x48, 0x48, read8_delegate(FUNC(berzerk_state::moonwarp_p1_r), this));
- io->install_read_handler (0x4a, 0x4a, read8_delegate(FUNC(berzerk_state::moonwarp_p2_r), this));
+ address_space &io = machine().device("maincpu")->memory().space(AS_IO);
+ io.install_read_handler (0x48, 0x48, read8_delegate(FUNC(berzerk_state::moonwarp_p1_r), this));
+ io.install_read_handler (0x4a, 0x4a, read8_delegate(FUNC(berzerk_state::moonwarp_p2_r), this));
}
/*************************************
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index cfac3fa6354..ee7c9013253 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -3692,7 +3692,7 @@ WRITE8_MEMBER(bfm_sc2_state::dmd_reset_w)
MACHINE_START_MEMBER(bfm_sc2_state,sc2dmd)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_write_handler(0x2800, 0x2800, 0, 0, write8_delegate(FUNC(bfm_sc2_state::vfd1_dmd_w),this));
space.install_write_handler(0x2900, 0x2900, 0, 0, write8_delegate(FUNC(bfm_sc2_state::dmd_reset_w),this));
}
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 38d01f02fc3..ec69a3ef534 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -2038,7 +2038,7 @@ ROM_END
static void decrypt_C10707_cpu(running_machine &machine, const char *cputag)
{
- address_space &space = *machine.device(cputag)->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(cputag)->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x10000);
UINT8 *rom = machine.root_device().memregion(cputag)->base();
offs_t addr;
@@ -2068,7 +2068,7 @@ READ8_MEMBER(btime_state::wtennis_reset_hack_r)
static void init_rom1(running_machine &machine)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine.root_device().memregion("maincpu")->base();
decrypted = auto_alloc_array(machine, UINT8, 0x10000);
@@ -2136,7 +2136,7 @@ DRIVER_INIT_MEMBER(btime_state,cookrace)
{
decrypt_C10707_cpu(machine(), "maincpu");
- machine().device("audiocpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0200, 0x0fff, "bank10");
+ machine().device("audiocpu")->memory().space(AS_PROGRAM).install_read_bank(0x0200, 0x0fff, "bank10");
membank("bank10")->set_base(memregion("audiocpu")->base() + 0xe200);
m_audio_nmi_enable_type = AUDIO_ENABLE_DIRECT;
}
@@ -2151,9 +2151,9 @@ DRIVER_INIT_MEMBER(btime_state,wtennis)
{
decrypt_C10707_cpu(machine(), "maincpu");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc15f, 0xc15f, read8_delegate(FUNC(btime_state::wtennis_reset_hack_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc15f, 0xc15f, read8_delegate(FUNC(btime_state::wtennis_reset_hack_r),this));
- machine().device("audiocpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0200, 0x0fff, "bank10");
+ machine().device("audiocpu")->memory().space(AS_PROGRAM).install_read_bank(0x0200, 0x0fff, "bank10");
membank("bank10")->set_base(memregion("audiocpu")->base() + 0xe200);
m_audio_nmi_enable_type = AUDIO_ENABLE_AY8910;
}
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index dd5340ab224..362474398c7 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -1568,7 +1568,7 @@ DRIVER_INIT_MEMBER(bublbobl_state,tokiob)
{
DRIVER_INIT_CALL(tokio);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xfe00, 0xfe00, read8_delegate(FUNC(bublbobl_state::tokiob_mcu_r),this) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xfe00, 0xfe00, read8_delegate(FUNC(bublbobl_state::tokiob_mcu_r),this) );
}
DRIVER_INIT_MEMBER(bublbobl_state,dland)
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index b16256cf7ac..ff1a3881fab 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -876,7 +876,7 @@ WRITE8_MEMBER(bzone_state::analog_select_w)
DRIVER_INIT_MEMBER(bzone_state,bradley)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_ram(0x400, 0x7ff);
space.install_read_port(0x1808, 0x1808, "1808");
space.install_read_port(0x1809, 0x1809, "1809");
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index fc1fd29bf22..1b9c78670c4 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -848,7 +848,7 @@ ROM_END
static void seibu_sound_bootleg(running_machine &machine,const char *cpu,int length)
{
- address_space &space = *machine.device(cpu)->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(cpu)->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine, UINT8, length);
UINT8 *rom = machine.root_device().memregion(cpu)->base();
diff --git a/src/mame/drivers/calchase.c b/src/mame/drivers/calchase.c
index d274b3c6ece..c946f720c21 100644
--- a/src/mame/drivers/calchase.c
+++ b/src/mame/drivers/calchase.c
@@ -977,14 +977,14 @@ DRIVER_INIT_MEMBER(calchase_state,calchase)
m_bios_ram = auto_alloc_array(machine(), UINT32, 0x20000/4);
pc_vga_init(machine(), vga_setting, NULL);
- pc_svga_trident_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_svga_trident_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
init_pc_common(machine(), PCCOMMON_KEYBOARD_AT, calchase_set_keyb_int);
intel82439tx_init(machine());
kbdc8042_init(machine(), &at8042);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x3f0b160, 0x3f0b163, read32_delegate(FUNC(calchase_state::calchase_idle_skip_r),this), write32_delegate(FUNC(calchase_state::calchase_idle_skip_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x3f0b160, 0x3f0b163, read32_delegate(FUNC(calchase_state::calchase_idle_skip_r),this), write32_delegate(FUNC(calchase_state::calchase_idle_skip_w),this));
}
ROM_START( calchase )
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index 3250b726791..dbd33958a24 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -554,7 +554,7 @@ DRIVER_INIT_MEMBER(calorie_state,calorie)
DRIVER_INIT_MEMBER(calorie_state,calorieb)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.set_decrypted_region(0x0000, 0x7fff, machine().root_device().memregion("maincpu")->base() + 0x10000);
}
diff --git a/src/mame/drivers/cd32.c b/src/mame/drivers/cd32.c
index d126a1b546b..3df964fc055 100644
--- a/src/mame/drivers/cd32.c
+++ b/src/mame/drivers/cd32.c
@@ -1438,7 +1438,7 @@ static void serial_w(running_machine &machine, UINT16 data)
cd32_state *state = machine.driver_data<cd32_state>();
UINT8 data8 = data & 0xff;
if ( data8 != 0x00 )
- state->m_microtouch->rx(*machine.memory().first_space(), 0, data8);
+ state->m_microtouch->rx(machine.driver_data()->generic_space(), 0, data8);
}
WRITE8_MEMBER (cd32_state::microtouch_tx)
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c
index 60bd543b4d7..85efaff2fad 100644
--- a/src/mame/drivers/cham24.c
+++ b/src/mame/drivers/cham24.c
@@ -322,7 +322,7 @@ void cham24_state::machine_start()
memcpy(&dst[0xc000], &src[0x0f8000], 0x4000);
/* uses 8K swapping, all ROM!*/
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x1fff, "bank1");
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x1fff, "bank1");
membank("bank1")->set_base(memregion("gfx1")->base());
/* need nametable ram, though. I doubt this uses more than 2k, but it starts up configured for 4 */
@@ -333,7 +333,7 @@ void cham24_state::machine_start()
m_nt_page[3] = m_nt_ram + 0xc00;
/* and read/write handlers */
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff,read8_delegate(FUNC(cham24_state::nt_r), this), write8_delegate(FUNC(cham24_state::nt_w), this));
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff,read8_delegate(FUNC(cham24_state::nt_r), this), write8_delegate(FUNC(cham24_state::nt_w), this));
}
DRIVER_INIT_MEMBER(cham24_state,cham24)
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index f239d696da6..8039c356d3b 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -448,7 +448,7 @@ public:
memset(pmc,0,sizeof(pmc));
memset(ramin,0,sizeof(ramin));
computedilated();
- video_memory=(UINT32 *)machine.firstcpu->space()->get_read_ptr(0xf0000000);
+ video_memory=(UINT32 *)machine.firstcpu->space().get_read_ptr(0xf0000000);
fb.allocate(640,480);
objectdata=&(object_data_alloc());
objectdata->data=this;
@@ -717,7 +717,7 @@ static void jamtable_disasm(running_machine &machine, address_space &space,UINT3
static void jamtable_disasm_command(running_machine &machine, int ref, int params, const char **param)
{
- address_space &space=*machine.firstcpu->space();
+ address_space &space=machine.firstcpu->space();
UINT64 addr,size;
if (params < 2)
@@ -731,7 +731,7 @@ static void jamtable_disasm_command(running_machine &machine, int ref, int param
static void dump_string_command(running_machine &machine, int ref, int params, const char **param)
{
- address_space &space=*machine.firstcpu->space();
+ address_space &space=machine.firstcpu->space();
UINT64 addr;
offs_t address;
UINT32 length,maximumlength;
@@ -770,7 +770,7 @@ static void dump_string_command(running_machine &machine, int ref, int params, c
static void dump_process_command(running_machine &machine, int ref, int params, const char **param)
{
- address_space &space=*machine.firstcpu->space();
+ address_space &space=machine.firstcpu->space();
UINT64 addr;
offs_t address;
@@ -796,7 +796,7 @@ static void dump_process_command(running_machine &machine, int ref, int params,
static void dump_list_command(running_machine &machine, int ref, int params, const char **param)
{
- address_space &space=*machine.firstcpu->space();
+ address_space &space=machine.firstcpu->space();
UINT64 addr,offs,start,old;
offs_t address,offset;
@@ -1365,8 +1365,8 @@ static const char *const usbregnames[]={
READ32_MEMBER( chihiro_state::usbctrl_r )
{
if (offset == 0) { /* hack needed until usb (and jvs) is implemented */
- chihiro_devs.pic8259_1->machine().firstcpu->space(0)->write_byte(0x6a79f,0x01);
- chihiro_devs.pic8259_1->machine().firstcpu->space(0)->write_byte(0x6a7a0,0x00);
+ chihiro_devs.pic8259_1->machine().firstcpu->space(0).write_byte(0x6a79f,0x01);
+ chihiro_devs.pic8259_1->machine().firstcpu->space(0).write_byte(0x6a7a0,0x00);
}
#ifdef LOG_OHCI
if (offset >= 0x54/4)
@@ -1689,10 +1689,10 @@ int chihiro_state::smbus_eeprom(int command,int rw,int data)
// hack to avoid hanging if eeprom contents are not correct
// this would need dumping the serial eeprom on the xbox board
if (command == 0) {
- chihiro_devs.pic8259_1->machine().firstcpu->space(0)->write_byte(0x3b744,0x90);
- chihiro_devs.pic8259_1->machine().firstcpu->space(0)->write_byte(0x3b745,0x90);
- chihiro_devs.pic8259_1->machine().firstcpu->space(0)->write_byte(0x3b766,0xc9);
- chihiro_devs.pic8259_1->machine().firstcpu->space(0)->write_byte(0x3b767,0xc3);
+ chihiro_devs.pic8259_1->machine().firstcpu->space(0).write_byte(0x3b744,0x90);
+ chihiro_devs.pic8259_1->machine().firstcpu->space(0).write_byte(0x3b745,0x90);
+ chihiro_devs.pic8259_1->machine().firstcpu->space(0).write_byte(0x3b766,0xc9);
+ chihiro_devs.pic8259_1->machine().firstcpu->space(0).write_byte(0x3b767,0xc3);
}
data = dummyeeprom[command]+dummyeeprom[command+1]*256;
logerror("eeprom: %d %d %d\n",command,rw,data);
diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c
index 171c4dae2d1..3beeaf7ebc4 100644
--- a/src/mame/drivers/cinemat.c
+++ b/src/mame/drivers/cinemat.c
@@ -1448,34 +1448,34 @@ ROM_END
DRIVER_INIT_MEMBER(cinemat_state,speedfrk)
{
m_gear = 0xe;
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x00, 0x03, read8_delegate(FUNC(cinemat_state::speedfrk_wheel_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x04, 0x06, read8_delegate(FUNC(cinemat_state::speedfrk_gear_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x00, 0x03, read8_delegate(FUNC(cinemat_state::speedfrk_wheel_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x04, 0x06, read8_delegate(FUNC(cinemat_state::speedfrk_gear_r),this));
}
DRIVER_INIT_MEMBER(cinemat_state,sundance)
{
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x00, 0x0f, read8_delegate(FUNC(cinemat_state::sundance_inputs_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x00, 0x0f, read8_delegate(FUNC(cinemat_state::sundance_inputs_r),this));
}
DRIVER_INIT_MEMBER(cinemat_state,tailg)
{
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x07, 0x07, write8_delegate(FUNC(cinemat_state::mux_select_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x07, 0x07, write8_delegate(FUNC(cinemat_state::mux_select_w),this));
}
DRIVER_INIT_MEMBER(cinemat_state,boxingb)
{
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x0c, 0x0f, read8_delegate(FUNC(cinemat_state::boxingb_dial_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x07, 0x07, write8_delegate(FUNC(cinemat_state::mux_select_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x0c, 0x0f, read8_delegate(FUNC(cinemat_state::boxingb_dial_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x07, 0x07, write8_delegate(FUNC(cinemat_state::mux_select_w),this));
}
DRIVER_INIT_MEMBER(cinemat_state,qb3)
{
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x0f, 0x0f, read8_delegate(FUNC(cinemat_state::qb3_frame_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x00, 0x00, write8_delegate(FUNC(cinemat_state::qb3_ram_bank_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x0f, 0x0f, read8_delegate(FUNC(cinemat_state::qb3_frame_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x00, 0x00, write8_delegate(FUNC(cinemat_state::qb3_ram_bank_w),this));
membank("bank1")->configure_entries(0, 4, m_rambase, 0x100*2);
}
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 5f9239f40eb..1aaacc4deb1 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -2481,7 +2481,7 @@ ROM_END
DRIVER_INIT_MEMBER(cischeat_state,wildplt)
{
- machine().device("cpu1")->memory().space(AS_PROGRAM)->install_read_handler(0x080000, 0x087fff, read16_delegate(FUNC(cischeat_state::wildplt_vregs_r),this));
+ machine().device("cpu1")->memory().space(AS_PROGRAM).install_read_handler(0x080000, 0x087fff, read16_delegate(FUNC(cischeat_state::wildplt_vregs_r),this));
DRIVER_INIT_CALL(f1gpstar);
}
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index d96313a04dc..703c032106d 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -2083,13 +2083,13 @@ static void cninja_patch( running_machine &machine )
DRIVER_INIT_MEMBER(cninja_state,cninja)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x1bc0a8, 0x1bc0a9, write16_delegate(FUNC(cninja_state::cninja_sound_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x1bc0a8, 0x1bc0a9, write16_delegate(FUNC(cninja_state::cninja_sound_w),this));
cninja_patch(machine());
}
DRIVER_INIT_MEMBER(cninja_state,stoneage)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x1bc0a8, 0x1bc0a9, write16_delegate(FUNC(cninja_state::stoneage_sound_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x1bc0a8, 0x1bc0a9, write16_delegate(FUNC(cninja_state::stoneage_sound_w),this));
}
DRIVER_INIT_MEMBER(cninja_state,mutantf)
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index e6a41994ff1..55178aaa616 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -707,7 +707,7 @@ MACHINE_START_MEMBER(combatsc_state,combatscb)
void combatsc_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
memset(m_io_ram, 0x00, 0x4000);
@@ -991,7 +991,7 @@ ROM_END
DRIVER_INIT_MEMBER(combatsc_state,combatsc)
{
/* joystick instead of trackball */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x0404, 0x0404, "IN1");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x0404, 0x0404, "IN1");
}
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index 53dd2b50f7e..cd41223bbd4 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -511,7 +511,7 @@ ROM_END
DRIVER_INIT_MEMBER(commando_state,commando)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine().root_device().memregion("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, 0xc000);
int A;
@@ -531,7 +531,7 @@ DRIVER_INIT_MEMBER(commando_state,commando)
DRIVER_INIT_MEMBER(commando_state,spaceinv)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine().root_device().memregion("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, 0xc000);
int A;
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index b8913bc56f7..458a042dba2 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -1184,7 +1184,7 @@ DRIVER_INIT_MEMBER(coolpool_state,amerdart)
DRIVER_INIT_MEMBER(coolpool_state,coolpool)
{
- machine().device("dsp")->memory().space(AS_IO)->install_read_handler(0x07, 0x07, read16_delegate(FUNC(coolpool_state::coolpool_input_r),this));
+ machine().device("dsp")->memory().space(AS_IO).install_read_handler(0x07, 0x07, read16_delegate(FUNC(coolpool_state::coolpool_input_r),this));
register_state_save(machine());
}
diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c
index d6fd3bad0c9..69a981dea20 100644
--- a/src/mame/drivers/coolridr.c
+++ b/src/mame/drivers/coolridr.c
@@ -1252,8 +1252,8 @@ READ32_MEMBER(coolridr_state::coolridr_hack2_r)
DRIVER_INIT_MEMBER(coolridr_state,coolridr)
{
-// machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x60d88a4, 0x060d88a7, FUNC(coolridr_hack1_r) );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x60d8894, 0x060d8897, read32_delegate(FUNC(coolridr_state::coolridr_hack2_r), this));
+// machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x60d88a4, 0x060d88a7, FUNC(coolridr_hack1_r) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x60d8894, 0x060d8897, read32_delegate(FUNC(coolridr_state::coolridr_hack2_r), this));
}
GAME( 1995, coolridr, 0, coolridr, coolridr, coolridr_state, coolridr, ROT0, "Sega", "Cool Riders (US)",GAME_NOT_WORKING|GAME_NO_SOUND )
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index 0bd0a1fb3e1..291e6a1a2bd 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -411,7 +411,7 @@ ADDRESS_MAP_END
INPUT_CHANGED_MEMBER(cosmic_state::panic_coin_inserted)
{
- panic_sound_output_w(*machine().device("maincpu")->memory().space(AS_PROGRAM), 17, newval == 0);
+ panic_sound_output_w(machine().device("maincpu")->memory().space(AS_PROGRAM), 17, newval == 0);
}
static INPUT_PORTS_START( panic )
@@ -1538,17 +1538,17 @@ DRIVER_INIT_MEMBER(cosmic_state,cosmica)
DRIVER_INIT_MEMBER(cosmic_state,devzone)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x4807, 0x4807,write8_delegate(FUNC(cosmic_state::cosmic_background_enable_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x4807, 0x4807,write8_delegate(FUNC(cosmic_state::cosmic_background_enable_w),this));
}
DRIVER_INIT_MEMBER(cosmic_state,nomnlnd)
{
dac_device *dac = machine().device<dac_device>("dac");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x5000, 0x5001, read8_delegate(FUNC(cosmic_state::nomnlnd_port_0_1_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x4800, 0x4800);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x4807, 0x4807, write8_delegate(FUNC(cosmic_state::cosmic_background_enable_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x480a, 0x480a, write8_delegate(FUNC(dac_device::write_unsigned8),dac));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x5000, 0x5001, read8_delegate(FUNC(cosmic_state::nomnlnd_port_0_1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x4800, 0x4800);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x4807, 0x4807, write8_delegate(FUNC(cosmic_state::cosmic_background_enable_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x480a, 0x480a, write8_delegate(FUNC(dac_device::write_unsigned8),dac));
}
DRIVER_INIT_MEMBER(cosmic_state,panic)
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 16ab40ea26a..3ec4506ece8 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -10698,10 +10698,10 @@ DRIVER_INIT_MEMBER(cps_state,forgottn)
/* Forgotten Worlds has a NEC uPD4701AC on the B-board handling dial inputs from the CN-MOWS connector. */
/* The memory mapping is handled by PAL LWIO */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x800040, 0x800041, write16_delegate(FUNC(cps_state::forgottn_dial_0_reset_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x800048, 0x800049, write16_delegate(FUNC(cps_state::forgottn_dial_1_reset_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x800052, 0x800055, read16_delegate(FUNC(cps_state::forgottn_dial_0_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x80005a, 0x80005d, read16_delegate(FUNC(cps_state::forgottn_dial_1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x800040, 0x800041, write16_delegate(FUNC(cps_state::forgottn_dial_0_reset_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x800048, 0x800049, write16_delegate(FUNC(cps_state::forgottn_dial_1_reset_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x800052, 0x800055, read16_delegate(FUNC(cps_state::forgottn_dial_0_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x80005a, 0x80005d, read16_delegate(FUNC(cps_state::forgottn_dial_1_r),this));
save_item(NAME(m_dial));
@@ -10715,8 +10715,8 @@ DRIVER_INIT_MEMBER(cps_state,sf2ee)
{
/* This specific revision of SF2 has the CPS-B custom mapped at a different address. */
/* The mapping is handled by the PAL IOB2 on the B-board */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->unmap_readwrite(0x800140, 0x80017f);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x8001c0, 0x8001ff, read16_delegate(FUNC(cps_state::cps1_cps_b_r),this), write16_delegate(FUNC(cps_state::cps1_cps_b_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_readwrite(0x800140, 0x80017f);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x8001c0, 0x8001ff, read16_delegate(FUNC(cps_state::cps1_cps_b_r),this), write16_delegate(FUNC(cps_state::cps1_cps_b_w),this));
DRIVER_INIT_CALL(cps1);
}
@@ -10724,7 +10724,7 @@ DRIVER_INIT_MEMBER(cps_state,sf2ee)
DRIVER_INIT_MEMBER(cps_state,sf2thndr)
{
/* This particular hack uses a modified B-board PAL which mirrors the CPS-B registers at an alternate address */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x8001c0, 0x8001ff, read16_delegate(FUNC(cps_state::cps1_cps_b_r),this), write16_delegate(FUNC(cps_state::cps1_cps_b_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x8001c0, 0x8001ff, read16_delegate(FUNC(cps_state::cps1_cps_b_r),this), write16_delegate(FUNC(cps_state::cps1_cps_b_w),this));
DRIVER_INIT_CALL(cps1);
}
@@ -10732,7 +10732,7 @@ DRIVER_INIT_MEMBER(cps_state,sf2thndr)
DRIVER_INIT_MEMBER(cps_state,sf2hack)
{
/* some SF2 hacks have some inputs wired to the LSB instead of MSB */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x800018, 0x80001f, read16_delegate(FUNC(cps_state::cps1_hack_dsw_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x800018, 0x80001f, read16_delegate(FUNC(cps_state::cps1_hack_dsw_r),this));
DRIVER_INIT_CALL(cps1);
}
@@ -10765,7 +10765,7 @@ DRIVER_INIT_MEMBER(cps_state,pang3b)
{
/* Pang 3 is the only non-QSound game to have an EEPROM. */
/* It is mapped in the CPS-B address range so probably is on the C-board. */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_port(0x80017a, 0x80017b, "EEPROMIN", "EEPROMOUT");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_port(0x80017a, 0x80017b, "EEPROMIN", "EEPROMOUT");
DRIVER_INIT_CALL(cps1);
}
@@ -10815,11 +10815,11 @@ DRIVER_INIT_MEMBER(cps_state,sf2mdt)
rom[i + 3] = rom[i + 6];
rom[i + 6] = tmp;
}
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x70c01a, 0x70c01b, read16_delegate(FUNC(cps_state::sf2mdt_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x70c01c, 0x70c01d, read16_delegate(FUNC(cps_state::sf2mdt_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x70c01e, 0x70c01f, read16_delegate(FUNC(cps_state::sf2mdt_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x70c010, 0x70c011, read16_delegate(FUNC(cps_state::sf2mdt_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x70c018, 0x70c019, read16_delegate(FUNC(cps_state::sf2mdt_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x70c01a, 0x70c01b, read16_delegate(FUNC(cps_state::sf2mdt_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x70c01c, 0x70c01d, read16_delegate(FUNC(cps_state::sf2mdt_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x70c01e, 0x70c01f, read16_delegate(FUNC(cps_state::sf2mdt_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x70c010, 0x70c011, read16_delegate(FUNC(cps_state::sf2mdt_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x70c018, 0x70c019, read16_delegate(FUNC(cps_state::sf2mdt_r),this));
DRIVER_INIT_CALL(cps1);
}
@@ -10827,7 +10827,7 @@ DRIVER_INIT_MEMBER(cps_state,sf2mdt)
DRIVER_INIT_MEMBER(cps_state,dinohunt)
{
// is this shared with the new sound hw?
- UINT8* ram = (UINT8*)machine().device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0xf18000, 0xf19fff);
+ UINT8* ram = (UINT8*)machine().device("maincpu")->memory().space(AS_PROGRAM).install_ram(0xf18000, 0xf19fff);
memset(ram,0xff,0x2000);
DRIVER_INIT_CALL(cps1);
}
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index fb6cfd38f08..a9bbed77c92 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -8142,7 +8142,7 @@ DRIVER_INIT_MEMBER(cps_state,pzloop2)
save_item(NAME(m_readpaddle));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x804000, 0x804001, FUNC(joy_or_paddle_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x804000, 0x804001, FUNC(joy_or_paddle_r));
}
static READ16_HANDLER( gigaman2_dummyqsound_r )
@@ -8176,7 +8176,7 @@ static void gigaman2_gfx_reorder(running_machine &machine)
DRIVER_INIT_MEMBER(cps_state,gigaman2)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT16 *rom = (UINT16 *)memregion("maincpu")->base();
int length = memregion("maincpu")->bytes();
@@ -8187,7 +8187,7 @@ DRIVER_INIT_MEMBER(cps_state,gigaman2)
m_gigaman2_dummyqsound_ram = auto_alloc_array(machine(), UINT16, 0x20000 / 2);
save_pointer(NAME(m_gigaman2_dummyqsound_ram), 0x20000 / 2);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x618000, 0x619fff, FUNC(gigaman2_dummyqsound_r), FUNC(gigaman2_dummyqsound_w)); // no qsound..
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x618000, 0x619fff, FUNC(gigaman2_dummyqsound_r), FUNC(gigaman2_dummyqsound_w)); // no qsound..
space.set_decrypted_region(0x000000, (length) - 1, &rom[length/4]);
m68k_set_encrypted_opcode_range(machine().device("maincpu"), 0, length);
}
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 9236e1638d1..e282e443e00 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -723,8 +723,8 @@ static void init_common(running_machine &machine, UINT32 key1, UINT32 key2, int
state->m_0xc0000000_ram_decrypted = auto_alloc_array(machine, UINT32, 0x400/4);
- address_space *main = machine.device<sh2_device>("maincpu")->space(AS_PROGRAM);
- main->set_direct_update_handler(direct_update_delegate(FUNC(cps3_state::cps3_direct_handler), state));
+ address_space &main = machine.device<sh2_device>("maincpu")->space(AS_PROGRAM);
+ main.set_direct_update_handler(direct_update_delegate(FUNC(cps3_state::cps3_direct_handler), state));
// flash roms
astring tempstr;
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index e3d22444064..cbad9c243d6 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -339,7 +339,7 @@ GFXDECODE_END
void crbaloon_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_IO);
+ address_space &space = machine().device("maincpu")->memory().space(AS_IO);
device_t *discrete = machine().device("discrete");
pc3092_reset();
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index 23714e40ffd..d3ab5c9a4bf 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -614,7 +614,7 @@ ROM_END
DRIVER_INIT_MEMBER(crgolf_state,crgolfhi)
{
- machine().device("audiocpu")->memory().space(AS_PROGRAM)->install_write_handler(0xa000, 0xa003, write8_delegate(FUNC(crgolf_state::crgolfhi_sample_w),this));
+ machine().device("audiocpu")->memory().space(AS_PROGRAM).install_write_handler(0xa000, 0xa003, write8_delegate(FUNC(crgolf_state::crgolfhi_sample_w),this));
}
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index 6e844038eda..80227c35ad1 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -407,12 +407,12 @@ static KONAMI_SETLINES_CALLBACK( crimfght_banking )
/* bit 5 = select work RAM or palette */
if (lines & 0x20)
{
- device->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x03ff, "bank3");
- device->memory().space(AS_PROGRAM)->install_write_handler(0x0000, 0x03ff, write8_delegate(FUNC(crimfght_state::paletteram_xBBBBBGGGGGRRRRR_byte_be_w), state));
+ device->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x03ff, "bank3");
+ device->memory().space(AS_PROGRAM).install_write_handler(0x0000, 0x03ff, write8_delegate(FUNC(crimfght_state::paletteram_xBBBBBGGGGGRRRRR_byte_be_w), state));
state->membank("bank3")->set_base(state->m_generic_paletteram_8);
}
else
- device->memory().space(AS_PROGRAM)->install_readwrite_bank(0x0000, 0x03ff, "bank1"); /* RAM */
+ device->memory().space(AS_PROGRAM).install_readwrite_bank(0x0000, 0x03ff, "bank1"); /* RAM */
/* bit 6 = enable char ROM reading through the video RAM */
k052109_set_rmrd_line(state->m_k052109, (lines & 0x40) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index 984a4ee3a27..4e57ce312a0 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -198,7 +198,7 @@ public:
static void IntReq( running_machine &machine, int num )
{
crystal_state *state = machine.driver_data<crystal_state>();
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
UINT32 IntEn = space.read_dword(0x01800c08);
UINT32 IntPend = space.read_dword(0x01800c0c);
if (IntEn & (1 << num))
@@ -276,7 +276,7 @@ WRITE32_MEMBER(crystal_state::IntAck_w)
static IRQ_CALLBACK( icallback )
{
crystal_state *state = device->machine().driver_data<crystal_state>();
- address_space &space = *device->memory().space(AS_PROGRAM);
+ address_space &space = device->memory().space(AS_PROGRAM);
UINT32 IntPend = space.read_dword(0x01800c0c);
int i;
@@ -652,7 +652,7 @@ static void SetVidReg( address_space &space, UINT16 reg, UINT16 val )
UINT32 crystal_state::screen_update_crystal(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int DoFlip;
UINT32 B0 = 0x0;
@@ -717,7 +717,7 @@ void crystal_state::screen_eof_crystal(screen_device &screen, bool state)
// rising edge
if (state)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT16 head, tail;
int DoFlip = 0;
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index 468beca3146..57af6e4a257 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -676,7 +676,7 @@ DRIVER_INIT_MEMBER(cshooter_state,cshooter)
DRIVER_INIT_MEMBER(cshooter_state,cshootere)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int A;
UINT8 *rom = machine().root_device().memregion("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, 0x8000);
diff --git a/src/mame/drivers/csplayh5.c b/src/mame/drivers/csplayh5.c
index 75672633080..0517768ee85 100644
--- a/src/mame/drivers/csplayh5.c
+++ b/src/mame/drivers/csplayh5.c
@@ -585,7 +585,7 @@ static Z80CTC_INTERFACE( ctc_intf )
void csplayh5_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
// initialize TMPZ84C011 PIO
diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c
index 36dcb921d64..bfe87d968bb 100644
--- a/src/mame/drivers/darkmist.c
+++ b/src/mame/drivers/darkmist.c
@@ -400,7 +400,7 @@ static void decrypt_snd(running_machine &machine)
DRIVER_INIT_MEMBER(darkmist_state,darkmist)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int i, len;
UINT8 *ROM = machine().root_device().memregion("maincpu")->base();
UINT8 *buffer = auto_alloc_array(machine(), UINT8, 0x10000);
diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c
index 02214341454..3982718db98 100644
--- a/src/mame/drivers/ddealer.c
+++ b/src/mame/drivers/ddealer.c
@@ -677,7 +677,7 @@ READ16_MEMBER(ddealer_state::ddealer_mcu_r)
DRIVER_INIT_MEMBER(ddealer_state,ddealer)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xfe01c, 0xfe01d, read16_delegate(FUNC(ddealer_state::ddealer_mcu_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xfe01c, 0xfe01d, read16_delegate(FUNC(ddealer_state::ddealer_mcu_r), this));
}
ROM_START( ddealer )
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 2b745fe619c..f02a8ee485e 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -10122,7 +10122,7 @@ DRIVER_INIT_MEMBER(dynax_state,rongrong)
version of the game might be a bootleg with the protection
patched. (both sets need this)
*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_read(0x60d4, 0x60d4);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_read(0x60d4, 0x60d4);
}
/***************************************************************************
@@ -11387,7 +11387,7 @@ ROM_END
DRIVER_INIT_MEMBER(dynax_state,momotaro)
{
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0xe0, 0xe0, read8_delegate(FUNC(dynax_state::momotaro_protection_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0xe0, 0xe0, read8_delegate(FUNC(dynax_state::momotaro_protection_r),this));
}
GAME( 1992, mmpanic, 0, mmpanic, mmpanic, driver_device, 0, ROT0, "Nakanihon / East Technology (Taito license)", "Monkey Mole Panic (USA)", GAME_NO_COCKTAIL | GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 16bbeb7ad44..a84af8c65af 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -2002,7 +2002,7 @@ DRIVER_INIT_MEMBER(ddragon_state,darktowr)
m_sound_irq = M6809_IRQ_LINE;
m_ym_irq = M6809_FIRQ_LINE;
m_technos_video_hw = 0;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x3808, 0x3808, write8_delegate(FUNC(ddragon_state::darktowr_bankswitch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x3808, 0x3808, write8_delegate(FUNC(ddragon_state::darktowr_bankswitch_w),this));
}
@@ -2014,7 +2014,7 @@ DRIVER_INIT_MEMBER(ddragon_state,toffy)
m_sound_irq = M6809_IRQ_LINE;
m_ym_irq = M6809_FIRQ_LINE;
m_technos_video_hw = 0;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x3808, 0x3808, write8_delegate(FUNC(ddragon_state::toffy_bankswitch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x3808, 0x3808, write8_delegate(FUNC(ddragon_state::toffy_bankswitch_w),this));
/* the program rom has a simple bitswap encryption */
rom = memregion("maincpu")->base();
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index 451d1ef46c8..1c24934bf27 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -422,8 +422,8 @@ DRIVER_INIT_MEMBER(deadang_state,ghunter)
seibu_adpcm_decrypt(machine(), "adpcm1");
seibu_adpcm_decrypt(machine(), "adpcm2");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x80000, 0x80001, read16_delegate(FUNC(deadang_state::ghunter_trackball_low_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xb0000, 0xb0001, read16_delegate(FUNC(deadang_state::ghunter_trackball_high_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x80000, 0x80001, read16_delegate(FUNC(deadang_state::ghunter_trackball_low_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xb0000, 0xb0001, read16_delegate(FUNC(deadang_state::ghunter_trackball_high_r),this));
}
/* Game Drivers */
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 60c84931edf..ebb425a486a 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -422,7 +422,7 @@ READ16_MEMBER(dec0_state::slyspy_state_r)
void slyspy_set_protection_map(running_machine& machine, int type)
{
dec0_state *state = machine.driver_data<dec0_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
deco_bac06_device *tilegen1 = (deco_bac06_device*)state->m_tilegen1;
deco_bac06_device *tilegen2 = (deco_bac06_device*)state->m_tilegen2;
@@ -3043,10 +3043,10 @@ ROM_END
DRIVER_INIT_MEMBER(dec0_state,midresb)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00180000, 0x0018000f, read16_delegate(FUNC(dec0_state::dec0_controls_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x001a0000, 0x001a000f, read16_delegate(FUNC(dec0_state::dec0_rotary_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00180000, 0x0018000f, read16_delegate(FUNC(dec0_state::dec0_controls_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x001a0000, 0x001a000f, read16_delegate(FUNC(dec0_state::dec0_rotary_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x00180014, 0x00180015, write16_delegate(FUNC(dec0_state::midres_sound_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x00180014, 0x00180015, write16_delegate(FUNC(dec0_state::midres_sound_w),this));
}
/******************************************************************************/
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index a2f3560821f..e740cac8c3b 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -71,7 +71,7 @@ void dec8_state::screen_eof_dec8(screen_device &screen, bool state)
// rising edge
if (state)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
dec8_mxc06_karn_buffer_spriteram_w(space, 0, 0);
}
}
@@ -3524,7 +3524,7 @@ DRIVER_INIT_MEMBER(dec8_state,dec8)
/* Ghostbusters, Darwin, Oscar use a "Deco 222" custom 6502 for sound. */
DRIVER_INIT_MEMBER(dec8_state,deco222)
{
- address_space &space = *machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("audiocpu")->memory().space(AS_PROGRAM);
int A;
UINT8 *decrypt;
UINT8 *rom;
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 410dc01da5c..08c6b1b9e65 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -506,7 +506,7 @@ WRITE32_MEMBER(deco32_state::tattass_prot_w)
WRITE32_MEMBER(deco32_state::tattass_control_w)
{
eeprom_device *eeprom = machine().device<eeprom_device>("eeprom");
- address_space *eeprom_space = eeprom->space();
+ address_space &eeprom_space = eeprom->space();
/* Eprom in low byte */
if (mem_mask==0x000000ff) { /* Byte write to low byte only (different from word writing including low byte) */
@@ -556,7 +556,7 @@ WRITE32_MEMBER(deco32_state::tattass_control_w)
int d=m_readBitCount/8;
int m=7-(m_readBitCount%8);
int a=(m_byteAddr+d)%1024;
- int b=eeprom_space->read_byte(a);
+ int b=eeprom_space.read_byte(a);
m_tattass_eprom_bit=(b>>m)&1;
@@ -573,7 +573,7 @@ WRITE32_MEMBER(deco32_state::tattass_control_w)
int b=(m_buffer[24]<<7)|(m_buffer[25]<<6)|(m_buffer[26]<<5)|(m_buffer[27]<<4)
|(m_buffer[28]<<3)|(m_buffer[29]<<2)|(m_buffer[30]<<1)|(m_buffer[31]<<0);
- eeprom_space->write_byte(m_byteAddr, b);
+ eeprom_space.write_byte(m_byteAddr, b);
}
m_lastClock=data&0x20;
return;
@@ -588,7 +588,7 @@ WRITE32_MEMBER(deco32_state::tattass_control_w)
/* Check for read command */
if (m_buffer[0] && m_buffer[1]) {
- m_tattass_eprom_bit=(eeprom_space->read_byte(m_byteAddr)>>7)&1;
+ m_tattass_eprom_bit=(eeprom_space.read_byte(m_byteAddr)>>7)&1;
m_readBitCount=1;
m_pendingCommand=1;
}
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index 73e699b3150..038c31d3e86 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -738,7 +738,7 @@ DRIVER_INIT_MEMBER(deco_mlc_state,avengrgs)
sh2drc_add_pcflush(machine().device("maincpu"), 0x32dc);
m_mainCpuIsArm = 0;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01089a0, 0x01089a3, read32_delegate(FUNC(deco_mlc_state::avengrgs_speedup_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x01089a0, 0x01089a3, read32_delegate(FUNC(deco_mlc_state::avengrgs_speedup_r),this));
descramble_sound(machine());
}
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index aa79aa04228..7393720ab97 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -1600,7 +1600,7 @@ ROM_END
DRIVER_INIT_MEMBER(decocass_state,decocass)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = memregion("maincpu")->base();
int A;
@@ -1638,8 +1638,8 @@ DRIVER_INIT_MEMBER(decocass_state,decocrom)
m_decrypted2[i] = swap_bits_5_6(rom[i]);
/* convert charram to a banked ROM */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x6000, 0xafff, "bank1");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x6000, 0xafff, FUNC(decocass_de0091_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x6000, 0xafff, "bank1");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x6000, 0xafff, FUNC(decocass_de0091_w));
membank("bank1")->configure_entry(0, m_charram);
membank("bank1")->configure_entry(1, memregion("user3")->base());
membank("bank1")->configure_decrypted_entry(0, &m_decrypted[0x6000]);
@@ -1647,7 +1647,7 @@ DRIVER_INIT_MEMBER(decocass_state,decocrom)
membank("bank1")->set_entry(0);
/* install the bank selector */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xe900, 0xe900, FUNC(decocass_e900_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xe900, 0xe900, FUNC(decocass_e900_w));
save_pointer(NAME(m_decrypted2), romlength);
}
@@ -1685,8 +1685,8 @@ DRIVER_INIT_MEMBER(decocass_state,cdsteljn)
DRIVER_INIT_CALL(decocass);
/* install custom mahjong panel */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xe413, 0xe413, FUNC(cdsteljn_mux_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xe600, 0xe6ff, FUNC(cdsteljn_input_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xe413, 0xe413, FUNC(cdsteljn_mux_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xe600, 0xe6ff, FUNC(cdsteljn_input_r));
}
/* -- */ GAME( 1981, decocass, 0, decocass, decocass, decocass_state, decocass, ROT270, "Data East Corporation", "DECO Cassette System", GAME_IS_BIOS_ROOT )
diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c
index e50116107be..4f56c326f4e 100644
--- a/src/mame/drivers/deshoros.c
+++ b/src/mame/drivers/deshoros.c
@@ -253,7 +253,7 @@ void destiny_state::machine_start()
void destiny_state::machine_reset()
{
- bank_select_w(*m_maincpu->space(AS_PROGRAM), 0, 0);
+ bank_select_w(m_maincpu->space(AS_PROGRAM), 0, 0);
}
static MACHINE_CONFIG_START( destiny, destiny_state )
diff --git a/src/mame/drivers/dfruit.c b/src/mame/drivers/dfruit.c
index d79b507ab03..f82966f6c8a 100644
--- a/src/mame/drivers/dfruit.c
+++ b/src/mame/drivers/dfruit.c
@@ -136,14 +136,14 @@ WRITE8_MEMBER(dfruit_state::dfruit_ram_bank_w)
UINT8 dfruit_state::ram_bank_r(UINT16 offset, UINT8 bank_num)
{
- address_space *vdp_space = machine().device<tc0091lvc_device>("tc0091lvc")->space();
- return vdp_space->read_byte(offset + (m_ram_bank[bank_num]) * 0x1000);;
+ address_space &vdp_space = machine().device<tc0091lvc_device>("tc0091lvc")->space();
+ return vdp_space.read_byte(offset + (m_ram_bank[bank_num]) * 0x1000);;
}
void dfruit_state::ram_bank_w(UINT16 offset, UINT8 data, UINT8 bank_num)
{
- address_space *vdp_space = machine().device<tc0091lvc_device>("tc0091lvc")->space();
- vdp_space->write_byte(offset + (m_ram_bank[bank_num]) * 0x1000,data);;
+ address_space &vdp_space = machine().device<tc0091lvc_device>("tc0091lvc")->space();
+ vdp_space.write_byte(offset + (m_ram_bank[bank_num]) * 0x1000,data);;
}
READ8_MEMBER(dfruit_state::dfruit_ram_0_r) { return ram_bank_r(offset, 0); }
diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c
index aa5f977b676..e3076a60e02 100644
--- a/src/mame/drivers/dgpix.c
+++ b/src/mame/drivers/dgpix.c
@@ -584,7 +584,7 @@ DRIVER_INIT_MEMBER(dgpix_state,xfiles)
rom[BYTE4_XOR_BE(0x3aa933)] = 0;
// protection related ?
-// machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_read(0xf0c8b440, 0xf0c8b447);
+// machine().device("maincpu")->memory().space(AS_PROGRAM).nop_read(0xf0c8b440, 0xf0c8b447);
m_flash_roms = 2;
}
@@ -604,7 +604,7 @@ DRIVER_INIT_MEMBER(dgpix_state,kdynastg)
rom[BYTE4_XOR_BE(0x3a45c9)] = 0;
// protection related ?
-// machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_read(0x12341234, 0x12341243);
+// machine().device("maincpu")->memory().space(AS_PROGRAM).nop_read(0x12341234, 0x12341243);
m_flash_roms = 4;
}
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index c6cf1f6a1f3..48fc5830727 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -519,8 +519,8 @@ READ8_MEMBER(dkong_state::hb_dma_read_byte)
fatalerror("hb_dma_read_byte - unmapped access for 0x%02x - bucket 0x%02x\n", offset, bucket);
addr = ((bucket << 7) & 0x7c00) | (offset & 0x3ff);
- address_space *prog_space = machine().device("maincpu")->memory().space(AS_PROGRAM);
- return prog_space->read_byte(addr);
+ address_space &prog_space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ return prog_space.read_byte(addr);
}
WRITE8_MEMBER(dkong_state::hb_dma_write_byte)
@@ -532,8 +532,8 @@ WRITE8_MEMBER(dkong_state::hb_dma_write_byte)
fatalerror("hb_dma_read_byte - unmapped access for 0x%02x - bucket 0x%02x\n", offset, bucket);
addr = ((bucket << 7) & 0x7c00) | (offset & 0x3ff);
- address_space *prog_space = machine().device("maincpu")->memory().space(AS_PROGRAM);
- prog_space->write_byte(addr, data);
+ address_space &prog_space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ prog_space.write_byte(addr, data);
}
READ8_MEMBER(dkong_state::p8257_ctl_r)
@@ -3097,7 +3097,7 @@ DRIVER_INIT_MEMBER(dkong_state,drakton)
{7,1,4,0,3,6,2,5},
};
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x3fff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x3fff, "bank1" );
/* While the PAL supports up to 16 decryption methods, only four
are actually used in the PAL. Therefore, we'll take a little
@@ -3119,7 +3119,7 @@ DRIVER_INIT_MEMBER(dkong_state,strtheat)
{6,3,4,1,0,7,2,5},
};
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x3fff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x3fff, "bank1" );
/* While the PAL supports up to 16 decryption methods, only four
are actually used in the PAL. Therefore, we'll take a little
@@ -3130,20 +3130,20 @@ DRIVER_INIT_MEMBER(dkong_state,strtheat)
drakton_decrypt_rom(machine(), 0x88, 0x1c000, bs[3]);
/* custom handlers supporting Joystick or Steering Wheel */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x7c00, 0x7c00, read8_delegate(FUNC(dkong_state::strtheat_inputport_0_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x7c80, 0x7c80, read8_delegate(FUNC(dkong_state::strtheat_inputport_1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x7c00, 0x7c00, read8_delegate(FUNC(dkong_state::strtheat_inputport_0_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x7c80, 0x7c80, read8_delegate(FUNC(dkong_state::strtheat_inputport_1_r),this));
}
DRIVER_INIT_MEMBER(dkong_state,dkongx)
{
UINT8 *decrypted;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
decrypted = auto_alloc_array(machine(), UINT8, 0x10000);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x5fff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x8000, 0xffff, "bank2" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x5fff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x8000, 0xffff, "bank2" );
space.install_write_handler(0xe000, 0xe000, write8_delegate(FUNC(dkong_state::braze_a15_w),this));
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 4c664b96d81..c4831c7c8b0 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -6477,7 +6477,7 @@ ROM_END
DRIVER_INIT_MEMBER(dynax_state,mjreach)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x10060, 0x10060, write8_delegate(FUNC(dynax_state::yarunara_flipscreen_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x10060, 0x10060, write8_delegate(FUNC(dynax_state::yarunara_flipscreen_w),this));
}
/***************************************************************************
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index 547d9b152af..9e1004d51ad 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -1481,15 +1481,15 @@ DRIVER_INIT_MEMBER(eolith_state,hidctch2)
DRIVER_INIT_MEMBER(eolith_state,hidctch3)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xfc200000, 0xfc200003); // this generates pens vibration
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xfc200000, 0xfc200003); // this generates pens vibration
// It is not clear why the first reads are needed too
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xfce00000, 0xfce00003, read32_delegate(FUNC(eolith_state::hidctch3_pen1_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xfce80000, 0xfce80003, read32_delegate(FUNC(eolith_state::hidctch3_pen1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xfce00000, 0xfce00003, read32_delegate(FUNC(eolith_state::hidctch3_pen1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xfce80000, 0xfce80003, read32_delegate(FUNC(eolith_state::hidctch3_pen1_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xfcf00000, 0xfcf00003, read32_delegate(FUNC(eolith_state::hidctch3_pen2_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xfcf80000, 0xfcf80003, read32_delegate(FUNC(eolith_state::hidctch3_pen2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xfcf00000, 0xfcf00003, read32_delegate(FUNC(eolith_state::hidctch3_pen2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xfcf80000, 0xfcf80003, read32_delegate(FUNC(eolith_state::hidctch3_pen2_r),this));
DRIVER_INIT_CALL(eolith);
}
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index d9c146c8c24..603b6e3f6f4 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -721,8 +721,8 @@ DRIVER_INIT_MEMBER(eprom_state,eprom)
atarijsa_init(machine(), "260010", 0x0002);
/* install CPU synchronization handlers */
- m_sync_data = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x16cc00, 0x16cc01, read16_delegate(FUNC(eprom_state::sync_r),this), write16_delegate(FUNC(eprom_state::sync_w),this));
- m_sync_data = machine().device("extra")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x16cc00, 0x16cc01, read16_delegate(FUNC(eprom_state::sync_r),this), write16_delegate(FUNC(eprom_state::sync_w),this));
+ m_sync_data = machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x16cc00, 0x16cc01, read16_delegate(FUNC(eprom_state::sync_r),this), write16_delegate(FUNC(eprom_state::sync_w),this));
+ m_sync_data = machine().device("extra")->memory().space(AS_PROGRAM).install_readwrite_handler(0x16cc00, 0x16cc01, read16_delegate(FUNC(eprom_state::sync_r),this), write16_delegate(FUNC(eprom_state::sync_w),this));
}
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index 273fb29ea01..8d1aad60da9 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -1896,8 +1896,8 @@ DRIVER_INIT_MEMBER(equites_state,gekisou)
unpack_region(machine(), "gfx3");
// install special handlers for unknown device (protection?)
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x580000, 0x580001, write16_delegate(FUNC(equites_state::gekisou_unknown_0_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x5a0000, 0x5a0001, write16_delegate(FUNC(equites_state::gekisou_unknown_1_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x580000, 0x580001, write16_delegate(FUNC(equites_state::gekisou_unknown_0_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x5a0000, 0x5a0001, write16_delegate(FUNC(equites_state::gekisou_unknown_1_w),this));
}
DRIVER_INIT_MEMBER(equites_state,splndrbt)
@@ -1910,7 +1910,7 @@ DRIVER_INIT_MEMBER(equites_state,hvoltage)
unpack_region(machine(), "gfx3");
#if HVOLTAGE_DEBUG
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x000038, 0x000039, read16_delegate(FUNC(equites_state::hvoltage_debug_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x000038, 0x000039, read16_delegate(FUNC(equites_state::hvoltage_debug_r),this));
#endif
}
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c
index ef58bcfb3f4..5b8dcc4684a 100644
--- a/src/mame/drivers/exidy.c
+++ b/src/mame/drivers/exidy.c
@@ -1462,7 +1462,7 @@ DRIVER_INIT_MEMBER(exidy_state,phantoma)
m_color_latch[0] = 0x09;
/* the ROM is actually mapped high */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xf800, 0xffff, "bank1");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xf800, 0xffff, "bank1");
membank("bank1")->set_base(memregion("maincpu")->base() + 0xf800);
}
@@ -1493,7 +1493,7 @@ DRIVER_INIT_MEMBER(exidy_state,pepper2)
DRIVER_INIT_MEMBER(exidy_state,fax)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
exidy_video_config(machine(), 0x04, 0x04, TRUE);
diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c
index 7b5acefed25..1a4be8e9910 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -301,9 +301,9 @@ void exidy440_bank_select(running_machine &machine, UINT8 bank)
if (state->m_showdown_bank_data[0] != NULL)
{
if (bank == 0 && state->m_bank != 0)
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x4000, 0x7fff, read8_delegate(FUNC(exidy440_state::showdown_bank0_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x4000, 0x7fff, read8_delegate(FUNC(exidy440_state::showdown_bank0_r),state));
else if (bank != 0 && state->m_bank == 0)
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x4000, 0x7fff, "bank1");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x4000, 0x7fff, "bank1");
}
/* select the bank and update the bank pointer */
@@ -1931,7 +1931,7 @@ DRIVER_INIT_MEMBER(exidy440_state,exidy440)
DRIVER_INIT_MEMBER(exidy440_state,claypign)
{
DRIVER_INIT_CALL(exidy440);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x2ec0, 0x2ec3, read8_delegate(FUNC(exidy440_state::claypign_protection_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x2ec0, 0x2ec3, read8_delegate(FUNC(exidy440_state::claypign_protection_r),this));
}
@@ -1940,11 +1940,11 @@ DRIVER_INIT_MEMBER(exidy440_state,topsecex)
DRIVER_INIT_CALL(exidy440);
/* extra input ports and scrolling */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x2ec5, 0x2ec5, read8_delegate(FUNC(exidy440_state::topsecex_input_port_5_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x2ec6, 0x2ec6, "AN0");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x2ec7, 0x2ec7, "IN4");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x2ec5, 0x2ec5, read8_delegate(FUNC(exidy440_state::topsecex_input_port_5_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x2ec6, 0x2ec6, "AN0");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x2ec7, 0x2ec7, "IN4");
- m_topsecex_yscroll = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x2ec1, 0x2ec1, write8_delegate(FUNC(exidy440_state::topsecex_yscroll_w),this));
+ m_topsecex_yscroll = machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x2ec1, 0x2ec1, write8_delegate(FUNC(exidy440_state::topsecex_yscroll_w),this));
}
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index 4b037f23d10..af69980faea 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -805,13 +805,13 @@ DRIVER_INIT_MEMBER(exprraid_state,exprraid)
DRIVER_INIT_MEMBER(exprraid_state,wexpressb2)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x3800, 0x3800, read8_delegate(FUNC(exprraid_state::vblank_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x3800, 0x3800, read8_delegate(FUNC(exprraid_state::vblank_r),this));
exprraid_gfx_expand(machine());
}
DRIVER_INIT_MEMBER(exprraid_state,wexpressb3)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xFFC0, 0xFFC0, read8_delegate(FUNC(exprraid_state::vblank_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xFFC0, 0xFFC0, read8_delegate(FUNC(exprraid_state::vblank_r),this));
exprraid_gfx_expand(machine());
}
diff --git a/src/mame/drivers/famibox.c b/src/mame/drivers/famibox.c
index dd70c10eedd..29b25e84664 100644
--- a/src/mame/drivers/famibox.c
+++ b/src/mame/drivers/famibox.c
@@ -564,8 +564,8 @@ void famibox_state::machine_start()
m_nt_page[2] = m_nt_ram + 0x800;
m_nt_page[3] = m_nt_ram + 0xc00;
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(famibox_state::famibox_nt_r), this), write8_delegate(FUNC(famibox_state::famibox_nt_w), this));
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x1fff, "ppubank1");
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(famibox_state::famibox_nt_r), this), write8_delegate(FUNC(famibox_state::famibox_nt_w), this));
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x1fff, "ppubank1");
famicombox_bankswitch(machine(), 0);
diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c
index 0fd04efdee4..b7b20e5bcfe 100644
--- a/src/mame/drivers/fastfred.c
+++ b/src/mame/drivers/fastfred.c
@@ -1000,8 +1000,8 @@ ROM_END
DRIVER_INIT_MEMBER(fastfred_state,flyboy)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc085, 0xc099, read8_delegate(FUNC(fastfred_state::flyboy_custom1_io_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc8fb, 0xc900, read8_delegate(FUNC(fastfred_state::flyboy_custom2_io_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc085, 0xc099, read8_delegate(FUNC(fastfred_state::flyboy_custom1_io_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc8fb, 0xc900, read8_delegate(FUNC(fastfred_state::flyboy_custom2_io_r),this));
m_hardware_type = 1;
}
@@ -1012,29 +1012,29 @@ DRIVER_INIT_MEMBER(fastfred_state,flyboyb)
DRIVER_INIT_MEMBER(fastfred_state,fastfred)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc800, 0xcfff, read8_delegate(FUNC(fastfred_state::fastfred_custom_io_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xc800, 0xcfff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc800, 0xcfff, read8_delegate(FUNC(fastfred_state::fastfred_custom_io_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xc800, 0xcfff);
m_hardware_type = 1;
}
DRIVER_INIT_MEMBER(fastfred_state,jumpcoas)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc800, 0xcfff, read8_delegate(FUNC(fastfred_state::jumpcoas_custom_io_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xc800, 0xcfff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc800, 0xcfff, read8_delegate(FUNC(fastfred_state::jumpcoas_custom_io_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xc800, 0xcfff);
m_hardware_type = 0;
}
DRIVER_INIT_MEMBER(fastfred_state,boggy84b)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc800, 0xcfff, read8_delegate(FUNC(fastfred_state::jumpcoas_custom_io_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xc800, 0xcfff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc800, 0xcfff, read8_delegate(FUNC(fastfred_state::jumpcoas_custom_io_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xc800, 0xcfff);
m_hardware_type = 2;
}
DRIVER_INIT_MEMBER(fastfred_state,boggy84)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc800, 0xcfff, read8_delegate(FUNC(fastfred_state::boggy84_custom_io_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xc800, 0xcfff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc800, 0xcfff, read8_delegate(FUNC(fastfred_state::boggy84_custom_io_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xc800, 0xcfff);
m_hardware_type = 2;
}
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index 8c3709c40c4..24af439b1f8 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -2220,9 +2220,9 @@ static void init_lights(running_machine &machine, write32_space_func out1, const
if(!out2) out2 = lamp_output2_w, out2name = "lamp_output2_w";
if(!out3) out3 = lamp_output3_w, out3name = "lamp_output3_w";
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x7d000804, 0x7d000807, out1, out1name);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x7d000320, 0x7d000323, out2, out2name);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x7d000324, 0x7d000327, out3, out3name);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x7d000804, 0x7d000807, out1, out1name);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x7d000320, 0x7d000323, out2, out2name);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x7d000324, 0x7d000327, out3, out3name);
}
static void init_firebeat(running_machine &machine)
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index b3cb8b89385..6b67028bb76 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -996,7 +996,7 @@ DRIVER_INIT_MEMBER(fitfight_state,fitfight)
{
// UINT16 *mem16 = (UINT16 *)machine().root_device().memregion("maincpu")->base();
// mem16[0x0165B2/2] = 0x4e71; // for now so it boots
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x700000, 0x700001, read16_delegate(FUNC(fitfight_state::fitfight_700000_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x700000, 0x700001, read16_delegate(FUNC(fitfight_state::fitfight_700000_r),this));
m_bbprot_kludge = 0;
}
@@ -1004,7 +1004,7 @@ DRIVER_INIT_MEMBER(fitfight_state,histryma)
{
// UINT16 *mem16 = (UINT16 *)machine().root_device().memregion("maincpu")->base();
// mem16[0x017FDC/2] = 0x4e71; // for now so it boots
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x700000, 0x700001, read16_delegate(FUNC(fitfight_state::histryma_700000_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x700000, 0x700001, read16_delegate(FUNC(fitfight_state::histryma_700000_r),this));
m_bbprot_kludge = 0;
}
@@ -1015,7 +1015,7 @@ DRIVER_INIT_MEMBER(fitfight_state,bbprot)
DRIVER_INIT_MEMBER(fitfight_state,hotmindff)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x200000, 0x200001, 0, 0, read16_delegate(FUNC(fitfight_state::hotmindff_unk_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, 0, 0, read16_delegate(FUNC(fitfight_state::hotmindff_unk_r),this));
DRIVER_INIT_CALL(fitfight);
}
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index e0b65d1e1fc..186a1d658d8 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -119,7 +119,7 @@ ADDRESS_MAP_END
CUSTOM_INPUT_MEMBER(flstory_state::victnine_mcu_status_bit01_r)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
return (victnine_mcu_status_r(space, 0) & 3);
}
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index 648eb9799ee..48c012c3639 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -1124,7 +1124,7 @@ ROM_END
DRIVER_INIT_MEMBER(freekick_state,gigasb)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.set_decrypted_region(0x0000, 0xbfff, machine().root_device().memregion("maincpu")->base() + 0x10000);
}
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 5b80993c163..d02ce8e7ca7 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -4535,7 +4535,7 @@ DRIVER_INIT_MEMBER(funworld_state,multiwin)
******************************************************/
{
UINT8 *ROM = machine().root_device().memregion("maincpu")->base();
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int x;
@@ -4568,7 +4568,7 @@ DRIVER_INIT_MEMBER(funworld_state,royalcdc)
******************************************************/
UINT8 *ROM = machine().root_device().memregion("maincpu")->base();
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int x;
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 76fc0ba31cf..d986a78a00e 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -1495,8 +1495,8 @@ DRIVER_INIT_MEMBER(gaiden_state,wildfang)
m_prot = 0;
m_jumpcode = 0;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x07a006, 0x07a007, read16_delegate(FUNC(gaiden_state::wildfang_protection_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07a804, 0x07a805, write16_delegate(FUNC(gaiden_state::wildfang_protection_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x07a006, 0x07a007, read16_delegate(FUNC(gaiden_state::wildfang_protection_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x07a804, 0x07a805, write16_delegate(FUNC(gaiden_state::wildfang_protection_w),this));
}
DRIVER_INIT_MEMBER(gaiden_state,raiga)
@@ -1507,8 +1507,8 @@ DRIVER_INIT_MEMBER(gaiden_state,raiga)
m_prot = 0;
m_jumpcode = 0;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x07a006, 0x07a007, read16_delegate(FUNC(gaiden_state::raiga_protection_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x07a804, 0x07a805, write16_delegate(FUNC(gaiden_state::raiga_protection_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x07a006, 0x07a007, read16_delegate(FUNC(gaiden_state::raiga_protection_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x07a804, 0x07a805, write16_delegate(FUNC(gaiden_state::raiga_protection_w),this));
}
static void descramble_drgnbowl_gfx(running_machine &machine)
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index e6dc102537a..08bc8c66dab 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -889,7 +889,7 @@ MACHINE_START_MEMBER(galaga_state,galaga)
static void bosco_latch_reset(running_machine &machine)
{
galaga_state *state = machine.driver_data<galaga_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int i;
/* Reset all latches */
@@ -3312,7 +3312,7 @@ DRIVER_INIT_MEMBER(galaga_state,gatsbee)
DRIVER_INIT_CALL(galaga);
/* Gatsbee has a larger character ROM, we need a handler for banking */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x1000, 0x1000, write8_delegate(FUNC(galaga_state::gatsbee_bank_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x1000, 0x1000, write8_delegate(FUNC(galaga_state::gatsbee_bank_w),this));
}
@@ -3353,8 +3353,8 @@ DRIVER_INIT_MEMBER(xevious_state,xevios)
DRIVER_INIT_MEMBER(xevious_state,battles)
{
/* replace the Namco I/O handlers with interface to the 4th CPU */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x7000, 0x700f, FUNC(battles_customio_data0_r), FUNC(battles_customio_data0_w) );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x7100, 0x7100, FUNC(battles_customio0_r), FUNC(battles_customio0_w) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x7000, 0x700f, FUNC(battles_customio_data0_r), FUNC(battles_customio_data0_w) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x7100, 0x7100, FUNC(battles_customio0_r), FUNC(battles_customio0_w) );
DRIVER_INIT_CALL(xevious);
}
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index abb7fb77637..11d7897e3e5 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -755,7 +755,7 @@ WRITE8_MEMBER(galaxian_state::explorer_sound_control_w)
READ8_MEMBER(galaxian_state::explorer_sound_latch_r)
{
machine().device("audiocpu")->execute().set_input_line(0, CLEAR_LINE);
- return soundlatch_byte_r(*machine().device("audiocpu")->memory().space(AS_PROGRAM), 0);
+ return soundlatch_byte_r(machine().device("audiocpu")->memory().space(AS_PROGRAM), 0);
}
@@ -1064,7 +1064,7 @@ static I8255A_INTERFACE( scorpion_ppi8255_1_intf )
INPUT_CHANGED_MEMBER(galaxian_state::gmgalax_game_changed)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* new value is the selected game */
m_gmgalax_selected_game = newval;
@@ -2740,7 +2740,7 @@ static void common_init(
static void unmap_galaxian_sound(running_machine &machine, offs_t base)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
space.unmap_write(base + 0x0004, base + 0x0007, 0, 0x07f8);
space.unmap_write(base + 0x0800, base + 0x0807, 0, 0x07f8);
@@ -2763,7 +2763,7 @@ DRIVER_INIT_MEMBER(galaxian_state,galaxian)
DRIVER_INIT_MEMBER(galaxian_state,nolock)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* same as galaxian... */
DRIVER_INIT_CALL(galaxian);
@@ -2775,7 +2775,7 @@ DRIVER_INIT_MEMBER(galaxian_state,nolock)
DRIVER_INIT_MEMBER(galaxian_state,azurian)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* yellow bullets instead of white ones */
common_init(machine(), scramble_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -2787,7 +2787,7 @@ DRIVER_INIT_MEMBER(galaxian_state,azurian)
DRIVER_INIT_MEMBER(galaxian_state,gmgalax)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, gmgalax_extend_tile_info, gmgalax_extend_sprite_info);
@@ -2804,7 +2804,7 @@ DRIVER_INIT_MEMBER(galaxian_state,gmgalax)
DRIVER_INIT_MEMBER(galaxian_state,pisces)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, pisces_extend_tile_info, pisces_extend_sprite_info);
@@ -2816,7 +2816,7 @@ DRIVER_INIT_MEMBER(galaxian_state,pisces)
DRIVER_INIT_MEMBER(galaxian_state,batman2)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, batman2_extend_tile_info, upper_extend_sprite_info);
@@ -2828,7 +2828,7 @@ DRIVER_INIT_MEMBER(galaxian_state,batman2)
DRIVER_INIT_MEMBER(galaxian_state,frogg)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* same as galaxian... */
common_init(machine(), galaxian_draw_bullet, frogger_draw_background, frogger_extend_tile_info, frogger_extend_sprite_info);
@@ -2864,7 +2864,7 @@ DRIVER_INIT_MEMBER(galaxian_state,mooncrsu)
DRIVER_INIT_MEMBER(galaxian_state,mooncrgx)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
@@ -2876,7 +2876,7 @@ DRIVER_INIT_MEMBER(galaxian_state,mooncrgx)
DRIVER_INIT_MEMBER(galaxian_state,moonqsr)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, 0x8000);
/* video extensions */
@@ -2894,7 +2894,7 @@ WRITE8_MEMBER(galaxian_state::artic_gfxbank_w)
DRIVER_INIT_MEMBER(galaxian_state,pacmanbl)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* same as galaxian... */
DRIVER_INIT_CALL(galaxian);
@@ -2954,7 +2954,7 @@ void galaxian_state::tenspot_set_game_bank(running_machine& machine, int bank, i
DRIVER_INIT_MEMBER(galaxian_state,tenspot)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* these are needed for batman part 2 to work properly, this banking is probably a property of the artic board,
which tenspot appears to have copied */
@@ -2991,7 +2991,7 @@ DRIVER_INIT_MEMBER(galaxian_state,devilfsg)
DRIVER_INIT_MEMBER(galaxian_state,zigzag)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), NULL, galaxian_draw_background, NULL, NULL);
@@ -3035,8 +3035,8 @@ DRIVER_INIT_MEMBER(galaxian_state,jumpbug)
DRIVER_INIT_MEMBER(galaxian_state,checkman)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
@@ -3046,7 +3046,7 @@ DRIVER_INIT_MEMBER(galaxian_state,checkman)
space.install_write_handler(0xb001, 0xb001, 0, 0x7f8, write8_delegate(FUNC(galaxian_state::irq_enable_w),this));
/* attach the sound command handler */
- iospace->install_write_handler(0x00, 0x00, 0, 0xffff, write8_delegate(FUNC(galaxian_state::checkman_sound_command_w),this));
+ iospace.install_write_handler(0x00, 0x00, 0, 0xffff, write8_delegate(FUNC(galaxian_state::checkman_sound_command_w),this));
/* decrypt program code */
decode_checkman(machine());
@@ -3055,7 +3055,7 @@ DRIVER_INIT_MEMBER(galaxian_state,checkman)
DRIVER_INIT_MEMBER(galaxian_state,checkmaj)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -3070,7 +3070,7 @@ DRIVER_INIT_MEMBER(galaxian_state,checkmaj)
DRIVER_INIT_MEMBER(galaxian_state,dingo)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -3085,8 +3085,8 @@ DRIVER_INIT_MEMBER(galaxian_state,dingo)
DRIVER_INIT_MEMBER(galaxian_state,dingoe)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
@@ -3096,7 +3096,7 @@ DRIVER_INIT_MEMBER(galaxian_state,dingoe)
space.install_write_handler(0xb001, 0xb001, 0, 0x7f8, write8_delegate(FUNC(galaxian_state::irq_enable_w),this));
/* attach the sound command handler */
- iospace->install_write_handler(0x00, 0x00, 0, 0xffff, write8_delegate(FUNC(galaxian_state::checkman_sound_command_w),this));
+ iospace.install_write_handler(0x00, 0x00, 0, 0xffff, write8_delegate(FUNC(galaxian_state::checkman_sound_command_w),this));
space.install_read_handler(0x3001, 0x3001, read8_delegate(FUNC(galaxian_state::dingoe_3001_r),this)); /* Protection check */
@@ -3107,7 +3107,7 @@ DRIVER_INIT_MEMBER(galaxian_state,dingoe)
DRIVER_INIT_MEMBER(galaxian_state,skybase)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, pisces_extend_tile_info, pisces_extend_sprite_info);
@@ -3125,7 +3125,7 @@ DRIVER_INIT_MEMBER(galaxian_state,skybase)
DRIVER_INIT_MEMBER(galaxian_state,kong)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, NULL, upper_extend_sprite_info);
@@ -3140,7 +3140,7 @@ DRIVER_INIT_MEMBER(galaxian_state,kong)
static void mshuttle_decode(running_machine &machine, const UINT8 convtable[8][16])
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine.root_device().memregion("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x10000);
int A;
@@ -3252,7 +3252,7 @@ DRIVER_INIT_MEMBER(galaxian_state,fantastc)
DRIVER_INIT_MEMBER(galaxian_state,kingball)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -3272,7 +3272,7 @@ DRIVER_INIT_MEMBER(galaxian_state,kingball)
DRIVER_INIT_MEMBER(galaxian_state,scorpnmc)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, batman2_extend_tile_info, upper_extend_sprite_info);
@@ -3293,7 +3293,7 @@ DRIVER_INIT_MEMBER(galaxian_state,scorpnmc)
DRIVER_INIT_MEMBER(galaxian_state,thepitm)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
@@ -3317,7 +3317,7 @@ DRIVER_INIT_MEMBER(galaxian_state,thepitm)
DRIVER_INIT_MEMBER(galaxian_state,theend)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), theend_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -3336,7 +3336,7 @@ DRIVER_INIT_MEMBER(galaxian_state,scramble)
DRIVER_INIT_MEMBER(galaxian_state,explorer)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), scramble_draw_bullet, scramble_draw_background, NULL, NULL);
@@ -3362,14 +3362,14 @@ DRIVER_INIT_MEMBER(galaxian_state,sfx)
m_sfx_tilemap = TRUE;
/* sound board has space for extra ROM */
- machine().device("audiocpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x3fff, "bank1");
+ machine().device("audiocpu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x3fff, "bank1");
membank("bank1")->set_base(memregion("audiocpu")->base());
}
DRIVER_INIT_MEMBER(galaxian_state,atlantis)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), scramble_draw_bullet, scramble_draw_background, NULL, NULL);
@@ -3411,7 +3411,7 @@ DRIVER_INIT_MEMBER(galaxian_state,frogger)
DRIVER_INIT_MEMBER(galaxian_state,froggrmc)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine(), NULL, frogger_draw_background, frogger_extend_tile_info, frogger_extend_sprite_info);
@@ -3456,12 +3456,12 @@ DRIVER_INIT_MEMBER(galaxian_state,amidar)
DRIVER_INIT_MEMBER(galaxian_state,scorpion)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
common_init(machine(), scramble_draw_bullet, scramble_draw_background, batman2_extend_tile_info, upper_extend_sprite_info);
/* hook up AY8910 */
- machine().device("audiocpu")->memory().space(AS_IO)->install_readwrite_handler(0x00, 0xff, read8_delegate(FUNC(galaxian_state::scorpion_ay8910_r),this), write8_delegate(FUNC(galaxian_state::scorpion_ay8910_w),this));
+ machine().device("audiocpu")->memory().space(AS_IO).install_readwrite_handler(0x00, 0xff, read8_delegate(FUNC(galaxian_state::scorpion_ay8910_r),this), write8_delegate(FUNC(galaxian_state::scorpion_ay8910_w),this));
/* extra ROM */
space.install_read_bank(0x5800, 0x67ff, "bank1");
@@ -3470,7 +3470,7 @@ DRIVER_INIT_MEMBER(galaxian_state,scorpion)
/* no background related */
// space.nop_write(0x6803, 0x6803);
- machine().device("audiocpu")->memory().space(AS_PROGRAM)->install_read_handler(0x3000, 0x3000, read8_delegate(FUNC(galaxian_state::scorpion_digitalker_intr_r),this));
+ machine().device("audiocpu")->memory().space(AS_PROGRAM).install_read_handler(0x3000, 0x3000, read8_delegate(FUNC(galaxian_state::scorpion_digitalker_intr_r),this));
/*
{
const UINT8 *rom = memregion("speech")->base();
diff --git a/src/mame/drivers/galgame.c b/src/mame/drivers/galgame.c
index fb4a8c7bd52..7d71f7165fb 100644
--- a/src/mame/drivers/galgame.c
+++ b/src/mame/drivers/galgame.c
@@ -396,7 +396,7 @@ static UINT8 read_uint8(UINT8 *pval, int pos, const UINT8* line, int linelen)
DRIVER_INIT_MEMBER(galaxygame_state,galaxygame)
{
- address_space *main = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &main = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *code = machine().root_device().memregion("code")->base();
int filepos = 0, linepos, linelen;
@@ -426,20 +426,20 @@ DRIVER_INIT_MEMBER(galaxygame_state,galaxygame)
if ( (linelen >= 15+6) && (line[15] != ' ') )
{
read_uint16(&val, 15, line, linelen);
- main->write_word(address, val, 0xffff);
+ main.write_word(address, val, 0xffff);
address += 2;
if ( (linelen >= 22+6) && (line[22] != ' ') )
{
read_uint16(&val, 22, line, linelen);
- main->write_word(address, val, 0xffff);
+ main.write_word(address, val, 0xffff);
address += 2;
}
if ( (linelen >= 29+6) && (line[29] != ' ') )
{
read_uint16(&val, 29, line, linelen);
- main->write_word(address, val, 0xffff);
+ main.write_word(address, val, 0xffff);
address += 2;
}
@@ -449,7 +449,7 @@ DRIVER_INIT_MEMBER(galaxygame_state,galaxygame)
if ( (linelen >= 18+3) && (line[18] != ' ') )
{
read_uint8(&val8, 18, line, linelen);
- main->write_byte(address, val8);
+ main.write_byte(address, val8);
address += 1;
}
}
@@ -458,11 +458,11 @@ DRIVER_INIT_MEMBER(galaxygame_state,galaxygame)
}
// set startup code
- main->write_word(0, 012700); /* MOV #0, R0 */
- main->write_word(2, 0);
- main->write_word(4, 0x8d00); /* MTPS R0 */
- main->write_word(6, 000167); /* JMP 0500*/
- main->write_word(8, 000500 - 10);
+ main.write_word(0, 012700); /* MOV #0, R0 */
+ main.write_word(2, 0);
+ main.write_word(4, 0x8d00); /* MTPS R0 */
+ main.write_word(6, 000167); /* JMP 0500*/
+ main.write_word(8, 000500 - 10);
}
GAME(1971, galgame, 0, galaxygame, galaxygame, galaxygame_state, galaxygame, ROT270, "Computer Recreations, Inc", "Galaxy Game", GAME_NO_SOUND_HW )
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index a8eba034d8e..1fd7b3a8ee6 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -1076,22 +1076,22 @@ WRITE8_MEMBER(galivan_state::youmab_86_w)
DRIVER_INIT_MEMBER(galivan_state,youmab)
{
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x82, 0x82, write8_delegate(FUNC(galivan_state::youmab_extra_bank_w),this)); // banks rom at 0x8000? writes 0xff and 0x00 before executing code there
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x7fff, "bank3");
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x82, 0x82, write8_delegate(FUNC(galivan_state::youmab_extra_bank_w),this)); // banks rom at 0x8000? writes 0xff and 0x00 before executing code there
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x7fff, "bank3");
membank("bank3")->set_base(memregion("maincpu")->base());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x8000, 0xbfff, "bank2");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x8000, 0xbfff, "bank2");
membank("bank2")->configure_entries(0, 2, memregion("user2")->base(), 0x4000);
membank("bank2")->set_entry(0);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x81, 0x81, write8_delegate(FUNC(galivan_state::youmab_81_w),this)); // ?? often, alternating values
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x84, 0x84, write8_delegate(FUNC(galivan_state::youmab_84_w),this)); // ?? often, sequence..
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x81, 0x81, write8_delegate(FUNC(galivan_state::youmab_81_w),this)); // ?? often, alternating values
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x84, 0x84, write8_delegate(FUNC(galivan_state::youmab_84_w),this)); // ?? often, sequence..
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xd800, 0xd81f); // scrolling isn't here..
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xd800, 0xd81f); // scrolling isn't here..
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x8a, 0x8a, read8_delegate(FUNC(galivan_state::youmab_8a_r),this)); // ???
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x8a, 0x8a, read8_delegate(FUNC(galivan_state::youmab_8a_r),this)); // ???
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x86, 0x86, write8_delegate(FUNC(galivan_state::youmab_86_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x86, 0x86, write8_delegate(FUNC(galivan_state::youmab_86_w),this));
}
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index 1d182dfc28f..46c3069cd24 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -77,7 +77,7 @@ void galpani2_state::machine_reset()
static void galpani2_write_kaneko(device_t *device)
{
- address_space *dstspace = device->memory().space(AS_PROGRAM);
+ address_space &dstspace = device->memory().space(AS_PROGRAM);
int i,x,tpattidx;
unsigned char testpattern[] = {0xFF,0x55,0xAA,0xDD,0xBB,0x99};
@@ -89,57 +89,57 @@ static void galpani2_write_kaneko(device_t *device)
{
for (tpattidx = 0; tpattidx < 6; tpattidx++)
{
- if (dstspace->read_byte(i) == testpattern[tpattidx]) x = 1; //ram test fragment present
+ if (dstspace.read_byte(i) == testpattern[tpattidx]) x = 1; //ram test fragment present
}
}
if ( x == 0 )
{
- dstspace->write_byte(0x100000,0x4b); //K
- dstspace->write_byte(0x100001,0x41); //A
- dstspace->write_byte(0x100002,0x4e); //N
- dstspace->write_byte(0x100003,0x45); //E
- dstspace->write_byte(0x100004,0x4b); //K
- dstspace->write_byte(0x100005,0x4f); //O
+ dstspace.write_byte(0x100000,0x4b); //K
+ dstspace.write_byte(0x100001,0x41); //A
+ dstspace.write_byte(0x100002,0x4e); //N
+ dstspace.write_byte(0x100003,0x45); //E
+ dstspace.write_byte(0x100004,0x4b); //K
+ dstspace.write_byte(0x100005,0x4f); //O
}
}
WRITE8_MEMBER(galpani2_state::galpani2_mcu_init_w)
{
- address_space *srcspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
- address_space *dstspace = machine().device("sub")->memory().space(AS_PROGRAM);
+ address_space &srcspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &dstspace = machine().device("sub")->memory().space(AS_PROGRAM);
UINT32 mcu_address, mcu_data;
for ( mcu_address = 0x100010; mcu_address < (0x100010 + 6); mcu_address += 1 )
{
- mcu_data = srcspace->read_byte(mcu_address );
- dstspace->write_byte(mcu_address-0x10, mcu_data);
+ mcu_data = srcspace.read_byte(mcu_address );
+ dstspace.write_byte(mcu_address-0x10, mcu_data);
}
machine().device("sub")->execute().set_input_line(INPUT_LINE_IRQ7, HOLD_LINE); //MCU Initialised
}
static void galpani2_mcu_nmi1(running_machine &machine)
{
- address_space *srcspace = machine.device("maincpu")->memory().space(AS_PROGRAM);
- address_space *dstspace = machine.device("sub")->memory().space(AS_PROGRAM);
+ address_space &srcspace = machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &dstspace = machine.device("sub")->memory().space(AS_PROGRAM);
UINT32 mcu_list, mcu_command, mcu_address, mcu_extra, mcu_src, mcu_dst, mcu_size;
for ( mcu_list = 0x100021; mcu_list < (0x100021 + 0x40); mcu_list += 4 )
{
- mcu_command = srcspace->read_byte(mcu_list);
+ mcu_command = srcspace.read_byte(mcu_list);
mcu_address = 0x100000 +
- (srcspace->read_byte(mcu_list + 1)<<8) +
- (srcspace->read_byte(mcu_list + 2)<<0) ;
+ (srcspace.read_byte(mcu_list + 1)<<8) +
+ (srcspace.read_byte(mcu_list + 2)<<0) ;
- mcu_extra = srcspace->read_byte(mcu_list + 3); //0xff for command $A and $2, 0x02 for others
+ mcu_extra = srcspace.read_byte(mcu_list + 3); //0xff for command $A and $2, 0x02 for others
if (mcu_command != 0)
{
logerror("%s : MCU [$%06X] endidx = $%02X / command = $%02X addr = $%04X ? = $%02X.\n",
machine.describe_context(),
mcu_list,
- srcspace->read_byte(0x100020),
+ srcspace.read_byte(0x100020),
mcu_command,
mcu_address,
mcu_extra
@@ -152,51 +152,51 @@ static void galpani2_mcu_nmi1(running_machine &machine)
break;
case 0x02: //Copy N bytes from RAM2 to RAM1?, gp2se is the only one to use it, often!
- mcu_src = (srcspace->read_byte(mcu_address + 2)<<8) +
- (srcspace->read_byte(mcu_address + 3)<<0) ;
+ mcu_src = (srcspace.read_byte(mcu_address + 2)<<8) +
+ (srcspace.read_byte(mcu_address + 3)<<0) ;
- mcu_dst = (srcspace->read_byte(mcu_address + 6)<<8) +
- (srcspace->read_byte(mcu_address + 7)<<0) ;
+ mcu_dst = (srcspace.read_byte(mcu_address + 6)<<8) +
+ (srcspace.read_byte(mcu_address + 7)<<0) ;
- mcu_size = (srcspace->read_byte(mcu_address + 8)<<8) +
- (srcspace->read_byte(mcu_address + 9)<<0) ;
+ mcu_size = (srcspace.read_byte(mcu_address + 8)<<8) +
+ (srcspace.read_byte(mcu_address + 9)<<0) ;
logerror("%s : MCU executes command $%02X, %04X %02X-> %04x\n",machine.describe_context(),mcu_command,mcu_src,mcu_size,mcu_dst);
for( ; mcu_size > 0 ; mcu_size-- )
{
mcu_src &= 0xffff; mcu_dst &= 0xffff;
- srcspace->write_byte(0x100000 + mcu_dst,dstspace->read_byte(0x100000 + mcu_src));
+ srcspace.write_byte(0x100000 + mcu_dst,dstspace.read_byte(0x100000 + mcu_src));
mcu_src ++; mcu_dst ++;
}
/* Raise a "job done" flag */
- srcspace->write_byte(mcu_address+0,0xff);
- srcspace->write_byte(mcu_address+1,0xff);
+ srcspace.write_byte(mcu_address+0,0xff);
+ srcspace.write_byte(mcu_address+1,0xff);
break;
case 0x0a: // Copy N bytes from RAM1 to RAM2
- mcu_src = (srcspace->read_byte(mcu_address + 2)<<8) +
- (srcspace->read_byte(mcu_address + 3)<<0) ;
+ mcu_src = (srcspace.read_byte(mcu_address + 2)<<8) +
+ (srcspace.read_byte(mcu_address + 3)<<0) ;
- mcu_dst = (srcspace->read_byte(mcu_address + 6)<<8) +
- (srcspace->read_byte(mcu_address + 7)<<0) ;
+ mcu_dst = (srcspace.read_byte(mcu_address + 6)<<8) +
+ (srcspace.read_byte(mcu_address + 7)<<0) ;
- mcu_size = (srcspace->read_byte(mcu_address + 8)<<8) +
- (srcspace->read_byte(mcu_address + 9)<<0) ;
+ mcu_size = (srcspace.read_byte(mcu_address + 8)<<8) +
+ (srcspace.read_byte(mcu_address + 9)<<0) ;
logerror("%s : MCU executes command $%02X, %04X %02X-> %04x\n",machine.describe_context(),mcu_command,mcu_src,mcu_size,mcu_dst);
for( ; mcu_size > 0 ; mcu_size-- )
{
mcu_src &= 0xffff; mcu_dst &= 0xffff;
- dstspace->write_byte(0x100000 + mcu_dst,srcspace->read_byte(0x100000 + mcu_src));
+ dstspace.write_byte(0x100000 + mcu_dst,srcspace.read_byte(0x100000 + mcu_src));
mcu_src ++; mcu_dst ++;
}
/* Raise a "job done" flag */
- srcspace->write_byte(mcu_address+0,0xff);
- srcspace->write_byte(mcu_address+1,0xff);
+ srcspace.write_byte(mcu_address+0,0xff);
+ srcspace.write_byte(mcu_address+1,0xff);
break;
@@ -210,14 +210,14 @@ static void galpani2_mcu_nmi1(running_machine &machine)
//case 0x85: //? Do what?
default:
/* Raise a "job done" flag */
- srcspace->write_byte(mcu_address+0,0xff);
- srcspace->write_byte(mcu_address+1,0xff);
+ srcspace.write_byte(mcu_address+0,0xff);
+ srcspace.write_byte(mcu_address+1,0xff);
logerror("%s : MCU ERROR, unknown command $%02X\n",machine.describe_context(),mcu_command);
}
/* Erase command (so that it won't be processed again)? */
- srcspace->write_byte(mcu_list,0x00);
+ srcspace.write_byte(mcu_list,0x00);
}
}
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index 0beaa31ea46..b06eec64339 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -187,8 +187,8 @@ WRITE_LINE_MEMBER(gameplan_state::r6532_irq)
WRITE8_MEMBER(gameplan_state::r6532_soundlatch_w)
{
- address_space *progspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
- soundlatch_byte_w(*progspace, 0, data);
+ address_space &progspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ soundlatch_byte_w(progspace, 0, data);
}
diff --git a/src/mame/drivers/gamtor.c b/src/mame/drivers/gamtor.c
index 3773064727b..c51cff31a41 100644
--- a/src/mame/drivers/gamtor.c
+++ b/src/mame/drivers/gamtor.c
@@ -1254,7 +1254,7 @@ static READ8_HANDLER( vga_setting ) { return 0xff; } // hard-code to color
DRIVER_INIT_MEMBER(gaminator_state,gaminator)
{
pc_vga_init(machine(), vga_setting, NULL);
- pc_vga_gamtor_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0x44000000, *machine().device("maincpu")->memory().space(AS_PROGRAM), 0x40000000);
+ pc_vga_gamtor_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0x44000000, machine().device("maincpu")->memory().space(AS_PROGRAM), 0x40000000);
}
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index d8eca53275a..10e69c27bfe 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -145,7 +145,7 @@ static void update_interrupts(running_machine &machine)
static void scanline_update(screen_device &screen, int scanline)
{
- address_space &space = *screen.machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &space = screen.machine().device("audiocpu")->memory().space(AS_PROGRAM);
/* sound IRQ is on 32V */
if (scanline & 32)
diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c
index 237d394f8f5..5ffe0f265b2 100644
--- a/src/mame/drivers/gei.c
+++ b/src/mame/drivers/gei.c
@@ -220,7 +220,7 @@ WRITE8_MEMBER(gei_state::sound_w)
set_led_status(machine(), 9,data & 0x08);
/* bit 5 - ticket out in trivia games */
- machine().device<ticket_dispenser_device>("ticket")->write(*machine().memory().first_space(), 0, (data & 0x20)<< 2);
+ machine().device<ticket_dispenser_device>("ticket")->write(machine().driver_data()->generic_space(), 0, (data & 0x20)<< 2);
/* bit 6 enables NMI */
m_nmi_mask = data & 0x40;
diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c
index 523206fa7f1..5946687e037 100644
--- a/src/mame/drivers/ghosteo.c
+++ b/src/mame/drivers/ghosteo.c
@@ -581,7 +581,7 @@ READ32_MEMBER(ghosteo_state::bballoon_speedup_r)
void ghosteo_state::machine_reset()
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x4d000010, 0x4d000013,read32_delegate(FUNC(ghosteo_state::bballoon_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x4d000010, 0x4d000013,read32_delegate(FUNC(ghosteo_state::bballoon_speedup_r), this));
s3c2410 = machine().device("s3c2410");
}
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index 54cfe730581..eb7900894d0 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -1022,7 +1022,7 @@ DRIVER_INIT_MEMBER(gladiatr_state,ppking)
rom[i+2*j*0x2000] = rom[i+j*0x2000];
}
}
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xf6a3,0xf6a3,read8_delegate(FUNC(gladiatr_state::f6a3_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xf6a3,0xf6a3,read8_delegate(FUNC(gladiatr_state::f6a3_r),this));
}
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 8a4e6053d65..c3902a76f73 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -412,7 +412,7 @@ DRIVER_INIT_MEMBER(glass_state,glass)
glass_ROM16_split_gfx(machine(), "gfx2", "gfx1", 0x0200000, 0x0200000, 0x0200000, 0x0300000);
/* install custom handler over RAM for protection */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfec000, 0xfeffff, read16_delegate(FUNC(glass_state::glass_mainram_r), this), write16_delegate(FUNC(glass_state::glass_mainram_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfec000, 0xfeffff, read16_delegate(FUNC(glass_state::glass_mainram_r), this), write16_delegate(FUNC(glass_state::glass_mainram_w),this));
}
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index 931889b63a7..988dcf73e0c 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -764,7 +764,7 @@ READ8_MEMBER(gng_state::diamond_hack_r)
DRIVER_INIT_MEMBER(gng_state,diamond)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x6000, 0x6000, read8_delegate(FUNC(gng_state::diamond_hack_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x6000, 0x6000, read8_delegate(FUNC(gng_state::diamond_hack_r),this));
}
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 609ba2ca0e8..b0aa15d7a02 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -10313,8 +10313,8 @@ DRIVER_INIT_MEMBER(goldstar_state,schery97)
ROM[i] = x;
}
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x1d, 0x1d, read8_delegate(FUNC(goldstar_state::fixedvala8_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x2a, 0x2a, read8_delegate(FUNC(goldstar_state::fixedvalb4_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x1d, 0x1d, read8_delegate(FUNC(goldstar_state::fixedvala8_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x2a, 0x2a, read8_delegate(FUNC(goldstar_state::fixedvalb4_r),this));
/* Oki 6295 at 0x20 */
}
@@ -10342,7 +10342,7 @@ DRIVER_INIT_MEMBER(goldstar_state,schery97a)
}
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x16, 0x16, read8_delegate(FUNC(goldstar_state::fixedval38_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x16, 0x16, read8_delegate(FUNC(goldstar_state::fixedval38_r),this));
/* Oki 6295 at 0x20 */
}
@@ -10368,7 +10368,7 @@ DRIVER_INIT_MEMBER(goldstar_state,skill98)
ROM[i] = x;
}
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x1e, 0x1e, read8_delegate(FUNC(goldstar_state::fixedvalea_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x1e, 0x1e, read8_delegate(FUNC(goldstar_state::fixedvalea_r),this));
/* Oki 6295 at 0x20 */
}
@@ -10394,7 +10394,7 @@ DRIVER_INIT_MEMBER(goldstar_state,nfb96_c1)
}
ROM[i] = x;
}
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x31, 0x31, read8_delegate(FUNC(goldstar_state::fixedval68_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x31, 0x31, read8_delegate(FUNC(goldstar_state::fixedval68_r),this));
}
@@ -10421,7 +10421,7 @@ DRIVER_INIT_MEMBER(goldstar_state,nfb96_c2)
ROM[i] = x;
}
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x21, 0x21, read8_delegate(FUNC(goldstar_state::fixedval58_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x21, 0x21, read8_delegate(FUNC(goldstar_state::fixedval58_r),this));
}
READ8_MEMBER(goldstar_state::fixedval80_r)
@@ -10457,11 +10457,11 @@ DRIVER_INIT_MEMBER(goldstar_state,nfb96_d)
ROM[i] = x;
}
// nfb96b needs both of these
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x23, 0x23, read8_delegate(FUNC(goldstar_state::fixedval80_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x5a, 0x5a, read8_delegate(FUNC(goldstar_state::fixedvalaa_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x23, 0x23, read8_delegate(FUNC(goldstar_state::fixedval80_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x5a, 0x5a, read8_delegate(FUNC(goldstar_state::fixedvalaa_r),this));
// csel96b
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x6e, 0x6e, read8_delegate(FUNC(goldstar_state::fixedval96_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x6e, 0x6e, read8_delegate(FUNC(goldstar_state::fixedval96_r),this));
}
@@ -10488,7 +10488,7 @@ DRIVER_INIT_MEMBER(goldstar_state,nfb96_dk)
}
ROM[i] = x;
}
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x2e, 0x2e, read8_delegate(FUNC(goldstar_state::fixedvalbe_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x2e, 0x2e, read8_delegate(FUNC(goldstar_state::fixedvalbe_r),this));
}
@@ -10520,8 +10520,8 @@ DRIVER_INIT_MEMBER(goldstar_state,rp35)
ROM[i] = x;
}
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x5e, 0x5e, read8_delegate(FUNC(goldstar_state::fixedval84_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x36, 0x36, read8_delegate(FUNC(goldstar_state::fixedval90_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x5e, 0x5e, read8_delegate(FUNC(goldstar_state::fixedval84_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x36, 0x36, read8_delegate(FUNC(goldstar_state::fixedval90_r),this));
}
READ8_MEMBER(goldstar_state::fixedvalb2_r)
@@ -10548,7 +10548,7 @@ DRIVER_INIT_MEMBER(goldstar_state,rp36)
ROM[i] = x;
}
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x34, 0x34, read8_delegate(FUNC(goldstar_state::fixedvalb2_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x34, 0x34, read8_delegate(FUNC(goldstar_state::fixedvalb2_r),this));
}
READ8_MEMBER(goldstar_state::fixedval48_r)
@@ -10575,7 +10575,7 @@ DRIVER_INIT_MEMBER(goldstar_state,rp36c3)
ROM[i] = x;
}
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x17, 0x17, read8_delegate(FUNC(goldstar_state::fixedval48_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x17, 0x17, read8_delegate(FUNC(goldstar_state::fixedval48_r),this));
}
READ8_MEMBER(goldstar_state::fixedval09_r)
@@ -10607,8 +10607,8 @@ DRIVER_INIT_MEMBER(goldstar_state,po33)
ROM[i] = x;
}
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x32, 0x32, read8_delegate(FUNC(goldstar_state::fixedval74_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x12, 0x12, read8_delegate(FUNC(goldstar_state::fixedval09_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x32, 0x32, read8_delegate(FUNC(goldstar_state::fixedval74_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x12, 0x12, read8_delegate(FUNC(goldstar_state::fixedval09_r),this));
/* oki6295 at 0x20 */
}
@@ -10641,8 +10641,8 @@ DRIVER_INIT_MEMBER(goldstar_state,match133)
ROM[i] = x;
}
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x16, 0x16, read8_delegate(FUNC(goldstar_state::fixedvalc7_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x1a, 0x1a, read8_delegate(FUNC(goldstar_state::fixedvale4_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x16, 0x16, read8_delegate(FUNC(goldstar_state::fixedvalc7_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x1a, 0x1a, read8_delegate(FUNC(goldstar_state::fixedvale4_r),this));
}
DRIVER_INIT_MEMBER(goldstar_state,cherrys)
@@ -10707,10 +10707,10 @@ DRIVER_INIT_MEMBER(goldstar_state,unkch4)
DRIVER_INIT_MEMBER(goldstar_state,tonypok)
{
// the ppi doesn't seem to work properly, so just install the inputs directly
- address_space *io = machine().device("maincpu")->memory().space(AS_IO);
- io->install_read_port(0x04, 0x04, "IN0" );
- io->install_read_port(0x05, 0x05, "IN1" );
- io->install_read_port(0x06, 0x06, "IN2" );
+ address_space &io = machine().device("maincpu")->memory().space(AS_IO);
+ io.install_read_port(0x04, 0x04, "IN0" );
+ io.install_read_port(0x05, 0x05, "IN1" );
+ io.install_read_port(0x06, 0x06, "IN2" );
}
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index 9ec580957d0..6771387e247 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -244,9 +244,9 @@ void gottlieb_state::machine_start()
if (m_laserdisc != NULL)
{
/* attach to the I/O ports */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x05805, 0x05807, 0, 0x07f8, read8_delegate(FUNC(gottlieb_state::laserdisc_status_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x05805, 0x05805, 0, 0x07f8, write8_delegate(FUNC(gottlieb_state::laserdisc_command_w),this)); /* command for the player */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x05806, 0x05806, 0, 0x07f8, write8_delegate(FUNC(gottlieb_state::laserdisc_select_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x05805, 0x05807, 0, 0x07f8, read8_delegate(FUNC(gottlieb_state::laserdisc_status_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x05805, 0x05805, 0, 0x07f8, write8_delegate(FUNC(gottlieb_state::laserdisc_command_w),this)); /* command for the player */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x05806, 0x05806, 0, 0x07f8, write8_delegate(FUNC(gottlieb_state::laserdisc_select_w),this));
/* allocate a timer for serial transmission, and one for philips code processing */
m_laserdisc_bit_timer = machine().scheduler().timer_alloc(FUNC(laserdisc_bit_callback));
@@ -2451,7 +2451,7 @@ DRIVER_INIT_MEMBER(gottlieb_state,romtiles)
DRIVER_INIT_MEMBER(gottlieb_state,stooges)
{
DRIVER_INIT_CALL(ramtiles);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x05803, 0x05803, 0, 0x07f8, write8_delegate(FUNC(gottlieb_state::stooges_output_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x05803, 0x05803, 0, 0x07f8, write8_delegate(FUNC(gottlieb_state::stooges_output_w),this));
}
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index 510b10b4a0e..7cc8b89ca3f 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -456,7 +456,7 @@ DRIVER_INIT_MEMBER(groundfx_state,groundfx)
int data;
/* Speedup handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x20b574, 0x20b577, read32_delegate(FUNC(groundfx_state::irq_speedup_r_groundfx),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x20b574, 0x20b577, read32_delegate(FUNC(groundfx_state::irq_speedup_r_groundfx),this));
/* make piv tile GFX format suitable for gfxdecode */
offset = size/2;
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index 2b65f3ecbd5..a9a84d3f0aa 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -640,7 +640,7 @@ READ32_MEMBER(gstream_state::gstream_speedup_r)
DRIVER_INIT_MEMBER(gstream_state,gstream)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd1ee0, 0xd1ee3, read32_delegate(FUNC(gstream_state::gstream_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd1ee0, 0xd1ee3, read32_delegate(FUNC(gstream_state::gstream_speedup_r), this));
}
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index d9ed0a29b42..81dd0d9ef73 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -1013,11 +1013,11 @@ static void mcu_init( running_machine &machine )
state->m_pending_command = 0;
state->m_mcu_data = 0;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x20008a, 0x20008b, write16_delegate(FUNC(gstriker_state::twrldc94_mcu_w),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x20008a, 0x20008b, read16_delegate(FUNC(gstriker_state::twrldc94_mcu_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x20008a, 0x20008b, write16_delegate(FUNC(gstriker_state::twrldc94_mcu_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x20008a, 0x20008b, read16_delegate(FUNC(gstriker_state::twrldc94_mcu_r),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x20008e, 0x20008f, write16_delegate(FUNC(gstriker_state::twrldc94_prot_reg_w),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x20008e, 0x20008f, read16_delegate(FUNC(gstriker_state::twrldc94_prot_reg_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x20008e, 0x20008f, write16_delegate(FUNC(gstriker_state::twrldc94_prot_reg_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x20008e, 0x20008f, read16_delegate(FUNC(gstriker_state::twrldc94_prot_reg_r),state));
}
DRIVER_INIT_MEMBER(gstriker_state,twrldc94)
@@ -1037,8 +1037,8 @@ DRIVER_INIT_MEMBER(gstriker_state,vgoalsoc)
m_gametype = 3;
mcu_init( machine() );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x200090, 0x200091, write16_delegate(FUNC(gstriker_state::vbl_toggle_w),this)); // vblank toggle
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x200090, 0x200091, read16_delegate(FUNC(gstriker_state::vbl_toggle_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x200090, 0x200091, write16_delegate(FUNC(gstriker_state::vbl_toggle_w),this)); // vblank toggle
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x200090, 0x200091, read16_delegate(FUNC(gstriker_state::vbl_toggle_r),this));
}
/*** GAME DRIVERS ************************************************************/
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index ec0c06865ac..9a591eddac0 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -905,7 +905,7 @@ DRIVER_INIT_MEMBER(gsword_state,gsword)
#endif
#if 1
/* hack for sound protection or time out function */
- machine().device("sub")->memory().space(AS_PROGRAM)->install_read_handler(0x4004, 0x4005, read8_delegate(FUNC(gsword_state::gsword_hack_r),this));
+ machine().device("sub")->memory().space(AS_PROGRAM).install_read_handler(0x4004, 0x4005, read8_delegate(FUNC(gsword_state::gsword_hack_r),this));
#endif
}
@@ -920,7 +920,7 @@ DRIVER_INIT_MEMBER(gsword_state,gsword2)
#endif
#if 1
/* hack for sound protection or time out function */
- machine().device("sub")->memory().space(AS_PROGRAM)->install_read_handler(0x4004, 0x4005, read8_delegate(FUNC(gsword_state::gsword_hack_r),this));
+ machine().device("sub")->memory().space(AS_PROGRAM).install_read_handler(0x4004, 0x4005, read8_delegate(FUNC(gsword_state::gsword_hack_r),this));
#endif
}
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 23bc82f858f..c33c95a1931 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -608,7 +608,7 @@ INPUT_CHANGED_MEMBER(guab_state::coin_inserted)
if (newval == 0)
{
UINT32 credit;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* Get the current credit value and add the new coin value */
credit = space.read_dword(0x8002c) + (UINT32)(FPTR)param;
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index c79e8cf1dbd..516f6844e6e 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -442,7 +442,7 @@ READ32_MEMBER(gunbustr_state::main_cycle_r)
DRIVER_INIT_MEMBER(gunbustr_state,gunbustr)
{
/* Speedup handler */
- m_maincpu->space(AS_PROGRAM)->install_read_handler(0x203acc, 0x203acf, read32_delegate(FUNC(gunbustr_state::main_cycle_r),this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x203acc, 0x203acf, read32_delegate(FUNC(gunbustr_state::main_cycle_r),this));
}
DRIVER_INIT_MEMBER(gunbustr_state,gunbustrj)
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index 68af270573d..dd98dc8198b 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -3999,9 +3999,9 @@ static void init_multisync(running_machine &machine, int compact_inputs)
/* install handlers for the compact driving games' inputs */
if (compact_inputs)
{
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x400000, 0x400001, FUNC(hdc68k_wheel_r));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x408000, 0x408001, FUNC(hdc68k_wheel_edge_reset_w));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hdc68k_port1_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x400000, 0x400001, FUNC(hdc68k_wheel_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x408000, 0x408001, FUNC(hdc68k_wheel_edge_reset_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hdc68k_port1_r));
}
}
@@ -4012,18 +4012,18 @@ static void init_adsp(running_machine &machine)
harddriv_state *state = machine.driver_data<harddriv_state>();
/* install ADSP program RAM */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x800000, 0x807fff, FUNC(hd68k_adsp_program_r), FUNC(hd68k_adsp_program_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0x800000, 0x807fff, FUNC(hd68k_adsp_program_r), FUNC(hd68k_adsp_program_w));
/* install ADSP data RAM */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x808000, 0x80bfff, FUNC(hd68k_adsp_data_r), FUNC(hd68k_adsp_data_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0x808000, 0x80bfff, FUNC(hd68k_adsp_data_r), FUNC(hd68k_adsp_data_w));
/* install ADSP serial buffer RAM */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x810000, 0x813fff, FUNC(hd68k_adsp_buffer_r), FUNC(hd68k_adsp_buffer_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0x810000, 0x813fff, FUNC(hd68k_adsp_buffer_r), FUNC(hd68k_adsp_buffer_w));
/* install ADSP control locations */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x818000, 0x81801f, FUNC(hd68k_adsp_control_w));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x818060, 0x81807f, FUNC(hd68k_adsp_irq_clear_w));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x838000, 0x83ffff, FUNC(hd68k_adsp_irq_state_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x818000, 0x81801f, FUNC(hd68k_adsp_control_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x818060, 0x81807f, FUNC(hd68k_adsp_irq_clear_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x838000, 0x83ffff, FUNC(hd68k_adsp_irq_state_r));
}
@@ -4033,21 +4033,21 @@ static void init_ds3(running_machine &machine)
harddriv_state *state = machine.driver_data<harddriv_state>();
/* install ADSP program RAM */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x800000, 0x807fff, FUNC(hd68k_ds3_program_r), FUNC(hd68k_ds3_program_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0x800000, 0x807fff, FUNC(hd68k_ds3_program_r), FUNC(hd68k_ds3_program_w));
/* install ADSP data RAM */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x808000, 0x80bfff, FUNC(hd68k_adsp_data_r), FUNC(hd68k_adsp_data_w));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x80c000, 0x80dfff, FUNC(hdds3_special_r), FUNC(hdds3_special_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0x808000, 0x80bfff, FUNC(hd68k_adsp_data_r), FUNC(hd68k_adsp_data_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0x80c000, 0x80dfff, FUNC(hdds3_special_r), FUNC(hdds3_special_w));
/* install ADSP control locations */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x820000, 0x8207ff, FUNC(hd68k_ds3_gdata_r));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x820800, 0x820fff, FUNC(hd68k_ds3_girq_state_r));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x820000, 0x8207ff, FUNC(hd68k_ds3_gdata_w));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x821000, 0x8217ff, FUNC(hd68k_adsp_irq_clear_w));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x822000, 0x8227ff, FUNC(hd68k_ds3_sdata_r));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x822800, 0x822fff, FUNC(hd68k_ds3_sirq_state_r));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x822000, 0x8227ff, FUNC(hd68k_ds3_sdata_w));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x823800, 0x823fff, FUNC(hd68k_ds3_control_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x820000, 0x8207ff, FUNC(hd68k_ds3_gdata_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x820800, 0x820fff, FUNC(hd68k_ds3_girq_state_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x820000, 0x8207ff, FUNC(hd68k_ds3_gdata_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x821000, 0x8217ff, FUNC(hd68k_adsp_irq_clear_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x822000, 0x8227ff, FUNC(hd68k_ds3_sdata_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x822800, 0x822fff, FUNC(hd68k_ds3_sirq_state_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x822000, 0x8227ff, FUNC(hd68k_ds3_sdata_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x823800, 0x823fff, FUNC(hd68k_ds3_control_w));
/* if we have a sound DSP, boot it */
if (state->m_ds4cpu1 != NULL)
@@ -4132,26 +4132,26 @@ static void init_dsk(running_machine &machine)
UINT8 *usr3 = state->memregion("user3")->base();
/* install ASIC61 */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x85c000, 0x85c7ff, FUNC(hd68k_dsk_dsp32_r), FUNC(hd68k_dsk_dsp32_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0x85c000, 0x85c7ff, FUNC(hd68k_dsk_dsp32_r), FUNC(hd68k_dsk_dsp32_w));
/* install control registers */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x85c800, 0x85c81f, FUNC(hd68k_dsk_control_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x85c800, 0x85c81f, FUNC(hd68k_dsk_control_w));
/* install extra RAM */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x900000, 0x90ffff, FUNC(hd68k_dsk_ram_r), FUNC(hd68k_dsk_ram_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0x900000, 0x90ffff, FUNC(hd68k_dsk_ram_r), FUNC(hd68k_dsk_ram_w));
state->m_dsk_ram = (UINT16 *)(usr3 + 0x40000);
/* install extra ZRAM */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x910000, 0x910fff, FUNC(hd68k_dsk_zram_r), FUNC(hd68k_dsk_zram_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0x910000, 0x910fff, FUNC(hd68k_dsk_zram_r), FUNC(hd68k_dsk_zram_w));
state->m_dsk_zram = (UINT16 *)(usr3 + 0x50000);
/* install ASIC65 */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x914000, 0x917fff, FUNC(asic65_data_w));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x914000, 0x917fff, FUNC(asic65_r));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x918000, 0x91bfff, FUNC(asic65_io_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x914000, 0x917fff, FUNC(asic65_data_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x914000, 0x917fff, FUNC(asic65_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x918000, 0x91bfff, FUNC(asic65_io_r));
/* install extra ROM */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x940000, 0x9fffff, FUNC(hd68k_dsk_small_rom_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x940000, 0x9fffff, FUNC(hd68k_dsk_small_rom_r));
state->m_dsk_rom = (UINT16 *)(usr3 + 0x00000);
/* set up the ASIC65 */
@@ -4166,22 +4166,22 @@ static void init_dsk2(running_machine &machine)
UINT8 *usr3 = state->memregion("user3")->base();
/* install ASIC65 */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x824000, 0x824003, FUNC(asic65_data_w));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x824000, 0x824003, FUNC(asic65_r));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x825000, 0x825001, FUNC(asic65_io_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x824000, 0x824003, FUNC(asic65_data_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x824000, 0x824003, FUNC(asic65_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x825000, 0x825001, FUNC(asic65_io_r));
/* install ASIC61 */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x827000, 0x8277ff, FUNC(hd68k_dsk_dsp32_r), FUNC(hd68k_dsk_dsp32_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0x827000, 0x8277ff, FUNC(hd68k_dsk_dsp32_r), FUNC(hd68k_dsk_dsp32_w));
/* install control registers */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x827800, 0x82781f, FUNC(hd68k_dsk_control_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x827800, 0x82781f, FUNC(hd68k_dsk_control_w));
/* install extra RAM */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0x880000, 0x8bffff, FUNC(hd68k_dsk_ram_r), FUNC(hd68k_dsk_ram_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0x880000, 0x8bffff, FUNC(hd68k_dsk_ram_r), FUNC(hd68k_dsk_ram_w));
state->m_dsk_ram = (UINT16 *)(usr3 + 0x100000);
/* install extra ROM */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x900000, 0x9fffff, FUNC(hd68k_dsk_rom_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x900000, 0x9fffff, FUNC(hd68k_dsk_rom_r));
state->m_dsk_rom = (UINT16 *)(usr3 + 0x000000);
/* set up the ASIC65 */
@@ -4195,15 +4195,15 @@ static void init_dspcom(running_machine &machine)
harddriv_state *state = machine.driver_data<harddriv_state>();
/* install ASIC65 */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x900000, 0x900003, FUNC(asic65_data_w));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x900000, 0x900003, FUNC(asic65_r));
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x901000, 0x910001, FUNC(asic65_io_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x900000, 0x900003, FUNC(asic65_data_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x900000, 0x900003, FUNC(asic65_r));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x901000, 0x910001, FUNC(asic65_io_r));
/* set up the ASIC65 */
asic65_config(machine, ASIC65_STEELTAL);
/* install DSPCOM control */
- state->m_maincpu->space(AS_PROGRAM)->install_legacy_write_handler(0x904000, 0x90401f, FUNC(hddspcom_control_w));
+ state->m_maincpu->space(AS_PROGRAM).install_legacy_write_handler(0x904000, 0x90401f, FUNC(hddspcom_control_w));
}
@@ -4215,9 +4215,9 @@ static void init_driver_sound(running_machine &machine)
hdsnd_init(machine);
/* install sound handlers */
- state->m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0x840000, 0x840001, read16_delegate(FUNC(harddriv_state::hd68k_snd_data_r),state), write16_delegate(FUNC(harddriv_state::hd68k_snd_data_w),state));
- state->m_maincpu->space(AS_PROGRAM)->install_read_handler(0x844000, 0x844001, read16_delegate(FUNC(harddriv_state::hd68k_snd_status_r),state));
- state->m_maincpu->space(AS_PROGRAM)->install_write_handler(0x84c000, 0x84c001, write16_delegate(FUNC(harddriv_state::hd68k_snd_reset_w),state));
+ state->m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x840000, 0x840001, read16_delegate(FUNC(harddriv_state::hd68k_snd_data_r),state), write16_delegate(FUNC(harddriv_state::hd68k_snd_data_w),state));
+ state->m_maincpu->space(AS_PROGRAM).install_read_handler(0x844000, 0x844001, read16_delegate(FUNC(harddriv_state::hd68k_snd_status_r),state));
+ state->m_maincpu->space(AS_PROGRAM).install_write_handler(0x84c000, 0x84c001, write16_delegate(FUNC(harddriv_state::hd68k_snd_reset_w),state));
}
@@ -4238,18 +4238,18 @@ DRIVER_INIT_MEMBER(harddriv_state,harddriv)
init_driver_sound(machine());
/* set up gsp speedup handler */
- m_gsp_speedup_addr[0] = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup1_w));
- m_gsp_speedup_addr[1] = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfffcfc00, 0xfffcfc0f, FUNC(hdgsp_speedup2_w));
- m_gsp->space(AS_PROGRAM)->install_legacy_read_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup_r));
+ m_gsp_speedup_addr[0] = m_gsp->space(AS_PROGRAM).install_legacy_write_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup1_w));
+ m_gsp_speedup_addr[1] = m_gsp->space(AS_PROGRAM).install_legacy_write_handler(0xfffcfc00, 0xfffcfc0f, FUNC(hdgsp_speedup2_w));
+ m_gsp->space(AS_PROGRAM).install_legacy_read_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup_r));
m_gsp_speedup_pc = 0xffc00f10;
/* set up msp speedup handler */
- m_msp_speedup_addr = m_msp->space(AS_PROGRAM)->install_legacy_write_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_w));
- m_msp->space(AS_PROGRAM)->install_legacy_read_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_r));
+ m_msp_speedup_addr = m_msp->space(AS_PROGRAM).install_legacy_write_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_w));
+ m_msp->space(AS_PROGRAM).install_legacy_read_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_r));
m_msp_speedup_pc = 0x00723b00;
/* set up adsp speedup handlers */
- m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
+ m_adsp->space(AS_DATA).install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
}
@@ -4262,18 +4262,18 @@ DRIVER_INIT_MEMBER(harddriv_state,harddrivc)
init_driver_sound(machine());
/* set up gsp speedup handler */
- m_gsp_speedup_addr[0] = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup1_w));
- m_gsp_speedup_addr[1] = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfffcfc00, 0xfffcfc0f, FUNC(hdgsp_speedup2_w));
- m_gsp->space(AS_PROGRAM)->install_legacy_read_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup_r));
+ m_gsp_speedup_addr[0] = m_gsp->space(AS_PROGRAM).install_legacy_write_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup1_w));
+ m_gsp_speedup_addr[1] = m_gsp->space(AS_PROGRAM).install_legacy_write_handler(0xfffcfc00, 0xfffcfc0f, FUNC(hdgsp_speedup2_w));
+ m_gsp->space(AS_PROGRAM).install_legacy_read_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup_r));
m_gsp_speedup_pc = 0xfff40ff0;
/* set up msp speedup handler */
- m_msp_speedup_addr = m_msp->space(AS_PROGRAM)->install_legacy_write_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_w));
- m_msp->space(AS_PROGRAM)->install_legacy_read_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_r));
+ m_msp_speedup_addr = m_msp->space(AS_PROGRAM).install_legacy_write_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_w));
+ m_msp->space(AS_PROGRAM).install_legacy_read_handler(0x00751b00, 0x00751b0f, FUNC(hdmsp_speedup_r));
m_msp_speedup_pc = 0x00723b00;
/* set up adsp speedup handlers */
- m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
+ m_adsp->space(AS_DATA).install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
}
@@ -4286,13 +4286,13 @@ DRIVER_INIT_MEMBER(harddriv_state,stunrun)
atarijsa_init(machine(), "IN0", 0x0020);
/* set up gsp speedup handler */
- m_gsp_speedup_addr[0] = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup1_w));
- m_gsp_speedup_addr[1] = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfffcfc00, 0xfffcfc0f, FUNC(hdgsp_speedup2_w));
- m_gsp->space(AS_PROGRAM)->install_legacy_read_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup_r));
+ m_gsp_speedup_addr[0] = m_gsp->space(AS_PROGRAM).install_legacy_write_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup1_w));
+ m_gsp_speedup_addr[1] = m_gsp->space(AS_PROGRAM).install_legacy_write_handler(0xfffcfc00, 0xfffcfc0f, FUNC(hdgsp_speedup2_w));
+ m_gsp->space(AS_PROGRAM).install_legacy_read_handler(0xfff9fc00, 0xfff9fc0f, FUNC(hdgsp_speedup_r));
m_gsp_speedup_pc = 0xfff41070;
/* set up adsp speedup handlers */
- m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
+ m_adsp->space(AS_DATA).install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
}
@@ -4307,14 +4307,14 @@ DRIVER_INIT_MEMBER(harddriv_state,racedriv)
/* set up the slapstic */
slapstic_init(machine(), 117);
- m_m68k_slapstic_base = m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(rd68k_slapstic_r), FUNC(rd68k_slapstic_w));
+ m_m68k_slapstic_base = m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(rd68k_slapstic_r), FUNC(rd68k_slapstic_w));
/* synchronization */
- m_rddsp32_sync[0] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x613c00, 0x613c03, FUNC(rddsp32_sync0_w));
- m_rddsp32_sync[1] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x613e00, 0x613e03, FUNC(rddsp32_sync1_w));
+ m_rddsp32_sync[0] = m_dsp32->space(AS_PROGRAM).install_legacy_write_handler(0x613c00, 0x613c03, FUNC(rddsp32_sync0_w));
+ m_rddsp32_sync[1] = m_dsp32->space(AS_PROGRAM).install_legacy_write_handler(0x613e00, 0x613e03, FUNC(rddsp32_sync1_w));
/* set up adsp speedup handlers */
- m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
+ m_adsp->space(AS_DATA).install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
}
@@ -4330,22 +4330,22 @@ static void racedrivc_init_common(running_machine &machine, offs_t gsp_protectio
/* set up the slapstic */
slapstic_init(machine, 117);
- state->m_m68k_slapstic_base = state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(rd68k_slapstic_r), FUNC(rd68k_slapstic_w));
+ state->m_m68k_slapstic_base = state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(rd68k_slapstic_r), FUNC(rd68k_slapstic_w));
/* synchronization */
- state->m_rddsp32_sync[0] = state->m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x613c00, 0x613c03, FUNC(rddsp32_sync0_w));
- state->m_rddsp32_sync[1] = state->m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x613e00, 0x613e03, FUNC(rddsp32_sync1_w));
+ state->m_rddsp32_sync[0] = state->m_dsp32->space(AS_PROGRAM).install_legacy_write_handler(0x613c00, 0x613c03, FUNC(rddsp32_sync0_w));
+ state->m_rddsp32_sync[1] = state->m_dsp32->space(AS_PROGRAM).install_legacy_write_handler(0x613e00, 0x613e03, FUNC(rddsp32_sync1_w));
/* set up protection hacks */
- state->m_gsp_protection = state->m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(gsp_protection, gsp_protection + 0x0f, FUNC(hdgsp_protection_w));
+ state->m_gsp_protection = state->m_gsp->space(AS_PROGRAM).install_legacy_write_handler(gsp_protection, gsp_protection + 0x0f, FUNC(hdgsp_protection_w));
/* set up gsp speedup handler */
- state->m_gsp_speedup_addr[0] = state->m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff76f60, 0xfff76f6f, FUNC(rdgsp_speedup1_w));
- state->m_gsp->space(AS_PROGRAM)->install_legacy_read_handler(0xfff76f60, 0xfff76f6f, FUNC(rdgsp_speedup1_r));
+ state->m_gsp_speedup_addr[0] = state->m_gsp->space(AS_PROGRAM).install_legacy_write_handler(0xfff76f60, 0xfff76f6f, FUNC(rdgsp_speedup1_w));
+ state->m_gsp->space(AS_PROGRAM).install_legacy_read_handler(0xfff76f60, 0xfff76f6f, FUNC(rdgsp_speedup1_r));
state->m_gsp_speedup_pc = 0xfff43a00;
/* set up adsp speedup handlers */
- state->m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
+ state->m_adsp->space(AS_DATA).install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
}
DRIVER_INIT_MEMBER(harddriv_state,racedrivc) { racedrivc_init_common(machine(), 0xfff95cd0); }
@@ -4357,8 +4357,8 @@ DRIVER_INIT_MEMBER(harddriv_state,racedrivb1)
/* this unpleasantness prevents racedrivb1 and racedrivg1 from crashing MAME during boot */
/* both clear the DSP32C's RAM and then release it from reset, causing it to run through */
/* its address space recursively executing instructions */
- m_dsp32->space(AS_PROGRAM)->install_read_handler(0x002000, 0x5fffff, read32_delegate(FUNC(harddriv_state::rddsp_unmap_r),this));
- m_dsp32->space(AS_PROGRAM)->install_read_handler(0x640000, 0xfff7ff, read32_delegate(FUNC(harddriv_state::rddsp_unmap_r),this));
+ m_dsp32->space(AS_PROGRAM).install_read_handler(0x002000, 0x5fffff, read32_delegate(FUNC(harddriv_state::rddsp_unmap_r),this));
+ m_dsp32->space(AS_PROGRAM).install_read_handler(0x640000, 0xfff7ff, read32_delegate(FUNC(harddriv_state::rddsp_unmap_r),this));
DRIVER_INIT_CALL(racedriv);
}
@@ -4385,23 +4385,23 @@ static void steeltal_init_common(running_machine &machine, offs_t ds3_transfer_p
init_dspcom(machine);
atarijsa_init(machine, "IN0", 0x0020);
- state->m_maincpu->space(AS_PROGRAM)->install_read_handler(0x908000, 0x908001, read16_delegate(FUNC(harddriv_state::steeltal_dummy_r),state));
+ state->m_maincpu->space(AS_PROGRAM).install_read_handler(0x908000, 0x908001, read16_delegate(FUNC(harddriv_state::steeltal_dummy_r),state));
/* set up the SLOOP */
if (!proto_sloop)
{
- state->m_m68k_slapstic_base = state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(st68k_sloop_r), FUNC(st68k_sloop_w));
- state->m_m68k_sloop_alt_base = state->m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0x4e000, 0x4ffff, FUNC(st68k_sloop_alt_r));
+ state->m_m68k_slapstic_base = state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(st68k_sloop_r), FUNC(st68k_sloop_w));
+ state->m_m68k_sloop_alt_base = state->m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0x4e000, 0x4ffff, FUNC(st68k_sloop_alt_r));
}
else
- state->m_m68k_slapstic_base = state->m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(st68k_protosloop_r), FUNC(st68k_protosloop_w));
+ state->m_m68k_slapstic_base = state->m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(st68k_protosloop_r), FUNC(st68k_protosloop_w));
/* set up protection hacks */
- state->m_gsp_protection = state->m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff965d0, 0xfff965df, FUNC(hdgsp_protection_w));
+ state->m_gsp_protection = state->m_gsp->space(AS_PROGRAM).install_legacy_write_handler(0xfff965d0, 0xfff965df, FUNC(hdgsp_protection_w));
/* set up adsp speedup handlers */
- state->m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
- state->m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1f99, 0x1f99, FUNC(hdds3_speedup_r));
+ state->m_adsp->space(AS_DATA).install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
+ state->m_adsp->space(AS_DATA).install_legacy_read_handler(0x1f99, 0x1f99, FUNC(hdds3_speedup_r));
state->m_ds3_speedup_addr = &state->m_adsp_data_memory[0x1f99];
state->m_ds3_speedup_pc = 0xff;
state->m_ds3_transfer_pc = ds3_transfer_pc;
@@ -4423,20 +4423,20 @@ DRIVER_INIT_MEMBER(harddriv_state,strtdriv)
/* set up the slapstic */
slapstic_init(machine(), 117);
- m_m68k_slapstic_base = m_maincpu->space(AS_PROGRAM)->install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(rd68k_slapstic_r), FUNC(rd68k_slapstic_w));
+ m_m68k_slapstic_base = m_maincpu->space(AS_PROGRAM).install_legacy_readwrite_handler(0xe0000, 0xfffff, FUNC(rd68k_slapstic_r), FUNC(rd68k_slapstic_w));
- m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hda68k_port1_r));
+ m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hda68k_port1_r));
/* synchronization */
- m_rddsp32_sync[0] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x613c00, 0x613c03, FUNC(rddsp32_sync0_w));
- m_rddsp32_sync[1] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x613e00, 0x613e03, FUNC(rddsp32_sync1_w));
+ m_rddsp32_sync[0] = m_dsp32->space(AS_PROGRAM).install_legacy_write_handler(0x613c00, 0x613c03, FUNC(rddsp32_sync0_w));
+ m_rddsp32_sync[1] = m_dsp32->space(AS_PROGRAM).install_legacy_write_handler(0x613e00, 0x613e03, FUNC(rddsp32_sync1_w));
/* set up protection hacks */
- m_gsp_protection = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff960a0, 0xfff960af, FUNC(hdgsp_protection_w));
+ m_gsp_protection = m_gsp->space(AS_PROGRAM).install_legacy_write_handler(0xfff960a0, 0xfff960af, FUNC(hdgsp_protection_w));
/* set up adsp speedup handlers */
- m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
- m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1f99, 0x1f99, FUNC(hdds3_speedup_r));
+ m_adsp->space(AS_DATA).install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
+ m_adsp->space(AS_DATA).install_legacy_read_handler(0x1f99, 0x1f99, FUNC(hdds3_speedup_r));
m_ds3_speedup_addr = &m_adsp_data_memory[0x1f99];
m_ds3_speedup_pc = 0xff;
m_ds3_transfer_pc = 0x43672;
@@ -4451,18 +4451,18 @@ DRIVER_INIT_MEMBER(harddriv_state,hdrivair)
init_ds3(machine());
init_dsk2(machine());
- m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hda68k_port1_r));
+ m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hda68k_port1_r));
/* synchronization */
- m_rddsp32_sync[0] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x21fe00, 0x21fe03, FUNC(rddsp32_sync0_w));
- m_rddsp32_sync[1] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x21ff00, 0x21ff03, FUNC(rddsp32_sync1_w));
+ m_rddsp32_sync[0] = m_dsp32->space(AS_PROGRAM).install_legacy_write_handler(0x21fe00, 0x21fe03, FUNC(rddsp32_sync0_w));
+ m_rddsp32_sync[1] = m_dsp32->space(AS_PROGRAM).install_legacy_write_handler(0x21ff00, 0x21ff03, FUNC(rddsp32_sync1_w));
/* set up protection hacks */
- m_gsp_protection = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff943f0, 0xfff943ff, FUNC(hdgsp_protection_w));
+ m_gsp_protection = m_gsp->space(AS_PROGRAM).install_legacy_write_handler(0xfff943f0, 0xfff943ff, FUNC(hdgsp_protection_w));
/* set up adsp speedup handlers */
- m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
- m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1f99, 0x1f99, FUNC(hdds3_speedup_r));
+ m_adsp->space(AS_DATA).install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
+ m_adsp->space(AS_DATA).install_legacy_read_handler(0x1f99, 0x1f99, FUNC(hdds3_speedup_r));
m_ds3_speedup_addr = &m_adsp_data_memory[0x1f99];
m_ds3_speedup_pc = 0x2da;
m_ds3_transfer_pc = 0x407b8;
@@ -4477,18 +4477,18 @@ DRIVER_INIT_MEMBER(harddriv_state,hdrivairp)
init_ds3(machine());
init_dsk2(machine());
- m_maincpu->space(AS_PROGRAM)->install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hda68k_port1_r));
+ m_maincpu->space(AS_PROGRAM).install_legacy_read_handler(0xa80000, 0xafffff, FUNC(hda68k_port1_r));
/* synchronization */
- m_rddsp32_sync[0] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x21fe00, 0x21fe03, FUNC(rddsp32_sync0_w));
- m_rddsp32_sync[1] = m_dsp32->space(AS_PROGRAM)->install_legacy_write_handler(0x21ff00, 0x21ff03, FUNC(rddsp32_sync1_w));
+ m_rddsp32_sync[0] = m_dsp32->space(AS_PROGRAM).install_legacy_write_handler(0x21fe00, 0x21fe03, FUNC(rddsp32_sync0_w));
+ m_rddsp32_sync[1] = m_dsp32->space(AS_PROGRAM).install_legacy_write_handler(0x21ff00, 0x21ff03, FUNC(rddsp32_sync1_w));
/* set up protection hacks */
- m_gsp_protection = m_gsp->space(AS_PROGRAM)->install_legacy_write_handler(0xfff916c0, 0xfff916cf, FUNC(hdgsp_protection_w));
+ m_gsp_protection = m_gsp->space(AS_PROGRAM).install_legacy_write_handler(0xfff916c0, 0xfff916cf, FUNC(hdgsp_protection_w));
/* set up adsp speedup handlers */
- m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
- m_adsp->space(AS_DATA)->install_legacy_read_handler(0x1f9a, 0x1f9a, FUNC(hdds3_speedup_r));
+ m_adsp->space(AS_DATA).install_legacy_read_handler(0x1fff, 0x1fff, FUNC(hdadsp_speedup_r));
+ m_adsp->space(AS_DATA).install_legacy_read_handler(0x1f9a, 0x1f9a, FUNC(hdds3_speedup_r));
m_ds3_speedup_addr = &m_adsp_data_memory[0x1f9a];
m_ds3_speedup_pc = 0x2d9;
m_ds3_transfer_pc = 0X407da;
diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c
index 11ecd74b03c..f62eca005d3 100644
--- a/src/mame/drivers/highvdeo.c
+++ b/src/mame/drivers/highvdeo.c
@@ -1201,7 +1201,7 @@ READ16_MEMBER(highvdeo_state::ciclone_status_r)
DRIVER_INIT_MEMBER(highvdeo_state,ciclone)
{
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x0030, 0x0033, read16_delegate(FUNC(highvdeo_state::ciclone_status_r), this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x0030, 0x0033, read16_delegate(FUNC(highvdeo_state::ciclone_status_r), this));
}
/*
@@ -1271,7 +1271,7 @@ WRITE16_MEMBER(highvdeo_state::fashion_output_w)
DRIVER_INIT_MEMBER(highvdeo_state,fashion)
{
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x0002, 0x0003, write16_delegate(FUNC(highvdeo_state::fashion_output_w), this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x0002, 0x0003, write16_delegate(FUNC(highvdeo_state::fashion_output_w), this));
}
GAMEL( 2000, tour4000, 0, tv_vcf, tv_vcf, driver_device, 0, ROT0, "High Video", "Tour 4000", 0, layout_fashion )
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index 35cb805c3a4..168661ffafc 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -1806,7 +1806,7 @@ void hng64_state::machine_reset()
KL5C80_virtual_mem_sync(this);
- address_space &space = *machine().device<z80_device>("comm")->space(AS_PROGRAM);
+ address_space &space = machine().device<z80_device>("comm")->space(AS_PROGRAM);
space.set_direct_update_handler(direct_update_delegate(FUNC(hng64_state::KL5C80_direct_handler), this));
machine().device("comm")->execute().set_input_line(INPUT_LINE_RESET, PULSE_LINE); // reset the CPU and let 'er rip
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index fbe6c7b5139..e3f52f09690 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -1211,7 +1211,7 @@ MACHINE_RESET_MEMBER(homedata_state,homedata)
MACHINE_RESET_MEMBER(homedata_state,pteacher)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* on reset, ports are set as input (high impedance), therefore 0xff output */
pteacher_upd7807_portc_w(space, 0, 0xff);
@@ -1227,7 +1227,7 @@ MACHINE_RESET_MEMBER(homedata_state,pteacher)
MACHINE_RESET_MEMBER(homedata_state,reikaids)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* on reset, ports are set as input (high impedance), therefore 0xff output */
reikaids_upd7807_portc_w(space, 0, 0xff);
@@ -2016,15 +2016,15 @@ DRIVER_INIT_MEMBER(homedata_state,jogakuen)
/* it seems that Mahjong Jogakuen runs on the same board as the others,
but with just these two addresses swapped. Instead of creating a new
MachineDriver, I just fix them here. */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8007, 0x8007, write8_delegate(FUNC(homedata_state::pteacher_blitter_bank_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8005, 0x8005, write8_delegate(FUNC(homedata_state::pteacher_gfx_bank_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x8007, 0x8007, write8_delegate(FUNC(homedata_state::pteacher_blitter_bank_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x8005, 0x8005, write8_delegate(FUNC(homedata_state::pteacher_gfx_bank_w),this));
}
DRIVER_INIT_MEMBER(homedata_state,mjikaga)
{
/* Mahjong Ikagadesuka is different as well. */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x7802, 0x7802, read8_delegate(FUNC(homedata_state::pteacher_snd_r),this));
- machine().device("audiocpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0123, 0x0123, write8_delegate(FUNC(homedata_state::pteacher_snd_answer_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x7802, 0x7802, read8_delegate(FUNC(homedata_state::pteacher_snd_r),this));
+ machine().device("audiocpu")->memory().space(AS_PROGRAM).install_write_handler(0x0123, 0x0123, write8_delegate(FUNC(homedata_state::pteacher_snd_answer_w),this));
}
DRIVER_INIT_MEMBER(homedata_state,reikaids)
diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c
index c631448ed08..3b49c29b81b 100644
--- a/src/mame/drivers/hshavoc.c
+++ b/src/mame/drivers/hshavoc.c
@@ -218,7 +218,7 @@ DRIVER_INIT_MEMBER(md_cons_state,hshavoc)
*/
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.nop_write(0x200000, 0x201fff);
}
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index 38a73db1980..569767ad91f 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -803,10 +803,10 @@ DRIVER_INIT_MEMBER(hyprduel_state,hyprduel)
m_int_num = 0x02;
/* cpu synchronization (severe timings) */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc0040e, 0xc00411, write16_delegate(FUNC(hyprduel_state::hyprduel_cpusync_trigger1_w),this));
- machine().device("sub")->memory().space(AS_PROGRAM)->install_read_handler(0xc00408, 0xc00409, read16_delegate(FUNC(hyprduel_state::hyprduel_cpusync_trigger1_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00408, 0xc00409, write16_delegate(FUNC(hyprduel_state::hyprduel_cpusync_trigger2_w),this));
- machine().device("sub")->memory().space(AS_PROGRAM)->install_read_handler(0xfff34c, 0xfff34d, read16_delegate(FUNC(hyprduel_state::hyprduel_cpusync_trigger2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc0040e, 0xc00411, write16_delegate(FUNC(hyprduel_state::hyprduel_cpusync_trigger1_w),this));
+ machine().device("sub")->memory().space(AS_PROGRAM).install_read_handler(0xc00408, 0xc00409, read16_delegate(FUNC(hyprduel_state::hyprduel_cpusync_trigger1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00408, 0xc00409, write16_delegate(FUNC(hyprduel_state::hyprduel_cpusync_trigger2_w),this));
+ machine().device("sub")->memory().space(AS_PROGRAM).install_read_handler(0xfff34c, 0xfff34d, read16_delegate(FUNC(hyprduel_state::hyprduel_cpusync_trigger2_r),this));
}
DRIVER_INIT_MEMBER(hyprduel_state,magerror)
diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c
index ebb695f1777..6b5af2f4ad3 100644
--- a/src/mame/drivers/igs011.c
+++ b/src/mame/drivers/igs011.c
@@ -1036,17 +1036,17 @@ WRITE16_MEMBER(igs011_state::igs011_prot_addr_w)
// m_prot2 = 0x00;
- address_space *sp = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &sp = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = memregion("maincpu")->base();
// Plug previous address range with ROM access
- sp->install_rom(m_prot1_addr + 0, m_prot1_addr + 9, rom + m_prot1_addr);
+ sp.install_rom(m_prot1_addr + 0, m_prot1_addr + 9, rom + m_prot1_addr);
m_prot1_addr = (data << 4) ^ 0x8340;
// Add protection memory range
- sp->install_write_handler(m_prot1_addr + 0, m_prot1_addr + 7, write16_delegate(FUNC(igs011_state::igs011_prot1_w), this));
- sp->install_read_handler (m_prot1_addr + 8, m_prot1_addr + 9, read16_delegate(FUNC(igs011_state::igs011_prot1_r), this));
+ sp.install_write_handler(m_prot1_addr + 0, m_prot1_addr + 7, write16_delegate(FUNC(igs011_state::igs011_prot1_w), this));
+ sp.install_read_handler (m_prot1_addr + 8, m_prot1_addr + 9, read16_delegate(FUNC(igs011_state::igs011_prot1_r), this));
}
/*
READ16_MEMBER(igs011_state::igs011_prot_fake_r)
@@ -1835,7 +1835,7 @@ DRIVER_INIT_MEMBER(igs011_state,drgnwrldv21)
drgnwrld_type2_decrypt(machine());
drgnwrld_gfx_decrypt(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd4c0, 0xd4ff, read16_delegate(FUNC(igs011_state::drgnwrldv21_igs011_prot2_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd4c0, 0xd4ff, read16_delegate(FUNC(igs011_state::drgnwrldv21_igs011_prot2_r), this));
/*
// PROTECTION CHECKS
// bp 32ee; bp 11ca8; bp 23d5e; bp 23fd0; bp 24170; bp 24348; bp 2454e; bp 246cc; bp 24922; bp 24b66; bp 24de2; bp 2502a; bp 25556; bp 269de; bp 2766a; bp 2a830
@@ -1975,7 +1975,7 @@ DRIVER_INIT_MEMBER(igs011_state,dbc)
dbc_decrypt(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x10600, 0x107ff, read16_delegate(FUNC(igs011_state::dbc_igs011_prot2_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x10600, 0x107ff, read16_delegate(FUNC(igs011_state::dbc_igs011_prot2_r), this));
/*
// PROTECTION CHECKS
rom[0x04c42/2] = 0x602e; // 004C42: 6604 bne 4c48 (rom test error otherwise)
@@ -2005,7 +2005,7 @@ DRIVER_INIT_MEMBER(igs011_state,ryukobou)
ryukobou_decrypt(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x10600, 0x107ff, read16_delegate(FUNC(igs011_state::ryukobou_igs011_prot2_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x10600, 0x107ff, read16_delegate(FUNC(igs011_state::ryukobou_igs011_prot2_r), this));
// PROTECTION CHECKS
// rom[0x2df68/2] = 0x4e75; // 02DF68: 4E56 FE00 link A6, #-$200 (fills palette with pink otherwise)
diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c
index 595ec8784fa..f9b245d3738 100644
--- a/src/mame/drivers/igs017.c
+++ b/src/mame/drivers/igs017.c
@@ -797,7 +797,7 @@ DRIVER_INIT_MEMBER(igs017_state,starzan)
starzan_decrypt(data, size, false); // data
starzan_decrypt(code, size, true); // opcodes
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_decrypted_region(0x00000, 0x3ffff, code);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_decrypted_region(0x00000, 0x3ffff, code);
mgcs_flip_sprites(machine());
}
@@ -3393,7 +3393,7 @@ MACHINE_CONFIG_END
MACHINE_RESET_MEMBER(igs017_state,lhzb2a)
{
MACHINE_RESET_CALL_MEMBER( mgcs );
- lhzb2a_input_addr_w(*m_maincpu->space(AS_PROGRAM), 0, 0xf0);
+ lhzb2a_input_addr_w(m_maincpu->space(AS_PROGRAM), 0, 0xf0);
}
static MACHINE_CONFIG_START( lhzb2a, igs017_state )
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index 425ee470ea5..470adf7a58c 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -443,7 +443,7 @@ DRIVER_INIT_MEMBER(iqblock_state,iqblock)
m_generic_paletteram2_8.set_target(rom + 0x12800, 0x800);
m_fgvideoram = rom + 0x16800;
m_bgvideoram = rom + 0x17000;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xfe26, 0xfe26, write8_delegate(FUNC(iqblock_state::iqblock_prot_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xfe26, 0xfe26, write8_delegate(FUNC(iqblock_state::iqblock_prot_w),this));
m_video_type=1;
}
@@ -465,7 +465,7 @@ DRIVER_INIT_MEMBER(iqblock_state,grndtour)
m_generic_paletteram2_8.set_target(rom + 0x12800, 0x800);
m_fgvideoram = rom + 0x16800;
m_bgvideoram = rom + 0x17000;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xfe39, 0xfe39, write8_delegate(FUNC(iqblock_state::grndtour_prot_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xfe39, 0xfe39, write8_delegate(FUNC(iqblock_state::grndtour_prot_w),this));
m_video_type=0;
}
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index f766c85f76e..55904d62c0d 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -436,7 +436,7 @@ static TIMER_DEVICE_CALLBACK( farwest_irq )
READ8_MEMBER(ironhors_state::farwest_soundlatch_r)
{
- return soundlatch_byte_r(*m_soundcpu->space(AS_PROGRAM), 0);
+ return soundlatch_byte_r(m_soundcpu->space(AS_PROGRAM), 0);
}
static const ym2203_interface farwest_ym2203_config =
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 118e66f736e..4f3178709b2 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -704,7 +704,7 @@ WRITE8_MEMBER(itech32_state::drivedge_portb_out)
set_led_status(machine(), 1, data & 0x01);
set_led_status(machine(), 2, data & 0x02);
set_led_status(machine(), 3, data & 0x04);
- machine().device<ticket_dispenser_device>("ticket")->write(*machine().memory().first_space(), 0, (data & 0x10) << 3);
+ machine().device<ticket_dispenser_device>("ticket")->write(machine().driver_data()->generic_space(), 0, (data & 0x10) << 3);
coin_counter_w(machine(), 0, (data & 0x20) >> 5);
}
@@ -722,7 +722,7 @@ WRITE8_MEMBER(itech32_state::pia_portb_out)
/* bit 4 controls the ticket dispenser */
/* bit 5 controls the coin counter */
/* bit 6 controls the diagnostic sound LED */
- machine().device<ticket_dispenser_device>("ticket")->write(*machine().memory().first_space(), 0, (data & 0x10) << 3);
+ machine().device<ticket_dispenser_device>("ticket")->write(machine().driver_data()->generic_space(), 0, (data & 0x10) << 3);
coin_counter_w(machine(), 0, (data & 0x20) >> 5);
}
@@ -4037,8 +4037,8 @@ DRIVER_INIT_MEMBER(itech32_state,drivedge)
m_planes = 1;
m_is_drivedge = 1;
- machine().device("dsp1")->memory().space(AS_PROGRAM)->install_read_handler(0x8382, 0x8382, read32_delegate(FUNC(itech32_state::drivedge_tms1_speedup_r),this));
- machine().device("dsp2")->memory().space(AS_PROGRAM)->install_read_handler(0x8382, 0x8382, read32_delegate(FUNC(itech32_state::drivedge_tms2_speedup_r),this));
+ machine().device("dsp1")->memory().space(AS_PROGRAM).install_read_handler(0x8382, 0x8382, read32_delegate(FUNC(itech32_state::drivedge_tms1_speedup_r),this));
+ machine().device("dsp2")->memory().space(AS_PROGRAM).install_read_handler(0x8382, 0x8382, read32_delegate(FUNC(itech32_state::drivedge_tms2_speedup_r),this));
}
@@ -4054,11 +4054,11 @@ DRIVER_INIT_MEMBER(itech32_state,wcbowl)
m_vram_height = 1024;
m_planes = 1;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x680000, 0x680001, read16_delegate(FUNC(itech32_state::trackball_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x680000, 0x680001, read16_delegate(FUNC(itech32_state::trackball_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_read(0x578000, 0x57ffff);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x680080, 0x680081, read16_delegate(FUNC(itech32_state::wcbowl_prot_result_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x680080, 0x680081);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_read(0x578000, 0x57ffff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x680080, 0x680081, read16_delegate(FUNC(itech32_state::wcbowl_prot_result_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x680080, 0x680081);
}
@@ -4072,8 +4072,8 @@ static void init_sftm_common(running_machine &machine, int prot_addr)
state->m_itech020_prot_address = prot_addr;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x300000, 0x300003, write32_delegate(FUNC(itech32_state::itech020_color2_w),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x380000, 0x380003, write32_delegate(FUNC(itech32_state::itech020_color1_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x300000, 0x300003, write32_delegate(FUNC(itech32_state::itech020_color2_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x380000, 0x380003, write32_delegate(FUNC(itech32_state::itech020_color1_w),state));
}
@@ -4104,10 +4104,10 @@ static void init_shuffle_bowl_common(running_machine &machine, int prot_addr)
state->m_itech020_prot_address = prot_addr;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x300000, 0x300003, write32_delegate(FUNC(itech32_state::itech020_color2_w),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x380000, 0x380003, write32_delegate(FUNC(itech32_state::itech020_color1_w),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x180800, 0x180803, read32_delegate(FUNC(itech32_state::trackball32_4bit_p1_r),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x181000, 0x181003, read32_delegate(FUNC(itech32_state::trackball32_4bit_p2_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x300000, 0x300003, write32_delegate(FUNC(itech32_state::itech020_color2_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x380000, 0x380003, write32_delegate(FUNC(itech32_state::itech020_color1_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x180800, 0x180803, read32_delegate(FUNC(itech32_state::trackball32_4bit_p1_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x181000, 0x181003, read32_delegate(FUNC(itech32_state::trackball32_4bit_p2_r),state));
}
@@ -4126,7 +4126,7 @@ DRIVER_INIT_MEMBER(itech32_state,wcbowln)
static void install_timekeeper(running_machine &machine)
{
device_t *device = machine.device("m48t02");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(*device, 0x681000, 0x6817ff, FUNC(timekeeper_r), FUNC(timekeeper_w), 0xffffffff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(*device, 0x681000, 0x6817ff, FUNC(timekeeper_r), FUNC(timekeeper_w), 0xffffffff);
}
DRIVER_INIT_MEMBER(itech32_state,wcbowlt)
@@ -4158,7 +4158,7 @@ DRIVER_INIT_MEMBER(itech32_state,gt3d)
Hacked versions of this PCB have been found with GT97
through GTClassic. This is _NOT_ a factory modification
*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x200000, 0x200003, read32_delegate(FUNC(itech32_state::trackball32_8bit_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x200000, 0x200003, read32_delegate(FUNC(itech32_state::trackball32_8bit_r),this));
init_gt_common(machine());
}
@@ -4171,8 +4171,8 @@ DRIVER_INIT_MEMBER(itech32_state,aama)
board share the same sound CPU code and sample ROMs.
This board has all versions of GT for it, GT3D through GTClassic
*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x180800, 0x180803, read32_delegate(FUNC(itech32_state::trackball32_4bit_p1_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x181000, 0x181003, read32_delegate(FUNC(itech32_state::trackball32_4bit_p2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x180800, 0x180803, read32_delegate(FUNC(itech32_state::trackball32_4bit_p1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x181000, 0x181003, read32_delegate(FUNC(itech32_state::trackball32_4bit_p2_r),this));
init_gt_common(machine());
}
@@ -4196,7 +4196,7 @@ DRIVER_INIT_MEMBER(itech32_state,s_ver)
board: GT97 v1.21S, GT98, GT99, GT2K & GT Classic Versions 1.00S
Trackball info is read through 200202 (actually 200203).
*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x200200, 0x200203, read32_delegate(FUNC(itech32_state::trackball32_4bit_p1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x200200, 0x200203, read32_delegate(FUNC(itech32_state::trackball32_4bit_p1_r),this));
init_gt_common(machine());
}
@@ -4210,7 +4210,7 @@ DRIVER_INIT_MEMBER(itech32_state,gt3dl)
Player 1 trackball read through 200003
Player 2 trackball read through 200002
*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x200000, 0x200003, read32_delegate(FUNC(itech32_state::trackball32_4bit_combined_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x200000, 0x200003, read32_delegate(FUNC(itech32_state::trackball32_4bit_combined_r),this));
init_gt_common(machine());
}
@@ -4218,7 +4218,7 @@ DRIVER_INIT_MEMBER(itech32_state,gt3dl)
DRIVER_INIT_MEMBER(itech32_state,gt2kp)
{
/* a little extra protection */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x680000, 0x680003, read32_delegate(FUNC(itech32_state::gt2kp_prot_result_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x680000, 0x680003, read32_delegate(FUNC(itech32_state::gt2kp_prot_result_r),this));
DRIVER_INIT_CALL(aama);
/* The protection code is:
@@ -4239,7 +4239,7 @@ Label1 bne.s Label1 ; Infinite loop if result isn't 0x01
DRIVER_INIT_MEMBER(itech32_state,gtclasscp)
{
/* a little extra protection */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x680000, 0x680003, read32_delegate(FUNC(itech32_state::gtclass_prot_result_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x680000, 0x680003, read32_delegate(FUNC(itech32_state::gtclass_prot_result_r),this));
DRIVER_INIT_CALL(aama);
/* The protection code is:
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index 9b2301366fb..ab9681ac1ab 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -767,7 +767,7 @@ WRITE8_MEMBER(itech8_state::ym2203_portb_out)
/* bit 6 controls the diagnostic sound LED */
/* bit 7 controls the ticket dispenser */
m_pia_portb_data = data;
- machine().device<ticket_dispenser_device>("ticket")->write(*machine().memory().first_space(), 0, data & 0x80);
+ machine().device<ticket_dispenser_device>("ticket")->write(machine().driver_data()->generic_space(), 0, data & 0x80);
coin_counter_w(machine(), 0, (data & 0x20) >> 5);
}
@@ -2630,25 +2630,25 @@ ROM_END
DRIVER_INIT_MEMBER(itech8_state,grmatch)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0160, 0x0160, write8_delegate(FUNC(itech8_state::grmatch_palette_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0180, 0x0180, write8_delegate(FUNC(itech8_state::grmatch_xscroll_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x01e0, 0x01ff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0160, 0x0160, write8_delegate(FUNC(itech8_state::grmatch_palette_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0180, 0x0180, write8_delegate(FUNC(itech8_state::grmatch_xscroll_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x01e0, 0x01ff);
}
DRIVER_INIT_MEMBER(itech8_state,slikshot)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler (0x0180, 0x0180, FUNC(slikshot_z80_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler (0x01cf, 0x01cf, FUNC(slikshot_z80_control_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x01cf, 0x01cf, FUNC(slikshot_z80_control_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler (0x0180, 0x0180, FUNC(slikshot_z80_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler (0x01cf, 0x01cf, FUNC(slikshot_z80_control_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x01cf, 0x01cf, FUNC(slikshot_z80_control_w));
}
DRIVER_INIT_MEMBER(itech8_state,sstrike)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler (0x1180, 0x1180, FUNC(slikshot_z80_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler (0x11cf, 0x11cf, FUNC(slikshot_z80_control_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x11cf, 0x11cf, FUNC(slikshot_z80_control_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler (0x1180, 0x1180, FUNC(slikshot_z80_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler (0x11cf, 0x11cf, FUNC(slikshot_z80_control_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x11cf, 0x11cf, FUNC(slikshot_z80_control_w));
}
@@ -2679,15 +2679,15 @@ DRIVER_INIT_MEMBER(itech8_state,neckneck)
DRIVER_INIT_MEMBER(itech8_state,rimrockn)
{
/* additional input ports */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port (0x0161, 0x0161, "161");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port (0x0162, 0x0162, "162");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port (0x0163, 0x0163, "163");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port (0x0164, 0x0164, "164");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port (0x0165, 0x0165, "165");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port (0x0161, 0x0161, "161");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port (0x0162, 0x0162, "162");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port (0x0163, 0x0163, "163");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port (0x0164, 0x0164, "164");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port (0x0165, 0x0165, "165");
/* different banking mechanism (disable the old one) */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x01a0, 0x01a0, write8_delegate(FUNC(itech8_state::rimrockn_bank_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x01c0, 0x01df, write8_delegate(FUNC(itech8_state::itech8_blitter_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x01a0, 0x01a0, write8_delegate(FUNC(itech8_state::rimrockn_bank_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x01c0, 0x01df, write8_delegate(FUNC(itech8_state::itech8_blitter_w),this));
}
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index 0529e4c3979..db0bf75497d 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -1290,7 +1290,7 @@ ROM_END
static void treahunt_decode( running_machine &machine )
{
int A;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine.root_device().memregion("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x4000);
int data;
@@ -1399,10 +1399,10 @@ DRIVER_INIT_MEMBER(jack_state,striv)
}
// Set-up the weirdest questions read ever done
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc000, 0xcfff, read8_delegate(FUNC(jack_state::striv_question_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc000, 0xcfff, read8_delegate(FUNC(jack_state::striv_question_r),this));
// Nop out unused sprites writes
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xb000, 0xb0ff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xb000, 0xb0ff);
m_timer_rate = 128;
}
diff --git a/src/mame/drivers/jaguar.c b/src/mame/drivers/jaguar.c
index 8c5c1d22602..59587104243 100644
--- a/src/mame/drivers/jaguar.c
+++ b/src/mame/drivers/jaguar.c
@@ -2273,10 +2273,10 @@ void jaguar_state::cojag_common_init(UINT16 gpu_jump_offs, UINT16 spin_pc)
/* install synchronization hooks for GPU */
if (m_is_r3000)
- m_main_cpu->space(AS_PROGRAM)->install_write_handler(0x04f0b000 + gpu_jump_offs, 0x04f0b003 + gpu_jump_offs, write32_delegate(FUNC(jaguar_state::gpu_jump_w), this));
+ m_main_cpu->space(AS_PROGRAM).install_write_handler(0x04f0b000 + gpu_jump_offs, 0x04f0b003 + gpu_jump_offs, write32_delegate(FUNC(jaguar_state::gpu_jump_w), this));
else
- m_main_cpu->space(AS_PROGRAM)->install_write_handler(0xf0b000 + gpu_jump_offs, 0xf0b003 + gpu_jump_offs, write32_delegate(FUNC(jaguar_state::gpu_jump_w), this));
- m_gpu->space(AS_PROGRAM)->install_read_handler(0xf03000 + gpu_jump_offs, 0xf03003 + gpu_jump_offs, read32_delegate(FUNC(jaguar_state::gpu_jump_r), this));
+ m_main_cpu->space(AS_PROGRAM).install_write_handler(0xf0b000 + gpu_jump_offs, 0xf0b003 + gpu_jump_offs, write32_delegate(FUNC(jaguar_state::gpu_jump_w), this));
+ m_gpu->space(AS_PROGRAM).install_read_handler(0xf03000 + gpu_jump_offs, 0xf03003 + gpu_jump_offs, read32_delegate(FUNC(jaguar_state::gpu_jump_r), this));
m_gpu_jump_address = &m_gpu_ram[gpu_jump_offs/4];
m_gpu_spin_pc = 0xf03000 + spin_pc;
@@ -2294,7 +2294,7 @@ DRIVER_INIT_MEMBER(jaguar_state,area51a)
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
- m_main_speedup = m_main_cpu->space(AS_PROGRAM)->install_write_handler(0xa02030, 0xa02033, write32_delegate(FUNC(jaguar_state::area51_main_speedup_w),this));
+ m_main_speedup = m_main_cpu->space(AS_PROGRAM).install_write_handler(0xa02030, 0xa02033, write32_delegate(FUNC(jaguar_state::area51_main_speedup_w),this));
#endif
}
@@ -2307,7 +2307,7 @@ DRIVER_INIT_MEMBER(jaguar_state,area51)
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
m_main_speedup_max_cycles = 120;
- m_main_speedup = m_main_cpu->space(AS_PROGRAM)->install_read_handler(0x100062e8, 0x100062eb, read32_delegate(FUNC(jaguar_state::cojagr3k_main_speedup_r),this));
+ m_main_speedup = m_main_cpu->space(AS_PROGRAM).install_read_handler(0x100062e8, 0x100062eb, read32_delegate(FUNC(jaguar_state::cojagr3k_main_speedup_r),this));
#endif
}
@@ -2322,7 +2322,7 @@ DRIVER_INIT_MEMBER(jaguar_state,maxforce)
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
m_main_speedup_max_cycles = 120;
- m_main_speedup = m_main_cpu->space(AS_PROGRAM)->install_read_handler(0x1000865c, 0x1000865f, read32_delegate(FUNC(jaguar_state::cojagr3k_main_speedup_r),this));
+ m_main_speedup = m_main_cpu->space(AS_PROGRAM).install_read_handler(0x1000865c, 0x1000865f, read32_delegate(FUNC(jaguar_state::cojagr3k_main_speedup_r),this));
#endif
}
@@ -2337,7 +2337,7 @@ DRIVER_INIT_MEMBER(jaguar_state,area51mx)
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
- m_main_speedup = m_main_cpu->space(AS_PROGRAM)->install_write_handler(0xa19550, 0xa19557, write32_delegate(FUNC(jaguar_state::area51mx_main_speedup_w),this));
+ m_main_speedup = m_main_cpu->space(AS_PROGRAM).install_write_handler(0xa19550, 0xa19557, write32_delegate(FUNC(jaguar_state::area51mx_main_speedup_w),this));
#endif
}
@@ -2353,7 +2353,7 @@ DRIVER_INIT_MEMBER(jaguar_state,a51mxr3k)
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
m_main_speedup_max_cycles = 120;
- m_main_speedup = m_main_cpu->space(AS_PROGRAM)->install_read_handler(0x10006f0c, 0x10006f0f, read32_delegate(FUNC(jaguar_state::cojagr3k_main_speedup_r),this));
+ m_main_speedup = m_main_cpu->space(AS_PROGRAM).install_read_handler(0x10006f0c, 0x10006f0f, read32_delegate(FUNC(jaguar_state::cojagr3k_main_speedup_r),this));
#endif
}
@@ -2366,7 +2366,7 @@ DRIVER_INIT_MEMBER(jaguar_state,fishfren)
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
m_main_speedup_max_cycles = 200;
- m_main_speedup = m_main_cpu->space(AS_PROGRAM)->install_read_handler(0x10021b60, 0x10021b63, read32_delegate(FUNC(jaguar_state::cojagr3k_main_speedup_r),this));
+ m_main_speedup = m_main_cpu->space(AS_PROGRAM).install_read_handler(0x10021b60, 0x10021b63, read32_delegate(FUNC(jaguar_state::cojagr3k_main_speedup_r),this));
#endif
}
@@ -2379,8 +2379,8 @@ void jaguar_state::init_freeze_common(offs_t main_speedup_addr)
/* install speedup for main CPU */
m_main_speedup_max_cycles = 200;
if (main_speedup_addr != 0)
- m_main_speedup = m_main_cpu->space(AS_PROGRAM)->install_read_handler(main_speedup_addr, main_speedup_addr + 3, read32_delegate(FUNC(jaguar_state::cojagr3k_main_speedup_r), this));
- m_main_gpu_wait = m_main_cpu->space(AS_PROGRAM)->install_read_handler(0x0400d900, 0x0400d900 + 3, read32_delegate(FUNC(jaguar_state::main_gpu_wait_r), this));
+ m_main_speedup = m_main_cpu->space(AS_PROGRAM).install_read_handler(main_speedup_addr, main_speedup_addr + 3, read32_delegate(FUNC(jaguar_state::cojagr3k_main_speedup_r), this));
+ m_main_gpu_wait = m_main_cpu->space(AS_PROGRAM).install_read_handler(0x0400d900, 0x0400d900 + 3, read32_delegate(FUNC(jaguar_state::main_gpu_wait_r), this));
#endif
}
@@ -2399,7 +2399,7 @@ DRIVER_INIT_MEMBER(jaguar_state,vcircle)
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
m_main_speedup_max_cycles = 50;
- m_main_speedup = m_main_cpu->space(AS_PROGRAM)->install_read_handler(0x12005b34, 0x12005b37, read32_delegate(FUNC(jaguar_state::cojagr3k_main_speedup_r),this));
+ m_main_speedup = m_main_cpu->space(AS_PROGRAM).install_read_handler(0x12005b34, 0x12005b37, read32_delegate(FUNC(jaguar_state::cojagr3k_main_speedup_r),this));
#endif
}
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index b81fa3bd697..3b068d8c7cb 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -730,7 +730,7 @@ WRITE16_MEMBER(jalmah_state::urashima_dma_w)
static void daireika_palette_dma(running_machine &machine, UINT16 val)
{
//jalmah_state *state = machine.driver_data<jalmah_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT32 index_1, index_2, src_addr, tmp_addr;
/*a0=301c0+jm_shared_ram[0x540/2] & 0xf00 */
/*a1=88000*/
@@ -2421,44 +2421,44 @@ READ16_MEMBER(jalmah_state::suchipi_mcu_r)
DRIVER_INIT_MEMBER(jalmah_state,urashima)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x80004, 0x80005, read16_delegate(FUNC(jalmah_state::urashima_mcu_r), this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x80012, 0x80013, write16_delegate(FUNC(jalmah_state::urashima_mcu_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x80004, 0x80005, read16_delegate(FUNC(jalmah_state::urashima_mcu_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x80012, 0x80013, write16_delegate(FUNC(jalmah_state::urashima_mcu_w), this));
m_mcu_prg = 0x12;
}
DRIVER_INIT_MEMBER(jalmah_state,daireika)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x80004, 0x80005, read16_delegate(FUNC(jalmah_state::daireika_mcu_r), this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x80012, 0x80013, write16_delegate(FUNC(jalmah_state::daireika_mcu_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x80004, 0x80005, read16_delegate(FUNC(jalmah_state::daireika_mcu_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x80012, 0x80013, write16_delegate(FUNC(jalmah_state::daireika_mcu_w), this));
m_mcu_prg = 0x11;
}
DRIVER_INIT_MEMBER(jalmah_state,mjzoomin)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x80004, 0x80005, read16_delegate(FUNC(jalmah_state::mjzoomin_mcu_r), this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x80012, 0x80013, write16_delegate(FUNC(jalmah_state::mjzoomin_mcu_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x80004, 0x80005, read16_delegate(FUNC(jalmah_state::mjzoomin_mcu_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x80012, 0x80013, write16_delegate(FUNC(jalmah_state::mjzoomin_mcu_w), this));
m_mcu_prg = 0x13;
}
DRIVER_INIT_MEMBER(jalmah_state,kakumei)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x80004, 0x80005, read16_delegate(FUNC(jalmah_state::kakumei_mcu_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x80004, 0x80005, read16_delegate(FUNC(jalmah_state::kakumei_mcu_r), this));
m_mcu_prg = 0x21;
}
DRIVER_INIT_MEMBER(jalmah_state,kakumei2)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x80004, 0x80005, read16_delegate(FUNC(jalmah_state::kakumei_mcu_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x80004, 0x80005, read16_delegate(FUNC(jalmah_state::kakumei_mcu_r), this));
m_mcu_prg = 0x22;
}
DRIVER_INIT_MEMBER(jalmah_state,suchipi)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x80004, 0x80005, read16_delegate(FUNC(jalmah_state::suchipi_mcu_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x80004, 0x80005, read16_delegate(FUNC(jalmah_state::suchipi_mcu_r), this));
m_mcu_prg = 0x23;
}
diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c
index 140472b23f0..2f3cf3f1a5e 100644
--- a/src/mame/drivers/jangou.c
+++ b/src/mame/drivers/jangou.c
@@ -1363,7 +1363,7 @@ READ8_MEMBER(jangou_state::jngolady_rng_r)
DRIVER_INIT_MEMBER(jangou_state,jngolady)
{
- machine().device("nsc")->memory().space(AS_PROGRAM)->install_read_handler(0x08, 0x08, read8_delegate(FUNC(jangou_state::jngolady_rng_r),this) );
+ machine().device("nsc")->memory().space(AS_PROGRAM).install_read_handler(0x08, 0x08, read8_delegate(FUNC(jangou_state::jngolady_rng_r),this) );
}
DRIVER_INIT_MEMBER(jangou_state,luckygrl)
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index e70f563846b..721f8ee19be 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -722,8 +722,8 @@ ROM_END
DRIVER_INIT_MEMBER( jchan_state, jchan )
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x403ffe, 0x403fff, write16_delegate(FUNC(jchan_state::main2sub_cmd_w),this));
- machine().device("sub")->memory().space(AS_PROGRAM)->install_write_handler(0x400000, 0x400001, write16_delegate(FUNC(jchan_state::sub2main_cmd_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x403ffe, 0x403fff, write16_delegate(FUNC(jchan_state::main2sub_cmd_w),this));
+ machine().device("sub")->memory().space(AS_PROGRAM).install_write_handler(0x400000, 0x400001, write16_delegate(FUNC(jchan_state::sub2main_cmd_w),this));
}
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 8011d2a6777..5e3b00b0e44 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -3838,7 +3838,7 @@ DRIVER_INIT_MEMBER( kaneko16_shogwarr_state, shogwarr )
DRIVER_INIT_MEMBER( kaneko16_shogwarr_state, brapboys )
{
// sample banking is different on brap boys for the music, why? GALs / PALs ?
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xe00000, 0xe00001, write16_delegate(FUNC(kaneko16_shogwarr_state::brapboys_oki_bank_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xe00000, 0xe00001, write16_delegate(FUNC(kaneko16_shogwarr_state::brapboys_oki_bank_w),this));
// default sample banks
kaneko16_common_oki_bank_w(machine(), "bank10", "oki1", 0, 0x30000, 0x10000);
diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c
index 3f3d1ca3eaa..196d09870c3 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -181,7 +181,7 @@ void kangaroo_state::machine_start()
MACHINE_START_MEMBER(kangaroo_state,kangaroo_mcu)
{
kangaroo_state::machine_start();
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xef00, 0xefff, read8_delegate(FUNC(kangaroo_state::mcu_sim_r),this), write8_delegate(FUNC(kangaroo_state::mcu_sim_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xef00, 0xefff, read8_delegate(FUNC(kangaroo_state::mcu_sim_r),this), write8_delegate(FUNC(kangaroo_state::mcu_sim_w),this));
save_item(NAME(m_mcu_clock));
}
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index 3d85a4e7d9e..3b2b262d642 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -711,7 +711,7 @@ ROM_END
static UINT8 *decrypt_code(running_machine &machine)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x10000);
UINT8 *rom = machine.root_device().memregion("maincpu")->base();
int A;
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index 8c9a383f029..8e4f6083eeb 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -528,9 +528,9 @@ DRIVER_INIT_MEMBER(konamigv_state,simpbowl)
m_flash8[2] = machine().device<fujitsu_29f016a_device>("flash2");
m_flash8[3] = machine().device<fujitsu_29f016a_device>("flash3");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1f680080, 0x1f68008f, read32_delegate(FUNC(konamigv_state::flash_r),this), write32_delegate(FUNC(konamigv_state::flash_w),this) );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler ( 0x1f6800c0, 0x1f6800c7, read32_delegate(FUNC(konamigv_state::trackball_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler ( 0x1f6800c8, 0x1f6800cb, read32_delegate(FUNC(konamigv_state::unknown_r),this)); /* ?? */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1f680080, 0x1f68008f, read32_delegate(FUNC(konamigv_state::flash_r),this), write32_delegate(FUNC(konamigv_state::flash_w),this) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler ( 0x1f6800c0, 0x1f6800c7, read32_delegate(FUNC(konamigv_state::trackball_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler ( 0x1f6800c8, 0x1f6800cb, read32_delegate(FUNC(konamigv_state::unknown_r),this)); /* ?? */
DRIVER_INIT_CALL(konamigv);
}
@@ -617,9 +617,9 @@ DRIVER_INIT_MEMBER(konamigv_state,btchamp)
m_flash16[0] = machine().device<sharp_lh28f400_device>("flash");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1f680080, 0x1f68008f, read32_delegate(FUNC(konamigv_state::btc_trackball_r),this), write32_delegate(FUNC(konamigv_state::btc_trackball_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write ( 0x1f6800e0, 0x1f6800e3);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1f380000, 0x1f3fffff, read32_delegate(FUNC(konamigv_state::btcflash_r),this), write32_delegate(FUNC(konamigv_state::btcflash_w),this) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1f680080, 0x1f68008f, read32_delegate(FUNC(konamigv_state::btc_trackball_r),this), write32_delegate(FUNC(konamigv_state::btc_trackball_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write ( 0x1f6800e0, 0x1f6800e3);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1f380000, 0x1f3fffff, read32_delegate(FUNC(konamigv_state::btcflash_r),this), write32_delegate(FUNC(konamigv_state::btcflash_w),this) );
DRIVER_INIT_CALL(konamigv);
}
@@ -672,8 +672,8 @@ WRITE32_MEMBER(konamigv_state::tokimeki_serial_w)
DRIVER_INIT_MEMBER(konamigv_state,tokimosh)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler ( 0x1f680080, 0x1f680083, read32_delegate(FUNC(konamigv_state::tokimeki_serial_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1f680090, 0x1f680093, write32_delegate(FUNC(konamigv_state::tokimeki_serial_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler ( 0x1f680080, 0x1f680083, read32_delegate(FUNC(konamigv_state::tokimeki_serial_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1f680090, 0x1f680093, write32_delegate(FUNC(konamigv_state::tokimeki_serial_w),this));
DRIVER_INIT_CALL(konamigv);
}
@@ -697,13 +697,13 @@ DRIVER_INIT_MEMBER(konamigv_state,kdeadeye)
m_flash16[0] = machine().device<sharp_lh28f400_device>("flash");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port ( 0x1f680080, 0x1f680083, "GUNX1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port ( 0x1f680090, 0x1f680093, "GUNY1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port ( 0x1f6800a0, 0x1f6800a3, "GUNX2" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port ( 0x1f6800b0, 0x1f6800b3, "GUNY2" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port ( 0x1f6800c0, 0x1f6800c3, "BUTTONS" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler ( 0x1f6800e0, 0x1f6800e3, write32_delegate(FUNC(konamigv_state::kdeadeye_0_w),this) );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1f380000, 0x1f3fffff, read32_delegate(FUNC(konamigv_state::btcflash_r),this), write32_delegate(FUNC(konamigv_state::btcflash_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port ( 0x1f680080, 0x1f680083, "GUNX1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port ( 0x1f680090, 0x1f680093, "GUNY1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port ( 0x1f6800a0, 0x1f6800a3, "GUNX2" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port ( 0x1f6800b0, 0x1f6800b3, "GUNY2" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port ( 0x1f6800c0, 0x1f6800c3, "BUTTONS" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler ( 0x1f6800e0, 0x1f6800e3, write32_delegate(FUNC(konamigv_state::kdeadeye_0_w),this) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1f380000, 0x1f3fffff, read32_delegate(FUNC(konamigv_state::btcflash_r),this), write32_delegate(FUNC(konamigv_state::btcflash_w),this));
DRIVER_INIT_CALL(konamigv);
}
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index da3049edf61..ec286b47ec0 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -3743,8 +3743,8 @@ DRIVER_INIT_MEMBER(konamigx_state,konamigx)
switch (gameDefs[i].special)
{
case 1: // LE2 guns
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd44000, 0xd44003, read32_delegate(FUNC(konamigx_state::le2_gun_H_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd44004, 0xd44007, read32_delegate(FUNC(konamigx_state::le2_gun_V_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd44000, 0xd44003, read32_delegate(FUNC(konamigx_state::le2_gun_H_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd44004, 0xd44007, read32_delegate(FUNC(konamigx_state::le2_gun_V_r),this));
break;
case 2: // tkmmpzdm hack
@@ -3780,7 +3780,7 @@ DRIVER_INIT_MEMBER(konamigx_state,konamigx)
break;
case 7: // install type 4 Xilinx protection for non-type 3/4 games
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xcc0000, 0xcc0007, write32_delegate(FUNC(konamigx_state::type4_prot_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xcc0000, 0xcc0007, write32_delegate(FUNC(konamigx_state::type4_prot_w),this));
break;
case 8: // tbyahhoo
@@ -3800,14 +3800,14 @@ DRIVER_INIT_MEMBER(konamigx_state,konamigx)
switch (readback)
{
case BPP5:
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd4a000, 0xd4a00f, read32_delegate(FUNC(konamigx_state::gx5bppspr_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd4a000, 0xd4a00f, read32_delegate(FUNC(konamigx_state::gx5bppspr_r),this));
break;
case BPP66:
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xd00000, 0xd01fff, FUNC(K056832_6bpp_rom_long_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xd00000, 0xd01fff, FUNC(K056832_6bpp_rom_long_r));
case BPP6:
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd4a000, 0xd4a00f, read32_delegate(FUNC(konamigx_state::gx6bppspr_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd4a000, 0xd4a00f, read32_delegate(FUNC(konamigx_state::gx6bppspr_r),this));
break;
}
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index 98f1e005ae9..515cdad733b 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -1555,7 +1555,7 @@ WRITE32_MEMBER(ksys573_state::ge765pwbba_w)
DRIVER_INIT_MEMBER(ksys573_state,ge765pwbba)
{
DRIVER_INIT_CALL(konami573);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1f640000, 0x1f6400ff, read32_delegate(FUNC(ksys573_state::ge765pwbba_r),this), write32_delegate(FUNC(ksys573_state::ge765pwbba_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1f640000, 0x1f6400ff, read32_delegate(FUNC(ksys573_state::ge765pwbba_r),this), write32_delegate(FUNC(ksys573_state::ge765pwbba_w),this));
}
/*
@@ -1667,7 +1667,7 @@ static void gx700pwfbf_init( running_machine &machine, void (*output_callback_fu
state->m_gx700pwfbf_output_callback = output_callback_func;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1f640000, 0x1f6400ff, read32_delegate(FUNC(ksys573_state::gx700pwbf_io_r),state), write32_delegate(FUNC(ksys573_state::gx700pwbf_io_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1f640000, 0x1f6400ff, read32_delegate(FUNC(ksys573_state::gx700pwbf_io_r),state), write32_delegate(FUNC(ksys573_state::gx700pwbf_io_w),state));
state->save_item( NAME(state->m_gx700pwbf_output_data) );
}
@@ -1905,7 +1905,7 @@ WRITE32_MEMBER(ksys573_state::gtrfrks_io_w)
DRIVER_INIT_MEMBER(ksys573_state,gtrfrks)
{
DRIVER_INIT_CALL(konami573);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1f600000, 0x1f6000ff, read32_delegate(FUNC(ksys573_state::gtrfrks_io_r),this), write32_delegate(FUNC(ksys573_state::gtrfrks_io_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1f600000, 0x1f6000ff, read32_delegate(FUNC(ksys573_state::gtrfrks_io_r),this), write32_delegate(FUNC(ksys573_state::gtrfrks_io_w),this));
}
/* GX894 digital i/o */
@@ -2218,7 +2218,7 @@ static void gx894pwbba_init( running_machine &machine, void (*output_callback_fu
state->m_gx894pwbba_output_callback = output_callback_func;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1f640000, 0x1f6400ff, read32_delegate(FUNC(ksys573_state::gx894pwbba_r),state), write32_delegate(FUNC(ksys573_state::gx894pwbba_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1f640000, 0x1f6400ff, read32_delegate(FUNC(ksys573_state::gx894pwbba_r),state), write32_delegate(FUNC(ksys573_state::gx894pwbba_w),state));
state->m_gx894_ram_write_offset = 0;
state->m_gx894_ram_read_offset = 0;
@@ -2244,7 +2244,7 @@ DRIVER_INIT_MEMBER(ksys573_state,gtrfrkdigital)
DRIVER_INIT_CALL(konami573);
gx894pwbba_init( machine(), NULL );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1f600000, 0x1f6000ff, read32_delegate(FUNC(ksys573_state::gtrfrks_io_r),this), write32_delegate(FUNC(ksys573_state::gtrfrks_io_w),this) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1f600000, 0x1f6000ff, read32_delegate(FUNC(ksys573_state::gtrfrks_io_r),this), write32_delegate(FUNC(ksys573_state::gtrfrks_io_w),this) );
}
/* ddr solo */
@@ -2536,7 +2536,7 @@ DRIVER_INIT_MEMBER(ksys573_state,dmx)
DRIVER_INIT_CALL(konami573);
gx894pwbba_init( machine(), dmx_output_callback );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x1f600000, 0x1f6000ff, write32_delegate(FUNC(ksys573_state::dmx_io_w),this) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x1f600000, 0x1f6000ff, write32_delegate(FUNC(ksys573_state::dmx_io_w),this) );
}
/* salary man champ */
@@ -2693,7 +2693,7 @@ DRIVER_INIT_MEMBER(ksys573_state,mamboagg)
DRIVER_INIT_CALL(konami573);
gx894pwbba_init( machine(), mamboagg_output_callback );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x1f600000, 0x1f6000ff, write32_delegate(FUNC(ksys573_state::mamboagg_io_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x1f600000, 0x1f6000ff, write32_delegate(FUNC(ksys573_state::mamboagg_io_w),this));
}
@@ -3011,7 +3011,7 @@ READ32_MEMBER(ksys573_state::gunmania_r)
DRIVER_INIT_MEMBER(ksys573_state,gunmania)
{
DRIVER_INIT_CALL(konami573);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1f640000, 0x1f6400ff, read32_delegate(FUNC(ksys573_state::gunmania_r),this), write32_delegate(FUNC(ksys573_state::gunmania_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1f640000, 0x1f6400ff, read32_delegate(FUNC(ksys573_state::gunmania_r),this), write32_delegate(FUNC(ksys573_state::gunmania_w),this));
}
/* ADC0834 Interface */
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index f39846b4ed8..a0a65baf6a0 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -510,7 +510,7 @@ void kyugo_state::machine_start()
void kyugo_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
// must start with interrupts and sub CPU disabled
m_nmi_mask = 0;
kyugo_sub_cpu_control_w(space, 0, 0);
@@ -1368,7 +1368,7 @@ ROM_END
DRIVER_INIT_MEMBER(kyugo_state,gyrodine)
{
/* add watchdog */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xe000, 0xe000, write8_delegate(FUNC(kyugo_state::watchdog_reset_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xe000, 0xe000, write8_delegate(FUNC(kyugo_state::watchdog_reset_w),this));
}
@@ -1376,10 +1376,10 @@ DRIVER_INIT_MEMBER(kyugo_state,srdmissn)
{
/* shared RAM is mapped at 0xe000 as well */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0xe000, 0xe7ff, m_shared_ram);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_ram(0xe000, 0xe7ff, m_shared_ram);
/* extra RAM on sub CPU */
- machine().device("sub")->memory().space(AS_PROGRAM)->install_ram(0x8800, 0x8fff);
+ machine().device("sub")->memory().space(AS_PROGRAM).install_ram(0x8800, 0x8fff);
}
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index da0d30fb7df..d4c31be5f02 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -1068,7 +1068,7 @@ DRIVER_INIT_MEMBER(ladybug_state,dorodon)
/* decode the opcodes */
offs_t i;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine(), UINT8, 0x6000);
UINT8 *rom = machine().root_device().memregion("maincpu")->base();
UINT8 *table = machine().root_device().memregion("user1")->base();
diff --git a/src/mame/drivers/lastbank.c b/src/mame/drivers/lastbank.c
index 3ea24f78194..0294f0ab34c 100644
--- a/src/mame/drivers/lastbank.c
+++ b/src/mame/drivers/lastbank.c
@@ -137,14 +137,14 @@ WRITE8_MEMBER(lastbank_state::lastbank_ram_bank_w)
UINT8 lastbank_state::ram_bank_r(UINT16 offset, UINT8 bank_num)
{
- address_space *vdp_space = machine().device<tc0091lvc_device>("tc0091lvc")->space();
- return vdp_space->read_byte(offset + (m_ram_bank[bank_num]) * 0x1000);;
+ address_space &vdp_space = machine().device<tc0091lvc_device>("tc0091lvc")->space();
+ return vdp_space.read_byte(offset + (m_ram_bank[bank_num]) * 0x1000);;
}
void lastbank_state::ram_bank_w(UINT16 offset, UINT8 data, UINT8 bank_num)
{
- address_space *vdp_space = machine().device<tc0091lvc_device>("tc0091lvc")->space();
- vdp_space->write_byte(offset + (m_ram_bank[bank_num]) * 0x1000,data);;
+ address_space &vdp_space = machine().device<tc0091lvc_device>("tc0091lvc")->space();
+ vdp_space.write_byte(offset + (m_ram_bank[bank_num]) * 0x1000,data);;
}
READ8_MEMBER(lastbank_state::lastbank_ram_0_r) { return ram_bank_r(offset, 0); }
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index 8db6247ec9b..460ba6e0636 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -1982,11 +1982,11 @@ static void init_master_ports(running_machine &machine, UINT8 mvram_base, UINT8
{
leland_state *state = machine.driver_data<leland_state>();
/* set up the master CPU VRAM I/O */
- machine.device("master")->memory().space(AS_IO)->install_readwrite_handler(mvram_base, mvram_base + 0x1f, read8_delegate(FUNC(leland_state::leland_mvram_port_r),state), write8_delegate(FUNC(leland_state::leland_mvram_port_w),state));
+ machine.device("master")->memory().space(AS_IO).install_readwrite_handler(mvram_base, mvram_base + 0x1f, read8_delegate(FUNC(leland_state::leland_mvram_port_r),state), write8_delegate(FUNC(leland_state::leland_mvram_port_w),state));
/* set up the master CPU I/O ports */
- machine.device("master")->memory().space(AS_IO)->install_read_handler(io_base, io_base + 0x1f, read8_delegate(FUNC(leland_state::leland_master_input_r),state));
- machine.device("master")->memory().space(AS_IO)->install_write_handler(io_base, io_base + 0x0f, write8_delegate(FUNC(leland_state::leland_master_output_w),state));
+ machine.device("master")->memory().space(AS_IO).install_read_handler(io_base, io_base + 0x1f, read8_delegate(FUNC(leland_state::leland_master_input_r),state));
+ machine.device("master")->memory().space(AS_IO).install_write_handler(io_base, io_base + 0x0f, write8_delegate(FUNC(leland_state::leland_master_output_w),state));
}
@@ -2002,8 +2002,8 @@ DRIVER_INIT_MEMBER(leland_state,cerberus)
init_master_ports(machine(), 0x40, 0x80);
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0x80, 0x80, read8_delegate(FUNC(leland_state::cerberus_dial_1_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0x90, 0x90, read8_delegate(FUNC(leland_state::cerberus_dial_2_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0x80, 0x80, read8_delegate(FUNC(leland_state::cerberus_dial_1_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0x90, 0x90, read8_delegate(FUNC(leland_state::cerberus_dial_2_r),this));
}
@@ -2048,7 +2048,7 @@ DRIVER_INIT_MEMBER(leland_state,alleymas)
/* kludge warning: the game uses location E0CA to determine if the joysticks are available */
/* it gets cleared by the code, but there is no obvious way for the value to be set to a */
/* non-zero value. If the value is zero, the joystick is never read. */
- m_alleymas_kludge_mem = machine().device("master")->memory().space(AS_PROGRAM)->install_write_handler(0xe0ca, 0xe0ca, write8_delegate(FUNC(leland_state::alleymas_joystick_kludge),this));
+ m_alleymas_kludge_mem = machine().device("master")->memory().space(AS_PROGRAM).install_write_handler(0xe0ca, 0xe0ca, write8_delegate(FUNC(leland_state::alleymas_joystick_kludge),this));
}
@@ -2071,9 +2071,9 @@ DRIVER_INIT_MEMBER(leland_state,dangerz)
init_master_ports(machine(), 0x40, 0x80);
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xf4, 0xf4, read8_delegate(FUNC(leland_state::dangerz_input_upper_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::dangerz_input_y_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(leland_state::dangerz_input_x_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xf4, 0xf4, read8_delegate(FUNC(leland_state::dangerz_input_upper_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::dangerz_input_y_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(leland_state::dangerz_input_x_r),this));
}
@@ -2118,10 +2118,10 @@ DRIVER_INIT_MEMBER(leland_state,redlin2p)
init_master_ports(machine(), 0x00, 0xc0);
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xc0, 0xc0, read8_delegate(FUNC(leland_state::redline_pedal_1_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xd0, 0xd0, read8_delegate(FUNC(leland_state::redline_pedal_2_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::redline_wheel_2_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(leland_state::redline_wheel_1_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xc0, 0xc0, read8_delegate(FUNC(leland_state::redline_pedal_1_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xd0, 0xd0, read8_delegate(FUNC(leland_state::redline_pedal_2_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::redline_wheel_2_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(leland_state::redline_wheel_1_r),this));
}
@@ -2150,9 +2150,9 @@ DRIVER_INIT_MEMBER(leland_state,viper)
init_master_ports(machine(), 0x00, 0xc0);
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xa4, 0xa4, read8_delegate(FUNC(leland_state::dangerz_input_upper_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xb8, 0xb8, read8_delegate(FUNC(leland_state::dangerz_input_y_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xbc, 0xbc, read8_delegate(FUNC(leland_state::dangerz_input_x_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xa4, 0xa4, read8_delegate(FUNC(leland_state::dangerz_input_upper_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xb8, 0xb8, read8_delegate(FUNC(leland_state::dangerz_input_y_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xbc, 0xbc, read8_delegate(FUNC(leland_state::dangerz_input_x_r),this));
}
@@ -2169,8 +2169,8 @@ DRIVER_INIT_MEMBER(leland_state,teamqb)
init_master_ports(machine(), 0x40, 0x80);
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x7c, 0x7c, "IN4");
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x7f, 0x7f, "IN5");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x7c, 0x7c, "IN4");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x7f, 0x7f, "IN5");
}
@@ -2187,8 +2187,8 @@ DRIVER_INIT_MEMBER(leland_state,aafb)
init_master_ports(machine(), 0x00, 0xc0);
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x7c, 0x7c, "IN4");
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x7f, 0x7f, "IN5");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x7c, 0x7c, "IN4");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x7f, 0x7f, "IN5");
}
@@ -2205,8 +2205,8 @@ DRIVER_INIT_MEMBER(leland_state,aafbb)
init_master_ports(machine(), 0x80, 0x40);
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x7c, 0x7c, "IN4");
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x7f, 0x7f, "IN5");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x7c, 0x7c, "IN4");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x7f, 0x7f, "IN5");
}
@@ -2223,8 +2223,8 @@ DRIVER_INIT_MEMBER(leland_state,aafbd2p)
init_master_ports(machine(), 0x00, 0x40);
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x7c, 0x7c, "IN4");
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x7f, 0x7f, "IN5");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x7c, 0x7c, "IN4");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x7f, 0x7f, "IN5");
}
@@ -2242,9 +2242,9 @@ DRIVER_INIT_MEMBER(leland_state,offroad)
init_master_ports(machine(), 0x40, 0x80); /* yes, this is intentional */
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::offroad_wheel_3_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xf9, 0xf9, read8_delegate(FUNC(leland_state::offroad_wheel_1_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(leland_state::offroad_wheel_2_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::offroad_wheel_3_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xf9, 0xf9, read8_delegate(FUNC(leland_state::offroad_wheel_1_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(leland_state::offroad_wheel_2_r),this));
}
@@ -2261,9 +2261,9 @@ DRIVER_INIT_MEMBER(leland_state,offroadt)
init_master_ports(machine(), 0x80, 0x40);
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::offroad_wheel_3_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xf9, 0xf9, read8_delegate(FUNC(leland_state::offroad_wheel_1_r),this));
- machine().device("master")->memory().space(AS_IO)->install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(leland_state::offroad_wheel_2_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(leland_state::offroad_wheel_3_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xf9, 0xf9, read8_delegate(FUNC(leland_state::offroad_wheel_1_r),this));
+ machine().device("master")->memory().space(AS_IO).install_read_handler(0xfb, 0xfb, read8_delegate(FUNC(leland_state::offroad_wheel_2_r),this));
}
@@ -2280,7 +2280,7 @@ DRIVER_INIT_MEMBER(leland_state,pigout)
init_master_ports(machine(), 0x00, 0x40);
/* set up additional input ports */
- machine().device("master")->memory().space(AS_IO)->install_read_port(0x7f, 0x7f, "IN4");
+ machine().device("master")->memory().space(AS_IO).install_read_port(0x7f, 0x7f, "IN4");
}
diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c
index 0beca879b38..32fda2f9510 100644
--- a/src/mame/drivers/lethalj.c
+++ b/src/mame/drivers/lethalj.c
@@ -895,19 +895,19 @@ ROM_END
DRIVER_INIT_MEMBER(lethalj_state,ripribit)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x04100010, 0x0410001f, write16_delegate(FUNC(lethalj_state::ripribit_control_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x04100010, 0x0410001f, write16_delegate(FUNC(lethalj_state::ripribit_control_w),this));
}
DRIVER_INIT_MEMBER(lethalj_state,cfarm)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x04100010, 0x0410001f, write16_delegate(FUNC(lethalj_state::cfarm_control_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x04100010, 0x0410001f, write16_delegate(FUNC(lethalj_state::cfarm_control_w),this));
}
DRIVER_INIT_MEMBER(lethalj_state,cclownz)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x04100010, 0x0410001f, write16_delegate(FUNC(lethalj_state::cclownz_control_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x04100010, 0x0410001f, write16_delegate(FUNC(lethalj_state::cclownz_control_w),this));
}
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index ddfdd7e8628..3e9d6c56e7c 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -69,9 +69,9 @@ WRITE8_MEMBER(liberate_state::deco16_bank_w)
m_bank = data;
if (m_bank)
- m_maincpu->space(AS_PROGRAM)->install_read_handler(0x8000, 0x800f, read8_delegate(FUNC(liberate_state::deco16_io_r),this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0x800f, read8_delegate(FUNC(liberate_state::deco16_io_r),this));
else
- m_maincpu->space(AS_PROGRAM)->install_read_bank(0x8000, 0x800f, "bank1");
+ m_maincpu->space(AS_PROGRAM).install_read_bank(0x8000, 0x800f, "bank1");
}
READ8_MEMBER(liberate_state::prosoccr_bank_r)
@@ -174,9 +174,9 @@ WRITE8_MEMBER(liberate_state::prosoccr_io_bank_w)
m_bank = data & 1;
if (m_bank)
- m_maincpu->space(AS_PROGRAM)->install_read_handler(0x8000, 0x800f, read8_delegate(FUNC(liberate_state::deco16_io_r),this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0x800f, read8_delegate(FUNC(liberate_state::deco16_io_r),this));
else
- m_maincpu->space(AS_PROGRAM)->install_read_handler(0x8000, 0x800f, read8_delegate(FUNC(liberate_state::prosoccr_charram_r),this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0x800f, read8_delegate(FUNC(liberate_state::prosoccr_charram_r),this));
}
@@ -1345,7 +1345,7 @@ ROM_END
static void sound_cpu_decrypt(running_machine &machine)
{
- address_space &space = *machine.device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("audiocpu")->memory().space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x4000);
UINT8 *rom = machine.root_device().memregion("audiocpu")->base();
int i;
@@ -1373,13 +1373,13 @@ DRIVER_INIT_MEMBER(liberate_state,yellowcb)
{
DRIVER_INIT_CALL(prosport);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0xa000, 0xa000, "IN0");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0xa000, 0xa000, "IN0");
}
DRIVER_INIT_MEMBER(liberate_state,liberate)
{
int A;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine(), UINT8, 0x10000);
UINT8 *ROM = machine().root_device().memregion("maincpu")->base();
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index 46ba608c63c..f82230a149b 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -1118,7 +1118,7 @@ DRIVER_INIT_MEMBER(limenko_state,common)
{
// Set up the QS1000 program ROM banking, taking care not to overlap the internal RAM
- machine().device("qs1000:cpu")->memory().space(AS_IO)->install_read_bank(0x0100, 0xffff, "bank");
+ machine().device("qs1000:cpu")->memory().space(AS_IO).install_read_bank(0x0100, 0xffff, "bank");
membank("qs1000:bank")->configure_entries(0, 8, memregion("qs1000:cpu")->base()+0x100, 0x10000);
m_spriteram_bit = 1;
@@ -1126,21 +1126,21 @@ DRIVER_INIT_MEMBER(limenko_state,common)
DRIVER_INIT_MEMBER(limenko_state,dynabomb)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xe2784, 0xe2787, read32_delegate(FUNC(limenko_state::dynabomb_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xe2784, 0xe2787, read32_delegate(FUNC(limenko_state::dynabomb_speedup_r), this));
DRIVER_INIT_CALL(common);
}
DRIVER_INIT_MEMBER(limenko_state,legendoh)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x32ab0, 0x32ab3, read32_delegate(FUNC(limenko_state::legendoh_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x32ab0, 0x32ab3, read32_delegate(FUNC(limenko_state::legendoh_speedup_r), this));
DRIVER_INIT_CALL(common);
}
DRIVER_INIT_MEMBER(limenko_state,sb2003)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x135800, 0x135803, read32_delegate(FUNC(limenko_state::sb2003_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x135800, 0x135803, read32_delegate(FUNC(limenko_state::sb2003_speedup_r), this));
DRIVER_INIT_CALL(common);
}
@@ -1161,7 +1161,7 @@ DRIVER_INIT_MEMBER(limenko_state,spotty)
dst[x+2] = (src[x+1]&0x0f) >> 0;
}
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x6626c, 0x6626f, read32_delegate(FUNC(limenko_state::spotty_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x6626c, 0x6626f, read32_delegate(FUNC(limenko_state::spotty_speedup_r), this));
m_spriteram_bit = 1;
}
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index 1affc514c4b..dd82ff5f6cf 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -303,16 +303,16 @@ static UINT16 littlerb_data_read(running_machine &machine, UINT16 mem_mask)
{
littlerb_state *state = machine.driver_data<littlerb_state>();
UINT32 addr = state->m_write_address >> 3; // almost surely raw addresses are actually shifted by 3
- address_space *vdp_space = machine.device<littlerb_vdp_device>("littlerbvdp")->space();
+ address_space &vdp_space = machine.device<littlerb_vdp_device>("littlerbvdp")->space();
- return vdp_space->read_word(addr, mem_mask);
+ return vdp_space.read_word(addr, mem_mask);
}
static void littlerb_data_write(running_machine &machine, UINT16 data, UINT16 mem_mask)
{
littlerb_state *state = machine.driver_data<littlerb_state>();
UINT32 addr = state->m_write_address >> 3; // almost surely raw addresses are actually shifted by 3
- address_space *vdp_space = machine.device<littlerb_vdp_device>("littlerbvdp")->space();
+ address_space &vdp_space = machine.device<littlerb_vdp_device>("littlerbvdp")->space();
int mode = state->m_vdp_writemode;
@@ -323,7 +323,7 @@ static void littlerb_data_write(running_machine &machine, UINT16 data, UINT16 me
}
else
{
- vdp_space->write_word(addr, data, mem_mask);
+ vdp_space.write_word(addr, data, mem_mask);
// 2000 is used for palette writes which appears to be a RAMDAC, no auto-inc.
// 1ff80806 is our 'spritelist'
@@ -612,7 +612,7 @@ static void draw_sprite(running_machine &machine, bitmap_ind16 &bitmap, const re
{
int x,y;
fulloffs >>= 3;
- address_space *vdp_space = machine.device<littlerb_vdp_device>("littlerbvdp")->space();
+ address_space &vdp_space = machine.device<littlerb_vdp_device>("littlerbvdp")->space();
for (y=0;y<ysize;y++)
{
@@ -620,7 +620,7 @@ static void draw_sprite(running_machine &machine, bitmap_ind16 &bitmap, const re
{
int drawxpos, drawypos;
// the addresses provided are the same as the offsets as the vdp writes
- UINT16 pix = vdp_space->read_byte(fulloffs);
+ UINT16 pix = vdp_space.read_byte(fulloffs);
drawxpos = xpos+x;
drawypos = ypos+y;
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index fb5376681bc..58ae7958680 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -960,9 +960,9 @@ DRIVER_INIT_MEMBER(lkage_state,lkage)
DRIVER_INIT_MEMBER(lkage_state,lkageb)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xf062, 0xf062, read8_delegate(FUNC(lkage_state::fake_mcu_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xf087, 0xf087, read8_delegate(FUNC(lkage_state::fake_status_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xf062, 0xf062, write8_delegate(FUNC(lkage_state::fake_mcu_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xf062, 0xf062, read8_delegate(FUNC(lkage_state::fake_mcu_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xf087, 0xf087, read8_delegate(FUNC(lkage_state::fake_status_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xf062, 0xf062, write8_delegate(FUNC(lkage_state::fake_mcu_w),this));
m_sprite_dx=0;
}
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index c0c633ac51a..bbaf6887790 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -63,34 +63,34 @@ WRITE16_MEMBER(lockon_state::adrst_w)
READ16_MEMBER(lockon_state::main_gnd_r)
{
- address_space *gndspace = m_ground->memory().space(AS_PROGRAM);
- return gndspace->read_word(V30_GND_ADDR | offset * 2);
+ address_space &gndspace = m_ground->memory().space(AS_PROGRAM);
+ return gndspace.read_word(V30_GND_ADDR | offset * 2);
}
WRITE16_MEMBER(lockon_state::main_gnd_w)
{
- address_space *gndspace = m_ground->memory().space(AS_PROGRAM);
+ address_space &gndspace = m_ground->memory().space(AS_PROGRAM);
if (ACCESSING_BITS_0_7)
- gndspace->write_byte(V30_GND_ADDR | (offset * 2 + 0), data);
+ gndspace.write_byte(V30_GND_ADDR | (offset * 2 + 0), data);
if (ACCESSING_BITS_8_15)
- gndspace->write_byte(V30_GND_ADDR | (offset * 2 + 1), data >> 8);
+ gndspace.write_byte(V30_GND_ADDR | (offset * 2 + 1), data >> 8);
}
READ16_MEMBER(lockon_state::main_obj_r)
{
- address_space *objspace = m_object->memory().space(AS_PROGRAM);
- return objspace->read_word(V30_OBJ_ADDR | offset * 2);
+ address_space &objspace = m_object->memory().space(AS_PROGRAM);
+ return objspace.read_word(V30_OBJ_ADDR | offset * 2);
}
WRITE16_MEMBER(lockon_state::main_obj_w)
{
- address_space *objspace =m_object->memory().space(AS_PROGRAM);
+ address_space &objspace =m_object->memory().space(AS_PROGRAM);
if (ACCESSING_BITS_0_7)
- objspace->write_byte(V30_OBJ_ADDR | (offset * 2 + 0), data);
+ objspace.write_byte(V30_OBJ_ADDR | (offset * 2 + 0), data);
if (ACCESSING_BITS_8_15)
- objspace->write_byte(V30_OBJ_ADDR | (offset * 2 + 1), data >> 8);
+ objspace.write_byte(V30_OBJ_ADDR | (offset * 2 + 1), data >> 8);
}
WRITE16_MEMBER(lockon_state::tst_w)
@@ -98,31 +98,31 @@ WRITE16_MEMBER(lockon_state::tst_w)
if (offset < 0x800)
{
- address_space *gndspace = m_ground->memory().space(AS_PROGRAM);
- address_space *objspace = m_object->memory().space(AS_PROGRAM);
+ address_space &gndspace = m_ground->memory().space(AS_PROGRAM);
+ address_space &objspace = m_object->memory().space(AS_PROGRAM);
if (ACCESSING_BITS_0_7)
- gndspace->write_byte(V30_GND_ADDR | (offset * 2 + 0), data);
+ gndspace.write_byte(V30_GND_ADDR | (offset * 2 + 0), data);
if (ACCESSING_BITS_8_15)
- gndspace->write_byte(V30_GND_ADDR | (offset * 2 + 1), data >> 8);
+ gndspace.write_byte(V30_GND_ADDR | (offset * 2 + 1), data >> 8);
if (ACCESSING_BITS_0_7)
- objspace->write_byte(V30_OBJ_ADDR | (offset * 2 + 0), data);
+ objspace.write_byte(V30_OBJ_ADDR | (offset * 2 + 0), data);
if (ACCESSING_BITS_8_15)
- objspace->write_byte(V30_OBJ_ADDR | (offset * 2 + 1), data >> 8);
+ objspace.write_byte(V30_OBJ_ADDR | (offset * 2 + 1), data >> 8);
}
}
READ16_MEMBER(lockon_state::main_z80_r)
{
- address_space *sndspace = m_audiocpu->space(AS_PROGRAM);
- return 0xff00 | sndspace->read_byte(offset);
+ address_space &sndspace = m_audiocpu->space(AS_PROGRAM);
+ return 0xff00 | sndspace.read_byte(offset);
}
WRITE16_MEMBER(lockon_state::main_z80_w)
{
- address_space *sndspace = m_audiocpu->space(AS_PROGRAM);
- sndspace->write_byte(offset, data);
+ address_space &sndspace = m_audiocpu->space(AS_PROGRAM);
+ sndspace.write_byte(offset, data);
}
WRITE16_MEMBER(lockon_state::inten_w)
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 92457025c64..7ffdde62bfa 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -916,7 +916,7 @@ DRIVER_INIT_MEMBER(looping_state,looping)
rom[i] = BITSWAP8(rom[i], 0,1,2,3,4,5,6,7);
/* install protection handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x7000, 0x7007, read8_delegate(FUNC(looping_state::protection_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x7000, 0x7007, read8_delegate(FUNC(looping_state::protection_r), this));
}
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 2a3cb728487..fe9cc4f5091 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -974,7 +974,7 @@ DRIVER_INIT_MEMBER(m107_state,dsoccr94)
UINT8 *ROM = memregion("maincpu")->base();
membank("bank1")->configure_entries(0, 4, &ROM[0x80000], 0x20000);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x06, 0x07, write16_delegate(FUNC(m107_state::m107_bankswitch_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x06, 0x07, write16_delegate(FUNC(m107_state::m107_bankswitch_w),this));
m_irq_vectorbase = 0x80;
m_spritesystem = 0;
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index cccfcf028bb..6717a36746a 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -352,21 +352,21 @@ READ8_MEMBER(m72_state::m72_snd_cpu_sample_r)
DRIVER_INIT_MEMBER(m72_state,m72_8751)
{
- address_space *program = machine().device("maincpu")->memory().space(AS_PROGRAM);
- address_space *io = machine().device("maincpu")->memory().space(AS_IO);
- address_space *sndio = machine().device("soundcpu")->memory().space(AS_IO);
+ address_space &program = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &io = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &sndio = machine().device("soundcpu")->memory().space(AS_IO);
m_protection_ram = auto_alloc_array(machine(), UINT16, 0x10000/2);
- program->install_read_bank(0xb0000, 0xbffff, "bank1");
- program->install_write_handler(0xb0000, 0xb0fff, write16_delegate(FUNC(m72_state::m72_main_mcu_w),this));
+ program.install_read_bank(0xb0000, 0xbffff, "bank1");
+ program.install_write_handler(0xb0000, 0xb0fff, write16_delegate(FUNC(m72_state::m72_main_mcu_w),this));
membank("bank1")->set_base(m_protection_ram);
- //io->install_legacy_write_handler(0xc0, 0xc1, FUNC(loht_sample_trigger_w));
- io->install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::m72_main_mcu_sound_w),this));
+ //io.install_legacy_write_handler(0xc0, 0xc1, FUNC(loht_sample_trigger_w));
+ io.install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::m72_main_mcu_sound_w),this));
/* sound cpu */
- sndio->install_write_handler(0x82, 0x82, 0xff, 0, write8_delegate(FUNC(m72_state::m72_snd_cpu_sample_w),this));
- sndio->install_read_handler (0x84, 0x84, 0xff, 0, read8_delegate(FUNC(m72_state::m72_snd_cpu_sample_r),this));
+ sndio.install_write_handler(0x82, 0x82, 0xff, 0, write8_delegate(FUNC(m72_state::m72_snd_cpu_sample_w),this));
+ sndio.install_read_handler (0x84, 0x84, 0xff, 0, read8_delegate(FUNC(m72_state::m72_snd_cpu_sample_r),this));
/* lohtb2 */
#if 0
@@ -717,41 +717,41 @@ static void install_protection_handler(running_machine &machine, const UINT8 *co
state->m_protection_ram = auto_alloc_array(machine, UINT16, 0x1000/2);
state->m_protection_code = code;
state->m_protection_crc = crc;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xb0000, 0xb0fff, "bank1");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xb0ffa, 0xb0ffb, read16_delegate(FUNC(m72_state::protection_r),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb0000, 0xb0fff, write16_delegate(FUNC(m72_state::protection_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xb0000, 0xb0fff, "bank1");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xb0ffa, 0xb0ffb, read16_delegate(FUNC(m72_state::protection_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xb0000, 0xb0fff, write16_delegate(FUNC(m72_state::protection_w),state));
state->membank("bank1")->set_base(state->m_protection_ram);
}
DRIVER_INIT_MEMBER(m72_state,bchopper)
{
install_protection_handler(machine(), bchopper_code,bchopper_crc);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::bchopper_sample_trigger_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::bchopper_sample_trigger_w),this));
}
DRIVER_INIT_MEMBER(m72_state,mrheli)
{
install_protection_handler(machine(), bchopper_code,mrheli_crc);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::bchopper_sample_trigger_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::bchopper_sample_trigger_w),this));
}
DRIVER_INIT_MEMBER(m72_state,nspirit)
{
install_protection_handler(machine(), nspirit_code,nspirit_crc);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::nspirit_sample_trigger_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::nspirit_sample_trigger_w),this));
}
DRIVER_INIT_MEMBER(m72_state,imgfight)
{
install_protection_handler(machine(), imgfight_code,imgfightj_crc);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::imgfight_sample_trigger_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::imgfight_sample_trigger_w),this));
}
DRIVER_INIT_MEMBER(m72_state,loht)
{
install_protection_handler(machine(), loht_code,loht_crc);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::loht_sample_trigger_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::loht_sample_trigger_w),this));
/* since we skip the startup tests, clear video RAM to prevent garbage on title screen */
memset(m_videoram2,0,0x4000);
@@ -760,30 +760,30 @@ DRIVER_INIT_MEMBER(m72_state,loht)
DRIVER_INIT_MEMBER(m72_state,xmultiplm72)
{
install_protection_handler(machine(), xmultiplm72_code,xmultiplm72_crc);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::xmultiplm72_sample_trigger_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::xmultiplm72_sample_trigger_w),this));
}
DRIVER_INIT_MEMBER(m72_state,dbreedm72)
{
install_protection_handler(machine(), dbreedm72_code,dbreedm72_crc);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::dbreedm72_sample_trigger_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::dbreedm72_sample_trigger_w),this));
}
DRIVER_INIT_MEMBER(m72_state,airduel)
{
install_protection_handler(machine(), airduel_code,airduel_crc);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::airduel_sample_trigger_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::airduel_sample_trigger_w),this));
}
DRIVER_INIT_MEMBER(m72_state,dkgenm72)
{
install_protection_handler(machine(), dkgenm72_code,dkgenm72_crc);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::dkgenm72_sample_trigger_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::dkgenm72_sample_trigger_w),this));
}
DRIVER_INIT_MEMBER(m72_state,gallop)
{
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::gallop_sample_trigger_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0xc0, 0xc1, write16_delegate(FUNC(m72_state::gallop_sample_trigger_w),this));
}
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index 4a511a15aa4..27ecb32ccc7 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -679,7 +679,7 @@ static const ym2151_interface dynablsb_ym2151_config =
INTERRUPT_GEN_MEMBER(m90_state::fake_nmi)
{
- address_space &space = *machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = machine().firstcpu->space(AS_PROGRAM);
int sample = m72_sample_r(m_audio,space,0);
if (sample)
m72_sample_w(m_audio,space,0,sample);
@@ -687,7 +687,7 @@ INTERRUPT_GEN_MEMBER(m90_state::fake_nmi)
INTERRUPT_GEN_MEMBER(m90_state::bomblord_fake_nmi)
{
- address_space &space = *machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = machine().firstcpu->space(AS_PROGRAM);
int sample = m72_sample_r(m_audio,space,0);
if (sample != 0x80)
m72_sample_w(m_audio,space,0,sample);
@@ -1183,7 +1183,7 @@ ROM_END
DRIVER_INIT_MEMBER(m90_state,quizf1)
{
membank("bank1")->configure_entries(0, 16, memregion("user1")->base(), 0x10000);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x04, 0x05, write16_delegate(FUNC(m90_state::quizf1_bankswitch_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x04, 0x05, write16_delegate(FUNC(m90_state::quizf1_bankswitch_w),this));
}
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index 2a3d1c7d26a..c242fd7880c 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -2186,7 +2186,7 @@ DRIVER_INIT_MEMBER(m92_state,m92_bank)
UINT8 *ROM = memregion("maincpu")->base();
membank("bank1")->configure_entries(0, 4, &ROM[0x80000], 0x20000);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x20, 0x21, write16_delegate(FUNC(m92_state::m92_bankswitch_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x20, 0x21, write16_delegate(FUNC(m92_state::m92_bankswitch_w),this));
m_game_kludge = 0;
m_irq_vectorbase = 0x80;
@@ -2198,10 +2198,10 @@ DRIVER_INIT_MEMBER(m92_state,majtitl2)
UINT8 *ROM = memregion("maincpu")->base();
membank("bank1")->configure_entries(0, 4, &ROM[0x80000], 0x20000);
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x20, 0x21, write16_delegate(FUNC(m92_state::m92_bankswitch_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x20, 0x21, write16_delegate(FUNC(m92_state::m92_bankswitch_w),this));
/* This game has an eeprom on the game board */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0000, 0xf3fff, read16_delegate(FUNC(m92_state::m92_eeprom_r),this), write16_delegate(FUNC(m92_state::m92_eeprom_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0000, 0xf3fff, read16_delegate(FUNC(m92_state::m92_eeprom_r),this), write16_delegate(FUNC(m92_state::m92_eeprom_w),this));
m_game_kludge = 2;
m_irq_vectorbase = 0x80;
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index 60b50003081..133a0306b4a 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -779,13 +779,13 @@ WRITE32_MEMBER(macrossp_state::quizmoon_speedup_w)
DRIVER_INIT_MEMBER(macrossp_state,macrossp)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xf10158, 0xf1015b, write32_delegate(FUNC(macrossp_state::macrossp_speedup_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xf10158, 0xf1015b, write32_delegate(FUNC(macrossp_state::macrossp_speedup_w),this));
}
DRIVER_INIT_MEMBER(macrossp_state,quizmoon)
{
#ifdef UNUSED_FUNCTION
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xf00020, 0xf00023, write32_delegate(FUNC(macrossp_state::quizmoon_speedup_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xf00020, 0xf00023, write32_delegate(FUNC(macrossp_state::quizmoon_speedup_w),this));
#endif
}
diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c
index 2705f7cc222..347c4f06b41 100644
--- a/src/mame/drivers/magictg.c
+++ b/src/mame/drivers/magictg.c
@@ -753,7 +753,6 @@ WRITE16_MEMBER( magictg_state::adsp_control_w )
if (data > 0)
{
- address_space* addr_space;
UINT8* adsp_rom = (UINT8*)space.machine().root_device().memregion("adsp")->base();
UINT32 page = (m_adsp_regs.bdma_control >> 8) & 0xff;
@@ -762,10 +761,7 @@ WRITE16_MEMBER( magictg_state::adsp_control_w )
UINT32 src_addr = (page << 14) | m_adsp_regs.bdma_external_addr;
- if (type == 0)
- addr_space = m_adsp->space(AS_PROGRAM);
- else
- addr_space = m_adsp->space(AS_DATA);
+ address_space &addr_space = m_adsp->space((type == 0) ? AS_PROGRAM : AS_DATA);
if (dir == 0)
{
@@ -777,7 +773,7 @@ WRITE16_MEMBER( magictg_state::adsp_control_w )
(adsp_rom[src_addr + 1] << 8) |
(adsp_rom[src_addr + 2]);
- addr_space->write_dword(m_adsp_regs.bdma_internal_addr * 4, src_word);
+ addr_space.write_dword(m_adsp_regs.bdma_internal_addr * 4, src_word);
src_addr += 3;
m_adsp_regs.bdma_internal_addr ++;
@@ -786,7 +782,7 @@ WRITE16_MEMBER( magictg_state::adsp_control_w )
{
UINT32 src_word =(adsp_rom[src_addr + 0] << 8) | adsp_rom[src_addr + 1];
- addr_space->write_dword(m_adsp_regs.bdma_internal_addr * 2, src_word);
+ addr_space.write_dword(m_adsp_regs.bdma_internal_addr * 2, src_word);
src_addr += 2;
m_adsp_regs.bdma_internal_addr ++;
diff --git a/src/mame/drivers/magtouch.c b/src/mame/drivers/magtouch.c
index 8452326117d..cab9e4c5e6b 100644
--- a/src/mame/drivers/magtouch.c
+++ b/src/mame/drivers/magtouch.c
@@ -249,7 +249,7 @@ ROM_END
DRIVER_INIT_MEMBER(magtouch_state,magtouch)
{
pc_vga_init(machine(), vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
}
GAME( 1995, magtouch, 0, magtouch, magtouch, magtouch_state, magtouch, ROT0, "Micro Manufacturing", "Magical Touch", GAME_NOT_WORKING | GAME_NO_SOUND )
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 4e6d935ff37..38cca7ca566 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -717,7 +717,7 @@ WRITE8_MEMBER(mappy_state::mappy_latch_w)
MACHINE_RESET_MEMBER(mappy_state,superpac)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
/* Reset all latches */
@@ -727,7 +727,7 @@ MACHINE_RESET_MEMBER(mappy_state,superpac)
MACHINE_RESET_MEMBER(mappy_state,phozon)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
/* Reset all latches */
@@ -737,7 +737,7 @@ MACHINE_RESET_MEMBER(mappy_state,phozon)
MACHINE_RESET_MEMBER(mappy_state,mappy)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
/* Reset all latches */
@@ -2258,13 +2258,13 @@ DRIVER_INIT_MEMBER(mappy_state,grobda)
However, removing the 15XX from the board causes sound to disappear completely, so
the DAC might be built-in after all.
*/
- machine().device("sub")->memory().space(AS_PROGRAM)->install_write_handler(0x0002, 0x0002, write8_delegate(FUNC(mappy_state::grobda_DAC_w),this));
+ machine().device("sub")->memory().space(AS_PROGRAM).install_write_handler(0x0002, 0x0002, write8_delegate(FUNC(mappy_state::grobda_DAC_w),this));
}
DRIVER_INIT_MEMBER(mappy_state,digdug2)
{
/* appears to not use the watchdog */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x8000, 0x8000);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x8000, 0x8000);
}
diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c
index 69af4b52b5a..084fd39a352 100644
--- a/src/mame/drivers/maygay1b.c
+++ b/src/mame/drivers/maygay1b.c
@@ -4432,7 +4432,7 @@ DRIVER_INIT_MEMBER(maygay1b_state,m1)
UINT8 *okirom = machine().root_device().memregion( "msm6376" )->base();
if (!okirom) {
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x2420, 0x2421, write8_delegate(FUNC(maygay1b_state::m1ab_no_oki_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x2420, 0x2421, write8_delegate(FUNC(maygay1b_state::m1ab_no_oki_w), this));
}
// print out the rom id / header info to give us some hints
// note this isn't always correct, alley cat has 'Calpsyo' still in the ident string?
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index f46e38df014..ab5d2dd8076 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -2800,17 +2800,17 @@ DRIVER_INIT_MEMBER(mcr_state,dpoker)
machine().device<midway_ssio_device>("ssio")->set_custom_input(0, 0x8e, read8_delegate(FUNC(mcr_state::dpoker_ip0_r),this));
// meter ram, is it battery backed?
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0x8000, 0x81ff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_ram(0x8000, 0x81ff);
// extra I/O
- machine().device("maincpu")->memory().space(AS_IO)->install_read_port(0x24, 0x24, "P24");
- machine().device("maincpu")->memory().space(AS_IO)->install_read_port(0x28, 0x28, "P28");
- machine().device("maincpu")->memory().space(AS_IO)->install_read_port(0x2c, 0x2c, "P2C");
+ machine().device("maincpu")->memory().space(AS_IO).install_read_port(0x24, 0x24, "P24");
+ machine().device("maincpu")->memory().space(AS_IO).install_read_port(0x28, 0x28, "P28");
+ machine().device("maincpu")->memory().space(AS_IO).install_read_port(0x2c, 0x2c, "P2C");
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x2c, 0x2c, write8_delegate(FUNC(mcr_state::dpoker_lamps1_w),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x30, 0x30, write8_delegate(FUNC(mcr_state::dpoker_lamps2_w),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x34, 0x34, write8_delegate(FUNC(mcr_state::dpoker_output_w),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x3f, 0x3f, write8_delegate(FUNC(mcr_state::dpoker_meters_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x2c, 0x2c, write8_delegate(FUNC(mcr_state::dpoker_lamps1_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x30, 0x30, write8_delegate(FUNC(mcr_state::dpoker_lamps2_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x34, 0x34, write8_delegate(FUNC(mcr_state::dpoker_output_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x3f, 0x3f, write8_delegate(FUNC(mcr_state::dpoker_meters_w),this));
dpoker_coin_status = 0;
dpoker_output = 0;
@@ -2841,7 +2841,7 @@ DRIVER_INIT_MEMBER(mcr_state,twotiger)
mcr_init(machine(), 90010, 91399, 90913);
machine().device<midway_ssio_device>("ssio")->set_custom_output(4, 0xff, write8_delegate(FUNC(mcr_state::twotiger_op4_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xe800, 0xefff, 0, 0x1000, read8_delegate(FUNC(mcr_state::twotiger_videoram_r),this), write8_delegate(FUNC(mcr_state::twotiger_videoram_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xe800, 0xefff, 0, 0x1000, read8_delegate(FUNC(mcr_state::twotiger_videoram_r),this), write8_delegate(FUNC(mcr_state::twotiger_videoram_w),this));
}
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index 7d2cb49ac3a..36a61416e9a 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -1525,26 +1525,26 @@ static void mcr_common_init(running_machine &machine)
DRIVER_INIT_MEMBER(mcr3_state,demoderm)
{
mcr_common_init(machine());
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x01, 0x01, read8_delegate(FUNC(mcr3_state::demoderm_ip1_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x02, 0x02, read8_delegate(FUNC(mcr3_state::demoderm_ip2_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x06, 0x06, write8_delegate(FUNC(mcr3_state::demoderm_op6_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x01, 0x01, read8_delegate(FUNC(mcr3_state::demoderm_ip1_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x02, 0x02, read8_delegate(FUNC(mcr3_state::demoderm_ip2_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x06, 0x06, write8_delegate(FUNC(mcr3_state::demoderm_op6_w),this));
}
DRIVER_INIT_MEMBER(mcr3_state,sarge)
{
mcr_common_init(machine());
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x06, 0x06, write8_delegate(FUNC(midway_turbo_chip_squeak_device::write),m_turbo_chip_squeak.target()));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x06, 0x06, write8_delegate(FUNC(midway_turbo_chip_squeak_device::write),m_turbo_chip_squeak.target()));
}
DRIVER_INIT_MEMBER(mcr3_state,maxrpm)
{
mcr_common_init(machine());
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x01, 0x01, read8_delegate(FUNC(mcr3_state::maxrpm_ip1_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x02, 0x02, read8_delegate(FUNC(mcr3_state::maxrpm_ip2_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x05, 0x05, write8_delegate(FUNC(mcr3_state::maxrpm_op5_w),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x06, 0x06, write8_delegate(FUNC(mcr3_state::maxrpm_op6_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x01, 0x01, read8_delegate(FUNC(mcr3_state::maxrpm_ip1_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x02, 0x02, read8_delegate(FUNC(mcr3_state::maxrpm_ip2_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x05, 0x05, write8_delegate(FUNC(mcr3_state::maxrpm_op5_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x06, 0x06, write8_delegate(FUNC(mcr3_state::maxrpm_op6_w),this));
state_save_register_global(machine(), m_maxrpm_adc_control);
state_save_register_global(machine(), m_maxrpm_adc_select);
@@ -1557,26 +1557,26 @@ DRIVER_INIT_MEMBER(mcr3_state,maxrpm)
DRIVER_INIT_MEMBER(mcr3_state,rampage)
{
mcr_common_init(machine());
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x04, 0x04, read8_delegate(FUNC(mcr3_state::rampage_ip4_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x06, 0x06, write8_delegate(FUNC(mcr3_state::rampage_op6_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x04, 0x04, read8_delegate(FUNC(mcr3_state::rampage_ip4_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x06, 0x06, write8_delegate(FUNC(mcr3_state::rampage_op6_w),this));
}
DRIVER_INIT_MEMBER(mcr3_state,powerdrv)
{
mcr_common_init(machine());
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x02, 0x02, read8_delegate(FUNC(mcr3_state::powerdrv_ip2_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x05, 0x05, write8_delegate(FUNC(mcr3_state::powerdrv_op5_w),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x06, 0x06, write8_delegate(FUNC(mcr3_state::powerdrv_op6_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x02, 0x02, read8_delegate(FUNC(mcr3_state::powerdrv_ip2_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x05, 0x05, write8_delegate(FUNC(mcr3_state::powerdrv_op5_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x06, 0x06, write8_delegate(FUNC(mcr3_state::powerdrv_op6_w),this));
}
DRIVER_INIT_MEMBER(mcr3_state,stargrds)
{
mcr_common_init(machine());
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x00, 0x00, read8_delegate(FUNC(mcr3_state::stargrds_ip0_r),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x05, 0x05, write8_delegate(FUNC(mcr3_state::stargrds_op5_w),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x06, 0x06, write8_delegate(FUNC(mcr3_state::stargrds_op6_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x00, 0x00, read8_delegate(FUNC(mcr3_state::stargrds_ip0_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x05, 0x05, write8_delegate(FUNC(mcr3_state::stargrds_op5_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x06, 0x06, write8_delegate(FUNC(mcr3_state::stargrds_op6_w),this));
}
@@ -1615,7 +1615,7 @@ DRIVER_INIT_MEMBER(mcr3_state,turbotag)
machine().device<cpu_device>("csd:cpu")->suspend(SUSPEND_REASON_DISABLE, 1);
/* kludge for bad ROM read */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0b53, 0x0b53, read8_delegate(FUNC(mcr3_state::turbotag_kludge_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0b53, 0x0b53, read8_delegate(FUNC(mcr3_state::turbotag_kludge_r),this));
}
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index cdb0953c40a..45f6ee0d877 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -1571,7 +1571,7 @@ DRIVER_INIT_MEMBER(mcr68_state,xenophob)
m_timing_factor = attotime::from_hz(machine().device("maincpu")->unscaled_clock() / 10) * (256 + 16);
/* install control port handler */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0c0000, 0x0cffff, write16_delegate(FUNC(mcr68_state::xenophobe_control_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16_delegate(FUNC(mcr68_state::xenophobe_control_w),this));
}
@@ -1583,9 +1583,9 @@ DRIVER_INIT_MEMBER(mcr68_state,spyhunt2)
m_timing_factor = attotime::from_hz(machine().device("maincpu")->unscaled_clock() / 10) * (256 + 16);
/* analog port handling is a bit tricky */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0c0000, 0x0cffff, write16_delegate(FUNC(mcr68_state::spyhunt2_control_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0d0000, 0x0dffff, read16_delegate(FUNC(mcr68_state::spyhunt2_port_0_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0e0000, 0x0effff, read16_delegate(FUNC(mcr68_state::spyhunt2_port_1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16_delegate(FUNC(mcr68_state::spyhunt2_control_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0d0000, 0x0dffff, read16_delegate(FUNC(mcr68_state::spyhunt2_port_0_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0e0000, 0x0effff, read16_delegate(FUNC(mcr68_state::spyhunt2_port_1_r),this));
}
@@ -1599,10 +1599,10 @@ DRIVER_INIT_MEMBER(mcr68_state,blasted)
m_timing_factor = attotime::from_hz(machine().device("maincpu")->unscaled_clock() / 10) * (256 + 16);
/* handle control writes */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0c0000, 0x0cffff, write16_delegate(FUNC(mcr68_state::blasted_control_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16_delegate(FUNC(mcr68_state::blasted_control_w),this));
/* 6840 is mapped to the lower 8 bits */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x0a0000, 0x0a000f, read16_delegate(FUNC(mcr68_state::mcr68_6840_lower_r),this), write16_delegate(FUNC(mcr68_state::mcr68_6840_lower_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x0a0000, 0x0a000f, read16_delegate(FUNC(mcr68_state::mcr68_6840_lower_r),this), write16_delegate(FUNC(mcr68_state::mcr68_6840_lower_w),this));
}
DRIVER_INIT_MEMBER(mcr68_state,intlaser)
@@ -1613,7 +1613,7 @@ DRIVER_INIT_MEMBER(mcr68_state,intlaser)
m_timing_factor = attotime::from_hz(machine().device("maincpu")->unscaled_clock() / 10) * (256 + 16);
/* handle control writes */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0c0000, 0x0cffff, write16_delegate(FUNC(mcr68_state::blasted_control_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16_delegate(FUNC(mcr68_state::blasted_control_w),this));
}
@@ -1627,13 +1627,13 @@ DRIVER_INIT_MEMBER(mcr68_state,archrivl)
m_timing_factor = attotime::from_hz(machine().device("maincpu")->unscaled_clock() / 10) * (256 + 16);
/* handle control writes */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0c0000, 0x0cffff, write16_delegate(FUNC(mcr68_state::archrivl_control_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0c0000, 0x0cffff, write16_delegate(FUNC(mcr68_state::archrivl_control_w),this));
/* 49-way joystick handling is a bit tricky */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0e0000, 0x0effff, read16_delegate(FUNC(mcr68_state::archrivl_port_1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0e0000, 0x0effff, read16_delegate(FUNC(mcr68_state::archrivl_port_1_r),this));
/* 6840 is mapped to the lower 8 bits */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x0a0000, 0x0a000f, read16_delegate(FUNC(mcr68_state::mcr68_6840_lower_r),this), write16_delegate(FUNC(mcr68_state::mcr68_6840_lower_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x0a0000, 0x0a000f, read16_delegate(FUNC(mcr68_state::mcr68_6840_lower_r),this), write16_delegate(FUNC(mcr68_state::mcr68_6840_lower_w),this));
}
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index d625c713f93..130a167c2b8 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -1313,7 +1313,7 @@ static void install_speedups(running_machine &machine, const speedup_entry *entr
state->m_speedup_count = count;
for (i = 0; i < count; i++)
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(entries[i].offset, entries[i].offset + 3, speedup_handlers[i].func, speedup_handlers[i].name);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(entries[i].offset, entries[i].offset + 3, speedup_handlers[i].func, speedup_handlers[i].name);
#ifdef MAME_DEBUG
machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(report_speedups), &machine));
diff --git a/src/mame/drivers/megadrvb.c b/src/mame/drivers/megadrvb.c
index 721a57cf31a..d3525f29ee8 100644
--- a/src/mame/drivers/megadrvb.c
+++ b/src/mame/drivers/megadrvb.c
@@ -664,8 +664,8 @@ DRIVER_INIT_MEMBER(md_boot_state,aladmdb)
#endif
// 220000 = writes to mcu? 330000 = reads?
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x220000, 0x220001, FUNC(aladmdb_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x330000, 0x330001, FUNC(aladmdb_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x220000, 0x220001, FUNC(aladmdb_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x330000, 0x330001, FUNC(aladmdb_r));
megadrive_6buttons_pad = 0;
DRIVER_INIT_CALL(megadrij);
@@ -714,7 +714,7 @@ DRIVER_INIT_MEMBER(md_boot_state,mk3mdb)
rom[0x07] = 0x02;
rom[0x06] = 0x10;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x770070, 0x770075, FUNC(mk3mdb_dsw_r) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x770070, 0x770075, FUNC(mk3mdb_dsw_r) );
megadrive_6buttons_pad = 1;
DRIVER_INIT_CALL(megadriv);
@@ -722,13 +722,13 @@ DRIVER_INIT_MEMBER(md_boot_state,mk3mdb)
DRIVER_INIT_MEMBER(md_boot_state,ssf2mdb)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xA130F0, 0xA130FF); // custom banking is disabled (!)
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x400000, 0x5fffff, "bank5");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x400000, 0x5fffff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xA130F0, 0xA130FF); // custom banking is disabled (!)
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x400000, 0x5fffff, "bank5");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x400000, 0x5fffff);
machine().root_device().membank("bank5")->set_base(machine().root_device().memregion( "maincpu" )->base() + 0x400000 );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x770070, 0x770075, FUNC(ssf2mdb_dsw_r) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x770070, 0x770075, FUNC(ssf2mdb_dsw_r) );
megadrive_6buttons_pad = 1;
DRIVER_INIT_CALL(megadrij);
@@ -770,7 +770,7 @@ DRIVER_INIT_MEMBER(md_boot_state,srmdb)
rom[0x06] = 0xd2;
rom[0x07] = 0x00;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x770070, 0x770075, FUNC(srmdb_dsw_r) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x770070, 0x770075, FUNC(srmdb_dsw_r) );
megadrive_6buttons_pad = 0;
DRIVER_INIT_CALL(megadriv);
@@ -778,11 +778,11 @@ DRIVER_INIT_MEMBER(md_boot_state,srmdb)
DRIVER_INIT_MEMBER(md_cons_state,topshoot)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x200050, 0x200051, FUNC(topshoot_200051_r) );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x200042, 0x200043, "IN0");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x200044, 0x200045, "IN1");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x200046, 0x200047, "IN2");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x200048, 0x200049, "IN3");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x200050, 0x200051, FUNC(topshoot_200051_r) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x200042, 0x200043, "IN0");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x200044, 0x200045, "IN1");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x200046, 0x200047, "IN2");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x200048, 0x200049, "IN3");
megadrive_6buttons_pad = 0;
DRIVER_INIT_CALL(megadriv);
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index 074b3b49333..efecec04e0c 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -882,13 +882,13 @@ DRIVER_INIT_MEMBER(mplay_state,megaplay)
mplay_start(machine());
/* for now ... */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa10000, 0xa1001f, FUNC(megaplay_io_read), FUNC(megaplay_io_write));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xa10000, 0xa1001f, FUNC(megaplay_io_read), FUNC(megaplay_io_write));
/* megaplay has ram shared with the bios cpu here */
- machine().device("genesis_snd_z80")->memory().space(AS_PROGRAM)->install_ram(0x2000, 0x3fff, &m_ic36_ram[0]);
+ machine().device("genesis_snd_z80")->memory().space(AS_PROGRAM).install_ram(0x2000, 0x3fff, &m_ic36_ram[0]);
/* instead of a RAM mirror the 68k sees the extra ram of the 2nd z80 too */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa02000, 0xa03fff, FUNC(megadriv_68k_read_z80_extra_ram), FUNC(megadriv_68k_write_z80_extra_ram));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xa02000, 0xa03fff, FUNC(megadriv_68k_read_z80_extra_ram), FUNC(megadriv_68k_write_z80_extra_ram));
init_megatech_bios(machine());
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 2cde07a4bb1..315ee97b42f 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -3730,8 +3730,8 @@ WRITE16_MEMBER(megasys1_state::megasys1A_mcu_hs_w)
DRIVER_INIT_MEMBER(megasys1_state,astyanax)
{
astyanax_rom_decode(machine(), "maincpu");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00000, 0x3ffff, read16_delegate(FUNC(megasys1_state::megasys1A_mcu_hs_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x20000, 0x20009, write16_delegate(FUNC(megasys1_state::megasys1A_mcu_hs_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16_delegate(FUNC(megasys1_state::megasys1A_mcu_hs_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x20000, 0x20009, write16_delegate(FUNC(megasys1_state::megasys1A_mcu_hs_w),this));
}
DRIVER_INIT_MEMBER(megasys1_state,avspirit)
@@ -3743,8 +3743,8 @@ DRIVER_INIT_MEMBER(megasys1_state,avspirit)
m_ip_select_values[4] = 0x34;
// has twice less RAM
- machine().device("maincpu")->memory().space(AS_PROGRAM)->unmap_readwrite(0x060000, 0x06ffff);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0x070000, 0x07ffff, m_ram);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_readwrite(0x060000, 0x06ffff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_ram(0x070000, 0x07ffff, m_ram);
}
DRIVER_INIT_MEMBER(megasys1_state,bigstrik)
@@ -3806,8 +3806,8 @@ READ16_MEMBER(megasys1_state::edfbl_input_r)
DRIVER_INIT_MEMBER(megasys1_state,edfbl)
{
//device_t *oki1 = machine().device("oki1");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xe0000, 0xe000f, read16_delegate(FUNC(megasys1_state::edfbl_input_r),this));
- //machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(*oki1, 0xe000e, 0xe000f, FUNC(soundlatch_byte_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xe0000, 0xe000f, read16_delegate(FUNC(megasys1_state::edfbl_input_r),this));
+ //machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(*oki1, 0xe000e, 0xe000f, FUNC(soundlatch_byte_w));
}
DRIVER_INIT_MEMBER(megasys1_state,hayaosi1)
@@ -3861,8 +3861,8 @@ DRIVER_INIT_MEMBER(megasys1_state,iganinju)
phantasm_rom_decode(machine(), "maincpu");
//ROM = (UINT16 *) machine().root_device().memregion("maincpu")->base();
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00000, 0x3ffff, read16_delegate(FUNC(megasys1_state::iganinju_mcu_hs_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x2f000, 0x2f009, write16_delegate(FUNC(megasys1_state::iganinju_mcu_hs_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16_delegate(FUNC(megasys1_state::iganinju_mcu_hs_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x2f000, 0x2f009, write16_delegate(FUNC(megasys1_state::iganinju_mcu_hs_w),this));
//ROM[0x00006e/2] = 0x0420; // the only game that does
// not like lev 3 interrupts
@@ -3889,17 +3889,17 @@ DRIVER_INIT_MEMBER(megasys1_state,jitsupro)
jitsupro_gfx_unmangle(machine(), "gfx1"); // Gfx
jitsupro_gfx_unmangle(machine(), "gfx4");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00000, 0x3ffff, read16_delegate(FUNC(megasys1_state::megasys1A_mcu_hs_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x20000, 0x20009, write16_delegate(FUNC(megasys1_state::megasys1A_mcu_hs_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16_delegate(FUNC(megasys1_state::megasys1A_mcu_hs_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x20000, 0x20009, write16_delegate(FUNC(megasys1_state::megasys1A_mcu_hs_w),this));
/* the sound code writes oki commands to both the lsb and msb */
- machine().device("soundcpu")->memory().space(AS_PROGRAM)->install_write_handler(0xa0000, 0xa0003, write16_delegate(FUNC(megasys1_state::okim6295_both_1_w),this));
- machine().device("soundcpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc0000, 0xc0003, write16_delegate(FUNC(megasys1_state::okim6295_both_2_w),this));
+ machine().device("soundcpu")->memory().space(AS_PROGRAM).install_write_handler(0xa0000, 0xa0003, write16_delegate(FUNC(megasys1_state::okim6295_both_1_w),this));
+ machine().device("soundcpu")->memory().space(AS_PROGRAM).install_write_handler(0xc0000, 0xc0003, write16_delegate(FUNC(megasys1_state::okim6295_both_2_w),this));
}
DRIVER_INIT_MEMBER(megasys1_state,peekaboo)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x100000, 0x100001, read16_delegate(FUNC(megasys1_state::protection_peekaboo_r),this), write16_delegate(FUNC(megasys1_state::protection_peekaboo_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x100000, 0x100001, read16_delegate(FUNC(megasys1_state::protection_peekaboo_r),this), write16_delegate(FUNC(megasys1_state::protection_peekaboo_w),this));
}
DRIVER_INIT_MEMBER(megasys1_state,phantasm)
@@ -3934,14 +3934,14 @@ DRIVER_INIT_MEMBER(megasys1_state,soldamj)
{
astyanax_rom_decode(machine(), "maincpu");
/* Sprite RAM is mirrored */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x8c000, 0x8cfff, read16_delegate(FUNC(megasys1_state::soldamj_spriteram16_r),this), write16_delegate(FUNC(megasys1_state::soldamj_spriteram16_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x8c000, 0x8cfff, read16_delegate(FUNC(megasys1_state::soldamj_spriteram16_r),this), write16_delegate(FUNC(megasys1_state::soldamj_spriteram16_w),this));
}
DRIVER_INIT_MEMBER(megasys1_state,soldam)
{
phantasm_rom_decode(machine(), "maincpu");
/* Sprite RAM is mirrored */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x8c000, 0x8cfff, read16_delegate(FUNC(megasys1_state::soldamj_spriteram16_r),this), write16_delegate(FUNC(megasys1_state::soldamj_spriteram16_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x8c000, 0x8cfff, read16_delegate(FUNC(megasys1_state::soldamj_spriteram16_r),this), write16_delegate(FUNC(megasys1_state::soldamj_spriteram16_w),this));
}
@@ -3978,8 +3978,8 @@ WRITE16_MEMBER(megasys1_state::stdragon_mcu_hs_w)
DRIVER_INIT_MEMBER(megasys1_state,stdragon)
{
phantasm_rom_decode(machine(), "maincpu");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00000, 0x3ffff, read16_delegate(FUNC(megasys1_state::stdragon_mcu_hs_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x23ff0, 0x23ff9, write16_delegate(FUNC(megasys1_state::stdragon_mcu_hs_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16_delegate(FUNC(megasys1_state::stdragon_mcu_hs_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x23ff0, 0x23ff9, write16_delegate(FUNC(megasys1_state::stdragon_mcu_hs_w),this));
}
DRIVER_INIT_MEMBER(megasys1_state,stdragona)
@@ -3988,8 +3988,8 @@ DRIVER_INIT_MEMBER(megasys1_state,stdragona)
stdragona_gfx_unmangle(machine(), "gfx1");
stdragona_gfx_unmangle(machine(), "gfx4");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00000, 0x3ffff, read16_delegate(FUNC(megasys1_state::stdragon_mcu_hs_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x23ff0, 0x23ff9, write16_delegate(FUNC(megasys1_state::stdragon_mcu_hs_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00000, 0x3ffff, read16_delegate(FUNC(megasys1_state::stdragon_mcu_hs_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x23ff0, 0x23ff9, write16_delegate(FUNC(megasys1_state::stdragon_mcu_hs_w),this));
}
READ16_MEMBER(megasys1_state::monkelf_input_r)
@@ -4018,7 +4018,7 @@ DRIVER_INIT_MEMBER(megasys1_state,monkelf)
UINT16 *ROM = (UINT16*)memregion("maincpu")->base();
ROM[0x00744/2] = 0x4e71; // weird check, 0xe000e R is a port-based trap?
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xe0000, 0xe000f, read16_delegate(FUNC(megasys1_state::monkelf_input_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xe0000, 0xe000f, read16_delegate(FUNC(megasys1_state::monkelf_input_r),this));
}
/*************************************
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index f44842a954b..d34b3511ee7 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -334,16 +334,16 @@ static WRITE8_HANDLER( bios_ctrl_w )
static READ8_HANDLER( megatech_z80_read_68k_banked_data )
{
mtech_state *state = space.machine().driver_data<mtech_state>();
- address_space *space68k = space.machine().device<legacy_cpu_device>("maincpu")->space();
- UINT8 ret = space68k->read_byte(state->m_mt_bank_addr + offset);
+ address_space &space68k = space.machine().device<legacy_cpu_device>("maincpu")->space();
+ UINT8 ret = space68k.read_byte(state->m_mt_bank_addr + offset);
return ret;
}
static WRITE8_HANDLER( megatech_z80_write_68k_banked_data )
{
mtech_state *state = space.machine().driver_data<mtech_state>();
- address_space *space68k = space.machine().device<legacy_cpu_device>("maincpu")->space();
- space68k->write_byte(state->m_mt_bank_addr + offset,data);
+ address_space &space68k = space.machine().device<legacy_cpu_device>("maincpu")->space();
+ space68k.write_byte(state->m_mt_bank_addr + offset,data);
}
static void megatech_z80_bank_w(running_machine &machine, UINT16 data)
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index c425739e25c..1e27fe522a3 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -371,7 +371,7 @@ static void pc16650d_tx_callback(running_machine &machine, int channel, int coun
{
meritm_state *state = machine.driver_data<meritm_state>();
for(int i = 0; i < count; i++)
- state->m_microtouch->rx(*machine.memory().first_space(), 0, data[i]);
+ state->m_microtouch->rx(machine.driver_data()->generic_space(), 0, data[i]);
}
WRITE8_MEMBER(meritm_state::microtouch_tx)
@@ -2047,7 +2047,7 @@ DRIVER_INIT_MEMBER(meritm_state,megat3te)
ds1204_init(machine(), megat3_ds1204_key, megat3_ds1204_nvram);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfff8, 0xffff, read8_delegate(FUNC(meritm_state::meritm_ds1644_r), this), write8_delegate(FUNC(meritm_state::meritm_ds1644_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfff8, 0xffff, read8_delegate(FUNC(meritm_state::meritm_ds1644_r), this), write8_delegate(FUNC(meritm_state::meritm_ds1644_w), this));
};
@@ -2077,7 +2077,7 @@ DRIVER_INIT_MEMBER(meritm_state,megat4te)
ds1204_init(machine(), 0, megat4te_ds1204_nvram);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfff8, 0xffff, read8_delegate(FUNC(meritm_state::meritm_ds1644_r), this), write8_delegate(FUNC(meritm_state::meritm_ds1644_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfff8, 0xffff, read8_delegate(FUNC(meritm_state::meritm_ds1644_r), this), write8_delegate(FUNC(meritm_state::meritm_ds1644_w), this));
};
@@ -2088,7 +2088,7 @@ DRIVER_INIT_MEMBER(meritm_state,megat4st)
ds1204_init(machine(), 0, megat4te_ds1204_nvram);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfff8, 0xffff, read8_delegate(FUNC(meritm_state::meritm_ds1644_r), this), write8_delegate(FUNC(meritm_state::meritm_ds1644_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfff8, 0xffff, read8_delegate(FUNC(meritm_state::meritm_ds1644_r), this), write8_delegate(FUNC(meritm_state::meritm_ds1644_w), this));
};
@@ -2108,7 +2108,7 @@ DRIVER_INIT_MEMBER(meritm_state,megat5t)
ds1204_init(machine(), 0, megat5_ds1204_nvram);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfff8, 0xffff, read8_delegate(FUNC(meritm_state::meritm_ds1644_r), this), write8_delegate(FUNC(meritm_state::meritm_ds1644_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfff8, 0xffff, read8_delegate(FUNC(meritm_state::meritm_ds1644_r), this), write8_delegate(FUNC(meritm_state::meritm_ds1644_w), this));
}
diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c
index 8244a25a169..29ca7e1900b 100644
--- a/src/mame/drivers/metalmx.c
+++ b/src/mame/drivers/metalmx.c
@@ -443,19 +443,19 @@ READ32_MEMBER(metalmx_state::dsp32c_2_r)
WRITE32_MEMBER(metalmx_state::host_gsp_w)
{
- address_space *gsp_space = machine().device("gsp")->memory().space(AS_PROGRAM);
+ address_space &gsp_space = machine().device("gsp")->memory().space(AS_PROGRAM);
- gsp_space->write_word((0xc0000000 + (offset << 5) + 0x10) / 8, data);
- gsp_space->write_word((0xc0000000 + (offset << 5))/ 8 , data >> 16);
+ gsp_space.write_word((0xc0000000 + (offset << 5) + 0x10) / 8, data);
+ gsp_space.write_word((0xc0000000 + (offset << 5))/ 8 , data >> 16);
}
READ32_MEMBER(metalmx_state::host_gsp_r)
{
- address_space *gsp_space = machine().device("gsp")->memory().space(AS_PROGRAM);
+ address_space &gsp_space = machine().device("gsp")->memory().space(AS_PROGRAM);
UINT32 val;
- val = gsp_space->read_word((0xc0000000 + (offset << 5) + 0x10) / 8);
- val |= gsp_space->read_word((0xc0000000 + (offset << 5)) / 8) << 16;
+ val = gsp_space.read_word((0xc0000000 + (offset << 5) + 0x10) / 8);
+ val |= gsp_space.read_word((0xc0000000 + (offset << 5)) / 8) << 16;
return val;
}
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index e9a979b688b..a5adc84ef1f 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -133,7 +133,7 @@ READ16_MEMBER(metro_state::metro_irq_cause_r)
static void update_irq_state( running_machine &machine )
{
metro_state *state = machine.driver_data<metro_state>();
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
/* Get the pending IRQs (only the enabled ones, e.g. where irq_enable is *0*) */
UINT16 irq = state->metro_irq_cause_r(space, 0, 0xffff) & ~*state->m_irq_enable;
@@ -262,7 +262,7 @@ static void ymf278b_interrupt( device_t *device, int active )
static int metro_io_callback( device_t *device, int ioline, int state )
{
metro_state *driver_state = device->machine().driver_data<metro_state>();
- address_space &space = *driver_state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = driver_state->m_maincpu->space(AS_PROGRAM);
UINT8 data = 0;
switch (ioline)
@@ -5941,7 +5941,7 @@ static void metro_common( running_machine &machine )
DRIVER_INIT_MEMBER(metro_state,metro)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
metro_common(machine());
@@ -5968,7 +5968,7 @@ DRIVER_INIT_MEMBER(metro_state,karatour)
DRIVER_INIT_MEMBER(metro_state,daitorid)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
metro_common(machine());
diff --git a/src/mame/drivers/midqslvr.c b/src/mame/drivers/midqslvr.c
index 76bef4501f4..d97dc908680 100644
--- a/src/mame/drivers/midqslvr.c
+++ b/src/mame/drivers/midqslvr.c
@@ -253,7 +253,7 @@ static void intel82439tx_pci_w(device_t *busdevice, device_t *device, int functi
static UINT8 piix4_config_r(device_t *busdevice, device_t *device, int function, int reg)
{
- address_space &space = *busdevice->machine().firstcpu->space( AS_PROGRAM );
+ address_space &space = busdevice->machine().firstcpu->space( AS_PROGRAM );
midqslvr_state *state = busdevice->machine().driver_data<midqslvr_state>();
function &= 3;
@@ -672,7 +672,7 @@ void midqslvr_state::machine_start()
kbdc8042_init(machine(), &at8042);
pc_vga_init(machine(), vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
}
void midqslvr_state::machine_reset()
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index 115e85852eb..dd9c2bf69f7 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -1725,7 +1725,7 @@ void midvunit_state::init_crusnusa_common(offs_t speedup)
m_adc_shift = 24;
/* speedups */
- m_generic_speedup = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(speedup, speedup + 1, read32_delegate(FUNC(midvunit_state::generic_speedup_r),this));
+ m_generic_speedup = machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(speedup, speedup + 1, read32_delegate(FUNC(midvunit_state::generic_speedup_r),this));
}
DRIVER_INIT_MEMBER(midvunit_state,crusnusa) { init_crusnusa_common(0xc93e); }
DRIVER_INIT_MEMBER(midvunit_state,crusnu40) { init_crusnusa_common(0xc957); }
@@ -1738,21 +1738,21 @@ void midvunit_state::init_crusnwld_common(offs_t speedup)
m_adc_shift = 16;
/* control register is different */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x994000, 0x994000, write32_delegate(FUNC(midvunit_state::crusnwld_control_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x994000, 0x994000, write32_delegate(FUNC(midvunit_state::crusnwld_control_w),this));
/* valid values are 450 or 460 */
midway_serial_pic_init(machine(), 450);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x991030, 0x991030, read32_delegate(FUNC(midvunit_state::offroadc_serial_status_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x996000, 0x996000, read32_delegate(FUNC(midvunit_state::offroadc_serial_data_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x996000, 0x996000, write32_delegate(FUNC(midvunit_state::offroadc_serial_data_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x991030, 0x991030, read32_delegate(FUNC(midvunit_state::offroadc_serial_status_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x996000, 0x996000, read32_delegate(FUNC(midvunit_state::offroadc_serial_data_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x996000, 0x996000, write32_delegate(FUNC(midvunit_state::offroadc_serial_data_w),this));
/* install strange protection device */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x9d0000, 0x9d1fff, read32_delegate(FUNC(midvunit_state::bit_data_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x9d0000, 0x9d0000, write32_delegate(FUNC(midvunit_state::bit_reset_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x9d0000, 0x9d1fff, read32_delegate(FUNC(midvunit_state::bit_data_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x9d0000, 0x9d0000, write32_delegate(FUNC(midvunit_state::bit_reset_w),this));
/* speedups */
if (speedup)
- m_generic_speedup = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(speedup, speedup + 1, read32_delegate(FUNC(midvunit_state::generic_speedup_r),this));
+ m_generic_speedup = machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(speedup, speedup + 1, read32_delegate(FUNC(midvunit_state::generic_speedup_r),this));
}
DRIVER_INIT_MEMBER(midvunit_state,crusnwld) { init_crusnwld_common(0xd4c0); }
#if 0
@@ -1766,15 +1766,15 @@ DRIVER_INIT_MEMBER(midvunit_state,offroadc)
m_adc_shift = 16;
/* control register is different */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x994000, 0x994000, write32_delegate(FUNC(midvunit_state::crusnwld_control_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x994000, 0x994000, write32_delegate(FUNC(midvunit_state::crusnwld_control_w),this));
/* valid values are 230 or 234 */
midway_serial_pic2_init(machine(), 230, 94);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x991030, 0x991030, read32_delegate(FUNC(midvunit_state::offroadc_serial_status_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x996000, 0x996000, read32_delegate(FUNC(midvunit_state::offroadc_serial_data_r),this), write32_delegate(FUNC(midvunit_state::offroadc_serial_data_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x991030, 0x991030, read32_delegate(FUNC(midvunit_state::offroadc_serial_status_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x996000, 0x996000, read32_delegate(FUNC(midvunit_state::offroadc_serial_data_r),this), write32_delegate(FUNC(midvunit_state::offroadc_serial_data_w),this));
/* speedups */
- m_generic_speedup = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x195aa, 0x195aa, read32_delegate(FUNC(midvunit_state::generic_speedup_r),this));
+ m_generic_speedup = machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x195aa, 0x195aa, read32_delegate(FUNC(midvunit_state::generic_speedup_r),this));
}
@@ -1799,7 +1799,7 @@ DRIVER_INIT_MEMBER(midvunit_state,wargods)
midway_serial_pic2_set_default_nvram(default_nvram);
/* speedups */
- m_generic_speedup = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x2f4c, 0x2f4c, read32_delegate(FUNC(midvunit_state::generic_speedup_r),this));
+ m_generic_speedup = machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x2f4c, 0x2f4c, read32_delegate(FUNC(midvunit_state::generic_speedup_r),this));
}
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index ab7776ea760..0cad6a0191f 100644
--- a/src/mame/drivers/midyunit.c
+++ b/src/mame/drivers/midyunit.c
@@ -152,13 +152,13 @@ WRITE8_MEMBER(midyunit_state::yawdim_oki_bank_w)
CUSTOM_INPUT_MEMBER(midyunit_state::narc_talkback_strobe_r)
{
- return (m_narc_sound->read(*machine().memory().first_space(), 0) >> 8) & 1;
+ return (m_narc_sound->read(machine().driver_data()->generic_space(), 0) >> 8) & 1;
}
CUSTOM_INPUT_MEMBER(midyunit_state::narc_talkback_data_r)
{
- return m_narc_sound->read(*machine().memory().first_space(), 0) & 0xff;
+ return m_narc_sound->read(machine().driver_data()->generic_space(), 0) & 0xff;
}
diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c
index e98fa5cf497..9a17ce11fc6 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -1433,7 +1433,7 @@ DRIVER_INIT_MEMBER(midzeus_state,invasn)
{
dcs2_init(machine(), 0, 0);
midway_ioasic_init(machine(), MIDWAY_IOASIC_STANDARD, 468/* or 488 */, 94, NULL);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x9c0000, 0x9c0000, read32_delegate(FUNC(midzeus_state::invasn_gun_r),this), write32_delegate(FUNC(midzeus_state::invasn_gun_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x9c0000, 0x9c0000, read32_delegate(FUNC(midzeus_state::invasn_gun_r),this), write32_delegate(FUNC(midzeus_state::invasn_gun_w),this));
}
@@ -1442,8 +1442,8 @@ DRIVER_INIT_MEMBER(midzeus_state,crusnexo)
dcs2_init(machine(), 0, 0);
midway_ioasic_init(machine(), MIDWAY_IOASIC_STANDARD, 472/* or 476,477,478,110 */, 99, NULL);
machine().root_device().membank("bank1")->configure_entries(0, 3, machine().root_device().memregion("user2")->base(), 0x400000*4);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x9b0004, 0x9b0007, read32_delegate(FUNC(midzeus_state::crusnexo_leds_r),this), write32_delegate(FUNC(midzeus_state::crusnexo_leds_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler (0x8d0009, 0x8d000a, write32_delegate(FUNC(midzeus_state::keypad_select_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x9b0004, 0x9b0007, read32_delegate(FUNC(midzeus_state::crusnexo_leds_r),this), write32_delegate(FUNC(midzeus_state::crusnexo_leds_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler (0x8d0009, 0x8d000a, write32_delegate(FUNC(midzeus_state::keypad_select_w),this));
}
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index 628d703cfd5..2a22d2a65d1 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -518,7 +518,7 @@ void missile_state::machine_start()
m_flipscreen = 0;
/* set up an opcode base handler since we use mapped handlers for RAM */
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
space.set_direct_update_handler(direct_update_delegate(FUNC(missile_state::missile_direct_handler), this));
/* create a timer to speed/slow the CPU */
@@ -731,7 +731,7 @@ WRITE8_MEMBER(missile_state::missile_w)
else if (offset < 0x4800)
{
pokey_device *pokey_dev = downcast<pokey_device *>(machine().device("pokey"));
- pokey_dev->write(*machine().firstcpu->space(), offset, data, 0xff);
+ pokey_dev->write(machine().firstcpu->space(), offset, data, 0xff);
}
/* OUT0 */
@@ -794,7 +794,7 @@ READ8_MEMBER(missile_state::missile_r)
else if (offset < 0x4800)
{
pokey_device *pokey_dev = downcast<pokey_device *>(machine().device("pokey"));
- result = pokey_dev->read(*machine().firstcpu->space(), offset & 0x0f, 0xff);
+ result = pokey_dev->read(machine().firstcpu->space(), offset & 0x0f, 0xff);
}
/* IN0 */
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index facbe8f6234..c5a0c5e915d 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -2104,7 +2104,7 @@ ROM_END
static void bootleg_decode( running_machine &machine )
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
space.set_decrypted_region(0x0000, 0x7fff, machine.root_device().memregion("maincpu")->base() + 0x50000);
machine.root_device().membank("bank1")->configure_decrypted_entries(0, 16, machine.root_device().memregion("maincpu")->base() + 0x60000, 0x4000);
}
@@ -2203,8 +2203,8 @@ DRIVER_INIT_MEMBER(mitchell_state,mgakuen)
{
m_input_type = 1;
configure_banks(machine());
- machine().device("maincpu")->memory().space(AS_IO)->install_read_port(0x03, 0x03, "DSW0");
- machine().device("maincpu")->memory().space(AS_IO)->install_read_port(0x04, 0x04, "DSW1");
+ machine().device("maincpu")->memory().space(AS_IO).install_read_port(0x03, 0x03, "DSW0");
+ machine().device("maincpu")->memory().space(AS_IO).install_read_port(0x04, 0x04, "DSW1");
}
DRIVER_INIT_MEMBER(mitchell_state,mgakuen2)
{
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 712c67c7c88..0aff8b6021e 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -5224,7 +5224,7 @@ ROM_END
DRIVER_INIT_MEMBER(model2_state,genprot)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x01d80000, 0x01dfffff, read32_delegate(FUNC(model2_state::model2_prot_r),this), write32_delegate(FUNC(model2_state::model2_prot_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x01d80000, 0x01dfffff, read32_delegate(FUNC(model2_state::model2_prot_r),this), write32_delegate(FUNC(model2_state::model2_prot_w),this));
m_protstate = m_protpos = 0;
}
@@ -5232,7 +5232,7 @@ DRIVER_INIT_MEMBER(model2_state,pltkids)
{
UINT32 *ROM = (UINT32 *)memregion("maincpu")->base();
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x01d80000, 0x01dfffff, read32_delegate(FUNC(model2_state::model2_prot_r),this), write32_delegate(FUNC(model2_state::model2_prot_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x01d80000, 0x01dfffff, read32_delegate(FUNC(model2_state::model2_prot_r),this), write32_delegate(FUNC(model2_state::model2_prot_w),this));
m_protstate = m_protpos = 0;
// fix bug in program: it destroys the interrupt table and never fixes it
@@ -5243,7 +5243,7 @@ DRIVER_INIT_MEMBER(model2_state,zerogun)
{
UINT32 *ROM = (UINT32 *)memregion("maincpu")->base();
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x01d80000, 0x01dfffff, read32_delegate(FUNC(model2_state::model2_prot_r),this), write32_delegate(FUNC(model2_state::model2_prot_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x01d80000, 0x01dfffff, read32_delegate(FUNC(model2_state::model2_prot_r),this), write32_delegate(FUNC(model2_state::model2_prot_w),this));
m_protstate = m_protpos = 0;
// fix bug in program: it destroys the interrupt table and never fixes it
@@ -5252,7 +5252,7 @@ DRIVER_INIT_MEMBER(model2_state,zerogun)
DRIVER_INIT_MEMBER(model2_state,daytonam)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x240000, 0x24ffff, read32_delegate(FUNC(model2_state::maxx_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x240000, 0x24ffff, read32_delegate(FUNC(model2_state::maxx_r),this));
}
/* very crude support for let the game set itself into stand-alone mode */
@@ -5285,8 +5285,8 @@ DRIVER_INIT_MEMBER(model2_state,sgt24h)
{
UINT32 *ROM = (UINT32 *)memregion("maincpu")->base();
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x01d80000, 0x01dfffff, read32_delegate(FUNC(model2_state::model2_prot_r),this), write32_delegate(FUNC(model2_state::model2_prot_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x01a10000, 0x01a1ffff, read32_delegate(FUNC(model2_state::jaleco_network_r),this), write32_delegate(FUNC(model2_state::jaleco_network_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x01d80000, 0x01dfffff, read32_delegate(FUNC(model2_state::model2_prot_r),this), write32_delegate(FUNC(model2_state::model2_prot_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x01a10000, 0x01a1ffff, read32_delegate(FUNC(model2_state::jaleco_network_r),this), write32_delegate(FUNC(model2_state::jaleco_network_w),this));
m_protstate = m_protpos = 0;
@@ -5296,7 +5296,7 @@ DRIVER_INIT_MEMBER(model2_state,sgt24h)
DRIVER_INIT_MEMBER(model2_state,overrev)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x01a10000, 0x01a1ffff, read32_delegate(FUNC(model2_state::jaleco_network_r),this), write32_delegate(FUNC(model2_state::jaleco_network_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x01a10000, 0x01a1ffff, read32_delegate(FUNC(model2_state::jaleco_network_r),this), write32_delegate(FUNC(model2_state::jaleco_network_w),this));
//TODO: cache patch?
}
@@ -5306,7 +5306,7 @@ DRIVER_INIT_MEMBER(model2_state,doa)
{
UINT32 *ROM = (UINT32 *)memregion("maincpu")->base();
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x01d80000, 0x01dfffff, read32_delegate(FUNC(model2_state::model2_prot_r),this), write32_delegate(FUNC(model2_state::model2_prot_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x01d80000, 0x01dfffff, read32_delegate(FUNC(model2_state::model2_prot_r),this), write32_delegate(FUNC(model2_state::model2_prot_w),this));
m_protstate = m_protpos = 0;
ROM[0x630/4] = 0x08000004;
@@ -5315,12 +5315,12 @@ DRIVER_INIT_MEMBER(model2_state,doa)
DRIVER_INIT_MEMBER(model2_state,rchase2)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x01c00008, 0x01c0000b, write32_delegate(FUNC(model2_state::rchase2_devices_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x01c00008, 0x01c0000b, write32_delegate(FUNC(model2_state::rchase2_devices_w),this));
}
DRIVER_INIT_MEMBER(model2_state,srallyc)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x01c00008, 0x01c0000b, write32_delegate(FUNC(model2_state::srallyc_devices_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x01c00008, 0x01c0000b, write32_delegate(FUNC(model2_state::srallyc_devices_w),this));
}
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 41cdae70b67..384db01afc0 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -1059,7 +1059,7 @@ WRITE64_MEMBER(model3_state::scsi_w)
static UINT32 scsi_fetch(running_machine &machine, UINT32 dsp)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT32 result;
result = space.read_dword(dsp);
return FLIPENDIAN_INT32(result);
@@ -1159,7 +1159,7 @@ WRITE64_MEMBER(model3_state::real3d_dma_w)
static void real3d_dma_callback(running_machine &machine, UINT32 src, UINT32 dst, int length, int byteswap)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
switch(dst >> 24)
{
case 0x88: /* Display List End Trigger */
@@ -5483,35 +5483,35 @@ DRIVER_INIT_MEMBER(model3_state,model3_10)
{
interleave_vroms(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xc0000000, 0xc00000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xc0000000, 0xc00000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xff000000, 0xff7fffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(FUNC(model3_state::mpc105_addr_r),this), write64_delegate(FUNC(model3_state::mpc105_addr_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(FUNC(model3_state::mpc105_data_r),this), write64_delegate(FUNC(model3_state::mpc105_data_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc105_reg_r),this), write64_delegate(FUNC(model3_state::mpc105_reg_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(FUNC(model3_state::mpc105_addr_r),this), write64_delegate(FUNC(model3_state::mpc105_addr_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(FUNC(model3_state::mpc105_data_r),this), write64_delegate(FUNC(model3_state::mpc105_data_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc105_reg_r),this), write64_delegate(FUNC(model3_state::mpc105_reg_w),this));
}
DRIVER_INIT_MEMBER(model3_state,model3_15)
{
interleave_vroms(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xff000000, 0xff7fffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(FUNC(model3_state::mpc105_addr_r),this), write64_delegate(FUNC(model3_state::mpc105_addr_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(FUNC(model3_state::mpc105_data_r),this), write64_delegate(FUNC(model3_state::mpc105_data_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc105_reg_r),this), write64_delegate(FUNC(model3_state::mpc105_reg_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(FUNC(model3_state::mpc105_addr_r),this), write64_delegate(FUNC(model3_state::mpc105_addr_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(FUNC(model3_state::mpc105_data_r),this), write64_delegate(FUNC(model3_state::mpc105_data_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc105_reg_r),this), write64_delegate(FUNC(model3_state::mpc105_reg_w),this));
}
DRIVER_INIT_MEMBER(model3_state,model3_20)
{
interleave_vroms(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xff000000, 0xff7fffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xc2000000, 0xc20000ff, read64_delegate(FUNC(model3_state::real3d_dma_r),this), write64_delegate(FUNC(model3_state::real3d_dma_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xc2000000, 0xc20000ff, read64_delegate(FUNC(model3_state::real3d_dma_r),this), write64_delegate(FUNC(model3_state::real3d_dma_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfec00000, 0xfedfffff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfee00000, 0xfeffffff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc106_reg_r),this), write64_delegate(FUNC(model3_state::mpc106_reg_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfec00000, 0xfedfffff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfee00000, 0xfeffffff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc106_reg_r),this), write64_delegate(FUNC(model3_state::mpc106_reg_w),this));
}
DRIVER_INIT_MEMBER(model3_state,lostwsga)
@@ -5520,7 +5520,7 @@ DRIVER_INIT_MEMBER(model3_state,lostwsga)
DRIVER_INIT_CALL(model3_15);
/* TODO: there's an M68K device at 0xC0000000 - FF, maybe lightgun controls ? */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xc1000000, 0xc10000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xc1000000, 0xc10000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
rom[0x7374f0/4] = 0x38840004; /* This seems to be an actual bug in the original code */
}
@@ -5531,7 +5531,7 @@ DRIVER_INIT_MEMBER(model3_state,scud)
DRIVER_INIT_CALL(model3_15);
/* TODO: network device at 0xC0000000 - FF */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
rom[(0x71275c^4)/4] = 0x60000000;
rom[(0x71277c^4)/4] = 0x60000000;
@@ -5543,7 +5543,7 @@ DRIVER_INIT_MEMBER(model3_state,scudplus)
DRIVER_INIT_CALL(model3_15);
/* TODO: network device at 0xC0000000 - FF */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xc1000000, 0xc10000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xc1000000, 0xc10000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
rom[(0x713724^4)/4] = 0x60000000;
rom[(0x713744^4)/4] = 0x60000000;
@@ -5560,7 +5560,7 @@ DRIVER_INIT_MEMBER(model3_state,scudplusa)
DRIVER_INIT_CALL(model3_15);
/* TODO: network device at 0xC0000000 - FF */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xc1000000, 0xc10000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xc1000000, 0xc10000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
//rom[(0x713724^4)/4] = 0x60000000; // Fix ME!!!! Needs to corrected for the non REV A version!!!!
//rom[(0x713744^4)/4] = 0x60000000;
@@ -5576,7 +5576,7 @@ DRIVER_INIT_MEMBER(model3_state,lemans24)
UINT32 *rom = (UINT32*)memregion("user1")->base();
DRIVER_INIT_CALL(model3_15);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xc1000000, 0xc10000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xc1000000, 0xc10000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
rom[(0x73fe38^4)/4] = 0x38840004; /* This seems to be an actual bug in the original code */
@@ -5607,15 +5607,15 @@ DRIVER_INIT_MEMBER(model3_state,vs215)
rom[(0x70e710^4)/4] = 0x60000000;
interleave_vroms(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xff000000, 0xff7fffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfec00000, 0xfedfffff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfee00000, 0xfeffffff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc106_reg_r),this), write64_delegate(FUNC(model3_state::mpc106_reg_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfec00000, 0xfedfffff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfee00000, 0xfeffffff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc106_reg_r),this), write64_delegate(FUNC(model3_state::mpc106_reg_w),this));
}
DRIVER_INIT_MEMBER(model3_state,vs29815)
@@ -5626,15 +5626,15 @@ DRIVER_INIT_MEMBER(model3_state,vs29815)
rom[(0x60290c^4)/4] = 0x60000000;
interleave_vroms(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xff000000, 0xff7fffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfec00000, 0xfedfffff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfee00000, 0xfeffffff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc106_reg_r),this), write64_delegate(FUNC(model3_state::mpc106_reg_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfec00000, 0xfedfffff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfee00000, 0xfeffffff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc106_reg_r),this), write64_delegate(FUNC(model3_state::mpc106_reg_w),this));
}
DRIVER_INIT_MEMBER(model3_state,bass)
@@ -5645,27 +5645,27 @@ DRIVER_INIT_MEMBER(model3_state,bass)
rom[(0x7999c8^4)/4] = 0x60000000;
interleave_vroms(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xff000000, 0xff7fffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfec00000, 0xfedfffff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xfee00000, 0xfeffffff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc106_reg_r),this), write64_delegate(FUNC(model3_state::mpc106_reg_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfec00000, 0xfedfffff, read64_delegate(FUNC(model3_state::mpc106_addr_r),this), write64_delegate(FUNC(model3_state::mpc106_addr_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xfee00000, 0xfeffffff, read64_delegate(FUNC(model3_state::mpc106_data_r),this), write64_delegate(FUNC(model3_state::mpc106_data_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc106_reg_r),this), write64_delegate(FUNC(model3_state::mpc106_reg_w),this));
}
DRIVER_INIT_MEMBER(model3_state,getbass)
{
interleave_vroms(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xff000000, 0xff7fffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xff000000, 0xff7fffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf9000000, 0xf90000ff, read64_delegate(FUNC(model3_state::scsi_r),this), write64_delegate(FUNC(model3_state::scsi_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(FUNC(model3_state::mpc105_addr_r),this), write64_delegate(FUNC(model3_state::mpc105_addr_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(FUNC(model3_state::mpc105_data_r),this), write64_delegate(FUNC(model3_state::mpc105_data_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc105_reg_r),this), write64_delegate(FUNC(model3_state::mpc105_reg_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0800cf8, 0xf0800cff, read64_delegate(FUNC(model3_state::mpc105_addr_r),this), write64_delegate(FUNC(model3_state::mpc105_addr_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf0c00cf8, 0xf0c00cff, read64_delegate(FUNC(model3_state::mpc105_data_r),this), write64_delegate(FUNC(model3_state::mpc105_data_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xf8fff000, 0xf8fff0ff, read64_delegate(FUNC(model3_state::mpc105_reg_r),this), write64_delegate(FUNC(model3_state::mpc105_reg_w),this));
}
DRIVER_INIT_MEMBER(model3_state,vs2)
@@ -5735,7 +5735,7 @@ DRIVER_INIT_MEMBER(model3_state,harley)
DRIVER_INIT_CALL(model3_20);
m_network_ram = auto_alloc_array_clear(machine(), UINT64, 0x10000);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xc0000000, 0xc00fffff, read64_delegate(FUNC(model3_state::network_r),this), write64_delegate(FUNC(model3_state::network_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xc0000000, 0xc00fffff, read64_delegate(FUNC(model3_state::network_r),this), write64_delegate(FUNC(model3_state::network_w),this));
rom[(0x50ecb4^4)/4] = 0x60000000;
rom[(0x50ecd4^4)/4] = 0x60000000;
@@ -5750,7 +5750,7 @@ DRIVER_INIT_MEMBER(model3_state,harleya)
DRIVER_INIT_CALL(model3_20);
m_network_ram = auto_alloc_array_clear(machine(), UINT64, 0x10000);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xc0000000, 0xc00fffff, read64_delegate(FUNC(model3_state::network_r),this), write64_delegate(FUNC(model3_state::network_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xc0000000, 0xc00fffff, read64_delegate(FUNC(model3_state::network_r),this), write64_delegate(FUNC(model3_state::network_w),this));
rom[(0x50e8d4^4)/4] = 0x60000000;
rom[(0x50e8f4^4)/4] = 0x60000000;
@@ -5819,8 +5819,8 @@ DRIVER_INIT_MEMBER(model3_state,daytona2)
UINT32 *rom = (UINT32*)memregion("user1")->base();
DRIVER_INIT_CALL(model3_20);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc3800000, 0xc3800007, write64_delegate(FUNC(model3_state::daytona2_rombank_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xc3000000, 0xc37fffff, "bank2" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc3800000, 0xc3800007, write64_delegate(FUNC(model3_state::daytona2_rombank_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xc3000000, 0xc37fffff, "bank2" );
//rom[(0x68468c^4)/4] = 0x60000000;
rom[(0x6063c4^4)/4] = 0x60000000;
@@ -5833,8 +5833,8 @@ DRIVER_INIT_MEMBER(model3_state,dayto2pe)
UINT32 *rom = (UINT32*)memregion("user1")->base();
DRIVER_INIT_CALL(model3_20);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc3800000, 0xc3800007, write64_delegate(FUNC(model3_state::daytona2_rombank_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xc3000000, 0xc37fffff, "bank2" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc3800000, 0xc3800007, write64_delegate(FUNC(model3_state::daytona2_rombank_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xc3000000, 0xc37fffff, "bank2" );
rom[(0x606784^4)/4] = 0x60000000;
rom[(0x69a3fc^4)/4] = 0x60000000; // jump to encrypted code
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index c3fbda381f0..c6a0adef25c 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -287,7 +287,7 @@ DRIVER_INIT_MEMBER(mouser_state,mouser)
/* Decode the opcodes */
offs_t i;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine().root_device().memregion("maincpu")->base();
UINT8 *decrypted = auto_alloc_array(machine(), UINT8, 0x6000);
UINT8 *table = machine().root_device().memregion("user1")->base();
diff --git a/src/mame/drivers/mpu3.c b/src/mame/drivers/mpu3.c
index ddb0a553f5e..49085089aba 100644
--- a/src/mame/drivers/mpu3.c
+++ b/src/mame/drivers/mpu3.c
@@ -935,7 +935,7 @@ static const mpu3_chr_table hprvpr_data[64] = {
DRIVER_INIT_MEMBER(mpu3_state,m3hprvpr)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
m_disp_func=METER_PORT;
m_current_chr_table = hprvpr_data;
diff --git a/src/mame/drivers/mpu4hw.c b/src/mame/drivers/mpu4hw.c
index 1506f0955d4..516fed437f8 100644
--- a/src/mame/drivers/mpu4hw.c
+++ b/src/mame/drivers/mpu4hw.c
@@ -2359,7 +2359,7 @@ MACHINE_START_MEMBER(mpu4_state,mod2)
MACHINE_START_MEMBER(mpu4_state,mpu4yam)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
mpu4_config_common(machine());
m_link7a_connected=0;
@@ -2369,7 +2369,7 @@ MACHINE_START_MEMBER(mpu4_state,mpu4yam)
MACHINE_START_MEMBER(mpu4_state,mpu4oki)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
mpu4_config_common(machine());
m_link7a_connected=0;
@@ -2379,7 +2379,7 @@ MACHINE_START_MEMBER(mpu4_state,mpu4oki)
MACHINE_START_MEMBER(mpu4_state,mpu4bwb)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
mpu4_config_common(machine());
m_link7a_connected=0;
@@ -2588,7 +2588,7 @@ DRIVER_INIT_MEMBER(mpu4_state,m4default_alt)
DRIVER_INIT_MEMBER(mpu4_state,m4default_big)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
DRIVER_INIT_CALL(m4default);
int size = machine().root_device().memregion( "maincpu" )->bytes();
@@ -2620,7 +2620,7 @@ WRITE8_MEMBER(mpu4_state::crystal_sound_w)
DRIVER_INIT_MEMBER(mpu4_state,m_frkstn)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
DRIVER_INIT_CALL(m4default_big);
space.install_read_handler(0x0880, 0x0880, 0, 0, read8_delegate(FUNC(mpu4_state::crystal_sound_r),this));
space.install_write_handler(0x0881, 0x0881, 0, 0, write8_delegate(FUNC(mpu4_state::crystal_sound_w),this));
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index d0bf3538901..f9eb15297cf 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -40,11 +40,11 @@ static WRITE8_DEVICE_HANDLER( mquake_cia_0_porta_w )
/* swap the write handlers between ROM and bank 1 based on the bit */
if ((data & 1) == 0)
/* overlay disabled, map RAM on 0x000000 */
- device->machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x000000, 0x07ffff, "bank1");
+ device->machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x000000, 0x07ffff, "bank1");
else
/* overlay enabled, map Amiga system ROM on 0x000000 */
- device->machine().device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x000000, 0x07ffff);
+ device->machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x000000, 0x07ffff);
}
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index 95fb9d14c1a..1bc025270cf 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -570,7 +570,7 @@ static void multigam_init_mmc3(running_machine &machine, UINT8 *prg_base, int pr
memcpy(&dst[0x8000], prg_base + (prg_size - 0x4000), 0x4000);
memcpy(&dst[0xc000], prg_base + (prg_size - 0x4000), 0x4000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(multigam_state::multigam3_mmc3_rom_switch_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(multigam_state::multigam3_mmc3_rom_switch_w),state));
state->m_multigam3_mmc3_banks[0] = 0x1e;
state->m_multigam3_mmc3_banks[1] = 0x1f;
@@ -679,7 +679,7 @@ static void multigam_init_mapper02(running_machine &machine, UINT8* prg_base, in
ppu2c0x_device *ppu = machine.device<ppu2c0x_device>("ppu");
UINT8* mem = state->memregion("maincpu")->base();
memcpy(mem + 0x8000, prg_base + prg_size - 0x8000, 0x8000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(multigam_state::multigam3_mapper02_rom_switch_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(multigam_state::multigam3_mapper02_rom_switch_w),state));
state->m_mapper02_prg_base = prg_base;
state->m_mapper02_prg_size = prg_size;
@@ -835,7 +835,7 @@ static void multigam_init_mmc1(running_machine &machine, UINT8 *prg_base, int pr
memcpy(&dst[0x8000], prg_base + (prg_size - 0x8000), 0x8000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(multigam_state::mmc1_rom_switch_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(multigam_state::mmc1_rom_switch_w),state));
state->m_mmc1_reg_write_enable = 1;
state->m_mmc1_rom_mask = (prg_size / 0x4000) - 1;
@@ -880,8 +880,8 @@ static void supergm3_set_bank(running_machine &machine)
state->m_supergm3_chr_bank == 0x40 )
{
// VRAM
- ppu->space(AS_PROGRAM)->install_read_bank(0x0000, 0x1fff, "bank1");
- ppu->space(AS_PROGRAM)->install_write_bank(0x0000, 0x1fff, "bank1");
+ ppu->space(AS_PROGRAM).install_read_bank(0x0000, 0x1fff, "bank1");
+ ppu->space(AS_PROGRAM).install_write_bank(0x0000, 0x1fff, "bank1");
state->membank("bank1")->set_base(state->m_vram);
if (state->m_supergm3_chr_bank == 0x40)
@@ -889,15 +889,15 @@ static void supergm3_set_bank(running_machine &machine)
}
else
{
- ppu->space(AS_PROGRAM)->install_read_bank(0x0000, 0x03ff, "bank2");
- ppu->space(AS_PROGRAM)->install_read_bank(0x0400, 0x07ff, "bank3");
- ppu->space(AS_PROGRAM)->install_read_bank(0x0800, 0x0bff, "bank4");
- ppu->space(AS_PROGRAM)->install_read_bank(0x0c00, 0x0fff, "bank5");
- ppu->space(AS_PROGRAM)->install_read_bank(0x1000, 0x13ff, "bank6");
- ppu->space(AS_PROGRAM)->install_read_bank(0x1400, 0x17ff, "bank7");
- ppu->space(AS_PROGRAM)->install_read_bank(0x1800, 0x1bff, "bank8");
- ppu->space(AS_PROGRAM)->install_read_bank(0x1c00, 0x1fff, "bank9");
- ppu->space(AS_PROGRAM)->unmap_write(0x0000, 0x1fff);
+ ppu->space(AS_PROGRAM).install_read_bank(0x0000, 0x03ff, "bank2");
+ ppu->space(AS_PROGRAM).install_read_bank(0x0400, 0x07ff, "bank3");
+ ppu->space(AS_PROGRAM).install_read_bank(0x0800, 0x0bff, "bank4");
+ ppu->space(AS_PROGRAM).install_read_bank(0x0c00, 0x0fff, "bank5");
+ ppu->space(AS_PROGRAM).install_read_bank(0x1000, 0x13ff, "bank6");
+ ppu->space(AS_PROGRAM).install_read_bank(0x1400, 0x17ff, "bank7");
+ ppu->space(AS_PROGRAM).install_read_bank(0x1800, 0x1bff, "bank8");
+ ppu->space(AS_PROGRAM).install_read_bank(0x1c00, 0x1fff, "bank9");
+ ppu->space(AS_PROGRAM).unmap_write(0x0000, 0x1fff);
set_videorom_bank(machine, 0, 8, 0, 8);
}
@@ -1139,7 +1139,7 @@ void multigam_state::machine_reset()
MACHINE_RESET_MEMBER(multigam_state,multigm3)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* reset the ppu */
multigm3_switch_prg_rom(space, 0, 0x01 );
};
@@ -1152,8 +1152,8 @@ void multigam_state::machine_start()
m_nt_page[2] = m_nt_ram + 0x800;
m_nt_page[3] = m_nt_ram + 0xc00;
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(multigam_state::multigam_nt_r),this), write8_delegate(FUNC(multigam_state::multigam_nt_w),this));
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x1fff, "bank1");
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(multigam_state::multigam_nt_r),this), write8_delegate(FUNC(multigam_state::multigam_nt_w),this));
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x1fff, "bank1");
membank("bank1")->set_base(memregion("gfx1")->base());
}
@@ -1165,16 +1165,16 @@ MACHINE_START_MEMBER(multigam_state,multigm3)
m_nt_page[2] = m_nt_ram + 0x800;
m_nt_page[3] = m_nt_ram + 0xc00;
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(multigam_state::multigam_nt_r),this), write8_delegate(FUNC(multigam_state::multigam_nt_w),this));
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(multigam_state::multigam_nt_r),this), write8_delegate(FUNC(multigam_state::multigam_nt_w),this));
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x03ff, "bank2");
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_read_bank(0x0400, 0x07ff, "bank3");
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_read_bank(0x0800, 0x0bff, "bank4");
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_read_bank(0x0c00, 0x0fff, "bank5");
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_read_bank(0x1000, 0x13ff, "bank6");
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_read_bank(0x1400, 0x17ff, "bank7");
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_read_bank(0x1800, 0x1bff, "bank8");
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_read_bank(0x1c00, 0x1fff, "bank9");
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x03ff, "bank2");
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_read_bank(0x0400, 0x07ff, "bank3");
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_read_bank(0x0800, 0x0bff, "bank4");
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_read_bank(0x0c00, 0x0fff, "bank5");
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_read_bank(0x1000, 0x13ff, "bank6");
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_read_bank(0x1400, 0x17ff, "bank7");
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_read_bank(0x1800, 0x1bff, "bank8");
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_read_bank(0x1c00, 0x1fff, "bank9");
set_videorom_bank(machine(), 0, 8, 0, 8);
};
@@ -1187,7 +1187,7 @@ MACHINE_START_MEMBER(multigam_state,supergm3)
m_nt_page[2] = m_nt_ram + 0x800;
m_nt_page[3] = m_nt_ram + 0xc00;
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(multigam_state::multigam_nt_r),this), write8_delegate(FUNC(multigam_state::multigam_nt_w),this));
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(multigam_state::multigam_nt_r),this), write8_delegate(FUNC(multigam_state::multigam_nt_w),this));
m_vram = auto_alloc_array(machine(), UINT8, 0x2000);
m_multigmc_mmc3_6000_ram = auto_alloc_array(machine(), UINT8, 0x2000);
@@ -1361,7 +1361,7 @@ ROM_END
DRIVER_INIT_MEMBER(multigam_state,multigam)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
multigam_switch_prg_rom(space, 0x0, 0x01);
}
@@ -1376,7 +1376,7 @@ static void multigm3_decrypt(UINT8* mem, int memsize, const UINT8* decode_nibble
DRIVER_INIT_MEMBER(multigam_state,multigm3)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
const UINT8 decode[16] = { 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a };
@@ -1390,7 +1390,7 @@ DRIVER_INIT_MEMBER(multigam_state,multigm3)
DRIVER_INIT_MEMBER(multigam_state,multigmt)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8* buf = auto_alloc_array(machine(), UINT8, 0x80000);
UINT8 *rom;
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index 979293985d3..13e0210be99 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -495,7 +495,7 @@ static int transfer_dword( running_machine &machine, UINT32 dest, UINT32 source
{
namcona1_state *state = machine.driver_data<namcona1_state>();
UINT16 data;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if( source>=0x400000 && source<0xc00000 )
{
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 1db2947c2cd..37e31264a63 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -879,12 +879,12 @@ static void namcos11_init_common(running_machine &machine, int n_daughterboard)
if (C76_SPEEDUP)
{
state->save_item( NAME(state->m_su_83) );
- machine.device("c76")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x82, 0x83, read16_delegate(FUNC(namcos11_state::c76_speedup_r),state), write16_delegate(FUNC(namcos11_state::c76_speedup_w),state));
+ machine.device("c76")->memory().space(AS_PROGRAM).install_readwrite_handler(0x82, 0x83, read16_delegate(FUNC(namcos11_state::c76_speedup_r),state), write16_delegate(FUNC(namcos11_state::c76_speedup_w),state));
}
if (!n_daughterboard)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x1fa10020, 0x1fa1002f);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x1fa10020, 0x1fa1002f);
return;
}
@@ -893,14 +893,14 @@ static void namcos11_init_common(running_machine &machine, int n_daughterboard)
UINT32 len = machine.root_device().memregion( "user2" )->bytes();
UINT8 *rgn = machine.root_device().memregion( "user2" )->base();
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x1f000000, 0x1f0fffff, "bank1" );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x1f100000, 0x1f1fffff, "bank2" );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x1f200000, 0x1f2fffff, "bank3" );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x1f300000, 0x1f3fffff, "bank4" );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x1f400000, 0x1f4fffff, "bank5" );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x1f500000, 0x1f5fffff, "bank6" );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x1f600000, 0x1f6fffff, "bank7" );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x1f700000, 0x1f7fffff, "bank8" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x1f000000, 0x1f0fffff, "bank1" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x1f100000, 0x1f1fffff, "bank2" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x1f200000, 0x1f2fffff, "bank3" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x1f300000, 0x1f3fffff, "bank4" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x1f400000, 0x1f4fffff, "bank5" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x1f500000, 0x1f5fffff, "bank6" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x1f600000, 0x1f6fffff, "bank7" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x1f700000, 0x1f7fffff, "bank8" );
for (bank = 0; bank < 8; bank++)
{
@@ -910,14 +910,14 @@ static void namcos11_init_common(running_machine &machine, int n_daughterboard)
if (n_daughterboard == 32)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x1fa10020, 0x1fa1002f, write32_delegate(FUNC(namcos11_state::bankswitch_rom32_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x1fa10020, 0x1fa1002f, write32_delegate(FUNC(namcos11_state::bankswitch_rom32_w),state));
}
if (n_daughterboard == 64)
{
state->m_n_bankoffset = 0;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x1f080000, 0x1f080003, write32_delegate(FUNC(namcos11_state::bankswitch_rom64_upper_w),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_read(0x1fa10020, 0x1fa1002f);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x1fa10020, 0x1fa1002f, write32_delegate(FUNC(namcos11_state::bankswitch_rom64_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x1f080000, 0x1f080003, write32_delegate(FUNC(namcos11_state::bankswitch_rom64_upper_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).nop_read(0x1fa10020, 0x1fa1002f);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x1fa10020, 0x1fa1002f, write32_delegate(FUNC(namcos11_state::bankswitch_rom64_w),state));
state->save_item( NAME(state->m_n_bankoffset) );
}
}
@@ -929,68 +929,68 @@ DRIVER_INIT_MEMBER(namcos11_state,tekken)
DRIVER_INIT_MEMBER(namcos11_state,tekken2)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c406_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c406_r),this));
namcos11_init_common(machine(), 32);
}
DRIVER_INIT_MEMBER(namcos11_state,souledge)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c409_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c409_r),this));
namcos11_init_common(machine(), 32);
}
DRIVER_INIT_MEMBER(namcos11_state,dunkmnia)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c410_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c410_r),this));
namcos11_init_common(machine(), 32);
}
DRIVER_INIT_MEMBER(namcos11_state,primglex)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c411_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c411_r),this));
namcos11_init_common(machine(), 32);
}
DRIVER_INIT_MEMBER(namcos11_state,xevi3dg)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c430_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c430_r),this));
namcos11_init_common(machine(), 32);
}
DRIVER_INIT_MEMBER(namcos11_state,danceyes)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c431_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c431_r),this));
namcos11_init_common(machine(), 32);
}
DRIVER_INIT_MEMBER(namcos11_state,pocketrc)
{
- machine().device("c76")->memory().space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC0_L, read8_delegate(FUNC(namcos11_state::pocketrc_steer_r),this));
- machine().device("c76")->memory().space(AS_IO)->install_read_handler(M37710_ADC1_L, M37710_ADC1_L, read8_delegate(FUNC(namcos11_state::pocketrc_gas_r),this));
+ machine().device("c76")->memory().space(AS_IO).install_read_handler(M37710_ADC0_L, M37710_ADC0_L, read8_delegate(FUNC(namcos11_state::pocketrc_steer_r),this));
+ machine().device("c76")->memory().space(AS_IO).install_read_handler(M37710_ADC1_L, M37710_ADC1_L, read8_delegate(FUNC(namcos11_state::pocketrc_gas_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c432_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c432_r),this));
namcos11_init_common(machine(), 32);
}
DRIVER_INIT_MEMBER(namcos11_state,starswep)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c442_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c442_r),this));
namcos11_init_common(machine(), 0);
}
DRIVER_INIT_MEMBER(namcos11_state,myangel3)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c443_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c443_r),this));
namcos11_init_common(machine(), 64);
}
DRIVER_INIT_MEMBER(namcos11_state,ptblank2ua)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c443_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler( 0x1fa20000, 0x1fa2ffff, read32_delegate(FUNC(namcos11_state::keycus_c443_r),this));
namcos11_init_common(machine(), 64);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x1f788000, 0x1f788003, write32_delegate(FUNC(namcos11_state::lightgun_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler (0x1f780000, 0x1f78000f, read32_delegate(FUNC(namcos11_state::lightgun_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x1f788000, 0x1f788003, write32_delegate(FUNC(namcos11_state::lightgun_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler (0x1f780000, 0x1f78000f, read32_delegate(FUNC(namcos11_state::lightgun_r),this));
}
MACHINE_RESET_MEMBER(namcos11_state,namcos11)
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index 6b7a17185a6..6da25ba7219 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1318,8 +1318,8 @@ READ32_MEMBER(namcos12_state::system11gun_r)
static void system11gun_install( running_machine &machine )
{
namcos12_state *state = machine.driver_data<namcos12_state>();
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x1f788000, 0x1f788003, write32_delegate(FUNC(namcos12_state::system11gun_w),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler (0x1f780000, 0x1f78000f, read32_delegate(FUNC(namcos12_state::system11gun_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x1f788000, 0x1f788003, write32_delegate(FUNC(namcos12_state::system11gun_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler (0x1f780000, 0x1f78000f, read32_delegate(FUNC(namcos12_state::system11gun_r),state));
}
WRITE32_MEMBER(namcos12_state::kcoff_w)
@@ -1386,7 +1386,7 @@ READ32_MEMBER(namcos12_state::tektagt_protection_3_r)
MACHINE_RESET_MEMBER(namcos12_state,namcos12)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
bankoffset_w(space,0,0,0xffffffff);
space.install_write_handler(0x1f801000, 0x1f801003, write32_delegate(FUNC(namcos12_state::s12_dma_bias_w),this));
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index 89f4f0788ed..0362c6df8d0 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -5444,7 +5444,7 @@ static void install_c74_speedup(running_machine &machine)
{
namcos22_state *state = machine.driver_data<namcos22_state>();
if (MCU_SPEEDUP)
- state->m_mcu->space(AS_PROGRAM)->install_readwrite_handler(0x80, 0x81, read16_delegate(FUNC(namcos22_state::mcuc74_speedup_r),state), write16_delegate(FUNC(namcos22_state::mcu_speedup_w),state));
+ state->m_mcu->space(AS_PROGRAM).install_readwrite_handler(0x80, 0x81, read16_delegate(FUNC(namcos22_state::mcuc74_speedup_r),state), write16_delegate(FUNC(namcos22_state::mcu_speedup_w),state));
}
static void install_130_speedup(running_machine &machine)
@@ -5452,7 +5452,7 @@ static void install_130_speedup(running_machine &machine)
namcos22_state *state = machine.driver_data<namcos22_state>();
// install speedup cheat for 1.30 MCU BIOS
if (MCU_SPEEDUP)
- state->m_mcu->space(AS_PROGRAM)->install_readwrite_handler(0x82, 0x83, read16_delegate(FUNC(namcos22_state::mcu130_speedup_r),state), write16_delegate(FUNC(namcos22_state::mcu_speedup_w),state));
+ state->m_mcu->space(AS_PROGRAM).install_readwrite_handler(0x82, 0x83, read16_delegate(FUNC(namcos22_state::mcu130_speedup_r),state), write16_delegate(FUNC(namcos22_state::mcu_speedup_w),state));
}
static void install_141_speedup(running_machine &machine)
@@ -5460,7 +5460,7 @@ static void install_141_speedup(running_machine &machine)
namcos22_state *state = machine.driver_data<namcos22_state>();
// install speedup cheat for 1.41 MCU BIOS
if (MCU_SPEEDUP)
- state->m_mcu->space(AS_PROGRAM)->install_readwrite_handler(0x82, 0x83, read16_delegate(FUNC(namcos22_state::mcu141_speedup_r),state), write16_delegate(FUNC(namcos22_state::mcu_speedup_w),state));
+ state->m_mcu->space(AS_PROGRAM).install_readwrite_handler(0x82, 0x83, read16_delegate(FUNC(namcos22_state::mcu141_speedup_r),state), write16_delegate(FUNC(namcos22_state::mcu_speedup_w),state));
}
static void namcos22_init( running_machine &machine, int game_type )
@@ -5483,8 +5483,8 @@ static void alpine_init_common( running_machine &machine, int game_type )
namcos22_state *state = machine.driver_data<namcos22_state>();
namcos22_init(machine, game_type);
- state->m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::alpineracer_mcu_adc_r),state));
- state->m_mcu->space(AS_IO)->install_write_handler(M37710_PORT5, M37710_PORT5, write8_delegate(FUNC(namcos22_state::alpine_mcu_port5_w),state));
+ state->m_mcu->space(AS_IO).install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::alpineracer_mcu_adc_r),state));
+ state->m_mcu->space(AS_IO).install_write_handler(M37710_PORT5, M37710_PORT5, write8_delegate(FUNC(namcos22_state::alpine_mcu_port5_w),state));
state->m_motor_timer = machine.scheduler().timer_alloc(FUNC(alpine_steplock_callback));
state->m_motor_timer->reset();
@@ -5513,8 +5513,8 @@ DRIVER_INIT_MEMBER(namcos22_state,alpinesa)
{
alpine_init_common(machine(), NAMCOS22_ALPINE_SURFER);
- m_maincpu->space(AS_PROGRAM)->install_read_handler (0x200000, 0x200003, read32_delegate(FUNC(namcos22_state::alpinesa_prot_r),this));
- m_maincpu->space(AS_PROGRAM)->install_write_handler(0x300000, 0x300003, write32_delegate(FUNC(namcos22_state::alpinesa_prot_w),this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler (0x200000, 0x200003, read32_delegate(FUNC(namcos22_state::alpinesa_prot_r),this));
+ m_maincpu->space(AS_PROGRAM).install_write_handler(0x300000, 0x300003, write32_delegate(FUNC(namcos22_state::alpinesa_prot_w),this));
install_141_speedup(machine());
m_keycus_id = 0x01a9;
@@ -5525,7 +5525,7 @@ DRIVER_INIT_MEMBER(namcos22_state,airco22)
namcos22_init(machine(), NAMCOS22_AIR_COMBAT22);
// S22-BIOS ver1.20 namco all rights reserved 94/12/21
- m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::airco22_mcu_adc_r),this));
+ m_mcu->space(AS_IO).install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::airco22_mcu_adc_r),this));
}
DRIVER_INIT_MEMBER(namcos22_state,propcycl)
@@ -5548,8 +5548,8 @@ DRIVER_INIT_MEMBER(namcos22_state,propcycl)
// pROM[0x22296/4] |= 0x00004e75;
namcos22_init(machine(), NAMCOS22_PROP_CYCLE);
- m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::propcycle_mcu_adc_r),this));
- m_mcu->space(AS_IO)->install_write_handler(M37710_PORT5, M37710_PORT5, write8_delegate(FUNC(namcos22_state::propcycle_mcu_port5_w),this));
+ m_mcu->space(AS_IO).install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::propcycle_mcu_adc_r),this));
+ m_mcu->space(AS_IO).install_write_handler(M37710_PORT5, M37710_PORT5, write8_delegate(FUNC(namcos22_state::propcycle_mcu_port5_w),this));
install_141_speedup(machine());
}
@@ -5609,7 +5609,7 @@ DRIVER_INIT_MEMBER(namcos22_state,cybrcyc)
{
namcos22_init(machine(), NAMCOS22_CYBER_CYCLES);
- m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::cybrcycc_mcu_adc_r),this));
+ m_mcu->space(AS_IO).install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::cybrcycc_mcu_adc_r),this));
install_130_speedup(machine());
m_keycus_id = 0x0387;
@@ -5626,7 +5626,7 @@ DRIVER_INIT_MEMBER(namcos22_state,tokyowar)
{
namcos22_init(machine(), NAMCOS22_TOKYO_WARS);
- m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::tokyowar_mcu_adc_r),this));
+ m_mcu->space(AS_IO).install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::tokyowar_mcu_adc_r),this));
install_141_speedup(machine());
m_keycus_id = 0x01a8;
@@ -5635,7 +5635,7 @@ DRIVER_INIT_MEMBER(namcos22_state,tokyowar)
DRIVER_INIT_MEMBER(namcos22_state,aquajet)
{
namcos22_init(machine(), NAMCOS22_AQUA_JET);
- m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::aquajet_mcu_adc_r),this));
+ m_mcu->space(AS_IO).install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::aquajet_mcu_adc_r),this));
install_141_speedup(machine());
}
@@ -5643,7 +5643,7 @@ DRIVER_INIT_MEMBER(namcos22_state,dirtdash)
{
namcos22_init(machine(), NAMCOS22_DIRT_DASH);
- m_mcu->space(AS_IO)->install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::cybrcycc_mcu_adc_r),this));
+ m_mcu->space(AS_IO).install_read_handler(M37710_ADC0_L, M37710_ADC7_H, read8_delegate(FUNC(namcos22_state::cybrcycc_mcu_adc_r),this));
install_141_speedup(machine());
m_keycus_id = 0x01a2;
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index 3832af295c6..dd512306ce3 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -832,10 +832,10 @@ ROM_END
DRIVER_INIT_MEMBER(naughtyb_state,popflame)
{
/* install a handler to catch protection checks */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x9000, 0x9000, read8_delegate(FUNC(naughtyb_state::popflame_protection_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x9090, 0x9090, read8_delegate(FUNC(naughtyb_state::popflame_protection_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x9000, 0x9000, read8_delegate(FUNC(naughtyb_state::popflame_protection_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x9090, 0x9090, read8_delegate(FUNC(naughtyb_state::popflame_protection_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb000, 0xb0ff, write8_delegate(FUNC(naughtyb_state::popflame_protection_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xb000, 0xb0ff, write8_delegate(FUNC(naughtyb_state::popflame_protection_w),this));
}
@@ -863,7 +863,7 @@ WRITE8_MEMBER(naughtyb_state::trvmstr_questions_w)
DRIVER_INIT_MEMBER(naughtyb_state,trvmstr)
{
/* install questions' handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xc000, 0xc002, read8_delegate(FUNC(naughtyb_state::trvmstr_questions_r),this), write8_delegate(FUNC(naughtyb_state::trvmstr_questions_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xc000, 0xc002, read8_delegate(FUNC(naughtyb_state::trvmstr_questions_r),this), write8_delegate(FUNC(naughtyb_state::trvmstr_questions_w),this));
}
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 062815a5dfa..ee651742a67 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -636,7 +636,7 @@ static Z80CTC_INTERFACE( ctc_intf_audio )
void nbmj9195_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
// initialize TMPZ84C011 PIO
@@ -649,7 +649,7 @@ void nbmj9195_state::machine_reset()
DRIVER_INIT_MEMBER(nbmj9195_state,nbmj9195)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *ROM = memregion("audiocpu")->base();
// sound program patch
diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c
index d7b011bd7fd..92cefd2f0c5 100644
--- a/src/mame/drivers/neodrvr.c
+++ b/src/mame/drivers/neodrvr.c
@@ -9724,7 +9724,7 @@ DRIVER_INIT_MEMBER(neogeo_state,kf2k3pcb)
neo_pcm2_swap(machine(), 5);
m_fixed_layer_bank_type = 2;
install_pvc_protection(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xc00000, 0xc7ffff, "bios" ); // 512k bios
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xc00000, 0xc7ffff, "bios" ); // 512k bios
}
DRIVER_INIT_MEMBER(neogeo_state,kof2003)
@@ -9796,18 +9796,18 @@ DRIVER_INIT_MEMBER(neogeo_state,jockeygp)
kof2000_neogeo_gfx_decrypt(machine(), 0xac);
/* install some extra RAM */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0x200000, 0x201fff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_ram(0x200000, 0x201fff);
-// machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x280000, 0x280001, "IN5");
-// machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x2c0000, 0x2c0001, "IN6");
+// machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x280000, 0x280001, "IN5");
+// machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x2c0000, 0x2c0001, "IN6");
}
DRIVER_INIT_MEMBER(neogeo_state,vliner)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0x200000, 0x201fff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_ram(0x200000, 0x201fff);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x280000, 0x280001, "IN5");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x2c0000, 0x2c0001, "IN6");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x280000, 0x280001, "IN5");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x2c0000, 0x2c0001, "IN6");
DRIVER_INIT_CALL(neogeo);
}
@@ -9815,7 +9815,7 @@ DRIVER_INIT_MEMBER(neogeo_state,vliner)
DRIVER_INIT_MEMBER(neogeo_state,kog)
{
/* overlay cartridge ROM */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x0ffffe, 0x0fffff, "JUMPER");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x0ffffe, 0x0fffff, "JUMPER");
kog_px_decrypt(machine());
neogeo_bootleg_sx_decrypt(machine(), 1);
@@ -9875,8 +9875,8 @@ DRIVER_INIT_MEMBER(neogeo_state,sbp)
// there are also writes to 0x1080..
//
// other stuff going on as well tho, the main overlay is still missing, and p1 inputs don't work
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x00200, 0x001fff, FUNC(sbp_lowerrom_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x00200, 0x001fff, FUNC(sbp_lowerrom_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x00200, 0x001fff, FUNC(sbp_lowerrom_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x00200, 0x001fff, FUNC(sbp_lowerrom_w));
/* the game code clears the text overlay used ingame immediately after writing it.. why? protection? sloppy code that the hw ignores? imperfect emulation? */
{
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index c72a9963ec6..980ab32a1a4 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -685,7 +685,7 @@ WRITE16_MEMBER(neogeo_state::main_cpu_bank_select_w)
static void main_cpu_banking_init( running_machine &machine )
{
- address_space &mainspace = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &mainspace = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* create vector banks */
machine.root_device().membank(NEOGEO_BANK_VECTORS)->configure_entry(0, machine.root_device().memregion("mainbios")->base());
@@ -826,7 +826,7 @@ static void audio_cpu_banking_init( running_machine &machine )
set_audio_cpu_banking(machine);
state->m_audio_cpu_rom_source_last = 0;
- set_audio_cpu_rom_source(*machine.device("maincpu")->memory().space(AS_PROGRAM), 0);
+ set_audio_cpu_rom_source(machine.device("maincpu")->memory().space(AS_PROGRAM), 0);
}
@@ -982,7 +982,7 @@ static void neogeo_postload(running_machine &machine)
_set_main_cpu_bank_address(machine);
_set_main_cpu_vector_table_source(machine);
set_audio_cpu_banking(machine);
- _set_audio_cpu_rom_source(*machine.device("maincpu")->memory().space(AS_PROGRAM));
+ _set_audio_cpu_rom_source(machine.device("maincpu")->memory().space(AS_PROGRAM));
set_outputs(machine);
}
@@ -1050,7 +1050,7 @@ void neogeo_state::machine_start()
void neogeo_state::machine_reset()
{
offs_t offs;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* reset system control registers */
for (offs = 0; offs < 8; offs++)
@@ -1336,7 +1336,7 @@ DEVICE_IMAGE_LOAD( neo_cartridge )
}
// setup cartridge ROM area
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x000080,0x0fffff,"cart_rom");
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x000080,0x0fffff,"cart_rom");
image.device().machine().root_device().membank("cart_rom")->set_base(&image.device().machine().root_device().memregion("maincpu")->base()[0x80]);
// handle possible protection
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index d4e8e591c0f..69c5872128a 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -1469,7 +1469,7 @@ DRIVER_INIT_MEMBER(ninjakd2_state,ninjakd2)
DRIVER_INIT_MEMBER(ninjakd2_state,bootleg)
{
- address_space &space = *machine().device("soundcpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("soundcpu")->memory().space(AS_PROGRAM);
space.set_decrypted_region(0x0000, 0x7fff, machine().root_device().memregion("soundcpu")->base() + 0x10000);
gfx_unscramble(machine());
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index 819d57e3cd1..594fb713dba 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -245,7 +245,7 @@ static Z80CTC_INTERFACE( ctc_intf )
void niyanpai_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
// initialize TMPZ84C011 PIO
@@ -308,7 +308,7 @@ READ16_MEMBER(niyanpai_state::musobana_inputport_0_r)
CUSTOM_INPUT_MEMBER(niyanpai_state::musobana_outcoin_flag_r)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
// tmp68301_parallel_interface[0x05]
// bit 0 coin counter
// bit 2 motor on
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 7d815c6ecf0..62ffb49071d 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -4573,8 +4573,8 @@ DRIVER_INIT_MEMBER(nmk16_state,bjtwin)
READ16_MEMBER(nmk16_state::vandykeb_r){ return 0x0000; }
DRIVER_INIT_MEMBER(nmk16_state,vandykeb)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x08000e, 0x08000f, read16_delegate(FUNC(nmk16_state::vandykeb_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x08001e, 0x08001f);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x08000e, 0x08000f, read16_delegate(FUNC(nmk16_state::vandykeb_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x08001e, 0x08001f);
}
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index 89c6dc7582a..a8dc2f6d7a4 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -228,7 +228,7 @@ WRITE8_MEMBER(nyny_state::pia_2_port_b_w)
m_star_enable = data & 0x10;
/* bits 5-7 go to the music board connector */
- audio_2_command_w(*m_maincpu->space(AS_PROGRAM), 0, data & 0xe0);
+ audio_2_command_w(m_maincpu->space(AS_PROGRAM), 0, data & 0xe0);
}
diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c
index 511f8c86d98..58d7fb109af 100644
--- a/src/mame/drivers/offtwall.c
+++ b/src/mame/drivers/offtwall.c
@@ -490,9 +490,9 @@ DRIVER_INIT_MEMBER(offtwall_state,offtwall)
atarijsa_init(machine(), "260010", 0x0040);
/* install son-of-slapstic workarounds */
- m_spritecache_count = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x3fde42, 0x3fde43, read16_delegate(FUNC(offtwall_state::spritecache_count_r),this));
- m_bankswitch_base = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x037ec2, 0x037f39, read16_delegate(FUNC(offtwall_state::bankswitch_r),this));
- m_unknown_verify_base = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x3fdf1e, 0x3fdf1f, read16_delegate(FUNC(offtwall_state::unknown_verify_r),this));
+ m_spritecache_count = machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x3fde42, 0x3fde43, read16_delegate(FUNC(offtwall_state::spritecache_count_r),this));
+ m_bankswitch_base = machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x037ec2, 0x037f39, read16_delegate(FUNC(offtwall_state::bankswitch_r),this));
+ m_unknown_verify_base = machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x3fdf1e, 0x3fdf1f, read16_delegate(FUNC(offtwall_state::unknown_verify_r),this));
}
@@ -502,9 +502,9 @@ DRIVER_INIT_MEMBER(offtwall_state,offtwalc)
atarijsa_init(machine(), "260010", 0x0040);
/* install son-of-slapstic workarounds */
- m_spritecache_count = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x3fde42, 0x3fde43, read16_delegate(FUNC(offtwall_state::spritecache_count_r),this));
- m_bankswitch_base = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x037eca, 0x037f43, read16_delegate(FUNC(offtwall_state::bankswitch_r),this));
- m_unknown_verify_base = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x3fdf24, 0x3fdf25, read16_delegate(FUNC(offtwall_state::unknown_verify_r),this));
+ m_spritecache_count = machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x3fde42, 0x3fde43, read16_delegate(FUNC(offtwall_state::spritecache_count_r),this));
+ m_bankswitch_base = machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x037eca, 0x037f43, read16_delegate(FUNC(offtwall_state::bankswitch_r),this));
+ m_unknown_verify_base = machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x3fdf24, 0x3fdf25, read16_delegate(FUNC(offtwall_state::unknown_verify_r),this));
}
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index e9a629cd72a..3c043895bc9 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -246,7 +246,7 @@ public:
void omegrace_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* Omega Race expects the vector processor to be ready. */
avgdvg_reset_w(space, 0, 0);
}
diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c
index 950438d7c32..6b84fc649ce 100644
--- a/src/mame/drivers/pachifev.c
+++ b/src/mame/drivers/pachifev.c
@@ -326,10 +326,10 @@ INTERRUPT_GEN_MEMBER(pachifev_state::pachifev_vblank_irq)
/* I wish I had found a better way to handle cocktail inputs, but I can't find a way to access internal RAM */
/* (bit 5 of 0xf0aa : 0 = player 1 and 1 = player 2 - bit 6 of 0xf0aa : 0 = upright and 1 = cocktail). */
/* All I found is that in main RAM, 0xe00f.b determines the player : 0x00 = player 1 and 0x01 = player 2. */
- address_space *ramspace = device.memory().space(AS_PROGRAM);
+ address_space &ramspace = device.memory().space(AS_PROGRAM);
UINT8 player = 0;
- if ((ramspace->read_byte(0xe00f) == 0x01) && ((ioport("DSW1")->read() & 0x08) == 0x00))
+ if ((ramspace.read_byte(0xe00f) == 0x01) && ((ioport("DSW1")->read() & 0x08) == 0x00))
player = 1;
int current_power=ioport(inname[player])->read() & 0x3f;
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index 62098382f76..448589c517b 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -388,7 +388,7 @@ MACHINE_RESET_MEMBER(pacman_state,mschamp)
MACHINE_RESET_MEMBER(pacman_state,superabc)
{
- superabc_bank_w(*m_maincpu->space(AS_PROGRAM), 0, 0);
+ superabc_bank_w(m_maincpu->space(AS_PROGRAM), 0, 0);
}
@@ -5742,7 +5742,7 @@ ROM_END
static void maketrax_rom_decode(running_machine &machine)
{
pacman_state *state = machine.driver_data<pacman_state>();
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x4000);
UINT8 *rom = machine.root_device().memregion("maincpu")->base();
@@ -5766,8 +5766,8 @@ static void maketrax_rom_decode(running_machine &machine)
DRIVER_INIT_MEMBER(pacman_state,maketrax)
{
/* set up protection handlers */
- m_maincpu->space(AS_PROGRAM)->install_read_handler(0x5080, 0x50bf, read8_delegate(FUNC(pacman_state::maketrax_special_port2_r),this));
- m_maincpu->space(AS_PROGRAM)->install_read_handler(0x50c0, 0x50ff, read8_delegate(FUNC(pacman_state::maketrax_special_port3_r),this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x5080, 0x50bf, read8_delegate(FUNC(pacman_state::maketrax_special_port2_r),this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x50c0, 0x50ff, read8_delegate(FUNC(pacman_state::maketrax_special_port3_r),this));
maketrax_rom_decode(machine());
}
@@ -5775,7 +5775,7 @@ DRIVER_INIT_MEMBER(pacman_state,maketrax)
static void korosuke_rom_decode(running_machine &machine)
{
pacman_state *state = machine.driver_data<pacman_state>();
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x4000);
UINT8 *rom = machine.root_device().memregion("maincpu")->base();
@@ -5799,8 +5799,8 @@ static void korosuke_rom_decode(running_machine &machine)
DRIVER_INIT_MEMBER(pacman_state,korosuke)
{
/* set up protection handlers */
- m_maincpu->space(AS_PROGRAM)->install_read_handler(0x5080, 0x5080, read8_delegate(FUNC(pacman_state::korosuke_special_port2_r),this));
- m_maincpu->space(AS_PROGRAM)->install_read_handler(0x50c0, 0x50ff, read8_delegate(FUNC(pacman_state::korosuke_special_port3_r),this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x5080, 0x5080, read8_delegate(FUNC(pacman_state::korosuke_special_port2_r),this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x50c0, 0x50ff, read8_delegate(FUNC(pacman_state::korosuke_special_port3_r),this));
korosuke_rom_decode(machine());
}
@@ -6102,7 +6102,7 @@ READ8_MEMBER(pacman_state::mspacii_protection_r)
DRIVER_INIT_MEMBER(pacman_state,mspacii)
{
// protection
- m_maincpu->space(AS_PROGRAM)->install_read_handler(0x504d, 0x506f, read8_delegate(FUNC(pacman_state::mspacii_protection_r), this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x504d, 0x506f, read8_delegate(FUNC(pacman_state::mspacii_protection_r), this));
}
DRIVER_INIT_MEMBER(pacman_state,superabc)
@@ -6163,10 +6163,10 @@ DRIVER_INIT_MEMBER(pacman_state,cannonbp)
{
/* extra memory */
- m_maincpu->space(AS_PROGRAM)->install_ram(0x4800, 0x4bff);
+ m_maincpu->space(AS_PROGRAM).install_ram(0x4800, 0x4bff);
/* protection? */
- m_maincpu->space(AS_PROGRAM)->install_read_handler(0x3000, 0x3fff, read8_delegate(FUNC(pacman_state::cannonbp_protection_r),this));
+ m_maincpu->space(AS_PROGRAM).install_read_handler(0x3000, 0x3fff, read8_delegate(FUNC(pacman_state::cannonbp_protection_r),this));
}
diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c
index a3c1a6087b3..9ffe986dc93 100644
--- a/src/mame/drivers/pangofun.c
+++ b/src/mame/drivers/pangofun.c
@@ -244,7 +244,7 @@ ROM_END
DRIVER_INIT_MEMBER(pangofun_state,pangofun)
{
pc_vga_init(machine(), vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
}
GAME( 1995, pangofun, 0, pangofun, pangofun, pangofun_state, pangofun, ROT0, "InfoCube", "Pango Fun (Italy)", GAME_NOT_WORKING|GAME_NO_SOUND )
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index f5547771a85..dfbd413ba0c 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -1259,14 +1259,14 @@ DRIVER_INIT_MEMBER(paradise_state,paradise)
DRIVER_INIT_MEMBER(paradise_state,tgtball)
{
m_sprite_inc = 4;
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x2001, 0x2001, write8_delegate(FUNC(paradise_state::tgtball_flipscreen_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x2001, 0x2001, write8_delegate(FUNC(paradise_state::tgtball_flipscreen_w),this));
}
DRIVER_INIT_MEMBER(paradise_state,torus)
{
m_sprite_inc = 4;
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x2070, 0x2070, write8_delegate(FUNC(paradise_state::torus_coin_counter_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x2070, 0x2070, write8_delegate(FUNC(paradise_state::torus_coin_counter_w),this));
}
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index 7180e50e07e..07791f07d30 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -481,7 +481,7 @@ READ16_MEMBER(pasha2_state::pasha2_speedup_r)
DRIVER_INIT_MEMBER(pasha2_state,pasha2)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x95744, 0x95747, read16_delegate(FUNC(pasha2_state::pasha2_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x95744, 0x95747, read16_delegate(FUNC(pasha2_state::pasha2_speedup_r), this));
membank("bank1")->set_base(memregion("user2")->base());
}
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index 09bd3f39d99..9b8aec8117f 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -487,7 +487,7 @@ DRIVER_INIT_MEMBER(pbaction_state,pbactio3)
pbaction_decode(machine(), "maincpu");
/* install a protection (?) workaround */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc000, 0xc000, read8_delegate(FUNC(pbaction_state::pbactio3_prot_kludge_r),this) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc000, 0xc000, read8_delegate(FUNC(pbaction_state::pbactio3_prot_kludge_r),this) );
}
DRIVER_INIT_MEMBER(pbaction_state,pbactio4)
diff --git a/src/mame/drivers/pcat_dyn.c b/src/mame/drivers/pcat_dyn.c
index b479557c2ee..d49afd76d74 100644
--- a/src/mame/drivers/pcat_dyn.c
+++ b/src/mame/drivers/pcat_dyn.c
@@ -197,7 +197,7 @@ ROM_END
DRIVER_INIT_MEMBER(pcat_dyn_state,pcat_dyn)
{
pc_vga_init(machine(), vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
}
GAME( 1995, toursol, 0, pcat_dyn, pcat_dyn, pcat_dyn_state, pcat_dyn, ROT0, "Dynamo", "Tournament Solitaire (V1.06, 08/03/95)", GAME_NOT_WORKING|GAME_NO_SOUND )
diff --git a/src/mame/drivers/pcat_nit.c b/src/mame/drivers/pcat_nit.c
index 6b344caf77f..b7d86696d7e 100644
--- a/src/mame/drivers/pcat_nit.c
+++ b/src/mame/drivers/pcat_nit.c
@@ -427,7 +427,7 @@ DRIVER_INIT_MEMBER(pcat_nit_state,pcat_nit)
machine().device<nvram_device>("nvram")->set_base(m_banked_nvram, 0x2000);
pc_vga_init(machine(), vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
}
GAME( 1993, bonanza, 0, pcat_nit, pcat_nit, pcat_nit_state, pcat_nit, ROT0, "New Image Technologies", "Bonanza (Revision 3)", GAME_NOT_WORKING|GAME_NO_SOUND )
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index 5e9c5de8361..150f1084c9d 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -411,7 +411,7 @@ ROM_END
DRIVER_INIT_MEMBER(pcktgal_state,deco222)
{
int A;
- address_space &space = *machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("audiocpu")->memory().space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine(), UINT8, 0x10000);
UINT8 *rom = machine().root_device().memregion("audiocpu")->base();
diff --git a/src/mame/drivers/pengadvb.c b/src/mame/drivers/pengadvb.c
index 93e74617ca0..2663d37a53a 100644
--- a/src/mame/drivers/pengadvb.c
+++ b/src/mame/drivers/pengadvb.c
@@ -67,12 +67,12 @@ static void mem_map_banks(running_machine &machine)
{
case 0:
// BIOS
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x3fff, "bank1" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x3fff, "bank1" );
state->membank("bank1")->set_base(state->memregion("maincpu")->base());
break;
default:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_read(0x0000, 0x3fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_read(0x0000, 0x3fff);
break;
}
@@ -81,22 +81,22 @@ static void mem_map_banks(running_machine &machine)
{
case 0:
// BIOS
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x4000, 0x5fff, "bank21" );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x6000, 0x7fff, "bank22" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x4000, 0x5fff, "bank21" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x6000, 0x7fff, "bank22" );
state->membank("bank21")->set_base(machine.root_device().memregion("maincpu")->base() + 0x4000);
state->membank("bank22")->set_base(machine.root_device().memregion("maincpu")->base() + 0x4000 + 0x2000);
break;
case 1:
// game
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x4000, 0x5fff, "bank21" );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x6000, 0x7fff, "bank22" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x4000, 0x5fff, "bank21" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x6000, 0x7fff, "bank22" );
state->membank("bank21")->set_base(machine.root_device().memregion("game")->base() + state->m_mem_banks[0]*0x2000);
state->membank("bank22")->set_base(machine.root_device().memregion("game")->base() + state->m_mem_banks[1]*0x2000);
break;
default:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_read(0x4000, 0x7fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_read(0x4000, 0x7fff);
break;
}
@@ -105,14 +105,14 @@ static void mem_map_banks(running_machine &machine)
{
case 1:
// game
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x8000, 0x9fff, "bank31" );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xa000, 0xbfff, "bank32" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x8000, 0x9fff, "bank31" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xa000, 0xbfff, "bank32" );
state->membank("bank31")->set_base(machine.root_device().memregion("game")->base() + state->m_mem_banks[2]*0x2000);
state->membank("bank32")->set_base(machine.root_device().memregion("game")->base() + state->m_mem_banks[3]*0x2000);
break;
default:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_read(0x8000, 0xbfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_read(0x8000, 0xbfff);
break;
}
@@ -121,12 +121,12 @@ static void mem_map_banks(running_machine &machine)
{
case 3:
// RAM
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xc000, 0xffff, "bank4" );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xc000, 0xffff, "bank4" );
state->membank("bank4")->set_base(state->m_main_mem);
break;
default:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_read(0xc000, 0xffff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_read(0xc000, 0xffff);
break;
}
}
diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c
index fe130576092..a9582092698 100644
--- a/src/mame/drivers/pengo.c
+++ b/src/mame/drivers/pengo.c
@@ -692,7 +692,7 @@ DRIVER_INIT_MEMBER(pengo_state,penta)
{ 0x88,0x0a,0x82,0x00,0xa0,0x22,0xaa,0x28 }, /* ...1...1...0.... */
{ 0x88,0x0a,0x82,0x00,0xa0,0x22,0xaa,0x28 } /* ...1...1...1.... */
};
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, 0x8000);
UINT8 *rom = machine().root_device().memregion("maincpu")->base();
int A;
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index e7aa6ecac60..6c53bb72659 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -1083,7 +1083,7 @@ ROM_END
DRIVER_INIT_MEMBER(phoenix_state,condor)
{
/* additional inputs for coinage */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0x5000, 0x5000, "DSW1");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0x5000, 0x5000, "DSW1");
}
diff --git a/src/mame/drivers/photoply.c b/src/mame/drivers/photoply.c
index 2ee5ca93f10..adf61d86cbb 100644
--- a/src/mame/drivers/photoply.c
+++ b/src/mame/drivers/photoply.c
@@ -378,7 +378,7 @@ ROM_END
DRIVER_INIT_MEMBER(photoply_state,photoply)
{
pc_vga_init(machine(), vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
}
GAME( 199?, photoply, 0, photoply, photoply, photoply_state, photoply, ROT0, "Funworld", "Photo Play 2000 (v2.01)", GAME_NOT_WORKING|GAME_NO_SOUND )
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index deb1170807a..f02a2e1f425 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -598,18 +598,18 @@ DRIVER_INIT_MEMBER(pingpong_state,cashquiz)
ROM[i] = BITSWAP8(ROM[i],0,1,2,3,4,5,6,7);
/* questions banking handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x4000, 0x4000, write8_delegate(FUNC(pingpong_state::cashquiz_question_bank_high_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x4001, 0x4001, write8_delegate(FUNC(pingpong_state::cashquiz_question_bank_low_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x4000, 0x4000, write8_delegate(FUNC(pingpong_state::cashquiz_question_bank_high_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x4001, 0x4001, write8_delegate(FUNC(pingpong_state::cashquiz_question_bank_low_w),this));
// 8 independents banks for questions
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5000, 0x50ff, "bank1");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5100, 0x51ff, "bank2");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5200, 0x52ff, "bank3");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5300, 0x53ff, "bank4");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5400, 0x54ff, "bank5");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5500, 0x55ff, "bank6");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5600, 0x56ff, "bank7");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5700, 0x57ff, "bank8");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5000, 0x50ff, "bank1");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5100, 0x51ff, "bank2");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5200, 0x52ff, "bank3");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5300, 0x53ff, "bank4");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5400, 0x54ff, "bank5");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5500, 0x55ff, "bank6");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5600, 0x56ff, "bank7");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5700, 0x57ff, "bank8");
// setup default banks
membank("bank1")->set_base(memregion("user1")->base() + 0x100*0 );
diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c
index 7467d8293ff..5576d075097 100644
--- a/src/mame/drivers/pinkiri8.c
+++ b/src/mame/drivers/pinkiri8.c
@@ -453,15 +453,16 @@ WRITE8_MEMBER(pinkiri8_state::pinkiri8_vram_w)
break;
case 3:
-
- address_space *vdp_space = machine().device<janshi_vdp_device>("janshivdp")->space();
+ {
+ address_space &vdp_space = machine().device<janshi_vdp_device>("janshivdp")->space();
if (LOG_VRAM) printf("%02x ", data);
m_prev_writes++;
m_vram_addr++;
- vdp_space->write_byte(m_vram_addr, data);
+ vdp_space.write_byte(m_vram_addr, data);
break;
+ }
}
}
@@ -1250,9 +1251,9 @@ READ8_MEMBER(pinkiri8_state::ronjan_patched_prot_r)
DRIVER_INIT_MEMBER(pinkiri8_state,ronjan)
{
- machine().device("maincpu")->memory().space(AS_IO)->install_readwrite_handler(0x90, 0x90, read8_delegate(FUNC(pinkiri8_state::ronjan_prot_r), this), write8_delegate(FUNC(pinkiri8_state::ronjan_prot_w), this));
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x66, 0x66, read8_delegate(FUNC(pinkiri8_state::ronjan_prot_status_r), this));
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x9f, 0x9f, read8_delegate(FUNC(pinkiri8_state::ronjan_patched_prot_r), this));
+ machine().device("maincpu")->memory().space(AS_IO).install_readwrite_handler(0x90, 0x90, read8_delegate(FUNC(pinkiri8_state::ronjan_prot_r), this), write8_delegate(FUNC(pinkiri8_state::ronjan_prot_w), this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x66, 0x66, read8_delegate(FUNC(pinkiri8_state::ronjan_prot_status_r), this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x9f, 0x9f, read8_delegate(FUNC(pinkiri8_state::ronjan_patched_prot_r), this));
}
GAME( 1992, janshi, 0, pinkiri8, janshi, driver_device, 0, ROT0, "Eagle", "Janshi", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_NOT_WORKING )
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index f226d663107..4e5185950c3 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -877,14 +877,14 @@ DRIVER_INIT_MEMBER(fromance_state,pipedrm)
/* sprite RAM lives at the end of palette RAM */
m_spriteram.set_target(&m_generic_paletteram_8[0xc00], 0x400);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0xcc00, 0xcfff, m_spriteram);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_ram(0xcc00, 0xcfff, m_spriteram);
}
DRIVER_INIT_MEMBER(fromance_state,hatris)
{
- machine().device("maincpu")->memory().space(AS_IO)->install_legacy_write_handler(0x20, 0x20, FUNC(sound_command_nonmi_w));
- machine().device("maincpu")->memory().space(AS_IO)->install_write_handler(0x21, 0x21, write8_delegate(FUNC(fromance_state::fromance_gfxreg_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_legacy_write_handler(0x20, 0x20, FUNC(sound_command_nonmi_w));
+ machine().device("maincpu")->memory().space(AS_IO).install_write_handler(0x21, 0x21, write8_delegate(FUNC(fromance_state::fromance_gfxreg_w),this));
}
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 6b01d19c12d..3f0a62e5ca9 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -459,7 +459,7 @@ DRIVER_INIT_MEMBER(pirates_state,genix)
/* If this value is increased then something has gone wrong and the protection failed */
/* Write-protect it for now */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x109e98, 0x109e9b, read16_delegate(FUNC(pirates_state::genix_prot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x109e98, 0x109e9b, read16_delegate(FUNC(pirates_state::genix_prot_r),this));
}
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 4184fd4c103..e1ff533a5c7 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -738,7 +738,7 @@ DRIVER_INIT_MEMBER(polygonet_state,polygonet)
memset(m_dsp56k_bank04_ram, 0, sizeof(m_dsp56k_bank04_ram));
/* The dsp56k occasionally executes out of mapped memory */
- address_space &space = *machine().device<dsp56k_device>("dsp")->space(AS_PROGRAM);
+ address_space &space = machine().device<dsp56k_device>("dsp")->space(AS_PROGRAM);
m_dsp56k_update_handler = space.set_direct_update_handler(direct_update_delegate(FUNC(polygonet_state::plygonet_dsp56k_direct_handler), this));
/* save states */
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index dab9f6ada59..a7c7e136b19 100644
--- a/src/mame/drivers/pntnpuzl.c
+++ b/src/mame/drivers/pntnpuzl.c
@@ -385,7 +385,7 @@ DRIVER_INIT_MEMBER(pntnpuzl_state,pip)
// rom[0x2696/2] = 0x4e71;
// rom[0x26a0/2] = 0x4e71;
pc_vga_init(machine(), vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0x3a0000, *machine().device("maincpu")->memory().space(AS_PROGRAM), 0x3c0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0x3a0000, machine().device("maincpu")->memory().space(AS_PROGRAM), 0x3c0000);
}
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index f837a950280..6e6ca257a04 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -463,7 +463,7 @@ static TIMER_DEVICE_CALLBACK( polepos_scanline )
MACHINE_RESET_MEMBER(polepos_state,polepos)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
/* Reset all latches */
@@ -1990,15 +1990,15 @@ ROM_END
DRIVER_INIT_MEMBER(polepos_state,topracern)
{
/* extra direct mapped inputs read */
- machine().device("maincpu")->memory().space(AS_IO)->install_read_port(0x02, 0x02, "STEER");
- machine().device("maincpu")->memory().space(AS_IO)->install_read_port(0x03, 0x03, "IN0");
- machine().device("maincpu")->memory().space(AS_IO)->install_read_port(0x04, 0x04, "DSWA");
+ machine().device("maincpu")->memory().space(AS_IO).install_read_port(0x02, 0x02, "STEER");
+ machine().device("maincpu")->memory().space(AS_IO).install_read_port(0x03, 0x03, "IN0");
+ machine().device("maincpu")->memory().space(AS_IO).install_read_port(0x04, 0x04, "DSWA");
}
DRIVER_INIT_MEMBER(polepos_state,polepos2)
{
/* note that the bootleg version doesn't need this custom IC; it has a hacked ROM in its place */
- machine().device("sub")->memory().space(AS_PROGRAM)->install_read_handler(0x4000, 0x5fff, read16_delegate(FUNC(polepos_state::polepos2_ic25_r),this));
+ machine().device("sub")->memory().space(AS_PROGRAM).install_read_handler(0x4000, 0x5fff, read16_delegate(FUNC(polepos_state::polepos2_ic25_r),this));
}
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index 960048866f0..80beed3a905 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -697,26 +697,26 @@ ROM_END
DRIVER_INIT_MEMBER(policetr_state,policetr)
{
- m_speedup_data = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x00000fc8, 0x00000fcb, write32_delegate(FUNC(policetr_state::speedup_w),this));
+ m_speedup_data = machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x00000fc8, 0x00000fcb, write32_delegate(FUNC(policetr_state::speedup_w),this));
m_speedup_pc = 0x1fc028ac;
}
DRIVER_INIT_MEMBER(policetr_state,plctr13b)
{
- m_speedup_data = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x00000fc8, 0x00000fcb, write32_delegate(FUNC(policetr_state::speedup_w),this));
+ m_speedup_data = machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x00000fc8, 0x00000fcb, write32_delegate(FUNC(policetr_state::speedup_w),this));
m_speedup_pc = 0x1fc028bc;
}
DRIVER_INIT_MEMBER(policetr_state,sshooter)
{
- m_speedup_data = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x00018fd8, 0x00018fdb, write32_delegate(FUNC(policetr_state::speedup_w),this));
+ m_speedup_data = machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x00018fd8, 0x00018fdb, write32_delegate(FUNC(policetr_state::speedup_w),this));
m_speedup_pc = 0x1fc03470;
}
DRIVER_INIT_MEMBER(policetr_state,sshoot12)
{
- m_speedup_data = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x00018fd8, 0x00018fdb, write32_delegate(FUNC(policetr_state::speedup_w),this));
+ m_speedup_data = machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x00018fd8, 0x00018fdb, write32_delegate(FUNC(policetr_state::speedup_w),this));
m_speedup_pc = 0x1fc033e0;
}
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index d1098e8d43e..a1c0605e3ba 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -503,7 +503,7 @@ ROM_END
DRIVER_INIT_MEMBER(progolf_state,progolf)
{
int A;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine().root_device().memregion("maincpu")->base();
UINT8* decrypted = auto_alloc_array(machine(), UINT8, 0x10000);
@@ -517,7 +517,7 @@ DRIVER_INIT_MEMBER(progolf_state,progolf)
DRIVER_INIT_MEMBER(progolf_state,progolfa)
{
int A;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine().root_device().memregion("maincpu")->base();
UINT8* decrypted = auto_alloc_array(machine(), UINT8, 0x10000);
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index abdfa4d8543..896b465fc27 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -1813,10 +1813,10 @@ DRIVER_INIT_MEMBER(psikyo_state,sngkace)
}
/* input ports */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::sngkace_input_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::sngkace_input_r),this));
/* sound latch */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::psikyo_soundlatch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::psikyo_soundlatch_w),this));
m_ka302c_banking = 0; // SH201B doesn't have any gfx banking
@@ -1865,13 +1865,13 @@ DRIVER_INIT_MEMBER(psikyo_state,tengai)
{
/* input ports */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::s1945_input_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::s1945_input_r),this));
/* sound latch */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::s1945_soundlatch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::s1945_soundlatch_w),this));
/* protection */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00004, 0xc0000b, write32_delegate(FUNC(psikyo_state::s1945_mcu_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00004, 0xc0000b, write32_delegate(FUNC(psikyo_state::s1945_mcu_w),this));
s1945_mcu_init(machine());
m_s1945_mcu_table = 0;
@@ -1887,10 +1887,10 @@ DRIVER_INIT_MEMBER(psikyo_state,gunbird)
{
/* input ports */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::gunbird_input_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::gunbird_input_r),this));
/* sound latch */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::psikyo_soundlatch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::psikyo_soundlatch_w),this));
m_ka302c_banking = 1;
@@ -1904,13 +1904,13 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945)
{
/* input ports */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::s1945_input_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::s1945_input_r),this));
/* sound latch */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::s1945_soundlatch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::s1945_soundlatch_w),this));
/* protection and tile bank switching */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00004, 0xc0000b, write32_delegate(FUNC(psikyo_state::s1945_mcu_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00004, 0xc0000b, write32_delegate(FUNC(psikyo_state::s1945_mcu_w),this));
s1945_mcu_init(machine());
m_s1945_mcu_table = s1945_table;
@@ -1926,13 +1926,13 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945a)
{
/* input ports */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::s1945_input_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::s1945_input_r),this));
/* sound latch */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::s1945_soundlatch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::s1945_soundlatch_w),this));
/* protection and tile bank switching */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00004, 0xc0000b, write32_delegate(FUNC(psikyo_state::s1945_mcu_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00004, 0xc0000b, write32_delegate(FUNC(psikyo_state::s1945_mcu_w),this));
s1945_mcu_init(machine());
m_s1945_mcu_table = s1945a_table;
@@ -1948,13 +1948,13 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945j)
{
/* input ports*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::s1945_input_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::s1945_input_r),this));
/* sound latch */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::s1945_soundlatch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::s1945_soundlatch_w),this));
/* protection and tile bank switching */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00004, 0xc0000b, write32_delegate(FUNC(psikyo_state::s1945_mcu_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00004, 0xc0000b, write32_delegate(FUNC(psikyo_state::s1945_mcu_w),this));
s1945_mcu_init(machine());
m_s1945_mcu_table = s1945j_table;
@@ -1970,10 +1970,10 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945jn)
{
/* input ports */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::gunbird_input_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::gunbird_input_r),this));
/* sound latch */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::s1945_soundlatch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::s1945_soundlatch_w),this));
m_ka302c_banking = 1;
@@ -1986,10 +1986,10 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945bl)
{
/* input ports */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::gunbird_input_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xc00000, 0xc0000b, read32_delegate(FUNC(psikyo_state::gunbird_input_r),this));
/* sound latch */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::s1945_soundlatch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc00010, 0xc00013, write32_delegate(FUNC(psikyo_state::s1945_soundlatch_w),this));
m_ka302c_banking = 1;
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index 31af67efb87..11bfc32e220 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -960,7 +960,7 @@ static void install_hotgmck_pcm_bank(running_machine &machine)
set_hotgmck_pcm_bank(machine, 0);
set_hotgmck_pcm_bank(machine, 1);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x5800008, 0x580000b, write32_delegate(FUNC(psikyo4_state::hotgmck_pcm_bank_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x5800008, 0x580000b, write32_delegate(FUNC(psikyo4_state::hotgmck_pcm_bank_w),state));
machine.save().register_postload(save_prepost_delegate(FUNC(hotgmck_pcm_bank_postload), &machine));
}
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index 11ff190f2b5..81d71d6f3a0 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -1259,7 +1259,7 @@ DRIVER_INIT_MEMBER(psikyosh_state,mjgtaste)
{
sh2drc_set_options(machine().device("maincpu"), SH2DRC_FASTEST_OPTIONS);
/* needs to install mahjong controls too (can select joystick in test mode tho) */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x03000000, 0x03000003, read32_delegate(FUNC(psikyosh_state::mjgtaste_input_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x03000000, 0x03000003, read32_delegate(FUNC(psikyosh_state::mjgtaste_input_r),this));
}
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index 179eabb689c..0be12f15c5e 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -479,7 +479,7 @@ INTERRUPT_GEN_MEMBER(pturn_state::pturn_main_intgen)
void pturn_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
soundlatch_clear_byte_w(space,0,0);
}
@@ -555,8 +555,8 @@ ROM_END
DRIVER_INIT_MEMBER(pturn_state,pturn)
{
/*
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc0dd, 0xc0dd, FUNC(pturn_protection_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc0db, 0xc0db, FUNC(pturn_protection2_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc0dd, 0xc0dd, FUNC(pturn_protection_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc0db, 0xc0db, FUNC(pturn_protection2_r));
*/
}
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index 8f8c4263347..775dfdf3253 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -1256,8 +1256,8 @@ static int kram3_decrypt(int address, int value)
DRIVER_INIT_MEMBER(qix_state,kram3)
{
- address_space *mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
- address_space *videospace = machine().device("videocpu")->memory().space(AS_PROGRAM);
+ address_space &mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &videospace = machine().device("videocpu")->memory().space(AS_PROGRAM);
//const UINT8 *patch;
UINT8 *rom, *decrypted;
int i;
@@ -1281,7 +1281,7 @@ DRIVER_INIT_MEMBER(qix_state,kram3)
rom = machine().root_device().memregion("maincpu")->base();
decrypted = auto_alloc_array(machine(), UINT8, 0x6000);
- mainspace->set_decrypted_region(0xa000, 0xffff, decrypted);
+ mainspace.set_decrypted_region(0xa000, 0xffff, decrypted);
memcpy(decrypted,&rom[0xa000],0x6000);
for (i = 0xa000; i < 0x10000; ++i)
@@ -1294,7 +1294,7 @@ DRIVER_INIT_MEMBER(qix_state,kram3)
rom = machine().root_device().memregion("videocpu")->base();
decrypted = auto_alloc_array(machine(), UINT8, 0x6000);
- videospace->set_decrypted_region(0xa000, 0xffff, decrypted);
+ videospace.set_decrypted_region(0xa000, 0xffff, decrypted);
memcpy(decrypted,&rom[0xa000],0x6000);
for (i = 0xa000; i < 0x10000; ++i)
diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c
index 8c778de06d7..48f5e8e5a97 100644
--- a/src/mame/drivers/queen.c
+++ b/src/mame/drivers/queen.c
@@ -656,7 +656,7 @@ void queen_state::machine_start()
kbdc8042_init(machine(), &at8042);
pc_vga_init(machine(), ::vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
}
void queen_state::machine_reset()
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index 7883c48e44c..1fc471f30cc 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -417,7 +417,7 @@ static const mc6845_interface mc6845_intf =
WRITE8_MEMBER(r2dtank_state::pia_comp_w)
{
device_t *device = machine().device("pia_main");
- downcast<pia6821_device *>(device)->write(*machine().memory().first_space(), offset, ~data);
+ downcast<pia6821_device *>(device)->write(machine().driver_data()->generic_space(), offset, ~data);
}
diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c
index 8279da2c078..8449d289e03 100644
--- a/src/mame/drivers/r2dx_v33.c
+++ b/src/mame/drivers/r2dx_v33.c
@@ -232,7 +232,7 @@ UINT32 r2dx_v33_state::screen_update_rdx_v33(screen_device &screen, bitmap_ind16
{
static UINT32 src_addr = 0x100000;
static int frame;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
//if(machine().input().code_pressed_once(KEYCODE_A))
// src_addr+=0x800;
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 4abb4263262..1a33d58554f 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -606,7 +606,7 @@ static void common_decrypt(running_machine &machine)
DRIVER_INIT_MEMBER(raiden_state,raidena)
{
#ifdef SYNC_HACK
- machine().device("sub")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4008, 0x4009, FUNC(sub_cpu_spin_r));
+ machine().device("sub")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4008, 0x4009, FUNC(sub_cpu_spin_r));
#endif
}
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index 2ddd6e1a6d1..34db80530e4 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -316,7 +316,7 @@ DRIVER_INIT_MEMBER(renegade_state,kuniokun)
DRIVER_INIT_MEMBER(renegade_state,kuniokunb)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* Remove the MCU handlers */
space.unmap_readwrite(0x3804, 0x3804);
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index 886805f0543..a112f942775 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -194,7 +194,7 @@ logerror("banksw %d\n",bank);
MACHINE_RESET_MEMBER(rmhaihai_state,themj)
{
- themj_rombank_w(*machine().device("maincpu")->memory().space(AS_IO), 0, 0);
+ themj_rombank_w(machine().device("maincpu")->memory().space(AS_IO), 0, 0);
}
diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c
index 919e056c97f..c2774d225d1 100644
--- a/src/mame/drivers/safarir.c
+++ b/src/mame/drivers/safarir.c
@@ -155,7 +155,7 @@ void safarir_state::palette_init()
TILE_GET_INFO_MEMBER(safarir_state::get_bg_tile_info)
{
int color;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 code = ram_r(space,tile_index | 0x400);
if (code & 0x80)
@@ -177,7 +177,7 @@ TILE_GET_INFO_MEMBER(safarir_state::get_bg_tile_info)
TILE_GET_INFO_MEMBER(safarir_state::get_fg_tile_info)
{
int color, flags;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 code = ram_r(space,tile_index);
if (code & 0x80)
diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c
index 2f83c5374a8..a7d78095ce0 100644
--- a/src/mame/drivers/sangho.c
+++ b/src/mame/drivers/sangho.c
@@ -80,20 +80,20 @@ static void pzlestar_map_banks(running_machine &machine)
switch(slot_select)
{
case 0:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x3fff, "bank1");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x0000, 0x3fff, "bank5");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x3fff, "bank1");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x0000, 0x3fff, "bank5");
state->membank("bank1")->set_base(state->m_ram);
state->membank("bank5")->set_base(state->m_ram);
break;
case 2:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x3fff, "bank1");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x0000, 0x3fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x3fff, "bank1");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x0000, 0x3fff);
state->membank("bank1")->set_base(state->memregion("user1")->base()+ 0x10000);
break;
case 1:
case 3:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_read(0x0000, 0x3fff);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x0000, 0x3fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_read(0x0000, 0x3fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x0000, 0x3fff);
break;
}
@@ -102,24 +102,24 @@ static void pzlestar_map_banks(running_machine &machine)
switch(slot_select)
{
case 0:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x4000, 0x7fff, "bank2");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x4000, 0x7fff, "bank6");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x4000, 0x7fff, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x4000, 0x7fff, "bank6");
state->membank("bank2")->set_base(state->m_ram + 0x4000);
state->membank("bank6")->set_base(state->m_ram + 0x4000);
break;
case 2:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x4000, 0x7fff, "bank2");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x4000, 0x7fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x4000, 0x7fff, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x4000, 0x7fff);
state->membank("bank2")->set_base(machine.root_device().memregion("user1")->base()+ 0x18000);
break;
case 3:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x4000, 0x7fff, "bank2");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x4000, 0x7fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x4000, 0x7fff, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x4000, 0x7fff);
state->membank("bank2")->set_base(machine.root_device().memregion("user1")->base()+ 0x20000 + (state->m_pzlestar_rom_bank*0x8000) + 0x4000);
break;
case 1:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_read(0x4000, 0x7fff);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x4000, 0x7fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_read(0x4000, 0x7fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x4000, 0x7fff);
break;
}
@@ -128,20 +128,20 @@ static void pzlestar_map_banks(running_machine &machine)
switch(slot_select)
{
case 0:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x8000, 0xbfff, "bank3");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x8000, 0xbfff, "bank7");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x8000, 0xbfff, "bank3");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x8000, 0xbfff, "bank7");
state->membank("bank3")->set_base(state->m_ram + 0x8000);
state->membank("bank7")->set_base(state->m_ram + 0x8000);
break;
case 3:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x8000, 0xbfff, "bank3");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x8000, 0xbfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x8000, 0xbfff, "bank3");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x8000, 0xbfff);
state->membank("bank3")->set_base(machine.root_device().memregion("user1")->base()+ 0x20000 + (state->m_pzlestar_rom_bank*0x8000));
break;
case 1:
case 2:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_read(0x8000, 0xbfff);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x8000, 0xbfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_read(0x8000, 0xbfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x8000, 0xbfff);
break;
}
@@ -150,16 +150,16 @@ static void pzlestar_map_banks(running_machine &machine)
switch(slot_select)
{
case 0:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xc000, 0xffff, "bank4");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0xc000, 0xffff, "bank8");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xc000, 0xffff, "bank4");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0xc000, 0xffff, "bank8");
state->membank("bank4")->set_base(state->m_ram + 0xc000);
state->membank("bank8")->set_base(state->m_ram + 0xc000);
break;
case 1:
case 2:
case 3:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_read(0xc000, 0xffff);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xc000, 0xffff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_read(0xc000, 0xffff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xc000, 0xffff);
break;
}
@@ -201,25 +201,25 @@ static void sexyboom_map_bank(running_machine &machine, int bank)
{
// ram
state->membank(read_bank_name)->set_base(&state->m_ram[(banknum & 0x7f) * 0x4000]);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(bank*0x4000, (bank+1)*0x4000 - 1, write_bank_name );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(bank*0x4000, (bank+1)*0x4000 - 1, write_bank_name );
state->membank(write_bank_name)->set_base(&state->m_ram[(banknum & 0x7f) * 0x4000]);
}
else
{
// rom 0
state->membank(read_bank_name)->set_base(machine.root_device().memregion("user1")->base()+0x4000*banknum);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(bank*0x4000, (bank+1)*0x4000 - 1);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(bank*0x4000, (bank+1)*0x4000 - 1);
}
}
else if (banktype == 0x82)
{
state->membank(read_bank_name)->set_base(machine.root_device().memregion("user1")->base()+0x20000+banknum*0x4000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(bank*0x4000, (bank+1)*0x4000 - 1);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(bank*0x4000, (bank+1)*0x4000 - 1);
}
else if (banktype == 0x80)
{
state->membank(read_bank_name)->set_base(machine.root_device().memregion("user1")->base()+0x120000+banknum*0x4000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(bank*0x4000, (bank+1)*0x4000 - 1);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(bank*0x4000, (bank+1)*0x4000 - 1);
}
else
{
diff --git a/src/mame/drivers/saturn.c b/src/mame/drivers/saturn.c
index 1b4d99328e5..dbab842a390 100644
--- a/src/mame/drivers/saturn.c
+++ b/src/mame/drivers/saturn.c
@@ -239,7 +239,7 @@ DMA TODO:
static void scu_do_transfer(running_machine &machine,UINT8 event)
{
saturn_state *state = machine.driver_data<saturn_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int i;
for(i=0;i<3;i++)
@@ -2054,35 +2054,35 @@ MACHINE_RESET_MEMBER(saturn_state,saturn)
m_cart_type = ioport("CART_AREA")->read() & 7;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x02400000, 0x027fffff, FUNC(saturn_null_ram_r), FUNC(saturn_null_ram_w));
- machine().device("slave")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x02400000, 0x027fffff, FUNC(saturn_null_ram_r), FUNC(saturn_null_ram_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x02400000, 0x027fffff, FUNC(saturn_null_ram_r), FUNC(saturn_null_ram_w));
+ machine().device("slave")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x02400000, 0x027fffff, FUNC(saturn_null_ram_r), FUNC(saturn_null_ram_w));
if(m_cart_type == 5)
{
// AM_RANGE(0x02400000, 0x027fffff) AM_RAM //cart RAM area, dynamically allocated
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_readwrite(0x02400000, 0x027fffff);
- machine().device("slave")->memory().space(AS_PROGRAM)->nop_readwrite(0x02400000, 0x027fffff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite(0x02400000, 0x027fffff);
+ machine().device("slave")->memory().space(AS_PROGRAM).nop_readwrite(0x02400000, 0x027fffff);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x02400000, 0x0247ffff, FUNC(saturn_cart_dram0_r), FUNC(saturn_cart_dram0_w));
- machine().device("slave")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x02400000, 0x0247ffff, FUNC(saturn_cart_dram0_r), FUNC(saturn_cart_dram0_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x02600000, 0x0267ffff, FUNC(saturn_cart_dram1_r), FUNC(saturn_cart_dram1_w));
- machine().device("slave")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x02600000, 0x0267ffff, FUNC(saturn_cart_dram1_r), FUNC(saturn_cart_dram1_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x02400000, 0x0247ffff, FUNC(saturn_cart_dram0_r), FUNC(saturn_cart_dram0_w));
+ machine().device("slave")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x02400000, 0x0247ffff, FUNC(saturn_cart_dram0_r), FUNC(saturn_cart_dram0_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x02600000, 0x0267ffff, FUNC(saturn_cart_dram1_r), FUNC(saturn_cart_dram1_w));
+ machine().device("slave")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x02600000, 0x0267ffff, FUNC(saturn_cart_dram1_r), FUNC(saturn_cart_dram1_w));
}
if(m_cart_type == 6)
{
// AM_RANGE(0x02400000, 0x027fffff) AM_RAM //cart RAM area, dynamically allocated
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_readwrite(0x02400000, 0x027fffff);
- machine().device("slave")->memory().space(AS_PROGRAM)->nop_readwrite(0x02400000, 0x027fffff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite(0x02400000, 0x027fffff);
+ machine().device("slave")->memory().space(AS_PROGRAM).nop_readwrite(0x02400000, 0x027fffff);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x02400000, 0x025fffff, FUNC(saturn_cart_dram0_r), FUNC(saturn_cart_dram0_w));
- machine().device("slave")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x02400000, 0x025fffff, FUNC(saturn_cart_dram0_r), FUNC(saturn_cart_dram0_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x02600000, 0x027fffff, FUNC(saturn_cart_dram1_r), FUNC(saturn_cart_dram1_w));
- machine().device("slave")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x02600000, 0x027fffff, FUNC(saturn_cart_dram1_r), FUNC(saturn_cart_dram1_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x02400000, 0x025fffff, FUNC(saturn_cart_dram0_r), FUNC(saturn_cart_dram0_w));
+ machine().device("slave")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x02400000, 0x025fffff, FUNC(saturn_cart_dram0_r), FUNC(saturn_cart_dram0_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x02600000, 0x027fffff, FUNC(saturn_cart_dram1_r), FUNC(saturn_cart_dram1_w));
+ machine().device("slave")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x02600000, 0x027fffff, FUNC(saturn_cart_dram1_r), FUNC(saturn_cart_dram1_w));
}
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_readwrite(0x04000000, 0x047fffff);
- machine().device("slave")->memory().space(AS_PROGRAM)->nop_readwrite(0x04000000, 0x047fffff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite(0x04000000, 0x047fffff);
+ machine().device("slave")->memory().space(AS_PROGRAM).nop_readwrite(0x04000000, 0x047fffff);
if(m_cart_type > 0 && m_cart_type < 5)
{
@@ -2093,8 +2093,8 @@ MACHINE_RESET_MEMBER(saturn_state,saturn)
//mask = 0x7fffff >> 4-3 = 0x3fffff 16mbit
//mask = 0x7fffff >> 4-2 = 0x1fffff 8mbit
//mask = 0x7fffff >> 4-1 = 0x0fffff 4mbit
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x04000000, 0x04000000 | mask, FUNC(saturn_cs1_r), FUNC(saturn_cs1_w));
- machine().device("slave")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x04000000, 0x04000000 | mask, FUNC(saturn_cs1_r), FUNC(saturn_cs1_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x04000000, 0x04000000 | mask, FUNC(saturn_cs1_r), FUNC(saturn_cs1_w));
+ machine().device("slave")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x04000000, 0x04000000 | mask, FUNC(saturn_cs1_r), FUNC(saturn_cs1_w));
}
diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c
index d98db1fe5a2..4627cf1ab6d 100644
--- a/src/mame/drivers/savquest.c
+++ b/src/mame/drivers/savquest.c
@@ -529,7 +529,7 @@ void savquest_state::machine_start()
kbdc8042_init(machine(), &at8042);
pc_vga_init(machine(), vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
}
void savquest_state::machine_reset()
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index 4b1b78d49e9..fc76c347eb0 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -1403,7 +1403,7 @@ static void voodoo_stall(device_t *device, int stall)
for (which = 0; which < 4; which++)
if (state->m_galileo.dma_stalled_on_voodoo[which])
{
- address_space &space = *device->machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = device->machine().device("maincpu")->memory().space(AS_PROGRAM);
if (LOG_DMA) logerror("Resuming DMA%d on voodoo\n", which);
/* mark this DMA as no longer stalled */
@@ -1420,7 +1420,7 @@ static void voodoo_stall(device_t *device, int stall)
/* if the CPU had a pending write, do it now */
if (state->m_cpu_stalled_on_voodoo)
{
- address_space &space = *device->machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = device->machine().firstcpu->space(AS_PROGRAM);
voodoo_w(device, space, state->m_cpu_stalled_offset, state->m_cpu_stalled_data, state->m_cpu_stalled_mem_mask);
}
state->m_cpu_stalled_on_voodoo = FALSE;
@@ -1588,7 +1588,7 @@ READ32_MEMBER(seattle_state::widget_r)
break;
case WREG_ANALOG:
- result = analog_port_r(*machine().device("maincpu")->memory().space(AS_PROGRAM), 0, mem_mask);
+ result = analog_port_r(machine().device("maincpu")->memory().space(AS_PROGRAM), 0, mem_mask);
break;
case WREG_ETHER_DATA:
@@ -1620,7 +1620,7 @@ WRITE32_MEMBER(seattle_state::widget_w)
break;
case WREG_ANALOG:
- analog_port_w(*machine().device("maincpu")->memory().space(AS_PROGRAM), 0, data, mem_mask);
+ analog_port_w(machine().device("maincpu")->memory().space(AS_PROGRAM), 0, data, mem_mask);
break;
case WREG_ETHER_DATA:
@@ -2873,20 +2873,20 @@ static void init_common(running_machine &machine, int ioasic, int serialnum, int
{
case PHOENIX_CONFIG:
/* original Phoenix board only has 4MB of RAM */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_readwrite(0x00400000, 0x007fffff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_readwrite(0x00400000, 0x007fffff);
break;
case SEATTLE_WIDGET_CONFIG:
/* set up the widget board */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x16c00000, 0x16c0001f, read32_delegate(FUNC(seattle_state::widget_r),state), write32_delegate(FUNC(seattle_state::widget_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x16c00000, 0x16c0001f, read32_delegate(FUNC(seattle_state::widget_r),state), write32_delegate(FUNC(seattle_state::widget_w),state));
break;
case FLAGSTAFF_CONFIG:
/* set up the analog inputs */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x14000000, 0x14000003, read32_delegate(FUNC(seattle_state::analog_port_r),state), write32_delegate(FUNC(seattle_state::analog_port_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x14000000, 0x14000003, read32_delegate(FUNC(seattle_state::analog_port_r),state), write32_delegate(FUNC(seattle_state::analog_port_w),state));
/* set up the ethernet controller */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x16c00000, 0x16c0003f, read32_delegate(FUNC(seattle_state::ethernet_r),state), write32_delegate(FUNC(seattle_state::ethernet_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x16c00000, 0x16c0003f, read32_delegate(FUNC(seattle_state::ethernet_r),state), write32_delegate(FUNC(seattle_state::ethernet_w),state));
break;
}
}
@@ -3014,7 +3014,7 @@ DRIVER_INIT_MEMBER(seattle_state,carnevil)
init_common(machine(), MIDWAY_IOASIC_CARNEVIL, 469/* 469 or 486 or 528 */, 80, SEATTLE_CONFIG);
/* set up the gun */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x16800000, 0x1680001f, read32_delegate(FUNC(seattle_state::carnevil_gun_r),this), write32_delegate(FUNC(seattle_state::carnevil_gun_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x16800000, 0x1680001f, read32_delegate(FUNC(seattle_state::carnevil_gun_r),this), write32_delegate(FUNC(seattle_state::carnevil_gun_w),this));
/* speedups */
mips3drc_add_hotspot(machine().device("maincpu"), 0x8015176C, 0x3C03801A, 250); /* confirmed */
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index 3c6c95ddc61..a6b4bd04fc9 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -1860,7 +1860,7 @@ void segac2_state::segac2_common_init(running_machine& machine, int (*func)(int
genvdp_use_cram = 0;
if (upd != NULL)
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(*upd, 0x880000, 0x880001, 0, 0x13fefe, FUNC(segac2_upd7759_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(*upd, 0x880000, 0x880001, 0, 0x13fefe, FUNC(segac2_upd7759_w));
}
@@ -2117,7 +2117,7 @@ DRIVER_INIT_MEMBER(segac2_state,tfrceacb)
{
/* disable the palette bank switching from the protection chip */
segac2_common_init(machine(), NULL);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x800000, 0x800001);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x800000, 0x800001);
}
DRIVER_INIT_MEMBER(segac2_state,borench)
@@ -2204,36 +2204,36 @@ DRIVER_INIT_MEMBER(segac2_state,pclub)
{
segac2_common_init(machine(), prot_func_pclub);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x880120, 0x880121, FUNC(printer_r) );/*Print Club Vol.1*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x880124, 0x880125, FUNC(printer_r) );/*Print Club Vol.2*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x880124, 0x880125, FUNC(print_club_camera_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x880120, 0x880121, FUNC(printer_r) );/*Print Club Vol.1*/
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x880124, 0x880125, FUNC(printer_r) );/*Print Club Vol.2*/
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x880124, 0x880125, FUNC(print_club_camera_w));
}
DRIVER_INIT_MEMBER(segac2_state,pclubjv2)
{
segac2_common_init(machine(), prot_func_pclubjv2);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x880120, 0x880121, FUNC(printer_r) );/*Print Club Vol.1*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x880124, 0x880125, FUNC(printer_r) );/*Print Club Vol.2*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x880124, 0x880125, FUNC(print_club_camera_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x880120, 0x880121, FUNC(printer_r) );/*Print Club Vol.1*/
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x880124, 0x880125, FUNC(printer_r) );/*Print Club Vol.2*/
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x880124, 0x880125, FUNC(print_club_camera_w));
}
DRIVER_INIT_MEMBER(segac2_state,pclubjv4)
{
segac2_common_init(machine(), prot_func_pclubjv4);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x880120, 0x880121, FUNC(printer_r) );/*Print Club Vol.1*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x880124, 0x880125, FUNC(printer_r) );/*Print Club Vol.2*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x880124, 0x880125, FUNC(print_club_camera_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x880120, 0x880121, FUNC(printer_r) );/*Print Club Vol.1*/
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x880124, 0x880125, FUNC(printer_r) );/*Print Club Vol.2*/
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x880124, 0x880125, FUNC(print_club_camera_w));
}
DRIVER_INIT_MEMBER(segac2_state,pclubjv5)
{
segac2_common_init(machine(), prot_func_pclubjv5);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x880120, 0x880121, FUNC(printer_r) );/*Print Club Vol.1*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x880124, 0x880125, FUNC(printer_r) );/*Print Club Vol.2*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x880124, 0x880125, FUNC(print_club_camera_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x880120, 0x880121, FUNC(printer_r) );/*Print Club Vol.1*/
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x880124, 0x880125, FUNC(printer_r) );/*Print Club Vol.2*/
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x880124, 0x880125, FUNC(print_club_camera_w));
}
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index cf9988a5c10..c65c49584d2 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -512,8 +512,8 @@ void ridleofp_state::driver_start()
{
systeme_state::driver_start();
- m_maincpu->space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(systeme_state::ridleofp_port_f8_read), this));
- m_maincpu->space(AS_IO)->install_write_handler(0xfa, 0xfa, write8_delegate(FUNC(systeme_state::ridleofp_port_fa_write), this));
+ m_maincpu->space(AS_IO).install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(systeme_state::ridleofp_port_f8_read), this));
+ m_maincpu->space(AS_IO).install_write_handler(0xfa, 0xfa, write8_delegate(FUNC(systeme_state::ridleofp_port_fa_write), this));
}
@@ -521,8 +521,8 @@ void hangonjr_state::driver_start()
{
systeme_state::driver_start();
- m_maincpu->space(AS_IO)->install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(systeme_state::hangonjr_port_f8_read), this));
- m_maincpu->space(AS_IO)->install_write_handler(0xfa, 0xfa, write8_delegate(FUNC(systeme_state::hangonjr_port_fa_write), this));
+ m_maincpu->space(AS_IO).install_read_handler(0xf8, 0xf8, read8_delegate(FUNC(systeme_state::hangonjr_port_f8_read), this));
+ m_maincpu->space(AS_IO).install_write_handler(0xfa, 0xfa, write8_delegate(FUNC(systeme_state::hangonjr_port_fa_write), this));
}
diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c
index 5eaed2c20ee..2adb760c07b 100644
--- a/src/mame/drivers/segag80r.c
+++ b/src/mame/drivers/segag80r.c
@@ -188,7 +188,7 @@ WRITE8_MEMBER(segag80r_state::vidram_w){ segag80r_videoram_w(space, decrypt_offs
WRITE8_MEMBER(segag80r_state::monsterb_vidram_w){ monsterb_videoram_w(space, decrypt_offset(space, offset), data); }
WRITE8_MEMBER(segag80r_state::pignewt_vidram_w){ pignewt_videoram_w(space, decrypt_offset(space, offset), data); }
WRITE8_MEMBER(segag80r_state::sindbadm_vidram_w){ sindbadm_videoram_w(space, decrypt_offset(space, offset), data); }
-WRITE8_MEMBER(segag80r_state::usb_ram_w){ device_t *device = machine().device("usbsnd"); sega_usb_ram_w(device, space, decrypt_offset(*machine().device("maincpu")->memory().space(AS_PROGRAM), offset), data); }
+WRITE8_MEMBER(segag80r_state::usb_ram_w){ device_t *device = machine().device("usbsnd"); sega_usb_ram_w(device, space, decrypt_offset(machine().device("maincpu")->memory().space(AS_PROGRAM), offset), data); }
@@ -1446,7 +1446,7 @@ static void monsterb_expand_gfx(running_machine &machine, const char *region)
DRIVER_INIT_MEMBER(segag80r_state,astrob)
{
device_t *speech = machine().device("segaspeech");
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
/* configure the 315-0062 security chip */
m_decrypt = segag80_security(62);
@@ -1455,11 +1455,11 @@ DRIVER_INIT_MEMBER(segag80r_state,astrob)
m_background_pcb = G80_BACKGROUND_NONE;
/* install speech board */
- iospace->install_legacy_write_handler(*speech, 0x38, 0x38, FUNC(sega_speech_data_w));
- iospace->install_legacy_write_handler(*speech, 0x3b, 0x3b, FUNC(sega_speech_control_w));
+ iospace.install_legacy_write_handler(*speech, 0x38, 0x38, FUNC(sega_speech_data_w));
+ iospace.install_legacy_write_handler(*speech, 0x3b, 0x3b, FUNC(sega_speech_control_w));
/* install Astro Blaster sound board */
- iospace->install_write_handler(0x3e, 0x3f, write8_delegate(FUNC(segag80r_state::astrob_sound_w),this));
+ iospace.install_write_handler(0x3e, 0x3f, write8_delegate(FUNC(segag80r_state::astrob_sound_w),this));
}
@@ -1476,7 +1476,7 @@ DRIVER_INIT_MEMBER(segag80r_state,005)
DRIVER_INIT_MEMBER(segag80r_state,spaceod)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
/* configure the 315-0063 security chip */
m_decrypt = segag80_security(63);
@@ -1485,21 +1485,21 @@ DRIVER_INIT_MEMBER(segag80r_state,spaceod)
m_background_pcb = G80_BACKGROUND_SPACEOD;
/* configure ports for the background board */
- iospace->install_readwrite_handler(0x08, 0x0f, read8_delegate(FUNC(segag80r_state::spaceod_back_port_r),this), write8_delegate(FUNC(segag80r_state::spaceod_back_port_w),this));
+ iospace.install_readwrite_handler(0x08, 0x0f, read8_delegate(FUNC(segag80r_state::spaceod_back_port_r),this), write8_delegate(FUNC(segag80r_state::spaceod_back_port_w),this));
/* install Space Odyssey sound board */
- iospace->install_write_handler(0x0e, 0x0f, write8_delegate(FUNC(segag80r_state::spaceod_sound_w),this));
+ iospace.install_write_handler(0x0e, 0x0f, write8_delegate(FUNC(segag80r_state::spaceod_sound_w),this));
/* install our wacky mangled ports */
- iospace->install_read_handler(0xf8, 0xfb, read8_delegate(FUNC(segag80r_state::spaceod_mangled_ports_r),this));
- iospace->install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(segag80r_state::spaceod_port_fc_r),this));
+ iospace.install_read_handler(0xf8, 0xfb, read8_delegate(FUNC(segag80r_state::spaceod_mangled_ports_r),this));
+ iospace.install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(segag80r_state::spaceod_port_fc_r),this));
}
DRIVER_INIT_MEMBER(segag80r_state,monsterb)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
- address_space *pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* configure the 315-0082 security chip */
m_decrypt = segag80_security(82);
@@ -1509,15 +1509,15 @@ DRIVER_INIT_MEMBER(segag80r_state,monsterb)
monsterb_expand_gfx(machine(), "gfx1");
/* install background board handlers */
- iospace->install_write_handler(0xb8, 0xbd, write8_delegate(FUNC(segag80r_state::monsterb_back_port_w),this));
- pgmspace->install_write_handler(0xe000, 0xffff, write8_delegate(FUNC(segag80r_state::monsterb_vidram_w),this));
+ iospace.install_write_handler(0xb8, 0xbd, write8_delegate(FUNC(segag80r_state::monsterb_back_port_w),this));
+ pgmspace.install_write_handler(0xe000, 0xffff, write8_delegate(FUNC(segag80r_state::monsterb_vidram_w),this));
}
DRIVER_INIT_MEMBER(segag80r_state,monster2)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
- address_space *pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* configure the 315-5006 security chip */
spatter_decode(machine(), "maincpu");
@@ -1528,17 +1528,17 @@ DRIVER_INIT_MEMBER(segag80r_state,monster2)
monsterb_expand_gfx(machine(), "gfx1");
/* install background board handlers */
- iospace->install_write_handler(0xb4, 0xb5, write8_delegate(FUNC(segag80r_state::pignewt_back_color_w),this));
- iospace->install_write_handler(0xb8, 0xbd, write8_delegate(FUNC(segag80r_state::pignewt_back_port_w),this));
- pgmspace->install_write_handler(0xe000, 0xffff, write8_delegate(FUNC(segag80r_state::pignewt_vidram_w),this));
+ iospace.install_write_handler(0xb4, 0xb5, write8_delegate(FUNC(segag80r_state::pignewt_back_color_w),this));
+ iospace.install_write_handler(0xb8, 0xbd, write8_delegate(FUNC(segag80r_state::pignewt_back_port_w),this));
+ pgmspace.install_write_handler(0xe000, 0xffff, write8_delegate(FUNC(segag80r_state::pignewt_vidram_w),this));
}
DRIVER_INIT_MEMBER(segag80r_state,pignewt)
{
device_t *usbsnd = machine().device("usbsnd");
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
- address_space *pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* configure the 315-0063? security chip */
m_decrypt = segag80_security(63);
@@ -1548,21 +1548,21 @@ DRIVER_INIT_MEMBER(segag80r_state,pignewt)
monsterb_expand_gfx(machine(), "gfx1");
/* install background board handlers */
- iospace->install_write_handler(0xb4, 0xb5, write8_delegate(FUNC(segag80r_state::pignewt_back_color_w),this));
- iospace->install_write_handler(0xb8, 0xbd, write8_delegate(FUNC(segag80r_state::pignewt_back_port_w),this));
- pgmspace->install_write_handler(0xe000, 0xffff, write8_delegate(FUNC(segag80r_state::pignewt_vidram_w),this));
+ iospace.install_write_handler(0xb4, 0xb5, write8_delegate(FUNC(segag80r_state::pignewt_back_color_w),this));
+ iospace.install_write_handler(0xb8, 0xbd, write8_delegate(FUNC(segag80r_state::pignewt_back_port_w),this));
+ pgmspace.install_write_handler(0xe000, 0xffff, write8_delegate(FUNC(segag80r_state::pignewt_vidram_w),this));
/* install Universal sound board */
- iospace->install_legacy_readwrite_handler(*usbsnd, 0x3f, 0x3f, FUNC(sega_usb_status_r), FUNC(sega_usb_data_w));
- pgmspace->install_legacy_read_handler(*usbsnd, 0xd000, 0xdfff, FUNC(sega_usb_ram_r));
- pgmspace->install_write_handler(0xd000, 0xdfff, write8_delegate(FUNC(segag80r_state::usb_ram_w),this));
+ iospace.install_legacy_readwrite_handler(*usbsnd, 0x3f, 0x3f, FUNC(sega_usb_status_r), FUNC(sega_usb_data_w));
+ pgmspace.install_legacy_read_handler(*usbsnd, 0xd000, 0xdfff, FUNC(sega_usb_ram_r));
+ pgmspace.install_write_handler(0xd000, 0xdfff, write8_delegate(FUNC(segag80r_state::usb_ram_w),this));
}
DRIVER_INIT_MEMBER(segag80r_state,sindbadm)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
- address_space *pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* configure the encrypted Z80 */
sindbadm_decode(machine(), "maincpu");
@@ -1572,8 +1572,8 @@ DRIVER_INIT_MEMBER(segag80r_state,sindbadm)
m_background_pcb = G80_BACKGROUND_SINDBADM;
/* install background board handlers */
- iospace->install_write_handler(0x40, 0x41, write8_delegate(FUNC(segag80r_state::sindbadm_back_port_w),this));
- pgmspace->install_write_handler(0xe000, 0xffff, write8_delegate(FUNC(segag80r_state::sindbadm_vidram_w),this));
+ iospace.install_write_handler(0x40, 0x41, write8_delegate(FUNC(segag80r_state::sindbadm_back_port_w),this));
+ pgmspace.install_write_handler(0xe000, 0xffff, write8_delegate(FUNC(segag80r_state::sindbadm_vidram_w),this));
}
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index 3339efc726f..928c5cafdd2 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -202,7 +202,7 @@ WRITE8_MEMBER(segag80v_state::mainram_w)
m_mainram[decrypt_offset(space, offset)] = data;
}
-WRITE8_MEMBER(segag80v_state::usb_ram_w){ sega_usb_ram_w(m_usb, space, decrypt_offset(*machine().device("maincpu")->memory().space(AS_PROGRAM), offset), data); }
+WRITE8_MEMBER(segag80v_state::usb_ram_w){ sega_usb_ram_w(m_usb, space, decrypt_offset(machine().device("maincpu")->memory().space(AS_PROGRAM), offset), data); }
WRITE8_MEMBER(segag80v_state::vectorram_w)
{
m_vectorram[decrypt_offset(space, offset)] = data;
@@ -1287,55 +1287,55 @@ ROM_END
DRIVER_INIT_MEMBER(segag80v_state,elim2)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
/* configure security */
m_decrypt = segag80_security(70);
/* configure sound */
m_usb = NULL;
- iospace->install_write_handler(0x3e, 0x3e, write8_delegate(FUNC(segag80v_state::elim1_sh_w),this));
- iospace->install_write_handler(0x3f, 0x3f, write8_delegate(FUNC(segag80v_state::elim2_sh_w),this));
+ iospace.install_write_handler(0x3e, 0x3e, write8_delegate(FUNC(segag80v_state::elim1_sh_w),this));
+ iospace.install_write_handler(0x3f, 0x3f, write8_delegate(FUNC(segag80v_state::elim2_sh_w),this));
}
DRIVER_INIT_MEMBER(segag80v_state,elim4)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
/* configure security */
m_decrypt = segag80_security(76);
/* configure sound */
m_usb = NULL;
- iospace->install_write_handler(0x3e, 0x3e, write8_delegate(FUNC(segag80v_state::elim1_sh_w),this));
- iospace->install_write_handler(0x3f, 0x3f, write8_delegate(FUNC(segag80v_state::elim2_sh_w),this));
+ iospace.install_write_handler(0x3e, 0x3e, write8_delegate(FUNC(segag80v_state::elim1_sh_w),this));
+ iospace.install_write_handler(0x3f, 0x3f, write8_delegate(FUNC(segag80v_state::elim2_sh_w),this));
/* configure inputs */
- iospace->install_write_handler(0xf8, 0xf8, write8_delegate(FUNC(segag80v_state::spinner_select_w),this));
- iospace->install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(segag80v_state::elim4_input_r),this));
+ iospace.install_write_handler(0xf8, 0xf8, write8_delegate(FUNC(segag80v_state::spinner_select_w),this));
+ iospace.install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(segag80v_state::elim4_input_r),this));
}
DRIVER_INIT_MEMBER(segag80v_state,spacfury)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
/* configure security */
m_decrypt = segag80_security(64);
/* configure sound */
m_usb = NULL;
- iospace->install_legacy_write_handler(*machine().device("segaspeech"), 0x38, 0x38, FUNC(sega_speech_data_w));
- iospace->install_legacy_write_handler(*machine().device("segaspeech"), 0x3b, 0x3b, FUNC(sega_speech_control_w));
- iospace->install_write_handler(0x3e, 0x3e, write8_delegate(FUNC(segag80v_state::spacfury1_sh_w),this));
- iospace->install_write_handler(0x3f, 0x3f, write8_delegate(FUNC(segag80v_state::spacfury2_sh_w),this));
+ iospace.install_legacy_write_handler(*machine().device("segaspeech"), 0x38, 0x38, FUNC(sega_speech_data_w));
+ iospace.install_legacy_write_handler(*machine().device("segaspeech"), 0x3b, 0x3b, FUNC(sega_speech_control_w));
+ iospace.install_write_handler(0x3e, 0x3e, write8_delegate(FUNC(segag80v_state::spacfury1_sh_w),this));
+ iospace.install_write_handler(0x3f, 0x3f, write8_delegate(FUNC(segag80v_state::spacfury2_sh_w),this));
}
DRIVER_INIT_MEMBER(segag80v_state,zektor)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
device_t *ay = machine().device("aysnd");
/* configure security */
@@ -1343,58 +1343,58 @@ DRIVER_INIT_MEMBER(segag80v_state,zektor)
/* configure sound */
m_usb = NULL;
- iospace->install_legacy_write_handler(*machine().device("segaspeech"), 0x38, 0x38, FUNC(sega_speech_data_w));
- iospace->install_legacy_write_handler(*machine().device("segaspeech"), 0x3b, 0x3b, FUNC(sega_speech_control_w));
- iospace->install_legacy_write_handler(*ay, 0x3c, 0x3d, FUNC(ay8910_address_data_w));
- iospace->install_write_handler(0x3e, 0x3e, write8_delegate(FUNC(segag80v_state::zektor1_sh_w),this));
- iospace->install_write_handler(0x3f, 0x3f, write8_delegate(FUNC(segag80v_state::zektor2_sh_w),this));
+ iospace.install_legacy_write_handler(*machine().device("segaspeech"), 0x38, 0x38, FUNC(sega_speech_data_w));
+ iospace.install_legacy_write_handler(*machine().device("segaspeech"), 0x3b, 0x3b, FUNC(sega_speech_control_w));
+ iospace.install_legacy_write_handler(*ay, 0x3c, 0x3d, FUNC(ay8910_address_data_w));
+ iospace.install_write_handler(0x3e, 0x3e, write8_delegate(FUNC(segag80v_state::zektor1_sh_w),this));
+ iospace.install_write_handler(0x3f, 0x3f, write8_delegate(FUNC(segag80v_state::zektor2_sh_w),this));
/* configure inputs */
- iospace->install_write_handler(0xf8, 0xf8, write8_delegate(FUNC(segag80v_state::spinner_select_w),this));
- iospace->install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(segag80v_state::spinner_input_r),this));
+ iospace.install_write_handler(0xf8, 0xf8, write8_delegate(FUNC(segag80v_state::spinner_select_w),this));
+ iospace.install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(segag80v_state::spinner_input_r),this));
}
DRIVER_INIT_MEMBER(segag80v_state,tacscan)
{
- address_space *pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
/* configure security */
m_decrypt = segag80_security(76);
/* configure sound */
m_usb = machine().device("usbsnd");
- iospace->install_legacy_readwrite_handler(*m_usb, 0x3f, 0x3f, FUNC(sega_usb_status_r), FUNC(sega_usb_data_w));
- pgmspace->install_legacy_read_handler(*m_usb, 0xd000, 0xdfff, FUNC(sega_usb_ram_r));
- pgmspace->install_write_handler(0xd000, 0xdfff, write8_delegate(FUNC(segag80v_state::usb_ram_w),this));
+ iospace.install_legacy_readwrite_handler(*m_usb, 0x3f, 0x3f, FUNC(sega_usb_status_r), FUNC(sega_usb_data_w));
+ pgmspace.install_legacy_read_handler(*m_usb, 0xd000, 0xdfff, FUNC(sega_usb_ram_r));
+ pgmspace.install_write_handler(0xd000, 0xdfff, write8_delegate(FUNC(segag80v_state::usb_ram_w),this));
/* configure inputs */
- iospace->install_write_handler(0xf8, 0xf8, write8_delegate(FUNC(segag80v_state::spinner_select_w),this));
- iospace->install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(segag80v_state::spinner_input_r),this));
+ iospace.install_write_handler(0xf8, 0xf8, write8_delegate(FUNC(segag80v_state::spinner_select_w),this));
+ iospace.install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(segag80v_state::spinner_input_r),this));
}
DRIVER_INIT_MEMBER(segag80v_state,startrek)
{
- address_space *pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
/* configure security */
m_decrypt = segag80_security(64);
/* configure sound */
m_usb = machine().device("usbsnd");
- iospace->install_legacy_write_handler(*machine().device("segaspeech"), 0x38, 0x38, FUNC(sega_speech_data_w));
- iospace->install_legacy_write_handler(*machine().device("segaspeech"), 0x3b, 0x3b, FUNC(sega_speech_control_w));
+ iospace.install_legacy_write_handler(*machine().device("segaspeech"), 0x38, 0x38, FUNC(sega_speech_data_w));
+ iospace.install_legacy_write_handler(*machine().device("segaspeech"), 0x3b, 0x3b, FUNC(sega_speech_control_w));
- iospace->install_legacy_readwrite_handler(*m_usb, 0x3f, 0x3f, FUNC(sega_usb_status_r), FUNC(sega_usb_data_w));
- pgmspace->install_legacy_read_handler(*m_usb, 0xd000, 0xdfff, FUNC(sega_usb_ram_r));
- pgmspace->install_write_handler(0xd000, 0xdfff, write8_delegate(FUNC(segag80v_state::usb_ram_w),this));
+ iospace.install_legacy_readwrite_handler(*m_usb, 0x3f, 0x3f, FUNC(sega_usb_status_r), FUNC(sega_usb_data_w));
+ pgmspace.install_legacy_read_handler(*m_usb, 0xd000, 0xdfff, FUNC(sega_usb_ram_r));
+ pgmspace.install_write_handler(0xd000, 0xdfff, write8_delegate(FUNC(segag80v_state::usb_ram_w),this));
/* configure inputs */
- iospace->install_write_handler(0xf8, 0xf8, write8_delegate(FUNC(segag80v_state::spinner_select_w),this));
- iospace->install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(segag80v_state::spinner_input_r),this));
+ iospace.install_write_handler(0xf8, 0xf8, write8_delegate(FUNC(segag80v_state::spinner_select_w),this));
+ iospace.install_read_handler(0xfc, 0xfc, read8_delegate(FUNC(segag80v_state::spinner_input_r),this));
}
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index b8f55b359b5..b42e6ba0776 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -437,7 +437,7 @@ void segahang_state::device_timer(emu_timer &timer, device_timer_id id, int para
// synchronize writes to the 8255 PPI
case TID_PPI_WRITE:
- m_i8255_1->write(*m_maincpu->space(AS_PROGRAM), param >> 8, param & 0xff);
+ m_i8255_1->write(m_maincpu->space(AS_PROGRAM), param >> 8, param & 0xff);
break;
}
}
@@ -1791,7 +1791,7 @@ DRIVER_INIT_MEMBER(segahang_state,endurobl)
UINT16 *decrypt = auto_alloc_array(machine(), UINT16, 0x40000/2);
memcpy(decrypt + 0x00000/2, rom + 0x30000/2, 0x10000);
memcpy(decrypt + 0x10000/2, rom + 0x10000/2, 0x20000);
- m_maincpu->space(AS_PROGRAM)->set_decrypted_region(0x000000, 0x03ffff, decrypt);
+ m_maincpu->space(AS_PROGRAM).set_decrypted_region(0x000000, 0x03ffff, decrypt);
}
DRIVER_INIT_MEMBER(segahang_state,endurob2)
@@ -1802,7 +1802,7 @@ DRIVER_INIT_MEMBER(segahang_state,endurob2)
UINT16 *rom = reinterpret_cast<UINT16 *>(memregion("maincpu")->base());
UINT16 *decrypt = auto_alloc_array(machine(), UINT16, 0x40000/2);
memcpy(decrypt, rom, 0x30000);
- m_maincpu->space(AS_PROGRAM)->set_decrypted_region(0x000000, 0x03ffff, decrypt);
+ m_maincpu->space(AS_PROGRAM).set_decrypted_region(0x000000, 0x03ffff, decrypt);
}
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 0bf0d60cec5..d94ef490623 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -427,7 +427,7 @@ WRITE8_MEMBER( segas16a_state::n7751_rom_offset_w )
WRITE8_DEVICE_HANDLER( segas16a_state::static_n7751_rom_offset_w )
{
segas16a_state *state = device->machine().driver_data<segas16a_state>();
- state->n7751_rom_offset_w(*state->m_maincpu->space(AS_PROGRAM), offset, data);
+ state->n7751_rom_offset_w(state->m_maincpu->space(AS_PROGRAM), offset, data);
}
@@ -539,11 +539,11 @@ WRITE8_MEMBER( segas16a_state::mcu_io_w )
case 0:
// access main work RAM
if (offset >= 0x4000 && offset < 0x8000)
- m_maincpu->space(AS_PROGRAM)->write_byte(0xc70001 ^ (offset & 0x3fff), data);
+ m_maincpu->space(AS_PROGRAM).write_byte(0xc70001 ^ (offset & 0x3fff), data);
// access misc I/O space
else if (offset >= 0x8000 && offset < 0xc000)
- m_maincpu->space(AS_PROGRAM)->write_byte(0xc40001 ^ (offset & 0x3fff), data);
+ m_maincpu->space(AS_PROGRAM).write_byte(0xc40001 ^ (offset & 0x3fff), data);
else
logerror("%03X: MCU movx write mode %02X offset %04X = %02X\n", m_mcu->pc(), m_mcu_control, offset, data);
break;
@@ -551,14 +551,14 @@ WRITE8_MEMBER( segas16a_state::mcu_io_w )
// access text RAM
case 1:
if (offset >= 0x8000 && offset < 0x9000)
- m_maincpu->space(AS_PROGRAM)->write_byte(0x410001 ^ (offset & 0xfff), data);
+ m_maincpu->space(AS_PROGRAM).write_byte(0x410001 ^ (offset & 0xfff), data);
else
logerror("%03X: MCU movx write mode %02X offset %04X = %02X\n", m_mcu->pc(), m_mcu_control, offset, data);
break;
// access palette RAM
case 3:
- m_maincpu->space(AS_PROGRAM)->write_byte(0x840001 ^ offset, data);
+ m_maincpu->space(AS_PROGRAM).write_byte(0x840001 ^ offset, data);
break;
// access ROMs - fall through to logging
@@ -590,24 +590,24 @@ READ8_MEMBER( segas16a_state::mcu_io_r )
// access main work RAM
else if (offset >= 0x4000 && offset < 0x8000)
- return m_maincpu->space(AS_PROGRAM)->read_byte(0xc70001 ^ (offset & 0x3fff));
+ return m_maincpu->space(AS_PROGRAM).read_byte(0xc70001 ^ (offset & 0x3fff));
// access misc I/O space
else if (offset >= 0x8000 && offset < 0xc000)
- return m_maincpu->space(AS_PROGRAM)->read_byte(0xc40001 ^ (offset & 0x3fff));
+ return m_maincpu->space(AS_PROGRAM).read_byte(0xc40001 ^ (offset & 0x3fff));
logerror("%03X: MCU movx read mode %02X offset %04X\n", m_mcu->pc(), m_mcu_control, offset);
return 0xff;
// access text RAM
case 1:
if (offset >= 0x8000 && offset < 0x9000)
- return m_maincpu->space(AS_PROGRAM)->read_byte(0x410001 ^ (offset & 0xfff));
+ return m_maincpu->space(AS_PROGRAM).read_byte(0x410001 ^ (offset & 0xfff));
logerror("%03X: MCU movx read mode %02X offset %04X\n", m_mcu->pc(), m_mcu_control, offset);
return 0xff;
// access palette RAM
case 3:
- return m_maincpu->space(AS_PROGRAM)->read_byte(0x840001 ^ offset);
+ return m_maincpu->space(AS_PROGRAM).read_byte(0x840001 ^ offset);
// access ROMs
case 5:
@@ -695,7 +695,7 @@ void segas16a_state::device_timer(emu_timer &timer, device_timer_id id, int para
// synchronize writes to the 8255 PPI
case TID_PPI_WRITE:
- m_i8255->write(*m_maincpu->space(AS_PROGRAM), param >> 8, param & 0xff);
+ m_i8255->write(m_maincpu->space(AS_PROGRAM), param >> 8, param & 0xff);
break;
}
}
@@ -767,7 +767,7 @@ void segas16a_state::quartet_i8751_sim()
m_maincpu->set_input_line(4, HOLD_LINE);
// X scroll values
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
segaic16_textram_0_w(space, 0xff8/2, m_workram[0x0d14/2], 0xffff);
segaic16_textram_0_w(space, 0xffa/2, m_workram[0x0d18/2], 0xffff);
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index fb305ba6567..091e1e2e3eb 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -1369,7 +1369,7 @@ void segas16b_state::altbeast_common_i8751_sim(offs_t soundoffs, offs_t inputoff
m_maincpu->set_input_line(4, HOLD_LINE);
// set tile banks
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
rom_5704_bank_w(space, 1, m_workram[0x3094/2] & 0x00ff, 0x00ff);
// process any new sound data
@@ -1414,7 +1414,7 @@ void segas16b_state::ddux_i8751_sim()
UINT16 temp = m_workram[0x0bd0/2];
if ((temp & 0xff00) != 0x0000)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
m_mapper->write(space, 0x03, temp >> 8);
m_workram[0x0bd0/2] = temp & 0x00ff;
}
@@ -1444,7 +1444,7 @@ void segas16b_state::goldnaxe_i8751_sim()
UINT16 temp = m_workram[0x2cfc/2];
if ((temp & 0xff00) != 0x0000)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
m_mapper->write(space, 0x03, temp >> 8);
m_workram[0x2cfc/2] = temp & 0x00ff;
}
@@ -1471,7 +1471,7 @@ void segas16b_state::tturf_i8751_sim()
temp = m_workram[0x01d0/2];
if ((temp & 0xff00) != 0x0000)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
m_mapper->write(space, 0x03, temp);
m_workram[0x01d0/2] = temp & 0x00ff;
}
@@ -1497,7 +1497,7 @@ void segas16b_state::wb3_i8751_sim()
UINT16 temp = m_workram[0x0008/2];
if ((temp & 0x00ff) != 0x0000)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
m_mapper->write(space, 0x03, temp >> 8);
m_workram[0x0008/2] = temp & 0xff00;
}
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index da91f88678c..c61b821d468 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -4209,14 +4209,14 @@ READ16_MEMBER(segas32_state::arescue_slavebusy_r)
DRIVER_INIT_MEMBER(segas32_state,arescue)
{
segas32_common_init(machine(), read16_delegate(FUNC(segas32_state::analog_custom_io_r),this), write16_delegate(FUNC(segas32_state::analog_custom_io_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa00000, 0xa00007, read16_delegate(FUNC(segas32_state::arescue_dsp_r),this), write16_delegate(FUNC(segas32_state::arescue_dsp_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa00000, 0xa00007, read16_delegate(FUNC(segas32_state::arescue_dsp_r),this), write16_delegate(FUNC(segas32_state::arescue_dsp_w),this));
m_dual_pcb_comms = auto_alloc_array(machine(), UINT16, 0x1000/2);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x810000, 0x810fff, read16_delegate(FUNC(segas32_state::dual_pcb_comms_r),this), write16_delegate(FUNC(segas32_state::dual_pcb_comms_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x818000, 0x818003, read16_delegate(FUNC(segas32_state::dual_pcb_masterslave),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x810000, 0x810fff, read16_delegate(FUNC(segas32_state::dual_pcb_comms_r),this), write16_delegate(FUNC(segas32_state::dual_pcb_comms_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x818000, 0x818003, read16_delegate(FUNC(segas32_state::dual_pcb_masterslave),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x810000, 0x810001, read16_delegate(FUNC(segas32_state::arescue_handshake_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x81000e, 0x81000f, read16_delegate(FUNC(segas32_state::arescue_slavebusy_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x810000, 0x810001, read16_delegate(FUNC(segas32_state::arescue_handshake_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x81000e, 0x81000f, read16_delegate(FUNC(segas32_state::arescue_slavebusy_r),this));
m_sw1_output = arescue_sw1_output;
}
@@ -4227,8 +4227,8 @@ DRIVER_INIT_MEMBER(segas32_state,arabfgt)
segas32_common_init(machine(), read16_delegate(FUNC(segas32_state::extra_custom_io_r),this), write16_delegate());
/* install protection handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xa00100, 0xa0011f, read16_delegate(FUNC(segas32_state::arf_wakeup_protection_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa00000, 0xa00fff, read16_delegate(FUNC(segas32_state::arabfgt_protection_r),this), write16_delegate(FUNC(segas32_state::arabfgt_protection_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xa00100, 0xa0011f, read16_delegate(FUNC(segas32_state::arf_wakeup_protection_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa00000, 0xa00fff, read16_delegate(FUNC(segas32_state::arabfgt_protection_r),this), write16_delegate(FUNC(segas32_state::arabfgt_protection_w),this));
}
@@ -4238,8 +4238,8 @@ DRIVER_INIT_MEMBER(segas32_state,brival)
/* install protection handlers */
m_system32_protram = auto_alloc_array(machine(), UINT16, 0x1000/2);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x20ba00, 0x20ba07, read16_delegate(FUNC(segas32_state::brival_protection_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xa00000, 0xa00fff, write16_delegate(FUNC(segas32_state::brival_protection_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x20ba00, 0x20ba07, read16_delegate(FUNC(segas32_state::brival_protection_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xa00000, 0xa00fff, write16_delegate(FUNC(segas32_state::brival_protection_w),this));
}
@@ -4248,7 +4248,7 @@ DRIVER_INIT_MEMBER(segas32_state,darkedge)
segas32_common_init(machine(), read16_delegate(FUNC(segas32_state::extra_custom_io_r),this), write16_delegate());
/* install protection handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa00000, 0xa7ffff, read16_delegate(FUNC(segas32_state::darkedge_protection_r),this), write16_delegate(FUNC(segas32_state::darkedge_protection_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa00000, 0xa7ffff, read16_delegate(FUNC(segas32_state::darkedge_protection_r),this), write16_delegate(FUNC(segas32_state::darkedge_protection_w),this));
m_system32_prot_vblank = darkedge_fd1149_vblank;
}
@@ -4257,7 +4257,7 @@ DRIVER_INIT_MEMBER(segas32_state,dbzvrvs)
segas32_common_init(machine(), read16_delegate(), write16_delegate());
/* install protection handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa00000, 0xa7ffff, read16_delegate(FUNC(segas32_state::dbzvrvs_protection_r),this), write16_delegate(FUNC(segas32_state::dbzvrvs_protection_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa00000, 0xa7ffff, read16_delegate(FUNC(segas32_state::dbzvrvs_protection_r),this), write16_delegate(FUNC(segas32_state::dbzvrvs_protection_w),this));
}
WRITE16_MEMBER(segas32_state::f1en_comms_echo_w)
@@ -4272,10 +4272,10 @@ DRIVER_INIT_MEMBER(segas32_state,f1en)
segas32_common_init(machine(), read16_delegate(FUNC(segas32_state::analog_custom_io_r),this), write16_delegate(FUNC(segas32_state::analog_custom_io_w),this));
m_dual_pcb_comms = auto_alloc_array(machine(), UINT16, 0x1000/2);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x810000, 0x810fff, read16_delegate(FUNC(segas32_state::dual_pcb_comms_r),this), write16_delegate(FUNC(segas32_state::dual_pcb_comms_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x818000, 0x818003, read16_delegate(FUNC(segas32_state::dual_pcb_masterslave),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x810000, 0x810fff, read16_delegate(FUNC(segas32_state::dual_pcb_comms_r),this), write16_delegate(FUNC(segas32_state::dual_pcb_comms_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x818000, 0x818003, read16_delegate(FUNC(segas32_state::dual_pcb_masterslave),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x810048, 0x810049, write16_delegate(FUNC(segas32_state::f1en_comms_echo_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x810048, 0x810049, write16_delegate(FUNC(segas32_state::f1en_comms_echo_w),this));
m_sw1_output = radm_sw1_output;
}
@@ -4288,10 +4288,10 @@ DRIVER_INIT_MEMBER(segas32_state,f1lap)
segas32_common_init(machine(), read16_delegate(FUNC(segas32_state::analog_custom_io_r),this), write16_delegate(FUNC(segas32_state::analog_custom_io_w),this));
m_dual_pcb_comms = auto_alloc_array(machine(), UINT16, 0x1000/2);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x800000, 0x800fff, read16_delegate(FUNC(segas32_state::dual_pcb_comms_r),this), write16_delegate(FUNC(segas32_state::dual_pcb_comms_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x801000, 0x801003, read16_delegate(FUNC(segas32_state::dual_pcb_masterslave),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x800000, 0x800fff, read16_delegate(FUNC(segas32_state::dual_pcb_comms_r),this), write16_delegate(FUNC(segas32_state::dual_pcb_comms_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x801000, 0x801003, read16_delegate(FUNC(segas32_state::dual_pcb_masterslave),this));
-// machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x800048, 0x800049, write16_delegate(FUNC(segas32_state::f1en_comms_echo_w),this));
+// machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x800048, 0x800049, write16_delegate(FUNC(segas32_state::f1en_comms_echo_w),this));
m_system32_prot_vblank = f1lap_fd1149_vblank;
m_sw1_output = f1lap_sw1_output;
@@ -4303,7 +4303,7 @@ DRIVER_INIT_MEMBER(segas32_state,ga2)
segas32_common_init(machine(), read16_delegate(FUNC(segas32_state::extra_custom_io_r),this), write16_delegate());
decrypt_ga2_protrom(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa00000, 0xa00fff, read16_delegate(FUNC(segas32_state::ga2_dpram_r),this), write16_delegate(FUNC(segas32_state::ga2_dpram_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa00000, 0xa00fff, read16_delegate(FUNC(segas32_state::ga2_dpram_r),this), write16_delegate(FUNC(segas32_state::ga2_dpram_w),this));
}
@@ -4363,7 +4363,7 @@ DRIVER_INIT_MEMBER(segas32_state,radr)
DRIVER_INIT_MEMBER(segas32_state,scross)
{
segas32_common_init(machine(), read16_delegate(FUNC(segas32_state::analog_custom_io_r),this), write16_delegate(FUNC(segas32_state::analog_custom_io_w),this));
- machine().device("soundcpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb0, 0xbf, write8_delegate(FUNC(segas32_state::scross_bank_w),this));
+ machine().device("soundcpu")->memory().space(AS_PROGRAM).install_write_handler(0xb0, 0xbf, write8_delegate(FUNC(segas32_state::scross_bank_w),this));
m_sw1_output = scross_sw1_output;
m_sw2_output = scross_sw2_output;
@@ -4381,7 +4381,7 @@ DRIVER_INIT_MEMBER(segas32_state,sonic)
segas32_common_init(machine(), read16_delegate(FUNC(segas32_state::sonic_custom_io_r),this), write16_delegate(FUNC(segas32_state::sonic_custom_io_w),this));
/* install protection handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x20E5C4, 0x20E5C5, write16_delegate(FUNC(segas32_state::sonic_level_load_protection),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x20E5C4, 0x20E5C5, write16_delegate(FUNC(segas32_state::sonic_level_load_protection),this));
}
@@ -4406,7 +4406,7 @@ DRIVER_INIT_MEMBER(segas32_state,svf)
DRIVER_INIT_MEMBER(segas32_state,jleague)
{
segas32_common_init(machine(), read16_delegate(), write16_delegate());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x20F700, 0x20F705, write16_delegate(FUNC(segas32_state::jleague_protection_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x20F700, 0x20F705, write16_delegate(FUNC(segas32_state::jleague_protection_w),this));
}
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index 3f4bb1af793..5535863f3c2 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -3256,7 +3256,7 @@ DRIVER_INIT_MEMBER(segaxbd_state,loffire)
m_adc_reverse[1] = m_adc_reverse[3] = true;
// install sync hack on core shared memory
- m_loffire_sync = m_maincpu->space(AS_PROGRAM)->install_write_handler(0x29c000, 0x29c011, write16_delegate(FUNC(segaxbd_state::loffire_sync0_w), this));
+ m_loffire_sync = m_maincpu->space(AS_PROGRAM).install_write_handler(0x29c000, 0x29c011, write16_delegate(FUNC(segaxbd_state::loffire_sync0_w), this));
}
DRIVER_INIT_MEMBER(segaxbd_state,smgp)
@@ -3266,7 +3266,7 @@ DRIVER_INIT_MEMBER(segaxbd_state,smgp)
m_iochip_custom_io_w[0][1] = iowrite_delegate(FUNC(segaxbd_state::smgp_iochip0_motor_w), this);
// map /EXCS space
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0x2f0000, 0x2f3fff, read16_delegate(FUNC(segaxbd_state::smgp_excs_r), this), write16_delegate(FUNC(segaxbd_state::smgp_excs_w), this));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x2f0000, 0x2f3fff, read16_delegate(FUNC(segaxbd_state::smgp_excs_r), this), write16_delegate(FUNC(segaxbd_state::smgp_excs_w), this));
}
DRIVER_INIT_MEMBER(segaxbd_state,rascot)
@@ -3281,7 +3281,7 @@ DRIVER_INIT_MEMBER(segaxbd_state,rascot)
rom[0x606/2] = 0x4e71;
// map /EXCS space
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0x0f0000, 0x0f3fff, read16_delegate(FUNC(segaxbd_state::rascot_excs_r), this), write16_delegate(FUNC(segaxbd_state::rascot_excs_w), this));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0f0000, 0x0f3fff, read16_delegate(FUNC(segaxbd_state::rascot_excs_r), this), write16_delegate(FUNC(segaxbd_state::rascot_excs_w), this));
}
DRIVER_INIT_MEMBER(segaxbd_state,gprider)
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index cf936cabc4f..d3e104955de 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1817,9 +1817,9 @@ MACHINE_RESET_MEMBER(seibuspi_state,spi)
machine().device("soundcpu")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE );
machine().device("maincpu")->execute().set_irq_acknowledge_callback(spi_irq_callback);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00000680, 0x00000683, read32_delegate(FUNC(seibuspi_state::sound_fifo_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x00000688, 0x0000068b, write32_delegate(FUNC(seibuspi_state::z80_prg_fifo_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0000068c, 0x0000068f, write32_delegate(FUNC(seibuspi_state::z80_enable_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00000680, 0x00000683, read32_delegate(FUNC(seibuspi_state::sound_fifo_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x00000688, 0x0000068b, write32_delegate(FUNC(seibuspi_state::z80_prg_fifo_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0000068c, 0x0000068f, write32_delegate(FUNC(seibuspi_state::z80_enable_w),this));
membank("bank4")->set_base(m_z80_rom);
membank("bank5")->set_base(m_z80_rom);
@@ -1899,8 +1899,8 @@ MACHINE_RESET_MEMBER(seibuspi_state,sxx2f)
memcpy(m_z80_rom, rom, 0x40000);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0000068c, 0x0000068f, write32_delegate(FUNC(seibuspi_state::eeprom_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00000680, 0x00000683, read32_delegate(FUNC(seibuspi_state::sb_coin_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0000068c, 0x0000068f, write32_delegate(FUNC(seibuspi_state::eeprom_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00000680, 0x00000683, read32_delegate(FUNC(seibuspi_state::sb_coin_r),this));
machine().device("maincpu")->execute().set_irq_acknowledge_callback(spi_irq_callback);
@@ -2077,28 +2077,28 @@ static void init_spi(running_machine &machine)
DRIVER_INIT_MEMBER(seibuspi_state,rdft)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00298d0, 0x00298d3, read32_delegate(FUNC(seibuspi_state::rdft_speedup_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00298d0, 0x00298d3, read32_delegate(FUNC(seibuspi_state::rdft_speedup_r),this));
init_spi(machine());
}
DRIVER_INIT_MEMBER(seibuspi_state,senkyu)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0018cb4, 0x0018cb7, read32_delegate(FUNC(seibuspi_state::senkyu_speedup_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0018cb4, 0x0018cb7, read32_delegate(FUNC(seibuspi_state::senkyu_speedup_r),this));
init_spi(machine());
}
DRIVER_INIT_MEMBER(seibuspi_state,senkyua)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0018c9c, 0x0018c9f, read32_delegate(FUNC(seibuspi_state::senkyua_speedup_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0018c9c, 0x0018c9f, read32_delegate(FUNC(seibuspi_state::senkyua_speedup_r),this));
init_spi(machine());
}
DRIVER_INIT_MEMBER(seibuspi_state,batlball)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0018db4, 0x0018db7, read32_delegate(FUNC(seibuspi_state::batlball_speedup_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0018db4, 0x0018db7, read32_delegate(FUNC(seibuspi_state::batlball_speedup_r),this));
init_spi(machine());
}
@@ -2106,21 +2106,21 @@ DRIVER_INIT_MEMBER(seibuspi_state,batlball)
DRIVER_INIT_MEMBER(seibuspi_state,ejanhs)
{
// idle skip doesn't work properly?
-// machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x002d224, 0x002d227, read32_delegate(FUNC(seibuspi_state::ejanhs_speedup_r),this));
+// machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x002d224, 0x002d227, read32_delegate(FUNC(seibuspi_state::ejanhs_speedup_r),this));
init_spi(machine());
}
DRIVER_INIT_MEMBER(seibuspi_state,viprp1)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x001e2e0, 0x001e2e3, read32_delegate(FUNC(seibuspi_state::viprp1_speedup_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x001e2e0, 0x001e2e3, read32_delegate(FUNC(seibuspi_state::viprp1_speedup_r),this));
init_spi(machine());
}
DRIVER_INIT_MEMBER(seibuspi_state,viprp1o)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x001d49c, 0x001d49f, read32_delegate(FUNC(seibuspi_state::viprp1o_speedup_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x001d49c, 0x001d49f, read32_delegate(FUNC(seibuspi_state::viprp1o_speedup_r),this));
init_spi(machine());
}
@@ -2133,12 +2133,12 @@ static void init_rf2_common(running_machine &machine)
state->m_flash[0] = machine.device<intel_e28f008sa_device>("flash0");
state->m_flash[1] = machine.device<intel_e28f008sa_device>("flash1");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0282AC, 0x0282AF, read32_delegate(FUNC(seibuspi_state::rf2_speedup_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0282AC, 0x0282AF, read32_delegate(FUNC(seibuspi_state::rf2_speedup_r),state));
seibuspi_rise10_text_decrypt(state->memregion("gfx1")->base());
seibuspi_rise10_bg_decrypt(state->memregion("gfx2")->base(), state->memregion("gfx2")->bytes());
seibuspi_rise10_sprite_decrypt(state->memregion("gfx3")->base(), 0x600000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x560, 0x563, write32_delegate(FUNC(seibuspi_state::sprite_dma_start_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x560, 0x563, write32_delegate(FUNC(seibuspi_state::sprite_dma_start_w),state));
}
DRIVER_INIT_MEMBER(seibuspi_state,rdft2)
@@ -2158,12 +2158,12 @@ static void init_rfjet_common(running_machine &machine)
state->m_flash[0] = machine.device<intel_e28f008sa_device>("flash0");
state->m_flash[1] = machine.device<intel_e28f008sa_device>("flash1");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x002894c, 0x002894f, read32_delegate(FUNC(seibuspi_state::rfjet_speedup_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x002894c, 0x002894f, read32_delegate(FUNC(seibuspi_state::rfjet_speedup_r),state));
seibuspi_rise11_text_decrypt(state->memregion("gfx1")->base());
seibuspi_rise11_bg_decrypt(state->memregion("gfx2")->base(), state->memregion("gfx2")->bytes());
seibuspi_rise11_sprite_decrypt_rfjet(state->memregion("gfx3")->base(), 0x800000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x560, 0x563, write32_delegate(FUNC(seibuspi_state::sprite_dma_start_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x560, 0x563, write32_delegate(FUNC(seibuspi_state::sprite_dma_start_w),state));
}
DRIVER_INIT_MEMBER(seibuspi_state,rfjet)
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 1dca6aa058d..0f64ea2a7f0 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -3176,7 +3176,7 @@ ADDRESS_MAP_END
MACHINE_RESET_MEMBER(seta_state,calibr50)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
sub_bankswitch_w(space, 0, 0);
}
@@ -10721,10 +10721,10 @@ WRITE16_MEMBER(seta_state::twineagl_200100_w)
DRIVER_INIT_MEMBER(seta_state,twineagl)
{
/* debug? */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x800000, 0x8000ff, read16_delegate(FUNC(seta_state::twineagl_debug_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x800000, 0x8000ff, read16_delegate(FUNC(seta_state::twineagl_debug_r),this));
/* This allows 2 simultaneous players and the use of the "Copyright" Dip Switch. */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x200100, 0x20010f, read16_delegate(FUNC(seta_state::twineagl_200100_r),this), write16_delegate(FUNC(seta_state::twineagl_200100_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x200100, 0x20010f, read16_delegate(FUNC(seta_state::twineagl_200100_r),this), write16_delegate(FUNC(seta_state::twineagl_200100_w),this));
}
@@ -10753,7 +10753,7 @@ WRITE16_MEMBER(seta_state::downtown_protection_w)
DRIVER_INIT_MEMBER(seta_state,downtown)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x200000, 0x2001ff, read16_delegate(FUNC(seta_state::downtown_protection_r),this), write16_delegate(FUNC(seta_state::downtown_protection_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x200000, 0x2001ff, read16_delegate(FUNC(seta_state::downtown_protection_r),this), write16_delegate(FUNC(seta_state::downtown_protection_w),this));
}
@@ -10773,7 +10773,7 @@ READ16_MEMBER(seta_state::arbalest_debug_r)
DRIVER_INIT_MEMBER(seta_state,arbalest)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x80000, 0x8000f, read16_delegate(FUNC(seta_state::arbalest_debug_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x80000, 0x8000f, read16_delegate(FUNC(seta_state::arbalest_debug_r),this));
}
@@ -10782,7 +10782,7 @@ DRIVER_INIT_MEMBER(seta_state,metafox)
UINT16 *RAM = (UINT16 *) machine().root_device().memregion("maincpu")->base();
/* This game uses the 21c000-21ffff area for protection? */
-// machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_readwrite(0x21c000, 0x21ffff);
+// machine().device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite(0x21c000, 0x21ffff);
RAM[0x8ab1c/2] = 0x4e71; // patch protection test: "cp error"
RAM[0x8ab1e/2] = 0x4e71;
@@ -10826,14 +10826,14 @@ DRIVER_INIT_MEMBER(seta_state,blandia)
DRIVER_INIT_MEMBER(seta_state,eightfrc)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_read(0x500004, 0x500005); // watchdog??
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_read(0x500004, 0x500005); // watchdog??
}
DRIVER_INIT_MEMBER(seta_state,zombraid)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xf00002, 0xf00003, read16_delegate(FUNC(seta_state::zombraid_gun_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xf00000, 0xf00001, write16_delegate(FUNC(seta_state::zombraid_gun_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xf00002, 0xf00003, read16_delegate(FUNC(seta_state::zombraid_gun_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xf00000, 0xf00001, write16_delegate(FUNC(seta_state::zombraid_gun_w),this));
}
@@ -10851,7 +10851,7 @@ DRIVER_INIT_MEMBER(seta_state,kiwame)
DRIVER_INIT_MEMBER(seta_state,rezon)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_read(0x500006, 0x500007); // irq ack?
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_read(0x500006, 0x500007); // irq ack?
}
DRIVER_INIT_MEMBER(seta_state,wiggie)
@@ -10883,8 +10883,8 @@ DRIVER_INIT_MEMBER(seta_state,wiggie)
}
/* X1_010 is not used. */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_readwrite(0x100000, 0x103fff);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xB00008, 0xB00009, write16_delegate(FUNC(seta_state::wiggie_soundlatch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite(0x100000, 0x103fff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xB00008, 0xB00009, write16_delegate(FUNC(seta_state::wiggie_soundlatch_w),this));
}
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index 9bf934243ba..c93af578f81 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -404,7 +404,7 @@ ROM_END
DRIVER_INIT_MEMBER(shootout_state,shootout)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int length = machine().root_device().memregion("maincpu")->bytes();
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, length - 0x8000);
UINT8 *rom = machine().root_device().memregion("maincpu")->base();
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index 35a4dc68404..d3d1a9d020a 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -502,14 +502,14 @@ ROM_END
DRIVER_INIT_MEMBER(sidepckt_state,sidepckt)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x3014, 0x3014, read8_delegate(FUNC(sidepckt_state::sidepckt_i8751_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x3018, 0x3018, write8_delegate(FUNC(sidepckt_state::sidepckt_i8751_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x3014, 0x3014, read8_delegate(FUNC(sidepckt_state::sidepckt_i8751_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x3018, 0x3018, write8_delegate(FUNC(sidepckt_state::sidepckt_i8751_w),this));
}
DRIVER_INIT_MEMBER(sidepckt_state,sidepctj)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x3014, 0x3014, read8_delegate(FUNC(sidepckt_state::sidepckt_i8751_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x3018, 0x3018, write8_delegate(FUNC(sidepckt_state::sidepctj_i8751_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x3014, 0x3014, read8_delegate(FUNC(sidepckt_state::sidepckt_i8751_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x3018, 0x3018, write8_delegate(FUNC(sidepckt_state::sidepctj_i8751_w),this));
}
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index 51c24ebdb64..23b8295152d 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -1061,7 +1061,7 @@ READ32_MEMBER(simpl156_state::joemacr_speedup_r)
DRIVER_INIT_MEMBER(simpl156_state,joemacr)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0201018, 0x020101b, read32_delegate(FUNC(simpl156_state::joemacr_speedup_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0201018, 0x020101b, read32_delegate(FUNC(simpl156_state::joemacr_speedup_r),this));
DRIVER_INIT_CALL(simpl156);
}
@@ -1074,7 +1074,7 @@ READ32_MEMBER(simpl156_state::chainrec_speedup_r)
DRIVER_INIT_MEMBER(simpl156_state,chainrec)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0201018, 0x020101b, read32_delegate(FUNC(simpl156_state::chainrec_speedup_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0201018, 0x020101b, read32_delegate(FUNC(simpl156_state::chainrec_speedup_r),this));
DRIVER_INIT_CALL(simpl156);
}
@@ -1087,7 +1087,7 @@ READ32_MEMBER(simpl156_state::prtytime_speedup_r)
DRIVER_INIT_MEMBER(simpl156_state,prtytime)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0201ae0, 0x0201ae3, read32_delegate(FUNC(simpl156_state::prtytime_speedup_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0201ae0, 0x0201ae3, read32_delegate(FUNC(simpl156_state::prtytime_speedup_r),this));
DRIVER_INIT_CALL(simpl156);
}
@@ -1101,7 +1101,7 @@ READ32_MEMBER(simpl156_state::charlien_speedup_r)
DRIVER_INIT_MEMBER(simpl156_state,charlien)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0201010, 0x0201013, read32_delegate(FUNC(simpl156_state::charlien_speedup_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0201010, 0x0201013, read32_delegate(FUNC(simpl156_state::charlien_speedup_r),this));
DRIVER_INIT_CALL(simpl156);
}
@@ -1114,7 +1114,7 @@ READ32_MEMBER(simpl156_state::osman_speedup_r)
DRIVER_INIT_MEMBER(simpl156_state,osman)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0201010, 0x0201013, read32_delegate(FUNC(simpl156_state::osman_speedup_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0201010, 0x0201013, read32_delegate(FUNC(simpl156_state::osman_speedup_r),this));
DRIVER_INIT_CALL(simpl156);
}
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index bc4e1ae60e6..811de98bc89 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -148,7 +148,7 @@ INTERRUPT_GEN_MEMBER(skydiver_state::skydiver_interrupt)
device_t *discrete = machine().device("discrete");
/* Convert range data to divide value and write to sound */
- address_space &space = *machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = machine().firstcpu->space(AS_PROGRAM);
discrete_sound_w(discrete, space, SKYDIVER_RANGE_DATA, (0x01 << (~m_videoram[0x394] & 0x07)) & 0xff); // Range 0-2
discrete_sound_w(discrete, space, SKYDIVER_RANGE3_EN, m_videoram[0x394] & 0x08); // Range 3 - note disable
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index f11ca1b9d83..124c8152dac 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -1739,12 +1739,12 @@ ROM_END
DRIVER_INIT_MEMBER(slapfght_state,tigerh)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xe803, 0xe803, read8_delegate(FUNC(slapfght_state::tigerh_mcu_r),this), write8_delegate(FUNC(slapfght_state::tigerh_mcu_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xe803, 0xe803, read8_delegate(FUNC(slapfght_state::tigerh_mcu_r),this), write8_delegate(FUNC(slapfght_state::tigerh_mcu_w),this));
}
DRIVER_INIT_MEMBER(slapfght_state,tigerhb)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xe803, 0xe803, read8_delegate(FUNC(slapfght_state::tigerhb_e803_r),this), write8_delegate(FUNC(slapfght_state::tigerhb_e803_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xe803, 0xe803, read8_delegate(FUNC(slapfght_state::tigerhb_e803_r),this), write8_delegate(FUNC(slapfght_state::tigerhb_e803_w),this));
}
@@ -1805,8 +1805,8 @@ READ8_MEMBER(slapfght_state::gtstarb1_port_0_read)
static void getstar_init( running_machine &machine )
{
slapfght_state *state = machine.driver_data<slapfght_state>();
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xe803, 0xe803, read8_delegate(FUNC(slapfght_state::getstar_e803_r),state), write8_delegate(FUNC(slapfght_state::getstar_e803_w),state));
- machine.device("maincpu")->memory().space(AS_IO)->install_read_handler(0x00, 0x00, read8_delegate(FUNC(slapfght_state::slapfight_port_00_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xe803, 0xe803, read8_delegate(FUNC(slapfght_state::getstar_e803_r),state), write8_delegate(FUNC(slapfght_state::getstar_e803_w),state));
+ machine.device("maincpu")->memory().space(AS_IO).install_read_handler(0x00, 0x00, read8_delegate(FUNC(slapfght_state::slapfight_port_00_r),state));
}
DRIVER_INIT_MEMBER(slapfght_state,getstar)
@@ -1829,7 +1829,7 @@ DRIVER_INIT_MEMBER(slapfght_state,gtstarb1)
getstar_init(machine());
/* specific handlers for this bootleg */
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x0, 0x0, read8_delegate(FUNC(slapfght_state::gtstarb1_port_0_read),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x0, 0x0, read8_delegate(FUNC(slapfght_state::gtstarb1_port_0_read),this));
/* requires this or it gets stuck with 'rom test' on screen */
/* it is possible the program roms are slighly corrupt like the gfx roms, or
that the bootleg simply shouldn't execute the code due to the modified roms */
@@ -1845,13 +1845,13 @@ DRIVER_INIT_MEMBER(slapfght_state,gtstarb2)
DRIVER_INIT_MEMBER(slapfght_state,slapfigh)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xe803, 0xe803, read8_delegate(FUNC(slapfght_state::slapfight_mcu_r),this), write8_delegate(FUNC(slapfght_state::slapfight_mcu_w),this));
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x00, 0x00, read8_delegate(FUNC(slapfght_state::slapfight_mcu_status_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xe803, 0xe803, read8_delegate(FUNC(slapfght_state::slapfight_mcu_r),this), write8_delegate(FUNC(slapfght_state::slapfight_mcu_w),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x00, 0x00, read8_delegate(FUNC(slapfght_state::slapfight_mcu_status_r),this));
}
DRIVER_INIT_MEMBER(slapfght_state,perfrman)
{
- machine().device("maincpu")->memory().space(AS_IO)->install_read_handler(0x00, 0x00, read8_delegate(FUNC(slapfght_state::perfrman_port_00_r),this));
+ machine().device("maincpu")->memory().space(AS_IO).install_read_handler(0x00, 0x00, read8_delegate(FUNC(slapfght_state::perfrman_port_00_r),this));
}
/* ( YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS ) */
diff --git a/src/mame/drivers/snesb.c b/src/mame/drivers/snesb.c
index 6c7e4d6cbb6..682bf065e30 100644
--- a/src/mame/drivers/snesb.c
+++ b/src/mame/drivers/snesb.c
@@ -662,12 +662,12 @@ DRIVER_INIT_MEMBER(snesb_state,kinstb)
}
m_shared_ram = auto_alloc_array(machine(), INT8, 0x100);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x781000, 0x7810ff, read8_delegate(FUNC(snesb_state::sharedram_r),this), write8_delegate(FUNC(snesb_state::sharedram_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x781000, 0x7810ff, read8_delegate(FUNC(snesb_state::sharedram_r),this), write8_delegate(FUNC(snesb_state::sharedram_w),this));
/* extra inputs */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770071, 0x770071, read8_delegate(FUNC(snesb_state::snesb_dsw1_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770073, 0x770073, read8_delegate(FUNC(snesb_state::snesb_dsw2_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770079, 0x770079, read8_delegate(FUNC(snesb_state::snesb_coin_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770071, 0x770071, read8_delegate(FUNC(snesb_state::snesb_dsw1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770073, 0x770073, read8_delegate(FUNC(snesb_state::snesb_dsw2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770079, 0x770079, read8_delegate(FUNC(snesb_state::snesb_coin_r),this));
DRIVER_INIT_CALL(snes_hirom);
}
@@ -708,9 +708,9 @@ DRIVER_INIT_MEMBER(snesb_state,ffight2b)
rom[0x7ffc] = 0x54;
/* extra inputs */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770071, 0x770071, read8_delegate(FUNC(snesb_state::snesb_dsw1_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770073, 0x770073, read8_delegate(FUNC(snesb_state::snesb_dsw2_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770079, 0x770079, read8_delegate(FUNC(snesb_state::snesb_coin_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770071, 0x770071, read8_delegate(FUNC(snesb_state::snesb_dsw1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770073, 0x770073, read8_delegate(FUNC(snesb_state::snesb_dsw2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770079, 0x770079, read8_delegate(FUNC(snesb_state::snesb_coin_r),this));
DRIVER_INIT_CALL(snes);
}
@@ -733,9 +733,9 @@ DRIVER_INIT_MEMBER(snesb_state,iron)
}
/* extra inputs */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770071, 0x770071, read8_delegate(FUNC(snesb_state::snesb_dsw1_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770073, 0x770073, read8_delegate(FUNC(snesb_state::snesb_dsw2_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770079, 0x770079, read8_delegate(FUNC(snesb_state::snesb_coin_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770071, 0x770071, read8_delegate(FUNC(snesb_state::snesb_dsw1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770073, 0x770073, read8_delegate(FUNC(snesb_state::snesb_dsw2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770079, 0x770079, read8_delegate(FUNC(snesb_state::snesb_coin_r),this));
DRIVER_INIT_CALL(snes);
}
@@ -764,9 +764,9 @@ DRIVER_INIT_MEMBER(snesb_state,denseib)
rom[0xfffd] = 0xf7;
/* extra inputs */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770071, 0x770071, read8_delegate(FUNC(snesb_state::snesb_dsw1_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770073, 0x770073, read8_delegate(FUNC(snesb_state::snesb_dsw2_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770079, 0x770079, read8_delegate(FUNC(snesb_state::snesb_coin_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770071, 0x770071, read8_delegate(FUNC(snesb_state::snesb_dsw1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770073, 0x770073, read8_delegate(FUNC(snesb_state::snesb_dsw2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770079, 0x770079, read8_delegate(FUNC(snesb_state::snesb_coin_r),this));
DRIVER_INIT_CALL(snes_hirom);
}
@@ -824,16 +824,16 @@ DRIVER_INIT_MEMBER(snesb_state,sblast2b)
dst[0xfffd] = 0x7a;
/* protection checks */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x75bd37, 0x75bd37, read8_delegate(FUNC(snesb_state::sb2b_75bd37_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x6a6000, 0x6a6fff, read8_delegate(FUNC(snesb_state::sb2b_6a6xxx_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x75bd37, 0x75bd37, read8_delegate(FUNC(snesb_state::sb2b_75bd37_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x6a6000, 0x6a6fff, read8_delegate(FUNC(snesb_state::sb2b_6a6xxx_r),this));
/* handler to read boot code */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x007000, 0x007fff, read8_delegate(FUNC(snesb_state::sb2b_7xxx_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x007000, 0x007fff, read8_delegate(FUNC(snesb_state::sb2b_7xxx_r),this));
/* extra inputs */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770071, 0x770071, read8_delegate(FUNC(snesb_state::snesb_dsw1_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770073, 0x770073, read8_delegate(FUNC(snesb_state::snesb_dsw2_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x770079, 0x770079, read8_delegate(FUNC(snesb_state::snesb_coin_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770071, 0x770071, read8_delegate(FUNC(snesb_state::snesb_dsw1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770073, 0x770073, read8_delegate(FUNC(snesb_state::snesb_dsw2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x770079, 0x770079, read8_delegate(FUNC(snesb_state::snesb_coin_r),this));
DRIVER_INIT_CALL(snes_hirom);
}
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index 485ad250bfc..7e6d87a5606 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -6266,7 +6266,7 @@ ROM_END
DRIVER_INIT_MEMBER(snk_state,countryc)
{
// replace coin counter with trackball select
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xc300, 0xc300, write8_delegate(FUNC(snk_state::countryc_trackball_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xc300, 0xc300, write8_delegate(FUNC(snk_state::countryc_trackball_w),this));
}
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index f7ef463b773..171169d564f 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -2342,7 +2342,7 @@ DRIVER_INIT_MEMBER(snowbros_state,moremorp)
// m_hyperpac_ram[0xf000/2 + i] = PROTDATA[i];
/* explicit check in the code */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x200000, 0x200001, read16_delegate(FUNC(snowbros_state::moremorp_0a_read),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16_delegate(FUNC(snowbros_state::moremorp_0a_read),this));
}
@@ -2741,7 +2741,7 @@ DRIVER_INIT_MEMBER(snowbros_state,4in1boot)
memcpy(src,buffer,len);
auto_free(machine(), buffer);
}
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x200000, 0x200001, read16_delegate(FUNC(snowbros_state::_4in1_02_read),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16_delegate(FUNC(snowbros_state::_4in1_02_read),this));
}
DRIVER_INIT_MEMBER(snowbros_state,snowbro3)
@@ -2768,7 +2768,7 @@ READ16_MEMBER(snowbros_state::_3in1_read)
DRIVER_INIT_MEMBER(snowbros_state,3in1semi)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x200000, 0x200001, read16_delegate(FUNC(snowbros_state::_3in1_read),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16_delegate(FUNC(snowbros_state::_3in1_read),this));
}
READ16_MEMBER(snowbros_state::cookbib3_read)
@@ -2778,7 +2778,7 @@ READ16_MEMBER(snowbros_state::cookbib3_read)
DRIVER_INIT_MEMBER(snowbros_state,cookbib3)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x200000, 0x200001, read16_delegate(FUNC(snowbros_state::cookbib3_read),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x200000, 0x200001, read16_delegate(FUNC(snowbros_state::cookbib3_read),this));
}
DRIVER_INIT_MEMBER(snowbros_state,pzlbreak)
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index 399347abb98..ec76e11fb12 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -180,7 +180,7 @@ void spacefb_state::machine_start()
void spacefb_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_IO);
+ address_space &space = machine().device("maincpu")->memory().space(AS_IO);
/* the 3 output ports are cleared on reset */
spacefb_port_0_w(space, 0, 0);
spacefb_port_1_w(space, 0, 0);
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index fe95637e6b6..ed47158bfd8 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -102,7 +102,7 @@ INTERRUPT_GEN_MEMBER(sprint2_state::sprint2)
}
}
- address_space &space = *machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = machine().firstcpu->space(AS_PROGRAM);
discrete_sound_w(discrete, space, SPRINT2_MOTORSND1_DATA, m_video_ram[0x394] & 15); // also DOMINOS_FREQ_DATA
discrete_sound_w(discrete, space, SPRINT2_MOTORSND2_DATA, m_video_ram[0x395] & 15);
discrete_sound_w(discrete, space, SPRINT2_CRASHSND_DATA, m_video_ram[0x396] & 15); // also DOMINOS_AMP_DATA
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 0900615eb4a..c327a2201fb 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -45,7 +45,7 @@ WRITE8_MEMBER(srumbler_state::srumbler_bankswitch_w)
void srumbler_state::machine_start()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* initialize banked ROM pointers */
srumbler_bankswitch_w(space,0,0);
}
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index bdb119457b1..3b887e45fe5 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -48,7 +48,7 @@ void starwars_state::machine_reset()
/* ESB-specific */
if (m_is_esb)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* reset the slapstic */
slapstic_reset();
@@ -514,14 +514,14 @@ DRIVER_INIT_MEMBER(starwars_state,esb)
m_slapstic_base = &rom[0x08000];
/* install an opcode base handler */
- address_space &space = *machine().device<m6809_device>("maincpu")->space(AS_PROGRAM);
+ address_space &space = machine().device<m6809_device>("maincpu")->space(AS_PROGRAM);
space.set_direct_update_handler(direct_update_delegate(FUNC(starwars_state::esb_setdirect), this));
/* install read/write handlers for it */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x8000, 0x9fff, read8_delegate(FUNC(starwars_state::esb_slapstic_r),this), write8_delegate(FUNC(starwars_state::esb_slapstic_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x8000, 0x9fff, read8_delegate(FUNC(starwars_state::esb_slapstic_r),this), write8_delegate(FUNC(starwars_state::esb_slapstic_w),this));
/* install additional banking */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xa000, 0xffff, "bank2");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xa000, 0xffff, "bank2");
/* prepare the matrix processor */
m_is_esb = 1;
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index f3da64996aa..a911050a15f 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -1128,8 +1128,8 @@ WRITE8_MEMBER(statriv2_state::laserdisc_io_w)
DRIVER_INIT_MEMBER(statriv2_state,laserdisc)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
- iospace->install_readwrite_handler(0x28, 0x2b, read8_delegate(FUNC(statriv2_state::laserdisc_io_r), this), write8_delegate(FUNC(statriv2_state::laserdisc_io_w), this));
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
+ iospace.install_readwrite_handler(0x28, 0x2b, read8_delegate(FUNC(statriv2_state::laserdisc_io_r), this), write8_delegate(FUNC(statriv2_state::laserdisc_io_w), this));
}
diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c
index 32bdcd88f17..dc54d5de56c 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -539,16 +539,16 @@ DRIVER_INIT_MEMBER(strnskil_state,pettanp)
// AM_RANGE(0xd806, 0xd806) AM_READ_LEGACY(protection_r) /* protection data read (pettanp) */
/* Fujitsu MB8841 4-Bit MCU */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd806, 0xd806, read8_delegate(FUNC(strnskil_state::pettanp_protection_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xd80d, 0xd80d, write8_delegate(FUNC(strnskil_state::protection_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd806, 0xd806, read8_delegate(FUNC(strnskil_state::pettanp_protection_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xd80d, 0xd80d, write8_delegate(FUNC(strnskil_state::protection_w),this));
}
DRIVER_INIT_MEMBER(strnskil_state,banbam)
{
/* Fujitsu MB8841 4-Bit MCU */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd806, 0xd806, read8_delegate(FUNC(strnskil_state::banbam_protection_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xd80d, 0xd80d, write8_delegate(FUNC(strnskil_state::protection_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd806, 0xd806, read8_delegate(FUNC(strnskil_state::banbam_protection_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xd80d, 0xd80d, write8_delegate(FUNC(strnskil_state::protection_w),this));
}
GAME( 1984, strnskil, 0, strnskil, strnskil, driver_device, 0, ROT0, "Sun Electronics", "Strength & Skill", 0 )
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index f14331bef71..a8aaa4b980b 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -343,8 +343,8 @@ DRIVER_INIT_MEMBER(saturn_state,stv)
sh2drc_set_options(machine().device("maincpu"), SH2DRC_STRICT_VERIFY|SH2DRC_STRICT_PCREL);
sh2drc_set_options(machine().device("slave"), SH2DRC_STRICT_VERIFY|SH2DRC_STRICT_PCREL);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::stv_ioga_r32),this), write32_delegate(FUNC(saturn_state::stv_ioga_w32),this));
- machine().device("slave")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::stv_ioga_r32),this), write32_delegate(FUNC(saturn_state::stv_ioga_w32),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::stv_ioga_r32),this), write32_delegate(FUNC(saturn_state::stv_ioga_w32),this));
+ machine().device("slave")->memory().space(AS_PROGRAM).install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::stv_ioga_r32),this), write32_delegate(FUNC(saturn_state::stv_ioga_w32),this));
m_vdp2.pal = 0;
}
@@ -352,8 +352,8 @@ DRIVER_INIT_MEMBER(saturn_state,stv)
DRIVER_INIT_MEMBER(saturn_state,critcrsh)
{
DRIVER_INIT_CALL(stv);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::critcrsh_ioga_r32),this), write32_delegate(FUNC(saturn_state::stv_ioga_w32),this));
- machine().device("slave")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::critcrsh_ioga_r32),this), write32_delegate(FUNC(saturn_state::stv_ioga_w32),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::critcrsh_ioga_r32),this), write32_delegate(FUNC(saturn_state::stv_ioga_w32),this));
+ machine().device("slave")->memory().space(AS_PROGRAM).install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::critcrsh_ioga_r32),this), write32_delegate(FUNC(saturn_state::stv_ioga_w32),this));
}
/*
@@ -390,11 +390,11 @@ DRIVER_INIT_MEMBER(saturn_state,magzun)
DRIVER_INIT_CALL(stv);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::magzun_ioga_r32),this), write32_delegate(FUNC(saturn_state::magzun_ioga_w32),this));
- machine().device("slave")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::magzun_ioga_r32),this), write32_delegate(FUNC(saturn_state::magzun_ioga_w32),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::magzun_ioga_r32),this), write32_delegate(FUNC(saturn_state::magzun_ioga_w32),this));
+ machine().device("slave")->memory().space(AS_PROGRAM).install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::magzun_ioga_r32),this), write32_delegate(FUNC(saturn_state::magzun_ioga_w32),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x608e830, 0x608e833, read32_delegate(FUNC(saturn_state::magzun_hef_hack_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x60ff3b4, 0x60ff3b7, read32_delegate(FUNC(saturn_state::magzun_rx_hack_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x608e830, 0x608e833, read32_delegate(FUNC(saturn_state::magzun_hef_hack_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x60ff3b4, 0x60ff3b7, read32_delegate(FUNC(saturn_state::magzun_rx_hack_r),this));
/* Program ROM patches, don't understand how to avoid these two checks ... */
{
@@ -410,8 +410,8 @@ DRIVER_INIT_MEMBER(saturn_state,magzun)
DRIVER_INIT_MEMBER(saturn_state,stvmp)
{
DRIVER_INIT_CALL(stv);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::stvmp_ioga_r32),this), write32_delegate(FUNC(saturn_state::stvmp_ioga_w32),this));
- machine().device("slave")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::stvmp_ioga_r32),this), write32_delegate(FUNC(saturn_state::stvmp_ioga_w32),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::stvmp_ioga_r32),this), write32_delegate(FUNC(saturn_state::stvmp_ioga_w32),this));
+ machine().device("slave")->memory().space(AS_PROGRAM).install_readwrite_handler(0x00400000, 0x0040003f, read32_delegate(FUNC(saturn_state::stvmp_ioga_r32),this), write32_delegate(FUNC(saturn_state::stvmp_ioga_w32),this));
}
@@ -663,7 +663,7 @@ DRIVER_INIT_MEMBER(saturn_state,astrass)
sh2drc_add_pcflush(machine().device("maincpu"), 0x60011ba);
sh2drc_add_pcflush(machine().device("maincpu"), 0x605b9da);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x06000770, 0x06000773, read32_delegate(FUNC(saturn_state::astrass_hack_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x06000770, 0x06000773, read32_delegate(FUNC(saturn_state::astrass_hack_r),this));
install_astrass_protection(machine());
diff --git a/src/mame/drivers/su2000.c b/src/mame/drivers/su2000.c
index c5ab5c17423..e124ab1504c 100644
--- a/src/mame/drivers/su2000.c
+++ b/src/mame/drivers/su2000.c
@@ -260,7 +260,7 @@ static IRQ_CALLBACK( pc_irq_callback )
void su2000_state::machine_start()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
m_pit8254 = machine().device("pit8254");
m_pic8259_1 = machine().device("pic8259_1");
@@ -287,7 +287,7 @@ void su2000_state::machine_start()
kbdc8042_init(machine(), &at8042);
pc_vga_init(machine(), vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
}
void su2000_state::machine_reset()
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 065f58d7514..db64e6000b5 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -361,7 +361,7 @@ ADDRESS_MAP_END
MACHINE_RESET_MEMBER(suna16_state,uballoon)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
uballoon_pcm_1_bankswitch_w(space, 0, 0);
}
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index 06ee8a93375..1a15280bd92 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -81,7 +81,7 @@ DRIVER_INIT_MEMBER(suna8_state,hardhead)
/* Non encrypted bootleg */
DRIVER_INIT_MEMBER(suna8_state,hardhedb)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.set_decrypted_region(0x0000, 0x7fff, machine().root_device().memregion("maincpu")->base() + 0x48000);
machine().root_device().membank("bank1")->configure_entries(0, 16, machine().root_device().memregion("maincpu")->base() + 0x10000, 0x4000);
}
@@ -92,7 +92,7 @@ DRIVER_INIT_MEMBER(suna8_state,hardhedb)
static UINT8 *brickzn_decrypt(running_machine &machine)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *RAM = machine.root_device().memregion("maincpu")->base();
size_t size = machine.root_device().memregion("maincpu")->bytes();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, size);
@@ -222,7 +222,7 @@ DRIVER_INIT_MEMBER(suna8_state,brickznv4)
DRIVER_INIT_MEMBER(suna8_state,hardhea2)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *RAM = machine().root_device().memregion("maincpu")->base();
size_t size = machine().root_device().memregion("maincpu")->bytes();
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, size);
@@ -309,7 +309,7 @@ rom13: 0?, 1y, 2n, 3n ?,?,?,? (palettes)
DRIVER_INIT_MEMBER(suna8_state,starfigh)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *RAM = machine().root_device().memregion("maincpu")->base();
size_t size = machine().root_device().memregion("maincpu")->bytes();
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, size);
@@ -377,7 +377,7 @@ DRIVER_INIT_MEMBER(suna8_state,starfigh)
DRIVER_INIT_MEMBER(suna8_state,sparkman)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *RAM = machine().root_device().memregion("maincpu")->base();
size_t size = machine().root_device().memregion("maincpu")->bytes();
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, size);
@@ -1832,7 +1832,7 @@ static TIMER_DEVICE_CALLBACK( hardhea2_interrupt )
MACHINE_RESET_MEMBER(suna8_state,hardhea2)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
hardhea2_rambank_0_w(space,0,0);
}
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index 83001feb49d..635a6a3d41d 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -453,8 +453,8 @@ READ16_MEMBER(superchs_state::sub_cycle_r)
DRIVER_INIT_MEMBER(superchs_state,superchs)
{
/* Speedup handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x100000, 0x100003, read32_delegate(FUNC(superchs_state::main_cycle_r),this));
- machine().device("sub")->memory().space(AS_PROGRAM)->install_read_handler(0x80000a, 0x80000b, read16_delegate(FUNC(superchs_state::sub_cycle_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x100000, 0x100003, read32_delegate(FUNC(superchs_state::main_cycle_r),this));
+ machine().device("sub")->memory().space(AS_PROGRAM).install_read_handler(0x80000a, 0x80000b, read16_delegate(FUNC(superchs_state::sub_cycle_r),this));
}
GAMEL( 1992, superchs, 0, superchs, superchs, superchs_state, superchs, ROT0, "Taito America Corporation", "Super Chase - Criminal Termination (US)", 0, layout_superchs )
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index b770bf695d5..ed5a63db424 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -288,7 +288,7 @@ UINT32 supertnk_state::screen_update_supertnk(screen_device &screen, bitmap_rgb3
void supertnk_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
supertnk_bankswitch_0_w(space, 0, 0);
supertnk_bankswitch_1_w(space, 0, 0);
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index e21abd12a59..7aaf19a1aa4 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -970,21 +970,21 @@ static void set_drc_pcflush(running_machine &machine, UINT32 addr)
DRIVER_INIT_MEMBER(skns_state,galpani4) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-5,-1); init_skns(machine()); }
DRIVER_INIT_MEMBER(skns_state,galpanis) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-5,-1); init_skns(machine()); }
-DRIVER_INIT_MEMBER(skns_state,cyvern) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+0,+2); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x604d3c8, 0x604d3cb, read32_delegate(FUNC(skns_state::cyvern_speedup_r),this) ); set_drc_pcflush(machine(), 0x402ebd2); }
-DRIVER_INIT_MEMBER(skns_state,galpans2) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-1,-1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x60fb6bc, 0x60fb6bf, read32_delegate(FUNC(skns_state::galpans2_speedup_r),this) ); set_drc_pcflush(machine(), 0x4049ae2); }
-DRIVER_INIT_MEMBER(skns_state,gutsn) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+0,+0); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x600c780, 0x600c783, read32_delegate(FUNC(skns_state::gutsn_speedup_r),this) ); set_drc_pcflush(machine(), 0x402206e); }
-DRIVER_INIT_MEMBER(skns_state,panicstr) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-1,-1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x60f19e4, 0x60f19e7, read32_delegate(FUNC(skns_state::panicstr_speedup_r),this) ); set_drc_pcflush(machine(), 0x404e68a); }
-DRIVER_INIT_MEMBER(skns_state,senknow) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+1,+1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x60000dc, 0x60000df, read32_delegate(FUNC(skns_state::senknow_speedup_r),this) ); set_drc_pcflush(machine(), 0x4017dce); }
-DRIVER_INIT_MEMBER(skns_state,puzzloope) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x6081d38, 0x6081d3b, read32_delegate(FUNC(skns_state::puzzloope_speedup_r),this) ); set_drc_pcflush(machine(), 0x401da14); }
-DRIVER_INIT_MEMBER(skns_state,puzzloopj) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x6086714, 0x6086717, read32_delegate(FUNC(skns_state::puzzloopj_speedup_r),this) ); set_drc_pcflush(machine(), 0x401dca0); }
-DRIVER_INIT_MEMBER(skns_state,puzzloopa) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x6085bcc, 0x6085bcf, read32_delegate(FUNC(skns_state::puzzloopa_speedup_r),this) ); set_drc_pcflush(machine(), 0x401d9d4); }
-DRIVER_INIT_MEMBER(skns_state,puzzloopu) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x6085cec, 0x6085cef, read32_delegate(FUNC(skns_state::puzzloopu_speedup_r),this) ); set_drc_pcflush(machine(), 0x401dab0); }
-DRIVER_INIT_MEMBER(skns_state,jjparads) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x6000994, 0x6000997, read32_delegate(FUNC(skns_state::jjparads_speedup_r),this) ); set_drc_pcflush(machine(), 0x4015e84); }
-DRIVER_INIT_MEMBER(skns_state,jjparad2) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x6000984, 0x6000987, read32_delegate(FUNC(skns_state::jjparad2_speedup_r),this) ); set_drc_pcflush(machine(), 0x401620a); }
-DRIVER_INIT_MEMBER(skns_state,ryouran) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x6000a14, 0x6000a17, read32_delegate(FUNC(skns_state::ryouran_speedup_r),this) ); set_drc_pcflush(machine(), 0x40182ce); }
-DRIVER_INIT_MEMBER(skns_state,teljan) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x6002fb4, 0x6002fb7, read32_delegate(FUNC(skns_state::teljan_speedup_r),this) ); set_drc_pcflush(machine(), 0x401ba32); }
-DRIVER_INIT_MEMBER(skns_state,sengekis) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-192,-272); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x60b74bc, 0x60b74bf, read32_delegate(FUNC(skns_state::sengekis_speedup_r),this) ); set_drc_pcflush(machine(), 0x60006ec); }
-DRIVER_INIT_MEMBER(skns_state,sengekij) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-192,-272); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x60b7380, 0x60b7383, read32_delegate(FUNC(skns_state::sengekij_speedup_r),this) ); set_drc_pcflush(machine(), 0x60006ec); }
+DRIVER_INIT_MEMBER(skns_state,cyvern) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+0,+2); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x604d3c8, 0x604d3cb, read32_delegate(FUNC(skns_state::cyvern_speedup_r),this) ); set_drc_pcflush(machine(), 0x402ebd2); }
+DRIVER_INIT_MEMBER(skns_state,galpans2) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-1,-1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x60fb6bc, 0x60fb6bf, read32_delegate(FUNC(skns_state::galpans2_speedup_r),this) ); set_drc_pcflush(machine(), 0x4049ae2); }
+DRIVER_INIT_MEMBER(skns_state,gutsn) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+0,+0); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x600c780, 0x600c783, read32_delegate(FUNC(skns_state::gutsn_speedup_r),this) ); set_drc_pcflush(machine(), 0x402206e); }
+DRIVER_INIT_MEMBER(skns_state,panicstr) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-1,-1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x60f19e4, 0x60f19e7, read32_delegate(FUNC(skns_state::panicstr_speedup_r),this) ); set_drc_pcflush(machine(), 0x404e68a); }
+DRIVER_INIT_MEMBER(skns_state,senknow) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+1,+1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x60000dc, 0x60000df, read32_delegate(FUNC(skns_state::senknow_speedup_r),this) ); set_drc_pcflush(machine(), 0x4017dce); }
+DRIVER_INIT_MEMBER(skns_state,puzzloope) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x6081d38, 0x6081d3b, read32_delegate(FUNC(skns_state::puzzloope_speedup_r),this) ); set_drc_pcflush(machine(), 0x401da14); }
+DRIVER_INIT_MEMBER(skns_state,puzzloopj) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x6086714, 0x6086717, read32_delegate(FUNC(skns_state::puzzloopj_speedup_r),this) ); set_drc_pcflush(machine(), 0x401dca0); }
+DRIVER_INIT_MEMBER(skns_state,puzzloopa) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x6085bcc, 0x6085bcf, read32_delegate(FUNC(skns_state::puzzloopa_speedup_r),this) ); set_drc_pcflush(machine(), 0x401d9d4); }
+DRIVER_INIT_MEMBER(skns_state,puzzloopu) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x6085cec, 0x6085cef, read32_delegate(FUNC(skns_state::puzzloopu_speedup_r),this) ); set_drc_pcflush(machine(), 0x401dab0); }
+DRIVER_INIT_MEMBER(skns_state,jjparads) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x6000994, 0x6000997, read32_delegate(FUNC(skns_state::jjparads_speedup_r),this) ); set_drc_pcflush(machine(), 0x4015e84); }
+DRIVER_INIT_MEMBER(skns_state,jjparad2) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x6000984, 0x6000987, read32_delegate(FUNC(skns_state::jjparad2_speedup_r),this) ); set_drc_pcflush(machine(), 0x401620a); }
+DRIVER_INIT_MEMBER(skns_state,ryouran) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x6000a14, 0x6000a17, read32_delegate(FUNC(skns_state::ryouran_speedup_r),this) ); set_drc_pcflush(machine(), 0x40182ce); }
+DRIVER_INIT_MEMBER(skns_state,teljan) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x6002fb4, 0x6002fb7, read32_delegate(FUNC(skns_state::teljan_speedup_r),this) ); set_drc_pcflush(machine(), 0x401ba32); }
+DRIVER_INIT_MEMBER(skns_state,sengekis) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-192,-272); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x60b74bc, 0x60b74bf, read32_delegate(FUNC(skns_state::sengekis_speedup_r),this) ); set_drc_pcflush(machine(), 0x60006ec); }
+DRIVER_INIT_MEMBER(skns_state,sengekij) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-192,-272); init_skns(machine());machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x60b7380, 0x60b7383, read32_delegate(FUNC(skns_state::sengekij_speedup_r),this) ); set_drc_pcflush(machine(), 0x60006ec); }
DRIVER_INIT_MEMBER(skns_state,sarukani) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-1,-1); init_skns(machine()); set_drc_pcflush(machine(), 0x4013b42); } // Speedup is in skns_io_w()
DRIVER_INIT_MEMBER(skns_state,galpans3) { machine().device<sknsspr_device>("spritegen")->skns_sprite_kludge(-1,-1); init_skns(machine()); }
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index 177194a02f5..bbb44565196 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -555,11 +555,11 @@ WRITE8_MEMBER(system1_state::mcu_io_w)
switch ((m_mcu_control >> 3) & 3)
{
case 0:
- machine().device<z80_device>("maincpu")->space(AS_PROGRAM)->write_byte(offset, data);
+ machine().device<z80_device>("maincpu")->space(AS_PROGRAM).write_byte(offset, data);
break;
case 2:
- machine().device<z80_device>("maincpu")->space(AS_IO)->write_byte(offset, data);
+ machine().device<z80_device>("maincpu")->space(AS_IO).write_byte(offset, data);
break;
default:
@@ -575,13 +575,13 @@ READ8_MEMBER(system1_state::mcu_io_r)
switch ((m_mcu_control >> 3) & 3)
{
case 0:
- return machine().device<z80_device>("maincpu")->space(AS_PROGRAM)->read_byte(offset);
+ return machine().device<z80_device>("maincpu")->space(AS_PROGRAM).read_byte(offset);
case 1:
return memregion("maincpu")->base()[offset + 0x10000];
case 2:
- return machine().device<z80_device>("maincpu")->space(AS_IO)->read_byte(offset);
+ return machine().device<z80_device>("maincpu")->space(AS_IO).read_byte(offset);
default:
logerror("%03X: MCU movx read mode %02X offset %04X\n",
@@ -4642,11 +4642,11 @@ DRIVER_INIT_MEMBER(system1_state,dakkochn)
mc8123_decrypt_rom(machine(), "maincpu", "key", "bank1", 4);
-// machine().device("maincpu")->memory().space(AS_IO)->install_legacy_read_handler(0x00, 0x00, FUNC(dakkochn_port_00_r));
-// machine().device("maincpu")->memory().space(AS_IO)->install_legacy_read_handler(0x03, 0x03, FUNC(dakkochn_port_03_r));
-// machine().device("maincpu")->memory().space(AS_IO)->install_legacy_read_handler(0x04, 0x04, FUNC(dakkochn_port_04_r));
+// machine().device("maincpu")->memory().space(AS_IO).install_legacy_read_handler(0x00, 0x00, FUNC(dakkochn_port_00_r));
+// machine().device("maincpu")->memory().space(AS_IO).install_legacy_read_handler(0x03, 0x03, FUNC(dakkochn_port_03_r));
+// machine().device("maincpu")->memory().space(AS_IO).install_legacy_read_handler(0x04, 0x04, FUNC(dakkochn_port_04_r));
-// machine().device("maincpu")->memory().space(AS_IO)->install_legacy_write_handler(0x15, 0x15, FUNC(dakkochn_port_15_w));
+// machine().device("maincpu")->memory().space(AS_IO).install_legacy_write_handler(0x15, 0x15, FUNC(dakkochn_port_15_w));
}
@@ -4704,8 +4704,8 @@ READ8_MEMBER(system1_state::nob_start_r)
DRIVER_INIT_MEMBER(system1_state,nob)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
DRIVER_INIT_CALL(bank44);
@@ -4715,8 +4715,8 @@ DRIVER_INIT_MEMBER(system1_state,nob)
space.install_read_handler(0x0001, 0x0001, read8_delegate(FUNC(system1_state::nob_start_r),this));
/* install MCU communications */
- iospace->install_readwrite_handler(0x18, 0x18, 0x00, 0x00, read8_delegate(FUNC(system1_state::nob_maincpu_latch_r),this), write8_delegate(FUNC(system1_state::nob_maincpu_latch_w),this));
- iospace->install_read_handler(0x1c, 0x1c, read8_delegate(FUNC(system1_state::nob_mcu_status_r),this));
+ iospace.install_readwrite_handler(0x18, 0x18, 0x00, 0x00, read8_delegate(FUNC(system1_state::nob_maincpu_latch_r),this), write8_delegate(FUNC(system1_state::nob_maincpu_latch_w),this));
+ iospace.install_read_handler(0x1c, 0x1c, read8_delegate(FUNC(system1_state::nob_mcu_status_r),this));
}
DRIVER_INIT_MEMBER(system1_state,nobb)
@@ -4736,23 +4736,23 @@ DRIVER_INIT_MEMBER(system1_state,nobb)
// ROM[0x10000 + 0 * 0x8000 + 0x3347] = 0x18; // 'jr' instead of 'jr z'
/* Patch to get sound in later levels(the program enters into a tight loop)*/
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
UINT8 *ROM2 = machine().root_device().memregion("soundcpu")->base();
ROM2[0x02f9] = 0x28;//'jr z' instead of 'jr'
DRIVER_INIT_CALL(bank44);
- iospace->install_read_handler(0x1c, 0x1c, read8_delegate(FUNC(system1_state::nobb_inport1c_r),this));
- iospace->install_read_handler(0x22, 0x22, read8_delegate(FUNC(system1_state::nobb_inport22_r),this));
- iospace->install_read_handler(0x23, 0x23, read8_delegate(FUNC(system1_state::nobb_inport23_r),this));
- iospace->install_write_handler(0x24, 0x24, write8_delegate(FUNC(system1_state::nobb_outport24_w),this));
+ iospace.install_read_handler(0x1c, 0x1c, read8_delegate(FUNC(system1_state::nobb_inport1c_r),this));
+ iospace.install_read_handler(0x22, 0x22, read8_delegate(FUNC(system1_state::nobb_inport22_r),this));
+ iospace.install_read_handler(0x23, 0x23, read8_delegate(FUNC(system1_state::nobb_inport23_r),this));
+ iospace.install_write_handler(0x24, 0x24, write8_delegate(FUNC(system1_state::nobb_outport24_w),this));
}
DRIVER_INIT_MEMBER(system1_state,bootleg)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.set_decrypted_region(0x0000, 0x7fff, machine().root_device().memregion("maincpu")->base() + 0x10000);
DRIVER_INIT_CALL(bank00);
}
@@ -4760,7 +4760,7 @@ DRIVER_INIT_MEMBER(system1_state,bootleg)
DRIVER_INIT_MEMBER(system1_state,bootsys2)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.set_decrypted_region(0x0000, 0x7fff, machine().root_device().memregion("maincpu")->base() + 0x20000);
machine().root_device().membank("bank1")->configure_decrypted_entries(0, 4, machine().root_device().memregion("maincpu")->base() + 0x30000, 0x4000);
DRIVER_INIT_CALL(bank0c);
@@ -4780,11 +4780,11 @@ DRIVER_INIT_MEMBER(system1_state,choplift)
DRIVER_INIT_MEMBER(system1_state,shtngmst)
{
- address_space *iospace = machine().device("maincpu")->memory().space(AS_IO);
- iospace->install_read_port(0x12, 0x12, 0x00, 0x00, "TRIGGER");
- iospace->install_read_port(0x18, 0x18, 0x00, 0x03, "18");
- iospace->install_read_port(0x1c, 0x1c, 0x00, 0x02, "GUNX");
- iospace->install_read_port(0x1d, 0x1d, 0x00, 0x02, "GUNY");
+ address_space &iospace = machine().device("maincpu")->memory().space(AS_IO);
+ iospace.install_read_port(0x12, 0x12, 0x00, 0x00, "TRIGGER");
+ iospace.install_read_port(0x18, 0x18, 0x00, 0x03, "18");
+ iospace.install_read_port(0x1c, 0x1c, 0x00, 0x02, "GUNX");
+ iospace.install_read_port(0x1d, 0x1d, 0x00, 0x02, "GUNY");
DRIVER_INIT_CALL(bank0c);
}
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 105dc3dbb3e..4fb2ca9bd45 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -3294,7 +3294,7 @@ DRIVER_INIT_MEMBER(segas1x_bootleg_state,goldnaxeb1)
int i;
UINT8 *ROM = memregion("maincpu")->base();
UINT8 *KEY = memregion("decryption")->base();
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 data[0x1000];
// the decryption key is in a rom (part of an MSDOS executable...)
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index 1523edc2902..d05ce755a2c 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -3885,8 +3885,8 @@ DRIVER_INIT_MEMBER(taito_f3_state,bubsympb)
}
}
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x4a001c, 0x4a001f, read32_delegate(FUNC(taito_f3_state::bubsympb_oki_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x4a001c, 0x4a001f, write32_delegate(FUNC(taito_f3_state::bubsympb_oki_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x4a001c, 0x4a001f, read32_delegate(FUNC(taito_f3_state::bubsympb_oki_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x4a001c, 0x4a001f, write32_delegate(FUNC(taito_f3_state::bubsympb_oki_w),this));
}
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 49856330f22..0b71c54c6db 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -1269,7 +1269,7 @@ ROM_END
DRIVER_INIT_MEMBER(taitox_state,kyustrkr)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x900000, 0x90000f, write16_delegate(FUNC(taitox_state::kyustrkr_input_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x900000, 0x90000f, write16_delegate(FUNC(taitox_state::kyustrkr_input_w),this));
}
diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c
index ffe5293a405..642ed8b6951 100644
--- a/src/mame/drivers/taitogn.c
+++ b/src/mame/drivers/taitogn.c
@@ -572,19 +572,19 @@ WRITE32_MEMBER(taitogn_state::flash_s3_w)
static void install_handlers(running_machine &machine, int mode)
{
taitogn_state *state = machine.driver_data<taitogn_state>();
- address_space *a = machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &a = machine.device("maincpu")->memory().space(AS_PROGRAM);
if(mode == 0) {
// Mode 0 has access to the subbios, the mn102 flash and the rf5c296 mem zone
- a->install_readwrite_handler(0x1f000000, 0x1f1fffff, read32_delegate(FUNC(taitogn_state::flash_subbios_r),state), write32_delegate(FUNC(taitogn_state::flash_subbios_w),state));
- a->install_readwrite_handler(0x1f200000, 0x1f2fffff, read32_delegate(FUNC(taitogn_state::rf5c296_mem_r),state), write32_delegate(FUNC(taitogn_state::rf5c296_mem_w),state));
- a->install_readwrite_handler(0x1f300000, 0x1f37ffff, read32_delegate(FUNC(taitogn_state::flash_mn102_r),state), write32_delegate(FUNC(taitogn_state::flash_mn102_w),state));
- a->nop_readwrite(0x1f380000, 0x1f5fffff);
+ a.install_readwrite_handler(0x1f000000, 0x1f1fffff, read32_delegate(FUNC(taitogn_state::flash_subbios_r),state), write32_delegate(FUNC(taitogn_state::flash_subbios_w),state));
+ a.install_readwrite_handler(0x1f200000, 0x1f2fffff, read32_delegate(FUNC(taitogn_state::rf5c296_mem_r),state), write32_delegate(FUNC(taitogn_state::rf5c296_mem_w),state));
+ a.install_readwrite_handler(0x1f300000, 0x1f37ffff, read32_delegate(FUNC(taitogn_state::flash_mn102_r),state), write32_delegate(FUNC(taitogn_state::flash_mn102_w),state));
+ a.nop_readwrite(0x1f380000, 0x1f5fffff);
} else {
// Mode 1 has access to the 3 samples flashes
- a->install_readwrite_handler(0x1f000000, 0x1f1fffff, read32_delegate(FUNC(taitogn_state::flash_s1_r),state), write32_delegate(FUNC(taitogn_state::flash_s1_w),state));
- a->install_readwrite_handler(0x1f200000, 0x1f3fffff, read32_delegate(FUNC(taitogn_state::flash_s2_r),state), write32_delegate(FUNC(taitogn_state::flash_s2_w),state));
- a->install_readwrite_handler(0x1f400000, 0x1f5fffff, read32_delegate(FUNC(taitogn_state::flash_s3_r),state), write32_delegate(FUNC(taitogn_state::flash_s3_w),state));
+ a.install_readwrite_handler(0x1f000000, 0x1f1fffff, read32_delegate(FUNC(taitogn_state::flash_s1_r),state), write32_delegate(FUNC(taitogn_state::flash_s1_w),state));
+ a.install_readwrite_handler(0x1f200000, 0x1f3fffff, read32_delegate(FUNC(taitogn_state::flash_s2_r),state), write32_delegate(FUNC(taitogn_state::flash_s2_w),state));
+ a.install_readwrite_handler(0x1f400000, 0x1f5fffff, read32_delegate(FUNC(taitogn_state::flash_s3_r),state), write32_delegate(FUNC(taitogn_state::flash_s3_w),state));
}
}
@@ -879,7 +879,7 @@ DRIVER_INIT_MEMBER(taitogn_state,coh3002t)
DRIVER_INIT_MEMBER(taitogn_state,coh3002t_mp)
{
DRIVER_INIT_CALL(coh3002t);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x1fa10100, 0x1fa10103, read32_delegate(FUNC(taitogn_state::gnet_mahjong_panel_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x1fa10100, 0x1fa10103, read32_delegate(FUNC(taitogn_state::gnet_mahjong_panel_r),this));
}
MACHINE_RESET_MEMBER(taitogn_state,coh3002t)
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index 0cd7fbe5eda..9855ea78588 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -1325,7 +1325,7 @@ DRIVER_INIT_MEMBER(taitojc_state,taitojc)
m_has_dsp_hack = 1;
- machine().device("dsp")->memory().space(AS_DATA)->install_readwrite_handler(0x7ff0, 0x7ff0, read16_delegate(FUNC(taitojc_state::taitojc_dsp_idle_skip_r),this), write16_delegate(FUNC(taitojc_state::dsp_idle_skip_w),this));
+ machine().device("dsp")->memory().space(AS_DATA).install_readwrite_handler(0x7ff0, 0x7ff0, read16_delegate(FUNC(taitojc_state::taitojc_dsp_idle_skip_r),this), write16_delegate(FUNC(taitojc_state::dsp_idle_skip_w),this));
}
DRIVER_INIT_MEMBER(taitojc_state,dendego2)
@@ -1333,7 +1333,7 @@ DRIVER_INIT_MEMBER(taitojc_state,dendego2)
DRIVER_INIT_CALL(taitojc);
- machine().device("dsp")->memory().space(AS_DATA)->install_readwrite_handler(0x7ff0, 0x7ff0, read16_delegate(FUNC(taitojc_state::dendego2_dsp_idle_skip_r),this), write16_delegate(FUNC(taitojc_state::dsp_idle_skip_w),this));
+ machine().device("dsp")->memory().space(AS_DATA).install_readwrite_handler(0x7ff0, 0x7ff0, read16_delegate(FUNC(taitojc_state::dendego2_dsp_idle_skip_r),this), write16_delegate(FUNC(taitojc_state::dsp_idle_skip_w),this));
}
DRIVER_INIT_MEMBER(taitojc_state,dangcurv)
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index 82323ec3f82..09c717fa35c 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -2765,7 +2765,7 @@ DRIVER_INIT_MEMBER(taitosj_state,spacecr)
init_common(machine());
/* install protection handler */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd48b, 0xd48b, read8_delegate(FUNC(taitosj_state::spacecr_prot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd48b, 0xd48b, read8_delegate(FUNC(taitosj_state::spacecr_prot_r),this));
}
DRIVER_INIT_MEMBER(taitosj_state,alpine)
@@ -2773,8 +2773,8 @@ DRIVER_INIT_MEMBER(taitosj_state,alpine)
init_common(machine());
/* install protection handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd40b, 0xd40b, read8_delegate(FUNC(taitosj_state::alpine_port_2_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xd50f, 0xd50f, write8_delegate(FUNC(taitosj_state::alpine_protection_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd40b, 0xd40b, read8_delegate(FUNC(taitosj_state::alpine_port_2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xd50f, 0xd50f, write8_delegate(FUNC(taitosj_state::alpine_protection_w),this));
}
DRIVER_INIT_MEMBER(taitosj_state,alpinea)
@@ -2782,8 +2782,8 @@ DRIVER_INIT_MEMBER(taitosj_state,alpinea)
init_common(machine());
/* install protection handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd40b, 0xd40b, read8_delegate(FUNC(taitosj_state::alpine_port_2_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xd50e, 0xd50e, write8_delegate(FUNC(taitosj_state::alpinea_bankswitch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd40b, 0xd40b, read8_delegate(FUNC(taitosj_state::alpine_port_2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xd50e, 0xd50e, write8_delegate(FUNC(taitosj_state::alpinea_bankswitch_w),this));
}
DRIVER_INIT_MEMBER(taitosj_state,junglhbr)
@@ -2791,7 +2791,7 @@ DRIVER_INIT_MEMBER(taitosj_state,junglhbr)
init_common(machine());
/* inverter on bits 0 and 1 */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x9000, 0xbfff, write8_delegate(FUNC(taitosj_state::junglhbr_characterram_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x9000, 0xbfff, write8_delegate(FUNC(taitosj_state::junglhbr_characterram_w),this));
}
GAME( 1981, spaceskr, 0, nomcu, spaceskr, taitosj_state, taitosj, ROT0, "Taito Corporation", "Space Seeker", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index 20744071faf..2e5914a9a61 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -710,7 +710,7 @@ DRIVER_INIT_MEMBER(taitowlf_state,taitowlf)
kbdc8042_init(machine(), &at8042);
#if ENABLE_VGA
pc_vga_init(machine(), vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
#endif
}
diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c
index 97a565a16e1..11f077a5aad 100644
--- a/src/mame/drivers/tcl.c
+++ b/src/mame/drivers/tcl.c
@@ -190,7 +190,7 @@ DRIVER_INIT_MEMBER(tcl_state,tcl)
{
/* only the first part is decrypted (and verified)*/
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *dest = machine().root_device().memregion("maincpu")->base();
int len = machine().root_device().memregion("maincpu")->bytes();
UINT8 *src = auto_alloc_array(machine(), UINT8, len);
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index 12bdeba1c2e..d37a7d330bd 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -1141,9 +1141,9 @@ DRIVER_INIT_MEMBER(tecmo_state,backfirt)
m_video_type = 2;
/* no MSM */
- machine().device("soundcpu")->memory().space(AS_PROGRAM)->nop_write(0xc000, 0xc000);
- machine().device("soundcpu")->memory().space(AS_PROGRAM)->nop_write(0xc400, 0xc400);
- machine().device("soundcpu")->memory().space(AS_PROGRAM)->nop_write(0xc800, 0xc800);
+ machine().device("soundcpu")->memory().space(AS_PROGRAM).nop_write(0xc000, 0xc000);
+ machine().device("soundcpu")->memory().space(AS_PROGRAM).nop_write(0xc400, 0xc400);
+ machine().device("soundcpu")->memory().space(AS_PROGRAM).nop_write(0xc800, 0xc800);
}
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index 2ebb649a60d..9d88142804c 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -1014,7 +1014,7 @@ DRIVER_INIT_MEMBER(terracre_state,amatelas)
DRIVER_INIT_MEMBER(terracre_state,horekid)
{
m_mpProtData = mHoreKidProtData;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x44004, 0x44005, read16_delegate(FUNC(terracre_state::horekid_IN2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x44004, 0x44005, read16_delegate(FUNC(terracre_state::horekid_IN2_r),this));
}
/* YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR, COMPANY, FULLNAME, FLAGS */
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index ee0d6dc0faa..50c520dc5f7 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -1091,7 +1091,7 @@ READ8_MEMBER(thepit_state::rtriv_question_r)
DRIVER_INIT_MEMBER(thepit_state,rtriv)
{
// Set-up the weirdest questions read ever done
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x4000, 0x4fff, read8_delegate(FUNC(thepit_state::rtriv_question_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x4000, 0x4fff, read8_delegate(FUNC(thepit_state::rtriv_question_r),this));
}
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index c9aca11c735..2a14639067e 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -120,7 +120,7 @@
void tiamc1_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
tiamc1_bankswitch_w(space, 0, 0);
}
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 10d476b9b34..456403b73e5 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -764,12 +764,12 @@ ROM_END
DRIVER_INIT_MEMBER(tigeroad_state,tigeroad)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xfe4002, 0xfe4003, write16_delegate(FUNC(tigeroad_state::tigeroad_soundcmd_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xfe4002, 0xfe4003, write16_delegate(FUNC(tigeroad_state::tigeroad_soundcmd_w),this));
}
DRIVER_INIT_MEMBER(tigeroad_state,f1dream)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xfe4002, 0xfe4003, write16_delegate(FUNC(tigeroad_state::f1dream_control_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xfe4002, 0xfe4003, write16_delegate(FUNC(tigeroad_state::f1dream_control_w),this));
}
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 20333722d04..3568388e8f3 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -225,7 +225,7 @@ static void duart_tx(device_t *device, int channel, UINT8 data)
tmaster_state *state = device->machine().driver_data<tmaster_state>();
if ( channel == 0 )
{
- state->m_microtouch->rx(*device->machine().memory().first_space(), 0, data);
+ state->m_microtouch->rx(device->machine().driver_data()->generic_space(), 0, data);
}
};
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index d181fd2b799..2bf6020ac30 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -860,7 +860,7 @@ DRIVER_INIT_MEMBER(toki_state,jujuba)
/* Decrypt data for z80 program */
{
- address_space &space = *machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("audiocpu")->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, 0x20000);
UINT8 *rom = machine().root_device().memregion("audiocpu")->base();
int i;
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 2cc1ed56513..92f3186ed0b 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -1444,7 +1444,7 @@ DRIVER_INIT_MEMBER(trackfld_state,trackfld)
DRIVER_INIT_MEMBER(trackfld_state,atlantol)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine().root_device().memregion("maincpu")->base();
UINT8 *decrypt;
int A;
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index 2a691ad504b..85a2a5fc486 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -3232,7 +3232,7 @@ DRIVER_INIT_MEMBER(tumbleb_state,tumbleb2)
#if TUMBLEP_HACK
tumblepb_patch_code(machine(), 0x000132);
#endif
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x100000, 0x100001, write16_delegate(FUNC(tumbleb_state::tumbleb2_soundmcu_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x100000, 0x100001, write16_delegate(FUNC(tumbleb_state::tumbleb2_soundmcu_w),this));
}
@@ -3270,7 +3270,7 @@ READ16_MEMBER(tumbleb_state::bcstory_1a0_read)
DRIVER_INIT_MEMBER(tumbleb_state,bcstory)
{
tumblepb_gfx1_rearrange(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x180008, 0x180009, read16_delegate(FUNC(tumbleb_state::bcstory_1a0_read),this)); // io should be here??
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x180008, 0x180009, read16_delegate(FUNC(tumbleb_state::bcstory_1a0_read),this)); // io should be here??
}
@@ -3334,10 +3334,10 @@ DRIVER_INIT_MEMBER(tumbleb_state,chokchok)
DRIVER_INIT_CALL(htchctch);
/* different palette format, closer to tumblep -- is this controlled by a register? the palette was right with the hatch catch trojan */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x140000, 0x140fff, write16_delegate(FUNC(tumbleb_state::paletteram_xxxxBBBBGGGGRRRR_word_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x140000, 0x140fff, write16_delegate(FUNC(tumbleb_state::paletteram_xxxxBBBBGGGGRRRR_word_w), this));
/* slightly different banking */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x100002, 0x100003, write16_delegate(FUNC(tumbleb_state::chokchok_tilebank_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x100002, 0x100003, write16_delegate(FUNC(tumbleb_state::chokchok_tilebank_w),this));
}
DRIVER_INIT_MEMBER(tumbleb_state,wlstar)
@@ -3345,7 +3345,7 @@ DRIVER_INIT_MEMBER(tumbleb_state,wlstar)
tumblepb_gfx1_rearrange(machine());
/* slightly different banking */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x100002, 0x100003, write16_delegate(FUNC(tumbleb_state::wlstar_tilebank_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x100002, 0x100003, write16_delegate(FUNC(tumbleb_state::wlstar_tilebank_w),this));
m_protbase = 0x0000;
}
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index a0fb273af39..9c0a7134885 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -567,7 +567,7 @@ READ8_MEMBER(turbo_state::buckrog_port_3_r)
static TIMER_CALLBACK( delayed_i8255_w )
{
turbo_state *state = machine.driver_data<turbo_state>();
- state->m_i8255_0->write(*state->m_maincpu->space(AS_PROGRAM), param >> 8, param & 0xff);
+ state->m_i8255_0->write(state->m_maincpu->space(AS_PROGRAM), param >> 8, param & 0xff);
}
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index fe632937824..ec2a1b98c30 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -88,14 +88,14 @@ INTERRUPT_GEN_MEMBER(tx1_state::z80_irq)
READ16_MEMBER(tx1_state::z80_shared_r)
{
- address_space *cpu2space = machine().device("audio_cpu")->memory().space(AS_PROGRAM);
- return cpu2space->read_byte(offset);
+ address_space &cpu2space = machine().device("audio_cpu")->memory().space(AS_PROGRAM);
+ return cpu2space.read_byte(offset);
}
WRITE16_MEMBER(tx1_state::z80_shared_w)
{
- address_space *cpu2space = machine().device("audio_cpu")->memory().space(AS_PROGRAM);
- cpu2space->write_byte(offset, data & 0xff);
+ address_space &cpu2space = machine().device("audio_cpu")->memory().space(AS_PROGRAM);
+ cpu2space.write_byte(offset, data & 0xff);
}
diff --git a/src/mame/drivers/umipoker.c b/src/mame/drivers/umipoker.c
index 62087881983..331bb90191c 100644
--- a/src/mame/drivers/umipoker.c
+++ b/src/mame/drivers/umipoker.c
@@ -747,13 +747,13 @@ ROM_END
DRIVER_INIT_MEMBER(umipoker_state,umipoker)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xe00010, 0xe00011, write16_delegate(FUNC(umipoker_state::umi_counters_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xe00010, 0xe00011, write16_delegate(FUNC(umipoker_state::umi_counters_w), this));
}
DRIVER_INIT_MEMBER(umipoker_state,saiyukip)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xe00010, 0xe00011, write16_delegate(FUNC(umipoker_state::saiyu_counters_w), this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xe0000c, 0xe0000d, write16_delegate(FUNC(umipoker_state::lamps_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xe00010, 0xe00011, write16_delegate(FUNC(umipoker_state::saiyu_counters_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xe0000c, 0xe0000d, write16_delegate(FUNC(umipoker_state::lamps_w), this));
}
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index 259888dbc62..a6d8ed6342a 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -98,11 +98,11 @@ WRITE8_MEMBER(upscope_state::upscope_cia_0_porta_w)
/* swap the write handlers between ROM and bank 1 based on the bit */
if ((data & 1) == 0)
/* overlay disabled, map RAM on 0x000000 */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x000000, 0x07ffff, "bank1");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x000000, 0x07ffff, "bank1");
else
/* overlay enabled, map Amiga system ROM on 0x000000 */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x000000, 0x07ffff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x000000, 0x07ffff);
}
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index de8ac6e1ac2..dbc76a3406a 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -2471,7 +2471,7 @@ READ16_MEMBER(vamphalf_state::boonggab_speedup_r)
DRIVER_INIT_MEMBER(vamphalf_state,vamphalf)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0004a840, 0x0004a843, read16_delegate(FUNC(vamphalf_state::vamphalf_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0004a840, 0x0004a843, read16_delegate(FUNC(vamphalf_state::vamphalf_speedup_r), this));
m_palshift = 0;
m_flip_bit = 0x80;
@@ -2479,7 +2479,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,vamphalf)
DRIVER_INIT_MEMBER(vamphalf_state,vamphafk)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0004a6d0, 0x0004a6d3, read16_delegate(FUNC(vamphalf_state::vamphafk_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0004a6d0, 0x0004a6d3, read16_delegate(FUNC(vamphalf_state::vamphafk_speedup_r), this));
m_palshift = 0;
m_flip_bit = 0x80;
@@ -2487,19 +2487,19 @@ DRIVER_INIT_MEMBER(vamphalf_state,vamphafk)
DRIVER_INIT_MEMBER(vamphalf_state,misncrft)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00072eb4, 0x00072eb7, read16_delegate(FUNC(vamphalf_state::misncrft_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00072eb4, 0x00072eb7, read16_delegate(FUNC(vamphalf_state::misncrft_speedup_r), this));
m_palshift = 0;
m_flip_bit = 1;
// Configure the QS1000 ROM banking. Care must be taken not to overlap the 256b internal RAM
- machine().device("qs1000:cpu")->memory().space(AS_IO)->install_read_bank(0x0100, 0xffff, "data");
+ machine().device("qs1000:cpu")->memory().space(AS_IO).install_read_bank(0x0100, 0xffff, "data");
membank("qs1000:data")->configure_entries(0, 16, memregion("qs1000:cpu")->base()+0x100, 0x8000-0x100);
}
DRIVER_INIT_MEMBER(vamphalf_state,coolmini)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x000d2e80, 0x000d2e83, read16_delegate(FUNC(vamphalf_state::coolmini_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x000d2e80, 0x000d2e83, read16_delegate(FUNC(vamphalf_state::coolmini_speedup_r), this));
m_palshift = 0;
m_flip_bit = 1;
@@ -2507,7 +2507,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,coolmini)
DRIVER_INIT_MEMBER(vamphalf_state,suplup)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0011605c, 0x0011605f, read16_delegate(FUNC(vamphalf_state::suplup_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0011605c, 0x0011605f, read16_delegate(FUNC(vamphalf_state::suplup_speedup_r), this));
m_palshift = 8;
/* no flipscreen */
@@ -2515,7 +2515,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,suplup)
DRIVER_INIT_MEMBER(vamphalf_state,luplup)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00115e84, 0x00115e87, read16_delegate(FUNC(vamphalf_state::luplup_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00115e84, 0x00115e87, read16_delegate(FUNC(vamphalf_state::luplup_speedup_r), this));
m_palshift = 8;
/* no flipscreen */
@@ -2523,7 +2523,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,luplup)
DRIVER_INIT_MEMBER(vamphalf_state,luplup29)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00113f08, 0x00113f0b, read16_delegate(FUNC(vamphalf_state::luplup29_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00113f08, 0x00113f0b, read16_delegate(FUNC(vamphalf_state::luplup29_speedup_r), this));
m_palshift = 8;
/* no flipscreen */
@@ -2531,7 +2531,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,luplup29)
DRIVER_INIT_MEMBER(vamphalf_state,puzlbang)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00113ecc, 0x00113ecf, read16_delegate(FUNC(vamphalf_state::puzlbang_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00113ecc, 0x00113ecf, read16_delegate(FUNC(vamphalf_state::puzlbang_speedup_r), this));
m_palshift = 8;
/* no flipscreen */
@@ -2539,8 +2539,8 @@ DRIVER_INIT_MEMBER(vamphalf_state,puzlbang)
DRIVER_INIT_MEMBER(vamphalf_state,wyvernwg)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00b56fc, 0x00b56ff, read32_delegate(FUNC(vamphalf_state::wyvernwg_speedup_r), this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00b74f8, 0x00b74fb, read32_delegate(FUNC(vamphalf_state::wyvernwga_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00b56fc, 0x00b56ff, read32_delegate(FUNC(vamphalf_state::wyvernwg_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00b74f8, 0x00b74fb, read32_delegate(FUNC(vamphalf_state::wyvernwga_speedup_r), this));
m_palshift = 0;
m_flip_bit = 1;
@@ -2550,7 +2550,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,wyvernwg)
m_semicom_prot_data[1] = 1;
// Configure the QS1000 ROM banking. Care must be taken not to overlap the 256b internal RAM
- machine().device("qs1000:cpu")->memory().space(AS_IO)->install_read_bank(0x0100, 0xffff, "data");
+ machine().device("qs1000:cpu")->memory().space(AS_IO).install_read_bank(0x0100, 0xffff, "data");
membank("qs1000:data")->configure_entries(0, 16, memregion("qs1000:cpu")->base()+0x100, 0x8000-0x100);
}
@@ -2558,7 +2558,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,finalgdr)
{
m_finalgdr_backupram_bank = 1;
m_finalgdr_backupram = auto_alloc_array(machine(), UINT8, 0x80*0x100);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x005e874, 0x005e877, read32_delegate(FUNC(vamphalf_state::finalgdr_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x005e874, 0x005e877, read32_delegate(FUNC(vamphalf_state::finalgdr_speedup_r), this));
machine().device<nvram_device>("nvram")->set_base(m_finalgdr_backupram, 0x80*0x100);
m_palshift = 0;
@@ -2574,7 +2574,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,mrkicker)
// backup ram isn't used
m_finalgdr_backupram_bank = 1;
m_finalgdr_backupram = auto_alloc_array(machine(), UINT8, 0x80*0x100);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00701a4, 0x00701a7, read32_delegate(FUNC(vamphalf_state::mrkicker_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00701a4, 0x00701a7, read32_delegate(FUNC(vamphalf_state::mrkicker_speedup_r), this));
machine().device<nvram_device>("nvram")->set_base(m_finalgdr_backupram, 0x80*0x100);
m_palshift = 0;
@@ -2587,7 +2587,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,mrkicker)
DRIVER_INIT_MEMBER(vamphalf_state,dquizgo2)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00cde70, 0x00cde73, read16_delegate(FUNC(vamphalf_state::dquizgo2_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00cde70, 0x00cde73, read16_delegate(FUNC(vamphalf_state::dquizgo2_speedup_r), this));
m_palshift = 0;
m_flip_bit = 1;
@@ -2595,7 +2595,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,dquizgo2)
DRIVER_INIT_MEMBER(vamphalf_state,dtfamily)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xcc2a8, 0xcc2a9, read16_delegate(FUNC(vamphalf_state::dtfamily_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xcc2a8, 0xcc2a9, read16_delegate(FUNC(vamphalf_state::dtfamily_speedup_r), this));
m_palshift = 0;
m_flip_bit = 1;
@@ -2604,7 +2604,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,dtfamily)
DRIVER_INIT_MEMBER(vamphalf_state,toyland)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x780d8, 0x780d9, read16_delegate(FUNC(vamphalf_state::toyland_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x780d8, 0x780d9, read16_delegate(FUNC(vamphalf_state::toyland_speedup_r), this));
m_palshift = 0;
m_flip_bit = 1;
@@ -2612,7 +2612,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,toyland)
DRIVER_INIT_MEMBER(vamphalf_state,aoh)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x028a09c, 0x028a09f, read32_delegate(FUNC(vamphalf_state::aoh_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x028a09c, 0x028a09f, read32_delegate(FUNC(vamphalf_state::aoh_speedup_r), this));
m_palshift = 0;
/* no flipscreen */
@@ -2620,16 +2620,16 @@ DRIVER_INIT_MEMBER(vamphalf_state,aoh)
DRIVER_INIT_MEMBER(vamphalf_state,jmpbreak)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00906fc, 0x00906ff, read16_delegate(FUNC(vamphalf_state::jmpbreak_speedup_r), this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xe0000000, 0xe0000003, write16_delegate(FUNC(vamphalf_state::jmpbreak_flipscreen_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00906fc, 0x00906ff, read16_delegate(FUNC(vamphalf_state::jmpbreak_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xe0000000, 0xe0000003, write16_delegate(FUNC(vamphalf_state::jmpbreak_flipscreen_w), this));
m_palshift = 0;
}
DRIVER_INIT_MEMBER(vamphalf_state,mrdig)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x00a99c, 0x00a99f, read16_delegate(FUNC(vamphalf_state::mrdig_speedup_r), this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xe0000000, 0xe0000003, write16_delegate(FUNC(vamphalf_state::jmpbreak_flipscreen_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x00a99c, 0x00a99f, read16_delegate(FUNC(vamphalf_state::mrdig_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xe0000000, 0xe0000003, write16_delegate(FUNC(vamphalf_state::jmpbreak_flipscreen_w), this));
m_palshift = 0;
}
@@ -2637,7 +2637,7 @@ DRIVER_INIT_MEMBER(vamphalf_state,mrdig)
DRIVER_INIT_MEMBER(vamphalf_state,boonggab)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x000f1b7c, 0x000f1b7f, read16_delegate(FUNC(vamphalf_state::boonggab_speedup_r), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x000f1b7c, 0x000f1b7f, read16_delegate(FUNC(vamphalf_state::boonggab_speedup_r), this));
m_palshift = 0;
m_has_extra_gfx = 1;
diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c
index 6a070fc1fe1..380d83fcfc7 100644
--- a/src/mame/drivers/vcombat.c
+++ b/src/mame/drivers/vcombat.c
@@ -448,10 +448,10 @@ DRIVER_INIT_MEMBER(vcombat_state,vcombat)
UINT8 *ROM = memregion("maincpu")->base();
/* The two i860s execute out of RAM */
- address_space &v0space = *machine().device<i860_device>("vid_0")->space(AS_PROGRAM);
+ address_space &v0space = machine().device<i860_device>("vid_0")->space(AS_PROGRAM);
v0space.set_direct_update_handler(direct_update_delegate(FUNC(vcombat_state::vcombat_vid_0_direct_handler), this));
- address_space &v1space = *machine().device<i860_device>("vid_1")->space(AS_PROGRAM);
+ address_space &v1space = machine().device<i860_device>("vid_1")->space(AS_PROGRAM);
v1space.set_direct_update_handler(direct_update_delegate(FUNC(vcombat_state::vcombat_vid_1_direct_handler), this));
/* Allocate the 68000 framebuffers */
@@ -495,7 +495,7 @@ DRIVER_INIT_MEMBER(vcombat_state,shadfgtr)
m_i860_framebuffer[1][1] = NULL;
/* The i860 executes out of RAM */
- address_space &space = *machine().device<i860_device>("vid_0")->space(AS_PROGRAM);
+ address_space &space = machine().device<i860_device>("vid_0")->space(AS_PROGRAM);
space.set_direct_update_handler(direct_update_delegate(FUNC(vcombat_state::vcombat_vid_0_direct_handler), this));
}
diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c
index bcd5f569f6c..834bc818300 100644
--- a/src/mame/drivers/vegaeo.c
+++ b/src/mame/drivers/vegaeo.c
@@ -356,7 +356,7 @@ DRIVER_INIT_MEMBER(vegaeo_state,vegaeo)
{
// Set up the QS1000 program ROM banking, taking care not to overlap the internal RAM
- machine().device("qs1000:cpu")->memory().space(AS_IO)->install_read_bank(0x0100, 0xffff, "bank");
+ machine().device("qs1000:cpu")->memory().space(AS_IO).install_read_bank(0x0100, 0xffff, "bank");
membank("qs1000:bank")->configure_entries(0, 8, memregion("qs1000:cpu")->base()+0x100, 0x10000);
init_eolith_speedup(machine());
diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c
index 456b590581a..b539d1bd86b 100644
--- a/src/mame/drivers/vegas.c
+++ b/src/mame/drivers/vegas.c
@@ -1565,7 +1565,7 @@ static void remap_dynamic_addresses(running_machine &machine)
/* unmap everything we know about */
for (addr = 0; addr < state->m_dynamic_count; addr++)
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_readwrite(dynamic[addr].start, dynamic[addr].end);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_readwrite(dynamic[addr].start, dynamic[addr].end);
/* the build the list of stuff */
state->m_dynamic_count = 0;
@@ -1681,7 +1681,7 @@ static void remap_dynamic_addresses(running_machine &machine)
/* now remap everything */
if (LOG_DYNAMIC) logerror("remap_dynamic_addresses:\n");
- address_space &space = *machine.device<cpu_device>("maincpu")->space(AS_PROGRAM);
+ address_space &space = machine.device<cpu_device>("maincpu")->space(AS_PROGRAM);
for (addr = 0; addr < state->m_dynamic_count; addr++)
{
if (LOG_DYNAMIC) logerror(" installing: %08X-%08X %s,%s\n", dynamic[addr].start, dynamic[addr].end, dynamic[addr].rdname, dynamic[addr].wrname);
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index e62afacb9d0..d2d52a37a7b 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -164,7 +164,7 @@ WRITE8_MEMBER(vendetta_state::vendetta_K052109_w)
static void vendetta_video_banking( running_machine &machine, int select )
{
vendetta_state *state = machine.driver_data<vendetta_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (select & 1)
{
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index 2813fac4a33..9ef528e639e 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -68,8 +68,8 @@ void videopin_state::machine_reset()
/* both output latches are cleared on reset */
- videopin_out1_w(*machine().memory().first_space(), 0, 0);
- videopin_out2_w(*machine().memory().first_space(), 0, 0);
+ videopin_out1_w(machine().driver_data()->generic_space(), 0, 0);
+ videopin_out2_w(machine().driver_data()->generic_space(), 0, 0);
}
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index fee8f6a512c..7b198ede31e 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -2026,15 +2026,15 @@ MACHINE_CONFIG_END
DRIVER_INIT_MEMBER(viper_state,viper)
{
-// machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler( *ide, 0xff200000, 0xff207fff, FUNC(hdd_r), FUNC(hdd_w) ); //TODO
+// machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler( *ide, 0xff200000, 0xff207fff, FUNC(hdd_r), FUNC(hdd_w) ); //TODO
}
DRIVER_INIT_MEMBER(viper_state,vipercf)
{
DRIVER_INIT_CALL(viper);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xff000000, 0xff000fff, read64_delegate(FUNC(viper_state::cf_card_data_r), this), write64_delegate(FUNC(viper_state::cf_card_data_w), this) );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xff200000, 0xff200fff, read64_delegate(FUNC(viper_state::cf_card_r), this), write64_delegate(FUNC(viper_state::cf_card_w), this) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xff000000, 0xff000fff, read64_delegate(FUNC(viper_state::cf_card_data_r), this), write64_delegate(FUNC(viper_state::cf_card_data_w), this) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xff200000, 0xff200fff, read64_delegate(FUNC(viper_state::cf_card_r), this), write64_delegate(FUNC(viper_state::cf_card_w), this) );
}
diff --git a/src/mame/drivers/voyager.c b/src/mame/drivers/voyager.c
index 59cbcf1910c..bee83776fc1 100644
--- a/src/mame/drivers/voyager.c
+++ b/src/mame/drivers/voyager.c
@@ -801,7 +801,7 @@ DRIVER_INIT_MEMBER(voyager_state,voyager)
m_bios_ram = auto_alloc_array(machine(), UINT32, 0x20000/4);
pc_vga_init(machine(), vga_setting, NULL);
- pc_svga_trident_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_svga_trident_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
init_pc_common(machine(), PCCOMMON_KEYBOARD_AT, voyager_set_keyb_int);
intel82439tx_init(machine());
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index 59b1ac1a0ed..a6b2d85d4f8 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -2744,7 +2744,7 @@ DRIVER_INIT_MEMBER(williams_state,mayday)
CONFIGURE_BLITTER(WILLIAMS_BLITTER_NONE, 0x0000);
/* install a handler to catch protection checks */
- m_mayday_protection = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xa190, 0xa191, read8_delegate(FUNC(williams_state::mayday_protection_r),this));
+ m_mayday_protection = machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xa190, 0xa191, read8_delegate(FUNC(williams_state::mayday_protection_r),this));
}
@@ -2778,7 +2778,7 @@ DRIVER_INIT_MEMBER(williams_state,bubbles)
CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000);
/* bubbles has a full 8-bit-wide CMOS */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xcc00, 0xcfff, write8_delegate(FUNC(williams_state::bubbles_cmos_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xcc00, 0xcfff, write8_delegate(FUNC(williams_state::bubbles_cmos_w),this));
}
@@ -2813,27 +2813,27 @@ DRIVER_INIT_MEMBER(williams_state,spdball)
CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000);
/* add a third PIA */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xc808, 0xc80b, read8_delegate(FUNC(pia6821_device::read), pia_3), write8_delegate(FUNC(pia6821_device::write), pia_3));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xc808, 0xc80b, read8_delegate(FUNC(pia6821_device::read), pia_3), write8_delegate(FUNC(pia6821_device::write), pia_3));
/* install extra input handlers */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0xc800, 0xc800, "AN0");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0xc801, 0xc801, "AN1");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0xc802, 0xc802, "AN2");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_port(0xc803, 0xc803, "AN3");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0xc800, 0xc800, "AN0");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0xc801, 0xc801, "AN1");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0xc802, 0xc802, "AN2");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_port(0xc803, 0xc803, "AN3");
}
DRIVER_INIT_MEMBER(williams_state,alienar)
{
CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xcbff, 0xcbff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xcbff, 0xcbff);
}
DRIVER_INIT_MEMBER(williams_state,alienaru)
{
CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xcbff, 0xcbff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xcbff, 0xcbff);
}
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index 789bac50cd6..34f1d7b5461 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -875,7 +875,7 @@ DRIVER_INIT_MEMBER(witch_state,witch)
UINT8 *ROM = (UINT8 *)memregion("maincpu")->base();
membank("bank1")->set_base(&ROM[0x10000+UNBANKED_SIZE]);
- machine().device("sub")->memory().space(AS_PROGRAM)->install_read_handler(0x7000, 0x700f, read8_delegate(FUNC(witch_state::prot_read_700x), this));
+ machine().device("sub")->memory().space(AS_PROGRAM).install_read_handler(0x7000, 0x700f, read8_delegate(FUNC(witch_state::prot_read_700x), this));
m_bank = -1;
}
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index 499107e1267..184c9c80d5c 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -1057,7 +1057,7 @@ DRIVER_INIT_MEMBER(wiz_state,stinger)
{ 5,3,7, 0x80 },
{ 5,7,3, 0x28 }
};
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine().root_device().memregion("maincpu")->base();
int size = machine().root_device().memregion("maincpu")->bytes();
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, size);
@@ -1094,13 +1094,13 @@ DRIVER_INIT_MEMBER(wiz_state,stinger)
DRIVER_INIT_MEMBER(wiz_state,scion)
{
- machine().device("audiocpu")->memory().space(AS_PROGRAM)->nop_write(0x4000, 0x4001);
+ machine().device("audiocpu")->memory().space(AS_PROGRAM).nop_write(0x4000, 0x4001);
}
DRIVER_INIT_MEMBER(wiz_state,wiz)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd400, 0xd400, read8_delegate(FUNC(wiz_state::wiz_protection_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd400, 0xd400, read8_delegate(FUNC(wiz_state::wiz_protection_r),this));
}
diff --git a/src/mame/drivers/xtom3d.c b/src/mame/drivers/xtom3d.c
index 913d634f591..81e8a8cec30 100644
--- a/src/mame/drivers/xtom3d.c
+++ b/src/mame/drivers/xtom3d.c
@@ -664,7 +664,7 @@ void xtom3d_state::machine_start()
kbdc8042_init(machine(), &at8042);
pc_vga_init(machine(), vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
}
void xtom3d_state::machine_reset()
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index bf76b640999..f10749b3b6a 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -156,7 +156,7 @@ number 0 on each voice. That sample is 00000-00000.
DRIVER_INIT_MEMBER(yunsun16_state,magicbub)
{
// remove_mem_write16_handler (0, 0x800180, 0x800181 );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x800188, 0x800189, write16_delegate(FUNC(yunsun16_state::magicbub_sound_command_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x800188, 0x800189, write16_delegate(FUNC(yunsun16_state::magicbub_sound_command_w),this));
}
/***************************************************************************
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index 603a3badb18..4d2503513e2 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -1522,7 +1522,7 @@ static void zaxxonj_decode(running_machine &machine, const char *cputag)
};
int A;
- address_space &space = *machine.device(cputag)->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(cputag)->memory().space(AS_PROGRAM);
UINT8 *rom = machine.root_device().memregion(cputag)->base();
int size = machine.root_device().memregion(cputag)->bytes();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, size);
@@ -1582,17 +1582,17 @@ DRIVER_INIT_MEMBER(zaxxon_state,futspy)
DRIVER_INIT_MEMBER(zaxxon_state,razmataz)
{
- address_space *pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &pgmspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
nprinces_decode(machine(), "maincpu");
/* additional input ports are wired */
- pgmspace->install_read_port(0xc004, 0xc004, 0, 0x18f3, "SW04");
- pgmspace->install_read_port(0xc008, 0xc008, 0, 0x18f3, "SW08");
- pgmspace->install_read_port(0xc00c, 0xc00c, 0, 0x18f3, "SW0C");
+ pgmspace.install_read_port(0xc004, 0xc004, 0, 0x18f3, "SW04");
+ pgmspace.install_read_port(0xc008, 0xc008, 0, 0x18f3, "SW08");
+ pgmspace.install_read_port(0xc00c, 0xc00c, 0, 0x18f3, "SW0C");
/* unknown behavior expected here */
- pgmspace->install_read_handler(0xc80a, 0xc80a, read8_delegate(FUNC(zaxxon_state::razmataz_counter_r),this));
+ pgmspace.install_read_handler(0xc80a, 0xc80a, read8_delegate(FUNC(zaxxon_state::razmataz_counter_r),this));
/* additional state saving */
save_item(NAME(m_razmataz_dial_pos));
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index 341ee4ff598..3111dd3cf41 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -733,13 +733,13 @@ WRITE32_MEMBER(zn_state::zn_qsound_w)
DRIVER_INIT_MEMBER(zn_state,coh1000c)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f000000, 0x1f3fffff, "bank1" ); /* fixed game rom */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f400000, 0x1f7fffff, "bank2" ); /* banked game rom */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1fb00000, 0x1fb00003, write32_delegate(FUNC(zn_state::bank_coh1000c_w),this)); /* bankswitch */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler ( 0x1fb40010, 0x1fb40013, read32_delegate(FUNC(zn_state::capcom_kickharness_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler ( 0x1fb40020, 0x1fb40023, read32_delegate(FUNC(zn_state::capcom_kickharness_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1fb80000, 0x1fbfffff, "bank3" ); /* country rom */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1fb60000, 0x1fb60003, write32_delegate(FUNC(zn_state::zn_qsound_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f000000, 0x1f3fffff, "bank1" ); /* fixed game rom */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f400000, 0x1f7fffff, "bank2" ); /* banked game rom */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fb00000, 0x1fb00003, write32_delegate(FUNC(zn_state::bank_coh1000c_w),this)); /* bankswitch */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler ( 0x1fb40010, 0x1fb40013, read32_delegate(FUNC(zn_state::capcom_kickharness_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler ( 0x1fb40020, 0x1fb40023, read32_delegate(FUNC(zn_state::capcom_kickharness_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1fb80000, 0x1fbfffff, "bank3" ); /* country rom */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fb60000, 0x1fb60003, write32_delegate(FUNC(zn_state::zn_qsound_w),this));
zn_driver_init(machine());
@@ -950,13 +950,13 @@ WRITE32_MEMBER(zn_state::bank_coh3002c_w)
DRIVER_INIT_MEMBER(zn_state,coh3002c)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f000000, 0x1f3fffff, "bank1" ); /* fixed game rom */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f400000, 0x1f7fffff, "bank2" ); /* banked game rom */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler ( 0x1fb40010, 0x1fb40013, read32_delegate(FUNC(zn_state::capcom_kickharness_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler ( 0x1fb40020, 0x1fb40023, read32_delegate(FUNC(zn_state::capcom_kickharness_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1fb00000, 0x1fb00003, write32_delegate(FUNC(zn_state::bank_coh3002c_w),this)); /* bankswitch */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1fb80000, 0x1fbfffff, "bank3" ); /* country rom */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1fb60000, 0x1fb60003, write32_delegate(FUNC(zn_state::zn_qsound_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f000000, 0x1f3fffff, "bank1" ); /* fixed game rom */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f400000, 0x1f7fffff, "bank2" ); /* banked game rom */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler ( 0x1fb40010, 0x1fb40013, read32_delegate(FUNC(zn_state::capcom_kickharness_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler ( 0x1fb40020, 0x1fb40023, read32_delegate(FUNC(zn_state::capcom_kickharness_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fb00000, 0x1fb00003, write32_delegate(FUNC(zn_state::bank_coh3002c_w),this)); /* bankswitch */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1fb80000, 0x1fbfffff, "bank3" ); /* country rom */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fb60000, 0x1fb60003, write32_delegate(FUNC(zn_state::zn_qsound_w),this));
zn_driver_init(machine());
}
@@ -1239,10 +1239,10 @@ DRIVER_INIT_MEMBER(zn_state,coh1000ta)
m_taitofx1_eeprom_size1 = 0x200; m_taitofx1_eeprom1 = auto_alloc_array( machine(), UINT8, m_taitofx1_eeprom_size1 );
machine().device<nvram_device>("eeprom1")->set_base(m_taitofx1_eeprom1, m_taitofx1_eeprom_size1);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f000000, 0x1f7fffff, "bank1" ); /* banked game rom */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler ( 0x1fb40000, 0x1fb40003, write32_delegate(FUNC(zn_state::bank_coh1000t_w),this)); /* bankswitch */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1fb80000, 0x1fb80003, read32_delegate(FUNC(zn_state::taitofx1a_ymsound_r),this), write32_delegate(FUNC(zn_state::taitofx1a_ymsound_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank( 0x1fbe0000, 0x1fbe0000 + ( m_taitofx1_eeprom_size1 - 1 ), "bank2" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f000000, 0x1f7fffff, "bank1" ); /* banked game rom */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler ( 0x1fb40000, 0x1fb40003, write32_delegate(FUNC(zn_state::bank_coh1000t_w),this)); /* bankswitch */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1fb80000, 0x1fb80003, read32_delegate(FUNC(zn_state::taitofx1a_ymsound_r),this), write32_delegate(FUNC(zn_state::taitofx1a_ymsound_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank( 0x1fbe0000, 0x1fbe0000 + ( m_taitofx1_eeprom_size1 - 1 ), "bank2" );
zn_driver_init(machine());
}
@@ -1328,13 +1328,13 @@ DRIVER_INIT_MEMBER(zn_state,coh1000tb)
machine().device<nvram_device>("eeprom1")->set_base(m_taitofx1_eeprom1, m_taitofx1_eeprom_size1);
machine().device<nvram_device>("eeprom2")->set_base(m_taitofx1_eeprom2, m_taitofx1_eeprom_size2);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f000000, 0x1f7fffff, "bank1" ); /* banked game rom */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank( 0x1fb00000, 0x1fb00000 + ( m_taitofx1_eeprom_size1 - 1 ), "bank2" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler ( 0x1fb40000, 0x1fb40003, write32_delegate(FUNC(zn_state::bank_coh1000t_w),this)); /* bankswitch */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler ( 0x1fb80000, 0x1fb8ffff, write32_delegate(FUNC(zn_state::taitofx1b_volume_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler ( 0x1fba0000, 0x1fbaffff, write32_delegate(FUNC(zn_state::taitofx1b_sound_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler ( 0x1fbc0000, 0x1fbc0003, read32_delegate(FUNC(zn_state::taitofx1b_sound_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank( 0x1fbe0000, 0x1fbe0000 + ( m_taitofx1_eeprom_size2 - 1 ), "bank3" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f000000, 0x1f7fffff, "bank1" ); /* banked game rom */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank( 0x1fb00000, 0x1fb00000 + ( m_taitofx1_eeprom_size1 - 1 ), "bank2" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler ( 0x1fb40000, 0x1fb40003, write32_delegate(FUNC(zn_state::bank_coh1000t_w),this)); /* bankswitch */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler ( 0x1fb80000, 0x1fb8ffff, write32_delegate(FUNC(zn_state::taitofx1b_volume_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler ( 0x1fba0000, 0x1fbaffff, write32_delegate(FUNC(zn_state::taitofx1b_sound_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler ( 0x1fbc0000, 0x1fbc0003, read32_delegate(FUNC(zn_state::taitofx1b_sound_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank( 0x1fbe0000, 0x1fbe0000 + ( m_taitofx1_eeprom_size2 - 1 ), "bank3" );
zn_driver_init(machine());
}
@@ -1499,7 +1499,7 @@ static void atpsx_dma_read( zn_state *state, UINT32 n_address, INT32 n_size )
/* dma size is in 32-bit words, convert to bytes */
n_size <<= 2;
- address_space &space = *state->machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = state->machine().firstcpu->space(AS_PROGRAM);
while( n_size > 0 )
{
psxwritebyte( p_n_psxram, n_address, ide_controller32_r( ide, space, 0x1f0 / 4, 0x000000ff ) );
@@ -1517,11 +1517,11 @@ DRIVER_INIT_MEMBER(zn_state,coh1000w)
{
device_t *ide = machine().device("ide");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f000000, 0x1f1fffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write ( 0x1f000000, 0x1f000003);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler( *ide, 0x1f7e4000, 0x1f7e4fff, FUNC(ide_controller32_r), FUNC(ide_controller32_w) );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_readwrite ( 0x1f7e8000, 0x1f7e8003);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler( *ide, 0x1f7f4000, 0x1f7f4fff, FUNC(ide_controller32_r), FUNC(ide_controller32_w) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f000000, 0x1f1fffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write ( 0x1f000000, 0x1f000003);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler( *ide, 0x1f7e4000, 0x1f7e4fff, FUNC(ide_controller32_r), FUNC(ide_controller32_w) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite ( 0x1f7e8000, 0x1f7e8003);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler( *ide, 0x1f7f4000, 0x1f7f4fff, FUNC(ide_controller32_r), FUNC(ide_controller32_w) );
zn_driver_init(machine());
}
@@ -1713,9 +1713,9 @@ WRITE32_MEMBER(zn_state::coh1002e_latch_w)
DRIVER_INIT_MEMBER(zn_state,coh1002e)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f000000, 0x1f7fffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1fa10300, 0x1fa10303, write32_delegate(FUNC(zn_state::coh1002e_bank_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1fb00000, 0x1fb00007, write32_delegate(FUNC(zn_state::coh1002e_latch_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f000000, 0x1f7fffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fa10300, 0x1fa10303, write32_delegate(FUNC(zn_state::coh1002e_bank_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fb00000, 0x1fb00007, write32_delegate(FUNC(zn_state::coh1002e_latch_w),this));
zn_driver_init(machine());
}
@@ -1853,12 +1853,12 @@ READ32_MEMBER(zn_state::bam2_unk_r)
DRIVER_INIT_MEMBER(zn_state,bam2)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f000000, 0x1f3fffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f400000, 0x1f7fffff, "bank2" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler ( 0x1fb00000, 0x1fb00007, read32_delegate(FUNC(zn_state::bam2_mcu_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler ( 0x1fa20000, 0x1fa20003, read32_delegate(FUNC(zn_state::bam2_unk_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1fa10300, 0x1fa10303, write32_delegate(FUNC(zn_state::bam2_sec_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1fb00000, 0x1fb00007, write32_delegate(FUNC(zn_state::bam2_mcu_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f000000, 0x1f3fffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f400000, 0x1f7fffff, "bank2" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler ( 0x1fb00000, 0x1fb00007, read32_delegate(FUNC(zn_state::bam2_mcu_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler ( 0x1fa20000, 0x1fa20003, read32_delegate(FUNC(zn_state::bam2_unk_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fa10300, 0x1fa10303, write32_delegate(FUNC(zn_state::bam2_sec_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fb00000, 0x1fb00007, write32_delegate(FUNC(zn_state::bam2_mcu_w),this));
zn_driver_init(machine());
}
@@ -2172,18 +2172,18 @@ READ32_MEMBER(zn_state::nbajamex_80_r)
DRIVER_INIT_MEMBER(zn_state,coh1000a)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f000000, 0x1f1fffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1fbfff00, 0x1fbfff03, write32_delegate(FUNC(zn_state::acpsx_00_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1fbfff10, 0x1fbfff13, write32_delegate(FUNC(zn_state::acpsx_10_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f000000, 0x1f1fffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fbfff00, 0x1fbfff03, write32_delegate(FUNC(zn_state::acpsx_00_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fbfff10, 0x1fbfff13, write32_delegate(FUNC(zn_state::acpsx_10_w),this));
if( strcmp( machine().system().name, "nbajamex" ) == 0 )
{
m_nbajamex_eeprom_size = 0x8000;
m_nbajamex_eeprom = auto_alloc_array( machine(), UINT8, m_nbajamex_eeprom_size );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank( 0x1f200000, 0x1f200000 + ( m_nbajamex_eeprom_size - 1 ), "bank2" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler ( 0x1fbfff08, 0x1fbfff0b, read32_delegate(FUNC(zn_state::nbajamex_08_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1fbfff80, 0x1fbfff83, read32_delegate(FUNC(zn_state::nbajamex_80_r),this), write32_delegate(FUNC(zn_state::nbajamex_80_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank( 0x1f200000, 0x1f200000 + ( m_nbajamex_eeprom_size - 1 ), "bank2" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler ( 0x1fbfff08, 0x1fbfff0b, read32_delegate(FUNC(zn_state::nbajamex_08_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1fbfff80, 0x1fbfff83, read32_delegate(FUNC(zn_state::nbajamex_80_r),this), write32_delegate(FUNC(zn_state::nbajamex_80_w),this));
membank( "bank2" )->set_base( m_nbajamex_eeprom ); /* ram/eeprom/?? */
}
@@ -2191,9 +2191,9 @@ DRIVER_INIT_MEMBER(zn_state,coh1000a)
if( ( !strcmp( machine().system().name, "jdredd" ) ) ||
( !strcmp( machine().system().name, "jdreddb" ) ) )
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x1fbfff8c, 0x1fbfff8f,read32_delegate(FUNC(zn_state::jdredd_idestat_r),this) );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write ( 0x1fbfff8c, 0x1fbfff8f);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x1fbfff90, 0x1fbfff9f, read32_delegate(FUNC(zn_state::jdredd_ide_r),this), write32_delegate(FUNC(zn_state::jdredd_ide_w),this) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x1fbfff8c, 0x1fbfff8f,read32_delegate(FUNC(zn_state::jdredd_idestat_r),this) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write ( 0x1fbfff8c, 0x1fbfff8f);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x1fbfff90, 0x1fbfff9f, read32_delegate(FUNC(zn_state::jdredd_ide_r),this), write32_delegate(FUNC(zn_state::jdredd_ide_w),this) );
}
zn_driver_init(machine());
@@ -2355,8 +2355,8 @@ WRITE32_MEMBER(zn_state::coh1001l_bnk_w)
DRIVER_INIT_MEMBER(zn_state,coh1001l)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f000000, 0x1f7fffff, "bank1" ); /* banked rom */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1fb00000, 0x1fb00003, write32_delegate(FUNC(zn_state::coh1001l_bnk_w),this) );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f000000, 0x1f7fffff, "bank1" ); /* banked rom */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fb00000, 0x1fb00003, write32_delegate(FUNC(zn_state::coh1001l_bnk_w),this) );
zn_driver_init(machine());
}
@@ -2397,9 +2397,9 @@ WRITE32_MEMBER(zn_state::coh1002v_bnk_w)
DRIVER_INIT_MEMBER(zn_state,coh1002v)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f000000, 0x1f27ffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1fb00000, 0x1fbfffff, "bank2" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler( 0x1fb00000, 0x1fb00003, write32_delegate(FUNC(zn_state::coh1002v_bnk_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f000000, 0x1f27ffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1fb00000, 0x1fbfffff, "bank2" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler( 0x1fb00000, 0x1fb00003, write32_delegate(FUNC(zn_state::coh1002v_bnk_w),this));
zn_driver_init(machine());
}
@@ -2600,9 +2600,9 @@ WRITE32_MEMBER(zn_state::cbaj_z80_w)
DRIVER_INIT_MEMBER(zn_state,coh1002m)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank ( 0x1f000000, 0x1f7fffff, "bank1" );
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x1fb00000, 0x1fb00003, read32_delegate(FUNC(zn_state::cbaj_z80_r),this), write32_delegate(FUNC(zn_state::cbaj_z80_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler ( 0x1fb00004, 0x1fb00007, write32_delegate(FUNC(zn_state::coh1002m_bank_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank ( 0x1f000000, 0x1f7fffff, "bank1" );
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x1fb00000, 0x1fb00003, read32_delegate(FUNC(zn_state::cbaj_z80_r),this), write32_delegate(FUNC(zn_state::cbaj_z80_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler ( 0x1fb00004, 0x1fb00007, write32_delegate(FUNC(zn_state::coh1002m_bank_w),this));
zn_driver_init(machine());
}
diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h
index 95db4d74d90..9b7ee149f4f 100644
--- a/src/mame/includes/jaguar.h
+++ b/src/mame/includes/jaguar.h
@@ -251,7 +251,7 @@ protected:
int effective_hvalue(int value);
bool adjust_object_timer(int vc);
void update_cpu_irq();
- UINT8 *memory_base(UINT32 offset) { return reinterpret_cast<UINT8 *>(m_gpu->space(AS_PROGRAM)->get_read_ptr(offset)); }
+ UINT8 *memory_base(UINT32 offset) { return reinterpret_cast<UINT8 *>(m_gpu->space(AS_PROGRAM).get_read_ptr(offset)); }
void blitter_run();
void scanline_update(int param);
void set_palette(UINT16 vmode);
diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c
index 13ea8a200a0..1c24c8ce9a3 100644
--- a/src/mame/machine/amiga.c
+++ b/src/mame/machine/amiga.c
@@ -261,7 +261,7 @@ void amiga_machine_config(running_machine &machine, const amiga_machine_interfac
static void amiga_m68k_reset(device_t *device)
{
amiga_state *state = device->machine().driver_data<amiga_state>();
- address_space &space = *device->memory().space(AS_PROGRAM);
+ address_space &space = device->memory().space(AS_PROGRAM);
logerror("Executed RESET at PC=%06x\n", space.device().safe_pc());
@@ -318,7 +318,7 @@ static TIMER_CALLBACK( scanline_callback )
if (scanline == 0)
{
/* signal VBLANK IRQ */
- amiga_custom_w(*machine.device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_VERTB, 0xffff);
+ amiga_custom_w(machine.device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_VERTB, 0xffff);
/* clock the first CIA TOD */
mos6526_tod_w(cia_0, 1);
@@ -939,7 +939,7 @@ static TIMER_CALLBACK( amiga_blitter_proc )
CUSTOM_REG(REG_DMACON) &= ~0x4000;
/* signal an interrupt */
- amiga_custom_w(*machine.device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_BLIT, 0xffff);
+ amiga_custom_w(machine.device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_BLIT, 0xffff);
/* reset the blitter timer */
state->m_blitter_timer->reset( );
@@ -1094,13 +1094,13 @@ WRITE16_HANDLER( amiga_cia_w )
void amiga_cia_0_irq(device_t *device, int state)
{
- amiga_custom_w(*device->machine().device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, (state ? 0x8000 : 0x0000) | INTENA_PORTS, 0xffff);
+ amiga_custom_w(device->machine().device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, (state ? 0x8000 : 0x0000) | INTENA_PORTS, 0xffff);
}
void amiga_cia_1_irq(device_t *device, int state)
{
- amiga_custom_w(*device->machine().device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, (state ? 0x8000 : 0x0000) | INTENA_EXTER, 0xffff);
+ amiga_custom_w(device->machine().device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, (state ? 0x8000 : 0x0000) | INTENA_EXTER, 0xffff);
}
@@ -1249,7 +1249,7 @@ static TIMER_CALLBACK( finish_serial_write )
CUSTOM_REG(REG_SERDATR) |= 0x3000;
/* signal an interrupt */
- amiga_custom_w(*machine.device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_TBE, 0xffff);
+ amiga_custom_w(machine.device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_TBE, 0xffff);
}
@@ -1509,7 +1509,7 @@ WRITE16_HANDLER( amiga_custom_w )
void amiga_serial_in_w(running_machine &machine, UINT16 data)
{
amiga_state *state = machine.driver_data<amiga_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int mask = (CUSTOM_REG(REG_SERPER) & 0x8000) ? 0x1ff : 0xff;
/* copy the data to the low 8 bits of SERDATR and set RBF */
diff --git a/src/mame/machine/archimds.c b/src/mame/machine/archimds.c
index 80d69f0417d..1349e9e9b37 100644
--- a/src/mame/machine/archimds.c
+++ b/src/mame/machine/archimds.c
@@ -115,7 +115,7 @@ static TIMER_CALLBACK( vidc_vblank )
/* TODO: what type of DMA this is, burst or cycle steal? Docs doesn't explain it (4 usec is the DRAM refresh). */
static TIMER_CALLBACK( vidc_video_tick )
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
static UINT8 *vram = machine.root_device().memregion("vram")->base();
UINT32 size;
@@ -133,7 +133,7 @@ static TIMER_CALLBACK( vidc_video_tick )
/* audio DMA */
static TIMER_CALLBACK( vidc_audio_tick )
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 ulaw_comp;
INT16 res;
UINT8 ch;
@@ -423,7 +423,7 @@ DIRECT_UPDATE_HANDLER( a310_setopbase )
void archimedes_driver_init(running_machine &machine)
{
archimedes_memc_physmem = reinterpret_cast<UINT32 *>(machine.root_device().memshare("physicalram")->ptr());
-// address_space &space = *machine.device<arm_device>("maincpu")->space(AS_PROGRAM);
+// address_space &space = machine.device<arm_device>("maincpu")->space(AS_PROGRAM);
// space.set_direct_update_handler(direct_update_delegate(FUNC(a310_setopbase), &machine));
}
diff --git a/src/mame/machine/asic65.c b/src/mame/machine/asic65.c
index 36e9b138caa..e3d76fcde3b 100644
--- a/src/mame/machine/asic65.c
+++ b/src/mame/machine/asic65.c
@@ -138,7 +138,7 @@ void asic65_config(running_machine &machine, int asictype)
void asic65_reset(running_machine &machine, int state)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* rom-based means reset and clear states */
if (asic65.cpu != NULL)
diff --git a/src/mame/machine/asteroid.c b/src/mame/machine/asteroid.c
index a8681e806a6..053ef12da12 100644
--- a/src/mame/machine/asteroid.c
+++ b/src/mame/machine/asteroid.c
@@ -133,6 +133,6 @@ WRITE8_MEMBER(asteroid_state::astdelux_led_w)
void asteroid_state::machine_reset()
{
- asteroid_bank_switch_w(*machine().device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
- avgdvg_reset_w(*machine().device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
+ asteroid_bank_switch_w(machine().device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
+ avgdvg_reset_w(machine().device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
}
diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c
index 78b12eb9b3b..de5fd60e30d 100644
--- a/src/mame/machine/atari.c
+++ b/src/mame/machine/atari.c
@@ -105,13 +105,13 @@ void a600xl_mmu(running_machine &machine, UINT8 new_mmu)
if ( new_mmu & 0x80 )
{
logerror("%s MMU SELFTEST RAM\n", machine.system().name);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_readwrite(0x5000, 0x57ff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite(0x5000, 0x57ff);
}
else
{
logerror("%s MMU SELFTEST ROM\n", machine.system().name);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5000, 0x57ff, "bank2");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x5000, 0x57ff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5000, 0x57ff, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x5000, 0x57ff);
machine.root_device().membank("bank2")->set_base(machine.root_device().memregion("maincpu")->base() + 0x5000);
}
}
diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c
index 682b1e36e21..777b9d550fa 100644
--- a/src/mame/machine/atarigen.c
+++ b/src/mame/machine/atarigen.c
@@ -498,7 +498,7 @@ void atarigen_slapstic_init(device_t *device, offs_t base, offs_t mirror, int ch
slapstic_init(device->machine(), chipnum);
/* install the memory handlers */
- state->m_slapstic = device->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(base, base + 0x7fff, 0, mirror, FUNC(atarigen_slapstic_r), FUNC(atarigen_slapstic_w));
+ state->m_slapstic = device->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(base, base + 0x7fff, 0, mirror, FUNC(atarigen_slapstic_r), FUNC(atarigen_slapstic_w));
/* allocate memory for a copy of bank 0 */
state->m_slapstic_bank0 = auto_alloc_array(device->machine(), UINT8, 0x2000);
@@ -511,7 +511,7 @@ void atarigen_slapstic_init(device_t *device, offs_t base, offs_t mirror, int ch
state->m_slapstic_base = base;
state->m_slapstic_mirror = mirror;
- address_space &space = *downcast<cpu_device *>(device)->space(AS_PROGRAM);
+ address_space &space = device->memory().space(AS_PROGRAM);
space.set_direct_update_handler(direct_update_delegate(FUNC(atarigen_state::atarigen_slapstic_setdirect), state));
}
}
@@ -764,7 +764,7 @@ static void update_6502_irq(running_machine &machine)
static TIMER_CALLBACK( delayed_sound_reset )
{
atarigen_state *state = machine.driver_data<atarigen_state>();
- address_space &space = *state->m_sound_cpu->memory().space(AS_PROGRAM);
+ address_space &space = state->m_sound_cpu->memory().space(AS_PROGRAM);
/* unhalt and reset the sound CPU */
if (param == 0)
@@ -1125,7 +1125,7 @@ static void atarivc_common_w(screen_device &screen, offs_t offset, UINT16 newwor
/* scanline IRQ ack here */
case 0x1e:
/* hack: this should be a device */
- atarigen_scanline_int_ack_w(*screen.machine().device("maincpu")->memory().space(AS_PROGRAM), 0, 0, 0xffff);
+ atarigen_scanline_int_ack_w(screen.machine().device("maincpu")->memory().space(AS_PROGRAM), 0, 0, 0xffff);
break;
/* log anything else */
diff --git a/src/mame/machine/bagman.c b/src/mame/machine/bagman.c
index 567df6a04e1..490fd63834b 100644
--- a/src/mame/machine/bagman.c
+++ b/src/mame/machine/bagman.c
@@ -210,7 +210,7 @@ UINT8 line;
MACHINE_RESET_MEMBER(bagman_state,bagman)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
bagman_pal16r6_w(space, 0, 1); /*pin 2*/
bagman_pal16r6_w(space, 1, 1); /*pin 3*/
bagman_pal16r6_w(space, 2, 1); /*pin 4*/
diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c
index 5097e24b141..4d3390d83e1 100644
--- a/src/mame/machine/balsente.c
+++ b/src/mame/machine/balsente.c
@@ -137,7 +137,7 @@ void balsente_state::machine_start()
void balsente_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int numbanks;
/* reset counters; counter 2's gate is tied high */
diff --git a/src/mame/machine/cclimber.c b/src/mame/machine/cclimber.c
index c26b55c6a48..7678d9b3da4 100644
--- a/src/mame/machine/cclimber.c
+++ b/src/mame/machine/cclimber.c
@@ -6,7 +6,7 @@
static void cclimber_decode(running_machine &machine, const UINT8 convtable[8][16])
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine.root_device().memregion("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x10000);
int A;
diff --git a/src/mame/machine/cd32.c b/src/mame/machine/cd32.c
index 68694bb6301..1638a5f1227 100644
--- a/src/mame/machine/cd32.c
+++ b/src/mame/machine/cd32.c
@@ -174,7 +174,7 @@ static DEVICE_START( akiko )
akiko_state *state = get_safe_token(device);
state->set_machine(machine);
- state->m_space = machine.device("maincpu")->memory().space(AS_PROGRAM);
+ state->m_space = &machine.device("maincpu")->memory().space(AS_PROGRAM);
state->m_c2p_input_index = 0;
state->m_c2p_output_index = 0;
diff --git a/src/mame/machine/cps2crpt.c b/src/mame/machine/cps2crpt.c
index aab2fd7ff4f..937b17f101d 100644
--- a/src/mame/machine/cps2crpt.c
+++ b/src/mame/machine/cps2crpt.c
@@ -632,7 +632,7 @@ static void optimise_sboxes(struct optimised_sbox* out, const struct sbox* in)
static void cps2_decrypt(running_machine &machine, const UINT32 *master_key, UINT32 upper_limit)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT16 *rom = (UINT16 *)machine.root_device().memregion("maincpu")->base();
int length = machine.root_device().memregion("maincpu")->bytes();
UINT16 *dec = auto_alloc_array(machine, UINT16, length/2);
diff --git a/src/mame/machine/cx4fn.c b/src/mame/machine/cx4fn.c
index c51d6511264..2e7ec24997b 100644
--- a/src/mame/machine/cx4fn.c
+++ b/src/mame/machine/cx4fn.c
@@ -101,7 +101,7 @@ static void CX4_C4DrawWireFrame(running_machine &machine)
UINT8 Color;
INT32 i;
- address_space &space = *machine.device<cpu_device>("maincpu")->space(AS_PROGRAM);
+ address_space &space = machine.device<cpu_device>("maincpu")->space(AS_PROGRAM);
for(i = cx4.ram[0x0295]; i > 0; i--, line += 5)
{
if(space.read_byte(line) == 0xff &&
diff --git a/src/mame/machine/cx4oam.c b/src/mame/machine/cx4oam.c
index 916d1647c40..63184b4ad2c 100644
--- a/src/mame/machine/cx4oam.c
+++ b/src/mame/machine/cx4oam.c
@@ -44,7 +44,7 @@ static void CX4_op00_00(running_machine &machine)
offset = (cx4.ram[0x626] & 3) * 2;
srcptr = 0x220;
- address_space &space = *machine.device<cpu_device>("maincpu")->space(AS_PROGRAM);
+ address_space &space = machine.device<cpu_device>("maincpu")->space(AS_PROGRAM);
for(i = cx4.ram[0x620]; i > 0 && sprcount > 0; i--, srcptr += 16)
{
UINT32 spraddr = CX4_readl(srcptr + 7);
diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c
index 14b30855bbf..dcf934f063c 100644
--- a/src/mame/machine/dc.c
+++ b/src/mame/machine/dc.c
@@ -321,7 +321,7 @@ void dc_update_interrupt_status(running_machine &machine)
{
if((state->dc_sysctrl_regs[SB_G2DTNRM] & state->dc_sysctrl_regs[SB_ISTNRM]) || (state->dc_sysctrl_regs[SB_G2DTEXT] & state->dc_sysctrl_regs[SB_ISTEXT]))
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
printf("Wave DMA HW trigger\n");
wave_dma_execute(space);
@@ -333,7 +333,7 @@ void dc_update_interrupt_status(running_machine &machine)
{
if((state->dc_sysctrl_regs[SB_PDTNRM] & state->dc_sysctrl_regs[SB_ISTNRM]) || (state->dc_sysctrl_regs[SB_PDTEXT] & state->dc_sysctrl_regs[SB_ISTEXT]))
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
printf("PVR-DMA HW trigger\n");
pvr_dma_execute(space);
diff --git a/src/mame/machine/dec0.c b/src/mame/machine/dec0.c
index 4dce6529919..b563c977b0f 100644
--- a/src/mame/machine/dec0.c
+++ b/src/mame/machine/dec0.c
@@ -361,8 +361,8 @@ static void h6280_decrypt(running_machine &machine, const char *cputag)
DRIVER_INIT_MEMBER(dec0_state,hippodrm)
{
UINT8 *RAM = machine().root_device().memregion("sub")->base();
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x180000, 0x180fff, read16_delegate(FUNC(dec0_state::hippodrm_68000_share_r),this), write16_delegate(FUNC(dec0_state::hippodrm_68000_share_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xffc800, 0xffcfff, write16_delegate(FUNC(dec0_state::sprite_mirror_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x180000, 0x180fff, read16_delegate(FUNC(dec0_state::hippodrm_68000_share_r),this), write16_delegate(FUNC(dec0_state::hippodrm_68000_share_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xffc800, 0xffcfff, write16_delegate(FUNC(dec0_state::sprite_mirror_w),this));
h6280_decrypt(machine(), "sub");
@@ -386,7 +386,7 @@ DRIVER_INIT_MEMBER(dec0_state,slyspy)
DRIVER_INIT_MEMBER(dec0_state,robocop)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x180000, 0x180fff, read16_delegate(FUNC(dec0_state::robocop_68000_share_r),this), write16_delegate(FUNC(dec0_state::robocop_68000_share_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x180000, 0x180fff, read16_delegate(FUNC(dec0_state::robocop_68000_share_r),this), write16_delegate(FUNC(dec0_state::robocop_68000_share_w),this));
}
DRIVER_INIT_MEMBER(dec0_state,baddudes)
diff --git a/src/mame/machine/deco102.c b/src/mame/machine/deco102.c
index caa40be3cde..8fb0d0a0303 100644
--- a/src/mame/machine/deco102.c
+++ b/src/mame/machine/deco102.c
@@ -50,7 +50,7 @@ static UINT16 decrypt(UINT16 data, int address, int select_xor)
void deco102_decrypt_cpu(running_machine &machine, const char *cputag, int address_xor, int data_select_xor, int opcode_select_xor)
{
int i;
- address_space &space = *machine.device(cputag)->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(cputag)->memory().space(AS_PROGRAM);
UINT16 *rom = (UINT16 *)machine.root_device().memregion(cputag)->base();
int size = machine.root_device().memregion(cputag)->bytes();
UINT16 *opcodes = auto_alloc_array(machine, UINT16, size / 2);
diff --git a/src/mame/machine/fd1089.c b/src/mame/machine/fd1089.c
index f2df406d035..0bc23a8fdf0 100644
--- a/src/mame/machine/fd1089.c
+++ b/src/mame/machine/fd1089.c
@@ -253,9 +253,9 @@ void fd1089_base_device::device_start()
decrypt(0x000000, romsize, m_plaintext, m_decrypted_opcodes, rombase);
// mark the ROM region as decrypted, pointing to the opcodes (if it is mapped)
- address_space *program = space(AS_PROGRAM);
- if (program->get_read_ptr(0) != NULL)
- program->set_decrypted_region(0x000000, romsize - 1, m_decrypted_opcodes);
+ address_space &program = space(AS_PROGRAM);
+ if (program.get_read_ptr(0) != NULL)
+ program.set_decrypted_region(0x000000, romsize - 1, m_decrypted_opcodes);
}
diff --git a/src/mame/machine/fd1094.c b/src/mame/machine/fd1094.c
index 652ed749756..9a282971447 100644
--- a/src/mame/machine/fd1094.c
+++ b/src/mame/machine/fd1094.c
@@ -712,7 +712,7 @@ void fd1094_device::device_start()
// if address 0 is mapped to ROM, assume this is a state memory mapping and
// use the internal state change callback
- if (space(AS_PROGRAM)->get_read_ptr(0) != NULL)
+ if (space(AS_PROGRAM).get_read_ptr(0) != NULL)
m_state_change = state_change_delegate(FUNC(fd1094_device::default_state_change), this);
// determine length and configure our cache
@@ -961,7 +961,7 @@ void fd1094_device::decrypt(offs_t baseaddr, UINT32 size, const UINT16 *srcptr,
void fd1094_device::default_state_change(UINT8 state)
{
- space(AS_PROGRAM)->set_decrypted_region(0x000000, m_srcbytes - 1, m_cache.decrypted_opcodes(state));
+ space(AS_PROGRAM).set_decrypted_region(0x000000, m_srcbytes - 1, m_cache.decrypted_opcodes(state));
}
diff --git a/src/mame/machine/fddebug.c b/src/mame/machine/fddebug.c
index a1aaacfa7d9..bc988bd5af5 100644
--- a/src/mame/machine/fddebug.c
+++ b/src/mame/machine/fddebug.c
@@ -747,7 +747,7 @@ static int instruction_hook(device_t &device, offs_t curpc)
}
/* try all possible decodings at the current pc */
- posscount = try_all_possibilities(*device.memory().space(AS_PROGRAM), curpc, 0, 0, instrbuffer, keybuffer, posslist) - posslist;
+ posscount = try_all_possibilities(device.memory().space(AS_PROGRAM), curpc, 0, 0, instrbuffer, keybuffer, posslist) - posslist;
if (keydirty)
fd1094_regenerate_key(device.machine());
@@ -1075,7 +1075,7 @@ static void execute_fdpc(running_machine &machine, int ref, int params, const ch
static void execute_fdsearch(running_machine &machine, int ref, int params, const char **param)
{
- address_space &space = *debug_cpu_get_visible_cpu(machine)->memory().space(AS_PROGRAM);
+ address_space &space = debug_cpu_get_visible_cpu(machine)->memory().space(AS_PROGRAM);
int pc = space.device().safe_pc();
int length, first = TRUE;
UINT8 instrdata[2];
@@ -1201,7 +1201,7 @@ static void execute_fdsearch(running_machine &machine, int ref, int params, cons
static void execute_fddasm(running_machine &machine, int ref, int params, const char **param)
{
- address_space &space = *debug_cpu_get_visible_cpu(machine)->memory().space(AS_PROGRAM);
+ address_space &space = debug_cpu_get_visible_cpu(machine)->memory().space(AS_PROGRAM);
int origstate = fd1094_set_state(keyregion, -1);
const char *filename;
int skipped = FALSE;
diff --git a/src/mame/machine/galaxold.c b/src/mame/machine/galaxold.c
index 5748c637462..467d6a135eb 100644
--- a/src/mame/machine/galaxold.c
+++ b/src/mame/machine/galaxold.c
@@ -217,7 +217,7 @@ DRIVER_INIT_MEMBER(galaxold_state,dingoe)
rom[i] = BITSWAP8(rom[i],7,6,5,0,3,2,1,4);
}
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x3001, 0x3001, FUNC(dingoe_3001_r)); /* Protection check */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x3001, 0x3001, FUNC(dingoe_3001_r)); /* Protection check */
}
#endif
@@ -266,19 +266,19 @@ CUSTOM_INPUT_MEMBER(galaxold_state::_4in1_fake_port_r)
DRIVER_INIT_MEMBER(galaxold_state,pisces)
{
/* the coin lockout was replaced */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x6002, 0x6002, FUNC(galaxold_gfxbank_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x6002, 0x6002, FUNC(galaxold_gfxbank_w));
}
DRIVER_INIT_MEMBER(galaxold_state,checkmaj)
{
/* for the title screen */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x3800, 0x3800, FUNC(checkmaj_protection_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x3800, 0x3800, FUNC(checkmaj_protection_r));
}
DRIVER_INIT_MEMBER(galaxold_state,dingo)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x3000, 0x3000, FUNC(dingo_3000_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x3035, 0x3035, FUNC(dingo_3035_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x3000, 0x3000, FUNC(dingo_3000_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x3035, 0x3035, FUNC(dingo_3035_r));
}
@@ -296,7 +296,7 @@ static UINT8 decode_mooncrst(UINT8 data,offs_t addr)
DRIVER_INIT_MEMBER(galaxold_state,mooncrsu)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa000, 0xa002, FUNC(galaxold_gfxbank_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xa000, 0xa002, FUNC(galaxold_gfxbank_w));
}
DRIVER_INIT_MEMBER(galaxold_state,mooncrst)
@@ -313,13 +313,13 @@ DRIVER_INIT_MEMBER(galaxold_state,mooncrst)
DRIVER_INIT_MEMBER(galaxold_state,mooncrgx)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x6000, 0x6002, FUNC(galaxold_gfxbank_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x6000, 0x6002, FUNC(galaxold_gfxbank_w));
}
DRIVER_INIT_MEMBER(galaxold_state,moonqsr)
{
offs_t i;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine().root_device().memregion("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine(), UINT8, 0x8000);
@@ -397,7 +397,7 @@ Pin layout is such that links can replace the PAL if encryption is not used.
DRIVER_INIT_MEMBER(galaxold_state,4in1)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
offs_t i, len = memregion("maincpu")->bytes();
UINT8 *RAM = memregion("maincpu")->base();
@@ -421,7 +421,7 @@ INTERRUPT_GEN_MEMBER(galaxold_state::hunchbks_vh_interrupt)
DRIVER_INIT_MEMBER(galaxold_state,ladybugg)
{
/* Doesn't actually use the bank, but it mustn't have a coin lock! */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x6002, 0x6002, write8_delegate(FUNC(galaxold_state::galaxold_gfxbank_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x6002, 0x6002, write8_delegate(FUNC(galaxold_state::galaxold_gfxbank_w),this));
}
DRIVER_INIT_MEMBER(galaxold_state,bullsdrtg)
diff --git a/src/mame/machine/irobot.c b/src/mame/machine/irobot.c
index 9bb6ce73608..966ebdc6654 100644
--- a/src/mame/machine/irobot.c
+++ b/src/mame/machine/irobot.c
@@ -186,8 +186,8 @@ void irobot_state::machine_reset()
/* set an initial timer to go off on scanline 0 */
machine().scheduler().timer_set(machine().primary_screen->time_until_pos(0), FUNC(scanline_callback));
- irobot_rom_banksel_w(*machine().device("maincpu")->memory().space(AS_PROGRAM),0,0);
- irobot_out0_w(*machine().device("maincpu")->memory().space(AS_PROGRAM),0,0);
+ irobot_rom_banksel_w(machine().device("maincpu")->memory().space(AS_PROGRAM),0,0);
+ irobot_out0_w(machine().device("maincpu")->memory().space(AS_PROGRAM),0,0);
m_combase = m_comRAM[0];
m_combase_mb = m_comRAM[1];
m_outx = 0;
diff --git a/src/mame/machine/kabuki.c b/src/mame/machine/kabuki.c
index d17695ad922..c6fc2f2a201 100644
--- a/src/mame/machine/kabuki.c
+++ b/src/mame/machine/kabuki.c
@@ -161,7 +161,7 @@ static void kabuki_decode(UINT8 *src,UINT8 *dest_op,UINT8 *dest_data,
static void mitchell_decode(running_machine &machine, int swap_key1,int swap_key2,int addr_key,int xor_key)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine.root_device().memregion("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, machine.root_device().memregion("maincpu")->bytes());
int numbanks = (machine.root_device().memregion("maincpu")->bytes() - 0x10000) / 0x4000;
@@ -202,7 +202,7 @@ void block_decode(running_machine &machine) { mitchell_decode(machine,0x02461
static void cps1_decode(running_machine &machine,int swap_key1,int swap_key2,int addr_key,int xor_key)
{
- address_space &space = *machine.device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("audiocpu")->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x8000);
UINT8 *rom = machine.root_device().memregion("audiocpu")->base();
diff --git a/src/mame/machine/kaneko_calc3.c b/src/mame/machine/kaneko_calc3.c
index f56bee238bc..8dabf8a39a5 100644
--- a/src/mame/machine/kaneko_calc3.c
+++ b/src/mame/machine/kaneko_calc3.c
@@ -1243,7 +1243,7 @@ UINT8 kaneko_calc3_device::shift_bits(UINT8 dat, int bits)
int kaneko_calc3_device::calc3_decompress_table(running_machine& machine, int tabnum, UINT8* dstram, int dstoffset)
{
calc3_t &calc3 = m_calc3;
- address_space &space = *machine.device(":maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(":maincpu")->memory().space(AS_PROGRAM);
UINT8* datarom = memregion(":calc3_rom")->base();
UINT8 numregions;
@@ -1344,11 +1344,11 @@ int kaneko_calc3_device::calc3_decompress_table(running_machine& machine, int ta
//printf("save to eeprom\n");
{
- address_space *eeprom_space = space.machine().device<eeprom_device>(":eeprom")->space();
+ address_space &eeprom_space = space.machine().device<eeprom_device>(":eeprom")->space();
for (i=0;i<0x80;i++)
{
- eeprom_space->write_byte(i, space.read_byte(calc3.eeprom_addr+0x200000+i));
+ eeprom_space.write_byte(i, space.read_byte(calc3.eeprom_addr+0x200000+i));
}
}
@@ -1633,7 +1633,7 @@ void kaneko_calc3_device::calc3_mcu_run(running_machine &machine)
calc3_t &calc3 = m_calc3;
UINT16 mcu_command;
int i;
- address_space &space = *machine.device(":maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(":maincpu")->memory().space(AS_PROGRAM);
if ( calc3.mcu_status != (1|2|4|8) ) return;
@@ -1689,11 +1689,11 @@ void kaneko_calc3_device::calc3_mcu_run(running_machine &machine)
}
#endif
{
- address_space *eeprom_space = space.machine().device<eeprom_device>(":eeprom")->space();
+ address_space &eeprom_space = space.machine().device<eeprom_device>(":eeprom")->space();
for (i=0;i<0x80;i++)
{
- space.write_byte(calc3.eeprom_addr+0x200000+i, eeprom_space->read_byte(i));
+ space.write_byte(calc3.eeprom_addr+0x200000+i, eeprom_space.read_byte(i));
}
}
diff --git a/src/mame/machine/kaneko_toybox.c b/src/mame/machine/kaneko_toybox.c
index 626766d89e6..64f033a0500 100644
--- a/src/mame/machine/kaneko_toybox.c
+++ b/src/mame/machine/kaneko_toybox.c
@@ -200,11 +200,11 @@ void kaneko_toybox_device::toybox_mcu_run(running_machine &machine)
{
UINT8* nvdat = (UINT8*)&kaneko16_mcu_ram[mcu_offset];
- address_space *eeprom_space = machine.device<eeprom_device>(":eeprom")->space();
+ address_space &eeprom_space = machine.device<eeprom_device>(":eeprom")->space();
for (int i=0;i<0x80;i++)
{
- nvdat[i] = eeprom_space->read_byte(i);
+ nvdat[i] = eeprom_space.read_byte(i);
}
logerror("%s : MCU executed command: %04X %04X (load NVRAM settings)\n", machine.describe_context(), mcu_command, mcu_offset*2);
@@ -214,11 +214,11 @@ void kaneko_toybox_device::toybox_mcu_run(running_machine &machine)
case 0x42: // Write to NVRAM
{
- address_space *eeprom_space = machine.device<eeprom_device>(":eeprom")->space();
+ address_space &eeprom_space = machine.device<eeprom_device>(":eeprom")->space();
UINT8* nvdat = (UINT8*)&kaneko16_mcu_ram[mcu_offset];
for (int i=0;i<0x80;i++)
{
- eeprom_space->write_byte(i, nvdat[i]);
+ eeprom_space.write_byte(i, nvdat[i]);
}
logerror("%s : MCU executed command: %04X %04X (save NVRAM settings)\n", machine.describe_context(), mcu_command, mcu_offset*2);
@@ -233,11 +233,11 @@ void kaneko_toybox_device::toybox_mcu_run(running_machine &machine)
//memcpy(m_nvram_save, bonkadv_mcu_43, sizeof(bonkadv_mcu_43));
- address_space *eeprom_space = machine.device<eeprom_device>(":eeprom")->space();
+ address_space &eeprom_space = machine.device<eeprom_device>(":eeprom")->space();
UINT8* nvdat = (UINT8*)&bonkadv_mcu_43[0];
for (int i=0;i<0x80;i++)
{
- eeprom_space->write_byte(i, nvdat[i]);
+ eeprom_space.write_byte(i, nvdat[i]);
}
logerror("%s : MCU executed command: %04X %04X (restore default NVRAM settings)\n", machine.describe_context(), mcu_command, mcu_offset*2);
}
diff --git a/src/mame/machine/konami1.c b/src/mame/machine/konami1.c
index 5d0d4df4f03..5a7035a77b6 100644
--- a/src/mame/machine/konami1.c
+++ b/src/mame/machine/konami1.c
@@ -42,7 +42,7 @@ static UINT8 konami1_decodebyte( UINT8 opcode, UINT16 address )
UINT8 *konami1_decode(running_machine &machine, const char *cpu)
{
- address_space &space = *machine.device(cpu)->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(cpu)->memory().space(AS_PROGRAM);
const UINT8 *rom = machine.root_device().memregion(cpu)->base();
int size = machine.root_device().memregion(cpu)->bytes();
int A;
diff --git a/src/mame/machine/konamigx.c b/src/mame/machine/konamigx.c
index cd5c0398345..f584e39cc09 100644
--- a/src/mame/machine/konamigx.c
+++ b/src/mame/machine/konamigx.c
@@ -443,7 +443,7 @@ void fantjour_dma_install(running_machine &machine)
{
konamigx_state *state = machine.driver_data<konamigx_state>();
state_save_register_global_array(machine, fantjour_dma);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xdb0000, 0xdb001f, write32_delegate(FUNC(konamigx_state::fantjour_dma_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xdb0000, 0xdb001f, write32_delegate(FUNC(konamigx_state::fantjour_dma_w),state));
memset(fantjour_dma, 0, sizeof(fantjour_dma));
}
diff --git a/src/mame/machine/mc8123.c b/src/mame/machine/mc8123.c
index 052166f20fb..6325e8dd227 100644
--- a/src/mame/machine/mc8123.c
+++ b/src/mame/machine/mc8123.c
@@ -377,7 +377,7 @@ static UINT8 mc8123_decrypt(offs_t addr,UINT8 val,const UINT8 *key,int opcode)
void mc8123_decrypt_rom(running_machine &machine, const char *cpu, const char *keyrgn, const char *bankname, int numbanks)
{
- address_space &space = *machine.device(cpu)->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(cpu)->memory().space(AS_PROGRAM);
int fixed_length = numbanks == 1 ? 0xc000 : 0x8000;
UINT8 *decrypted1 = auto_alloc_array(machine, UINT8, fixed_length);
UINT8 *decrypted2 = numbanks > 1 ? auto_alloc_array(machine, UINT8, 0x4000 * numbanks) : 0;
diff --git a/src/mame/machine/mcr68.c b/src/mame/machine/mcr68.c
index 489a47f2535..b2c00d2df9b 100644
--- a/src/mame/machine/mcr68.c
+++ b/src/mame/machine/mcr68.c
@@ -288,7 +288,7 @@ WRITE8_DEVICE_HANDLER( zwackery_pia1_w )
WRITE_LINE_DEVICE_HANDLER( zwackery_ca2_w )
{
mcr68_state *drvstate = device->machine().driver_data<mcr68_state>();
- address_space &space = *device->machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = device->machine().device("maincpu")->memory().space(AS_PROGRAM);
drvstate->m_chip_squeak_deluxe->write(space, 0, (state << 4) | drvstate->m_zwackery_sound_data);
}
diff --git a/src/mame/machine/md_cart.c b/src/mame/machine/md_cart.c
index 3cc5662ab50..061660285a4 100644
--- a/src/mame/machine/md_cart.c
+++ b/src/mame/machine/md_cart.c
@@ -916,8 +916,8 @@ static void install_sram_rw_handlers(running_machine &machine, bool mask_addr)
image->battery_load(state->m_md_cart.sram, state->m_md_cart.sram_end - state->m_md_cart.sram_start + 1, 0xff); // Dino Dini's Soccer needs backup RAM to be 1fill
memcpy(megadriv_backupram, state->m_md_cart.sram, state->m_md_cart.sram_end - state->m_md_cart.sram_start + 1);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(state->m_md_cart.sram_start & mask, state->m_md_cart.sram_end & mask, FUNC(genesis_sram_read));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(state->m_md_cart.sram_start & mask, state->m_md_cart.sram_end & mask, FUNC(genesis_sram_write));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(state->m_md_cart.sram_start & mask, state->m_md_cart.sram_end & mask, FUNC(genesis_sram_read));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(state->m_md_cart.sram_start & mask, state->m_md_cart.sram_end & mask, FUNC(genesis_sram_write));
state->m_md_cart.sram_handlers_installed = 1;
}
@@ -1245,8 +1245,8 @@ static void setup_megadriv_custom_mappers(running_machine &machine)
case CM_JCART:
case CM_JCART_SEPROM:
/* Codemasters PCB (J-Carts) */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x38fffe, 0x38ffff, FUNC(jcart_ctrl_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x38fffe, 0x38ffff, FUNC(jcart_ctrl_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x38fffe, 0x38ffff, FUNC(jcart_ctrl_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x38fffe, 0x38ffff, FUNC(jcart_ctrl_w));
break;
case SSF2:
@@ -1254,7 +1254,7 @@ static void setup_megadriv_custom_mappers(running_machine &machine)
memcpy(&ROM[0x400000], &ROM[VIRGIN_COPY_GEN], 0x400000);
memcpy(&ROM[0x000000], &ROM[VIRGIN_COPY_GEN], 0x400000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa130f0, 0xa130ff, FUNC(genesis_ssf2_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xa130f0, 0xa130ff, FUNC(genesis_ssf2_bank_w));
break;
case LIONK3:
@@ -1263,8 +1263,8 @@ static void setup_megadriv_custom_mappers(running_machine &machine)
memcpy(&ROM[0x000000], &ROM[VIRGIN_COPY_GEN], 0x200000); /* default rom */
memcpy(&ROM[0x200000], &ROM[VIRGIN_COPY_GEN], 0x200000); /* default rom */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x600000, 0x6fffff, FUNC(l3alt_prot_r), FUNC(l3alt_prot_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x700000, 0x7fffff, FUNC(l3alt_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x600000, 0x6fffff, FUNC(l3alt_prot_r), FUNC(l3alt_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x700000, 0x7fffff, FUNC(l3alt_bank_w));
break;
case SDK99:
@@ -1273,13 +1273,13 @@ static void setup_megadriv_custom_mappers(running_machine &machine)
memcpy(&ROM[0x000000], &ROM[VIRGIN_COPY_GEN], 0x300000); /* default rom */
memcpy(&ROM[0x300000], &ROM[VIRGIN_COPY_GEN], 0x100000); /* default rom */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x600000, 0x6fffff, FUNC(l3alt_prot_r), FUNC(l3alt_prot_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x700000, 0x7fffff, FUNC(l3alt_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x600000, 0x6fffff, FUNC(l3alt_prot_r), FUNC(l3alt_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x700000, 0x7fffff, FUNC(l3alt_bank_w));
break;
case REDCLIFF:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400000, 0x400001, FUNC(redclif_prot2_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400004, 0x400005, FUNC(redclif_prot_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400000, 0x400001, FUNC(redclif_prot2_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400004, 0x400005, FUNC(redclif_prot_r));
break;
case REDCL_EN:
@@ -1287,8 +1287,8 @@ static void setup_megadriv_custom_mappers(running_machine &machine)
ROM[x] ^= 0x40;
memcpy(&ROM[0x000000], &ROM[VIRGIN_COPY_GEN + 4], 0x200000); /* default rom */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400000, 0x400001, FUNC(redclif_prot2_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400004, 0x400005, FUNC(redclif_prot_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400000, 0x400001, FUNC(redclif_prot2_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400004, 0x400005, FUNC(redclif_prot_r));
break;
case RADICA:
@@ -1296,43 +1296,43 @@ static void setup_megadriv_custom_mappers(running_machine &machine)
memcpy(&ROM[0x400000], &ROM[VIRGIN_COPY_GEN], 0x400000); // keep a copy for later banking.. making use of huge ROM_REGION allocated to genesis driver
memcpy(&ROM[0x800000], &ROM[VIRGIN_COPY_GEN], 0x400000); // wraparound banking (from hazemd code)
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa13000, 0xa1307f, FUNC(radica_bank_select));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xa13000, 0xa1307f, FUNC(radica_bank_select));
break;
case KOF99:
//memcpy(&ROM[0x000000],&ROM[VIRGIN_COPY_GEN],0x300000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa13000, 0xa13001, FUNC(kof99_A13000_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa13002, 0xa13003, FUNC(kof99_A13002_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa1303e, 0xa1303f, FUNC(kof99_00A1303E_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xa13000, 0xa13001, FUNC(kof99_A13000_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xa13002, 0xa13003, FUNC(kof99_A13002_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xa1303e, 0xa1303f, FUNC(kof99_00A1303E_r));
break;
case SOULBLAD:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400002, 0x400003, FUNC(soulb_400002_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400004, 0x400005, FUNC(soulb_400004_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400006, 0x400007, FUNC(soulb_400006_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400002, 0x400003, FUNC(soulb_400002_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400004, 0x400005, FUNC(soulb_400004_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400006, 0x400007, FUNC(soulb_400006_r));
break;
case MJLOVER:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400000, 0x400001, FUNC(mjlovr_prot_1_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x401000, 0x401001, FUNC(mjlovr_prot_2_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400000, 0x400001, FUNC(mjlovr_prot_1_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x401000, 0x401001, FUNC(mjlovr_prot_2_r));
break;
case SQUIRRELK:
state->m_md_cart.squirrel_king_extra = 0;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400000, 0x400007, FUNC(squirrel_king_extra_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x400000, 0x400007, FUNC(squirrel_king_extra_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400000, 0x400007, FUNC(squirrel_king_extra_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x400000, 0x400007, FUNC(squirrel_king_extra_w));
break;
case SMOUSE:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400000, 0x400007, FUNC(smous_prot_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400000, 0x400007, FUNC(smous_prot_r));
break;
case SMB:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa13000, 0xa13001, FUNC(smbro_prot_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xa13000, 0xa13001, FUNC(smbro_prot_r));
break;
case SMB2:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa13000, 0xa13001, FUNC(smb2_extra_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xa13000, 0xa13001, FUNC(smb2_extra_r));
break;
case KAIJU:
@@ -1340,7 +1340,7 @@ static void setup_megadriv_custom_mappers(running_machine &machine)
memcpy(&ROM[0x600000], &ROM[VIRGIN_COPY_GEN], 0x200000);
memcpy(&ROM[0x000000], &ROM[VIRGIN_COPY_GEN], 0x200000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x700000, 0x7fffff, FUNC(kaiju_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x700000, 0x7fffff, FUNC(kaiju_bank_w));
break;
case CHINFIGHT3:
@@ -1348,48 +1348,48 @@ static void setup_megadriv_custom_mappers(running_machine &machine)
memcpy(&ROM[0x600000], &ROM[VIRGIN_COPY_GEN], 0x200000);
memcpy(&ROM[0x000000], &ROM[VIRGIN_COPY_GEN], 0x200000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400000, 0x4fffff, FUNC(chifi3_prot_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x600000, 0x6fffff, FUNC(chifi3_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400000, 0x4fffff, FUNC(chifi3_prot_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x600000, 0x6fffff, FUNC(chifi3_bank_w));
break;
case LIONK2:
state->m_md_cart.lion2_prot1_data = state->m_md_cart.lion2_prot2_data = 0;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400002, 0x400003, FUNC(lion2_prot1_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400006, 0x400007, FUNC(lion2_prot2_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x400000, 0x400001, FUNC(lion2_prot1_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x400004, 0x400005, FUNC(lion2_prot2_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400002, 0x400003, FUNC(lion2_prot1_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400006, 0x400007, FUNC(lion2_prot2_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x400000, 0x400001, FUNC(lion2_prot1_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x400004, 0x400005, FUNC(lion2_prot2_w));
break;
case BUGSLIFE:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa13000, 0xa13001, FUNC(bugl_extra_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xa13000, 0xa13001, FUNC(bugl_extra_r));
break;
case ELFWOR:
/* It return (0x55 @ 0x400000 OR 0xc9 @ 0x400004) AND (0x0f @ 0x400002 OR 0x18 @ 0x400006). It is probably best to add handlers for all 4 addresses. */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400000, 0x400001, FUNC(elfwor_400000_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400002, 0x400003, FUNC(elfwor_400002_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400004, 0x400005, FUNC(elfwor_400004_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400006, 0x400007, FUNC(elfwor_400006_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400000, 0x400001, FUNC(elfwor_400000_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400002, 0x400003, FUNC(elfwor_400002_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400004, 0x400005, FUNC(elfwor_400004_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400006, 0x400007, FUNC(elfwor_400006_r));
break;
case ROCKMANX3:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa13000, 0xa13001, FUNC(rx3_extra_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xa13000, 0xa13001, FUNC(rx3_extra_r));
break;
case SBUBBOB:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400000, 0x400001, FUNC(sbub_extra1_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400002, 0x400003, FUNC(sbub_extra2_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400000, 0x400001, FUNC(sbub_extra1_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400002, 0x400003, FUNC(sbub_extra2_r));
break;
case KOF98:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x480000, 0x480001, FUNC(kof98_aa_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4800e0, 0x4800e1, FUNC(kof98_aa_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4824a0, 0x4824a1, FUNC(kof98_aa_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x488880, 0x488881, FUNC(kof98_aa_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x480000, 0x480001, FUNC(kof98_aa_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4800e0, 0x4800e1, FUNC(kof98_aa_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4824a0, 0x4824a1, FUNC(kof98_aa_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x488880, 0x488881, FUNC(kof98_aa_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4a8820, 0x4a8821, FUNC(kof98_0a_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f8820, 0x4f8821, FUNC(kof98_00_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4a8820, 0x4a8821, FUNC(kof98_0a_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f8820, 0x4f8821, FUNC(kof98_00_r));
break;
case REALTEC:
@@ -1402,44 +1402,44 @@ static void setup_megadriv_custom_mappers(running_machine &machine)
for (mirroraddr = 0; mirroraddr < 0x400000; mirroraddr += 0x2000)
memcpy(ROM + mirroraddr, ROM + VIRGIN_COPY_GEN + 0x7e000, 0x002000); /* copy last 8kb across the whole rom region */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x400000, 0x400001, FUNC(realtec_400000_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x402000, 0x402001, FUNC(realtec_402000_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x404000, 0x404001, FUNC(realtec_404000_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x400000, 0x400001, FUNC(realtec_400000_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x402000, 0x402001, FUNC(realtec_402000_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x404000, 0x404001, FUNC(realtec_404000_w));
break;
case MC_SUP19IN1:
memcpy(&ROM[0x400000], &ROM[VIRGIN_COPY_GEN], 0x400000); // allow hard reset to menu
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa13000, 0xa13039, FUNC(s19in1_bank));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xa13000, 0xa13039, FUNC(s19in1_bank));
break;
case MC_SUP15IN1:
memcpy(&ROM[0x400000], &ROM[VIRGIN_COPY_GEN], 0x200000); // allow hard reset to menu
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa13000, 0xa13039, FUNC(s19in1_bank));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xa13000, 0xa13039, FUNC(s19in1_bank));
break;
case MC_12IN1:
memcpy(&ROM[0x000000], &ROM[VIRGIN_COPY_GEN], 0x400000); /* default rom */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa13000, 0xa1303f, FUNC(mc_12in1_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xa13000, 0xa1303f, FUNC(mc_12in1_bank_w));
break;
case TOPFIGHTER:
memcpy(&ROM[0x000000], &ROM[VIRGIN_COPY_GEN], 0x400000); /* default rom */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x6f5344, 0x6f5345, FUNC(topfig_6F5344_r) );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x6bd294, 0x6bd295, FUNC(topfig_6BD294_r) );
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x645b44, 0x645b45, FUNC(topfig_645B44_r) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x6f5344, 0x6f5345, FUNC(topfig_6F5344_r) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x6bd294, 0x6bd295, FUNC(topfig_6BD294_r) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x645b44, 0x645b45, FUNC(topfig_645B44_r) );
/* readd */
- //machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x689b80, 0x689b81, FUNC(MWA16_NOP));
- //machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x6d8b02, 0x6d8b03, FUNC(MWA16_NOP));
+ //machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x689b80, 0x689b81, FUNC(MWA16_NOP));
+ //machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x6d8b02, 0x6d8b03, FUNC(MWA16_NOP));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x700000, 0x7fffff, FUNC(topfig_bank_w) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x700000, 0x7fffff, FUNC(topfig_bank_w) );
break;
case PSOLAR:
memcpy(&ROM[0x000000], &ROM[VIRGIN_COPY_GEN], 0x400000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa13002, 0xa13007, FUNC(psolar_bank_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa13000, 0xa13001, FUNC(psolar_unk_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x0015e6, 0x0015e9, FUNC(psolar_hack_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xa13002, 0xa13007, FUNC(psolar_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xa13000, 0xa13001, FUNC(psolar_unk_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x0015e6, 0x0015e9, FUNC(psolar_hack_r));
psolar_rdcnt = 0;
break;
}
@@ -1507,7 +1507,7 @@ static void setup_megadriv_custom_mappers(running_machine &machine)
}
/* install NOP handler for TMSS */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa14000, 0xa14003, FUNC(genesis_TMSS_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xa14000, 0xa14003, FUNC(genesis_TMSS_bank_w));
}
static void setup_megadriv_sram(device_image_interface &image)
@@ -1535,7 +1535,7 @@ static void setup_megadriv_sram(device_image_interface &image)
state->m_md_cart.sram_end = state->m_md_cart.sram_start + image.get_software_region_length("sram") - 1;
state->m_md_cart.sram_detected = 1;
megadriv_backupram = (UINT16*) (ROM + state->m_md_cart.sram_start);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa130f0, 0xa130f1, FUNC(genesis_sram_toggle));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xa130f0, 0xa130f1, FUNC(genesis_sram_toggle));
if (state->m_md_cart.last_loaded_image_length <= state->m_md_cart.sram_start)
{
state->m_md_cart.sram_active = 1;
@@ -1557,39 +1557,39 @@ static void setup_megadriv_sram(device_image_interface &image)
state->m_md_cart.sram_end = state->m_md_cart.sram_start + image.get_software_region_length("fram") - 1;
state->m_md_cart.sram_detected = 1;
megadriv_backupram = (UINT16*) (ROM + state->m_md_cart.sram_start);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa130f0, 0xa130f1, FUNC(sega_6658a_reg_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa130f0, 0xa130f1, FUNC(sega_6658a_reg_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xa130f0, 0xa130f1, FUNC(sega_6658a_reg_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xa130f0, 0xa130f1, FUNC(sega_6658a_reg_w));
install_sram_rw_handlers(machine, FALSE);
break;
// These types might come either from xml or from old-styele loading
case SEGA_EEPROM:
state->m_md_cart.has_serial_eeprom = 1;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x200000, 0x200001, FUNC(wboy_v_eeprom_r), FUNC(wboy_v_eeprom_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x200000, 0x200001, FUNC(wboy_v_eeprom_r), FUNC(wboy_v_eeprom_w));
break;
case NBA_JAM:
state->m_md_cart.has_serial_eeprom = 1;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x200000, 0x200001, FUNC(nba_jam_eeprom_r), FUNC(nba_jam_eeprom_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x200000, 0x200001, FUNC(nba_jam_eeprom_r), FUNC(nba_jam_eeprom_w));
break;
case NBA_JAM_TE:
case NFL_QB_96:
case C_SLAM: // same handling but different sizes
state->m_md_cart.has_serial_eeprom = 1;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x200000, 0x200001, FUNC(nba_jam_te_eeprom_r), FUNC(nba_jam_te_eeprom_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x200000, 0x200001, FUNC(nba_jam_te_eeprom_r), FUNC(nba_jam_te_eeprom_w));
break;
case EA_NHLPA:
state->m_md_cart.has_serial_eeprom = 1;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x200000, 0x200001, FUNC(ea_nhlpa_eeprom_r), FUNC(ea_nhlpa_eeprom_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x200000, 0x200001, FUNC(ea_nhlpa_eeprom_r), FUNC(ea_nhlpa_eeprom_w));
break;
case CODE_MASTERS:
case CM_JCART_SEPROM:
state->m_md_cart.has_serial_eeprom = 1;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x300000, 0x300001, FUNC(codemasters_eeprom_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x380000, 0x380001, FUNC(codemasters_eeprom_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x300000, 0x300001, FUNC(codemasters_eeprom_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x380000, 0x380001, FUNC(codemasters_eeprom_r));
break;
case PSOLAR:
state->m_md_cart.sram_start = 0x800000;
@@ -1599,8 +1599,8 @@ static void setup_megadriv_sram(device_image_interface &image)
STM95.eeprom_data = (UINT8*)state->m_md_cart.sram;
state->m_md_cart.has_serial_eeprom = 1;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa13008, 0xa13009, FUNC(psolar_eeprom_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xa1300a, 0xa1300b, FUNC(psolar_eeprom_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xa13008, 0xa13009, FUNC(psolar_eeprom_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xa1300a, 0xa1300b, FUNC(psolar_eeprom_r));
break;
}
@@ -1652,7 +1652,7 @@ static void setup_megadriv_sram(device_image_interface &image)
if (state->m_md_cart.last_loaded_image_length <= state->m_md_cart.sram_start)
state->m_md_cart.sram_active = 1;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xa130f0, 0xa130f1, FUNC(genesis_sram_toggle));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xa130f0, 0xa130f1, FUNC(genesis_sram_toggle));
//printf("res: start %x, end %x, det %d, active %d\n", state->m_md_cart.sram_start, state->m_md_cart.sram_end, state->m_md_cart.sram_detected, state->m_md_cart.sram_active);
/* Sonic 1 included in Sonic Classics doesn't have SRAM and
diff --git a/src/mame/machine/mega32x.c b/src/mame/machine/mega32x.c
index ea0877153fa..0e556cd33fe 100644
--- a/src/mame/machine/mega32x.c
+++ b/src/mame/machine/mega32x.c
@@ -414,7 +414,7 @@ WRITE16_MEMBER( sega_32x_device::_32x_68k_a15106_w )
READ16_MEMBER( sega_32x_device::_32x_dreq_common_r )
{
- address_space* _68kspace = space.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& _68kspace = space.machine().device("maincpu")->memory().space(AS_PROGRAM);
switch (offset)
{
@@ -430,7 +430,7 @@ READ16_MEMBER( sega_32x_device::_32x_dreq_common_r )
return m_dreq_size;
case 0x0a/2: // a15112 / 4012
- if (&space == _68kspace)
+ if (&space == &_68kspace)
{
printf("attempting to READ FIFO with 68k!\n");
return 0xffff;
@@ -485,13 +485,13 @@ READ16_MEMBER( sega_32x_device::_32x_dreq_common_r )
WRITE16_MEMBER( sega_32x_device::_32x_dreq_common_w )
{
- address_space* _68kspace = space.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& _68kspace = space.machine().device("maincpu")->memory().space(AS_PROGRAM);
switch (offset)
{
case 0x00/2: // a15108 / 4008
case 0x02/2: // a1510a / 400a
- if (&space != _68kspace)
+ if (&space != &_68kspace)
{
printf("attempting to WRITE DREQ SRC with SH2!\n");
return;
@@ -506,7 +506,7 @@ WRITE16_MEMBER( sega_32x_device::_32x_dreq_common_w )
case 0x04/2: // a1510c / 400c
case 0x06/2: // a1510e / 400e
- if (&space != _68kspace)
+ if (&space != &_68kspace)
{
printf("attempting to WRITE DREQ DST with SH2!\n");
return;
@@ -520,7 +520,7 @@ WRITE16_MEMBER( sega_32x_device::_32x_dreq_common_w )
break;
case 0x08/2: // a15110 / 4010
- if (&space != _68kspace)
+ if (&space != &_68kspace)
{
printf("attempting to WRITE DREQ SIZE with SH2!\n");
return;
@@ -534,7 +534,7 @@ WRITE16_MEMBER( sega_32x_device::_32x_dreq_common_w )
break;
case 0x0a/2: // a15112 / 4012 - FIFO Write (68k only!)
- if (&space != _68kspace)
+ if (&space != &_68kspace)
{
printf("attempting to WRITE FIFO with SH2!\n");
return;
@@ -688,14 +688,14 @@ WRITE16_MEMBER( sega_32x_device::_32x_68k_a15100_w )
- space.machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x000070, 0x000073, read16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_w),this)); // h interrupt vector
+ space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x000070, 0x000073, read16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_w),this)); // h interrupt vector
}
else
{
m_32x_adapter_enabled = 0;
space.install_rom(0x0000000, 0x03fffff, space.machine().root_device().memregion("gamecart")->base());
- space.machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x000070, 0x000073, read16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_w),this)); // h interrupt vector
+ space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x000070, 0x000073, read16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_w),this)); // h interrupt vector
}
}
@@ -1063,15 +1063,15 @@ WRITE16_MEMBER( sega_32x_device::_32x_common_vdp_regs_w )
{
// what happens if the z80 accesses it, what authorization do we use? which address space do we get?? the z80 *can* write here and to the framebuffer via the window
- address_space* _68kspace = space.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& _68kspace = space.machine().device("maincpu")->memory().space(AS_PROGRAM);
- if (&space!= _68kspace)
+ if (&space!= &_68kspace)
{
if (m_32x_access_auth!=1)
return;
}
- if (&space== _68kspace)
+ if (&space== &_68kspace)
{
if (m_32x_access_auth!=0)
return;
@@ -1889,24 +1889,24 @@ void sega_32x_device::device_reset()
if (m_32x_adapter_enabled == 0)
{
- machine().device(":maincpu")->memory().space(AS_PROGRAM)->install_rom(0x0000000, 0x03fffff, machine().root_device().memregion(":gamecart")->base());
- machine().device(":maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x000070, 0x000073, read16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_w),this)); // h interrupt vector
+ machine().device(":maincpu")->memory().space(AS_PROGRAM).install_rom(0x0000000, 0x03fffff, machine().root_device().memregion(":gamecart")->base());
+ machine().device(":maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x000070, 0x000073, read16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_m_hint_vector_w),this)); // h interrupt vector
};
m_a15100_reg = 0x0000;
- machine().device(":maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa15100, 0xa15101, read16_delegate(FUNC(sega_32x_device::_32x_68k_a15100_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_a15100_w),this)); // framebuffer control regs
- machine().device(":maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa15102, 0xa15103, read16_delegate(FUNC(sega_32x_device::_32x_68k_a15102_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_a15102_w),this)); // send irq to sh2
- machine().device(":maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa15104, 0xa15105, read16_delegate(FUNC(sega_32x_device::_32x_68k_a15104_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_a15104_w),this)); // 68k BANK rom set
- machine().device(":maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa15106, 0xa15107, read16_delegate(FUNC(sega_32x_device::_32x_68k_a15106_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_a15106_w),this)); // dreq stuff
- machine().device(":maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa15108, 0xa15113, read16_delegate(FUNC(sega_32x_device::_32x_dreq_common_r),this), write16_delegate(FUNC(sega_32x_device::_32x_dreq_common_w),this)); // dreq src / dst / length /fifo
+ machine().device(":maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa15100, 0xa15101, read16_delegate(FUNC(sega_32x_device::_32x_68k_a15100_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_a15100_w),this)); // framebuffer control regs
+ machine().device(":maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa15102, 0xa15103, read16_delegate(FUNC(sega_32x_device::_32x_68k_a15102_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_a15102_w),this)); // send irq to sh2
+ machine().device(":maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa15104, 0xa15105, read16_delegate(FUNC(sega_32x_device::_32x_68k_a15104_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_a15104_w),this)); // 68k BANK rom set
+ machine().device(":maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa15106, 0xa15107, read16_delegate(FUNC(sega_32x_device::_32x_68k_a15106_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_a15106_w),this)); // dreq stuff
+ machine().device(":maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa15108, 0xa15113, read16_delegate(FUNC(sega_32x_device::_32x_dreq_common_r),this), write16_delegate(FUNC(sega_32x_device::_32x_dreq_common_w),this)); // dreq src / dst / length /fifo
- machine().device(":maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa1511a, 0xa1511b, read16_delegate(FUNC(sega_32x_device::_32x_68k_a1511a_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_a1511a_w),this)); // SEGA TV
+ machine().device(":maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa1511a, 0xa1511b, read16_delegate(FUNC(sega_32x_device::_32x_68k_a1511a_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_a1511a_w),this)); // SEGA TV
- machine().device(":maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa15120, 0xa1512f, read16_delegate(FUNC(sega_32x_device::_32x_68k_m_commsram_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_m_commsram_w),this)); // comms reg 0-7
- machine().device(":maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0xa15130, 0xa1513f, read16_delegate(FUNC(sega_32x_device::_32x_pwm_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_pwm_w),this));
+ machine().device(":maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa15120, 0xa1512f, read16_delegate(FUNC(sega_32x_device::_32x_68k_m_commsram_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_m_commsram_w),this)); // comms reg 0-7
+ machine().device(":maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0xa15130, 0xa1513f, read16_delegate(FUNC(sega_32x_device::_32x_pwm_r),this), write16_delegate(FUNC(sega_32x_device::_32x_68k_pwm_w),this));
- machine().device(":maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x0a130ec, 0x0a130ef, read16_delegate(FUNC(sega_32x_device::_32x_68k_MARS_r),this)); // system ID
+ machine().device(":maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x0a130ec, 0x0a130ef, read16_delegate(FUNC(sega_32x_device::_32x_68k_MARS_r),this)); // system ID
diff --git a/src/mame/machine/megacd.c b/src/mame/machine/megacd.c
index 4a274fc140c..4627cd4973c 100644
--- a/src/mame/machine/megacd.c
+++ b/src/mame/machine/megacd.c
@@ -886,7 +886,7 @@ void CDC_End_Transfer(running_machine& machine)
void CDC_Do_DMA(running_machine& machine, int rate)
{
- address_space& space = *machine.device(":segacd:segacd_68k")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device(":segacd:segacd_68k")->memory().space(AS_PROGRAM);
UINT32 dstoffset, length;
UINT8 *dest;
@@ -2304,7 +2304,7 @@ READ16_HANDLER( segacd_stopwatch_timer_r )
/* main CPU map set up in INIT */
void segacd_init_main_cpu( running_machine& machine )
{
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
segacd_font_bits = reinterpret_cast<UINT16 *>(machine.root_device().memshare(":segacd:segacd_font")->ptr());
segacd_backupram = reinterpret_cast<UINT16 *>(machine.root_device().memshare(":segacd:backupram")->ptr());
@@ -2324,21 +2324,21 @@ void segacd_init_main_cpu( running_machine& machine )
segacd_wordram_mapped = 1;
- space.machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x200000, 0x23ffff, FUNC(segacd_main_dataram_part1_r), FUNC(segacd_main_dataram_part1_w)); // RAM shared with sub
+ space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x200000, 0x23ffff, FUNC(segacd_main_dataram_part1_r), FUNC(segacd_main_dataram_part1_w)); // RAM shared with sub
- space.machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa12000, 0xa12001, FUNC(scd_a12000_halt_reset_r), FUNC(scd_a12000_halt_reset_w)); // sub-cpu control
- space.machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa12002, 0xa12003, FUNC(scd_a12002_memory_mode_r), FUNC(scd_a12002_memory_mode_w)); // memory mode / write protect
- //space.machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa12004, 0xa12005, FUNC(segacd_cdc_mode_address_r), FUNC(segacd_cdc_mode_address_w));
- space.machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa12006, 0xa12007, FUNC(scd_a12006_hint_register_r), FUNC(scd_a12006_hint_register_w)); // where HINT points on main CPU
- //space.machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler (0xa12008, 0xa12009, FUNC(cdc_data_main_r));
+ space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xa12000, 0xa12001, FUNC(scd_a12000_halt_reset_r), FUNC(scd_a12000_halt_reset_w)); // sub-cpu control
+ space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xa12002, 0xa12003, FUNC(scd_a12002_memory_mode_r), FUNC(scd_a12002_memory_mode_w)); // memory mode / write protect
+ //space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xa12004, 0xa12005, FUNC(segacd_cdc_mode_address_r), FUNC(segacd_cdc_mode_address_w));
+ space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xa12006, 0xa12007, FUNC(scd_a12006_hint_register_r), FUNC(scd_a12006_hint_register_w)); // where HINT points on main CPU
+ //space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler (0xa12008, 0xa12009, FUNC(cdc_data_main_r));
- space.machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa1200c, 0xa1200d, FUNC(segacd_stopwatch_timer_r), FUNC(segacd_stopwatch_timer_w)); // starblad
+ space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xa1200c, 0xa1200d, FUNC(segacd_stopwatch_timer_r), FUNC(segacd_stopwatch_timer_w)); // starblad
- space.machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa1200e, 0xa1200f, FUNC(segacd_comms_flags_r), FUNC(segacd_comms_flags_maincpu_w)); // communication flags block
+ space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xa1200e, 0xa1200f, FUNC(segacd_comms_flags_r), FUNC(segacd_comms_flags_maincpu_w)); // communication flags block
- space.machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa12010, 0xa1201f, FUNC(segacd_comms_main_part1_r), FUNC(segacd_comms_main_part1_w));
- space.machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa12020, 0xa1202f, FUNC(segacd_comms_main_part2_r), FUNC(segacd_comms_main_part2_w));
+ space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xa12010, 0xa1201f, FUNC(segacd_comms_main_part1_r), FUNC(segacd_comms_main_part1_w));
+ space.machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xa12020, 0xa1202f, FUNC(segacd_comms_main_part2_r), FUNC(segacd_comms_main_part2_w));
diff --git a/src/mame/machine/megadriv.c b/src/mame/machine/megadriv.c
index cde3f7ac814..a32b4a896d6 100644
--- a/src/mame/machine/megadriv.c
+++ b/src/mame/machine/megadriv.c
@@ -800,15 +800,15 @@ static WRITE16_HANDLER ( megadriv_68k_req_z80_reset )
// z80 area of the 68k if games misbehave
static READ8_HANDLER( z80_read_68k_banked_data )
{
- address_space *space68k = space.machine().device<legacy_cpu_device>("maincpu")->space();
- UINT8 ret = space68k->read_byte(genz80.z80_bank_addr+offset);
+ address_space &space68k = space.machine().device<legacy_cpu_device>("maincpu")->space();
+ UINT8 ret = space68k.read_byte(genz80.z80_bank_addr+offset);
return ret;
}
static WRITE8_HANDLER( z80_write_68k_banked_data )
{
- address_space *space68k = space.machine().device<legacy_cpu_device>("maincpu")->space();
- space68k->write_byte(genz80.z80_bank_addr+offset,data);
+ address_space &space68k = space.machine().device<legacy_cpu_device>("maincpu")->space();
+ space68k.write_byte(genz80.z80_bank_addr+offset,data);
}
@@ -1511,24 +1511,24 @@ void megatech_set_megadrive_z80_as_megadrive_z80(running_machine &machine, const
device_t *ym = machine.device("ymsnd");
/* INIT THE PORTS *********************************************************************************************/
- machine.device(tag)->memory().space(AS_IO)->install_legacy_readwrite_handler(0x0000, 0xffff, FUNC(z80_unmapped_port_r), FUNC(z80_unmapped_port_w));
+ machine.device(tag)->memory().space(AS_IO).install_legacy_readwrite_handler(0x0000, 0xffff, FUNC(z80_unmapped_port_r), FUNC(z80_unmapped_port_w));
/* catch any addresses that don't get mapped */
- machine.device(tag)->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x0000, 0xffff, FUNC(z80_unmapped_r), FUNC(z80_unmapped_w));
+ machine.device(tag)->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x0000, 0xffff, FUNC(z80_unmapped_r), FUNC(z80_unmapped_w));
- machine.device(tag)->memory().space(AS_PROGRAM)->install_readwrite_bank(0x0000, 0x1fff, "bank1");
+ machine.device(tag)->memory().space(AS_PROGRAM).install_readwrite_bank(0x0000, 0x1fff, "bank1");
machine.root_device().membank("bank1")->set_base(genz80.z80_prgram );
- machine.device(tag)->memory().space(AS_PROGRAM)->install_ram(0x0000, 0x1fff, genz80.z80_prgram);
+ machine.device(tag)->memory().space(AS_PROGRAM).install_ram(0x0000, 0x1fff, genz80.z80_prgram);
- machine.device(tag)->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(*ym, 0x4000, 0x4003, FUNC(ym2612_r), FUNC(ym2612_w));
- machine.device(tag)->memory().space(AS_PROGRAM)->install_legacy_write_handler (0x6000, 0x6000, FUNC(megadriv_z80_z80_bank_w));
- machine.device(tag)->memory().space(AS_PROGRAM)->install_legacy_write_handler (0x6001, 0x6001, FUNC(megadriv_z80_z80_bank_w));
- machine.device(tag)->memory().space(AS_PROGRAM)->install_legacy_read_handler (0x6100, 0x7eff, FUNC(megadriv_z80_unmapped_read));
- machine.device(tag)->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x7f00, 0x7fff, FUNC(megadriv_z80_vdp_read), FUNC(megadriv_z80_vdp_write));
- machine.device(tag)->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x8000, 0xffff, FUNC(z80_read_68k_banked_data), FUNC(z80_write_68k_banked_data));
+ machine.device(tag)->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(*ym, 0x4000, 0x4003, FUNC(ym2612_r), FUNC(ym2612_w));
+ machine.device(tag)->memory().space(AS_PROGRAM).install_legacy_write_handler (0x6000, 0x6000, FUNC(megadriv_z80_z80_bank_w));
+ machine.device(tag)->memory().space(AS_PROGRAM).install_legacy_write_handler (0x6001, 0x6001, FUNC(megadriv_z80_z80_bank_w));
+ machine.device(tag)->memory().space(AS_PROGRAM).install_legacy_read_handler (0x6100, 0x7eff, FUNC(megadriv_z80_unmapped_read));
+ machine.device(tag)->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x7f00, 0x7fff, FUNC(megadriv_z80_vdp_read), FUNC(megadriv_z80_vdp_write));
+ machine.device(tag)->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x8000, 0xffff, FUNC(z80_read_68k_banked_data), FUNC(z80_write_68k_banked_data));
}
diff --git a/src/mame/machine/megasvp.c b/src/mame/machine/megasvp.c
index 923bf33fee5..648f8a1b9e2 100644
--- a/src/mame/machine/megasvp.c
+++ b/src/mame/machine/megasvp.c
@@ -354,13 +354,13 @@ void svp_init(running_machine &machine)
/* SVP stuff */
state->m_dram = auto_alloc_array(machine, UINT8, 0x20000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0x300000, 0x31ffff, state->m_dram);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xa15000, 0xa150ff, FUNC(svp_68k_io_r), FUNC(svp_68k_io_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_ram(0x300000, 0x31ffff, state->m_dram);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xa15000, 0xa150ff, FUNC(svp_68k_io_r), FUNC(svp_68k_io_w));
// "cell arrange" 1 and 2
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x390000, 0x39ffff, FUNC(svp_68k_cell1_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x3a0000, 0x3affff, FUNC(svp_68k_cell2_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x390000, 0x39ffff, FUNC(svp_68k_cell1_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x3a0000, 0x3affff, FUNC(svp_68k_cell2_r));
- machine.device("svp")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x438, 0x438, FUNC(svp_speedup_r));
+ machine.device("svp")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x438, 0x438, FUNC(svp_speedup_r));
state->m_iram = auto_alloc_array(machine, UINT8, 0x800);
state->membank("bank3")->set_base(state->m_iram);
diff --git a/src/mame/machine/megavdp.c b/src/mame/machine/megavdp.c
index 4fda2fa41bb..5d719133d3e 100644
--- a/src/mame/machine/megavdp.c
+++ b/src/mame/machine/megavdp.c
@@ -204,7 +204,7 @@ void sega_genesis_vdp_device::device_start()
irq4_on_timer = machine().scheduler().timer_alloc(FUNC(irq4_on_timer_callback), (void*)this);
megadriv_render_timer = machine().scheduler().timer_alloc(FUNC(megadriv_render_timer_callback), (void*)this);
- m_space68k = machine().device<legacy_cpu_device>(":maincpu")->space();
+ m_space68k = &machine().device<legacy_cpu_device>(":maincpu")->space();
m_cpu68k = machine().device<legacy_cpu_device>(":maincpu");
}
diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c
index 90d887a828f..d192ccfcf73 100644
--- a/src/mame/machine/mhavoc.c
+++ b/src/mame/machine/mhavoc.c
@@ -82,7 +82,7 @@ void mhavoc_state::machine_start()
void mhavoc_state::machine_reset()
{
- address_space &space = *machine().device("alpha")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("alpha")->memory().space(AS_PROGRAM);
m_has_gamma_cpu = (machine().device("gamma") != NULL);
membank("bank1")->configure_entry(0, m_zram0);
@@ -324,6 +324,6 @@ DRIVER_INIT_MEMBER(mhavoc_state,mhavocrv)
{
/* install the speech support that was only optionally stuffed for use */
/* in the Return to Vax hack */
- machine().device("gamma")->memory().space(AS_PROGRAM)->install_write_handler(0x5800, 0x5800, write8_delegate(FUNC(mhavoc_state::mhavocrv_speech_data_w),this));
- machine().device("gamma")->memory().space(AS_PROGRAM)->install_write_handler(0x5900, 0x5900, write8_delegate(FUNC(mhavoc_state::mhavocrv_speech_strobe_w),this));
+ machine().device("gamma")->memory().space(AS_PROGRAM).install_write_handler(0x5800, 0x5800, write8_delegate(FUNC(mhavoc_state::mhavocrv_speech_data_w),this));
+ machine().device("gamma")->memory().space(AS_PROGRAM).install_write_handler(0x5900, 0x5900, write8_delegate(FUNC(mhavoc_state::mhavocrv_speech_strobe_w),this));
}
diff --git a/src/mame/machine/micro3d.c b/src/mame/machine/micro3d.c
index 45a2ce58ceb..f3764eedeb9 100644
--- a/src/mame/machine/micro3d.c
+++ b/src/mame/machine/micro3d.c
@@ -605,7 +605,7 @@ WRITE32_MEMBER(micro3d_state::drmath_intr2_ack)
DRIVER_INIT_MEMBER(micro3d_state,micro3d)
{
- address_space &space = *machine().device("drmath")->memory().space(AS_DATA);
+ address_space &space = machine().device("drmath")->memory().space(AS_DATA);
i8051_set_serial_tx_callback(machine().device("audiocpu"), data_from_i8031);
i8051_set_serial_rx_callback(machine().device("audiocpu"), data_to_i8031);
@@ -624,7 +624,7 @@ DRIVER_INIT_MEMBER(micro3d_state,micro3d)
DRIVER_INIT_MEMBER(micro3d_state,botss)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* Required to pass the hardware version check */
space.install_read_handler(0x140000, 0x140001, read16_delegate(FUNC(micro3d_state::botss_140000_r),this));
diff --git a/src/mame/machine/midtunit.c b/src/mame/machine/midtunit.c
index 54aa8de2c42..c55514c61ca 100644
--- a/src/mame/machine/midtunit.c
+++ b/src/mame/machine/midtunit.c
@@ -445,16 +445,16 @@ DRIVER_INIT_MEMBER(midtunit_state,mktunit)
init_tunit_generic(machine(), SOUND_ADPCM);
/* protection */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x1b00000, 0x1b6ffff, read16_delegate(FUNC(midtunit_state::mk_prot_r),this), write16_delegate(FUNC(midtunit_state::mk_prot_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x1b00000, 0x1b6ffff, read16_delegate(FUNC(midtunit_state::mk_prot_r),this), write16_delegate(FUNC(midtunit_state::mk_prot_w),this));
/* sound chip protection (hidden RAM) */
- machine().device("adpcm:cpu")->memory().space(AS_PROGRAM)->install_ram(0xfb9c, 0xfbc6);
+ machine().device("adpcm:cpu")->memory().space(AS_PROGRAM).install_ram(0xfb9c, 0xfbc6);
}
DRIVER_INIT_MEMBER(midtunit_state,mkturbo)
{
/* protection */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xfffff400, 0xfffff40f, read16_delegate(FUNC(midtunit_state::mkturbo_prot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xfffff400, 0xfffff40f, read16_delegate(FUNC(midtunit_state::mkturbo_prot_r),this));
DRIVER_INIT_CALL(mktunit);
}
@@ -469,20 +469,20 @@ static void init_nbajam_common(running_machine &machine, int te_protection)
if (!te_protection)
{
nbajam_prot_table = nbajam_prot_values;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x1b14020, 0x1b2503f, read16_delegate(FUNC(midtunit_state::nbajam_prot_r),state), write16_delegate(FUNC(midtunit_state::nbajam_prot_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x1b14020, 0x1b2503f, read16_delegate(FUNC(midtunit_state::nbajam_prot_r),state), write16_delegate(FUNC(midtunit_state::nbajam_prot_w),state));
}
else
{
nbajam_prot_table = nbajamte_prot_values;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x1b15f40, 0x1b37f5f, read16_delegate(FUNC(midtunit_state::nbajam_prot_r),state), write16_delegate(FUNC(midtunit_state::nbajam_prot_w),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x1b95f40, 0x1bb7f5f, read16_delegate(FUNC(midtunit_state::nbajam_prot_r),state), write16_delegate(FUNC(midtunit_state::nbajam_prot_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x1b15f40, 0x1b37f5f, read16_delegate(FUNC(midtunit_state::nbajam_prot_r),state), write16_delegate(FUNC(midtunit_state::nbajam_prot_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x1b95f40, 0x1bb7f5f, read16_delegate(FUNC(midtunit_state::nbajam_prot_r),state), write16_delegate(FUNC(midtunit_state::nbajam_prot_w),state));
}
/* sound chip protection (hidden RAM) */
if (!te_protection)
- machine.device("adpcm:cpu")->memory().space(AS_PROGRAM)->install_ram(0xfbaa, 0xfbd4);
+ machine.device("adpcm:cpu")->memory().space(AS_PROGRAM).install_ram(0xfbaa, 0xfbd4);
else
- machine.device("adpcm:cpu")->memory().space(AS_PROGRAM)->install_ram(0xfbec, 0xfc16);
+ machine.device("adpcm:cpu")->memory().space(AS_PROGRAM).install_ram(0xfbec, 0xfc16);
}
DRIVER_INIT_MEMBER(midtunit_state,nbajam)
@@ -501,19 +501,19 @@ DRIVER_INIT_MEMBER(midtunit_state,jdreddp)
init_tunit_generic(machine(), SOUND_ADPCM_LARGE);
/* looks like the watchdog needs to be disabled */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x01d81060, 0x01d8107f);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x01d81060, 0x01d8107f);
/* protection */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x1b00000, 0x1bfffff, read16_delegate(FUNC(midtunit_state::jdredd_prot_r),this), write16_delegate(FUNC(midtunit_state::jdredd_prot_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x1b00000, 0x1bfffff, read16_delegate(FUNC(midtunit_state::jdredd_prot_r),this), write16_delegate(FUNC(midtunit_state::jdredd_prot_w),this));
/* sound chip protection (hidden RAM) */
- machine().device("adpcm:cpu")->memory().space(AS_PROGRAM)->install_read_bank(0xfbcf, 0xfbf9, "bank7");
- machine().device("adpcm:cpu")->memory().space(AS_PROGRAM)->install_write_bank(0xfbcf, 0xfbf9, "bank9");
+ machine().device("adpcm:cpu")->memory().space(AS_PROGRAM).install_read_bank(0xfbcf, 0xfbf9, "bank7");
+ machine().device("adpcm:cpu")->memory().space(AS_PROGRAM).install_write_bank(0xfbcf, 0xfbf9, "bank9");
membank("adpcm:bank9")->set_base(auto_alloc_array(machine(), UINT8, 0x80));
#if ENABLE_ALL_JDREDD_LEVELS
/* how about the final levels? */
- jdredd_hack = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xFFBA7FF0, 0xFFBA7FFf, FUNC(jdredd_hack_r));
+ jdredd_hack = machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xFFBA7FF0, 0xFFBA7FFf, FUNC(jdredd_hack_r));
#endif
}
@@ -534,13 +534,13 @@ DRIVER_INIT_MEMBER(midtunit_state,mk2)
midtunit_gfx_rom_large = 1;
/* protection */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x00f20c60, 0x00f20c7f, write16_delegate(FUNC(midtunit_state::mk2_prot_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x00f42820, 0x00f4283f, write16_delegate(FUNC(midtunit_state::mk2_prot_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01a190e0, 0x01a190ff, read16_delegate(FUNC(midtunit_state::mk2_prot_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01a191c0, 0x01a191df, read16_delegate(FUNC(midtunit_state::mk2_prot_shift_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01a3d0c0, 0x01a3d0ff, read16_delegate(FUNC(midtunit_state::mk2_prot_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01d9d1e0, 0x01d9d1ff, read16_delegate(FUNC(midtunit_state::mk2_prot_const_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01def920, 0x01def93f, read16_delegate(FUNC(midtunit_state::mk2_prot_const_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x00f20c60, 0x00f20c7f, write16_delegate(FUNC(midtunit_state::mk2_prot_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x00f42820, 0x00f4283f, write16_delegate(FUNC(midtunit_state::mk2_prot_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x01a190e0, 0x01a190ff, read16_delegate(FUNC(midtunit_state::mk2_prot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x01a191c0, 0x01a191df, read16_delegate(FUNC(midtunit_state::mk2_prot_shift_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x01a3d0c0, 0x01a3d0ff, read16_delegate(FUNC(midtunit_state::mk2_prot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x01d9d1e0, 0x01d9d1ff, read16_delegate(FUNC(midtunit_state::mk2_prot_const_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x01def920, 0x01def93f, read16_delegate(FUNC(midtunit_state::mk2_prot_const_r),this));
}
diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c
index 58c6e92de9a..bac897668de 100644
--- a/src/mame/machine/midwunit.c
+++ b/src/mame/machine/midwunit.c
@@ -221,13 +221,13 @@ DRIVER_INIT_MEMBER(midwunit_state,mk3r10)
DRIVER_INIT_MEMBER(midwunit_state,umk3)
{
init_mk3_common(machine());
- m_umk3_palette = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0106a060, 0x0106a09f, write16_delegate(FUNC(midwunit_state::umk3_palette_hack_w),this));
+ m_umk3_palette = machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0106a060, 0x0106a09f, write16_delegate(FUNC(midwunit_state::umk3_palette_hack_w),this));
}
DRIVER_INIT_MEMBER(midwunit_state,umk3r11)
{
init_mk3_common(machine());
- m_umk3_palette = machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0106a060, 0x0106a09f,write16_delegate(FUNC(midwunit_state::umk3_palette_hack_w),this));
+ m_umk3_palette = machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0106a060, 0x0106a09f,write16_delegate(FUNC(midwunit_state::umk3_palette_hack_w),this));
}
@@ -312,7 +312,7 @@ DRIVER_INIT_MEMBER(midwunit_state,wwfmania)
init_wunit_generic(machine());
/* enable I/O shuffling */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x01800000, 0x0180000f, write16_delegate(FUNC(midwunit_state::wwfmania_io_0_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x01800000, 0x0180000f, write16_delegate(FUNC(midwunit_state::wwfmania_io_0_w),this));
/* serial prefixes 430, 528 */
midway_serial_pic_init(machine(), 528);
diff --git a/src/mame/machine/midyunit.c b/src/mame/machine/midyunit.c
index a9eaf5a60ff..dc4392a8636 100644
--- a/src/mame/machine/midyunit.c
+++ b/src/mame/machine/midyunit.c
@@ -297,20 +297,20 @@ static void init_generic(running_machine &machine, int bpp, int sound, int prot_
switch (sound)
{
case SOUND_CVSD_SMALL:
- machine.device("cvsd:cpu")->memory().space(AS_PROGRAM)->install_write_handler(prot_start, prot_end, write8_delegate(FUNC(midyunit_state::cvsd_protection_w),state));
+ machine.device("cvsd:cpu")->memory().space(AS_PROGRAM).install_write_handler(prot_start, prot_end, write8_delegate(FUNC(midyunit_state::cvsd_protection_w),state));
state->m_cvsd_protection_base = machine.root_device().memregion("cvsd:cpu")->base() + 0x10000 + (prot_start - 0x8000);
break;
case SOUND_CVSD:
- machine.device("cvsd:cpu")->memory().space(AS_PROGRAM)->install_ram(prot_start, prot_end);
+ machine.device("cvsd:cpu")->memory().space(AS_PROGRAM).install_ram(prot_start, prot_end);
break;
case SOUND_ADPCM:
- machine.device("adpcm:cpu")->memory().space(AS_PROGRAM)->install_ram(prot_start, prot_end);
+ machine.device("adpcm:cpu")->memory().space(AS_PROGRAM).install_ram(prot_start, prot_end);
break;
case SOUND_NARC:
- machine.device("narcsnd:cpu0")->memory().space(AS_PROGRAM)->install_ram(prot_start, prot_end);
+ machine.device("narcsnd:cpu0")->memory().space(AS_PROGRAM).install_ram(prot_start, prot_end);
break;
case SOUND_YAWDIM:
@@ -478,7 +478,7 @@ READ16_MEMBER(midyunit_state::mkturbo_prot_r)
DRIVER_INIT_MEMBER(midyunit_state,mkyturbo)
{
/* protection */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xfffff400, 0xfffff40f, read16_delegate(FUNC(midyunit_state::mkturbo_prot_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xfffff400, 0xfffff40f, read16_delegate(FUNC(midyunit_state::mkturbo_prot_r),this));
DRIVER_INIT_CALL(mkyunit);
}
@@ -500,12 +500,12 @@ static void term2_init_common(running_machine &machine, write16_delegate hack_w)
init_generic(machine, 6, SOUND_ADPCM, 0xfa8d, 0xfa9c);
/* special inputs */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x01c00000, 0x01c0005f, read16_delegate(FUNC(midyunit_state::term2_input_r),state));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x01e00000, 0x01e0001f, write16_delegate(FUNC(midyunit_state::term2_sound_w),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x01c00000, 0x01c0005f, read16_delegate(FUNC(midyunit_state::term2_input_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x01e00000, 0x01e0001f, write16_delegate(FUNC(midyunit_state::term2_sound_w),state));
/* HACK: this prevents the freeze on the movies */
/* until we figure whats causing it, this is better than nothing */
- state->m_t2_hack_mem = machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x010aa0e0, 0x010aa0ff, hack_w);
+ state->m_t2_hack_mem = machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x010aa0e0, 0x010aa0ff, hack_w);
}
DRIVER_INIT_MEMBER(midyunit_state,term2) { term2_init_common(machine(), write16_delegate(FUNC(midyunit_state::term2_hack_w),this)); }
diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c
index a38fc5fdca0..be42a00bc1e 100644
--- a/src/mame/machine/n64.c
+++ b/src/mame/machine/n64.c
@@ -75,7 +75,7 @@ void n64_periphs::device_reset()
maincpu = machine().device("maincpu");
rspcpu = machine().device("rsp");
- mem_map = maincpu->memory().space(AS_PROGRAM);
+ mem_map = &maincpu->memory().space(AS_PROGRAM);
mi_version = 0x01010101;
mi_interrupt = 0;
diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c
index 8bb40bd7854..c89e7ccda4c 100644
--- a/src/mame/machine/namcos1.c
+++ b/src/mame/machine/namcos1.c
@@ -672,7 +672,7 @@ static void set_bank(running_machine &machine, int banknum, const bankhandler *h
"bank9", "bank10", "bank11", "bank12", "bank13", "bank14", "bank15", "bank16"
};
static const char *const cputags[] = { "maincpu", "sub" };
- address_space &space = *machine.device(cputags[(banknum >> 3) & 1])->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(cputags[(banknum >> 3) & 1])->memory().space(AS_PROGRAM);
int bankstart = (banknum & 7) * 0x2000;
/* for BANK handlers , memory direct and OP-code base */
@@ -1216,7 +1216,7 @@ DRIVER_INIT_MEMBER(namcos1_state,tankfrc4)
};
namcos1_driver_init(machine(), &tankfrce_specific);
- machine().device("mcu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x1400, 0x1401, FUNC(faceoff_inputs_r));
+ machine().device("mcu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x1400, 0x1401, FUNC(faceoff_inputs_r));
}
/*******************************************************************************
@@ -1307,7 +1307,7 @@ static READ8_HANDLER( quester_paddle_r )
DRIVER_INIT_MEMBER(namcos1_state,quester)
{
namcos1_driver_init(machine(), NULL);
- machine().device("mcu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x1400, 0x1401, FUNC(quester_paddle_r));
+ machine().device("mcu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x1400, 0x1401, FUNC(quester_paddle_r));
}
@@ -1396,7 +1396,7 @@ static READ8_HANDLER( berabohm_buttons_r )
DRIVER_INIT_MEMBER(namcos1_state,berabohm)
{
namcos1_driver_init(machine(), NULL);
- machine().device("mcu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x1400, 0x1401, FUNC(berabohm_buttons_r));
+ machine().device("mcu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x1400, 0x1401, FUNC(berabohm_buttons_r));
}
@@ -1466,5 +1466,5 @@ static READ8_HANDLER( faceoff_inputs_r )
DRIVER_INIT_MEMBER(namcos1_state,faceoff)
{
namcos1_driver_init(machine(), NULL);
- machine().device("mcu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x1400, 0x1401, FUNC(faceoff_inputs_r));
+ machine().device("mcu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x1400, 0x1401, FUNC(faceoff_inputs_r));
}
diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c
index 963bd22d841..e15d6451555 100644
--- a/src/mame/machine/namcos2.c
+++ b/src/mame/machine/namcos2.c
@@ -113,7 +113,7 @@ MACHINE_START_MEMBER(namcos2_shared_state,namcos2)
MACHINE_RESET_MEMBER(namcos2_shared_state,namcos2)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
mFinalLapProtCount = 0;
namcos2_mcu_analog_ctrl = 0;
namcos2_mcu_analog_data = 0xaa;
diff --git a/src/mame/machine/naomi.c b/src/mame/machine/naomi.c
index 24364f9dda7..66ff1859817 100644
--- a/src/mame/machine/naomi.c
+++ b/src/mame/machine/naomi.c
@@ -192,8 +192,8 @@ static void create_pic_from_retdat(running_machine& machine)
DRIVER_INIT_MEMBER(dc_state,naomi)
{
- //machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc2ad238, 0xc2ad23f, FUNC(naomi_biose_idle_skip_r)); // rev e bios
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc2b0600, 0xc2b0607, FUNC(naomi_biosh_idle_skip_r)); // rev h bios
+ //machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc2ad238, 0xc2ad23f, FUNC(naomi_biose_idle_skip_r)); // rev e bios
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc2b0600, 0xc2b0607, FUNC(naomi_biosh_idle_skip_r)); // rev h bios
jvsboard_type = JVSBD_DEFAULT;
actel_id = 0xffff;
@@ -202,7 +202,7 @@ DRIVER_INIT_MEMBER(dc_state,naomi)
DRIVER_INIT_MEMBER(dc_state,naomi2)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc2b0600, 0xc2b0607, FUNC(naomi2_biose_idle_skip_r)); // rev e bios
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc2b0600, 0xc2b0607, FUNC(naomi2_biose_idle_skip_r)); // rev e bios
jvsboard_type = JVSBD_DEFAULT;
actel_id = 0xffff;
@@ -211,8 +211,8 @@ DRIVER_INIT_MEMBER(dc_state,naomi2)
DRIVER_INIT_MEMBER(dc_state,naomi_mp)
{
- //machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc2ad238, 0xc2ad23f, FUNC(naomi_biose_idle_skip_r)); // rev e bios
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc2b0600, 0xc2b0607, FUNC(naomi_biosh_idle_skip_r)); // rev h bios
+ //machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc2ad238, 0xc2ad23f, FUNC(naomi_biose_idle_skip_r)); // rev e bios
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc2b0600, 0xc2b0607, FUNC(naomi_biosh_idle_skip_r)); // rev h bios
jvsboard_type = JVSBD_MAHJONG;
actel_id = 0xffff;
@@ -221,8 +221,8 @@ DRIVER_INIT_MEMBER(dc_state,naomi_mp)
DRIVER_INIT_MEMBER(dc_state,naomigd)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc2ad238, 0xc2ad23f, FUNC(naomi_biose_idle_skip_r)); // rev e bios
- //machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc2b0600, 0xc2b0607, FUNC(naomi_biosh_idle_skip_r)); // rev h bios
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc2ad238, 0xc2ad23f, FUNC(naomi_biose_idle_skip_r)); // rev e bios
+ //machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc2b0600, 0xc2b0607, FUNC(naomi_biosh_idle_skip_r)); // rev h bios
jvsboard_type = JVSBD_DEFAULT;
actel_id = 0xffff;
@@ -231,8 +231,8 @@ DRIVER_INIT_MEMBER(dc_state,naomigd)
DRIVER_INIT_MEMBER(dc_state,naomigd_mp)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc2ad238, 0xc2ad23f, FUNC(naomi_biose_idle_skip_r)); // rev e bios
- //machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc2b0600, 0xc2b0607, FUNC(naomi_biosh_idle_skip_r)); // rev h bios
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc2ad238, 0xc2ad23f, FUNC(naomi_biose_idle_skip_r)); // rev e bios
+ //machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc2b0600, 0xc2b0607, FUNC(naomi_biosh_idle_skip_r)); // rev h bios
jvsboard_type = JVSBD_MAHJONG;
actel_id = 0xffff;
@@ -250,7 +250,7 @@ static READ64_HANDLER( naomigd_ggxxsla_idle_skip_r )
DRIVER_INIT_MEMBER(dc_state,ggxxsla)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc1aae18, 0xc1aae1f, FUNC(naomigd_ggxxsla_idle_skip_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc1aae18, 0xc1aae1f, FUNC(naomigd_ggxxsla_idle_skip_r));
DRIVER_INIT_CALL(naomigd);
}
@@ -265,7 +265,7 @@ static READ64_HANDLER( naomigd_ggxx_idle_skip_r )
DRIVER_INIT_MEMBER(dc_state,ggxx)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc1837b8, 0xc1837bf, FUNC(naomigd_ggxx_idle_skip_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc1837b8, 0xc1837bf, FUNC(naomigd_ggxx_idle_skip_r));
DRIVER_INIT_CALL(naomigd);
}
@@ -281,7 +281,7 @@ static READ64_HANDLER( naomigd_ggxxrl_idle_skip_r )
DRIVER_INIT_MEMBER(dc_state,ggxxrl)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc18d6c8, 0xc18d6cf, FUNC(naomigd_ggxxrl_idle_skip_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc18d6c8, 0xc18d6cf, FUNC(naomigd_ggxxrl_idle_skip_r));
DRIVER_INIT_CALL(naomigd);
}
@@ -296,7 +296,7 @@ static READ64_HANDLER( naomigd_sfz3ugd_idle_skip_r )
DRIVER_INIT_MEMBER(dc_state,sfz3ugd)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc5dc900, 0xc5dc907, FUNC(naomigd_sfz3ugd_idle_skip_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc5dc900, 0xc5dc907, FUNC(naomigd_sfz3ugd_idle_skip_r));
DRIVER_INIT_CALL(naomigd);
}
@@ -344,7 +344,7 @@ static READ64_HANDLER( hotd2_idle_skip_r )
DRIVER_INIT_MEMBER(dc_state,hotd2)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xca25fb8, 0xca25fbf, FUNC(hotd2_idle_skip_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xca25fb8, 0xca25fbf, FUNC(hotd2_idle_skip_r));
}
// f355 PC=0xc065f7c RAM=0xc26dafc
diff --git a/src/mame/machine/neoboot.c b/src/mame/machine/neoboot.c
index 35f59b5dfca..d39418c8253 100644
--- a/src/mame/machine/neoboot.c
+++ b/src/mame/machine/neoboot.c
@@ -178,9 +178,9 @@ static WRITE16_HANDLER( kof10th_bankswitch_w )
void install_kof10th_protection ( running_machine &machine )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x2fe000, 0x2fffff, FUNC(kof10th_RAMB_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x200000, 0x23ffff, FUNC(kof10th_custom_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x240000, 0x2fffff, FUNC(kof10th_bankswitch_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x2fe000, 0x2fffff, FUNC(kof10th_RAMB_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x200000, 0x23ffff, FUNC(kof10th_custom_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x240000, 0x2fffff, FUNC(kof10th_bankswitch_w));
}
void decrypt_kof10th(running_machine &machine)
@@ -485,7 +485,7 @@ void patch_cthd2003( running_machine &machine )
UINT16 *mem16 = (UINT16 *)machine.root_device().memregion("maincpu")->base();
/* special ROM banking handler */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x2ffff0, 0x2fffff, FUNC(cthd2003_bankswitch_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x2ffff0, 0x2fffff, FUNC(cthd2003_bankswitch_w));
// theres still a problem on the character select screen but it seems to be related to cpu core timing issues,
// overclocking the 68k prevents it.
@@ -729,7 +729,7 @@ static WRITE16_HANDLER ( ms5plus_bankswitch_w )
void install_ms5plus_protection(running_machine &machine)
{
// special ROM banking handler / additional protection
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x2ffff0, 0x2fffff,FUNC(mslug5_prot_r), FUNC(ms5plus_bankswitch_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x2ffff0, 0x2fffff,FUNC(mslug5_prot_r), FUNC(ms5plus_bankswitch_w));
}
@@ -972,7 +972,7 @@ void kf2k3bl_px_decrypt( running_machine &machine )
void kf2k3bl_install_protection(running_machine &machine)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x2fe000, 0x2fffff, FUNC(kof2003_r), FUNC(kof2003_w) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x2fe000, 0x2fffff, FUNC(kof2003_r), FUNC(kof2003_w) );
}
@@ -1000,7 +1000,7 @@ void kf2k3pl_px_decrypt( running_machine &machine )
void kf2k3pl_install_protection(running_machine &machine)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x2fe000, 0x2fffff, FUNC(kof2003_r), FUNC(kof2003p_w) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x2fe000, 0x2fffff, FUNC(kof2003_r), FUNC(kof2003p_w) );
}
@@ -1031,7 +1031,7 @@ void kf2k3upl_px_decrypt( running_machine &machine )
void kf2k3upl_install_protection(running_machine &machine)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x2fe000, 0x2fffff, FUNC(kof2003_r), FUNC(kof2003_w) );
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x2fe000, 0x2fffff, FUNC(kof2003_r), FUNC(kof2003_w) );
}
diff --git a/src/mame/machine/neoprot.c b/src/mame/machine/neoprot.c
index f42f7a87b93..893c2f16a51 100644
--- a/src/mame/machine/neoprot.c
+++ b/src/mame/machine/neoprot.c
@@ -101,7 +101,7 @@ void fatfury2_install_protection( running_machine &machine )
/* the protection involves reading and writing addresses in the */
/* 0x2xxxxx range. There are several checks all around the code. */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x200000, 0x2fffff, FUNC(fatfury2_protection_16_r), FUNC(fatfury2_protection_16_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x200000, 0x2fffff, FUNC(fatfury2_protection_16_r), FUNC(fatfury2_protection_16_w));
state->m_fatfury2_prot_data = 0;
@@ -146,7 +146,7 @@ void install_kof98_protection( running_machine &machine )
{
/* when 0x20aaaa contains 0x0090 (word) then 0x100 (normally the neogeo header) should return 0x00c200fd worked out using real hw */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x20aaaa, 0x20aaab, FUNC(kof98_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x20aaaa, 0x20aaab, FUNC(kof98_prot_w));
}
@@ -405,15 +405,15 @@ static void sma_install_random_read_handler( running_machine &machine, int addr1
neogeo_state *state = machine.driver_data<neogeo_state>();
state->save_item(NAME(state->m_neogeo_rng));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(addr1, addr1 + 1, FUNC(sma_random_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(addr2, addr2 + 1, FUNC(sma_random_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(addr1, addr1 + 1, FUNC(sma_random_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(addr2, addr2 + 1, FUNC(sma_random_r));
}
void kof99_install_protection( running_machine &machine )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x2ffff0, 0x2ffff1, FUNC(kof99_bankswitch_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x2fe446, 0x2fe447, FUNC(prot_9a37_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x2ffff0, 0x2ffff1, FUNC(kof99_bankswitch_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x2fe446, 0x2fe447, FUNC(prot_9a37_r));
sma_install_random_read_handler(machine, 0x2ffff8, 0x2ffffa);
}
@@ -421,8 +421,8 @@ void kof99_install_protection( running_machine &machine )
void garou_install_protection( running_machine &machine )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x2fffc0, 0x2fffc1, FUNC(garou_bankswitch_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x2fe446, 0x2fe447, FUNC(prot_9a37_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x2fffc0, 0x2fffc1, FUNC(garou_bankswitch_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x2fe446, 0x2fe447, FUNC(prot_9a37_r));
sma_install_random_read_handler(machine, 0x2fffcc, 0x2ffff0);
}
@@ -430,8 +430,8 @@ void garou_install_protection( running_machine &machine )
void garouh_install_protection( running_machine &machine )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x2fffc0, 0x2fffc1, FUNC(garouh_bankswitch_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x2fe446, 0x2fe447, FUNC(prot_9a37_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x2fffc0, 0x2fffc1, FUNC(garouh_bankswitch_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x2fe446, 0x2fe447, FUNC(prot_9a37_r));
sma_install_random_read_handler(machine, 0x2fffcc, 0x2ffff0);
}
@@ -439,8 +439,8 @@ void garouh_install_protection( running_machine &machine )
void mslug3_install_protection( running_machine &machine )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x2fffe4, 0x2fffe5, FUNC(mslug3_bankswitch_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x2fe446, 0x2fe447, FUNC(prot_9a37_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x2fffe4, 0x2fffe5, FUNC(mslug3_bankswitch_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x2fe446, 0x2fe447, FUNC(prot_9a37_r));
// sma_install_random_read_handler(machine, 0x2ffff8, 0x2ffffa);
}
@@ -448,8 +448,8 @@ void mslug3_install_protection( running_machine &machine )
void kof2000_install_protection( running_machine &machine )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x2fffec, 0x2fffed, FUNC(kof2000_bankswitch_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x2fe446, 0x2fe447, FUNC(prot_9a37_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x2fffec, 0x2fffed, FUNC(kof2000_bankswitch_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x2fe446, 0x2fe447, FUNC(prot_9a37_r));
sma_install_random_read_handler(machine, 0x2fffd8, 0x2fffda);
}
@@ -540,5 +540,5 @@ void install_pvc_protection( running_machine &machine )
state->m_pvc_cartridge_ram = auto_alloc_array(machine, UINT16, 0x2000 / 2);
state->save_pointer(NAME(state->m_pvc_cartridge_ram), 0x2000 / 2);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x2fe000, 0x2fffff, FUNC(pvc_prot_r), FUNC(pvc_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x2fe000, 0x2fffff, FUNC(pvc_prot_r), FUNC(pvc_prot_w));
}
diff --git a/src/mame/machine/nmk004.c b/src/mame/machine/nmk004.c
index b8064a03ce0..a4f39d70c57 100644
--- a/src/mame/machine/nmk004.c
+++ b/src/mame/machine/nmk004.c
@@ -311,7 +311,7 @@ static void effects_update(int channel)
static void fm_update(int channel)
{
struct fm_control *fm = &NMK004_state.fm_control[channel];
- address_space &space = *NMK004_state.machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = NMK004_state.machine().firstcpu->space(AS_PROGRAM);
// advance the timers
if (fm->timer1)
@@ -595,7 +595,7 @@ static void fm_voices_update(void)
};
int channel,i;
- address_space &space = *NMK004_state.machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = NMK004_state.machine().firstcpu->space(AS_PROGRAM);
for (channel = 0; channel < 3;channel++)
{
struct fm_control *fm1 = &NMK004_state.fm_control[channel];
@@ -684,7 +684,7 @@ static void fm_voices_update(void)
static void psg_update(int channel)
{
struct psg_control *psg = &NMK004_state.psg_control[channel];
- address_space &space = *NMK004_state.machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = NMK004_state.machine().firstcpu->space(AS_PROGRAM);
// advance the timers
if (psg->note_timer)
@@ -1003,7 +1003,7 @@ void NMK004_irq(device_t *device, int irq)
{
if (irq)
{
- address_space &space = *NMK004_state.machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = NMK004_state.machine().firstcpu->space(AS_PROGRAM);
int status = ym2203_status_port_r(device,space,0);
if (status & 1) // timer A expired
@@ -1039,7 +1039,7 @@ static TIMER_CALLBACK( real_nmk004_init )
NMK004_state.rom = machine.root_device().memregion("audiocpu")->base();
- address_space &space = *NMK004_state.machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = NMK004_state.machine().firstcpu->space(AS_PROGRAM);
ym2203_control_port_w(NMK004_state.ymdevice, space, 0, 0x2f);
i = 0;
diff --git a/src/mame/machine/pgmprot.c b/src/mame/machine/pgmprot.c
index 9caca92a5a4..2201f73330d 100644
--- a/src/mame/machine/pgmprot.c
+++ b/src/mame/machine/pgmprot.c
@@ -150,8 +150,8 @@ DRIVER_INIT_MEMBER(pgm_asic3_state,orlegend)
{
pgm_basic_init(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xC0400e, 0xC0400f, FUNC(pgm_asic3_r), FUNC(pgm_asic3_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xC04000, 0xC04001, FUNC(pgm_asic3_reg_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xC0400e, 0xC0400f, FUNC(pgm_asic3_r), FUNC(pgm_asic3_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xC04000, 0xC04001, FUNC(pgm_asic3_reg_w));
m_asic3_reg = 0;
m_asic3_latch[0] = 0;
diff --git a/src/mame/machine/pgmprot1.c b/src/mame/machine/pgmprot1.c
index 2dd93cecde8..3539d37447f 100644
--- a/src/mame/machine/pgmprot1.c
+++ b/src/mame/machine/pgmprot1.c
@@ -286,7 +286,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,photoy2k)
pgm_photoy2k_decrypt(machine());
pgm_arm7_type1_latch_init(machine());
/* we only have a china internal ROM dumped for now.. allow region to be changed for debugging (to ensure all alt titles / regions can be seen) */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0008, 0x4f0009, FUNC(kovsh_fake_region_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f0008, 0x4f0009, FUNC(kovsh_fake_region_r));
}
DRIVER_INIT_MEMBER(pgm_arm_type1_state,kovsh)
@@ -295,7 +295,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,kovsh)
pgm_kovsh_decrypt(machine());
pgm_arm7_type1_latch_init(machine());
/* we only have a china internal ROM dumped for now.. allow region to be changed for debugging (to ensure all alt titles / regions can be seen) */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0008, 0x4f0009, FUNC(kovsh_fake_region_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f0008, 0x4f0009, FUNC(kovsh_fake_region_r));
}
/* Fake remapping of ASIC commands to the ones used by KOVSH due to the lack of the real ARM rom for this set */
@@ -365,8 +365,8 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,kovshp)
pgm_basic_init(machine());
pgm_kovshp_decrypt(machine());
pgm_arm7_type1_latch_init(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0008, 0x4f0009, FUNC(kovsh_fake_region_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x500000, 0x500005, FUNC(kovshp_asic27a_write_word));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f0008, 0x4f0009, FUNC(kovsh_fake_region_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x500000, 0x500005, FUNC(kovshp_asic27a_write_word));
}
@@ -378,8 +378,8 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,kovshxas)
pgm_basic_init(machine());
// pgm_kovshp_decrypt(machine());
pgm_arm7_type1_latch_init(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0008, 0x4f0009, FUNC(kovsh_fake_region_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x500000, 0x500005, FUNC(kovshp_asic27a_write_word));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f0008, 0x4f0009, FUNC(kovsh_fake_region_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x500000, 0x500005, FUNC(kovshp_asic27a_write_word));
}
static void pgm_decode_kovlsqh2_tiles( running_machine &machine )
@@ -483,8 +483,8 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,kovlsqh2)
pgm_decode_kovlsqh2_samples(machine());
pgm_basic_init(machine());
pgm_arm7_type1_latch_init(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0008, 0x4f0009, FUNC(kovsh_fake_region_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x500000, 0x500005, FUNC(kovshp_asic27a_write_word));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f0008, 0x4f0009, FUNC(kovsh_fake_region_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x500000, 0x500005, FUNC(kovshp_asic27a_write_word));
}
DRIVER_INIT_MEMBER(pgm_arm_type1_state,kovqhsgs)
@@ -505,7 +505,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,kovqhsgs)
pgm_basic_init(machine());
pgm_arm7_type1_latch_init(machine());
/* we only have a china internal ROM dumped for now.. allow region to be changed for debugging (to ensure all alt titles / regions can be seen) */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0008, 0x4f0009, FUNC(kovsh_fake_region_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f0008, 0x4f0009, FUNC(kovsh_fake_region_r));
}
/*
@@ -1412,7 +1412,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,ddp3)
pgm_basic_init(machine(), false);
pgm_py2k2_decrypt(machine()); // yes, it's the same as photo y2k2
arm_sim_handler = command_handler_ddp3;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
}
DRIVER_INIT_MEMBER(pgm_arm_type1_state,ket)
@@ -1420,7 +1420,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,ket)
pgm_basic_init(machine(), false);
pgm_ket_decrypt(machine());
arm_sim_handler = command_handler_ddp3;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x400000, 0x400005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x400000, 0x400005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
}
DRIVER_INIT_MEMBER(pgm_arm_type1_state,espgal)
@@ -1428,7 +1428,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,espgal)
pgm_basic_init(machine(), false);
pgm_espgal_decrypt(machine());
arm_sim_handler = command_handler_ddp3;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x400000, 0x400005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x400000, 0x400005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
}
DRIVER_INIT_MEMBER(pgm_arm_type1_state,puzzli2)
@@ -1436,8 +1436,8 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,puzzli2)
pgm_basic_init(machine());
pgm_puzzli2_decrypt(machine());
arm_sim_handler = command_handler_puzzli2;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0000, 0x4f003f, FUNC(pgm_arm7_type1_sim_protram_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f0000, 0x4f003f, FUNC(pgm_arm7_type1_sim_protram_r));
m_irq4_disabled = 1; // // doesn't like this irq??
}
@@ -1446,8 +1446,8 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,py2k2)
pgm_basic_init(machine());
pgm_py2k2_decrypt(machine());
arm_sim_handler = command_handler_py2k2;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0000, 0x4f003f, FUNC(pgm_arm7_type1_sim_protram_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f0000, 0x4f003f, FUNC(pgm_arm7_type1_sim_protram_r));
}
DRIVER_INIT_MEMBER(pgm_arm_type1_state,pstar)
@@ -1465,8 +1465,8 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,pstar)
memset(m_slots, 0, 16 * sizeof(UINT32));
arm_sim_handler = command_handler_pstars;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0000, 0x4f003f, FUNC(pstars_arm7_type1_sim_protram_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f0000, 0x4f003f, FUNC(pstars_arm7_type1_sim_protram_r));
save_item(NAME(m_pstar_e7_value));
save_item(NAME(m_pstar_b1_value));
@@ -1484,8 +1484,8 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,kov)
m_kov_cb_value = 0;
m_kov_fe_value = 0;
arm_sim_handler = command_handler_kov;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0000, 0x4f003f, FUNC(pgm_arm7_type1_sim_protram_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f0000, 0x4f003f, FUNC(pgm_arm7_type1_sim_protram_r));
}
DRIVER_INIT_MEMBER(pgm_arm_type1_state,kovboot)
@@ -1498,8 +1498,8 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,kovboot)
m_kov_cb_value = 0;
m_kov_fe_value = 0;
arm_sim_handler = command_handler_kov;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0000, 0x4f003f, FUNC(pgm_arm7_type1_sim_protram_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f0000, 0x4f003f, FUNC(pgm_arm7_type1_sim_protram_r));
}
@@ -1511,8 +1511,8 @@ DRIVER_INIT_MEMBER(pgm_arm_type1_state,oldsplus)
memset(m_extra_ram, 0, 0x100 * sizeof(UINT16));
memset(m_slots, 0, 0x100 * sizeof(UINT32));
arm_sim_handler = command_handler_oldsplus;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x4f0000, 0x4f003f, FUNC(pgm_arm7_type1_sim_protram_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x500000, 0x500005, FUNC(pgm_arm7_type1_sim_r), FUNC(pgm_arm7_type1_sim_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x4f0000, 0x4f003f, FUNC(pgm_arm7_type1_sim_protram_r));
state_save_register_global_array(machine(), m_extra_ram);
state_save_register_global_array(machine(), m_slots);
}
diff --git a/src/mame/machine/pgmprot2.c b/src/mame/machine/pgmprot2.c
index a072ccafb01..4c43964eda8 100644
--- a/src/mame/machine/pgmprot2.c
+++ b/src/mame/machine/pgmprot2.c
@@ -188,7 +188,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type2_state,kov2)
kov2_latch_init(machine());
// we only have a HK internal ROM dumped for now, allow us to override that for debugging purposes.
- machine().device("prot")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x48000138, 0x4800013b, FUNC(kov2_arm_region_w));
+ machine().device("prot")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x48000138, 0x4800013b, FUNC(kov2_arm_region_w));
}
@@ -222,7 +222,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type2_state,kov2p)
mem8[0x1FFFFD] = 0x99;
// we only have a HK internal ROM dumped for now, allow us to override that for debugging purposes.
- machine().device("prot")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x48000138, 0x4800013b, FUNC(kov2_arm_region_w));
+ machine().device("prot")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x48000138, 0x4800013b, FUNC(kov2_arm_region_w));
}
static WRITE32_HANDLER( martmast_arm_region_w )
@@ -242,7 +242,7 @@ DRIVER_INIT_MEMBER(pgm_arm_type2_state,martmast)
kov2_latch_init(machine());
// we only have a USA / CHINA internal ROMs dumped for now, allow us to override that for debugging purposes.
- machine().device("prot")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x48000138, 0x4800013b, FUNC(martmast_arm_region_w));
+ machine().device("prot")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x48000138, 0x4800013b, FUNC(martmast_arm_region_w));
}
@@ -297,10 +297,10 @@ DRIVER_INIT_MEMBER(pgm_arm_type2_state,ddp2)
kov2_latch_init(machine());
// we only have a Japan internal ROM dumped for now, allow us to override that for debugging purposes.
- machine().device("prot")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x48000000, 0x48000003, FUNC(ddp2_arm_region_w));
+ machine().device("prot")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x48000000, 0x48000003, FUNC(ddp2_arm_region_w));
- machine().device("prot")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x1800300c, 0x1800300f, FUNC(ddp2_speedup_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x80ee54, 0x80ee55, FUNC(ddp2_main_speedup_r));
+ machine().device("prot")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x1800300c, 0x1800300f, FUNC(ddp2_speedup_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x80ee54, 0x80ee55, FUNC(ddp2_main_speedup_r));
}
diff --git a/src/mame/machine/pgmprot3.c b/src/mame/machine/pgmprot3.c
index 6171571f8f3..dd93ea242ab 100644
--- a/src/mame/machine/pgmprot3.c
+++ b/src/mame/machine/pgmprot3.c
@@ -293,8 +293,8 @@ DRIVER_INIT_MEMBER(pgm_arm_type3_state,dmnfrnt)
/* put some fake code for the ARM here ... */
pgm_create_dummy_internal_arm_region(machine());
- machine().device("prot")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x18000444, 0x18000447, FUNC(dmnfrnt_speedup_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x80a03c, 0x80a03d, FUNC(dmnfrnt_main_speedup_r));
+ machine().device("prot")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x18000444, 0x18000447, FUNC(dmnfrnt_speedup_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x80a03c, 0x80a03d, FUNC(dmnfrnt_main_speedup_r));
m_svg_ram_sel = 1;
diff --git a/src/mame/machine/pgmprot4.c b/src/mame/machine/pgmprot4.c
index 25971f5e225..9c184468a37 100644
--- a/src/mame/machine/pgmprot4.c
+++ b/src/mame/machine/pgmprot4.c
@@ -373,7 +373,7 @@ DRIVER_INIT_MEMBER(pgm_022_025_state,killbld)
pgm_basic_init(machine());
pgm_killbld_decrypt(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xd40000, 0xd40003, FUNC(killbld_igs025_prot_r), FUNC(killbld_igs025_prot_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xd40000, 0xd40003, FUNC(killbld_igs025_prot_r), FUNC(killbld_igs025_prot_w));
m_kb_cmd = 0;
m_kb_reg = 0;
@@ -536,7 +536,7 @@ DRIVER_INIT_MEMBER(pgm_022_025_state,drgw3)
}
}
*/
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xDA5610, 0xDA5613, FUNC(drgw3_igs025_prot_r), FUNC(drgw3_igs025_prot_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xDA5610, 0xDA5613, FUNC(drgw3_igs025_prot_r), FUNC(drgw3_igs025_prot_w));
pgm_dw3_decrypt(machine());
}
diff --git a/src/mame/machine/pgmprot5.c b/src/mame/machine/pgmprot5.c
index 5ff134b3686..aadfa66b217 100644
--- a/src/mame/machine/pgmprot5.c
+++ b/src/mame/machine/pgmprot5.c
@@ -62,7 +62,7 @@ static void drgwld2_common_init(running_machine &machine)
select and after failing in the 2nd stage (probably there are other checks
out there).
*/
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xd80000, 0xd80003, FUNC(dw2_d80000_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xd80000, 0xd80003, FUNC(dw2_d80000_r));
}
DRIVER_INIT_MEMBER(pgm_state,drgw2)
diff --git a/src/mame/machine/pgmprot6.c b/src/mame/machine/pgmprot6.c
index fe871f541e3..7145eba3c1d 100644
--- a/src/mame/machine/pgmprot6.c
+++ b/src/mame/machine/pgmprot6.c
@@ -196,8 +196,8 @@ DRIVER_INIT_MEMBER(pgm_028_025_state,olds)
{
pgm_basic_init(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xdcb400, 0xdcb403, FUNC(olds_r), FUNC(olds_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x8178f4, 0x8178f5, FUNC(olds_prot_swap_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xdcb400, 0xdcb403, FUNC(olds_r), FUNC(olds_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x8178f4, 0x8178f5, FUNC(olds_prot_swap_r));
m_kb_cmd = 0;
m_kb_reg = 0;
diff --git a/src/mame/machine/pitnrun.c b/src/mame/machine/pitnrun.c
index 7eb45189ba7..d45dfecc212 100644
--- a/src/mame/machine/pitnrun.c
+++ b/src/mame/machine/pitnrun.c
@@ -105,7 +105,7 @@ static TIMER_CALLBACK( pitnrun_mcu_status_real_w )
WRITE8_MEMBER(pitnrun_state::pitnrun_68705_portB_w)
{
- address_space *cpu0space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &cpu0space = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (~data & 0x02)
{
/* 68705 is going to read data from the Z80 */
@@ -120,11 +120,11 @@ WRITE8_MEMBER(pitnrun_state::pitnrun_68705_portB_w)
}
if (~data & 0x10)
{
- cpu0space->write_byte(m_address, m_portA_out);
+ cpu0space.write_byte(m_address, m_portA_out);
}
if (~data & 0x20)
{
- m_portA_in = cpu0space->read_byte(m_address);
+ m_portA_in = cpu0space.read_byte(m_address);
}
if (~data & 0x40)
{
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index 3eb8f30e38c..888ab57de6b 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -51,8 +51,8 @@ void playch10_state::machine_start()
/* move to individual boards as documentation of actual boards allows */
m_nt_ram = auto_alloc_array(machine(), UINT8, 0x1000);
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(playch10_state::pc10_chr_r),this), write8_delegate(FUNC(playch10_state::pc10_chr_w),this));
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(playch10_state::pc10_nt_r),this),write8_delegate(FUNC(playch10_state::pc10_nt_w),this));
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(playch10_state::pc10_chr_r),this), write8_delegate(FUNC(playch10_state::pc10_chr_w),this));
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(playch10_state::pc10_nt_r),this),write8_delegate(FUNC(playch10_state::pc10_nt_w),this));
if (NULL != m_vram)
set_videoram_bank(machine(), 0, 8, 0, 8);
@@ -74,8 +74,8 @@ MACHINE_START_MEMBER(playch10_state,playch10_hboard)
m_vram = auto_alloc_array(machine(), UINT8, 0x2000);
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(playch10_state::pc10_chr_r),this), write8_delegate(FUNC(playch10_state::pc10_chr_w),this));
- machine().device("ppu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(playch10_state::pc10_nt_r),this), write8_delegate(FUNC(playch10_state::pc10_nt_w),this));
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_readwrite_handler(0, 0x1fff, read8_delegate(FUNC(playch10_state::pc10_chr_r),this), write8_delegate(FUNC(playch10_state::pc10_chr_w),this));
+ machine().device("ppu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(playch10_state::pc10_nt_r),this), write8_delegate(FUNC(playch10_state::pc10_nt_w),this));
}
/*************************************
@@ -581,7 +581,7 @@ WRITE8_MEMBER(playch10_state::aboard_vrom_switch_w)
DRIVER_INIT_MEMBER(playch10_state,pcaboard)
{
/* switches vrom with writes to the $803e-$8041 area */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0x8fff, write8_delegate(FUNC(playch10_state::aboard_vrom_switch_w),this));
+ machine().device("cart")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0x8fff, write8_delegate(FUNC(playch10_state::aboard_vrom_switch_w),this));
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -613,7 +613,7 @@ DRIVER_INIT_MEMBER(playch10_state,pcbboard)
memcpy(&prg[0x08000], &prg[0x28000], 0x8000);
/* Roms are banked at $8000 to $bfff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::bboard_rom_switch_w),this));
+ machine().device("cart")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::bboard_rom_switch_w),this));
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -638,7 +638,7 @@ WRITE8_MEMBER(playch10_state::cboard_vrom_switch_w)
DRIVER_INIT_MEMBER(playch10_state,pccboard)
{
/* switches vrom with writes to $6000 */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x6000, 0x6000, write8_delegate(FUNC(playch10_state::cboard_vrom_switch_w),this));
+ machine().device("cart")->memory().space(AS_PROGRAM).install_write_handler(0x6000, 0x6000, write8_delegate(FUNC(playch10_state::cboard_vrom_switch_w),this));
/* we have no vram, make sure switching games doesn't point to an old allocation */
m_vram = NULL;
@@ -661,7 +661,7 @@ DRIVER_INIT_MEMBER(playch10_state,pcdboard)
m_mmc1_rom_mask = 0x07;
/* MMC mapper at writes to $8000-$ffff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::mmc1_rom_switch_w),this));
+ machine().device("cart")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::mmc1_rom_switch_w),this));
/* common init */
@@ -677,7 +677,7 @@ DRIVER_INIT_MEMBER(playch10_state,pcdboard)
DRIVER_INIT_MEMBER(playch10_state,pcdboard_2)
{
/* extra ram at $6000-$7fff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff);
+ machine().device("cart")->memory().space(AS_PROGRAM).install_ram(0x6000, 0x7fff);
/* common init */
DRIVER_INIT_CALL(pcdboard);
@@ -775,13 +775,13 @@ DRIVER_INIT_MEMBER(playch10_state,pceboard)
memcpy(&prg[0x08000], &prg[0x28000], 0x8000);
/* basically a mapper 9 on a nes */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::eboard_rom_switch_w),this));
+ machine().device("cart")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::eboard_rom_switch_w),this));
/* ppu_latch callback */
ppu->set_latch(mapper9_latch);
/* nvram at $6000-$6fff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x6fff);
+ machine().device("cart")->memory().space(AS_PROGRAM).install_ram(0x6000, 0x6fff);
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -804,7 +804,7 @@ DRIVER_INIT_MEMBER(playch10_state,pcfboard)
m_mmc1_rom_mask = 0x07;
/* MMC mapper at writes to $8000-$ffff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::mmc1_rom_switch_w),this));
+ machine().device("cart")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::mmc1_rom_switch_w),this));
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -815,7 +815,7 @@ DRIVER_INIT_MEMBER(playch10_state,pcfboard)
DRIVER_INIT_MEMBER(playch10_state,pcfboard_2)
{
/* extra ram at $6000-$6fff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x6fff);
+ machine().device("cart")->memory().space(AS_PROGRAM).install_ram(0x6000, 0x6fff);
m_vram = NULL;
@@ -991,10 +991,10 @@ DRIVER_INIT_MEMBER(playch10_state,pcgboard)
memcpy(&prg[0x0c000], &prg[0x4c000], 0x4000);
/* MMC3 mapper at writes to $8000-$ffff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::gboard_rom_switch_w),this));
+ machine().device("cart")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::gboard_rom_switch_w),this));
/* extra ram at $6000-$7fff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff);
+ machine().device("cart")->memory().space(AS_PROGRAM).install_ram(0x6000, 0x7fff);
m_gboard_banks[0] = 0x1e;
m_gboard_banks[1] = 0x1f;
@@ -1045,7 +1045,7 @@ DRIVER_INIT_MEMBER(playch10_state,pciboard)
memcpy(&prg[0x08000], &prg[0x10000], 0x8000);
/* Roms are banked at $8000 to $bfff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::iboard_rom_switch_w),this));
+ machine().device("cart")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::iboard_rom_switch_w),this));
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -1112,10 +1112,10 @@ DRIVER_INIT_MEMBER(playch10_state,pchboard)
memcpy(&prg[0x0c000], &prg[0x4c000], 0x4000);
/* Roms are banked at $8000 to $bfff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::hboard_rom_switch_w),this));
+ machine().device("cart")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::hboard_rom_switch_w),this));
/* extra ram at $6000-$7fff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff);
+ machine().device("cart")->memory().space(AS_PROGRAM).install_ram(0x6000, 0x7fff);
m_gboard_banks[0] = 0x1e;
m_gboard_banks[1] = 0x1f;
@@ -1142,10 +1142,10 @@ DRIVER_INIT_MEMBER(playch10_state,pckboard)
m_mmc1_rom_mask = 0x0f;
/* extra ram at $6000-$7fff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff);
+ machine().device("cart")->memory().space(AS_PROGRAM).install_ram(0x6000, 0x7fff);
/* Roms are banked at $8000 to $bfff */
- machine().device("cart")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::mmc1_rom_switch_w),this));
+ machine().device("cart")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(playch10_state::mmc1_rom_switch_w),this));
/* common init */
DRIVER_INIT_CALL(playch10);
diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c
index 4c0968d5462..bb8d7620600 100644
--- a/src/mame/machine/qix.c
+++ b/src/mame/machine/qix.c
@@ -465,7 +465,7 @@ WRITE8_MEMBER(qix_state::qix_68705_portC_w)
static TIMER_CALLBACK( pia_w_callback )
{
pia6821_device *device = (pia6821_device *)ptr;
- device->write(*device->machine().memory().first_space(), param >> 8, param & 0xff);
+ device->write(device->machine().driver_data()->generic_space(), param >> 8, param & 0xff);
}
@@ -503,7 +503,7 @@ static WRITE8_DEVICE_HANDLER( qix_coinctl_w )
qix_state *state = device->machine().driver_data<qix_state>();
/* write to the sound chip */
- state->m_sn1->write(*device->machine().device<legacy_cpu_device>("maincpu")->space(), 0, data);
+ state->m_sn1->write(device->machine().device<legacy_cpu_device>("maincpu")->space(), 0, data);
/* clock the ready line going back into CB1 */
pia6821_device *pia = downcast<pia6821_device *>(device);
@@ -517,7 +517,7 @@ static WRITE8_DEVICE_HANDLER( slither_76489_1_w )
qix_state *state = device->machine().driver_data<qix_state>();
/* write to the sound chip */
- state->m_sn2->write(*device->machine().device<legacy_cpu_device>("maincpu")->space(), 0, data);
+ state->m_sn2->write(device->machine().device<legacy_cpu_device>("maincpu")->space(), 0, data);
/* clock the ready line going back into CB1 */
pia6821_device *pia = downcast<pia6821_device *>(device);
diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c
index 810b1c14eee..f66181fd00a 100644
--- a/src/mame/machine/scramble.c
+++ b/src/mame/machine/scramble.c
@@ -156,13 +156,13 @@ DRIVER_INIT_MEMBER(scramble_state,scramble_ppi)
DRIVER_INIT_MEMBER(scramble_state,scobra)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xa803, 0xa803, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xa803, 0xa803, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),this));
}
#ifdef UNUSED_FUNCTION
DRIVER_INIT_MEMBER(scramble_state,atlantis)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x6803, 0x6803, FUNC(scrambold_background_enable_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x6803, 0x6803, FUNC(scrambold_background_enable_w));
}
DRIVER_INIT_MEMBER(scramble_state,scramble)
@@ -173,14 +173,14 @@ DRIVER_INIT_MEMBER(scramble_state,scramble)
DRIVER_INIT_MEMBER(scramble_state,stratgyx)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb000, 0xb000, write8_delegate(FUNC(scramble_state::scrambold_background_green_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb002, 0xb002, write8_delegate(FUNC(scramble_state::scrambold_background_blue_w),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb00a, 0xb00a, write8_delegate(FUNC(scramble_state::scrambold_background_red_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xb000, 0xb000, write8_delegate(FUNC(scramble_state::scrambold_background_green_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xb002, 0xb002, write8_delegate(FUNC(scramble_state::scrambold_background_blue_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xb00a, 0xb00a, write8_delegate(FUNC(scramble_state::scrambold_background_red_w),this));
}
DRIVER_INIT_MEMBER(scramble_state,tazmani2)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb002, 0xb002, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xb002, 0xb002, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),this));
}
DRIVER_INIT_MEMBER(scramble_state,ckongs)
@@ -190,15 +190,15 @@ DRIVER_INIT_MEMBER(scramble_state,ckongs)
DRIVER_INIT_MEMBER(scramble_state,mariner)
{
/* extra ROM */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5800, 0x67ff, "bank1");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x5800, 0x67ff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5800, 0x67ff, "bank1");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x5800, 0x67ff);
machine().root_device().membank("bank1")->set_base(machine().root_device().memregion("maincpu")->base() + 0x5800);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x9008, 0x9008, FUNC(mariner_protection_2_r));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xb401, 0xb401, FUNC(mariner_protection_1_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x9008, 0x9008, FUNC(mariner_protection_2_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xb401, 0xb401, FUNC(mariner_protection_1_r));
/* ??? (it's NOT a background enable) */
- /*machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x6803, 0x6803);*/
+ /*machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x6803, 0x6803);*/
}
#ifdef UNUSED_FUNCTION
@@ -276,15 +276,15 @@ DRIVER_INIT_MEMBER(scramble_state,cavelon)
UINT8 *ROM = memregion("maincpu")->base();
/* banked ROM */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x3fff, "bank1");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x3fff, "bank1");
membank("bank1")->configure_entries(0, 2, &ROM[0x00000], 0x10000);
cavelon_banksw(machine());
/* A15 switches memory banks */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x8000, 0xffff, FUNC(cavelon_banksw_r), FUNC(cavelon_banksw_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x8000, 0xffff, FUNC(cavelon_banksw_r), FUNC(cavelon_banksw_w));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x2000, 0x2000); /* ??? */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x3800, 0x3801); /* looks suspicously like
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x2000, 0x2000); /* ??? */
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x3800, 0x3801); /* looks suspicously like
an AY8910, but not sure */
state_save_register_global(machine(), m_cavelon_bank);
}
@@ -293,7 +293,7 @@ DRIVER_INIT_MEMBER(scramble_state,cavelon)
DRIVER_INIT_MEMBER(scramble_state,darkplnt)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xb00a, 0xb00a, write8_delegate(FUNC(scramble_state::darkplnt_bullet_color_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xb00a, 0xb00a, write8_delegate(FUNC(scramble_state::darkplnt_bullet_color_w),this));
}
DRIVER_INIT_MEMBER(scramble_state,mimonkey)
@@ -328,17 +328,17 @@ DRIVER_INIT_MEMBER(scramble_state,mimonkey)
ROM[A] = ROM[A] ^ xortable[line][col];
ctr++;
}
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xa804, 0xa804, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xa804, 0xa804, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),this));
}
DRIVER_INIT_MEMBER(scramble_state,mimonsco)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xa804, 0xa804, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xa804, 0xa804, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),this));
}
DRIVER_INIT_MEMBER(scramble_state,mimonscr)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x6804, 0x6804, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x6804, 0x6804, write8_delegate(FUNC(scramble_state::scrambold_background_enable_w),this));
}
diff --git a/src/mame/machine/segacrp2.c b/src/mame/machine/segacrp2.c
index 8d79ae5eb9f..fb2c31d1429 100644
--- a/src/mame/machine/segacrp2.c
+++ b/src/mame/machine/segacrp2.c
@@ -60,7 +60,7 @@ static void sega_decode_2(running_machine &machine,const char *cputag,
};
- address_space &space = *machine.device(cputag)->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(cputag)->memory().space(AS_PROGRAM);
UINT8 *rom = machine.root_device().memregion(cputag)->base();
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x8000);
diff --git a/src/mame/machine/segacrpt.c b/src/mame/machine/segacrpt.c
index 3ff52b608d9..e0695a94e57 100644
--- a/src/mame/machine/segacrpt.c
+++ b/src/mame/machine/segacrpt.c
@@ -217,7 +217,7 @@ static void sega_decode(running_machine &machine, const char *cputag, const UINT
{
int A;
- address_space &space = *machine.device(cputag)->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(cputag)->memory().space(AS_PROGRAM);
int length = machine.root_device().memregion(cputag)->bytes();
int cryptlen = MIN(length, 0x8000);
UINT8 *rom = machine.root_device().memregion(cputag)->base();
@@ -439,7 +439,7 @@ void toprollr_decode(running_machine &machine, const char *cputag, const char *r
int A;
- address_space &space = *machine.device(cputag)->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(cputag)->memory().space(AS_PROGRAM);
UINT8 *rom = machine.root_device().memregion(regiontag)->base();
int bankstart;
decrypted = auto_alloc_array(machine, UINT8, 0x6000*3);
@@ -797,7 +797,7 @@ void jongkyo_decode(running_machine &machine, const char *cputag)
int A;
- address_space &space = *machine.device(cputag)->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(cputag)->memory().space(AS_PROGRAM);
UINT8 *rom = machine.root_device().memregion(cputag)->base();
decrypted = auto_alloc_array(machine, UINT8, 0x9000);
diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c
index 6327b5239a3..e2805ee5725 100644
--- a/src/mame/machine/segaic16.c
+++ b/src/mame/machine/segaic16.c
@@ -541,7 +541,7 @@ void sega_315_5195_mapper_device::device_start()
}
// find the address space that is to be mapped
- m_space = m_cpu->space(AS_PROGRAM);
+ m_space = &m_cpu->space(AS_PROGRAM);
if (m_space == NULL)
throw emu_fatalerror("Unable to find program address space on device '%s'", m_cputag);
diff --git a/src/mame/machine/segamsys.c b/src/mame/machine/segamsys.c
index 17569358c92..3fc10d0eb4b 100644
--- a/src/mame/machine/segamsys.c
+++ b/src/mame/machine/segamsys.c
@@ -1485,8 +1485,8 @@ READ8_HANDLER( sms_ioport_gg00_r )
void init_extra_gg_ports(running_machine& machine, const char* tag)
{
- address_space *io = machine.device(tag)->memory().space(AS_IO);
- io->install_legacy_read_handler (0x00, 0x00, FUNC(sms_ioport_gg00_r));
+ address_space &io = machine.device(tag)->memory().space(AS_IO);
+ io.install_legacy_read_handler (0x00, 0x00, FUNC(sms_ioport_gg00_r));
}
void init_smsgg(running_machine &machine)
@@ -1648,22 +1648,22 @@ static void megatech_set_genz80_as_sms_standard_ports(running_machine &machine,
{
/* INIT THE PORTS *********************************************************************************************/
- address_space *io = machine.device(tag)->memory().space(AS_IO);
+ address_space &io = machine.device(tag)->memory().space(AS_IO);
device_t *sn = machine.device("snsnd");
- io->install_legacy_readwrite_handler(0x0000, 0xffff, FUNC(z80_unmapped_port_r), FUNC(z80_unmapped_port_w));
+ io.install_legacy_readwrite_handler(0x0000, 0xffff, FUNC(z80_unmapped_port_r), FUNC(z80_unmapped_port_w));
- io->install_legacy_read_handler (0x7e, 0x7e, FUNC(md_sms_vdp_vcounter_r));
- io->install_legacy_write_handler(*sn, 0x7e, 0x7f, FUNC(sn76496_w));
- io->install_legacy_readwrite_handler (0xbe, 0xbe, FUNC(md_sms_vdp_data_r), FUNC(md_sms_vdp_data_w));
- io->install_legacy_readwrite_handler (0xbf, 0xbf, FUNC(md_sms_vdp_ctrl_r), FUNC(md_sms_vdp_ctrl_w));
+ io.install_legacy_read_handler (0x7e, 0x7e, FUNC(md_sms_vdp_vcounter_r));
+ io.install_legacy_write_handler(*sn, 0x7e, 0x7f, FUNC(sn76496_w));
+ io.install_legacy_readwrite_handler (0xbe, 0xbe, FUNC(md_sms_vdp_data_r), FUNC(md_sms_vdp_data_w));
+ io.install_legacy_readwrite_handler (0xbf, 0xbf, FUNC(md_sms_vdp_ctrl_r), FUNC(md_sms_vdp_ctrl_w));
- io->install_legacy_read_handler (0x10, 0x10, FUNC(megatech_sms_ioport_dd_r)); // super tetris
+ io.install_legacy_read_handler (0x10, 0x10, FUNC(megatech_sms_ioport_dd_r)); // super tetris
- io->install_legacy_read_handler (0xdc, 0xdc, FUNC(megatech_sms_ioport_dc_r));
- io->install_legacy_read_handler (0xdd, 0xdd, FUNC(megatech_sms_ioport_dd_r));
- io->install_legacy_read_handler (0xde, 0xde, FUNC(megatech_sms_ioport_dd_r));
- io->install_legacy_read_handler (0xdf, 0xdf, FUNC(megatech_sms_ioport_dd_r)); // adams family
+ io.install_legacy_read_handler (0xdc, 0xdc, FUNC(megatech_sms_ioport_dc_r));
+ io.install_legacy_read_handler (0xdd, 0xdd, FUNC(megatech_sms_ioport_dd_r));
+ io.install_legacy_read_handler (0xde, 0xde, FUNC(megatech_sms_ioport_dd_r));
+ io.install_legacy_read_handler (0xdf, 0xdf, FUNC(megatech_sms_ioport_dd_r)); // adams family
}
void megatech_set_genz80_as_sms_standard_map(running_machine &machine, const char* tag, int mapper)
@@ -1671,16 +1671,16 @@ void megatech_set_genz80_as_sms_standard_map(running_machine &machine, const cha
/* INIT THE MEMMAP / BANKING *********************************************************************************/
/* catch any addresses that don't get mapped */
- machine.device(tag)->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x0000, 0xffff, FUNC(z80_unmapped_r), FUNC(z80_unmapped_w));
+ machine.device(tag)->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x0000, 0xffff, FUNC(z80_unmapped_r), FUNC(z80_unmapped_w));
/* main ram area */
- sms_mainram = (UINT8 *)machine.device(tag)->memory().space(AS_PROGRAM)->install_ram(0xc000, 0xdfff, 0, 0x2000);
+ sms_mainram = (UINT8 *)machine.device(tag)->memory().space(AS_PROGRAM).install_ram(0xc000, 0xdfff, 0, 0x2000);
memset(sms_mainram,0x00,0x2000);
megatech_set_genz80_as_sms_standard_ports(machine, tag);
/* fixed rom bank area */
- sms_rom = (UINT8 *)machine.device(tag)->memory().space(AS_PROGRAM)->install_rom(0x0000, 0xbfff, NULL);
+ sms_rom = (UINT8 *)machine.device(tag)->memory().space(AS_PROGRAM).install_rom(0x0000, 0xbfff, NULL);
memcpy(sms_rom, machine.root_device().memregion("maincpu")->base(), 0xc000);
@@ -1688,14 +1688,14 @@ void megatech_set_genz80_as_sms_standard_map(running_machine &machine, const cha
{
- machine.device(tag)->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfffc, 0xffff, FUNC(mt_sms_standard_rom_bank_w));
+ machine.device(tag)->memory().space(AS_PROGRAM).install_legacy_write_handler(0xfffc, 0xffff, FUNC(mt_sms_standard_rom_bank_w));
}
else if (mapper == MAPPER_CODEMASTERS )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x0000, 0x0000, FUNC(codemasters_rom_bank_0000_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x4000, 0x4000, FUNC(codemasters_rom_bank_4000_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0x8000, FUNC(codemasters_rom_bank_8000_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x0000, 0x0000, FUNC(codemasters_rom_bank_0000_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x4000, 0x4000, FUNC(codemasters_rom_bank_4000_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x8000, 0x8000, FUNC(codemasters_rom_bank_8000_w));
}
// smsgg_backupram = NULL;
}
diff --git a/src/mame/machine/segas32.c b/src/mame/machine/segas32.c
index 550bcdd1e15..5688dce05d4 100644
--- a/src/mame/machine/segas32.c
+++ b/src/mame/machine/segas32.c
@@ -207,7 +207,7 @@ WRITE16_MEMBER(segas32_state::brival_protection_w)
void darkedge_fd1149_vblank(device_t *device)
{
- address_space &space = *device->memory().space(AS_PROGRAM);
+ address_space &space = device->memory().space(AS_PROGRAM);
space.write_word(0x20f072, 0);
space.write_word(0x20f082, 0);
@@ -243,7 +243,7 @@ READ16_MEMBER(segas32_state::darkedge_protection_r)
void f1lap_fd1149_vblank(device_t *device)
{
- address_space &space = *device->memory().space(AS_PROGRAM);
+ address_space &space = device->memory().space(AS_PROGRAM);
space.write_byte(0x20F7C6, 0);
diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c
index 33ec4cbfdb3..4824d3283a7 100644
--- a/src/mame/machine/snes.c
+++ b/src/mame/machine/snes.c
@@ -135,7 +135,7 @@ static TIMER_CALLBACK( snes_reset_oam_address )
{
snes_state *state = machine.driver_data<snes_state>();
// make sure we're in the 65816's context since we're messing with the OAM and stuff
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
if (!(snes_ppu.screen_disabled)) //Reset OAM address, byuu says it happens at H=10
{
@@ -148,15 +148,15 @@ static TIMER_CALLBACK( snes_reset_oam_address )
static TIMER_CALLBACK( snes_reset_hdma )
{
snes_state *state = machine.driver_data<snes_state>();
- address_space &cpu0space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &cpu0space = state->m_maincpu->space(AS_PROGRAM);
snes_hdma_init(cpu0space);
}
static TIMER_CALLBACK( snes_update_io )
{
snes_state *state = machine.driver_data<snes_state>();
- address_space *cpu0space = state->m_maincpu->space(AS_PROGRAM);
- state->m_io_read(cpu0space->machine());
+ address_space &cpu0space = state->m_maincpu->space(AS_PROGRAM);
+ state->m_io_read(cpu0space.machine());
snes_ram[HVBJOY] &= 0xfe; /* Clear busy bit */
state->m_io_timer->adjust(attotime::never);
@@ -233,7 +233,7 @@ static TIMER_CALLBACK( snes_scanline_tick )
// hdma reset happens at scanline 0, H=~6
if (snes_ppu.beam.current_vert == 0)
{
- address_space &cpu0space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &cpu0space = state->m_maincpu->space(AS_PROGRAM);
snes_hdma_init(cpu0space);
}
@@ -257,7 +257,7 @@ static TIMER_CALLBACK( snes_scanline_tick )
static TIMER_CALLBACK( snes_hblank_tick )
{
snes_state *state = machine.driver_data<snes_state>();
- address_space &cpu0space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &cpu0space = state->m_maincpu->space(AS_PROGRAM);
int nextscan;
snes_ppu.beam.current_vert = machine.primary_screen->vpos();
@@ -1558,14 +1558,14 @@ static void snes_init_timers( running_machine &machine )
static void snes_init_ram( running_machine &machine )
{
snes_state *state = machine.driver_data<snes_state>();
- address_space *cpu0space = machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &cpu0space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int i;
/* Init work RAM - 0x55 isn't exactly right but it's close */
/* make sure it happens to the 65816 (CPU 0) */
for (i = 0; i < (128*1024); i++)
{
- cpu0space->write_byte(0x7e0000 + i, 0x55);
+ cpu0space.write_byte(0x7e0000 + i, 0x55);
}
/* Inititialize registers/variables */
@@ -1680,8 +1680,8 @@ MACHINE_START( snes )
state->m_spc700 = machine.device<snes_sound_device>("spc700");
state->m_superfx = machine.device<cpu_device>("superfx");
- state->m_maincpu->space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(snes_state::snes_direct), state));
-// state->m_soundcpu->space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(snes_state::snes_spc_direct), state));
+ state->m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(snes_state::snes_direct), state));
+// state->m_soundcpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(snes_state::snes_spc_direct), state));
// power-on sets these registers like this
snes_ram[WRIO] = 0xff;
@@ -1816,7 +1816,7 @@ MACHINE_RESET( snes )
/* for mame we use an init, maybe we will need more for the different games */
DRIVER_INIT_MEMBER(snes_state,snes)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT16 total_blocks, read_blocks;
UINT8 *rom;
@@ -1881,7 +1881,7 @@ DRIVER_INIT_MEMBER(snes_state,snes)
DRIVER_INIT_MEMBER(snes_state,snes_hirom)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT16 total_blocks, read_blocks;
UINT8 *rom;
diff --git a/src/mame/machine/snescx4.c b/src/mame/machine/snescx4.c
index 7d648d04719..add0db3d3fc 100644
--- a/src/mame/machine/snescx4.c
+++ b/src/mame/machine/snescx4.c
@@ -108,7 +108,7 @@ static void CX4_transfer_data(running_machine &machine)
count = (cx4.reg[0x43]) | (cx4.reg[0x44] << 8);
dest = (cx4.reg[0x45]) | (cx4.reg[0x46] << 8);
- address_space &space = *machine.device<cpu_device>("maincpu")->space(AS_PROGRAM);
+ address_space &space = machine.device<cpu_device>("maincpu")->space(AS_PROGRAM);
for(i=0;i<count;i++)
{
CX4_write(machine, dest++, space.read_byte(src++));
diff --git a/src/mame/machine/stfight.c b/src/mame/machine/stfight.c
index a47efa07382..cdde2c09594 100644
--- a/src/mame/machine/stfight.c
+++ b/src/mame/machine/stfight.c
@@ -38,7 +38,7 @@ Encryption PAL 16R4 on CPU board
DRIVER_INIT_MEMBER(stfight_state,empcity)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = memregion("maincpu")->base();
int A;
@@ -82,7 +82,7 @@ DRIVER_INIT_MEMBER(stfight_state,stfight)
void stfight_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
m_adpcm_data_offs = m_adpcm_data_end = 0;
m_toggle = 0;
m_fm_data = 0;
diff --git a/src/mame/machine/stvprot.c b/src/mame/machine/stvprot.c
index 8ebc833cc6e..0eaf04fe581 100644
--- a/src/mame/machine/stvprot.c
+++ b/src/mame/machine/stvprot.c
@@ -162,7 +162,7 @@ static WRITE32_HANDLER ( twcup98_prot_w )
void install_twcup98_protection(running_machine &machine)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x4fffff0, 0x4ffffff, FUNC(twcup98_prot_r), FUNC(twcup98_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x4fffff0, 0x4ffffff, FUNC(twcup98_prot_r), FUNC(twcup98_prot_w));
}
/**************************
@@ -227,7 +227,7 @@ static WRITE32_HANDLER ( sss_prot_w )
void install_sss_protection(running_machine &machine)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x4fffff0, 0x4ffffff, FUNC(sss_prot_r), FUNC(sss_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x4fffff0, 0x4ffffff, FUNC(sss_prot_r), FUNC(sss_prot_w));
}
/*************************************
@@ -292,7 +292,7 @@ static WRITE32_HANDLER ( rsgun_prot_w )
void install_rsgun_protection(running_machine &machine)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x4fffff0, 0x4ffffff, FUNC(rsgun_prot_r), FUNC(rsgun_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x4fffff0, 0x4ffffff, FUNC(rsgun_prot_r), FUNC(rsgun_prot_w));
}
/*************************
@@ -387,7 +387,7 @@ static WRITE32_HANDLER ( elandore_prot_w )
void install_elandore_protection(running_machine &machine)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x4fffff0, 0x4ffffff, FUNC(elandore_prot_r), FUNC(elandore_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x4fffff0, 0x4ffffff, FUNC(elandore_prot_r), FUNC(elandore_prot_w));
}
/*************************
@@ -471,7 +471,7 @@ static WRITE32_HANDLER ( ffreveng_prot_w )
void install_ffreveng_protection(running_machine &machine)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x4fffff0, 0x4ffffff, FUNC(ffreveng_prot_r), FUNC(ffreveng_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x4fffff0, 0x4ffffff, FUNC(ffreveng_prot_r), FUNC(ffreveng_prot_w));
}
/************************
@@ -511,7 +511,7 @@ static WRITE32_HANDLER(astrass_prot_w)
void install_astrass_protection(running_machine &machine)
{
ctrl_index = -1;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x4fffff0, 0x4ffffff, FUNC(astrass_prot_r), FUNC(astrass_prot_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x4fffff0, 0x4ffffff, FUNC(astrass_prot_r), FUNC(astrass_prot_w));
}
/**************************
@@ -698,9 +698,9 @@ void install_decathlt_protection(running_machine &machine)
decathlt_prot_uploadmode = 0;
decathlt_prot_uploadoffset = 0;
decathlt_part = 1;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x37FFFF0, 0x37FFFFF, FUNC(decathlt_prot_r), FUNC(decathlt_prot1_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x37FFFF0, 0x37FFFFF, FUNC(decathlt_prot_r), FUNC(decathlt_prot1_w));
/* It accesses the device at this address too, with different tables, for the game textures, should it just act like a mirror, or a secondary device? */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x27FFFF0, 0x27FFFFF, FUNC(decathlt_prot_r), FUNC(decathlt_prot2_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x27FFFF0, 0x27FFFFF, FUNC(decathlt_prot_r), FUNC(decathlt_prot2_w));
}
void stv_register_protection_savestates(running_machine &machine)
diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c
index ed522407e91..9a57a5c63e6 100644
--- a/src/mame/machine/taitosj.c
+++ b/src/mame/machine/taitosj.c
@@ -36,7 +36,7 @@ void taitosj_state::machine_start()
void taitosj_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* set the default ROM bank (many games only have one bank and */
/* never write to the bank selector register) */
taitosj_bankswitch_w(space, 0, 0);
@@ -211,18 +211,18 @@ WRITE8_MEMBER(taitosj_state::taitosj_68705_portB_w)
}
if (~data & 0x10)
{
- address_space *cpu0space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &cpu0space = machine().device("maincpu")->memory().space(AS_PROGRAM);
LOG(("%04x: 68705 write %02x to address %04x\n",space.device().safe_pc(), m_portA_out, m_address));
- cpu0space->write_byte(m_address, m_portA_out);
+ cpu0space.write_byte(m_address, m_portA_out);
/* increase low 8 bits of latched address for burst writes */
m_address = (m_address & 0xff00) | ((m_address + 1) & 0xff);
}
if (~data & 0x20)
{
- address_space *cpu0space = machine().device("maincpu")->memory().space(AS_PROGRAM);
- m_portA_in = cpu0space->read_byte(m_address);
+ address_space &cpu0space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ m_portA_in = cpu0space.read_byte(m_address);
LOG(("%04x: 68705 read %02x from address %04x\n", space.device().safe_pc(), m_portA_in, m_address));
}
if (~data & 0x40)
diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c
index be6141f3c34..b2268a75472 100644
--- a/src/mame/machine/tatsumi.c
+++ b/src/mame/machine/tatsumi.c
@@ -66,7 +66,7 @@ WRITE16_MEMBER(tatsumi_state::apache3_z80_ctrl_w)
READ16_MEMBER(tatsumi_state::apache3_v30_v20_r)
{
- address_space *targetspace = machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &targetspace = machine().device("audiocpu")->memory().space(AS_PROGRAM);
/* Each V20 byte maps to a V30 word */
if ((m_control_word & 0xe0) == 0xe0)
@@ -77,12 +77,12 @@ READ16_MEMBER(tatsumi_state::apache3_v30_v20_r)
offset += 0x00000; // main ram
else
logerror("%08x: unmapped read z80 rom %08x\n", space.device().safe_pc(), offset);
- return 0xff00 | targetspace->read_byte(offset);
+ return 0xff00 | targetspace.read_byte(offset);
}
WRITE16_MEMBER(tatsumi_state::apache3_v30_v20_w)
{
- address_space *targetspace = machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &targetspace = machine().device("audiocpu")->memory().space(AS_PROGRAM);
if ((m_control_word & 0xe0) != 0x80)
logerror("%08x: write unmapped v30 rom %08x\n", space.device().safe_pc(), offset);
@@ -90,7 +90,7 @@ WRITE16_MEMBER(tatsumi_state::apache3_v30_v20_w)
/* Only 8 bits of the V30 data bus are connected - ignore writes to the other half */
if (ACCESSING_BITS_0_7)
{
- targetspace->write_byte(offset, data & 0xff);
+ targetspace.write_byte(offset, data & 0xff);
}
}
@@ -142,18 +142,18 @@ WRITE16_MEMBER(tatsumi_state::apache3_rotate_w)
READ16_MEMBER(tatsumi_state::roundup_v30_z80_r)
{
- address_space *targetspace = machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &targetspace = machine().device("audiocpu")->memory().space(AS_PROGRAM);
/* Each Z80 byte maps to a V30 word */
if (m_control_word & 0x20)
offset += 0x8000; /* Upper half */
- return 0xff00 | targetspace->read_byte(offset);
+ return 0xff00 | targetspace.read_byte(offset);
}
WRITE16_MEMBER(tatsumi_state::roundup_v30_z80_w)
{
- address_space *targetspace = machine().device("audiocpu")->memory().space(AS_PROGRAM);
+ address_space &targetspace = machine().device("audiocpu")->memory().space(AS_PROGRAM);
/* Only 8 bits of the V30 data bus are connected - ignore writes to the other half */
if (ACCESSING_BITS_0_7)
@@ -161,7 +161,7 @@ WRITE16_MEMBER(tatsumi_state::roundup_v30_z80_w)
if (m_control_word & 0x20)
offset += 0x8000; /* Upper half of Z80 address &space */
- targetspace->write_byte(offset, data & 0xff);
+ targetspace.write_byte(offset, data & 0xff);
}
}
diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c
index a1fcb305614..4a273555e6c 100644
--- a/src/mame/machine/tnzs.c
+++ b/src/mame/machine/tnzs.c
@@ -528,7 +528,7 @@ DRIVER_INIT_MEMBER(tnzs_state,drtoppel)
m_mcu_type = MCU_DRTOPPEL;
/* drtoppel writes to the palette RAM area even if it has PROMs! We have to patch it out. */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xf800, 0xfbff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xf800, 0xfbff);
}
DRIVER_INIT_MEMBER(tnzs_state,chukatai)
@@ -540,7 +540,7 @@ DRIVER_INIT_MEMBER(tnzs_state,tnzs)
{
m_mcu_type = MCU_TNZS;
/* we need to install a kludge to avoid problems with a bug in the original code */
-// machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xef10, 0xef10, FUNC(tnzs_sync_kludge_w));
+// machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xef10, 0xef10, FUNC(tnzs_sync_kludge_w));
}
DRIVER_INIT_MEMBER(tnzs_state,tnzsb)
@@ -548,7 +548,7 @@ DRIVER_INIT_MEMBER(tnzs_state,tnzsb)
m_mcu_type = MCU_NONE_TNZSB;
/* we need to install a kludge to avoid problems with a bug in the original code */
-// machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xef10, 0xef10, FUNC(tnzs_sync_kludge_w));
+// machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xef10, 0xef10, FUNC(tnzs_sync_kludge_w));
}
DRIVER_INIT_MEMBER(tnzs_state,kabukiz)
@@ -564,9 +564,9 @@ DRIVER_INIT_MEMBER(tnzs_state,insectx)
m_mcu_type = MCU_NONE_INSECTX;
/* this game has no mcu, replace the handler with plain input port handlers */
- machine().device("sub")->memory().space(AS_PROGRAM)->install_read_port(0xc000, 0xc000, "IN0" );
- machine().device("sub")->memory().space(AS_PROGRAM)->install_read_port(0xc001, 0xc001, "IN1" );
- machine().device("sub")->memory().space(AS_PROGRAM)->install_read_port(0xc002, 0xc002, "IN2" );
+ machine().device("sub")->memory().space(AS_PROGRAM).install_read_port(0xc000, 0xc000, "IN0" );
+ machine().device("sub")->memory().space(AS_PROGRAM).install_read_port(0xc001, 0xc001, "IN1" );
+ machine().device("sub")->memory().space(AS_PROGRAM).install_read_port(0xc002, 0xc002, "IN2" );
}
DRIVER_INIT_MEMBER(tnzs_state,kageki)
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index 3bd01768d4b..6f40ae8019a 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -75,13 +75,12 @@ READ16_MEMBER(toaplan1_state::demonwld_dsp_r)
{
/* DSP can read data from main CPU RAM via DSP IO port 1 */
- address_space *mainspace;
UINT16 input_data = 0;
switch (m_main_ram_seg) {
- case 0xc00000: mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
- input_data = mainspace->read_word(m_main_ram_seg + m_dsp_addr_w);
- break;
+ case 0xc00000: {address_space &mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ input_data = mainspace.read_word(m_main_ram_seg + m_dsp_addr_w);
+ break;}
default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n", space.device().safe_pcbase(), m_main_ram_seg + m_dsp_addr_w);
}
logerror("DSP PC:%04x IO read %04x at %08x (port 1)\n", space.device().safe_pcbase(), input_data, m_main_ram_seg + m_dsp_addr_w);
@@ -90,15 +89,13 @@ READ16_MEMBER(toaplan1_state::demonwld_dsp_r)
WRITE16_MEMBER(toaplan1_state::demonwld_dsp_w)
{
- address_space *mainspace;
-
/* Data written to main CPU RAM via DSP IO port 1 */
m_dsp_execute = 0;
switch (m_main_ram_seg) {
- case 0xc00000: if ((m_dsp_addr_w < 3) && (data == 0)) m_dsp_execute = 1;
- mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
- mainspace->write_word(m_main_ram_seg + m_dsp_addr_w, data);
- break;
+ case 0xc00000: {if ((m_dsp_addr_w < 3) && (data == 0)) m_dsp_execute = 1;
+ address_space &mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ mainspace.write_word(m_main_ram_seg + m_dsp_addr_w, data);
+ break;}
default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n", space.device().safe_pcbase(), m_main_ram_seg + m_dsp_addr_w);
}
logerror("DSP PC:%04x IO write %04x at %08x (port 1)\n", space.device().safe_pcbase(), data, m_main_ram_seg + m_dsp_addr_w);
diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c
index 9af773d1ae2..b2d3164589a 100644
--- a/src/mame/machine/twincobr.c
+++ b/src/mame/machine/twincobr.c
@@ -51,14 +51,13 @@ READ16_MEMBER(twincobr_state::twincobr_dsp_r)
{
/* DSP can read data from main CPU RAM via DSP IO port 1 */
- address_space *mainspace;
UINT16 input_data = 0;
switch (m_main_ram_seg) {
case 0x30000:
case 0x40000:
- case 0x50000: mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
- input_data = mainspace->read_word(m_main_ram_seg + m_dsp_addr_w);
- break;
+ case 0x50000: {address_space &mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ input_data = mainspace.read_word(m_main_ram_seg + m_dsp_addr_w);
+ break;}
default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n",space.device().safe_pcbase(),m_main_ram_seg + m_dsp_addr_w); break;
}
LOG(("DSP PC:%04x IO read %04x at %08x (port 1)\n",space.device().safe_pcbase(),input_data,m_main_ram_seg + m_dsp_addr_w));
@@ -67,16 +66,14 @@ READ16_MEMBER(twincobr_state::twincobr_dsp_r)
WRITE16_MEMBER(twincobr_state::twincobr_dsp_w)
{
- address_space *mainspace;
-
/* Data written to main CPU RAM via DSP IO port 1 */
m_dsp_execute = 0;
switch (m_main_ram_seg) {
case 0x30000: if ((m_dsp_addr_w < 3) && (data == 0)) m_dsp_execute = 1;
case 0x40000:
- case 0x50000: mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
- mainspace->write_word(m_main_ram_seg + m_dsp_addr_w, data);
- break;
+ case 0x50000: {address_space &mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ mainspace.write_word(m_main_ram_seg + m_dsp_addr_w, data);
+ break;}
default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n",space.device().safe_pcbase(),m_main_ram_seg + m_dsp_addr_w); break;
}
LOG(("DSP PC:%04x IO write %04x at %08x (port 1)\n",space.device().safe_pcbase(),data,m_main_ram_seg + m_dsp_addr_w));
@@ -101,15 +98,14 @@ READ16_MEMBER(twincobr_state::wardner_dsp_r)
{
/* DSP can read data from main CPU RAM via DSP IO port 1 */
- address_space *mainspace;
UINT16 input_data = 0;
switch (m_main_ram_seg) {
case 0x7000:
case 0x8000:
- case 0xa000: mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
- input_data = mainspace->read_byte(m_main_ram_seg + (m_dsp_addr_w + 0))
- | (mainspace->read_byte(m_main_ram_seg + (m_dsp_addr_w + 1)) << 8);
- break;
+ case 0xa000: {address_space &mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ input_data = mainspace.read_byte(m_main_ram_seg + (m_dsp_addr_w + 0))
+ | (mainspace.read_byte(m_main_ram_seg + (m_dsp_addr_w + 1)) << 8);
+ break;}
default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n",space.device().safe_pcbase(),m_main_ram_seg + m_dsp_addr_w); break;
}
LOG(("DSP PC:%04x IO read %04x at %08x (port 1)\n",space.device().safe_pcbase(),input_data,m_main_ram_seg + m_dsp_addr_w));
@@ -118,17 +114,15 @@ READ16_MEMBER(twincobr_state::wardner_dsp_r)
WRITE16_MEMBER(twincobr_state::wardner_dsp_w)
{
- address_space *mainspace;
-
/* Data written to main CPU RAM via DSP IO port 1 */
m_dsp_execute = 0;
switch (m_main_ram_seg) {
case 0x7000: if ((m_dsp_addr_w < 3) && (data == 0)) m_dsp_execute = 1;
case 0x8000:
- case 0xa000: mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
- mainspace->write_byte(m_main_ram_seg + (m_dsp_addr_w + 0), (data & 0xff));
- mainspace->write_byte(m_main_ram_seg + (m_dsp_addr_w + 1), ((data >> 8) & 0xff));
- break;
+ case 0xa000: {address_space &mainspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ mainspace.write_byte(m_main_ram_seg + (m_dsp_addr_w + 0), (data & 0xff));
+ mainspace.write_byte(m_main_ram_seg + (m_dsp_addr_w + 1), ((data >> 8) & 0xff));
+ break;}
default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n",space.device().safe_pcbase(),m_main_ram_seg + m_dsp_addr_w); break;
}
LOG(("DSP PC:%04x IO write %04x at %08x (port 1)\n",space.device().safe_pcbase(),data,m_main_ram_seg + m_dsp_addr_w));
diff --git a/src/mame/machine/vectrex.c b/src/mame/machine/vectrex.c
index 29da8f88da7..4cbc9a615cd 100644
--- a/src/mame/machine/vectrex.c
+++ b/src/mame/machine/vectrex.c
@@ -89,7 +89,7 @@ DEVICE_IMAGE_LOAD(vectrex_cart)
}
if (memcmp(mem + 0x06,"SRAM",4)) {
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x0000, 0x7fff);
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x0000, 0x7fff);
}
/* If VIA T2 starts, reset refresh timer.
diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c
index e4d9a870e81..9b502811770 100644
--- a/src/mame/machine/vsnes.c
+++ b/src/mame/machine/vsnes.c
@@ -186,7 +186,7 @@ static void v_set_videorom_bank( running_machine& machine, int start, int count,
MACHINE_START_MEMBER(vsnes_state,vsnes)
{
- address_space *ppu1_space = machine().device("ppu1")->memory().space(AS_PROGRAM);
+ address_space &ppu1_space = machine().device("ppu1")->memory().space(AS_PROGRAM);
int i;
/* establish nametable ram */
@@ -197,7 +197,7 @@ MACHINE_START_MEMBER(vsnes_state,vsnes)
m_nt_page[0][2] = m_nt_ram[0] + 0x800;
m_nt_page[0][3] = m_nt_ram[0] + 0xc00;
- ppu1_space->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(vsnes_state::vsnes_nt0_r),this), write8_delegate(FUNC(vsnes_state::vsnes_nt0_w),this));
+ ppu1_space.install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(vsnes_state::vsnes_nt0_r),this), write8_delegate(FUNC(vsnes_state::vsnes_nt0_w),this));
m_vrom[0] = memregion("gfx1")->base();
m_vrom_size[0] = memregion("gfx1")->bytes();
@@ -210,14 +210,14 @@ MACHINE_START_MEMBER(vsnes_state,vsnes)
{
for (i = 0; i < 8; i++)
{
- ppu1_space->install_read_bank(0x0400 * i, 0x0400 * i + 0x03ff, chr_banknames[i]);
+ ppu1_space.install_read_bank(0x0400 * i, 0x0400 * i + 0x03ff, chr_banknames[i]);
membank(chr_banknames[i])->configure_entries(0, m_vrom_banks, m_vrom[0], 0x400);
}
v_set_videorom_bank(machine(), 0, 8, 0);
}
else
{
- ppu1_space->install_ram(0x0000, 0x1fff, m_vram);
+ ppu1_space.install_ram(0x0000, 0x1fff, m_vram);
}
}
@@ -241,12 +241,12 @@ MACHINE_START_MEMBER(vsnes_state,vsdual)
m_nt_page[1][2] = m_nt_ram[1] + 0x800;
m_nt_page[1][3] = m_nt_ram[1] + 0xc00;
- machine().device("ppu1")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(vsnes_state::vsnes_nt0_r),this), write8_delegate(FUNC(vsnes_state::vsnes_nt0_w),this));
- machine().device("ppu2")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(vsnes_state::vsnes_nt1_r),this), write8_delegate(FUNC(vsnes_state::vsnes_nt1_w),this));
+ machine().device("ppu1")->memory().space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(vsnes_state::vsnes_nt0_r),this), write8_delegate(FUNC(vsnes_state::vsnes_nt0_w),this));
+ machine().device("ppu2")->memory().space(AS_PROGRAM).install_readwrite_handler(0x2000, 0x3eff, read8_delegate(FUNC(vsnes_state::vsnes_nt1_r),this), write8_delegate(FUNC(vsnes_state::vsnes_nt1_w),this));
// read only!
- machine().device("ppu1")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x1fff, "bank2");
+ machine().device("ppu1")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x1fff, "bank2");
// read only!
- machine().device("ppu2")->memory().space(AS_PROGRAM)->install_read_bank(0x0000, 0x1fff, "bank3");
+ machine().device("ppu2")->memory().space(AS_PROGRAM).install_read_bank(0x0000, 0x1fff, "bank3");
membank("bank2")->configure_entries(0, m_vrom_size[0] / 0x2000, m_vrom[0], 0x2000);
membank("bank3")->configure_entries(0, m_vrom_size[1] / 0x2000, m_vrom[1], 0x2000);
membank("bank2")->set_entry(0);
@@ -339,7 +339,7 @@ WRITE8_MEMBER(vsnes_state::vsnormal_vrom_banking)
DRIVER_INIT_MEMBER(vsnes_state,vsnormal)
{
/* vrom switching is enabled with bit 2 of $4016 */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x4016, 0x4016, write8_delegate(FUNC(vsnes_state::vsnormal_vrom_banking),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x4016, 0x4016, write8_delegate(FUNC(vsnes_state::vsnormal_vrom_banking),this));
}
/**********************************************************************************/
@@ -395,7 +395,7 @@ WRITE8_MEMBER(vsnes_state::gun_in0_w)
DRIVER_INIT_MEMBER(vsnes_state,vsgun)
{
/* VROM switching is enabled with bit 2 of $4016 */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x4016, 0x4016, read8_delegate(FUNC(vsnes_state::gun_in0_r),this), write8_delegate(FUNC(vsnes_state::gun_in0_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x4016, 0x4016, read8_delegate(FUNC(vsnes_state::gun_in0_r),this), write8_delegate(FUNC(vsnes_state::gun_in0_w),this));
m_do_vrom_bank = 1;
}
@@ -436,7 +436,7 @@ DRIVER_INIT_MEMBER(vsnes_state,vskonami)
memcpy(&prg[0x08000], &prg[0x18000], 0x8000);
/* banking is done with writes to the $8000-$ffff area */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::vskonami_rom_banking),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::vskonami_rom_banking),this));
}
/***********************************************************************/
@@ -463,7 +463,7 @@ DRIVER_INIT_MEMBER(vsnes_state,vsgshoe)
memcpy (&prg[0x08000], &prg[0x12000], 0x2000);
/* vrom switching is enabled with bit 2 of $4016 */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x4016, 0x4016, read8_delegate(FUNC(vsnes_state::gun_in0_r),this), write8_delegate(FUNC(vsnes_state::vsgshoe_gun_in0_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x4016, 0x4016, read8_delegate(FUNC(vsnes_state::gun_in0_r),this), write8_delegate(FUNC(vsnes_state::vsgshoe_gun_in0_w),this));
m_do_vrom_bank = 1;
}
@@ -592,7 +592,7 @@ DRIVER_INIT_MEMBER(vsnes_state,drmario)
memcpy(&prg[0x0c000], &prg[0x1c000], 0x4000);
/* MMC1 mapper at writes to $8000-$ffff */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::drmario_rom_banking),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::drmario_rom_banking),this));
m_drmario_shiftreg = 0;
m_drmario_shiftcount = 0;
@@ -616,7 +616,7 @@ DRIVER_INIT_MEMBER(vsnes_state,vsvram)
memcpy(&prg[0x08000], &prg[0x28000], 0x8000);
/* banking is done with writes to the $8000-$ffff area */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::vsvram_rom_banking),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::vsvram_rom_banking),this));
/* allocate m_vram */
m_vram = auto_alloc_array(machine(), UINT8, 0x2000);
@@ -778,10 +778,10 @@ DRIVER_INIT_MEMBER(vsnes_state,MMC3)
memcpy(&prg[0xe000], &prg[(MMC3_prg_chunks - 1) * 0x4000 + 0x12000], 0x2000);
/* MMC3 mapper at writes to $8000-$ffff */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::mapper4_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::mapper4_w),this));
/* extra ram at $6000-$7fff */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_ram(0x6000, 0x7fff);
}
/* Vs. RBI Baseball */
@@ -818,7 +818,7 @@ DRIVER_INIT_MEMBER(vsnes_state,rbibb)
DRIVER_INIT_CALL(MMC3);
/* RBI Base ball hack */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x5e00, 0x5e01, read8_delegate(FUNC(vsnes_state::rbi_hack_r),this)) ;
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x5e00, 0x5e01, read8_delegate(FUNC(vsnes_state::rbi_hack_r),this)) ;
}
/* Vs. Super Xevious */
@@ -865,10 +865,10 @@ DRIVER_INIT_MEMBER(vsnes_state,supxevs)
DRIVER_INIT_CALL(MMC3);
/* Vs. Super Xevious Protection */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x54ff, 0x54ff, read8_delegate(FUNC(vsnes_state::supxevs_read_prot_1_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x5678, 0x5678, read8_delegate(FUNC(vsnes_state::supxevs_read_prot_2_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x578f, 0x578f, read8_delegate(FUNC(vsnes_state::supxevs_read_prot_3_r),this));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x5567, 0x5567, read8_delegate(FUNC(vsnes_state::supxevs_read_prot_4_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x54ff, 0x54ff, read8_delegate(FUNC(vsnes_state::supxevs_read_prot_1_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x5678, 0x5678, read8_delegate(FUNC(vsnes_state::supxevs_read_prot_2_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x578f, 0x578f, read8_delegate(FUNC(vsnes_state::supxevs_read_prot_3_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x5567, 0x5567, read8_delegate(FUNC(vsnes_state::supxevs_read_prot_4_r),this));
}
/* Vs. TKO Boxing */
@@ -897,7 +897,7 @@ DRIVER_INIT_MEMBER(vsnes_state,tkoboxng)
DRIVER_INIT_CALL(MMC3);
/* security device at $5e00-$5e01 */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x5e00, 0x5e01, read8_delegate(FUNC(vsnes_state::tko_security_r),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x5e00, 0x5e01, read8_delegate(FUNC(vsnes_state::tko_security_r),this));
}
/* Vs. Freedom Force */
@@ -906,7 +906,7 @@ DRIVER_INIT_MEMBER(vsnes_state,vsfdf)
{
DRIVER_INIT_CALL(MMC3);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x4016, 0x4016, read8_delegate(FUNC(vsnes_state::gun_in0_r),this), write8_delegate(FUNC(vsnes_state::gun_in0_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x4016, 0x4016, read8_delegate(FUNC(vsnes_state::gun_in0_r),this), write8_delegate(FUNC(vsnes_state::gun_in0_w),this));
m_do_vrom_bank = 0;
}
@@ -956,7 +956,7 @@ DRIVER_INIT_MEMBER(vsnes_state,platoon)
memcpy(&prg[0x08000], &prg[0x10000], 0x4000);
memcpy(&prg[0x0c000], &prg[0x2c000], 0x4000);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::mapper68_rom_banking),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x8000, 0xffff, write8_delegate(FUNC(vsnes_state::mapper68_rom_banking),this));
}
/**********************************************************************************/
@@ -977,10 +977,10 @@ READ8_MEMBER(vsnes_state::set_bnglngby_irq_r)
DRIVER_INIT_MEMBER(vsnes_state,bnglngby)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x0231, 0x0231, read8_delegate(FUNC(vsnes_state::set_bnglngby_irq_r),this), write8_delegate(FUNC(vsnes_state::set_bnglngby_irq_w),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x0231, 0x0231, read8_delegate(FUNC(vsnes_state::set_bnglngby_irq_r),this), write8_delegate(FUNC(vsnes_state::set_bnglngby_irq_w),this));
/* extra ram */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_ram(0x6000, 0x7fff);
m_ret = 0;
@@ -1012,11 +1012,11 @@ DRIVER_INIT_MEMBER(vsnes_state,vsdual)
UINT8 *prg = machine().root_device().memregion("maincpu")->base();
/* vrom switching is enabled with bit 2 of $4016 */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x4016, 0x4016, write8_delegate(FUNC(vsnes_state::vsdual_vrom_banking),this));
- machine().device("sub")->memory().space(AS_PROGRAM)->install_write_handler(0x4016, 0x4016, write8_delegate(FUNC(vsnes_state::vsdual_vrom_banking),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x4016, 0x4016, write8_delegate(FUNC(vsnes_state::vsdual_vrom_banking),this));
+ machine().device("sub")->memory().space(AS_PROGRAM).install_write_handler(0x4016, 0x4016, write8_delegate(FUNC(vsnes_state::vsdual_vrom_banking),this));
/* shared ram at $6000 */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff, &prg[0x6000]);
- machine().device("sub")->memory().space(AS_PROGRAM)->install_ram(0x6000, 0x7fff, &prg[0x6000]);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_ram(0x6000, 0x7fff, &prg[0x6000]);
+ machine().device("sub")->memory().space(AS_PROGRAM).install_ram(0x6000, 0x7fff, &prg[0x6000]);
}
diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c
index 84777718d25..6af1dce7aaa 100644
--- a/src/mame/machine/williams.c
+++ b/src/mame/machine/williams.c
@@ -456,7 +456,7 @@ TIMER_DEVICE_CALLBACK( williams2_endscreen_callback )
static void williams2_postload(running_machine &machine)
{
williams_state *state = machine.driver_data<williams_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
state->williams2_bank_select_w(space, 0, state->m_vram_bank);
}
@@ -475,7 +475,7 @@ MACHINE_START_MEMBER(williams_state,williams2)
MACHINE_RESET_MEMBER(williams_state,williams2)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* make sure our banking is reset */
williams2_bank_select_w(space, 0, 0);
@@ -759,7 +759,7 @@ WRITE8_MEMBER(williams_state::williams2_7segment_w)
static void defender_postload(running_machine &machine)
{
williams_state *state = machine.driver_data<williams_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
state->defender_bank_select_w(space, 0, state->m_vram_bank);
}
@@ -777,7 +777,7 @@ MACHINE_START_MEMBER(williams_state,defender)
MACHINE_RESET_MEMBER(williams_state,defender)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
MACHINE_RESET_CALL_MEMBER(williams_common);
@@ -1002,7 +1002,7 @@ static WRITE8_DEVICE_HANDLER( joust2_pia_3_cb1_w )
{
joust2_state *state = device->machine().driver_data<joust2_state>();
state->m_joust2_current_sound_data = (state->m_joust2_current_sound_data & ~0x100) | ((data << 8) & 0x100);
- state->m_cvsd_sound->write(*device->machine().memory().first_space(), 0, state->m_joust2_current_sound_data);
+ state->m_cvsd_sound->write(device->machine().driver_data()->generic_space(), 0, state->m_joust2_current_sound_data);
}
@@ -1010,6 +1010,6 @@ static WRITE8_DEVICE_HANDLER( joust2_snd_cmd_w )
{
joust2_state *state = device->machine().driver_data<joust2_state>();
state->m_joust2_current_sound_data = (state->m_joust2_current_sound_data & ~0xff) | (data & 0xff);
- state->m_cvsd_sound->write(*device->machine().memory().first_space(), 0, state->m_joust2_current_sound_data);
+ state->m_cvsd_sound->write(device->machine().driver_data()->generic_space(), 0, state->m_joust2_current_sound_data);
device->machine().scheduler().synchronize(FUNC(joust2_deferred_snd_cmd_w), state->m_joust2_current_sound_data);
}
diff --git a/src/mame/video/amiga.c b/src/mame/video/amiga.c
index 95653dcc600..cf3ec36d77a 100644
--- a/src/mame/video/amiga.c
+++ b/src/mame/video/amiga.c
@@ -206,7 +206,7 @@ int amiga_copper_execute_next(running_machine &machine, int xpos)
{
if (LOG_COPPER)
logerror("%02X.%02X: Write to %s = %04x\n", state->m_last_scanline, xpos / 2, amiga_custom_names[state->m_copper_pending_offset & 0xff], state->m_copper_pending_data);
- amiga_custom_w(*machine.device("maincpu")->memory().space(AS_PROGRAM), state->m_copper_pending_offset, state->m_copper_pending_data, 0xffff);
+ amiga_custom_w(machine.device("maincpu")->memory().space(AS_PROGRAM), state->m_copper_pending_offset, state->m_copper_pending_data, 0xffff);
state->m_copper_pending_offset = 0;
}
@@ -262,7 +262,7 @@ int amiga_copper_execute_next(running_machine &machine, int xpos)
{
if (LOG_COPPER)
logerror("%02X.%02X: Write to %s = %04x\n", state->m_last_scanline, xpos / 2, amiga_custom_names[word0 & 0xff], word1);
- amiga_custom_w(*machine.device("maincpu")->memory().space(AS_PROGRAM), word0, word1, 0xffff);
+ amiga_custom_w(machine.device("maincpu")->memory().space(AS_PROGRAM), word0, word1, 0xffff);
}
else // additional 2 cycles needed for non-Agnus registers
{
diff --git a/src/mame/video/astrocde.c b/src/mame/video/astrocde.c
index bed4aaace68..cc28efe4e05 100644
--- a/src/mame/video/astrocde.c
+++ b/src/mame/video/astrocde.c
@@ -866,7 +866,7 @@ WRITE8_MEMBER(astrocde_state::astrocade_pattern_board_w)
case 6: /* height of blit and initiator */
m_pattern_height = data;
- execute_blit(*space.device().memory().space(AS_PROGRAM));
+ execute_blit(space.device().memory().space(AS_PROGRAM));
break;
}
}
diff --git a/src/mame/video/atari.c b/src/mame/video/atari.c
index 91010e7116c..3222527cd38 100644
--- a/src/mame/video/atari.c
+++ b/src/mame/video/atari.c
@@ -1174,7 +1174,7 @@ static TIMER_CALLBACK( antic_steal_cycles )
*****************************************************************************/
static TIMER_CALLBACK( antic_scanline_render )
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
VIDEO *video = antic.video[antic.scanline];
LOG((" @cycle #%3d render mode $%X lines to go #%d\n", cycle(machine), (antic.cmd & 0x0f), antic.modelines));
@@ -1244,7 +1244,7 @@ INLINE void LMS(running_machine &machine, int new_cmd)
**************************************************************/
if( new_cmd & ANTIC_LMS )
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int addr = RDANTIC(space);
antic.doffs = (antic.doffs + 1) & DOFFS;
addr += 256 * RDANTIC(space);
@@ -1269,7 +1269,7 @@ INLINE void LMS(running_machine &machine, int new_cmd)
*****************************************************************************/
static void antic_scanline_dma(running_machine &machine, int param)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
LOG((" @cycle #%3d DMA fetch\n", cycle(machine)));
if (antic.scanline == VBL_END)
antic.r.nmist &= ~VBL_NMI;
diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c
index 3204d036539..7ef04315ffc 100644
--- a/src/mame/video/atarisy1.c
+++ b/src/mame/video/atarisy1.c
@@ -384,7 +384,7 @@ WRITE16_HANDLER( atarisy1_spriteram_w )
TIMER_DEVICE_CALLBACK( atarisy1_int3off_callback )
{
- address_space &space = *timer.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = timer.machine().device("maincpu")->memory().space(AS_PROGRAM);
/* clear the state */
atarigen_scanline_int_ack_w(space, 0, 0, 0xffff);
diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c
index 46c7bb2d23e..7129217c806 100644
--- a/src/mame/video/avgdvg.c
+++ b/src/mame/video/avgdvg.c
@@ -1289,7 +1289,7 @@ WRITE16_HANDLER( avgdvg_reset_word_w )
MACHINE_RESET( avgdvg )
{
- avgdvg_reset_w (*machine.device("maincpu")->memory().space(AS_PROGRAM),0,0);
+ avgdvg_reset_w (machine.device("maincpu")->memory().space(AS_PROGRAM),0,0);
}
diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c
index 7b530bbba4a..f00b912d937 100644
--- a/src/mame/video/blstroid.c
+++ b/src/mame/video/blstroid.c
@@ -89,7 +89,7 @@ VIDEO_START_MEMBER(blstroid_state,blstroid)
static TIMER_CALLBACK( irq_off )
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* clear the interrupt */
atarigen_scanline_int_ack_w(space, 0, 0, 0xffff);
diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c
index 215378ad415..e10561b3e2e 100644
--- a/src/mame/video/cischeat.c
+++ b/src/mame/video/cischeat.c
@@ -1419,7 +1419,7 @@ if ( machine().input().code_pressed(KEYCODE_Z) || machine().input().code_pressed
if (msk != 0) m_active_layers &= msk;
#if 1
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
popmessage("Cmd: %04X Pos:%04X Lim:%04X Inp:%04X",
m_scudhamm_motor_command,
diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c
index ed667a69c5d..75dfea9f561 100644
--- a/src/mame/video/combatsc.c
+++ b/src/mame/video/combatsc.c
@@ -507,7 +507,7 @@ byte #4:
static void bootleg_draw_sprites( running_machine &machine, bitmap_ind16 &bitmap, const rectangle &cliprect, const UINT8 *source, int circuit )
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
gfx_element *gfx = machine.gfx[circuit + 2];
int limit = circuit ? (space.read_byte(0xc2) * 256 + space.read_byte(0xc3)) : (space.read_byte(0xc0) * 256 + space.read_byte(0xc1));
diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c
index a68ccca561e..1b81e4cb63c 100644
--- a/src/mame/video/dc.c
+++ b/src/mame/video/dc.c
@@ -1975,7 +1975,7 @@ static void render_tri(running_machine &machine, bitmap_rgb32 &bitmap, texinfo *
static void render_to_accumulation_buffer(running_machine &machine,bitmap_rgb32 &bitmap,const rectangle &cliprect)
{
dc_state *state = machine.driver_data<dc_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int cs,rs,ns;
UINT32 c;
#if 0
diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c
index 19d280fdb1a..a90ec6b003a 100644
--- a/src/mame/video/dogfgt.c
+++ b/src/mame/video/dogfgt.c
@@ -215,7 +215,7 @@ UINT32 dogfgt_state::screen_update_dogfgt(screen_device &screen, bitmap_ind16 &b
if (m_lastflip != flip_screen() || m_lastpixcolor != m_pixcolor)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
m_lastflip = flip_screen();
m_lastpixcolor = m_pixcolor;
diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c
index 07357177322..71174c2260e 100644
--- a/src/mame/video/gp9001.c
+++ b/src/mame/video/gp9001.c
@@ -400,7 +400,7 @@ static int gp9001_videoram16_r(gp9001vdp_device *vdp, offs_t offset)
{
int offs = vdp->gp9001_voffs;
vdp->gp9001_voffs++;
- return vdp->space()->read_word(offs*2);
+ return vdp->space().read_word(offs*2);
}
@@ -408,7 +408,7 @@ static void gp9001_videoram16_w(gp9001vdp_device *vdp, offs_t offset, UINT16 dat
{
int offs = vdp->gp9001_voffs;
vdp->gp9001_voffs++;
- vdp->space()->write_word(offs*2, data, mem_mask);
+ vdp->space().write_word(offs*2, data, mem_mask);
}
static WRITE16_DEVICE_HANDLER( gp9001_devvoffs_w )
diff --git a/src/mame/video/gtia.c b/src/mame/video/gtia.c
index f731e4e2e20..ce4739f5f40 100644
--- a/src/mame/video/gtia.c
+++ b/src/mame/video/gtia.c
@@ -157,7 +157,7 @@ static int is_ntsc(running_machine &machine)
static void gtia_reset(running_machine &machine)
{
int i;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* reset the GTIA read/write/helper registers */
for (i = 0; i < 32; i++)
diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c
index 92044f829ba..9a7e364e367 100644
--- a/src/mame/video/hng64.c
+++ b/src/mame/video/hng64.c
@@ -1446,7 +1446,7 @@ UINT32 hng64_state::screen_update_hng64(screen_device &screen, bitmap_rgb32 &bit
// but it could be useful
if ( machine().input().code_pressed_once(KEYCODE_L) )
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.write_byte(0x2f27c8, 0x2);
}
#endif
diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c
index 770d17c4eab..cd470585804 100644
--- a/src/mame/video/leland.c
+++ b/src/mame/video/leland.c
@@ -290,7 +290,7 @@ WRITE8_MEMBER(leland_state::leland_master_video_addr_w)
static TIMER_CALLBACK( leland_delayed_mvram_w )
{
- address_space &space = *machine.device("master")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("master")->memory().space(AS_PROGRAM);
int num = (param >> 16) & 1;
int offset = (param >> 8) & 0xff;
diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c
index b71de2215c9..5cdbaf1c617 100644
--- a/src/mame/video/namcos22.c
+++ b/src/mame/video/namcos22.c
@@ -2813,7 +2813,7 @@ UINT32 namcos22_state::screen_update_namcos22s(screen_device &screen, bitmap_rgb
FILE *f = fopen( "dump.txt", "wb" );
if( f )
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
if (1) // czram
{
@@ -2878,7 +2878,7 @@ UINT32 namcos22_state::screen_update_namcos22(screen_device &screen, bitmap_rgb3
FILE *f = fopen( "dump.txt", "wb" );
if( f )
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
//Dump(space, f,0x90000000, 0x90000003, "led?" );
Dump(space, f,0x90010000, 0x90017fff, "cz_ram");
diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c
index 5ccf0b94554..af06b2b0fd7 100644
--- a/src/mame/video/ojankohs.c
+++ b/src/mame/video/ojankohs.c
@@ -307,7 +307,7 @@ UINT32 ojankohs_state::screen_update_ojankoc(screen_device &screen, bitmap_ind16
if (m_screen_refresh)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* redraw bitmap */
for (offs = 0; offs < 0x8000; offs++)
diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c
index 904e9f85dbb..901ca9c9f16 100644
--- a/src/mame/video/popeye.c
+++ b/src/mame/video/popeye.c
@@ -277,7 +277,7 @@ static void draw_background(running_machine &machine, bitmap_ind16 &bitmap, cons
{
popeye_state *state = machine.driver_data<popeye_state>();
int offs;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (state->m_lastflip != state->flip_screen())
{
diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c
index f9ac115746d..651d85e2db7 100644
--- a/src/mame/video/ppu2c0x.c
+++ b/src/mame/video/ppu2c0x.c
@@ -265,7 +265,7 @@ void ppu2c0x_device::device_start()
inline UINT8 ppu2c0x_device::readbyte(offs_t address)
{
- return space()->read_byte(address);
+ return space().read_byte(address);
}
@@ -275,7 +275,7 @@ inline UINT8 ppu2c0x_device::readbyte(offs_t address)
inline void ppu2c0x_device::writebyte(offs_t address, UINT8 data)
{
- space()->write_byte(address, data);
+ space().write_byte(address, data);
}
diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c
index f04ff545e27..1a0117d7cb4 100644
--- a/src/mame/video/simpsons.c
+++ b/src/mame/video/simpsons.c
@@ -93,7 +93,7 @@ WRITE8_MEMBER(simpsons_state::simpsons_k053247_w)
void simpsons_video_banking( running_machine &machine, int bank )
{
simpsons_state *state = machine.driver_data<simpsons_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (bank & 1)
{
diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c
index 2581e8d3213..a8f7832c4f5 100644
--- a/src/mame/video/skydiver.c
+++ b/src/mame/video/skydiver.c
@@ -11,7 +11,7 @@
void skydiver_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* reset all latches */
skydiver_start_lamp_1_w(space, 0, 0);
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index c85cc5d0a5c..c2df8b52b18 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -27,7 +27,7 @@ static void hitice_clear_pixel_bitmap( running_machine &machine )
{
int i;
taitob_state *state = machine.driver_data<taitob_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
for (i = 0; i < 0x40000; i++)
state->hitice_pixelram_w(space, i, 0, 0xffff);
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index 7630f01980f..ec55bb9203c 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -286,7 +286,7 @@ static void toaplan1_set_scrolls(running_machine &machine)
static void rallybik_flipscreen(running_machine &machine)
{
toaplan1_state *state = machine.driver_data<toaplan1_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
state->rallybik_bcu_flipscreen_w(space, 0, state->m_bcu_flipscreen, 0xffff);
}
@@ -294,7 +294,7 @@ static void rallybik_flipscreen(running_machine &machine)
static void toaplan1_flipscreen(running_machine &machine)
{
toaplan1_state *state = machine.driver_data<toaplan1_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
state->toaplan1_bcu_flipscreen_w(space, 0, state->m_bcu_flipscreen, 0xffff);
}
diff --git a/src/mame/video/vdc.c b/src/mame/video/vdc.c
index 5b7ca4af9b4..18501dbab81 100644
--- a/src/mame/video/vdc.c
+++ b/src/mame/video/vdc.c
@@ -1185,7 +1185,7 @@ READ8_HANDLER( vpc_r )
static void vpc_init( running_machine &machine )
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
vpc_w( space, 0, 0x11 );
vpc_w( space, 1, 0x11 );
vpc.window1.w = 0;
diff --git a/src/mame/video/vrender0.c b/src/mame/video/vrender0.c
index c34313d7dc0..475a2b31633 100644
--- a/src/mame/video/vrender0.c
+++ b/src/mame/video/vrender0.c
@@ -402,7 +402,7 @@ static const _DrawTemplate DrawTile[]=
int vrender0_ProcessPacket(device_t *device, UINT32 PacketPtr, UINT16 *Dest, UINT8 *TEXTURE)
{
vr0video_state *vr0 = get_safe_token(device);
- address_space &space = *vr0->cpu->memory().space(AS_PROGRAM);
+ address_space &space = vr0->cpu->memory().space(AS_PROGRAM);
UINT32 Dx = Packet(1) & 0x3ff;
UINT32 Dy = Packet(2) & 0x1ff;
UINT32 Endx = Packet(3) & 0x3ff;
diff --git a/src/mess/audio/mos7360.c b/src/mess/audio/mos7360.c
index bf087986852..249dc1f9e65 100644
--- a/src/mess/audio/mos7360.c
+++ b/src/mess/audio/mos7360.c
@@ -237,7 +237,7 @@ inline UINT8 mos7360_device::read_ram(offs_t offset)
int rom = m_rom;
m_rom = 0;
- m_last_data = space(AS_0)->read_byte(offset);
+ m_last_data = space(AS_0).read_byte(offset);
m_rom = rom;
@@ -249,7 +249,7 @@ inline UINT8 mos7360_device::read_rom(offs_t offset)
int rom = m_rom;
m_rom = 1;
- m_last_data = space(AS_0)->read_byte(offset);
+ m_last_data = space(AS_0).read_byte(offset);
m_rom = rom;
diff --git a/src/mess/audio/svision.c b/src/mess/audio/svision.c
index ae699e45047..22ea0ae6ab0 100644
--- a/src/mess/audio/svision.c
+++ b/src/mess/audio/svision.c
@@ -261,7 +261,7 @@ static STREAM_UPDATE( svision_update )
}
else
{
- sample = device->machine().device("maincpu")->memory().space(AS_PROGRAM)->read_byte(addr);
+ sample = device->machine().device("maincpu")->memory().space(AS_PROGRAM).read_byte(addr);
}
if (((unsigned)state->dma.pos) & 1)
s = (sample & 0xf);
diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c
index df6e38e3528..30cfb3e8a8f 100644
--- a/src/mess/drivers/a2600.c
+++ b/src/mess/drivers/a2600.c
@@ -783,7 +783,7 @@ DIRECT_UPDATE_MEMBER(a2600_state::modeF6_opbase)
{
if ( ( address & 0x1FFF ) >= 0x1FF6 && ( address & 0x1FFF ) <= 0x1FF9 )
{
- modeF6_switch_w(*machine().device("maincpu")->memory().space(AS_PROGRAM), ( address & 0x1FFF ) - 0x1FF6, 0 );
+ modeF6_switch_w(machine().device("maincpu")->memory().space(AS_PROGRAM), ( address & 0x1FFF ) - 0x1FF6, 0 );
}
return address;
}
@@ -1129,7 +1129,7 @@ DIRECT_UPDATE_MEMBER(a2600_state::modeFE_opbase_handler)
m_bank_base[1] = memregion("user1")->base() + 0x1000 * ( ( address & 0x2000 ) ? 0 : 1 );
membank("bank1")->set_base(m_bank_base[1] );
/* and restore old opbase handler */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(m_FE_old_opbase_handler);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(m_FE_old_opbase_handler);
}
else
{
@@ -1142,7 +1142,7 @@ DIRECT_UPDATE_MEMBER(a2600_state::modeFE_opbase_handler)
static void modeFE_switch(running_machine &machine,UINT16 offset, UINT8 data)
{
a2600_state *state = machine.driver_data<a2600_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* Retrieve last byte read by the cpu (for this mapping scheme this
should be the last byte that was on the data bus
*/
@@ -1290,7 +1290,7 @@ static void install_banks(running_machine &machine, int count, unsigned init)
"bank4",
};
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(
0x1000 + (i + 0) * 0x1000 / count - 0,
0x1000 + (i + 1) * 0x1000 / count - 1, handler[i]);
@@ -1732,7 +1732,7 @@ static void set_controller( running_machine &machine, const char *controller, un
void a2600_state::machine_reset()
{
- address_space& space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int chip = 0xFF;
static const unsigned char snowwhite[] = { 0x10, 0xd0, 0xff, 0xff }; // Snow White Proto
diff --git a/src/mess/drivers/a310.c b/src/mess/drivers/a310.c
index 519beb4cb8c..355e398d990 100644
--- a/src/mess/drivers/a310.c
+++ b/src/mess/drivers/a310.c
@@ -113,7 +113,7 @@ DRIVER_INIT_MEMBER(a310_state,a310)
{
UINT32 ram_size = machine().device<ram_device>(RAM_TAG)->size();
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler( 0x02000000, 0x02000000+(ram_size-1), read32_delegate(FUNC(a310_state::a310_psy_wram_r), this), write32_delegate(FUNC(a310_state::a310_psy_wram_w), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler( 0x02000000, 0x02000000+(ram_size-1), read32_delegate(FUNC(a310_state::a310_psy_wram_r), this), write32_delegate(FUNC(a310_state::a310_psy_wram_w), this));
archimedes_driver_init(machine());
}
diff --git a/src/mess/drivers/a5105.c b/src/mess/drivers/a5105.c
index a3436071fd4..6656a2457df 100644
--- a/src/mess/drivers/a5105.c
+++ b/src/mess/drivers/a5105.c
@@ -219,7 +219,7 @@ READ8_MEMBER( a5105_state::a5105_memsel_r )
WRITE8_MEMBER( a5105_state::a5105_memsel_w )
{
- address_space *prog = m_maincpu->space( AS_PROGRAM );
+ address_space &prog = m_maincpu->space( AS_PROGRAM );
if (m_memsel[0] != ((data & 0x03) >> 0))
{
@@ -229,15 +229,15 @@ WRITE8_MEMBER( a5105_state::a5105_memsel_w )
{
case 0:
membank("bank1")->set_base(m_rom_base);
- prog->install_read_bank(0x0000, 0x3fff, "bank1");
- prog->unmap_write(0x0000, 0x3fff);
+ prog.install_read_bank(0x0000, 0x3fff, "bank1");
+ prog.unmap_write(0x0000, 0x3fff);
break;
case 2:
membank("bank1")->set_base(m_ram_base);
- prog->install_readwrite_bank(0x0000, 0x3fff, "bank1");
+ prog.install_readwrite_bank(0x0000, 0x3fff, "bank1");
break;
default:
- prog->unmap_readwrite(0x0000, 0x3fff);
+ prog.unmap_readwrite(0x0000, 0x3fff);
break;
}
}
@@ -250,20 +250,20 @@ WRITE8_MEMBER( a5105_state::a5105_memsel_w )
{
case 0:
membank("bank2")->set_base(m_rom_base + 0x4000);
- prog->install_read_bank(0x4000, 0x7fff, "bank2");
- prog->unmap_write(0x4000, 0x4000);
+ prog.install_read_bank(0x4000, 0x7fff, "bank2");
+ prog.unmap_write(0x4000, 0x4000);
break;
case 1:
membank("bank2")->set_base(machine().root_device().memregion("k5651")->base());
- prog->install_read_bank(0x4000, 0x7fff, "bank2");
- prog->unmap_write(0x4000, 0x4000);
+ prog.install_read_bank(0x4000, 0x7fff, "bank2");
+ prog.unmap_write(0x4000, 0x4000);
break;
case 2:
membank("bank2")->set_base(m_ram_base + 0x4000);
- prog->install_readwrite_bank(0x4000, 0x7fff, "bank2");
+ prog.install_readwrite_bank(0x4000, 0x7fff, "bank2");
break;
default:
- prog->unmap_readwrite(0x4000, 0x7fff);
+ prog.unmap_readwrite(0x4000, 0x7fff);
break;
}
}
@@ -276,15 +276,15 @@ WRITE8_MEMBER( a5105_state::a5105_memsel_w )
{
case 0:
membank("bank3")->set_base(m_rom_base + 0x8000);
- prog->install_read_bank(0x8000, 0xbfff, "bank3");
- prog->unmap_write(0x8000, 0xbfff);
+ prog.install_read_bank(0x8000, 0xbfff, "bank3");
+ prog.unmap_write(0x8000, 0xbfff);
break;
case 2:
membank("bank3")->set_base(m_ram_base + 0x8000);
- prog->install_readwrite_bank(0x8000, 0xbfff, "bank3");
+ prog.install_readwrite_bank(0x8000, 0xbfff, "bank3");
break;
default:
- prog->unmap_readwrite(0x8000, 0xbfff);
+ prog.unmap_readwrite(0x8000, 0xbfff);
break;
}
}
@@ -297,10 +297,10 @@ WRITE8_MEMBER( a5105_state::a5105_memsel_w )
{
case 2:
membank("bank4")->set_base(m_ram_base + 0xc000);
- prog->install_readwrite_bank(0xc000, 0xffff, "bank4");
+ prog.install_readwrite_bank(0xc000, 0xffff, "bank4");
break;
default:
- prog->unmap_readwrite(0xc000, 0xffff);
+ prog.unmap_readwrite(0xc000, 0xffff);
break;
}
}
@@ -454,7 +454,7 @@ INPUT_PORTS_END
void a5105_state::machine_reset()
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
a5105_ab_w(space, 0, 9); // turn motor off
beep_set_frequency(m_beep, 500);
diff --git a/src/mess/drivers/a7000.c b/src/mess/drivers/a7000.c
index 0ea2f6954b3..f16dfb31952 100644
--- a/src/mess/drivers/a7000.c
+++ b/src/mess/drivers/a7000.c
@@ -602,7 +602,7 @@ static TIMER_CALLBACK( flyback_timer_callback )
void a7000_state::viddma_transfer_start()
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
UINT32 src = m_viddma_addr_start;
UINT32 dst = 0;
UINT32 size = m_viddma_addr_end;
@@ -612,7 +612,7 @@ void a7000_state::viddma_transfer_start()
/* TODO: this should actually be a qword transfer */
for(dma_index = 0;dma_index < size;dma_index++)
{
- vram[dst] = mem->read_byte(src);
+ vram[dst] = mem.read_byte(src);
src++;
dst++;
diff --git a/src/mess/drivers/abc1600.c b/src/mess/drivers/abc1600.c
index bb87142fc62..21a85ff3a1d 100644
--- a/src/mess/drivers/abc1600.c
+++ b/src/mess/drivers/abc1600.c
@@ -182,7 +182,7 @@ UINT8 abc1600_state::read_ram(offs_t offset)
else if (offset < 0x180000)
{
// video RAM
- address_space &program = *m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
data = video_ram_r(program, offset);
}
else
@@ -209,7 +209,7 @@ void abc1600_state::write_ram(offs_t offset, UINT8 data)
else if (offset < 0x180000)
{
// video RAM
- address_space &program = *m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
video_ram_w(program, offset, data);
}
else
@@ -242,7 +242,7 @@ UINT8 abc1600_state::read_io(offs_t offset)
UINT8 abc1600_state::read_internal_io(offs_t offset)
{
- address_space &program = *m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 data = 0;
if (X11)
@@ -467,7 +467,7 @@ void abc1600_state::write_io(offs_t offset, UINT8 data)
void abc1600_state::write_internal_io(offs_t offset, UINT8 data)
{
- address_space &program = *m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
if (X11)
{
@@ -770,7 +770,7 @@ void abc1600_state::write_user_memory(offs_t offset, UINT8 data)
UINT8 abc1600_state::read_supervisor_memory(offs_t offset)
{
- address_space &program = *m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 data = 0;
if (!A2 && !A1)
@@ -799,7 +799,7 @@ UINT8 abc1600_state::read_supervisor_memory(offs_t offset)
void abc1600_state::write_supervisor_memory(offs_t offset, UINT8 data)
{
- address_space &program = *m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
if (!A2 && !A1)
{
@@ -1879,7 +1879,7 @@ void abc1600_state::machine_start()
void abc1600_state::machine_reset()
{
- address_space &program = *m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
// clear special control register
for (int i = 0; i < 8; i++)
diff --git a/src/mess/drivers/abc80x.c b/src/mess/drivers/abc80x.c
index e822539ab12..040797e5ad4 100644
--- a/src/mess/drivers/abc80x.c
+++ b/src/mess/drivers/abc80x.c
@@ -192,17 +192,17 @@ READ8_MEMBER( abc802_state::pling_r )
void abc800_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
if (m_fetch_charram)
{
// HR video RAM selected
- program->install_ram(0x0000, 0x3fff, m_video_ram);
+ program.install_ram(0x0000, 0x3fff, m_video_ram);
}
else
{
// BASIC ROM selected
- program->install_rom(0x0000, 0x3fff, memregion(Z80_TAG)->base());
+ program.install_rom(0x0000, 0x3fff, memregion(Z80_TAG)->base());
}
}
@@ -213,18 +213,18 @@ void abc800_state::bankswitch()
void abc802_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
if (m_lrs)
{
// ROM and video RAM selected
- program->install_rom(0x0000, 0x77ff, memregion(Z80_TAG)->base());
- program->install_ram(0x7800, 0x7fff, m_char_ram);
+ program.install_rom(0x0000, 0x77ff, memregion(Z80_TAG)->base());
+ program.install_ram(0x7800, 0x7fff, m_char_ram);
}
else
{
// low RAM selected
- program->install_ram(0x0000, 0x7fff, m_ram->pointer());
+ program.install_ram(0x0000, 0x7fff, m_ram->pointer());
}
}
@@ -235,7 +235,7 @@ void abc802_state::bankswitch()
void abc806_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT32 videoram_mask = m_ram->size() - (32 * 1024) - 1;
int bank;
char bank_name[10];
@@ -256,7 +256,7 @@ void abc806_state::bankswitch()
sprintf(bank_name,"bank%d",bank);
//logerror("%04x-%04x: Video RAM %04x (32K)\n", start_addr, end_addr, videoram_offset);
- program->install_readwrite_bank(start_addr, end_addr, bank_name);
+ program.install_readwrite_bank(start_addr, end_addr, bank_name);
membank(bank_name)->configure_entry(1, m_video_ram + videoram_offset);
membank(bank_name)->set_entry(1);
}
@@ -270,7 +270,7 @@ void abc806_state::bankswitch()
sprintf(bank_name,"bank%d",bank);
//logerror("%04x-%04x: Work RAM (32K)\n", start_addr, end_addr);
- program->install_readwrite_bank(start_addr, end_addr, bank_name);
+ program.install_readwrite_bank(start_addr, end_addr, bank_name);
membank(bank_name)->set_entry(0);
}
}
@@ -290,7 +290,7 @@ void abc806_state::bankswitch()
// map to video RAM
//logerror("%04x-%04x: Video RAM %04x (4K)\n", start_addr, end_addr, videoram_offset);
- program->install_readwrite_bank(start_addr, end_addr, bank_name);
+ program.install_readwrite_bank(start_addr, end_addr, bank_name);
membank(bank_name)->configure_entry(1, m_video_ram + videoram_offset);
membank(bank_name)->set_entry(1);
}
@@ -304,8 +304,8 @@ void abc806_state::bankswitch()
// ROM
//logerror("%04x-%04x: ROM (4K)\n", start_addr, end_addr);
- program->install_read_bank(start_addr, end_addr, bank_name);
- program->unmap_write(start_addr, end_addr);
+ program.install_read_bank(start_addr, end_addr, bank_name);
+ program.unmap_write(start_addr, end_addr);
membank(bank_name)->set_entry(0);
break;
@@ -313,9 +313,9 @@ void abc806_state::bankswitch()
// ROM/char RAM
//logerror("%04x-%04x: ROM (4K)\n", start_addr, end_addr);
- program->install_read_bank(0x7000, 0x77ff, bank_name);
- program->unmap_write(0x7000, 0x77ff);
- program->install_readwrite_handler(0x7800, 0x7fff, 0, 0, read8_delegate(FUNC(abc806_state::charram_r),this), write8_delegate(FUNC(abc806_state::charram_w),this));
+ program.install_read_bank(0x7000, 0x77ff, bank_name);
+ program.unmap_write(0x7000, 0x77ff);
+ program.install_readwrite_handler(0x7800, 0x7fff, 0, 0, read8_delegate(FUNC(abc806_state::charram_r),this), write8_delegate(FUNC(abc806_state::charram_w),this));
membank(bank_name)->set_entry(0);
break;
@@ -323,7 +323,7 @@ void abc806_state::bankswitch()
// work RAM
//logerror("%04x-%04x: Work RAM (4K)\n", start_addr, end_addr);
- program->install_readwrite_bank(start_addr, end_addr, bank_name);
+ program.install_readwrite_bank(start_addr, end_addr, bank_name);
membank(bank_name)->set_entry(0);
break;
}
@@ -349,12 +349,12 @@ void abc806_state::bankswitch()
if (start_addr == 0x7000)
{
- program->install_readwrite_bank(0x7000, 0x77ff, bank_name);
- program->install_readwrite_handler(0x7800, 0x7fff, 0, 0, read8_delegate(FUNC(abc806_state::charram_r), this), write8_delegate(FUNC(abc806_state::charram_w), this));
+ program.install_readwrite_bank(0x7000, 0x77ff, bank_name);
+ program.install_readwrite_handler(0x7800, 0x7fff, 0, 0, read8_delegate(FUNC(abc806_state::charram_r), this), write8_delegate(FUNC(abc806_state::charram_w), this));
}
else
{
- program->install_readwrite_bank(start_addr, end_addr, bank_name);
+ program.install_readwrite_bank(start_addr, end_addr, bank_name);
}
membank(bank_name)->configure_entry(1, m_video_ram + videoram_offset);
@@ -1498,7 +1498,7 @@ DIRECT_UPDATE_MEMBER( abc800c_state::direct_update_handler )
DRIVER_INIT_MEMBER(abc800c_state,driver_init)
{
- m_maincpu->space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(abc800c_state::direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(abc800c_state::direct_update_handler), this));
}
@@ -1532,7 +1532,7 @@ DIRECT_UPDATE_MEMBER( abc800m_state::direct_update_handler )
DRIVER_INIT_MEMBER(abc800m_state,driver_init)
{
- m_maincpu->space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(abc800m_state::direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(abc800m_state::direct_update_handler), this));
}
@@ -1556,7 +1556,7 @@ DIRECT_UPDATE_MEMBER( abc802_state::direct_update_handler )
DRIVER_INIT_MEMBER(abc802_state,driver_init)
{
- m_maincpu->space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(abc802_state::direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(abc802_state::direct_update_handler), this));
}
@@ -1590,7 +1590,7 @@ DIRECT_UPDATE_MEMBER( abc806_state::direct_update_handler )
DRIVER_INIT_MEMBER(abc806_state,driver_init)
{
- m_maincpu->space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(abc806_state::direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(abc806_state::direct_update_handler), this));
}
diff --git a/src/mess/drivers/ace.c b/src/mess/drivers/ace.c
index 13a8c67d940..f59570711a1 100644
--- a/src/mess/drivers/ace.c
+++ b/src/mess/drivers/ace.c
@@ -590,21 +590,21 @@ static Z80PIO_INTERFACE( pio_intf )
void ace_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* configure RAM */
switch (m_ram->size())
{
case 1*1024:
- program->unmap_readwrite(0x4000, 0xffff);
+ program.unmap_readwrite(0x4000, 0xffff);
break;
case 16*1024:
- program->unmap_readwrite(0x8000, 0xffff);
+ program.unmap_readwrite(0x8000, 0xffff);
break;
case 32*1024:
- program->unmap_readwrite(0xc000, 0xffff);
+ program.unmap_readwrite(0xc000, 0xffff);
break;
}
}
diff --git a/src/mess/drivers/adam.c b/src/mess/drivers/adam.c
index e09d02b883f..9ef8d2d3b47 100644
--- a/src/mess/drivers/adam.c
+++ b/src/mess/drivers/adam.c
@@ -245,7 +245,7 @@ enum
void adam_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = m_ram->pointer();
switch (m_mioc & 0x03)
@@ -253,58 +253,58 @@ void adam_state::bankswitch()
case LO_SMARTWRITER:
if (BIT(m_adamnet, 1))
{
- program->unmap_readwrite(0x0000, 0x5fff);
- program->install_rom(0x6000, 0x7fff, memregion("wp")->base() + 0x8000);
+ program.unmap_readwrite(0x0000, 0x5fff);
+ program.install_rom(0x6000, 0x7fff, memregion("wp")->base() + 0x8000);
}
else
{
- program->install_rom(0x0000, 0x7fff, memregion("wp")->base());
+ program.install_rom(0x0000, 0x7fff, memregion("wp")->base());
}
break;
case LO_INTERNAL_RAM:
- program->install_ram(0x0000, 0x7fff, ram);
+ program.install_ram(0x0000, 0x7fff, ram);
break;
case LO_RAM_EXPANSION:
if (m_ram->size() > 64 * 1024)
- program->install_ram(0x0000, 0x7fff, ram + 0x10000);
+ program.install_ram(0x0000, 0x7fff, ram + 0x10000);
else
- program->unmap_readwrite(0x0000, 0x7fff);
+ program.unmap_readwrite(0x0000, 0x7fff);
break;
case LO_OS7_ROM_INTERNAL_RAM:
- program->install_rom(0x0000, 0x1fff, memregion("os7")->base());
- program->install_ram(0x2000, 0x7fff, ram + 0x2000);
+ program.install_rom(0x0000, 0x1fff, memregion("os7")->base());
+ program.install_ram(0x2000, 0x7fff, ram + 0x2000);
break;
}
switch ((m_mioc >> 2) & 0x03)
{
case HI_INTERNAL_RAM:
- program->install_ram(0x8000, 0xffff, ram + 0x8000);
+ program.install_ram(0x8000, 0xffff, ram + 0x8000);
break;
case HI_ROM_EXPANSION:
- program->install_rom(0x8000, 0xffff, memregion("xrom")->base());
+ program.install_rom(0x8000, 0xffff, memregion("xrom")->base());
break;
case HI_RAM_EXPANSION:
if (m_game)
{
- program->install_rom(0x8000, 0xffff, memregion("cart")->base());
+ program.install_rom(0x8000, 0xffff, memregion("cart")->base());
}
else
{
if (m_ram->size() > 64 * 1024)
- program->install_ram(0x8000, 0xffff, ram + 0x18000);
+ program.install_ram(0x8000, 0xffff, ram + 0x18000);
else
- program->unmap_readwrite(0x8000, 0xffff);
+ program.unmap_readwrite(0x8000, 0xffff);
}
break;
case HI_CARTRIDGE_ROM:
- program->install_rom(0x8000, 0xffff, memregion("cart")->base());
+ program.install_rom(0x8000, 0xffff, memregion("cart")->base());
break;
}
}
diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c
index 2fe232e39ed..147ca668f77 100644
--- a/src/mess/drivers/amiga.c
+++ b/src/mess/drivers/amiga.c
@@ -550,7 +550,7 @@ static WRITE8_DEVICE_HANDLER( amiga_cia_0_portA_w )
}
/* overlay disabled, map RAM on 0x000000 */
- device->machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x000000, state->m_chip_ram.bytes() - 1, 0, mirror_mask, "bank1");
+ device->machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x000000, state->m_chip_ram.bytes() - 1, 0, mirror_mask, "bank1");
/* if there is a cart region, check for cart overlay */
if (device->machine().root_device().memregion("user2")->base() != NULL)
@@ -558,7 +558,7 @@ static WRITE8_DEVICE_HANDLER( amiga_cia_0_portA_w )
}
else
/* overlay enabled, map Amiga system ROM on 0x000000 */
- device->machine().device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x000000, state->m_chip_ram.bytes() - 1);
+ device->machine().device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x000000, state->m_chip_ram.bytes() - 1);
set_led_status( device->machine(), 0, ( data & 2 ) ? 0 : 1 ); /* bit 2 = Power Led on Amiga */
output_set_value("power_led", ( data & 2 ) ? 0 : 1);
@@ -597,12 +597,12 @@ static void amiga_reset(running_machine &machine)
if (machine.root_device().ioport("hardware")->read() & 0x08)
{
/* Install RTC */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0xdc0000, 0xdc003f, FUNC(amiga_clock_r), FUNC(amiga_clock_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0xdc0000, 0xdc003f, FUNC(amiga_clock_r), FUNC(amiga_clock_w));
}
else
{
/* No RTC support */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_readwrite(0xdc0000, 0xdc003f);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_readwrite(0xdc0000, 0xdc003f);
}
}
diff --git a/src/mess/drivers/apexc.c b/src/mess/drivers/apexc.c
index 654f689853d..27e94542ed3 100644
--- a/src/mess/drivers/apexc.c
+++ b/src/mess/drivers/apexc.c
@@ -398,7 +398,7 @@ INPUT_PORTS_END
*/
INTERRUPT_GEN_MEMBER(apexc_state::apexc_interrupt)
{
- address_space& space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT32 edit_keys;
int control_keys;
diff --git a/src/mess/drivers/apollo.c b/src/mess/drivers/apollo.c
index fcd8887207a..97f6b52526c 100644
--- a/src/mess/drivers/apollo.c
+++ b/src/mess/drivers/apollo.c
@@ -1192,7 +1192,7 @@ static GENERIC_TERMINAL_INTERFACE( apollo_terminal_config ) {
void apollo_terminal_write(UINT8 data) {
if (dsp_terminal != NULL) {
// output data to the terminal emulator
- dynamic_cast<generic_terminal_device *>(dsp_terminal)->write(*dsp_terminal->machine().memory().first_space(), 0, data);
+ dynamic_cast<generic_terminal_device *>(dsp_terminal)->write(dsp_terminal->machine().driver_data()->generic_space(), 0, data);
}
}
diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c
index 04009cec4c7..bebf64836e6 100644
--- a/src/mess/drivers/apricot.c
+++ b/src/mess/drivers/apricot.c
@@ -257,13 +257,13 @@ static const mc6845_interface apricot_mc6845_intf =
DRIVER_INIT_MEMBER(apricot_state,apricot)
{
- address_space *prg = m_maincpu->space(AS_PROGRAM);
+ address_space &prg = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = m_ram->pointer();
UINT32 ram_size = m_ram->size();
- prg->unmap_readwrite(0x40000, 0xeffff);
- prg->install_ram(0x00000, ram_size - 1, ram);
+ prg.unmap_readwrite(0x40000, 0xeffff);
+ prg.install_ram(0x00000, ram_size - 1, ram);
m_maincpu->set_irq_acknowledge_callback(apricot_irq_ack);
diff --git a/src/mess/drivers/apricotf.c b/src/mess/drivers/apricotf.c
index c2ecc565b79..8a0f11d0d3a 100644
--- a/src/mess/drivers/apricotf.c
+++ b/src/mess/drivers/apricotf.c
@@ -32,7 +32,7 @@
UINT32 f1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
int lines = m_200_256 ? 200 : 256;
for (int y = 0; y < lines; y++)
@@ -41,7 +41,7 @@ UINT32 f1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, cons
for (int sx = 0; sx < 80; sx++)
{
- UINT16 data = program->read_word(addr);
+ UINT16 data = program.read_word(addr);
if (m_40_80)
{
diff --git a/src/mess/drivers/aquarius.c b/src/mess/drivers/aquarius.c
index cf9639dfaf8..9f5a68fab4d 100644
--- a/src/mess/drivers/aquarius.c
+++ b/src/mess/drivers/aquarius.c
@@ -216,7 +216,7 @@ DRIVER_INIT_MEMBER(aquarius_state,aquarius)
/* install expansion memory if available */
if (machine().device<ram_device>(RAM_TAG)->size() > 0x1000)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_readwrite_bank(0x4000, 0x4000 + machine().device<ram_device>(RAM_TAG)->size() - 0x1000 - 1, "bank1");
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
diff --git a/src/mess/drivers/astrocde.c b/src/mess/drivers/astrocde.c
index a1c2175b529..92e6a5942de 100644
--- a/src/mess/drivers/astrocde.c
+++ b/src/mess/drivers/astrocde.c
@@ -100,8 +100,13 @@ ADDRESS_MAP_END
INPUT_CHANGED_MEMBER(astrocde_mess_state::set_write_protect) // run when RAM expansion write protect switch is changed
{
int ram_expansion_installed = 0, write_protect_on = 0, expansion_ram_start = 0, expansion_ram_end = 0, shadow_ram_end = 0;
+<<<<<<< .mine
+ address_space &space = field.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ UINT8 *expram = field.machine().device<ram_device>("ram_tag")->pointer();
+=======
address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *expram = machine().device<ram_device>("ram_tag")->pointer();
+>>>>>>> .r18023
get_ram_expansion_settings(ram_expansion_installed, write_protect_on, expansion_ram_start, expansion_ram_end, shadow_ram_end); // passing by reference
@@ -320,8 +325,13 @@ DRIVER_INIT_MEMBER(astrocde_state,astrocde)
MACHINE_RESET_MEMBER(astrocde_mess_state, astrocde)
{
int ram_expansion_installed = 0, write_protect_on = 0, expansion_ram_start = 0, expansion_ram_end = 0, shadow_ram_end = 0;
+<<<<<<< .mine
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
+ UINT8 *expram = machine.device<ram_device>("ram_tag")->pointer();
+=======
address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *expram = machine().device<ram_device>("ram_tag")->pointer();
+>>>>>>> .r18023
space.unmap_readwrite(0x5000, 0xffff); // unmap any previously installed expansion RAM
get_ram_expansion_settings(ram_expansion_installed, write_protect_on, expansion_ram_start, expansion_ram_end, shadow_ram_end); // passing by reference
diff --git a/src/mess/drivers/atari400.c b/src/mess/drivers/atari400.c
index 58fc2b7ee89..47d1d619d62 100644
--- a/src/mess/drivers/atari400.c
+++ b/src/mess/drivers/atari400.c
@@ -759,18 +759,18 @@ static void a800xl_mmu(running_machine &machine, UINT8 new_mmu)
logerror("%s MMU BIOS ROM\n", machine.system().name);
base3 = base + 0x14000; /* 8K lo BIOS */
base4 = base + 0x15800; /* 4K FP ROM + 8K hi BIOS */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xc000, 0xcfff, "bank3");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xc000, 0xcfff);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xd800, 0xffff, "bank4");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xd800, 0xffff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xc000, 0xcfff, "bank3");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xc000, 0xcfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xd800, 0xffff, "bank4");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xd800, 0xffff);
}
else
{
logerror("%s MMU BIOS RAM\n", machine.system().name);
base3 = base + 0x0c000; /* 8K RAM */
base4 = base + 0x0d800; /* 4K RAM + 8K RAM */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0xc000, 0xcfff, "bank3");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0xd800, 0xffff, "bank4");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0xc000, 0xcfff, "bank3");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0xd800, 0xffff, "bank4");
}
machine.root_device().membank("bank3")->set_base(base3);
machine.root_device().membank("bank4")->set_base(base4);
@@ -779,14 +779,14 @@ static void a800xl_mmu(running_machine &machine, UINT8 new_mmu)
if( new_mmu & 0x02 )
{
logerror("%s MMU BASIC RAM\n", machine.system().name);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0xa000, 0xbfff, "bank1");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0xa000, 0xbfff, "bank1");
base1 = base + 0x0a000; /* 8K RAM */
}
else
{
logerror("%s MMU BASIC ROM\n", machine.system().name);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xa000, 0xbfff, "bank1");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xa000, 0xbfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xa000, 0xbfff, "bank1");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xa000, 0xbfff);
base1 = base + 0x10000; /* 8K BASIC */
}
@@ -796,14 +796,14 @@ static void a800xl_mmu(running_machine &machine, UINT8 new_mmu)
if( new_mmu & 0x80 )
{
logerror("%s MMU SELFTEST RAM\n", machine.system().name);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0x5000, 0x57ff, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0x5000, 0x57ff, "bank2");
base2 = base + 0x05000; /* 0x0800 bytes */
}
else
{
logerror("%s MMU SELFTEST ROM\n", machine.system().name);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5000, 0x57ff, "bank2");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x5000, 0x57ff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5000, 0x57ff, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x5000, 0x57ff);
base2 = base + 0x15000; /* 0x0800 bytes */
}
machine.root_device().membank("bank2")->set_base(base2);
@@ -821,18 +821,18 @@ static void a1200xl_mmu(running_machine &machine, UINT8 new_mmu)
logerror("%s MMU BIOS ROM\n", machine.system().name);
base3 = base + 0x14000; /* 8K lo BIOS */
base4 = base + 0x15800; /* 4K FP ROM + 8K hi BIOS */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xc000, 0xcfff, "bank3");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xc000, 0xcfff);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xd800, 0xffff, "bank4");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xd800, 0xffff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xc000, 0xcfff, "bank3");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xc000, 0xcfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xd800, 0xffff, "bank4");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xd800, 0xffff);
}
else
{
logerror("%s MMU BIOS RAM\n", machine.system().name);
base3 = base + 0x0c000; /* 8K RAM */
base4 = base + 0x0d800; /* 4K RAM + 8K RAM */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0xc000, 0xcfff, "bank3");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0xd800, 0xffff, "bank4");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0xc000, 0xcfff, "bank3");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0xd800, 0xffff, "bank4");
}
machine.root_device().membank("bank3")->set_base(base3);
machine.root_device().membank("bank4")->set_base(base4);
@@ -842,14 +842,14 @@ static void a1200xl_mmu(running_machine &machine, UINT8 new_mmu)
{
logerror("%s MMU SELFTEST RAM\n", machine.system().name);
base2 = base + 0x05000; /* 0x0800 bytes */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0x5000, 0x57ff, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0x5000, 0x57ff, "bank2");
}
else
{
logerror("%s MMU SELFTEST ROM\n", machine.system().name);
base2 = base + 0x15000; /* 0x0800 bytes */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5000, 0x57ff, "bank2");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x5000, 0x57ff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5000, 0x57ff, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x5000, 0x57ff);
}
machine.root_device().membank("bank2")->set_base(base2);
}
@@ -865,18 +865,18 @@ static void xegs_mmu(running_machine &machine, UINT8 new_mmu)
logerror("%s MMU BIOS ROM\n", machine.system().name);
base3 = base + 0x14000; /* 8K lo BIOS */
base4 = base + 0x15800; /* 4K FP ROM + 8K hi BIOS */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xc000, 0xcfff, "bank3");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xc000, 0xcfff);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xd800, 0xffff, "bank4");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xd800, 0xffff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xc000, 0xcfff, "bank3");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xc000, 0xcfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xd800, 0xffff, "bank4");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xd800, 0xffff);
}
else
{
logerror("%s MMU BIOS RAM\n", machine.system().name);
base3 = base + 0x0c000; /* 8K RAM */
base4 = base + 0x0d800; /* 4K RAM + 8K RAM */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0xc000, 0xcfff, "bank3");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0xd800, 0xffff, "bank4");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0xc000, 0xcfff, "bank3");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0xd800, 0xffff, "bank4");
}
machine.root_device().membank("bank3")->set_base(base3);
machine.root_device().membank("bank4")->set_base(base4);
@@ -886,14 +886,14 @@ static void xegs_mmu(running_machine &machine, UINT8 new_mmu)
if( new_mmu & 0x80 )
{
logerror("%s MMU SELFTEST RAM\n", machine.system().name);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0x5000, 0x57ff, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0x5000, 0x57ff, "bank2");
base2 = base + 0x05000; /* 0x0800 bytes */
}
else
{
logerror("%s MMU SELFTEST ROM\n", machine.system().name);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x5000, 0x57ff, "bank2");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x5000, 0x57ff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x5000, 0x57ff, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x5000, 0x57ff);
base2 = base + 0x15000; /* 0x0800 bytes */
}
machine.root_device().membank("bank2")->set_base(base2);
diff --git a/src/mess/drivers/atarist.c b/src/mess/drivers/atarist.c
index 1b2a3adb9bf..2648baf52b5 100644
--- a/src/mess/drivers/atarist.c
+++ b/src/mess/drivers/atarist.c
@@ -67,14 +67,14 @@ void st_state::flush_dma_fifo()
if (m_fdc_fifo_empty[m_fdc_fifo_sel]) return;
if (m_fdc_dmabytes) {
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
for (int i = 0; i < 8; i++) {
UINT16 data = m_fdc_fifo[m_fdc_fifo_sel][i];
if (LOG) logerror("Flushing DMA FIFO %u data %04x to address %06x\n", m_fdc_fifo_sel, data, m_dma_base);
if(m_dma_base >= 8)
- program->write_word(m_dma_base, data);
+ program.write_word(m_dma_base, data);
m_dma_base += 2;
}
m_fdc_dmabytes -= 16;
@@ -98,9 +98,9 @@ void st_state::flush_dma_fifo()
void st_state::fill_dma_fifo()
{
if (m_fdc_dmabytes) {
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
for (int i = 0; i < 8; i++) {
- UINT16 data = program->read_word(m_dma_base);
+ UINT16 data = program.read_word(m_dma_base);
if (LOG) logerror("Filling DMA FIFO %u with data %04x from memory address %06x\n", m_fdc_fifo_sel, data, m_dma_base);
@@ -2142,24 +2142,24 @@ static IRQ_CALLBACK( atarist_int_ack )
void st_state::configure_memory()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
switch (m_ram->size())
{
case 256 * 1024:
- program->unmap_readwrite(0x040000, 0x3fffff);
+ program.unmap_readwrite(0x040000, 0x3fffff);
break;
case 512 * 1024:
- program->unmap_readwrite(0x080000, 0x3fffff);
+ program.unmap_readwrite(0x080000, 0x3fffff);
break;
case 1024 * 1024:
- program->unmap_readwrite(0x100000, 0x3fffff);
+ program.unmap_readwrite(0x100000, 0x3fffff);
break;
case 2048 * 1024:
- program->unmap_readwrite(0x200000, 0x3fffff);
+ program.unmap_readwrite(0x200000, 0x3fffff);
break;
}
}
@@ -2292,12 +2292,12 @@ void megaste_state::machine_start()
void stbook_state::machine_start()
{
/* configure RAM banking */
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
switch (m_ram->size())
{
case 1024 * 1024:
- program->unmap_readwrite(0x100000, 0x3fffff);
+ program.unmap_readwrite(0x100000, 0x3fffff);
break;
}
diff --git a/src/mess/drivers/atm.c b/src/mess/drivers/atm.c
index 86144ec6a1f..ef3f27f9cd7 100644
--- a/src/mess/drivers/atm.c
+++ b/src/mess/drivers/atm.c
@@ -120,7 +120,7 @@ ADDRESS_MAP_END
MACHINE_RESET_MEMBER(atm_state,atm)
{
UINT8 *messram = machine().device<ram_device>(RAM_TAG)->pointer();
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
device_t *beta = machine().device(BETA_DISK_TAG);
space.install_read_bank(0x0000, 0x3fff, "bank1");
diff --git a/src/mess/drivers/atom.c b/src/mess/drivers/atom.c
index 722e2a46724..43887da9489 100644
--- a/src/mess/drivers/atom.c
+++ b/src/mess/drivers/atom.c
@@ -123,11 +123,11 @@ Hardware: PPIA 8255
void atom_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *eprom = memregion(EXTROM_TAG)->base() + (m_eprom << 12);
- program->install_rom(0xa000, 0xafff, eprom);
+ program.install_rom(0xa000, 0xafff, eprom);
}
/*-------------------------------------------------
@@ -648,7 +648,7 @@ void atom_state::machine_start()
generator. I don't know if this is hardware, or random data because the
ram chips are not cleared at start-up. So at this time, these numbers
are poked into the memory to simulate it. When I have more details I will fix it */
- UINT8 *m_baseram = (UINT8 *)m_maincpu->space(AS_PROGRAM)->get_write_ptr(0x0000);
+ UINT8 *m_baseram = (UINT8 *)m_maincpu->space(AS_PROGRAM).get_write_ptr(0x0000);
m_baseram[0x08] = machine().rand() & 0x0ff;
m_baseram[0x09] = machine().rand() & 0x0ff;
diff --git a/src/mess/drivers/avigo.c b/src/mess/drivers/avigo.c
index 5919a279c5f..14dd2e1f747 100644
--- a/src/mess/drivers/avigo.c
+++ b/src/mess/drivers/avigo.c
@@ -158,7 +158,7 @@ static RP5C01_INTERFACE( rtc_intf )
void avigo_state::refresh_memory(UINT8 bank, UINT8 chip_select)
{
- address_space& space = *m_maincpu->space(AS_PROGRAM);
+ address_space& space = m_maincpu->space(AS_PROGRAM);
int &active_flash = (bank == 1 ? m_flash_at_0x4000 : m_flash_at_0x8000);
char bank_tag[6];
@@ -246,8 +246,8 @@ void avigo_state::machine_reset()
/* if is a cold start initialize flash contents */
if (!m_warm_start)
{
- memcpy(m_flashes[0]->space()->get_read_ptr(0), memregion("bios")->base() + 0x000000, 0x100000);
- memcpy(m_flashes[1]->space()->get_read_ptr(0), memregion("bios")->base() + 0x100000, 0x100000);
+ memcpy(m_flashes[0]->space().get_read_ptr(0), memregion("bios")->base() + 0x000000, 0x100000);
+ memcpy(m_flashes[1]->space().get_read_ptr(0), memregion("bios")->base() + 0x100000, 0x100000);
}
m_irq = 0;
@@ -293,9 +293,9 @@ void avigo_state::machine_start()
save_item(NAME(m_warm_start));
// save all flash contents
- save_pointer(NAME((UINT8*)m_flashes[0]->space()->get_read_ptr(0)), 0x100000);
- save_pointer(NAME((UINT8*)m_flashes[1]->space()->get_read_ptr(0)), 0x100000);
- save_pointer(NAME((UINT8*)m_flashes[2]->space()->get_read_ptr(0)), 0x100000);
+ save_pointer(NAME((UINT8*)m_flashes[0]->space().get_read_ptr(0)), 0x100000);
+ save_pointer(NAME((UINT8*)m_flashes[1]->space().get_read_ptr(0)), 0x100000);
+ save_pointer(NAME((UINT8*)m_flashes[2]->space().get_read_ptr(0)), 0x100000);
// register postload callback
machine().save().register_postload(save_prepost_delegate(FUNC(avigo_state::postload), this));
@@ -830,7 +830,7 @@ static TIMER_DEVICE_CALLBACK( avigo_1hz_timer )
static QUICKLOAD_LOAD(avigo)
{
avigo_state *state = image.device().machine().driver_data<avigo_state>();
- address_space* flash1 = state->m_flashes[1]->space(0);
+ address_space& flash1 = state->m_flashes[1]->space(0);
const char *systemname = image.device().machine().system().name;
UINT32 first_app_page = (0x50000>>14);
int app_page;
@@ -846,7 +846,7 @@ static QUICKLOAD_LOAD(avigo)
for (int offset=0; offset<0x4000; offset++)
{
- if (flash1->read_byte((app_page<<14) + offset) != 0xff)
+ if (flash1.read_byte((app_page<<14) + offset) != 0xff)
{
empty_page = false;
break;
@@ -863,10 +863,10 @@ static QUICKLOAD_LOAD(avigo)
logerror("Application loaded at 0x%05x-0x%05x\n", app_page<<14, (app_page<<14) + (UINT32)image.length());
// copy app file into flash memory
- image.fread((UINT8*)state->m_flashes[1]->space()->get_read_ptr(app_page<<14), image.length());
+ image.fread((UINT8*)state->m_flashes[1]->space().get_read_ptr(app_page<<14), image.length());
// update the application ID
- flash1->write_byte((app_page<<14) + 0x1a5, 0x80 + (app_page - (first_app_page>>14)));
+ flash1.write_byte((app_page<<14) + 0x1a5, 0x80 + (app_page - (first_app_page>>14)));
// reset the CPU for allow at the Avigo OS to recognize the installed app
state->m_warm_start = 1;
diff --git a/src/mess/drivers/basic52.c b/src/mess/drivers/basic52.c
index 69afbce87fe..488c3f6dc17 100644
--- a/src/mess/drivers/basic52.c
+++ b/src/mess/drivers/basic52.c
@@ -80,7 +80,7 @@ INPUT_PORTS_END
static void to_term(device_t *device, int data )
{
basic52_state *state = device->machine().driver_data<basic52_state>();
- address_space &space = *device->memory().space(AS_PROGRAM);
+ address_space &space = device->memory().space(AS_PROGRAM);
state->m_terminal->write(space, 0, data);
}
diff --git a/src/mess/drivers/bebox.c b/src/mess/drivers/bebox.c
index b8e80d6e417..3edaf365ad6 100644
--- a/src/mess/drivers/bebox.c
+++ b/src/mess/drivers/bebox.c
@@ -101,7 +101,7 @@ ADDRESS_MAP_END
static UINT32 scsi53c810_fetch(running_machine &machine, UINT32 dsp)
{
UINT32 result;
- result = machine.device("ppc1")->memory().space(AS_PROGRAM)->read_dword(dsp & 0x7FFFFFFF);
+ result = machine.device("ppc1")->memory().space(AS_PROGRAM).read_dword(dsp & 0x7FFFFFFF);
return BYTE_REVERSE32(result);
}
diff --git a/src/mess/drivers/bigbord2.c b/src/mess/drivers/bigbord2.c
index bce19e521b8..455d69d6930 100644
--- a/src/mess/drivers/bigbord2.c
+++ b/src/mess/drivers/bigbord2.c
@@ -417,7 +417,7 @@ static TIMER_DEVICE_CALLBACK( ctc_tick )
WRITE_LINE_MEMBER( bigbord2_state::frame )
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
static UINT8 framecnt;
framecnt++;
diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c
index d55e5072aba..8a40aa2b409 100644
--- a/src/mess/drivers/bml3.c
+++ b/src/mess/drivers/bml3.c
@@ -637,16 +637,16 @@ void bml3_state::machine_start()
void bml3_state::machine_reset()
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
/* defaults */
- mem->install_rom(0xa000, 0xfeff,mem->machine().root_device().memregion("maincpu")->base() + 0xa000);
- mem->install_rom(0xfff0, 0xffff,mem->machine().root_device().memregion("maincpu")->base() + 0xfff0);
- mem->install_write_handler(0xa000, 0xbfff, 0, 0,write8_delegate(FUNC(bml3_state::bml3_a000_w), this),0);
- mem->install_write_handler(0xc000, 0xdfff, 0, 0,write8_delegate(FUNC(bml3_state::bml3_c000_w), this),0);
- mem->install_write_handler(0xe000, 0xefff, 0, 0,write8_delegate(FUNC(bml3_state::bml3_e000_w), this),0);
- mem->install_write_handler(0xf000, 0xfeff, 0, 0,write8_delegate(FUNC(bml3_state::bml3_f000_w), this),0);
- mem->install_write_handler(0xfff0, 0xffff, 0, 0,write8_delegate(FUNC(bml3_state::bml3_fff0_w), this),0);
+ mem.install_rom(0xa000, 0xfeff,mem.machine().root_device().memregion("maincpu")->base() + 0xa000);
+ mem.install_rom(0xfff0, 0xffff,mem.machine().root_device().memregion("maincpu")->base() + 0xfff0);
+ mem.install_write_handler(0xa000, 0xbfff, 0, 0,write8_delegate(FUNC(bml3_state::bml3_a000_w), this),0);
+ mem.install_write_handler(0xc000, 0xdfff, 0, 0,write8_delegate(FUNC(bml3_state::bml3_c000_w), this),0);
+ mem.install_write_handler(0xe000, 0xefff, 0, 0,write8_delegate(FUNC(bml3_state::bml3_e000_w), this),0);
+ mem.install_write_handler(0xf000, 0xfeff, 0, 0,write8_delegate(FUNC(bml3_state::bml3_f000_w), this),0);
+ mem.install_write_handler(0xfff0, 0xffff, 0, 0,write8_delegate(FUNC(bml3_state::bml3_fff0_w), this),0);
m_firq_mask = -1; // disable firq
}
@@ -701,7 +701,7 @@ const mc6843_interface bml3_6843_if = { NULL };
WRITE8_MEMBER(bml3_state::bml3_piaA_w)
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
/* ROM banking:
-0-- --0- 0xa000 - 0xbfff ROM R RAM W
-1-- --0- 0xa000 - 0xbfff RAM R/W
@@ -721,15 +721,15 @@ WRITE8_MEMBER(bml3_state::bml3_piaA_w)
{
if(data & 0x40)
{
- mem->install_readwrite_handler(0xa000, 0xbfff, 0, 0,
+ mem.install_readwrite_handler(0xa000, 0xbfff, 0, 0,
read8_delegate(FUNC(bml3_state::bml3_a000_r), this),
write8_delegate(FUNC(bml3_state::bml3_a000_w), this), 0);
}
else
{
- mem->install_rom(0xa000, 0xbfff,
- mem->machine().root_device().memregion("maincpu")->base() + 0xa000);
- mem->install_write_handler(0xa000, 0xbfff, 0, 0,
+ mem.install_rom(0xa000, 0xbfff,
+ mem.machine().root_device().memregion("maincpu")->base() + 0xa000);
+ mem.install_write_handler(0xa000, 0xbfff, 0, 0,
write8_delegate(FUNC(bml3_state::bml3_a000_w), this),
0);
}
@@ -739,15 +739,15 @@ WRITE8_MEMBER(bml3_state::bml3_piaA_w)
{
if(data & 0x40)
{
- mem->install_readwrite_handler(0xc000, 0xdfff, 0, 0,
+ mem.install_readwrite_handler(0xc000, 0xdfff, 0, 0,
read8_delegate(FUNC(bml3_state::bml3_c000_r), this),
write8_delegate(FUNC(bml3_state::bml3_c000_w), this), 0);
}
else
{
- mem->install_rom(0xc000, 0xdfff,
- mem->machine().root_device().memregion("maincpu")->base() + 0xc000);
- mem->install_write_handler(0xc000, 0xdfff, 0, 0,
+ mem.install_rom(0xc000, 0xdfff,
+ mem.machine().root_device().memregion("maincpu")->base() + 0xc000);
+ mem.install_write_handler(0xc000, 0xdfff, 0, 0,
write8_delegate(FUNC(bml3_state::bml3_c000_w), this),
0);
}
@@ -757,15 +757,15 @@ WRITE8_MEMBER(bml3_state::bml3_piaA_w)
{
if(data & 0x80)
{
- mem->install_readwrite_handler(0xe000, 0xefff, 0, 0,
+ mem.install_readwrite_handler(0xe000, 0xefff, 0, 0,
read8_delegate(FUNC(bml3_state::bml3_e000_r), this),
write8_delegate(FUNC(bml3_state::bml3_e000_w), this), 0);
}
else
{
- mem->install_rom(0xe000, 0xefff,
- mem->machine().root_device().memregion("maincpu")->base() + 0xe000);
- mem->install_write_handler(0xe000, 0xefff, 0, 0,
+ mem.install_rom(0xe000, 0xefff,
+ mem.machine().root_device().memregion("maincpu")->base() + 0xe000);
+ mem.install_write_handler(0xe000, 0xefff, 0, 0,
write8_delegate(FUNC(bml3_state::bml3_e000_w), this),
0);
}
@@ -773,30 +773,30 @@ WRITE8_MEMBER(bml3_state::bml3_piaA_w)
if(data & 1)
{
- mem->install_readwrite_handler(0xf000, 0xfeff, 0, 0,
+ mem.install_readwrite_handler(0xf000, 0xfeff, 0, 0,
read8_delegate(FUNC(bml3_state::bml3_f000_r), this),
write8_delegate(FUNC(bml3_state::bml3_f000_w), this), 0);
}
else
{
- mem->install_rom(0xf000, 0xfeff,
- mem->machine().root_device().memregion("maincpu")->base() + 0xf000);
- mem->install_write_handler(0xf000, 0xfeff, 0, 0,
+ mem.install_rom(0xf000, 0xfeff,
+ mem.machine().root_device().memregion("maincpu")->base() + 0xf000);
+ mem.install_write_handler(0xf000, 0xfeff, 0, 0,
write8_delegate(FUNC(bml3_state::bml3_f000_w), this),
0);
}
if(data & 2)
{
- mem->install_readwrite_handler(0xfff0, 0xffff, 0, 0,
+ mem.install_readwrite_handler(0xfff0, 0xffff, 0, 0,
read8_delegate(FUNC(bml3_state::bml3_fff0_r), this),
write8_delegate(FUNC(bml3_state::bml3_fff0_w), this), 0);
}
else
{
- mem->install_rom(0xfff0, 0xffff,
- mem->machine().root_device().memregion("maincpu")->base() + 0xfff0);
- mem->install_write_handler(0xfff0, 0xffff, 0, 0,
+ mem.install_rom(0xfff0, 0xffff,
+ mem.machine().root_device().memregion("maincpu")->base() + 0xfff0);
+ mem.install_write_handler(0xfff0, 0xffff, 0, 0,
write8_delegate(FUNC(bml3_state::bml3_fff0_w), this),
0);
}
diff --git a/src/mess/drivers/bw12.c b/src/mess/drivers/bw12.c
index 87cf6aaccb9..97c3af97a4d 100644
--- a/src/mess/drivers/bw12.c
+++ b/src/mess/drivers/bw12.c
@@ -51,28 +51,28 @@
void bw12_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
switch (m_bank)
{
case 0: /* ROM */
- program->install_read_bank(0x0000, 0x7fff, "bank1");
- program->unmap_write(0x0000, 0x7fff);
+ program.install_read_bank(0x0000, 0x7fff, "bank1");
+ program.unmap_write(0x0000, 0x7fff);
break;
case 1: /* BK0 */
- program->install_readwrite_bank(0x0000, 0x7fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x7fff, "bank1");
break;
case 2: /* BK1 */
case 3: /* BK2 */
if (m_ram->size() > 64*1024)
{
- program->install_readwrite_bank(0x0000, 0x7fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x7fff, "bank1");
}
else
{
- program->unmap_readwrite(0x0000, 0x7fff);
+ program.unmap_readwrite(0x0000, 0x7fff);
}
break;
}
diff --git a/src/mess/drivers/bw2.c b/src/mess/drivers/bw2.c
index c7b7006c130..5c7742dfbf5 100644
--- a/src/mess/drivers/bw2.c
+++ b/src/mess/drivers/bw2.c
@@ -51,7 +51,7 @@ void bw2_state::bankswitch(UINT8 data)
*/
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
int max_ram_bank = 0;
@@ -87,11 +87,11 @@ void bw2_state::bankswitch(UINT8 data)
switch (m_bank)
{
case BANK_RAM1:
- program->install_readwrite_bank(0x0000, 0x7fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x7fff, "bank1");
break;
case BANK_VRAM:
- program->install_readwrite_bank(0x0000, 0x3fff, 0, 0x4000, "bank1");
+ program.install_readwrite_bank(0x0000, 0x3fff, 0, 0x4000, "bank1");
break;
case BANK_RAM2:
@@ -101,17 +101,17 @@ void bw2_state::bankswitch(UINT8 data)
case BANK_RAM6:
if (m_bank > max_ram_bank)
{
- program->unmap_readwrite(0x0000, 0x7fff);
+ program.unmap_readwrite(0x0000, 0x7fff);
}
else
{
- program->install_readwrite_bank(0x0000, 0x7fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x7fff, "bank1");
}
break;
case BANK_ROM:
- program->install_read_bank(0x0000, 0x7fff, "bank1");
- program->unmap_write(0x0000, 0x7fff);
+ program.install_read_bank(0x0000, 0x7fff, "bank1");
+ program.unmap_write(0x0000, 0x7fff);
break;
}
@@ -133,7 +133,7 @@ void bw2_state::ramcard_bankswitch(UINT8 data)
*/
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
int max_ram_bank = BANK_RAM1;
@@ -164,11 +164,11 @@ void bw2_state::ramcard_bankswitch(UINT8 data)
{
case BANK_RAM1:
case BANK_RAMCARD_RAM:
- program->install_readwrite_bank(0x0000, 0x7fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x7fff, "bank1");
break;
case BANK_VRAM:
- program->install_readwrite_bank(0x0000, 0x3fff, 0, 0x4000, "bank1");
+ program.install_readwrite_bank(0x0000, 0x3fff, 0, 0x4000, "bank1");
break;
case BANK_RAM3:
@@ -176,22 +176,22 @@ void bw2_state::ramcard_bankswitch(UINT8 data)
case BANK_RAM6:
if (m_bank > max_ram_bank)
{
- program->unmap_readwrite(0x0000, 0x7fff);
+ program.unmap_readwrite(0x0000, 0x7fff);
}
else
{
- program->install_readwrite_bank(0x0000, 0x7fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x7fff, "bank1");
}
break;
case BANK_RAMCARD_ROM:
- program->install_read_bank(0x0000, 0x3fff, 0, 0x4000, "bank1");
- program->unmap_write(0x0000, 0x3fff, 0, 0x4000);
+ program.install_read_bank(0x0000, 0x3fff, 0, 0x4000, "bank1");
+ program.unmap_write(0x0000, 0x3fff, 0, 0x4000);
break;
case BANK_ROM:
- program->install_read_bank(0x0000, 0x7fff, "bank1");
- program->unmap_write(0x0000, 0x7fff);
+ program.install_read_bank(0x0000, 0x7fff, "bank1");
+ program.unmap_write(0x0000, 0x7fff);
break;
}
@@ -200,18 +200,18 @@ void bw2_state::ramcard_bankswitch(UINT8 data)
WRITE8_MEMBER( bw2_state::ramcard_bank_w )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 ramcard_bank = data & 0x0f;
UINT32 bank_offset = ramcard_bank * 0x8000;
if ((get_ramdisk_size() == 256) && (ramcard_bank > 7))
{
- program->unmap_readwrite(0x0000, 0x7fff);
+ program.unmap_readwrite(0x0000, 0x7fff);
}
else
{
- program->install_readwrite_bank(0x0000, 0x7fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x7fff, "bank1");
}
membank("bank1")->configure_entry(BANK_RAMCARD_RAM, m_ramcard_ram + bank_offset);
@@ -638,7 +638,7 @@ void bw2_state::machine_start()
void bw2_state::machine_reset()
{
- address_space *io = machine().device(Z80_TAG)->memory().space(AS_IO);
+ address_space &io = machine().device(Z80_TAG)->memory().space(AS_IO);
if (get_ramdisk_size() > 0)
{
@@ -649,7 +649,7 @@ void bw2_state::machine_reset()
membank("bank1")->configure_entry(BANK_RAMCARD_RAM, m_ramcard_ram);
membank("bank1")->configure_entry(BANK_RAM6, m_ram->pointer() + 0x18000);
- io->install_write_handler(0x30, 0x30, 0, 0x0f, write8_delegate(FUNC(bw2_state::ramcard_bank_w), this), 0);
+ io.install_write_handler(0x30, 0x30, 0, 0x0f, write8_delegate(FUNC(bw2_state::ramcard_bank_w), this), 0);
}
else
{
@@ -657,7 +657,7 @@ void bw2_state::machine_reset()
membank("bank1")->configure_entries(BANK_RAM2, 5, m_ram->pointer() + 0x8000, 0x8000);
- io->unmap_write(0x30, 0x30, 0, 0x0f);
+ io.unmap_write(0x30, 0x30, 0, 0x0f);
}
membank("bank1")->set_entry(BANK_ROM);
diff --git a/src/mess/drivers/c64.c b/src/mess/drivers/c64.c
index c53c7e5f4b5..8d7bb72fc17 100644
--- a/src/mess/drivers/c64.c
+++ b/src/mess/drivers/c64.c
@@ -848,12 +848,12 @@ static CBM_IEC_INTERFACE( iec_intf )
READ8_MEMBER( c64_state::exp_dma_r )
{
- return m_maincpu->space(AS_PROGRAM)->read_byte(offset);
+ return m_maincpu->space(AS_PROGRAM).read_byte(offset);
}
WRITE8_MEMBER( c64_state::exp_dma_w )
{
- m_maincpu->space(AS_PROGRAM)->write_byte(offset, data);
+ m_maincpu->space(AS_PROGRAM).write_byte(offset, data);
}
WRITE_LINE_MEMBER( c64_state::exp_irq_w )
diff --git a/src/mess/drivers/camplynx.c b/src/mess/drivers/camplynx.c
index 5116d73a3a8..9420240ad44 100644
--- a/src/mess/drivers/camplynx.c
+++ b/src/mess/drivers/camplynx.c
@@ -130,8 +130,8 @@ WRITE8_MEMBER( camplynx_state::lynx48k_bank_w )
WRITE8_MEMBER( camplynx_state::lynx128k_bank_w )
{
/* get address space */
- address_space *mem = m_maincpu->space(AS_PROGRAM);
- UINT8 *base = mem->machine().root_device().memregion("maincpu")->base();
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
+ UINT8 *base = mem.machine().root_device().memregion("maincpu")->base();
/* Set read banks */
UINT8 bank = data & 0x0f;
@@ -330,25 +330,25 @@ INPUT_PORTS_END
MACHINE_RESET_MEMBER(camplynx_state,lynx128k)
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
- mem->install_read_bank (0x0000, 0x1fff, "bank1");
- mem->install_read_bank (0x2000, 0x3fff, "bank2");
- mem->install_read_bank (0x4000, 0x5fff, "bank3");
- mem->install_read_bank (0x6000, 0x7fff, "bank4");
- mem->install_read_bank (0x8000, 0x9fff, "bank5");
- mem->install_read_bank (0xa000, 0xbfff, "bank6");
- mem->install_read_bank (0xc000, 0xdfff, "bank7");
- mem->install_read_bank (0xe000, 0xffff, "bank8");
- mem->install_write_bank (0x0000, 0x1fff, "bank11");
- mem->install_write_bank (0x2000, 0x3fff, "bank12");
- mem->install_write_bank (0x4000, 0x5fff, "bank13");
- mem->install_write_bank (0x6000, 0x7fff, "bank14");
- mem->install_write_bank (0x8000, 0x9fff, "bank15");
- mem->install_write_bank (0xa000, 0xbfff, "bank16");
- mem->install_write_bank (0xc000, 0xdfff, "bank17");
- mem->install_write_bank (0xe000, 0xffff, "bank18");
-
- lynx128k_bank_w(*mem, 0, 0);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
+ mem.install_read_bank (0x0000, 0x1fff, "bank1");
+ mem.install_read_bank (0x2000, 0x3fff, "bank2");
+ mem.install_read_bank (0x4000, 0x5fff, "bank3");
+ mem.install_read_bank (0x6000, 0x7fff, "bank4");
+ mem.install_read_bank (0x8000, 0x9fff, "bank5");
+ mem.install_read_bank (0xa000, 0xbfff, "bank6");
+ mem.install_read_bank (0xc000, 0xdfff, "bank7");
+ mem.install_read_bank (0xe000, 0xffff, "bank8");
+ mem.install_write_bank (0x0000, 0x1fff, "bank11");
+ mem.install_write_bank (0x2000, 0x3fff, "bank12");
+ mem.install_write_bank (0x4000, 0x5fff, "bank13");
+ mem.install_write_bank (0x6000, 0x7fff, "bank14");
+ mem.install_write_bank (0x8000, 0x9fff, "bank15");
+ mem.install_write_bank (0xa000, 0xbfff, "bank16");
+ mem.install_write_bank (0xc000, 0xdfff, "bank17");
+ mem.install_write_bank (0xe000, 0xffff, "bank18");
+
+ lynx128k_bank_w(mem, 0, 0);
}
WRITE8_MEMBER( camplynx_state::lynx128k_irq )
diff --git a/src/mess/drivers/cat.c b/src/mess/drivers/cat.c
index fc4968f9065..13ee3e58d9b 100644
--- a/src/mess/drivers/cat.c
+++ b/src/mess/drivers/cat.c
@@ -355,7 +355,7 @@ UINT32 cat_state::screen_update_cat(screen_device &screen, bitmap_ind16 &bitmap,
static TIMER_CALLBACK( swyft_reset )
{
- memset(machine.device("maincpu")->memory().space(AS_PROGRAM)->get_read_ptr(0xe2341), 0xff, 1);
+ memset(machine.device("maincpu")->memory().space(AS_PROGRAM).get_read_ptr(0xe2341), 0xff, 1);
}
MACHINE_START_MEMBER(cat_state,swyft)
diff --git a/src/mess/drivers/cd2650.c b/src/mess/drivers/cd2650.c
index 74932bc9922..3eb5070113a 100644
--- a/src/mess/drivers/cd2650.c
+++ b/src/mess/drivers/cd2650.c
@@ -166,7 +166,7 @@ static ASCII_KEYBOARD_INTERFACE( keyboard_intf )
QUICKLOAD_LOAD( cd2650 )
{
- address_space &space = *image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
int quick_addr = 0x440;
int exec_addr;
diff --git a/src/mess/drivers/cosmicos.c b/src/mess/drivers/cosmicos.c
index 449c7dcdc02..5376c46ae39 100644
--- a/src/mess/drivers/cosmicos.c
+++ b/src/mess/drivers/cosmicos.c
@@ -252,22 +252,22 @@ INPUT_CHANGED_MEMBER( cosmicos_state::clear_data )
void cosmicos_state::set_ram_mode()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = m_ram->pointer();
if (m_ram_disable)
{
- program->unmap_readwrite(0xff00, 0xffff);
+ program.unmap_readwrite(0xff00, 0xffff);
}
else
{
if (m_ram_protect)
{
- program->install_rom(0xff00, 0xffff, ram);
+ program.install_rom(0xff00, 0xffff, ram);
}
else
{
- program->install_ram(0xff00, 0xffff, ram);
+ program.install_ram(0xff00, 0xffff, ram);
}
}
}
@@ -486,7 +486,7 @@ static COSMAC_INTERFACE( cosmicos_config )
void cosmicos_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* initialize LED display */
m_led->rbi_w(1);
@@ -495,11 +495,11 @@ void cosmicos_state::machine_start()
switch (m_ram->size())
{
case 256:
- program->unmap_readwrite(0x0000, 0xbfff);
+ program.unmap_readwrite(0x0000, 0xbfff);
break;
case 4*1024:
- program->unmap_readwrite(0x1000, 0xbfff);
+ program.unmap_readwrite(0x1000, 0xbfff);
break;
}
@@ -622,9 +622,9 @@ DIRECT_UPDATE_MEMBER(cosmicos_state::cosmicos_direct_update_handler)
DRIVER_INIT_MEMBER(cosmicos_state,cosmicos)
{
- address_space *program = machine().device(CDP1802_TAG)->memory().space(AS_PROGRAM);
+ address_space &program = machine().device(CDP1802_TAG)->memory().space(AS_PROGRAM);
- program->set_direct_update_handler(direct_update_delegate(FUNC(cosmicos_state::cosmicos_direct_update_handler), this));
+ program.set_direct_update_handler(direct_update_delegate(FUNC(cosmicos_state::cosmicos_direct_update_handler), this));
}
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
diff --git a/src/mess/drivers/crvision.c b/src/mess/drivers/crvision.c
index b4a32eb38c5..5f15b23b35f 100644
--- a/src/mess/drivers/crvision.c
+++ b/src/mess/drivers/crvision.c
@@ -853,7 +853,7 @@ static DEVICE_IMAGE_LOAD( crvision_cart )
running_machine &machine = image.device().machine();
crvision_state *state = machine.driver_data<crvision_state>();
UINT8 *mem = state->memregion(M6502_TAG)->base();
- address_space *program = machine.device(M6502_TAG)->memory().space(AS_PROGRAM);
+ address_space &program = machine.device(M6502_TAG)->memory().space(AS_PROGRAM);
if (image.software_entry() == NULL)
{
@@ -873,7 +873,7 @@ static DEVICE_IMAGE_LOAD( crvision_cart )
case 0x1000: // 4K
memcpy(mem + 0x9000, temp_copy, 0x1000); // load 4KB at 0x9000
memcpy(mem + 0xb000, mem + 0x9000, 0x1000); // mirror 4KB at 0xb000
- program->install_read_bank(0x8000, 0xbfff, 0, 0x2000, BANK_ROM1);
+ program.install_read_bank(0x8000, 0xbfff, 0, 0x2000, BANK_ROM1);
break;
case 0x1800: // 6K
@@ -883,13 +883,13 @@ static DEVICE_IMAGE_LOAD( crvision_cart )
memcpy(mem + 0x8800, mem + 0x8000, 0x0800); // mirror higher 2KB at 0x8800
memcpy(mem + 0xa000, mem + 0x8000, 0x0800); // mirror higher 2KB at 0xa000
memcpy(mem + 0xa800, mem + 0x8000, 0x0800); // mirror higher 2KB at 0xa800
- program->install_read_bank(0x8000, 0xbfff, 0, 0x2000, BANK_ROM1);
+ program.install_read_bank(0x8000, 0xbfff, 0, 0x2000, BANK_ROM1);
break;
case 0x2000: // 8K
memcpy(mem + 0x8000, temp_copy, 0x2000); // load 8KB at 0x8000
memcpy(mem + 0xa000, mem + 0x8000, 0x2000); // mirror 8KB at 0xa000
- program->install_read_bank(0x8000, 0xbfff, 0, 0x2000, BANK_ROM1);
+ program.install_read_bank(0x8000, 0xbfff, 0, 0x2000, BANK_ROM1);
break;
case 0x2800: // 10K
@@ -903,8 +903,8 @@ static DEVICE_IMAGE_LOAD( crvision_cart )
memcpy(mem + 0x6800, mem + 0x4000, 0x0800); // mirror higher 2KB at 0x6800
memcpy(mem + 0x7000, mem + 0x4000, 0x0800); // mirror higher 2KB at 0x7000
memcpy(mem + 0x7800, mem + 0x4000, 0x0800); // mirror higher 2KB at 0x7800
- program->install_read_bank(0x8000, 0xbfff, BANK_ROM1);
- program->install_read_bank(0x4000, 0x7fff, BANK_ROM2);
+ program.install_read_bank(0x8000, 0xbfff, BANK_ROM1);
+ program.install_read_bank(0x4000, 0x7fff, BANK_ROM2);
break;
case 0x3000: // 12K
@@ -914,15 +914,15 @@ static DEVICE_IMAGE_LOAD( crvision_cart )
memcpy(mem + 0x5000, mem + 0x4000, 0x1000); // mirror higher 4KB at 0x5000
memcpy(mem + 0x6000, mem + 0x4000, 0x1000); // mirror higher 4KB at 0x6000
memcpy(mem + 0x7000, mem + 0x4000, 0x1000); // mirror higher 4KB at 0x7000
- program->install_read_bank(0x8000, 0xbfff, BANK_ROM1);
- program->install_read_bank(0x4000, 0x7fff, BANK_ROM2);
+ program.install_read_bank(0x8000, 0xbfff, BANK_ROM1);
+ program.install_read_bank(0x4000, 0x7fff, BANK_ROM2);
break;
case 0x4000: // 16K
memcpy(mem + 0xa000, temp_copy, 0x2000); // load lower 8KB at 0xa000
memcpy(mem + 0x8000, temp_copy + 0x2000, 0x2000); // load higher 8KB at 0x8000
- program->install_read_bank(0x8000, 0xbfff, BANK_ROM1);
- program->install_read_bank(0x4000, 0x7fff, BANK_ROM2);
+ program.install_read_bank(0x8000, 0xbfff, BANK_ROM1);
+ program.install_read_bank(0x4000, 0x7fff, BANK_ROM2);
break;
case 0x4800: // 18K
@@ -936,8 +936,8 @@ static DEVICE_IMAGE_LOAD( crvision_cart )
memcpy(mem + 0x6800, mem + 0x4000, 0x0800); // mirror higher 2KB at 0x6800
memcpy(mem + 0x7000, mem + 0x4000, 0x0800); // mirror higher 2KB at 0x7000
memcpy(mem + 0x7800, mem + 0x4000, 0x0800); // mirror higher 2KB at 0x7800
- program->install_read_bank(0x8000, 0xbfff, BANK_ROM1);
- program->install_read_bank(0x4000, 0x7fff, BANK_ROM2);
+ program.install_read_bank(0x8000, 0xbfff, BANK_ROM1);
+ program.install_read_bank(0x4000, 0x7fff, BANK_ROM2);
break;
default:
diff --git a/src/mess/drivers/cxhumax.c b/src/mess/drivers/cxhumax.c
index 130e2979584..229ba779920 100644
--- a/src/mess/drivers/cxhumax.c
+++ b/src/mess/drivers/cxhumax.c
@@ -154,12 +154,12 @@ READ32_MEMBER( cxhumax_state::cx_scratch_r )
//we're in disabled debug_printf
unsigned char* buf = (unsigned char *)alloca(200);
unsigned char temp;
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
memset(buf,0,200);
int i = 0;
- while ((temp=program->read_byte(m_maincpu->state_int(ARM7_R0)+i))) {
+ while ((temp=program.read_byte(m_maincpu->state_int(ARM7_R0)+i))) {
buf[i++]=temp;
//m_terminal->write(space, 0, temp);
}
diff --git a/src/mess/drivers/d6800.c b/src/mess/drivers/d6800.c
index 8bf884d14f4..efd0ce35524 100644
--- a/src/mess/drivers/d6800.c
+++ b/src/mess/drivers/d6800.c
@@ -320,7 +320,7 @@ static const cassette_interface d6800_cassette_interface =
static QUICKLOAD_LOAD( d6800 )
{
- address_space &space = *image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
int quick_addr = 0x0200;
int exec_addr = 0xc000;
diff --git a/src/mess/drivers/dc.c b/src/mess/drivers/dc.c
index bd01b59021f..35d42c9d62a 100644
--- a/src/mess/drivers/dc.c
+++ b/src/mess/drivers/dc.c
@@ -65,14 +65,14 @@ DRIVER_INIT_MEMBER(dc_state,dc)
DRIVER_INIT_MEMBER(dc_state,dcus)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc2303b0, 0xc2303b7, FUNC(dcus_idle_skip_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc2303b0, 0xc2303b7, FUNC(dcus_idle_skip_r));
DRIVER_INIT_CALL(dc);
}
DRIVER_INIT_MEMBER(dc_state,dcjp)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xc2302f8, 0xc2302ff, FUNC(dcjp_idle_skip_r));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xc2302f8, 0xc2302ff, FUNC(dcjp_idle_skip_r));
DRIVER_INIT_CALL(dc);
}
diff --git a/src/mess/drivers/dectalk.c b/src/mess/drivers/dectalk.c
index 965010fa76a..84b4094f8fd 100644
--- a/src/mess/drivers/dectalk.c
+++ b/src/mess/drivers/dectalk.c
@@ -228,7 +228,7 @@ static void duart_output(device_t *device, UINT8 data)
static void duart_tx(device_t *device, int channel, UINT8 data)
{
device_t *devconf = device->machine().device(TERMINAL_TAG);
- dynamic_cast<generic_terminal_device *>(devconf)->write(*devconf->machine().memory().first_space(), 0, data);
+ dynamic_cast<generic_terminal_device *>(devconf)->write(devconf->machine().driver_data()->generic_space(), 0, data);
#ifdef SERIAL_TO_STDERR
fprintf(stderr, "%02X ",data);
#endif
diff --git a/src/mess/drivers/elf.c b/src/mess/drivers/elf.c
index c5ce44a1be8..84c4ceb6fe1 100644
--- a/src/mess/drivers/elf.c
+++ b/src/mess/drivers/elf.c
@@ -236,15 +236,15 @@ static CDP1861_INTERFACE( elf2_cdp1861_intf )
void elf2_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* initialize LED displays */
m_led_l->rbi_w(1);
m_led_h->rbi_w(1);
/* setup memory banking */
- program->install_read_bank(0x0000, 0x00ff, "bank1");
- program->install_write_handler(0x0000, 0x00ff, write8_delegate(FUNC(elf2_state::memory_w), this));
+ program.install_read_bank(0x0000, 0x00ff, "bank1");
+ program.install_write_handler(0x0000, 0x00ff, write8_delegate(FUNC(elf2_state::memory_w), this));
membank("bank1")->configure_entry(0, m_ram->pointer());
membank("bank1")->set_entry(0);
diff --git a/src/mess/drivers/elwro800.c b/src/mess/drivers/elwro800.c
index 1fdb121ac20..61471a95116 100644
--- a/src/mess/drivers/elwro800.c
+++ b/src/mess/drivers/elwro800.c
@@ -121,21 +121,21 @@ static void elwro800jr_mmu_w(running_machine &machine, UINT8 data)
{
// rom BAS0
state->membank("bank1")->set_base(state->memregion("maincpu")->base() + 0x0000); /* BAS0 ROM */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x0000, 0x1fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x0000, 0x1fff);
state->m_ram_at_0000 = 0;
}
else if (!BIT(cs,4))
{
// rom BOOT
state->membank("bank1")->set_base(machine.root_device().memregion("maincpu")->base() + 0x4000); /* BOOT ROM */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x0000, 0x1fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x0000, 0x1fff);
state->m_ram_at_0000 = 0;
}
else
{
// RAM
state->membank("bank1")->set_base(messram);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x0000, 0x1fff, "bank1");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x0000, 0x1fff, "bank1");
state->m_ram_at_0000 = 1;
}
@@ -143,12 +143,12 @@ static void elwro800jr_mmu_w(running_machine &machine, UINT8 data)
if (!BIT(cs,1))
{
state->membank("bank2")->set_base(machine.root_device().memregion("maincpu")->base() + 0x2000); /* BAS1 ROM */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0x2000, 0x3fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).nop_write(0x2000, 0x3fff);
}
else
{
state->membank("bank2")->set_base(messram + 0x2000); /* RAM */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x2000, 0x3fff, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x2000, 0x3fff, "bank2");
}
if (BIT(ls175,2))
@@ -524,7 +524,7 @@ MACHINE_RESET_MEMBER(elwro800_state,elwro800)
// this is a reset of ls175 in mmu
elwro800jr_mmu_w(machine(), 0);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(elwro800_state::elwro800_direct_handler), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(elwro800_state::elwro800_direct_handler), this));
}
static const cassette_interface elwro800jr_cassette_interface =
diff --git a/src/mess/drivers/enterp.c b/src/mess/drivers/enterp.c
index 86831071474..b718fb2d18f 100644
--- a/src/mess/drivers/enterp.c
+++ b/src/mess/drivers/enterp.c
@@ -108,7 +108,7 @@ static WRITE8_DEVICE_HANDLER( enterprise_dave_reg_write )
case 0x11:
case 0x12:
case 0x13:
- enterprise_update_memory_page(*device->machine().device("maincpu")->memory().space(AS_PROGRAM), offset - 0x0f, data);
+ enterprise_update_memory_page(device->machine().device("maincpu")->memory().space(AS_PROGRAM), offset - 0x0f, data);
break;
case 0x15:
diff --git a/src/mess/drivers/exp85.c b/src/mess/drivers/exp85.c
index 72209215bea..d2a946e9635 100644
--- a/src/mess/drivers/exp85.c
+++ b/src/mess/drivers/exp85.c
@@ -190,11 +190,11 @@ static const serial_terminal_interface terminal_intf =
void exp85_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* setup memory banking */
- program->install_read_bank(0x0000, 0x07ff, "bank1");
- program->unmap_write(0x0000, 0x07ff);
+ program.install_read_bank(0x0000, 0x07ff, "bank1");
+ program.unmap_write(0x0000, 0x07ff);
membank("bank1")->configure_entry(0, memregion(I8085A_TAG)->base() + 0xf000);
membank("bank1")->configure_entry(1, memregion(I8085A_TAG)->base());
membank("bank1")->set_entry(0);
diff --git a/src/mess/drivers/fk1.c b/src/mess/drivers/fk1.c
index 0a3bea99b50..36f3c68d871 100644
--- a/src/mess/drivers/fk1.c
+++ b/src/mess/drivers/fk1.c
@@ -293,10 +293,10 @@ WRITE8_MEMBER( fk1_state::fk1_intr_w )
READ8_MEMBER( fk1_state::fk1_bank_ram_r )
{
- address_space *space_mem = m_maincpu->space(AS_PROGRAM);
+ address_space &space_mem = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
- space_mem->install_write_bank(0x0000, 0x3fff, "bank1");
+ space_mem.install_write_bank(0x0000, 0x3fff, "bank1");
membank("bank1")->set_base(ram);
membank("bank2")->set_base(ram + 0x4000);
return 0;
@@ -304,8 +304,8 @@ READ8_MEMBER( fk1_state::fk1_bank_ram_r )
READ8_MEMBER( fk1_state::fk1_bank_rom_r )
{
- address_space *space_mem = m_maincpu->space(AS_PROGRAM);
- space_mem->unmap_write(0x0000, 0x3fff);
+ address_space &space_mem = m_maincpu->space(AS_PROGRAM);
+ space_mem.unmap_write(0x0000, 0x3fff);
membank("bank1")->set_base(machine().root_device().memregion("maincpu")->base());
membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x10000);
return 0;
@@ -423,7 +423,7 @@ static TIMER_DEVICE_CALLBACK( vsync_callback )
void fk1_state::machine_reset()
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
space.unmap_write(0x0000, 0x3fff);
diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c
index dee1158dd2e..c5dfe1e0aaa 100644
--- a/src/mess/drivers/fm7.c
+++ b/src/mess/drivers/fm7.c
@@ -824,7 +824,7 @@ READ8_MEMBER(fm7_state::fm77av_boot_mode_r)
static void fm7_update_psg(running_machine &machine)
{
fm7_state *state = machine.driver_data<fm7_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if(state->m_type == SYS_FM7)
{
@@ -1963,7 +1963,7 @@ void fm7_state::machine_reset()
}
if(m_type == SYS_FM77AV || m_type == SYS_FM77AV40EX || m_type == SYS_FM11)
{
- fm7_mmr_refresh(*machine().device("maincpu")->memory().space(AS_PROGRAM));
+ fm7_mmr_refresh(machine().device("maincpu")->memory().space(AS_PROGRAM));
}
if(m_type == SYS_FM11)
{
diff --git a/src/mess/drivers/fmtowns.c b/src/mess/drivers/fmtowns.c
index f91b1c27bc5..83ada1d37bd 100644
--- a/src/mess/drivers/fmtowns.c
+++ b/src/mess/drivers/fmtowns.c
@@ -2459,7 +2459,7 @@ void towns_state::driver_start()
m_towns_cd.read_timer = machine().scheduler().timer_alloc(FUNC(towns_cdrom_read_byte), (void*)machine().device("dma_1"));
machine().device("maincpu")->execute().set_irq_acknowledge_callback(towns_irq_callback);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_ram(0x100000,machine().device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,NULL);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_ram(0x100000,machine().device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,NULL);
}
@@ -2472,10 +2472,8 @@ void marty_state::driver_start()
void towns_state::machine_reset()
{
- address_space *program;
-
m_maincpu = machine().device<cpu_device>("maincpu");
- program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
m_dma_1 = machine().device("dma_1");
m_dma_2 = machine().device("dma_2");
m_fdc = machine().device("fdc");
@@ -2496,7 +2494,7 @@ void towns_state::machine_reset()
m_towns_mainmem_enable = 0x00;
m_towns_system_port = 0x00;
m_towns_ram_enable = 0x00;
- towns_update_video_banks(*program);
+ towns_update_video_banks(program);
m_towns_kb_status = 0x18;
m_towns_kb_irq1_enable = 0;
m_towns_pad_mask = 0x7f;
diff --git a/src/mess/drivers/fp1100.c b/src/mess/drivers/fp1100.c
index 42655360778..09679d11b08 100644
--- a/src/mess/drivers/fp1100.c
+++ b/src/mess/drivers/fp1100.c
@@ -175,8 +175,8 @@ WRITE8_MEMBER( fp1100_state::irq_mask_w )
irq_mask = data;
///printf("%02x\n",data);
// FIXME - the below 2 lines are needed, otherwise nothing ever gets written to videoram
- address_space *mem = m_subcpu->space(AS_PROGRAM);
- data = mem->read_byte(0xe800);
+ address_space &mem = m_subcpu->space(AS_PROGRAM);
+ data = mem.read_byte(0xe800);
}
WRITE8_MEMBER( fp1100_state::main_to_sub_w )
diff --git a/src/mess/drivers/gba.c b/src/mess/drivers/gba.c
index 037a3d49e72..5027e5dd26f 100644
--- a/src/mess/drivers/gba.c
+++ b/src/mess/drivers/gba.c
@@ -154,7 +154,7 @@ static void dma_exec(running_machine &machine, FPTR ch)
int ctrl;
int srcadd, dstadd;
UINT32 src, dst;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
gba_state *state = machine.driver_data<gba_state>();
src = state->m_dma_src[ch];
@@ -3061,13 +3061,13 @@ static DEVICE_IMAGE_LOAD( gba_cart )
if (cart_size <= (16 * 1024 * 1024))
{
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xd000000, 0xdffffff, read32_delegate(FUNC(gba_state::eeprom_r),state));
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xd000000, 0xdffffff, write32_delegate(FUNC(gba_state::eeprom_w),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xd000000, 0xdffffff, read32_delegate(FUNC(gba_state::eeprom_r),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xd000000, 0xdffffff, write32_delegate(FUNC(gba_state::eeprom_w),state));
}
else
{
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xdffff00, 0xdffffff, read32_delegate(FUNC(gba_state::eeprom_r),state));
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xdffff00, 0xdffffff, write32_delegate(FUNC(gba_state::eeprom_w),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xdffff00, 0xdffffff, read32_delegate(FUNC(gba_state::eeprom_r),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xdffff00, 0xdffffff, write32_delegate(FUNC(gba_state::eeprom_w),state));
}
}
@@ -3076,8 +3076,8 @@ static DEVICE_IMAGE_LOAD( gba_cart )
state->m_nvptr = (UINT8 *)&state->m_gba_sram;
state->m_nvsize = 0x10000;
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xe000000, 0xe00ffff, read32_delegate(FUNC(gba_state::sram_r),state));
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xe000000, 0xe00ffff, write32_delegate(FUNC(gba_state::sram_w),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xe000000, 0xe00ffff, read32_delegate(FUNC(gba_state::sram_r),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xe000000, 0xe00ffff, write32_delegate(FUNC(gba_state::sram_w),state));
}
if (chip & GBA_CHIP_FLASH_1M)
@@ -3087,8 +3087,8 @@ static DEVICE_IMAGE_LOAD( gba_cart )
state->m_flash_size = 0x20000;
state->m_flash_mask = 0x1ffff/4;
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xe000000, 0xe01ffff, read32_delegate(FUNC(gba_state::flash_r),state));
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xe000000, 0xe01ffff, write32_delegate(FUNC(gba_state::flash_w),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xe000000, 0xe01ffff, read32_delegate(FUNC(gba_state::flash_r),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xe000000, 0xe01ffff, write32_delegate(FUNC(gba_state::flash_w),state));
}
if ((chip & GBA_CHIP_FLASH) || (chip & GBA_CHIP_FLASH_512))
@@ -3098,8 +3098,8 @@ static DEVICE_IMAGE_LOAD( gba_cart )
state->m_flash_size = 0x10000;
state->m_flash_mask = 0xffff/4;
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0xe000000, 0xe00ffff, read32_delegate(FUNC(gba_state::flash_r),state));
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0xe000000, 0xe00ffff, write32_delegate(FUNC(gba_state::flash_w),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xe000000, 0xe00ffff, read32_delegate(FUNC(gba_state::flash_r),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0xe000000, 0xe00ffff, write32_delegate(FUNC(gba_state::flash_w),state));
}
if (chip & GBA_CHIP_RTC)
@@ -3204,7 +3204,7 @@ DIRECT_UPDATE_MEMBER(gba_state::gba_direct)
DRIVER_INIT_MEMBER(gba_state,gbadv)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(gba_state::gba_direct), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(gba_state::gba_direct), this));
}
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME */
diff --git a/src/mess/drivers/gp32.c b/src/mess/drivers/gp32.c
index ff16c798ab9..57922070341 100644
--- a/src/mess/drivers/gp32.c
+++ b/src/mess/drivers/gp32.c
@@ -706,7 +706,7 @@ static void s3c240x_dma_trigger( running_machine &machine, int dma)
gp32_state *state = machine.driver_data<gp32_state>();
UINT32 *regs = &state->m_s3c240x_dma_regs[dma<<3];
UINT32 curr_tc, curr_src, curr_dst;
- address_space &space = *machine.device( "maincpu")->memory().space( AS_PROGRAM);
+ address_space &space = machine.device( "maincpu")->memory().space( AS_PROGRAM);
int dsz, inc_src, inc_dst, servmode;
static const UINT32 ch_int[] = { INT_DMA0, INT_DMA1, INT_DMA2, INT_DMA3 };
verboselog( machine, 5, "DMA %d trigger\n", dma);
diff --git a/src/mess/drivers/homelab.c b/src/mess/drivers/homelab.c
index c876136dd33..480b4e91118 100644
--- a/src/mess/drivers/homelab.c
+++ b/src/mess/drivers/homelab.c
@@ -646,7 +646,7 @@ static const mea8000_interface brailab4_speech_intf = { "speech", DEVCB_NULL };
static QUICKLOAD_LOAD(homelab)
{
- address_space &space = *image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
int i=0;
UINT8 ch;
UINT16 quick_addr;
diff --git a/src/mess/drivers/ht68k.c b/src/mess/drivers/ht68k.c
index 608dd27ff6f..6588b7f12f8 100644
--- a/src/mess/drivers/ht68k.c
+++ b/src/mess/drivers/ht68k.c
@@ -97,7 +97,7 @@ static void duart_irq_handler(device_t *device, int state, UINT8 vector)
static void duart_tx(device_t *device, int channel, UINT8 data)
{
ht68k_state *state = device->machine().driver_data<ht68k_state>();
- state->m_terminal->write(*device->machine().memory().first_space(), 0, data);
+ state->m_terminal->write(device->machine().driver_data()->generic_space(), 0, data);
}
static UINT8 duart_input(device_t *device)
diff --git a/src/mess/drivers/indiana.c b/src/mess/drivers/indiana.c
index ce37cee85b1..155eb4daf18 100644
--- a/src/mess/drivers/indiana.c
+++ b/src/mess/drivers/indiana.c
@@ -84,7 +84,7 @@ READ8_HANDLER( indiana_vga_setting )
DRIVER_INIT_MEMBER(indiana_state,indiana)
{
pc_vga_init(machine(), indiana_vga_setting, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0x7f7a0000, *machine().device("maincpu")->memory().space(AS_PROGRAM), 0x7f600000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0x7f7a0000, machine().device("maincpu")->memory().space(AS_PROGRAM), 0x7f600000);
}
/* ROM definition */
diff --git a/src/mess/drivers/instruct.c b/src/mess/drivers/instruct.c
index 631695458c0..a620bd0554f 100644
--- a/src/mess/drivers/instruct.c
+++ b/src/mess/drivers/instruct.c
@@ -218,7 +218,7 @@ void instruct_state::machine_reset()
QUICKLOAD_LOAD( instruct )
{
- address_space &space = *image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
int quick_addr = 0x0100;
int exec_addr;
diff --git a/src/mess/drivers/ip22.c b/src/mess/drivers/ip22.c
index 4577b42b408..44b442dc1b5 100644
--- a/src/mess/drivers/ip22.c
+++ b/src/mess/drivers/ip22.c
@@ -1261,7 +1261,7 @@ static void dump_chain(address_space &space, UINT32 ch_base)
static void scsi_irq(running_machine &machine, int state)
{
ip22_state *drvstate = machine.driver_data<ip22_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (state)
{
diff --git a/src/mess/drivers/itt3030.c b/src/mess/drivers/itt3030.c
index 6277a4dcb49..a640c1573c0 100644
--- a/src/mess/drivers/itt3030.c
+++ b/src/mess/drivers/itt3030.c
@@ -57,7 +57,7 @@ READ8_MEMBER(itt3030_state::unk2_r)
UINT32 itt3030_state::screen_update( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
for(int y = 0; y < 24; y++ )
{
diff --git a/src/mess/drivers/kyocera.c b/src/mess/drivers/kyocera.c
index f64ee56507b..0b7c048e7a9 100644
--- a/src/mess/drivers/kyocera.c
+++ b/src/mess/drivers/kyocera.c
@@ -104,7 +104,7 @@ READ8_MEMBER( pc8201_state::bank_r )
void pc8201_state::bankswitch(UINT8 data)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
int rom_bank = data & 0x03;
int ram_bank = (data >> 2) & 0x03;
@@ -114,13 +114,13 @@ void pc8201_state::bankswitch(UINT8 data)
if (rom_bank > 1)
{
/* RAM */
- program->install_readwrite_bank(0x0000, 0x7fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x7fff, "bank1");
}
else
{
/* ROM */
- program->install_read_bank(0x0000, 0x7fff, "bank1");
- program->unmap_write(0x0000, 0x7fff);
+ program.install_read_bank(0x0000, 0x7fff, "bank1");
+ program.unmap_write(0x0000, 0x7fff);
}
membank("bank1")->set_entry(rom_bank);
@@ -130,31 +130,31 @@ void pc8201_state::bankswitch(UINT8 data)
case 0:
if (m_ram->size() > 16 * 1024)
{
- program->install_readwrite_bank(0x8000, 0xffff, "bank2");
+ program.install_readwrite_bank(0x8000, 0xffff, "bank2");
}
else
{
- program->unmap_readwrite(0x8000, 0xbfff);
- program->install_readwrite_bank(0xc000, 0xffff, "bank2");
+ program.unmap_readwrite(0x8000, 0xbfff);
+ program.install_readwrite_bank(0xc000, 0xffff, "bank2");
}
break;
case 1:
- program->unmap_readwrite(0x8000, 0xffff);
+ program.unmap_readwrite(0x8000, 0xffff);
break;
case 2:
if (m_ram->size() > 32 * 1024)
- program->install_readwrite_bank(0x8000, 0xffff, "bank2");
+ program.install_readwrite_bank(0x8000, 0xffff, "bank2");
else
- program->unmap_readwrite(0x8000, 0xffff);
+ program.unmap_readwrite(0x8000, 0xffff);
break;
case 3:
if (m_ram->size() > 64 * 1024)
- program->install_readwrite_bank(0x8000, 0xffff, "bank2");
+ program.install_readwrite_bank(0x8000, 0xffff, "bank2");
else
- program->unmap_readwrite(0x8000, 0xffff);
+ program.unmap_readwrite(0x8000, 0xffff);
break;
}
@@ -454,7 +454,7 @@ READ8_MEMBER( kc85_state::keyboard_r )
void tandy200_state::bankswitch(UINT8 data)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
int rom_bank = data & 0x03;
int ram_bank = (data >> 2) & 0x03;
@@ -464,23 +464,23 @@ void tandy200_state::bankswitch(UINT8 data)
if (rom_bank == 3)
{
/* invalid ROM bank */
- program->unmap_readwrite(0x0000, 0x7fff);
+ program.unmap_readwrite(0x0000, 0x7fff);
}
else
{
- program->install_read_bank(0x0000, 0x7fff, "bank1");
- program->unmap_write(0x0000, 0x7fff);
+ program.install_read_bank(0x0000, 0x7fff, "bank1");
+ program.unmap_write(0x0000, 0x7fff);
membank("bank1")->set_entry(rom_bank);
}
if (m_ram->size() < ((ram_bank + 1) * 24 * 1024))
{
/* invalid RAM bank */
- program->unmap_readwrite(0xa000, 0xffff);
+ program.unmap_readwrite(0xa000, 0xffff);
}
else
{
- program->install_readwrite_bank(0xa000, 0xffff, "bank2");
+ program.install_readwrite_bank(0xa000, 0xffff, "bank2");
membank("bank2")->set_entry(ram_bank);
}
}
@@ -1127,15 +1127,15 @@ static const i8251_interface tandy200_uart_intf =
void kc85_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* initialize RTC */
m_rtc->cs_w(1);
m_rtc->oe_w(1);
/* configure ROM banking */
- program->install_read_bank(0x0000, 0x7fff, "bank1");
- program->unmap_write(0x0000, 0x7fff);
+ program.install_read_bank(0x0000, 0x7fff, "bank1");
+ program.unmap_write(0x0000, 0x7fff);
membank("bank1")->configure_entry(0, memregion(I8085_TAG)->base());
membank("bank1")->configure_entry(1, memregion("option")->base());
membank("bank1")->set_entry(0);
@@ -1144,12 +1144,12 @@ void kc85_state::machine_start()
switch (m_ram->size())
{
case 16 * 1024:
- program->unmap_readwrite(0x8000, 0xbfff);
- program->install_readwrite_bank(0xc000, 0xffff, "bank2");
+ program.unmap_readwrite(0x8000, 0xbfff);
+ program.install_readwrite_bank(0xc000, 0xffff, "bank2");
break;
case 32 * 1024:
- program->install_readwrite_bank(0x8000, 0xffff,"bank2");
+ program.install_readwrite_bank(0x8000, 0xffff,"bank2");
break;
}
@@ -1194,15 +1194,15 @@ void pc8201_state::machine_start()
void trsm100_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* initialize RTC */
m_rtc->cs_w(1);
m_rtc->oe_w(1);
/* configure ROM banking */
- program->install_read_bank(0x0000, 0x7fff, "bank1");
- program->unmap_write(0x0000, 0x7fff);
+ program.install_read_bank(0x0000, 0x7fff, "bank1");
+ program.unmap_write(0x0000, 0x7fff);
membank("bank1")->configure_entry(0, memregion(I8085_TAG)->base());
membank("bank1")->configure_entry(1, memregion("option")->base());
membank("bank1")->set_entry(0);
@@ -1211,22 +1211,22 @@ void trsm100_state::machine_start()
switch (m_ram->size())
{
case 8 * 1024:
- program->unmap_readwrite(0x8000, 0xcfff);
- program->install_readwrite_bank(0xe000, 0xffff, "bank2");
+ program.unmap_readwrite(0x8000, 0xcfff);
+ program.install_readwrite_bank(0xe000, 0xffff, "bank2");
break;
case 16 * 1024:
- program->unmap_readwrite(0x8000, 0xbfff);
- program->install_readwrite_bank(0xc000, 0xffff, "bank2");
+ program.unmap_readwrite(0x8000, 0xbfff);
+ program.install_readwrite_bank(0xc000, 0xffff, "bank2");
break;
case 24 * 1024:
- program->unmap_readwrite(0x8000, 0x9fff);
- program->install_readwrite_bank(0xa000, 0xffff, "bank2");
+ program.unmap_readwrite(0x8000, 0x9fff);
+ program.install_readwrite_bank(0xa000, 0xffff, "bank2");
break;
case 32 * 1024:
- program->install_readwrite_bank(0x8000, 0xffff, "bank2");
+ program.install_readwrite_bank(0x8000, 0xffff, "bank2");
break;
}
diff --git a/src/mess/drivers/lc80.c b/src/mess/drivers/lc80.c
index a2aaa185114..0949dfdb43f 100644
--- a/src/mess/drivers/lc80.c
+++ b/src/mess/drivers/lc80.c
@@ -296,7 +296,7 @@ static const z80_daisy_config lc80_daisy_chain[] =
void lc80_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* setup memory banking */
membank("bank1")->configure_entry(0, memregion(Z80_TAG)->base()); // TODO
@@ -314,29 +314,29 @@ void lc80_state::machine_start()
membank("bank4")->configure_entry(0, memregion(Z80_TAG)->base() + 0x2000);
membank("bank4")->set_entry(0);
- program->install_readwrite_bank(0x0000, 0x07ff, "bank1");
- program->install_readwrite_bank(0x0800, 0x0fff, "bank2");
- program->install_readwrite_bank(0x1000, 0x17ff, "bank3");
+ program.install_readwrite_bank(0x0000, 0x07ff, "bank1");
+ program.install_readwrite_bank(0x0800, 0x0fff, "bank2");
+ program.install_readwrite_bank(0x1000, 0x17ff, "bank3");
switch (m_ram->size())
{
case 1*1024:
- program->install_readwrite_bank(0x2000, 0x23ff, "bank4");
- program->unmap_readwrite(0x2400, 0x2fff);
+ program.install_readwrite_bank(0x2000, 0x23ff, "bank4");
+ program.unmap_readwrite(0x2400, 0x2fff);
break;
case 2*1024:
- program->install_readwrite_bank(0x2000, 0x27ff, "bank4");
- program->unmap_readwrite(0x2800, 0x2fff);
+ program.install_readwrite_bank(0x2000, 0x27ff, "bank4");
+ program.unmap_readwrite(0x2800, 0x2fff);
break;
case 3*1024:
- program->install_readwrite_bank(0x2000, 0x2bff, "bank4");
- program->unmap_readwrite(0x2c00, 0x2fff);
+ program.install_readwrite_bank(0x2000, 0x2bff, "bank4");
+ program.unmap_readwrite(0x2c00, 0x2fff);
break;
case 4*1024:
- program->install_readwrite_bank(0x2000, 0x2fff, "bank4");
+ program.install_readwrite_bank(0x2000, 0x2fff, "bank4");
break;
}
diff --git a/src/mess/drivers/lynx.c b/src/mess/drivers/lynx.c
index 4ab33d7fd58..87680587fcb 100644
--- a/src/mess/drivers/lynx.c
+++ b/src/mess/drivers/lynx.c
@@ -138,7 +138,7 @@ ROM_END
static QUICKLOAD_LOAD( lynx )
{
device_t *cpu = image.device().machine().device("maincpu");
- address_space &space = *image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *data = NULL;
UINT8 *rom = image.device().machine().root_device().memregion("maincpu")->base();
UINT8 header[10]; // 80 08 dw Start dw Len B S 9 3
diff --git a/src/mess/drivers/m5.c b/src/mess/drivers/m5.c
index 7a51c316e8c..95943dadfc2 100644
--- a/src/mess/drivers/m5.c
+++ b/src/mess/drivers/m5.c
@@ -617,13 +617,13 @@ static const z80_daisy_config m5_daisy_chain[] =
void m5_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
// configure RAM
switch (m_ram->size())
{
case 4*1024:
- program->unmap_readwrite(0x8000, 0xffff);
+ program.unmap_readwrite(0x8000, 0xffff);
break;
case 36*1024:
diff --git a/src/mess/drivers/mc10.c b/src/mess/drivers/mc10.c
index a4a449f8968..ff710dc9cf0 100644
--- a/src/mess/drivers/mc10.c
+++ b/src/mess/drivers/mc10.c
@@ -236,7 +236,7 @@ static TIMER_DEVICE_CALLBACK( alice32_scanline )
DRIVER_INIT_MEMBER(mc10_state,mc10)
{
- address_space &prg = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &prg = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* initialize keyboard strobe */
m_keyboard_strobe = 0x00;
diff --git a/src/mess/drivers/mc1000.c b/src/mess/drivers/mc1000.c
index 72cc2792579..8fdf0cc7424 100644
--- a/src/mess/drivers/mc1000.c
+++ b/src/mess/drivers/mc1000.c
@@ -26,7 +26,7 @@
void mc1000_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* MC6845 video RAM */
membank("bank2")->set_entry(m_mc6845_bank);
@@ -34,11 +34,11 @@ void mc1000_state::bankswitch()
/* extended RAM */
if (m_ram->size() > 16*1024)
{
- program->install_readwrite_bank(0x4000, 0x7fff, "bank3");
+ program.install_readwrite_bank(0x4000, 0x7fff, "bank3");
}
else
{
- program->unmap_readwrite(0x4000, 0x7fff);
+ program.unmap_readwrite(0x4000, 0x7fff);
}
/* MC6847 video RAM */
@@ -46,16 +46,16 @@ void mc1000_state::bankswitch()
{
if (m_ram->size() > 16*1024)
{
- program->install_readwrite_bank(0x8000, 0x97ff, "bank4");
+ program.install_readwrite_bank(0x8000, 0x97ff, "bank4");
}
else
{
- program->unmap_readwrite(0x8000, 0x97ff);
+ program.unmap_readwrite(0x8000, 0x97ff);
}
}
else
{
- program->install_readwrite_bank(0x8000, 0x97ff, "bank4");
+ program.install_readwrite_bank(0x8000, 0x97ff, "bank4");
}
membank("bank4")->set_entry(m_mc6847_bank);
@@ -63,11 +63,11 @@ void mc1000_state::bankswitch()
/* extended RAM */
if (m_ram->size() > 16*1024)
{
- program->install_readwrite_bank(0x9800, 0xbfff, "bank5");
+ program.install_readwrite_bank(0x9800, 0xbfff, "bank5");
}
else
{
- program->unmap_readwrite(0x9800, 0xbfff);
+ program.unmap_readwrite(0x9800, 0xbfff);
}
}
@@ -323,19 +323,19 @@ static const ay8910_interface ay8910_intf =
void mc1000_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* setup memory banking */
UINT8 *rom = memregion(Z80_TAG)->base();
- program->install_readwrite_bank(0x0000, 0x1fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x1fff, "bank1");
membank("bank1")->configure_entry(0, rom);
membank("bank1")->configure_entry(1, rom + 0xc000);
membank("bank1")->set_entry(1);
m_rom0000 = 1;
- program->install_readwrite_bank(0x2000, 0x27ff, "bank2");
+ program.install_readwrite_bank(0x2000, 0x27ff, "bank2");
membank("bank2")->configure_entry(0, rom + 0x2000);
membank("bank2")->configure_entry(1, m_mc6845_video_ram);
membank("bank2")->set_entry(0);
@@ -499,7 +499,7 @@ DIRECT_UPDATE_MEMBER(mc1000_state::mc1000_direct_update_handler)
DRIVER_INIT_MEMBER(mc1000_state,mc1000)
{
- machine().device(Z80_TAG)->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(mc1000_state::mc1000_direct_update_handler), this));
+ machine().device(Z80_TAG)->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(mc1000_state::mc1000_direct_update_handler), this));
}
/* System Drivers */
diff --git a/src/mess/drivers/mc80.c b/src/mess/drivers/mc80.c
index 7e7ee6a822c..063864ef27f 100644
--- a/src/mess/drivers/mc80.c
+++ b/src/mess/drivers/mc80.c
@@ -137,13 +137,13 @@ INPUT_PORTS_END
static TIMER_DEVICE_CALLBACK( mc8020_kbd )
{
device_t *cpu = timer.machine().device( "maincpu" );
- address_space *mem = cpu->memory().space(AS_PROGRAM);
+ address_space &mem = cpu->memory().space(AS_PROGRAM);
char kbdrow[6];
UINT8 i;
for (i = 1; i < 8; i++)
{
sprintf(kbdrow,"X%X", i);
- mem->write_word(0xd20+i, timer.machine().root_device().ioport(kbdrow)->read());
+ mem.write_word(0xd20+i, timer.machine().root_device().ioport(kbdrow)->read());
}
}
diff --git a/src/mess/drivers/micronic.c b/src/mess/drivers/micronic.c
index a007bb260b5..d319c63016f 100644
--- a/src/mess/drivers/micronic.c
+++ b/src/mess/drivers/micronic.c
@@ -164,12 +164,12 @@ WRITE8_MEMBER( micronic_state::bank_select_w )
if (data < 2)
{
membank("bank1")->set_entry(data);
- m_maincpu->space(AS_PROGRAM)->unmap_write(0x0000, 0x7fff);
+ m_maincpu->space(AS_PROGRAM).unmap_write(0x0000, 0x7fff);
}
else
{
membank("bank1")->set_entry((data <= m_banks_num) ? data : m_banks_num);
- m_maincpu->space(AS_PROGRAM)->install_write_bank(0x0000, 0x7fff, "bank1");
+ m_maincpu->space(AS_PROGRAM).install_write_bank(0x0000, 0x7fff, "bank1");
}
}
@@ -342,7 +342,7 @@ void micronic_state::machine_start()
void micronic_state::machine_reset()
{
membank("bank1")->set_entry(0);
- m_maincpu->space(AS_PROGRAM)->unmap_write(0x0000, 0x7fff);
+ m_maincpu->space(AS_PROGRAM).unmap_write(0x0000, 0x7fff);
}
diff --git a/src/mess/drivers/mikromik.c b/src/mess/drivers/mikromik.c
index 1dbe3280ee9..3801e46ed2a 100644
--- a/src/mess/drivers/mikromik.c
+++ b/src/mess/drivers/mikromik.c
@@ -757,11 +757,11 @@ void mm1_state::machine_start()
void mm1_state::machine_reset()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
int i;
// reset LS259
- for (i = 0; i < 8; i++) ls259_w(*program, i, 0);
+ for (i = 0; i < 8; i++) ls259_w(program, i, 0);
// set FDC ready
if (!ioport("T5")->read()) upd765_ready_w(m_fdc, 1);
diff --git a/src/mess/drivers/mpf1.c b/src/mess/drivers/mpf1.c
index 2ff0e70abeb..641f2ee2be3 100644
--- a/src/mess/drivers/mpf1.c
+++ b/src/mess/drivers/mpf1.c
@@ -479,7 +479,7 @@ DIRECT_UPDATE_MEMBER(mpf1_state::mpf1_direct_update_handler)
DRIVER_INIT_MEMBER(mpf1_state,mpf1)
{
- m_maincpu->space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(mpf1_state::mpf1_direct_update_handler), this));
+ m_maincpu->space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(mpf1_state::mpf1_direct_update_handler), this));
}
COMP( 1979, mpf1, 0, 0, mpf1, mpf1, mpf1_state, mpf1, "Multitech", "Micro Professor 1", 0)
diff --git a/src/mess/drivers/mpz80.c b/src/mess/drivers/mpz80.c
index 9a3a3dd24ce..a2ee381d179 100644
--- a/src/mess/drivers/mpz80.c
+++ b/src/mess/drivers/mpz80.c
@@ -840,8 +840,8 @@ DIRECT_UPDATE_MEMBER(mpz80_state::mpz80_direct_update_handler)
DRIVER_INIT_MEMBER(mpz80_state,mpz80)
{
- address_space *program = machine().device<cpu_device>(Z80_TAG)->space(AS_PROGRAM);
- program->set_direct_update_handler(direct_update_delegate(FUNC(mpz80_state::mpz80_direct_update_handler), this));
+ address_space &program = machine().device<cpu_device>(Z80_TAG)->space(AS_PROGRAM);
+ program.set_direct_update_handler(direct_update_delegate(FUNC(mpz80_state::mpz80_direct_update_handler), this));
}
diff --git a/src/mess/drivers/ms0515.c b/src/mess/drivers/ms0515.c
index c96f24adfe6..69050349877 100644
--- a/src/mess/drivers/ms0515.c
+++ b/src/mess/drivers/ms0515.c
@@ -118,7 +118,7 @@ WRITE8_MEMBER(ms0515_state::ms0515_sys_w)
void ms0515_state::machine_reset()
{
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
- ms0515_bank_w(*machine().memory().first_space(),0,0);
+ ms0515_bank_w(machine().driver_data()->generic_space(),0,0);
m_video_ram = ram + 0000000 + 0340000;
m_blink = 0;
diff --git a/src/mess/drivers/msbc1.c b/src/mess/drivers/msbc1.c
index b2794507576..d911247a9f6 100644
--- a/src/mess/drivers/msbc1.c
+++ b/src/mess/drivers/msbc1.c
@@ -65,7 +65,7 @@ INPUT_PORTS_END
void msbc1_state::machine_reset()
{
- void *ram = machine().firstcpu->space(AS_PROGRAM)->get_write_ptr(0);
+ void *ram = machine().firstcpu->space(AS_PROGRAM).get_write_ptr(0);
UINT8 *rom = memregion(MC68000R12_TAG)->base();
memcpy(ram, rom, 8);
diff --git a/src/mess/drivers/mstation.c b/src/mess/drivers/mstation.c
index b24682158df..e4bc79b34e8 100644
--- a/src/mess/drivers/mstation.c
+++ b/src/mess/drivers/mstation.c
@@ -174,7 +174,7 @@ UINT32 mstation_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap
void mstation_state::refresh_memory(UINT8 bank, UINT8 chip_select)
{
- address_space* program = m_maincpu->space(AS_PROGRAM);
+ address_space& program = m_maincpu->space(AS_PROGRAM);
int &active_flash = (bank == 1 ? m_flash_at_0x4000 : m_flash_at_0x8000);
char bank_tag[6];
@@ -185,9 +185,9 @@ void mstation_state::refresh_memory(UINT8 bank, UINT8 chip_select)
if (active_flash < 0)
{
if (bank == 1)
- program->install_readwrite_handler(0x4000, 0x7fff, 0, 0, read8_delegate(FUNC(mstation_state::flash_0x4000_read_handler), this), write8_delegate(FUNC(mstation_state::flash_0x4000_write_handler), this));
+ program.install_readwrite_handler(0x4000, 0x7fff, 0, 0, read8_delegate(FUNC(mstation_state::flash_0x4000_read_handler), this), write8_delegate(FUNC(mstation_state::flash_0x4000_write_handler), this));
else
- program->install_readwrite_handler(0x8000, 0xbfff, 0, 0, read8_delegate(FUNC(mstation_state::flash_0x8000_read_handler), this), write8_delegate(FUNC(mstation_state::flash_0x8000_write_handler), this));
+ program.install_readwrite_handler(0x8000, 0xbfff, 0, 0, read8_delegate(FUNC(mstation_state::flash_0x8000_read_handler), this), write8_delegate(FUNC(mstation_state::flash_0x8000_write_handler), this));
}
active_flash = chip_select ? 1 : 0;
@@ -195,20 +195,20 @@ void mstation_state::refresh_memory(UINT8 bank, UINT8 chip_select)
case 1: // banked RAM
sprintf(bank_tag,"bank%d", bank);
membank(bank_tag)->set_base(m_ram_base + (((bank == 1 ? m_bank1[0] : m_bank2[0]) & 0x07)<<14));
- program->install_readwrite_bank (bank * 0x4000, bank * 0x4000 + 0x3fff, bank_tag);
+ program.install_readwrite_bank (bank * 0x4000, bank * 0x4000 + 0x3fff, bank_tag);
active_flash = -1;
break;
case 2: // left LCD panel
- program->install_readwrite_handler(bank * 0x4000, bank * 0x4000 + 0x3fff, 0, 0, read8_delegate(FUNC(mstation_state::lcd_left_r), this), write8_delegate(FUNC(mstation_state::lcd_left_w), this));
+ program.install_readwrite_handler(bank * 0x4000, bank * 0x4000 + 0x3fff, 0, 0, read8_delegate(FUNC(mstation_state::lcd_left_r), this), write8_delegate(FUNC(mstation_state::lcd_left_w), this));
active_flash = -1;
break;
case 4: // right LCD panel
- program->install_readwrite_handler(bank * 0x4000, bank * 0x4000 + 0x3fff, 0, 0, read8_delegate(FUNC(mstation_state::lcd_right_r), this), write8_delegate(FUNC(mstation_state::lcd_right_w), this));
+ program.install_readwrite_handler(bank * 0x4000, bank * 0x4000 + 0x3fff, 0, 0, read8_delegate(FUNC(mstation_state::lcd_right_r), this), write8_delegate(FUNC(mstation_state::lcd_right_w), this));
active_flash = -1;
break;
default:
logerror("Unknown chip %02x mapped at %04x - %04x\n", chip_select, bank * 0x4000, bank * 0x4000 + 0x3fff);
- program->unmap_readwrite(bank * 0x4000, bank * 0x4000 + 0x3fff);
+ program.unmap_readwrite(bank * 0x4000, bank * 0x4000 + 0x3fff);
active_flash = -1;
break;
}
diff --git a/src/mess/drivers/nanos.c b/src/mess/drivers/nanos.c
index 74c7c831ca4..06c9493dada 100644
--- a/src/mess/drivers/nanos.c
+++ b/src/mess/drivers/nanos.c
@@ -439,7 +439,7 @@ void nanos_state::machine_start()
void nanos_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_write_bank(0x0000, 0x0fff, "bank3");
space.install_write_bank(0x1000, 0xffff, "bank2");
diff --git a/src/mess/drivers/nc.c b/src/mess/drivers/nc.c
index 0e41dbffe8e..0ec5e4798a7 100644
--- a/src/mess/drivers/nc.c
+++ b/src/mess/drivers/nc.c
@@ -321,7 +321,7 @@ static const char *const nc_bankhandler_w[]={
static void nc_refresh_memory_bank_config(running_machine &machine, int bank)
{
nc_state *state = machine.driver_data<nc_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int mem_type;
int mem_bank;
char bank1[10];
diff --git a/src/mess/drivers/newbrain.c b/src/mess/drivers/newbrain.c
index 5c725efc15b..8dac24e0c8b 100644
--- a/src/mess/drivers/newbrain.c
+++ b/src/mess/drivers/newbrain.c
@@ -55,18 +55,18 @@ void newbrain_state::check_interrupt()
/* Bank Switching */
#define memory_install_unmapped(program, bank, bank_start, bank_end) \
- program->unmap_readwrite(bank_start, bank_end);
+ program.unmap_readwrite(bank_start, bank_end);
#define memory_install_rom_helper(program, bank, bank_start, bank_end) \
- program->install_read_bank(bank_start, bank_end, bank); \
- program->unmap_write(bank_start, bank_end);
+ program.install_read_bank(bank_start, bank_end, bank); \
+ program.unmap_write(bank_start, bank_end);
#define memory_install_ram_helper(program, bank, bank_start, bank_end) \
- program->install_readwrite_bank(bank_start, bank_end, bank);
+ program.install_readwrite_bank(bank_start, bank_end, bank);
void newbrain_eim_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
int bank;
for (bank = 1; bank < 9; bank++)
@@ -104,7 +104,7 @@ void newbrain_eim_state::bankswitch()
void newbrain_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
int bank;
for (bank = 1; bank < 9; bank++)
diff --git a/src/mess/drivers/next.c b/src/mess/drivers/next.c
index 540b4fec45e..1d9510c60d3 100644
--- a/src/mess/drivers/next.c
+++ b/src/mess/drivers/next.c
@@ -304,7 +304,7 @@ void next_state::dma_drq_w(int slot, bool state)
dma_slot &ds = dma_slots[slot];
ds.drq = state;
if(state && (ds.state & DMA_ENABLE)) {
- address_space &space = *maincpu->space(AS_PROGRAM);
+ address_space &space = maincpu->space(AS_PROGRAM);
if(ds.state & DMA_READ) {
while(ds.drq) {
dma_check_update(slot);
diff --git a/src/mess/drivers/ng_aes.c b/src/mess/drivers/ng_aes.c
index b41cbda1253..a0934d40bd7 100644
--- a/src/mess/drivers/ng_aes.c
+++ b/src/mess/drivers/ng_aes.c
@@ -612,7 +612,7 @@ WRITE16_MEMBER(ng_aes_state::main_cpu_bank_select_w)
static void main_cpu_banking_init( running_machine &machine )
{
ng_aes_state *state = machine.driver_data<ng_aes_state>();
- address_space &mainspace = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &mainspace = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* create vector banks */
state->membank(NEOGEO_BANK_VECTORS)->configure_entry(0, machine.root_device().memregion("mainbios")->base());
@@ -753,7 +753,7 @@ static void audio_cpu_banking_init( running_machine &machine )
set_audio_cpu_banking(machine);
state->m_audio_cpu_rom_source_last = 0;
- set_audio_cpu_rom_source(*machine.device("maincpu")->memory().space(AS_PROGRAM), 0);
+ set_audio_cpu_rom_source(machine.device("maincpu")->memory().space(AS_PROGRAM), 0);
}
@@ -1149,7 +1149,7 @@ static void aes_postload(neogeo_state *state)
_set_main_cpu_bank_address(state->machine());
_set_main_cpu_vector_table_source(state->machine());
set_audio_cpu_banking(state->machine());
- _set_audio_cpu_rom_source(*state->machine().device("maincpu")->memory().space(AS_PROGRAM));
+ _set_audio_cpu_rom_source(state->machine().device("maincpu")->memory().space(AS_PROGRAM));
}
static void common_machine_start(running_machine &machine)
@@ -1254,7 +1254,7 @@ MACHINE_START_MEMBER(ng_aes_state,neocd)
MACHINE_RESET_MEMBER(ng_aes_state,neogeo)
{
offs_t offs;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* reset system control registers */
for (offs = 0; offs < 8; offs++)
diff --git a/src/mess/drivers/ob68k1a.c b/src/mess/drivers/ob68k1a.c
index d4ad42e52a9..8b85dd1aa6e 100644
--- a/src/mess/drivers/ob68k1a.c
+++ b/src/mess/drivers/ob68k1a.c
@@ -288,13 +288,13 @@ static serial_terminal_interface terminal_intf =
void ob68k1a_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
// configure RAM
switch (m_ram->size())
{
case 32*1024:
- program->unmap_readwrite(0x008000, 0x01ffff);
+ program.unmap_readwrite(0x008000, 0x01ffff);
break;
}
}
@@ -306,14 +306,14 @@ void ob68k1a_state::machine_start()
void ob68k1a_state::machine_reset()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
// initialize COM8116
// m_dbrg->stt_w(program, 0, 0x01);
// m_dbrg->str_w(program, 0, 0x01);
// set reset vector
- void *ram = program->get_write_ptr(0);
+ void *ram = program.get_write_ptr(0);
UINT8 *rom = memregion(MC68000L10_TAG)->base();
memcpy(ram, rom, 8);
diff --git a/src/mess/drivers/osi.c b/src/mess/drivers/osi.c
index ec6b27116de..875892b1243 100644
--- a/src/mess/drivers/osi.c
+++ b/src/mess/drivers/osi.c
@@ -674,7 +674,7 @@ static ACIA6850_INTERFACE( osi470_acia_intf )
void sb2m600_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* configure RAM banking */
membank("bank1")->configure_entry(0, memregion(M6502_TAG)->base());
@@ -683,12 +683,12 @@ void sb2m600_state::machine_start()
switch (m_ram->size())
{
case 4*1024:
- program->install_readwrite_bank(0x0000, 0x0fff, "bank1");
- program->unmap_readwrite(0x1000, 0x1fff);
+ program.install_readwrite_bank(0x0000, 0x0fff, "bank1");
+ program.unmap_readwrite(0x1000, 0x1fff);
break;
case 8*1024:
- program->install_readwrite_bank(0x0000, 0x1fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x1fff, "bank1");
break;
}
@@ -699,7 +699,7 @@ void sb2m600_state::machine_start()
void c1p_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* configure RAM banking */
membank("bank1")->configure_entry(0, memregion(M6502_TAG)->base());
@@ -708,12 +708,12 @@ void c1p_state::machine_start()
switch (m_ram->size())
{
case 8*1024:
- program->install_readwrite_bank(0x0000, 0x1fff, "bank1");
- program->unmap_readwrite(0x2000, 0x4fff);
+ program.install_readwrite_bank(0x0000, 0x1fff, "bank1");
+ program.unmap_readwrite(0x2000, 0x4fff);
break;
case 20*1024:
- program->install_readwrite_bank(0x0000, 0x4fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x4fff, "bank1");
break;
}
diff --git a/src/mess/drivers/p8k.c b/src/mess/drivers/p8k.c
index 075b07dc857..bbdf2c5a038 100644
--- a/src/mess/drivers/p8k.c
+++ b/src/mess/drivers/p8k.c
@@ -513,12 +513,12 @@ static WRITE16_DEVICE_HANDLER( p8k_16_pio_w )
static READ16_DEVICE_HANDLER( p8k_16_ctc_r )
{
- return (UINT16)downcast<z80ctc_device *>(device)->read(*device->machine().memory().first_space(),(offset & 0x06) >> 1);
+ return (UINT16)downcast<z80ctc_device *>(device)->read(device->machine().driver_data()->generic_space(),(offset & 0x06) >> 1);
}
static WRITE16_DEVICE_HANDLER( p8k_16_ctc_w )
{
- downcast<z80ctc_device *>(device)->write(*device->machine().memory().first_space(), (offset & 0x06) >> 1, (UINT8)(data & 0xff));
+ downcast<z80ctc_device *>(device)->write(device->machine().driver_data()->generic_space(), (offset & 0x06) >> 1, (UINT8)(data & 0xff));
}
READ16_MEMBER( p8k_state::portff82_r )
diff --git a/src/mess/drivers/palm.c b/src/mess/drivers/palm.c
index 6ac364715ca..2a3b975342d 100644
--- a/src/mess/drivers/palm.c
+++ b/src/mess/drivers/palm.c
@@ -120,7 +120,7 @@ static void palm_spim_exchange( device_t *device )
void palm_state::machine_start()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_read_bank (0x000000, machine().device<ram_device>(RAM_TAG)->size() - 1, machine().device<ram_device>(RAM_TAG)->size() - 1, 0, "bank1");
space.install_write_bank(0x000000, machine().device<ram_device>(RAM_TAG)->size() - 1, machine().device<ram_device>(RAM_TAG)->size() - 1, 0, "bank1");
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
diff --git a/src/mess/drivers/pasopia7.c b/src/mess/drivers/pasopia7.c
index 18f9ba2832b..cfb98f3ff74 100644
--- a/src/mess/drivers/pasopia7.c
+++ b/src/mess/drivers/pasopia7.c
@@ -579,12 +579,12 @@ READ8_MEMBER( pasopia7_state::pasopia7_io_r )
if(m_mio_sel)
{
- address_space *ram_space = m_maincpu->space(AS_PROGRAM);
+ address_space &ram_space = m_maincpu->space(AS_PROGRAM);
m_mio_sel = 0;
//printf("%08x\n",offset);
//return 0x0d; // hack: this is used for reading the keyboard data, we can fake it a little ... (modify fda4)
- return ram_space->read_byte(offset);
+ return ram_space.read_byte(offset);
}
io_port = offset & 0xff; //trim down to 8-bit bus
@@ -630,9 +630,9 @@ WRITE8_MEMBER( pasopia7_state::pasopia7_io_w )
if(m_mio_sel)
{
- address_space *ram_space = m_maincpu->space(AS_PROGRAM);
+ address_space &ram_space = m_maincpu->space(AS_PROGRAM);
m_mio_sel = 0;
- ram_space->write_byte(offset, data);
+ ram_space.write_byte(offset, data);
return;
}
diff --git a/src/mess/drivers/pc1512.c b/src/mess/drivers/pc1512.c
index 63c082d8a84..8196d0308c1 100644
--- a/src/mess/drivers/pc1512.c
+++ b/src/mess/drivers/pc1512.c
@@ -888,18 +888,18 @@ WRITE_LINE_MEMBER( pc1512_state::eop_w )
READ8_MEMBER( pc1512_state::memr_r )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
offs_t page_offset = m_dma_page[m_dma_channel] << 16;
- return program->read_byte(page_offset + offset);
+ return program.read_byte(page_offset + offset);
}
WRITE8_MEMBER( pc1512_state::memw_w )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
offs_t page_offset = m_dma_page[m_dma_channel] << 16;
- program->write_byte(page_offset + offset, data);
+ program.write_byte(page_offset + offset, data);
}
READ8_MEMBER( pc1512_state::ior1_r )
@@ -1210,8 +1210,8 @@ void pc1512_state::machine_start()
if (ram_size < 640 * 1024)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
- program->unmap_readwrite(ram_size, 0x9ffff);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
+ program.unmap_readwrite(ram_size, 0x9ffff);
}
// state saving
diff --git a/src/mess/drivers/pc6001.c b/src/mess/drivers/pc6001.c
index 39f8c242269..e4de11fddba 100644
--- a/src/mess/drivers/pc6001.c
+++ b/src/mess/drivers/pc6001.c
@@ -2069,7 +2069,7 @@ static TIMER_DEVICE_CALLBACK(cassette_callback)
static TIMER_DEVICE_CALLBACK(keyboard_callback)
{
pc6001_state *state = timer.machine().driver_data<pc6001_state>();
- address_space &space = *timer.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = timer.machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT32 key1 = timer.machine().root_device().ioport("key1")->read();
UINT32 key2 = timer.machine().root_device().ioport("key2")->read();
UINT32 key3 = timer.machine().root_device().ioport("key3")->read();
diff --git a/src/mess/drivers/pc8001.c b/src/mess/drivers/pc8001.c
index b57b1cf8953..ded3e003275 100644
--- a/src/mess/drivers/pc8001.c
+++ b/src/mess/drivers/pc8001.c
@@ -456,16 +456,16 @@ WRITE8_MEMBER( pc8001_state::dma_mem_w )
READ8_MEMBER( pc8001_state::dma_io_r )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
- return program->read_byte(offset);
+ return program.read_byte(offset);
}
WRITE8_MEMBER( pc8001_state::dma_io_w )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
- program->write_byte(offset, data);
+ program.write_byte(offset, data);
}
static I8257_INTERFACE( dmac_intf )
@@ -491,7 +491,7 @@ static UPD1990A_INTERFACE( rtc_intf )
void pc8001_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* initialize RTC */
m_rtc->cs_w(1);
@@ -504,31 +504,31 @@ void pc8001_state::machine_start()
UINT8 *ram = m_ram->pointer();
membank("bank1")->configure_entry(1, memregion("n80")->base());
- program->install_read_bank(0x0000, 0x5fff, "bank1");
- program->unmap_write(0x0000, 0x5fff);
+ program.install_read_bank(0x0000, 0x5fff, "bank1");
+ program.unmap_write(0x0000, 0x5fff);
switch (m_ram->size())
{
case 16*1024:
membank("bank3")->configure_entry(0, ram);
- program->unmap_readwrite(0x6000, 0xbfff);
- program->unmap_readwrite(0x8000, 0xbfff);
- program->install_readwrite_bank(0xc000, 0xffff, "bank3");
+ program.unmap_readwrite(0x6000, 0xbfff);
+ program.unmap_readwrite(0x8000, 0xbfff);
+ program.install_readwrite_bank(0xc000, 0xffff, "bank3");
break;
case 32*1024:
membank("bank3")->configure_entry(0, ram);
- program->unmap_readwrite(0x6000, 0xbfff);
- program->install_readwrite_bank(0x8000, 0xffff, "bank3");
+ program.unmap_readwrite(0x6000, 0xbfff);
+ program.install_readwrite_bank(0x8000, 0xffff, "bank3");
break;
case 64*1024:
membank("bank1")->configure_entry(0, ram);
membank("bank2")->configure_entry(0, ram + 0x6000);
membank("bank3")->configure_entry(0, ram + 0x8000);
- program->install_readwrite_bank(0x0000, 0x5fff, "bank1");
- program->install_readwrite_bank(0x6000, 0xbfff, "bank2");
- program->install_readwrite_bank(0x8000, 0xffff, "bank3");
+ program.install_readwrite_bank(0x0000, 0x5fff, "bank1");
+ program.install_readwrite_bank(0x6000, 0xbfff, "bank2");
+ program.install_readwrite_bank(0x8000, 0xffff, "bank3");
membank("bank2")->set_entry(0);
break;
}
diff --git a/src/mess/drivers/pc8401a.c b/src/mess/drivers/pc8401a.c
index edc357f8eab..787c49a9e7e 100644
--- a/src/mess/drivers/pc8401a.c
+++ b/src/mess/drivers/pc8401a.c
@@ -72,7 +72,7 @@ static TIMER_DEVICE_CALLBACK( pc8401a_keyboard_tick )
void pc8401a_state::bankswitch(UINT8 data)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
int rombank = data & 0x03;
int ram0000 = (data >> 2) & 0x03;
@@ -84,26 +84,26 @@ void pc8401a_state::bankswitch(UINT8 data)
if (rombank < 3)
{
/* internal ROM */
- program->install_read_bank(0x0000, 0x7fff, "bank1");
- program->unmap_write(0x0000, 0x7fff);
+ program.install_read_bank(0x0000, 0x7fff, "bank1");
+ program.unmap_write(0x0000, 0x7fff);
membank("bank1")->set_entry(rombank);
}
else
{
/* ROM cartridge */
- program->unmap_readwrite(0x0000, 0x7fff);
+ program.unmap_readwrite(0x0000, 0x7fff);
}
//logerror("0x0000-0x7fff = ROM %u\n", rombank);
break;
case 1: /* RAM 0000H to 7FFFH */
- program->install_readwrite_bank(0x0000, 0x7fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x7fff, "bank1");
membank("bank1")->set_entry(4);
//logerror("0x0000-0x7fff = RAM 0-7fff\n");
break;
case 2: /* RAM 8000H to FFFFH */
- program->install_readwrite_bank(0x0000, 0x7fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x7fff, "bank1");
membank("bank1")->set_entry(5);
//logerror("0x0000-0x7fff = RAM 8000-ffff\n");
break;
@@ -116,19 +116,19 @@ void pc8401a_state::bankswitch(UINT8 data)
switch (ram8000)
{
case 0: /* cell addresses 0000H to 3FFFH */
- program->install_readwrite_bank(0x8000, 0xbfff, "bank3");
+ program.install_readwrite_bank(0x8000, 0xbfff, "bank3");
membank("bank3")->set_entry(0);
//logerror("0x8000-0xbfff = RAM 0-3fff\n");
break;
case 1: /* cell addresses 4000H to 7FFFH */
- program->install_readwrite_bank(0x8000, 0xbfff, "bank3");
+ program.install_readwrite_bank(0x8000, 0xbfff, "bank3");
membank("bank3")->set_entry(1);
//logerror("0x8000-0xbfff = RAM 4000-7fff\n");
break;
case 2: /* cell addresses 8000H to BFFFH */
- program->install_readwrite_bank(0x8000, 0xbfff, "bank3");
+ program.install_readwrite_bank(0x8000, 0xbfff, "bank3");
membank("bank3")->set_entry(2);
//logerror("0x8000-0xbfff = RAM 8000-bfff\n");
break;
@@ -136,12 +136,12 @@ void pc8401a_state::bankswitch(UINT8 data)
case 3: /* RAM cartridge */
if (m_ram->size() > 64)
{
- program->install_readwrite_bank(0x8000, 0xbfff, "bank3");
+ program.install_readwrite_bank(0x8000, 0xbfff, "bank3");
membank("bank3")->set_entry(3); // TODO or 4
}
else
{
- program->unmap_readwrite(0x8000, 0xbfff);
+ program.unmap_readwrite(0x8000, 0xbfff);
}
//logerror("0x8000-0xbfff = RAM cartridge\n");
break;
@@ -150,15 +150,15 @@ void pc8401a_state::bankswitch(UINT8 data)
if (BIT(data, 6))
{
/* CRT video RAM */
- program->install_readwrite_bank(0xc000, 0xdfff, "bank4");
- program->unmap_readwrite(0xe000, 0xe7ff);
+ program.install_readwrite_bank(0xc000, 0xdfff, "bank4");
+ program.unmap_readwrite(0xe000, 0xe7ff);
membank("bank4")->set_entry(1);
//logerror("0xc000-0xdfff = video RAM\n");
}
else
{
/* RAM */
- program->install_readwrite_bank(0xc000, 0xe7ff, "bank4");
+ program.install_readwrite_bank(0xc000, 0xe7ff, "bank4");
membank("bank4")->set_entry(0);
//logerror("0xc000-0e7fff = RAM c000-e7fff\n");
}
diff --git a/src/mess/drivers/pc88va.c b/src/mess/drivers/pc88va.c
index d4522ce7142..84b44d883d4 100644
--- a/src/mess/drivers/pc88va.c
+++ b/src/mess/drivers/pc88va.c
@@ -651,7 +651,7 @@ WRITE8_MEMBER(pc88va_state::idp_command_w)
static void tsp_sprite_enable(running_machine &machine, UINT32 spr_offset, UINT8 sw_bit)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
space.write_word(spr_offset, space.read_word(spr_offset) & ~0x200);
space.write_word(spr_offset, space.read_word(spr_offset) | (sw_bit & 0x200));
diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c
index c54ca84aa1f..3d2ff84e4a7 100644
--- a/src/mess/drivers/pc9801.c
+++ b/src/mess/drivers/pc9801.c
@@ -2611,7 +2611,7 @@ MACHINE_START_MEMBER(pc9801_state,pc9821)
INTERRUPT_GEN_MEMBER(pc9801_state::pc9801_vrtc_irq)
{
#if 0
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
static UINT8 test;
if(machine().input().code_pressed_once(JOYCODE_BUTTON1))
diff --git a/src/mess/drivers/pce220.c b/src/mess/drivers/pce220.c
index 77fb0afc156..04d68f00b31 100644
--- a/src/mess/drivers/pce220.c
+++ b/src/mess/drivers/pce220.c
@@ -340,8 +340,8 @@ WRITE8_MEMBER( pce220_state::boot_bank_w )
// set to 1 after boot for restore the ram in the first bank
if (data & 0x01)
{
- address_space *space_prg = m_maincpu->space(AS_PROGRAM);
- space_prg->install_write_bank(0x0000, 0x3fff, "bank1");
+ address_space &space_prg = m_maincpu->space(AS_PROGRAM);
+ space_prg.install_write_bank(0x0000, 0x3fff, "bank1");
membank("bank1")->set_entry(0);
}
}
@@ -472,16 +472,16 @@ READ8_MEMBER( pcg850v_state::g850v_bank_r )
WRITE8_MEMBER( pcg850v_state::g850v_bank_w )
{
- address_space *space_prg = m_maincpu->space(AS_PROGRAM);
+ address_space &space_prg = m_maincpu->space(AS_PROGRAM);
if (data < 0x16)
{
- space_prg->install_read_bank(0xc000, 0xffff, "bank4");
+ space_prg.install_read_bank(0xc000, 0xffff, "bank4");
membank("bank4")->set_entry(data);
}
else
{
- space_prg->unmap_read(0xc000, 0xffff);
+ space_prg.unmap_read(0xc000, 0xffff);
}
m_g850v_bank_num = data;
@@ -873,7 +873,7 @@ void pcg850v_state::machine_start()
void pce220_state::machine_reset()
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
space.unmap_write(0x0000, 0x3fff);
// install the boot code into the first bank
diff --git a/src/mess/drivers/pcfx.c b/src/mess/drivers/pcfx.c
index cb3a403d99c..8dad94a509e 100644
--- a/src/mess/drivers/pcfx.c
+++ b/src/mess/drivers/pcfx.c
@@ -65,16 +65,16 @@ public:
READ8_MEMBER(pcfx_state::extio_r)
{
- address_space *io_space = m_maincpu->space(AS_IO);
+ address_space &io_space = m_maincpu->space(AS_IO);
- return io_space->read_byte(offset);
+ return io_space.read_byte(offset);
}
WRITE8_MEMBER(pcfx_state::extio_w)
{
- address_space *io_space = m_maincpu->space(AS_IO);
+ address_space &io_space = m_maincpu->space(AS_IO);
- io_space->write_byte(offset, data);
+ io_space.write_byte(offset, data);
}
static ADDRESS_MAP_START( pcfx_mem, AS_PROGRAM, 32, pcfx_state )
diff --git a/src/mess/drivers/pcw.c b/src/mess/drivers/pcw.c
index c539786c37c..adec44c1e34 100644
--- a/src/mess/drivers/pcw.c
+++ b/src/mess/drivers/pcw.c
@@ -234,7 +234,7 @@ READ8_MEMBER(pcw_state::pcw_keyboard_data_r)
static void pcw_update_read_memory_block(running_machine &machine, int block, int bank)
{
pcw_state *state = machine.driver_data<pcw_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
char block_name[10];
sprintf(block_name,"bank%d",block+1);
diff --git a/src/mess/drivers/pcw16.c b/src/mess/drivers/pcw16.c
index 357819c1a0c..cd14f605b9f 100644
--- a/src/mess/drivers/pcw16.c
+++ b/src/mess/drivers/pcw16.c
@@ -369,7 +369,7 @@ READ8_MEMBER(pcw16_state::pcw16_no_mem_r)
/*
static void pcw16_set_bank_handlers(running_machine &machine, int bank, PCW16_RAM_TYPE type)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
pcw16_state *state = machine.driver_data<pcw16_state>();
switch (type) {
case PCW16_MEM_ROM:
@@ -441,7 +441,7 @@ static void pcw16_update_bank(running_machine &machine, int bank)
flashdev = machine.device<intelfsh8_device>("flash1");
}
- mem_ptr = (unsigned char *)flashdev->space()->get_read_ptr(0);
+ mem_ptr = (unsigned char *)flashdev->space().get_read_ptr(0);
}
}
diff --git a/src/mess/drivers/pdp1.c b/src/mess/drivers/pdp1.c
index 508ab743284..98c48831efe 100644
--- a/src/mess/drivers/pdp1.c
+++ b/src/mess/drivers/pdp1.c
@@ -1588,12 +1588,12 @@ static void iot_dcc(device_t *device, int op2, int nac, int mb, int *io, int ac)
{
if ((state->m_parallel_drum.wfb >= 1) && (state->m_parallel_drum.wfb <= 22))
{
- drum_write(state, state->m_parallel_drum.wfb-1, dc, (signed)device->machine().device("maincpu")->memory().space(AS_PROGRAM)->read_dword(state->m_parallel_drum.wcl<<2));
+ drum_write(state, state->m_parallel_drum.wfb-1, dc, (signed)device->machine().device("maincpu")->memory().space(AS_PROGRAM).read_dword(state->m_parallel_drum.wcl<<2));
}
if ((state->m_parallel_drum.rfb >= 1) && (state->m_parallel_drum.rfb <= 22))
{
- device->machine().device("maincpu")->memory().space(AS_PROGRAM)->write_dword(state->m_parallel_drum.wcl<<2, drum_read(state, state->m_parallel_drum.rfb-1, dc));
+ device->machine().device("maincpu")->memory().space(AS_PROGRAM).write_dword(state->m_parallel_drum.wcl<<2, drum_read(state, state->m_parallel_drum.rfb-1, dc));
}
state->m_parallel_drum.wc = (state->m_parallel_drum.wc+1) & 07777;
@@ -1862,7 +1862,7 @@ INTERRUPT_GEN_MEMBER(pdp1_state::pdp1_interrupt)
device.state().set_state_int(PDP1_MA, device.state().state_int(PDP1_PC));
device.state().set_state_int(PDP1_IR, LAC); /* this instruction is actually executed */
- device.state().set_state_int(PDP1_MB, (signed)device.memory().space(AS_PROGRAM)->read_dword(PDP1_MA<<2));
+ device.state().set_state_int(PDP1_MB, (signed)device.memory().space(AS_PROGRAM).read_dword(PDP1_MA<<2));
device.state().set_state_int(PDP1_AC, device.state().state_int(PDP1_MB));
}
if (control_transitions & pdp1_deposit)
@@ -1874,7 +1874,7 @@ INTERRUPT_GEN_MEMBER(pdp1_state::pdp1_interrupt)
device.state().set_state_int(PDP1_IR, DAC); /* this instruction is actually executed */
device.state().set_state_int(PDP1_MB, device.state().state_int(PDP1_AC));
- device.memory().space(AS_PROGRAM)->write_dword(device.state().state_int(PDP1_MA)<<2, device.state().state_int(PDP1_MB));
+ device.memory().space(AS_PROGRAM).write_dword(device.state().state_int(PDP1_MA)<<2, device.state().state_int(PDP1_MB));
}
if (control_transitions & pdp1_read_in)
{ /* set cpu to read instructions from perforated tape */
diff --git a/src/mess/drivers/pentagon.c b/src/mess/drivers/pentagon.c
index 735a25ce818..b44d898b93c 100644
--- a/src/mess/drivers/pentagon.c
+++ b/src/mess/drivers/pentagon.c
@@ -112,7 +112,7 @@ MACHINE_RESET_MEMBER(pentagon_state,pentagon)
{
UINT8 *messram = machine().device<ram_device>(RAM_TAG)->pointer();
device_t *beta = machine().device(BETA_DISK_TAG);
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_read_bank(0x0000, 0x3fff, "bank1");
space.unmap_write(0x0000, 0x3fff);
diff --git a/src/mess/drivers/pes.c b/src/mess/drivers/pes.c
index 49a651826be..beaf7c8dda9 100644
--- a/src/mess/drivers/pes.c
+++ b/src/mess/drivers/pes.c
@@ -114,7 +114,7 @@ static int data_to_i8031(device_t *device)
static void data_from_i8031(device_t *device, int data)
{
pes_state *state = device->machine().driver_data<pes_state>();
- state->m_terminal->write(*device->machine().memory().first_space(),0,data);
+ state->m_terminal->write(device->machine().driver_data()->generic_space(),0,data);
#ifdef DEBUG_SERIAL_CB
fprintf(stderr,"callback: output from i8031/pes to pc/terminal: %02X\n",data);
#endif
diff --git a/src/mess/drivers/pipbug.c b/src/mess/drivers/pipbug.c
index b95737a8e1d..48bc1c69cdf 100644
--- a/src/mess/drivers/pipbug.c
+++ b/src/mess/drivers/pipbug.c
@@ -92,7 +92,7 @@ static const serial_terminal_interface terminal_intf =
QUICKLOAD_LOAD( pipbug )
{
- address_space &space = *image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
int quick_addr = 0x0440;
int exec_addr;
diff --git a/src/mess/drivers/plus4.c b/src/mess/drivers/plus4.c
index a03d81e8d19..042ac3f3d29 100644
--- a/src/mess/drivers/plus4.c
+++ b/src/mess/drivers/plus4.c
@@ -800,12 +800,12 @@ static CBM_IEC_INTERFACE( c16_iec_intf )
READ8_MEMBER( plus4_state::exp_dma_r )
{
- return m_maincpu->space(AS_PROGRAM)->read_byte(offset);
+ return m_maincpu->space(AS_PROGRAM).read_byte(offset);
}
WRITE8_MEMBER( plus4_state::exp_dma_w )
{
- m_maincpu->space(AS_PROGRAM)->write_byte(offset, data);
+ m_maincpu->space(AS_PROGRAM).write_byte(offset, data);
}
WRITE_LINE_MEMBER( plus4_state::exp_irq_w )
diff --git a/src/mess/drivers/poly.c b/src/mess/drivers/poly.c
index 442416a1fbc..6574da9264b 100644
--- a/src/mess/drivers/poly.c
+++ b/src/mess/drivers/poly.c
@@ -161,9 +161,9 @@ WRITE8_MEMBER( poly_state::kbd_put )
{
m_term_data = data;
//m_term_key = 1;
- address_space *mem = m_maincpu->space(AS_PROGRAM);
- mem->write_byte(0xebec, data); // this has to be 0xecf1 for bios 1
- mem->write_byte(0xebd0, 1); // any non-zero here
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
+ mem.write_byte(0xebec, data); // this has to be 0xecf1 for bios 1
+ mem.write_byte(0xebd0, 1); // any non-zero here
}
static ASCII_KEYBOARD_INTERFACE( keyboard_intf )
diff --git a/src/mess/drivers/portfoli.c b/src/mess/drivers/portfoli.c
index a307d0e42f8..c5a0e9869b8 100644
--- a/src/mess/drivers/portfoli.c
+++ b/src/mess/drivers/portfoli.c
@@ -438,18 +438,18 @@ WRITE8_MEMBER( portfolio_state::counter_w )
WRITE8_MEMBER( portfolio_state::ncc1_w )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
if (BIT(data, 0))
{
// system ROM
UINT8 *rom = memregion(M80C88A_TAG)->base();
- program->install_rom(0xc0000, 0xdffff, rom);
+ program.install_rom(0xc0000, 0xdffff, rom);
}
else
{
// credit card memory
- program->unmap_readwrite(0xc0000, 0xdffff);
+ program.unmap_readwrite(0xc0000, 0xdffff);
}
//logerror("NCC %02x\n", data);
@@ -763,7 +763,7 @@ static DEVICE_IMAGE_LOAD( portfolio_cart )
void portfolio_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* set CPU interrupt vector callback */
m_maincpu->set_irq_acknowledge_callback(portfolio_int_ack);
@@ -772,11 +772,11 @@ void portfolio_state::machine_start()
switch (machine().device<ram_device>(RAM_TAG)->size())
{
case 128 * 1024:
- program->unmap_readwrite(0x1f000, 0x9efff);
+ program.unmap_readwrite(0x1f000, 0x9efff);
break;
case 384 * 1024:
- program->unmap_readwrite(0x5f000, 0x9efff);
+ program.unmap_readwrite(0x5f000, 0x9efff);
break;
}
@@ -801,22 +801,22 @@ void portfolio_state::machine_start()
void portfolio_state::machine_reset()
{
- address_space *io = m_maincpu->space(AS_IO);
+ address_space &io = m_maincpu->space(AS_IO);
// peripherals
m_pid = ioport("PERIPHERAL")->read();
- io->unmap_readwrite(0x8070, 0x807b);
- io->unmap_readwrite(0x807d, 0x807e);
+ io.unmap_readwrite(0x8070, 0x807b);
+ io.unmap_readwrite(0x807d, 0x807e);
switch (m_pid)
{
case PID_SERIAL:
- io->install_readwrite_handler(0x8070, 0x8077, read8_delegate(FUNC(ins8250_device::ins8250_r), (ins8250_device*)m_uart), write8_delegate(FUNC(ins8250_device::ins8250_w), (ins8250_device*)m_uart));
+ io.install_readwrite_handler(0x8070, 0x8077, read8_delegate(FUNC(ins8250_device::ins8250_r), (ins8250_device*)m_uart), write8_delegate(FUNC(ins8250_device::ins8250_w), (ins8250_device*)m_uart));
break;
case PID_PARALLEL:
- io->install_readwrite_handler(0x8078, 0x807b, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi));
+ io.install_readwrite_handler(0x8078, 0x807b, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi));
break;
}
}
diff --git a/src/mess/drivers/prestige.c b/src/mess/drivers/prestige.c
index b2937484ef5..926f2e49951 100644
--- a/src/mess/drivers/prestige.c
+++ b/src/mess/drivers/prestige.c
@@ -121,7 +121,7 @@ READ8_MEMBER( prestige_state::bankswitch_r )
WRITE8_MEMBER( prestige_state::bankswitch_w )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
switch (offset)
{
@@ -159,26 +159,26 @@ WRITE8_MEMBER( prestige_state::bankswitch_w )
{
//cartridge memory is writable
if (data & 0x08)
- program->install_readwrite_bank(0x4000, 0x7fff, "bank2");
+ program.install_readwrite_bank(0x4000, 0x7fff, "bank2");
else
- program->unmap_write(0x4000, 0x7fff);
+ program.unmap_write(0x4000, 0x7fff);
if (data & 0x04)
- program->install_readwrite_bank(0x8000, 0xbfff, "bank3");
+ program.install_readwrite_bank(0x8000, 0xbfff, "bank3");
else
- program->unmap_write(0x8000, 0xbfff);
+ program.unmap_write(0x8000, 0xbfff);
- program->install_readwrite_bank(0xc000, 0xdfff, "bank4");
+ program.install_readwrite_bank(0xc000, 0xdfff, "bank4");
}
else
{
//cartridge memory is read-only
if (data & 0x02)
- program->unmap_write(0xc000, 0xdfff);
+ program.unmap_write(0xc000, 0xdfff);
else
- program->install_readwrite_bank(0xc000, 0xdfff, "bank4");
+ program.install_readwrite_bank(0xc000, 0xdfff, "bank4");
- program->unmap_write(0x4000, 0xbfff);
+ program.unmap_write(0x4000, 0xbfff);
}
break;
case 6:
diff --git a/src/mess/drivers/prof80.c b/src/mess/drivers/prof80.c
index 3b40862c7f9..1ebb8886f16 100644
--- a/src/mess/drivers/prof80.c
+++ b/src/mess/drivers/prof80.c
@@ -48,7 +48,7 @@
void prof80_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = m_ram->pointer();
UINT8 *rom = memregion(Z80_TAG)->base();
int bank;
@@ -62,27 +62,27 @@ void prof80_state::bankswitch()
switch (block)
{
case BLK_RAM1:
- program->install_ram(start_addr, end_addr, ram + ((bank % 8) * 0x1000));
+ program.install_ram(start_addr, end_addr, ram + ((bank % 8) * 0x1000));
break;
case BLK_RAM2:
- program->install_ram(start_addr, end_addr, ram + 0x8000 + ((bank % 8) * 0x1000));
+ program.install_ram(start_addr, end_addr, ram + 0x8000 + ((bank % 8) * 0x1000));
break;
case BLK_RAM3:
- program->install_ram(start_addr, end_addr, ram + 0x10000 + ((bank % 8) * 0x1000));
+ program.install_ram(start_addr, end_addr, ram + 0x10000 + ((bank % 8) * 0x1000));
break;
case BLK_RAM4:
- program->install_ram(start_addr, end_addr, ram + 0x18000 + ((bank % 8) * 0x1000));
+ program.install_ram(start_addr, end_addr, ram + 0x18000 + ((bank % 8) * 0x1000));
break;
case BLK_EPROM:
- program->install_rom(start_addr, end_addr, rom + ((bank % 2) * 0x1000));
+ program.install_rom(start_addr, end_addr, rom + ((bank % 2) * 0x1000));
break;
default:
- program->unmap_readwrite(start_addr, end_addr);
+ program.unmap_readwrite(start_addr, end_addr);
}
//logerror("Segment %u address %04x-%04x block %u\n", bank, start_addr, end_addr, block);
diff --git a/src/mess/drivers/psx.c b/src/mess/drivers/psx.c
index b01134e0c83..4344a94a9f7 100644
--- a/src/mess/drivers/psx.c
+++ b/src/mess/drivers/psx.c
@@ -431,7 +431,7 @@ DIRECT_UPDATE_MEMBER(psx1_state::psx_setopbase)
{
device_t *cpu = machine().device("maincpu");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(psx1_state::psx_default), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(psx1_state::psx_default), this));
if( load_psxexe( cpu, m_exe_buffer, m_exe_size ) ||
load_cpe( cpu, m_exe_buffer, m_exe_size ) ||
@@ -455,7 +455,7 @@ DIRECT_UPDATE_MEMBER(psx1_state::psx_setopbase)
static QUICKLOAD_LOAD( psx_exe_load )
{
psx1_state *state = image.device().machine().driver_data<psx1_state>();
- address_space &space = *image.device().machine().device( "maincpu")->memory().space( AS_PROGRAM );
+ address_space &space = image.device().machine().device( "maincpu")->memory().space( AS_PROGRAM );
state->m_exe_size = 0;
state->m_exe_buffer = (UINT8*)malloc( quickload_size );
diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c
index 676489a75df..c7019e48954 100644
--- a/src/mess/drivers/px4.c
+++ b/src/mess/drivers/px4.c
@@ -528,7 +528,7 @@ static void install_rom_capsule(address_space &space, int size, const char *regi
/* bank register */
WRITE8_MEMBER(px4_state::px4_bankr_w)
{
- address_space &space_program = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space_program = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (VERBOSE)
logerror("%s: px4_bankr_w (0x%02x)\n", machine().describe_context(), data);
diff --git a/src/mess/drivers/px8.c b/src/mess/drivers/px8.c
index be97e201c45..9809604b396 100644
--- a/src/mess/drivers/px8.c
+++ b/src/mess/drivers/px8.c
@@ -75,38 +75,38 @@ enum
void px8_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = m_ram->pointer();
UINT8 *ipl_rom = memregion(UPD70008_TAG)->base();
if (!m_bank0)
{
/* IPL ROM */
- program->install_rom(0x0000, 0x7fff, ipl_rom);
+ program.install_rom(0x0000, 0x7fff, ipl_rom);
}
else
{
if (m_bk2)
{
/* D-RAM (L) */
- program->install_ram(0x0000, 0x7fff, ram);
+ program.install_ram(0x0000, 0x7fff, ram);
}
else
{
/* OPTION ROM (L) */
- program->unmap_readwrite(0x0000, 0x7fff);
+ program.unmap_readwrite(0x0000, 0x7fff);
}
}
if (m_bk2)
{
/* D-RAM (H) */
- program->install_ram(0x8000, 0xffff, ram + 0x8000);
+ program.install_ram(0x8000, 0xffff, ram + 0x8000);
}
else
{
/* OPTION ROM (H) */
- program->unmap_readwrite(0x8000, 0xffff);
+ program.unmap_readwrite(0x8000, 0xffff);
}
}
diff --git a/src/mess/drivers/ql.c b/src/mess/drivers/ql.c
index 94ec839cb1d..211542b7d44 100644
--- a/src/mess/drivers/ql.c
+++ b/src/mess/drivers/ql.c
@@ -907,7 +907,7 @@ void ql_state::machine_start()
void ql_state::machine_reset()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
m_disk_type=ioport(QL_CONFIG_PORT)->read() & DISK_TYPE_MASK;
logerror("disktype=%d\n",m_disk_type);
@@ -920,23 +920,23 @@ void ql_state::machine_reset()
switch (m_ram->size())
{
case 128*1024:
- program->unmap_readwrite(0x040000, 0x0fffff);
+ program.unmap_readwrite(0x040000, 0x0fffff);
break;
case 192*1024:
- program->unmap_readwrite(0x050000, 0x0fffff);
+ program.unmap_readwrite(0x050000, 0x0fffff);
break;
case 256*1024:
- program->unmap_readwrite(0x060000, 0x0fffff);
+ program.unmap_readwrite(0x060000, 0x0fffff);
break;
case 384*1024:
- program->unmap_readwrite(0x080000, 0x0fffff);
+ program.unmap_readwrite(0x080000, 0x0fffff);
break;
case 640*1024:
- program->unmap_readwrite(0x0c0000, 0x0fffff);
+ program.unmap_readwrite(0x0c0000, 0x0fffff);
break;
}
@@ -944,17 +944,17 @@ void ql_state::machine_reset()
{
case DISK_TYPE_SANDY :
logerror("Configuring SandySuperDisk\n");
- program->install_rom(0x0c0000, 0x0c3fff, &machine().root_device().memregion(M68008_TAG)->base()[SANDY_ROM_BASE]);
- program->install_read_handler(SANDY_IO_BASE, SANDY_IO_END, 0, 0, read8_delegate(FUNC(ql_state::disk_io_r), this));
- program->install_write_handler(SANDY_IO_BASE, SANDY_IO_END, 0, 0, write8_delegate(FUNC(ql_state::disk_io_w), this));
+ program.install_rom(0x0c0000, 0x0c3fff, &machine().root_device().memregion(M68008_TAG)->base()[SANDY_ROM_BASE]);
+ program.install_read_handler(SANDY_IO_BASE, SANDY_IO_END, 0, 0, read8_delegate(FUNC(ql_state::disk_io_r), this));
+ program.install_write_handler(SANDY_IO_BASE, SANDY_IO_END, 0, 0, write8_delegate(FUNC(ql_state::disk_io_w), this));
m_disk_io_base=SANDY_IO_BASE;
break;
case DISK_TYPE_TRUMP :
logerror("Configuring TrumpCard\n");
- program->install_read_handler(CART_ROM_BASE, CART_ROM_END, 0, 0, read8_delegate(FUNC(ql_state::cart_rom_r), this));
- program->install_read_handler(TRUMP_ROM_BASE, TRUMP_ROM_END, 0, 0, read8_delegate(FUNC(ql_state::trump_card_rom_r), this));
- program->install_read_handler(TRUMP_IO_BASE, TRUMP_IO_END, 0, 0, read8_delegate(FUNC(ql_state::disk_io_r), this));
- program->install_write_handler(TRUMP_IO_BASE, TRUMP_IO_END, 0, 0, write8_delegate(FUNC(ql_state::disk_io_w), this));
+ program.install_read_handler(CART_ROM_BASE, CART_ROM_END, 0, 0, read8_delegate(FUNC(ql_state::cart_rom_r), this));
+ program.install_read_handler(TRUMP_ROM_BASE, TRUMP_ROM_END, 0, 0, read8_delegate(FUNC(ql_state::trump_card_rom_r), this));
+ program.install_read_handler(TRUMP_IO_BASE, TRUMP_IO_END, 0, 0, read8_delegate(FUNC(ql_state::disk_io_r), this));
+ program.install_write_handler(TRUMP_IO_BASE, TRUMP_IO_END, 0, 0, write8_delegate(FUNC(ql_state::disk_io_w), this));
m_disk_io_base=TRUMP_IO_BASE;
break;
}
diff --git a/src/mess/drivers/rex6000.c b/src/mess/drivers/rex6000.c
index 473c4ab1b22..d743890d3fd 100644
--- a/src/mess/drivers/rex6000.c
+++ b/src/mess/drivers/rex6000.c
@@ -155,7 +155,7 @@ READ8_MEMBER( rex6000_state::bankswitch_r )
WRITE8_MEMBER( rex6000_state::bankswitch_w )
{
- address_space* program = m_maincpu->space(AS_PROGRAM);
+ address_space& program = m_maincpu->space(AS_PROGRAM);
m_bank[offset&3] = data;
@@ -170,11 +170,11 @@ WRITE8_MEMBER( rex6000_state::bankswitch_w )
if (m_banks[0].type != BANK_UNKNOWN)
{
- program->install_readwrite_handler(0x8000, 0x9fff, 0, 0, read8_delegate(FUNC(rex6000_state::flash_0x8000_r), this), write8_delegate(FUNC(rex6000_state::flash_0x8000_w), this));
+ program.install_readwrite_handler(0x8000, 0x9fff, 0, 0, read8_delegate(FUNC(rex6000_state::flash_0x8000_r), this), write8_delegate(FUNC(rex6000_state::flash_0x8000_w), this));
}
else
{
- program->unmap_readwrite(0x8000, 0x9fff);
+ program.unmap_readwrite(0x8000, 0x9fff);
}
break;
@@ -187,15 +187,15 @@ WRITE8_MEMBER( rex6000_state::bankswitch_w )
if (m_banks[1].type == BANK_RAM)
{
- program->install_ram(0xa000, 0xbfff, m_ram_base + ((m_banks[1].page & 0x03)<<13));
+ program.install_ram(0xa000, 0xbfff, m_ram_base + ((m_banks[1].page & 0x03)<<13));
}
else if (m_banks[1].type != BANK_UNKNOWN)
{
- program->install_readwrite_handler(0xa000, 0xbfff, 0, 0, read8_delegate(FUNC(rex6000_state::flash_0xa000_r), this), write8_delegate(FUNC(rex6000_state::flash_0xa000_w), this));
+ program.install_readwrite_handler(0xa000, 0xbfff, 0, 0, read8_delegate(FUNC(rex6000_state::flash_0xa000_r), this), write8_delegate(FUNC(rex6000_state::flash_0xa000_w), this));
}
else
{
- program->unmap_readwrite(0xa000, 0xbfff);
+ program.unmap_readwrite(0xa000, 0xbfff);
}
break;
@@ -452,10 +452,10 @@ void rex6000_state::machine_start()
}
void rex6000_state::machine_reset()
{
- address_space* program = m_maincpu->space(AS_PROGRAM);
+ address_space& program = m_maincpu->space(AS_PROGRAM);
- program->install_readwrite_handler(0x8000, 0x9fff, 0, 0, read8_delegate(FUNC(rex6000_state::flash_0x8000_r), this), write8_delegate(FUNC(rex6000_state::flash_0x8000_w), this));
- program->install_readwrite_handler(0xa000, 0xbfff, 0, 0, read8_delegate(FUNC(rex6000_state::flash_0xa000_r), this), write8_delegate(FUNC(rex6000_state::flash_0xa000_w), this));
+ program.install_readwrite_handler(0x8000, 0x9fff, 0, 0, read8_delegate(FUNC(rex6000_state::flash_0x8000_r), this), write8_delegate(FUNC(rex6000_state::flash_0x8000_w), this));
+ program.install_readwrite_handler(0xa000, 0xbfff, 0, 0, read8_delegate(FUNC(rex6000_state::flash_0xa000_r), this), write8_delegate(FUNC(rex6000_state::flash_0xa000_w), this));
m_banks[0].type = 0x04;
m_banks[0].type = 0;
@@ -493,7 +493,7 @@ UINT32 rex6000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap,
}
else
{
- data = m_flash[mem_type]->space(0)->read_byte(((lcd_bank & 0x7f)<<13) | (y*30 + x));
+ data = m_flash[mem_type]->space(0).read_byte(((lcd_bank & 0x7f)<<13) | (y*30 + x));
}
@@ -569,7 +569,7 @@ static QUICKLOAD_LOAD(rex6000)
{
static const char magic[] = "ApplicationName:Addin";
running_machine &machine = image.device().machine();
- address_space* flash = machine.device("flash0b")->memory().space(0);
+ address_space& flash = machine.device("flash0b")->memory().space(0);
UINT32 img_start = 0;
UINT8 *data;
@@ -583,7 +583,7 @@ static QUICKLOAD_LOAD(rex6000)
img_start += 0xa0; //skip the icon (40x32 pixel)
for (int i=0; i<image.length() - img_start ;i++)
- flash->write_byte(i, data[img_start + i]);
+ flash.write_byte(i, data[img_start + i]);
auto_free(machine, data);
diff --git a/src/mess/drivers/rx78.c b/src/mess/drivers/rx78.c
index 44b08b3b9d1..62b0b58d47e 100644
--- a/src/mess/drivers/rx78.c
+++ b/src/mess/drivers/rx78.c
@@ -525,10 +525,10 @@ ROM_END
DRIVER_INIT_MEMBER(rx78_state,rx78)
{
UINT32 ram_size = machine().device<ram_device>(RAM_TAG)->size();
- address_space *prg = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &prg = machine().device("maincpu")->memory().space(AS_PROGRAM);
if(ram_size == 0x4000)
- prg->unmap_readwrite(0x6000, 0xafff);
+ prg.unmap_readwrite(0x6000, 0xafff);
}
/* Driver */
diff --git a/src/mess/drivers/sage2.c b/src/mess/drivers/sage2.c
index 1d05f6296ec..d7494dfa7c4 100644
--- a/src/mess/drivers/sage2.c
+++ b/src/mess/drivers/sage2.c
@@ -657,8 +657,8 @@ DIRECT_UPDATE_MEMBER(sage2_state::sage2_direct_update_handler)
DRIVER_INIT_MEMBER(sage2_state,sage2)
{
- address_space *program = machine().device<cpu_device>(M68000_TAG)->space(AS_PROGRAM);
- program->set_direct_update_handler(direct_update_delegate(FUNC(sage2_state::sage2_direct_update_handler), this));
+ address_space &program = machine().device<cpu_device>(M68000_TAG)->space(AS_PROGRAM);
+ program.set_direct_update_handler(direct_update_delegate(FUNC(sage2_state::sage2_direct_update_handler), this));
// patch out i8251 test
machine().root_device().memregion(M68000_TAG)->base()[0x1be8] = 0xd6;
diff --git a/src/mess/drivers/samcoupe.c b/src/mess/drivers/samcoupe.c
index 79e48befb24..282c6fe589d 100644
--- a/src/mess/drivers/samcoupe.c
+++ b/src/mess/drivers/samcoupe.c
@@ -167,7 +167,7 @@ READ8_MEMBER(samcoupe_state::samcoupe_lmpr_r)
WRITE8_MEMBER(samcoupe_state::samcoupe_lmpr_w)
{
- address_space &space_program = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space_program = machine().device("maincpu")->memory().space(AS_PROGRAM);
m_lmpr = data;
samcoupe_update_memory(space_program);
@@ -180,7 +180,7 @@ READ8_MEMBER(samcoupe_state::samcoupe_hmpr_r)
WRITE8_MEMBER(samcoupe_state::samcoupe_hmpr_w)
{
- address_space &space_program = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space_program = machine().device("maincpu")->memory().space(AS_PROGRAM);
m_hmpr = data;
samcoupe_update_memory(space_program);
@@ -193,7 +193,7 @@ READ8_MEMBER(samcoupe_state::samcoupe_vmpr_r)
WRITE8_MEMBER(samcoupe_state::samcoupe_vmpr_w)
{
- address_space &space_program = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space_program = machine().device("maincpu")->memory().space(AS_PROGRAM);
m_vmpr = data;
samcoupe_update_memory(space_program);
diff --git a/src/mess/drivers/scorpion.c b/src/mess/drivers/scorpion.c
index 050a207dc6e..41bd4477f29 100644
--- a/src/mess/drivers/scorpion.c
+++ b/src/mess/drivers/scorpion.c
@@ -326,7 +326,7 @@ MACHINE_RESET_MEMBER(scorpion_state,scorpion)
{
UINT8 *messram = machine().device<ram_device>(RAM_TAG)->pointer();
device_t *beta = machine().device(BETA_DISK_TAG);
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
m_ram_0000 = NULL;
space.install_read_bank(0x0000, 0x3fff, "bank1");
diff --git a/src/mess/drivers/sg1000.c b/src/mess/drivers/sg1000.c
index bb623468fc5..5d645b1bbc7 100644
--- a/src/mess/drivers/sg1000.c
+++ b/src/mess/drivers/sg1000.c
@@ -642,20 +642,20 @@ const cassette_interface sc3000_cassette_interface =
void sg1000_state::install_cartridge(UINT8 *ptr, int size)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
switch (size)
{
case 40 * 1024:
- program->install_read_bank(0x8000, 0x9fff, "bank1");
- program->unmap_write(0x8000, 0x9fff);
+ program.install_read_bank(0x8000, 0x9fff, "bank1");
+ program.unmap_write(0x8000, 0x9fff);
membank("bank1")->configure_entry(0, memregion(Z80_TAG)->base() + 0x8000);
membank("bank1")->set_entry(0);
break;
case 48 * 1024:
- program->install_read_bank(0x8000, 0xbfff, "bank1");
- program->unmap_write(0x8000, 0xbfff);
+ program.install_read_bank(0x8000, 0xbfff, "bank1");
+ program.unmap_write(0x8000, 0xbfff);
membank("bank1")->configure_entry(0, memregion(Z80_TAG)->base() + 0x8000);
membank("bank1")->set_entry(0);
break;
@@ -663,14 +663,14 @@ void sg1000_state::install_cartridge(UINT8 *ptr, int size)
default:
if (IS_CARTRIDGE_TV_DRAW(ptr))
{
- program->install_write_handler(0x6000, 0x6000, 0, 0, write8_delegate(FUNC(sg1000_state::tvdraw_axis_w), this), 0);
- program->install_read_handler(0x8000, 0x8000, 0, 0, read8_delegate(FUNC(sg1000_state::tvdraw_status_r), this), 0);
- program->install_read_handler(0xa000, 0xa000, 0, 0, read8_delegate(FUNC(sg1000_state::tvdraw_data_r), this), 0);
- program->nop_write(0xa000, 0xa000);
+ program.install_write_handler(0x6000, 0x6000, 0, 0, write8_delegate(FUNC(sg1000_state::tvdraw_axis_w), this), 0);
+ program.install_read_handler(0x8000, 0x8000, 0, 0, read8_delegate(FUNC(sg1000_state::tvdraw_status_r), this), 0);
+ program.install_read_handler(0xa000, 0xa000, 0, 0, read8_delegate(FUNC(sg1000_state::tvdraw_data_r), this), 0);
+ program.nop_write(0xa000, 0xa000);
}
else if (IS_CARTRIDGE_THE_CASTLE(ptr))
{
- program->install_readwrite_bank(0x8000, 0x9fff, "bank1");
+ program.install_readwrite_bank(0x8000, 0x9fff, "bank1");
}
break;
}
@@ -684,7 +684,7 @@ static DEVICE_IMAGE_LOAD( sg1000_cart )
{
running_machine &machine = image.device().machine();
sg1000_state *state = machine.driver_data<sg1000_state>();
- address_space *program = machine.device(Z80_TAG)->memory().space(AS_PROGRAM);
+ address_space &program = machine.device(Z80_TAG)->memory().space(AS_PROGRAM);
UINT8 *ptr = state->memregion(Z80_TAG)->base();
UINT32 ram_size = 0x400;
bool install_2000_ram = false;
@@ -781,11 +781,11 @@ static DEVICE_IMAGE_LOAD( sg1000_cart )
if ( install_2000_ram )
{
- program->install_ram(0x2000, 0x3FFF);
+ program.install_ram(0x2000, 0x3FFF);
}
/* work RAM banking */
- program->install_readwrite_bank(0xc000, 0xc000 + ram_size - 1, 0, 0x4000 - ram_size, "bank2");
+ program.install_readwrite_bank(0xc000, 0xc000 + ram_size - 1, 0, 0x4000 - ram_size, "bank2");
return IMAGE_INIT_PASS;
}
@@ -825,25 +825,25 @@ static DEVICE_IMAGE_LOAD( omv_cart )
void sc3000_state::install_cartridge(UINT8 *ptr, int size)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* include SG-1000 mapping */
sg1000_state::install_cartridge(ptr, size);
if (IS_CARTRIDGE_BASIC_LEVEL_III(ptr))
{
- program->install_readwrite_bank(0x8000, 0xbfff, "bank1");
- program->install_readwrite_bank(0xc000, 0xffff, "bank2");
+ program.install_readwrite_bank(0x8000, 0xbfff, "bank1");
+ program.install_readwrite_bank(0xc000, 0xffff, "bank2");
}
else if (IS_CARTRIDGE_MUSIC_EDITOR(ptr))
{
- program->install_readwrite_bank(0x8000, 0x9fff, "bank1");
- program->install_readwrite_bank(0xc000, 0xc7ff, 0, 0x3800, "bank2");
+ program.install_readwrite_bank(0x8000, 0x9fff, "bank1");
+ program.install_readwrite_bank(0xc000, 0xc7ff, 0, 0x3800, "bank2");
}
else
{
/* regular cartridges */
- program->install_readwrite_bank(0xc000, 0xc7ff, 0, 0x3800, "bank2");
+ program.install_readwrite_bank(0xc000, 0xc7ff, 0, 0x3800, "bank2");
}
}
diff --git a/src/mess/drivers/sgi_ip2.c b/src/mess/drivers/sgi_ip2.c
index 8723c9c8507..22ffda25fec 100644
--- a/src/mess/drivers/sgi_ip2.c
+++ b/src/mess/drivers/sgi_ip2.c
@@ -433,7 +433,7 @@ static void duarta_tx(device_t *device, int channel, UINT8 data)
{
device_t *devconf = device->machine().device(TERMINAL_TAG);
verboselog(device->machine(), 0, "duarta_tx: %02x\n", data);
- dynamic_cast<generic_terminal_device *>(devconf)->write(*devconf->machine().memory().first_space(), 0, data);
+ dynamic_cast<generic_terminal_device *>(devconf)->write(devconf->machine().driver_data()->generic_space(), 0, data);
}
static const duart68681_config sgi_ip2_duart68681a_config =
diff --git a/src/mess/drivers/spc1000.c b/src/mess/drivers/spc1000.c
index 31b50d730dd..b2834eead53 100644
--- a/src/mess/drivers/spc1000.c
+++ b/src/mess/drivers/spc1000.c
@@ -224,7 +224,7 @@ INPUT_PORTS_END
void spc1000_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *mem = memregion("maincpu")->base();
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
diff --git a/src/mess/drivers/specpls3.c b/src/mess/drivers/specpls3.c
index b89a5408b13..82fff6091d5 100644
--- a/src/mess/drivers/specpls3.c
+++ b/src/mess/drivers/specpls3.c
@@ -211,7 +211,7 @@ static READ8_HANDLER(spectrum_plus3_port_2ffd_r)
void spectrum_plus3_update_memory(running_machine &machine)
{
spectrum_state *state = machine.driver_data<spectrum_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *messram = machine.device<ram_device>(RAM_TAG)->pointer();
if (state->m_port_7ffd_data & 8)
diff --git a/src/mess/drivers/spectrum.c b/src/mess/drivers/spectrum.c
index 9c4d7ed15bf..73cbea395ca 100644
--- a/src/mess/drivers/spectrum.c
+++ b/src/mess/drivers/spectrum.c
@@ -620,7 +620,7 @@ INPUT_PORTS_END
DRIVER_INIT_MEMBER(spectrum_state,spectrum)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
switch (machine().device<ram_device>(RAM_TAG)->size())
{
@@ -633,7 +633,7 @@ DRIVER_INIT_MEMBER(spectrum_state,spectrum)
MACHINE_RESET_MEMBER(spectrum_state,spectrum)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.set_direct_update_handler(direct_update_delegate(FUNC(spectrum_state::spectrum_direct), this));
diff --git a/src/mess/drivers/super6.c b/src/mess/drivers/super6.c
index e6b131ff7fb..17134bcef80 100644
--- a/src/mess/drivers/super6.c
+++ b/src/mess/drivers/super6.c
@@ -30,15 +30,15 @@
void super6_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = m_ram->pointer();
UINT8 *rom = memregion(Z80_TAG)->base();
// power on jump
- if (!BIT(m_bank0, 6)) { program->install_rom(0x0000, 0x07ff, 0, 0xf800, rom); return; }
+ if (!BIT(m_bank0, 6)) { program.install_rom(0x0000, 0x07ff, 0, 0xf800, rom); return; }
// first 64KB of memory
- program->install_ram(0x0000, 0xffff, ram);
+ program.install_ram(0x0000, 0xffff, ram);
// second 64KB of memory
int map = (m_bank1 >> 4) & 0x07;
@@ -46,49 +46,49 @@ void super6_state::bankswitch()
switch (map)
{
case 0:
- if (BIT(m_bank1, 0)) program->install_ram(0x0000, 0x3fff, ram + 0x10000);
- if (BIT(m_bank1, 1)) program->install_ram(0x4000, 0x7fff, ram + 0x14000);
- if (BIT(m_bank1, 2)) program->install_ram(0x8000, 0xbfff, ram + 0x18000);
- if (BIT(m_bank1, 3)) program->install_ram(0xc000, 0xffff, ram + 0x1c000);
+ if (BIT(m_bank1, 0)) program.install_ram(0x0000, 0x3fff, ram + 0x10000);
+ if (BIT(m_bank1, 1)) program.install_ram(0x4000, 0x7fff, ram + 0x14000);
+ if (BIT(m_bank1, 2)) program.install_ram(0x8000, 0xbfff, ram + 0x18000);
+ if (BIT(m_bank1, 3)) program.install_ram(0xc000, 0xffff, ram + 0x1c000);
break;
case 1:
- if (BIT(m_bank1, 0)) program->install_ram(0x0000, 0x3fff, ram + 0x10000);
- if (BIT(m_bank1, 1)) program->install_ram(0x4000, 0x7fff, ram + 0x14000);
- if (BIT(m_bank1, 2)) program->install_ram(0x8000, 0xbfff, ram + 0x18000);
- if (BIT(m_bank1, 3)) program->install_ram(0xc000, 0xffff, ram + 0x0000);
+ if (BIT(m_bank1, 0)) program.install_ram(0x0000, 0x3fff, ram + 0x10000);
+ if (BIT(m_bank1, 1)) program.install_ram(0x4000, 0x7fff, ram + 0x14000);
+ if (BIT(m_bank1, 2)) program.install_ram(0x8000, 0xbfff, ram + 0x18000);
+ if (BIT(m_bank1, 3)) program.install_ram(0xc000, 0xffff, ram + 0x0000);
break;
case 2:
- if (BIT(m_bank1, 0)) program->install_ram(0x0000, 0x3fff, ram + 0x10000);
- if (BIT(m_bank1, 1)) program->install_ram(0x4000, 0x7fff, ram + 0x14000);
- if (BIT(m_bank1, 2)) program->install_ram(0x8000, 0xbfff, ram + 0x4000);
- if (BIT(m_bank1, 3)) program->install_ram(0xc000, 0xffff, ram + 0x1c000);
+ if (BIT(m_bank1, 0)) program.install_ram(0x0000, 0x3fff, ram + 0x10000);
+ if (BIT(m_bank1, 1)) program.install_ram(0x4000, 0x7fff, ram + 0x14000);
+ if (BIT(m_bank1, 2)) program.install_ram(0x8000, 0xbfff, ram + 0x4000);
+ if (BIT(m_bank1, 3)) program.install_ram(0xc000, 0xffff, ram + 0x1c000);
break;
case 3:
- if (BIT(m_bank1, 0)) program->install_ram(0x0000, 0x3fff, ram + 0x10000);
- if (BIT(m_bank1, 1)) program->install_ram(0x4000, 0x7fff, ram + 0x14000);
- if (BIT(m_bank1, 2)) program->install_ram(0x8000, 0xbfff, ram + 0x0000);
- if (BIT(m_bank1, 3)) program->install_ram(0xc000, 0xffff, ram + 0x4000);
+ if (BIT(m_bank1, 0)) program.install_ram(0x0000, 0x3fff, ram + 0x10000);
+ if (BIT(m_bank1, 1)) program.install_ram(0x4000, 0x7fff, ram + 0x14000);
+ if (BIT(m_bank1, 2)) program.install_ram(0x8000, 0xbfff, ram + 0x0000);
+ if (BIT(m_bank1, 3)) program.install_ram(0xc000, 0xffff, ram + 0x4000);
break;
case 4:
- if (BIT(m_bank1, 0)) program->install_ram(0x0000, 0x3fff, ram + 0xc000);
- if (BIT(m_bank1, 1)) program->install_ram(0x4000, 0x7fff, ram + 0x14000);
- if (BIT(m_bank1, 2)) program->install_ram(0x8000, 0xbfff, ram + 0x18000);
- if (BIT(m_bank1, 3)) program->install_ram(0xc000, 0xffff, ram + 0x1c000);
+ if (BIT(m_bank1, 0)) program.install_ram(0x0000, 0x3fff, ram + 0xc000);
+ if (BIT(m_bank1, 1)) program.install_ram(0x4000, 0x7fff, ram + 0x14000);
+ if (BIT(m_bank1, 2)) program.install_ram(0x8000, 0xbfff, ram + 0x18000);
+ if (BIT(m_bank1, 3)) program.install_ram(0xc000, 0xffff, ram + 0x1c000);
break;
}
// bank 0 overrides
- if (BIT(m_bank0, 0)) program->install_ram(0x0000, 0x3fff, ram + 0x0000);
- if (BIT(m_bank0, 1)) program->install_ram(0x4000, 0x7fff, ram + 0x4000);
- if (BIT(m_bank0, 2)) program->install_ram(0x8000, 0xbfff, ram + 0x8000);
- if (BIT(m_bank0, 3)) program->install_ram(0xc000, 0xffff, ram + 0xc000);
+ if (BIT(m_bank0, 0)) program.install_ram(0x0000, 0x3fff, ram + 0x0000);
+ if (BIT(m_bank0, 1)) program.install_ram(0x4000, 0x7fff, ram + 0x4000);
+ if (BIT(m_bank0, 2)) program.install_ram(0x8000, 0xbfff, ram + 0x8000);
+ if (BIT(m_bank0, 3)) program.install_ram(0xc000, 0xffff, ram + 0xc000);
// PROM enabled
- if (!BIT(m_bank0, 5)) program->install_rom(0xf000, 0xf7ff, 0, 0x800, rom);
+ if (!BIT(m_bank0, 5)) program.install_rom(0xf000, 0xf7ff, 0, 0x800, rom);
}
diff --git a/src/mess/drivers/supracan.c b/src/mess/drivers/supracan.c
index 9aaa8958e08..c8a8a7ee332 100644
--- a/src/mess/drivers/supracan.c
+++ b/src/mess/drivers/supracan.c
@@ -993,7 +993,7 @@ WRITE16_MEMBER( supracan_state::supracan_dma_w )
{
acan_dma_regs_t *acan_dma_regs = &m_acan_dma_regs;
int ch = (offset < 0x10/2) ? 0 : 1;
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
switch(offset)
{
@@ -1039,7 +1039,7 @@ WRITE16_MEMBER( supracan_state::supracan_dma_w )
{
if(data & 0x1000)
{
- mem->write_word(acan_dma_regs->dest[ch], mem->read_word(acan_dma_regs->source[ch]));
+ mem.write_word(acan_dma_regs->dest[ch], mem.read_word(acan_dma_regs->source[ch]));
acan_dma_regs->dest[ch]+=2;
acan_dma_regs->source[ch]+=2;
if(data & 0x0100)
@@ -1048,7 +1048,7 @@ WRITE16_MEMBER( supracan_state::supracan_dma_w )
}
else
{
- mem->write_byte(acan_dma_regs->dest[ch], mem->read_byte(acan_dma_regs->source[ch]));
+ mem.write_byte(acan_dma_regs->dest[ch], mem.read_byte(acan_dma_regs->source[ch]));
acan_dma_regs->dest[ch]++;
acan_dma_regs->source[ch]++;
}
@@ -1128,7 +1128,7 @@ ADDRESS_MAP_END
READ8_MEMBER( supracan_state::supracan_6502_soundmem_r )
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
UINT8 data = m_soundram[offset];
switch(offset)
@@ -1140,8 +1140,8 @@ READ8_MEMBER( supracan_state::supracan_6502_soundmem_r )
case 0x410: // Sound IRQ enable
data = m_sound_irq_enable_reg;
- if(!mem->debugger_access()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", machine(), 0, "supracan_soundreg_r: IRQ enable: %04x\n", data);
- if(!mem->debugger_access())
+ if(!mem.debugger_access()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", machine(), 0, "supracan_soundreg_r: IRQ enable: %04x\n", data);
+ if(!mem.debugger_access())
{
if(m_sound_irq_enable_reg & m_sound_irq_source_reg)
{
@@ -1156,17 +1156,17 @@ READ8_MEMBER( supracan_state::supracan_6502_soundmem_r )
case 0x411: // Sound IRQ source
data = m_sound_irq_source_reg;
m_sound_irq_source_reg = 0;
- if(!mem->debugger_access()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", machine(), 3, "supracan_soundreg_r: IRQ source: %04x\n", data);
- if(!mem->debugger_access())
+ if(!mem.debugger_access()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", machine(), 3, "supracan_soundreg_r: IRQ source: %04x\n", data);
+ if(!mem.debugger_access())
{
machine().device("soundcpu")->execute().set_input_line(0, CLEAR_LINE);
}
break;
case 0x420:
- if(!mem->debugger_access()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", machine(), 3, "supracan_soundreg_r: Sound hardware status? (not yet implemented): %02x\n", 0);
+ if(!mem.debugger_access()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", machine(), 3, "supracan_soundreg_r: Sound hardware status? (not yet implemented): %02x\n", 0);
break;
case 0x422:
- if(!mem->debugger_access()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", machine(), 3, "supracan_soundreg_r: Sound hardware data? (not yet implemented): %02x\n", 0);
+ if(!mem.debugger_access()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", machine(), 3, "supracan_soundreg_r: Sound hardware data? (not yet implemented): %02x\n", 0);
break;
case 0x404:
case 0x405:
@@ -1177,7 +1177,7 @@ READ8_MEMBER( supracan_state::supracan_6502_soundmem_r )
default:
if(offset >= 0x300 && offset < 0x500)
{
- if(!mem->debugger_access()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", machine(), 0, "supracan_soundreg_r: Unknown register %04x\n", offset);
+ if(!mem.debugger_access()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", machine(), 0, "supracan_soundreg_r: Unknown register %04x\n", offset);
}
break;
}
@@ -1357,7 +1357,7 @@ void supracan_state::palette_init()
WRITE16_MEMBER( supracan_state::supracan_68k_soundram_w )
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
m_soundram[offset*2 + 1] = data & 0xff;
m_soundram[offset*2 + 0] = data >> 8;
@@ -1366,13 +1366,13 @@ WRITE16_MEMBER( supracan_state::supracan_68k_soundram_w )
if(mem_mask & 0xff00)
{
m_hack_68k_to_6502_access = true;
- supracan_6502_soundmem_w(*mem, offset*2, data >> 8);
+ supracan_6502_soundmem_w(mem, offset*2, data >> 8);
m_hack_68k_to_6502_access = false;
}
if(mem_mask & 0x00ff)
{
m_hack_68k_to_6502_access = true;
- supracan_6502_soundmem_w(*mem, offset*2 + 1, data & 0xff);
+ supracan_6502_soundmem_w(mem, offset*2 + 1, data & 0xff);
m_hack_68k_to_6502_access = false;
}
}
@@ -1380,7 +1380,7 @@ WRITE16_MEMBER( supracan_state::supracan_68k_soundram_w )
READ16_MEMBER( supracan_state::supracan_68k_soundram_r )
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
UINT16 val = m_soundram[offset*2 + 0] << 8;
val |= m_soundram[offset*2 + 1];
@@ -1390,13 +1390,13 @@ READ16_MEMBER( supracan_state::supracan_68k_soundram_r )
if(mem_mask & 0xff00)
{
m_hack_68k_to_6502_access = true;
- val |= supracan_6502_soundmem_r(*mem, offset*2) << 8;
+ val |= supracan_6502_soundmem_r(mem, offset*2) << 8;
m_hack_68k_to_6502_access = false;
}
if(mem_mask & 0x00ff)
{
m_hack_68k_to_6502_access = true;
- val |= supracan_6502_soundmem_r(*mem, offset*2 + 1);
+ val |= supracan_6502_soundmem_r(mem, offset*2 + 1);
m_hack_68k_to_6502_access = false;
}
}
@@ -1454,13 +1454,13 @@ WRITE16_MEMBER( supracan_state::supracan_sound_w )
READ16_MEMBER( supracan_state::supracan_video_r )
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
UINT16 data = m_video_regs[offset];
switch(offset)
{
case 0x00/2: // Video IRQ flags
- if(!mem->debugger_access())
+ if(!mem.debugger_access())
{
//verboselog("maincpu", machine(), 0, "read video IRQ flags (%04x)\n", data);
m_maincpu->set_input_line(7, CLEAR_LINE);
@@ -1472,16 +1472,16 @@ READ16_MEMBER( supracan_state::supracan_video_r )
data = 0;
break;
case 0x100/2:
- if(!mem->debugger_access()) verboselog("maincpu", machine(), 0, "read tilemap_flags[0] (%04x)\n", data);
+ if(!mem.debugger_access()) verboselog("maincpu", machine(), 0, "read tilemap_flags[0] (%04x)\n", data);
break;
case 0x106/2:
- if(!mem->debugger_access()) verboselog("maincpu", machine(), 0, "read tilemap_scrolly[0] (%04x)\n", data);
+ if(!mem.debugger_access()) verboselog("maincpu", machine(), 0, "read tilemap_scrolly[0] (%04x)\n", data);
break;
case 0x120/2:
- if(!mem->debugger_access()) verboselog("maincpu", machine(), 0, "read tilemap_flags[1] (%04x)\n", data);
+ if(!mem.debugger_access()) verboselog("maincpu", machine(), 0, "read tilemap_flags[1] (%04x)\n", data);
break;
default:
- if(!mem->debugger_access()) verboselog("maincpu", machine(), 0, "supracan_video_r: Unknown register: %08x (%04x & %04x)\n", 0xf00000 + (offset << 1), data, mem_mask);
+ if(!mem.debugger_access()) verboselog("maincpu", machine(), 0, "supracan_video_r: Unknown register: %08x (%04x & %04x)\n", 0xf00000 + (offset << 1), data, mem_mask);
break;
}
@@ -1557,7 +1557,7 @@ static TIMER_CALLBACK( supracan_video_callback )
WRITE16_MEMBER( supracan_state::supracan_video_w )
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
acan_sprdma_regs_t *acan_sprdma_regs = &m_acan_sprdma_regs;
int i;
@@ -1618,13 +1618,13 @@ WRITE16_MEMBER( supracan_state::supracan_video_w )
{
if(data & 0x0100) //dma 0x00 fill (or fixed value?)
{
- mem->write_word(acan_sprdma_regs->dst, 0);
+ mem.write_word(acan_sprdma_regs->dst, 0);
acan_sprdma_regs->dst+=2 * acan_sprdma_regs->dst_inc;
//memset(supracan_vram,0x00,0x020000);
}
else
{
- mem->write_word(acan_sprdma_regs->dst, mem->read_word(acan_sprdma_regs->src));
+ mem.write_word(acan_sprdma_regs->dst, mem.read_word(acan_sprdma_regs->src));
acan_sprdma_regs->dst+=2 * acan_sprdma_regs->dst_inc;
acan_sprdma_regs->src+=2 * acan_sprdma_regs->src_inc;
}
diff --git a/src/mess/drivers/tandy2k.c b/src/mess/drivers/tandy2k.c
index 12cf5238dde..b8d4245e732 100644
--- a/src/mess/drivers/tandy2k.c
+++ b/src/mess/drivers/tandy2k.c
@@ -49,10 +49,10 @@ void tandy2k_state::speaker_update()
READ8_MEMBER( tandy2k_state::videoram_r )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
offs_t addr = (m_vram_base << 15) | (offset << 1);
- UINT16 data = program->read_word(addr);
+ UINT16 data = program.read_word(addr);
// character
m_drb0->write(space, 0, data & 0xff);
@@ -319,12 +319,12 @@ UINT32 tandy2k_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
static CRT9007_DRAW_SCANLINE( tandy2k_crt9007_display_pixels )
{
tandy2k_state *state = device->machine().driver_data<tandy2k_state>();
- address_space *program = state->m_maincpu->space(AS_PROGRAM);
+ address_space &program = state->m_maincpu->space(AS_PROGRAM);
for (int sx = 0; sx < x_count; sx++)
{
UINT32 videoram_addr = ((state->m_vram_base << 15) | (va << 1)) + sx;
- UINT8 videoram_data = program->read_word(videoram_addr);
+ UINT8 videoram_data = program.read_word(videoram_addr);
UINT16 charram_addr = (videoram_data << 4) | sl;
UINT8 charram_data = state->m_char_ram[charram_addr] & 0xff;
@@ -670,11 +670,11 @@ static TANDY2K_KEYBOARD_INTERFACE( kb_intf )
void tandy2k_state::machine_start()
{
// memory banking
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = m_ram->pointer();
int ram_size = m_ram->size();
- program->install_ram(0x00000, ram_size - 1, ram);
+ program.install_ram(0x00000, ram_size - 1, ram);
// patch out i186 relocation register check
UINT8 *rom = memregion(I80186_TAG)->base();
diff --git a/src/mess/drivers/tek405x.c b/src/mess/drivers/tek405x.c
index c15653f6d73..b7936225b87 100644
--- a/src/mess/drivers/tek405x.c
+++ b/src/mess/drivers/tek405x.c
@@ -117,7 +117,7 @@ static TIMER_DEVICE_CALLBACK( keyboard_tick )
void tek4051_state::bankswitch(UINT8 data)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
//int d = data & 0x07;
int lbs = (data >> 3) & 0x07;
@@ -125,19 +125,19 @@ void tek4051_state::bankswitch(UINT8 data)
switch (lbs)
{
case LBS_RBC:
- program->install_rom(0x8800, 0xa7ff, memregion(MC6800_TAG)->base() + 0x800);
+ program.install_rom(0x8800, 0xa7ff, memregion(MC6800_TAG)->base() + 0x800);
break;
case LBS_BSOFL:
- program->install_rom(0x8800, 0xa7ff, memregion("020_0147_00")->base());
+ program.install_rom(0x8800, 0xa7ff, memregion("020_0147_00")->base());
break;
case LBS_BSCOM:
- program->install_rom(0x8800, 0xa7ff, memregion("672_0799_08")->base());
+ program.install_rom(0x8800, 0xa7ff, memregion("672_0799_08")->base());
break;
default:
- program->unmap_readwrite(0x8800, 0xa7ff);
+ program.unmap_readwrite(0x8800, 0xa7ff);
}
}
@@ -1167,21 +1167,21 @@ static IEEE488_INTERFACE( ieee488_intf )
void tek4051_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
// configure RAM
switch (m_ram->size())
{
case 8*1024:
- program->unmap_readwrite(0x2000, 0x7fff);
+ program.unmap_readwrite(0x2000, 0x7fff);
break;
case 16*1024:
- program->unmap_readwrite(0x4000, 0x7fff);
+ program.unmap_readwrite(0x4000, 0x7fff);
break;
case 24*1024:
- program->unmap_readwrite(0x6000, 0x7fff);
+ program.unmap_readwrite(0x6000, 0x7fff);
break;
}
diff --git a/src/mess/drivers/ti89.c b/src/mess/drivers/ti89.c
index 617a608321f..c0a9ae2cc33 100644
--- a/src/mess/drivers/ti89.c
+++ b/src/mess/drivers/ti89.c
@@ -445,15 +445,15 @@ void ti68k_state::machine_start()
m_hw_version = m_HW1;
m_initial_pc = ((rom[2]) << 16) | rom[3];
- m_maincpu->space(AS_PROGRAM)->unmap_read(0x200000, 0x5fffff);
+ m_maincpu->space(AS_PROGRAM).unmap_read(0x200000, 0x5fffff);
if (m_initial_pc > 0x400000)
{
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0x400000, 0x5fffff, 0, 0, read16_delegate(FUNC(ti68k_state::flash_r), this),write16_delegate(FUNC(ti68k_state::flash_w), this));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x400000, 0x5fffff, 0, 0, read16_delegate(FUNC(ti68k_state::flash_r), this),write16_delegate(FUNC(ti68k_state::flash_w), this));
}
else
{
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0x200000, 0x3fffff, 0, 0, read16_delegate(FUNC(ti68k_state::flash_r), this), write16_delegate(FUNC(ti68k_state::flash_w), this));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x200000, 0x3fffff, 0, 0, read16_delegate(FUNC(ti68k_state::flash_r), this), write16_delegate(FUNC(ti68k_state::flash_w), this));
}
}
@@ -493,7 +493,7 @@ UINT32 ti68k_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, c
for (y = 0; y < height; y++)
for (x = 0; x < width / 8; x++)
{
- UINT8 s_byte= m_maincpu->space(AS_PROGRAM)->read_byte(m_lcd_base + y * (width/8) + x);
+ UINT8 s_byte= m_maincpu->space(AS_PROGRAM).read_byte(m_lcd_base + y * (width/8) + x);
for (b = 0; b<8; b++)
bitmap.pix16(y, x * 8 + (7 - b)) = BIT(s_byte, b);
}
diff --git a/src/mess/drivers/tiki100.c b/src/mess/drivers/tiki100.c
index 983c291fb1d..a1a4e1fdbbe 100644
--- a/src/mess/drivers/tiki100.c
+++ b/src/mess/drivers/tiki100.c
@@ -44,20 +44,20 @@ WRITE8_MEMBER( tiki100_state::gfxram_w )
void tiki100_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
if (m_vire)
{
if (!m_rome)
{
/* reserved */
- program->unmap_readwrite(0x0000, 0xffff);
+ program.unmap_readwrite(0x0000, 0xffff);
}
else
{
/* GFXRAM, GFXRAM, RAM */
- program->install_readwrite_handler(0x0000, 0x7fff, read8_delegate(FUNC(tiki100_state::gfxram_r), this), write8_delegate(FUNC(tiki100_state::gfxram_w), this));
- program->install_readwrite_bank(0x8000, 0xffff, "bank3");
+ program.install_readwrite_handler(0x0000, 0x7fff, read8_delegate(FUNC(tiki100_state::gfxram_r), this), write8_delegate(FUNC(tiki100_state::gfxram_w), this));
+ program.install_readwrite_bank(0x8000, 0xffff, "bank3");
membank("bank1")->set_entry(BANK_VIDEO_RAM);
membank("bank2")->set_entry(BANK_VIDEO_RAM);
@@ -69,10 +69,10 @@ void tiki100_state::bankswitch()
if (!m_rome)
{
/* ROM, RAM, RAM */
- program->install_read_bank(0x0000, 0x3fff, "bank1");
- program->unmap_write(0x0000, 0x3fff);
- program->install_readwrite_bank(0x4000, 0x7fff, "bank2");
- program->install_readwrite_bank(0x8000, 0xffff, "bank3");
+ program.install_read_bank(0x0000, 0x3fff, "bank1");
+ program.unmap_write(0x0000, 0x3fff);
+ program.install_readwrite_bank(0x4000, 0x7fff, "bank2");
+ program.install_readwrite_bank(0x8000, 0xffff, "bank3");
membank("bank1")->set_entry(BANK_ROM);
membank("bank2")->set_entry(BANK_RAM);
@@ -81,9 +81,9 @@ void tiki100_state::bankswitch()
else
{
/* RAM, RAM, RAM */
- program->install_readwrite_bank(0x0000, 0x3fff, "bank1");
- program->install_readwrite_bank(0x4000, 0x7fff, "bank2");
- program->install_readwrite_bank(0x8000, 0xffff, "bank3");
+ program.install_readwrite_bank(0x0000, 0x3fff, "bank1");
+ program.install_readwrite_bank(0x4000, 0x7fff, "bank2");
+ program.install_readwrite_bank(0x8000, 0xffff, "bank3");
membank("bank1")->set_entry(BANK_RAM);
membank("bank2")->set_entry(BANK_RAM);
diff --git a/src/mess/drivers/timex.c b/src/mess/drivers/timex.c
index 6c635ac209e..0cfd632cd5f 100644
--- a/src/mess/drivers/timex.c
+++ b/src/mess/drivers/timex.c
@@ -228,7 +228,7 @@ void ts2068_update_memory(running_machine &machine)
{
spectrum_state *state = machine.driver_data<spectrum_state>();
UINT8 *messram = machine.device<ram_device>(RAM_TAG)->pointer();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
unsigned char *ChosenROM, *ExROM;
const timex_cart_t *timex_cart = timex_cart_data();
int timex_cart_type = timex_cart->type;
diff --git a/src/mess/drivers/tmc1800.c b/src/mess/drivers/tmc1800.c
index 15042e9afe9..fd4df95a5bf 100644
--- a/src/mess/drivers/tmc1800.c
+++ b/src/mess/drivers/tmc1800.c
@@ -167,14 +167,14 @@ WRITE8_MEMBER( nano_state::keylatch_w )
void tmc2000_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = m_ram->pointer();
UINT8 *rom = memregion(CDP1802_TAG)->base();
if (m_roc)
{
// monitor ROM
- program->install_rom(0x0000, 0x01ff, 0, 0x7e00, rom);
+ program.install_rom(0x0000, 0x01ff, 0, 0x7e00, rom);
}
else
{
@@ -182,15 +182,15 @@ void tmc2000_state::bankswitch()
switch (m_ram->size())
{
case 4 * 1024:
- program->install_ram(0x0000, 0x0fff, 0, 0x7000, ram);
+ program.install_ram(0x0000, 0x0fff, 0, 0x7000, ram);
break;
case 16 * 1024:
- program->install_ram(0x0000, 0x3fff, 0, 0x4000, ram);
+ program.install_ram(0x0000, 0x3fff, 0, 0x4000, ram);
break;
case 32 * 1024:
- program->install_ram(0x0000, 0x7fff, ram);
+ program.install_ram(0x0000, 0x7fff, ram);
break;
}
}
@@ -198,13 +198,13 @@ void tmc2000_state::bankswitch()
if (m_rac)
{
// color RAM
- program->install_ram(0x8000, 0x81ff, 0, 0x7e00, m_colorram);
- program->unmap_read(0x8000, 0x81ff, 0, 0x7e00);
+ program.install_ram(0x8000, 0x81ff, 0, 0x7e00, m_colorram);
+ program.unmap_read(0x8000, 0x81ff, 0, 0x7e00);
}
else
{
// monitor ROM
- program->install_rom(0x8000, 0x81ff, 0, 0x7e00, rom);
+ program.install_rom(0x8000, 0x81ff, 0, 0x7e00, rom);
}
}
@@ -220,9 +220,9 @@ WRITE8_MEMBER( tmc2000_state::bankswitch_w )
WRITE8_MEMBER( nano_state::bankswitch_w )
{
/* enable RAM */
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = m_ram->pointer();
- program->install_ram(0x0000, 0x0fff, 0, 0x7000, ram);
+ program.install_ram(0x0000, 0x0fff, 0, 0x7000, ram);
/* write to CDP1864 tone latch */
m_cti->tone_latch_w(space, 0, data);
@@ -745,9 +745,9 @@ void nano_state::machine_reset()
m_cti->reset();
/* enable ROM */
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *rom = memregion(CDP1802_TAG)->base();
- program->install_rom(0x0000, 0x01ff, 0, 0x7e00, rom);
+ program.install_rom(0x0000, 0x01ff, 0, 0x7e00, rom);
}
/* Machine Drivers */
diff --git a/src/mess/drivers/tmc600.c b/src/mess/drivers/tmc600.c
index 40dbced60b3..0594a6db7bd 100644
--- a/src/mess/drivers/tmc600.c
+++ b/src/mess/drivers/tmc600.c
@@ -237,17 +237,17 @@ static COSMAC_INTERFACE( cosmac_intf )
void tmc600_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
/* configure RAM */
switch (m_ram->size())
{
case 8*1024:
- program->unmap_readwrite(0x8000, 0xbfff);
+ program.unmap_readwrite(0x8000, 0xbfff);
break;
case 16*1024:
- program->unmap_readwrite(0xa000, 0xbfff);
+ program.unmap_readwrite(0xa000, 0xbfff);
break;
}
diff --git a/src/mess/drivers/tvc.c b/src/mess/drivers/tvc.c
index fb55f278e5a..4e221ee849e 100644
--- a/src/mess/drivers/tvc.c
+++ b/src/mess/drivers/tvc.c
@@ -32,7 +32,7 @@
void tvc_state::tvc_set_mem_page(UINT8 data)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
switch(data & 0x18)
{
case 0x00 : // system ROM selected
diff --git a/src/mess/drivers/unixpc.c b/src/mess/drivers/unixpc.c
index aa4da776274..6dde44c566f 100644
--- a/src/mess/drivers/unixpc.c
+++ b/src/mess/drivers/unixpc.c
@@ -71,10 +71,10 @@ WRITE16_MEMBER( unixpc_state::romlmap_w )
void unixpc_state::machine_reset()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
// force ROM into lower mem on reset
- romlmap_w(*program, 0, 0, 0xffff);
+ romlmap_w(program, 0, 0, 0xffff);
// reset cpu so that it can pickup the new values
m_maincpu->reset();
diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c
index faeb420a727..fcc9d5a35bb 100644
--- a/src/mess/drivers/v1050.c
+++ b/src/mess/drivers/v1050.c
@@ -126,19 +126,19 @@ void v1050_state::set_interrupt(UINT8 mask, int state)
void v1050_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
int bank = (m_bank >> 1) & 0x03;
if (BIT(m_bank, 0))
{
- program->install_readwrite_bank(0x0000, 0x1fff, "bank1");
+ program.install_readwrite_bank(0x0000, 0x1fff, "bank1");
membank("bank1")->set_entry(bank);
}
else
{
- program->install_read_bank(0x0000, 0x1fff, "bank1");
- program->unmap_write(0x0000, 0x1fff);
+ program.install_read_bank(0x0000, 0x1fff, "bank1");
+ program.unmap_write(0x0000, 0x1fff);
membank("bank1")->set_entry(3);
}
@@ -146,12 +146,12 @@ void v1050_state::bankswitch()
if (bank == 2)
{
- program->unmap_readwrite(0x4000, 0xbfff);
+ program.unmap_readwrite(0x4000, 0xbfff);
}
else
{
- program->install_readwrite_bank(0x4000, 0x7fff, "bank3");
- program->install_readwrite_bank(0x8000, 0xbfff, "bank4");
+ program.install_readwrite_bank(0x4000, 0x7fff, "bank3");
+ program.install_readwrite_bank(0x8000, 0xbfff, "bank4");
membank("bank3")->set_entry(bank);
membank("bank4")->set_entry(bank);
}
@@ -702,7 +702,7 @@ WRITE8_MEMBER( v1050_state::misc_ppi_pa_w )
static WRITE8_DEVICE_HANDLER( misc_ppi_pb_w )
{
centronics_device *centronics = device->machine().device<centronics_device>(CENTRONICS_TAG);
- centronics->write( *device->machine().memory().first_space() , 0, ~data & 0xff);
+ centronics->write( device->machine().driver_data()->generic_space() , 0, ~data & 0xff);
}
static READ8_DEVICE_HANDLER( misc_ppi_pc_r )
@@ -1020,7 +1020,7 @@ static IRQ_CALLBACK( v1050_int_ack )
void v1050_state::machine_start()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
// initialize SASI bus
m_sasibus->init_scsibus(256);
@@ -1042,17 +1042,17 @@ void v1050_state::machine_start()
membank("bank1")->configure_entry(2, ram + 0x1c000);
membank("bank1")->configure_entry(3, memregion(Z80_TAG)->base());
- program->install_readwrite_bank(0x2000, 0x3fff, "bank2");
+ program.install_readwrite_bank(0x2000, 0x3fff, "bank2");
membank("bank2")->configure_entries(0, 2, ram + 0x2000, 0x10000);
membank("bank2")->configure_entry(2, ram + 0x1e000);
- program->install_readwrite_bank(0x4000, 0x7fff, "bank3");
+ program.install_readwrite_bank(0x4000, 0x7fff, "bank3");
membank("bank3")->configure_entries(0, 2, ram + 0x4000, 0x10000);
- program->install_readwrite_bank(0x8000, 0xbfff, "bank4");
+ program.install_readwrite_bank(0x8000, 0xbfff, "bank4");
membank("bank4")->configure_entries(0, 2, ram + 0x8000, 0x10000);
- program->install_readwrite_bank(0xc000, 0xffff, "bank5");
+ program.install_readwrite_bank(0xc000, 0xffff, "bank5");
membank("bank5")->configure_entries(0, 3, ram + 0xc000, 0);
bankswitch();
diff --git a/src/mess/drivers/vboy.c b/src/mess/drivers/vboy.c
index 48b4956c5f9..aa0f9a5cea3 100644
--- a/src/mess/drivers/vboy.c
+++ b/src/mess/drivers/vboy.c
@@ -1405,8 +1405,8 @@ static DEVICE_IMAGE_LOAD( vboy_cart )
{
state->m_nvptr = (UINT8 *)&state->m_vboy_sram;
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler(0x06000000, 0x0600ffff, read32_delegate(FUNC(vboy_state::sram_r),state));
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x06000000, 0x0600ffff, write32_delegate(FUNC(vboy_state::sram_w),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0x06000000, 0x0600ffff, read32_delegate(FUNC(vboy_state::sram_r),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x06000000, 0x0600ffff, write32_delegate(FUNC(vboy_state::sram_w),state));
image.battery_load(state->m_nvptr, 0x10000, 0x00);
state->m_nvimage = image;
diff --git a/src/mess/drivers/vc4000.c b/src/mess/drivers/vc4000.c
index 64629d4cc60..6cfac00dcff 100644
--- a/src/mess/drivers/vc4000.c
+++ b/src/mess/drivers/vc4000.c
@@ -339,7 +339,7 @@ static DEVICE_IMAGE_LOAD( vc4000_cart )
{
running_machine &machine = image.device().machine();
vc4000_state *state = machine.driver_data<vc4000_state>();
- address_space *memspace = machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &memspace = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT32 size;
if (image.software_entry() == NULL)
@@ -352,23 +352,23 @@ static DEVICE_IMAGE_LOAD( vc4000_cart )
if (size > 0x1000) /* 6k rom + 1k ram - Chess2 only */
{
- memspace->install_read_bank(0x0800, 0x15ff, "bank1"); /* extra rom */
+ memspace.install_read_bank(0x0800, 0x15ff, "bank1"); /* extra rom */
state->membank("bank1")->set_base(machine.root_device().memregion("maincpu")->base() + 0x1000);
- memspace->install_readwrite_bank(0x1800, 0x1bff, "bank2"); /* ram */
+ memspace.install_readwrite_bank(0x1800, 0x1bff, "bank2"); /* ram */
state->membank("bank2")->set_base(machine.root_device().memregion("maincpu")->base() + 0x1800);
}
else if (size > 0x0800) /* some 4k roms have 1k of mirrored ram */
{
- memspace->install_read_bank(0x0800, 0x0fff, "bank1"); /* extra rom */
+ memspace.install_read_bank(0x0800, 0x0fff, "bank1"); /* extra rom */
state->membank("bank1")->set_base(machine.root_device().memregion("maincpu")->base() + 0x0800);
- memspace->install_readwrite_bank(0x1000, 0x15ff, 0, 0x800, "bank2"); /* ram */
+ memspace.install_readwrite_bank(0x1000, 0x15ff, 0, 0x800, "bank2"); /* ram */
state->membank("bank2")->set_base(machine.root_device().memregion("maincpu")->base() + 0x1000);
}
else if (size == 0x0800) /* 2k roms + 2k ram - Hobby Module(Radofin) and elektor TVGC*/
{
- memspace->install_readwrite_bank(0x0800, 0x0fff, "bank1"); /* ram */
+ memspace.install_readwrite_bank(0x0800, 0x0fff, "bank1"); /* ram */
state->membank("bank1")->set_base(machine.root_device().memregion("maincpu")->base() + 0x0800);
}
@@ -530,7 +530,7 @@ ROM_END
QUICKLOAD_LOAD(vc4000)
{
- address_space &space = *image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
int i;
int quick_addr = 0x08c0;
int exec_addr;
diff --git a/src/mess/drivers/vcs80.c b/src/mess/drivers/vcs80.c
index 553f790f7e6..916c6fb5165 100644
--- a/src/mess/drivers/vcs80.c
+++ b/src/mess/drivers/vcs80.c
@@ -255,8 +255,8 @@ DIRECT_UPDATE_MEMBER(vcs80_state::vcs80_direct_update_handler)
DRIVER_INIT_MEMBER(vcs80_state,vcs80)
{
- machine().device(Z80_TAG)->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(vcs80_state::vcs80_direct_update_handler), this));
- machine().device(Z80_TAG)->memory().space(AS_IO)->set_direct_update_handler(direct_update_delegate(FUNC(vcs80_state::vcs80_direct_update_handler), this));
+ machine().device(Z80_TAG)->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(vcs80_state::vcs80_direct_update_handler), this));
+ machine().device(Z80_TAG)->memory().space(AS_IO).set_direct_update_handler(direct_update_delegate(FUNC(vcs80_state::vcs80_direct_update_handler), this));
}
/* System Drivers */
diff --git a/src/mess/drivers/vg5k.c b/src/mess/drivers/vg5k.c
index b0bfec7710d..7b35d70bb9a 100644
--- a/src/mess/drivers/vg5k.c
+++ b/src/mess/drivers/vg5k.c
@@ -337,12 +337,12 @@ DRIVER_INIT_MEMBER(vg5k_state,vg5k)
/* install expansion memory*/
- address_space *program = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &program = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
UINT16 ram_size = machine().device<ram_device>(RAM_TAG)->size();
if (ram_size > 0x4000)
- program->install_ram(0x8000, 0x3fff + ram_size, ram);
+ program.install_ram(0x8000, 0x3fff + ram_size, ram);
}
diff --git a/src/mess/drivers/vic10.c b/src/mess/drivers/vic10.c
index a7ff6bc4b84..dc6621fd36f 100644
--- a/src/mess/drivers/vic10.c
+++ b/src/mess/drivers/vic10.c
@@ -124,12 +124,12 @@ WRITE8_MEMBER( vic10_state::write )
READ8_MEMBER( vic10_state::vic_videoram_r )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
if (offset < 0x3000)
- return program->read_byte(offset);
+ return program.read_byte(offset);
- return program->read_byte(0xe000 + (offset & 0x1fff));
+ return program.read_byte(0xe000 + (offset & 0x1fff));
}
diff --git a/src/mess/drivers/victor9k.c b/src/mess/drivers/victor9k.c
index 12b2e7ee0fd..6752bc59cbb 100644
--- a/src/mess/drivers/victor9k.c
+++ b/src/mess/drivers/victor9k.c
@@ -75,7 +75,7 @@ INPUT_PORTS_END
static MC6845_UPDATE_ROW( victor9k_update_row )
{
victor9k_state *state = device->machine().driver_data<victor9k_state>();
- address_space *program = state->m_maincpu->space(AS_PROGRAM);
+ address_space &program = state->m_maincpu->space(AS_PROGRAM);
const rgb_t *palette = palette_entry_list_raw(bitmap.palette());
if (BIT(ma, 13))
@@ -90,7 +90,7 @@ static MC6845_UPDATE_ROW( victor9k_update_row )
{
UINT16 code = (state->m_video_ram[video_ram_addr + 1] << 8) | state->m_video_ram[video_ram_addr];
UINT32 char_ram_addr = (BIT(ma, 12) << 16) | ((code & 0xff) << 5) | (ra << 1);
- UINT16 data = program->read_word(char_ram_addr);
+ UINT16 data = program.read_word(char_ram_addr);
for (int x = 0; x <= 10; x++)
{
@@ -926,8 +926,8 @@ void victor9k_state::machine_start()
m_maincpu->set_irq_acknowledge_callback(victor9k_irq_callback);
// memory banking
- address_space *program = m_maincpu->space(AS_PROGRAM);
- program->install_ram(0x00000, m_ram->size() - 1, m_ram->pointer());
+ address_space &program = m_maincpu->space(AS_PROGRAM);
+ program.install_ram(0x00000, m_ram->size() - 1, m_ram->pointer());
}
// Machine Driver
diff --git a/src/mess/drivers/vii.c b/src/mess/drivers/vii.c
index bd465f58bb7..6d6db609538 100644
--- a/src/mess/drivers/vii.c
+++ b/src/mess/drivers/vii.c
@@ -217,7 +217,7 @@ static void vii_set_pixel(vii_state *state, UINT32 offset, UINT16 rgb)
static void vii_blit(running_machine &machine, bitmap_rgb32 &bitmap, const rectangle &cliprect, UINT32 xoff, UINT32 yoff, UINT32 attr, UINT32 ctrl, UINT32 bitmap_addr, UINT16 tile)
{
vii_state *state = machine.driver_data<vii_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT32 h = 8 << ((attr & PAGE_TILE_HEIGHT_MASK) >> PAGE_TILE_HEIGHT_SHIFT);
UINT32 w = 8 << ((attr & PAGE_TILE_WIDTH_MASK) >> PAGE_TILE_WIDTH_SHIFT);
@@ -293,7 +293,7 @@ static void vii_blit_page(running_machine &machine, bitmap_rgb32 &bitmap, const
UINT32 tilemap = regs[4];
UINT32 palette_map = regs[5];
UINT32 h, w, hn, wn;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if(!(ctrl & PAGE_ENABLE_MASK))
{
@@ -355,7 +355,7 @@ static void vii_blit_page(running_machine &machine, bitmap_rgb32 &bitmap, const
static void vii_blit_sprite(running_machine &machine, bitmap_rgb32 &bitmap, const rectangle &cliprect, int depth, UINT32 base_addr)
{
vii_state *state = machine.driver_data<vii_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT16 tile, attr;
INT16 x, y;
UINT32 h, w;
@@ -445,14 +445,14 @@ UINT32 vii_state::screen_update_vii(screen_device &screen, bitmap_rgb32 &bitmap,
void vii_state::vii_do_dma(UINT32 len)
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
UINT32 src = m_video_regs[0x70];
UINT32 dst = m_video_regs[0x71] + 0x2c00;
UINT32 j;
for(j = 0; j < len; j++)
{
- mem->write_word((dst+j) << 1, mem->read_word((src+j) << 1));
+ mem.write_word((dst+j) << 1, mem.read_word((src+j) << 1));
}
m_video_regs[0x72] = 0;
@@ -616,14 +616,14 @@ void vii_state::vii_do_i2c()
void vii_state::spg_do_dma(UINT32 len)
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
UINT32 src = ((m_io_regs[0x101] & 0x3f) << 16) | m_io_regs[0x100];
UINT32 dst = m_io_regs[0x103] & 0x3fff;
UINT32 j;
for(j = 0; j < len; j++)
- mem->write_word((dst+j) << 1, mem->read_word((src+j) << 1));
+ mem.write_word((dst+j) << 1, mem.read_word((src+j) << 1));
m_io_regs[0x102] = 0;
}
diff --git a/src/mess/drivers/vixen.c b/src/mess/drivers/vixen.c
index c7639726a18..a32207b59e0 100644
--- a/src/mess/drivers/vixen.c
+++ b/src/mess/drivers/vixen.c
@@ -809,10 +809,10 @@ void vixen_state::machine_start()
void vixen_state::machine_reset()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
- program->install_read_bank(0x0000, 0xefff, 0xfff, 0, "bank1");
- program->install_write_bank(0x0000, 0xefff, 0xfff, 0, "bank2");
+ program.install_read_bank(0x0000, 0xefff, 0xfff, 0, "bank1");
+ program.install_write_bank(0x0000, 0xefff, 0xfff, 0, "bank2");
membank("bank1")->set_entry(1);
membank("bank2")->set_entry(1);
@@ -910,10 +910,10 @@ DIRECT_UPDATE_MEMBER(vixen_state::vixen_direct_update_handler)
{
if (m_reset)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
- program->install_read_bank(0x0000, 0xefff, "bank1");
- program->install_write_bank(0x0000, 0xefff, "bank2");
+ program.install_read_bank(0x0000, 0xefff, "bank1");
+ program.install_write_bank(0x0000, 0xefff, "bank2");
membank("bank1")->set_entry(0);
membank("bank2")->set_entry(0);
@@ -931,8 +931,8 @@ DIRECT_UPDATE_MEMBER(vixen_state::vixen_direct_update_handler)
DRIVER_INIT_MEMBER(vixen_state,vixen)
{
- address_space *program = machine().device<cpu_device>(Z8400A_TAG)->space(AS_PROGRAM);
- program->set_direct_update_handler(direct_update_delegate(FUNC(vixen_state::vixen_direct_update_handler), this));
+ address_space &program = machine().device<cpu_device>(Z8400A_TAG)->space(AS_PROGRAM);
+ program.set_direct_update_handler(direct_update_delegate(FUNC(vixen_state::vixen_direct_update_handler), this));
}
diff --git a/src/mess/drivers/vt520.c b/src/mess/drivers/vt520.c
index cb196078c51..c5e80390b3a 100644
--- a/src/mess/drivers/vt520.c
+++ b/src/mess/drivers/vt520.c
@@ -53,7 +53,7 @@ INPUT_PORTS_END
void vt520_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = memregion("maincpu")->base();
space.unmap_write(0x0000, 0xffff);
membank("bank1")->set_base(rom + 0x70000);
diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c
index b9583cd2895..71322afad10 100644
--- a/src/mess/drivers/vtech1.c
+++ b/src/mess/drivers/vtech1.c
@@ -209,7 +209,7 @@ public:
static SNAPSHOT_LOAD( vtech1 )
{
vtech1_state *vtech1 = image.device().machine().driver_data<vtech1_state>();
- address_space &space = *image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 i, header[24];
UINT16 start, end, size;
char pgmname[18];
@@ -628,7 +628,7 @@ static READ8_DEVICE_HANDLER( vtech1_mc6847_videoram_r )
DRIVER_INIT_MEMBER(vtech1_state,vtech1)
{
- address_space *prg = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &prg = machine().device("maincpu")->memory().space(AS_PROGRAM);
int id;
/* ram */
@@ -642,7 +642,7 @@ DRIVER_INIT_MEMBER(vtech1_state,vtech1)
if (m_ram_size == 18*1024 || m_ram_size == 22*1024 || m_ram_size == 32*1024)
{
offs_t base = 0x7800 + (m_ram_size - 0x4000);
- prg->install_readwrite_bank(base, base + 0x3fff, "bank2");
+ prg.install_readwrite_bank(base, base + 0x3fff, "bank2");
membank("bank2")->set_base(m_ram + base - 0x7800);
}
@@ -650,11 +650,11 @@ DRIVER_INIT_MEMBER(vtech1_state,vtech1)
if (m_ram_size >= 66*1024)
{
/* install fixed first bank */
- prg->install_readwrite_bank(0x8000, 0xbfff, "bank2");
+ prg.install_readwrite_bank(0x8000, 0xbfff, "bank2");
membank("bank2")->set_base(m_ram + 0x800);
/* install the others, dynamically banked in */
- prg->install_readwrite_bank(0xc000, 0xffff, "bank3");
+ prg.install_readwrite_bank(0xc000, 0xffff, "bank3");
membank("bank3")->configure_entries(0, (m_ram_size - 0x4800) / 0x4000, m_ram + 0x4800, 0x4000);
membank("bank3")->set_entry(0);
}
@@ -681,7 +681,7 @@ DRIVER_INIT_MEMBER(vtech1_state,vtech1)
DRIVER_INIT_MEMBER(vtech1_state,vtech1h)
{
- address_space *prg = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &prg = machine().device("maincpu")->memory().space(AS_PROGRAM);
DRIVER_INIT_CALL(vtech1);
@@ -689,7 +689,7 @@ DRIVER_INIT_MEMBER(vtech1_state,vtech1h)
//m_videoram_size = 0x2000;
//m_videoram = auto_alloc_array(machine(), UINT8, m_videoram_size);
- prg->install_readwrite_bank(0x7000, 0x77ff, "bank4");
+ prg.install_readwrite_bank(0x7000, 0x77ff, "bank4");
membank("bank4")->configure_entries(0, 4, m_videoram, 0x800);
membank("bank4")->set_entry(0);
}
diff --git a/src/mess/drivers/wangpc.c b/src/mess/drivers/wangpc.c
index 4ce8502dafc..36f67c35822 100644
--- a/src/mess/drivers/wangpc.c
+++ b/src/mess/drivers/wangpc.c
@@ -696,18 +696,18 @@ WRITE_LINE_MEMBER( wangpc_state::eop_w )
READ8_MEMBER( wangpc_state::memr_r )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
offs_t addr = (m_dma_page[m_dack] << 16) | offset;
- return program->read_byte(addr);
+ return program.read_byte(addr);
}
WRITE8_MEMBER( wangpc_state::memw_w )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
offs_t addr = (m_dma_page[m_dack] << 16) | offset;
- program->write_byte(addr, data);
+ program.write_byte(addr, data);
}
READ8_MEMBER( wangpc_state::ior2_r )
diff --git a/src/mess/drivers/x07.c b/src/mess/drivers/x07.c
index f3eff9f3b41..5e6a8044826 100644
--- a/src/mess/drivers/x07.c
+++ b/src/mess/drivers/x07.c
@@ -1042,7 +1042,7 @@ static DEVICE_IMAGE_LOAD( x07_card )
{
running_machine &machine = image.device().machine();
x07_state *state = machine.driver_data<x07_state>();
- address_space &space = *state->m_maincpu->space( AS_PROGRAM );
+ address_space &space = state->m_maincpu->space( AS_PROGRAM );
UINT16 ram_size = state->m_ram->size();
if (image.software_entry() == NULL)
@@ -1454,8 +1454,8 @@ void x07_state::machine_start()
save_item(NAME(m_cursor.on));
/* install RAM */
- address_space *program = m_maincpu->space(AS_PROGRAM);
- program->install_ram(0x0000, m_ram->size() - 1, m_ram->pointer());
+ address_space &program = m_maincpu->space(AS_PROGRAM);
+ program.install_ram(0x0000, m_ram->size() - 1, m_ram->pointer());
}
void x07_state::machine_reset()
diff --git a/src/mess/drivers/x1.c b/src/mess/drivers/x1.c
index ef426aea950..edb9d055e5c 100644
--- a/src/mess/drivers/x1.c
+++ b/src/mess/drivers/x1.c
@@ -1937,7 +1937,7 @@ static Z80DMA_INTERFACE( x1_dma )
INPUT_CHANGED_MEMBER(x1_state::ipl_reset)
{
- //address_space &space = *machine().device("x1_cpu")->memory().space(AS_PROGRAM);
+ //address_space &space = machine().device("x1_cpu")->memory().space(AS_PROGRAM);
m_x1_cpu->set_input_line(INPUT_LINE_RESET, newval ? CLEAR_LINE : ASSERT_LINE);
@@ -2404,7 +2404,7 @@ static IRQ_CALLBACK(x1_irq_callback)
TIMER_DEVICE_CALLBACK(x1_keyboard_callback)
{
x1_state *state = timer.machine().driver_data<x1_state>();
- address_space &space = *timer.machine().device("x1_cpu")->memory().space(AS_PROGRAM);
+ address_space &space = timer.machine().device("x1_cpu")->memory().space(AS_PROGRAM);
UINT32 key1 = timer.machine().root_device().ioport("key1")->read();
UINT32 key2 = timer.machine().root_device().ioport("key2")->read();
UINT32 key3 = timer.machine().root_device().ioport("key3")->read();
diff --git a/src/mess/drivers/x1twin.c b/src/mess/drivers/x1twin.c
index 2f7ab3dc19d..1e1d5cd25c0 100644
--- a/src/mess/drivers/x1twin.c
+++ b/src/mess/drivers/x1twin.c
@@ -110,7 +110,7 @@ static const mc6845_interface mc6845_intf =
INPUT_CHANGED_MEMBER(x1twin_state::ipl_reset)
{
- //address_space &space = *machine().device("x1_cpu")->memory().space(AS_PROGRAM);
+ //address_space &space = machine().device("x1_cpu")->memory().space(AS_PROGRAM);
m_x1_cpu->set_input_line(INPUT_LINE_RESET, newval ? CLEAR_LINE : ASSERT_LINE);
diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c
index 39498bad0d2..a2d4537f91c 100644
--- a/src/mess/drivers/x68k.c
+++ b/src/mess/drivers/x68k.c
@@ -2622,7 +2622,7 @@ MACHINE_RESET_MEMBER(x68k_state,x68000)
MACHINE_START_MEMBER(x68k_state,x68000)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* Install RAM handlers */
m_spriteram = (UINT16*)(*memregion("user1"));
space.install_legacy_read_handler(0x000000,0xbffffb,0xffffffff,0,FUNC(x68k_emptyram_r));
@@ -2652,7 +2652,7 @@ MACHINE_START_MEMBER(x68k_state,x68000)
MACHINE_START_MEMBER(x68k_state,x68030)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* Install RAM handlers */
m_spriteram = (UINT16*)(*memregion("user1"));
space.install_legacy_read_handler(0x000000,0xbffffb,0xffffffff,0,FUNC(x68k_rom0_r),0xffffffff);
diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c
index 84d2328ac7e..46163de5641 100644
--- a/src/mess/drivers/xerox820.c
+++ b/src/mess/drivers/xerox820.c
@@ -143,40 +143,40 @@ static TIMER_DEVICE_CALLBACK( xerox820_keyboard_tick )
void xerox820_state::bankswitch(int bank)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = m_ram->pointer();
if (bank)
{
/* ROM */
- program->install_rom(0x0000, 0x0fff, memregion("monitor")->base());
- program->unmap_readwrite(0x1000, 0x1fff);
- program->install_ram(0x3000, 0x3fff, m_video_ram);
+ program.install_rom(0x0000, 0x0fff, memregion("monitor")->base());
+ program.unmap_readwrite(0x1000, 0x1fff);
+ program.install_ram(0x3000, 0x3fff, m_video_ram);
}
else
{
/* RAM */
- program->install_ram(0x0000, 0x3fff, ram);
+ program.install_ram(0x0000, 0x3fff, ram);
}
}
void xerox820ii_state::bankswitch(int bank)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = m_ram->pointer();
if (bank)
{
/* ROM */
- program->install_rom(0x0000, 0x17ff, memregion("monitor")->base());
- program->unmap_readwrite(0x1800, 0x2fff);
- program->install_ram(0x3000, 0x3fff, m_video_ram);
- program->unmap_readwrite(0x4000, 0xbfff);
+ program.install_rom(0x0000, 0x17ff, memregion("monitor")->base());
+ program.unmap_readwrite(0x1800, 0x2fff);
+ program.install_ram(0x3000, 0x3fff, m_video_ram);
+ program.unmap_readwrite(0x4000, 0xbfff);
}
else
{
/* RAM */
- program->install_ram(0x0000, 0xbfff, ram);
+ program.install_ram(0x0000, 0xbfff, ram);
}
}
diff --git a/src/mess/drivers/xor100.c b/src/mess/drivers/xor100.c
index 38a8fc5999d..34a9330e8af 100644
--- a/src/mess/drivers/xor100.c
+++ b/src/mess/drivers/xor100.c
@@ -57,7 +57,7 @@ enum
void xor100_state::bankswitch()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
int banks = m_ram->size() / 0x10000;
switch (m_mode)
@@ -65,16 +65,16 @@ void xor100_state::bankswitch()
case EPROM_0000:
if (m_bank < banks)
{
- program->install_write_bank(0x0000, 0xffff, "bank1");
+ program.install_write_bank(0x0000, 0xffff, "bank1");
membank("bank1")->set_entry(1 + m_bank);
}
else
{
- program->unmap_write(0x0000, 0xffff);
+ program.unmap_write(0x0000, 0xffff);
}
- program->install_read_bank(0x0000, 0xf7ff, 0x07ff, 0, "bank2");
- program->install_read_bank(0xf800, 0xffff, "bank3");
+ program.install_read_bank(0x0000, 0xf7ff, 0x07ff, 0, "bank2");
+ program.install_read_bank(0xf800, 0xffff, "bank3");
membank("bank2")->set_entry(0);
membank("bank3")->set_entry(0);
break;
@@ -82,36 +82,36 @@ void xor100_state::bankswitch()
case EPROM_F800:
if (m_bank < banks)
{
- program->install_write_bank(0x0000, 0xffff, "bank1");
- program->install_read_bank(0x0000, 0xf7ff, "bank2");
+ program.install_write_bank(0x0000, 0xffff, "bank1");
+ program.install_read_bank(0x0000, 0xf7ff, "bank2");
membank("bank1")->set_entry(1 + m_bank);
membank("bank2")->set_entry(1 + m_bank);
}
else
{
- program->unmap_write(0x0000, 0xffff);
- program->unmap_read(0x0000, 0xf7ff);
+ program.unmap_write(0x0000, 0xffff);
+ program.unmap_read(0x0000, 0xf7ff);
}
- program->install_read_bank(0xf800, 0xffff, "bank3");
+ program.install_read_bank(0xf800, 0xffff, "bank3");
membank("bank3")->set_entry(0);
break;
case EPROM_OFF:
if (m_bank < banks)
{
- program->install_write_bank(0x0000, 0xffff, "bank1");
- program->install_read_bank(0x0000, 0xf7ff, "bank2");
- program->install_read_bank(0xf800, 0xffff, "bank3");
+ program.install_write_bank(0x0000, 0xffff, "bank1");
+ program.install_read_bank(0x0000, 0xf7ff, "bank2");
+ program.install_read_bank(0xf800, 0xffff, "bank3");
membank("bank1")->set_entry(1 + m_bank);
membank("bank2")->set_entry(1 + m_bank);
membank("bank3")->set_entry(1 + m_bank);
}
else
{
- program->unmap_write(0x0000, 0xffff);
- program->unmap_read(0x0000, 0xf7ff);
- program->unmap_read(0xf800, 0xffff);
+ program.unmap_write(0x0000, 0xffff);
+ program.unmap_read(0x0000, 0xf7ff);
+ program.unmap_read(0xf800, 0xffff);
}
break;
}
diff --git a/src/mess/drivers/z1013.c b/src/mess/drivers/z1013.c
index 5f71a9dbe83..f11acb93ee2 100644
--- a/src/mess/drivers/z1013.c
+++ b/src/mess/drivers/z1013.c
@@ -348,7 +348,7 @@ SNAPSHOT_LOAD( z1013 )
return IMAGE_INIT_FAIL;
}
- memcpy (image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->get_read_ptr(startaddr),
+ memcpy (image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).get_read_ptr(startaddr),
data+0x20, endaddr - startaddr + 1);
if (runaddr)
diff --git a/src/mess/drivers/z88.c b/src/mess/drivers/z88.c
index 6785b1343c7..797fc527556 100644
--- a/src/mess/drivers/z88.c
+++ b/src/mess/drivers/z88.c
@@ -67,8 +67,8 @@ void z88_state::bankswitch_update(int bank, UINT16 page, int rams)
// install read bank
if (m_bank_type[bank] != Z88_BANK_ROM)
{
- m_maincpu->space(AS_PROGRAM)->install_read_bank(bank<<14, (bank<<14) + 0x3fff, bank_tag);
- m_maincpu->space(AS_PROGRAM)->unmap_write(bank<<14, (bank<<14) + 0x3fff);
+ m_maincpu->space(AS_PROGRAM).install_read_bank(bank<<14, (bank<<14) + 0x3fff, bank_tag);
+ m_maincpu->space(AS_PROGRAM).unmap_write(bank<<14, (bank<<14) + 0x3fff);
m_bank_type[bank] = Z88_BANK_ROM;
}
@@ -81,7 +81,7 @@ void z88_state::bankswitch_update(int bank, UINT16 page, int rams)
// install readwrite bank
if (m_bank_type[bank] != Z88_BANK_RAM)
{
- m_maincpu->space(AS_PROGRAM)->install_readwrite_bank(bank<<14, (bank<<14) + 0x3fff, bank_tag);
+ m_maincpu->space(AS_PROGRAM).install_readwrite_bank(bank<<14, (bank<<14) + 0x3fff, bank_tag);
m_bank_type[bank] = Z88_BANK_RAM;
}
@@ -92,7 +92,7 @@ void z88_state::bankswitch_update(int bank, UINT16 page, int rams)
{
if (m_bank_type[bank] != Z88_BANK_UNMAP)
{
- m_maincpu->space(AS_PROGRAM)->unmap_readwrite(bank<<14, (bank<<14) + 0x3fff);
+ m_maincpu->space(AS_PROGRAM).unmap_readwrite(bank<<14, (bank<<14) + 0x3fff);
m_bank_type[bank] = Z88_BANK_UNMAP;
}
}
@@ -107,16 +107,16 @@ void z88_state::bankswitch_update(int bank, UINT16 page, int rams)
switch (bank)
{
case 0:
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0x0000, 0x3fff, 0, 0, read8_delegate(FUNC(z88_state::bank0_cart_r), this), write8_delegate(FUNC(z88_state::bank0_cart_w), this));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0000, 0x3fff, 0, 0, read8_delegate(FUNC(z88_state::bank0_cart_r), this), write8_delegate(FUNC(z88_state::bank0_cart_w), this));
break;
case 1:
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0x4000, 0x7fff, 0, 0, read8_delegate(FUNC(z88_state::bank1_cart_r), this), write8_delegate(FUNC(z88_state::bank1_cart_w), this));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x4000, 0x7fff, 0, 0, read8_delegate(FUNC(z88_state::bank1_cart_r), this), write8_delegate(FUNC(z88_state::bank1_cart_w), this));
break;
case 2:
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0x8000, 0xbfff, 0, 0, read8_delegate(FUNC(z88_state::bank2_cart_r), this), write8_delegate(FUNC(z88_state::bank2_cart_w), this));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x8000, 0xbfff, 0, 0, read8_delegate(FUNC(z88_state::bank2_cart_r), this), write8_delegate(FUNC(z88_state::bank2_cart_w), this));
break;
case 3:
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(0xc000, 0xffff, 0, 0, read8_delegate(FUNC(z88_state::bank3_cart_r), this), write8_delegate(FUNC(z88_state::bank3_cart_w), this));
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc000, 0xffff, 0, 0, read8_delegate(FUNC(z88_state::bank3_cart_r), this), write8_delegate(FUNC(z88_state::bank3_cart_w), this));
break;
}
@@ -128,13 +128,13 @@ void z88_state::bankswitch_update(int bank, UINT16 page, int rams)
// override setting for lower 8k of bank 0
if (bank == 0)
{
- m_maincpu->space(AS_PROGRAM)->install_read_bank(0, 0x1fff, "bank1");
+ m_maincpu->space(AS_PROGRAM).install_read_bank(0, 0x1fff, "bank1");
// enable RAM
if (rams)
- m_maincpu->space(AS_PROGRAM)->install_write_bank(0, 0x1fff, "bank1");
+ m_maincpu->space(AS_PROGRAM).install_write_bank(0, 0x1fff, "bank1");
else
- m_maincpu->space(AS_PROGRAM)->unmap_write(0, 0x1fff);
+ m_maincpu->space(AS_PROGRAM).unmap_write(0, 0x1fff);
membank("bank1")->set_entry(rams & 1);
}
diff --git a/src/mess/drivers/z9001.c b/src/mess/drivers/z9001.c
index b35e2edbafd..3e64313df11 100644
--- a/src/mess/drivers/z9001.c
+++ b/src/mess/drivers/z9001.c
@@ -145,7 +145,7 @@ WRITE_LINE_MEMBER( z9001_state::cass_w )
static TIMER_DEVICE_CALLBACK( timer_callback )
{
z9001_state *state = timer.machine().driver_data<z9001_state>();
- state->m_maincpu->space(AS_PROGRAM)->write_byte(0x006a, 0);
+ state->m_maincpu->space(AS_PROGRAM).write_byte(0x006a, 0);
}
void z9001_state::machine_reset()
@@ -218,7 +218,7 @@ static const gfx_layout z9001_charlayout =
WRITE8_MEMBER( z9001_state::kbd_put )
{
- m_maincpu->space(AS_PROGRAM)->write_byte(0x0025, data);
+ m_maincpu->space(AS_PROGRAM).write_byte(0x0025, data);
}
static ASCII_KEYBOARD_INTERFACE( keyboard_intf )
diff --git a/src/mess/formats/ace_ace.c b/src/mess/formats/ace_ace.c
index e89e680f5cb..e80b744f1fa 100644
--- a/src/mess/formats/ace_ace.c
+++ b/src/mess/formats/ace_ace.c
@@ -27,7 +27,7 @@ SNAPSHOT_LOAD( ace )
{
cpu_device *cpu = image.device().machine().firstcpu;
UINT8 *RAM = image.device().machine().root_device().memregion(cpu->tag())->base();
- address_space &space = *cpu->space(AS_PROGRAM);
+ address_space &space = cpu->space(AS_PROGRAM);
unsigned char ace_repeat, ace_byte, loop;
int done=0, ace_index=0x2000;
diff --git a/src/mess/formats/atom_atm.c b/src/mess/formats/atom_atm.c
index 70b38b7a273..4b2a7550288 100644
--- a/src/mess/formats/atom_atm.c
+++ b/src/mess/formats/atom_atm.c
@@ -26,7 +26,7 @@
static void image_fread_memory(device_image_interface &image, UINT16 addr, UINT32 count)
{
- void *ptr = image.device().machine().firstcpu->space(AS_PROGRAM)->get_write_ptr(addr);
+ void *ptr = image.device().machine().firstcpu->space(AS_PROGRAM).get_write_ptr(addr);
image.fread( ptr, count);
}
diff --git a/src/mess/formats/cbm_snqk.c b/src/mess/formats/cbm_snqk.c
index a71d52ce45a..dacc2af1ddc 100644
--- a/src/mess/formats/cbm_snqk.c
+++ b/src/mess/formats/cbm_snqk.c
@@ -30,7 +30,7 @@ static int general_cbm_loadsnap( device_image_interface &image, const char *file
UINT32 bytesread;
UINT16 address = 0;
int i;
- address_space &space = *image.device().machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = image.device().machine().firstcpu->space(AS_PROGRAM);
if (!file_type)
goto error;
@@ -93,7 +93,7 @@ error:
static void cbm_quick_sethiaddress( running_machine &machine, UINT16 hiaddress )
{
- address_space &space = *machine.firstcpu->space(AS_PROGRAM);
+ address_space &space = machine.firstcpu->space(AS_PROGRAM);
space.write_byte(0x31, hiaddress & 0xff);
space.write_byte(0x2f, hiaddress & 0xff);
@@ -120,7 +120,7 @@ QUICKLOAD_LOAD( cbm_vc20 )
static void cbm_pet_quick_sethiaddress( running_machine &machine, UINT16 hiaddress )
{
- address_space &space = *machine.firstcpu->space(AS_PROGRAM);
+ address_space &space = machine.firstcpu->space(AS_PROGRAM);
space.write_byte(0x2e, hiaddress & 0xff);
space.write_byte(0x2c, hiaddress & 0xff);
@@ -137,7 +137,7 @@ QUICKLOAD_LOAD( cbm_pet )
static void cbm_pet1_quick_sethiaddress(running_machine &machine, UINT16 hiaddress)
{
- address_space &space = *machine.firstcpu->space(AS_PROGRAM);
+ address_space &space = machine.firstcpu->space(AS_PROGRAM);
space.write_byte(0x80, hiaddress & 0xff);
space.write_byte(0x7e, hiaddress & 0xff);
@@ -154,7 +154,7 @@ QUICKLOAD_LOAD( cbm_pet1 )
static void cbmb_quick_sethiaddress(running_machine &machine, UINT16 hiaddress)
{
- address_space &space = *machine.firstcpu->space(AS_PROGRAM);
+ address_space &space = machine.firstcpu->space(AS_PROGRAM);
space.write_byte(0xf0046, hiaddress & 0xff);
space.write_byte(0xf0047, hiaddress >> 8);
@@ -172,7 +172,7 @@ QUICKLOAD_LOAD( p500 )
static void cbm_c65_quick_sethiaddress( running_machine &machine, UINT16 hiaddress )
{
- address_space &space = *machine.firstcpu->space(AS_PROGRAM);
+ address_space &space = machine.firstcpu->space(AS_PROGRAM);
space.write_byte(0x82, hiaddress & 0xff);
space.write_byte(0x83, hiaddress >> 8);
diff --git a/src/mess/formats/comx35_comx.c b/src/mess/formats/comx35_comx.c
index 345d1f6416e..b1874d9fb8d 100644
--- a/src/mess/formats/comx35_comx.c
+++ b/src/mess/formats/comx35_comx.c
@@ -47,7 +47,7 @@ static void image_fread_memory(device_image_interface &image, UINT16 addr, UINT3
QUICKLOAD_LOAD( comx35_comx )
{
- address_space *program = image.device().machine().firstcpu->space(AS_PROGRAM);
+ address_space &program = image.device().machine().firstcpu->space(AS_PROGRAM);
UINT8 header[16] = {0};
int size = image.length();
@@ -172,16 +172,16 @@ QUICKLOAD_LOAD( comx35_comx )
image.fread(header, 2);
array_length = pick_integer_be(header, 0, 2);
- start_array = (program->read_byte(0x4295) << 8) | program->read_byte(0x4296);
+ start_array = (program.read_byte(0x4295) << 8) | program.read_byte(0x4296);
end_array = start_array + (size - 7);
- program->write_byte(0x4299, end_array >> 8);
- program->write_byte(0x429a, end_array & 0xff);
+ program.write_byte(0x4299, end_array >> 8);
+ program.write_byte(0x429a, end_array & 0xff);
start_string = start_array + array_length;
- program->write_byte(0x4292, start_string >> 8);
- program->write_byte(0x4293, start_string & 0xff);
+ program.write_byte(0x4292, start_string >> 8);
+ program.write_byte(0x4293, start_string & 0xff);
image_fread_memory(image, start_array, size);
}
diff --git a/src/mess/formats/m65_snqk.c b/src/mess/formats/m65_snqk.c
index 7103ec24a70..bf9c49d0ccb 100644
--- a/src/mess/formats/m65_snqk.c
+++ b/src/mess/formats/m65_snqk.c
@@ -219,7 +219,7 @@ static void microtan_snapshot_copy(running_machine &machine, UINT8 *snapshot_buf
{
microtan_state *state = machine.driver_data<microtan_state>();
UINT8 *RAM = state->memregion("maincpu")->base();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
via6522_device *via_0 = machine.device<via6522_device>("via6522_0");
via6522_device *via_1 = machine.device<via6522_device>("via6522_1");
device_t *ay8910 = machine.device("ay8910.1");
diff --git a/src/mess/formats/spec_snqk.c b/src/mess/formats/spec_snqk.c
index 3368cfb638c..3a9c7b5887d 100644
--- a/src/mess/formats/spec_snqk.c
+++ b/src/mess/formats/spec_snqk.c
@@ -320,7 +320,7 @@ void spectrum_setup_sp(running_machine &machine, UINT8 *snapdata, UINT32 snapsiz
UINT16 start, size, data, status;
spectrum_state *state = machine.driver_data<spectrum_state>();
device_t *cpu = machine.device("maincpu");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (snapsize == SP_NEW_SIZE_16K || snapsize == SP_NEW_SIZE_48K)
{
@@ -520,7 +520,7 @@ void spectrum_setup_sna(running_machine &machine, UINT8 *snapdata, UINT32 snapsi
UINT16 data, addr;
spectrum_state *state = machine.driver_data<spectrum_state>();
device_t *cpu = machine.device("maincpu");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if ((snapsize != SNA48_SIZE) && (state->m_port_7ffd_data == -1))
{
@@ -739,7 +739,7 @@ void spectrum_setup_ach(running_machine &machine, UINT8 *snapdata, UINT32 snapsi
UINT16 data;
spectrum_state *state = machine.driver_data<spectrum_state>();
device_t *cpu = machine.device("maincpu");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
data = (snapdata[ACH_OFFSET + 0] << 8) | snapdata[ACH_OFFSET + 4];
LOAD_REG(cpu, Z80_AF, data);
@@ -872,7 +872,7 @@ void spectrum_setup_prg(running_machine &machine, UINT8 *snapdata, UINT32 snapsi
UINT16 addr, data;
spectrum_state *state = machine.driver_data<spectrum_state>();
device_t *cpu = machine.device("maincpu");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
data = snapdata[PRG_OFFSET + 0];
if (data != 0x05)
@@ -1042,7 +1042,7 @@ void spectrum_setup_plusd(running_machine &machine, UINT8 *snapdata, UINT32 snap
UINT16 addr = 0, data;
spectrum_state *state = machine.driver_data<spectrum_state>();
device_t *cpu = machine.device("maincpu");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
data = (snapdata[PLUSD_OFFSET + 15] << 8) | snapdata[PLUSD_OFFSET + 14];
LOAD_REG(cpu, Z80_BC, data);
@@ -1210,7 +1210,7 @@ void spectrum_setup_sem(running_machine &machine, UINT8 *snapdata, UINT32 snapsi
UINT16 data;
spectrum_state *state = machine.driver_data<spectrum_state>();
device_t *cpu = machine.device("maincpu");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
data = (snapdata[SEM_OFFSET + 1] << 8) | snapdata[SEM_OFFSET + 0];
LOAD_REG(cpu, Z80_AF, data);
@@ -1329,7 +1329,7 @@ void spectrum_setup_sit(running_machine &machine, UINT8 *snapdata, UINT32 snapsi
UINT16 data;
spectrum_state *state = machine.driver_data<spectrum_state>();
device_t *cpu = machine.device("maincpu");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
data = (snapdata[SIT_OFFSET + 7] << 8) | snapdata[SIT_OFFSET + 6];
LOAD_REG(cpu, Z80_AF, data);
@@ -1459,7 +1459,7 @@ void spectrum_setup_zx(running_machine &machine, UINT8 *snapdata, UINT32 snapsiz
UINT16 data, mode;
spectrum_state *state = machine.driver_data<spectrum_state>();
device_t *cpu = machine.device("maincpu");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
logerror("Skipping last 132 bytes of the 16K ROM dump at offset:0000\n");
@@ -1591,7 +1591,7 @@ void spectrum_setup_snp(running_machine &machine, UINT8 *snapdata, UINT32 snapsi
UINT16 data;
spectrum_state *state = machine.driver_data<spectrum_state>();
device_t *cpu = machine.device("maincpu");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
data = (snapdata[SNP_OFFSET + 1] << 8) | snapdata[SNP_OFFSET + 0];
LOAD_REG(cpu, Z80_AF, data);
@@ -1768,7 +1768,7 @@ static void spectrum_snx_decompress_block(running_machine &machine, UINT8 *sourc
{
UINT8 counthi, countlo, compress, fill;
UINT16 block = 0, count, i, j, numbytes;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
i = SNX_HDR - 1;
numbytes = 0;
@@ -1818,7 +1818,7 @@ void spectrum_setup_snx(running_machine &machine, UINT8 *snapdata, UINT32 snapsi
UINT16 data, addr;
spectrum_state *state = machine.driver_data<spectrum_state>();
device_t *cpu = machine.device("maincpu");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
data = (snapdata[SNX_OFFSET + 4] << 8) | snapdata[SNX_OFFSET + 5];
if (data != 0x25)
@@ -1972,7 +1972,7 @@ void spectrum_setup_frz(running_machine &machine, UINT8 *snapdata, UINT32 snapsi
UINT16 addr, data;
spectrum_state *state = machine.driver_data<spectrum_state>();
device_t *cpu = machine.device("maincpu");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (state->m_port_7ffd_data == -1)
{
@@ -2083,7 +2083,7 @@ static void spectrum_z80_decompress_block(running_machine &machine,UINT8 *source
{
UINT8 ch;
int i;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
do
{
@@ -2194,7 +2194,7 @@ void spectrum_setup_z80(running_machine &machine, UINT8 *snapdata, UINT32 snapsi
int i;
UINT8 lo, hi, data;
SPECTRUM_Z80_SNAPSHOT_TYPE z80_type;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
z80_type = spectrum_identify_z80(snapdata, snapsize);
@@ -2520,7 +2520,7 @@ error:
void spectrum_setup_scr(running_machine &machine, UINT8 *quickdata, UINT32 quicksize)
{
int i;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
for (i = 0; i < quicksize; i++)
space.write_byte(i + BASE_RAM, quickdata[i]);
@@ -2560,7 +2560,7 @@ void spectrum_setup_raw(running_machine &machine, UINT8 *quickdata, UINT32 quick
UINT8 data;
UINT16 start, len;
spectrum_state *state = machine.driver_data<spectrum_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
start = (quickdata[RAW_OFFSET + 4] << 8) | quickdata[RAW_OFFSET + 3];
len = (quickdata[RAW_OFFSET + 2] << 8) | quickdata[RAW_OFFSET + 1];
diff --git a/src/mess/formats/trs_cmd.c b/src/mess/formats/trs_cmd.c
index d29a8d4acc2..20c9c537224 100644
--- a/src/mess/formats/trs_cmd.c
+++ b/src/mess/formats/trs_cmd.c
@@ -35,7 +35,7 @@
QUICKLOAD_LOAD( trs80_cmd )
{
- address_space *program = image.device().machine().firstcpu->space(AS_PROGRAM);
+ address_space &program = image.device().machine().firstcpu->space(AS_PROGRAM);
UINT8 type, length;
UINT8 data[0x100];
@@ -57,7 +57,7 @@ QUICKLOAD_LOAD( trs80_cmd )
image.fread( &addr, 2);
UINT16 address = (addr[1] << 8) | addr[0];
if (LOG) logerror("/CMD object code block: address %04x length %u\n", address, block_length);
- ptr = program->get_write_ptr(address);
+ ptr = program.get_write_ptr(address);
image.fread( ptr, block_length);
}
break;
diff --git a/src/mess/formats/z80bin.c b/src/mess/formats/z80bin.c
index bbce778f05b..7f98af42d74 100644
--- a/src/mess/formats/z80bin.c
+++ b/src/mess/formats/z80bin.c
@@ -68,7 +68,7 @@ static int z80bin_load_file(device_image_interface *image, const char *file_type
image->message("%s: Unexpected EOF while writing byte to %04X", pgmname, (unsigned) j);
return IMAGE_INIT_FAIL;
}
- image->device().machine().device("maincpu")->memory().space(AS_PROGRAM)->write_byte(j, data);
+ image->device().machine().device("maincpu")->memory().space(AS_PROGRAM).write_byte(j, data);
}
return IMAGE_INIT_PASS;
@@ -122,7 +122,7 @@ QUICKLOAD_LOAD( mbee_z80bin )
autorun = image.device().machine().root_device().ioport("CONFIG")->read_safe(0xFF) & 1;
device_t *cpu = image.device().machine().device("maincpu");
- address_space &space = *image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
space.write_word(0xa6, execute_address); /* fix the EXEC command */
@@ -158,7 +158,7 @@ QUICKLOAD_LOAD( sorcerer )
/* check to see if autorun is on (I hate how this works) */
autorun = image.device().machine().root_device().ioport("CONFIG")->read_safe(0xFF) & 1;
- address_space &space = *image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
if ((execute_address >= 0xc000) && (execute_address <= 0xdfff) && (space.read_byte(0xdffa) != 0xc3))
return IMAGE_INIT_FAIL; /* can't run a program if the cartridge isn't in */
diff --git a/src/mess/machine/6883sam.c b/src/mess/machine/6883sam.c
index 84deaee8a6f..2bd91da284c 100644
--- a/src/mess/machine/6883sam.c
+++ b/src/mess/machine/6883sam.c
@@ -74,7 +74,7 @@ void sam6883_device::device_start()
/* find the CPU */
m_cpu = machine().device<cpu_device>(config->m_cpu_tag);
- m_cpu_space = m_cpu->space(config->m_cpu_space);
+ m_cpu_space = &m_cpu->space(config->m_cpu_space);
/* resolve callbacks */
m_res_input_func.resolve(config->m_input_func, *this);
diff --git a/src/mess/machine/990_hd.c b/src/mess/machine/990_hd.c
index 2afbe6c0977..4603812426d 100644
--- a/src/mess/machine/990_hd.c
+++ b/src/mess/machine/990_hd.c
@@ -540,7 +540,7 @@ static void store_registers(running_machine &machine)
if (! (hdc.w[1] & w1_transfer_inhibit))
for (i=0; i<real_word_count; i++)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->write_word(dma_address, buffer[i]);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).write_word(dma_address, buffer[i]);
dma_address = (dma_address + 2) & 0x1ffffe;
}
@@ -695,7 +695,7 @@ static void read_data(running_machine &machine)
if (! (hdc.w[1] & w1_transfer_inhibit))
for (i=0; i<bytes_read; i+=2)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->write_word(dma_address, (((int) buffer[i]) << 8) | buffer[i+1]);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).write_word(dma_address, (((int) buffer[i]) << 8) | buffer[i+1]);
dma_address = (dma_address + 2) & 0x1ffffe;
}
@@ -791,7 +791,7 @@ static void write_data(running_machine &machine)
/* DMA */
for (i=0; (i<byte_count) && (i<hdc.d[dsk_sel].bytes_per_sector); i+=2)
{
- word = machine.device("maincpu")->memory().space(AS_PROGRAM)->read_word(dma_address);
+ word = machine.device("maincpu")->memory().space(AS_PROGRAM).read_word(dma_address);
buffer[i] = word >> 8;
buffer[i+1] = word & 0xff;
@@ -898,7 +898,7 @@ static void unformatted_read(running_machine &machine)
if (! (hdc.w[1] & w1_transfer_inhibit))
for (i=0; i<real_word_count; i++)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->write_word(dma_address, buffer[i]);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).write_word(dma_address, buffer[i]);
dma_address = (dma_address + 2) & 0x1ffffe;
}
diff --git a/src/mess/machine/990_tap.c b/src/mess/machine/990_tap.c
index 92b50150873..f2038bc1e9b 100644
--- a/src/mess/machine/990_tap.c
+++ b/src/mess/machine/990_tap.c
@@ -306,7 +306,7 @@ static void cmd_read_binary_forward(device_t *device)
/* DMA */
for (i=0; i<bytes_read; i+=2)
{
- device->machine().device("maincpu")->memory().space(AS_PROGRAM)->write_word(dma_address, (((int) buffer[i]) << 8) | buffer[i+1]);
+ device->machine().device("maincpu")->memory().space(AS_PROGRAM).write_word(dma_address, (((int) buffer[i]) << 8) | buffer[i+1]);
dma_address = (dma_address + 2) & 0x1ffffe;
}
diff --git a/src/mess/machine/a7800.c b/src/mess/machine/a7800.c
index 3f34c96d9be..8909e827ef3 100644
--- a/src/mess/machine/a7800.c
+++ b/src/mess/machine/a7800.c
@@ -72,7 +72,7 @@ const riot6532_interface a7800_r6532_interface =
static void a7800_driver_init(running_machine &machine, int ispal, int lines)
{
a7800_state *state = machine.driver_data<a7800_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
state->m_ROM = state->memregion("maincpu")->base();
state->m_ispal = ispal;
state->m_lines = lines;
@@ -107,7 +107,7 @@ DRIVER_INIT_MEMBER(a7800_state,a7800_pal)
void a7800_state::machine_reset()
{
UINT8 *memory;
- address_space& space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine().device("maincpu")->memory().space(AS_PROGRAM);
m_ctrl_lock = 0;
m_ctrl_reg = 0;
diff --git a/src/mess/machine/advision.c b/src/mess/machine/advision.c
index f6868755f81..a15c0fd13e2 100644
--- a/src/mess/machine/advision.c
+++ b/src/mess/machine/advision.c
@@ -30,7 +30,7 @@ void advision_state::machine_start()
/* configure EA banking */
membank("bank1")->configure_entry(0, memregion("bios")->base());
membank("bank1")->configure_entry(1, memregion(I8048_TAG)->base());
- m_maincpu->space(AS_PROGRAM)->install_readwrite_bank(0x0000, 0x03ff, "bank1");
+ m_maincpu->space(AS_PROGRAM).install_readwrite_bank(0x0000, 0x03ff, "bank1");
membank("bank1")->set_entry(0);
/* allocate external RAM */
diff --git a/src/mess/machine/aim65.c b/src/mess/machine/aim65.c
index 81dd1298767..fa65a95df30 100644
--- a/src/mess/machine/aim65.c
+++ b/src/mess/machine/aim65.c
@@ -141,7 +141,7 @@ WRITE8_MEMBER( aim65_state::aim65_riot_a_w )
void aim65_state::machine_start()
{
ram_device *ram = machine().device<ram_device>(RAM_TAG);
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* Init RAM */
space.install_ram(0x0000, ram->size() - 1, ram->pointer());
diff --git a/src/mess/machine/amigacd.c b/src/mess/machine/amigacd.c
index 071692296d0..f11369863a3 100644
--- a/src/mess/machine/amigacd.c
+++ b/src/mess/machine/amigacd.c
@@ -82,7 +82,7 @@ static void check_interrupts( running_machine &machine )
return;
/* otherwise, generate the IRQ */
- amiga_custom_w(*machine.device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_PORTS, 0xffff);
+ amiga_custom_w(machine.device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_PORTS, 0xffff);
}
static TIMER_CALLBACK(dmac_dma_proc)
@@ -389,14 +389,14 @@ static WRITE16_HANDLER( amiga_dmac_w )
static void dmac_install(running_machine &machine, offs_t base)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
space.install_legacy_read_handler(base, base + 0xFFFF, FUNC(amiga_dmac_r));
space.install_legacy_write_handler(base, base + 0xFFFF, FUNC(amiga_dmac_w));
}
static void dmac_uninstall(running_machine &machine, offs_t base)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
space.unmap_readwrite(base, base + 0xFFFF);
}
@@ -457,7 +457,7 @@ static TIMER_CALLBACK(tp6525_delayed_irq)
if ( (CUSTOM_REG(REG_INTREQ) & INTENA_PORTS) == 0 )
{
- amiga_custom_w(*machine.device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_PORTS, 0xffff);
+ amiga_custom_w(machine.device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_PORTS, 0xffff);
}
else
{
@@ -474,7 +474,7 @@ static void amigacd_tpi6525_irq_trampoline(device_t *device, int level)
{
if ( (CUSTOM_REG(REG_INTREQ) & INTENA_PORTS) == 0 )
{
- amiga_custom_w(*device->machine().device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_PORTS, 0xffff);
+ amiga_custom_w(device->machine().device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_PORTS, 0xffff);
}
else
{
diff --git a/src/mess/machine/amigacrt.c b/src/mess/machine/amigacrt.c
index 55bf8e90cf2..0fe23df594f 100644
--- a/src/mess/machine/amigacrt.c
+++ b/src/mess/machine/amigacrt.c
@@ -94,7 +94,7 @@ static void amiga_ar1_nmi( running_machine &machine )
{
amiga_state *state = machine.driver_data<amiga_state>();
/* get the cart's built-in ram */
- UINT16 *ar_ram = (UINT16 *)machine.device("maincpu")->memory().space(AS_PROGRAM)->get_write_ptr(0x9fc000);
+ UINT16 *ar_ram = (UINT16 *)machine.device("maincpu")->memory().space(AS_PROGRAM).get_write_ptr(0x9fc000);
if ( ar_ram != NULL )
{
@@ -133,7 +133,7 @@ static WRITE16_HANDLER( amiga_ar1_chipmem_w )
static void amiga_ar1_check_overlay( running_machine &machine )
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x000000, 0x00007f, FUNC(amiga_ar1_chipmem_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x000000, 0x00007f, FUNC(amiga_ar1_chipmem_w));
}
static void amiga_ar1_init( running_machine &machine )
@@ -153,11 +153,11 @@ static void amiga_ar1_init( running_machine &machine )
memset(ar_ram, 0, 0x4000);
/* Install ROM */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xf00000, 0xf7ffff, "bank2");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xf00000, 0xf7ffff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xf00000, 0xf7ffff, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xf00000, 0xf7ffff);
/* Install RAM */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0x9fc000, 0x9fffff, "bank3");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0x9fc000, 0x9fffff, "bank3");
/* Configure Banks */
state->membank("bank2")->set_base(machine.root_device().memregion("user2")->base());
@@ -269,7 +269,7 @@ static void amiga_ar23_freeze( running_machine &machine )
if ( ((pc >> 16) & 0xfe ) != 0x40 )
{
/* get the cart's built-in ram */
- UINT16 *ar_ram = (UINT16 *)machine.device("maincpu")->memory().space(AS_PROGRAM)->get_write_ptr(0x440000);
+ UINT16 *ar_ram = (UINT16 *)machine.device("maincpu")->memory().space(AS_PROGRAM).get_write_ptr(0x440000);
if ( ar_ram != NULL )
{
@@ -283,7 +283,7 @@ static void amiga_ar23_freeze( running_machine &machine )
state->membank("bank1")->set_entry(2);
/* writes go to chipram */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x000000, state->m_chip_ram.bytes() - 1, FUNC(amiga_ar23_chipmem_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x000000, state->m_chip_ram.bytes() - 1, FUNC(amiga_ar23_chipmem_w));
/* trigger NMI irq */
machine.device("maincpu")->execute().set_input_line(7, PULSE_LINE);
@@ -341,7 +341,7 @@ static READ16_HANDLER( amiga_ar23_custom_r )
static void amiga_ar23_check_overlay( running_machine &machine )
{
amigacrt.ar23_mode = 3;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x000000, 0x00000f, FUNC(amiga_ar23_chipmem_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x000000, 0x00000f, FUNC(amiga_ar23_chipmem_w));
}
static void amiga_ar23_init( running_machine &machine, int ar3 )
@@ -367,20 +367,20 @@ static void amiga_ar23_init( running_machine &machine, int ar3 )
}
/* Install ROM */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x400000, 0x400000+size, 0, mirror, "bank2");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x400000, 0x400000+size, 0, mirror);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x400000, 0x400000+size, 0, mirror, "bank2");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x400000, 0x400000+size, 0, mirror);
/* Install RAM */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x440000, 0x44ffff, "bank3");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x440000, 0x44ffff, "bank3");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x440000, 0x44ffff, "bank3");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x440000, 0x44ffff, "bank3");
/* Install Custom chip monitor */
-// machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0xdff000, 0xdff1ff, FUNC(amiga_ar23_custom_r));
-// machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xdff000, 0xdff1ff, FUNC(amiga_ar23_custom_w));
+// machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0xdff000, 0xdff1ff, FUNC(amiga_ar23_custom_r));
+// machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xdff000, 0xdff1ff, FUNC(amiga_ar23_custom_w));
/* Install status/mode handlers */
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x400000, 0x400007, 0, mirror, FUNC(amiga_ar23_mode_r));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x400000, 0x400003, 0, mirror, FUNC(amiga_ar23_mode_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x400000, 0x400007, 0, mirror, FUNC(amiga_ar23_mode_r));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x400000, 0x400003, 0, mirror, FUNC(amiga_ar23_mode_w));
/* Configure Banks */
state->membank("bank2")->set_base(machine.root_device().memregion("user2")->base());
diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c
index 3e514db1219..22ed66eb021 100644
--- a/src/mess/machine/amstrad.c
+++ b/src/mess/machine/amstrad.c
@@ -1195,7 +1195,7 @@ static void amstrad_setLowerRom(running_machine &machine)
}
else // CPC+/GX4000
{
- //address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ //address_space &space = state->m_maincpu->space(AS_PROGRAM);
/* if ( state->m_asic.enabled && ( state->m_asic.rmr2 & 0x18 ) == 0x18 )
{
@@ -2174,7 +2174,7 @@ The exception is the case where none of b7-b0 are reset (i.e. port &FBFF), which
static void amstrad_handle_snapshot(running_machine &machine, unsigned char *pSnapshot)
{
amstrad_state *state = machine.driver_data<amstrad_state>();
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
mc6845_device *mc6845 = state->m_crtc;
device_t *ay8910 = state->m_ay;
int RegData;
@@ -2457,7 +2457,7 @@ BDIR BC1 |
static void update_psg(running_machine &machine)
{
amstrad_state *state = machine.driver_data<amstrad_state>();
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
device_t *ay8910 = state->m_ay;
mc146818_device *rtc = state->m_rtc;
@@ -2831,7 +2831,7 @@ static const UINT8 amstrad_cycle_table_ex[256]=
static void amstrad_common_init(running_machine &machine)
{
amstrad_state *state = machine.driver_data<amstrad_state>();
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
device_t* romexp;
rom_image_device* romimage;
char str[20];
@@ -2976,7 +2976,7 @@ MACHINE_START_MEMBER(amstrad_state,plus)
MACHINE_RESET_MEMBER(amstrad_state,plus)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
int i;
UINT8 *rom = memregion("maincpu")->base();
@@ -3026,7 +3026,7 @@ MACHINE_START_MEMBER(amstrad_state,gx4000)
MACHINE_RESET_MEMBER(amstrad_state,gx4000)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
int i;
UINT8 *rom = memregion("maincpu")->base();
diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c
index 5172a1571a8..5c081ba6069 100644
--- a/src/mess/machine/apollo.c
+++ b/src/mess/machine/apollo.c
@@ -826,7 +826,7 @@ WRITE8_DEVICE_HANDLER(apollo_ptm_w) {
***************************************************************************/
static DEVICE_RESET( apollo_rtc ) {
- address_space &space = *device->machine().device(MAINCPU)->memory().space(AS_PROGRAM);
+ address_space &space = device->machine().device(MAINCPU)->memory().space(AS_PROGRAM);
apollo_state *state = device->machine().driver_data<apollo_state>();
UINT8 year = state->apollo_rtc_r(space, 9);
@@ -872,7 +872,7 @@ READ8_MEMBER(apollo_state::apollo_rtc_r)
static TIMER_CALLBACK( apollo_rtc_timer )
{
apollo_state *state = machine.driver_data<apollo_state>();
- address_space &space = *machine.device(MAINCPU)->memory().space(AS_PROGRAM);
+ address_space &space = machine.device(MAINCPU)->memory().space(AS_PROGRAM);
// FIXME: reading register 0x0c will clear all interrupt flags
if ((state->apollo_rtc_r(space, 0x0c) & 0x80))
diff --git a/src/mess/machine/apple1.c b/src/mess/machine/apple1.c
index afc78e1dbd7..1655f14fb0b 100644
--- a/src/mess/machine/apple1.c
+++ b/src/mess/machine/apple1.c
@@ -143,7 +143,7 @@ static const UINT8 apple1_control_keymap[] =
DRIVER_INIT_MEMBER(apple1_state,apple1)
{
- address_space& space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* Set up the handlers for MESS's dynamically-sized RAM. */
space.install_readwrite_bank(0x0000, machine().device<ram_device>(RAM_TAG)->size() - 1, "bank1");
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
@@ -255,7 +255,7 @@ SNAPSHOT_LOAD(apple1)
for (addr = start_addr, snapptr = snapbuf + SNAP_HEADER_LEN;
addr <= end_addr;
addr++, snapptr++)
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->write_byte(addr, *snapptr);
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).write_byte(addr, *snapptr);
return IMAGE_INIT_PASS;
diff --git a/src/mess/machine/apple2.c b/src/mess/machine/apple2.c
index 53f07a16e4d..518f79a3d4f 100644
--- a/src/mess/machine/apple2.c
+++ b/src/mess/machine/apple2.c
@@ -59,7 +59,7 @@ void apple2_setup_memory(running_machine &machine, const apple2_memmap_config *c
void apple2_update_memory(running_machine &machine)
{
apple2_state *state = machine.driver_data<apple2_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int i, bank;
char rbank[10], wbank[10];
int full_update = 0;
diff --git a/src/mess/machine/apple2gs.c b/src/mess/machine/apple2gs.c
index 9b4b9c78ea9..ec88a568215 100644
--- a/src/mess/machine/apple2gs.c
+++ b/src/mess/machine/apple2gs.c
@@ -1554,7 +1554,7 @@ static UINT8 apple2gs_xxCxxx_r(address_space &space, running_machine &machine, o
}
else if ((address & 0x000F00) == 0x000000) // accessing C0xx?
{
- result = state->apple2gs_c0xx_r(*machine.device("maincpu")->memory().space(AS_PROGRAM), address, 0);
+ result = state->apple2gs_c0xx_r(machine.device("maincpu")->memory().space(AS_PROGRAM), address, 0);
}
else
{
@@ -1646,7 +1646,7 @@ static void apple2gs_xxCxxx_w(address_space &space, running_machine &machine, of
}
else if ((address & 0x000F00) == 0x000000)
{
- state->apple2gs_c0xx_w(*machine.device("maincpu")->memory().space(AS_PROGRAM), address, data, 0);
+ state->apple2gs_c0xx_w(machine.device("maincpu")->memory().space(AS_PROGRAM), address, data, 0);
}
else
{
@@ -1796,7 +1796,7 @@ static READ8_HANDLER(apple2gs_bank_echo_r)
static void apple2gs_setup_memory(running_machine &machine)
{
apple2gs_state *state = machine.driver_data<apple2gs_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
offs_t begin, end;
apple2_memmap_config cfg;
diff --git a/src/mess/machine/apple3.c b/src/mess/machine/apple3.c
index 8474fbf8617..8e6a0624e37 100644
--- a/src/mess/machine/apple3.c
+++ b/src/mess/machine/apple3.c
@@ -327,7 +327,7 @@ static void apple3_update_memory(running_machine &machine)
apple3_state *state = machine.driver_data<apple3_state>();
UINT16 bank;
UINT8 page;
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (LOG_MEMORY)
{
@@ -734,5 +734,5 @@ DRIVER_INIT_MEMBER(apple3_state,apple3)
m_via_1_irq = 0;
apple3_update_memory(machine());
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(apple3_state::apple3_opbase), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(apple3_state::apple3_opbase), this));
}
diff --git a/src/mess/machine/at.c b/src/mess/machine/at.c
index 1ad1e1f938b..99ff20cd228 100644
--- a/src/mess/machine/at.c
+++ b/src/mess/machine/at.c
@@ -316,7 +316,7 @@ WRITE8_MEMBER( at_state::at_portb_w )
static void init_at_common(running_machine &machine)
{
at_state *state = machine.driver_data<at_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
// The CS4031 chipset does this itself
if (machine.device("cs4031") == NULL)
diff --git a/src/mess/machine/ataricrt.c b/src/mess/machine/ataricrt.c
index 7f3fe7c9f5e..2e1160461f3 100644
--- a/src/mess/machine/ataricrt.c
+++ b/src/mess/machine/ataricrt.c
@@ -42,23 +42,23 @@ static void a800_setbank(running_machine &machine, int cart_mounted)
offs_t ram_top;
// take care of 0x0000-0x7fff: RAM or NOP
ram_top = MIN(machine.device<ram_device>(RAM_TAG)->size(), 0x8000) - 1;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0x0000, ram_top, "0000");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0x0000, ram_top, "0000");
machine.root_device().membank("0000")->set_base(machine.device<ram_device>(RAM_TAG)->pointer());
// take care of 0x8000-0x9fff: A800 -> either right slot or RAM or NOP, others -> RAM or NOP
// is there anything in the right slot?
if (cart_mounted & RIGHT_CARTSLOT_MOUNTED)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x8000, 0x9fff, "8000");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x8000, 0x9fff, "8000");
machine.root_device().membank("8000")->set_base(machine.root_device().memregion("rslot")->base());
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x8000, 0x9fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x8000, 0x9fff);
}
else if (a800_cart_type != BBSB)
{
ram_top = MIN(machine.device<ram_device>(RAM_TAG)->size(), 0xa000) - 1;
if (ram_top > 0x8000)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0x8000, ram_top, "8000");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0x8000, ram_top, "8000");
machine.root_device().membank("8000")->set_base(machine.device<ram_device>(RAM_TAG)->pointer() + 0x8000);
}
}
@@ -71,9 +71,9 @@ static void a800_setbank(running_machine &machine, int cart_mounted)
{
if (a800_cart_type == A800_16K)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x8000, 0x9fff, "8000");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x8000, 0x9fff, "8000");
machine.root_device().membank("8000")->set_base(machine.root_device().memregion("lslot")->base());
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x8000, 0x9fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x8000, 0x9fff);
memcpy(machine.root_device().memregion("maincpu")->base() + 0x10000, machine.root_device().memregion("lslot")->base() + 0x2000, 0x2000);
}
@@ -86,44 +86,44 @@ static void a800_setbank(running_machine &machine, int cart_mounted)
{
machine.root_device().membank("8000")->set_base(machine.root_device().memregion("lslot")->base());
machine.root_device().membank("a000")->set_base(machine.root_device().memregion("lslot")->base() + 0x2000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x8000, 0xbfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x8000, 0xbfff);
}
else if (a800_cart_type == BBSB)
{
// this requires separate banking in 0x8000 & 0x9000!
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x8000, 0x8fff, "8000");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x9000, 0x9fff, "9000");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x8000, 0x8fff, "8000");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x9000, 0x9fff, "9000");
machine.root_device().membank("8000")->set_base(machine.root_device().memregion("lslot")->base() + 0x0000);
machine.root_device().membank("9000")->set_base(machine.root_device().memregion("lslot")->base() + 0x4000);
machine.root_device().membank("a000")->set_base(machine.root_device().memregion("lslot")->base() + 0x8000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xa000, 0xbfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xa000, 0xbfff);
}
else if (a800_cart_type == OSS_034M)
{
// this requires separate banking in 0xa000 & 0xb000!
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xa000, 0xafff, "a000");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xb000, 0xbfff, "b000");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xa000, 0xafff, "a000");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xb000, 0xbfff, "b000");
machine.root_device().membank("b000")->set_base(machine.root_device().memregion("lslot")->base() + 0x3000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xa000, 0xbfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xa000, 0xbfff);
}
else if (a800_cart_type == OSS_M091)
{
// this requires separate banking in 0xa000 & 0xb000!
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xa000, 0xafff, "a000");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xb000, 0xbfff, "b000");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xa000, 0xafff, "a000");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xb000, 0xbfff, "b000");
machine.root_device().membank("b000")->set_base(machine.root_device().memregion("lslot")->base());
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xa000, 0xbfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xa000, 0xbfff);
}
else if (a800_cart_type == XEGS_32K)
{
machine.root_device().membank("8000")->set_base(machine.root_device().memregion("lslot")->base());
machine.root_device().membank("a000")->set_base(machine.root_device().memregion("lslot")->base() + 0x6000);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x8000, 0xbfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x8000, 0xbfff);
}
else
{
machine.root_device().membank("a000")->set_base(machine.root_device().memregion("lslot")->base());
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xa000, 0xbfff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xa000, 0xbfff);
}
}
}
@@ -352,29 +352,29 @@ static void a800_setup_mappers(running_machine &machine, int type)
case PHOENIX_8K: // as normal 8k cart, but it can be disabled by writing to 0xd500-0xdfff
break;
case XEGS_32K:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xd500, 0xd5ff, FUNC(x32_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xd500, 0xd5ff, FUNC(x32_bank_w));
break;
case OSS_034M:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xd500, 0xd5ff, FUNC(oss_034m_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xd500, 0xd5ff, FUNC(oss_034m_w));
break;
case OSS_M091:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xd500, 0xd5ff, FUNC(oss_m091_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xd500, 0xd5ff, FUNC(oss_m091_w));
break;
case BBSB:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x8000, 0x8fff, FUNC(bbsb_bankl_w));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x9000, 0x9fff, FUNC(bbsb_bankh_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x8000, 0x8fff, FUNC(bbsb_bankl_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x9000, 0x9fff, FUNC(bbsb_bankh_w));
break;
case WILLIAMS_64K:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xd500, 0xd50f, FUNC(w64_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xd500, 0xd50f, FUNC(w64_bank_w));
break;
case DIAMOND_64K:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xd5d0, 0xd5df, FUNC(ex64_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xd5d0, 0xd5df, FUNC(ex64_bank_w));
break;
case EXPRESS_64:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xd570, 0xd57f, FUNC(ex64_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xd570, 0xd57f, FUNC(ex64_bank_w));
break;
case SPARTADOS_X:
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xd5e0, 0xd5ef, FUNC(ex64_bank_w));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xd5e0, 0xd5ef, FUNC(ex64_bank_w));
break;
default:
break;
@@ -665,7 +665,7 @@ static WRITE8_HANDLER( xegs_bankswitch )
MACHINE_START( xegs )
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *cart = space.machine().root_device().memregion("user1")->base();
UINT8 *cpu = space.machine().root_device().memregion("maincpu")->base();
diff --git a/src/mess/machine/b2m.c b/src/mess/machine/b2m.c
index ce44900bd6a..d08e49c7b25 100644
--- a/src/mess/machine/b2m.c
+++ b/src/mess/machine/b2m.c
@@ -44,7 +44,7 @@ static void b2m_set_bank(running_machine &machine,int bank)
{
UINT8 *rom;
b2m_state *state = machine.driver_data<b2m_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *ram = machine.device<ram_device>(RAM_TAG)->pointer();
space.install_write_bank(0x0000, 0x27ff, "bank1");
diff --git a/src/mess/machine/bbc.c b/src/mess/machine/bbc.c
index 84d30054e22..c053f3c0da3 100644
--- a/src/mess/machine/bbc.c
+++ b/src/mess/machine/bbc.c
@@ -2074,7 +2074,7 @@ MACHINE_START_MEMBER(bbc_state,bbcbp)
{
m_mc6850_clock = 0;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(bbc_state::bbcbp_direct_handler), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(bbc_state::bbcbp_direct_handler), this));
/* bank 6 is the paged ROMs from b000 to bfff */
membank("bank6")->configure_entries(0, 16, memregion("user1")->base() + 0x3000, 1<<14);
@@ -2100,14 +2100,14 @@ MACHINE_START_MEMBER(bbc_state,bbcm)
{
m_mc6850_clock = 0;
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(bbc_state::bbcm_direct_handler), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(bbc_state::bbcm_direct_handler), this));
/* bank 5 is the paged ROMs from 9000 to bfff */
membank("bank5")->configure_entries(0, 16, machine().root_device().memregion("user1")->base()+0x01000, 1<<14);
/* Set ROM/IO bank to point to rom */
membank( "bank8" )->set_base( memregion("user1")->base()+0x43c00);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0xFC00, 0xFEFF, "bank8");
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0xFC00, 0xFEFF, "bank8");
}
MACHINE_RESET_MEMBER(bbc_state,bbcm)
diff --git a/src/mess/machine/bebox.c b/src/mess/machine/bebox.c
index b8fb66d5954..b9497bfe137 100644
--- a/src/mess/machine/bebox.c
+++ b/src/mess/machine/bebox.c
@@ -201,7 +201,7 @@ READ64_HANDLER( bebox_crossproc_interrupts_r )
result = state->m_crossproc_interrupts;
/* return a different result depending on which CPU is accessing this handler */
- if (&space != space.machine().device("ppc1")->memory().space(AS_PROGRAM))
+ if (&space != &space.machine().device("ppc1")->memory().space(AS_PROGRAM))
result |= 0x02000000;
else
result &= ~0x02000000;
@@ -955,7 +955,7 @@ void scsi53c810_pci_write(device_t *busdevice, device_t *device, int function, i
/* brutal ugly hack; at some point the PCI code should be handling this stuff */
if (state->m_scsi53c810_data[5] != 0xFFFFFFF0)
{
- address_space &space = *device->machine().device("ppc1")->memory().space(AS_PROGRAM);
+ address_space &space = device->machine().device("ppc1")->memory().space(AS_PROGRAM);
addr = (state->m_scsi53c810_data[5] | 0xC0000000) & ~0xFF;
space.install_legacy_read_handler(addr, addr + 0xFF, FUNC(scsi53c810_r));
@@ -995,7 +995,7 @@ void bebox_state::machine_reset()
machine().device("ppc1")->execute().set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
machine().device("ppc2")->execute().set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
- memcpy(machine().device<fujitsu_29f016a_device>("flash")->space()->get_read_ptr(0),memregion("user1")->base(),0x200000);
+ memcpy(machine().device<fujitsu_29f016a_device>("flash")->space().get_read_ptr(0),memregion("user1")->base(),0x200000);
}
void bebox_state::machine_start()
@@ -1005,8 +1005,8 @@ void bebox_state::machine_start()
DRIVER_INIT_MEMBER(bebox_state,bebox)
{
- address_space *space_0 = machine().device("ppc1")->memory().space(AS_PROGRAM);
- address_space *space_1 = machine().device("ppc2")->memory().space(AS_PROGRAM);
+ address_space &space_0 = machine().device("ppc1")->memory().space(AS_PROGRAM);
+ address_space &space_1 = machine().device("ppc2")->memory().space(AS_PROGRAM);
offs_t vram_begin;
offs_t vram_end;
@@ -1014,8 +1014,8 @@ DRIVER_INIT_MEMBER(bebox_state,bebox)
membank("bank2")->set_base(machine().root_device().memregion("user2")->base());
/* install MESS managed RAM */
- space_0->install_readwrite_bank(0, machine().device<ram_device>(RAM_TAG)->size() - 1, 0, 0x02000000, "bank3");
- space_1->install_readwrite_bank(0, machine().device<ram_device>(RAM_TAG)->size() - 1, 0, 0x02000000, "bank3");
+ space_0.install_readwrite_bank(0, machine().device<ram_device>(RAM_TAG)->size() - 1, 0, 0x02000000, "bank3");
+ space_1.install_readwrite_bank(0, machine().device<ram_device>(RAM_TAG)->size() - 1, 0, 0x02000000, "bank3");
membank("bank3")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
kbdc8042_init(machine(), &bebox_8042_interface);
@@ -1023,8 +1023,8 @@ DRIVER_INIT_MEMBER(bebox_state,bebox)
/* install VGA memory */
vram_begin = 0xC1000000;
vram_end = vram_begin + pc_vga_memory_size() - 1;
- space_0->install_legacy_readwrite_handler(vram_begin, vram_end, FUNC(bebox_video_r), FUNC(bebox_video_w));
- space_1->install_legacy_readwrite_handler(vram_begin, vram_end, FUNC(bebox_video_r), FUNC(bebox_video_w));
+ space_0.install_legacy_readwrite_handler(vram_begin, vram_end, FUNC(bebox_video_r), FUNC(bebox_video_w));
+ space_1.install_legacy_readwrite_handler(vram_begin, vram_end, FUNC(bebox_video_r), FUNC(bebox_video_w));
/* The following is a verrrry ugly hack put in to support NetBSD for
* NetBSD. When NetBSD/bebox it does most of its work on CPU #0 and then
@@ -1044,7 +1044,7 @@ DRIVER_INIT_MEMBER(bebox_state,bebox)
/* bcctr 0x14, 0 */
U64(0x4E80042000000000)
};
- space_1->install_read_bank(0x9421FFF0, 0x9421FFFF, "bank1");
+ space_1.install_read_bank(0x9421FFF0, 0x9421FFFF, "bank1");
membank("bank1")->set_base(ops);
}
}
diff --git a/src/mess/machine/c128.c b/src/mess/machine/c128.c
index 2954a330a4b..60c394cff29 100644
--- a/src/mess/machine/c128.c
+++ b/src/mess/machine/c128.c
@@ -452,12 +452,12 @@ void c128_state::bankswitch_64(int reset)
if ((!m_game && m_exrom) || (charen && (loram || hiram)))
{
- m_subcpu->space(AS_PROGRAM)->install_read_handler(0xd000, 0xdfff, read8_delegate(FUNC(c128_state::read_io), this));
+ m_subcpu->space(AS_PROGRAM).install_read_handler(0xd000, 0xdfff, read8_delegate(FUNC(c128_state::read_io), this));
m_write_io = 1;
}
else
{
- m_subcpu->space(AS_PROGRAM)->install_read_bank(0xd000, 0xdfff, "bank5");
+ m_subcpu->space(AS_PROGRAM).install_read_bank(0xd000, 0xdfff, "bank5");
m_write_io = 0;
if ((!charen && (loram || hiram)))
membank("bank13")->set_base(m_chargen);
@@ -636,17 +636,17 @@ void c128_state::bankswitch_128(int reset)
else
m_ram_top = 0x10000;
- m_subcpu->space(AS_PROGRAM)->install_read_handler(0xff00, 0xff04, read8_delegate(FUNC(c128_state::mmu8722_ff00_r), this));
+ m_subcpu->space(AS_PROGRAM).install_read_handler(0xff00, 0xff04, read8_delegate(FUNC(c128_state::mmu8722_ff00_r), this));
if (MMU_IO_ON)
{
m_write_io = 1;
- m_subcpu->space(AS_PROGRAM)->install_read_handler(0xd000, 0xdfff, read8_delegate(FUNC(c128_state::read_io), this));
+ m_subcpu->space(AS_PROGRAM).install_read_handler(0xd000, 0xdfff, read8_delegate(FUNC(c128_state::read_io), this));
}
else
{
m_write_io = 0;
- m_subcpu->space(AS_PROGRAM)->install_read_bank(0xd000, 0xdfff, "bank13");
+ m_subcpu->space(AS_PROGRAM).install_read_bank(0xd000, 0xdfff, "bank13");
}
@@ -1025,8 +1025,8 @@ WRITE8_MEMBER( c128_state::cpu_w )
bankswitch_64(0);
- m_memory[0x000] = m_subcpu->space(AS_PROGRAM)->read_byte(0);
- m_memory[0x001] = m_subcpu->space(AS_PROGRAM)->read_byte(1);
+ m_memory[0x000] = m_subcpu->space(AS_PROGRAM).read_byte(0);
+ m_memory[0x001] = m_subcpu->space(AS_PROGRAM).read_byte(1);
}
READ8_MEMBER( c128_state::cpu_r)
diff --git a/src/mess/machine/c64.c b/src/mess/machine/c64.c
index 67960bd3559..2e97e6dbeab 100644
--- a/src/mess/machine/c64.c
+++ b/src/mess/machine/c64.c
@@ -465,7 +465,7 @@ static void c64_bankswitch( running_machine &machine, int reset )
state->membank("bank1")->set_base(state->m_roml);
state->membank("bank3")->set_base(state->m_memory + 0xa000);
state->membank("bank4")->set_base(state->m_romh);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xe000, 0xffff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xe000, 0xffff);
}
else
{
@@ -589,8 +589,8 @@ WRITE8_DEVICE_HANDLER(c64_m6510_port_write)
if (!state->m_ultimax)
c64_bankswitch(device->machine(), 0);
- state->m_memory[0x000] = device->memory().space(AS_PROGRAM)->read_byte(0);
- state->m_memory[0x001] = device->memory().space(AS_PROGRAM)->read_byte(1);
+ state->m_memory[0x000] = device->memory().space(AS_PROGRAM).read_byte(0);
+ state->m_memory[0x001] = device->memory().space(AS_PROGRAM).read_byte(1);
}
@@ -1260,13 +1260,13 @@ static int c64_crt_load( device_image_interface &image )
***************************************************************************/
#define install_write_handler(_start, _end, _handler) \
- image.device().machine().firstcpu->space(AS_PROGRAM)->install_legacy_write_handler(_start, _end, FUNC(_handler));
+ image.device().machine().firstcpu->space(AS_PROGRAM).install_legacy_write_handler(_start, _end, FUNC(_handler));
#define install_io1_handler(_handler) \
- image.device().machine().firstcpu->space(AS_PROGRAM)->install_legacy_write_handler(0xde00, 0xde00, 0, 0xff, FUNC(_handler));
+ image.device().machine().firstcpu->space(AS_PROGRAM).install_legacy_write_handler(0xde00, 0xde00, 0, 0xff, FUNC(_handler));
#define install_io2_handler(_handler) \
- image.device().machine().firstcpu->space(AS_PROGRAM)->install_legacy_write_handler(0xdf00, 0xdf00, 0, 0xff, FUNC(_handler));
+ image.device().machine().firstcpu->space(AS_PROGRAM).install_legacy_write_handler(0xdf00, 0xdf00, 0, 0xff, FUNC(_handler));
#define allocate_cartridge_timer(_period, _func) \
legacy_c64_state *state = image.device().machine().driver_data<legacy_c64_state>(); \
@@ -1577,7 +1577,7 @@ static void load_super_explode_cartridge(device_image_interface &image)
map_cartridge_roml(image.device().machine(), 0x0000);
- address_space &space = *image.device().machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = image.device().machine().firstcpu->space(AS_PROGRAM);
space.install_legacy_read_handler(0xdf00, 0xdfff, FUNC(super_explode_r));
install_io2_handler(super_explode_bank_w);
@@ -1959,7 +1959,7 @@ static WRITE8_HANDLER( comal80_bank_w )
static void setup_c64_custom_mappers(running_machine &machine)
{
legacy_c64_state *state = machine.driver_data<legacy_c64_state>();
- address_space &space = *machine.device( "maincpu")->memory().space( AS_PROGRAM );
+ address_space &space = machine.device( "maincpu")->memory().space( AS_PROGRAM );
switch (state->m_cart.mapper)
{
diff --git a/src/mess/machine/c65.c b/src/mess/machine/c65.c
index f0dbe554eeb..5bc2b010348 100644
--- a/src/mess/machine/c65.c
+++ b/src/mess/machine/c65.c
@@ -270,7 +270,7 @@ static void c65_dma_port_w( running_machine &machine, int offset, int value )
PAIR pair, src, dst, len;
UINT8 cmd, fill;
int i;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
switch (offset & 3)
{
@@ -793,13 +793,13 @@ void c65_bankswitch_interface( running_machine &machine, int value )
{
state->membank("bank8")->set_base(state->m_colorram + 0x400);
state->membank("bank9")->set_base(state->m_colorram + 0x400);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0dc00, 0x0dfff, "bank8");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x0dc00, 0x0dfff, "bank9");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x0dc00, 0x0dfff, "bank8");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x0dc00, 0x0dfff, "bank9");
}
else
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x0dc00, 0x0dfff, FUNC(c65_read_io_dc00));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x0dc00, 0x0dfff, FUNC(c65_write_io_dc00));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x0dc00, 0x0dfff, FUNC(c65_read_io_dc00));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x0dc00, 0x0dfff, FUNC(c65_write_io_dc00));
}
}
@@ -869,18 +869,18 @@ void c65_bankswitch( running_machine &machine )
if (state->m_io_dc00_on)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x0dc00, 0x0dfff, FUNC(c65_read_io_dc00));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x0dc00, 0x0dfff, FUNC(c65_write_io_dc00));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x0dc00, 0x0dfff, FUNC(c65_read_io_dc00));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x0dc00, 0x0dfff, FUNC(c65_write_io_dc00));
}
else
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0dc00, 0x0dfff, "bank8");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x0dc00, 0x0dfff, "bank9");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x0dc00, 0x0dfff, "bank8");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x0dc00, 0x0dfff, "bank9");
state->membank("bank8")->set_base(state->m_colorram + 0x400);
state->membank("bank9")->set_base(state->m_colorram + 0x400);
}
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x0d000, 0x0d7ff, FUNC(c65_read_io));
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0x0d000, 0x0d7ff, FUNC(c65_write_io));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x0d000, 0x0d7ff, FUNC(c65_read_io));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0x0d000, 0x0d7ff, FUNC(c65_write_io));
}
else
{
@@ -900,8 +900,8 @@ void c65_bankswitch( running_machine &machine )
state->membank("bank6")->set_base(state->m_memory + 0xd800);
state->membank("bank8")->set_base(state->m_memory + 0xdc00);
}
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x0d000, 0x0d7ff, "bank4");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x0d000, 0x0d7ff, "bank5");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x0d000, 0x0d7ff, "bank4");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x0d000, 0x0d7ff, "bank5");
}
if (!state->m_game && state->m_exrom)
diff --git a/src/mess/machine/cgenie.c b/src/mess/machine/cgenie.c
index 23f70a7e1f3..346ed50a2ce 100644
--- a/src/mess/machine/cgenie.c
+++ b/src/mess/machine/cgenie.c
@@ -47,7 +47,7 @@ static TIMER_CALLBACK( handle_cassette_input )
void cgenie_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
device_t *ay8910 = machine().device("ay8910");
UINT8 *ROM = memregion("maincpu")->base();
@@ -124,7 +124,7 @@ void cgenie_state::machine_reset()
void cgenie_state::machine_start()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *gfx = memregion("gfx2")->base();
int i;
@@ -597,7 +597,7 @@ INTERRUPT_GEN_MEMBER(cgenie_state::cgenie_frame_interrupt)
m_tv_mode = ioport("DSW0")->read() & 0x10;
/* force setting of background color */
m_port_ff ^= FF_BGD0;
- cgenie_port_ff_w(*machine().device("maincpu")->memory().space(AS_PROGRAM), 0, m_port_ff ^ FF_BGD0);
+ cgenie_port_ff_w(machine().device("maincpu")->memory().space(AS_PROGRAM), 0, m_port_ff ^ FF_BGD0);
}
}
diff --git a/src/mess/machine/coco.c b/src/mess/machine/coco.c
index 9aaa4f6f2e5..df07fcb24ec 100644
--- a/src/mess/machine/coco.c
+++ b/src/mess/machine/coco.c
@@ -236,24 +236,24 @@ UINT8 coco_state::floating_bus_read(void)
UINT8 byte;
// set up the ability to read address spaces
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
// get the previous and current PC
UINT16 prev_pc = m_maincpu->pcbase();
UINT16 pc = m_maincpu->pc();
// get the byte; and skip over header bytes
- byte = program->read_byte(prev_pc);
+ byte = program.read_byte(prev_pc);
if ((byte == 0x10) || (byte == 0x11))
- byte = program->read_byte(++prev_pc);
+ byte = program.read_byte(++prev_pc);
// check to see if the opcode specifies the indexed addressing mode, and the secondary byte
// specifies no-offset
bool is_nooffset_indexed = (((byte & 0xF0) == 0x60) || ((byte & 0xF0) == 0xA0) || ((byte & 0xF0) == 0xE0))
- && ((program->read_byte(prev_pc + 1) & 0xBF) == 0x84);
+ && ((program.read_byte(prev_pc + 1) & 0xBF) == 0x84);
// finally read the byte
- return program->read_byte(is_nooffset_indexed ? pc : 0xFFFF);
+ return program.read_byte(is_nooffset_indexed ? pc : 0xFFFF);
}
diff --git a/src/mess/machine/coco_multi.c b/src/mess/machine/coco_multi.c
index 3d18754f766..4ea90d74c4d 100644
--- a/src/mess/machine/coco_multi.c
+++ b/src/mess/machine/coco_multi.c
@@ -153,7 +153,7 @@ void coco_multipak_device::device_start()
// install $FF7F handler
write8_delegate wh = write8_delegate(FUNC(coco_multipak_device::ff7f_write), this);
- machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM)->install_write_handler(0xFF7F, 0xFF7F, wh);
+ machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM).install_write_handler(0xFF7F, 0xFF7F, wh);
// initial state
m_select = 0xFF;
diff --git a/src/mess/machine/coco_vhd.c b/src/mess/machine/coco_vhd.c
index fe4ade801b0..7fef1b320ca 100644
--- a/src/mess/machine/coco_vhd.c
+++ b/src/mess/machine/coco_vhd.c
@@ -106,7 +106,7 @@ void coco_vhd_image_device::device_start()
{
m_status = VHDSTATUS_NO_VHD_ATTACHED;
m_cpu = machine().device<cpu_device>(MAINCPU_TAG);
- m_cpu_space = m_cpu->space(AS_PROGRAM);
+ m_cpu_space = &m_cpu->space(AS_PROGRAM);
}
diff --git a/src/mess/machine/compis.c b/src/mess/machine/compis.c
index c10b7142767..8883de1f273 100644
--- a/src/mess/machine/compis.c
+++ b/src/mess/machine/compis.c
@@ -1053,8 +1053,8 @@ READ16_MEMBER( compis_state::compis_i186_internal_port_r )
WRITE16_MEMBER( compis_state::compis_i186_internal_port_w )
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
- address_space *io = m_maincpu->space(AS_IO);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
+ address_space &io = m_maincpu->space(AS_IO);
int temp, which, data16 = data;
switch (offset)
@@ -1275,14 +1275,14 @@ WRITE16_MEMBER( compis_state::compis_i186_internal_port_w )
temp = (data16 & 0x0fff) << 8;
if (data16 & 0x1000)
{
- mem->install_read_handler(temp, temp + 0xff, read16_delegate(FUNC(compis_state::compis_i186_internal_port_r), this));
- mem->install_write_handler(temp, temp + 0xff, write16_delegate(FUNC(compis_state::compis_i186_internal_port_w), this));
+ mem.install_read_handler(temp, temp + 0xff, read16_delegate(FUNC(compis_state::compis_i186_internal_port_r), this));
+ mem.install_write_handler(temp, temp + 0xff, write16_delegate(FUNC(compis_state::compis_i186_internal_port_w), this));
}
else
{
temp &= 0xffff;
- io->install_read_handler(temp, temp + 0xff, read16_delegate(FUNC(compis_state::compis_i186_internal_port_r), this));
- io->install_write_handler(temp, temp + 0xff, write16_delegate(FUNC(compis_state::compis_i186_internal_port_w), this));
+ io.install_read_handler(temp, temp + 0xff, read16_delegate(FUNC(compis_state::compis_i186_internal_port_r), this));
+ io.install_write_handler(temp, temp + 0xff, write16_delegate(FUNC(compis_state::compis_i186_internal_port_w), this));
}
/* popmessage("Sound CPU reset");*/
break;
diff --git a/src/mess/machine/comx_clm.c b/src/mess/machine/comx_clm.c
index 4dd001b91ec..b34094adb6c 100644
--- a/src/mess/machine/comx_clm.c
+++ b/src/mess/machine/comx_clm.c
@@ -251,7 +251,7 @@ void comx_clm_device::comx_ds_w(int state)
UINT8 comx_clm_device::comx_mrd_r(offs_t offset, int *extrom)
{
- address_space &space = *machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = machine().firstcpu->space(AS_PROGRAM);
UINT8 data = 0xff;
@@ -278,7 +278,7 @@ UINT8 comx_clm_device::comx_mrd_r(offs_t offset, int *extrom)
void comx_clm_device::comx_mwr_w(offs_t offset, UINT8 data)
{
- address_space &space = *machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = machine().firstcpu->space(AS_PROGRAM);
if (offset >= 0xd000 && offset < 0xd800)
{
diff --git a/src/mess/machine/cpc_ssa1.c b/src/mess/machine/cpc_ssa1.c
index 59586d1a407..83839ca0ebb 100644
--- a/src/mess/machine/cpc_ssa1.c
+++ b/src/mess/machine/cpc_ssa1.c
@@ -187,7 +187,7 @@ cpc_dkspeech_device::cpc_dkspeech_device(const machine_config &mconfig, const ch
void cpc_ssa1_device::device_start()
{
device_t* cpu = machine().device("maincpu");
- address_space& space = *cpu->memory().space(AS_IO);
+ address_space& space = cpu->memory().space(AS_IO);
m_slot = dynamic_cast<cpc_expansion_slot_device *>(owner());
m_rom = memregion("sp0256")->base();
@@ -201,7 +201,7 @@ void cpc_ssa1_device::device_start()
void cpc_dkspeech_device::device_start()
{
device_t* cpu = machine().device("maincpu");
- address_space& space = *cpu->memory().space(AS_IO);
+ address_space& space = cpu->memory().space(AS_IO);
m_slot = dynamic_cast<cpc_expansion_slot_device *>(owner());
m_rom = memregion("sp0256")->base();
diff --git a/src/mess/machine/cs4031.c b/src/mess/machine/cs4031.c
index ed75bbd3817..09696c0fa5b 100644
--- a/src/mess/machine/cs4031.c
+++ b/src/mess/machine/cs4031.c
@@ -126,7 +126,7 @@ void cs4031_device::device_start()
throw device_missing_dependencies();
device_t *cpu = machine().device(m_cputag);
- m_space = cpu->memory().space(AS_PROGRAM);
+ m_space = &cpu->memory().space(AS_PROGRAM);
m_isa = machine().root_device().memregion(m_isatag)->base();
m_bios = machine().root_device().memregion(m_biostag)->base();
diff --git a/src/mess/machine/cybiko.c b/src/mess/machine/cybiko.c
index e04891501dc..9a0ba35b9a4 100644
--- a/src/mess/machine/cybiko.c
+++ b/src/mess/machine/cybiko.c
@@ -40,8 +40,8 @@ static void cybiko_rs232_reset(void);
static void init_ram_handler(running_machine &machine, offs_t start, offs_t size, offs_t mirror)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(start, start + size - 1, 0, mirror - size, "bank1");
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(start, start + size - 1, 0, mirror - size, "bank1");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(start, start + size - 1, 0, mirror - size, "bank1");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(start, start + size - 1, 0, mirror - size, "bank1");
machine.root_device().membank( "bank1" )->set_base( machine.device<ram_device>(RAM_TAG)->pointer());
}
diff --git a/src/mess/machine/dgn_beta.c b/src/mess/machine/dgn_beta.c
index 3493a2ee035..286b1066663 100644
--- a/src/mess/machine/dgn_beta.c
+++ b/src/mess/machine/dgn_beta.c
@@ -256,8 +256,8 @@ static const struct bank_info_entry bank_info[] =
static void UpdateBanks(running_machine &machine, int first, int last)
{
dgn_beta_state *state = machine.driver_data<dgn_beta_state>();
- address_space *space_0 = machine.device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
- address_space *space_1 = machine.device(DMACPU_TAG)->memory().space(AS_PROGRAM);
+ address_space &space_0 = machine.device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
+ address_space &space_1 = machine.device(DMACPU_TAG)->memory().space(AS_PROGRAM);
int Page;
UINT8 *readbank;
int bank_start;
@@ -265,7 +265,7 @@ static void UpdateBanks(running_machine &machine, int first, int last)
int MapPage;
char page_num[10];
- LOG_BANK_UPDATE(("\n\nUpdating banks %d to %d at PC=$%X\n",first,last,space_0->device().safe_pc()));
+ LOG_BANK_UPDATE(("\n\nUpdating banks %d to %d at PC=$%X\n",first,last,space_0.device().safe_pc()));
for(Page=first;Page<=last;Page++)
{
sprintf(page_num,"bank%d",Page+1);
@@ -295,8 +295,8 @@ static void UpdateBanks(running_machine &machine, int first, int last)
readbank = &machine.device<ram_device>(RAM_TAG)->pointer()[(MapPage*RamPageSize)-256];
logerror("Error RAM in Last page !\n");
}
- space_0->install_legacy_write_handler(bank_start, bank_end,bank_info[Page].func,bank_info[Page].name);
- space_1->install_legacy_write_handler(bank_start, bank_end,bank_info[Page].func,bank_info[Page].name);
+ space_0.install_legacy_write_handler(bank_start, bank_end,bank_info[Page].func,bank_info[Page].name);
+ space_1.install_legacy_write_handler(bank_start, bank_end,bank_info[Page].func,bank_info[Page].name);
}
else // Block is rom, or undefined
{
@@ -310,8 +310,8 @@ static void UpdateBanks(running_machine &machine, int first, int last)
else
readbank=state->m_system_rom;
- space_0->unmap_write(bank_start, bank_end);
- space_1->unmap_write(bank_start, bank_end);
+ space_0.unmap_write(bank_start, bank_end);
+ space_1.unmap_write(bank_start, bank_end);
}
state->m_PageRegs[state->m_TaskReg][Page].memory=readbank;
diff --git a/src/mess/machine/electron.c b/src/mess/machine/electron.c
index ad77381793a..8f920490b5f 100644
--- a/src/mess/machine/electron.c
+++ b/src/mess/machine/electron.c
@@ -337,7 +337,7 @@ static void electron_reset(running_machine &machine)
state->m_ula.screen_size = 0x8000 - 0x3000;
state->m_ula.screen_addr = 0;
state->m_ula.tape_running = 0;
- state->m_ula.vram = (UINT8 *)machine.device("maincpu")->memory().space(AS_PROGRAM)->get_read_ptr(state->m_ula.screen_base);
+ state->m_ula.vram = (UINT8 *)machine.device("maincpu")->memory().space(AS_PROGRAM).get_read_ptr(state->m_ula.screen_base);
}
void electron_state::machine_start()
diff --git a/src/mess/machine/galaxy.c b/src/mess/machine/galaxy.c
index 2d10cca9b64..ac988816be4 100644
--- a/src/mess/machine/galaxy.c
+++ b/src/mess/machine/galaxy.c
@@ -155,7 +155,7 @@ SNAPSHOT_LOAD( galaxy )
DRIVER_INIT_MEMBER(galaxy_state,galaxy)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_readwrite_bank( 0x2800, 0x2800 + machine().device<ram_device>(RAM_TAG)->size() - 1, "bank1");
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
@@ -171,7 +171,7 @@ DRIVER_INIT_MEMBER(galaxy_state,galaxy)
MACHINE_RESET_MEMBER(galaxy_state,galaxy)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* ROM 2 enable/disable */
if (machine().root_device().ioport("ROM2")->read()) {
@@ -196,7 +196,7 @@ DRIVER_INIT_MEMBER(galaxy_state,galaxyp)
MACHINE_RESET_MEMBER(galaxy_state,galaxyp)
{
UINT8 *ROM = machine().root_device().memregion("maincpu")->base();
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
machine().device("maincpu")->execute().set_irq_acknowledge_callback(galaxy_irq_callback);
diff --git a/src/mess/machine/gb.c b/src/mess/machine/gb.c
index f1726f1e953..34d10a6d08f 100644
--- a/src/mess/machine/gb.c
+++ b/src/mess/machine/gb.c
@@ -119,8 +119,8 @@ static void gb_init_regs(running_machine &machine)
state->SIODATA = 0x00;
state->SIOCONT = 0x7E;
- state->gb_io_w( *machine.device("maincpu")->memory().space(AS_PROGRAM ), 0x05, 0x00 ); /* TIMECNT */
- state->gb_io_w( *machine.device("maincpu")->memory().space(AS_PROGRAM ), 0x06, 0x00 ); /* TIMEMOD */
+ state->gb_io_w( machine.device("maincpu")->memory().space(AS_PROGRAM ), 0x05, 0x00 ); /* TIMECNT */
+ state->gb_io_w( machine.device("maincpu")->memory().space(AS_PROGRAM ), 0x06, 0x00 ); /* TIMEMOD */
}
static void gb_rom16_0000( running_machine &machine, UINT8 *addr )
@@ -154,7 +154,7 @@ static void gb_rom8_6000( running_machine &machine, UINT8 *addr )
static void gb_init(running_machine &machine)
{
gb_state *state = machine.driver_data<gb_state>();
- address_space &space = *machine.device( "maincpu")->memory().space( AS_PROGRAM );
+ address_space &space = machine.device( "maincpu")->memory().space( AS_PROGRAM );
/* Initialize the memory banks */
state->m_MBC1Mode = 0;
diff --git a/src/mess/machine/genpc.c b/src/mess/machine/genpc.c
index 57b4f972244..3c1408a3b90 100644
--- a/src/mess/machine/genpc.c
+++ b/src/mess/machine/genpc.c
@@ -71,9 +71,9 @@ READ8_MEMBER( ibm5160_mb_device::pc_dma_read_byte )
{
if(m_dma_channel == -1)
return 0xff;
- address_space *spaceio = m_maincpu->space(AS_PROGRAM);
+ address_space &spaceio = m_maincpu->space(AS_PROGRAM);
offs_t page_offset = (((offs_t) m_dma_offset[m_dma_channel]) << 16) & 0x0F0000;
- return spaceio->read_byte( page_offset + offset);
+ return spaceio.read_byte( page_offset + offset);
}
@@ -81,10 +81,10 @@ WRITE8_MEMBER( ibm5160_mb_device::pc_dma_write_byte )
{
if(m_dma_channel == -1)
return;
- address_space *spaceio = m_maincpu->space(AS_PROGRAM);
+ address_space &spaceio = m_maincpu->space(AS_PROGRAM);
offs_t page_offset = (((offs_t) m_dma_offset[m_dma_channel]) << 16) & 0x0F0000;
- spaceio->write_byte( page_offset + offset, data);
+ spaceio.write_byte( page_offset + offset, data);
}
@@ -574,10 +574,10 @@ void ibm5160_mb_device::install_device(device_t *dev, offs_t start, offs_t end,
switch(buswidth)
{
case 8:
- m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0);
+ m_maincpu->space(AS_IO).install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0);
break;
case 16:
- m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff);
+ m_maincpu->space(AS_IO).install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff);
break;
default:
fatalerror("IBM5160_MOTHERBOARD: Bus width %d not supported\n", buswidth);
@@ -591,10 +591,10 @@ void ibm5160_mb_device::install_device_write(device_t *dev, offs_t start, offs_t
switch(buswidth)
{
case 8:
- m_maincpu->space(AS_IO)->install_legacy_write_handler(*dev, start, end, mask, mirror, whandler, whandler_name,0);
+ m_maincpu->space(AS_IO).install_legacy_write_handler(*dev, start, end, mask, mirror, whandler, whandler_name,0);
break;
case 16:
- m_maincpu->space(AS_IO)->install_legacy_write_handler(*dev, start, end, mask, mirror, whandler, whandler_name, 0xffff);
+ m_maincpu->space(AS_IO).install_legacy_write_handler(*dev, start, end, mask, mirror, whandler, whandler_name, 0xffff);
break;
default:
fatalerror("IBM5160_MOTHERBOARD: Bus width %d not supported\n", buswidth);
@@ -608,10 +608,10 @@ void ibm5160_mb_device::install_device(offs_t start, offs_t end, offs_t mask, of
switch(buswidth)
{
case 8:
- m_maincpu->space(AS_IO)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0);
+ m_maincpu->space(AS_IO).install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0);
break;
case 16:
- m_maincpu->space(AS_IO)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffff);
+ m_maincpu->space(AS_IO).install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffff);
break;
default:
fatalerror("IBM5160_MOTHERBOARD: Bus width %d not supported\n", buswidth);
@@ -635,10 +635,10 @@ void ibm5160_mb_device::device_start()
switch(buswidth)
{
case 8:
- m_maincpu->space(AS_IO)->install_readwrite_handler(0x0060, 0x0063, 0, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi8255), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi8255), 0);
+ m_maincpu->space(AS_IO).install_readwrite_handler(0x0060, 0x0063, 0, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi8255), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi8255), 0);
break;
case 16:
- m_maincpu->space(AS_IO)->install_readwrite_handler(0x0060, 0x0063, 0, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi8255), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi8255), 0xffff);
+ m_maincpu->space(AS_IO).install_readwrite_handler(0x0060, 0x0063, 0, 0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi8255), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi8255), 0xffff);
break;
default:
fatalerror("IBM5160_MOTHERBOARD: Bus width %d not supported\n", buswidth);
diff --git a/src/mess/machine/hd63450.c b/src/mess/machine/hd63450.c
index ce163aeabf9..c9eb273136e 100644
--- a/src/mess/machine/hd63450.c
+++ b/src/mess/machine/hd63450.c
@@ -237,7 +237,7 @@ void hd63450_write(device_t* device, int offset, int data, UINT16 mem_mask)
static void dma_transfer_start(device_t* device, int channel, int dir)
{
- address_space &space = *device->machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = device->machine().firstcpu->space(AS_PROGRAM);
hd63450_t* dmac = get_safe_token(device);
dmac->in_progress[channel] = 1;
dmac->reg[channel].csr &= ~0xe0;
@@ -314,7 +314,7 @@ static void dma_transfer_continue(device_t* device, int channel)
void hd63450_single_transfer(device_t* device, int x)
{
- address_space &space = *device->machine().firstcpu->space(AS_PROGRAM);
+ address_space &space = device->machine().firstcpu->space(AS_PROGRAM);
int data;
int datasize = 1;
hd63450_t* dmac = get_safe_token(device);
diff --git a/src/mess/machine/hp48.c b/src/mess/machine/hp48.c
index 2b728f305e8..1c1926adea7 100644
--- a/src/mess/machine/hp48.c
+++ b/src/mess/machine/hp48.c
@@ -709,7 +709,7 @@ static void hp48_apply_modules(hp48_state *state)
{
int i;
int nce2_enable = 1;
- address_space& space = *state->machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = state->machine().device("maincpu")->memory().space(AS_PROGRAM);
state->m_io_addr = 0x100000;
diff --git a/src/mess/machine/i82439tx.c b/src/mess/machine/i82439tx.c
index e7ba2aa5945..d91efc72b10 100644
--- a/src/mess/machine/i82439tx.c
+++ b/src/mess/machine/i82439tx.c
@@ -287,7 +287,7 @@ void i82439tx_device::device_start()
device_t *cpu = machine().device(m_cputag);
assert(cpu != NULL);
- m_space = cpu->memory().space(AS_PROGRAM);
+ m_space = &cpu->memory().space(AS_PROGRAM);
/* get rom region */
m_rom = machine().root_device().memregion(m_rom_region)->base();
diff --git a/src/mess/machine/intv.c b/src/mess/machine/intv.c
index f92d2fa0995..a355a1fc6b4 100644
--- a/src/mess/machine/intv.c
+++ b/src/mess/machine/intv.c
@@ -410,7 +410,7 @@ static int intv_load_rom_file(device_image_interface &image)
UINT8 *memory = image.device().machine().root_device().memregion("maincpu")->base();
intv_state *state = image.device().machine().driver_data<intv_state>();
- address_space *program = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &program = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
const char *filetype = image.filetype();
/* if it is in .rom format, we enter here */
@@ -504,7 +504,7 @@ static int intv_load_rom_file(device_image_interface &image)
start = (( ram & 0xf0 ) >> 4) * 0x1000;
size = ( ram & 0x0f ) * 0x800;
- program->install_readwrite_handler(start, start + size,
+ program.install_readwrite_handler(start, start + size,
read16_delegate( FUNC( intv_state::intv_cart_ram8_r ), state),
write16_delegate( FUNC( intv_state::intv_cart_ram8_w ), state));
}
@@ -556,7 +556,7 @@ DEVICE_IMAGE_LOAD( intv_cart )
const char* region_name[] = {"4800", "5000", "6000", "7000", "9000", "A000", "C000", "D000", "F000"};
UINT8 *memory = image.device().machine().root_device().memregion("maincpu")->base();
intv_state *state = image.device().machine().driver_data<intv_state>();
- address_space *program = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &program = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT32 size=0;
UINT16 address = 0;
@@ -593,7 +593,7 @@ DEVICE_IMAGE_LOAD( intv_cart )
size = image.get_software_region_length("D000_RAM8");
if (size)
{
- program->install_readwrite_handler(0xD000, 0xD000 + size,
+ program.install_readwrite_handler(0xD000, 0xD000 + size,
read16_delegate( FUNC( intv_state::intv_cart_ram8_r ), state),
write16_delegate( FUNC( intv_state::intv_cart_ram8_w ), state));
}
@@ -601,7 +601,7 @@ DEVICE_IMAGE_LOAD( intv_cart )
size = image.get_software_region_length("8800_RAM8");
if (size)
{
- program->install_readwrite_handler(0x8800, 0x8800 + size,
+ program.install_readwrite_handler(0x8800, 0x8800 + size,
read16_delegate( FUNC( intv_state::intv_cart_ram8_r ), state),
write16_delegate( FUNC( intv_state::intv_cart_ram8_w ), state));
}
diff --git a/src/mess/machine/iq151_staper.c b/src/mess/machine/iq151_staper.c
index a43b5015f6a..d717667e348 100644
--- a/src/mess/machine/iq151_staper.c
+++ b/src/mess/machine/iq151_staper.c
@@ -93,7 +93,7 @@ void iq151_staper_device::device_timer(emu_timer &timer, device_timer_id id, int
void iq151_staper_device::io_read(offs_t offset, UINT8 &data)
{
- address_space& space = *machine().device("maincpu")->memory().space(AS_IO);
+ address_space& space = machine().device("maincpu")->memory().space(AS_IO);
if (offset >= 0xf8 && offset < 0xfc)
data = m_ppi->read(space, offset & 0x03);
@@ -105,7 +105,7 @@ void iq151_staper_device::io_read(offs_t offset, UINT8 &data)
void iq151_staper_device::io_write(offs_t offset, UINT8 data)
{
- address_space& space = *machine().device("maincpu")->memory().space(AS_IO);
+ address_space& space = machine().device("maincpu")->memory().space(AS_IO);
if (offset >= 0xf8 && offset < 0xfc)
m_ppi->write(space, offset & 0x03, data);
diff --git a/src/mess/machine/isa.c b/src/mess/machine/isa.c
index a6613ccc81c..c6c506b2980 100644
--- a/src/mess/machine/isa.c
+++ b/src/mess/machine/isa.c
@@ -202,24 +202,25 @@ void isa8_device::device_reset()
void isa8_device::install_space(address_spacenum spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_space_func rhandler, const char* rhandler_name, write8_space_func whandler, const char *whandler_name)
{
int buswidth = m_maincpu->space_config(spacenum)->m_databus_width;
+ address_space &space = m_maincpu->space(spacenum);
switch(buswidth)
{
case 8:
- m_maincpu->space(spacenum)->install_legacy_readwrite_handler(start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0);
+ space.install_legacy_readwrite_handler(start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0);
break;
case 16:
- m_maincpu->space(spacenum)->install_legacy_readwrite_handler(start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff);
+ space.install_legacy_readwrite_handler(start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff);
break;
case 32:
if ((start % 4) == 0) {
if ((end-start)==1) {
- m_maincpu->space(spacenum)->install_legacy_readwrite_handler(start, end+2, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0x0000ffff);
+ space.install_legacy_readwrite_handler(start, end+2, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0x0000ffff);
} else {
- m_maincpu->space(spacenum)->install_legacy_readwrite_handler(start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffffffff);
+ space.install_legacy_readwrite_handler(start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffffffff);
}
} else {
// we handle just misalligned by 2
- m_maincpu->space(spacenum)->install_legacy_readwrite_handler(start-2, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff0000);
+ space.install_legacy_readwrite_handler(start-2, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff0000);
}
break;
default:
@@ -232,24 +233,25 @@ void isa8_device::install_space(address_spacenum spacenum, offs_t start, offs_t
void isa8_device::install_space(address_spacenum spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_delegate rhandler, write8_delegate whandler)
{
int buswidth = m_maincpu->space_config(spacenum)->m_databus_width;
+ address_space &space = m_maincpu->space(spacenum);
switch(buswidth)
{
case 8:
- m_maincpu->space(spacenum)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0);
+ space.install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0);
break;
case 16:
- m_maincpu->space(spacenum)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffff);
+ space.install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffff);
break;
case 32:
if ((start % 4) == 0) {
if ((end-start)==1) {
- m_maincpu->space(spacenum)->install_readwrite_handler(start, end+2, mask, mirror, rhandler, whandler, 0x0000ffff);
+ space.install_readwrite_handler(start, end+2, mask, mirror, rhandler, whandler, 0x0000ffff);
} else {
- m_maincpu->space(spacenum)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffffffff);
+ space.install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffffffff);
}
} else {
// we handle just misalligned by 2
- m_maincpu->space(spacenum)->install_readwrite_handler(start-2, end, mask, mirror, rhandler, whandler, 0xffff0000);
+ space.install_readwrite_handler(start-2, end, mask, mirror, rhandler, whandler, 0xffff0000);
}
break;
default:
@@ -262,24 +264,25 @@ void isa8_device::install_space(address_spacenum spacenum, offs_t start, offs_t
void isa8_device::install_space(address_spacenum spacenum, device_t *dev, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_device_func rhandler, const char* rhandler_name, write8_device_func whandler, const char *whandler_name)
{
int buswidth = m_maincpu->space_config(spacenum)->m_databus_width;
+ address_space &space = m_maincpu->space(spacenum);
switch(buswidth)
{
case 8:
- m_maincpu->space(spacenum)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0);
+ space.install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0);
break;
case 16:
- m_maincpu->space(spacenum)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff);
+ space.install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff);
break;
case 32:
if ((start % 4) == 0) {
if ((end-start)==1) {
- m_maincpu->space(spacenum)->install_legacy_readwrite_handler(*dev, start, end+2, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0x0000ffff);
+ space.install_legacy_readwrite_handler(*dev, start, end+2, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0x0000ffff);
} else {
- m_maincpu->space(spacenum)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffffffff);
+ space.install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffffffff);
}
} else {
// we handle just misalligned by 2
- m_maincpu->space(spacenum)->install_legacy_readwrite_handler(*dev, start-2, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff0000);
+ space.install_legacy_readwrite_handler(*dev, start-2, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff0000);
}
break;
default:
@@ -327,14 +330,14 @@ void isa8_device::install_device(offs_t start, offs_t end, offs_t mask, offs_t m
void isa8_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror, const char *tag, UINT8 *data)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
space.install_readwrite_bank(start, end, mask, mirror, tag );
machine().root_device().membank(tag)->set_base(data);
}
void isa8_device::unmap_bank(offs_t start, offs_t end, offs_t mask, offs_t mirror)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
space.unmap_readwrite(start, end, mask, mirror);
}
@@ -346,7 +349,7 @@ void isa8_device::install_rom(device_t *dev, offs_t start, offs_t end, offs_t ma
UINT8 *dest = machine().root_device().memregion("isa")->base() + start - 0xc0000;
memcpy(dest,src, end - start + 1);
} else {
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
space.install_read_bank(start, end, mask, mirror, tag);
space.unmap_write(start, end, mask, mirror);
machine().root_device().membank(tag)->set_base(machine().root_device().memregion(dev->subtag(tempstring, region))->base());
@@ -355,14 +358,14 @@ void isa8_device::install_rom(device_t *dev, offs_t start, offs_t end, offs_t ma
void isa8_device::unmap_rom(offs_t start, offs_t end, offs_t mask, offs_t mirror)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
space.unmap_read(start, end, mask, mirror);
}
bool isa8_device::is_option_rom_space_available(offs_t start, int size)
{
m_maincpu = machine().device<cpu_device>(m_cputag);
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
for(int i = 0; i < size; i += 4096) // 4KB granularity should be enough
if(space.get_read_ptr(start + i)) return false;
return true;
@@ -548,18 +551,18 @@ void isa16_device::install16_device(device_t *dev, offs_t start, offs_t end, off
switch(buswidth)
{
case 16:
- m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0);
+ m_maincpu->space(AS_IO).install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0);
break;
case 32:
if ((start % 4) == 0) {
if ((end-start)==1) {
- m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(*dev, start, end+2, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0x0000ffff);
+ m_maincpu->space(AS_IO).install_legacy_readwrite_handler(*dev, start, end+2, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0x0000ffff);
} else {
- m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffffffff);
+ m_maincpu->space(AS_IO).install_legacy_readwrite_handler(*dev, start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffffffff);
}
} else {
// we handle just misalligned by 2
- m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(*dev, start-2, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff0000);
+ m_maincpu->space(AS_IO).install_legacy_readwrite_handler(*dev, start-2, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name,0xffff0000);
}
break;
@@ -575,19 +578,19 @@ void isa16_device::install16_device(offs_t start, offs_t end, offs_t mask, offs_
switch(buswidth)
{
case 16:
- m_maincpu->space(AS_IO)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0);
+ m_maincpu->space(AS_IO).install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0);
break;
case 32:
- m_maincpu->space(AS_IO)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffffffff);
+ m_maincpu->space(AS_IO).install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffffffff);
if ((start % 4) == 0) {
if ((end-start)==1) {
- m_maincpu->space(AS_IO)->install_readwrite_handler(start, end+2, mask, mirror, rhandler, whandler, 0x0000ffff);
+ m_maincpu->space(AS_IO).install_readwrite_handler(start, end+2, mask, mirror, rhandler, whandler, 0x0000ffff);
} else {
- m_maincpu->space(AS_IO)->install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffffffff);
+ m_maincpu->space(AS_IO).install_readwrite_handler(start, end, mask, mirror, rhandler, whandler, 0xffffffff);
}
} else {
// we handle just misalligned by 2
- m_maincpu->space(AS_IO)->install_readwrite_handler(start-2, end, mask, mirror, rhandler, whandler, 0xffff0000);
+ m_maincpu->space(AS_IO).install_readwrite_handler(start-2, end, mask, mirror, rhandler, whandler, 0xffff0000);
}
break;
@@ -603,19 +606,19 @@ void isa16_device::install16_device(offs_t start, offs_t end, offs_t mask, offs_
switch(buswidth)
{
case 16:
- m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0);
+ m_maincpu->space(AS_IO).install_legacy_readwrite_handler(start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0);
break;
case 32:
- m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0xffffffff);
+ m_maincpu->space(AS_IO).install_legacy_readwrite_handler(start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0xffffffff);
if ((start % 4) == 0) {
if ((end-start)==1) {
- m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(start, end+2, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0x0000ffff);
+ m_maincpu->space(AS_IO).install_legacy_readwrite_handler(start, end+2, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0x0000ffff);
} else {
- m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0xffffffff);
+ m_maincpu->space(AS_IO).install_legacy_readwrite_handler(start, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0xffffffff);
}
} else {
// we handle just misalligned by 2
- m_maincpu->space(AS_IO)->install_legacy_readwrite_handler(start-2, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0xffff0000);
+ m_maincpu->space(AS_IO).install_legacy_readwrite_handler(start-2, end, mask, mirror, rhandler, rhandler_name, whandler, whandler_name, 0xffff0000);
}
break;
diff --git a/src/mess/machine/kaypro.c b/src/mess/machine/kaypro.c
index 6a27798195a..680fa288bf1 100644
--- a/src/mess/machine/kaypro.c
+++ b/src/mess/machine/kaypro.c
@@ -42,20 +42,20 @@ WRITE8_MEMBER( kaypro_state::common_pio_system_w )
d0 drive A */
/* get address space */
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
if (data & 0x80)
{
- mem->unmap_readwrite (0x0000, 0x3fff);
- mem->install_read_bank (0x0000, 0x0fff, "bank1");
+ mem.unmap_readwrite (0x0000, 0x3fff);
+ mem.install_read_bank (0x0000, 0x0fff, "bank1");
membank("bank1")->set_base(machine().root_device().memregion("maincpu")->base());
- mem->install_readwrite_handler (0x3000, 0x3fff, read8_delegate(FUNC(kaypro_state::kaypro_videoram_r), this), write8_delegate(FUNC(kaypro_state::kaypro_videoram_w), this));
+ mem.install_readwrite_handler (0x3000, 0x3fff, read8_delegate(FUNC(kaypro_state::kaypro_videoram_r), this), write8_delegate(FUNC(kaypro_state::kaypro_videoram_w), this));
}
else
{
- mem->unmap_readwrite(0x0000, 0x3fff);
- mem->install_read_bank (0x0000, 0x3fff, "bank2");
- mem->install_write_bank (0x0000, 0x3fff, "bank3");
+ mem.unmap_readwrite(0x0000, 0x3fff);
+ mem.install_read_bank (0x0000, 0x3fff, "bank2");
+ mem.install_write_bank (0x0000, 0x3fff, "bank3");
membank("bank2")->set_base(machine().root_device().memregion("rambank")->base());
membank("bank3")->set_base(machine().root_device().memregion("rambank")->base());
}
@@ -155,21 +155,21 @@ WRITE8_MEMBER( kaypro_state::kaypro2x_system_port_w )
d0 drive A */
/* get address space */
- address_space *mem = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &mem = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (BIT(data, 7))
{
- mem->unmap_readwrite (0x0000, 0x3fff);
- mem->install_read_bank (0x0000, 0x1fff, "bank1");
- membank("bank1")->set_base(mem->machine().root_device().memregion("maincpu")->base());
+ mem.unmap_readwrite (0x0000, 0x3fff);
+ mem.install_read_bank (0x0000, 0x1fff, "bank1");
+ membank("bank1")->set_base(mem.machine().root_device().memregion("maincpu")->base());
}
else
{
- mem->unmap_readwrite (0x0000, 0x3fff);
- mem->install_read_bank (0x0000, 0x3fff, "bank2");
- mem->install_write_bank (0x0000, 0x3fff, "bank3");
- membank("bank2")->set_base(mem->machine().root_device().memregion("rambank")->base());
- membank("bank3")->set_base(mem->machine().root_device().memregion("rambank")->base());
+ mem.unmap_readwrite (0x0000, 0x3fff);
+ mem.install_read_bank (0x0000, 0x3fff, "bank2");
+ mem.install_write_bank (0x0000, 0x3fff, "bank3");
+ membank("bank2")->set_base(mem.machine().root_device().memregion("rambank")->base());
+ membank("bank3")->set_base(mem.machine().root_device().memregion("rambank")->base());
}
wd17xx_dden_w(m_fdc, BIT(data, 5));
@@ -327,7 +327,7 @@ MACHINE_RESET_MEMBER(kaypro_state,kayproii)
MACHINE_RESET_MEMBER(kaypro_state,kaypro2x)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
kaypro2x_system_port_w(space, 0, 0x80);
MACHINE_RESET_CALL_MEMBER(kay_kbd);
}
@@ -346,7 +346,7 @@ MACHINE_RESET_MEMBER(kaypro_state,kaypro2x)
QUICKLOAD_LOAD( kayproii )
{
kaypro_state *state = image.device().machine().driver_data<kaypro_state>();
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
UINT8 *RAM = state->memregion("rambank")->base();
UINT16 i;
UINT8 data;
@@ -369,7 +369,7 @@ QUICKLOAD_LOAD( kayproii )
QUICKLOAD_LOAD( kaypro2x )
{
kaypro_state *state = image.device().machine().driver_data<kaypro_state>();
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
UINT8 *RAM = state->memregion("rambank")->base();
UINT16 i;
UINT8 data;
diff --git a/src/mess/machine/kc.c b/src/mess/machine/kc.c
index 918e915e8f7..b683b9b8355 100644
--- a/src/mess/machine/kc.c
+++ b/src/mess/machine/kc.c
@@ -61,7 +61,7 @@ QUICKLOAD_LOAD(kc)
datasize = image.length() - 128;
}
- address_space &space = *state->m_maincpu->space( AS_PROGRAM );
+ address_space &space = state->m_maincpu->space( AS_PROGRAM );
for (i=0; i<datasize; i++)
space.write_byte((addr+i) & 0xffff, data[i+128]);
@@ -290,7 +290,7 @@ void kc_state::cassette_set_motor(int motor_state)
/* update status of memory area 0x0000-0x03fff */
void kc_state::update_0x00000()
{
- address_space &space = *m_maincpu->space( AS_PROGRAM );
+ address_space &space = m_maincpu->space( AS_PROGRAM );
/* access ram? */
if (m_pio_data[0] & (1<<1))
@@ -330,7 +330,7 @@ void kc_state::update_0x00000()
/* update status of memory area 0x4000-0x07fff */
void kc_state::update_0x04000()
{
- address_space &space = *m_maincpu->space( AS_PROGRAM );
+ address_space &space = m_maincpu->space( AS_PROGRAM );
LOG(("Module at 0x4000\n"));
@@ -343,7 +343,7 @@ void kc_state::update_0x04000()
/* update memory address 0x0c000-0x0e000 */
void kc_state::update_0x0c000()
{
- address_space &space = *m_maincpu->space( AS_PROGRAM );
+ address_space &space = m_maincpu->space( AS_PROGRAM );
if ((m_pio_data[0] & (1<<7)) && memregion("basic")->base() != NULL)
{
@@ -366,7 +366,7 @@ void kc_state::update_0x0c000()
/* update memory address 0x0e000-0x0ffff */
void kc_state::update_0x0e000()
{
- address_space &space = *m_maincpu->space( AS_PROGRAM );
+ address_space &space = m_maincpu->space( AS_PROGRAM );
if (m_pio_data[0] & (1<<0))
{
@@ -390,7 +390,7 @@ void kc_state::update_0x0e000()
/* update status of memory area 0x08000-0x0ffff */
void kc_state::update_0x08000()
{
- address_space &space = *m_maincpu->space( AS_PROGRAM );
+ address_space &space = m_maincpu->space( AS_PROGRAM );
if (m_pio_data[0] & (1<<2))
{
@@ -413,7 +413,7 @@ void kc_state::update_0x08000()
/* update status of memory area 0x4000-0x07fff */
void kc85_4_state::update_0x04000()
{
- address_space &space = *m_maincpu->space( AS_PROGRAM );
+ address_space &space = m_maincpu->space( AS_PROGRAM );
/* access ram? */
if (m_port_86_data & (1<<0))
@@ -455,7 +455,7 @@ void kc85_4_state::update_0x04000()
/* update memory address 0x0c000-0x0e000 */
void kc85_4_state::update_0x0c000()
{
- address_space &space = *m_maincpu->space( AS_PROGRAM );
+ address_space &space = m_maincpu->space( AS_PROGRAM );
if (m_port_86_data & (1<<7))
{
@@ -491,7 +491,7 @@ void kc85_4_state::update_0x0c000()
void kc85_4_state::update_0x08000()
{
- address_space &space = *m_maincpu->space( AS_PROGRAM );
+ address_space &space = m_maincpu->space( AS_PROGRAM );
if (m_pio_data[0] & (1<<2))
{
diff --git a/src/mess/machine/kc_d004.c b/src/mess/machine/kc_d004.c
index 95508996fe3..e570f19bd9b 100644
--- a/src/mess/machine/kc_d004.c
+++ b/src/mess/machine/kc_d004.c
@@ -336,7 +336,7 @@ void kc_d004_device::io_write(offs_t offset, UINT8 data)
if (data & 0x02)
{
for (int i=0; i<0xfc00; i++)
- m_cpu->space(AS_PROGRAM)->write_byte(i, 0);
+ m_cpu->space(AS_PROGRAM).write_byte(i, 0);
m_cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
}
diff --git a/src/mess/machine/lisa.c b/src/mess/machine/lisa.c
index d3fb575cc94..94390d474fc 100644
--- a/src/mess/machine/lisa.c
+++ b/src/mess/machine/lisa.c
@@ -237,7 +237,7 @@ INLINE void COPS_send_data_if_possible(running_machine &machine)
{
lisa_state *state = machine.driver_data<lisa_state>();
via6522_device *via_0 = machine.device<via6522_device>("via6522_0");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if ((! state->m_hold_COPS_data) && state->m_fifo_size && (! state->m_COPS_Ready))
{
@@ -427,7 +427,7 @@ static TIMER_CALLBACK(read_COPS_command)
lisa_state *state = machine.driver_data<lisa_state>();
int command;
via6522_device *via_0 = machine.device<via6522_device>("via6522_0");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
state->m_COPS_Ready = 0;
@@ -1043,7 +1043,7 @@ void lisa_state::machine_reset()
m_rom_ptr = machine().root_device().memregion("maincpu")->base() + ROM_OFFSET;
m_videoROM_ptr = memregion("gfx1")->base();
-// machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate_create_static(lisa_OPbaseoverride, *machine()));
+// machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate_create_static(lisa_OPbaseoverride, *machine()));
// m68k_set_reset_callback(machine().device("maincpu"), /*lisa_reset_instr_callback*/NULL);
/* init MMU */
diff --git a/src/mess/machine/llc.c b/src/mess/machine/llc.c
index 8125a708562..c9b20ff6fcf 100644
--- a/src/mess/machine/llc.c
+++ b/src/mess/machine/llc.c
@@ -152,7 +152,7 @@ DRIVER_INIT_MEMBER(llc_state,llc2)
MACHINE_RESET_MEMBER(llc_state,llc2)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.unmap_write(0x0000, 0x3fff);
membank("bank1")->set_base(machine().root_device().memregion("maincpu")->base());
@@ -170,34 +170,34 @@ MACHINE_RESET_MEMBER(llc_state,llc2)
WRITE8_MEMBER(llc_state::llc2_rom_disable_w)
{
- address_space *mem_space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &mem_space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
- mem_space->install_write_bank(0x0000, 0xbfff, "bank1");
+ mem_space.install_write_bank(0x0000, 0xbfff, "bank1");
membank("bank1")->set_base(ram);
- mem_space->install_write_bank(0x4000, 0x5fff, "bank2");
+ mem_space.install_write_bank(0x4000, 0x5fff, "bank2");
membank("bank2")->set_base(ram + 0x4000);
- mem_space->install_write_bank(0x6000, 0xbfff, "bank3");
+ mem_space.install_write_bank(0x6000, 0xbfff, "bank3");
membank("bank3")->set_base(ram + 0x6000);
- mem_space->install_write_bank(0xc000, 0xffff, "bank4");
+ mem_space.install_write_bank(0xc000, 0xffff, "bank4");
membank("bank4")->set_base(ram + 0xc000);
}
WRITE8_MEMBER(llc_state::llc2_basic_enable_w)
{
- address_space *mem_space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &mem_space = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (data & 0x02)
{
- mem_space->unmap_write(0x4000, 0x5fff);
+ mem_space.unmap_write(0x4000, 0x5fff);
membank("bank2")->set_base(machine().root_device().memregion("maincpu")->base() + 0x10000);
}
else
{
- mem_space->install_write_bank(0x4000, 0x5fff, "bank2");
+ mem_space.install_write_bank(0x4000, 0x5fff, "bank2");
membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x4000);
}
diff --git a/src/mess/machine/lviv.c b/src/mess/machine/lviv.c
index 24360aa8a61..371505cb78b 100644
--- a/src/mess/machine/lviv.c
+++ b/src/mess/machine/lviv.c
@@ -172,17 +172,17 @@ READ8_MEMBER(lviv_state::lviv_io_r)
WRITE8_MEMBER(lviv_state::lviv_io_w)
{
- address_space *cpuspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &cpuspace = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (m_startup_mem_map)
{
UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
m_startup_mem_map = 0;
- cpuspace->install_write_bank(0x0000, 0x3fff, "bank1");
- cpuspace->install_write_bank(0x4000, 0x7fff, "bank2");
- cpuspace->install_write_bank(0x8000, 0xbfff, "bank3");
- cpuspace->unmap_write(0xC000, 0xffff);
+ cpuspace.install_write_bank(0x0000, 0x3fff, "bank1");
+ cpuspace.install_write_bank(0x4000, 0x7fff, "bank2");
+ cpuspace.install_write_bank(0x8000, 0xbfff, "bank3");
+ cpuspace.unmap_write(0xC000, 0xffff);
membank("bank1")->set_base(ram);
membank("bank2")->set_base(ram + 0x4000);
@@ -232,7 +232,7 @@ I8255A_INTERFACE( lviv_ppi8255_interface_1 )
void lviv_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *mem;
space.set_direct_update_handler(direct_update_delegate(FUNC(lviv_state::lviv_directoverride), this));
diff --git a/src/mess/machine/lynx.c b/src/mess/machine/lynx.c
index 3d34e596549..8c0d4d3f918 100644
--- a/src/mess/machine/lynx.c
+++ b/src/mess/machine/lynx.c
@@ -703,7 +703,7 @@ static void lynx_blitter(running_machine &machine)
int i; int colors;
- state->m_blitter.mem = (UINT8*)machine.device("maincpu")->memory().space(AS_PROGRAM)->get_read_ptr(0x0000);
+ state->m_blitter.mem = (UINT8*)machine.device("maincpu")->memory().space(AS_PROGRAM).get_read_ptr(0x0000);
state->m_blitter.busy = 1; // blitter working
state->m_blitter.memory_accesses = 0;
@@ -1927,7 +1927,7 @@ WRITE8_MEMBER(lynx_state::lynx_memory_config_w)
static void lynx_reset(running_machine &machine)
{
lynx_state *state = machine.driver_data<lynx_state>();
- state->lynx_memory_config_w(*machine.device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
+ state->lynx_memory_config_w(machine.device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
machine.device("maincpu")->execute().set_input_line(INPUT_LINE_HALT, CLEAR_LINE);
machine.device("maincpu")->execute().set_input_line(M65SC02_IRQ_LINE, CLEAR_LINE);
@@ -1959,7 +1959,7 @@ static void lynx_reset(running_machine &machine)
static void lynx_postload(lynx_state *state)
{
- state->lynx_memory_config_w( *state->machine().device("maincpu")->memory().space(AS_PROGRAM), 0, state->m_memory_config);
+ state->lynx_memory_config_w( state->machine().device("maincpu")->memory().space(AS_PROGRAM), 0, state->m_memory_config);
}
void lynx_state::machine_start()
diff --git a/src/mess/machine/mac.c b/src/mess/machine/mac.c
index b0264c8d0c1..1bc818aa4cc 100644
--- a/src/mess/machine/mac.c
+++ b/src/mess/machine/mac.c
@@ -212,7 +212,7 @@ static void mac_install_memory(running_machine &machine, offs_t memory_begin, of
offs_t memory_size, void *memory_data, int is_rom, const char *bank)
{
mac_state *state = machine.driver_data<mac_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
offs_t memory_mask;
memory_size = MIN(memory_size, (memory_end + 1 - memory_begin));
@@ -410,7 +410,7 @@ void mac_state::v8_resize()
}
else
{
- address_space& space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT32 onboard_amt, simm_amt, simm_size;
static const UINT32 simm_sizes[4] = { 0, 2*1024*1024, 4*1024*1024, 8*1024*1024 };
@@ -501,13 +501,13 @@ void mac_state::set_memory_overlay(int overlay)
}
else if ((m_model == MODEL_MAC_PORTABLE) || (m_model == MODEL_MAC_PB100) || (m_model == MODEL_MAC_IIVX) || (m_model == MODEL_MAC_IIFX))
{
- address_space& space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.unmap_write(0x000000, 0x9fffff, 0x9fffff, 0);
mac_install_memory(machine(), 0x000000, memory_size-1, memory_size, memory_data, is_rom, "bank1");
}
else if ((m_model == MODEL_MAC_PB140) || (m_model == MODEL_MAC_PB160) || ((m_model >= MODEL_MAC_PBDUO_210) && (m_model <= MODEL_MAC_PBDUO_270c)))
{
- address_space& space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.unmap_write(0x000000, 0xffffff, 0xffffff, 0);
mac_install_memory(machine(), 0x000000, memory_size-1, memory_size, memory_data, is_rom, "bank1");
}
@@ -1814,7 +1814,7 @@ void mac_state::machine_reset()
if (m_model >= MODEL_MAC_POWERMAC_6100 && m_model <= MODEL_MAC_POWERMAC_8100)
{
- m_awacs->set_dma_base(*m_maincpu->space(AS_PROGRAM), 0x10000, 0x12000);
+ m_awacs->set_dma_base(m_maincpu->space(AS_PROGRAM), 0x10000, 0x12000);
}
// start 60.15 Hz timer for most systems
@@ -2099,7 +2099,7 @@ static void mac_driver_init(running_machine &machine, model_t model)
(model == MODEL_MAC_LC_II) || (model == MODEL_MAC_LC_III) || (model == MODEL_MAC_LC_III_PLUS) || ((mac->m_model >= MODEL_MAC_II) && (mac->m_model <= MODEL_MAC_SE30)) ||
(model == MODEL_MAC_PORTABLE) || (model == MODEL_MAC_PB100) || (model == MODEL_MAC_PB140) || (model == MODEL_MAC_PB160) || (model == MODEL_MAC_PBDUO_210) || (model >= MODEL_MAC_QUADRA_700 && model <= MODEL_MAC_QUADRA_800))
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(mac_state::overlay_opbaseoverride), mac));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(mac_state::overlay_opbaseoverride), mac));
}
/* setup keyboard */
diff --git a/src/mess/machine/mbc55x.c b/src/mess/machine/mbc55x.c
index 9e7b7858ed7..ddc01a9956f 100644
--- a/src/mess/machine/mbc55x.c
+++ b/src/mess/machine/mbc55x.c
@@ -339,7 +339,7 @@ WRITE8_MEMBER(mbc55x_state::mbc55x_kb_usart_w)
static void set_ram_size(running_machine &machine)
{
mbc55x_state *state = machine.driver_data<mbc55x_state>();
- address_space &space = *machine.device( MAINCPU_TAG)->memory().space( AS_PROGRAM );
+ address_space &space = machine.device( MAINCPU_TAG)->memory().space( AS_PROGRAM );
int ramsize = state->m_ram->size();
int nobanks = ramsize / RAM_BANK_SIZE;
char bank[10];
@@ -434,7 +434,7 @@ static void mbc55x_debug(running_machine &machine, int ref, int params, const ch
static int instruction_hook(device_t &device, offs_t curpc)
{
mbc55x_state *state = device.machine().driver_data<mbc55x_state>();
- address_space &space = *device.memory().space(AS_PROGRAM);
+ address_space &space = device.memory().space(AS_PROGRAM);
UINT8 *addr_ptr;
addr_ptr = (UINT8*)space.get_read_ptr(curpc);
diff --git a/src/mess/machine/mbee.c b/src/mess/machine/mbee.c
index 44d3d161edf..175e7663e08 100644
--- a/src/mess/machine/mbee.c
+++ b/src/mess/machine/mbee.c
@@ -222,27 +222,27 @@ READ8_MEMBER( mbee_state::mbee256_speed_high_r )
WRITE8_MEMBER( mbee_state::mbee_04_w ) // address
{
- address_space *mem = m_maincpu->space(AS_IO);
- machine().device<mc146818_device>("rtc")->write(*mem, 0, data);
+ address_space &mem = m_maincpu->space(AS_IO);
+ machine().device<mc146818_device>("rtc")->write(mem, 0, data);
}
WRITE8_MEMBER( mbee_state::mbee_06_w ) // write
{
- address_space *mem = m_maincpu->space(AS_IO);
- machine().device<mc146818_device>("rtc")->write(*mem, 1, data);
+ address_space &mem = m_maincpu->space(AS_IO);
+ machine().device<mc146818_device>("rtc")->write(mem, 1, data);
}
READ8_MEMBER( mbee_state::mbee_07_r ) // read
{
- address_space *mem = m_maincpu->space(AS_IO);
- return machine().device<mc146818_device>("rtc")->read(*mem, 1);
+ address_space &mem = m_maincpu->space(AS_IO);
+ return machine().device<mc146818_device>("rtc")->read(mem, 1);
}
static TIMER_CALLBACK( mbee_rtc_irq )
{
mbee_state *state = machine.driver_data<mbee_state>();
- address_space *mem = machine.device("maincpu")->memory().space(AS_IO);
- UINT8 data = machine.device<mc146818_device>("rtc")->read(*mem, 12);
+ address_space &mem = machine.device("maincpu")->memory().space(AS_IO);
+ UINT8 data = machine.device<mc146818_device>("rtc")->read(mem, 12);
if (data) state->m_clock_pulse = 0x80;
}
@@ -263,7 +263,7 @@ static TIMER_CALLBACK( mbee_rtc_irq )
WRITE8_MEMBER( mbee_state::mbee256_50_w )
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
// primary low banks
membank("boot")->set_entry((data & 3) | ((data & 0x20) >> 3));
@@ -273,35 +273,35 @@ WRITE8_MEMBER( mbee_state::mbee256_50_w )
membank("bank9")->set_entry((data & 4) ? 1 : 0);
// 8000-8FFF, F000-FFFF
- mem->unmap_readwrite (0x8000, 0x87ff);
- mem->unmap_readwrite (0x8800, 0x8fff);
- mem->unmap_readwrite (0xf000, 0xf7ff);
- mem->unmap_readwrite (0xf800, 0xffff);
+ mem.unmap_readwrite (0x8000, 0x87ff);
+ mem.unmap_readwrite (0x8800, 0x8fff);
+ mem.unmap_readwrite (0xf000, 0xf7ff);
+ mem.unmap_readwrite (0xf800, 0xffff);
switch (data & 0x1c)
{
case 0x00:
- mem->install_read_bank (0x8000, 0x87ff, "bank8l");
- mem->install_read_bank (0x8800, 0x8fff, "bank8h");
- mem->install_readwrite_handler (0xf000, 0xf7ff, read8_delegate(FUNC(mbee_state::mbeeppc_low_r), this), write8_delegate(FUNC(mbee_state::mbeeppc_low_w), this));
- mem->install_readwrite_handler (0xf800, 0xffff, read8_delegate(FUNC(mbee_state::mbeeppc_high_r), this), write8_delegate(FUNC(mbee_state::mbeeppc_high_w), this));
+ mem.install_read_bank (0x8000, 0x87ff, "bank8l");
+ mem.install_read_bank (0x8800, 0x8fff, "bank8h");
+ mem.install_readwrite_handler (0xf000, 0xf7ff, read8_delegate(FUNC(mbee_state::mbeeppc_low_r), this), write8_delegate(FUNC(mbee_state::mbeeppc_low_w), this));
+ mem.install_readwrite_handler (0xf800, 0xffff, read8_delegate(FUNC(mbee_state::mbeeppc_high_r), this), write8_delegate(FUNC(mbee_state::mbeeppc_high_w), this));
membank("bank8l")->set_entry(0); // rom
membank("bank8h")->set_entry(0); // rom
break;
case 0x04:
- mem->install_read_bank (0x8000, 0x87ff, "bank8l");
- mem->install_read_bank (0x8800, 0x8fff, "bank8h");
- mem->install_readwrite_handler (0xf000, 0xf7ff, read8_delegate(FUNC(mbee_state::mbeeppc_low_r), this), write8_delegate(FUNC(mbee_state::mbeeppc_low_w), this));
- mem->install_readwrite_handler (0xf800, 0xffff, read8_delegate(FUNC(mbee_state::mbeeppc_high_r), this), write8_delegate(FUNC(mbee_state::mbeeppc_high_w), this));
+ mem.install_read_bank (0x8000, 0x87ff, "bank8l");
+ mem.install_read_bank (0x8800, 0x8fff, "bank8h");
+ mem.install_readwrite_handler (0xf000, 0xf7ff, read8_delegate(FUNC(mbee_state::mbeeppc_low_r), this), write8_delegate(FUNC(mbee_state::mbeeppc_low_w), this));
+ mem.install_readwrite_handler (0xf800, 0xffff, read8_delegate(FUNC(mbee_state::mbeeppc_high_r), this), write8_delegate(FUNC(mbee_state::mbeeppc_high_w), this));
membank("bank8l")->set_entry(1); // ram
membank("bank8h")->set_entry(1); // ram
break;
case 0x08:
case 0x18:
- mem->install_read_bank (0x8000, 0x87ff, "bank8l");
- mem->install_read_bank (0x8800, 0x8fff, "bank8h");
- mem->install_read_bank (0xf000, 0xf7ff, "bankfl");
- mem->install_read_bank (0xf800, 0xffff, "bankfh");
+ mem.install_read_bank (0x8000, 0x87ff, "bank8l");
+ mem.install_read_bank (0x8800, 0x8fff, "bank8h");
+ mem.install_read_bank (0xf000, 0xf7ff, "bankfl");
+ mem.install_read_bank (0xf800, 0xffff, "bankfh");
membank("bank8l")->set_entry(0); // rom
membank("bank8h")->set_entry(0); // rom
membank("bankfl")->set_entry(0); // ram
@@ -309,10 +309,10 @@ WRITE8_MEMBER( mbee_state::mbee256_50_w )
break;
case 0x0c:
case 0x1c:
- mem->install_read_bank (0x8000, 0x87ff, "bank8l");
- mem->install_read_bank (0x8800, 0x8fff, "bank8h");
- mem->install_read_bank (0xf000, 0xf7ff, "bankfl");
- mem->install_read_bank (0xf800, 0xffff, "bankfh");
+ mem.install_read_bank (0x8000, 0x87ff, "bank8l");
+ mem.install_read_bank (0x8800, 0x8fff, "bank8h");
+ mem.install_read_bank (0xf000, 0xf7ff, "bankfl");
+ mem.install_read_bank (0xf800, 0xffff, "bankfh");
membank("bank8l")->set_entry(1); // ram
membank("bank8h")->set_entry(1); // ram
membank("bankfl")->set_entry(0); // ram
@@ -320,10 +320,10 @@ WRITE8_MEMBER( mbee_state::mbee256_50_w )
break;
case 0x10:
case 0x14:
- mem->install_readwrite_handler (0x8000, 0x87ff, read8_delegate(FUNC(mbee_state::mbeeppc_low_r), this), write8_delegate(FUNC(mbee_state::mbeeppc_low_w), this));
- mem->install_readwrite_handler (0x8800, 0x8fff, read8_delegate(FUNC(mbee_state::mbeeppc_high_r), this), write8_delegate(FUNC(mbee_state::mbeeppc_high_w), this));
- mem->install_read_bank (0xf000, 0xf7ff, "bankfl");
- mem->install_read_bank (0xf800, 0xffff, "bankfh");
+ mem.install_readwrite_handler (0x8000, 0x87ff, read8_delegate(FUNC(mbee_state::mbeeppc_low_r), this), write8_delegate(FUNC(mbee_state::mbeeppc_low_w), this));
+ mem.install_readwrite_handler (0x8800, 0x8fff, read8_delegate(FUNC(mbee_state::mbeeppc_high_r), this), write8_delegate(FUNC(mbee_state::mbeeppc_high_w), this));
+ mem.install_read_bank (0xf000, 0xf7ff, "bankfl");
+ mem.install_read_bank (0xf800, 0xffff, "bankfh");
membank("bankfl")->set_entry(0); // ram
membank("bankfh")->set_entry(0); // ram
break;
@@ -345,7 +345,7 @@ WRITE8_MEMBER( mbee_state::mbee256_50_w )
WRITE8_MEMBER( mbee_state::mbee128_50_w )
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
// primary low banks
membank("boot")->set_entry((data & 3));
@@ -355,35 +355,35 @@ WRITE8_MEMBER( mbee_state::mbee128_50_w )
membank("bank9")->set_entry((data & 4) ? 1 : 0);
// 8000-8FFF, F000-FFFF
- mem->unmap_readwrite (0x8000, 0x87ff);
- mem->unmap_readwrite (0x8800, 0x8fff);
- mem->unmap_readwrite (0xf000, 0xf7ff);
- mem->unmap_readwrite (0xf800, 0xffff);
+ mem.unmap_readwrite (0x8000, 0x87ff);
+ mem.unmap_readwrite (0x8800, 0x8fff);
+ mem.unmap_readwrite (0xf000, 0xf7ff);
+ mem.unmap_readwrite (0xf800, 0xffff);
switch (data & 0x1c)
{
case 0x00:
- mem->install_read_bank (0x8000, 0x87ff, "bank8l");
- mem->install_read_bank (0x8800, 0x8fff, "bank8h");
- mem->install_readwrite_handler (0xf000, 0xf7ff, read8_delegate(FUNC(mbee_state::mbeeppc_low_r),this), write8_delegate(FUNC(mbee_state::mbeeppc_low_w),this));
- mem->install_readwrite_handler (0xf800, 0xffff, read8_delegate(FUNC(mbee_state::mbeeppc_high_r),this), write8_delegate(FUNC(mbee_state::mbeeppc_high_w),this));
+ mem.install_read_bank (0x8000, 0x87ff, "bank8l");
+ mem.install_read_bank (0x8800, 0x8fff, "bank8h");
+ mem.install_readwrite_handler (0xf000, 0xf7ff, read8_delegate(FUNC(mbee_state::mbeeppc_low_r),this), write8_delegate(FUNC(mbee_state::mbeeppc_low_w),this));
+ mem.install_readwrite_handler (0xf800, 0xffff, read8_delegate(FUNC(mbee_state::mbeeppc_high_r),this), write8_delegate(FUNC(mbee_state::mbeeppc_high_w),this));
membank("bank8l")->set_entry(0); // rom
membank("bank8h")->set_entry(0); // rom
break;
case 0x04:
- mem->install_read_bank (0x8000, 0x87ff, "bank8l");
- mem->install_read_bank (0x8800, 0x8fff, "bank8h");
- mem->install_readwrite_handler (0xf000, 0xf7ff, read8_delegate(FUNC(mbee_state::mbeeppc_low_r),this), write8_delegate(FUNC(mbee_state::mbeeppc_low_w),this));
- mem->install_readwrite_handler (0xf800, 0xffff, read8_delegate(FUNC(mbee_state::mbeeppc_high_r),this), write8_delegate(FUNC(mbee_state::mbeeppc_high_w),this));
+ mem.install_read_bank (0x8000, 0x87ff, "bank8l");
+ mem.install_read_bank (0x8800, 0x8fff, "bank8h");
+ mem.install_readwrite_handler (0xf000, 0xf7ff, read8_delegate(FUNC(mbee_state::mbeeppc_low_r),this), write8_delegate(FUNC(mbee_state::mbeeppc_low_w),this));
+ mem.install_readwrite_handler (0xf800, 0xffff, read8_delegate(FUNC(mbee_state::mbeeppc_high_r),this), write8_delegate(FUNC(mbee_state::mbeeppc_high_w),this));
membank("bank8l")->set_entry(1); // ram
membank("bank8h")->set_entry(1); // ram
break;
case 0x08:
case 0x18:
- mem->install_read_bank (0x8000, 0x87ff, "bank8l");
- mem->install_read_bank (0x8800, 0x8fff, "bank8h");
- mem->install_read_bank (0xf000, 0xf7ff, "bankfl");
- mem->install_read_bank (0xf800, 0xffff, "bankfh");
+ mem.install_read_bank (0x8000, 0x87ff, "bank8l");
+ mem.install_read_bank (0x8800, 0x8fff, "bank8h");
+ mem.install_read_bank (0xf000, 0xf7ff, "bankfl");
+ mem.install_read_bank (0xf800, 0xffff, "bankfh");
membank("bank8l")->set_entry(0); // rom
membank("bank8h")->set_entry(0); // rom
membank("bankfl")->set_entry(0); // ram
@@ -391,10 +391,10 @@ WRITE8_MEMBER( mbee_state::mbee128_50_w )
break;
case 0x0c:
case 0x1c:
- mem->install_read_bank (0x8000, 0x87ff, "bank8l");
- mem->install_read_bank (0x8800, 0x8fff, "bank8h");
- mem->install_read_bank (0xf000, 0xf7ff, "bankfl");
- mem->install_read_bank (0xf800, 0xffff, "bankfh");
+ mem.install_read_bank (0x8000, 0x87ff, "bank8l");
+ mem.install_read_bank (0x8800, 0x8fff, "bank8h");
+ mem.install_read_bank (0xf000, 0xf7ff, "bankfl");
+ mem.install_read_bank (0xf800, 0xffff, "bankfh");
membank("bank8l")->set_entry(1); // ram
membank("bank8h")->set_entry(1); // ram
membank("bankfl")->set_entry(0); // ram
@@ -402,10 +402,10 @@ WRITE8_MEMBER( mbee_state::mbee128_50_w )
break;
case 0x10:
case 0x14:
- mem->install_readwrite_handler (0x8000, 0x87ff, read8_delegate(FUNC(mbee_state::mbeeppc_low_r),this), write8_delegate(FUNC(mbee_state::mbeeppc_low_w),this));
- mem->install_readwrite_handler (0x8800, 0x8fff, read8_delegate(FUNC(mbee_state::mbeeppc_high_r),this), write8_delegate(FUNC(mbee_state::mbeeppc_high_w),this));
- mem->install_read_bank (0xf000, 0xf7ff, "bankfl");
- mem->install_read_bank (0xf800, 0xffff, "bankfh");
+ mem.install_readwrite_handler (0x8000, 0x87ff, read8_delegate(FUNC(mbee_state::mbeeppc_low_r),this), write8_delegate(FUNC(mbee_state::mbeeppc_low_w),this));
+ mem.install_readwrite_handler (0x8800, 0x8fff, read8_delegate(FUNC(mbee_state::mbeeppc_high_r),this), write8_delegate(FUNC(mbee_state::mbeeppc_high_w),this));
+ mem.install_read_bank (0xf000, 0xf7ff, "bankfl");
+ mem.install_read_bank (0xf800, 0xffff, "bankfh");
membank("bankfl")->set_entry(0); // ram
membank("bankfh")->set_entry(0); // ram
break;
@@ -532,20 +532,20 @@ MACHINE_RESET_MEMBER(mbee_state,mbee64)
MACHINE_RESET_MEMBER(mbee_state,mbee128)
{
- address_space *mem = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &mem = machine().device("maincpu")->memory().space(AS_PROGRAM);
machine_reset_common_disk(machine());
- mbee128_50_w(*mem,0,0); // set banks to default
+ mbee128_50_w(mem,0,0); // set banks to default
membank("boot")->set_entry(4); // boot time
}
MACHINE_RESET_MEMBER(mbee_state,mbee256)
{
UINT8 i;
- address_space *mem = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &mem = machine().device("maincpu")->memory().space(AS_PROGRAM);
machine_reset_common_disk(machine());
for (i = 0; i < 15; i++) m_mbee256_was_pressed[i] = 0;
m_mbee256_q_pos = 0;
- mbee256_50_w(*mem,0,0); // set banks to default
+ mbee256_50_w(mem,0,0); // set banks to default
membank("boot")->set_entry(8); // boot time
machine().scheduler().timer_set(attotime::from_usec(4), FUNC(mbee_reset));
}
@@ -564,7 +564,7 @@ INTERRUPT_GEN_MEMBER(mbee_state::mbee_interrupt)
// Due to the uncertainly and hackage here, this is commented out for now - Robbbert - 05-Oct-2010
#if 0
- //address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ //address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* The printer status connects to the pio ASTB pin, and the printer changing to not
busy should signal an interrupt routine at B61C, (next line) but this doesn't work.
The line below does what the interrupt should be doing. */
@@ -753,7 +753,7 @@ QUICKLOAD_LOAD( mbee )
{
mbee_state *state = image.device().machine().driver_data<mbee_state>();
device_t *cpu = image.device().machine().device("maincpu");
- address_space &space = *image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT16 i, j;
UINT8 data, sw = image.device().machine().root_device().ioport("CONFIG")->read() & 1; /* reading the dipswitch: 1 = autorun */
diff --git a/src/mess/machine/mface2.c b/src/mess/machine/mface2.c
index cb09c8e665b..67ab4a013eb 100644
--- a/src/mess/machine/mface2.c
+++ b/src/mess/machine/mface2.c
@@ -70,7 +70,7 @@ DIRECT_UPDATE_MEMBER( cpc_multiface2_device::amstrad_multiface_directoverride )
m_slot->romen_w(0);
/* clear op base override */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(cpc_multiface2_device::amstrad_default),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(cpc_multiface2_device::amstrad_default),this));
}
return pc;
@@ -163,7 +163,7 @@ void cpc_multiface2_device::multiface_stop()
m_slot->nmi_w(0);
/* initialise 0065 override to monitor calls to 0065 */
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(cpc_multiface2_device::amstrad_multiface_directoverride),this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(cpc_multiface2_device::amstrad_multiface_directoverride),this));
}
}
diff --git a/src/mess/machine/microtan.c b/src/mess/machine/microtan.c
index 7bcb842405a..00e1ba7c054 100644
--- a/src/mess/machine/microtan.c
+++ b/src/mess/machine/microtan.c
@@ -514,7 +514,7 @@ DRIVER_INIT_MEMBER(microtan_state,microtan)
{
UINT8 *dst = memregion("gfx2")->base();
int i;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
for (i = 0; i < 256; i++)
{
diff --git a/src/mess/machine/mpc105.c b/src/mess/machine/mpc105.c
index 9e2b2e2f327..57579a57fa9 100644
--- a/src/mess/machine/mpc105.c
+++ b/src/mess/machine/mpc105.c
@@ -94,7 +94,7 @@ void mpc105_device::update_memory()
if (m_bank_base > 0)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
/* first clear everything out */
space.nop_read(0x00000000, 0x3FFFFFFF);
diff --git a/src/mess/machine/msx.c b/src/mess/machine/msx.c
index 245974869c1..1c03209ae6d 100644
--- a/src/mess/machine/msx.c
+++ b/src/mess/machine/msx.c
@@ -634,7 +634,7 @@ WRITE8_DEVICE_HANDLER( msx_printer_data_w )
/* SIMPL emulation */
device->machine().device<dac_device>("dac")->write_signed8(data);
else
- device->machine().device<centronics_device>("centronics")->write(*device->machine().memory().first_space(), 0, data);
+ device->machine().device<centronics_device>("centronics")->write(device->machine().driver_data()->generic_space(), 0, data);
}
READ8_DEVICE_HANDLER( msx_printer_status_r )
diff --git a/src/mess/machine/msx_slot.c b/src/mess/machine/msx_slot.c
index 96f818c0a8b..cb486838d6b 100644
--- a/src/mess/machine/msx_slot.c
+++ b/src/mess/machine/msx_slot.c
@@ -31,7 +31,7 @@
static void msx_cpu_setbank (running_machine &machine, int page, UINT8 *mem)
{
msx_state *state = machine.driver_data<msx_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
switch (page)
{
case 1:
@@ -379,9 +379,9 @@ MSX_SLOT_MAP(konami_scc)
msx_cpu_setbank (machine, 5, state->m_mem + state->m_banks[2] * 0x2000);
msx_cpu_setbank (machine, 6, state->m_mem + state->m_banks[3] * 0x2000);
if (state->m_cart.scc.active ) {
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0x9800, 0x9fff, FUNC(konami_scc_bank5));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0x9800, 0x9fff, FUNC(konami_scc_bank5));
} else {
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(0x9800, 0x9fff,"bank7");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(0x9800, 0x9fff,"bank7");
}
break;
case 3:
@@ -393,7 +393,7 @@ MSX_SLOT_MAP(konami_scc)
MSX_SLOT_WRITE(konami_scc)
{
msx_state *drvstate = machine.driver_data<msx_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (addr >= 0x5000 && addr < 0x5800)
{
state->m_banks[0] = val & state->m_bank_mask;
@@ -1279,7 +1279,7 @@ static READ8_HANDLER (msx_diskrom_page2_r)
MSX_SLOT_MAP(diskrom)
{
msx_state *drvstate = machine.driver_data<msx_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
switch (page)
{
case 0:
@@ -1306,7 +1306,7 @@ MSX_SLOT_MAP(diskrom)
MSX_SLOT_WRITE(diskrom)
{
device_t *fdc = machine.device("wd179x");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (addr >= 0xa000 && addr < 0xc000)
{
addr -= 0x4000;
@@ -1408,7 +1408,7 @@ static READ8_HANDLER (msx_diskrom2_page2_r)
MSX_SLOT_MAP(diskrom2)
{
msx_state *drvstate = machine.driver_data<msx_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
switch (page)
{
case 0:
@@ -1434,7 +1434,7 @@ MSX_SLOT_MAP(diskrom2)
MSX_SLOT_WRITE(diskrom2)
{
device_t *fdc = machine.device("wd179x");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (addr >= 0xa000 && addr < 0xc000)
{
addr -= 0x4000;
@@ -1685,7 +1685,7 @@ MSX_SLOT_MAP(fmpac)
MSX_SLOT_WRITE(fmpac)
{
msx_state *drvstate = machine.driver_data<msx_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int i, data;
if (addr >= 0x4000 && addr < 0x6000 && state->m_cart.fmpac.sram_support)
@@ -2244,7 +2244,7 @@ static READ8_HANDLER (soundcartridge_sccp)
MSX_SLOT_MAP(soundcartridge)
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
switch (page)
{
case 0:
@@ -2279,7 +2279,7 @@ MSX_SLOT_MAP(soundcartridge)
MSX_SLOT_WRITE(soundcartridge)
{
msx_state *drvstate = machine.driver_data<msx_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int i;
if (addr < 0x4000)
diff --git a/src/mess/machine/mtx.c b/src/mess/machine/mtx.c
index 0973f55ad14..6060067535b 100644
--- a/src/mess/machine/mtx.c
+++ b/src/mess/machine/mtx.c
@@ -74,7 +74,7 @@ static void bankswitch(running_machine &machine, UINT8 data)
*/
mtx_state *state = machine.driver_data<mtx_state>();
- address_space *program = machine.device(Z80_TAG)->memory().space(AS_PROGRAM);
+ address_space &program = machine.device(Z80_TAG)->memory().space(AS_PROGRAM);
ram_device *messram = machine.device<ram_device>(RAM_TAG);
// UINT8 cbm_mode = data >> 7 & 0x01;
@@ -87,19 +87,19 @@ static void bankswitch(running_machine &machine, UINT8 data)
/* set ram bank, for invalid pages a nop-handler will be installed */
if (ram_page >= messram->size()/0x8000)
{
- program->nop_readwrite(0x4000, 0x7fff);
- program->nop_readwrite(0x8000, 0xbfff);
+ program.nop_readwrite(0x4000, 0x7fff);
+ program.nop_readwrite(0x8000, 0xbfff);
}
else if (ram_page + 1 == messram->size()/0x8000)
{
- program->nop_readwrite(0x4000, 0x7fff);
- program->install_readwrite_bank(0x8000, 0xbfff, "bank4");
+ program.nop_readwrite(0x4000, 0x7fff);
+ program.install_readwrite_bank(0x8000, 0xbfff, "bank4");
state->membank("bank4")->set_entry(ram_page);
}
else
{
- program->install_readwrite_bank(0x4000, 0x7fff, "bank3");
- program->install_readwrite_bank(0x8000, 0xbfff, "bank4");
+ program.install_readwrite_bank(0x4000, 0x7fff, "bank3");
+ program.install_readwrite_bank(0x8000, 0xbfff, "bank4");
state->membank("bank3")->set_entry(ram_page);
state->membank("bank4")->set_entry(ram_page);
}
@@ -333,7 +333,7 @@ WRITE8_MEMBER(mtx_state::hrx_attr_w)
SNAPSHOT_LOAD( mtx )
{
- address_space *program = image.device().machine().device(Z80_TAG)->memory().space(AS_PROGRAM);
+ address_space &program = image.device().machine().device(Z80_TAG)->memory().space(AS_PROGRAM);
UINT8 header[18];
UINT16 addr;
@@ -345,9 +345,9 @@ SNAPSHOT_LOAD( mtx )
{
/* long header */
addr = pick_integer_le(header, 16, 2);
- void *ptr = program->get_write_ptr(addr);
+ void *ptr = program.get_write_ptr(addr);
image.fread( ptr, 599);
- ptr = program->get_write_ptr(0xc000);
+ ptr = program.get_write_ptr(0xc000);
image.fread( ptr, snapshot_size - 599 - 18);
}
else
@@ -355,9 +355,9 @@ SNAPSHOT_LOAD( mtx )
/* short header */
addr = pick_integer_le(header, 0, 2);
image.fseek(4, SEEK_SET);
- void *ptr = program->get_write_ptr(addr);
+ void *ptr = program.get_write_ptr(addr);
image.fread( ptr, 599);
- ptr = program->get_write_ptr(0xc000);
+ ptr = program.get_write_ptr(0xc000);
image.fread( ptr, snapshot_size - 599 - 4);
}
diff --git a/src/mess/machine/mz700.c b/src/mess/machine/mz700.c
index e47ca57cfcb..8c849b34c3a 100644
--- a/src/mess/machine/mz700.c
+++ b/src/mess/machine/mz700.c
@@ -109,7 +109,7 @@ void mz_state::machine_start()
m_ppi = machine().device<i8255_device>("ppi8255");
/* reset memory map to defaults */
- mz700_bank_4_w(*machine().device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
+ mz700_bank_4_w(machine().device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
}
@@ -143,18 +143,18 @@ WRITE8_MEMBER(mz_state::mz700_e008_w)
READ8_MEMBER(mz_state::mz800_bank_0_r)
{
UINT8 *videoram = m_videoram;
- address_space *spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* switch in cgrom */
- spc->install_read_bank(0x1000, 0x1fff, "bank2");
- spc->nop_write(0x1000, 0x1fff);
+ spc.install_read_bank(0x1000, 0x1fff, "bank2");
+ spc.nop_write(0x1000, 0x1fff);
membank("bank2")->set_base(machine().root_device().memregion("monitor")->base() + 0x1000);
if (m_mz700_mode)
{
/* cgram from 0xc000 to 0xcfff */
- spc->install_read_bank(0xc000, 0xcfff, "bank6");
- spc->install_write_handler(0xc000, 0xcfff, write8_delegate(FUNC(mz_state::mz800_cgram_w),this));
+ spc.install_read_bank(0xc000, 0xcfff, "bank6");
+ spc.install_write_handler(0xc000, 0xcfff, write8_delegate(FUNC(mz_state::mz800_cgram_w),this));
membank("bank6")->set_base(m_cgram);
}
else
@@ -162,17 +162,17 @@ READ8_MEMBER(mz_state::mz800_bank_0_r)
if (m_hires_mode)
{
/* vram from 0x8000 to 0xbfff */
- spc->install_readwrite_bank(0x8000, 0xbfff, "bank4");
+ spc.install_readwrite_bank(0x8000, 0xbfff, "bank4");
membank("bank4")->set_base(videoram);
}
else
{
/* vram from 0x8000 to 0x9fff */
- spc->install_readwrite_bank(0x8000, 0x9fff, "bank4");
+ spc.install_readwrite_bank(0x8000, 0x9fff, "bank4");
membank("bank4")->set_base(videoram);
/* ram from 0xa000 to 0xbfff */
- spc->install_readwrite_bank(0xa000, 0xbfff, "bank5");
+ spc.install_readwrite_bank(0xa000, 0xbfff, "bank5");
membank("bank5")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xa000);
}
}
@@ -182,38 +182,38 @@ READ8_MEMBER(mz_state::mz800_bank_0_r)
WRITE8_MEMBER(mz_state::mz700_bank_0_w)
{
- address_space *spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
- spc->install_readwrite_bank(0x0000, 0x0fff, "bank1");
+ spc.install_readwrite_bank(0x0000, 0x0fff, "bank1");
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
}
WRITE8_MEMBER(mz_state::mz800_bank_0_w)
{
- address_space *spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
- spc->install_readwrite_bank(0x0000, 0x7fff, "bank1");
+ spc.install_readwrite_bank(0x0000, 0x7fff, "bank1");
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
}
READ8_MEMBER(mz_state::mz800_bank_1_r)
{
- address_space *spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* switch in ram from 0x1000 to 0x1fff */
- spc->install_readwrite_bank(0x1000, 0x1fff, "bank2");
+ spc.install_readwrite_bank(0x1000, 0x1fff, "bank2");
membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x1000);
if (m_mz700_mode)
{
/* ram from 0xc000 to 0xcfff */
- spc->install_readwrite_bank(0xc000, 0xcfff, "bank6");
+ spc.install_readwrite_bank(0xc000, 0xcfff, "bank6");
membank("bank6")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xc000);
}
else
{
/* ram from 0x8000 to 0xbfff */
- spc->install_readwrite_bank(0x8000, 0xbfff, "bank4");
+ spc.install_readwrite_bank(0x8000, 0xbfff, "bank4");
membank("bank4")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x8000);
}
@@ -222,14 +222,14 @@ READ8_MEMBER(mz_state::mz800_bank_1_r)
WRITE8_MEMBER(mz_state::mz700_bank_1_w)
{
- address_space *spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (m_mz700_mode)
{
/* switch in ram when not locked */
if (!m_mz700_ram_lock)
{
- spc->install_readwrite_bank(0xd000, 0xffff, "bank7");
+ spc.install_readwrite_bank(0xd000, 0xffff, "bank7");
membank("bank7")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xd000);
m_mz700_ram_vram = FALSE;
}
@@ -239,7 +239,7 @@ WRITE8_MEMBER(mz_state::mz700_bank_1_w)
/* switch in ram when not locked */
if (!m_mz800_ram_lock)
{
- spc->install_readwrite_bank(0xe000, 0xffff, "bank8");
+ spc.install_readwrite_bank(0xe000, 0xffff, "bank8");
membank("bank8")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xe000);
m_mz800_ram_monitor = FALSE;
}
@@ -248,28 +248,28 @@ WRITE8_MEMBER(mz_state::mz700_bank_1_w)
WRITE8_MEMBER(mz_state::mz700_bank_2_w)
{
- address_space *spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
- spc->install_read_bank(0x0000, 0x0fff, "bank1");
- spc->nop_write(0x0000, 0x0fff);
+ spc.install_read_bank(0x0000, 0x0fff, "bank1");
+ spc.nop_write(0x0000, 0x0fff);
membank("bank1")->set_base(machine().root_device().memregion("monitor")->base());
}
WRITE8_MEMBER(mz_state::mz700_bank_3_w)
{
UINT8 *videoram = m_videoram;
- address_space *spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (m_mz700_mode)
{
if (!m_mz700_ram_lock)
{
/* switch in videoram */
- spc->install_readwrite_bank(0xd000, 0xd7ff, "bank7");
+ spc.install_readwrite_bank(0xd000, 0xd7ff, "bank7");
membank("bank7")->set_base(videoram);
/* switch in colorram */
- spc->install_readwrite_bank(0xd800, 0xdfff, "bank9");
+ spc.install_readwrite_bank(0xd800, 0xdfff, "bank9");
membank("bank9")->set_base(m_colorram);
m_mz700_ram_vram = TRUE;
@@ -277,15 +277,15 @@ WRITE8_MEMBER(mz_state::mz700_bank_3_w)
/* switch in memory mapped i/o devices */
if (m_mz700)
{
- spc->install_readwrite_handler(0xe000, 0xfff3, 0, 0x1ff0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi));
- spc->install_legacy_readwrite_handler(*m_pit, 0xe004, 0xfff7, 0, 0x1ff0, FUNC(pit8253_r), FUNC(pit8253_w));
- spc->install_readwrite_handler(0xe008, 0xfff8, 0, 0x1ff0, read8_delegate(FUNC(mz_state::mz700_e008_r),this), write8_delegate(FUNC(mz_state::mz700_e008_w),this));
+ spc.install_readwrite_handler(0xe000, 0xfff3, 0, 0x1ff0, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi));
+ spc.install_legacy_readwrite_handler(*m_pit, 0xe004, 0xfff7, 0, 0x1ff0, FUNC(pit8253_r), FUNC(pit8253_w));
+ spc.install_readwrite_handler(0xe008, 0xfff8, 0, 0x1ff0, read8_delegate(FUNC(mz_state::mz700_e008_r),this), write8_delegate(FUNC(mz_state::mz700_e008_w),this));
}
else
{
- spc->install_readwrite_handler(0xe000, 0xe003, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi));
- spc->install_legacy_readwrite_handler(*m_pit, 0xe004, 0xe007, FUNC(pit8253_r), FUNC(pit8253_w));
- spc->install_readwrite_handler(0xe008, 0xe008, read8_delegate(FUNC(mz_state::mz700_e008_r),this), write8_delegate(FUNC(mz_state::mz700_e008_w),this));
+ spc.install_readwrite_handler(0xe000, 0xe003, read8_delegate(FUNC(i8255_device::read), (i8255_device*)m_ppi), write8_delegate(FUNC(i8255_device::write), (i8255_device*)m_ppi));
+ spc.install_legacy_readwrite_handler(*m_pit, 0xe004, 0xe007, FUNC(pit8253_r), FUNC(pit8253_w));
+ spc.install_readwrite_handler(0xe008, 0xe008, read8_delegate(FUNC(mz_state::mz700_e008_r),this), write8_delegate(FUNC(mz_state::mz700_e008_w),this));
}
}
}
@@ -294,8 +294,8 @@ WRITE8_MEMBER(mz_state::mz700_bank_3_w)
if (!m_mz800_ram_lock)
{
/* switch in mz800 monitor rom if not locked */
- spc->install_read_bank(0xe000, 0xffff, "bank8");
- spc->nop_write(0xe000, 0xffff);
+ spc.install_read_bank(0xe000, 0xffff, "bank8");
+ spc.nop_write(0xe000, 0xffff);
membank("bank8")->set_base(machine().root_device().memregion("monitor")->base() + 0x2000);
m_mz800_ram_monitor = TRUE;
}
@@ -305,7 +305,7 @@ WRITE8_MEMBER(mz_state::mz700_bank_3_w)
WRITE8_MEMBER(mz_state::mz700_bank_4_w)
{
UINT8 *videoram = m_videoram;
- address_space *spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (m_mz700_mode)
{
@@ -314,44 +314,44 @@ WRITE8_MEMBER(mz_state::mz700_bank_4_w)
mz700_bank_3_w(space, 0, 0); /* switch in videoram, colorram, and mmio */
/* rest is ram is always ram in mz700 mode */
- spc->install_readwrite_bank(0x1000, 0xcfff, "bank2");
+ spc.install_readwrite_bank(0x1000, 0xcfff, "bank2");
membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x1000);
}
else
{
/* monitor rom and cgrom */
- spc->install_read_bank(0x0000, 0x1fff, "bank1");
- spc->nop_write(0x0000, 0x1fff);
+ spc.install_read_bank(0x0000, 0x1fff, "bank1");
+ spc.nop_write(0x0000, 0x1fff);
membank("bank1")->set_base(machine().root_device().memregion("monitor")->base());
/* ram from 0x2000 to 0x7fff */
- spc->install_readwrite_bank(0x2000, 0x7fff, "bank3");
+ spc.install_readwrite_bank(0x2000, 0x7fff, "bank3");
membank("bank3")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
if (m_hires_mode)
{
/* vram from 0x8000 to 0xbfff */
- spc->install_readwrite_bank(0x8000, 0xbfff, "bank4");
+ spc.install_readwrite_bank(0x8000, 0xbfff, "bank4");
membank("bank4")->set_base(videoram);
}
else
{
/* vram from 0x8000 to 0x9fff */
- spc->install_readwrite_bank(0x8000, 0x9fff, "bank4");
+ spc.install_readwrite_bank(0x8000, 0x9fff, "bank4");
membank("bank4")->set_base(videoram);
/* ram from 0xa000 to 0xbfff */
- spc->install_readwrite_bank(0xa000, 0xbfff, "bank5");
+ spc.install_readwrite_bank(0xa000, 0xbfff, "bank5");
membank("bank5")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xa000);
}
/* ram from 0xc000 to 0xdfff */
- spc->install_readwrite_bank(0xc000, 0xdfff, "bank6");
+ spc.install_readwrite_bank(0xc000, 0xdfff, "bank6");
membank("bank6")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xc000);
/* mz800 monitor rom from 0xe000 to 0xffff */
- spc->install_read_bank(0xe000, 0xffff, "bank8");
- spc->nop_write(0xe000, 0xffff);
+ spc.install_read_bank(0xe000, 0xffff, "bank8");
+ spc.nop_write(0xe000, 0xffff);
membank("bank8")->set_base(machine().root_device().memregion("monitor")->base() + 0x2000);
m_mz800_ram_monitor = TRUE;
@@ -361,19 +361,19 @@ WRITE8_MEMBER(mz_state::mz700_bank_4_w)
WRITE8_MEMBER(mz_state::mz700_bank_5_w)
{
- address_space *spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &spc = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (m_mz700_mode)
{
/* prevent access from 0xd000 to 0xffff */
m_mz700_ram_lock = TRUE;
- spc->nop_readwrite(0xd000, 0xffff);
+ spc.nop_readwrite(0xd000, 0xffff);
}
else
{
/* prevent access from 0xe000 to 0xffff */
m_mz800_ram_lock = TRUE;
- spc->nop_readwrite(0xe000, 0xffff);
+ spc.nop_readwrite(0xe000, 0xffff);
}
}
diff --git a/src/mess/machine/nascom1.c b/src/mess/machine/nascom1.c
index 2d4195bc438..80189051eff 100644
--- a/src/mess/machine/nascom1.c
+++ b/src/mess/machine/nascom1.c
@@ -222,14 +222,14 @@ SNAPSHOT_LOAD( nascom1 )
if (sscanf((char *)line, "%x %x %x %x %x %x %x %x %x %x\010\010\n",
&addr, &b0, &b1, &b2, &b3, &b4, &b5, &b6, &b7, &dummy) == 10)
{
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->write_byte(addr++, b0);
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->write_byte(addr++, b1);
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->write_byte(addr++, b2);
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->write_byte(addr++, b3);
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->write_byte(addr++, b4);
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->write_byte(addr++, b5);
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->write_byte(addr++, b6);
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->write_byte(addr++, b7);
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).write_byte(addr++, b0);
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).write_byte(addr++, b1);
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).write_byte(addr++, b2);
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).write_byte(addr++, b3);
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).write_byte(addr++, b4);
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).write_byte(addr++, b5);
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).write_byte(addr++, b6);
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).write_byte(addr++, b7);
}
}
@@ -265,28 +265,28 @@ DRIVER_INIT_MEMBER(nascom1_state,nascom1)
switch (machine().device<ram_device>(RAM_TAG)->size())
{
case 1 * 1024:
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_readwrite(
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite(
0x1400, 0x9000);
break;
case 16 * 1024:
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(
0x1400, 0x4fff, "bank1");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_readwrite(
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite(
0x5000, 0xafff);
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
break;
case 32 * 1024:
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(
0x1400, 0x8fff, "bank1");
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_readwrite(
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite(
0x9000, 0xafff);
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
break;
case 40 * 1024:
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(
0x1400, 0xafff, "bank1");
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
break;
diff --git a/src/mess/machine/nes.c b/src/mess/machine/nes.c
index 5bbe950cf07..2b305d71f95 100644
--- a/src/mess/machine/nes.c
+++ b/src/mess/machine/nes.c
@@ -36,7 +36,7 @@ static void fds_irq(device_t *device, int scanline, int vblank, int blanked);
static void init_nes_core( running_machine &machine )
{
nes_state *state = machine.driver_data<nes_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
static const char *const bank_names[] = { "bank1", "bank2", "bank3", "bank4" };
int prg_banks = (state->m_prg_chunks == 1) ? (2 * 2) : (state->m_prg_chunks * 2);
int i;
@@ -48,8 +48,8 @@ static void init_nes_core( running_machine &machine )
/* Brutal hack put in as a consequence of the new memory system; we really need to fix the NES code */
space.install_readwrite_bank(0x0000, 0x07ff, 0, 0x1800, "bank10");
- machine.device("ppu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0, 0x1fff, FUNC(nes_chr_r), FUNC(nes_chr_w));
- machine.device("ppu")->memory().space(AS_PROGRAM)->install_legacy_readwrite_handler(0x2000, 0x3eff, FUNC(nes_nt_r), FUNC(nes_nt_w));
+ machine.device("ppu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0, 0x1fff, FUNC(nes_chr_r), FUNC(nes_chr_w));
+ machine.device("ppu")->memory().space(AS_PROGRAM).install_legacy_readwrite_handler(0x2000, 0x3eff, FUNC(nes_nt_r), FUNC(nes_nt_w));
state->membank("bank10")->set_base(state->m_rom);
@@ -193,7 +193,7 @@ static void init_nes_core( running_machine &machine )
}
if (state->m_pcb_id == WAIXING_SH2)
- machine.device("ppu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(0, 0x1fff, FUNC(waixing_sh2_chr_r));
+ machine.device("ppu")->memory().space(AS_PROGRAM).install_legacy_read_handler(0, 0x1fff, FUNC(waixing_sh2_chr_r));
}
// to be probably removed (it does nothing since a long time)
diff --git a/src/mess/machine/northbridge.c b/src/mess/machine/northbridge.c
index ecca90f816c..6c734ad9d73 100644
--- a/src/mess/machine/northbridge.c
+++ b/src/mess/machine/northbridge.c
@@ -24,7 +24,7 @@ northbridge_device::northbridge_device(const machine_config &mconfig, device_typ
void northbridge_device::device_start()
{
- address_space& space = *machine().device(":maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine().device(":maincpu")->memory().space(AS_PROGRAM);
machine().root_device().membank("bank10")->set_base(m_ram->pointer());
diff --git a/src/mess/machine/nubus.c b/src/mess/machine/nubus.c
index c72e69ec588..5a36775e20a 100644
--- a/src/mess/machine/nubus.c
+++ b/src/mess/machine/nubus.c
@@ -146,10 +146,10 @@ void nubus_device::install_device(offs_t start, offs_t end, read8_delegate rhand
switch(buswidth)
{
case 32:
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(start, end, rhandler, whandler, mask);
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, mask);
break;
case 64:
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(start, end, rhandler, whandler, ((UINT64)mask<<32)|mask);
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, ((UINT64)mask<<32)|mask);
break;
default:
fatalerror("NUBUS: Bus width %d not supported\n", buswidth);
@@ -164,10 +164,10 @@ void nubus_device::install_device(offs_t start, offs_t end, read16_delegate rhan
switch(buswidth)
{
case 32:
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(start, end, rhandler, whandler, mask);
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, mask);
break;
case 64:
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(start, end, rhandler, whandler, ((UINT64)mask<<32)|mask);
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, ((UINT64)mask<<32)|mask);
break;
default:
fatalerror("NUBUS: Bus width %d not supported\n", buswidth);
@@ -182,10 +182,10 @@ void nubus_device::install_device(offs_t start, offs_t end, read32_delegate rhan
switch(buswidth)
{
case 32:
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(start, end, rhandler, whandler, mask);
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, mask);
break;
case 64:
- m_maincpu->space(AS_PROGRAM)->install_readwrite_handler(start, end, rhandler, whandler, ((UINT64)mask<<32)|mask);
+ m_maincpu->space(AS_PROGRAM).install_readwrite_handler(start, end, rhandler, whandler, ((UINT64)mask<<32)|mask);
break;
default:
fatalerror("NUBUS: Bus width %d not supported\n", buswidth);
@@ -200,10 +200,10 @@ void nubus_device::install_readonly_device(offs_t start, offs_t end, read32_dele
switch(buswidth)
{
case 32:
- m_maincpu->space(AS_PROGRAM)->install_read_handler(start, end, rhandler, mask);
+ m_maincpu->space(AS_PROGRAM).install_read_handler(start, end, rhandler, mask);
break;
case 64:
- m_maincpu->space(AS_PROGRAM)->install_read_handler(start, end, rhandler, ((UINT64)mask<<32)|mask);
+ m_maincpu->space(AS_PROGRAM).install_read_handler(start, end, rhandler, ((UINT64)mask<<32)|mask);
break;
default:
fatalerror("NUBUS: Bus width %d not supported\n", buswidth);
@@ -218,10 +218,10 @@ void nubus_device::install_writeonly_device(offs_t start, offs_t end, write32_de
switch(buswidth)
{
case 32:
- m_maincpu->space(AS_PROGRAM)->install_write_handler(start, end, whandler, mask);
+ m_maincpu->space(AS_PROGRAM).install_write_handler(start, end, whandler, mask);
break;
case 64:
- m_maincpu->space(AS_PROGRAM)->install_write_handler(start, end, whandler, ((UINT64)mask<<32)|mask);
+ m_maincpu->space(AS_PROGRAM).install_write_handler(start, end, whandler, ((UINT64)mask<<32)|mask);
break;
default:
fatalerror("NUBUS: Bus width %d not supported\n", buswidth);
@@ -233,7 +233,7 @@ void nubus_device::install_bank(offs_t start, offs_t end, offs_t mask, offs_t mi
{
// printf("install_bank: %s @ %x->%x mask %x mirror %x\n", tag, start, end, mask, mirror);
m_maincpu = machine().device<cpu_device>(m_cputag);
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
space.install_readwrite_bank(start, end, mask, mirror, tag );
machine().root_device().membank(tag)->set_base(data);
}
diff --git a/src/mess/machine/ondra.c b/src/mess/machine/ondra.c
index 841f07b72f2..9a80117200c 100644
--- a/src/mess/machine/ondra.c
+++ b/src/mess/machine/ondra.c
@@ -42,19 +42,19 @@ static void ondra_update_banks(running_machine &machine)
ondra_state *state = machine.driver_data<ondra_state>();
UINT8 *mem = state->memregion("maincpu")->base();
if (state->m_bank1_status==0) {
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0x0000, 0x3fff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0x0000, 0x3fff);
state->membank("bank1")->set_base(mem + 0x010000);
} else {
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(0x0000, 0x3fff, "bank1");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(0x0000, 0x3fff, "bank1");
state->membank("bank1")->set_base(machine.device<ram_device>(RAM_TAG)->pointer() + 0x0000);
}
state->membank("bank2")->set_base(machine.device<ram_device>(RAM_TAG)->pointer() + 0x4000);
if (state->m_bank2_status==0) {
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0xe000, 0xffff, "bank3");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0xe000, 0xffff, "bank3");
state->membank("bank3")->set_base(machine.device<ram_device>(RAM_TAG)->pointer() + 0xe000);
} else {
- machine.device("maincpu")->memory().space(AS_PROGRAM)->unmap_write(0xe000, 0xffff);
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_read_handler (0xe000, 0xffff, read8_delegate(FUNC(ondra_state::ondra_keyboard_r),state));
+ machine.device("maincpu")->memory().space(AS_PROGRAM).unmap_write(0xe000, 0xffff);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_read_handler (0xe000, 0xffff, read8_delegate(FUNC(ondra_state::ondra_keyboard_r),state));
}
}
diff --git a/src/mess/machine/oric.c b/src/mess/machine/oric.c
index 21417fb1bba..5facf797100 100644
--- a/src/mess/machine/oric.c
+++ b/src/mess/machine/oric.c
@@ -221,7 +221,7 @@ static WRITE8_DEVICE_HANDLER ( oric_via_out_a_func )
{
/* if psg not selected, write to printer */
centronics_device *centronics = device->machine().device<centronics_device>("centronics");
- centronics->write(*device->machine().memory().first_space(), 0, data);
+ centronics->write(device->machine().driver_data()->generic_space(), 0, data);
}
}
@@ -427,7 +427,7 @@ static void oric_install_apple2_interface(running_machine &machine)
{
oric_state *state = machine.driver_data<oric_state>();
device_t *fdc = machine.device("fdc");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (state->m_is_telestrat)
return;
@@ -446,7 +446,7 @@ static void oric_enable_memory(running_machine &machine, int low, int high, int
{
oric_state *state = machine.driver_data<oric_state>();
int i;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
if (state->m_is_telestrat)
return;
@@ -551,7 +551,7 @@ static void oric_install_apple2_v2_interface(running_machine &machine)
{
oric_state *state = machine.driver_data<oric_state>();
device_t *fdc = machine.device("fdc");
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
space.install_read_handler(0x0300, 0x030f, read8_delegate(FUNC(oric_state::oric_IO_r),state));
space.install_legacy_read_handler(*fdc, 0x0310, 0x031f, FUNC(applefdc_r));
@@ -755,7 +755,7 @@ WRITE8_MEMBER(oric_state::oric_jasmin_w)
static void oric_install_jasmin_interface(running_machine &machine)
{
oric_state *state = machine.driver_data<oric_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
/* romdis */
state->m_port_3fb_w = 1;
oric_jasmin_set_mem_0x0c000(machine);
@@ -978,7 +978,7 @@ WRITE8_MEMBER(oric_state::oric_microdisc_w)
static void oric_install_microdisc_interface(running_machine &machine)
{
oric_state *state = machine.driver_data<oric_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
space.install_read_handler(0x0300, 0x030f, read8_delegate(FUNC(oric_state::oric_IO_r),state));
space.install_read_handler(0x0310, 0x031f, read8_delegate(FUNC(oric_state::oric_microdisc_r),state));
@@ -1064,7 +1064,7 @@ void oric_state::machine_start()
void oric_state::machine_reset()
{
int disc_interface_id = machine().root_device().ioport("FLOPPY")->read() & 0x07;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (m_is_telestrat)
return;
@@ -1246,7 +1246,7 @@ CB2
static void telestrat_refresh_mem(running_machine &machine)
{
oric_state *state = machine.driver_data<oric_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
telestrat_mem_block *mem_block = &state->m_telestrat_blocks[state->m_telestrat_bank_selection];
diff --git a/src/mess/machine/orion.c b/src/mess/machine/orion.c
index fa5c29a7042..20f4b447a1f 100644
--- a/src/mess/machine/orion.c
+++ b/src/mess/machine/orion.c
@@ -268,7 +268,7 @@ static void orionz80_switch_bank(running_machine &machine)
orion_state *state = machine.driver_data<orion_state>();
UINT8 bank_select;
UINT8 segment_select;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
bank_select = (state->m_orionz80_dispatcher & 0x0c) >> 2;
segment_select = state->m_orionz80_dispatcher & 0x03;
@@ -328,7 +328,7 @@ WRITE8_MEMBER(orion_state::orionz80_dispatcher_w)
MACHINE_RESET_MEMBER(orion_state,orionz80)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.unmap_write(0x0000, 0x3fff);
space.install_write_bank(0x4000, 0xefff, "bank2");
@@ -412,7 +412,7 @@ WRITE8_MEMBER(orion_state::orionz80_io_w)
static void orionpro_bank_switch(running_machine &machine)
{
orion_state *state = machine.driver_data<orion_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int page = state->m_orionpro_page & 7; // we have only 8 pages
int is128 = (state->m_orionpro_dispatcher & 0x80) ? 1 : 0;
UINT8 *ram = machine.device<ram_device>(RAM_TAG)->pointer();
diff --git a/src/mess/machine/osborne1.c b/src/mess/machine/osborne1.c
index 5809a2815fc..2953ab25a61 100644
--- a/src/mess/machine/osborne1.c
+++ b/src/mess/machine/osborne1.c
@@ -426,7 +426,7 @@ static void osborne1_load_proc(device_image_interface &image)
void osborne1_state::machine_reset()
{
int drive;
- address_space& space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* Initialize memory configuration */
osborne1_bankswitch_w( space, 0x00, 0 );
@@ -524,7 +524,7 @@ int osborne1_daisy_device::z80daisy_irq_ack()
osborne1_state *state = machine().driver_data<osborne1_state>();
/* Enable ROM and I/O when IRQ is acknowledged */
UINT8 old_bankswitch = state->m_bankswitch;
- address_space& space = *device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = device().machine().device("maincpu")->memory().space(AS_PROGRAM);
state->osborne1_bankswitch_w( space, 0, 0 );
state->m_bankswitch = old_bankswitch;
diff --git a/src/mess/machine/partner.c b/src/mess/machine/partner.c
index a2cfd608be1..1e23e064c2c 100644
--- a/src/mess/machine/partner.c
+++ b/src/mess/machine/partner.c
@@ -125,7 +125,7 @@ WRITE8_MEMBER(partner_state::partner_floppy_w){
static void partner_iomap_bank(running_machine &machine,UINT8 *rom)
{
partner_state *state = machine.driver_data<partner_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
switch(state->m_win_mem_page) {
case 2 :
// FDD
@@ -143,7 +143,7 @@ static void partner_iomap_bank(running_machine &machine,UINT8 *rom)
static void partner_bank_switch(running_machine &machine)
{
partner_state *state = machine.driver_data<partner_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = state->memregion("maincpu")->base();
UINT8 *ram = machine.device<ram_device>(RAM_TAG)->pointer();
diff --git a/src/mess/machine/pc.c b/src/mess/machine/pc.c
index c48578eeb0e..12210292c42 100644
--- a/src/mess/machine/pc.c
+++ b/src/mess/machine/pc.c
@@ -98,7 +98,7 @@ READ8_MEMBER(pc_state::ec1841_memboard_r)
WRITE8_MEMBER(pc_state::ec1841_memboard_w)
{
pc_state *st = space.machine().driver_data<pc_state>();
- address_space *program = space.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &program = space.machine().device("maincpu")->memory().space(AS_PROGRAM);
running_machine &machine = space.machine();
UINT8 current;
@@ -114,25 +114,25 @@ WRITE8_MEMBER(pc_state::ec1841_memboard_w)
if (BIT(current, 2) && !BIT(data, 2)) {
// disable read access
- program->unmap_read(0, 0x7ffff);
+ program.unmap_read(0, 0x7ffff);
DBG_LOG(1,"ec1841_memboard_w",("unmap_read(%d)\n", offset));
}
if (BIT(current, 3) && !BIT(data, 3)) {
// disable write access
- program->unmap_write(0, 0x7ffff);
+ program.unmap_write(0, 0x7ffff);
DBG_LOG(1,"ec1841_memboard_w",("unmap_write(%d)\n", offset));
}
if (!BIT(current, 2) && BIT(data, 2)) {
// enable read access
- program->install_read_bank(0, 0x7ffff, "bank10");
+ program.install_read_bank(0, 0x7ffff, "bank10");
DBG_LOG(1,"ec1841_memboard_w",("map_read(%d)\n", offset));
}
if (!BIT(current, 3) && BIT(data, 3)) {
// enable write access
- program->install_write_bank(0, 0x7ffff, "bank10");
+ program.install_write_bank(0, 0x7ffff, "bank10");
DBG_LOG(1,"ec1841_memboard_w",("map_write(%d)\n", offset));
}
@@ -1409,10 +1409,10 @@ static READ8_HANDLER( input_port_0_r ) { return space.machine().root_device().io
DRIVER_INIT_MEMBER(pc_state,pc1640)
{
- address_space *io_space = machine().firstcpu->space( AS_IO );
+ address_space &io_space = machine().firstcpu->space( AS_IO );
- io_space->install_legacy_read_handler(0x278, 0x27b, FUNC(pc1640_port278_r), 0xffff);
- io_space->install_legacy_read_handler(0x4278, 0x427b, FUNC(pc1640_port4278_r), 0xffff);
+ io_space.install_legacy_read_handler(0x278, 0x27b, FUNC(pc1640_port278_r), 0xffff);
+ io_space.install_legacy_read_handler(0x4278, 0x427b, FUNC(pc1640_port4278_r), 0xffff);
mess_init_pc_common(machine(), PCCOMMON_KEYBOARD_PC, pc_set_keyb_int, pc_set_irq_line);
}
@@ -1422,7 +1422,7 @@ DRIVER_INIT_MEMBER(pc_state,pc_vga)
mess_init_pc_common(machine(), PCCOMMON_KEYBOARD_PC, pc_set_keyb_int, pc_set_irq_line);
pc_vga_init(machine(), ::input_port_0_r, NULL);
- pc_vga_io_init(machine(), *machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, *machine().device("maincpu")->memory().space(AS_IO), 0x0000);
+ pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000);
}
static IRQ_CALLBACK(pc_irq_callback)
diff --git a/src/mess/machine/pc1350.c b/src/mess/machine/pc1350.c
index c322cf5a111..bae1d82cfa5 100644
--- a/src/mess/machine/pc1350.c
+++ b/src/mess/machine/pc1350.c
@@ -99,7 +99,7 @@ static TIMER_CALLBACK(pc1350_power_up)
MACHINE_START( pc1350 )
{
pc1350_state *state = machine.driver_data<pc1350_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
state->m_power = 1;
machine.scheduler().timer_set(attotime::from_seconds(1), FUNC(pc1350_power_up));
diff --git a/src/mess/machine/pc_lpt.c b/src/mess/machine/pc_lpt.c
index 8b0951352a3..a4ca98bdfc4 100644
--- a/src/mess/machine/pc_lpt.c
+++ b/src/mess/machine/pc_lpt.c
@@ -137,7 +137,7 @@ READ8_DEVICE_HANDLER( pc_lpt_data_r )
{
pc_lpt_state *lpt = get_safe_token(device);
// pull up mechanism for input lines, zeros are provided by pheripherial
- return lpt->data & ~lpt->centronics->read(*device->machine().memory().first_space(), 0);
+ return lpt->data & ~lpt->centronics->read(device->machine().driver_data()->generic_space(), 0);
}
@@ -145,7 +145,7 @@ WRITE8_DEVICE_HANDLER( pc_lpt_data_w )
{
pc_lpt_state *lpt = get_safe_token(device);
lpt->data = data;
- lpt->centronics->write(*device->machine().memory().first_space(), 0, data);
+ lpt->centronics->write(device->machine().driver_data()->generic_space(), 0, data);
}
diff --git a/src/mess/machine/pce.c b/src/mess/machine/pce.c
index 630288ccb4d..3232533a03f 100644
--- a/src/mess/machine/pce.c
+++ b/src/mess/machine/pce.c
@@ -220,7 +220,7 @@ DEVICE_IMAGE_LOAD(pce_cart)
/* Check for Street fighter 2 */
if (size == PCE_ROM_MAXSIZE)
{
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x01ff0, 0x01ff3, write8_delegate(FUNC(pce_state::pce_sf2_banking_w),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x01ff0, 0x01ff3, write8_delegate(FUNC(pce_state::pce_sf2_banking_w),state));
}
/* Check for Populous */
@@ -228,7 +228,7 @@ DEVICE_IMAGE_LOAD(pce_cart)
{
state->m_cartridge_ram = auto_alloc_array(image.device().machine(), UINT8, 0x8000);
state->membank("bank2")->set_base(state->m_cartridge_ram);
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x080000, 0x087FFF, write8_delegate(FUNC(pce_state::pce_cartridge_ram_w),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x080000, 0x087FFF, write8_delegate(FUNC(pce_state::pce_cartridge_ram_w),state));
}
/* Check for CD system card */
@@ -243,8 +243,8 @@ DEVICE_IMAGE_LOAD(pce_cart)
{
state->m_cartridge_ram = auto_alloc_array(image.device().machine(), UINT8, 0x30000);
state->membank("bank4")->set_base(state->m_cartridge_ram);
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_handler(0x0D0000, 0x0FFFFF, write8_delegate(FUNC(pce_state::pce_cartridge_ram_w),state));
- image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_handler(0x080000, 0x087FFF, read8_delegate(FUNC(pce_state::pce_cd_acard_wram_r),state),write8_delegate(FUNC(pce_state::pce_cd_acard_wram_w),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_handler(0x0D0000, 0x0FFFFF, write8_delegate(FUNC(pce_state::pce_cartridge_ram_w),state));
+ image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_handler(0x080000, 0x087FFF, read8_delegate(FUNC(pce_state::pce_cd_acard_wram_r),state),write8_delegate(FUNC(pce_state::pce_cd_acard_wram_w),state));
}
}
return 0;
diff --git a/src/mess/machine/pecom.c b/src/mess/machine/pecom.c
index 43505223283..25ec32d87c8 100644
--- a/src/mess/machine/pecom.c
+++ b/src/mess/machine/pecom.c
@@ -27,7 +27,7 @@ void pecom_state::machine_start()
void pecom_state::machine_reset()
{
UINT8 *rom = machine().root_device().memregion(CDP1802_TAG)->base();
- address_space &space = *machine().device(CDP1802_TAG)->memory().space(AS_PROGRAM);
+ address_space &space = machine().device(CDP1802_TAG)->memory().space(AS_PROGRAM);
space.unmap_write(0x0000, 0x3fff);
@@ -68,24 +68,24 @@ WRITE8_MEMBER(pecom_state::pecom_cdp1869_pageram_w)
WRITE8_MEMBER(pecom_state::pecom_bank_w)
{
- address_space *space2 = machine().device(CDP1802_TAG)->memory().space(AS_PROGRAM);
+ address_space &space2 = machine().device(CDP1802_TAG)->memory().space(AS_PROGRAM);
UINT8 *rom = memregion(CDP1802_TAG)->base();
- machine().device(CDP1802_TAG)->memory().space(AS_PROGRAM)->install_write_bank(0x0000, 0x3fff, "bank1");
+ machine().device(CDP1802_TAG)->memory().space(AS_PROGRAM).install_write_bank(0x0000, 0x3fff, "bank1");
membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x0000);
if (data==2)
{
- space2->install_read_handler (0xf000, 0xf7ff, read8_delegate(FUNC(pecom_state::pecom_cdp1869_charram_r),this));
- space2->install_write_handler(0xf000, 0xf7ff, write8_delegate(FUNC(pecom_state::pecom_cdp1869_charram_w),this));
- space2->install_read_handler (0xf800, 0xffff, read8_delegate(FUNC(pecom_state::pecom_cdp1869_pageram_r),this));
- space2->install_write_handler(0xf800, 0xffff, write8_delegate(FUNC(pecom_state::pecom_cdp1869_pageram_w),this));
+ space2.install_read_handler (0xf000, 0xf7ff, read8_delegate(FUNC(pecom_state::pecom_cdp1869_charram_r),this));
+ space2.install_write_handler(0xf000, 0xf7ff, write8_delegate(FUNC(pecom_state::pecom_cdp1869_charram_w),this));
+ space2.install_read_handler (0xf800, 0xffff, read8_delegate(FUNC(pecom_state::pecom_cdp1869_pageram_r),this));
+ space2.install_write_handler(0xf800, 0xffff, write8_delegate(FUNC(pecom_state::pecom_cdp1869_pageram_w),this));
}
else
{
- space2->unmap_write(0xf000, 0xf7ff);
- space2->unmap_write(0xf800, 0xffff);
- space2->install_read_bank (0xf000, 0xf7ff, "bank3");
- space2->install_read_bank (0xf800, 0xffff, "bank4");
+ space2.unmap_write(0xf000, 0xf7ff);
+ space2.unmap_write(0xf800, 0xffff);
+ space2.install_read_bank (0xf000, 0xf7ff, "bank3");
+ space2.install_read_bank (0xf800, 0xffff, "bank4");
membank("bank3")->set_base(rom + 0xf000);
membank("bank4")->set_base(rom + 0xf800);
}
diff --git a/src/mess/machine/pet.c b/src/mess/machine/pet.c
index 8ae44a13bc0..7ceed6952c3 100644
--- a/src/mess/machine/pet.c
+++ b/src/mess/machine/pet.c
@@ -656,12 +656,12 @@ static void pet_common_driver_init( running_machine &machine )
state->m_superpet = 0;
state->m_cbm8096 = 0;
- machine.device("maincpu")->memory().space(AS_PROGRAM)->install_readwrite_bank(0x0000, machine.device<ram_device>(RAM_TAG)->size() - 1, "bank10");
+ machine.device("maincpu")->memory().space(AS_PROGRAM).install_readwrite_bank(0x0000, machine.device<ram_device>(RAM_TAG)->size() - 1, "bank10");
state->membank("bank10")->set_base(state->m_memory);
if (machine.device<ram_device>(RAM_TAG)->size() < 0x8000)
{
- machine.device("maincpu")->memory().space(AS_PROGRAM)->nop_readwrite(machine.device<ram_device>(RAM_TAG)->size(), 0x7FFF);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite(machine.device<ram_device>(RAM_TAG)->size(), 0x7FFF);
}
/* 2114 poweron ? 64 x 0xff, 64x 0, and so on */
@@ -743,13 +743,13 @@ void pet_state::machine_reset()
{
if (machine().root_device().ioport("CFG")->read() & 0x08)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(0xfff0, 0xfff0, FUNC(cbm8096_w));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(0xfff0, 0xfff0, FUNC(cbm8096_w));
}
else
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_write(0xfff0, 0xfff0);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_write(0xfff0, 0xfff0);
}
- cbm8096_w(*machine().device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
+ cbm8096_w(machine().device("maincpu")->memory().space(AS_PROGRAM), 0, 0);
}
//removed cbm_drive_0_config (machine().root_device().ioport("CFG")->read() & 2 ? IEEE : 0, 8);
diff --git a/src/mess/machine/pk8020.c b/src/mess/machine/pk8020.c
index 8e5e2b2a831..2c61aa0d531 100644
--- a/src/mess/machine/pk8020.c
+++ b/src/mess/machine/pk8020.c
@@ -231,7 +231,7 @@ WRITE8_MEMBER(pk8020_state::devices_w)
static void pk8020_set_bank(running_machine &machine,UINT8 data)
{
pk8020_state *state = machine.driver_data<pk8020_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *mem = state->memregion("maincpu")->base();
UINT8 *ram = machine.device<ram_device>(RAM_TAG)->pointer();
diff --git a/src/mess/machine/pmd85.c b/src/mess/machine/pmd85.c
index 457bfae527a..e5fb95d330b 100644
--- a/src/mess/machine/pmd85.c
+++ b/src/mess/machine/pmd85.c
@@ -28,7 +28,7 @@ enum {PMD85_1, PMD85_2, PMD85_2A, PMD85_2B, PMD85_3, ALFA, MATO, C2717};
static void pmd851_update_memory(running_machine &machine)
{
pmd85_state *state = machine.driver_data<pmd85_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *ram = machine.device<ram_device>(RAM_TAG)->pointer();
if (state->m_startup_mem_map)
@@ -73,7 +73,7 @@ static void pmd851_update_memory(running_machine &machine)
static void pmd852a_update_memory(running_machine &machine)
{
pmd85_state *state = machine.driver_data<pmd85_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *ram = machine.device<ram_device>(RAM_TAG)->pointer();
if (state->m_startup_mem_map)
@@ -149,7 +149,7 @@ static void pmd853_update_memory(running_machine &machine)
static void alfa_update_memory(running_machine &machine)
{
pmd85_state *state = machine.driver_data<pmd85_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *ram = machine.device<ram_device>(RAM_TAG)->pointer();
if (state->m_startup_mem_map)
@@ -183,7 +183,7 @@ static void alfa_update_memory(running_machine &machine)
static void mato_update_memory(running_machine &machine)
{
pmd85_state *state = machine.driver_data<pmd85_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *ram = machine.device<ram_device>(RAM_TAG)->pointer();
if (state->m_startup_mem_map)
@@ -209,7 +209,7 @@ static void mato_update_memory(running_machine &machine)
static void c2717_update_memory(running_machine &machine)
{
pmd85_state *state = machine.driver_data<pmd85_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *mem = state->memregion("maincpu")->base();
UINT8 *ram = machine.device<ram_device>(RAM_TAG)->pointer();
@@ -960,5 +960,5 @@ void pmd85_state::machine_reset()
machine().scheduler().timer_set(attotime::zero, FUNC(setup_machine_state));
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(pmd85_state::pmd85_opbaseoverride), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(pmd85_state::pmd85_opbaseoverride), this));
}
diff --git a/src/mess/machine/pokemini.c b/src/mess/machine/pokemini.c
index c50f105904a..20f8c0800e1 100644
--- a/src/mess/machine/pokemini.c
+++ b/src/mess/machine/pokemini.c
@@ -1416,7 +1416,7 @@ DEVICE_IMAGE_LOAD( pokemini_cart )
static TIMER_CALLBACK( pokemini_prc_counter_callback )
{
pokemini_state *state = machine.driver_data<pokemini_state>();
- address_space &space = *machine.device( "maincpu")->memory().space( AS_PROGRAM );
+ address_space &space = machine.device( "maincpu")->memory().space( AS_PROGRAM );
state->m_prc.count++;
/* Check for overflow */
diff --git a/src/mess/machine/poly88.c b/src/mess/machine/poly88.c
index a3ff4edc47b..0c40bd43f73 100644
--- a/src/mess/machine/poly88.c
+++ b/src/mess/machine/poly88.c
@@ -257,7 +257,7 @@ WRITE8_MEMBER(poly88_state::poly88_intr_w)
SNAPSHOT_LOAD( poly88 )
{
- address_space &space = *image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = image.device().machine().device("maincpu")->memory().space(AS_PROGRAM);
UINT8* data= auto_alloc_array(image.device().machine(), UINT8, snapshot_size);
UINT16 recordNum;
UINT16 recordLen;
diff --git a/src/mess/machine/pp01.c b/src/mess/machine/pp01.c
index c34f91aecf4..138abbc44c4 100644
--- a/src/mess/machine/pp01.c
+++ b/src/mess/machine/pp01.c
@@ -85,7 +85,7 @@ static void pp01_set_memory(running_machine &machine,UINT8 block, UINT8 data)
{
pp01_state *state = machine.driver_data<pp01_state>();
UINT8 *mem = state->memregion("maincpu")->base();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT16 startaddr = block*0x1000;
UINT16 endaddr = ((block+1)*0x1000)-1;
UINT8 blocknum = block + 1;
diff --git a/src/mess/machine/primo.c b/src/mess/machine/primo.c
index 2ddbc1492df..89ddee8607d 100644
--- a/src/mess/machine/primo.c
+++ b/src/mess/machine/primo.c
@@ -46,7 +46,7 @@ INTERRUPT_GEN_MEMBER(primo_state::primo_vblank_interrupt)
static void primo_update_memory(running_machine &machine)
{
primo_state *state = machine.driver_data<primo_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
switch (state->m_port_FD & 0x03)
{
case 0x00: /* Original ROM */
@@ -300,7 +300,7 @@ static void primo_setup_pss (running_machine &machine, UINT8* snapshot_data, UIN
/* memory */
for (i=0; i<0xc000; i++)
- machine.device("maincpu")->memory().space(AS_PROGRAM)->write_byte( i+0x4000, snapshot_data[i+38]);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).write_byte( i+0x4000, snapshot_data[i+38]);
}
SNAPSHOT_LOAD( primo )
@@ -346,7 +346,7 @@ static void primo_setup_pp (running_machine &machine,UINT8* quickload_data, UINT
start_addr = quickload_data[2] + quickload_data[3]*256;
for (i=4; i<quickload_size; i++)
- machine.device("maincpu")->memory().space(AS_PROGRAM)->write_byte(start_addr+i-4, quickload_data[i]);
+ machine.device("maincpu")->memory().space(AS_PROGRAM).write_byte(start_addr+i-4, quickload_data[i]);
machine.device("maincpu")->state().set_state_int(Z80_PC, start_addr);
diff --git a/src/mess/machine/radio86.c b/src/mess/machine/radio86.c
index b03e7a67996..e397d33d589 100644
--- a/src/mess/machine/radio86.c
+++ b/src/mess/machine/radio86.c
@@ -168,12 +168,12 @@ READ8_MEMBER(radio86_state::radio_cpu_state_r)
READ8_MEMBER(radio86_state::radio_io_r)
{
- return machine().device("maincpu")->memory().space(AS_PROGRAM)->read_byte((offset << 8) + offset);
+ return machine().device("maincpu")->memory().space(AS_PROGRAM).read_byte((offset << 8) + offset);
}
WRITE8_MEMBER(radio86_state::radio_io_w)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->write_byte((offset << 8) + offset,data);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).write_byte((offset << 8) + offset,data);
}
MACHINE_RESET_MEMBER(radio86_state,radio86)
diff --git a/src/mess/machine/rm380z.c b/src/mess/machine/rm380z.c
index ee6a1e892f9..a936f713f35 100644
--- a/src/mess/machine/rm380z.c
+++ b/src/mess/machine/rm380z.c
@@ -107,14 +107,14 @@ READ8_MEMBER( rm380z_state::port_read )
WRITE8_MEMBER( rm380z_state::port_write_1b00 )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
- port_write(*program,offset+0xfc,data);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
+ port_write(program,offset+0xfc,data);
}
READ8_MEMBER( rm380z_state::port_read_1b00 )
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
- return port_read(*program,offset+0xfc);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
+ return port_read(program,offset+0xfc);
}
READ8_MEMBER( rm380z_state::hiram_read )
@@ -282,19 +282,19 @@ void rm380z_state::machine_reset()
void rm380z_state::config_memory_map()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
UINT8 *rom = memregion(RM380Z_MAINCPU_TAG)->base();
UINT8* m_ram_p = m_messram->pointer();
if ( RM380Z_PORTS_ENABLED_HIGH )
{
- program->install_ram( 0x0000, 0xDFFF, m_ram_p );
+ program.install_ram( 0x0000, 0xDFFF, m_ram_p );
}
else
{
- program->install_rom( 0x0000, 0x0FFF, rom );
- program->install_readwrite_handler(0x1BFC, 0x1BFF,read8_delegate(FUNC(rm380z_state::port_read_1b00), this),write8_delegate(FUNC(rm380z_state::port_write_1b00), this) );
- program->install_rom( 0x1C00, 0x1DFF, rom + 0x1400 );
- program->install_ram( 0x4000, 0xDFFF, m_ram_p );
+ program.install_rom( 0x0000, 0x0FFF, rom );
+ program.install_readwrite_handler(0x1BFC, 0x1BFF,read8_delegate(FUNC(rm380z_state::port_read_1b00), this),write8_delegate(FUNC(rm380z_state::port_write_1b00), this) );
+ program.install_rom( 0x1C00, 0x1DFF, rom + 0x1400 );
+ program.install_ram( 0x4000, 0xDFFF, m_ram_p );
}
}
diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c
index b406b89c9b7..2c5eb29f23a 100644
--- a/src/mess/machine/rmnimbus.c
+++ b/src/mess/machine/rmnimbus.c
@@ -729,11 +729,8 @@ static void drq_callback(running_machine &machine, int which)
{
rmnimbus_state *state = machine.driver_data<rmnimbus_state>();
struct dma_state *dma = &state->m_i186.dma[which];
- address_space *memory_space = machine.device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
- address_space *io_space = machine.device(MAINCPU_TAG)->memory().space(AS_IO);
-
- address_space *src_space;
- address_space *dest_space;
+ address_space &memory_space = machine.device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
+ address_space &io_space = machine.device(MAINCPU_TAG)->memory().space(AS_IO);
UINT16 dma_word;
UINT8 dma_byte;
@@ -750,27 +747,20 @@ static void drq_callback(running_machine &machine, int which)
return;
}
- if(dma->control & DEST_MIO)
- dest_space=memory_space;
- else
- dest_space=io_space;
-
- if(dma->control & SRC_MIO)
- src_space=memory_space;
- else
- src_space=io_space;
+ address_space &dest_space = (dma->control & DEST_MIO) ? memory_space : io_space;
+ address_space &src_space = (dma->control & SRC_MIO) ? memory_space : io_space;
// Do the transfer
if(dma->control & BYTE_WORD)
{
- dma_word=src_space->read_word(dma->source);
- dest_space->write_word(dma->dest,dma_word);
+ dma_word=src_space.read_word(dma->source);
+ dest_space.write_word(dma->dest,dma_word);
incdec_size=2;
}
else
{
- dma_byte=src_space->read_byte(dma->source);
- dest_space->write_byte(dma->dest,dma_byte);
+ dma_byte=src_space.read_byte(dma->source);
+ dest_space.write_byte(dma->dest,dma_byte);
incdec_size=1;
}
@@ -1232,14 +1222,14 @@ WRITE16_MEMBER(rmnimbus_state::nimbus_i186_internal_port_w)
temp = (data16 & 0x0fff) << 8;
if (data16 & 0x1000)
{
- machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM)->install_read_handler(temp, temp + 0xff, read16_delegate(FUNC(rmnimbus_state::nimbus_i186_internal_port_r),this));
- machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM)->install_write_handler(temp, temp + 0xff, write16_delegate(FUNC(rmnimbus_state::nimbus_i186_internal_port_w),this));
+ machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM).install_read_handler(temp, temp + 0xff, read16_delegate(FUNC(rmnimbus_state::nimbus_i186_internal_port_r),this));
+ machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM).install_write_handler(temp, temp + 0xff, write16_delegate(FUNC(rmnimbus_state::nimbus_i186_internal_port_w),this));
}
else
{
temp &= 0xffff;
- machine().device(MAINCPU_TAG)->memory().space(AS_IO)->install_read_handler(temp, temp + 0xff, read16_delegate(FUNC(rmnimbus_state::nimbus_i186_internal_port_r),this));
- machine().device(MAINCPU_TAG)->memory().space(AS_IO)->install_write_handler(temp, temp + 0xff, write16_delegate(FUNC(rmnimbus_state::nimbus_i186_internal_port_w),this));
+ machine().device(MAINCPU_TAG)->memory().space(AS_IO).install_read_handler(temp, temp + 0xff, read16_delegate(FUNC(rmnimbus_state::nimbus_i186_internal_port_r),this));
+ machine().device(MAINCPU_TAG)->memory().space(AS_IO).install_write_handler(temp, temp + 0xff, write16_delegate(FUNC(rmnimbus_state::nimbus_i186_internal_port_w),this));
}
break;
@@ -1346,7 +1336,7 @@ static void nimbus_debug(running_machine &machine, int ref, int params, const ch
static int instruction_hook(device_t &device, offs_t curpc)
{
rmnimbus_state *state = device.machine().driver_data<rmnimbus_state>();
- address_space &space = *device.memory().space(AS_PROGRAM);
+ address_space &space = device.memory().space(AS_PROGRAM);
UINT8 *addr_ptr;
addr_ptr = (UINT8*)space.get_read_ptr(curpc);
@@ -1725,7 +1715,7 @@ static void *get_dssi_ptr(address_space &space, UINT16 ds, UINT16 si)
static void decode_dssi_generic(device_t *device,UINT16 ds, UINT16 si, UINT8 raw_flag)
{
- address_space &space = *device->machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
+ address_space &space = device->machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
UINT16 *params;
int count;
@@ -1743,7 +1733,7 @@ static void decode_dssi_generic(device_t *device,UINT16 ds, UINT16 si, UINT8 ra
static void decode_dssi_f_fill_area(device_t *device,UINT16 ds, UINT16 si, UINT8 raw_flag)
{
- address_space &space = *device->machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
+ address_space &space = device->machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
UINT16 *addr_ptr;
t_area_params *area_params;
@@ -1796,7 +1786,7 @@ static void decode_dssi_f_fill_area(device_t *device,UINT16 ds, UINT16 si, UINT
static void decode_dssi_f_plot_character_string(device_t *device,UINT16 ds, UINT16 si, UINT8 raw_flag)
{
- address_space &space = *device->machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
+ address_space &space = device->machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
UINT8 *char_ptr;
t_plot_string_params *plot_string_params;
@@ -1825,7 +1815,7 @@ static void decode_dssi_f_plot_character_string(device_t *device,UINT16 ds, UIN
static void decode_dssi_f_set_new_clt(device_t *device,UINT16 ds, UINT16 si, UINT8 raw_flag)
{
- address_space &space = *device->machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
+ address_space &space = device->machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
UINT16 *new_colours;
int colour;
new_colours=(UINT16 *)get_dssi_ptr(space,ds,si);
@@ -1842,7 +1832,7 @@ static void decode_dssi_f_set_new_clt(device_t *device,UINT16 ds, UINT16 si, UI
static void decode_dssi_f_plonk_char(device_t *device,UINT16 ds, UINT16 si, UINT8 raw_flag)
{
- address_space &space = *device->machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
+ address_space &space = device->machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
UINT16 *params;
params=(UINT16 *)get_dssi_ptr(space,ds,si);
@@ -1856,7 +1846,7 @@ static void decode_dssi_f_plonk_char(device_t *device,UINT16 ds, UINT16 si, UIN
static void decode_dssi_f_rw_sectors(device_t *device,UINT16 ds, UINT16 si, UINT8 raw_flag)
{
- address_space &space = *device->machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
+ address_space &space = device->machine().device(MAINCPU_TAG)->memory().space(AS_PROGRAM);
UINT16 *params;
int param_no;
@@ -1992,7 +1982,7 @@ static const nimbus_blocks ramblocks[] =
static void nimbus_bank_memory(running_machine &machine)
{
rmnimbus_state *state = machine.driver_data<rmnimbus_state>();
- address_space &space = *machine.device( MAINCPU_TAG)->memory().space( AS_PROGRAM );
+ address_space &space = machine.device( MAINCPU_TAG)->memory().space( AS_PROGRAM );
int ramsize = machine.device<ram_device>(RAM_TAG)->size();
int ramblock = 0;
int blockno;
diff --git a/src/mess/machine/s100_wunderbus.c b/src/mess/machine/s100_wunderbus.c
index 15e07c1180c..f987ad0bb37 100644
--- a/src/mess/machine/s100_wunderbus.c
+++ b/src/mess/machine/s100_wunderbus.c
@@ -415,15 +415,15 @@ UINT8 s100_wunderbus_device::s100_sinp_r(address_space &space, offs_t offset)
break;
case 1:
- data = m_ace1->ins8250_r(*machine().memory().first_space(), offset & 0x07);
+ data = m_ace1->ins8250_r(machine().driver_data()->generic_space(), offset & 0x07);
break;
case 2:
- data = m_ace2->ins8250_r(*machine().memory().first_space(), offset & 0x07);
+ data = m_ace2->ins8250_r(machine().driver_data()->generic_space(), offset & 0x07);
break;
case 3:
- data = m_ace3->ins8250_r(*machine().memory().first_space(), offset & 0x07);
+ data = m_ace3->ins8250_r(machine().driver_data()->generic_space(), offset & 0x07);
break;
}
}
@@ -538,15 +538,15 @@ void s100_wunderbus_device::s100_sout_w(address_space &space, offs_t offset, UIN
break;
case 1:
- m_ace1->ins8250_w(*machine().memory().first_space(), offset & 0x07, data);
+ m_ace1->ins8250_w(machine().driver_data()->generic_space(), offset & 0x07, data);
break;
case 2:
- m_ace2->ins8250_w(*machine().memory().first_space(), offset & 0x07, data);
+ m_ace2->ins8250_w(machine().driver_data()->generic_space(), offset & 0x07, data);
break;
case 3:
- m_ace3->ins8250_w(*machine().memory().first_space(), offset & 0x07, data);
+ m_ace3->ins8250_w(machine().driver_data()->generic_space(), offset & 0x07, data);
break;
}
}
diff --git a/src/mess/machine/s3c44b0.c b/src/mess/machine/s3c44b0.c
index db2927b84d7..1ccd820a81c 100644
--- a/src/mess/machine/s3c44b0.c
+++ b/src/mess/machine/s3c44b0.c
@@ -2001,7 +2001,7 @@ SCREEN_UPDATE_RGB32( s3c44b0 )
DEVICE_START( s3c44b0 )
{
running_machine &machine = device->machine();
- address_space &space = *machine.device( "maincpu")->memory().space( AS_PROGRAM);
+ address_space &space = machine.device( "maincpu")->memory().space( AS_PROGRAM);
s3c44b0_t *s3c44b0 = get_token( device);
s3c44b0->iface = (const s3c44b0_interface *)device->static_config();
s3c44b0->space = &space;
diff --git a/src/mess/machine/samcoupe.c b/src/mess/machine/samcoupe.c
index 49fd966fa43..37332064f78 100644
--- a/src/mess/machine/samcoupe.c
+++ b/src/mess/machine/samcoupe.c
@@ -139,7 +139,7 @@ void samcoupe_update_memory(address_space &space)
WRITE8_MEMBER(samcoupe_state::samcoupe_ext_mem_w)
{
- address_space &space_program = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space_program = machine().device("maincpu")->memory().space(AS_PROGRAM);
if (offset & 1)
m_hext = data;
@@ -160,7 +160,7 @@ WRITE8_MEMBER(samcoupe_state::samcoupe_ext_mem_w)
static READ8_DEVICE_HANDLER( samcoupe_rtc_r )
{
- address_space &spaceio = *device->machine().device("maincpu")->memory().space(AS_IO);
+ address_space &spaceio = device->machine().device("maincpu")->memory().space(AS_IO);
msm6242_device *rtc = dynamic_cast<msm6242_device*>(device);
return rtc->read(spaceio,offset >> 12);
}
@@ -168,7 +168,7 @@ static READ8_DEVICE_HANDLER( samcoupe_rtc_r )
static WRITE8_DEVICE_HANDLER( samcoupe_rtc_w )
{
- address_space &spaceio = *device->machine().device("maincpu")->memory().space(AS_IO);
+ address_space &spaceio = device->machine().device("maincpu")->memory().space(AS_IO);
msm6242_device *rtc = dynamic_cast<msm6242_device*>(device);
rtc->write(spaceio,offset >> 12, data);
}
@@ -244,8 +244,8 @@ void samcoupe_state::machine_start()
void samcoupe_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
- address_space &spaceio = *machine().device("maincpu")->memory().space(AS_IO);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &spaceio = machine().device("maincpu")->memory().space(AS_IO);
/* initialize state */
m_lmpr = 0x0f; /* ROM0 paged in, ROM1 paged out RAM Banks */
diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c
index a8d20c6550a..9a2dd235466 100644
--- a/src/mess/machine/sms.c
+++ b/src/mess/machine/sms.c
@@ -1940,7 +1940,7 @@ MACHINE_START_MEMBER(sms_state,sms)
m_main_scr = machine().device("screen");
m_left_lcd = machine().device("left_lcd");
m_right_lcd = machine().device("right_lcd");
- m_space = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ m_space = &machine().device("maincpu")->memory().space(AS_PROGRAM);
/* Check if lightgun has been chosen as input: if so, enable crosshair */
machine().scheduler().timer_set(attotime::zero, FUNC(lightgun_tick));
@@ -1948,7 +1948,7 @@ MACHINE_START_MEMBER(sms_state,sms)
MACHINE_RESET_MEMBER(sms_state,sms)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
m_ctrl_reg = 0xff;
if (m_has_fm)
diff --git a/src/mess/machine/snescart.c b/src/mess/machine/snescart.c
index 109db62e314..bd248101e42 100644
--- a/src/mess/machine/snescart.c
+++ b/src/mess/machine/snescart.c
@@ -504,7 +504,7 @@ static UINT32 snes_find_hilo_mode( device_image_interface &image, UINT8 *buffer,
static int snes_find_addon_chip( running_machine &machine )
{
snes_state *state = machine.driver_data<snes_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int supported_type = 1;
int dsp_prg_offset = 0;
@@ -686,7 +686,7 @@ static int snes_find_addon_chip( running_machine &machine )
static void snes_cart_log_info( running_machine &machine, int total_blocks, int supported )
{
snes_state *state = machine.driver_data<snes_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
char title[21], rom_id[4], company_id[2];
int i, company, has_ram = 0, has_sram = 0;
@@ -763,7 +763,7 @@ static DEVICE_IMAGE_LOAD( snes_cart )
int supported_type = 1;
running_machine &machine = image.device().machine();
snes_state *state = machine.driver_data<snes_state>();
- address_space &space = *machine.device( "maincpu")->memory().space( AS_PROGRAM );
+ address_space &space = machine.device( "maincpu")->memory().space( AS_PROGRAM );
int total_blocks, read_blocks, has_bsx_slot = 0, st_bios = 0;
UINT32 offset, int_header_offs;
UINT8 *ROM = state->memregion("cart")->base();
diff --git a/src/mess/machine/sorcerer.c b/src/mess/machine/sorcerer.c
index 697bf7548d1..b9398db100d 100644
--- a/src/mess/machine/sorcerer.c
+++ b/src/mess/machine/sorcerer.c
@@ -306,7 +306,7 @@ SNAPSHOT_LOAD(sorcerer)
{
device_t *cpu = image.device().machine().device("maincpu");
UINT8 *RAM = image.device().machine().root_device().memregion(cpu->tag())->base();
- address_space &space = *cpu->memory().space(AS_PROGRAM);
+ address_space &space = cpu->memory().space(AS_PROGRAM);
UINT8 header[28];
unsigned char s_byte;
@@ -360,7 +360,7 @@ void sorcerer_state::machine_start()
UINT16 endmem = 0xbfff;
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
/* configure RAM */
switch (m_ram->size())
{
@@ -387,7 +387,7 @@ MACHINE_START_MEMBER(sorcerer_state,sorcererd)
UINT16 endmem = 0xbbff;
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
/* configure RAM */
switch (m_ram->size())
{
@@ -407,7 +407,7 @@ MACHINE_START_MEMBER(sorcerer_state,sorcererd)
void sorcerer_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* Initialize cassette interface */
m_cass_data.output.length = 0;
diff --git a/src/mess/machine/southbridge.c b/src/mess/machine/southbridge.c
index 77d786cf5ce..5789c028260 100644
--- a/src/mess/machine/southbridge.c
+++ b/src/mess/machine/southbridge.c
@@ -194,18 +194,18 @@ IRQ_CALLBACK(southbridge_device::at_irq_callback)
void southbridge_device::device_start()
{
- address_space* spaceio = machine().device(":maincpu")->memory().space(AS_IO);
-
- spaceio->install_legacy_readwrite_handler(*m_dma8237_1, 0x0000, 0x001f, FUNC(i8237_r), FUNC(i8237_w), 0xffffffff);
- spaceio->install_legacy_readwrite_handler(*m_pic8259_master, 0x0020, 0x003f, FUNC(pic8259_r), FUNC(pic8259_w), 0xffffffff);
- spaceio->install_legacy_readwrite_handler(*m_pit8254, 0x0040, 0x005f, FUNC(pit8253_r), FUNC(pit8253_w), 0xffffffff);
- spaceio->install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(southbridge_device::at_keybc_r),this), write8_delegate(FUNC(southbridge_device::at_keybc_w),this), 0xffffffff);
- spaceio->install_readwrite_handler(0x0064, 0x0067, read8_delegate(FUNC(at_keyboard_controller_device::status_r),&(*m_keybc)), write8_delegate(FUNC(at_keyboard_controller_device::command_w),&(*m_keybc)), 0xffffffff);
- spaceio->install_readwrite_handler(0x0070, 0x007f, read8_delegate(FUNC(mc146818_device::read),&(*m_mc146818)), write8_delegate(FUNC(mc146818_device::write),&(*m_mc146818)), 0xffffffff);
- spaceio->install_readwrite_handler(0x0080, 0x009f, read8_delegate(FUNC(southbridge_device::at_page8_r),this), write8_delegate(FUNC(southbridge_device::at_page8_w),this), 0xffffffff);
- spaceio->install_legacy_readwrite_handler(*m_pic8259_slave, 0x00a0, 0x00bf, FUNC(pic8259_r), FUNC(pic8259_w), 0xffffffff);
- spaceio->install_readwrite_handler(0x00c0, 0x00df, read8_delegate(FUNC(southbridge_device::at_dma8237_2_r),this), write8_delegate(FUNC(southbridge_device::at_dma8237_2_w),this), 0xffffffff);
- spaceio->nop_readwrite(0x00e0, 0x00ef);
+ address_space& spaceio = machine().device(":maincpu")->memory().space(AS_IO);
+
+ spaceio.install_legacy_readwrite_handler(*m_dma8237_1, 0x0000, 0x001f, FUNC(i8237_r), FUNC(i8237_w), 0xffffffff);
+ spaceio.install_legacy_readwrite_handler(*m_pic8259_master, 0x0020, 0x003f, FUNC(pic8259_r), FUNC(pic8259_w), 0xffffffff);
+ spaceio.install_legacy_readwrite_handler(*m_pit8254, 0x0040, 0x005f, FUNC(pit8253_r), FUNC(pit8253_w), 0xffffffff);
+ spaceio.install_readwrite_handler(0x0060, 0x0063, read8_delegate(FUNC(southbridge_device::at_keybc_r),this), write8_delegate(FUNC(southbridge_device::at_keybc_w),this), 0xffffffff);
+ spaceio.install_readwrite_handler(0x0064, 0x0067, read8_delegate(FUNC(at_keyboard_controller_device::status_r),&(*m_keybc)), write8_delegate(FUNC(at_keyboard_controller_device::command_w),&(*m_keybc)), 0xffffffff);
+ spaceio.install_readwrite_handler(0x0070, 0x007f, read8_delegate(FUNC(mc146818_device::read),&(*m_mc146818)), write8_delegate(FUNC(mc146818_device::write),&(*m_mc146818)), 0xffffffff);
+ spaceio.install_readwrite_handler(0x0080, 0x009f, read8_delegate(FUNC(southbridge_device::at_page8_r),this), write8_delegate(FUNC(southbridge_device::at_page8_w),this), 0xffffffff);
+ spaceio.install_legacy_readwrite_handler(*m_pic8259_slave, 0x00a0, 0x00bf, FUNC(pic8259_r), FUNC(pic8259_w), 0xffffffff);
+ spaceio.install_readwrite_handler(0x00c0, 0x00df, read8_delegate(FUNC(southbridge_device::at_dma8237_2_r),this), write8_delegate(FUNC(southbridge_device::at_dma8237_2_w),this), 0xffffffff);
+ spaceio.nop_readwrite(0x00e0, 0x00ef);
m_at_offset1 = 0xff;
diff --git a/src/mess/machine/special.c b/src/mess/machine/special.c
index 2a32bafbe52..49b238e34d3 100644
--- a/src/mess/machine/special.c
+++ b/src/mess/machine/special.c
@@ -136,7 +136,7 @@ READ8_MEMBER( special_state::specimx_video_color_r )
void special_state::specimx_set_bank(offs_t i, UINT8 data)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
UINT8 *ram = m_ram->pointer();
space.install_write_bank(0xc000, 0xffbf, "bank3");
@@ -273,7 +273,7 @@ void special_state::erik_set_bank()
UINT8 bank4 = (m_RR_register >> 6) & 3;
UINT8 *mem = memregion("maincpu")->base();
UINT8 *ram = m_ram->pointer();
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
space.install_write_bank(0x0000, 0x3fff, "bank1");
space.install_write_bank(0x4000, 0x8fff, "bank2");
diff --git a/src/mess/machine/sym1.c b/src/mess/machine/sym1.c
index 9da03cddfba..82b6ff57837 100644
--- a/src/mess/machine/sym1.c
+++ b/src/mess/machine/sym1.c
@@ -197,29 +197,29 @@ static WRITE8_DEVICE_HANDLER( sym1_via0_b_w )
*/
static WRITE8_DEVICE_HANDLER( sym1_via2_a_w )
{
- address_space *cpu0space = device->machine().device( "maincpu")->memory().space( AS_PROGRAM );
+ address_space &cpu0space = device->machine().device( "maincpu")->memory().space( AS_PROGRAM );
logerror("SYM1 VIA2 W 0x%02x\n", data);
if ((device->machine().root_device().ioport("WP")->read() & 0x01) && !(data & 0x01)) {
- cpu0space->nop_write(0xa600, 0xa67f);
+ cpu0space.nop_write(0xa600, 0xa67f);
} else {
- cpu0space->install_write_bank(0xa600, 0xa67f, "bank5");
+ cpu0space.install_write_bank(0xa600, 0xa67f, "bank5");
}
if ((device->machine().root_device().ioport("WP")->read() & 0x02) && !(data & 0x02)) {
- cpu0space->nop_write(0x0400, 0x07ff);
+ cpu0space.nop_write(0x0400, 0x07ff);
} else {
- cpu0space->install_write_bank(0x0400, 0x07ff, "bank2");
+ cpu0space.install_write_bank(0x0400, 0x07ff, "bank2");
}
if ((device->machine().root_device().ioport("WP")->read() & 0x04) && !(data & 0x04)) {
- cpu0space->nop_write(0x0800, 0x0bff);
+ cpu0space.nop_write(0x0800, 0x0bff);
} else {
- cpu0space->install_write_bank(0x0800, 0x0bff, "bank3");
+ cpu0space.install_write_bank(0x0800, 0x0bff, "bank3");
}
if ((device->machine().root_device().ioport("WP")->read() & 0x08) && !(data & 0x08)) {
- cpu0space->nop_write(0x0c00, 0x0fff);
+ cpu0space.nop_write(0x0c00, 0x0fff);
} else {
- cpu0space->install_write_bank(0x0c00, 0x0fff, "bank4");
+ cpu0space.install_write_bank(0x0c00, 0x0fff, "bank4");
}
}
@@ -289,7 +289,7 @@ DRIVER_INIT_MEMBER(sym1_state,sym1)
/* wipe expansion memory banks that are not installed */
if (machine().device<ram_device>(RAM_TAG)->size() < 4*1024)
{
- machine().device( "maincpu")->memory().space( AS_PROGRAM )->nop_readwrite(
+ machine().device( "maincpu")->memory().space( AS_PROGRAM ).nop_readwrite(
machine().device<ram_device>(RAM_TAG)->size(), 0x0fff);
}
@@ -302,8 +302,8 @@ void sym1_state::machine_reset()
{
/* make 0xf800 to 0xffff point to the last half of the monitor ROM
so that the CPU can find its reset vectors */
- machine().device( "maincpu")->memory().space( AS_PROGRAM )->install_read_bank(0xf800, 0xffff, "bank1");
- machine().device( "maincpu")->memory().space( AS_PROGRAM )->nop_write(0xf800, 0xffff);
+ machine().device( "maincpu")->memory().space( AS_PROGRAM ).install_read_bank(0xf800, 0xffff, "bank1");
+ machine().device( "maincpu")->memory().space( AS_PROGRAM ).nop_write(0xf800, 0xffff);
membank("bank1")->set_base(m_monitor + 0x800);
machine().device("maincpu")->reset();
}
diff --git a/src/mess/machine/tf20.c b/src/mess/machine/tf20.c
index 0f402078cfa..29bb3c633a2 100644
--- a/src/mess/machine/tf20.c
+++ b/src/mess/machine/tf20.c
@@ -72,10 +72,10 @@ static TIMER_DEVICE_CALLBACK( serial_clock )
static READ8_HANDLER( tf20_rom_disable )
{
tf20_state *tf20 = get_safe_token(space.device().owner());
- address_space *prg = space.device().memory().space(AS_PROGRAM);
+ address_space &prg = space.device().memory().space(AS_PROGRAM);
/* switch in ram */
- prg->install_ram(0x0000, 0x7fff, tf20->ram->pointer());
+ prg.install_ram(0x0000, 0x7fff, tf20->ram->pointer());
return 0xff;
}
@@ -327,7 +327,7 @@ static DEVICE_START( tf20 )
{
tf20_state *tf20 = get_safe_token(device);
device_t *cpu = device->subdevice("tf20");
- address_space *prg = cpu->memory().space(AS_PROGRAM);
+ address_space &prg = cpu->memory().space(AS_PROGRAM);
cpu->execute().set_irq_acknowledge_callback(tf20_irq_ack);
@@ -345,16 +345,16 @@ static DEVICE_START( tf20 )
tf20->floppy_1 = device->subdevice(FLOPPY_1);
/* enable second half of ram */
- prg->install_ram(0x8000, 0xffff, tf20->ram->pointer() + 0x8000);
+ prg.install_ram(0x8000, 0xffff, tf20->ram->pointer() + 0x8000);
}
static DEVICE_RESET( tf20 )
{
device_t *cpu = device->subdevice("tf20");
- address_space *prg = cpu->memory().space(AS_PROGRAM);
+ address_space &prg = cpu->memory().space(AS_PROGRAM);
/* enable rom */
- prg->install_rom(0x0000, 0x07ff, 0, 0x7800, cpu->region()->base());
+ prg.install_rom(0x0000, 0x07ff, 0, 0x7800, cpu->region()->base());
}
const device_type TF20 = &device_creator<tf20_device>;
diff --git a/src/mess/machine/thomson.c b/src/mess/machine/thomson.c
index 66ed9eb393e..c9c97270b89 100644
--- a/src/mess/machine/thomson.c
+++ b/src/mess/machine/thomson.c
@@ -447,7 +447,7 @@ DEVICE_IMAGE_LOAD( to7_cartridge )
static void to7_update_cart_bank(running_machine &machine)
{
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int bank = 0;
if ( thom_cart_nb_banks )
{
@@ -772,7 +772,7 @@ static WRITE8_DEVICE_HANDLER( to7_io_portb_out )
LOG_IO(( "$%04x %f to7_io_portb_out: CENTRONICS set data=$%02X\n", device->machine().device("maincpu")->safe_pcbase(), device->machine().time().as_double(), data ));
/* set 8-bit data */
- printer->write( *device->machine().memory().first_space(), 0, data);
+ printer->write( device->machine().driver_data()->generic_space(), 0, data);
}
@@ -1487,7 +1487,7 @@ MACHINE_RESET ( to7 )
MACHINE_START ( to7 )
{
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8* mem = machine.root_device().memregion("maincpu")->base();
UINT8* ram = machine.device<ram_device>(RAM_TAG)->pointer();
@@ -1568,7 +1568,7 @@ static READ8_DEVICE_HANDLER ( to770_sys_porta_in )
static void to770_update_ram_bank(running_machine &machine)
{
pia6821_device *sys_pia = machine.device<pia6821_device>(THOM_PIA_SYS );
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 portb = sys_pia->port_b_z_mask();
int bank;
@@ -1992,7 +1992,7 @@ DEVICE_IMAGE_LOAD( mo5_cartridge )
static void mo5_update_cart_bank(running_machine &machine)
{
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int rom_is_ram = mo5_reg_cart & 4;
int bank = 0;
int bank_is_read_only = 0;
@@ -2394,7 +2394,7 @@ static UINT8 to9_soft_bank;
static void to9_update_cart_bank(running_machine &machine)
{
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int bank = 0;
int slot = ( mc6846_get_output_port(machine.device("mc6846")) >> 4 ) & 3; /* bits 4-5: ROM bank */
@@ -2510,7 +2510,7 @@ READ8_HANDLER ( to9_cartridge_r )
static void to9_update_ram_bank (running_machine &machine)
{
pia6821_device *sys_pia = machine.device<pia6821_device>(THOM_PIA_SYS );
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 port = mc6846_get_output_port(machine.device("mc6846"));
UINT8 portb = sys_pia->port_b_z_mask();
UINT8 disk = ((port >> 2) & 1) | ((port >> 5) & 2); /* bits 6,2: RAM bank */
@@ -3049,7 +3049,7 @@ static READ8_DEVICE_HANDLER ( to9_sys_porta_in )
static WRITE8_DEVICE_HANDLER ( to9_sys_porta_out )
{
centronics_device *printer = device->machine().device<centronics_device>("centronics");
- printer->write(*device->machine().memory().first_space(), 0, data & 0xfe);
+ printer->write(device->machine().driver_data()->generic_space(), 0, data & 0xfe);
}
@@ -3573,7 +3573,7 @@ static void to8_update_floppy_bank_postload(running_machine *machine)
static void to8_update_ram_bank (running_machine &machine)
{
pia6821_device *sys_pia = machine.device<pia6821_device>(THOM_PIA_SYS );
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
UINT8 bank = 0;
if ( to8_reg_sys1 & 0x10 )
@@ -3637,7 +3637,7 @@ static void to8_update_ram_bank_postload(running_machine *machine)
static void to8_update_cart_bank (running_machine &machine)
{
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int bank = 0;
int bank_is_read_only = 0;
@@ -4498,7 +4498,7 @@ static void mo6_update_ram_bank_postload(running_machine *machine)
static void mo6_update_cart_bank (running_machine &machine)
{
pia6821_device *sys_pia = machine.device<pia6821_device>(THOM_PIA_SYS );
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int b = (sys_pia->a_output() >> 5) & 1;
int bank = 0;
int bank_is_read_only = 0;
@@ -4760,7 +4760,7 @@ static WRITE8_DEVICE_HANDLER ( mo6_game_porta_out )
LOG (( "$%04x %f mo6_game_porta_out: CENTRONICS set data=$%02X\n", device->machine().device("maincpu")->safe_pcbase(), device->machine().time().as_double(), data ));
/* centronics data */
- printer->write( *device->machine().memory().first_space(), 0, data);
+ printer->write( device->machine().driver_data()->generic_space(), 0, data);
}
diff --git a/src/mess/machine/ti85.c b/src/mess/machine/ti85.c
index f065c7f8017..e8e25839cb0 100644
--- a/src/mess/machine/ti85.c
+++ b/src/mess/machine/ti85.c
@@ -60,7 +60,7 @@ static void update_ti85_memory (running_machine &machine)
static void update_ti83p_memory (running_machine &machine)
{
ti85_state *state = machine.driver_data<ti85_state>();
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
if (state->m_ti8x_memory_page_1 & 0x40)
{
@@ -84,7 +84,7 @@ static void update_ti83p_memory (running_machine &machine)
static void update_ti86_memory (running_machine &machine)
{
ti85_state *state = machine.driver_data<ti85_state>();
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
if (state->m_ti8x_memory_page_1 & 0x40)
{
@@ -112,7 +112,7 @@ static void update_ti86_memory (running_machine &machine)
void ti85_state::machine_start()
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
m_bios = memregion("bios")->base();
m_timer_interrupt_mask = 0;
@@ -149,7 +149,7 @@ MACHINE_RESET_MEMBER(ti85_state,ti85)
MACHINE_START_MEMBER(ti85_state,ti83p)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
m_bios = memregion("bios")->base();
m_timer_interrupt_mask = 0;
@@ -187,7 +187,7 @@ MACHINE_START_MEMBER(ti85_state,ti83p)
MACHINE_START_MEMBER(ti85_state,ti86)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
m_bios = memregion("bios")->base();
m_timer_interrupt_mask = 0;
@@ -608,7 +608,7 @@ static void ti8x_snapshot_setup_registers (running_machine &machine, UINT8 * dat
static void ti85_setup_snapshot (running_machine &machine, UINT8 * data)
{
ti85_state *state = machine.driver_data<ti85_state>();
- address_space &space = *state->m_maincpu->space(AS_PROGRAM);
+ address_space &space = state->m_maincpu->space(AS_PROGRAM);
int i;
unsigned char lo,hi;
unsigned char * hdw = data + 0x8000 + 0x94;
diff --git a/src/mess/machine/ti99/datamux.c b/src/mess/machine/ti99/datamux.c
index f11fc709553..49b88ced1f2 100644
--- a/src/mess/machine/ti99/datamux.c
+++ b/src/mess/machine/ti99/datamux.c
@@ -254,7 +254,7 @@ void ti99_datamux_device::device_reset(void)
m_ready.resolve(conf->ready, *this);
m_cpu = machine().device("maincpu");
- m_space = m_cpu->memory().space(AS_PROGRAM);
+ m_space = &m_cpu->memory().space(AS_PROGRAM);
m_devices.reset(); // clear the list
m_use32k = (ioport("RAM")->read()==1);
diff --git a/src/mess/machine/ti99/ti_rs232.c b/src/mess/machine/ti99/ti_rs232.c
index eccf7ca5bc3..e96c8bd8d49 100644
--- a/src/mess/machine/ti99/ti_rs232.c
+++ b/src/mess/machine/ti99/ti_rs232.c
@@ -1059,7 +1059,7 @@ void ti_rs232_pio_device::device_reset()
m_select_value = 0x74000;
}
- m_space = machine().device("maincpu")->memory().space(AS_IO);
+ m_space = &machine().device("maincpu")->memory().space(AS_IO);
m_selected = false;
m_cru_base = (ioport("CRURS232")->read()==0)? 0x1300 : 0x1500;
diff --git a/src/mess/machine/ti99/tn_ide.c b/src/mess/machine/ti99/tn_ide.c
index 5b532dfc363..6473bfd7234 100644
--- a/src/mess/machine/ti99/tn_ide.c
+++ b/src/mess/machine/ti99/tn_ide.c
@@ -136,18 +136,18 @@ READ8Z_MEMBER(nouspikel_ide_interface_device::readz)
case 0: /* RTC RAM */
if (addr & 0x80)
/* RTC RAM page register */
- reply = m_rtc->xram_r(*machine().memory().first_space(),(addr & 0x1f) | 0x20);
+ reply = m_rtc->xram_r(machine().driver_data()->generic_space(),(addr & 0x1f) | 0x20);
else
/* RTC RAM read */
- reply = m_rtc->xram_r(*machine().memory().first_space(),addr);
+ reply = m_rtc->xram_r(machine().driver_data()->generic_space(),addr);
break;
case 1: /* RTC registers */
if (addr & 0x10)
/* register data */
- reply = m_rtc->rtc_r(*machine().memory().first_space(),1);
+ reply = m_rtc->rtc_r(machine().driver_data()->generic_space(),1);
else
/* register select */
- reply = m_rtc->rtc_r(*machine().memory().first_space(),0);
+ reply = m_rtc->rtc_r(machine().driver_data()->generic_space(),0);
break;
case 2: /* IDE registers set 1 (CS1Fx) */
if (m_tms9995_mode ? (!(addr & 1)) : (addr & 1))
@@ -205,18 +205,18 @@ WRITE8_MEMBER(nouspikel_ide_interface_device::write)
case 0: /* RTC RAM */
if (addr & 0x80)
/* RTC RAM page register */
- m_rtc->xram_w(*machine().memory().first_space(),(addr & 0x1f) | 0x20, data);
+ m_rtc->xram_w(machine().driver_data()->generic_space(),(addr & 0x1f) | 0x20, data);
else
/* RTC RAM write */
- m_rtc->xram_w(*machine().memory().first_space(),addr, data);
+ m_rtc->xram_w(machine().driver_data()->generic_space(),addr, data);
break;
case 1: /* RTC registers */
if (addr & 0x10)
/* register data */
- m_rtc->rtc_w(*machine().memory().first_space(),1, data);
+ m_rtc->rtc_w(machine().driver_data()->generic_space(),1, data);
else
/* register select */
- m_rtc->rtc_w(*machine().memory().first_space(),0, data);
+ m_rtc->rtc_w(machine().driver_data()->generic_space(),0, data);
break;
case 2: /* IDE registers set 1 (CS1Fx) */
/*
diff --git a/src/mess/machine/trs80.c b/src/mess/machine/trs80.c
index 7eb2d39d2ae..c0e17389c14 100644
--- a/src/mess/machine/trs80.c
+++ b/src/mess/machine/trs80.c
@@ -216,7 +216,7 @@ WRITE8_MEMBER( trs80_state::trs80m4_84_w )
d0 Select bit 0 */
/* get address space instead of io space */
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
UINT8 *base = memregion("maincpu")->base();
m_mode = (m_mode & 0x73) | (data & 0x8c);
@@ -255,9 +255,9 @@ WRITE8_MEMBER( trs80_state::trs80m4_84_w )
membank("bank17")->set_base(base + 0x14000);
membank("bank18")->set_base(base + 0x1f400);
membank("bank19")->set_base(base + 0x1f800);
- mem->install_readwrite_handler (0x37e8, 0x37e9, read8_delegate(FUNC(trs80_state::trs80_printer_r), this), write8_delegate(FUNC(trs80_state::trs80_printer_w), this)); /* 3 & 13 */
- mem->install_read_handler (0x3800, 0x3bff, read8_delegate(FUNC(trs80_state::trs80_keyboard_r), this)); /* 5 */
- mem->install_readwrite_handler (0x3c00, 0x3fff, read8_delegate(FUNC(trs80_state::trs80_videoram_r), this), write8_delegate(FUNC(trs80_state::trs80_videoram_w), this)); /* 6 & 16 */
+ mem.install_readwrite_handler (0x37e8, 0x37e9, read8_delegate(FUNC(trs80_state::trs80_printer_r), this), write8_delegate(FUNC(trs80_state::trs80_printer_w), this)); /* 3 & 13 */
+ mem.install_read_handler (0x3800, 0x3bff, read8_delegate(FUNC(trs80_state::trs80_keyboard_r), this)); /* 5 */
+ mem.install_readwrite_handler (0x3c00, 0x3fff, read8_delegate(FUNC(trs80_state::trs80_videoram_r), this), write8_delegate(FUNC(trs80_state::trs80_videoram_w), this)); /* 6 & 16 */
break;
case 1: /* write-only ram backs up the rom */
@@ -292,8 +292,8 @@ WRITE8_MEMBER( trs80_state::trs80m4_84_w )
membank("bank17")->set_base(base + 0x14000);
membank("bank18")->set_base(base + 0x1f400);
membank("bank19")->set_base(base + 0x1f800);
- mem->install_read_handler (0x3800, 0x3bff, read8_delegate(FUNC(trs80_state::trs80_keyboard_r), this)); /* 5 */
- mem->install_readwrite_handler (0x3c00, 0x3fff, read8_delegate(FUNC(trs80_state::trs80_videoram_r), this), write8_delegate(FUNC(trs80_state::trs80_videoram_w), this)); /* 6 & 16 */
+ mem.install_read_handler (0x3800, 0x3bff, read8_delegate(FUNC(trs80_state::trs80_keyboard_r), this)); /* 5 */
+ mem.install_readwrite_handler (0x3c00, 0x3fff, read8_delegate(FUNC(trs80_state::trs80_videoram_r), this), write8_delegate(FUNC(trs80_state::trs80_videoram_w), this)); /* 6 & 16 */
break;
case 2: /* keyboard and video are moved to high memory, and the rest is ram */
@@ -312,8 +312,8 @@ WRITE8_MEMBER( trs80_state::trs80m4_84_w )
membank("bank16")->set_base(base + 0x13c00);
membank("bank17")->set_base(base + 0x14000);
membank("bank18")->set_base(base + 0x0a000);
- mem->install_read_handler (0xf400, 0xf7ff, read8_delegate(FUNC(trs80_state::trs80_keyboard_r), this)); /* 8 */
- mem->install_readwrite_handler (0xf800, 0xffff, read8_delegate(FUNC(trs80_state::trs80_videoram_r), this), write8_delegate(FUNC(trs80_state::trs80_videoram_w), this)); /* 9 & 19 */
+ mem.install_read_handler (0xf400, 0xf7ff, read8_delegate(FUNC(trs80_state::trs80_keyboard_r), this)); /* 8 */
+ mem.install_readwrite_handler (0xf800, 0xffff, read8_delegate(FUNC(trs80_state::trs80_videoram_r), this), write8_delegate(FUNC(trs80_state::trs80_videoram_w), this)); /* 9 & 19 */
m_model4++;
break;
@@ -561,29 +561,29 @@ WRITE8_MEMBER( trs80_state::lnw80_fe_w )
d0 inverse video (entire screen) */
/* get address space instead of io space */
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
m_mode = (m_mode & 0x87) | ((data & 0x0f) << 3);
if (data & 8)
{
- mem->unmap_readwrite (0x0000, 0x3fff);
- mem->install_readwrite_handler (0x0000, 0x3fff, read8_delegate(FUNC(trs80_state::trs80_gfxram_r), this), write8_delegate(FUNC(trs80_state::trs80_gfxram_w), this));
+ mem.unmap_readwrite (0x0000, 0x3fff);
+ mem.install_readwrite_handler (0x0000, 0x3fff, read8_delegate(FUNC(trs80_state::trs80_gfxram_r), this), write8_delegate(FUNC(trs80_state::trs80_gfxram_w), this));
}
else
{
- mem->unmap_readwrite (0x0000, 0x3fff);
- mem->install_read_bank (0x0000, 0x2fff, "bank1");
+ mem.unmap_readwrite (0x0000, 0x3fff);
+ mem.install_read_bank (0x0000, 0x2fff, "bank1");
membank("bank1")->set_base(machine().root_device().memregion("maincpu")->base());
- mem->install_readwrite_handler (0x37e0, 0x37e3, read8_delegate(FUNC(trs80_state::trs80_irq_status_r), this), write8_delegate(FUNC(trs80_state::trs80_motor_w), this));
- mem->install_readwrite_handler (0x37e8, 0x37eb, read8_delegate(FUNC(trs80_state::trs80_printer_r), this), write8_delegate(FUNC(trs80_state::trs80_printer_w), this));
- mem->install_read_handler (0x37ec, 0x37ec, read8_delegate(FUNC(trs80_state::trs80_wd179x_r), this));
- mem->install_legacy_write_handler (*m_fdc, 0x37ec, 0x37ec, FUNC(wd17xx_command_w));
- mem->install_legacy_readwrite_handler (*m_fdc, 0x37ed, 0x37ed, FUNC(wd17xx_track_r), FUNC(wd17xx_track_w));
- mem->install_legacy_readwrite_handler (*m_fdc, 0x37ee, 0x37ee, FUNC(wd17xx_sector_r), FUNC(wd17xx_sector_w));
- mem->install_legacy_readwrite_handler (*m_fdc, 0x37ef, 0x37ef, FUNC(wd17xx_data_r), FUNC(wd17xx_data_w));
- mem->install_read_handler (0x3800, 0x38ff, 0, 0x0300, read8_delegate(FUNC(trs80_state::trs80_keyboard_r), this));
- mem->install_readwrite_handler (0x3c00, 0x3fff, read8_delegate(FUNC(trs80_state::trs80_videoram_r), this), write8_delegate(FUNC(trs80_state::trs80_videoram_w), this));
+ mem.install_readwrite_handler (0x37e0, 0x37e3, read8_delegate(FUNC(trs80_state::trs80_irq_status_r), this), write8_delegate(FUNC(trs80_state::trs80_motor_w), this));
+ mem.install_readwrite_handler (0x37e8, 0x37eb, read8_delegate(FUNC(trs80_state::trs80_printer_r), this), write8_delegate(FUNC(trs80_state::trs80_printer_w), this));
+ mem.install_read_handler (0x37ec, 0x37ec, read8_delegate(FUNC(trs80_state::trs80_wd179x_r), this));
+ mem.install_legacy_write_handler (*m_fdc, 0x37ec, 0x37ec, FUNC(wd17xx_command_w));
+ mem.install_legacy_readwrite_handler (*m_fdc, 0x37ed, 0x37ed, FUNC(wd17xx_track_r), FUNC(wd17xx_track_w));
+ mem.install_legacy_readwrite_handler (*m_fdc, 0x37ee, 0x37ee, FUNC(wd17xx_sector_r), FUNC(wd17xx_sector_w));
+ mem.install_legacy_readwrite_handler (*m_fdc, 0x37ef, 0x37ef, FUNC(wd17xx_data_r), FUNC(wd17xx_data_w));
+ mem.install_read_handler (0x3800, 0x38ff, 0, 0x0300, read8_delegate(FUNC(trs80_state::trs80_keyboard_r), this));
+ mem.install_readwrite_handler (0x3c00, 0x3fff, read8_delegate(FUNC(trs80_state::trs80_videoram_r), this), write8_delegate(FUNC(trs80_state::trs80_videoram_w), this));
}
}
@@ -863,35 +863,35 @@ void trs80_state::machine_reset()
MACHINE_RESET_MEMBER(trs80_state,trs80m4)
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
m_cassette_data = 0;
- mem->install_read_bank (0x0000, 0x0fff, "bank1");
- mem->install_read_bank (0x1000, 0x37e7, "bank2");
- mem->install_read_bank (0x37e8, 0x37e9, "bank3");
- mem->install_read_bank (0x37ea, 0x37ff, "bank4");
- mem->install_read_bank (0x3800, 0x3bff, "bank5");
- mem->install_read_bank (0x3c00, 0x3fff, "bank6");
- mem->install_read_bank (0x4000, 0xf3ff, "bank7");
- mem->install_read_bank (0xf400, 0xf7ff, "bank8");
- mem->install_read_bank (0xf800, 0xffff, "bank9");
-
- mem->install_write_bank (0x0000, 0x0fff, "bank11");
- mem->install_write_bank (0x1000, 0x37e7, "bank12");
- mem->install_write_bank (0x37e8, 0x37e9, "bank13");
- mem->install_write_bank (0x37ea, 0x37ff, "bank14");
- mem->install_write_bank (0x3800, 0x3bff, "bank15");
- mem->install_write_bank (0x3c00, 0x3fff, "bank16");
- mem->install_write_bank (0x4000, 0xf3ff, "bank17");
- mem->install_write_bank (0xf400, 0xf7ff, "bank18");
- mem->install_write_bank (0xf800, 0xffff, "bank19");
- trs80m4p_9c_w(*mem, 0, 1); /* Enable the ROM */
- trs80m4_84_w(*mem, 0, 0); /* switch in devices at power-on */
+ mem.install_read_bank (0x0000, 0x0fff, "bank1");
+ mem.install_read_bank (0x1000, 0x37e7, "bank2");
+ mem.install_read_bank (0x37e8, 0x37e9, "bank3");
+ mem.install_read_bank (0x37ea, 0x37ff, "bank4");
+ mem.install_read_bank (0x3800, 0x3bff, "bank5");
+ mem.install_read_bank (0x3c00, 0x3fff, "bank6");
+ mem.install_read_bank (0x4000, 0xf3ff, "bank7");
+ mem.install_read_bank (0xf400, 0xf7ff, "bank8");
+ mem.install_read_bank (0xf800, 0xffff, "bank9");
+
+ mem.install_write_bank (0x0000, 0x0fff, "bank11");
+ mem.install_write_bank (0x1000, 0x37e7, "bank12");
+ mem.install_write_bank (0x37e8, 0x37e9, "bank13");
+ mem.install_write_bank (0x37ea, 0x37ff, "bank14");
+ mem.install_write_bank (0x3800, 0x3bff, "bank15");
+ mem.install_write_bank (0x3c00, 0x3fff, "bank16");
+ mem.install_write_bank (0x4000, 0xf3ff, "bank17");
+ mem.install_write_bank (0xf400, 0xf7ff, "bank18");
+ mem.install_write_bank (0xf800, 0xffff, "bank19");
+ trs80m4p_9c_w(mem, 0, 1); /* Enable the ROM */
+ trs80m4_84_w(mem, 0, 0); /* switch in devices at power-on */
}
MACHINE_RESET_MEMBER(trs80_state,lnw80)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
m_cassette_data = 0;
m_reg_load = 1;
lnw80_fe_w(space, 0, 0);
diff --git a/src/mess/machine/upd71071.c b/src/mess/machine/upd71071.c
index acf8dd1fef3..46cadb4fa35 100644
--- a/src/mess/machine/upd71071.c
+++ b/src/mess/machine/upd71071.c
@@ -123,7 +123,7 @@ static TIMER_CALLBACK(dma_transfer_timer)
// single byte or word transfer
device_t* device = (device_t*)ptr;
upd71071_t* dmac = get_safe_token(device);
- address_space& space = *device->machine().device(dmac->intf->cputag)->memory().space(AS_PROGRAM);
+ address_space& space = device->machine().device(dmac->intf->cputag)->memory().space(AS_PROGRAM);
int channel = param;
UINT16 data = 0; // data to transfer
diff --git a/src/mess/machine/vector06.c b/src/mess/machine/vector06.c
index 1fd85af2153..d798137f848 100644
--- a/src/mess/machine/vector06.c
+++ b/src/mess/machine/vector06.c
@@ -169,7 +169,7 @@ void vector06_state::machine_start()
void vector06_state::machine_reset()
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
machine().device("maincpu")->execute().set_irq_acknowledge_callback(vector06_irq_callback);
space.install_read_bank (0x0000, 0x7fff, "bank1");
diff --git a/src/mess/machine/vtech2.c b/src/mess/machine/vtech2.c
index e06c146ad64..13f32025d48 100644
--- a/src/mess/machine/vtech2.c
+++ b/src/mess/machine/vtech2.c
@@ -113,7 +113,7 @@ static void laser_machine_init(running_machine &machine, int bank_mask, int vide
logerror("laser_machine_init(): bank mask $%04X, video %d [$%05X]\n", state->m_laser_bank_mask, state->m_laser_video_bank, state->m_laser_video_bank * 0x04000);
for (i = 0; i < ARRAY_LENGTH(state->m_laser_bank); i++)
- state->laser_bank_select_w(*machine.device("maincpu")->memory().space(AS_PROGRAM), i, 0);
+ state->laser_bank_select_w(machine.device("maincpu")->memory().space(AS_PROGRAM), i, 0);
}
void vtech2_state::machine_reset()
@@ -155,8 +155,8 @@ WRITE8_MEMBER(vtech2_state::laser_bank_select_w)
/* memory mapped I/O bank selected? */
if (data == 2)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_read_handler(offset * 0x4000, offset * 0x4000 + 0x3fff, mra_bank_soft[offset].func, mra_bank_soft[offset].name);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_legacy_write_handler(offset * 0x4000, offset * 0x4000 + 0x3fff, mwa_bank_soft[offset].func, mwa_bank_soft[offset].name);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_read_handler(offset * 0x4000, offset * 0x4000 + 0x3fff, mra_bank_soft[offset].func, mra_bank_soft[offset].name);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_legacy_write_handler(offset * 0x4000, offset * 0x4000 + 0x3fff, mwa_bank_soft[offset].func, mwa_bank_soft[offset].name);
}
else
{
@@ -169,14 +169,14 @@ WRITE8_MEMBER(vtech2_state::laser_bank_select_w)
{
logerror("select bank #%d VIDEO!\n", offset+1);
}
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_read_bank(offset * 0x4000, offset * 0x4000 + 0x3fff, mra_bank_hard[offset]);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->install_write_bank(offset * 0x4000, offset * 0x4000 + 0x3fff, mwa_bank_hard[offset]);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_bank(offset * 0x4000, offset * 0x4000 + 0x3fff, mra_bank_hard[offset]);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).install_write_bank(offset * 0x4000, offset * 0x4000 + 0x3fff, mwa_bank_hard[offset]);
}
else
{
logerror("select bank #%d MASKED!\n", offset+1);
- machine().device("maincpu")->memory().space(AS_PROGRAM)->nop_readwrite(offset * 0x4000, offset * 0x4000 + 0x3fff);
+ machine().device("maincpu")->memory().space(AS_PROGRAM).nop_readwrite(offset * 0x4000, offset * 0x4000 + 0x3fff);
}
}
diff --git a/src/mess/machine/wswan.c b/src/mess/machine/wswan.c
index 2912d891507..c5ec6785771 100644
--- a/src/mess/machine/wswan.c
+++ b/src/mess/machine/wswan.c
@@ -223,7 +223,7 @@ MACHINE_START_MEMBER(wswan_state,wscolor)
void wswan_state::machine_reset()
{
- address_space &space = *machine().device( "maincpu")->memory().space( AS_PROGRAM );
+ address_space &space = machine().device( "maincpu")->memory().space( AS_PROGRAM );
/* Intialize ports */
memcpy( m_ws_portram, ws_portram_init, 256 );
@@ -354,10 +354,10 @@ READ8_MEMBER( wswan_state::wswan_port_r )
WRITE8_MEMBER( wswan_state::wswan_port_w )
{
- address_space *mem = m_maincpu->space(AS_PROGRAM);
+ address_space &mem = m_maincpu->space(AS_PROGRAM);
wswan_state *state = machine().driver_data<wswan_state>();
UINT8 input;
- logerror( "PC=%X: port write %02X <- %02X\n", mem->device().safe_pc(), offset, data );
+ logerror( "PC=%X: port write %02X <- %02X\n", mem.device().safe_pc(), offset, data );
switch( offset )
{
case 0x00: /* Display control
@@ -676,7 +676,7 @@ WRITE8_MEMBER( wswan_state::wswan_port_w )
length = m_ws_portram[0x46] + (m_ws_portram[0x47] << 8);
for( ; length > 0; length-- )
{
- mem->write_byte(dst, mem->read_byte(src ) );
+ mem.write_byte(dst, mem.read_byte(src ) );
src++;
dst++;
}
@@ -1251,7 +1251,7 @@ WRITE8_MEMBER( wswan_state::wswan_port_w )
m_ws_portram[0xcb] = m_rtc.year;
break;
default:
- logerror( "%X: Unknown RTC command (%X) requested\n", mem->device().safe_pc(), data );
+ logerror( "%X: Unknown RTC command (%X) requested\n", mem.device().safe_pc(), data );
}
break;
case 0xcb: /* RTC Data */
@@ -1350,7 +1350,7 @@ DEVICE_IMAGE_LOAD(wswan_cart)
else
size = image.get_software_region_length("rom");
- state->m_ws_ram = (UINT8*) image.device().machine().device("maincpu")->memory().space(AS_PROGRAM)->get_read_ptr(0);
+ state->m_ws_ram = (UINT8*) image.device().machine().device("maincpu")->memory().space(AS_PROGRAM).get_read_ptr(0);
memset(state->m_ws_ram, 0, 0xffff);
state->m_ROMBanks = size / 65536;
@@ -1459,7 +1459,7 @@ static TIMER_CALLBACK(wswan_scanline_interrupt)
/* Handle Sound DMA */
if ( ( state->m_sound_dma.enable & 0x88 ) == 0x80 )
{
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM );
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM );
/* TODO: Output sound DMA byte */
state->wswan_port_w( space, 0x89, space.read_byte(state->m_sound_dma.source ) );
state->m_sound_dma.size--;
diff --git a/src/mess/machine/x68k_neptunex.c b/src/mess/machine/x68k_neptunex.c
index f045b52b09c..a92db6f4ded 100644
--- a/src/mess/machine/x68k_neptunex.c
+++ b/src/mess/machine/x68k_neptunex.c
@@ -47,7 +47,7 @@ void x68k_neptune_device::device_start()
device_t* cpu = machine().device("maincpu");
char mac[7];
UINT32 num = rand();
- address_space& space = *cpu->memory().space(AS_PROGRAM);
+ address_space& space = cpu->memory().space(AS_PROGRAM);
m_slot = dynamic_cast<x68k_expansion_slot_device *>(owner());
memset(m_prom, 0x57, 16);
sprintf(mac+2, "\x1b%c%c%c", (num >> 16) & 0xff, (num >> 8) & 0xff, num & 0xff);
diff --git a/src/mess/machine/x68k_scsiext.c b/src/mess/machine/x68k_scsiext.c
index 4c207dd2906..650f3d2ace4 100644
--- a/src/mess/machine/x68k_scsiext.c
+++ b/src/mess/machine/x68k_scsiext.c
@@ -68,7 +68,7 @@ void x68k_scsiext_device::device_start()
device_t* cpu = machine().device("maincpu");
UINT8* ROM;
astring temp;
- address_space& space = *cpu->memory().space(AS_PROGRAM);
+ address_space& space = cpu->memory().space(AS_PROGRAM);
m_slot = dynamic_cast<x68k_expansion_slot_device *>(owner());
space.install_read_bank(0xea0020,0xea1fff,0,0,"scsi_ext");
space.unmap_write(0xea0020,0xea1fff,0,0);
diff --git a/src/mess/machine/z80ne.c b/src/mess/machine/z80ne.c
index 3a091eae72d..a5267656c26 100644
--- a/src/mess/machine/z80ne.c
+++ b/src/mess/machine/z80ne.c
@@ -172,7 +172,7 @@ DIRECT_UPDATE_MEMBER(z80ne_state::z80ne_nmi_delay_count)
if (!m_nmi_delay_counter)
{
- machine().device("z80ne")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), this));
+ machine().device("z80ne")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), this));
machine().device("z80ne")->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE);
}
return address;
@@ -184,7 +184,7 @@ DIRECT_UPDATE_MEMBER(z80ne_state::z80ne_nmi_delay_count)
*/
DIRECT_UPDATE_MEMBER(z80ne_state::z80ne_reset_delay_count)
{
- address_space &space = *machine().device("z80ne")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("z80ne")->memory().space(AS_PROGRAM);
/*
* TODO: when debugger is active, his memory access causes this callback
*
@@ -195,7 +195,7 @@ DIRECT_UPDATE_MEMBER(z80ne_state::z80ne_reset_delay_count)
if (!m_reset_delay_counter)
{
/* remove this callback */
- machine().device("z80ne")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), this));
+ machine().device("z80ne")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), this));
/* and switch to RAM bank at address 0x0000 */
membank( "bank1" )->set_entry( 0 ); /* RAM at 0x0000 (bank 1) */
}
@@ -213,7 +213,7 @@ static void reset_lx388(running_machine &machine)
static void reset_lx382_banking(running_machine &machine)
{
z80ne_state *state = machine.driver_data<z80ne_state>();
- address_space &space = *machine.device("z80ne")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("z80ne")->memory().space(AS_PROGRAM);
/* switch to ROM bank at address 0x0000 */
state->membank("bank1")->set_entry(1);
@@ -227,7 +227,7 @@ static void reset_lx382_banking(running_machine &machine)
static void reset_lx390_banking(running_machine &machine)
{
z80ne_state *state = machine.driver_data<z80ne_state>();
- address_space &space = *machine.device("z80ne")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("z80ne")->memory().space(AS_PROGRAM);
state->m_reset_delay_counter = 0;
switch (machine.root_device().ioport("CONFIG")->read() & 0x07) {
@@ -249,7 +249,7 @@ static void reset_lx390_banking(running_machine &machine)
state->membank("bank2")->set_entry(1); /* ep548 at 0x0400-0x3FFF */
state->membank("bank3")->set_entry(0); /* RAM at 0x8000 */
state->membank("bank4")->set_entry(0); /* RAM at 0xF000 */
- machine.device("z80ne")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), state));
+ machine.device("z80ne")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), state));
break;
case 0x03: /* EP390 Boot Loader for 5.5k floppy BASIC */
if (VERBOSE)
@@ -258,7 +258,7 @@ static void reset_lx390_banking(running_machine &machine)
state->membank("bank2")->set_entry(0); /* RAM at 0x0400-0x3FFF */
state->membank("bank3")->set_entry(0); /* RAM at 0x8000 */
state->membank("bank4")->set_entry(1); /* ep390 at 0xF000 */
- machine.device("z80ne")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), state));
+ machine.device("z80ne")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), state));
break;
case 0x04: /* EP1390 Boot Loader for NE DOS 1.0/1.5 */
if (VERBOSE)
@@ -267,7 +267,7 @@ static void reset_lx390_banking(running_machine &machine)
state->membank("bank2")->set_entry(0); /* RAM at 0x0400-0x3FFF */
state->membank("bank3")->set_entry(0); /* RAM at 0x8000 */
state->membank("bank4")->set_entry(2); /* ep1390 at 0xF000 */
- machine.device("z80ne")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), state));
+ machine.device("z80ne")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), state));
break;
case 0x05: /* EP2390 Boot Loader for NE DOS G.1 */
if (VERBOSE)
@@ -276,7 +276,7 @@ static void reset_lx390_banking(running_machine &machine)
state->membank("bank2")->set_entry(0); /* RAM at 0x0400-0x3FFF */
state->membank("bank3")->set_entry(0); /* RAM at 0x8000 */
state->membank("bank4")->set_entry(3); /* ep2390 at 0xF000 */
- machine.device("z80ne")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), state));
+ machine.device("z80ne")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_default), state));
break;
}
@@ -288,7 +288,7 @@ static void reset_lx390_banking(running_machine &machine)
MACHINE_RESET_MEMBER(z80ne_state,z80ne_base)
{
int i;
- address_space &space = *machine().device("z80ne")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("z80ne")->memory().space(AS_PROGRAM);
LOG(("In MACHINE_RESET z80ne_base\n"));
@@ -480,7 +480,7 @@ WRITE8_MEMBER(z80ne_state::lx383_w)
else
/* after writing to port 0xF8 and the first ~M1 cycles strike a NMI for single step execution */
m_nmi_delay_counter = 1;
- machine().device("z80ne")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_nmi_delay_count), this));
+ machine().device("z80ne")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(z80ne_state::z80ne_nmi_delay_count), this));
}
diff --git a/src/mess/machine/z88_flash.c b/src/mess/machine/z88_flash.c
index 593d3ef6441..51bcb1bf929 100644
--- a/src/mess/machine/z88_flash.c
+++ b/src/mess/machine/z88_flash.c
@@ -70,7 +70,7 @@ machine_config_constructor z88_1024k_flash_device::device_mconfig_additions() co
UINT8* z88_1024k_flash_device::get_cart_base()
{
- return (UINT8*)m_flash->space()->get_read_ptr(0);
+ return (UINT8*)m_flash->space().get_read_ptr(0);
}
/*-------------------------------------------------
diff --git a/src/mess/machine/zx.c b/src/mess/machine/zx.c
index adb15f86cc8..c4246ad570b 100644
--- a/src/mess/machine/zx.c
+++ b/src/mess/machine/zx.c
@@ -44,7 +44,7 @@ READ8_MEMBER( zx_state::zx_ram_r )
DRIVER_INIT_MEMBER(zx_state,zx)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
space.install_read_bank(0x4000, 0x4000 + machine().device<ram_device>(RAM_TAG)->size() - 1, "bank1");
space.install_write_handler(0x4000, 0x4000 + machine().device<ram_device>(RAM_TAG)->size() - 1, write8_delegate(FUNC(zx_state::zx_ram_w),this));
@@ -74,19 +74,19 @@ DIRECT_UPDATE_MEMBER(zx_state::pow3000_setdirect)
void zx_state::machine_reset()
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(zx_state::zx_setdirect), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(zx_state::zx_setdirect), this));
m_tape_bit = 0x80;
}
MACHINE_RESET_MEMBER(zx_state,pow3000)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(zx_state::pow3000_setdirect), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(zx_state::pow3000_setdirect), this));
m_tape_bit = 0x80;
}
MACHINE_RESET_MEMBER(zx_state,pc8300)
{
- machine().device("maincpu")->memory().space(AS_PROGRAM)->set_direct_update_handler(direct_update_delegate(FUNC(zx_state::pc8300_setdirect), this));
+ machine().device("maincpu")->memory().space(AS_PROGRAM).set_direct_update_handler(direct_update_delegate(FUNC(zx_state::pc8300_setdirect), this));
m_tape_bit = 0x80;
}
@@ -354,7 +354,7 @@ WRITE8_MEMBER( zx_state::zx80_io_w )
WRITE8_MEMBER( zx_state::zx81_io_w )
{
- address_space *mem = machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &mem = machine().device("maincpu")->memory().space(AS_PROGRAM);
/* port F5 = unknown, pc8300/pow3000/lambda only
F6 = unknown, pc8300/pow3000/lambda only
FB = write data to printer, not emulated
@@ -385,7 +385,7 @@ WRITE8_MEMBER( zx_state::zx81_io_w )
zx_ula_bkgnd(1);
if (m_ula_frame_vsync == 2)
{
- mem->device().execute().spin_until_time(machine().primary_screen->time_until_pos(height - 1, 0));
+ mem.device().execute().spin_until_time(machine().primary_screen->time_until_pos(height - 1, 0));
m_ula_scanline_count = height - 1;
logerror ("S: %d B: %d\n", machine().primary_screen->vpos(), machine().primary_screen->hpos());
}
diff --git a/src/mess/video/a7800.c b/src/mess/video/a7800.c
index ddbd97463d2..e5e3397fd82 100644
--- a/src/mess/video/a7800.c
+++ b/src/mess/video/a7800.c
@@ -86,7 +86,7 @@ void a7800_state::video_start()
static void maria_draw_scanline(running_machine &machine)
{
a7800_state *state = machine.driver_data<a7800_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
unsigned int graph_adr,data_addr;
int width,hpos,pal,mode,ind;
unsigned int dl;
@@ -321,7 +321,7 @@ TIMER_DEVICE_CALLBACK( a7800_interrupt )
a7800_state *state = timer.machine().driver_data<a7800_state>();
int frame_scanline;
UINT8 *ROM = timer.machine().root_device().memregion("maincpu")->base();
- address_space& space = *timer.machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = timer.machine().device("maincpu")->memory().space(AS_PROGRAM);
state->m_maria_scanline++;
diff --git a/src/mess/video/ac1.c b/src/mess/video/ac1.c
index 74effeeb62c..e3c10b7e869 100644
--- a/src/mess/video/ac1.c
+++ b/src/mess/video/ac1.c
@@ -29,7 +29,7 @@ void ac1_state::video_start()
UINT32 ac1_state::screen_update_ac1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int x,y;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
for(y = 0; y < 16; y++ )
{
@@ -45,7 +45,7 @@ UINT32 ac1_state::screen_update_ac1(screen_device &screen, bitmap_ind16 &bitmap,
UINT32 ac1_state::screen_update_ac1_32(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int x,y;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
for(y = 0; y < 32; y++ )
{
diff --git a/src/mess/video/apple3.c b/src/mess/video/apple3.c
index c4b0b0f6ccf..68b08bee1fc 100644
--- a/src/mess/video/apple3.c
+++ b/src/mess/video/apple3.c
@@ -40,7 +40,7 @@ static const UINT32 text_map[] =
void apple3_write_charmem(running_machine &machine)
{
apple3_state *state = machine.driver_data<apple3_state>();
- address_space& space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM);
static const UINT32 screen_hole_map[] =
{
0x478, 0x4f8, 0x578, 0x5f8, 0x678, 0x6f8, 0x778, 0x7f8
diff --git a/src/mess/video/atarist.c b/src/mess/video/atarist.c
index b06e206b1da..13904018fb5 100644
--- a/src/mess/video/atarist.c
+++ b/src/mess/video/atarist.c
@@ -180,8 +180,8 @@ static TIMER_CALLBACK( atarist_shifter_tick )
inline void st_state::shifter_load()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
- UINT16 data = program->read_word(m_shifter_ofs);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
+ UINT16 data = program.read_word(m_shifter_ofs);
m_shifter_ir[m_shifter_bitplane] = data;
m_shifter_bitplane++;
@@ -619,8 +619,8 @@ WRITE8_MEMBER( ste_state::shifter_pixelofs_w )
void st_state::blitter_source()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
- UINT16 data = program->read_word(m_blitter_src);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
+ UINT16 data = program.read_word(m_blitter_src);
if (m_blitter_src_inc_x < 0)
{
@@ -669,9 +669,9 @@ UINT16 st_state::blitter_hop()
void st_state::blitter_op(UINT16 s, UINT32 dstaddr, UINT16 mask)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
- UINT16 d = program->read_word(dstaddr);
+ UINT16 d = program.read_word(dstaddr);
UINT16 result = 0;
if (m_blitter_op & 0x08) result = (~s & ~d);
@@ -679,7 +679,7 @@ void st_state::blitter_op(UINT16 s, UINT32 dstaddr, UINT16 mask)
if (m_blitter_op & 0x02) result |= (s & ~d);
if (m_blitter_op & 0x01) result |= (s & d);
- program->write_word(dstaddr, result);
+ program.write_word(dstaddr, result);
}
diff --git a/src/mess/video/cirrus.c b/src/mess/video/cirrus.c
index 16c4d71ba41..b2e43c84069 100644
--- a/src/mess/video/cirrus.c
+++ b/src/mess/video/cirrus.c
@@ -163,7 +163,7 @@ const struct pc_svga_interface cirrus_svga_interface =
void cirrus_device::device_start()
{
pc_vga_init(machine(), NULL, &cirrus_svga_interface);
- pc_vga_io_init(machine(), *machine().device("ppc1")->memory().space(AS_PROGRAM), 0xC00A0000, *machine().device("ppc1")->memory().space(AS_PROGRAM), 0x80000000);
+ pc_vga_io_init(machine(), machine().device("ppc1")->memory().space(AS_PROGRAM), 0xC00A0000, machine().device("ppc1")->memory().space(AS_PROGRAM), 0x80000000);
}
//-------------------------------------------------
diff --git a/src/mess/video/dai.c b/src/mess/video/dai.c
index 43340b568ea..b42f0b61a2a 100644
--- a/src/mess/video/dai.c
+++ b/src/mess/video/dai.c
@@ -57,7 +57,7 @@ void dai_state::video_start()
UINT32 dai_state::screen_update_dai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int i, j, k, l;
UINT8* char_rom = memregion("gfx1")->base();
diff --git a/src/mess/video/ef9345.c b/src/mess/video/ef9345.c
index df9686dc96e..a065a4da6d3 100644
--- a/src/mess/video/ef9345.c
+++ b/src/mess/video/ef9345.c
@@ -140,7 +140,7 @@ void ef9345_device::device_start()
m_busy_timer = timer_alloc(BUSY_TIMER);
m_blink_timer = timer_alloc(BLINKING_TIMER);
- m_videoram = space(0);
+ m_videoram = &space(0);
m_charset = region();
m_screen_out.allocate(496, m_screen->height());
diff --git a/src/mess/video/galaxy.c b/src/mess/video/galaxy.c
index eaef0105ca9..f3add79782c 100644
--- a/src/mess/video/galaxy.c
+++ b/src/mess/video/galaxy.c
@@ -16,7 +16,7 @@
static TIMER_CALLBACK( gal_video )
{
galaxy_state *state = machine.driver_data<galaxy_state>();
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
int y, x;
if (state->m_interrupts_enabled == TRUE)
{
diff --git a/src/mess/video/gb.c b/src/mess/video/gb.c
index 7adbd2ef0e9..0cfc406e6d5 100644
--- a/src/mess/video/gb.c
+++ b/src/mess/video/gb.c
@@ -1222,7 +1222,7 @@ void gb_video_reset( running_machine &machine, int mode )
gb_state *state = machine.driver_data<gb_state>();
int i;
int vram_size = 0x2000;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
emu_timer *old_timer = state->m_lcd.lcd_timer;
memset( &state->m_lcd, 0, sizeof(state->m_lcd) );
@@ -1332,7 +1332,7 @@ static void gbc_hdma(running_machine &machine, UINT16 length)
{
gb_state *state = machine.driver_data<gb_state>();
UINT16 src, dst;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
src = ((UINT16)HDMA1 << 8) | (HDMA2 & 0xF0);
dst = ((UINT16)(HDMA3 & 0x1F) << 8) | (HDMA4 & 0xF0);
diff --git a/src/mess/video/hd66421.c b/src/mess/video/hd66421.c
index 843b9ed66f1..f3c322f17da 100644
--- a/src/mess/video/hd66421.c
+++ b/src/mess/video/hd66421.c
@@ -92,7 +92,7 @@ const address_space_config *hd66421_device::memory_space_config(address_spacenum
inline UINT8 hd66421_device::readbyte(offs_t address)
{
- return space()->read_byte(address);
+ return space().read_byte(address);
}
@@ -102,7 +102,7 @@ inline UINT8 hd66421_device::readbyte(offs_t address)
inline void hd66421_device::writebyte(offs_t address, UINT8 data)
{
- space()->write_byte(address, data);
+ space().write_byte(address, data);
}
diff --git a/src/mess/video/hp48.c b/src/mess/video/hp48.c
index 463cc71be11..250f5e0b6e8 100644
--- a/src/mess/video/hp48.c
+++ b/src/mess/video/hp48.c
@@ -130,7 +130,7 @@ void hp48_state::palette_init()
UINT32 hp48_state::screen_update_hp48(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
hp48_state *state = machine().driver_data<hp48_state>();
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
int x, y, xp, i, addr;
int display = HP48_IO_4(0) >> 3; /* 1=on, 0=off */
int left_margin = HP48_IO_4(0) & 7; /* 0..7 pixels for main bitmap */
diff --git a/src/mess/video/iq151_grafik.c b/src/mess/video/iq151_grafik.c
index 26f96ee1fc7..c34d3cd0773 100644
--- a/src/mess/video/iq151_grafik.c
+++ b/src/mess/video/iq151_grafik.c
@@ -130,7 +130,7 @@ void iq151_grafik_device::io_read(offs_t offset, UINT8 &data)
{
if (offset >= 0xd0 && offset < 0xd4)
{
- address_space& space = *machine().device("maincpu")->memory().space(AS_IO);
+ address_space& space = machine().device("maincpu")->memory().space(AS_IO);
data = m_ppi8255->read(space, offset & 3);
}
else if (offset == 0xd4)
@@ -150,7 +150,7 @@ void iq151_grafik_device::io_write(offs_t offset, UINT8 data)
{
if (offset >= 0xd0 && offset < 0xd4)
{
- address_space& space = *machine().device("maincpu")->memory().space(AS_IO);
+ address_space& space = machine().device("maincpu")->memory().space(AS_IO);
m_ppi8255->write(space, offset & 3, data);
}
else if (offset == 0xd4)
diff --git a/src/mess/video/irisha.c b/src/mess/video/irisha.c
index 854c4ce742b..0c04cd1e4ea 100644
--- a/src/mess/video/irisha.c
+++ b/src/mess/video/irisha.c
@@ -20,7 +20,7 @@ UINT32 irisha_state::screen_update_irisha(screen_device &screen, bitmap_ind16 &b
UINT8 code1; //, code2;
UINT8 col;
int y, x, b;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
// draw image
for (y = 0; y < 200; y++)
diff --git a/src/mess/video/isa_cga.c b/src/mess/video/isa_cga.c
index 24399eb247a..07bdd376c7f 100644
--- a/src/mess/video/isa_cga.c
+++ b/src/mess/video/isa_cga.c
@@ -1595,9 +1595,9 @@ WRITE8_MEMBER( isa8_cga_device::io_write )
// TODO: This should be moved to card implementations that actually had this feature
m_p3df = data;
if (data & 1) {
- address_space *space_prg = machine().firstcpu->space(AS_PROGRAM);
+ address_space &space_prg = machine().firstcpu->space(AS_PROGRAM);
- space_prg->install_readwrite_handler(0xb8000, 0xb87ff, read8_delegate( FUNC(isa8_cga_device::char_ram_read), this), write8_delegate(FUNC(isa8_cga_device::char_ram_write), this) );
+ space_prg.install_readwrite_handler(0xb8000, 0xb87ff, read8_delegate( FUNC(isa8_cga_device::char_ram_read), this), write8_delegate(FUNC(isa8_cga_device::char_ram_write), this) );
} else {
m_isa->install_bank(0xb8000, 0xb8000 + MIN(0x8000,m_vram_size) - 1, 0, m_vram_size & 0x4000, "bank_cga", m_vram);
}
@@ -2013,7 +2013,7 @@ void isa8_cga_pc1512_device::device_start()
m_isa->install_device(0x3d0, 0x3df, 0, 0, read8_delegate( FUNC(isa8_cga_pc1512_device::io_read), this ), write8_delegate( FUNC(isa8_cga_pc1512_device::io_write), this ) );
m_isa->install_bank(0xb8000, 0xbbfff, 0, 0, "bank1", m_vram);
- address_space &space = *machine().firstcpu->space( AS_PROGRAM );
+ address_space &space = machine().firstcpu->space( AS_PROGRAM );
space.install_write_handler( 0xb8000, 0xbbfff, 0, 0x0C000, write8_delegate( FUNC(isa8_cga_pc1512_device::vram_w), this ) );
}
diff --git a/src/mess/video/kramermc.c b/src/mess/video/kramermc.c
index 0335a26b3a2..1b9910c8825 100644
--- a/src/mess/video/kramermc.c
+++ b/src/mess/video/kramermc.c
@@ -30,7 +30,7 @@ void kramermc_state::video_start()
UINT32 kramermc_state::screen_update_kramermc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
int x,y;
- address_space &space = *machine().device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine().device("maincpu")->memory().space(AS_PROGRAM);
for(y = 0; y < 16; y++ )
{
diff --git a/src/mess/video/mos6566.c b/src/mess/video/mos6566.c
index ed03f97b216..706e3119718 100644
--- a/src/mess/video/mos6566.c
+++ b/src/mess/video/mos6566.c
@@ -280,14 +280,14 @@ inline void mos6566_device::vic2_clear_interrupt( int mask )
inline UINT8 mos6566_device::read_videoram(offs_t offset)
{
- m_last_data = space(AS_0)->read_byte(offset & 0x3fff);
+ m_last_data = space(AS_0).read_byte(offset & 0x3fff);
return m_last_data;
}
inline UINT8 mos6566_device::read_colorram(offs_t offset)
{
- return space(AS_1)->read_byte(offset & 0x3ff);
+ return space(AS_1).read_byte(offset & 0x3ff);
}
// Idle access
diff --git a/src/mess/video/newbrain.c b/src/mess/video/newbrain.c
index fd74238d029..5bec32fd8ff 100644
--- a/src/mess/video/newbrain.c
+++ b/src/mess/video/newbrain.c
@@ -15,7 +15,7 @@ void newbrain_state::video_start()
void newbrain_state::screen_update(bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
int y, sx;
int columns = (m_tvctl & NEWBRAIN_VIDEO_80L) ? 80 : 40;
@@ -36,7 +36,7 @@ void newbrain_state::screen_update(bitmap_rgb32 &bitmap, const rectangle &clipre
{
int bit;
- UINT8 videoram_data = program->read_byte(videoram_addr + sx);
+ UINT8 videoram_data = program.read_byte(videoram_addr + sx);
UINT8 charrom_data;
if (gr)
diff --git a/src/mess/video/oric.c b/src/mess/video/oric.c
index 56248001860..4211b3e4e79 100644
--- a/src/mess/video/oric.c
+++ b/src/mess/video/oric.c
@@ -68,7 +68,7 @@ static void oric_vh_update_attribute(running_machine &machine, UINT8 c)
oric_state *state = machine.driver_data<oric_state>();
/* attribute */
UINT8 attribute = c & 0x03f;
- address_space &space = *machine.device("maincpu")->memory().space(AS_PROGRAM);
+ address_space &space = machine.device("maincpu")->memory().space(AS_PROGRAM);
switch ((attribute>>3) & 0x03)
{
@@ -213,7 +213,7 @@ UINT32 oric_state::screen_update_oric(screen_device &screen, bitmap_ind16 &bitma
}
/* fetch data */
- c = RAM ? RAM[read_addr] : machine().device("maincpu")->memory().space(AS_PROGRAM)->read_byte(read_addr);
+ c = RAM ? RAM[read_addr] : machine().device("maincpu")->memory().space(AS_PROGRAM).read_byte(read_addr);
/* if bits 6 and 5 are zero, the byte contains a serial attribute */
if ((c & ((1 << 6) | (1 << 5))) == 0)
diff --git a/src/mess/video/pc_aga.c b/src/mess/video/pc_aga.c
index 06cb047fa0d..d80917a7968 100644
--- a/src/mess/video/pc_aga.c
+++ b/src/mess/video/pc_aga.c
@@ -689,21 +689,21 @@ void pc_aga_set_mode(running_machine &machine, AGA_MODE mode)
VIDEO_START( pc_aga )
{
- address_space &space = *machine.firstcpu->space(AS_PROGRAM);
- address_space *spaceio = machine.firstcpu->space(AS_IO);
+ address_space &space = machine.firstcpu->space(AS_PROGRAM);
+ address_space &spaceio = machine.firstcpu->space(AS_IO);
int buswidth = machine.firstcpu->space_config(AS_PROGRAM)->m_databus_width;
switch(buswidth)
{
case 8:
space.install_legacy_readwrite_handler(0xb0000, 0xbffff, FUNC(pc200_videoram_r), FUNC(pc200_videoram_w) );
- spaceio->install_legacy_readwrite_handler(0x3b0, 0x3bf, FUNC(pc_aga_mda_r), FUNC(pc_aga_mda_w) );
- spaceio->install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_aga_cga_r), FUNC(pc_aga_cga_w) );
+ spaceio.install_legacy_readwrite_handler(0x3b0, 0x3bf, FUNC(pc_aga_mda_r), FUNC(pc_aga_mda_w) );
+ spaceio.install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_aga_cga_r), FUNC(pc_aga_cga_w) );
break;
case 16:
space.install_legacy_readwrite_handler(0xb0000, 0xbffff, FUNC(pc200_videoram_r), FUNC(pc200_videoram_w), 0xffff );
- spaceio->install_legacy_readwrite_handler(0x3b0, 0x3bf, FUNC(pc_aga_mda_r), FUNC(pc_aga_mda_w), 0xffff );
- spaceio->install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_aga_cga_r), FUNC(pc_aga_cga_w), 0xffff );
+ spaceio.install_legacy_readwrite_handler(0x3b0, 0x3bf, FUNC(pc_aga_mda_r), FUNC(pc_aga_mda_w), 0xffff );
+ spaceio.install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_aga_cga_r), FUNC(pc_aga_cga_w), 0xffff );
break;
default:
@@ -720,21 +720,21 @@ VIDEO_START( pc_aga )
VIDEO_START( pc200 )
{
- address_space &space = *machine.firstcpu->space(AS_PROGRAM);
- address_space *spaceio = machine.firstcpu->space(AS_IO);
+ address_space &space = machine.firstcpu->space(AS_PROGRAM);
+ address_space &spaceio = machine.firstcpu->space(AS_IO);
int buswidth = machine.firstcpu->space_config(AS_PROGRAM)->m_databus_width;
switch(buswidth)
{
case 8:
space.install_legacy_readwrite_handler(0xb0000, 0xbffff, FUNC(pc_aga_videoram_r), FUNC(pc_aga_videoram_w) );
- spaceio->install_legacy_readwrite_handler(0x3b0, 0x3bf, FUNC(pc_aga_mda_r), FUNC(pc_aga_mda_w) );
- spaceio->install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc200_cga_r), FUNC(pc200_cga_w) );
+ spaceio.install_legacy_readwrite_handler(0x3b0, 0x3bf, FUNC(pc_aga_mda_r), FUNC(pc_aga_mda_w) );
+ spaceio.install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc200_cga_r), FUNC(pc200_cga_w) );
break;
case 16:
space.install_legacy_readwrite_handler(0xb0000, 0xbffff, FUNC(pc_aga_videoram_r), FUNC(pc_aga_videoram_w), 0xffff );
- spaceio->install_legacy_readwrite_handler(0x3b0, 0x3bf, FUNC(pc_aga_mda_r), FUNC(pc_aga_mda_w), 0xffff );
- spaceio->install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc200_cga_r), FUNC(pc200_cga_w), 0xffff );
+ spaceio.install_legacy_readwrite_handler(0x3b0, 0x3bf, FUNC(pc_aga_mda_r), FUNC(pc_aga_mda_w), 0xffff );
+ spaceio.install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc200_cga_r), FUNC(pc200_cga_w), 0xffff );
break;
default:
diff --git a/src/mess/video/pc_t1t.c b/src/mess/video/pc_t1t.c
index c252c6962f7..30838395d38 100644
--- a/src/mess/video/pc_t1t.c
+++ b/src/mess/video/pc_t1t.c
@@ -922,8 +922,8 @@ static WRITE_LINE_DEVICE_HANDLER( pcjr_vsync_changed )
static VIDEO_START( pc_t1t )
{
int buswidth;
- address_space &space = *machine.firstcpu->space(AS_PROGRAM);
- address_space *spaceio = machine.firstcpu->space(AS_IO);
+ address_space &space = machine.firstcpu->space(AS_PROGRAM);
+ address_space &spaceio = machine.firstcpu->space(AS_IO);
pcjr.chr_gen = machine.root_device().memregion("gfx1")->base();
pcjr.update_row = NULL;
@@ -935,12 +935,12 @@ static VIDEO_START( pc_t1t )
{
case 8:
space.install_legacy_readwrite_handler(0xb8000, 0xbffff, FUNC(pc_t1t_videoram_r), FUNC(pc_t1t_videoram_w) );
- spaceio->install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_T1T_r),FUNC(pc_T1T_w) );
+ spaceio.install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_T1T_r),FUNC(pc_T1T_w) );
break;
case 16:
space.install_legacy_readwrite_handler(0xb8000, 0xbffff, FUNC(pc_t1t_videoram_r), FUNC(pc_t1t_videoram_w), 0xffff );
- spaceio->install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_T1T_r),FUNC(pc_T1T_w), 0xffff );
+ spaceio.install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_T1T_r),FUNC(pc_T1T_w), 0xffff );
break;
default:
@@ -953,7 +953,7 @@ static VIDEO_START( pc_t1t )
static VIDEO_START( pc_pcjr )
{
int buswidth;
- address_space *spaceio = machine.firstcpu->space(AS_IO);
+ address_space &spaceio = machine.firstcpu->space(AS_IO);
pcjr.chr_gen = machine.root_device().memregion("gfx1")->base();
pcjr.update_row = NULL;
@@ -965,7 +965,7 @@ static VIDEO_START( pc_pcjr )
switch(buswidth)
{
case 8:
- spaceio->install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_T1T_r),FUNC(pc_pcjr_w) );
+ spaceio.install_legacy_readwrite_handler(0x3d0, 0x3df, FUNC(pc_T1T_r),FUNC(pc_pcjr_w) );
break;
default:
diff --git a/src/mess/video/primo.c b/src/mess/video/primo.c
index 0263922ddca..417f550763d 100644
--- a/src/mess/video/primo.c
+++ b/src/mess/video/primo.c
@@ -23,7 +23,7 @@ static void primo_draw_scanline(running_machine &machine,bitmap_ind16 &bitmap, i
UINT16 *scanline = &bitmap.pix16(primo_scanline);
/* address of current line in Primo video memory */
- const UINT8* primo_video_ram_line = (const UINT8*)machine.device("maincpu")->memory().space(AS_PROGRAM)->get_read_ptr(state->m_video_memory_base + 32 * primo_scanline);
+ const UINT8* primo_video_ram_line = (const UINT8*)machine.device("maincpu")->memory().space(AS_PROGRAM).get_read_ptr(state->m_video_memory_base + 32 * primo_scanline);
for (x=0; x<256; x+=8)
{
diff --git a/src/mess/video/ti85.c b/src/mess/video/ti85.c
index b02851b671e..5793c6b7c54 100644
--- a/src/mess/video/ti85.c
+++ b/src/mess/video/ti85.c
@@ -149,7 +149,7 @@ void ti85_state::video_start()
UINT32 ti85_state::screen_update_ti85(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
- address_space &space = *m_maincpu->space(AS_PROGRAM);
+ address_space &space = m_maincpu->space(AS_PROGRAM);
int x,y,b;
int brightnes;
int lcdmem;
diff --git a/src/mess/video/tms3556.c b/src/mess/video/tms3556.c
index e7a0e10a8c0..66c6718c7b3 100644
--- a/src/mess/video/tms3556.c
+++ b/src/mess/video/tms3556.c
@@ -54,7 +54,7 @@ const address_space_config *tms3556_device::memory_space_config(address_spacenum
inline UINT8 tms3556_device::readbyte(offs_t address)
{
- return space()->read_byte(address);
+ return space().read_byte(address);
}
@@ -64,7 +64,7 @@ inline UINT8 tms3556_device::readbyte(offs_t address)
inline void tms3556_device::writebyte(offs_t address, UINT8 data)
{
- space()->write_byte(address, data);
+ space().write_byte(address, data);
}
diff --git a/src/mess/video/upd7220.c b/src/mess/video/upd7220.c
index df8fb2fd90e..bac7b7007a3 100644
--- a/src/mess/video/upd7220.c
+++ b/src/mess/video/upd7220.c
@@ -212,7 +212,7 @@ void upd7220_device::device_config_complete()
inline UINT8 upd7220_device::readbyte(offs_t address)
{
- return space()->read_byte(address);
+ return space().read_byte(address);
}
@@ -222,7 +222,7 @@ inline UINT8 upd7220_device::readbyte(offs_t address)
inline void upd7220_device::writebyte(offs_t address, UINT8 data)
{
- space()->write_byte(address, data);
+ space().write_byte(address, data);
}
diff --git a/src/mess/video/zx8301.c b/src/mess/video/zx8301.c
index 426f2202435..8314a768eca 100644
--- a/src/mess/video/zx8301.c
+++ b/src/mess/video/zx8301.c
@@ -103,7 +103,7 @@ void zx8301_device::device_config_complete()
inline UINT8 zx8301_device::readbyte(offs_t address)
{
- return space()->read_byte(address);
+ return space().read_byte(address);
}
@@ -113,7 +113,7 @@ inline UINT8 zx8301_device::readbyte(offs_t address)
inline void zx8301_device::writebyte(offs_t address, UINT8 data)
{
- space()->write_byte(address, data);
+ space().write_byte(address, data);
}