summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/emu/addrmap.c4
-rw-r--r--src/emu/addrmap.h6
-rw-r--r--src/emu/cpu/adsp2100/adsp2100.c6
-rw-r--r--src/emu/cpu/adsp2100/adsp2100.h6
-rw-r--r--src/emu/cpu/alph8201/alph8201.c18
-rw-r--r--src/emu/cpu/am29000/am29000.c18
-rw-r--r--src/emu/cpu/apexc/apexc.c18
-rw-r--r--src/emu/cpu/arm/arm.c18
-rw-r--r--src/emu/cpu/arm7/arm7.c20
-rw-r--r--src/emu/cpu/asap/asap.c2
-rw-r--r--src/emu/cpu/asap/asap.h2
-rw-r--r--src/emu/cpu/avr8/avr8.c18
-rw-r--r--src/emu/cpu/ccpu/ccpu.c18
-rw-r--r--src/emu/cpu/cop400/cop400.c74
-rw-r--r--src/emu/cpu/cosmac/cosmac.c2
-rw-r--r--src/emu/cpu/cosmac/cosmac.h2
-rw-r--r--src/emu/cpu/cp1610/cp1610.c18
-rw-r--r--src/emu/cpu/cubeqcpu/cubeqcpu.c54
-rw-r--r--src/emu/cpu/drcuml.c2
-rw-r--r--src/emu/cpu/drcumlsh.h8
-rw-r--r--src/emu/cpu/dsp16/dsp16.c2
-rw-r--r--src/emu/cpu/dsp16/dsp16.h2
-rw-r--r--src/emu/cpu/dsp32/dsp32.c2
-rw-r--r--src/emu/cpu/dsp32/dsp32.h2
-rw-r--r--src/emu/cpu/dsp56k/dsp56k.c26
-rw-r--r--src/emu/cpu/e132xs/e132xs.c114
-rw-r--r--src/emu/cpu/esrip/esrip.c18
-rw-r--r--src/emu/cpu/f8/f8.c18
-rw-r--r--src/emu/cpu/g65816/g65816.c18
-rw-r--r--src/emu/cpu/h6280/h6280.c20
-rw-r--r--src/emu/cpu/h83002/h8_16.c34
-rw-r--r--src/emu/cpu/h83002/h8_8.c26
-rw-r--r--src/emu/cpu/hcd62121/hcd62121.c18
-rw-r--r--src/emu/cpu/hd61700/hd61700.h2
-rw-r--r--src/emu/cpu/hd6309/hd6309.c18
-rw-r--r--src/emu/cpu/i386/i386.c20
-rw-r--r--src/emu/cpu/i4004/i4004.c18
-rw-r--r--src/emu/cpu/i8008/i8008.c18
-rw-r--r--src/emu/cpu/i8085/i8085.c12
-rw-r--r--src/emu/cpu/i86/i286.c18
-rw-r--r--src/emu/cpu/i86/i86.c26
-rw-r--r--src/emu/cpu/i860/i860.c18
-rw-r--r--src/emu/cpu/i960/i960.c24
-rw-r--r--src/emu/cpu/jaguar/jaguar.c6
-rw-r--r--src/emu/cpu/konami/konami.c18
-rw-r--r--src/emu/cpu/lh5801/lh5801.c18
-rw-r--r--src/emu/cpu/lr35902/lr35902.c18
-rw-r--r--src/emu/cpu/m37710/m37710.c26
-rw-r--r--src/emu/cpu/m6502/m4510.c24
-rw-r--r--src/emu/cpu/m6502/m6502.c28
-rw-r--r--src/emu/cpu/m6502/m6509.c22
-rw-r--r--src/emu/cpu/m6502/m65ce02.c18
-rw-r--r--src/emu/cpu/m6800/m6800.c38
-rw-r--r--src/emu/cpu/m68000/m68kcpu.c30
-rw-r--r--src/emu/cpu/m6805/m6805.c22
-rw-r--r--src/emu/cpu/m6809/m6809.c18
-rw-r--r--src/emu/cpu/mb86233/mb86233.c18
-rw-r--r--src/emu/cpu/mb88xx/mb88xx.c62
-rw-r--r--src/emu/cpu/mc68hc11/mc68hc11.c18
-rw-r--r--src/emu/cpu/mcs48/mcs48.c46
-rw-r--r--src/emu/cpu/mcs51/mcs51.c56
-rw-r--r--src/emu/cpu/minx/minx.c18
-rw-r--r--src/emu/cpu/mips/mips3com.c12
-rw-r--r--src/emu/cpu/mips/mips3com.h2
-rw-r--r--src/emu/cpu/mips/mips3fe.c2
-rw-r--r--src/emu/cpu/mips/psx.c4
-rw-r--r--src/emu/cpu/mips/psx.h2
-rw-r--r--src/emu/cpu/mips/r3000.c18
-rw-r--r--src/emu/cpu/mn10200/mn10200.c18
-rw-r--r--src/emu/cpu/nec/nec.c22
-rw-r--r--src/emu/cpu/nec/v25.c26
-rw-r--r--src/emu/cpu/pdp1/pdp1.c18
-rw-r--r--src/emu/cpu/pdp1/tx0.c36
-rw-r--r--src/emu/cpu/pic16c5x/pic16c5x.c78
-rw-r--r--src/emu/cpu/pic16c62x/pic16c62x.c90
-rw-r--r--src/emu/cpu/powerpc/ppc.c38
-rw-r--r--src/emu/cpu/powerpc/ppc_mem.c4
-rw-r--r--src/emu/cpu/powerpc/ppccom.c20
-rw-r--r--src/emu/cpu/powerpc/ppccom.h2
-rw-r--r--src/emu/cpu/powerpc/ppcfe.c2
-rw-r--r--src/emu/cpu/pps4/pps4.c18
-rw-r--r--src/emu/cpu/rsp/rsp.c18
-rw-r--r--src/emu/cpu/rsp/rspdrc.c18
-rw-r--r--src/emu/cpu/s2650/s2650.c18
-rw-r--r--src/emu/cpu/saturn/saturn.c18
-rw-r--r--src/emu/cpu/sc61860/sc61860.c18
-rw-r--r--src/emu/cpu/scmp/scmp.c18
-rw-r--r--src/emu/cpu/se3208/se3208.c18
-rw-r--r--src/emu/cpu/sh2/sh2.c18
-rw-r--r--src/emu/cpu/sh2/sh2drc.c26
-rw-r--r--src/emu/cpu/sh4/sh4.c26
-rw-r--r--src/emu/cpu/sharc/sharc.c26
-rw-r--r--src/emu/cpu/sm8500/sm8500.c18
-rw-r--r--src/emu/cpu/spc700/spc700.c18
-rw-r--r--src/emu/cpu/ssem/ssem.c18
-rw-r--r--src/emu/cpu/ssp1601/ssp1601.c22
-rw-r--r--src/emu/cpu/superfx/superfx.c18
-rw-r--r--src/emu/cpu/t11/t11.c18
-rw-r--r--src/emu/cpu/tlcs90/tlcs90.c34
-rw-r--r--src/emu/cpu/tlcs900/tlcs900.c10
-rw-r--r--src/emu/cpu/tms0980/tms0980.c48
-rw-r--r--src/emu/cpu/tms32010/tms32010.c28
-rw-r--r--src/emu/cpu/tms32025/tms32025.c32
-rw-r--r--src/emu/cpu/tms32031/tms32031.c6
-rw-r--r--src/emu/cpu/tms32031/tms32031.h2
-rw-r--r--src/emu/cpu/tms32051/tms32051.c30
-rw-r--r--src/emu/cpu/tms34010/tms34010.c6
-rw-r--r--src/emu/cpu/tms57002/tms57002.c22
-rw-r--r--src/emu/cpu/tms7000/tms7000.c22
-rw-r--r--src/emu/cpu/tms9900/99xxcore.h20
-rw-r--r--src/emu/cpu/unsp/unsp.c18
-rwxr-xr-xsrc/emu/cpu/upd7725/upd7725.c2
-rwxr-xr-xsrc/emu/cpu/upd7725/upd7725.h2
-rw-r--r--src/emu/cpu/upd7810/upd7810.c18
-rw-r--r--src/emu/cpu/v30mz/v30mz.c18
-rw-r--r--src/emu/cpu/v60/v60.c24
-rw-r--r--src/emu/cpu/v810/v810.c18
-rw-r--r--src/emu/cpu/vtlb.c4
-rw-r--r--src/emu/cpu/vtlb.h2
-rw-r--r--src/emu/cpu/z180/z180.c14
-rw-r--r--src/emu/cpu/z8/z8.c28
-rw-r--r--src/emu/cpu/z80/z80.c12
-rw-r--r--src/emu/cpu/z8000/z8000.c26
-rw-r--r--src/emu/debug/debugcmd.c68
-rw-r--r--src/emu/debug/debugcpu.c47
-rw-r--r--src/emu/debug/debugcpu.h4
-rw-r--r--src/emu/debug/dvmemory.c2
-rw-r--r--src/emu/debug/express.c6
-rw-r--r--src/emu/debug/express.h14
-rw-r--r--src/emu/devcb.c16
-rw-r--r--src/emu/devcb.h2
-rw-r--r--src/emu/devcpu.c8
-rw-r--r--src/emu/devcpu.h46
-rw-r--r--src/emu/devlegcy.h2
-rw-r--r--src/emu/dimemory.c14
-rw-r--r--src/emu/dimemory.h37
-rw-r--r--src/emu/imagedev/snapquik.c2
-rw-r--r--src/emu/machine/at28c16.c4
-rw-r--r--src/emu/machine/at28c16.h2
-rw-r--r--src/emu/machine/eeprom.c6
-rw-r--r--src/emu/machine/eeprom.h2
-rw-r--r--src/emu/machine/er2055.c4
-rw-r--r--src/emu/machine/er2055.h2
-rw-r--r--src/emu/machine/i2cmem.c4
-rw-r--r--src/emu/machine/i2cmem.h2
-rw-r--r--src/emu/machine/idectrl.h2
-rw-r--r--src/emu/machine/intelfsh.c16
-rw-r--r--src/emu/machine/intelfsh.h2
-rw-r--r--src/emu/machine/latch8.c2
-rw-r--r--src/emu/machine/ldpr8210.c4
-rw-r--r--src/emu/machine/ldv1000.c4
-rw-r--r--src/emu/machine/ldvp931.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.c6
-rw-r--r--src/emu/machine/x2212.c6
-rw-r--r--src/emu/machine/x2212.h2
-rw-r--r--src/emu/memory.c14
-rw-r--r--src/emu/memory.h26
-rw-r--r--src/emu/sound/bsmt2000.c8
-rw-r--r--src/emu/sound/bsmt2000.h2
-rw-r--r--src/emu/sound/cdp1869.c4
-rw-r--r--src/emu/sound/cdp1869.h4
-rw-r--r--src/emu/sound/nes_apu.c2
-rw-r--r--src/emu/sound/okim6295.c4
-rw-r--r--src/emu/sound/okim6295.h2
-rw-r--r--src/emu/sound/okim9810.c4
-rw-r--r--src/emu/sound/okim9810.h2
-rw-r--r--src/emu/sound/scsp.c2
-rw-r--r--src/emu/video/pc_vga.c2
-rw-r--r--src/emu/video/pc_vga.h2
-rw-r--r--src/mame/audio/8080bw.c4
-rw-r--r--src/mame/audio/amiga.c2
-rw-r--r--src/mame/audio/atarijsa.c20
-rw-r--r--src/mame/audio/cage.c6
-rw-r--r--src/mame/audio/carnival.c4
-rw-r--r--src/mame/audio/cinemat.c6
-rw-r--r--src/mame/audio/dcs.c36
-rw-r--r--src/mame/audio/dkong.c12
-rw-r--r--src/mame/audio/exidy.c8
-rw-r--r--src/mame/audio/exidy440.c2
-rw-r--r--src/mame/audio/gottlieb.c6
-rw-r--r--src/mame/audio/harddriv.c4
-rw-r--r--src/mame/audio/hyprolyb.c4
-rw-r--r--src/mame/audio/irem.c8
-rw-r--r--src/mame/audio/jaguar.c2
-rw-r--r--src/mame/audio/jedi.c2
-rw-r--r--src/mame/audio/leland.c16
-rw-r--r--src/mame/audio/mario.c10
-rw-r--r--src/mame/audio/mcr.c12
-rw-r--r--src/mame/audio/n8080.c6
-rw-r--r--src/mame/audio/namco52.c2
-rw-r--r--src/mame/audio/namco54.c2
-rw-r--r--src/mame/audio/namcoc7x.c8
-rw-r--r--src/mame/audio/qix.c2
-rw-r--r--src/mame/audio/redalert.c6
-rw-r--r--src/mame/audio/scramble.c6
-rw-r--r--src/mame/audio/segag80r.c2
-rw-r--r--src/mame/audio/segasnd.c10
-rw-r--r--src/mame/audio/seibu.c16
-rw-r--r--src/mame/audio/t5182.c4
-rw-r--r--src/mame/audio/taito_en.c2
-rw-r--r--src/mame/audio/taito_zm.c4
-rw-r--r--src/mame/audio/timeplt.c4
-rw-r--r--src/mame/audio/williams.c18
-rw-r--r--src/mame/drivers/1942.c4
-rw-r--r--src/mame/drivers/1943.c6
-rw-r--r--src/mame/drivers/1945kiii.c2
-rw-r--r--src/mame/drivers/20pacgal.c4
-rw-r--r--src/mame/drivers/2mindril.c2
-rw-r--r--src/mame/drivers/39in1.c2
-rw-r--r--src/mame/drivers/3super8.c2
-rw-r--r--src/mame/drivers/40love.c6
-rw-r--r--src/mame/drivers/4enraya.c4
-rw-r--r--src/mame/drivers/4roses.c2
-rw-r--r--src/mame/drivers/5clown.c4
-rw-r--r--src/mame/drivers/8080bw.c52
-rw-r--r--src/mame/drivers/86lions.c2
-rw-r--r--src/mame/drivers/88games.c4
-rw-r--r--src/mame/drivers/ace.c2
-rw-r--r--src/mame/drivers/acefruit.c4
-rw-r--r--src/mame/drivers/acommand.c2
-rw-r--r--src/mame/drivers/actfancr.c10
-rw-r--r--src/mame/drivers/adp.c10
-rw-r--r--src/mame/drivers/aeroboto.c4
-rw-r--r--src/mame/drivers/aerofgt.c34
-rw-r--r--src/mame/drivers/airbustr.c14
-rw-r--r--src/mame/drivers/ajax.c6
-rw-r--r--src/mame/drivers/albazc.c2
-rw-r--r--src/mame/drivers/albazg.c4
-rw-r--r--src/mame/drivers/aleck64.c4
-rw-r--r--src/mame/drivers/alg.c8
-rw-r--r--src/mame/drivers/aliens.c4
-rw-r--r--src/mame/drivers/allied.c2
-rw-r--r--src/mame/drivers/alpha68k.c32
-rw-r--r--src/mame/drivers/alvg.c2
-rw-r--r--src/mame/drivers/amaticmg.c4
-rw-r--r--src/mame/drivers/ambush.c4
-rw-r--r--src/mame/drivers/ampoker2.c4
-rw-r--r--src/mame/drivers/amspdwy.c6
-rw-r--r--src/mame/drivers/angelkds.c8
-rw-r--r--src/mame/drivers/appoooh.c6
-rw-r--r--src/mame/drivers/aquarium.c6
-rw-r--r--src/mame/drivers/arabian.c6
-rw-r--r--src/mame/drivers/arcadecl.c2
-rw-r--r--src/mame/drivers/arcadia.c6
-rw-r--r--src/mame/drivers/argus.c14
-rw-r--r--src/mame/drivers/aristmk4.c4
-rw-r--r--src/mame/drivers/aristmk5.c2
-rw-r--r--src/mame/drivers/arkanoid.c18
-rw-r--r--src/mame/drivers/armedf.c24
-rw-r--r--src/mame/drivers/artmagic.c18
-rw-r--r--src/mame/drivers/ashnojoe.c6
-rw-r--r--src/mame/drivers/asterix.c4
-rw-r--r--src/mame/drivers/asteroid.c12
-rw-r--r--src/mame/drivers/astinvad.c8
-rw-r--r--src/mame/drivers/astrocde.c62
-rw-r--r--src/mame/drivers/astrocorp.c8
-rw-r--r--src/mame/drivers/astrof.c18
-rw-r--r--src/mame/drivers/asuka.c18
-rw-r--r--src/mame/drivers/atari_s1.c2
-rw-r--r--src/mame/drivers/atari_s2.c2
-rw-r--r--src/mame/drivers/atari_s3.c2
-rw-r--r--src/mame/drivers/atarifb.c8
-rw-r--r--src/mame/drivers/atarig1.c4
-rw-r--r--src/mame/drivers/atarig42.c2
-rw-r--r--src/mame/drivers/atarigt.c6
-rw-r--r--src/mame/drivers/atarigx2.c4
-rw-r--r--src/mame/drivers/atarisy1.c4
-rw-r--r--src/mame/drivers/atarisy2.c6
-rw-r--r--src/mame/drivers/atarisy4.c20
-rw-r--r--src/mame/drivers/ataxx.c44
-rw-r--r--src/mame/drivers/atetris.c4
-rw-r--r--src/mame/drivers/attckufo.c2
-rw-r--r--src/mame/drivers/atvtrack.c4
-rw-r--r--src/mame/drivers/avalnche.c4
-rw-r--r--src/mame/drivers/avt.c4
-rw-r--r--src/mame/drivers/aztarac.c4
-rw-r--r--src/mame/drivers/backfire.c4
-rw-r--r--src/mame/drivers/badlands.c8
-rw-r--r--src/mame/drivers/bagman.c10
-rw-r--r--src/mame/drivers/balsente.c24
-rw-r--r--src/mame/drivers/bankp.c4
-rw-r--r--src/mame/drivers/baraduke.c6
-rw-r--r--src/mame/drivers/bartop52.c2
-rw-r--r--src/mame/drivers/batman.c2
-rw-r--r--src/mame/drivers/battlane.c2
-rw-r--r--src/mame/drivers/battlera.c6
-rw-r--r--src/mame/drivers/battlex.c4
-rw-r--r--src/mame/drivers/battlnts.c4
-rw-r--r--src/mame/drivers/bbusters.c14
-rw-r--r--src/mame/drivers/beaminv.c4
-rw-r--r--src/mame/drivers/beathead.c2
-rw-r--r--src/mame/drivers/beezer.c4
-rw-r--r--src/mame/drivers/berzerk.c10
-rw-r--r--src/mame/drivers/bestleag.c2
-rw-r--r--src/mame/drivers/bfcobra.c6
-rw-r--r--src/mame/drivers/bfm_sc1.c6
-rw-r--r--src/mame/drivers/bfm_sc2.c8
-rw-r--r--src/mame/drivers/bfmsys85.c2
-rw-r--r--src/mame/drivers/big10.c4
-rw-r--r--src/mame/drivers/bigevglf.c12
-rw-r--r--src/mame/drivers/bigfghtr.c8
-rw-r--r--src/mame/drivers/bigstrkb.c2
-rw-r--r--src/mame/drivers/bingo.c2
-rw-r--r--src/mame/drivers/bingoc.c6
-rw-r--r--src/mame/drivers/bingor.c6
-rw-r--r--src/mame/drivers/bionicc.c4
-rw-r--r--src/mame/drivers/bishi.c2
-rw-r--r--src/mame/drivers/bking.c8
-rw-r--r--src/mame/drivers/blackt96.c4
-rw-r--r--src/mame/drivers/bladestl.c4
-rw-r--r--src/mame/drivers/blitz.c4
-rw-r--r--src/mame/drivers/blitz68k.c18
-rw-r--r--src/mame/drivers/blktiger.c12
-rw-r--r--src/mame/drivers/blmbycar.c4
-rw-r--r--src/mame/drivers/blockade.c4
-rw-r--r--src/mame/drivers/blockhl.c4
-rw-r--r--src/mame/drivers/blockout.c4
-rw-r--r--src/mame/drivers/bloodbro.c4
-rw-r--r--src/mame/drivers/blstroid.c2
-rw-r--r--src/mame/drivers/blueprnt.c4
-rw-r--r--src/mame/drivers/bmcbowl.c2
-rw-r--r--src/mame/drivers/bnstars.c4
-rw-r--r--src/mame/drivers/bogeyman.c2
-rw-r--r--src/mame/drivers/bombjack.c6
-rw-r--r--src/mame/drivers/boogwing.c4
-rw-r--r--src/mame/drivers/bottom9.c4
-rw-r--r--src/mame/drivers/boxer.c2
-rw-r--r--src/mame/drivers/brkthru.c6
-rw-r--r--src/mame/drivers/bsktball.c2
-rw-r--r--src/mame/drivers/btime.c30
-rw-r--r--src/mame/drivers/btoads.c6
-rw-r--r--src/mame/drivers/bublbobl.c20
-rw-r--r--src/mame/drivers/buggychl.c4
-rw-r--r--src/mame/drivers/buster.c2
-rw-r--r--src/mame/drivers/bwidow.c4
-rw-r--r--src/mame/drivers/bwing.c10
-rw-r--r--src/mame/drivers/by17.c2
-rw-r--r--src/mame/drivers/by35.c2
-rw-r--r--src/mame/drivers/by6803.c2
-rw-r--r--src/mame/drivers/by68701.c2
-rw-r--r--src/mame/drivers/byvid.c4
-rw-r--r--src/mame/drivers/bzone.c6
-rw-r--r--src/mame/drivers/cabal.c18
-rw-r--r--src/mame/drivers/cabaret.c4
-rw-r--r--src/mame/drivers/calchase.c4
-rw-r--r--src/mame/drivers/calomega.c8
-rw-r--r--src/mame/drivers/calorie.c8
-rw-r--r--src/mame/drivers/canyon.c2
-rw-r--r--src/mame/drivers/capbowl.c6
-rw-r--r--src/mame/drivers/capcom.c2
-rw-r--r--src/mame/drivers/cardline.c4
-rw-r--r--src/mame/drivers/carjmbre.c6
-rw-r--r--src/mame/drivers/carpolo.c2
-rw-r--r--src/mame/drivers/carrera.c4
-rw-r--r--src/mame/drivers/caswin.c4
-rw-r--r--src/mame/drivers/cave.c68
-rw-r--r--src/mame/drivers/cb2001.c4
-rw-r--r--src/mame/drivers/cball.c2
-rw-r--r--src/mame/drivers/cbasebal.c4
-rw-r--r--src/mame/drivers/cbuster.c4
-rw-r--r--src/mame/drivers/ccastles.c2
-rw-r--r--src/mame/drivers/cchance.c2
-rw-r--r--src/mame/drivers/cchasm.c6
-rw-r--r--src/mame/drivers/cclimber.c22
-rw-r--r--src/mame/drivers/cd32.c2
-rw-r--r--src/mame/drivers/cdi.c2
-rw-r--r--src/mame/drivers/centiped.c18
-rw-r--r--src/mame/drivers/chaknpop.c2
-rw-r--r--src/mame/drivers/cham24.c6
-rw-r--r--src/mame/drivers/champbas.c16
-rw-r--r--src/mame/drivers/champbwl.c2
-rw-r--r--src/mame/drivers/chanbara.c2
-rw-r--r--src/mame/drivers/changela.c4
-rw-r--r--src/mame/drivers/cheekyms.c4
-rw-r--r--src/mame/drivers/chihiro.c4
-rw-r--r--src/mame/drivers/chinagat.c14
-rw-r--r--src/mame/drivers/chinsan.c4
-rw-r--r--src/mame/drivers/chqflag.c4
-rw-r--r--src/mame/drivers/chsuper.c4
-rw-r--r--src/mame/drivers/cidelsa.c18
-rw-r--r--src/mame/drivers/cinemat.c30
-rw-r--r--src/mame/drivers/circus.c2
-rw-r--r--src/mame/drivers/circusc.c4
-rw-r--r--src/mame/drivers/cischeat.c36
-rw-r--r--src/mame/drivers/citycon.c4
-rw-r--r--src/mame/drivers/clayshoo.c4
-rw-r--r--src/mame/drivers/cliffhgr.c4
-rw-r--r--src/mame/drivers/cloak.c4
-rw-r--r--src/mame/drivers/cloud9.c2
-rw-r--r--src/mame/drivers/clshroad.c4
-rw-r--r--src/mame/drivers/cmmb.c2
-rw-r--r--src/mame/drivers/cninja.c20
-rw-r--r--src/mame/drivers/cntsteer.c10
-rw-r--r--src/mame/drivers/coinmstr.c10
-rw-r--r--src/mame/drivers/coinmvga.c4
-rw-r--r--src/mame/drivers/cojag.c32
-rw-r--r--src/mame/drivers/combatsc.c12
-rw-r--r--src/mame/drivers/comebaby.c2
-rw-r--r--src/mame/drivers/commando.c8
-rw-r--r--src/mame/drivers/compgolf.c2
-rw-r--r--src/mame/drivers/contra.c4
-rw-r--r--src/mame/drivers/coolpool.c16
-rw-r--r--src/mame/drivers/coolridr.c10
-rw-r--r--src/mame/drivers/cop01.c12
-rw-r--r--src/mame/drivers/copsnrob.c2
-rw-r--r--src/mame/drivers/corona.c32
-rw-r--r--src/mame/drivers/cosmic.c22
-rw-r--r--src/mame/drivers/cps1.c40
-rw-r--r--src/mame/drivers/cps2.c10
-rw-r--r--src/mame/drivers/cps3.c2
-rw-r--r--src/mame/drivers/crbaloon.c6
-rw-r--r--src/mame/drivers/crgolf.c6
-rw-r--r--src/mame/drivers/crimfght.c10
-rw-r--r--src/mame/drivers/crospang.c8
-rw-r--r--src/mame/drivers/crshrace.c6
-rw-r--r--src/mame/drivers/crystal.c10
-rw-r--r--src/mame/drivers/cshooter.c8
-rw-r--r--src/mame/drivers/csplayh5.c12
-rw-r--r--src/mame/drivers/cubeqst.c6
-rw-r--r--src/mame/drivers/cultures.c4
-rw-r--r--src/mame/drivers/cvs.c12
-rw-r--r--src/mame/drivers/cyberbal.c10
-rw-r--r--src/mame/drivers/cybertnk.c6
-rw-r--r--src/mame/drivers/cyclemb.c8
-rw-r--r--src/mame/drivers/d9final.c4
-rw-r--r--src/mame/drivers/dacholer.c8
-rw-r--r--src/mame/drivers/dai3wksi.c2
-rw-r--r--src/mame/drivers/dambustr.c2
-rw-r--r--src/mame/drivers/darius.c10
-rw-r--r--src/mame/drivers/darkhors.c10
-rw-r--r--src/mame/drivers/darkmist.c4
-rw-r--r--src/mame/drivers/darkseal.c4
-rw-r--r--src/mame/drivers/dassault.c10
-rw-r--r--src/mame/drivers/dblewing.c6
-rw-r--r--src/mame/drivers/dbz.c6
-rw-r--r--src/mame/drivers/dcheese.c4
-rw-r--r--src/mame/drivers/dcon.c2
-rw-r--r--src/mame/drivers/dday.c2
-rw-r--r--src/mame/drivers/ddayjlc.c4
-rw-r--r--src/mame/drivers/ddealer.c4
-rw-r--r--src/mame/drivers/ddenlovr.c74
-rw-r--r--src/mame/drivers/ddragon.c22
-rw-r--r--src/mame/drivers/ddragon3.c10
-rw-r--r--src/mame/drivers/ddribble.c6
-rw-r--r--src/mame/drivers/ddz.c2
-rw-r--r--src/mame/drivers/de_1.c2
-rw-r--r--src/mame/drivers/de_2.c2
-rw-r--r--src/mame/drivers/de_3.c2
-rw-r--r--src/mame/drivers/de_3b.c2
-rw-r--r--src/mame/drivers/deadang.c8
-rw-r--r--src/mame/drivers/dec0.c30
-rw-r--r--src/mame/drivers/dec8.c40
-rw-r--r--src/mame/drivers/deco156.c4
-rw-r--r--src/mame/drivers/deco32.c22
-rw-r--r--src/mame/drivers/deco_ld.c8
-rw-r--r--src/mame/drivers/deco_mlc.c4
-rw-r--r--src/mame/drivers/decocass.c14
-rw-r--r--src/mame/drivers/deniam.c8
-rw-r--r--src/mame/drivers/deshoros.c2
-rw-r--r--src/mame/drivers/destroyr.c2
-rw-r--r--src/mame/drivers/dfruit.c4
-rw-r--r--src/mame/drivers/dgpix.c8
-rw-r--r--src/mame/drivers/dietgo.c4
-rw-r--r--src/mame/drivers/discoboy.c6
-rw-r--r--src/mame/drivers/diverboy.c4
-rw-r--r--src/mame/drivers/djboy.c14
-rw-r--r--src/mame/drivers/djmain.c2
-rw-r--r--src/mame/drivers/dkong.c28
-rw-r--r--src/mame/drivers/dlair.c6
-rw-r--r--src/mame/drivers/dmndrby.c4
-rw-r--r--src/mame/drivers/docastle.c16
-rw-r--r--src/mame/drivers/dogfgt.c4
-rw-r--r--src/mame/drivers/dominob.c4
-rw-r--r--src/mame/drivers/dooyong.c24
-rw-r--r--src/mame/drivers/dorachan.c4
-rw-r--r--src/mame/drivers/dotrikun.c4
-rw-r--r--src/mame/drivers/dragrace.c2
-rw-r--r--src/mame/drivers/dreamwld.c2
-rw-r--r--src/mame/drivers/drgnmst.c4
-rw-r--r--src/mame/drivers/dribling.c4
-rw-r--r--src/mame/drivers/drmicro.c4
-rw-r--r--src/mame/drivers/drtomy.c2
-rw-r--r--src/mame/drivers/drw80pkr.c4
-rw-r--r--src/mame/drivers/dunhuang.c4
-rw-r--r--src/mame/drivers/dwarfd.c8
-rw-r--r--src/mame/drivers/dynadice.c8
-rw-r--r--src/mame/drivers/dynax.c52
-rw-r--r--src/mame/drivers/dynduke.c6
-rw-r--r--src/mame/drivers/egghunt.c6
-rw-r--r--src/mame/drivers/embargo.c4
-rw-r--r--src/mame/drivers/enigma2.c8
-rw-r--r--src/mame/drivers/eolith.c12
-rw-r--r--src/mame/drivers/eolith16.c2
-rw-r--r--src/mame/drivers/epos.c8
-rw-r--r--src/mame/drivers/eprom.c10
-rw-r--r--src/mame/drivers/equites.c16
-rw-r--r--src/mame/drivers/ertictac.c2
-rw-r--r--src/mame/drivers/esd16.c12
-rw-r--r--src/mame/drivers/esh.c4
-rw-r--r--src/mame/drivers/espial.c8
-rw-r--r--src/mame/drivers/esripsys.c8
-rw-r--r--src/mame/drivers/ettrivia.c4
-rw-r--r--src/mame/drivers/exedexes.c4
-rw-r--r--src/mame/drivers/exerion.c4
-rw-r--r--src/mame/drivers/exidy.c20
-rw-r--r--src/mame/drivers/exidy440.c16
-rw-r--r--src/mame/drivers/expro02.c4
-rw-r--r--src/mame/drivers/exprraid.c10
-rw-r--r--src/mame/drivers/exterm.c8
-rw-r--r--src/mame/drivers/exzisus.c8
-rw-r--r--src/mame/drivers/f-32.c4
-rw-r--r--src/mame/drivers/f1gp.c14
-rw-r--r--src/mame/drivers/fantland.c18
-rw-r--r--src/mame/drivers/fastfred.c28
-rw-r--r--src/mame/drivers/fastlane.c2
-rw-r--r--src/mame/drivers/fcombat.c4
-rw-r--r--src/mame/drivers/fcrash.c6
-rw-r--r--src/mame/drivers/feversoc.c2
-rw-r--r--src/mame/drivers/fgoal.c2
-rw-r--r--src/mame/drivers/finalizr.c6
-rw-r--r--src/mame/drivers/firebeat.c10
-rw-r--r--src/mame/drivers/firefox.c4
-rw-r--r--src/mame/drivers/firetrap.c6
-rw-r--r--src/mame/drivers/firetrk.c6
-rw-r--r--src/mame/drivers/fitfight.c12
-rw-r--r--src/mame/drivers/flicker.c6
-rw-r--r--src/mame/drivers/flkatck.c4
-rw-r--r--src/mame/drivers/flower.c4
-rw-r--r--src/mame/drivers/flstory.c14
-rw-r--r--src/mame/drivers/flyball.c2
-rw-r--r--src/mame/drivers/foodf.c2
-rw-r--r--src/mame/drivers/forte2.c4
-rw-r--r--src/mame/drivers/fortecar.c4
-rw-r--r--src/mame/drivers/freekick.c14
-rw-r--r--src/mame/drivers/fromanc2.c14
-rw-r--r--src/mame/drivers/fromance.c14
-rw-r--r--src/mame/drivers/funkball.c4
-rw-r--r--src/mame/drivers/funkybee.c4
-rw-r--r--src/mame/drivers/funkyjet.c4
-rw-r--r--src/mame/drivers/funworld.c14
-rw-r--r--src/mame/drivers/funybubl.c6
-rw-r--r--src/mame/drivers/fuukifg2.c6
-rw-r--r--src/mame/drivers/fuukifg3.c6
-rw-r--r--src/mame/drivers/g627.c2
-rw-r--r--src/mame/drivers/gaelco.c10
-rw-r--r--src/mame/drivers/gaelco2.c12
-rw-r--r--src/mame/drivers/gaelco3d.c10
-rw-r--r--src/mame/drivers/gaiden.c22
-rw-r--r--src/mame/drivers/gal3.c10
-rw-r--r--src/mame/drivers/galaga.c22
-rw-r--r--src/mame/drivers/galastrm.c2
-rw-r--r--src/mame/drivers/galaxi.c2
-rw-r--r--src/mame/drivers/galaxia.c8
-rw-r--r--src/mame/drivers/galaxian.c126
-rw-r--r--src/mame/drivers/galaxold.c50
-rw-r--r--src/mame/drivers/galivan.c26
-rw-r--r--src/mame/drivers/galpani2.c14
-rw-r--r--src/mame/drivers/galpani3.c2
-rw-r--r--src/mame/drivers/galpanic.c12
-rw-r--r--src/mame/drivers/galspnbl.c4
-rw-r--r--src/mame/drivers/gamecstl.c4
-rw-r--r--src/mame/drivers/gameplan.c8
-rw-r--r--src/mame/drivers/gaplus.c8
-rw-r--r--src/mame/drivers/gatron.c4
-rw-r--r--src/mame/drivers/gauntlet.c6
-rw-r--r--src/mame/drivers/gberet.c6
-rw-r--r--src/mame/drivers/gbusters.c4
-rw-r--r--src/mame/drivers/gcpinbal.c2
-rw-r--r--src/mame/drivers/gei.c24
-rw-r--r--src/mame/drivers/ggconnie.c4
-rw-r--r--src/mame/drivers/ghosteo.c4
-rw-r--r--src/mame/drivers/gijoe.c4
-rw-r--r--src/mame/drivers/ginganin.c4
-rw-r--r--src/mame/drivers/gladiatr.c20
-rw-r--r--src/mame/drivers/glass.c2
-rw-r--r--src/mame/drivers/gng.c6
-rw-r--r--src/mame/drivers/go2000.c6
-rw-r--r--src/mame/drivers/goal92.c4
-rw-r--r--src/mame/drivers/goindol.c4
-rw-r--r--src/mame/drivers/goldngam.c4
-rw-r--r--src/mame/drivers/goldnpkr.c20
-rw-r--r--src/mame/drivers/goldstar.c72
-rw-r--r--src/mame/drivers/gomoku.c2
-rw-r--r--src/mame/drivers/good.c2
-rw-r--r--src/mame/drivers/goodejan.c8
-rw-r--r--src/mame/drivers/gotcha.c4
-rw-r--r--src/mame/drivers/gottlieb.c12
-rw-r--r--src/mame/drivers/gotya.c2
-rw-r--r--src/mame/drivers/gp_1.c2
-rw-r--r--src/mame/drivers/gp_2.c2
-rw-r--r--src/mame/drivers/gpworld.c4
-rw-r--r--src/mame/drivers/gradius3.c6
-rw-r--r--src/mame/drivers/grchamp.c10
-rw-r--r--src/mame/drivers/gridlee.c2
-rw-r--r--src/mame/drivers/groundfx.c4
-rw-r--r--src/mame/drivers/gstream.c6
-rw-r--r--src/mame/drivers/gstriker.c20
-rw-r--r--src/mame/drivers/gsword.c20
-rw-r--r--src/mame/drivers/gticlub.c10
-rw-r--r--src/mame/drivers/gts1.c2
-rw-r--r--src/mame/drivers/gts3.c2
-rw-r--r--src/mame/drivers/gts80.c2
-rw-r--r--src/mame/drivers/gts80a.c8
-rw-r--r--src/mame/drivers/gts80b.c2
-rw-r--r--src/mame/drivers/guab.c4
-rw-r--r--src/mame/drivers/gumbo.c6
-rw-r--r--src/mame/drivers/gunbustr.c4
-rw-r--r--src/mame/drivers/gundealr.c6
-rw-r--r--src/mame/drivers/gunpey.c4
-rw-r--r--src/mame/drivers/gunsmoke.c4
-rw-r--r--src/mame/drivers/gyruss.c12
-rw-r--r--src/mame/drivers/halleys.c8
-rw-r--r--src/mame/drivers/hanaawas.c4
-rw-r--r--src/mame/drivers/hankin.c2
-rw-r--r--src/mame/drivers/harddriv.c234
-rw-r--r--src/mame/drivers/hcastle.c4
-rw-r--r--src/mame/drivers/hexion.c2
-rw-r--r--src/mame/drivers/higemaru.c2
-rw-r--r--src/mame/drivers/highvdeo.c24
-rw-r--r--src/mame/drivers/hikaru.c4
-rw-r--r--src/mame/drivers/himesiki.c8
-rw-r--r--src/mame/drivers/hitme.c4
-rw-r--r--src/mame/drivers/hitpoker.c4
-rw-r--r--src/mame/drivers/hnayayoi.c10
-rw-r--r--src/mame/drivers/hng64.c8
-rw-r--r--src/mame/drivers/holeland.c6
-rw-r--r--src/mame/drivers/homedata.c36
-rw-r--r--src/mame/drivers/homerun.c4
-rw-r--r--src/mame/drivers/hornet.c10
-rw-r--r--src/mame/drivers/hotblock.c4
-rw-r--r--src/mame/drivers/hotstuff.c2
-rw-r--r--src/mame/drivers/hshavoc.c2
-rw-r--r--src/mame/drivers/hvyunit.c14
-rw-r--r--src/mame/drivers/hyhoo.c4
-rw-r--r--src/mame/drivers/hyperspt.c8
-rw-r--r--src/mame/drivers/hyprduel.c16
-rw-r--r--src/mame/drivers/icecold.c2
-rw-r--r--src/mame/drivers/igs009.c4
-rw-r--r--src/mame/drivers/igs011.c22
-rw-r--r--src/mame/drivers/igs017.c10
-rw-r--r--src/mame/drivers/igs_m027.c2
-rw-r--r--src/mame/drivers/igspoker.c8
-rw-r--r--src/mame/drivers/ikki.c4
-rw-r--r--src/mame/drivers/imolagp.c8
-rw-r--r--src/mame/drivers/inder.c2
-rw-r--r--src/mame/drivers/intrscti.c4
-rw-r--r--src/mame/drivers/inufuku.c6
-rw-r--r--src/mame/drivers/iqblock.c8
-rw-r--r--src/mame/drivers/irobot.c2
-rw-r--r--src/mame/drivers/ironhors.c12
-rw-r--r--src/mame/drivers/istellar.c12
-rw-r--r--src/mame/drivers/itech32.c60
-rw-r--r--src/mame/drivers/itech8.c52
-rw-r--r--src/mame/drivers/itgambl2.c2
-rw-r--r--src/mame/drivers/itgambl3.c2
-rw-r--r--src/mame/drivers/itgamble.c2
-rw-r--r--src/mame/drivers/jack.c14
-rw-r--r--src/mame/drivers/jackal.c4
-rw-r--r--src/mame/drivers/jackie.c4
-rw-r--r--src/mame/drivers/jackpool.c2
-rw-r--r--src/mame/drivers/jailbrek.c2
-rw-r--r--src/mame/drivers/jalmah.c24
-rw-r--r--src/mame/drivers/jangou.c26
-rw-r--r--src/mame/drivers/jantotsu.c4
-rw-r--r--src/mame/drivers/jchan.c8
-rw-r--r--src/mame/drivers/jedi.c2
-rw-r--r--src/mame/drivers/jokrwild.c2
-rw-r--r--src/mame/drivers/jollyjgr.c4
-rw-r--r--src/mame/drivers/jongkyo.c4
-rw-r--r--src/mame/drivers/jp.c2
-rw-r--r--src/mame/drivers/jpmimpct.c6
-rw-r--r--src/mame/drivers/jpmsys5.c2
-rw-r--r--src/mame/drivers/jrpacman.c4
-rw-r--r--src/mame/drivers/jubilee.c4
-rw-r--r--src/mame/drivers/junofrst.c8
-rw-r--r--src/mame/drivers/jvh.c2
-rw-r--r--src/mame/drivers/kaneko16.c36
-rw-r--r--src/mame/drivers/kangaroo.c8
-rw-r--r--src/mame/drivers/karnov.c4
-rw-r--r--src/mame/drivers/kchamp.c18
-rw-r--r--src/mame/drivers/kickgoal.c6
-rw-r--r--src/mame/drivers/kingdrby.c18
-rw-r--r--src/mame/drivers/kingobox.c18
-rw-r--r--src/mame/drivers/kingpin.c6
-rw-r--r--src/mame/drivers/kinst.c2
-rw-r--r--src/mame/drivers/kissproto.c2
-rw-r--r--src/mame/drivers/klax.c2
-rw-r--r--src/mame/drivers/kncljoe.c6
-rw-r--r--src/mame/drivers/koftball.c2
-rw-r--r--src/mame/drivers/koikoi.c4
-rw-r--r--src/mame/drivers/konamigq.c4
-rw-r--r--src/mame/drivers/konamigv.c32
-rw-r--r--src/mame/drivers/konamigx.c28
-rw-r--r--src/mame/drivers/konamim2.c2
-rw-r--r--src/mame/drivers/kongambl.c4
-rw-r--r--src/mame/drivers/kopunch.c4
-rw-r--r--src/mame/drivers/ksayakyu.c4
-rw-r--r--src/mame/drivers/ksys573.c18
-rw-r--r--src/mame/drivers/kungfur.c2
-rw-r--r--src/mame/drivers/kyugo.c16
-rw-r--r--src/mame/drivers/labyrunr.c2
-rw-r--r--src/mame/drivers/ladybug.c10
-rw-r--r--src/mame/drivers/ladyfrog.c4
-rw-r--r--src/mame/drivers/laserbas.c4
-rw-r--r--src/mame/drivers/laserbat.c8
-rw-r--r--src/mame/drivers/lasso.c20
-rw-r--r--src/mame/drivers/lastbank.c4
-rw-r--r--src/mame/drivers/lastduel.c8
-rw-r--r--src/mame/drivers/lastfght.c2
-rw-r--r--src/mame/drivers/lazercmd.c8
-rw-r--r--src/mame/drivers/legionna.c18
-rw-r--r--src/mame/drivers/leland.c72
-rw-r--r--src/mame/drivers/lemmings.c4
-rw-r--r--src/mame/drivers/lethal.c4
-rw-r--r--src/mame/drivers/lethalj.c8
-rw-r--r--src/mame/drivers/lgp.c8
-rw-r--r--src/mame/drivers/liberate.c30
-rw-r--r--src/mame/drivers/liberatr.c4
-rw-r--r--src/mame/drivers/limenko.c18
-rw-r--r--src/mame/drivers/littlerb.c6
-rw-r--r--src/mame/drivers/lkage.c14
-rw-r--r--src/mame/drivers/lockon.c26
-rw-r--r--src/mame/drivers/looping.c16
-rw-r--r--src/mame/drivers/lordgun.c10
-rw-r--r--src/mame/drivers/lsasquad.c12
-rw-r--r--src/mame/drivers/ltcasino.c2
-rw-r--r--src/mame/drivers/ltd.c2
-rw-r--r--src/mame/drivers/luckgrln.c4
-rw-r--r--src/mame/drivers/lucky74.c4
-rw-r--r--src/mame/drivers/lvcards.c8
-rw-r--r--src/mame/drivers/lwings.c16
-rw-r--r--src/mame/drivers/m10.c6
-rw-r--r--src/mame/drivers/m107.c10
-rw-r--r--src/mame/drivers/m14.c4
-rw-r--r--src/mame/drivers/m52.c6
-rw-r--r--src/mame/drivers/m57.c2
-rw-r--r--src/mame/drivers/m58.c2
-rw-r--r--src/mame/drivers/m62.c38
-rw-r--r--src/mame/drivers/m63.c8
-rw-r--r--src/mame/drivers/m72.c76
-rw-r--r--src/mame/drivers/m79amb.c2
-rw-r--r--src/mame/drivers/m90.c16
-rw-r--r--src/mame/drivers/m92.c12
-rw-r--r--src/mame/drivers/macrossp.c8
-rw-r--r--src/mame/drivers/macs.c4
-rw-r--r--src/mame/drivers/madalien.c4
-rw-r--r--src/mame/drivers/madmotor.c4
-rw-r--r--src/mame/drivers/magic10.c10
-rw-r--r--src/mame/drivers/magicard.c2
-rw-r--r--src/mame/drivers/magicfly.c2
-rw-r--r--src/mame/drivers/magictg.c2
-rw-r--r--src/mame/drivers/magmax.c6
-rw-r--r--src/mame/drivers/magtouch.c6
-rw-r--r--src/mame/drivers/mainevt.c8
-rw-r--r--src/mame/drivers/mainsnk.c6
-rw-r--r--src/mame/drivers/malzak.c6
-rw-r--r--src/mame/drivers/mappy.c24
-rw-r--r--src/mame/drivers/marineb.c6
-rw-r--r--src/mame/drivers/marinedt.c4
-rw-r--r--src/mame/drivers/mario.c6
-rw-r--r--src/mame/drivers/markham.c4
-rw-r--r--src/mame/drivers/mastboy.c4
-rw-r--r--src/mame/drivers/matmania.c10
-rw-r--r--src/mame/drivers/maxaflex.c4
-rw-r--r--src/mame/drivers/maygay1b.c2
-rw-r--r--src/mame/drivers/maygayv1.c8
-rw-r--r--src/mame/drivers/mayumi.c4
-rw-r--r--src/mame/drivers/mazerbla.c18
-rw-r--r--src/mame/drivers/mcatadv.c10
-rw-r--r--src/mame/drivers/mcr.c18
-rw-r--r--src/mame/drivers/mcr3.c42
-rw-r--r--src/mame/drivers/mcr68.c28
-rw-r--r--src/mame/drivers/meadows.c10
-rw-r--r--src/mame/drivers/mediagx.c6
-rw-r--r--src/mame/drivers/megadriv.c2
-rw-r--r--src/mame/drivers/megadrvb.c26
-rw-r--r--src/mame/drivers/megaplay.c10
-rw-r--r--src/mame/drivers/megasys1.c30
-rw-r--r--src/mame/drivers/megatech.c4
-rw-r--r--src/mame/drivers/megazone.c10
-rw-r--r--src/mame/drivers/meijinsn.c6
-rw-r--r--src/mame/drivers/mephisto.c2
-rw-r--r--src/mame/drivers/merit.c26
-rw-r--r--src/mame/drivers/meritm.c20
-rw-r--r--src/mame/drivers/mermaid.c4
-rw-r--r--src/mame/drivers/metalmx.c16
-rw-r--r--src/mame/drivers/metlclsh.c4
-rw-r--r--src/mame/drivers/metro.c66
-rw-r--r--src/mame/drivers/mexico86.c8
-rw-r--r--src/mame/drivers/mgolf.c2
-rw-r--r--src/mame/drivers/mhavoc.c6
-rw-r--r--src/mame/drivers/micro3d.c12
-rw-r--r--src/mame/drivers/micropin.c2
-rw-r--r--src/mame/drivers/midas.c4
-rw-r--r--src/mame/drivers/midqslvr.c4
-rw-r--r--src/mame/drivers/midtunit.c2
-rw-r--r--src/mame/drivers/midvunit.c30
-rw-r--r--src/mame/drivers/midwunit.c2
-rw-r--r--src/mame/drivers/midxunit.c2
-rw-r--r--src/mame/drivers/midyunit.c4
-rw-r--r--src/mame/drivers/midzeus.c12
-rw-r--r--src/mame/drivers/mikie.c4
-rw-r--r--src/mame/drivers/mil4000.c2
-rw-r--r--src/mame/drivers/miniboy7.c2
-rw-r--r--src/mame/drivers/minivadr.c2
-rw-r--r--src/mame/drivers/mirage.c4
-rw-r--r--src/mame/drivers/mirax.c4
-rw-r--r--src/mame/drivers/missb2.c6
-rw-r--r--src/mame/drivers/missile.c2
-rw-r--r--src/mame/drivers/mitchell.c24
-rw-r--r--src/mame/drivers/mjkjidai.c4
-rw-r--r--src/mame/drivers/mjsister.c4
-rw-r--r--src/mame/drivers/mlanding.c14
-rw-r--r--src/mame/drivers/model1.c10
-rw-r--r--src/mame/drivers/model2.c44
-rw-r--r--src/mame/drivers/model3.c106
-rw-r--r--src/mame/drivers/mogura.c4
-rw-r--r--src/mame/drivers/mole.c2
-rw-r--r--src/mame/drivers/momoko.c4
-rw-r--r--src/mame/drivers/monzagp.c4
-rw-r--r--src/mame/drivers/moo.c8
-rw-r--r--src/mame/drivers/mosaic.c8
-rw-r--r--src/mame/drivers/mouser.c8
-rw-r--r--src/mame/drivers/mpoker.c2
-rw-r--r--src/mame/drivers/mpu4.c10
-rw-r--r--src/mame/drivers/mpu4drvr.c16
-rw-r--r--src/mame/drivers/mpu5.c2
-rw-r--r--src/mame/drivers/mquake.c6
-rw-r--r--src/mame/drivers/mrdo.c2
-rw-r--r--src/mame/drivers/mrflea.c8
-rw-r--r--src/mame/drivers/mrgame.c2
-rw-r--r--src/mame/drivers/mrjong.c4
-rw-r--r--src/mame/drivers/ms32.c6
-rw-r--r--src/mame/drivers/msisaac.c4
-rw-r--r--src/mame/drivers/mugsmash.c4
-rw-r--r--src/mame/drivers/multfish.c6
-rw-r--r--src/mame/drivers/multigam.c68
-rw-r--r--src/mame/drivers/munchmo.c4
-rw-r--r--src/mame/drivers/murogem.c2
-rw-r--r--src/mame/drivers/murogmbl.c2
-rw-r--r--src/mame/drivers/mustache.c2
-rw-r--r--src/mame/drivers/mw18w.c4
-rw-r--r--src/mame/drivers/mw8080bw.c44
-rw-r--r--src/mame/drivers/mwarr.c2
-rw-r--r--src/mame/drivers/mystston.c2
-rw-r--r--src/mame/drivers/mystwarr.c14
-rw-r--r--src/mame/drivers/n8080.c6
-rw-r--r--src/mame/drivers/namcofl.c6
-rw-r--r--src/mame/drivers/namcona1.c10
-rw-r--r--src/mame/drivers/namconb1.c8
-rw-r--r--src/mame/drivers/namcond1.c6
-rw-r--r--src/mame/drivers/namcops2.c2
-rw-r--r--src/mame/drivers/namcos1.c10
-rw-r--r--src/mame/drivers/namcos10.c24
-rw-r--r--src/mame/drivers/namcos11.c44
-rw-r--r--src/mame/drivers/namcos12.c12
-rw-r--r--src/mame/drivers/namcos2.c36
-rw-r--r--src/mame/drivers/namcos21.c36
-rw-r--r--src/mame/drivers/namcos22.c48
-rw-r--r--src/mame/drivers/namcos23.c20
-rw-r--r--src/mame/drivers/namcos86.c8
-rw-r--r--src/mame/drivers/naomi.c8
-rw-r--r--src/mame/drivers/naughtyb.c12
-rw-r--r--src/mame/drivers/nbmj8688.c28
-rw-r--r--src/mame/drivers/nbmj8891.c48
-rw-r--r--src/mame/drivers/nbmj8900.c6
-rw-r--r--src/mame/drivers/nbmj8991.c30
-rw-r--r--src/mame/drivers/nbmj9195.c70
-rw-r--r--src/mame/drivers/nemesis.c28
-rw-r--r--src/mame/drivers/neodrvr.c16
-rw-r--r--src/mame/drivers/neogeo.c14
-rw-r--r--src/mame/drivers/neoprint.c8
-rw-r--r--src/mame/drivers/neptunp2.c4
-rw-r--r--src/mame/drivers/news.c2
-rw-r--r--src/mame/drivers/nightgal.c18
-rw-r--r--src/mame/drivers/ninjakd2.c14
-rw-r--r--src/mame/drivers/ninjaw.c10
-rw-r--r--src/mame/drivers/nitedrvr.c2
-rw-r--r--src/mame/drivers/niyanpai.c16
-rw-r--r--src/mame/drivers/nmg5.c10
-rw-r--r--src/mame/drivers/nmk16.c62
-rw-r--r--src/mame/drivers/norautp.c28
-rw-r--r--src/mame/drivers/nova2001.c16
-rw-r--r--src/mame/drivers/nsm.c2
-rw-r--r--src/mame/drivers/nsmpoker.c4
-rw-r--r--src/mame/drivers/nss.c8
-rw-r--r--src/mame/drivers/nwk-tr.c6
-rw-r--r--src/mame/drivers/nycaptor.c18
-rw-r--r--src/mame/drivers/nyny.c8
-rw-r--r--src/mame/drivers/offtwall.c14
-rw-r--r--src/mame/drivers/ohmygod.c2
-rw-r--r--src/mame/drivers/ojankohs.c14
-rw-r--r--src/mame/drivers/olibochu.c4
-rw-r--r--src/mame/drivers/omegrace.c10
-rw-r--r--src/mame/drivers/oneshot.c4
-rw-r--r--src/mame/drivers/onetwo.c8
-rw-r--r--src/mame/drivers/opwolf.c8
-rw-r--r--src/mame/drivers/orbit.c2
-rw-r--r--src/mame/drivers/othello.c10
-rw-r--r--src/mame/drivers/othldrby.c2
-rw-r--r--src/mame/drivers/othunder.c4
-rw-r--r--src/mame/drivers/overdriv.c6
-rw-r--r--src/mame/drivers/pachifev.c6
-rw-r--r--src/mame/drivers/pacland.c6
-rw-r--r--src/mame/drivers/pacman.c66
-rw-r--r--src/mame/drivers/pandoras.c10
-rw-r--r--src/mame/drivers/pangofun.c6
-rw-r--r--src/mame/drivers/panicr.c2
-rw-r--r--src/mame/drivers/paradise.c14
-rw-r--r--src/mame/drivers/paranoia.c12
-rw-r--r--src/mame/drivers/parodius.c4
-rw-r--r--src/mame/drivers/pasha2.c6
-rw-r--r--src/mame/drivers/pass.c6
-rw-r--r--src/mame/drivers/pastelg.c6
-rw-r--r--src/mame/drivers/pbaction.c8
-rw-r--r--src/mame/drivers/pcat_dyn.c6
-rw-r--r--src/mame/drivers/pcat_nit.c6
-rw-r--r--src/mame/drivers/pcktgal.c6
-rw-r--r--src/mame/drivers/pcxt.c6
-rw-r--r--src/mame/drivers/pengadvb.c28
-rw-r--r--src/mame/drivers/pengo.c6
-rw-r--r--src/mame/drivers/peplus.c4
-rw-r--r--src/mame/drivers/peyper.c4
-rw-r--r--src/mame/drivers/pgm.c52
-rw-r--r--src/mame/drivers/phoenix.c8
-rw-r--r--src/mame/drivers/photon.c4
-rw-r--r--src/mame/drivers/photon2.c4
-rw-r--r--src/mame/drivers/photoply.c4
-rw-r--r--src/mame/drivers/pingpong.c24
-rw-r--r--src/mame/drivers/pinkiri8.c16
-rw-r--r--src/mame/drivers/pipedrm.c16
-rw-r--r--src/mame/drivers/pipeline.c8
-rw-r--r--src/mame/drivers/pirates.c4
-rw-r--r--src/mame/drivers/pitnrun.c8
-rw-r--r--src/mame/drivers/pkscram.c2
-rw-r--r--src/mame/drivers/pktgaldx.c4
-rw-r--r--src/mame/drivers/play_1.c2
-rw-r--r--src/mame/drivers/play_2.c2
-rw-r--r--src/mame/drivers/play_3.c2
-rw-r--r--src/mame/drivers/play_5.c2
-rw-r--r--src/mame/drivers/playch10.c6
-rw-r--r--src/mame/drivers/playmark.c16
-rw-r--r--src/mame/drivers/plygonet.c8
-rw-r--r--src/mame/drivers/pntnpuzl.c2
-rw-r--r--src/mame/drivers/pokechmp.c4
-rw-r--r--src/mame/drivers/poker72.c2
-rw-r--r--src/mame/drivers/polepos.c20
-rw-r--r--src/mame/drivers/policetr.c12
-rw-r--r--src/mame/drivers/polyplay.c4
-rw-r--r--src/mame/drivers/poo.c8
-rw-r--r--src/mame/drivers/poolshrk.c2
-rw-r--r--src/mame/drivers/pooyan.c2
-rw-r--r--src/mame/drivers/popeye.c8
-rw-r--r--src/mame/drivers/popper.c4
-rw-r--r--src/mame/drivers/portrait.c4
-rw-r--r--src/mame/drivers/powerbal.c4
-rw-r--r--src/mame/drivers/powerins.c10
-rw-r--r--src/mame/drivers/ppmast93.c8
-rw-r--r--src/mame/drivers/prehisle.c6
-rw-r--r--src/mame/drivers/progolf.c8
-rw-r--r--src/mame/drivers/psattack.c2
-rw-r--r--src/mame/drivers/psikyo.c58
-rw-r--r--src/mame/drivers/psikyo4.c10
-rw-r--r--src/mame/drivers/psikyosh.c6
-rw-r--r--src/mame/drivers/psychic5.c12
-rw-r--r--src/mame/drivers/pturn.c10
-rw-r--r--src/mame/drivers/puckpkmn.c4
-rw-r--r--src/mame/drivers/punchout.c8
-rw-r--r--src/mame/drivers/pushman.c10
-rw-r--r--src/mame/drivers/pzletime.c2
-rw-r--r--src/mame/drivers/qdrmfgp.c4
-rw-r--r--src/mame/drivers/qix.c10
-rw-r--r--src/mame/drivers/quakeat.c4
-rw-r--r--src/mame/drivers/quantum.c2
-rw-r--r--src/mame/drivers/quasar.c8
-rw-r--r--src/mame/drivers/queen.c4
-rw-r--r--src/mame/drivers/quizdna.c10
-rw-r--r--src/mame/drivers/quizo.c4
-rw-r--r--src/mame/drivers/quizpani.c2
-rw-r--r--src/mame/drivers/quizpun2.c8
-rw-r--r--src/mame/drivers/r2dtank.c4
-rw-r--r--src/mame/drivers/r2dx_v33.c6
-rw-r--r--src/mame/drivers/rabbit.c2
-rw-r--r--src/mame/drivers/raiden.c14
-rw-r--r--src/mame/drivers/raiden2.c10
-rw-r--r--src/mame/drivers/rainbow.c8
-rw-r--r--src/mame/drivers/rallyx.c6
-rw-r--r--src/mame/drivers/rampart.c2
-rw-r--r--src/mame/drivers/rastan.c4
-rw-r--r--src/mame/drivers/rbmk.c6
-rw-r--r--src/mame/drivers/rcorsair.c2
-rw-r--r--src/mame/drivers/re900.c4
-rw-r--r--src/mame/drivers/realbrk.c10
-rw-r--r--src/mame/drivers/redalert.c8
-rw-r--r--src/mame/drivers/redclash.c4
-rw-r--r--src/mame/drivers/relief.c2
-rw-r--r--src/mame/drivers/renegade.c8
-rw-r--r--src/mame/drivers/retofinv.c8
-rw-r--r--src/mame/drivers/rgum.c2
-rw-r--r--src/mame/drivers/rmhaihai.c10
-rw-r--r--src/mame/drivers/rockrage.c4
-rw-r--r--src/mame/drivers/rocnrope.c2
-rw-r--r--src/mame/drivers/rohga.c10
-rw-r--r--src/mame/drivers/rollerg.c4
-rw-r--r--src/mame/drivers/rollrace.c4
-rw-r--r--src/mame/drivers/rotaryf.c4
-rw-r--r--src/mame/drivers/roul.c8
-rw-r--r--src/mame/drivers/route16.c16
-rw-r--r--src/mame/drivers/rowamet.c2
-rw-r--r--src/mame/drivers/royalmah.c62
-rw-r--r--src/mame/drivers/rpunch.c4
-rw-r--r--src/mame/drivers/runaway.c2
-rw-r--r--src/mame/drivers/rungun.c4
-rw-r--r--src/mame/drivers/s11.c2
-rw-r--r--src/mame/drivers/s11a.c2
-rw-r--r--src/mame/drivers/s11b.c2
-rw-r--r--src/mame/drivers/s11c.c2
-rw-r--r--src/mame/drivers/s3.c2
-rw-r--r--src/mame/drivers/s4.c2
-rw-r--r--src/mame/drivers/s6.c2
-rw-r--r--src/mame/drivers/s6a.c2
-rw-r--r--src/mame/drivers/s7.c2
-rw-r--r--src/mame/drivers/s8.c2
-rw-r--r--src/mame/drivers/s9.c2
-rw-r--r--src/mame/drivers/safarir.c6
-rw-r--r--src/mame/drivers/sandscrp.c6
-rw-r--r--src/mame/drivers/sangho.c62
-rw-r--r--src/mame/drivers/sauro.c8
-rw-r--r--src/mame/drivers/savquest.c4
-rw-r--r--src/mame/drivers/sbasketb.c4
-rw-r--r--src/mame/drivers/sbowling.c4
-rw-r--r--src/mame/drivers/sbrkout.c2
-rw-r--r--src/mame/drivers/sbugger.c4
-rw-r--r--src/mame/drivers/scobra.c22
-rw-r--r--src/mame/drivers/scotrsht.c6
-rw-r--r--src/mame/drivers/scramble.c30
-rw-r--r--src/mame/drivers/scregg.c4
-rw-r--r--src/mame/drivers/sderby.c6
-rw-r--r--src/mame/drivers/seattle.c18
-rw-r--r--src/mame/drivers/segac2.c30
-rw-r--r--src/mame/drivers/segae.c18
-rw-r--r--src/mame/drivers/segag80r.c50
-rw-r--r--src/mame/drivers/segag80v.c20
-rw-r--r--src/mame/drivers/segahang.c24
-rw-r--r--src/mame/drivers/segald.c4
-rw-r--r--src/mame/drivers/segaorun.c10
-rw-r--r--src/mame/drivers/segas16a.c12
-rw-r--r--src/mame/drivers/segas16b.c22
-rw-r--r--src/mame/drivers/segas18.c10
-rw-r--r--src/mame/drivers/segas24.c4
-rw-r--r--src/mame/drivers/segas32.c50
-rw-r--r--src/mame/drivers/segaxbd.c20
-rw-r--r--src/mame/drivers/segaybd.c12
-rw-r--r--src/mame/drivers/seibuspi.c40
-rw-r--r--src/mame/drivers/seicross.c8
-rw-r--r--src/mame/drivers/sengokmj.c4
-rw-r--r--src/mame/drivers/senjyo.c10
-rw-r--r--src/mame/drivers/seta.c110
-rw-r--r--src/mame/drivers/seta2.c24
-rw-r--r--src/mame/drivers/sf.c12
-rw-r--r--src/mame/drivers/sfbonus.c4
-rw-r--r--src/mame/drivers/sfcbox.c4
-rw-r--r--src/mame/drivers/sfkick.c8
-rw-r--r--src/mame/drivers/sg1000a.c4
-rw-r--r--src/mame/drivers/shadfrce.c4
-rw-r--r--src/mame/drivers/shangha3.c10
-rw-r--r--src/mame/drivers/shanghai.c10
-rw-r--r--src/mame/drivers/shangkid.c22
-rw-r--r--src/mame/drivers/shaolins.c2
-rw-r--r--src/mame/drivers/shisen.c8
-rw-r--r--src/mame/drivers/shootout.c8
-rw-r--r--src/mame/drivers/shougi.c8
-rw-r--r--src/mame/drivers/shuuz.c2
-rw-r--r--src/mame/drivers/sidearms.c12
-rw-r--r--src/mame/drivers/sidepckt.c12
-rw-r--r--src/mame/drivers/sigmab52.c4
-rw-r--r--src/mame/drivers/sigmab98.c22
-rw-r--r--src/mame/drivers/silkroad.c2
-rw-r--r--src/mame/drivers/simpl156.c20
-rw-r--r--src/mame/drivers/simpsons.c4
-rw-r--r--src/mame/drivers/skeetsht.c6
-rw-r--r--src/mame/drivers/skimaxx.c6
-rw-r--r--src/mame/drivers/skullxbo.c2
-rw-r--r--src/mame/drivers/skyarmy.c4
-rw-r--r--src/mame/drivers/skydiver.c2
-rw-r--r--src/mame/drivers/skyfox.c4
-rw-r--r--src/mame/drivers/skykid.c6
-rw-r--r--src/mame/drivers/skylncr.c4
-rw-r--r--src/mame/drivers/skyraid.c2
-rw-r--r--src/mame/drivers/slapfght.c40
-rw-r--r--src/mame/drivers/slapshot.c6
-rw-r--r--src/mame/drivers/sleic.c2
-rw-r--r--src/mame/drivers/sliver.c6
-rw-r--r--src/mame/drivers/slotcarn.c4
-rw-r--r--src/mame/drivers/sms.c6
-rw-r--r--src/mame/drivers/snesb.c28
-rw-r--r--src/mame/drivers/snk.c80
-rw-r--r--src/mame/drivers/snk6502.c10
-rw-r--r--src/mame/drivers/snk68.c8
-rw-r--r--src/mame/drivers/snookr10.c4
-rw-r--r--src/mame/drivers/snowbros.c38
-rw-r--r--src/mame/drivers/solomon.c6
-rw-r--r--src/mame/drivers/sonson.c4
-rw-r--r--src/mame/drivers/sothello.c10
-rw-r--r--src/mame/drivers/spacefb.c10
-rw-r--r--src/mame/drivers/spaceg.c2
-rw-r--r--src/mame/drivers/spbactn.c4
-rw-r--r--src/mame/drivers/spcforce.c6
-rw-r--r--src/mame/drivers/spdodgeb.c4
-rw-r--r--src/mame/drivers/speedatk.c4
-rw-r--r--src/mame/drivers/speedbal.c8
-rw-r--r--src/mame/drivers/speedspn.c6
-rw-r--r--src/mame/drivers/speglsht.c6
-rw-r--r--src/mame/drivers/spiders.c4
-rw-r--r--src/mame/drivers/spinb.c2
-rw-r--r--src/mame/drivers/splash.c16
-rw-r--r--src/mame/drivers/spoker.c4
-rw-r--r--src/mame/drivers/spool99.c4
-rw-r--r--src/mame/drivers/sprcros2.c8
-rw-r--r--src/mame/drivers/sprint2.c2
-rw-r--r--src/mame/drivers/sprint4.c2
-rw-r--r--src/mame/drivers/sprint8.c2
-rw-r--r--src/mame/drivers/spy.c4
-rw-r--r--src/mame/drivers/srmp2.c12
-rw-r--r--src/mame/drivers/srmp5.c6
-rw-r--r--src/mame/drivers/srmp6.c2
-rw-r--r--src/mame/drivers/srumbler.c6
-rw-r--r--src/mame/drivers/ssfindo.c6
-rw-r--r--src/mame/drivers/sshangha.c6
-rw-r--r--src/mame/drivers/ssingles.c6
-rw-r--r--src/mame/drivers/sslam.c6
-rw-r--r--src/mame/drivers/ssozumo.c4
-rw-r--r--src/mame/drivers/sspeedr.c4
-rw-r--r--src/mame/drivers/ssrj.c2
-rw-r--r--src/mame/drivers/sstrangr.c4
-rw-r--r--src/mame/drivers/ssv.c40
-rw-r--r--src/mame/drivers/st0016.c8
-rw-r--r--src/mame/drivers/st_mp100.c2
-rw-r--r--src/mame/drivers/st_mp200.c2
-rw-r--r--src/mame/drivers/stactics.c2
-rw-r--r--src/mame/drivers/stadhero.c4
-rw-r--r--src/mame/drivers/starcrus.c4
-rw-r--r--src/mame/drivers/starfire.c2
-rw-r--r--src/mame/drivers/starshp1.c2
-rw-r--r--src/mame/drivers/starwars.c10
-rw-r--r--src/mame/drivers/statriv2.c8
-rw-r--r--src/mame/drivers/stepstag.c4
-rw-r--r--src/mame/drivers/stfight.c4
-rw-r--r--src/mame/drivers/stlforce.c2
-rw-r--r--src/mame/drivers/strnskil.c14
-rw-r--r--src/mame/drivers/stv.c12
-rw-r--r--src/mame/drivers/stvinit.c2
-rw-r--r--src/mame/drivers/sub.c8
-rw-r--r--src/mame/drivers/subs.c2
-rw-r--r--src/mame/drivers/subsino.c18
-rw-r--r--src/mame/drivers/subsino2.c18
-rw-r--r--src/mame/drivers/suna16.c34
-rw-r--r--src/mame/drivers/suna8.c40
-rw-r--r--src/mame/drivers/supbtime.c6
-rw-r--r--src/mame/drivers/supdrapo.c2
-rw-r--r--src/mame/drivers/superchs.c8
-rw-r--r--src/mame/drivers/superdq.c4
-rw-r--r--src/mame/drivers/superqix.c16
-rw-r--r--src/mame/drivers/supertnk.c6
-rw-r--r--src/mame/drivers/suprgolf.c4
-rw-r--r--src/mame/drivers/suprloco.c4
-rw-r--r--src/mame/drivers/suprnova.c34
-rw-r--r--src/mame/drivers/suprridr.c8
-rw-r--r--src/mame/drivers/suprslam.c6
-rw-r--r--src/mame/drivers/surpratk.c2
-rw-r--r--src/mame/drivers/system1.c34
-rw-r--r--src/mame/drivers/system16.c60
-rw-r--r--src/mame/drivers/tagteam.c4
-rw-r--r--src/mame/drivers/tail2nos.c6
-rw-r--r--src/mame/drivers/taito.c2
-rw-r--r--src/mame/drivers/taito_b.c36
-rw-r--r--src/mame/drivers/taito_f2.c64
-rw-r--r--src/mame/drivers/taito_f3.c6
-rw-r--r--src/mame/drivers/taito_h.c8
-rw-r--r--src/mame/drivers/taito_l.c40
-rw-r--r--src/mame/drivers/taito_o.c2
-rw-r--r--src/mame/drivers/taito_x.c14
-rw-r--r--src/mame/drivers/taito_z.c42
-rw-r--r--src/mame/drivers/taitoair.c10
-rw-r--r--src/mame/drivers/taitogn.c6
-rw-r--r--src/mame/drivers/taitojc.c10
-rw-r--r--src/mame/drivers/taitopjc.c2
-rw-r--r--src/mame/drivers/taitosj.c22
-rw-r--r--src/mame/drivers/taitotz.c2
-rw-r--r--src/mame/drivers/taitowlf.c4
-rw-r--r--src/mame/drivers/tank8.c2
-rw-r--r--src/mame/drivers/tankbatt.c2
-rw-r--r--src/mame/drivers/tankbust.c6
-rw-r--r--src/mame/drivers/taotaido.c6
-rw-r--r--src/mame/drivers/targeth.c2
-rw-r--r--src/mame/drivers/tatsumi.c24
-rw-r--r--src/mame/drivers/tattack.c2
-rw-r--r--src/mame/drivers/taxidrvr.c8
-rw-r--r--src/mame/drivers/tbowl.c6
-rw-r--r--src/mame/drivers/tceptor.c12
-rw-r--r--src/mame/drivers/tcl.c4
-rw-r--r--src/mame/drivers/techno.c2
-rw-r--r--src/mame/drivers/tecmo.c16
-rw-r--r--src/mame/drivers/tecmo16.c6
-rw-r--r--src/mame/drivers/tecmosys.c6
-rw-r--r--src/mame/drivers/tehkanwc.c8
-rw-r--r--src/mame/drivers/tempest.c2
-rw-r--r--src/mame/drivers/terracre.c12
-rw-r--r--src/mame/drivers/tetrisp2.c12
-rw-r--r--src/mame/drivers/tgtpanic.c4
-rw-r--r--src/mame/drivers/thayers.c6
-rw-r--r--src/mame/drivers/thedeep.c4
-rw-r--r--src/mame/drivers/thepit.c10
-rw-r--r--src/mame/drivers/thief.c6
-rw-r--r--src/mame/drivers/thoop2.c2
-rw-r--r--src/mame/drivers/thunderj.c4
-rw-r--r--src/mame/drivers/thunderx.c8
-rw-r--r--src/mame/drivers/tiamc1.c6
-rw-r--r--src/mame/drivers/tickee.c8
-rw-r--r--src/mame/drivers/tigeroad.c14
-rw-r--r--src/mame/drivers/timelimt.c8
-rw-r--r--src/mame/drivers/timeplt.c6
-rw-r--r--src/mame/drivers/timetrv.c4
-rw-r--r--src/mame/drivers/tmaster.c4
-rw-r--r--src/mame/drivers/tmmjprd.c2
-rw-r--r--src/mame/drivers/tmnt.c40
-rw-r--r--src/mame/drivers/tnzs.c24
-rw-r--r--src/mame/drivers/toaplan1.c36
-rw-r--r--src/mame/drivers/toaplan2.c70
-rw-r--r--src/mame/drivers/toki.c8
-rw-r--r--src/mame/drivers/tokyocop.c2
-rw-r--r--src/mame/drivers/tomcat.c8
-rw-r--r--src/mame/drivers/toobin.c2
-rw-r--r--src/mame/drivers/topspeed.c6
-rw-r--r--src/mame/drivers/toratora.c2
-rw-r--r--src/mame/drivers/tourtabl.c2
-rw-r--r--src/mame/drivers/toypop.c8
-rw-r--r--src/mame/drivers/tp84.c8
-rw-r--r--src/mame/drivers/trackfld.c18
-rw-r--r--src/mame/drivers/travrusa.c2
-rw-r--r--src/mame/drivers/triforce.c2
-rw-r--r--src/mame/drivers/triplhnt.c2
-rw-r--r--src/mame/drivers/truco.c2
-rw-r--r--src/mame/drivers/trucocl.c2
-rw-r--r--src/mame/drivers/trvmadns.c4
-rw-r--r--src/mame/drivers/trvquest.c2
-rw-r--r--src/mame/drivers/tryout.c4
-rw-r--r--src/mame/drivers/tsamurai.c26
-rw-r--r--src/mame/drivers/ttchamp.c4
-rw-r--r--src/mame/drivers/tubep.c26
-rw-r--r--src/mame/drivers/tugboat.c2
-rw-r--r--src/mame/drivers/tumbleb.c40
-rw-r--r--src/mame/drivers/tumblep.c4
-rw-r--r--src/mame/drivers/tunhunt.c2
-rw-r--r--src/mame/drivers/turbo.c10
-rw-r--r--src/mame/drivers/turrett.c2
-rw-r--r--src/mame/drivers/tutankhm.c2
-rw-r--r--src/mame/drivers/twin16.c8
-rw-r--r--src/mame/drivers/twincobr.c12
-rw-r--r--src/mame/drivers/twinkle.c4
-rw-r--r--src/mame/drivers/twins.c6
-rw-r--r--src/mame/drivers/tx1.c24
-rw-r--r--src/mame/drivers/uapce.c6
-rw-r--r--src/mame/drivers/ultraman.c6
-rw-r--r--src/mame/drivers/ultratnk.c2
-rw-r--r--src/mame/drivers/ultrsprt.c4
-rw-r--r--src/mame/drivers/undrfire.c6
-rw-r--r--src/mame/drivers/unico.c6
-rw-r--r--src/mame/drivers/upscope.c6
-rw-r--r--src/mame/drivers/usgames.c4
-rw-r--r--src/mame/drivers/vamphalf.c64
-rw-r--r--src/mame/drivers/vaportra.c4
-rw-r--r--src/mame/drivers/vastar.c8
-rw-r--r--src/mame/drivers/vball.c4
-rw-r--r--src/mame/drivers/vcombat.c8
-rw-r--r--src/mame/drivers/vd.c2
-rw-r--r--src/mame/drivers/vega.c2
-rw-r--r--src/mame/drivers/vegaeo.c2
-rw-r--r--src/mame/drivers/vegas.c8
-rw-r--r--src/mame/drivers/vendetta.c8
-rw-r--r--src/mame/drivers/vertigo.c4
-rw-r--r--src/mame/drivers/vicdual.c58
-rw-r--r--src/mame/drivers/victory.c4
-rw-r--r--src/mame/drivers/videopin.c2
-rw-r--r--src/mame/drivers/videopkr.c12
-rw-r--r--src/mame/drivers/vigilant.c14
-rw-r--r--src/mame/drivers/vindictr.c2
-rw-r--r--src/mame/drivers/viper.c8
-rw-r--r--src/mame/drivers/vmetal.c2
-rw-r--r--src/mame/drivers/volfied.c4
-rw-r--r--src/mame/drivers/vp101.c2
-rw-r--r--src/mame/drivers/vpoker.c2
-rw-r--r--src/mame/drivers/vroulet.c4
-rw-r--r--src/mame/drivers/vsnes.c4
-rw-r--r--src/mame/drivers/vulgus.c4
-rw-r--r--src/mame/drivers/wallc.c2
-rw-r--r--src/mame/drivers/wardner.c16
-rw-r--r--src/mame/drivers/warpwarp.c8
-rw-r--r--src/mame/drivers/warriorb.c6
-rw-r--r--src/mame/drivers/wc90.c6
-rw-r--r--src/mame/drivers/wc90b.c6
-rw-r--r--src/mame/drivers/wecleman.c12
-rw-r--r--src/mame/drivers/welltris.c6
-rw-r--r--src/mame/drivers/wgp.c6
-rw-r--r--src/mame/drivers/wheelfir.c4
-rw-r--r--src/mame/drivers/white_mod.c2
-rw-r--r--src/mame/drivers/whitestar.c2
-rw-r--r--src/mame/drivers/wico.c2
-rw-r--r--src/mame/drivers/williams.c36
-rw-r--r--src/mame/drivers/wink.c8
-rw-r--r--src/mame/drivers/wiping.c4
-rw-r--r--src/mame/drivers/witch.c6
-rw-r--r--src/mame/drivers/wiz.c12
-rw-r--r--src/mame/drivers/wldarrow.c2
-rw-r--r--src/mame/drivers/wolfpack.c2
-rw-r--r--src/mame/drivers/wpc_95.c2
-rw-r--r--src/mame/drivers/wpc_an.c2
-rw-r--r--src/mame/drivers/wpc_dcs.c2
-rw-r--r--src/mame/drivers/wpc_dot.c2
-rw-r--r--src/mame/drivers/wpc_flip1.c2
-rw-r--r--src/mame/drivers/wpc_flip2.c2
-rw-r--r--src/mame/drivers/wpc_s.c2
-rw-r--r--src/mame/drivers/wrally.c6
-rw-r--r--src/mame/drivers/wwfsstar.c4
-rw-r--r--src/mame/drivers/wwfwfest.c6
-rw-r--r--src/mame/drivers/xain.c8
-rw-r--r--src/mame/drivers/xexex.c4
-rw-r--r--src/mame/drivers/xmen.c6
-rw-r--r--src/mame/drivers/xorworld.c2
-rw-r--r--src/mame/drivers/xtheball.c2
-rw-r--r--src/mame/drivers/xtom3d.c4
-rw-r--r--src/mame/drivers/xxmissio.c4
-rw-r--r--src/mame/drivers/xybots.c2
-rw-r--r--src/mame/drivers/xyonix.c4
-rw-r--r--src/mame/drivers/yiear.c2
-rw-r--r--src/mame/drivers/yunsun16.c8
-rw-r--r--src/mame/drivers/yunsung8.c6
-rw-r--r--src/mame/drivers/zac2650.c4
-rw-r--r--src/mame/drivers/zac_1.c2
-rw-r--r--src/mame/drivers/zac_2.c2
-rw-r--r--src/mame/drivers/zac_proto.c2
-rw-r--r--src/mame/drivers/zaccaria.c6
-rw-r--r--src/mame/drivers/zaxxon.c20
-rw-r--r--src/mame/drivers/zerozone.c4
-rw-r--r--src/mame/drivers/zn.c128
-rw-r--r--src/mame/drivers/zodiack.c6
-rw-r--r--src/mame/drivers/zr107.c8
-rw-r--r--src/mame/machine/amiga.c14
-rw-r--r--src/mame/machine/archimds.c4
-rw-r--r--src/mame/machine/asic65.c6
-rw-r--r--src/mame/machine/asteroid.c4
-rw-r--r--src/mame/machine/atari.c6
-rw-r--r--src/mame/machine/atarigen.c6
-rw-r--r--src/mame/machine/bagman.c2
-rw-r--r--src/mame/machine/balsente.c2
-rw-r--r--src/mame/machine/buggychl.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/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.c2
-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/kaneko16.c4
-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.c142
-rw-r--r--src/mame/machine/megadriv.c106
-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/model1.c2
-rw-r--r--src/mame/machine/n64.c2
-rw-r--r--src/mame/machine/namco50.c2
-rw-r--r--src/mame/machine/namco51.c2
-rw-r--r--src/mame/machine/namco53.c2
-rw-r--r--src/mame/machine/namco62.c2
-rw-r--r--src/mame/machine/namcos1.c10
-rw-r--r--src/mame/machine/namcos2.c2
-rw-r--r--src/mame/machine/naomi.c12
-rw-r--r--src/mame/machine/neoboot.c16
-rw-r--r--src/mame/machine/neoprot.c30
-rw-r--r--src/mame/machine/pcshare.c2
-rw-r--r--src/mame/machine/pitnrun.c2
-rw-r--r--src/mame/machine/playch10.c40
-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.c6
-rw-r--r--src/mame/machine/segamsys.c22
-rw-r--r--src/mame/machine/segas32.c2
-rw-r--r--src/mame/machine/snes.c16
-rw-r--r--src/mame/machine/stfight.c4
-rw-r--r--src/mame/machine/stvprot.c16
-rw-r--r--src/mame/machine/taitosj.c6
-rw-r--r--src/mame/machine/tatsumi.c12
-rw-r--r--src/mame/machine/tnzs.c14
-rw-r--r--src/mame/machine/toaplan1.c4
-rw-r--r--src/mame/machine/twincobr.c8
-rw-r--r--src/mame/machine/vsnes.c54
-rw-r--r--src/mame/machine/williams.c8
-rw-r--r--src/mame/video/amiga.c4
-rw-r--r--src/mame/video/armedf.c2
-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/bfm_adr2.c2
-rw-r--r--src/mame/video/bfm_dm01.c2
-rw-r--r--src/mame/video/bionicc.c2
-rw-r--r--src/mame/video/blktiger.c2
-rw-r--r--src/mame/video/blstroid.c2
-rw-r--r--src/mame/video/cidelsa.c4
-rw-r--r--src/mame/video/cischeat.c2
-rw-r--r--src/mame/video/combatsc.c2
-rw-r--r--src/mame/video/commando.c2
-rw-r--r--src/mame/video/crshrace.c2
-rw-r--r--src/mame/video/dc.c2
-rw-r--r--src/mame/video/dogfgt.c2
-rw-r--r--src/mame/video/dooyong.c4
-rw-r--r--src/mame/video/dynduke.c2
-rw-r--r--src/mame/video/exedexes.c2
-rw-r--r--src/mame/video/gaelco2.c2
-rw-r--r--src/mame/video/gng.c2
-rw-r--r--src/mame/video/gp9001.c4
-rw-r--r--src/mame/video/gp9001.h2
-rw-r--r--src/mame/video/gtia.c2
-rw-r--r--src/mame/video/hng64.c2
-rw-r--r--src/mame/video/jaguar.c2
-rw-r--r--src/mame/video/lastduel.c2
-rw-r--r--src/mame/video/leland.c2
-rw-r--r--src/mame/video/lwings.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.c2
-rw-r--r--src/mame/video/psikyosh.c2
-rw-r--r--src/mame/video/psx.c2
-rw-r--r--src/mame/video/qix.c6
-rw-r--r--src/mame/video/sidearms.c2
-rw-r--r--src/mame/video/simpsons.c2
-rw-r--r--src/mame/video/skydiver.c2
-rw-r--r--src/mame/video/srumbler.c2
-rw-r--r--src/mame/video/taito_b.c2
-rw-r--r--src/mame/video/tigeroad.c2
-rw-r--r--src/mame/video/toaplan1.c4
-rw-r--r--src/mame/video/toki.c4
-rw-r--r--src/mame/video/twin16.c2
-rw-r--r--src/mame/video/twincobr.c2
-rw-r--r--src/mame/video/vdc.c2
-rw-r--r--src/mame/video/vrender0.c2
1462 files changed, 7695 insertions, 7695 deletions
diff --git a/src/emu/addrmap.c b/src/emu/addrmap.c
index 670c5515b77..75c39c2b3a3 100644
--- a/src/emu/addrmap.c
+++ b/src/emu/addrmap.c
@@ -696,7 +696,7 @@ address_map_entry64::address_map_entry64(address_map &map, offs_t start, offs_t
// address_map - constructor
//-------------------------------------------------
-address_map::address_map(const device_config &devconfig, int spacenum)
+address_map::address_map(const device_config &devconfig, address_spacenum spacenum)
: m_spacenum(spacenum),
m_databits(0xff),
m_unmapval(0),
@@ -741,7 +741,7 @@ address_map::~address_map()
// values
//-------------------------------------------------
-void address_map::configure(UINT8 spacenum, UINT8 databits)
+void address_map::configure(address_spacenum spacenum, UINT8 databits)
{
assert(m_spacenum == spacenum);
if (m_databits == 0xff)
diff --git a/src/emu/addrmap.h b/src/emu/addrmap.h
index 147ca155a43..b45c38a90f8 100644
--- a/src/emu/addrmap.h
+++ b/src/emu/addrmap.h
@@ -408,11 +408,11 @@ class address_map
{
public:
// construction/destruction
- address_map(const device_config &devconfig, int spacenum);
+ address_map(const device_config &devconfig, address_spacenum spacenum);
~address_map();
// configuration
- void configure(UINT8 _spacenum, UINT8 _databits);
+ void configure(address_spacenum _spacenum, UINT8 _databits);
// setters
void set_global_mask(offs_t mask);
@@ -425,7 +425,7 @@ public:
address_map_entry64 *add(offs_t start, offs_t end, address_map_entry64 *ptr);
// public data
- UINT8 m_spacenum; // space number of the map
+ address_spacenum m_spacenum; // space number of the map
UINT8 m_databits; // data bits represented by the map
UINT8 m_unmapval; // unmapped memory value
offs_t m_globalmask; // global mask
diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/emu/cpu/adsp2100/adsp2100.c
index 1b33655cdee..2b4804cd13e 100644
--- a/src/emu/cpu/adsp2100/adsp2100.c
+++ b/src/emu/cpu/adsp2100/adsp2100.c
@@ -286,21 +286,21 @@ UINT32 adsp2181_device_config::execute_input_lines() const
// the space doesn't exist
//-------------------------------------------------
-const address_space_config *adsp2100_device_config::memory_space_config(int spacenum) const
+const address_space_config *adsp2100_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == AS_PROGRAM) ? &m_program_config :
(spacenum == AS_DATA) ? &m_data_config :
NULL;
}
-const address_space_config *adsp2101_device_config::memory_space_config(int spacenum) const
+const address_space_config *adsp2101_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == AS_PROGRAM) ? &m_program_config :
(spacenum == AS_DATA) ? &m_data_config :
NULL;
}
-const address_space_config *adsp2181_device_config::memory_space_config(int spacenum) const
+const address_space_config *adsp2181_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == AS_PROGRAM) ? &m_program_config :
(spacenum == AS_DATA) ? &m_data_config :
diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/emu/cpu/adsp2100/adsp2100.h
index 286fecb5379..71c22755cf0 100644
--- a/src/emu/cpu/adsp2100/adsp2100.h
+++ b/src/emu/cpu/adsp2100/adsp2100.h
@@ -578,7 +578,7 @@ protected:
virtual UINT32 execute_input_lines() const;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
};
@@ -617,7 +617,7 @@ protected:
virtual UINT32 execute_input_lines() const;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
};
@@ -659,7 +659,7 @@ protected:
virtual UINT32 execute_input_lines() const;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// address spaces
const address_space_config m_io_config;
diff --git a/src/emu/cpu/alph8201/alph8201.c b/src/emu/cpu/alph8201/alph8201.c
index a21c5d9d85b..b947f79ac6f 100644
--- a/src/emu/cpu/alph8201/alph8201.c
+++ b/src/emu/cpu/alph8201/alph8201.c
@@ -893,15 +893,15 @@ static CPU_GET_INFO( alpha8xxx )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 10; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 6; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 10; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 6; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
#if HANDLE_HALT_LINE
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_HALT: info->i = cpustate->halt ? ASSERT_LINE : CLEAR_LINE; break;
#endif
diff --git a/src/emu/cpu/am29000/am29000.c b/src/emu/cpu/am29000/am29000.c
index 4f0de4d0372..6dc4efcae5c 100644
--- a/src/emu/cpu/am29000/am29000.c
+++ b/src/emu/cpu/am29000/am29000.c
@@ -728,15 +728,15 @@ CPU_GET_INFO( am29000 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 2; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PC:
case CPUINFO_INT_REGISTER + AM29000_PC: info->i = am29000->pc; break;
diff --git a/src/emu/cpu/apexc/apexc.c b/src/emu/cpu/apexc/apexc.c
index db140f7fec4..e50ab8e3ce1 100644
--- a/src/emu/cpu/apexc/apexc.c
+++ b/src/emu/cpu/apexc/apexc.c
@@ -899,15 +899,15 @@ CPU_GET_INFO( apexc )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; /* IIRC */ break;
case CPUINFO_INT_MAX_CYCLES: info->i = 75; /* IIRC */ break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 15; /*13+2 ignored bits to make double word address*/ break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = /*5*/8; /* no I/O bus, but we use address 0 for punchtape I/O */ break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = /*0*/1; /*0 is quite enough but the MAME core does not understand*/ break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 15; /*13+2 ignored bits to make double word address*/ break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = /*5*/8; /* no I/O bus, but we use address 0 for punchtape I/O */ break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = /*0*/1; /*0 is quite enough but the MAME core does not understand*/ break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_SP: info->i = 0; /* no SP */ break;
case CPUINFO_INT_PC:
diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c
index 4ba2fabbc92..efe4102a7ce 100644
--- a/src/emu/cpu/arm/arm.c
+++ b/src/emu/cpu/arm/arm.c
@@ -1506,15 +1506,15 @@ CPU_GET_INFO( arm )
case CPUINFO_INT_MIN_CYCLES: info->i = 3; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 26; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 26; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + ARM_IRQ_LINE: info->i = cpustate->pendingIrq; break;
case CPUINFO_INT_INPUT_STATE + ARM_FIRQ_LINE: info->i = cpustate->pendingFiq; break;
diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c
index 6fee89a8004..64010c86869 100644
--- a/src/emu/cpu/arm7/arm7.c
+++ b/src/emu/cpu/arm7/arm7.c
@@ -306,7 +306,7 @@ static CPU_TRANSLATE( arm7 )
arm_state *cpustate = (device != NULL) ? (arm_state *)device->token() : NULL;
/* only applies to the program address space and only does something if the MMU's enabled */
- if( space == ADDRESS_SPACE_PROGRAM && ( COPRO_CTRL & COPRO_CTRL_MMU_EN ) )
+ if( space == AS_PROGRAM && ( COPRO_CTRL & COPRO_CTRL_MMU_EN ) )
{
*address = arm7_tlb_translate(cpustate, *address, ARM7_TLB_NO_ABORT);
}
@@ -559,15 +559,15 @@ CPU_GET_INFO( arm7 )
case CPUINFO_INT_MIN_CYCLES: info->i = 3; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
/* interrupt lines/exceptions */
case CPUINFO_INT_INPUT_STATE + ARM7_IRQ_LINE: info->i = cpustate->pendingIrq; break;
diff --git a/src/emu/cpu/asap/asap.c b/src/emu/cpu/asap/asap.c
index d7f19a6dc94..ee9f35ce217 100644
--- a/src/emu/cpu/asap/asap.c
+++ b/src/emu/cpu/asap/asap.c
@@ -237,7 +237,7 @@ UINT32 asap_device_config::execute_input_lines() const
// the space doesn't exist
//-------------------------------------------------
-const address_space_config *asap_device_config::memory_space_config(int spacenum) const
+const address_space_config *asap_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == AS_PROGRAM) ? &m_program_config : NULL;
}
diff --git a/src/emu/cpu/asap/asap.h b/src/emu/cpu/asap/asap.h
index f0ec5055844..03a93574cb6 100644
--- a/src/emu/cpu/asap/asap.h
+++ b/src/emu/cpu/asap/asap.h
@@ -70,7 +70,7 @@ protected:
virtual UINT32 execute_input_lines() const;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// device_config_disasm_interface overrides
virtual UINT32 disasm_min_opcode_bytes() const;
diff --git a/src/emu/cpu/avr8/avr8.c b/src/emu/cpu/avr8/avr8.c
index acd769b6a82..d29121fcba9 100644
--- a/src/emu/cpu/avr8/avr8.c
+++ b/src/emu/cpu/avr8/avr8.c
@@ -1084,15 +1084,15 @@ CPU_GET_INFO( avr8 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 22; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 11; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 22; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 11; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PC: /* intentional fallthrough */
case CPUINFO_INT_REGISTER + AVR8_PC: info->i = cpustate->pc << 1; break;
diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c
index 0574b47aed0..c4920b40d37 100644
--- a/src/emu/cpu/ccpu/ccpu.c
+++ b/src/emu/cpu/ccpu/ccpu.c
@@ -746,15 +746,15 @@ CPU_GET_INFO( ccpu )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 15; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 5; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 15; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 5; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PREVIOUSPC: /* not implemented */ break;
diff --git a/src/emu/cpu/cop400/cop400.c b/src/emu/cpu/cop400/cop400.c
index febba94ef49..fc2240c8f96 100644
--- a/src/emu/cpu/cop400/cop400.c
+++ b/src/emu/cpu/cop400/cop400.c
@@ -1236,32 +1236,32 @@ static CPU_EXECUTE( cop400 )
ADDRESS MAPS
***************************************************************************/
-static ADDRESS_MAP_START( program_512b, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( program_512b, AS_PROGRAM, 8 )
AM_RANGE(0x000, 0x1ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( program_1kb, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( program_1kb, AS_PROGRAM, 8 )
AM_RANGE(0x000, 0x3ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( program_2kb, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( program_2kb, AS_PROGRAM, 8 )
AM_RANGE(0x000, 0x7ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( data_32b, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( data_32b, AS_DATA, 8 )
AM_RANGE(0x00, 0x1f) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( data_64b, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( data_64b, AS_DATA, 8 )
AM_RANGE(0x00, 0x3f) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( data_128b, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( data_128b, AS_DATA, 8 )
AM_RANGE(0x00, 0x7f) AM_RAM
ADDRESS_MAP_END
#ifdef UNUSED_CODE
-static ADDRESS_MAP_START( data_160b, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( data_160b, AS_DATA, 8 )
AM_RANGE(0x00, 0x9f) AM_RAM
ADDRESS_MAP_END
#endif
@@ -1396,15 +1396,15 @@ static CPU_GET_INFO( cop400 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 2; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: /* set per-core */ break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; /* really 4 */ break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: /* set per-core */ break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 9; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: /* set per-core */ break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; /* really 4 */ break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: /* set per-core */ break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 9; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
/* --- the following bits of info are returned as pointers to functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(cop400); break;
@@ -1419,8 +1419,8 @@ static CPU_GET_INFO( cop400 )
/* --- the following bits of info are returned as pointers --- */
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: /* set per-core */ break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: /* set per-core */ break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: /* set per-core */ break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: /* set per-core */ break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "COP400"); break;
@@ -1440,8 +1440,8 @@ CPU_GET_INFO( cop410 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 9; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 5; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 9; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 5; break;
/* --- the following bits of info are returned as pointers to functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(cop410); break;
@@ -1449,8 +1449,8 @@ CPU_GET_INFO( cop410 )
// case CPUINFO_FCT_VALIDITY_CHECK: info->validity_check = CPU_VALIDITY_CHECK_NAME(cop410); break;
/* --- the following bits of info are returned as pointers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_512b); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_32b); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_512b); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_32b); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "COP410"); break;
@@ -1482,7 +1482,7 @@ CPU_GET_INFO( cop401 )
switch (state)
{
/* --- the following bits of info are returned as pointers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = NULL; break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "COP401"); break;
@@ -1498,8 +1498,8 @@ CPU_GET_INFO( cop420 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 10; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 6; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 10; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 6; break;
/* --- the following bits of info are returned as pointers to functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(cop420); break;
@@ -1507,8 +1507,8 @@ CPU_GET_INFO( cop420 )
// case CPUINFO_FCT_VALIDITY_CHECK: info->validity_check = CPU_VALIDITY_CHECK_NAME(cop420); break;
/* --- the following bits of info are returned as pointers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_1kb); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_64b); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_1kb); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_64b); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "COP420"); break;
@@ -1563,7 +1563,7 @@ CPU_GET_INFO( cop402 )
switch (state)
{
/* --- the following bits of info are returned as pointers to data or functions --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = NULL; break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "COP402"); break;
@@ -1579,8 +1579,8 @@ CPU_GET_INFO( cop444 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 11; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 7; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 11; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 7; break;
/* --- the following bits of info are returned as pointers to functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(cop444); break;
@@ -1588,8 +1588,8 @@ CPU_GET_INFO( cop444 )
// case CPUINFO_FCT_VALIDITY_CHECK: info->validity_check = CPU_VALIDITY_CHECK_NAME(cop444); break;
/* --- the following bits of info are returned as pointers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_2kb); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_128b); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_2kb); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_128b); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "COP444"); break;
@@ -1627,12 +1627,12 @@ CPU_GET_INFO( cop424 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 10; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 6; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 10; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 6; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_1kb); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_64b); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_1kb); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_64b); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "COP424"); break;
@@ -1680,7 +1680,7 @@ CPU_GET_INFO( cop404 )
switch (state)
{
/* --- the following bits of info are returned as pointers to data or functions --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = NULL; break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "COP404"); break;
diff --git a/src/emu/cpu/cosmac/cosmac.c b/src/emu/cpu/cosmac/cosmac.c
index 5c0eaaadeca..fa65160de7b 100644
--- a/src/emu/cpu/cosmac/cosmac.c
+++ b/src/emu/cpu/cosmac/cosmac.c
@@ -257,7 +257,7 @@ UINT32 cosmac_device_config::execute_input_lines() const
// the space doesn't exist
//-------------------------------------------------
-const address_space_config *cosmac_device_config::memory_space_config(int spacenum) const
+const address_space_config *cosmac_device_config::memory_space_config(address_spacenum spacenum) const
{
switch (spacenum)
{
diff --git a/src/emu/cpu/cosmac/cosmac.h b/src/emu/cpu/cosmac/cosmac.h
index 8f5c392bb18..ed755d1496a 100644
--- a/src/emu/cpu/cosmac/cosmac.h
+++ b/src/emu/cpu/cosmac/cosmac.h
@@ -165,7 +165,7 @@ protected:
virtual UINT32 execute_input_lines() const;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// device_config_disasm_interface overrides
virtual UINT32 disasm_min_opcode_bytes() const;
diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/emu/cpu/cp1610/cp1610.c
index 2f7965d6eb6..b588cf60697 100644
--- a/src/emu/cpu/cp1610/cp1610.c
+++ b/src/emu/cpu/cp1610/cp1610.c
@@ -3469,15 +3469,15 @@ CPU_GET_INFO( cp1610 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 7; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PREVIOUSPC: info->i = 0; /* TODO??? */ break;
diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/emu/cpu/cubeqcpu/cubeqcpu.c
index 7c6ef0dcfa0..e4b5c8d2f16 100644
--- a/src/emu/cpu/cubeqcpu/cubeqcpu.c
+++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c
@@ -1601,15 +1601,15 @@ CPU_GET_INFO( cquestsnd )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -3; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -3; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PC:
case CPUINFO_INT_REGISTER + CQUESTSND_PC: info->i = cpustate->pc; break;
@@ -1719,15 +1719,15 @@ CPU_GET_INFO( cquestrot )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 9; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -3; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 9; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -3; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PC:
case CPUINFO_INT_REGISTER + CQUESTROT_PC: info->i = cpustate->pc; break;
@@ -1837,15 +1837,15 @@ CPU_GET_INFO( cquestlin )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -3; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -3; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PC:
case CPUINFO_INT_REGISTER + CQUESTLIN_FGPC: info->i = cpustate->pc[cpustate->clkcnt & 3 ? BACKGROUND : FOREGROUND]; break;
diff --git a/src/emu/cpu/drcuml.c b/src/emu/cpu/drcuml.c
index b682b0255e3..a921999d2d4 100644
--- a/src/emu/cpu/drcuml.c
+++ b/src/emu/cpu/drcuml.c
@@ -120,7 +120,7 @@ drcbe_interface::drcbe_interface(drcuml_state &drcuml, drc_cache &cache, device_
// find the spaces and fetch memory accessors
device_memory_interface *memory;
if (device.interface(memory))
- for (int spacenum = 0; spacenum < ARRAY_LENGTH(m_space); spacenum++)
+ for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_space); spacenum++)
{
m_space[spacenum] = memory->space(spacenum);
if (m_space[spacenum] != NULL)
diff --git a/src/emu/cpu/drcumlsh.h b/src/emu/cpu/drcumlsh.h
index 55e75285f09..c02ac68a882 100644
--- a/src/emu/cpu/drcumlsh.h
+++ b/src/emu/cpu/drcumlsh.h
@@ -141,8 +141,8 @@
/* ----- 32-bit Floating Point Arithmetic Operations ----- */
#define UML_FSLOAD(block, dst, base, index) do { block->append().fsload(dst, base, index); } while (0)
#define UML_FSSTORE(block, base, index, src1) do { block->append().fsstore(base, index, src1); } while (0)
-#define UML_FSREAD(block, dst, src1, space) do { block->append().fsread(dst, src1, ADDRESS_SPACE_##space); } while (0)
-#define UML_FSWRITE(block, dst, src1, space) do { block->append().fswrite(dst, src1, ADDRESS_SPACE_##space); } while (0)
+#define UML_FSREAD(block, dst, src1, space) do { block->append().fsread(dst, src1, AS_##space); } while (0)
+#define UML_FSWRITE(block, dst, src1, space) do { block->append().fswrite(dst, src1, AS_##space); } while (0)
#define UML_FSMOV(block, dst, src1) do { block->append().fsmov(dst, src1); } while (0)
#define UML_FSMOVc(block, cond, dst, src1) do { block->append().fsmov(cond, dst, src1); } while (0)
#define UML_FSTOINT(block, dst, src1, size, round) do { block->append().fstoint(dst, src1, size, round); } while (0)
@@ -163,8 +163,8 @@
/* ----- 64-bit Floating Point Arithmetic Operations ----- */
#define UML_FDLOAD(block, dst, base, index) do { block->append().fdload(dst, base, index); } while (0)
#define UML_FDSTORE(block, base, index, src1) do { block->append().fdstore(base, index, src1); } while (0)
-#define UML_FDREAD(block, dst, src1, space) do { block->append().fdread(dst, src1, ADDRESS_SPACE_##space); } while (0)
-#define UML_FDWRITE(block, dst, src1, space) do { block->append().fdwrite(dst, src1, ADDRESS_SPACE_##space); } while (0)
+#define UML_FDREAD(block, dst, src1, space) do { block->append().fdread(dst, src1, AS_##space); } while (0)
+#define UML_FDWRITE(block, dst, src1, space) do { block->append().fdwrite(dst, src1, AS_##space); } while (0)
#define UML_FDMOV(block, dst, src1) do { block->append().fdmov(dst, src1); } while (0)
#define UML_FDMOVc(block, cond, dst, src1) do { block->append().fdmov(cond, dst, src1); } while (0)
#define UML_FDTOINT(block, dst, src1, size, round) do { block->append().fdtoint(dst, src1, size, round); } while (0)
diff --git a/src/emu/cpu/dsp16/dsp16.c b/src/emu/cpu/dsp16/dsp16.c
index 0c253b24621..f3dfa3d074a 100644
--- a/src/emu/cpu/dsp16/dsp16.c
+++ b/src/emu/cpu/dsp16/dsp16.c
@@ -88,7 +88,7 @@ UINT32 dsp16_device_config::execute_input_lines() const
// the space doesn't exist
//-------------------------------------------------
-const address_space_config *dsp16_device_config::memory_space_config(int spacenum) const
+const address_space_config *dsp16_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == AS_PROGRAM) ? &m_program_config : NULL;
}
diff --git a/src/emu/cpu/dsp16/dsp16.h b/src/emu/cpu/dsp16/dsp16.h
index ea99c06def1..9a4be99be5f 100644
--- a/src/emu/cpu/dsp16/dsp16.h
+++ b/src/emu/cpu/dsp16/dsp16.h
@@ -58,7 +58,7 @@ protected:
virtual UINT32 execute_input_lines() const;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// device_config_disasm_interface overrides
virtual UINT32 disasm_min_opcode_bytes() const;
diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c
index ed5e8595153..19859c26586 100644
--- a/src/emu/cpu/dsp32/dsp32.c
+++ b/src/emu/cpu/dsp32/dsp32.c
@@ -257,7 +257,7 @@ UINT32 dsp32c_device_config::execute_input_lines() const
// the space doesn't exist
//-------------------------------------------------
-const address_space_config *dsp32c_device_config::memory_space_config(int spacenum) const
+const address_space_config *dsp32c_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == AS_PROGRAM) ? &m_program_config : NULL;
}
diff --git a/src/emu/cpu/dsp32/dsp32.h b/src/emu/cpu/dsp32/dsp32.h
index 97e7fd5b64e..e5e0ffa8ca5 100644
--- a/src/emu/cpu/dsp32/dsp32.h
+++ b/src/emu/cpu/dsp32/dsp32.h
@@ -169,7 +169,7 @@ protected:
virtual UINT32 execute_input_lines() const;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// device_config_disasm_interface overrides
virtual UINT32 disasm_min_opcode_bytes() const;
diff --git a/src/emu/cpu/dsp56k/dsp56k.c b/src/emu/cpu/dsp56k/dsp56k.c
index 4c0d4bbf5d6..93ed7708691 100644
--- a/src/emu/cpu/dsp56k/dsp56k.c
+++ b/src/emu/cpu/dsp56k/dsp56k.c
@@ -368,12 +368,12 @@ extern CPU_DISASSEMBLE( dsp56k );
/****************************************************************************
* Internal Memory Maps
****************************************************************************/
-static ADDRESS_MAP_START( dsp56156_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dsp56156_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x0000,0x07ff) AM_READWRITE(DSP56K::program_r, DSP56K::program_w) /* 1-5 */
// AM_RANGE(0x2f00,0x2fff) AM_ROM /* 1-5 PROM reserved memory. Is this the right spot for it? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dsp56156_x_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( dsp56156_x_data_map, AS_DATA, 16 )
AM_RANGE(0x0000,0x07ff) AM_RAM /* 1-5 */
AM_RANGE(0xffc0,0xffff) AM_READWRITE(DSP56K::peripheral_register_r, DSP56K::peripheral_register_w) /* 1-5 On-chip peripheral registers memory mapped in data space */
ADDRESS_MAP_END
@@ -508,15 +508,15 @@ CPU_GET_INFO( dsp56k )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; // ? break;
case CPUINFO_INT_MAX_CYCLES: info->i = 8; // ? break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + DSP56K_IRQ_MODA: info->i = DSP56K_IRQ_MODA; break;
case CPUINFO_INT_INPUT_STATE + DSP56K_IRQ_MODB: info->i = DSP56K_IRQ_MODB; break;
@@ -591,9 +591,9 @@ CPU_GET_INFO( dsp56k )
case CPUINFO_FCT_WRITE: info->write = NULL; break;
case CPUINFO_FCT_READOP: info->readop = NULL; break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA:
info->internal_map16 = ADDRESS_MAP_NAME(dsp56156_x_data_map); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM:
info->internal_map16 = ADDRESS_MAP_NAME(dsp56156_program_map); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/emu/cpu/e132xs/e132xs.c
index 93c0b15c77b..7cd6a29a443 100644
--- a/src/emu/cpu/e132xs/e132xs.c
+++ b/src/emu/cpu/e132xs/e132xs.c
@@ -375,13 +375,13 @@ static void check_interrupts(hyperstone_state *cpustate);
// 4Kb IRAM (On-Chip Memory)
-static ADDRESS_MAP_START( e116_4k_iram_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( e116_4k_iram_map, AS_PROGRAM, 16 )
AM_RANGE(0xc0000000, 0xc0000fff) AM_RAM AM_MIRROR(0x1ffff000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( e132_4k_iram_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( e132_4k_iram_map, AS_PROGRAM, 32 )
AM_RANGE(0xc0000000, 0xc0000fff) AM_RAM AM_MIRROR(0x1ffff000)
ADDRESS_MAP_END
@@ -389,13 +389,13 @@ ADDRESS_MAP_END
// 8Kb IRAM (On-Chip Memory)
-static ADDRESS_MAP_START( e116_8k_iram_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( e116_8k_iram_map, AS_PROGRAM, 16 )
AM_RANGE(0xc0000000, 0xc0001fff) AM_RAM AM_MIRROR(0x1fffe000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( e132_8k_iram_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( e132_8k_iram_map, AS_PROGRAM, 32 )
AM_RANGE(0xc0000000, 0xc0001fff) AM_RAM AM_MIRROR(0x1fffe000)
ADDRESS_MAP_END
@@ -403,13 +403,13 @@ ADDRESS_MAP_END
// 16Kb IRAM (On-Chip Memory)
-static ADDRESS_MAP_START( e116_16k_iram_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( e116_16k_iram_map, AS_PROGRAM, 16 )
AM_RANGE(0xc0000000, 0xc0003fff) AM_RAM AM_MIRROR(0x1fffc000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( e132_16k_iram_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( e132_16k_iram_map, AS_PROGRAM, 32 )
AM_RANGE(0xc0000000, 0xc0003fff) AM_RAM AM_MIRROR(0x1fffc000)
ADDRESS_MAP_END
@@ -4856,13 +4856,13 @@ static CPU_GET_INFO( hyperstone )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 36; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 15; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 15; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: /* not implemented */ break;
@@ -4993,8 +4993,8 @@ static CPU_GET_INFO( hyperstone )
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(hyperstone); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map16 = NULL; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO: info->internal_map16 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map16 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_IO: info->internal_map16 = NULL; break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_FAMILY: strcpy(info->s, "Hyperstone CPU"); break;
@@ -5144,10 +5144,10 @@ CPU_GET_INFO( e116t )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_4k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_4k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e116t); break;
@@ -5165,10 +5165,10 @@ CPU_GET_INFO( e116xt )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_8k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_8k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e116xt); break;
@@ -5186,10 +5186,10 @@ CPU_GET_INFO( e116xs )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_16k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_16k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e116xs); break;
@@ -5207,10 +5207,10 @@ CPU_GET_INFO( e116xsr )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_16k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_16k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e116xsr); break;
@@ -5228,10 +5228,10 @@ CPU_GET_INFO( e132n )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 32; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_4k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_4k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e132n); break;
@@ -5249,10 +5249,10 @@ CPU_GET_INFO( e132t )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 32; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_4k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_4k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e132t); break;
@@ -5270,10 +5270,10 @@ CPU_GET_INFO( e132xn )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 32; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_8k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_8k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e132xn); break;
@@ -5291,10 +5291,10 @@ CPU_GET_INFO( e132xt )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 32; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_8k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_8k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e132xt); break;
@@ -5312,10 +5312,10 @@ CPU_GET_INFO( e132xs )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 32; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_16k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_16k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e132xs); break;
@@ -5333,10 +5333,10 @@ CPU_GET_INFO( e132xsr )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 32; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_16k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_16k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(e132xsr); break;
@@ -5354,10 +5354,10 @@ CPU_GET_INFO( gms30c2116 )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_4k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_4k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(gms30c2116); break;
@@ -5375,10 +5375,10 @@ CPU_GET_INFO( gms30c2132 )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 32; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_4k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_4k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(gms30c2132); break;
@@ -5396,10 +5396,10 @@ CPU_GET_INFO( gms30c2216 )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_8k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(e116_8k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(gms30c2216); break;
@@ -5417,10 +5417,10 @@ CPU_GET_INFO( gms30c2232 )
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 32; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_8k_iram_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(e132_8k_iram_map); break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(gms30c2232); break;
diff --git a/src/emu/cpu/esrip/esrip.c b/src/emu/cpu/esrip/esrip.c
index a394de44eb7..9b983566760 100644
--- a/src/emu/cpu/esrip/esrip.c
+++ b/src/emu/cpu/esrip/esrip.c
@@ -1901,15 +1901,15 @@ CPU_GET_INFO( esrip )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 9; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -3; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 9; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -3; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_REGISTER:
case CPUINFO_INT_PC: info->i = RIP_PC; break;
diff --git a/src/emu/cpu/f8/f8.c b/src/emu/cpu/f8/f8.c
index 1ca981204e4..91c43da9354 100644
--- a/src/emu/cpu/f8/f8.c
+++ b/src/emu/cpu/f8/f8.c
@@ -2034,15 +2034,15 @@ CPU_GET_INFO( f8 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 7; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_SP: info->i = cpustate->pc1; break;
case CPUINFO_INT_PC: info->i = (cpustate->pc0 - 1) & 0xffff; break;
diff --git a/src/emu/cpu/g65816/g65816.c b/src/emu/cpu/g65816/g65816.c
index c57d6912b7d..30d58b3ddcc 100644
--- a/src/emu/cpu/g65816/g65816.c
+++ b/src/emu/cpu/g65816/g65816.c
@@ -434,15 +434,15 @@ CPU_GET_INFO( g65816 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 20; /* rough guess */ break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + G65816_LINE_IRQ: info->i = LINE_IRQ; break;
case CPUINFO_INT_INPUT_STATE + G65816_LINE_NMI: info->i = LINE_NMI; break;
diff --git a/src/emu/cpu/h6280/h6280.c b/src/emu/cpu/h6280/h6280.c
index dd529534ed4..145aa804a80 100644
--- a/src/emu/cpu/h6280/h6280.c
+++ b/src/emu/cpu/h6280/h6280.c
@@ -353,7 +353,7 @@ static CPU_TRANSLATE( h6280 )
{
h6280_Regs* cpustate = get_safe_token(device);
- if (space == ADDRESS_SPACE_PROGRAM)
+ if (space == AS_PROGRAM)
*address = TRANSLATED(*address);
return TRUE;
@@ -438,16 +438,16 @@ CPU_GET_INFO( h6280 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 17 + 6*65536; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 21; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 21; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
case CPUINFO_INT_LOGADDR_WIDTH_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 2; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 2; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = cpustate->irq_state[0]; break;
case CPUINFO_INT_INPUT_STATE + 1: info->i = cpustate->irq_state[1]; break;
diff --git a/src/emu/cpu/h83002/h8_16.c b/src/emu/cpu/h83002/h8_16.c
index 814c4be9a2b..9b5fb48ee47 100644
--- a/src/emu/cpu/h83002/h8_16.c
+++ b/src/emu/cpu/h83002/h8_16.c
@@ -550,19 +550,19 @@ static WRITE16_HANDLER( h8_3007_itu1_w )
}
// On-board RAM and peripherals
-static ADDRESS_MAP_START( h8_3002_internal_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( h8_3002_internal_map, AS_PROGRAM, 16 )
// 512B RAM
AM_RANGE(0xfffd10, 0xffff0f) AM_RAM
AM_RANGE(0xffff10, 0xffffff) AM_READWRITE( h8_itu_r, h8_itu_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( h8_3044_internal_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( h8_3044_internal_map, AS_PROGRAM, 16 )
// 32k ROM, 2k RAM
AM_RANGE(0xfff710, 0xffff0f) AM_RAM
AM_RANGE(0xffff1c, 0xffffff) AM_READWRITE( h8_itu_r, h8_itu_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( h8_3007_internal_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( h8_3007_internal_map, AS_PROGRAM, 16 )
// ROM-less, 4k RAM
AM_RANGE(0xfee000, 0xfee0ff) AM_READWRITE( h8_3007_itu1_r, h8_3007_itu1_w )
AM_RANGE(0xffef20, 0xffff1f) AM_RAM
@@ -588,20 +588,20 @@ CPU_GET_INFO( h8_3002 )
case CPUINFO_INT_MAX_INSTRUCTION_BYTES: info->i = 10; break;
// Bus sizes
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
// Internal maps
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(h8_3002_internal_map); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map16 = NULL; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO: info->internal_map16 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(h8_3002_internal_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map16 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_IO: info->internal_map16 = NULL; break;
// CPU misc parameters
case DEVINFO_STR_NAME: strcpy(info->s, "H8/3002"); break;
@@ -648,7 +648,7 @@ CPU_GET_INFO( h8_3044 )
{
switch (state)
{
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(h8_3044_internal_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(h8_3044_internal_map); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(h8_24); break;
case DEVINFO_STR_NAME: strcpy(info->s, "H8/3044"); break;
default:
@@ -660,7 +660,7 @@ CPU_GET_INFO( h8_3007 )
{
switch (state)
{
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(h8_3007_internal_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(h8_3007_internal_map); break;
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(h8_3007); break;
case DEVINFO_STR_NAME: strcpy(info->s, "H8/3007"); break;
default:
diff --git a/src/emu/cpu/h83002/h8_8.c b/src/emu/cpu/h83002/h8_8.c
index 3528fc8e6e2..ce7cd1a4f63 100644
--- a/src/emu/cpu/h83002/h8_8.c
+++ b/src/emu/cpu/h83002/h8_8.c
@@ -744,7 +744,7 @@ static TIMER_CALLBACK( h8_timer_3_cb )
timer_8bit_expire(h8, 1, 1);
}
-static ADDRESS_MAP_START( h8_3334_internal_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( h8_3334_internal_map, AS_PROGRAM, 8 )
// 512B RAM
AM_RANGE(0xfb80, 0xff7f) AM_RAM
AM_RANGE(0xff88, 0xffff) AM_READWRITE( h8330_itu_r, h8330_itu_w )
@@ -769,20 +769,20 @@ CPU_GET_INFO( h8_3334 )
case CPUINFO_INT_MAX_INSTRUCTION_BYTES: info->i = 10; break;
// Bus sizes
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
// Internal maps
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(h8_3334_internal_map); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = NULL; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO: info->internal_map16 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(h8_3334_internal_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_IO: info->internal_map16 = NULL; break;
// CPU misc parameters
case DEVINFO_STR_NAME: strcpy(info->s, "H8/3334"); break;
diff --git a/src/emu/cpu/hcd62121/hcd62121.c b/src/emu/cpu/hcd62121/hcd62121.c
index d4ff03b5d9c..1ab2de40414 100644
--- a/src/emu/cpu/hcd62121/hcd62121.c
+++ b/src/emu/cpu/hcd62121/hcd62121.c
@@ -413,15 +413,15 @@ CPU_GET_INFO( hcd62121 )
case CPUINFO_INT_MIN_CYCLES: info->i = 4; /* right? */ break;
case CPUINFO_INT_MAX_CYCLES: info->i = 48; /* right? */ break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_SP: info->i = cpustate->sp; break;
case CPUINFO_INT_PC: info->i = ( cpustate->cseg << 16 ) | cpustate->ip; break;
diff --git a/src/emu/cpu/hd61700/hd61700.h b/src/emu/cpu/hd61700/hd61700.h
index 76dc22d1ffa..a14fe9a4b3f 100644
--- a/src/emu/cpu/hd61700/hd61700.h
+++ b/src/emu/cpu/hd61700/hd61700.h
@@ -96,7 +96,7 @@ protected:
virtual UINT32 execute_input_lines() const { return 6; }
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
// device_config_disasm_interface overrides
virtual UINT32 disasm_min_opcode_bytes() const { return 1; }
diff --git a/src/emu/cpu/hd6309/hd6309.c b/src/emu/cpu/hd6309/hd6309.c
index c1a3023b117..d931748a568 100644
--- a/src/emu/cpu/hd6309/hd6309.c
+++ b/src/emu/cpu/hd6309/hd6309.c
@@ -1273,15 +1273,15 @@ CPU_GET_INFO( hd6309 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 20; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + HD6309_IRQ_LINE: info->i = m68_state->irq_state[HD6309_IRQ_LINE]; break;
case CPUINFO_INT_INPUT_STATE + HD6309_FIRQ_LINE:info->i = m68_state->irq_state[HD6309_FIRQ_LINE]; break;
diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c
index 28e6c222003..963cf8bf467 100644
--- a/src/emu/cpu/i386/i386.c
+++ b/src/emu/cpu/i386/i386.c
@@ -761,7 +761,7 @@ static CPU_TRANSLATE( i386 )
{
i386_state *cpustate = get_safe_token(device);
int result = 1;
- if (space == ADDRESS_SPACE_PROGRAM)
+ if (space == AS_PROGRAM)
{
if (cpustate->cr[0] & 0x80000000)
result = translate_address(cpustate,address);
@@ -896,17 +896,17 @@ CPU_GET_INFO( i386 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 40; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
case CPUINFO_INT_LOGADDR_WIDTH_PROGRAM: info->i = 32; break;
case CPUINFO_INT_PAGE_SHIFT_PROGRAM: info->i = 12; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE: info->i = CLEAR_LINE; break;
diff --git a/src/emu/cpu/i4004/i4004.c b/src/emu/cpu/i4004/i4004.c
index 87306d5479b..d9a2d2ee0bd 100644
--- a/src/emu/cpu/i4004/i4004.c
+++ b/src/emu/cpu/i4004/i4004.c
@@ -585,17 +585,17 @@ CPU_GET_INFO( i4004 )
case CPUINFO_INT_MIN_CYCLES: info->i = 8; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 12; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 12; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 12; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break; // Only lower 4 bits used
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 6; break; // 4 I/O for each ROM chip and 4 OUT for each RAM
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break; // There could be 4 chips in 16 banks for RAM
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break; // Only lower 4 bits used
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 6; break; // 4 I/O for each ROM chip and 4 OUT for each RAM
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break; // There could be 4 chips in 16 banks for RAM
/* --- the following bits of info are returned as pointers to functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(i4004); break;
diff --git a/src/emu/cpu/i8008/i8008.c b/src/emu/cpu/i8008/i8008.c
index e60fb027be3..5fd91efc137 100644
--- a/src/emu/cpu/i8008/i8008.c
+++ b/src/emu/cpu/i8008/i8008.c
@@ -688,17 +688,17 @@ CPU_GET_INFO( i8008 )
case CPUINFO_INT_MIN_CYCLES: info->i = 8; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 14; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 14; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
/* --- the following bits of info are returned as pointers to functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(i8008); break;
diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c
index fa043adf71d..524a819d367 100644
--- a/src/emu/cpu/i8085/i8085.c
+++ b/src/emu/cpu/i8085/i8085.c
@@ -1215,12 +1215,12 @@ CPU_GET_INFO( i8085 )
case CPUINFO_INT_MIN_CYCLES: info->i = 4; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
/* --- the following bits of info are returned as pointers to functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(i808x); break;
diff --git a/src/emu/cpu/i86/i286.c b/src/emu/cpu/i86/i286.c
index 8710541095e..23310b9107f 100644
--- a/src/emu/cpu/i86/i286.c
+++ b/src/emu/cpu/i86/i286.c
@@ -405,15 +405,15 @@ CPU_GET_INFO( i80286 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 50; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = cpustate->irq_state; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = cpustate->nmi_state; break;
diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c
index 0ab1177d0c9..2dfd32ec5ce 100644
--- a/src/emu/cpu/i86/i86.c
+++ b/src/emu/cpu/i86/i86.c
@@ -561,15 +561,15 @@ CPU_GET_INFO( i8086 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 50; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 20; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = cpustate->irq_state; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = cpustate->nmi_state; break;
@@ -610,8 +610,8 @@ CPU_GET_INFO( i8088 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i8088); break;
@@ -678,8 +678,8 @@ CPU_GET_INFO( i80188 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i8088); break;
diff --git a/src/emu/cpu/i860/i860.c b/src/emu/cpu/i860/i860.c
index 9d8b122ba36..86bfd4f24ce 100644
--- a/src/emu/cpu/i860/i860.c
+++ b/src/emu/cpu/i860/i860.c
@@ -192,15 +192,15 @@ CPU_GET_INFO( i860 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 8; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PC:
case CPUINFO_INT_REGISTER + I860_PC: info->i = cpustate->pc; break;
diff --git a/src/emu/cpu/i960/i960.c b/src/emu/cpu/i960/i960.c
index eeb903298c0..632c9f5c8e9 100644
--- a/src/emu/cpu/i960/i960.c
+++ b/src/emu/cpu/i960/i960.c
@@ -2128,23 +2128,23 @@ CPU_GET_INFO( i960 )
case CPUINFO_INT_MAX_INSTRUCTION_BYTES: info->i = 8; break;
// Bus sizes
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
case CPUINFO_INT_LOGADDR_WIDTH_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
case CPUINFO_INT_LOGADDR_WIDTH_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_LOGADDR_WIDTH_IO: info->i = 0; break;
// Internal maps
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = NULL;break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map32 = NULL;break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO: info->internal_map32 = NULL;break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map32 = NULL;break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map32 = NULL;break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_IO: info->internal_map32 = NULL;break;
// CPU misc parameters
case DEVINFO_STR_NAME: strcpy(info->s, "i960KB"); break;
diff --git a/src/emu/cpu/jaguar/jaguar.c b/src/emu/cpu/jaguar/jaguar.c
index c9b3d3a4abe..5811cd8dc65 100644
--- a/src/emu/cpu/jaguar/jaguar.c
+++ b/src/emu/cpu/jaguar/jaguar.c
@@ -1507,9 +1507,9 @@ CPU_GET_INFO( jaguargpu )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + JAGUAR_IRQ0: info->i = (jaguar->ctrl[G_CTRL] & 0x40) ? ASSERT_LINE : CLEAR_LINE; break;
case CPUINFO_INT_INPUT_STATE + JAGUAR_IRQ1: info->i = (jaguar->ctrl[G_CTRL] & 0x80) ? ASSERT_LINE : CLEAR_LINE; break;
diff --git a/src/emu/cpu/konami/konami.c b/src/emu/cpu/konami/konami.c
index 4575450cbf6..1a78d3e6fdf 100644
--- a/src/emu/cpu/konami/konami.c
+++ b/src/emu/cpu/konami/konami.c
@@ -560,15 +560,15 @@ CPU_GET_INFO( konami )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 13; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + KONAMI_IRQ_LINE: info->i = cpustate->irq_state[KONAMI_IRQ_LINE]; break;
case CPUINFO_INT_INPUT_STATE + KONAMI_FIRQ_LINE:info->i = cpustate->irq_state[KONAMI_FIRQ_LINE]; break;
diff --git a/src/emu/cpu/lh5801/lh5801.c b/src/emu/cpu/lh5801/lh5801.c
index 94013880b53..d2292449f7c 100644
--- a/src/emu/cpu/lh5801/lh5801.c
+++ b/src/emu/cpu/lh5801/lh5801.c
@@ -271,15 +271,15 @@ CPU_GET_INFO( lh5801 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 19; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE: info->i = cpustate->irq_state; break;
diff --git a/src/emu/cpu/lr35902/lr35902.c b/src/emu/cpu/lr35902/lr35902.c
index e6fd5464391..1b4174d17b9 100644
--- a/src/emu/cpu/lr35902/lr35902.c
+++ b/src/emu/cpu/lr35902/lr35902.c
@@ -421,15 +421,15 @@ CPU_GET_INFO( lr35902 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; /* right? */ break;
case CPUINFO_INT_MAX_CYCLES: info->i = 16; /* right? */ break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_SP: info->i = cpustate->w.SP; break;
case CPUINFO_INT_PC: info->i = cpustate->w.PC; break;
diff --git a/src/emu/cpu/m37710/m37710.c b/src/emu/cpu/m37710/m37710.c
index b2caef14559..ad5ced6347c 100644
--- a/src/emu/cpu/m37710/m37710.c
+++ b/src/emu/cpu/m37710/m37710.c
@@ -996,7 +996,7 @@ static CPU_SET_INFO( m37710 )
}
// On-board RAM and peripherals
-static ADDRESS_MAP_START( m37710_internal_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( m37710_internal_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00007f) AM_READWRITE(m37710_internal_word_r, m37710_internal_word_w)
AM_RANGE(0x000080, 0x00027f) AM_RAM
ADDRESS_MAP_END
@@ -1023,15 +1023,15 @@ CPU_GET_INFO( m37710 )
case CPUINFO_INT_MAX_CYCLES: info->i = 20; /* rough guess */ break;
case CPUINFO_INT_INPUT_LINES: info->i = M37710_LINE_MAX; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + M37710_LINE_IRQ0: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + M37710_LINE_IRQ1: info->i = 0; break;
@@ -1066,9 +1066,9 @@ CPU_GET_INFO( m37710 )
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m37710); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->ICount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(m37710_internal_map); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map16 = NULL; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO: info->internal_map8 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(m37710_internal_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map16 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_IO: info->internal_map8 = NULL; break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "M37710"); break;
diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c
index ee9b93284e9..5d0ec414ecc 100644
--- a/src/emu/cpu/m6502/m4510.c
+++ b/src/emu/cpu/m6502/m4510.c
@@ -392,7 +392,7 @@ static WRITE8_HANDLER( m4510_write_0000 )
cpustate->port_write(cpustate->device, 0, m4510_get_port(downcast<legacy_cpu_device *>(space->cpu)));
}
-static ADDRESS_MAP_START(m4510_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(m4510_mem, AS_PROGRAM, 8)
AM_RANGE(0x0000, 0x0001) AM_READWRITE(m4510_read_0000, m4510_write_0000)
ADDRESS_MAP_END
@@ -400,7 +400,7 @@ static CPU_TRANSLATE( m4510 )
{
m4510_Regs *cpustate = get_safe_token(device);
- if (space == ADDRESS_SPACE_PROGRAM)
+ if (space == AS_PROGRAM)
*address = M4510_MEM(*address);
return TRUE;
}
@@ -468,17 +468,17 @@ CPU_GET_INFO( m4510 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 10; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 20; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
case CPUINFO_INT_LOGADDR_WIDTH_PROGRAM: info->i = 16; break;
case CPUINFO_INT_PAGE_SHIFT_PROGRAM: info->i = 13; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + M4510_IRQ_LINE: info->i = cpustate->irq_state; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = cpustate->nmi_state; break;
@@ -517,7 +517,7 @@ CPU_GET_INFO( m4510 )
case CPUINFO_FCT_BURN: info->burn = NULL; break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m4510); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m4510_mem); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m4510_mem); break;
case CPUINFO_FCT_TRANSLATE: info->translate = CPU_TRANSLATE_NAME(m4510); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c
index d6b291d4459..830a7218238 100644
--- a/src/emu/cpu/m6502/m6502.c
+++ b/src/emu/cpu/m6502/m6502.c
@@ -400,7 +400,7 @@ static WRITE8_HANDLER( m6510_write_0000 )
cpustate->port_write( cpustate->device, cpustate->ddr, cpustate->port & cpustate->ddr );
}
-static ADDRESS_MAP_START(m6510_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(m6510_mem, AS_PROGRAM, 8)
AM_RANGE(0x0000, 0x0001) AM_READWRITE(m6510_read_0000, m6510_write_0000)
ADDRESS_MAP_END
@@ -698,15 +698,15 @@ CPU_GET_INFO( m6502 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 10; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + M6502_IRQ_LINE: info->i = cpustate->irq_state; break;
case CPUINFO_INT_INPUT_STATE + M6502_SET_OVERFLOW: info->i = cpustate->so_state; break;
@@ -776,7 +776,7 @@ CPU_GET_INFO( m6504 )
{
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "M6504"); break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 13; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 13; break;
default: CPU_GET_INFO_CALL(m6502); break;
}
@@ -822,7 +822,7 @@ CPU_GET_INFO( m6510 )
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m6510); break;
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(m6510); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m6510); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m6510_mem); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m6510_mem); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "M6510"); break;
@@ -964,8 +964,8 @@ CPU_GET_INFO( deco16 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 8; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(deco16); break;
diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c
index 3ea7f7c3873..ddebf42cd26 100644
--- a/src/emu/cpu/m6502/m6509.c
+++ b/src/emu/cpu/m6502/m6509.c
@@ -130,7 +130,7 @@ static WRITE8_HANDLER( m6509_write_00001 )
cpustate->ind_bank.b.h2=data&0xf;
}
-static ADDRESS_MAP_START(m6509_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(m6509_mem, AS_PROGRAM, 8)
AM_RANGE(0x00000, 0x00000) AM_MIRROR(0xF0000) AM_READWRITE(m6509_read_00000, m6509_write_00000)
AM_RANGE(0x00001, 0x00001) AM_MIRROR(0xF0000) AM_READWRITE(m6509_read_00001, m6509_write_00001)
ADDRESS_MAP_END
@@ -343,15 +343,15 @@ CPU_GET_INFO( m6509 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 10; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 20; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + M6509_IRQ_LINE: info->i = cpustate->irq_state; break;
case CPUINFO_INT_INPUT_STATE + M6509_SET_OVERFLOW:info->i = cpustate->so_state; break;
@@ -381,7 +381,7 @@ CPU_GET_INFO( m6509 )
case CPUINFO_FCT_BURN: info->burn = NULL; break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m6502); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m6509_mem); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m6509_mem); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "M6509"); break;
diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c
index 7bfe01575d9..899d9aa2788 100644
--- a/src/emu/cpu/m6502/m65ce02.c
+++ b/src/emu/cpu/m6502/m65ce02.c
@@ -288,17 +288,17 @@ CPU_GET_INFO( m65ce02 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 10; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 20; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
case CPUINFO_INT_LOGADDR_WIDTH_PROGRAM: info->i = 16; break;
case CPUINFO_INT_PAGE_SHIFT_PROGRAM: info->i = 13; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE+M65CE02_NMI_STATE: info->i = cpustate->nmi_state; break;
case CPUINFO_INT_INPUT_STATE+M65CE02_IRQ_STATE: info->i = cpustate->irq_state; break;
diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c
index 22348b1832e..23e68c92d03 100644
--- a/src/emu/cpu/m6800/m6800.c
+++ b/src/emu/cpu/m6800/m6800.c
@@ -1266,7 +1266,7 @@ static CPU_INIT( m6803 )
}
}
-static ADDRESS_MAP_START(m6803_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(m6803_mem, AS_PROGRAM, 8)
AM_RANGE(0x0000, 0x001f) AM_READWRITE(m6801_io_r, m6801_io_w)
AM_RANGE(0x0020, 0x007f) AM_NOP /* unused */
AM_RANGE(0x0080, 0x00ff) AM_RAM /* 6803 internal RAM */
@@ -1862,15 +1862,15 @@ CPU_GET_INFO( m6800 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 12; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 9; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 9; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + M6800_IRQ_LINE: info->i = cpustate->irq_state[M6800_IRQ_LINE]; break;
case CPUINFO_INT_INPUT_STATE + M6801_TIN_LINE: info->i = cpustate->irq_state[M6801_TIN_LINE]; break;
@@ -1939,8 +1939,8 @@ CPU_GET_INFO( m6801 )
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
case CPUINFO_INT_CLOCK_DIVIDER: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 9; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 9; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m6801); break;
@@ -1987,14 +1987,14 @@ CPU_GET_INFO( m6803 )
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
case CPUINFO_INT_CLOCK_DIVIDER: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 9; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 9; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m6803); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(m6803); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m6803_mem); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(m6803_mem); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "M6803"); break;
@@ -2037,8 +2037,8 @@ CPU_GET_INFO( hd6301 )
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
case CPUINFO_INT_CLOCK_DIVIDER: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 9; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 9; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(hd6301); break;
@@ -2061,8 +2061,8 @@ CPU_GET_INFO( hd63701 )
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
case CPUINFO_INT_CLOCK_DIVIDER: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 9; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 9; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(hd63701); break;
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c
index 71c2ba4a1f1..94f3b4a2e41 100644
--- a/src/emu/cpu/m68000/m68kcpu.c
+++ b/src/emu/cpu/m68000/m68kcpu.c
@@ -563,7 +563,7 @@ static CPU_TRANSLATE( m68k )
/* only applies to the program address space and only does something if the MMU's enabled */
if (m68k)
{
- if ((space == ADDRESS_SPACE_PROGRAM) && (m68k->pmmu_enabled))
+ if ((space == AS_PROGRAM) && (m68k->pmmu_enabled))
{
// FIXME: mmu_tmp_sr will be overwritten in pmmu_translate_addr_with_fc
UINT16 mmu_tmp_sr = m68k->mmu_tmp_sr;
@@ -590,7 +590,7 @@ static CPU_TRANSLATE( m68khmmu )
/* only applies to the program address space and only does something if the MMU's enabled */
if (m68k)
{
- if ((space == ADDRESS_SPACE_PROGRAM) && (m68k->hmmu_enabled))
+ if ((space == AS_PROGRAM) && (m68k->hmmu_enabled))
{
*address = hmmu_translate_addr(m68k, *address);
}
@@ -1015,9 +1015,9 @@ static CPU_GET_INFO( m68k )
case CPUINFO_INT_MIN_CYCLES: info->i = 4; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 158; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = 0; /* there is no level 0 */ break;
case CPUINFO_INT_INPUT_STATE + 1: info->i = (m68k->virq_state >> 1) & 1; break;
@@ -1666,8 +1666,8 @@ CPU_GET_INFO( m68008 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 22; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 22; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68008); break;
@@ -1772,8 +1772,8 @@ CPU_GET_INFO( m68020 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 158; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68020); break;
@@ -1886,7 +1886,7 @@ CPU_GET_INFO( m68ec020 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68ec020); break;
@@ -1942,8 +1942,8 @@ CPU_GET_INFO( m68030 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 158; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68030); break;
@@ -2049,8 +2049,8 @@ CPU_GET_INFO( m68040 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 158; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68040); break;
@@ -2178,7 +2178,7 @@ CPU_GET_INFO( scc68070 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(scc68070); break;
diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c
index 30ae0cbfdd2..9840b049dc4 100644
--- a/src/emu/cpu/m6805/m6805.c
+++ b/src/emu/cpu/m6805/m6805.c
@@ -978,15 +978,15 @@ CPU_GET_INFO( m6805 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 10; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 12; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + M6805_IRQ_LINE: info->i = cpustate->irq_state[M6805_IRQ_LINE]; break;
@@ -1065,7 +1065,7 @@ CPU_GET_INFO( m68hc05eg )
case CPUINFO_INT_INPUT_STATE + M68HC05EG_INT_TIMER: info->i = cpustate->irq_state[M68HC05EG_INT_TIMER]; break;
case CPUINFO_INT_INPUT_STATE + M68HC05EG_INT_CPI: info->i = cpustate->irq_state[M68HC05EG_INT_CPI]; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 13; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 13; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(m68hc05eg); break;
@@ -1159,7 +1159,7 @@ CPU_GET_INFO( hd63705 )
case CPUINFO_INT_INPUT_STATE + HD63705_INT_ADCONV: info->i = cpustate->irq_state[HD63705_INT_ADCONV]; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = cpustate->irq_state[HD63705_INT_NMI]; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(hd63705); break;
diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c
index 0b85186775f..75d4ed9183f 100644
--- a/src/emu/cpu/m6809/m6809.c
+++ b/src/emu/cpu/m6809/m6809.c
@@ -849,15 +849,15 @@ CPU_GET_INFO( m6809 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 19; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + M6809_IRQ_LINE: info->i = m68_state->irq_state[M6809_IRQ_LINE]; break;
case CPUINFO_INT_INPUT_STATE + M6809_FIRQ_LINE: info->i = m68_state->irq_state[M6809_FIRQ_LINE]; break;
diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/emu/cpu/mb86233/mb86233.c
index f02ad292a90..64c0483995a 100644
--- a/src/emu/cpu/mb86233/mb86233.c
+++ b/src/emu/cpu/mb86233/mb86233.c
@@ -1619,15 +1619,15 @@ CPU_GET_INFO( mb86233 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 2; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -2; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -2; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PREVIOUSPC: /* not implemented */ break;
diff --git a/src/emu/cpu/mb88xx/mb88xx.c b/src/emu/cpu/mb88xx/mb88xx.c
index 6ba06ca866f..d14b6cf5b44 100644
--- a/src/emu/cpu/mb88xx/mb88xx.c
+++ b/src/emu/cpu/mb88xx/mb88xx.c
@@ -874,19 +874,19 @@ static CPU_EXECUTE( mb88 )
ADDRESS MAPS
***************************************************************************/
-static ADDRESS_MAP_START(program_10bit, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(program_10bit, AS_PROGRAM, 8)
AM_RANGE(0x000, 0x3ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(program_11bit, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(program_11bit, AS_PROGRAM, 8)
AM_RANGE(0x000, 0x7ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(data_6bit, ADDRESS_SPACE_DATA, 8)
+static ADDRESS_MAP_START(data_6bit, AS_DATA, 8)
AM_RANGE(0x00, 0x3f) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(data_7bit, ADDRESS_SPACE_DATA, 8)
+static ADDRESS_MAP_START(data_7bit, AS_DATA, 8)
AM_RANGE(0x00, 0x7f) AM_RAM
ADDRESS_MAP_END
@@ -951,15 +951,15 @@ CPU_GET_INFO( mb88 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 3; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 11; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 7; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 3; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 11; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 7; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 3; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + MB88_IRQ_LINE: info->i = cpustate->pending_interrupt ? ASSERT_LINE : CLEAR_LINE; break;
@@ -995,8 +995,8 @@ CPU_GET_INFO( mb88 )
case CPUINFO_FCT_BURN: info->burn = NULL; break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(mb88); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_11bit); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_11bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "MB88xx"); break;
@@ -1043,12 +1043,12 @@ CPU_GET_INFO( mb8841 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 11; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 7; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 11; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 7; break;
/* --- the following bits of info are returned as pointers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_11bit); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_11bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "MB8841"); break;
@@ -1062,12 +1062,12 @@ CPU_GET_INFO( mb8842 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 11; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 7; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 11; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 7; break;
/* --- the following bits of info are returned as pointers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_11bit); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_11bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "MB8842"); break;
@@ -1081,12 +1081,12 @@ CPU_GET_INFO( mb8843 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 10; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 6; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 10; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 6; break;
/* --- the following bits of info are returned as pointers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_10bit); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_6bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_10bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_6bit); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "MB8843"); break;
@@ -1100,12 +1100,12 @@ CPU_GET_INFO( mb8844 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 10; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 6; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 10; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 6; break;
/* --- the following bits of info are returned as pointers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_10bit); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_6bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_10bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_6bit); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "MB8844"); break;
diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/emu/cpu/mc68hc11/mc68hc11.c
index ac8e9bbb2f7..7cd5d87d15e 100644
--- a/src/emu/cpu/mc68hc11/mc68hc11.c
+++ b/src/emu/cpu/mc68hc11/mc68hc11.c
@@ -550,15 +550,15 @@ CPU_GET_INFO( mc68hc11 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 41; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + MC68HC11_IRQ_LINE: info->i = cpustate->irq_state[MC68HC11_IRQ_LINE]; break;
diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c
index 946a3aa0998..bcedcf23008 100644
--- a/src/emu/cpu/mcs48/mcs48.c
+++ b/src/emu/cpu/mcs48/mcs48.c
@@ -175,14 +175,14 @@ typedef int (*mcs48_ophandler)(mcs48_state *state);
MACROS
***************************************************************************/
-/* ROM is mapped to ADDRESS_SPACE_PROGRAM */
+/* ROM is mapped to AS_PROGRAM */
#define program_r(a) cpustate->program->read_byte(a)
-/* RAM is mapped to ADDRESS_SPACE_DATA */
+/* RAM is mapped to AS_DATA */
#define ram_r(a) cpustate->data->read_byte(a)
#define ram_w(a,V) cpustate->data->write_byte(a, V)
-/* ports are mapped to ADDRESS_SPACE_IO */
+/* ports are mapped to AS_IO */
#define ext_r(a) cpustate->io->read_byte(a)
#define ext_w(a,V) cpustate->io->write_byte(a, V)
#define port_r(a) cpustate->io->read_byte(MCS48_PORT_P0 + a)
@@ -1225,27 +1225,27 @@ void upi41_master_w(device_t *_device, UINT8 a0, UINT8 data)
***************************************************************************/
/* FIXME: the memory maps should probably support rom banking for EA */
-static ADDRESS_MAP_START(program_10bit, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(program_10bit, AS_PROGRAM, 8)
AM_RANGE(0x000, 0x3ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(program_11bit, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(program_11bit, AS_PROGRAM, 8)
AM_RANGE(0x000, 0x7ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(program_12bit, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(program_12bit, AS_PROGRAM, 8)
AM_RANGE(0x000, 0xfff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(data_6bit, ADDRESS_SPACE_DATA, 8)
+static ADDRESS_MAP_START(data_6bit, AS_DATA, 8)
AM_RANGE(0x00, 0x3f) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(data_7bit, ADDRESS_SPACE_DATA, 8)
+static ADDRESS_MAP_START(data_7bit, AS_DATA, 8)
AM_RANGE(0x00, 0x7f) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(data_8bit, ADDRESS_SPACE_DATA, 8)
+static ADDRESS_MAP_START(data_8bit, AS_DATA, 8)
AM_RANGE(0x00, 0xff) AM_RAM
ADDRESS_MAP_END
@@ -1375,15 +1375,15 @@ static CPU_GET_INFO( mcs48 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 3; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 12; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: /*info->i = 6 or 7 or 8;*/ break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 9; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: /*info->i = 6 or 7 or 8;*/ break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 9; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + MCS48_INPUT_IRQ: info->i = cpustate->irq_state ? ASSERT_LINE : CLEAR_LINE; break;
case CPUINFO_INT_INPUT_STATE + MCS48_INPUT_EA: info->i = cpustate->ea; break;
@@ -1400,8 +1400,8 @@ static CPU_GET_INFO( mcs48 )
/* --- the following bits of info are returned as pointers --- */
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: /* set per-core */ break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: /* set per-core */ break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: /* set per-core */ break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: /* set per-core */ break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: /* set per-core */ break;
@@ -1423,7 +1423,7 @@ static void mcs48_generic_get_info(const device_config *devconfig, legacy_cpu_de
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA:
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA:
if (ramsize == 64)
info->i = 6;
else if (ramsize == 128)
@@ -1456,7 +1456,7 @@ static void mcs48_generic_get_info(const device_config *devconfig, legacy_cpu_de
break;
/* --- the following bits of info are returned as pointers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM:
if (romsize == 0)
info->internal_map8 = NULL;
else if (romsize == 1024)
@@ -1469,7 +1469,7 @@ static void mcs48_generic_get_info(const device_config *devconfig, legacy_cpu_de
fatalerror("mcs48_generic_get_info: Invalid RAM size");
break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA:
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA:
if (ramsize == 64)
info->internal_map8 = ADDRESS_MAP_NAME(data_6bit);
else if (ramsize == 128)
diff --git a/src/emu/cpu/mcs51/mcs51.c b/src/emu/cpu/mcs51/mcs51.c
index f197dd4c93c..61bfde09727 100644
--- a/src/emu/cpu/mcs51/mcs51.c
+++ b/src/emu/cpu/mcs51/mcs51.c
@@ -2404,20 +2404,20 @@ static CPU_INIT( ds5002fp )
ADDRESS MAPS
***************************************************************************/
-static ADDRESS_MAP_START(program_12bit, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(program_12bit, AS_PROGRAM, 8)
AM_RANGE(0x00, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(program_13bit, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(program_13bit, AS_PROGRAM, 8)
AM_RANGE(0x00, 0x1fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(data_7bit, ADDRESS_SPACE_DATA, 8)
+static ADDRESS_MAP_START(data_7bit, AS_DATA, 8)
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x0100, 0x01ff) AM_RAM /* SFR */
ADDRESS_MAP_END
-static ADDRESS_MAP_START(data_8bit, ADDRESS_SPACE_DATA, 8)
+static ADDRESS_MAP_START(data_8bit, AS_DATA, 8)
AM_RANGE(0x0000, 0x00ff) AM_RAM
AM_RANGE(0x0100, 0x01ff) AM_RAM /* SFR */
ADDRESS_MAP_END
@@ -2487,15 +2487,15 @@ static CPU_GET_INFO( mcs51 )
case CPUINFO_INT_MAX_CYCLES: info->i = 20; /* rough guess */ break;
case CPUINFO_INT_INPUT_LINES: info->i = 3; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 9; /* due to sfr mapping */ break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 18; /* 128k for ds5002fp */ break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 9; /* due to sfr mapping */ break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 18; /* 128k for ds5002fp */ break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PREVIOUSPC: info->i = PPC; break;
case CPUINFO_INT_PC: info->i = PC; break;
@@ -2529,9 +2529,9 @@ static CPU_GET_INFO( mcs51 )
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i8051); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &mcs51_state->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = NULL; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = NULL; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO: info->internal_map8 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_IO: info->internal_map8 = NULL; break;
case DEVINFO_STR_NAME: strcpy(info->s, "I8051"); break;
case DEVINFO_STR_FAMILY: strcpy(info->s, "MCS-51"); break;
@@ -2579,7 +2579,7 @@ CPU_GET_INFO( i8031 )
{
switch (state)
{
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
case DEVINFO_STR_NAME: strcpy(info->s, "I8031"); break;
default: CPU_GET_INFO_CALL(mcs51); break;
}
@@ -2590,8 +2590,8 @@ CPU_GET_INFO( i8051 )
{
switch (state)
{
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_12bit); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_12bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
case DEVINFO_STR_NAME: strcpy(info->s, "I8051"); break;
default: CPU_GET_INFO_CALL(mcs51); break;
}
@@ -2603,7 +2603,7 @@ CPU_GET_INFO( i8032 )
switch (state)
{
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i8052); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_8bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_8bit); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i8052); break;
case DEVINFO_STR_NAME: strcpy(info->s, "I8032"); break;
default: CPU_GET_INFO_CALL(mcs51); break;
@@ -2615,8 +2615,8 @@ CPU_GET_INFO( i8052 )
switch (state)
{
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i8052); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_13bit); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_8bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_13bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_8bit); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i8052); break;
case DEVINFO_STR_NAME: strcpy(info->s, "I8052"); break;
default: CPU_GET_INFO_CALL(mcs51); break;
@@ -2627,8 +2627,8 @@ CPU_GET_INFO( i8751 )
{
switch (state)
{
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_12bit); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_12bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
case DEVINFO_STR_NAME: strcpy(info->s, "I8751"); break;
default: CPU_GET_INFO_CALL(mcs51); break;
}
@@ -2639,8 +2639,8 @@ CPU_GET_INFO( i8752 )
switch (state)
{
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i8052); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_13bit); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_8bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_13bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_8bit); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i8052); break;
case DEVINFO_STR_NAME: strcpy(info->s, "I8752"); break;
default: CPU_GET_INFO_CALL(mcs51); break;
@@ -2658,8 +2658,8 @@ CPU_GET_INFO( i80c31 )
switch (state)
{
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(i80c31); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = NULL; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(data_7bit); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(i80c51); break;
case DEVINFO_STR_NAME: strcpy(info->s, "I80C31"); break;
default: CPU_GET_INFO_CALL(i8031); break;
diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c
index c427cb83d4a..5750b766613 100644
--- a/src/emu/cpu/minx/minx.c
+++ b/src/emu/cpu/minx/minx.c
@@ -321,15 +321,15 @@ CPU_GET_INFO( minx )
case CPUINFO_INT_MAX_INSTRUCTION_BYTES: info->i = 5; break;
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = 0; break;
case CPUINFO_INT_REGISTER + STATE_GENPC: info->i = GET_MINX_PC; break;
case CPUINFO_INT_REGISTER + STATE_GENSP:
diff --git a/src/emu/cpu/mips/mips3com.c b/src/emu/cpu/mips/mips3com.c
index 78f1f0a83b4..9e84e9d3780 100644
--- a/src/emu/cpu/mips/mips3com.c
+++ b/src/emu/cpu/mips/mips3com.c
@@ -102,7 +102,7 @@ void mips3com_init(mips3_state *mips, mips3_flavor flavor, int bigendian, legacy
mips->program->accessors(mips->memory);
/* allocate the virtual TLB */
- mips->vtlb = vtlb_alloc(device, ADDRESS_SPACE_PROGRAM, 2 * mips->tlbentries + 2, 0);
+ mips->vtlb = vtlb_alloc(device, AS_PROGRAM, 2 * mips->tlbentries + 2, 0);
/* allocate a timer for the compare interrupt */
mips->compare_int_timer = device->machine->scheduler().timer_alloc(FUNC(compare_int_callback), (void *)device);
@@ -238,10 +238,10 @@ void mips3com_asid_changed(mips3_state *mips)
from logical to physical
-------------------------------------------------*/
-int mips3com_translate_address(mips3_state *mips, int space, int intention, offs_t *address)
+int mips3com_translate_address(mips3_state *mips, address_spacenum space, int intention, offs_t *address)
{
/* only applies to the program address space */
- if (space == ADDRESS_SPACE_PROGRAM)
+ if (space == AS_PROGRAM)
{
const vtlb_entry *table = vtlb_table(mips->vtlb);
vtlb_entry entry = table[*address >> MIPS3_MIN_PAGE_SHIFT];
@@ -468,9 +468,9 @@ void mips3com_get_info(mips3_state *mips, UINT32 state, cpuinfo *info)
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 40; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = MIPS3_MAX_PADDR_SHIFT;break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = MIPS3_MAX_PADDR_SHIFT;break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
case CPUINFO_INT_LOGADDR_WIDTH_PROGRAM: info->i = 32; break;
case CPUINFO_INT_PAGE_SHIFT_PROGRAM: info->i = MIPS3_MIN_PAGE_SHIFT; break;
diff --git a/src/emu/cpu/mips/mips3com.h b/src/emu/cpu/mips/mips3com.h
index 8b650757023..ac89400fa71 100644
--- a/src/emu/cpu/mips/mips3com.h
+++ b/src/emu/cpu/mips/mips3com.h
@@ -240,7 +240,7 @@ offs_t mips3com_dasm(mips3_state *mips, char *buffer, offs_t pc, const UINT8 *op
void mips3com_update_cycle_counting(mips3_state *mips);
void mips3com_asid_changed(mips3_state *mips);
-int mips3com_translate_address(mips3_state *mips, int space, int intention, offs_t *address);
+int mips3com_translate_address(mips3_state *mips, address_spacenum space, int intention, offs_t *address);
void mips3com_tlbr(mips3_state *mips);
void mips3com_tlbwi(mips3_state *mips);
void mips3com_tlbwr(mips3_state *mips);
diff --git a/src/emu/cpu/mips/mips3fe.c b/src/emu/cpu/mips/mips3fe.c
index f22c75aedc6..9f2b50a14e7 100644
--- a/src/emu/cpu/mips/mips3fe.c
+++ b/src/emu/cpu/mips/mips3fe.c
@@ -68,7 +68,7 @@ bool mips3_frontend::describe(opcode_desc &desc, const opcode_desc *prev)
// compute the physical PC
assert((desc.physpc & 3) == 0);
- if (!mips3com_translate_address(&m_context, ADDRESS_SPACE_PROGRAM, TRANSLATE_FETCH, &desc.physpc))
+ if (!mips3com_translate_address(&m_context, AS_PROGRAM, TRANSLATE_FETCH, &desc.physpc))
{
// uh-oh: a page fault; leave the description empty and just if this is the first instruction, leave it empty and
// mark as needing to validate; otherwise, just end the sequence here
diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c
index 4e45f3044c6..2f9e1a1acbc 100644
--- a/src/emu/cpu/mips/psx.c
+++ b/src/emu/cpu/mips/psx.c
@@ -1536,7 +1536,7 @@ int psxcpu_device::store_data_address_breakpoint( UINT32 address )
}
// On-board RAM and peripherals
-static ADDRESS_MAP_START( psxcpu_internal_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( psxcpu_internal_map, AS_PROGRAM, 32 )
AM_RANGE(0x00800000, 0x1effffff) AM_DEVREADWRITE(DEVICE_SELF,psx_berr_r, psx_berr_w)
AM_RANGE(0x1f800400, 0x1f800fff) AM_DEVREADWRITE(DEVICE_SELF,psx_berr_r, psx_berr_w)
AM_RANGE(0x20000000, 0x7fffffff) AM_DEVREADWRITE(DEVICE_SELF,psx_berr_r, psx_berr_w)
@@ -1546,7 +1546,7 @@ static ADDRESS_MAP_START( psxcpu_internal_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfffe0130, 0xfffe0133) AM_DEVREADWRITE(DEVICE_SELF,psx_biu_r, psx_biu_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cxd8661r_internal_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( cxd8661r_internal_map, AS_PROGRAM, 32 )
AM_RANGE(0x01000000, 0x1effffff) AM_DEVREADWRITE(DEVICE_SELF,psx_berr_r, psx_berr_w)
AM_RANGE(0x1f800400, 0x1f800fff) AM_DEVREADWRITE(DEVICE_SELF,psx_berr_r, psx_berr_w)
AM_RANGE(0x20000000, 0x7fffffff) AM_DEVREADWRITE(DEVICE_SELF,psx_berr_r, psx_berr_w)
diff --git a/src/emu/cpu/mips/psx.h b/src/emu/cpu/mips/psx.h
index c76404df631..2704552d179 100644
--- a/src/emu/cpu/mips/psx.h
+++ b/src/emu/cpu/mips/psx.h
@@ -147,7 +147,7 @@ protected:
virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return cycles * 4; }
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : NULL; }
// device_config_disasm_interface overrides
virtual UINT32 disasm_min_opcode_bytes() const { return 4; }
diff --git a/src/emu/cpu/mips/r3000.c b/src/emu/cpu/mips/r3000.c
index f51f28e02e5..1388fd9edf6 100644
--- a/src/emu/cpu/mips/r3000.c
+++ b/src/emu/cpu/mips/r3000.c
@@ -1176,15 +1176,15 @@ static CPU_GET_INFO( r3000 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 40; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 29; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 29; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + R3000_IRQ0: info->i = (r3000->cpr[0][COP0_Cause] & 0x400) ? ASSERT_LINE : CLEAR_LINE; break;
case CPUINFO_INT_INPUT_STATE + R3000_IRQ1: info->i = (r3000->cpr[0][COP0_Cause] & 0x800) ? ASSERT_LINE : CLEAR_LINE; break;
diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c
index 69cb5e8f382..9b37e6d194d 100644
--- a/src/emu/cpu/mn10200/mn10200.c
+++ b/src/emu/cpu/mn10200/mn10200.c
@@ -2375,15 +2375,15 @@ CPU_GET_INFO( mn10200 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 8; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PC: /* intentional fallthrough */
case CPUINFO_INT_REGISTER + MN10200_PC: info->i = cpustate->pc; break;
diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c
index 35f76d2fbf3..026d7850013 100644
--- a/src/emu/cpu/nec/nec.c
+++ b/src/emu/cpu/nec/nec.c
@@ -513,15 +513,15 @@ static CPU_GET_INFO( nec )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 80; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 20; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = (nec_state->pending_irq & INT_IRQ) ? ASSERT_LINE : CLEAR_LINE; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = nec_state->nmi_state; break;
@@ -614,8 +614,8 @@ CPU_GET_INFO( v20 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(v20); break;
diff --git a/src/emu/cpu/nec/v25.c b/src/emu/cpu/nec/v25.c
index e4adc5cabb8..8b8f27eef71 100644
--- a/src/emu/cpu/nec/v25.c
+++ b/src/emu/cpu/nec/v25.c
@@ -620,15 +620,15 @@ static CPU_GET_INFO( v25v35 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 80; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 20; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 17; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 17; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = (nec_state->pending_irq & INT_IRQ) ? ASSERT_LINE : CLEAR_LINE; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = nec_state->nmi_state; break;
@@ -722,8 +722,8 @@ CPU_GET_INFO( v25 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(v25); break;
@@ -745,8 +745,8 @@ CPU_GET_INFO( v35 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(v35); break;
diff --git a/src/emu/cpu/pdp1/pdp1.c b/src/emu/cpu/pdp1/pdp1.c
index 74b6fb7cbdb..d356596b8e7 100644
--- a/src/emu/cpu/pdp1/pdp1.c
+++ b/src/emu/cpu/pdp1/pdp1.c
@@ -947,15 +947,15 @@ CPU_GET_INFO( pdp1 )
case CPUINFO_INT_MIN_CYCLES: info->i = 5; /* 5us cycle time */ break;
case CPUINFO_INT_MAX_CYCLES: info->i = 31; /* we emulate individual 5us cycle, but MUL/DIV have longer timings */ break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 18; /*16+2 ignored bits to make double word address*/ break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 18; /*16+2 ignored bits to make double word address*/ break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_SP: info->i = 0; /* no SP */ break;
case CPUINFO_INT_PC: info->i = PC; break;
diff --git a/src/emu/cpu/pdp1/tx0.c b/src/emu/cpu/pdp1/tx0.c
index e65a6fe812d..15b1aa0dcd6 100644
--- a/src/emu/cpu/pdp1/tx0.c
+++ b/src/emu/cpu/pdp1/tx0.c
@@ -441,15 +441,15 @@ CPU_GET_INFO( tx0_64kw )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 3; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -2; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -2; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_SP: info->i = 0; /* no SP */ break;
case CPUINFO_INT_PC: info->i = PC; break;
@@ -567,15 +567,15 @@ CPU_GET_INFO( tx0_8kw )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 3; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 13; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -2; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 13; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -2; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_SP: info->i = 0; /* no SP */ break;
case CPUINFO_INT_PC: info->i = PC; break;
diff --git a/src/emu/cpu/pic16c5x/pic16c5x.c b/src/emu/cpu/pic16c5x/pic16c5x.c
index b08d01496ff..876c3e1841a 100644
--- a/src/emu/cpu/pic16c5x/pic16c5x.c
+++ b/src/emu/cpu/pic16c5x/pic16c5x.c
@@ -1009,15 +1009,15 @@ static CPU_GET_INFO( pic16c5x )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 2; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 9; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 5; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 5; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 9; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 5; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 5; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PREVIOUSPC: info->i = cpustate->PREVPC; break;
@@ -1097,11 +1097,11 @@ static CPU_GET_INFO( pic16c5x )
* Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( pic16c54_rom, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pic16c54_rom, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x1ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pic16c54_ram, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( pic16c54_ram, AS_DATA, 8 )
AM_RANGE(0x00, 0x07) AM_RAM
AM_RANGE(0x08, 0x0f) AM_RAM
AM_RANGE(0x10, 0x1f) AM_RAM
@@ -1135,13 +1135,13 @@ CPU_GET_INFO( pic16c54 )
{
switch (state)
{
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 9; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 5; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 9; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 5; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(pic16c54); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c54_rom); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c54_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c54_rom); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c54_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C54"); break;
@@ -1155,11 +1155,11 @@ CPU_GET_INFO( pic16c54 )
* Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( pic16c55_rom, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pic16c55_rom, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x1ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pic16c55_ram, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( pic16c55_ram, AS_DATA, 8 )
AM_RANGE(0x00, 0x07) AM_RAM
AM_RANGE(0x08, 0x0f) AM_RAM
AM_RANGE(0x10, 0x1f) AM_RAM
@@ -1193,13 +1193,13 @@ CPU_GET_INFO( pic16c55 )
{
switch (state)
{
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 9; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 5; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 9; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 5; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(pic16c55); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c55_rom); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c55_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c55_rom); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c55_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C55"); break;
@@ -1213,11 +1213,11 @@ CPU_GET_INFO( pic16c55 )
* Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( pic16c56_rom, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pic16c56_rom, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x3ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pic16c56_ram, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( pic16c56_ram, AS_DATA, 8 )
AM_RANGE(0x00, 0x07) AM_RAM
AM_RANGE(0x08, 0x0f) AM_RAM
AM_RANGE(0x10, 0x1f) AM_RAM
@@ -1251,13 +1251,13 @@ CPU_GET_INFO( pic16c56 )
{
switch (state)
{
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 10; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 5; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 10; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 5; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(pic16c56); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c56_rom); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c56_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c56_rom); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c56_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C56"); break;
@@ -1271,11 +1271,11 @@ CPU_GET_INFO( pic16c56 )
* Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( pic16c57_rom, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pic16c57_rom, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x7ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pic16c57_ram, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( pic16c57_ram, AS_DATA, 8 )
AM_RANGE(0x00, 0x07) AM_RAM AM_MIRROR(0x60)
AM_RANGE(0x08, 0x0f) AM_RAM AM_MIRROR(0x60)
AM_RANGE(0x10, 0x1f) AM_RAM
@@ -1312,12 +1312,12 @@ CPU_GET_INFO( pic16c57 )
{
switch (state)
{
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 11; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 7; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 11; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 7; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(pic16c57); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c57_rom); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c57_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c57_rom); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c57_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C57"); break;
@@ -1331,11 +1331,11 @@ CPU_GET_INFO( pic16c57 )
* Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( pic16c58_rom, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pic16c58_rom, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x7ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pic16c58_ram, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( pic16c58_ram, AS_DATA, 8 )
AM_RANGE(0x00, 0x07) AM_RAM AM_MIRROR(0x60)
AM_RANGE(0x08, 0x0f) AM_RAM AM_MIRROR(0x60)
AM_RANGE(0x10, 0x1f) AM_RAM
@@ -1372,12 +1372,12 @@ CPU_GET_INFO( pic16c58 )
{
switch (state)
{
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 11; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 7; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 11; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 7; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(pic16c58); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c58_rom); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c58_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c58_rom); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c58_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C58"); break;
diff --git a/src/emu/cpu/pic16c62x/pic16c62x.c b/src/emu/cpu/pic16c62x/pic16c62x.c
index 7b1255026bb..bae5876979e 100644
--- a/src/emu/cpu/pic16c62x/pic16c62x.c
+++ b/src/emu/cpu/pic16c62x/pic16c62x.c
@@ -1127,15 +1127,15 @@ static CPU_GET_INFO( pic16c62x )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 2; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 12; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 5; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 5; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PREVIOUSPC: info->i = cpustate->PREVPC; break;
@@ -1226,11 +1226,11 @@ static CPU_GET_INFO( pic16c62x )
* Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( pic16c620_rom, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pic16c620_rom, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x1ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pic16c620_ram, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( pic16c620_ram, AS_DATA, 8 )
AM_RANGE(0x00, 0x06) AM_RAM
AM_RANGE(0x0a, 0x0c) AM_RAM
AM_RANGE(0x1f, 0x6f) AM_RAM
@@ -1266,13 +1266,13 @@ CPU_GET_INFO( pic16c620 )
{
switch (state)
{
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 9; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 9; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 8; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(pic16c620); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c620_rom); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c620_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c620_rom); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c620_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C620"); break;
@@ -1289,11 +1289,11 @@ CPU_GET_INFO( pic16c620 )
* Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( pic16c621_rom, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pic16c621_rom, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x3ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pic16c621_ram, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( pic16c621_ram, AS_DATA, 8 )
AM_RANGE(0x00, 0x06) AM_RAM
AM_RANGE(0x0a, 0x0c) AM_RAM
AM_RANGE(0x1f, 0x6f) AM_RAM
@@ -1329,13 +1329,13 @@ CPU_GET_INFO( pic16c621 )
{
switch (state)
{
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 10; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 10; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 8; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(pic16c621); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c621_rom); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c621_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c621_rom); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c621_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C621"); break;
@@ -1352,11 +1352,11 @@ CPU_GET_INFO( pic16c621 )
* Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( pic16c622_rom, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pic16c622_rom, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x7ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pic16c622_ram, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( pic16c622_ram, AS_DATA, 8 )
AM_RANGE(0x00, 0x06) AM_RAM
AM_RANGE(0x0a, 0x0c) AM_RAM
AM_RANGE(0x1f, 0x7f) AM_RAM
@@ -1392,13 +1392,13 @@ CPU_GET_INFO( pic16c622 )
{
switch (state)
{
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 11; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 11; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 8; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(pic16c622); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c622_rom); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c622_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c622_rom); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c622_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C622"); break;
@@ -1415,11 +1415,11 @@ CPU_GET_INFO( pic16c622 )
* Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( pic16c620a_rom, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pic16c620a_rom, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x1ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pic16c620a_ram, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( pic16c620a_ram, AS_DATA, 8 )
AM_RANGE(0x00, 0x06) AM_RAM
AM_RANGE(0x0a, 0x0c) AM_RAM
AM_RANGE(0x1f, 0x6f) AM_RAM
@@ -1457,13 +1457,13 @@ CPU_GET_INFO( pic16c620a )
{
switch (state)
{
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 9; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 9; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 8; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(pic16c620a); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c620a_rom); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c620a_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c620a_rom); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c620a_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C620A"); break;
@@ -1480,11 +1480,11 @@ CPU_GET_INFO( pic16c620a )
* Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( pic16c621a_rom, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pic16c621a_rom, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x3ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pic16c621a_ram, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( pic16c621a_ram, AS_DATA, 8 )
AM_RANGE(0x00, 0x06) AM_RAM
AM_RANGE(0x0a, 0x0c) AM_RAM
AM_RANGE(0x1f, 0x6f) AM_RAM
@@ -1522,13 +1522,13 @@ CPU_GET_INFO( pic16c621a )
{
switch (state)
{
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 10; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 10; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 8; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(pic16c621a); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c621a_rom); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c621a_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c621a_rom); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c621a_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C621A"); break;
@@ -1545,11 +1545,11 @@ CPU_GET_INFO( pic16c621a )
* Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( pic16c622a_rom, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pic16c622a_rom, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x7ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pic16c622a_ram, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( pic16c622a_ram, AS_DATA, 8 )
AM_RANGE(0x00, 0x06) AM_RAM
AM_RANGE(0x0a, 0x0c) AM_RAM
AM_RANGE(0x1f, 0x6f) AM_RAM
@@ -1587,13 +1587,13 @@ CPU_GET_INFO( pic16c622a )
{
switch (state)
{
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 11; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 11; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 8; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(pic16c622a); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c622a_rom); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c622a_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(pic16c622a_rom); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME(pic16c622a_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "PIC16C622A"); break;
diff --git a/src/emu/cpu/powerpc/ppc.c b/src/emu/cpu/powerpc/ppc.c
index 7abb4a5035f..296e1594ee0 100644
--- a/src/emu/cpu/powerpc/ppc.c
+++ b/src/emu/cpu/powerpc/ppc.c
@@ -1750,15 +1750,15 @@ static CPU_GET_INFO( ppc )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 40; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE: info->i = CLEAR_LINE; break;
@@ -1901,8 +1901,8 @@ CPU_GET_INFO( ppc603 )
case CPUINFO_INT_INPUT_LINES: info->i = 5; break;
case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
case CPUINFO_INT_LOGADDR_WIDTH_PROGRAM: info->i = 32; break;
case CPUINFO_INT_PAGE_SHIFT_PROGRAM: info->i = 17; break;
case CPUINFO_INT_REGISTER + PPC_DEC: info->i = read_decrementer(); break;
@@ -1949,8 +1949,8 @@ CPU_GET_INFO( ppc602 )
case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break;
case CPUINFO_INT_REGISTER + PPC_IBR: info->i = ppc.ibr; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(ppc602); break;
@@ -1993,8 +1993,8 @@ CPU_GET_INFO( mpc8240 )
case CPUINFO_INT_INPUT_LINES: info->i = 5; break;
case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(mpc8240); break;
@@ -2034,8 +2034,8 @@ CPU_GET_INFO( ppc601 )
case CPUINFO_INT_INPUT_LINES: info->i = 5; break;
case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(ppc601); break;
@@ -2075,8 +2075,8 @@ CPU_GET_INFO( ppc604 )
case CPUINFO_INT_INPUT_LINES: info->i = 5; break;
case DEVINFO_INT_ENDIANNESS: info->i = ENDIANNESS_BIG; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(ppc604); break;
diff --git a/src/emu/cpu/powerpc/ppc_mem.c b/src/emu/cpu/powerpc/ppc_mem.c
index 9f8f5437826..38c76a6bba2 100644
--- a/src/emu/cpu/powerpc/ppc_mem.c
+++ b/src/emu/cpu/powerpc/ppc_mem.c
@@ -277,11 +277,11 @@ exception:
return 0;
}
-static int ppc_translate_address_cb(int space, offs_t *addr)
+static int ppc_translate_address_cb(address_spacenum space, offs_t *addr)
{
int success = 1;
- if (space == ADDRESS_SPACE_PROGRAM)
+ if (space == AS_PROGRAM)
{
if (MSR & MSR_DR)
success = ppc_translate_address(addr, PPC_TRANSLATE_CODE | PPC_TRANSLATE_READ | PPC_TRANSLATE_NOEXCEPTION);
diff --git a/src/emu/cpu/powerpc/ppccom.c b/src/emu/cpu/powerpc/ppccom.c
index 9b1ec9f368f..c99b2a50ebc 100644
--- a/src/emu/cpu/powerpc/ppccom.c
+++ b/src/emu/cpu/powerpc/ppccom.c
@@ -324,7 +324,7 @@ void ppccom_init(powerpc_state *ppc, powerpc_flavor flavor, UINT8 cap, int tb_di
ppc->codexor = 4;
/* allocate the virtual TLB */
- ppc->vtlb = vtlb_alloc(device, ADDRESS_SPACE_PROGRAM, (cap & PPCCAP_603_MMU) ? PPC603_FIXED_TLB_ENTRIES : 0, POWERPC_TLB_ENTRIES);
+ ppc->vtlb = vtlb_alloc(device, AS_PROGRAM, (cap & PPCCAP_603_MMU) ? PPC603_FIXED_TLB_ENTRIES : 0, POWERPC_TLB_ENTRIES);
/* allocate a timer for the compare interrupt */
if ((cap & PPCCAP_OEA) && (ppc->tb_divisor))
@@ -604,10 +604,10 @@ static UINT32 ppccom_translate_address_internal(powerpc_state *ppc, int intentio
from logical to physical
-------------------------------------------------*/
-int ppccom_translate_address(powerpc_state *ppc, int space, int intention, offs_t *address)
+int ppccom_translate_address(powerpc_state *ppc, address_spacenum space, int intention, offs_t *address)
{
/* only applies to the program address space */
- if (space != ADDRESS_SPACE_PROGRAM)
+ if (space != AS_PROGRAM)
return TRUE;
/* translation is successful if the internal routine returns 0 or 1 */
@@ -1307,9 +1307,9 @@ void ppccom_get_info(powerpc_state *ppc, UINT32 state, cpuinfo *info)
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 40; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
case CPUINFO_INT_LOGADDR_WIDTH_PROGRAM: info->i = 32; break;
case CPUINFO_INT_PAGE_SHIFT_PROGRAM: info->i = POWERPC_MIN_PAGE_SHIFT;break;
@@ -2091,7 +2091,7 @@ static WRITE8_HANDLER( ppc4xx_spu_w )
the 4XX
-------------------------------------------------*/
-static ADDRESS_MAP_START( internal_ppc4xx, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( internal_ppc4xx, AS_PROGRAM, 32 )
AM_RANGE(0x40000000, 0x4000000f) AM_READWRITE8(ppc4xx_spu_r, ppc4xx_spu_w, 0xffffffff)
ADDRESS_MAP_END
@@ -2160,14 +2160,14 @@ void ppc4xx_get_info(powerpc_state *ppc, UINT32 state, cpuinfo *info)
case CPUINFO_INT_INPUT_STATE + PPC_IRQ_LINE_3: info->i = ppc4xx_get_irq_line(ppc, PPC4XX_IRQ_BIT_EXT3); break;
case CPUINFO_INT_INPUT_STATE + PPC_IRQ_LINE_4: info->i = ppc4xx_get_irq_line(ppc, PPC4XX_IRQ_BIT_EXT4); break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 31; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 31; break;
case CPUINFO_INT_LOGADDR_WIDTH_PROGRAM: info->i = 32; break;
case CPUINFO_INT_PAGE_SHIFT_PROGRAM: info->i = POWERPC_MIN_PAGE_SHIFT;break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: /* provided per-CPU */ break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(internal_ppc4xx); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(internal_ppc4xx); break;
/* --- everything else is handled generically --- */
default: ppccom_get_info(ppc, state, info); break;
diff --git a/src/emu/cpu/powerpc/ppccom.h b/src/emu/cpu/powerpc/ppccom.h
index a58b8033125..e6fd2fff222 100644
--- a/src/emu/cpu/powerpc/ppccom.h
+++ b/src/emu/cpu/powerpc/ppccom.h
@@ -578,7 +578,7 @@ void ppccom_exit(powerpc_state *ppc);
void ppccom_reset(powerpc_state *ppc);
offs_t ppccom_dasm(powerpc_state *ppc, char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram);
-int ppccom_translate_address(powerpc_state *ppc, int space, int intention, offs_t *address);
+int ppccom_translate_address(powerpc_state *ppc, address_spacenum space, int intention, offs_t *address);
void ppccom_set_info(powerpc_state *ppc, UINT32 state, cpuinfo *info);
void ppccom_get_info(powerpc_state *ppc, UINT32 state, cpuinfo *info);
diff --git a/src/emu/cpu/powerpc/ppcfe.c b/src/emu/cpu/powerpc/ppcfe.c
index 4acd13b9b19..d7c2a5e81b3 100644
--- a/src/emu/cpu/powerpc/ppcfe.c
+++ b/src/emu/cpu/powerpc/ppcfe.c
@@ -103,7 +103,7 @@ bool ppc_frontend::describe(opcode_desc &desc, const opcode_desc *prev)
int regnum;
// compute the physical PC
- if (!ppccom_translate_address(&m_context, ADDRESS_SPACE_PROGRAM, TRANSLATE_FETCH, &desc.physpc))
+ if (!ppccom_translate_address(&m_context, AS_PROGRAM, TRANSLATE_FETCH, &desc.physpc))
{
// uh-oh: a page fault; leave the description empty and just if this is the first instruction, leave it empty and
// mark as needing to validate; otherwise, just end the sequence here
diff --git a/src/emu/cpu/pps4/pps4.c b/src/emu/cpu/pps4/pps4.c
index 81de9b8022e..cf19dfc64c1 100644
--- a/src/emu/cpu/pps4/pps4.c
+++ b/src/emu/cpu/pps4/pps4.c
@@ -411,17 +411,17 @@ CPU_GET_INFO( pps4 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 2; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 12; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break; // 4 bit for RAM
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 12; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; break; // 4 bit for RAM
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 12; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break; // 4 bit
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break; // 4 bit
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
/* --- the following bits of info are returned as pointers to functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(pps4); break;
diff --git a/src/emu/cpu/rsp/rsp.c b/src/emu/cpu/rsp/rsp.c
index 1137105b1bd..a756842f2f8 100644
--- a/src/emu/cpu/rsp/rsp.c
+++ b/src/emu/cpu/rsp/rsp.c
@@ -3010,15 +3010,15 @@ CPU_GET_INFO( rsp )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE: info->i = CLEAR_LINE; break;
diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c
index bbde2e951bb..9c7b2295355 100644
--- a/src/emu/cpu/rsp/rspdrc.c
+++ b/src/emu/cpu/rsp/rspdrc.c
@@ -4730,15 +4730,15 @@ CPU_GET_INFO( rsp )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE: info->i = CLEAR_LINE; break;
diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c
index 7f6d1d8ed3e..20ab35740ea 100644
--- a/src/emu/cpu/s2650/s2650.c
+++ b/src/emu/cpu/s2650/s2650.c
@@ -1559,17 +1559,17 @@ CPU_GET_INFO( s2650 )
case CPUINFO_INT_MIN_CYCLES: info->i = 5; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 13; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 15; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 15; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 9; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 9; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = s2650c->irq_state; break;
case CPUINFO_INT_INPUT_STATE + 1: info->i = s2650_get_sense(s2650c) ? ASSERT_LINE : CLEAR_LINE; break;
diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c
index 53bf61b9021..7fa69b211e6 100644
--- a/src/emu/cpu/saturn/saturn.c
+++ b/src/emu/cpu/saturn/saturn.c
@@ -317,15 +317,15 @@ CPU_GET_INFO( saturn )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 21; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 20; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + SATURN_NMI_LINE: info->i = cpustate->nmi_state; break;
case CPUINFO_INT_INPUT_STATE + SATURN_IRQ_LINE: info->i = cpustate->irq_state; break;
diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c
index 6c51c2088c9..ce2e0951626 100644
--- a/src/emu/cpu/sc61860/sc61860.c
+++ b/src/emu/cpu/sc61860/sc61860.c
@@ -185,15 +185,15 @@ CPU_GET_INFO( sc61860 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PREVIOUSPC: info->i = cpustate->oldpc; break;
diff --git a/src/emu/cpu/scmp/scmp.c b/src/emu/cpu/scmp/scmp.c
index 8b578771a2f..d2066248309 100644
--- a/src/emu/cpu/scmp/scmp.c
+++ b/src/emu/cpu/scmp/scmp.c
@@ -615,17 +615,17 @@ CPU_GET_INFO( scmp )
case CPUINFO_INT_MIN_CYCLES: info->i = 5; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 131593; break; // DLY instruction max time
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
/* --- the following bits of info are returned as pointers to functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(scmp); break;
diff --git a/src/emu/cpu/se3208/se3208.c b/src/emu/cpu/se3208/se3208.c
index 5c140cbc4de..6add121d646 100644
--- a/src/emu/cpu/se3208/se3208.c
+++ b/src/emu/cpu/se3208/se3208.c
@@ -1857,15 +1857,15 @@ CPU_GET_INFO( se3208 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + SE3208_INT: info->i = se3208_state->IRQ; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = se3208_state->NMI; break;
diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c
index 6ed10b4ab29..70282c98c95 100644
--- a/src/emu/cpu/sh2/sh2.c
+++ b/src/emu/cpu/sh2/sh2.c
@@ -2367,15 +2367,15 @@ CPU_GET_INFO( sh2 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + SH2_INT_VBLIN: info->i = sh2->irq_line_state[SH2_INT_VBLIN]; break;
case CPUINFO_INT_INPUT_STATE + SH2_INT_VBLOUT: info->i = sh2->irq_line_state[SH2_INT_VBLOUT]; break;
diff --git a/src/emu/cpu/sh2/sh2drc.c b/src/emu/cpu/sh2/sh2drc.c
index 97c0906a820..f1a44969ff4 100644
--- a/src/emu/cpu/sh2/sh2drc.c
+++ b/src/emu/cpu/sh2/sh2drc.c
@@ -3194,7 +3194,7 @@ static READ32_HANDLER(sh2_internal_a5)
sh2_internal_map - maps SH2 built-ins
-------------------------------------------------*/
-static ADDRESS_MAP_START( sh2_internal_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( sh2_internal_map, AS_PROGRAM, 32 )
AM_RANGE(0x40000000, 0xbfffffff) AM_READ(sh2_internal_a5)
AM_RANGE(0xe0000000, 0xffffffff) AM_READWRITE(sh2_internal_r, sh2_internal_w)
ADDRESS_MAP_END
@@ -3280,20 +3280,20 @@ CPU_GET_INFO( sh2 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
// Internal maps
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(sh2_internal_map); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map32 = NULL; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO: info->internal_map32 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map32 = ADDRESS_MAP_NAME(sh2_internal_map); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map32 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_IO: info->internal_map32 = NULL; break;
case CPUINFO_INT_INPUT_STATE + SH2_INT_VBLIN: info->i = sh2->irq_line_state[SH2_INT_VBLIN]; break;
case CPUINFO_INT_INPUT_STATE + SH2_INT_VBLOUT: info->i = sh2->irq_line_state[SH2_INT_VBLOUT]; break;
diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c
index 5c37404d059..d928ae6d633 100644
--- a/src/emu/cpu/sh4/sh4.c
+++ b/src/emu/cpu/sh4/sh4.c
@@ -3609,7 +3609,7 @@ void sh4_set_ftcsr_callback(device_t *device, sh4_ftcsr_callback callback)
#if 0
/*When OC index mode is off (CCR.OIX = 0)*/
-static ADDRESS_MAP_START( sh4_internal_map, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( sh4_internal_map, AS_PROGRAM, 64 )
AM_RANGE(0x1C000000, 0x1C000FFF) AM_RAM AM_MIRROR(0x03FFD000)
AM_RANGE(0x1C002000, 0x1C002FFF) AM_RAM AM_MIRROR(0x03FFD000)
AM_RANGE(0xE0000000, 0xE000003F) AM_RAM AM_MIRROR(0x03FFFFC0)
@@ -3624,7 +3624,7 @@ static WRITE32_HANDLER(sh4_test_w)
#endif
/*When OC index mode is on (CCR.OIX = 1)*/
-static ADDRESS_MAP_START( sh4_internal_map, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( sh4_internal_map, AS_PROGRAM, 64 )
AM_RANGE(0x1C000000, 0x1C000FFF) AM_RAM AM_MIRROR(0x01FFF000)
AM_RANGE(0x1E000000, 0x1E000FFF) AM_RAM AM_MIRROR(0x01FFF000)
AM_RANGE(0xE0000000, 0xE000003F) AM_RAM AM_MIRROR(0x03FFFFC0) // todo: store queues should be write only on DC's SH4, executing PREFM shouldn't cause an actual memory read access!
@@ -3657,17 +3657,17 @@ CPU_GET_INFO( sh4 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
-
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map64 = ADDRESS_MAP_NAME(sh4_internal_map); break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
+
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map64 = ADDRESS_MAP_NAME(sh4_internal_map); break;
case CPUINFO_INT_INPUT_STATE + SH4_IRL0: info->i = sh4->irq_line_state[SH4_IRL0]; break;
case CPUINFO_INT_INPUT_STATE + SH4_IRL1: info->i = sh4->irq_line_state[SH4_IRL1]; break;
diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c
index 6a73387e9cf..5d70fcc2f78 100644
--- a/src/emu/cpu/sharc/sharc.c
+++ b/src/emu/cpu/sharc/sharc.c
@@ -960,7 +960,7 @@ static CPU_SET_INFO( adsp21062 )
static CPU_READ( sharc )
{
SHARC_REGS *cpustate = get_safe_token(device);
- if (space == ADDRESS_SPACE_PROGRAM)
+ if (space == AS_PROGRAM)
{
int address = offset >> 3;
@@ -986,7 +986,7 @@ static CPU_READ( sharc )
*value = 0;
}
}
- else if (space == ADDRESS_SPACE_DATA)
+ else if (space == AS_DATA)
{
int address = offset >> 2;
if (address >= 0x20000)
@@ -1046,7 +1046,7 @@ static CPU_READOP( sharc )
}
// This is just used to stop the debugger from complaining about executing from I/O space
-static ADDRESS_MAP_START( internal_pgm, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( internal_pgm, AS_PROGRAM, 64 )
AM_RANGE(0x20000, 0x7ffff) AM_RAM
ADDRESS_MAP_END
@@ -1068,15 +1068,15 @@ static CPU_GET_INFO( sharc )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 40; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 64; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -3; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = -2; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -3; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = -2; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE: info->i = CLEAR_LINE; break;
@@ -1193,7 +1193,7 @@ static CPU_GET_INFO( sharc )
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
case CPUINFO_FCT_READ: info->read = CPU_READ_NAME(sharc); break;
case CPUINFO_FCT_READOP: info->readop = CPU_READOP_NAME(sharc); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map64 = ADDRESS_MAP_NAME(internal_pgm); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map64 = ADDRESS_MAP_NAME(internal_pgm); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_FAMILY: strcpy(info->s, "SHARC"); break;
diff --git a/src/emu/cpu/sm8500/sm8500.c b/src/emu/cpu/sm8500/sm8500.c
index 09ff95d2c8c..862c665f4ac 100644
--- a/src/emu/cpu/sm8500/sm8500.c
+++ b/src/emu/cpu/sm8500/sm8500.c
@@ -501,15 +501,15 @@ CPU_GET_INFO( sm8500 )
case CPUINFO_INT_MAX_INSTRUCTION_BYTES: info->i = 5; break;
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0:
case CPUINFO_INT_INPUT_STATE + 1:
case CPUINFO_INT_INPUT_STATE + 2:
diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c
index 6855bda9dee..9256361aa36 100644
--- a/src/emu/cpu/spc700/spc700.c
+++ b/src/emu/cpu/spc700/spc700.c
@@ -1688,15 +1688,15 @@ CPU_GET_INFO( spc700 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 8; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = (LINE_IRQ == IRQ_SET) ? ASSERT_LINE : CLEAR_LINE; break;
diff --git a/src/emu/cpu/ssem/ssem.c b/src/emu/cpu/ssem/ssem.c
index 5d70ddb6f51..18d4aa7ead5 100644
--- a/src/emu/cpu/ssem/ssem.c
+++ b/src/emu/cpu/ssem/ssem.c
@@ -266,15 +266,15 @@ CPU_GET_INFO( ssem )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PC: /* intentional fallthrough */
case CPUINFO_INT_REGISTER + SSEM_PC: info->i = cpustate->pc << 2; break;
diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/emu/cpu/ssp1601/ssp1601.c
index 2d11783f92d..57ccefa36b7 100644
--- a/src/emu/cpu/ssp1601/ssp1601.c
+++ b/src/emu/cpu/ssp1601/ssp1601.c
@@ -822,15 +822,15 @@ CPU_GET_INFO( ssp1601 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 4; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 4; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 4; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: /* not implemented */ break;
@@ -870,8 +870,8 @@ CPU_GET_INFO( ssp1601 )
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(ssp1601); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &ssp1601_state->g_cycles; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map16 = NULL; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_IO: info->internal_map16 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map16 = NULL; break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_IO: info->internal_map16 = NULL; break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, CHIP_NAME); break;
diff --git a/src/emu/cpu/superfx/superfx.c b/src/emu/cpu/superfx/superfx.c
index ba187583612..1e22facd51a 100644
--- a/src/emu/cpu/superfx/superfx.c
+++ b/src/emu/cpu/superfx/superfx.c
@@ -1567,15 +1567,15 @@ CPU_GET_INFO( superfx )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_PC: /* intentional fallthrough */
case CPUINFO_INT_REGISTER + SUPERFX_PC: info->i = ((cpustate->pbr << 16) | cpustate->r[15]) - 1; break;
diff --git a/src/emu/cpu/t11/t11.c b/src/emu/cpu/t11/t11.c
index 4c64cbec9ae..5355bca86cf 100644
--- a/src/emu/cpu/t11/t11.c
+++ b/src/emu/cpu/t11/t11.c
@@ -427,15 +427,15 @@ CPU_GET_INFO( t11 )
case CPUINFO_INT_MIN_CYCLES: info->i = 12; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 110; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + T11_IRQ0: info->i = (cpustate->irq_state & 1) ? ASSERT_LINE : CLEAR_LINE; break;
case CPUINFO_INT_INPUT_STATE + T11_IRQ1: info->i = (cpustate->irq_state & 2) ? ASSERT_LINE : CLEAR_LINE; break;
diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c
index e17941693d9..aa38f2009ad 100644
--- a/src/emu/cpu/tlcs90/tlcs90.c
+++ b/src/emu/cpu/tlcs90/tlcs90.c
@@ -2731,23 +2731,23 @@ static CPU_INIT( t90 )
cpustate->timer[4] = device->machine->scheduler().timer_alloc(FUNC(t90_timer4_callback), cpustate);
}
-static ADDRESS_MAP_START(tmp90840_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(tmp90840_mem, AS_PROGRAM, 8)
AM_RANGE( 0x0000, 0x1fff ) AM_ROM // 8KB ROM (internal)
AM_RANGE( 0xfec0, 0xffc0 ) AM_RAM // 256b RAM (internal)
AM_RANGE( T90_IOBASE, T90_IOBASE+47 ) AM_READWRITE( t90_internal_registers_r, t90_internal_registers_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START(tmp90841_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(tmp90841_mem, AS_PROGRAM, 8)
// AM_RANGE( 0x0000, 0x1fff ) AM_ROM // rom-less
AM_RANGE( 0xfec0, 0xffc0 ) AM_RAM // 256b RAM (internal)
AM_RANGE( T90_IOBASE, T90_IOBASE+47 ) AM_READWRITE( t90_internal_registers_r, t90_internal_registers_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START(tmp91640_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(tmp91640_mem, AS_PROGRAM, 8)
AM_RANGE( 0x0000, 0x3fff ) AM_ROM // 16KB ROM (internal)
AM_RANGE( 0xfdc0, 0xffc0 ) AM_RAM // 512b RAM (internal)
AM_RANGE( T90_IOBASE, T90_IOBASE+47 ) AM_READWRITE( t90_internal_registers_r, t90_internal_registers_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START(tmp91641_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(tmp91641_mem, AS_PROGRAM, 8)
// AM_RANGE( 0x0000, 0x3fff ) AM_ROM // rom-less
AM_RANGE( 0xfdc0, 0xffc0 ) AM_RAM // 512b RAM (internal)
AM_RANGE( T90_IOBASE, T90_IOBASE+47 ) AM_READWRITE( t90_internal_registers_r, t90_internal_registers_w )
@@ -2805,17 +2805,17 @@ CPU_GET_INFO( tmp90840 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 26; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 20; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = cpustate->irq_state & (1 << INTNMI); break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_IRQ0: info->i = cpustate->irq_state & (1 << INT0); break;
@@ -2851,7 +2851,7 @@ CPU_GET_INFO( tmp90840 )
case CPUINFO_FCT_BURN: info->burn = CPU_BURN_NAME(t90); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(t90); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp90840_mem); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp90840_mem); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
@@ -2897,7 +2897,7 @@ CPU_GET_INFO( tmp90841 )
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp90841_mem); return;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp90841_mem); return;
/* --- the following bits of info are returned as NULL-terminated strings --- */
@@ -2913,7 +2913,7 @@ CPU_GET_INFO( tmp91640 )
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp91640_mem); return;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp91640_mem); return;
/* --- the following bits of info are returned as NULL-terminated strings --- */
@@ -2929,7 +2929,7 @@ CPU_GET_INFO( tmp91641 )
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp91641_mem); return;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tmp91641_mem); return;
/* --- the following bits of info are returned as NULL-terminated strings --- */
diff --git a/src/emu/cpu/tlcs900/tlcs900.c b/src/emu/cpu/tlcs900/tlcs900.c
index acef08b54a6..6cb2b52ac23 100644
--- a/src/emu/cpu/tlcs900/tlcs900.c
+++ b/src/emu/cpu/tlcs900/tlcs900.c
@@ -1095,7 +1095,7 @@ static WRITE8_HANDLER( tlcs900_internal_w )
}
-static ADDRESS_MAP_START( tlcs900_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tlcs900_mem, AS_PROGRAM, 8 )
AM_RANGE( 0x000000, 0x00007f ) AM_READWRITE( tlcs900_internal_r, tlcs900_internal_w )
ADDRESS_MAP_END
@@ -1134,9 +1134,9 @@ CPU_GET_INFO( tlcs900h )
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break; /* FIXME */
case CPUINFO_INT_INPUT_LINES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:
case CPUINFO_INT_INPUT_STATE + TLCS900_NMI: info->i = cpustate->level[TLCS900_NMI]; break;
@@ -1178,7 +1178,7 @@ CPU_GET_INFO( tlcs900h )
case CPUINFO_FCT_EXECUTE: info->execute = CPU_EXECUTE_NAME(tlcs900); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(tlcs900); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tlcs900_mem); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tlcs900_mem); break;
case CPUINFO_STR_REGISTER + TLCS900_PC: sprintf( info->s, "PC:%08x", cpustate->pc.d ); break;
case CPUINFO_STR_REGISTER + TLCS900_SR: sprintf( info->s, "SR:%c%d%c%d%c%c%c%c%c%c%c%c",
diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c
index ad442573bc4..e3a6440f4ba 100644
--- a/src/emu/cpu/tms0980/tms0980.c
+++ b/src/emu/cpu/tms0980/tms0980.c
@@ -460,32 +460,32 @@ INLINE tms0980_state *get_safe_token(device_t *device)
}
-static ADDRESS_MAP_START(tms0980_internal_rom, ADDRESS_SPACE_PROGRAM, 16)
+static ADDRESS_MAP_START(tms0980_internal_rom, AS_PROGRAM, 16)
AM_RANGE( 0x0000, 0x0FFF ) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(tms0980_internal_ram, ADDRESS_SPACE_DATA, 8)
+static ADDRESS_MAP_START(tms0980_internal_ram, AS_DATA, 8)
AM_RANGE( 0x0000, 0x0FFF ) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(program_10bit_8, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(program_10bit_8, AS_PROGRAM, 8)
AM_RANGE( 0x000, 0x3ff ) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(program_11bit_8, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(program_11bit_8, AS_PROGRAM, 8)
AM_RANGE( 0x000, 0x7ff ) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(data_6bit, ADDRESS_SPACE_DATA, 8)
+static ADDRESS_MAP_START(data_6bit, AS_DATA, 8)
AM_RANGE( 0x00, 0x3f ) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(data_7bit, ADDRESS_SPACE_DATA, 8)
+static ADDRESS_MAP_START(data_7bit, AS_DATA, 8)
AM_RANGE( 0x00, 0x7f ) AM_RAM
ADDRESS_MAP_END
@@ -1121,9 +1121,9 @@ static CPU_GET_INFO( tms_generic )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 6; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8 /* 4 */; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8 /* 4 */; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
case CPUINFO_INT_PREVIOUSPC: info->i = ( ( cpustate->prev_pa << 7 ) | cpustate->prev_pc ) << 1; break;
case CPUINFO_INT_PC: info->i = ( ( cpustate->pa << 7 ) | cpustate->pc ) << 1; break;
@@ -1171,13 +1171,13 @@ CPU_GET_INFO( tms0980 )
{
case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 2; break;
case CPUINFO_INT_MAX_INSTRUCTION_BYTES: info->i = 2; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16 /* 9 */; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 12; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 7; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16 /* 9 */; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 7; break;
case CPUINFO_INT_PREVIOUSPC: info->i = ( ( cpustate->prev_pa << 7 ) | cpustate->prev_pc ) << 1; break;
case CPUINFO_INT_PC: info->i = ( ( cpustate->pa << 7 ) | cpustate->pc ) << 1; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME( tms0980_internal_rom ); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME( tms0980_internal_ram ); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME( tms0980_internal_rom ); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME( tms0980_internal_ram ); break;
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME( tms0980 ); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME( tms0980 ); break;
case DEVINFO_STR_NAME: strcpy( info->s, "TMS0980" ); break;
@@ -1194,13 +1194,13 @@ CPU_GET_INFO( tms1000 )
{
case CPUINFO_INT_MIN_INSTRUCTION_BYTES: info->i = 1; break;
case CPUINFO_INT_MAX_INSTRUCTION_BYTES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 10; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 6; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 10; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 6; break;
case CPUINFO_INT_PREVIOUSPC: info->i = ( cpustate->prev_pa << 6 ) | tms1000_pc_decode[ cpustate->prev_pc ]; break;
case CPUINFO_INT_PC: info->i = ( cpustate->pa << 6 ) | tms1000_pc_decode[ cpustate->pc ]; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME( program_10bit_8 ); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME( data_6bit ); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME( program_10bit_8 ); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME( data_6bit ); break;
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME( tms1000 ); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME( tms1000 ); break;
case DEVINFO_STR_NAME: strcpy( info->s, "TMS1000" ); break;
@@ -1249,13 +1249,13 @@ CPU_GET_INFO( tms1100 )
switch(state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 11; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 7; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 11; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 7; break;
case CPUINFO_INT_PREVIOUSPC: info->i = ( cpustate->prev_pa << 6 ) | tms1000_pc_decode[ cpustate->prev_pc ]; break;
case CPUINFO_INT_PC: info->i = ( cpustate->pa << 6 ) | tms1000_pc_decode[ cpustate->pc ]; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME( program_11bit_8 ); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map8 = ADDRESS_MAP_NAME( data_7bit ); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME( program_11bit_8 ); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map8 = ADDRESS_MAP_NAME( data_7bit ); break;
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME( tms1100 ); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME( tms1100 ); break;
case DEVINFO_STR_NAME: strcpy( info->s, "TMS1100" ); break;
diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/emu/cpu/tms32010/tms32010.c
index 007b18ad879..b5579df843b 100644
--- a/src/emu/cpu/tms32010/tms32010.c
+++ b/src/emu/cpu/tms32010/tms32010.c
@@ -913,7 +913,7 @@ static CPU_EXECUTE( tms32010 )
* TMS32010 Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( tms32010_ram, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( tms32010_ram, AS_DATA, 16 )
AM_RANGE(0x00, 0x7f) AM_RAM /* Page 0 */
AM_RANGE(0x80, 0x8f) AM_RAM /* Page 1 */
ADDRESS_MAP_END
@@ -990,15 +990,15 @@ CPU_GET_INFO( tms32010 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 3; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 12; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 5; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 5; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = -1; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = (cpustate->INTF & TMS32010_INT_PENDING) ? ASSERT_LINE : CLEAR_LINE; break;
@@ -1025,7 +1025,7 @@ CPU_GET_INFO( tms32010 )
case CPUINFO_FCT_BURN: info->burn = NULL; break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(tms32010); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map16 = ADDRESS_MAP_NAME(tms32010_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map16 = ADDRESS_MAP_NAME(tms32010_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "TMS32010"); break;
@@ -1074,7 +1074,7 @@ CPU_GET_INFO( tms32010 )
* TMS32015 Internal Memory Map
****************************************************************************/
-static ADDRESS_MAP_START( tms32015_ram, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( tms32015_ram, AS_DATA, 16 )
AM_RANGE(0x00, 0x7f) AM_RAM /* Page 0 */
AM_RANGE(0x80, 0xff) AM_RAM /* Page 1 */
ADDRESS_MAP_END
@@ -1089,7 +1089,7 @@ CPU_GET_INFO( tms32015 )
switch (state)
{
/* --- the following bits of info are returned as pointers to data or functions --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map16 = ADDRESS_MAP_NAME(tms32015_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map16 = ADDRESS_MAP_NAME(tms32015_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "TMS32015"); break;
@@ -1123,7 +1123,7 @@ CPU_GET_INFO( tms32016 )
{
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(tms32016); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map16 = ADDRESS_MAP_NAME(tms32015_ram); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map16 = ADDRESS_MAP_NAME(tms32015_ram); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "TMS32016"); break;
diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/emu/cpu/tms32025/tms32025.c
index 39798ed1300..1c9aa0dd33a 100644
--- a/src/emu/cpu/tms32025/tms32025.c
+++ b/src/emu/cpu/tms32025/tms32025.c
@@ -2155,19 +2155,20 @@ static CPU_READ( tms32025 )
switch (space)
{
- case ADDRESS_SPACE_PROGRAM:
+ case AS_PROGRAM:
ptr = cpustate->pgmmap[offset >> 8];
if (!ptr)
return 0;
break;
- case ADDRESS_SPACE_DATA:
+ case AS_DATA:
ptr = cpustate->datamap[offset >> 8];
if (!ptr)
return 0;
break;
- case ADDRESS_SPACE_IO:
+ default:
+ case AS_IO:
return 0;
}
@@ -2207,19 +2208,20 @@ static CPU_WRITE( tms32025 )
switch (space)
{
- case ADDRESS_SPACE_PROGRAM:
+ case AS_PROGRAM:
ptr = cpustate->pgmmap[offset >> 8];
if (!ptr)
return 0;
break;
- case ADDRESS_SPACE_DATA:
+ case AS_DATA:
ptr = cpustate->datamap[offset >> 8];
if (!ptr)
return 0;
break;
- case ADDRESS_SPACE_IO:
+ default:
+ case AS_IO:
return 0;
}
@@ -2324,15 +2326,15 @@ CPU_GET_INFO( tms32025 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1*CLK; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 5*CLK; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 17; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 17; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = -1; break;
case CPUINFO_INT_INPUT_STATE + TMS32025_INT0: info->i = (cpustate->IFR & 0x01) ? ASSERT_LINE : CLEAR_LINE; break;
case CPUINFO_INT_INPUT_STATE + TMS32025_INT1: info->i = (cpustate->IFR & 0x02) ? ASSERT_LINE : CLEAR_LINE; break;
diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c
index 618d978f675..124a7d81e2a 100644
--- a/src/emu/cpu/tms32031/tms32031.c
+++ b/src/emu/cpu/tms32031/tms32031.c
@@ -120,11 +120,11 @@ const device_type TMS32031 = tms32031_device_config::static_alloc_device_config;
const device_type TMS32032 = tms32032_device_config::static_alloc_device_config;
// internal memory maps
-static ADDRESS_MAP_START( internal_32031, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( internal_32031, AS_PROGRAM, 32 )
AM_RANGE(0x809800, 0x809fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( internal_32032, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( internal_32032, AS_PROGRAM, 32 )
AM_RANGE(0x87fe00, 0x87ffff) AM_RAM
ADDRESS_MAP_END
@@ -238,7 +238,7 @@ UINT32 tms3203x_device_config::execute_input_lines() const
// the space doesn't exist
//-------------------------------------------------
-const address_space_config *tms3203x_device_config::memory_space_config(int spacenum) const
+const address_space_config *tms3203x_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == AS_PROGRAM) ? &m_program_config : NULL;
}
diff --git a/src/emu/cpu/tms32031/tms32031.h b/src/emu/cpu/tms32031/tms32031.h
index 2a5910932f6..38c2ea277c0 100644
--- a/src/emu/cpu/tms32031/tms32031.h
+++ b/src/emu/cpu/tms32031/tms32031.h
@@ -184,7 +184,7 @@ protected:
virtual UINT32 execute_input_lines() const;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// device_config_disasm_interface overrides
virtual UINT32 disasm_min_opcode_bytes() const;
diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c
index c4ae2dde9d8..99838cbdd99 100644
--- a/src/emu/cpu/tms32051/tms32051.c
+++ b/src/emu/cpu/tms32051/tms32051.c
@@ -530,12 +530,12 @@ static WRITE16_HANDLER( cpuregs_w )
* Internal memory map
**************************************************************************/
-static ADDRESS_MAP_START( internal_pgm, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( internal_pgm, AS_PROGRAM, 16 )
AM_RANGE(0x2000, 0x23ff) AM_RAM // SARAM
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("share11") // DARAM B0
ADDRESS_MAP_END
-static ADDRESS_MAP_START( internal_data, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( internal_data, AS_DATA, 16 )
AM_RANGE(0x0000, 0x005f) AM_READWRITE(cpuregs_r, cpuregs_w)
AM_RANGE(0x0060, 0x007f) AM_RAM // DARAM B2
AM_RANGE(0x0100, 0x02ff) AM_RAM AM_SHARE("share11") // DARAM B0
@@ -560,11 +560,11 @@ static CPU_SET_INFO( tms )
static CPU_READ( tms )
{
tms32051_state *cpustate = get_safe_token(device);
- if (space == ADDRESS_SPACE_PROGRAM)
+ if (space == AS_PROGRAM)
{
*value = (PM_READ16(cpustate, offset>>1) >> ((offset & 1) ? 0 : 8)) & 0xff;
}
- else if (space == ADDRESS_SPACE_DATA)
+ else if (space == AS_DATA)
{
*value = (DM_READ16(cpustate, offset>>1) >> ((offset & 1) ? 0 : 8)) & 0xff;
}
@@ -589,15 +589,15 @@ static CPU_GET_INFO( tms )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 5; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = -1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = -1; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE: info->i = CLEAR_LINE; break;
@@ -638,8 +638,8 @@ static CPU_GET_INFO( tms )
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(tms32051); break;
case CPUINFO_FCT_READ: info->read = CPU_READ_NAME(tms); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(internal_pgm); break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_DATA: info->internal_map16 = ADDRESS_MAP_NAME(internal_data); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map16 = ADDRESS_MAP_NAME(internal_pgm); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_DATA: info->internal_map16 = ADDRESS_MAP_NAME(internal_data); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_FAMILY: strcpy(info->s, "TMS3205x"); break;
diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c
index 58e28949f5a..c89895c5066 100644
--- a/src/emu/cpu/tms34010/tms34010.c
+++ b/src/emu/cpu/tms34010/tms34010.c
@@ -1736,9 +1736,9 @@ CPU_GET_INFO( tms34010 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 10000; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 3; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 3; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = (IOREG(tms, REG_INTPEND) & TMS34010_INT1) ? ASSERT_LINE : CLEAR_LINE; break;
case CPUINFO_INT_INPUT_STATE + 1: info->i = (IOREG(tms, REG_INTPEND) & TMS34010_INT2) ? ASSERT_LINE : CLEAR_LINE; break;
diff --git a/src/emu/cpu/tms57002/tms57002.c b/src/emu/cpu/tms57002/tms57002.c
index eb25d344baa..df63908023b 100644
--- a/src/emu/cpu/tms57002/tms57002.c
+++ b/src/emu/cpu/tms57002/tms57002.c
@@ -1107,7 +1107,7 @@ static CPU_SET_INFO(tms57002)
{
}
-static ADDRESS_MAP_START(internal_pgm, ADDRESS_SPACE_PROGRAM, 32)
+static ADDRESS_MAP_START(internal_pgm, AS_PROGRAM, 32)
AM_RANGE(0x000, 0x3ff) AM_RAM
ADDRESS_MAP_END
@@ -1125,22 +1125,22 @@ CPU_GET_INFO(tms57002)
case CPUINFO_INT_MAX_INSTRUCTION_BYTES: info->i = 4; break;
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 3; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = -2; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 20; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = -2; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 20; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(tms57002); break;
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(tms57002); break;
case CPUINFO_FCT_RESET: info->reset = CPU_RESET_NAME(tms57002); break;
case CPUINFO_FCT_EXECUTE: info->execute = CPU_EXECUTE_NAME(tms57002); break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(tms57002); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &s->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM:info->internal_map32 = ADDRESS_MAP_NAME(internal_pgm); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM:info->internal_map32 = ADDRESS_MAP_NAME(internal_pgm); break;
case DEVINFO_STR_NAME: strcpy( info->s, "TMS57002" ); break;
case DEVINFO_STR_FAMILY: strcpy( info->s, "Texas Instruments TMS57002 (DASP)" ); break;
case DEVINFO_STR_VERSION: strcpy( info->s, "1.0" ); break;
diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c
index 3894d2a7986..fe93b5c8ac1 100644
--- a/src/emu/cpu/tms7000/tms7000.c
+++ b/src/emu/cpu/tms7000/tms7000.c
@@ -131,7 +131,7 @@ static WRITE8_HANDLER( tms7000_internal_w );
static READ8_HANDLER( tms70x0_pf_r );
static WRITE8_HANDLER( tms70x0_pf_w );
-static ADDRESS_MAP_START(tms7000_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(tms7000_mem, AS_PROGRAM, 8)
AM_RANGE(0x0000, 0x007f) AM_READWRITE(tms7000_internal_r, tms7000_internal_w) /* tms7000 internal RAM */
AM_RANGE(0x0080, 0x00ff) AM_NOP /* reserved */
AM_RANGE(0x0100, 0x01ff) AM_READWRITE(tms70x0_pf_r, tms70x0_pf_w) /* tms7000 internal I/O ports */
@@ -281,15 +281,15 @@ CPU_GET_INFO( tms7000 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 48; break; /* 48 represents the multiply instruction, the next highest is 17 */
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + TMS7000_IRQ1_LINE: info->i = cpustate->irq_state[TMS7000_IRQ1_LINE]; break;
case CPUINFO_INT_INPUT_STATE + TMS7000_IRQ2_LINE: info->i = cpustate->irq_state[TMS7000_IRQ2_LINE]; break;
@@ -315,7 +315,7 @@ CPU_GET_INFO( tms7000 )
case CPUINFO_FCT_BURN: info->burn = NULL; /* Not supported */break;
case CPUINFO_FCT_DISASSEMBLE: info->disassemble = CPU_DISASSEMBLE_NAME(tms7000); break;
case CPUINFO_PTR_INSTRUCTION_COUNTER: info->icount = &cpustate->icount; break;
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tms7000_mem); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(tms7000_mem); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "TMS7000"); break;
diff --git a/src/emu/cpu/tms9900/99xxcore.h b/src/emu/cpu/tms9900/99xxcore.h
index 1e297fbcf4f..31c953c68a1 100644
--- a/src/emu/cpu/tms9900/99xxcore.h
+++ b/src/emu/cpu/tms9900/99xxcore.h
@@ -4648,11 +4648,11 @@ void TMS99XX_GET_INFO(const device_config *devconfig, legacy_cpu_device *device,
case CPUINFO_INT_MAX_CYCLES: info->i = 10;/*TODO: compute this value*/break;
#if (USE_16_BIT_ACCESSORS)
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
#else
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
#endif
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM:
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM:
#if (TMS99XX_MODEL == TI990_10_ID)
/* this CPU has a mapper to expand the address space */
info->i = 21;
@@ -4667,12 +4667,12 @@ void TMS99XX_GET_INFO(const device_config *devconfig, legacy_cpu_device *device,
info->i = 16;
#endif
break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO:
#if (TMS99XX_MODEL == TI990_10_ID)
/* 3 MSBs do exist, although they are not connected (don't ask...) */
info->i = 15;
@@ -4693,7 +4693,7 @@ void TMS99XX_GET_INFO(const device_config *devconfig, legacy_cpu_device *device,
info->i = 15;
#endif
break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
/* not implemented */
/* case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = get_irq_line(INPUT_LINE_NMI); break;
diff --git a/src/emu/cpu/unsp/unsp.c b/src/emu/cpu/unsp/unsp.c
index 04d3c6cffa1..d12628f7f7a 100644
--- a/src/emu/cpu/unsp/unsp.c
+++ b/src/emu/cpu/unsp/unsp.c
@@ -866,15 +866,15 @@ CPU_GET_INFO( unsp )
case CPUINFO_INT_MIN_CYCLES: info->i = 5; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 5; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 23; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 23; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_REGISTER + UNSP_SP: info->i = UNSP_REG(SP); break;
case CPUINFO_INT_REGISTER + UNSP_R1: info->i = UNSP_REG(R1); break;
diff --git a/src/emu/cpu/upd7725/upd7725.c b/src/emu/cpu/upd7725/upd7725.c
index 5466143268e..5922099e680 100755
--- a/src/emu/cpu/upd7725/upd7725.c
+++ b/src/emu/cpu/upd7725/upd7725.c
@@ -124,7 +124,7 @@ UINT32 necdsp_device_config::execute_input_lines() const
// the space doesn't exist
//-------------------------------------------------
-const address_space_config *necdsp_device_config::memory_space_config(int spacenum) const
+const address_space_config *necdsp_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == AS_PROGRAM) ? &m_program_config : &m_data_config;
}
diff --git a/src/emu/cpu/upd7725/upd7725.h b/src/emu/cpu/upd7725/upd7725.h
index 4e64e74e57e..11bda94ea18 100755
--- a/src/emu/cpu/upd7725/upd7725.h
+++ b/src/emu/cpu/upd7725/upd7725.h
@@ -41,7 +41,7 @@ protected:
virtual UINT32 execute_input_lines() const;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// device_config_disasm_interface overrides
virtual UINT32 disasm_min_opcode_bytes() const;
diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c
index d71668b1a73..43a6533e3a7 100644
--- a/src/emu/cpu/upd7810/upd7810.c
+++ b/src/emu/cpu/upd7810/upd7810.c
@@ -2143,15 +2143,15 @@ CPU_GET_INFO( upd7810 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 40; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = (IRR & INTNMI) ? ASSERT_LINE : CLEAR_LINE; break;
case CPUINFO_INT_INPUT_STATE + UPD7810_INTF1: info->i = (IRR & INTF1) ? ASSERT_LINE : CLEAR_LINE; break;
diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c
index 2a15d477e50..d56785e22ad 100644
--- a/src/emu/cpu/v30mz/v30mz.c
+++ b/src/emu/cpu/v30mz/v30mz.c
@@ -1069,15 +1069,15 @@ CPU_GET_INFO( v30mz )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 80; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 20; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = (cpustate->pending_irq & INT_IRQ) ? ASSERT_LINE : CLEAR_LINE; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = cpustate->nmi_state; break;
diff --git a/src/emu/cpu/v60/v60.c b/src/emu/cpu/v60/v60.c
index 71894191425..bf2e2faface 100644
--- a/src/emu/cpu/v60/v60.c
+++ b/src/emu/cpu/v60/v60.c
@@ -581,15 +581,15 @@ CPU_GET_INFO( v60 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 1; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 24; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 24; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = cpustate->irq_line; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = cpustate->nmi_line; break;
@@ -747,9 +747,9 @@ CPU_GET_INFO( v70 )
switch (state)
{
/* --- the following bits of info are returned as 64-bit signed integers --- */
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(v70); break;
diff --git a/src/emu/cpu/v810/v810.c b/src/emu/cpu/v810/v810.c
index ae05b52b865..06ad6c4b7b6 100644
--- a/src/emu/cpu/v810/v810.c
+++ b/src/emu/cpu/v810/v810.c
@@ -1211,15 +1211,15 @@ CPU_GET_INFO( v810 )
case CPUINFO_INT_MIN_CYCLES: info->i = 3; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 6; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 32; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 32; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = (cpustate->irq_line == 0) ? cpustate->irq_state : CLEAR_LINE; break;
case CPUINFO_INT_INPUT_STATE + 1: info->i = (cpustate->irq_line == 1) ? cpustate->irq_state : CLEAR_LINE; break;
diff --git a/src/emu/cpu/vtlb.c b/src/emu/cpu/vtlb.c
index 2c3a1fd9099..80a5b9109f7 100644
--- a/src/emu/cpu/vtlb.c
+++ b/src/emu/cpu/vtlb.c
@@ -31,7 +31,7 @@
struct _vtlb_state
{
cpu_device * cpudevice; /* CPU device */
- int space; /* address space */
+ address_spacenum space; /* address space */
int dynamic; /* number of dynamic entries */
int fixed; /* number of fixed entries */
int dynindex; /* index of next dynamic entry */
@@ -54,7 +54,7 @@ struct _vtlb_state
given CPU
-------------------------------------------------*/
-vtlb_state *vtlb_alloc(device_t *cpu, int space, int fixed_entries, int dynamic_entries)
+vtlb_state *vtlb_alloc(device_t *cpu, address_spacenum space, int fixed_entries, int dynamic_entries)
{
vtlb_state *vtlb;
diff --git a/src/emu/cpu/vtlb.h b/src/emu/cpu/vtlb.h
index 58908a928b9..3777668fa99 100644
--- a/src/emu/cpu/vtlb.h
+++ b/src/emu/cpu/vtlb.h
@@ -55,7 +55,7 @@ typedef struct _vtlb_state vtlb_state;
/* ----- initialization/teardown ----- */
/* allocate a new VTLB for the given CPU */
-vtlb_state *vtlb_alloc(device_t *cpu, int space, int fixed_entries, int dynamic_entries);
+vtlb_state *vtlb_alloc(device_t *cpu, address_spacenum space, int fixed_entries, int dynamic_entries);
/* free an allocated VTLB */
void vtlb_free(vtlb_state *vtlb);
diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c
index 3911955dc03..5f9139ffc78 100644
--- a/src/emu/cpu/z180/z180.c
+++ b/src/emu/cpu/z180/z180.c
@@ -2563,7 +2563,7 @@ static void set_irq_line(z180_state *cpustate, int irqline, int state)
/* logical to physical address translation */
static CPU_TRANSLATE( z180 )
{
- if (space == ADDRESS_SPACE_PROGRAM)
+ if (space == AS_PROGRAM)
{
z180_state *cpustate = get_safe_token(device);
*address = MMU_REMAP_ADDR(cpustate, *address);
@@ -2691,12 +2691,12 @@ CPU_GET_INFO( z180 )
case CPUINFO_INT_MIN_CYCLES: info->i = 1; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 20; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = cpustate->nmi_state; break;
case CPUINFO_INT_INPUT_STATE + Z180_IRQ0: info->i = cpustate->irq_state[0]; break;
diff --git a/src/emu/cpu/z8/z8.c b/src/emu/cpu/z8/z8.c
index 941fcae4d15..e25b8f3b24c 100644
--- a/src/emu/cpu/z8/z8.c
+++ b/src/emu/cpu/z8/z8.c
@@ -734,11 +734,11 @@ static CPU_RESET( z8 )
ADDRESS MAPS
***************************************************************************/
-static ADDRESS_MAP_START( program_2kb, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( program_2kb, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( program_4kb, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( program_4kb, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
@@ -840,15 +840,15 @@ static CPU_GET_INFO( z8 )
case CPUINFO_INT_MIN_CYCLES: info->i = 6; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 20; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 2; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 2; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
/* --- the following bits of info are returned as pointers to functions --- */
case CPUINFO_FCT_SET_INFO: info->setinfo = CPU_SET_INFO_NAME(z8); break;
@@ -881,7 +881,7 @@ CPU_GET_INFO( z8601 )
switch (state)
{
/* --- the following bits of info are returned as pointers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_2kb); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_2kb); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "Z8601"); break;
@@ -895,7 +895,7 @@ CPU_GET_INFO( ub8830d )
switch (state)
{
/* --- the following bits of info are returned as pointers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_2kb); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_2kb); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "UB8830D"); break;
@@ -909,7 +909,7 @@ CPU_GET_INFO( z8611 )
switch (state)
{
/* --- the following bits of info are returned as pointers --- */
- case DEVINFO_PTR_INTERNAL_MEMORY_MAP + ADDRESS_SPACE_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_4kb); break;
+ case DEVINFO_PTR_INTERNAL_MEMORY_MAP + AS_PROGRAM: info->internal_map8 = ADDRESS_MAP_NAME(program_4kb); break;
/* --- the following bits of info are returned as NULL-terminated strings --- */
case DEVINFO_STR_NAME: strcpy(info->s, "Z8611"); break;
diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c
index d9393bbac7d..19878d487b2 100644
--- a/src/emu/cpu/z80/z80.c
+++ b/src/emu/cpu/z80/z80.c
@@ -3860,12 +3860,12 @@ CPU_GET_INFO( z80 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 16; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = z80->nmi_state; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = z80->irq_state; break;
diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c
index 7c7d546c1d1..09f69555c83 100644
--- a/src/emu/cpu/z8000/z8000.c
+++ b/src/emu/cpu/z8000/z8000.c
@@ -584,15 +584,15 @@ CPU_GET_INFO( z8002 )
case CPUINFO_INT_MIN_CYCLES: info->i = 2; break;
case CPUINFO_INT_MAX_CYCLES: info->i = 744; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_PROGRAM: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_DATA: info->i = 0; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break;
case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI: info->i = cpustate->nmi_state; break;
case CPUINFO_INT_INPUT_STATE + 0: info->i = cpustate->irq_state[0]; break;
@@ -699,10 +699,10 @@ CPU_GET_INFO( z8001 )
{
switch (state)
{
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 16; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 20; break;
- case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_IO: info->i = 8; break;
- case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO: info->i = 16; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break;
+ case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break;
+ case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break;
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(z8001); break;
diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c
index 9606269eb5f..2bd5196eaff 100644
--- a/src/emu/debug/debugcmd.c
+++ b/src/emu/debug/debugcmd.c
@@ -298,12 +298,12 @@ void debug_command_init(running_machine *machine)
debug_console_register_command(machine, "bpenable", CMDFLAG_NONE, 1, 0, 1, execute_bpdisenable);
debug_console_register_command(machine, "bplist", CMDFLAG_NONE, 0, 0, 0, execute_bplist);
- debug_console_register_command(machine, "wpset", CMDFLAG_NONE, ADDRESS_SPACE_PROGRAM, 3, 5, execute_wpset);
- debug_console_register_command(machine, "wp", CMDFLAG_NONE, ADDRESS_SPACE_PROGRAM, 3, 5, execute_wpset);
- debug_console_register_command(machine, "wpdset", CMDFLAG_NONE, ADDRESS_SPACE_DATA, 3, 5, execute_wpset);
- debug_console_register_command(machine, "wpd", CMDFLAG_NONE, ADDRESS_SPACE_DATA, 3, 5, execute_wpset);
- debug_console_register_command(machine, "wpiset", CMDFLAG_NONE, ADDRESS_SPACE_IO, 3, 5, execute_wpset);
- debug_console_register_command(machine, "wpi", CMDFLAG_NONE, ADDRESS_SPACE_IO, 3, 5, execute_wpset);
+ debug_console_register_command(machine, "wpset", CMDFLAG_NONE, AS_PROGRAM, 3, 5, execute_wpset);
+ debug_console_register_command(machine, "wp", CMDFLAG_NONE, AS_PROGRAM, 3, 5, execute_wpset);
+ debug_console_register_command(machine, "wpdset", CMDFLAG_NONE, AS_DATA, 3, 5, execute_wpset);
+ debug_console_register_command(machine, "wpd", CMDFLAG_NONE, AS_DATA, 3, 5, execute_wpset);
+ debug_console_register_command(machine, "wpiset", CMDFLAG_NONE, AS_IO, 3, 5, execute_wpset);
+ debug_console_register_command(machine, "wpi", CMDFLAG_NONE, AS_IO, 3, 5, execute_wpset);
debug_console_register_command(machine, "wpclear", CMDFLAG_NONE, 0, 0, 1, execute_wpclear);
debug_console_register_command(machine, "wpdisable", CMDFLAG_NONE, 0, 0, 1, execute_wpdisenable);
debug_console_register_command(machine, "wpenable", CMDFLAG_NONE, 1, 0, 1, execute_wpdisenable);
@@ -311,17 +311,17 @@ void debug_command_init(running_machine *machine)
debug_console_register_command(machine, "hotspot", CMDFLAG_NONE, 0, 0, 3, execute_hotspot);
- debug_console_register_command(machine, "save", CMDFLAG_NONE, ADDRESS_SPACE_PROGRAM, 3, 4, execute_save);
- debug_console_register_command(machine, "saved", CMDFLAG_NONE, ADDRESS_SPACE_DATA, 3, 4, execute_save);
- debug_console_register_command(machine, "savei", CMDFLAG_NONE, ADDRESS_SPACE_IO, 3, 4, execute_save);
+ debug_console_register_command(machine, "save", CMDFLAG_NONE, AS_PROGRAM, 3, 4, execute_save);
+ debug_console_register_command(machine, "saved", CMDFLAG_NONE, AS_DATA, 3, 4, execute_save);
+ debug_console_register_command(machine, "savei", CMDFLAG_NONE, AS_IO, 3, 4, execute_save);
- debug_console_register_command(machine, "load", CMDFLAG_NONE, ADDRESS_SPACE_PROGRAM, 3, 4, execute_load);
- debug_console_register_command(machine, "loadd", CMDFLAG_NONE, ADDRESS_SPACE_DATA, 3, 4, execute_load);
- debug_console_register_command(machine, "loadi", CMDFLAG_NONE, ADDRESS_SPACE_IO, 3, 4, execute_load);
+ debug_console_register_command(machine, "load", CMDFLAG_NONE, AS_PROGRAM, 3, 4, execute_load);
+ debug_console_register_command(machine, "loadd", CMDFLAG_NONE, AS_DATA, 3, 4, execute_load);
+ debug_console_register_command(machine, "loadi", CMDFLAG_NONE, AS_IO, 3, 4, execute_load);
- debug_console_register_command(machine, "dump", CMDFLAG_NONE, ADDRESS_SPACE_PROGRAM, 3, 6, execute_dump);
- debug_console_register_command(machine, "dumpd", CMDFLAG_NONE, ADDRESS_SPACE_DATA, 3, 6, execute_dump);
- debug_console_register_command(machine, "dumpi", CMDFLAG_NONE, ADDRESS_SPACE_IO, 3, 6, execute_dump);
+ debug_console_register_command(machine, "dump", CMDFLAG_NONE, AS_PROGRAM, 3, 6, execute_dump);
+ debug_console_register_command(machine, "dumpd", CMDFLAG_NONE, AS_DATA, 3, 6, execute_dump);
+ debug_console_register_command(machine, "dumpi", CMDFLAG_NONE, AS_IO, 3, 6, execute_dump);
debug_console_register_command(machine, "cheatinit", CMDFLAG_NONE, 0, 0, 4, execute_cheatinit);
debug_console_register_command(machine, "ci", CMDFLAG_NONE, 0, 0, 4, execute_cheatinit);
@@ -340,12 +340,12 @@ void debug_command_init(running_machine *machine)
debug_console_register_command(machine, "cheatundo", CMDFLAG_NONE, 0, 0, 0, execute_cheatundo);
debug_console_register_command(machine, "cu", CMDFLAG_NONE, 0, 0, 0, execute_cheatundo);
- debug_console_register_command(machine, "f", CMDFLAG_KEEP_QUOTES, ADDRESS_SPACE_PROGRAM, 3, MAX_COMMAND_PARAMS, execute_find);
- debug_console_register_command(machine, "find", CMDFLAG_KEEP_QUOTES, ADDRESS_SPACE_PROGRAM, 3, MAX_COMMAND_PARAMS, execute_find);
- debug_console_register_command(machine, "fd", CMDFLAG_KEEP_QUOTES, ADDRESS_SPACE_DATA, 3, MAX_COMMAND_PARAMS, execute_find);
- debug_console_register_command(machine, "findd", CMDFLAG_KEEP_QUOTES, ADDRESS_SPACE_DATA, 3, MAX_COMMAND_PARAMS, execute_find);
- debug_console_register_command(machine, "fi", CMDFLAG_KEEP_QUOTES, ADDRESS_SPACE_IO, 3, MAX_COMMAND_PARAMS, execute_find);
- debug_console_register_command(machine, "findi", CMDFLAG_KEEP_QUOTES, ADDRESS_SPACE_IO, 3, MAX_COMMAND_PARAMS, execute_find);
+ debug_console_register_command(machine, "f", CMDFLAG_KEEP_QUOTES, AS_PROGRAM, 3, MAX_COMMAND_PARAMS, execute_find);
+ debug_console_register_command(machine, "find", CMDFLAG_KEEP_QUOTES, AS_PROGRAM, 3, MAX_COMMAND_PARAMS, execute_find);
+ debug_console_register_command(machine, "fd", CMDFLAG_KEEP_QUOTES, AS_DATA, 3, MAX_COMMAND_PARAMS, execute_find);
+ debug_console_register_command(machine, "findd", CMDFLAG_KEEP_QUOTES, AS_DATA, 3, MAX_COMMAND_PARAMS, execute_find);
+ debug_console_register_command(machine, "fi", CMDFLAG_KEEP_QUOTES, AS_IO, 3, MAX_COMMAND_PARAMS, execute_find);
+ debug_console_register_command(machine, "findi", CMDFLAG_KEEP_QUOTES, AS_IO, 3, MAX_COMMAND_PARAMS, execute_find);
debug_console_register_command(machine, "dasm", CMDFLAG_NONE, 0, 3, 5, execute_dasm);
@@ -359,9 +359,9 @@ void debug_command_init(running_machine *machine)
debug_console_register_command(machine, "source", CMDFLAG_NONE, 0, 1, 1, execute_source);
- debug_console_register_command(machine, "map", CMDFLAG_NONE, ADDRESS_SPACE_PROGRAM, 1, 1, execute_map);
- debug_console_register_command(machine, "mapd", CMDFLAG_NONE, ADDRESS_SPACE_DATA, 1, 1, execute_map);
- debug_console_register_command(machine, "mapi", CMDFLAG_NONE, ADDRESS_SPACE_IO, 1, 1, execute_map);
+ debug_console_register_command(machine, "map", CMDFLAG_NONE, AS_PROGRAM, 1, 1, execute_map);
+ debug_console_register_command(machine, "mapd", CMDFLAG_NONE, AS_DATA, 1, 1, execute_map);
+ debug_console_register_command(machine, "mapi", CMDFLAG_NONE, AS_IO, 1, 1, execute_map);
debug_console_register_command(machine, "memdump", CMDFLAG_NONE, 0, 0, 1, execute_memdump);
debug_console_register_command(machine, "symlist", CMDFLAG_NONE, 0, 0, 1, execute_symlist);
@@ -1437,7 +1437,7 @@ static void execute_wplist(running_machine *machine, int ref, int params, const
/* loop over all CPUs */
for (device_t *device = machine->m_devicelist.first(); device != NULL; device = device->next())
- for (int spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++)
+ for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; spacenum++)
if (device->debug()->watchpoint_first(spacenum) != NULL)
{
static const char *const types[] = { "unkn ", "read ", "write", "r/w " };
@@ -1718,7 +1718,7 @@ static void execute_cheatinit(running_machine *machine, int ref, int params, con
memset(cheat_region, 0, sizeof(cheat_region));
/* validate parameters */
- if (!debug_command_parameter_cpu_space(machine, (params > 3) ? param[3] : NULL, ADDRESS_SPACE_PROGRAM, &space))
+ if (!debug_command_parameter_cpu_space(machine, (params > 3) ? param[3] : NULL, AS_PROGRAM, &space))
return;
if (ref == 0)
@@ -1832,7 +1832,7 @@ static void execute_cheatinit(running_machine *machine, int ref, int params, con
return;
}
- if (!debug_command_parameter_cpu_space(machine, &cheat.cpu, ADDRESS_SPACE_PROGRAM, &space))
+ if (!debug_command_parameter_cpu_space(machine, &cheat.cpu, AS_PROGRAM, &space))
return;
cheat_map *newmap = auto_alloc_array(machine, cheat_map, cheat.length + real_length);
@@ -1899,7 +1899,7 @@ static void execute_cheatnext(running_machine *machine, int ref, int params, con
return;
}
- if (!debug_command_parameter_cpu_space(machine, &cheat.cpu, ADDRESS_SPACE_PROGRAM, &space))
+ if (!debug_command_parameter_cpu_space(machine, &cheat.cpu, AS_PROGRAM, &space))
return;
if (params > 1 && !debug_command_parameter_number(machine, param[1], &comp_value))
@@ -2054,7 +2054,7 @@ static void execute_cheatlist(running_machine *machine, int ref, int params, con
UINT64 sizemask;
FILE *f = NULL;
- if (!debug_command_parameter_cpu_space(machine, &cheat.cpu, ADDRESS_SPACE_PROGRAM, &space))
+ if (!debug_command_parameter_cpu_space(machine, &cheat.cpu, AS_PROGRAM, &space))
return;
if (!debug_command_parameter_cpu(machine, &cheat.cpu, &cpu))
@@ -2066,9 +2066,9 @@ static void execute_cheatlist(running_machine *machine, int ref, int params, con
switch (space->spacenum())
{
default:
- case ADDRESS_SPACE_PROGRAM: spaceletter = 'p'; break;
- case ADDRESS_SPACE_DATA: spaceletter = 'd'; break;
- case ADDRESS_SPACE_IO: spaceletter = 'i'; break;
+ case AS_PROGRAM: spaceletter = 'p'; break;
+ case AS_DATA: spaceletter = 'd'; break;
+ case AS_IO: spaceletter = 'i'; break;
}
switch (cheat.width)
@@ -2253,7 +2253,7 @@ static void execute_dasm(running_machine *machine, int ref, int params, const ch
return;
if (!debug_command_parameter_number(machine, param[3], &bytes))
return;
- if (!debug_command_parameter_cpu_space(machine, (params > 4) ? param[4] : NULL, ADDRESS_SPACE_PROGRAM, &space))
+ if (!debug_command_parameter_cpu_space(machine, (params > 4) ? param[4] : NULL, AS_PROGRAM, &space))
return;
/* determine the width of the bytes */
@@ -2437,7 +2437,7 @@ static void execute_history(running_machine *machine, int ref, int params, const
{
/* validate parameters */
address_space *space;
- if (!debug_command_parameter_cpu_space(machine, (params > 0) ? param[0] : NULL, ADDRESS_SPACE_PROGRAM, &space))
+ if (!debug_command_parameter_cpu_space(machine, (params > 0) ? param[0] : NULL, AS_PROGRAM, &space))
return;
UINT64 count = device_debug::HISTORY_SIZE;
diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index 302e7650050..e8cd3830303 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -118,13 +118,13 @@ static void reset_transient_flags(running_machine &machine);
static void process_source_file(running_machine *machine);
/* expression handlers */
-static UINT64 expression_read_memory(void *param, const char *name, int space, UINT32 address, int size);
+static UINT64 expression_read_memory(void *param, const char *name, expression_space space, UINT32 address, int size);
static UINT64 expression_read_program_direct(address_space *space, int opcode, offs_t address, int size);
static UINT64 expression_read_memory_region(running_machine *machine, const char *rgntag, offs_t address, int size);
-static void expression_write_memory(void *param, const char *name, int space, UINT32 address, int size, UINT64 data);
+static void expression_write_memory(void *param, const char *name, expression_space space, UINT32 address, int size, UINT64 data);
static void expression_write_program_direct(address_space *space, int opcode, offs_t address, int size, UINT64 data);
static void expression_write_memory_region(running_machine *machine, const char *rgntag, offs_t address, int size, UINT64 data);
-static expression_error::error_code expression_validate(void *param, const char *name, int space);
+static expression_error::error_code expression_validate(void *param, const char *name, expression_space space);
/* variable getters/setters */
static UINT64 get_cpunum(symbol_table &table, void *ref);
@@ -1163,7 +1163,7 @@ static device_t *expression_get_device(running_machine *machine, const char *tag
space
-------------------------------------------------*/
-static UINT64 expression_read_memory(void *param, const char *name, int spacenum, UINT32 address, int size)
+static UINT64 expression_read_memory(void *param, const char *name, expression_space spacenum, UINT32 address, int size)
{
running_machine *machine = (running_machine *)param;
UINT64 result = ~(UINT64)0 >> (64 - 8*size);
@@ -1180,7 +1180,7 @@ static UINT64 expression_read_memory(void *param, const char *name, int spacenum
device = expression_get_device(machine, name);
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- space = device->memory().space(ADDRESS_SPACE_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL));
+ 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);
break;
@@ -1193,7 +1193,7 @@ static UINT64 expression_read_memory(void *param, const char *name, int spacenum
device = expression_get_device(machine, name);
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- space = device->memory().space(ADDRESS_SPACE_PROGRAM + (spacenum - EXPSPACE_PROGRAM_PHYSICAL));
+ 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);
break;
@@ -1204,7 +1204,7 @@ static UINT64 expression_read_memory(void *param, const char *name, int spacenum
device = expression_get_device(machine, name);
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- result = expression_read_program_direct(device->memory().space(ADDRESS_SPACE_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:
@@ -1212,6 +1212,9 @@ static UINT64 expression_read_memory(void *param, const char *name, int spacenum
break;
result = expression_read_memory_region(machine, name, address, size);
break;
+
+ default:
+ break;
}
return result;
}
@@ -1332,7 +1335,7 @@ static UINT64 expression_read_memory_region(running_machine *machine, const char
space
-------------------------------------------------*/
-static void expression_write_memory(void *param, const char *name, int spacenum, UINT32 address, int size, UINT64 data)
+static void expression_write_memory(void *param, const char *name, expression_space spacenum, UINT32 address, int size, UINT64 data)
{
running_machine *machine = (running_machine *)param;
device_t *device = NULL;
@@ -1348,7 +1351,7 @@ static void expression_write_memory(void *param, const char *name, int spacenum,
device = expression_get_device(machine, name);
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- space = device->memory().space(ADDRESS_SPACE_PROGRAM + (spacenum - EXPSPACE_PROGRAM_LOGICAL));
+ 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);
break;
@@ -1361,7 +1364,7 @@ static void expression_write_memory(void *param, const char *name, int spacenum,
device = expression_get_device(machine, name);
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- space = device->memory().space(ADDRESS_SPACE_PROGRAM + (spacenum - EXPSPACE_PROGRAM_PHYSICAL));
+ 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);
break;
@@ -1372,7 +1375,7 @@ static void expression_write_memory(void *param, const char *name, int spacenum,
device = expression_get_device(machine, name);
if (device == NULL)
device = debug_cpu_get_visible_cpu(machine);
- expression_write_program_direct(device->memory().space(ADDRESS_SPACE_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:
@@ -1380,6 +1383,9 @@ static void expression_write_memory(void *param, const char *name, int spacenum,
break;
expression_write_memory_region(machine, name, address, size, data);
break;
+
+ default:
+ break;
}
}
@@ -1512,7 +1518,7 @@ static void expression_write_memory_region(running_machine *machine, const char
appropriate name
-------------------------------------------------*/
-static expression_error::error_code expression_validate(void *param, const char *name, int space)
+static expression_error::error_code expression_validate(void *param, const char *name, expression_space space)
{
running_machine *machine = (running_machine *)param;
device_t *device = NULL;
@@ -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(ADDRESS_SPACE_PROGRAM + (space - EXPSPACE_PROGRAM_LOGICAL)) == NULL)
+ if (device->memory().space(AS_PROGRAM + (space - EXPSPACE_PROGRAM_LOGICAL)) == NULL)
return expression_error::NO_SUCH_MEMORY_SPACE;
break;
@@ -1547,7 +1553,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(ADDRESS_SPACE_PROGRAM + (space - EXPSPACE_PROGRAM_PHYSICAL)) == NULL)
+ if (device->memory().space(AS_PROGRAM + (space - EXPSPACE_PROGRAM_PHYSICAL)) == NULL)
return expression_error::NO_SUCH_MEMORY_SPACE;
break;
@@ -1561,7 +1567,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(ADDRESS_SPACE_PROGRAM) == NULL)
+ if (device->memory().space(AS_PROGRAM) == NULL)
return expression_error::NO_SUCH_MEMORY_SPACE;
break;
@@ -1571,6 +1577,9 @@ static expression_error::error_code expression_validate(void *param, const char
if (machine->region(name)->base() == NULL)
return expression_error::INVALID_MEMORY_NAME;
break;
+
+ default:
+ return expression_error::NO_SUCH_MEMORY_SPACE;
}
return expression_error::NONE;
}
@@ -2391,7 +2400,7 @@ int device_debug::watchpoint_set(address_space &space, int type, offs_t address,
bool device_debug::watchpoint_clear(int index)
{
// scan the list to see if we own this breakpoint
- for (int spacenum = 0; spacenum < ARRAY_LENGTH(m_wplist); spacenum++)
+ for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_wplist); spacenum++)
for (watchpoint **wp = &m_wplist[spacenum]; *wp != NULL; wp = &(*wp)->m_next)
if ((*wp)->m_index == index)
{
@@ -2415,7 +2424,7 @@ bool device_debug::watchpoint_clear(int index)
void device_debug::watchpoint_clear_all()
{
// clear the head until we run out
- for (int spacenum = 0; spacenum < ARRAY_LENGTH(m_wplist); spacenum++)
+ for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_wplist); spacenum++)
while (m_wplist[spacenum] != NULL)
watchpoint_clear(m_wplist[spacenum]->index());
}
@@ -2429,7 +2438,7 @@ void device_debug::watchpoint_clear_all()
bool device_debug::watchpoint_enable(int index, bool enable)
{
// scan the list to see if we own this watchpoint
- for (int spacenum = 0; spacenum < ARRAY_LENGTH(m_wplist); spacenum++)
+ for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_wplist); spacenum++)
for (watchpoint *wp = m_wplist[spacenum]; wp != NULL; wp = wp->next())
if (wp->m_index == index)
{
@@ -2451,7 +2460,7 @@ bool device_debug::watchpoint_enable(int index, bool enable)
void device_debug::watchpoint_enable_all(bool enable)
{
// apply the enable to all watchpoints we own
- for (int spacenum = 0; spacenum < ARRAY_LENGTH(m_wplist); spacenum++)
+ for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_wplist); spacenum++)
for (watchpoint *wp = m_wplist[spacenum]; wp != NULL; wp = wp->next())
watchpoint_enable(wp->index(), enable);
}
diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h
index 4b926d7bffb..990cc7e5cf5 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(int spacenum = AS_PROGRAM) 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->space(spacenum) != NULL) ? 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; }
@@ -193,7 +193,7 @@ public:
void breakpoint_enable_all(bool enable = true);
// watchpoints
- watchpoint *watchpoint_first(int spacenum) const { return m_wplist[spacenum]; }
+ watchpoint *watchpoint_first(address_spacenum spacenum) const { return m_wplist[spacenum]; }
int watchpoint_set(address_space &space, int type, offs_t address, offs_t length, const char *condition, const char *action);
bool watchpoint_clear(int wpnum);
void watchpoint_clear_all();
diff --git a/src/emu/debug/dvmemory.c b/src/emu/debug/dvmemory.c
index dce4f239f59..f7398692729 100644
--- a/src/emu/debug/dvmemory.c
+++ b/src/emu/debug/dvmemory.c
@@ -154,7 +154,7 @@ void debug_view_memory::enumerate_sources()
// first add all the devices' address spaces
device_memory_interface *memintf = NULL;
for (bool gotone = m_machine.m_devicelist.first(memintf); gotone; gotone = memintf->next(memintf))
- for (int spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++)
+ for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; spacenum++)
{
address_space *space = memintf->space(spacenum);
if (space != NULL)
diff --git a/src/emu/debug/express.c b/src/emu/debug/express.c
index 2a7b8f24701..dbb2e96aedb 100644
--- a/src/emu/debug/express.c
+++ b/src/emu/debug/express.c
@@ -528,7 +528,7 @@ void symbol_table::set_value(const char *symbol, UINT64 value)
// memory name/space/offset combination is valid
//-------------------------------------------------
-expression_error::error_code symbol_table::memory_valid(const char *name, int space)
+expression_error::error_code symbol_table::memory_valid(const char *name, expression_space space)
{
// walk up the table hierarchy to find the owner
for (symbol_table *symtable = this; symtable != NULL; symtable = symtable->m_parent)
@@ -546,7 +546,7 @@ expression_error::error_code symbol_table::memory_valid(const char *name, int sp
// memory_value - return a value read from memory
//-------------------------------------------------
-UINT64 symbol_table::memory_value(const char *name, int space, UINT32 offset, int size)
+UINT64 symbol_table::memory_value(const char *name, expression_space space, UINT32 offset, int size)
{
// walk up the table hierarchy to find the owner
for (symbol_table *symtable = this; symtable != NULL; symtable = symtable->m_parent)
@@ -565,7 +565,7 @@ UINT64 symbol_table::memory_value(const char *name, int space, UINT32 offset, in
// set_memory_value - write a value to memory
//-------------------------------------------------
-void symbol_table::set_memory_value(const char *name, int space, UINT32 offset, int size, UINT64 value)
+void symbol_table::set_memory_value(const char *name, expression_space space, UINT32 offset, int size, UINT64 value)
{
// walk up the table hierarchy to find the owner
for (symbol_table *symtable = this; symtable != NULL; symtable = symtable->m_parent)
diff --git a/src/emu/debug/express.h b/src/emu/debug/express.h
index 0931626b9de..8b348c67ef0 100644
--- a/src/emu/debug/express.h
+++ b/src/emu/debug/express.h
@@ -42,7 +42,7 @@
#ifndef __EXPRESS_H__
#define __EXPRESS_H__
-#include "osdcore.h"
+#include "emu.h"
//**************************************************************************
@@ -184,9 +184,9 @@ public:
typedef UINT64 (*execute_func)(symbol_table &table, void *symref, int numparams, const UINT64 *paramlist);
// callback functions for memory reads/writes
- typedef expression_error::error_code (*valid_func)(void *cbparam, const char *name, int space);
- typedef UINT64 (*read_func)(void *cbparam, const char *name, int space, UINT32 offset, int size);
- typedef void (*write_func)(void *cbparam, const char *name, int space, UINT32 offset, int size, UINT64 value);
+ typedef expression_error::error_code (*valid_func)(void *cbparam, const char *name, expression_space space);
+ typedef UINT64 (*read_func)(void *cbparam, const char *name, expression_space space, UINT32 offset, int size);
+ typedef void (*write_func)(void *cbparam, const char *name, expression_space space, UINT32 offset, int size, UINT64 value);
enum read_write
{
@@ -218,9 +218,9 @@ public:
void set_value(const char *symbol, UINT64 value);
// memory accessors
- expression_error::error_code memory_valid(const char *name, int space);
- UINT64 memory_value(const char *name, int space, UINT32 offset, int size);
- void set_memory_value(const char *name, int space, UINT32 offset, int size, UINT64 value);
+ expression_error::error_code memory_valid(const char *name, expression_space space);
+ UINT64 memory_value(const char *name, expression_space space, UINT32 offset, int size);
+ void set_memory_value(const char *name, expression_space space, UINT32 offset, int size, UINT64 value);
private:
// internal state
diff --git a/src/emu/devcb.c b/src/emu/devcb.c
index 7f90abbfda0..d70af9f9507 100644
--- a/src/emu/devcb.c
+++ b/src/emu/devcb.c
@@ -48,9 +48,9 @@ void devcb_resolve_read_line(devcb_resolved_read_line *resolved, const devcb_rea
}
/* address space handlers */
- else if (config->type >= DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->readspace != NULL)
+ else if (config->type >= DEVCB_TYPE_MEMORY(AS_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->readspace != NULL)
{
- FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM);
+ FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(AS_PROGRAM);
device_t *targetdev = device->siblingdevice(config->tag);
if (targetdev == NULL)
@@ -137,9 +137,9 @@ void devcb_resolve_write_line(devcb_resolved_write_line *resolved, const devcb_w
}
/* address space handlers */
- else if (config->type >= DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->writespace != NULL)
+ else if (config->type >= DEVCB_TYPE_MEMORY(AS_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->writespace != NULL)
{
- FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM);
+ FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(AS_PROGRAM);
device_t *targetdev = device->siblingdevice(config->tag);
if (targetdev == NULL)
@@ -235,9 +235,9 @@ void devcb_resolve_read8(devcb_resolved_read8 *resolved, const devcb_read8 *conf
}
/* address space handlers */
- else if (config->type >= DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->readspace != NULL)
+ else if (config->type >= DEVCB_TYPE_MEMORY(AS_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->readspace != NULL)
{
- FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM);
+ FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(AS_PROGRAM);
device_t *targetdev = device->siblingdevice(config->tag);
if (targetdev == NULL)
@@ -314,9 +314,9 @@ void devcb_resolve_write8(devcb_resolved_write8 *resolved, const devcb_write8 *c
}
/* address space handlers */
- else if (config->type >= DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->writespace != NULL)
+ else if (config->type >= DEVCB_TYPE_MEMORY(AS_PROGRAM) && config->type < DEVCB_TYPE_MEMORY(ADDRESS_SPACES) && config->writespace != NULL)
{
- FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(ADDRESS_SPACE_PROGRAM);
+ FPTR spacenum = (FPTR)config->type - (FPTR)DEVCB_TYPE_MEMORY(AS_PROGRAM);
device_t *targetdev = device->siblingdevice(config->tag);
if (targetdev == NULL)
diff --git a/src/emu/devcb.h b/src/emu/devcb.h
index 77b7dd3dc65..d252481e6ed 100644
--- a/src/emu/devcb.h
+++ b/src/emu/devcb.h
@@ -115,7 +115,7 @@ void devcb_stub(device_t *device, offs_t offset, UINT8 data)
#define DEVCB_DEVICE_MEMBER(tag,cls,memb) { DEVCB_TYPE_DEVICE, tag, NULL, &devcb_stub<cls, &cls::memb>, NULL }
/* read/write handlers for a given CPU's address space */
-#define DEVCB_MEMORY_HANDLER(cpu,space,func) { DEVCB_TYPE_MEMORY(ADDRESS_SPACE_##space), (cpu), NULL, NULL, (func) }
+#define DEVCB_MEMORY_HANDLER(cpu,space,func) { DEVCB_TYPE_MEMORY(AS_##space), (cpu), NULL, NULL, (func) }
/* read handlers for an I/O port by tag */
#define DEVCB_INPUT_PORT(tag) { DEVCB_TYPE_INPUT, (tag), NULL, NULL, NULL }
diff --git a/src/emu/devcpu.c b/src/emu/devcpu.c
index 23462efbf39..9585949b348 100644
--- a/src/emu/devcpu.c
+++ b/src/emu/devcpu.c
@@ -70,7 +70,7 @@ legacy_cpu_device_config::legacy_cpu_device_config(const machine_config &mconfig
{
// build up our address spaces; legacy devices don't have logical spaces
memset(m_space_config, 0, sizeof(m_space_config));
- for (int spacenum = 0; spacenum < ARRAY_LENGTH(m_space_config); spacenum++)
+ for (address_spacenum spacenum = AS_0; spacenum < ARRAY_LENGTH(m_space_config); spacenum++)
{
m_space_config[spacenum].m_name = (spacenum == 1) ? "data" : (spacenum == 2) ? "i/o" : "program";
m_space_config[spacenum].m_endianness = static_cast<endianness_t>(get_legacy_config_int(DEVINFO_INT_ENDIANNESS));
@@ -347,7 +347,7 @@ void legacy_cpu_device::execute_burn(INT32 cycles)
// on the provided address
//-------------------------------------------------
-bool legacy_cpu_device::memory_translate(int spacenum, int intention, offs_t &address)
+bool legacy_cpu_device::memory_translate(address_spacenum spacenum, int intention, offs_t &address)
{
if (m_translate != NULL)
return (*m_translate)(this, spacenum, intention, &address) ? true : false;
@@ -360,7 +360,7 @@ bool legacy_cpu_device::memory_translate(int spacenum, int intention, offs_t &ad
// device specific overrides
//-------------------------------------------------
-bool legacy_cpu_device::memory_read(int spacenum, offs_t offset, int size, UINT64 &value)
+bool legacy_cpu_device::memory_read(address_spacenum spacenum, offs_t offset, int size, UINT64 &value)
{
if (m_read != NULL)
return (*m_read)(this, spacenum, offset, size, &value) ? true : false;
@@ -373,7 +373,7 @@ bool legacy_cpu_device::memory_read(int spacenum, offs_t offset, int size, UINT6
// for device specific overrides
//-------------------------------------------------
-bool legacy_cpu_device::memory_write(int spacenum, offs_t offset, int size, UINT64 value)
+bool legacy_cpu_device::memory_write(address_spacenum spacenum, offs_t offset, int size, UINT64 value)
{
if (m_write != NULL)
return (*m_write)(this, spacenum, offset, size, value) ? true : false;
diff --git a/src/emu/devcpu.h b/src/emu/devcpu.h
index ec66f011a0a..aa40b5f78ea 100644
--- a/src/emu/devcpu.h
+++ b/src/emu/devcpu.h
@@ -53,14 +53,6 @@
// CONSTANTS
//**************************************************************************
-// alternate address space names for common use
-enum
-{
- ADDRESS_SPACE_PROGRAM = ADDRESS_SPACE_0, // program address space
- ADDRESS_SPACE_DATA = ADDRESS_SPACE_1, // data address space
- ADDRESS_SPACE_IO = ADDRESS_SPACE_2 // I/O address space
-};
-
// CPU information constants
const int MAX_REGS = 256;
enum
@@ -80,14 +72,14 @@ enum
CPUINFO_INT_MAX_CYCLES, // R/O: maximum cycles for a single instruction
CPUINFO_INT_LOGADDR_WIDTH, // R/O: address bus size for logical accesses in each space (0=same as physical)
- CPUINFO_INT_LOGADDR_WIDTH_PROGRAM = CPUINFO_INT_LOGADDR_WIDTH + ADDRESS_SPACE_PROGRAM,
- CPUINFO_INT_LOGADDR_WIDTH_DATA = CPUINFO_INT_LOGADDR_WIDTH + ADDRESS_SPACE_DATA,
- CPUINFO_INT_LOGADDR_WIDTH_IO = CPUINFO_INT_LOGADDR_WIDTH + ADDRESS_SPACE_IO,
+ CPUINFO_INT_LOGADDR_WIDTH_PROGRAM = CPUINFO_INT_LOGADDR_WIDTH + AS_PROGRAM,
+ CPUINFO_INT_LOGADDR_WIDTH_DATA = CPUINFO_INT_LOGADDR_WIDTH + AS_DATA,
+ CPUINFO_INT_LOGADDR_WIDTH_IO = CPUINFO_INT_LOGADDR_WIDTH + AS_IO,
CPUINFO_INT_LOGADDR_WIDTH_LAST = CPUINFO_INT_LOGADDR_WIDTH + ADDRESS_SPACES - 1,
CPUINFO_INT_PAGE_SHIFT, // R/O: size of a page log 2 (i.e., 12=4096), or 0 if paging not supported
- CPUINFO_INT_PAGE_SHIFT_PROGRAM = CPUINFO_INT_PAGE_SHIFT + ADDRESS_SPACE_PROGRAM,
- CPUINFO_INT_PAGE_SHIFT_DATA = CPUINFO_INT_PAGE_SHIFT + ADDRESS_SPACE_DATA,
- CPUINFO_INT_PAGE_SHIFT_IO = CPUINFO_INT_PAGE_SHIFT + ADDRESS_SPACE_IO,
+ CPUINFO_INT_PAGE_SHIFT_PROGRAM = CPUINFO_INT_PAGE_SHIFT + AS_PROGRAM,
+ CPUINFO_INT_PAGE_SHIFT_DATA = CPUINFO_INT_PAGE_SHIFT + AS_DATA,
+ CPUINFO_INT_PAGE_SHIFT_IO = CPUINFO_INT_PAGE_SHIFT + AS_IO,
CPUINFO_INT_PAGE_SHIFT_LAST = CPUINFO_INT_PAGE_SHIFT + ADDRESS_SPACES - 1,
CPUINFO_INT_INPUT_STATE, // R/W: states for each input line
@@ -120,9 +112,9 @@ enum
CPUINFO_FCT_EXECUTE, // R/O: int (*execute)(legacy_cpu_device *device, int cycles)
CPUINFO_FCT_BURN, // R/O: void (*burn)(legacy_cpu_device *device, int cycles)
CPUINFO_FCT_DISASSEMBLE, // R/O: offs_t (*disassemble)(legacy_cpu_device *device, char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, int options)
- CPUINFO_FCT_TRANSLATE, // R/O: int (*translate)(legacy_cpu_device *device, int space, int intention, offs_t *address)
- CPUINFO_FCT_READ, // R/O: int (*read)(legacy_cpu_device *device, int space, UINT32 offset, int size, UINT64 *value)
- CPUINFO_FCT_WRITE, // R/O: int (*write)(legacy_cpu_device *device, int space, UINT32 offset, int size, UINT64 value)
+ CPUINFO_FCT_TRANSLATE, // R/O: int (*translate)(legacy_cpu_device *device, address_spacenum space, int intention, offs_t *address)
+ CPUINFO_FCT_READ, // R/O: int (*read)(legacy_cpu_device *device, address_spacenum space, UINT32 offset, int size, UINT64 *value)
+ CPUINFO_FCT_WRITE, // R/O: int (*write)(legacy_cpu_device *device, address_spacenum space, UINT32 offset, int size, UINT64 value)
CPUINFO_FCT_READOP, // R/O: int (*readop)(legacy_cpu_device *device, UINT32 offset, int size, UINT64 *value)
CPUINFO_FCT_DEBUG_INIT, // R/O: void (*debug_init)(legacy_cpu_device *device)
CPUINFO_FCT_IMPORT_STATE, // R/O: void (*import_state)(legacy_cpu_device *device, const device_state_entry &entry)
@@ -248,15 +240,15 @@ const device_type name = basename##_device_config::static_alloc_device_config
#define CPU_BURN_CALL(name) CPU_BURN_NAME(name)(device, cycles)
#define CPU_TRANSLATE_NAME(name) cpu_translate_##name
-#define CPU_TRANSLATE(name) int CPU_TRANSLATE_NAME(name)(legacy_cpu_device *device, int space, int intention, offs_t *address)
+#define CPU_TRANSLATE(name) int CPU_TRANSLATE_NAME(name)(legacy_cpu_device *device, address_spacenum space, int intention, offs_t *address)
#define CPU_TRANSLATE_CALL(name) CPU_TRANSLATE_NAME(name)(device, space, intention, address)
#define CPU_READ_NAME(name) cpu_read_##name
-#define CPU_READ(name) int CPU_READ_NAME(name)(legacy_cpu_device *device, int space, UINT32 offset, int size, UINT64 *value)
+#define CPU_READ(name) int CPU_READ_NAME(name)(legacy_cpu_device *device, address_spacenum space, UINT32 offset, int size, UINT64 *value)
#define CPU_READ_CALL(name) CPU_READ_NAME(name)(device, space, offset, size, value)
#define CPU_WRITE_NAME(name) cpu_write_##name
-#define CPU_WRITE(name) int CPU_WRITE_NAME(name)(legacy_cpu_device *device, int space, UINT32 offset, int size, UINT64 value)
+#define CPU_WRITE(name) int CPU_WRITE_NAME(name)(legacy_cpu_device *device, address_spacenum space, UINT32 offset, int size, UINT64 value)
#define CPU_WRITE_CALL(name) CPU_WRITE_NAME(name)(device, space, offset, size, value)
#define CPU_READOP_NAME(name) cpu_readop_##name
@@ -317,9 +309,9 @@ typedef void (*cpu_reset_func)(legacy_cpu_device *device);
typedef void (*cpu_exit_func)(legacy_cpu_device *device);
typedef void (*cpu_execute_func)(legacy_cpu_device *device);
typedef void (*cpu_burn_func)(legacy_cpu_device *device, int cycles);
-typedef int (*cpu_translate_func)(legacy_cpu_device *device, int space, int intention, offs_t *address);
-typedef int (*cpu_read_func)(legacy_cpu_device *device, int space, UINT32 offset, int size, UINT64 *value);
-typedef int (*cpu_write_func)(legacy_cpu_device *device, int space, UINT32 offset, int size, UINT64 value);
+typedef int (*cpu_translate_func)(legacy_cpu_device *device, address_spacenum space, int intention, offs_t *address);
+typedef int (*cpu_read_func)(legacy_cpu_device *device, address_spacenum space, UINT32 offset, int size, UINT64 *value);
+typedef int (*cpu_write_func)(legacy_cpu_device *device, address_spacenum space, UINT32 offset, int size, UINT64 value);
typedef int (*cpu_readop_func)(legacy_cpu_device *device, UINT32 offset, int size, UINT64 *value);
typedef void (*cpu_debug_init_func)(legacy_cpu_device *device);
typedef offs_t (*cpu_disassemble_func)(legacy_cpu_device *device, char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, int options);
@@ -407,7 +399,7 @@ protected:
virtual UINT32 execute_default_irq_vector() const { return get_legacy_config_int(CPUINFO_INT_DEFAULT_IRQ_VECTOR); }
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const { return (spacenum < ARRAY_LENGTH(m_space_config) && m_space_config[spacenum].m_addrbus_width != 0) ? &m_space_config[spacenum] : NULL; }
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum < ARRAY_LENGTH(m_space_config) && m_space_config[spacenum].m_addrbus_width != 0) ? &m_space_config[spacenum] : NULL; }
// device_config_disasm_interface overrides
virtual UINT32 disasm_min_opcode_bytes() const { return get_legacy_config_int(CPUINFO_INT_MIN_INSTRUCTION_BYTES); }
@@ -472,9 +464,9 @@ protected:
virtual void execute_set_input(int inputnum, int state) { set_legacy_runtime_int(CPUINFO_INT_INPUT_STATE + inputnum, state); }
// device_memory_interface overrides
- virtual bool memory_translate(int spacenum, int intention, offs_t &address);
- virtual bool memory_read(int spacenum, offs_t offset, int size, UINT64 &value);
- virtual bool memory_write(int spacenum, offs_t offset, int size, UINT64 value);
+ virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address);
+ virtual bool memory_read(address_spacenum spacenum, offs_t offset, int size, UINT64 &value);
+ virtual bool memory_write(address_spacenum spacenum, offs_t offset, int size, UINT64 value);
virtual bool memory_readop(offs_t offset, int size, UINT64 &value);
// device_state_interface overrides
diff --git a/src/emu/devlegcy.h b/src/emu/devlegcy.h
index 01a772574b0..626e9de122e 100644
--- a/src/emu/devlegcy.h
+++ b/src/emu/devlegcy.h
@@ -534,7 +534,7 @@ protected:
virtual void device_config_complete();
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const { return (spacenum == 0) ? &m_space_config : NULL; }
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == 0) ? &m_space_config : NULL; }
// internal state
address_space_config m_space_config;
diff --git a/src/emu/dimemory.c b/src/emu/dimemory.c
index 4dafaf92cce..7b9ccea2ae5 100644
--- a/src/emu/dimemory.c
+++ b/src/emu/dimemory.c
@@ -137,7 +137,7 @@ device_config_memory_interface::~device_config_memory_interface()
// does not exist
//-------------------------------------------------
-const address_space_config *device_config_memory_interface::memory_space_config(int spacenum) const
+const address_space_config *device_config_memory_interface::memory_space_config(address_spacenum spacenum) const
{
return NULL;
}
@@ -148,7 +148,7 @@ const address_space_config *device_config_memory_interface::memory_space_config(
// to set up VBLANK interrupts on the device
//-------------------------------------------------
-void device_config_memory_interface::static_set_addrmap(device_config *device, int spacenum, address_map_constructor map)
+void device_config_memory_interface::static_set_addrmap(device_config *device, address_spacenum spacenum, address_map_constructor map)
{
device_config_memory_interface *memory = dynamic_cast<device_config_memory_interface *>(device);
if (memory == NULL)
@@ -171,7 +171,7 @@ bool device_config_memory_interface::interface_validity_check(emu_options &optio
bool error = false;
// loop over all address spaces
- for (int spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++)
+ for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; spacenum++)
{
const address_space_config *spaceconfig = space_config(spacenum);
if (spaceconfig != NULL)
@@ -342,7 +342,7 @@ device_memory_interface::~device_memory_interface()
// to a device
//-------------------------------------------------
-void device_memory_interface::set_address_space(int spacenum, address_space &space)
+void device_memory_interface::set_address_space(address_spacenum spacenum, address_space &space)
{
assert(spacenum < ARRAY_LENGTH(m_addrspace));
m_addrspace[spacenum] = &space;
@@ -356,7 +356,7 @@ void device_memory_interface::set_address_space(int spacenum, address_space &spa
// translation is supported
//-------------------------------------------------
-bool device_memory_interface::memory_translate(int spacenum, int intention, offs_t &address)
+bool device_memory_interface::memory_translate(address_spacenum spacenum, int intention, offs_t &address)
{
// by default it maps directly
return true;
@@ -371,7 +371,7 @@ bool device_memory_interface::memory_translate(int spacenum, int intention, offs
// handled by bypassing the memory system
//-------------------------------------------------
-bool device_memory_interface::memory_read(int spacenum, offs_t offset, int size, UINT64 &value)
+bool device_memory_interface::memory_read(address_spacenum spacenum, offs_t offset, int size, UINT64 &value)
{
// by default, we don't do anything
return false;
@@ -386,7 +386,7 @@ bool device_memory_interface::memory_read(int spacenum, offs_t offset, int size,
// handled by bypassing the memory system
//-------------------------------------------------
-bool device_memory_interface::memory_write(int spacenum, offs_t offset, int size, UINT64 value)
+bool device_memory_interface::memory_write(address_spacenum spacenum, offs_t offset, int size, UINT64 value)
{
// by default, we don't do anything
return false;
diff --git a/src/emu/dimemory.h b/src/emu/dimemory.h
index bdd9b6263f7..d1a9cc42d82 100644
--- a/src/emu/dimemory.h
+++ b/src/emu/dimemory.h
@@ -51,15 +51,6 @@
// CONSTANTS
//**************************************************************************
-// the configuration for a general device
-enum device_space
-{
- AS_PROGRAM = 0,
- AS_DATA = 1,
- AS_IO = 2
-};
-
-
// Translation intentions
const int TRANSLATE_TYPE_MASK = 0x03; // read write or fetch
const int TRANSLATE_USER_MASK = 0x04; // user mode or fully privileged
@@ -112,15 +103,15 @@ public:
virtual ~device_config_memory_interface();
// basic information getters
- address_map_constructor address_map(int spacenum = 0) const { return (spacenum < ARRAY_LENGTH(m_address_map)) ? m_address_map[spacenum] : NULL; }
- const address_space_config *space_config(int spacenum = 0) const { return memory_space_config(spacenum); }
+ address_map_constructor address_map(address_spacenum spacenum = AS_0) const { return (spacenum < ARRAY_LENGTH(m_address_map)) ? m_address_map[spacenum] : NULL; }
+ const address_space_config *space_config(address_spacenum spacenum = AS_0) const { return memory_space_config(spacenum); }
// static inline helpers
- static void static_set_addrmap(device_config *device, int spacenum, address_map_constructor map);
+ static void static_set_addrmap(device_config *device, address_spacenum spacenum, address_map_constructor map);
protected:
// required overrides
- virtual const address_space_config *memory_space_config(int spacenum) const = 0;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum) const = 0;
// optional operation overrides
virtual bool interface_validity_check(emu_options &options, const game_driver &driver) const;
@@ -145,26 +136,26 @@ public:
const device_config_memory_interface &memory_config() const { return m_memory_config; }
// basic information getters
- const address_space_config *space_config(int spacenum = 0) const { return m_memory_config.space_config(spacenum); }
+ const address_space_config *space_config(address_spacenum spacenum = AS_0) const { return m_memory_config.space_config(spacenum); }
address_space *space(int index = 0) const { return m_addrspace[index]; }
- address_space *space(device_space index) const { return m_addrspace[static_cast<int>(index)]; }
+ address_space *space(address_spacenum index) const { return m_addrspace[static_cast<int>(index)]; }
// address space accessors
- void set_address_space(int spacenum, address_space &space);
+ void set_address_space(address_spacenum spacenum, address_space &space);
// address translation
- bool translate(int spacenum, int intention, offs_t &address) { return memory_translate(spacenum, intention, address); }
+ bool translate(address_spacenum spacenum, int intention, offs_t &address) { return memory_translate(spacenum, intention, address); }
// read/write access
- bool read(int spacenum, offs_t offset, int size, UINT64 &value) { return memory_read(spacenum, offset, size, value); }
- bool write(int spacenum, offs_t offset, int size, UINT64 value) { return memory_write(spacenum, offset, size, value); }
+ bool read(address_spacenum spacenum, offs_t offset, int size, UINT64 &value) { return memory_read(spacenum, offset, size, value); }
+ bool write(address_spacenum spacenum, offs_t offset, int size, UINT64 value) { return memory_write(spacenum, offset, size, value); }
bool readop(offs_t offset, int size, UINT64 &value) { return memory_readop(offset, size, value); }
protected:
// optional operation overrides
- virtual bool memory_translate(int spacenum, int intention, offs_t &address);
- virtual bool memory_read(int spacenum, offs_t offset, int size, UINT64 &value);
- virtual bool memory_write(int spacenum, offs_t offset, int size, UINT64 value);
+ virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address);
+ virtual bool memory_read(address_spacenum spacenum, offs_t offset, int size, UINT64 &value);
+ virtual bool memory_write(address_spacenum spacenum, offs_t offset, int size, UINT64 value);
virtual bool memory_readop(offs_t offset, int size, UINT64 &value);
// interface-level overrides
@@ -185,7 +176,7 @@ protected:
// to sthe given address space's configuration
//-------------------------------------------------
-inline const address_space_config *devconfig_get_space_config(const device_config &devconfig, int spacenum = 0)
+inline const address_space_config *devconfig_get_space_config(const device_config &devconfig, address_spacenum spacenum = AS_0)
{
const device_config_memory_interface *intf;
if (!devconfig.interface(intf))
diff --git a/src/emu/imagedev/snapquik.c b/src/emu/imagedev/snapquik.c
index ce16c5fb548..af56b4776ec 100644
--- a/src/emu/imagedev/snapquik.c
+++ b/src/emu/imagedev/snapquik.c
@@ -298,7 +298,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(ADDRESS_SPACE_PROGRAM)->write_byte(j, data);
+ image->device().machine->device("maincpu")->memory().space(AS_PROGRAM)->write_byte(j, data);
}
return IMAGE_INIT_PASS;
diff --git a/src/emu/machine/at28c16.c b/src/emu/machine/at28c16.c
index 8e0dc4d2f69..f7418af244d 100644
--- a/src/emu/machine/at28c16.c
+++ b/src/emu/machine/at28c16.c
@@ -22,7 +22,7 @@
const device_type AT28C16 = at28c16_device_config::static_alloc_device_config;
-static ADDRESS_MAP_START( at28c16_map8, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( at28c16_map8, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x081f) AM_RAM
ADDRESS_MAP_END
@@ -95,7 +95,7 @@ bool at28c16_device_config::device_validity_check( emu_options &options, const g
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *at28c16_device_config::memory_space_config( int spacenum ) const
+const address_space_config *at28c16_device_config::memory_space_config( address_spacenum spacenum ) const
{
return ( spacenum == 0 ) ? &m_space_config : NULL;
}
diff --git a/src/emu/machine/at28c16.h b/src/emu/machine/at28c16.h
index b6b9857eee8..040a821b592 100644
--- a/src/emu/machine/at28c16.h
+++ b/src/emu/machine/at28c16.h
@@ -61,7 +61,7 @@ protected:
virtual bool device_validity_check( emu_options &options, const game_driver &driver ) const;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config( int spacenum = 0 ) const;
+ virtual const address_space_config *memory_space_config( address_spacenum spacenum = AS_0 ) const;
// device-specific configuration
address_space_config m_space_config;
diff --git a/src/emu/machine/eeprom.c b/src/emu/machine/eeprom.c
index a760faf7222..27c95819464 100644
--- a/src/emu/machine/eeprom.c
+++ b/src/emu/machine/eeprom.c
@@ -57,12 +57,12 @@ const eeprom_interface eeprom_interface_93C66B =
};
-static ADDRESS_MAP_START( eeprom_map8, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( eeprom_map8, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( eeprom_map16, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( eeprom_map16, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
ADDRESS_MAP_END
@@ -183,7 +183,7 @@ bool eeprom_device_config::device_validity_check(emu_options &options, const gam
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *eeprom_device_config::memory_space_config(int spacenum) const
+const address_space_config *eeprom_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == 0) ? &m_space_config : NULL;
}
diff --git a/src/emu/machine/eeprom.h b/src/emu/machine/eeprom.h
index 966af2cc9c5..3a59d3c3c46 100644
--- a/src/emu/machine/eeprom.h
+++ b/src/emu/machine/eeprom.h
@@ -86,7 +86,7 @@ protected:
virtual bool device_validity_check(emu_options &options, const game_driver &driver) const;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// device-specific configuration
address_space_config m_space_config;
diff --git a/src/emu/machine/er2055.c b/src/emu/machine/er2055.c
index a5a356d842b..ff7879a19ff 100644
--- a/src/emu/machine/er2055.c
+++ b/src/emu/machine/er2055.c
@@ -47,7 +47,7 @@
const device_type ER2055 = er2055_device_config::static_alloc_device_config;
-static ADDRESS_MAP_START( er2055_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( er2055_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x003f) AM_RAM
ADDRESS_MAP_END
@@ -96,7 +96,7 @@ device_t *er2055_device_config::alloc_device(running_machine &machine) const
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *er2055_device_config::memory_space_config(int spacenum) const
+const address_space_config *er2055_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == 0) ? &m_space_config : NULL;
}
diff --git a/src/emu/machine/er2055.h b/src/emu/machine/er2055.h
index c23294dc51d..833b43918e4 100644
--- a/src/emu/machine/er2055.h
+++ b/src/emu/machine/er2055.h
@@ -76,7 +76,7 @@ public:
protected:
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// device-specific configuration
address_space_config m_space_config;
diff --git a/src/emu/machine/i2cmem.c b/src/emu/machine/i2cmem.c
index c379f2c8e64..88dd45e805f 100644
--- a/src/emu/machine/i2cmem.c
+++ b/src/emu/machine/i2cmem.c
@@ -57,7 +57,7 @@ INLINE void ATTR_PRINTF( 3, 4 ) verboselog( device_t *device, int n_level, const
const device_type I2CMEM = i2cmem_device_config::static_alloc_device_config;
-static ADDRESS_MAP_START( i2cmem_map8, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( i2cmem_map8, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
ADDRESS_MAP_END
@@ -151,7 +151,7 @@ bool i2cmem_device_config::device_validity_check( emu_options &options, const ga
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *i2cmem_device_config::memory_space_config( int spacenum ) const
+const address_space_config *i2cmem_device_config::memory_space_config( address_spacenum spacenum ) const
{
return ( spacenum == 0 ) ? &m_space_config : NULL;
}
diff --git a/src/emu/machine/i2cmem.h b/src/emu/machine/i2cmem.h
index 8ecfd36bb9c..db353a0ec86 100644
--- a/src/emu/machine/i2cmem.h
+++ b/src/emu/machine/i2cmem.h
@@ -70,7 +70,7 @@ protected:
virtual bool device_validity_check( emu_options &options, const game_driver &driver ) const;
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config( int spacenum = 0 ) const;
+ virtual const address_space_config *memory_space_config( address_spacenum spacenum = AS_0 ) const;
// device-specific configuration
address_space_config m_space_config;
diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h
index 4ea9f400519..3b27e8588aa 100644
--- a/src/emu/machine/idectrl.h
+++ b/src/emu/machine/idectrl.h
@@ -49,7 +49,7 @@ struct _ide_config
#define MCFG_IDE_BUS_MASTER_SPACE(_cpu, _space) \
MCFG_DEVICE_CONFIG_DATAPTR(ide_config, bmcpu, _cpu) \
- MCFG_DEVICE_CONFIG_DATA32(ide_config, bmspace, ADDRESS_SPACE_##_space)
+ MCFG_DEVICE_CONFIG_DATA32(ide_config, bmspace, AS_##_space)
diff --git a/src/emu/machine/intelfsh.c b/src/emu/machine/intelfsh.c
index 9b814eae618..0a99eefad38 100644
--- a/src/emu/machine/intelfsh.c
+++ b/src/emu/machine/intelfsh.c
@@ -79,32 +79,32 @@ const device_type SHARP_UNK128MBIT = sharp_unk128mbit_device_config::static_allo
// GLOBAL VARIABLES
//**************************************************************************
-static ADDRESS_MAP_START( memory_map8_512Kb, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memory_map8_512Kb, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x00ffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( memory_map8_1Mb, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memory_map8_1Mb, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x01ffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( memory_map8_8Mb, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memory_map8_8Mb, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x0fffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( memory_map8_16Mb, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memory_map8_16Mb, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x1fffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( memory_map16_4Mb, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( memory_map16_4Mb, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x03ffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( memory_map16_16Mb, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( memory_map16_16Mb, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x0fffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( memory_map16_64Mb, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( memory_map16_64Mb, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x3fffff) AM_RAM
ADDRESS_MAP_END
@@ -226,7 +226,7 @@ intelfsh16_device_config::intelfsh16_device_config(const machine_config &mconfig
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *intelfsh_device_config::memory_space_config(int spacenum) const
+const address_space_config *intelfsh_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == 0) ? &m_space_config : NULL;
}
diff --git a/src/emu/machine/intelfsh.h b/src/emu/machine/intelfsh.h
index 242c0098c28..024e1ec3d56 100644
--- a/src/emu/machine/intelfsh.h
+++ b/src/emu/machine/intelfsh.h
@@ -84,7 +84,7 @@ protected:
intelfsh_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant);
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// internal state
address_space_config m_space_config;
diff --git a/src/emu/machine/latch8.c b/src/emu/machine/latch8.c
index f305b44a51a..289588f28e6 100644
--- a/src/emu/machine/latch8.c
+++ b/src/emu/machine/latch8.c
@@ -83,7 +83,7 @@ READ8_DEVICE_HANDLER( latch8_r )
if (latch8->has_read)
{
/* temporary hack until all relevant systems are devices */
- address_space *space = device->machine->firstcpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->firstcpu->memory().space(AS_PROGRAM);
int i;
for (i=0; i<8; i++)
{
diff --git a/src/emu/machine/ldpr8210.c b/src/emu/machine/ldpr8210.c
index df52658d089..5f9c6e22ed0 100644
--- a/src/emu/machine/ldpr8210.c
+++ b/src/emu/machine/ldpr8210.c
@@ -275,7 +275,7 @@ INLINE void update_audio_squelch(laserdisc_state *ld)
PR-8210 ROM AND MACHINE INTERFACES
***************************************************************************/
-static ADDRESS_MAP_START( pr8210_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pr8210_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READWRITE(pr8210_pia_r, pr8210_pia_w)
AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READ(pr8210_bus_r)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_WRITE(pr8210_port1_w)
@@ -989,7 +989,7 @@ static void overlay_draw_char(bitmap_t *bitmap, UINT8 ch, float xstart)
SIMUTREK ROM AND MACHINE INTERFACES
***************************************************************************/
-static ADDRESS_MAP_START( simutrek_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( simutrek_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READ(simutrek_data_r)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READWRITE(simutrek_port2_r, simutrek_port2_w)
AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ(simutrek_t0_r)
diff --git a/src/emu/machine/ldv1000.c b/src/emu/machine/ldv1000.c
index 441fb19dd20..f9477730987 100644
--- a/src/emu/machine/ldv1000.c
+++ b/src/emu/machine/ldv1000.c
@@ -118,7 +118,7 @@ static WRITE8_DEVICE_HANDLER( ppi1_portc_w );
LD-V1000 ROM AND MACHINE INTERFACES
***************************************************************************/
-static ADDRESS_MAP_START( ldv1000_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ldv1000_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x6000) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x3800) AM_RAM
AM_RANGE(0xc000, 0xc003) AM_MIRROR(0x9ff0) AM_DEVREADWRITE("ldvppi0", ppi8255_r, ppi8255_w)
@@ -126,7 +126,7 @@ static ADDRESS_MAP_START( ldv1000_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ldv1000_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ldv1000_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x07) AM_MIRROR(0x38) AM_READWRITE(decoder_display_port_r, decoder_display_port_w)
AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(controller_r)
diff --git a/src/emu/machine/ldvp931.c b/src/emu/machine/ldvp931.c
index 4933132cf71..e01a3f07541 100644
--- a/src/emu/machine/ldvp931.c
+++ b/src/emu/machine/ldvp931.c
@@ -121,7 +121,7 @@ static READ8_HANDLER( t1_r );
22VP931 ROM AND MACHINE INTERFACES
***************************************************************************/
-static ADDRESS_MAP_START( vp931_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( vp931_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_MIRROR(0xcf) AM_READWRITE(keypad_r, output0_w)
AM_RANGE(0x10, 0x10) AM_MIRROR(0xcf) AM_READWRITE(unknown_r, output1_w)
AM_RANGE(0x20, 0x20) AM_MIRROR(0xcf) AM_READWRITE(datic_r, lcd_w)
diff --git a/src/emu/machine/s3c2400.c b/src/emu/machine/s3c2400.c
index 61b6abc6c09..d21f36d713b 100644
--- a/src/emu/machine/s3c2400.c
+++ b/src/emu/machine/s3c2400.c
@@ -45,7 +45,7 @@ SCREEN_UPDATE( s3c2400 )
DEVICE_START( s3c2400 )
{
- address_space *space = device->machine->device( "maincpu")->memory().space( ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device( "maincpu")->memory().space( AS_PROGRAM);
DEVICE_START_CALL(s3c24xx);
memory_install_readwrite32_device_handler( space, device, 0x14000000, 0x1400003b, 0, 0, s3c24xx_memcon_r, s3c24xx_memcon_w);
memory_install_readwrite32_device_handler( space, device, 0x14200000, 0x1420005b, 0, 0, s3c24xx_usb_host_r, s3c24xx_usb_host_w);
diff --git a/src/emu/machine/s3c2410.c b/src/emu/machine/s3c2410.c
index fcd80962afe..09d829c829e 100644
--- a/src/emu/machine/s3c2410.c
+++ b/src/emu/machine/s3c2410.c
@@ -45,7 +45,7 @@ SCREEN_UPDATE( s3c2410 )
DEVICE_START( s3c2410 )
{
- address_space *space = device->machine->device( "maincpu")->memory().space( ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device( "maincpu")->memory().space( AS_PROGRAM);
DEVICE_START_CALL(s3c24xx);
memory_install_readwrite32_device_handler( space, device, 0x48000000, 0x4800003b, 0, 0, s3c24xx_memcon_r, s3c24xx_memcon_w);
memory_install_readwrite32_device_handler( space, device, 0x49000000, 0x4900005b, 0, 0, s3c24xx_usb_host_r, s3c24xx_usb_host_w);
diff --git a/src/emu/machine/s3c2440.c b/src/emu/machine/s3c2440.c
index ba34c4c25b3..510b64ac317 100644
--- a/src/emu/machine/s3c2440.c
+++ b/src/emu/machine/s3c2440.c
@@ -45,7 +45,7 @@ SCREEN_UPDATE( s3c2440 )
DEVICE_START( s3c2440 )
{
- address_space *space = device->machine->device( "maincpu")->memory().space( ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device( "maincpu")->memory().space( AS_PROGRAM);
memory_install_readwrite32_device_handler( space, device, 0x48000000, 0x4800003b, 0, 0, s3c24xx_memcon_r, s3c24xx_memcon_w);
memory_install_readwrite32_device_handler( space, device, 0x49000000, 0x4900005b, 0, 0, s3c24xx_usb_host_r, s3c24xx_usb_host_w);
memory_install_readwrite32_device_handler( space, device, 0x4a000000, 0x4a00001f, 0, 0, s3c24xx_irq_r, s3c24xx_irq_w);
diff --git a/src/emu/machine/s3c24xx.c b/src/emu/machine/s3c24xx.c
index 97c4b140582..6ec6e637426 100644
--- a/src/emu/machine/s3c24xx.c
+++ b/src/emu/machine/s3c24xx.c
@@ -247,7 +247,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( ADDRESS_SPACE_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++)
@@ -291,7 +291,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( ADDRESS_SPACE_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++)
@@ -1454,7 +1454,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( ADDRESS_SPACE_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);
diff --git a/src/emu/machine/x2212.c b/src/emu/machine/x2212.c
index e51625bc52e..81f76677f0a 100644
--- a/src/emu/machine/x2212.c
+++ b/src/emu/machine/x2212.c
@@ -16,11 +16,11 @@
const device_type X2212 = x2212_device_config::static_alloc_device_config;
-static ADDRESS_MAP_START( x2212_sram_map, ADDRESS_SPACE_0, 8 )
+static ADDRESS_MAP_START( x2212_sram_map, AS_0, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( x2212_e2prom_map, ADDRESS_SPACE_1, 8 )
+static ADDRESS_MAP_START( x2212_e2prom_map, AS_1, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM
ADDRESS_MAP_END
@@ -71,7 +71,7 @@ device_t *x2212_device_config::alloc_device(running_machine &machine) const
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *x2212_device_config::memory_space_config(int spacenum) const
+const address_space_config *x2212_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == 0) ? &m_sram_space_config : (spacenum == 1) ? &m_e2prom_space_config : NULL;
}
diff --git a/src/emu/machine/x2212.h b/src/emu/machine/x2212.h
index fcfb1f89508..fc85f32e9be 100644
--- a/src/emu/machine/x2212.h
+++ b/src/emu/machine/x2212.h
@@ -54,7 +54,7 @@ public:
protected:
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// device-specific configuration
address_space_config m_sram_space_config;
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 50e726e2209..c3614504dad 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -893,7 +893,7 @@ class address_space_specific : public address_space
public:
// construction/destruction
- address_space_specific(device_memory_interface &memory, int spacenum)
+ address_space_specific(device_memory_interface &memory, address_spacenum spacenum)
: address_space(memory, spacenum, _Large),
m_read(*this, _Large),
m_write(*this, _Large)
@@ -1563,7 +1563,7 @@ void memory_init(running_machine *machine)
// loop over devices and spaces within each device
device_memory_interface *memory = NULL;
for (bool gotone = machine->m_devicelist.first(memory); gotone; gotone = memory->next(memory))
- for (int spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++)
+ for (address_spacenum spacenum = AS_0; spacenum < ADDRESS_SPACES; spacenum++)
{
// if there is a configuration for this space, we need an address space
const address_space_config *spaceconfig = memory->space_config(spacenum);
@@ -1786,7 +1786,7 @@ static STATE_POSTLOAD( bank_reattach )
// address_space - constructor
//-------------------------------------------------
-address_space::address_space(device_memory_interface &memory, int spacenum, bool large)
+address_space::address_space(device_memory_interface &memory, address_spacenum spacenum, bool large)
: machine(memory.device().machine),
cpu(&memory.device()),
m_machine(*memory.device().machine),
@@ -1827,7 +1827,7 @@ address_space::~address_space()
// allocate - static smart allocator of subtypes
//-------------------------------------------------
-address_space &address_space::allocate(running_machine &machine, const address_space_config &config, device_memory_interface &memory, int spacenum)
+address_space &address_space::allocate(running_machine &machine, const address_space_config &config, device_memory_interface &memory, address_spacenum spacenum)
{
// allocate one of the appropriate type
bool large = (config.addr2byte_end(0xffffffffUL >> (32 - config.m_addrbus_width)) >= (1 << 18));
@@ -1933,7 +1933,7 @@ inline void address_space::adjust_addresses(offs_t &start, offs_t &end, offs_t &
void address_space::prepare_map()
{
- const memory_region *devregion = (m_spacenum == ADDRESS_SPACE_0) ? m_machine.region(m_device.tag()) : NULL;
+ const memory_region *devregion = (m_spacenum == AS_0) ? m_machine.region(m_device.tag()) : NULL;
UINT32 devregionsize = (devregion != NULL) ? devregion->bytes() : 0;
// allocate the address map
@@ -1966,7 +1966,7 @@ void address_space::prepare_map()
}
// if this is a ROM handler without a specified region, attach it to the implicit region
- if (m_spacenum == ADDRESS_SPACE_0 && entry->m_read.m_type == AMH_ROM && entry->m_region == NULL)
+ if (m_spacenum == AS_0 && entry->m_read.m_type == AMH_ROM && entry->m_region == NULL)
{
// make sure it fits within the memory region before doing so, however
if (entry->m_byteend < devregionsize)
@@ -3020,7 +3020,7 @@ bool address_space::needs_backing_store(const address_map_entry *entry)
// if we're reading from RAM or from ROM outside of address space 0 or its region, then yes, we do need backing
const memory_region *region = m_machine.region(m_device.tag());
if (entry->m_read.m_type == AMH_RAM ||
- (entry->m_read.m_type == AMH_ROM && (m_spacenum != ADDRESS_SPACE_0 || region == NULL || entry->m_addrstart >= region->bytes())))
+ (entry->m_read.m_type == AMH_ROM && (m_spacenum != AS_0 || region == NULL || entry->m_addrstart >= region->bytes())))
return true;
// all other cases don't need backing
diff --git a/src/emu/memory.h b/src/emu/memory.h
index c5998ac4d2f..f7174cea448 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -53,14 +53,20 @@
//**************************************************************************
// address spaces
-enum
+enum address_spacenum
{
- ADDRESS_SPACE_0, // first address space
- ADDRESS_SPACE_1, // second address space
- ADDRESS_SPACE_2, // third address space
- ADDRESS_SPACE_3, // fourth address space
- ADDRESS_SPACES // maximum number of address spaces
+ AS_0, // first address space
+ AS_1, // second address space
+ AS_2, // third address space
+ AS_3, // fourth address space
+ ADDRESS_SPACES, // maximum number of address spaces
+
+ // alternate address space names for common use
+ AS_PROGRAM = AS_0, // program address space
+ AS_DATA = AS_1, // data address space
+ AS_IO = AS_2 // I/O address space
};
+DECLARE_ENUM_OPERATORS(address_spacenum);
// read or write constants
enum read_or_write
@@ -337,18 +343,18 @@ class address_space : public bindable_object
protected:
// construction/destruction
- address_space(device_memory_interface &memory, int spacenum, bool large);
+ address_space(device_memory_interface &memory, address_spacenum spacenum, bool large);
~address_space();
public:
// public allocator
- static address_space &allocate(running_machine &machine, const address_space_config &config, device_memory_interface &memory, int spacenum);
+ static address_space &allocate(running_machine &machine, const address_space_config &config, device_memory_interface &memory, address_spacenum spacenum);
// getters
address_space *next() const { return m_next; }
device_t &device() const { return m_device; }
const char *name() const { return m_name; }
- int spacenum() const { return m_spacenum; }
+ address_spacenum spacenum() const { return m_spacenum; }
address_map *map() const { return m_map; }
direct_read_data &direct() const { return m_direct; }
@@ -551,7 +557,7 @@ protected:
offs_t m_logaddrmask; // logical address mask
offs_t m_logbytemask; // byte-converted logical address mask
UINT64 m_unmap; // unmapped value
- UINT8 m_spacenum; // address space index
+ address_spacenum m_spacenum; // address space index
bool m_debugger_access; // treat accesses as coming from the debugger
bool m_log_unmap; // log unmapped accesses in this space?
direct_read_data & m_direct; // fast direct-access read info
diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c
index 93fcf158f5d..d2781fef5b1 100644
--- a/src/emu/sound/bsmt2000.c
+++ b/src/emu/sound/bsmt2000.c
@@ -56,14 +56,14 @@ const device_type BSMT2000 = bsmt2000_device_config::static_alloc_device_config;
// program map for the DSP (points to internal ROM)
-static ADDRESS_MAP_START( tms_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tms_program_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000, 0xfff) AM_ROM
ADDRESS_MAP_END
// I/O map for the DSP
-static ADDRESS_MAP_START( tms_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( tms_io_map, AS_IO, 16 )
AM_RANGE(0, 0) AM_DEVREADWRITE_MODERN(DEVICE_SELF_OWNER, bsmt2000_device, tms_register_r, tms_rom_addr_w)
AM_RANGE(1, 1) AM_DEVREADWRITE_MODERN(DEVICE_SELF_OWNER, bsmt2000_device, tms_data_r, tms_rom_bank_w)
AM_RANGE(2, 2) AM_DEVREAD_MODERN(DEVICE_SELF_OWNER, bsmt2000_device, tms_rom_r)
@@ -84,7 +84,7 @@ MACHINE_CONFIG_END
// default address map for the external memory interface
// the BSMT can address a full 32 bits but typically only 24 are used
-static ADDRESS_MAP_START( bsmt2000, 0, 8 )
+static ADDRESS_MAP_START( bsmt2000, AS_0, 8 )
AM_RANGE(0x00000, 0xffffff) AM_ROM
ADDRESS_MAP_END
@@ -177,7 +177,7 @@ machine_config_constructor bsmt2000_device_config::machine_config_additions() co
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *bsmt2000_device_config::memory_space_config(int spacenum) const
+const address_space_config *bsmt2000_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == 0) ? &m_space_config : NULL;
}
diff --git a/src/emu/sound/bsmt2000.h b/src/emu/sound/bsmt2000.h
index 4d5ffc76362..b1c34929c35 100644
--- a/src/emu/sound/bsmt2000.h
+++ b/src/emu/sound/bsmt2000.h
@@ -94,7 +94,7 @@ public:
protected:
// device_config overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// internal state
const address_space_config m_space_config;
diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c
index 51e459115a2..4d7b8cd9870 100644
--- a/src/emu/sound/cdp1869.c
+++ b/src/emu/sound/cdp1869.c
@@ -61,7 +61,7 @@ const device_type CDP1869 = cdp1869_device_config::static_alloc_device_config;
// default address map
-static ADDRESS_MAP_START( cdp1869, 0, 8 )
+static ADDRESS_MAP_START( cdp1869, AS_0, 8 )
AM_RANGE(0x000, 0x7ff) AM_RAM
ADDRESS_MAP_END
@@ -110,7 +110,7 @@ device_t *cdp1869_device_config::alloc_device(running_machine &machine) const
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *cdp1869_device_config::memory_space_config(int spacenum) const
+const address_space_config *cdp1869_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == 0) ? &m_space_config : NULL;
}
diff --git a/src/emu/sound/cdp1869.h b/src/emu/sound/cdp1869.h
index f2c218e24f0..743107b09de 100644
--- a/src/emu/sound/cdp1869.h
+++ b/src/emu/sound/cdp1869.h
@@ -140,7 +140,7 @@
#define MCFG_CDP1869_ADD(_tag, _pixclock, _config, _map) \
MCFG_DEVICE_ADD(_tag, CDP1869, _pixclock) \
MCFG_DEVICE_CONFIG(_config) \
- MCFG_DEVICE_ADDRESS_MAP(0, _map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, _map)
#define MCFG_CDP1869_SCREEN_PAL_ADD(_tag, _clock) \
MCFG_SCREEN_ADD(_tag, RASTER) \
@@ -227,7 +227,7 @@ protected:
virtual void device_config_complete();
// device_config_memory_interface overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// address space configurations
const address_space_config m_space_config;
diff --git a/src/emu/sound/nes_apu.c b/src/emu/sound/nes_apu.c
index f86bea4c5bc..c95a9672691 100644
--- a/src/emu/sound/nes_apu.c
+++ b/src/emu/sound/nes_apu.c
@@ -704,7 +704,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(ADDRESS_SPACE_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 9ac2a107121..f3f05138b72 100644
--- a/src/emu/sound/okim6295.c
+++ b/src/emu/sound/okim6295.c
@@ -75,7 +75,7 @@ const UINT8 okim6295_device::s_volume_table[16] =
};
// default address map
-static ADDRESS_MAP_START( okim6295, 0, 8 )
+static ADDRESS_MAP_START( okim6295, AS_0, 8 )
AM_RANGE(0x00000, 0x3ffff) AM_ROM
ADDRESS_MAP_END
@@ -136,7 +136,7 @@ void okim6295_device_config::static_set_pin7(device_config *device, int pin7)
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *okim6295_device_config::memory_space_config(int spacenum) const
+const address_space_config *okim6295_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == 0) ? &m_space_config : NULL;
}
diff --git a/src/emu/sound/okim6295.h b/src/emu/sound/okim6295.h
index cb3b3fde7b9..539efa79dc7 100644
--- a/src/emu/sound/okim6295.h
+++ b/src/emu/sound/okim6295.h
@@ -93,7 +93,7 @@ public:
protected:
// device_config overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// internal state
const address_space_config m_space_config;
diff --git a/src/emu/sound/okim9810.c b/src/emu/sound/okim9810.c
index 775f1843448..ffbf37a39f2 100644
--- a/src/emu/sound/okim9810.c
+++ b/src/emu/sound/okim9810.c
@@ -62,7 +62,7 @@ const UINT32 okim9810_device::s_sampling_freq_table[16] =
};
// default address map
-static ADDRESS_MAP_START( okim9810, 0, 8 )
+static ADDRESS_MAP_START( okim9810, AS_0, 8 )
AM_RANGE(0x000000, 0xffffff) AM_ROM
ADDRESS_MAP_END
@@ -110,7 +110,7 @@ device_t *okim9810_device_config::alloc_device(running_machine &machine) const
// any address spaces owned by this device
//-------------------------------------------------
-const address_space_config *okim9810_device_config::memory_space_config(int spacenum) const
+const address_space_config *okim9810_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == 0) ? &m_space_config : NULL;
}
diff --git a/src/emu/sound/okim9810.h b/src/emu/sound/okim9810.h
index b1c5c01f5e3..7cf55c1ecd4 100644
--- a/src/emu/sound/okim9810.h
+++ b/src/emu/sound/okim9810.h
@@ -80,7 +80,7 @@ public:
protected:
// device_config overrides
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
// internal state
const address_space_config m_space_config;
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index 2a332467ecf..7e92f3eca8d 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -1318,7 +1318,7 @@ WRITE16_DEVICE_HANDLER( scsp_w )
scsp->scsp_dtlg = scsp_regs[0x416/2] & 0x0ffe;
if(scsp_dexe)
{
- dma_scsp(device->machine->firstcpu->memory().space(ADDRESS_SPACE_PROGRAM), scsp);
+ dma_scsp(device->machine->firstcpu->memory().space(AS_PROGRAM), scsp);
scsp_regs[0x416/2]^=0x1000;//disable starting bit
}
break;
diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c
index 9af018351a9..abed214b3b2 100644
--- a/src/emu/video/pc_vga.c
+++ b/src/emu/video/pc_vga.c
@@ -596,7 +596,7 @@ static WRITE64_HANDLER( vga_ega64_w ) { write64be_with_write8_handler(vga_ega_w,
static void vga_cpu_interface(running_machine *machine)
{
- address_space *space = machine->firstcpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->firstcpu->memory().space(AS_PROGRAM);
static int sequencer, gc;
read8_space_func read_handler;
write8_space_func write_handler;
diff --git a/src/emu/video/pc_vga.h b/src/emu/video/pc_vga.h
index baee18b53b1..525274ae344 100644
--- a/src/emu/video/pc_vga.h
+++ b/src/emu/video/pc_vga.h
@@ -25,7 +25,7 @@ struct pc_vga_interface
read8_space_func read_dipswitch;
/* where the ports go */
- int port_addressspace;
+ address_spacenum port_addressspace;
offs_t port_offset;
};
diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c
index 56e23721b00..922c17b6761 100644
--- a/src/mame/audio/8080bw.c
+++ b/src/mame/audio/8080bw.c
@@ -910,7 +910,7 @@ static TIMER_CALLBACK( schaser_effect_555_cb )
static STATE_POSTLOAD( schaser_reinit_555_time_remain )
{
_8080bw_state *state = machine->driver_data<_8080bw_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
state->schaser_effect_555_time_remain = attotime::from_double(state->schaser_effect_555_time_remain_savable);
schaser_sh_port_2_w(space, 0, state->port_2_last_extra);
}
@@ -933,7 +933,7 @@ MACHINE_START( schaser_sh )
MACHINE_RESET( schaser_sh )
{
_8080bw_state *state = machine->driver_data<_8080bw_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
state->schaser_effect_555_is_low = 0;
state->schaser_effect_555_timer->adjust(attotime::never);
diff --git a/src/mame/audio/amiga.c b/src/mame/audio/amiga.c
index 47746647f69..9ef03c75c03 100644
--- a/src/mame/audio/amiga.c
+++ b/src/mame/audio/amiga.c
@@ -78,7 +78,7 @@ INLINE amiga_audio *get_safe_token( device_t *device )
static TIMER_CALLBACK( signal_irq )
{
- amiga_custom_w(machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 5d990843722..778d0b34b05 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -87,12 +87,12 @@ static WRITE8_HANDLER( jsa3_io_w );
*
*************************************/
-static ADDRESS_MAP_START( jsa3_oki_map, 0, 8 )
+static ADDRESS_MAP_START( jsa3_oki_map, AS_0, 8 )
AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK("bank12")
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank13")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jsa3_oki2_map, 0, 8 )
+static ADDRESS_MAP_START( jsa3_oki2_map, AS_0, 8 )
AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK("bank14")
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank15")
ADDRESS_MAP_END
@@ -147,7 +147,7 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask)
/* install POKEY memory handlers */
if (pokey != NULL)
- memory_install_readwrite8_device_handler(jsacpu->memory().space(ADDRESS_SPACE_PROGRAM), pokey, 0x2c00, 0x2c0f, 0, 0, pokey_r, pokey_w);
+ memory_install_readwrite8_device_handler(jsacpu->memory().space(AS_PROGRAM), pokey, 0x2c00, 0x2c0f, 0, 0, pokey_r, pokey_w);
init_save_state(machine);
atarijsa_reset();
@@ -748,7 +748,7 @@ static void update_all_volumes(running_machine *machine )
*
*************************************/
-static ADDRESS_MAP_START( atarijsa1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( atarijsa1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x2800, 0x2bff) AM_READWRITE(jsa1_io_r, jsa1_io_w)
@@ -756,7 +756,7 @@ static ADDRESS_MAP_START( atarijsa1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( atarijsa2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( atarijsa2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x2800, 0x2bff) AM_READWRITE(jsa2_io_r, jsa2_io_w)
@@ -765,7 +765,7 @@ ADDRESS_MAP_END
/* full map verified from schematics and Batman GALs */
-static ADDRESS_MAP_START( atarijsa3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( atarijsa3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x2800, 0x2fff) AM_READWRITE(jsa3_io_r, jsa3_io_w)
@@ -773,7 +773,7 @@ static ADDRESS_MAP_START( atarijsa3_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( atarijsa3s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( atarijsa3s_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x2800, 0x2fff) AM_READWRITE(jsa3s_io_r, jsa3s_io_w)
@@ -895,7 +895,7 @@ MACHINE_CONFIG_DERIVED( jsa_iii_mono, jsa_ii_mono )
MCFG_CPU_PROGRAM_MAP(atarijsa3_map)
MCFG_DEVICE_MODIFY("adpcm")
- MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, jsa3_oki_map)
MACHINE_CONFIG_END
@@ -927,11 +927,11 @@ MACHINE_CONFIG_FRAGMENT( jsa_iiis_stereo )
MCFG_OKIM6295_ADD("adpcml", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)
- MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, jsa3_oki_map)
MCFG_OKIM6295_ADD("adpcmr", JSA_MASTER_CLOCK/3, OKIM6295_PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.75)
- MCFG_DEVICE_ADDRESS_MAP(0, jsa3_oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, jsa3_oki2_map)
MACHINE_CONFIG_END
diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c
index 0e699a8a101..f26e1886d18 100644
--- a/src/mame/audio/cage.c
+++ b/src/mame/audio/cage.c
@@ -172,7 +172,7 @@ void cage_init(running_machine *machine, offs_t speedup)
timer[1] = machine->device<timer_device>("cage_timer1");
if (speedup)
- speedup_ram = memory_install_write32_handler(cage_cpu->memory().space(ADDRESS_SPACE_PROGRAM), speedup, speedup, 0, 0, speedup_w);
+ speedup_ram = memory_install_write32_handler(cage_cpu->memory().space(AS_PROGRAM), speedup, speedup, 0, 0, speedup_w);
for (chan = 0; chan < DAC_BUFFER_CHANNELS; chan++)
{
@@ -615,7 +615,7 @@ static const tms3203x_config cage_config =
};
-static ADDRESS_MAP_START( cage_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( cage_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x00ffff) AM_RAM
AM_RANGE(0x200000, 0x200000) AM_WRITENOP
AM_RANGE(0x400000, 0x47ffff) AM_ROMBANK("bank10")
@@ -626,7 +626,7 @@ static ADDRESS_MAP_START( cage_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cage_map_seattle, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( cage_map_seattle, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x00ffff) AM_RAM
AM_RANGE(0x200000, 0x200000) AM_WRITENOP
AM_RANGE(0x400000, 0x47ffff) AM_ROMBANK("bank10")
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index ecef00144e9..413396e055d 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -285,11 +285,11 @@ static WRITE8_DEVICE_HANDLER( carnival_music_port_2_w )
}
-static ADDRESS_MAP_START( carnival_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( carnival_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( carnival_audio_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( carnival_audio_io_map, AS_IO, 8 )
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(carnival_music_port_t1_r)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_WRITE(carnival_music_port_1_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_DEVWRITE("psg", carnival_music_port_2_w)
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index 49f3cc7f34b..9a7fdb37559 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -1549,7 +1549,7 @@ static MACHINE_RESET( demon_sound )
}
-static ADDRESS_MAP_START( demon_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( demon_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x3000, 0x33ff) AM_RAM
AM_RANGE(0x4000, 0x4001) AM_DEVREAD("ay1", ay8910_r)
@@ -1562,7 +1562,7 @@ static ADDRESS_MAP_START( demon_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( demon_sound_ports, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( demon_sound_ports, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVWRITE("ctc", z80ctc_w)
AM_RANGE(0x1c, 0x1f) AM_DEVWRITE("ctc", z80ctc_w)
@@ -1622,7 +1622,7 @@ static WRITE8_HANDLER( qb3_sound_w )
static MACHINE_RESET( qb3_sound )
{
MACHINE_RESET_CALL(demon_sound);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x04, 0x04, 0, 0, qb3_sound_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x04, 0x04, 0, 0, qb3_sound_w);
/* 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 9d6df30c75d..dc9c4b47a48 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -431,14 +431,14 @@ static int preprocess_write(running_machine *machine, UINT16 data);
*************************************/
/* DCS 2k memory map */
-static ADDRESS_MAP_START( dcs_2k_program_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dcs_2k_program_map, AS_PROGRAM, 32 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE(&dcs_internal_program_ram)
AM_RANGE(0x0800, 0x0fff) AM_RAM AM_SHARE("share1") AM_BASE(&dcs_external_program_ram)
AM_RANGE(0x1000, 0x17ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1800, 0x1fff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dcs_2k_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( dcs_2k_data_map, AS_DATA, 16 )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_READWRITE(dcs_dataram_r, dcs_dataram_w)
AM_RANGE(0x2000, 0x2fff) AM_ROMBANK("databank")
AM_RANGE(0x3000, 0x33ff) AM_WRITE(dcs_data_bank_select_w)
@@ -449,7 +449,7 @@ ADDRESS_MAP_END
/* DCS 2k with UART memory map */
-static ADDRESS_MAP_START( dcs_2k_uart_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( dcs_2k_uart_data_map, AS_DATA, 16 )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_READWRITE(dcs_dataram_r, dcs_dataram_w)
AM_RANGE(0x2000, 0x2fff) AM_ROMBANK("databank")
AM_RANGE(0x3000, 0x33ff) AM_WRITE(dcs_data_bank_select_w)
@@ -462,12 +462,12 @@ ADDRESS_MAP_END
/* DCS 8k memory map */
-static ADDRESS_MAP_START( dcs_8k_program_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dcs_8k_program_map, AS_PROGRAM, 32 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE(&dcs_internal_program_ram)
AM_RANGE(0x0800, 0x1fff) AM_RAM AM_BASE(&dcs_external_program_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dcs_8k_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( dcs_8k_data_map, AS_DATA, 16 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x1fff) AM_READWRITE(dcs_dataram_r, dcs_dataram_w)
AM_RANGE(0x2000, 0x2fff) AM_ROMBANK("databank")
@@ -485,18 +485,18 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( dcs2_2115_program_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dcs2_2115_program_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE(&dcs_internal_program_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dcs2_2104_program_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dcs2_2104_program_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x01ff) AM_RAM AM_BASE(&dcs_internal_program_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dcs2_2115_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( dcs2_2115_data_map, AS_DATA, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0400, 0x0400) AM_READWRITE(input_latch_r, input_latch_ack_w)
AM_RANGE(0x0401, 0x0401) AM_WRITE(output_latch_w)
@@ -508,7 +508,7 @@ static ADDRESS_MAP_START( dcs2_2115_data_map, ADDRESS_SPACE_DATA, 16 )
AM_RANGE(0x3fe0, 0x3fff) AM_READWRITE(adsp_control_r, adsp_control_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dcs2_2104_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( dcs2_2104_data_map, AS_DATA, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0400, 0x0400) AM_READWRITE(input_latch_r, input_latch_ack_w)
AM_RANGE(0x0401, 0x0401) AM_WRITE(output_latch_w)
@@ -528,13 +528,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( dsio_program_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dsio_program_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_RAM AM_BASE(&dcs_internal_program_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dsio_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( dsio_data_map, AS_DATA, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x03ff) AM_RAMBANK("databank")
AM_RANGE(0x0400, 0x3fdf) AM_RAM
@@ -542,7 +542,7 @@ static ADDRESS_MAP_START( dsio_data_map, ADDRESS_SPACE_DATA, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dsio_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( dsio_io_map, AS_IO, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0400, 0x0400) AM_READWRITE(input_latch_r, input_latch_ack_w)
AM_RANGE(0x0401, 0x0401) AM_WRITE(output_latch_w)
@@ -560,13 +560,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( denver_program_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( denver_program_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_RAM AM_BASE(&dcs_internal_program_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( denver_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( denver_data_map, AS_DATA, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x07ff) AM_RAMBANK("databank")
AM_RANGE(0x0800, 0x3fdf) AM_RAM
@@ -574,7 +574,7 @@ static ADDRESS_MAP_START( denver_data_map, ADDRESS_SPACE_DATA, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( denver_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( denver_io_map, AS_IO, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0400, 0x0400) AM_READWRITE(input_latch_r, input_latch_ack_w)
AM_RANGE(0x0401, 0x0401) AM_WRITE(output_latch_w)
@@ -2131,7 +2131,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->memory().space(ADDRESS_SPACE_PROGRAM), 0, 0x000a, 0xffff);
+ output_latch_w(dcs.cpu->memory().space(AS_PROGRAM), 0, 0x000a, 0xffff);
}
@@ -2143,7 +2143,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->memory().space(ADDRESS_SPACE_PROGRAM), 0, param, 0xffff);
+ output_latch_w(dcs.cpu->memory().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));
@@ -2273,7 +2273,7 @@ static int preprocess_stage_1(running_machine *machine, UINT16 data)
static TIMER_CALLBACK( s2_ack_callback )
{
- address_space *space = dcs.cpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = dcs.cpu->memory().space(AS_PROGRAM);
/* if the output is full, stall for a usec */
if (IS_OUTPUT_FULL())
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index 556b0e8b03e..ccfc0dd4111 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -1285,11 +1285,11 @@ WRITE8_HANDLER( dkong_audio_irq_w )
*
*************************************/
-static ADDRESS_MAP_START( dkong_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dkong_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dkong_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dkong_sound_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0xFF) AM_DEVREAD("ls175.3d", dkong_tune_r)
AM_WRITE(dkong_voice_w)
AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_DEVREAD("ls175.3d", dkong_tune_r)
@@ -1300,7 +1300,7 @@ static ADDRESS_MAP_START( dkong_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_LATCH8_READBIT("ls259.6h", 4)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dkongjr_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dkongjr_sound_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_MIRROR(0xff) AM_LATCH8_READ("ls174.3d")
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("discrete", dkong_p1_w) /* only write to dac */
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_LATCH8_READWRITE("virtual_p2")
@@ -1308,7 +1308,7 @@ static ADDRESS_MAP_START( dkongjr_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_LATCH8_READBIT("ls259.6h", 4)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( radarscp1_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( radarscp1_sound_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_MIRROR(0xff) AM_DEVREAD("ls175.3d", latch8_r)
AM_RANGE(0x00, 0xff) AM_DEVWRITE("discrete", dkong_p1_w) /* DAC here */
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_LATCH8_READ("virtual_p1")
@@ -1318,7 +1318,7 @@ static ADDRESS_MAP_START( radarscp1_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_LATCH8_READBIT("ls259.6h", 4)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dkong3_sound1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dkong3_sound1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x4016, 0x4016) AM_LATCH8_READ("latch1") /* overwrite default */
AM_RANGE(0x4017, 0x4017) AM_LATCH8_READ("latch2")
@@ -1327,7 +1327,7 @@ static ADDRESS_MAP_START( dkong3_sound1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dkong3_sound2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dkong3_sound2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x4016, 0x4016) AM_LATCH8_READ("latch3") /* overwrite default */
AM_RANGE(0x4000, 0x4017) AM_DEVREAD("nes2", nes_psg_r)
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index a724b06742a..09307278a6e 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -866,7 +866,7 @@ DEVICE_GET_INFO( venture_sound )
DEFINE_LEGACY_SOUND_DEVICE(EXIDY_VENTURE, venture_sound);
-static ADDRESS_MAP_START( venture_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( venture_audio_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0780) AM_RAM
AM_RANGE(0x0800, 0x087f) AM_MIRROR(0x0780) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w)
@@ -935,13 +935,13 @@ static READ8_DEVICE_HANDLER( mtrap_voiceio_r )
}
-static ADDRESS_MAP_START( cvsd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cvsd_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x3fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cvsd_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cvsd_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xff) AM_DEVREADWRITE("custom", mtrap_voiceio_r, mtrap_voiceio_w)
ADDRESS_MAP_END
@@ -1105,7 +1105,7 @@ DEVICE_GET_INFO( victory_sound )
DEFINE_LEGACY_SOUND_DEVICE(EXIDY_VICTORY, victory_sound);
-static ADDRESS_MAP_START( victory_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( victory_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0f00) AM_RAM
AM_RANGE(0x1000, 0x107f) AM_MIRROR(0x0f80) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w)
AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x0ffc) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c
index a0b82ea6a9b..7ac9ebff735 100644
--- a/src/mame/audio/exidy440.c
+++ b/src/mame/audio/exidy440.c
@@ -902,7 +902,7 @@ static void decode_and_filter_cvsd(UINT8 *input, int bytes, int maskbits, int fr
*
*************************************/
-static ADDRESS_MAP_START( exidy440_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( exidy440_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_NOP
AM_RANGE(0x8000, 0x801f) AM_MIRROR(0x03e0) AM_READWRITE(m6844_r, m6844_w) AM_BASE(&m6844_data)
AM_RANGE(0x8400, 0x840f) AM_MIRROR(0x03f0) AM_RAM_WRITE(sound_volume_w) AM_BASE(&sound_volume)
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index 5f18bf4f231..fe9f1ca61b6 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -298,7 +298,7 @@ static SOUND_START( gottlieb1 )
*
*************************************/
-static ADDRESS_MAP_START( gottlieb_sound1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gottlieb_sound1_map, AS_PROGRAM, 8 )
/* A15 not decoded except in expansion socket */
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0d80) AM_RAM
@@ -547,7 +547,7 @@ static SOUND_START( gottlieb2 )
*
*************************************/
-static ADDRESS_MAP_START( gottlieb_speech2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gottlieb_speech2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM
AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x1fff) AM_WRITEONLY AM_BASE_MEMBER(gottlieb_state, sp0250_latch)
AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x1fff) AM_WRITE(speech_control_w)
@@ -560,7 +560,7 @@ static ADDRESS_MAP_START( gottlieb_speech2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gottlieb_audio2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gottlieb_audio2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x3c00) AM_RAM
AM_RANGE(0x4000, 0x4001) AM_MIRROR(0x3ffe) AM_DEVWRITE("dac1", gottlieb_dac_w) AM_BASE_MEMBER(gottlieb_state, dac_data)
AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x3fff) AM_READ(audio_data_r)
diff --git a/src/mame/audio/harddriv.c b/src/mame/audio/harddriv.c
index d8ff8912011..620b2d7ab0f 100644
--- a/src/mame/audio/harddriv.c
+++ b/src/mame/audio/harddriv.c
@@ -242,7 +242,7 @@ WRITE16_HANDLER( hdsnd68k_320ram_w )
READ16_HANDLER( hdsnd68k_320ports_r )
{
harddriv_state *state = space->machine->driver_data<harddriv_state>();
- address_space *iospace = state->sounddsp->memory().space(ADDRESS_SPACE_IO);
+ address_space *iospace = state->sounddsp->memory().space(AS_IO);
return iospace->read_word((offset & 7) << 1);
}
@@ -250,7 +250,7 @@ READ16_HANDLER( hdsnd68k_320ports_r )
WRITE16_HANDLER( hdsnd68k_320ports_w )
{
harddriv_state *state = space->machine->driver_data<harddriv_state>();
- address_space *iospace = state->sounddsp->memory().space(ADDRESS_SPACE_IO);
+ address_space *iospace = state->sounddsp->memory().space(AS_IO);
iospace->write_word((offset & 7) << 1, data);
}
diff --git a/src/mame/audio/hyprolyb.c b/src/mame/audio/hyprolyb.c
index 6f933803fa0..62c49a2b79b 100644
--- a/src/mame/audio/hyprolyb.c
+++ b/src/mame/audio/hyprolyb.c
@@ -25,7 +25,7 @@ static DEVICE_START( hyprolyb_adpcm )
{
hyprolyb_adpcm_state *state = get_safe_token(device);
- state->space = device->machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ state->space = device->machine->device("audiocpu")->memory().space(AS_PROGRAM);
state->msm = device->machine->device("msm");
device->save_item(NAME(state->adpcm_ready)); // only bootlegs
device->save_item(NAME(state->adpcm_busy));
@@ -89,7 +89,7 @@ static READ8_DEVICE_HANDLER( hyprolyb_adpcm_data_r )
return soundlatch2_r(state->space, offset);
}
-static ADDRESS_MAP_START( hyprolyb_adpcm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hyprolyb_adpcm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_data_r)
AM_RANGE(0x1001, 0x1001) AM_DEVREAD("hyprolyb_adpcm", hyprolyb_adpcm_ready_r)
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index b9f68704294..9ab3bd6d02a 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -376,14 +376,14 @@ DISCRETE_SOUND_END
/* complete address map verified from Moon Patrol/10 Yard Fight schematics */
/* large map uses 8k ROMs, small map uses 4k ROMs; this is selected via a jumper */
-static ADDRESS_MAP_START( m52_small_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m52_small_sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x0fff) AM_DEVWRITE("irem_audio", m52_adpcm_w)
AM_RANGE(0x1000, 0x1fff) AM_WRITE(sound_irq_ack_w)
AM_RANGE(0x2000, 0x7fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m52_large_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m52_large_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_DEVWRITE("irem_audio", m52_adpcm_w)
AM_RANGE(0x2000, 0x3fff) AM_WRITE(sound_irq_ack_w)
AM_RANGE(0x4000, 0xffff) AM_ROM
@@ -391,14 +391,14 @@ ADDRESS_MAP_END
/* complete address map verified from Kid Niki schematics */
-static ADDRESS_MAP_START( m62_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m62_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0800, 0x0800) AM_MIRROR(0xf7fc) AM_WRITE(sound_irq_ack_w)
AM_RANGE(0x0801, 0x0802) AM_MIRROR(0xf7fc) AM_DEVWRITE("irem_audio", m62_adpcm_w)
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( irem_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( irem_sound_portmap, AS_IO, 8 )
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_DEVREADWRITE("irem_audio", m6803_port1_r, m6803_port1_w)
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_DEVREADWRITE("irem_audio", m6803_port2_r, m6803_port2_w)
ADDRESS_MAP_END
diff --git a/src/mame/audio/jaguar.c b/src/mame/audio/jaguar.c
index cb429a601aa..7637528c8cb 100644
--- a/src/mame/audio/jaguar.c
+++ b/src/mame/audio/jaguar.c
@@ -262,7 +262,7 @@ void cojag_sound_init(running_machine *machine)
}
#if ENABLE_SPEEDUP_HACKS
- memory_install_write32_handler(machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf1a100, 0xf1a103, 0, 0, dsp_flags_w);
+ memory_install_write32_handler(machine->device("audiocpu")->memory().space(AS_PROGRAM), 0xf1a100, 0xf1a103, 0, 0, dsp_flags_w);
#endif
}
diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c
index a60ff0708df..5aba809acd9 100644
--- a/src/mame/audio/jedi.c
+++ b/src/mame/audio/jedi.c
@@ -173,7 +173,7 @@ static WRITE8_HANDLER( speech_reset_w )
*
*************************************/
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x080f) AM_MIRROR(0x07c0) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w)
AM_RANGE(0x0810, 0x081f) AM_MIRROR(0x07c0) AM_DEVREADWRITE("pokey2", pokey_r, pokey_w)
diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c
index 3536ca6468b..4147fab418e 100644
--- a/src/mame/audio/leland.c
+++ b/src/mame/audio/leland.c
@@ -1511,12 +1511,12 @@ static WRITE16_DEVICE_HANDLER( i80186_internal_port_w )
temp = (state->i80186.mem.peripheral & 0xffc0) << 4;
if (state->i80186.mem.middle_size & 0x0040)
{
- memory_install_readwrite16_device_handler(state->i80186.cpu->memory().space(ADDRESS_SPACE_PROGRAM), device, temp, temp + 0x2ff, 0, 0, peripheral_r, peripheral_w);
+ memory_install_readwrite16_device_handler(state->i80186.cpu->memory().space(AS_PROGRAM), device, temp, temp + 0x2ff, 0, 0, peripheral_r, peripheral_w);
}
else
{
temp &= 0xffff;
- memory_install_readwrite16_device_handler(state->i80186.cpu->memory().space(ADDRESS_SPACE_IO), device, temp, temp + 0x2ff, 0, 0, peripheral_r, peripheral_w);
+ memory_install_readwrite16_device_handler(state->i80186.cpu->memory().space(AS_IO), device, temp, temp + 0x2ff, 0, 0, peripheral_r, peripheral_w);
}
/* we need to do this at a time when the 80186 context is swapped in */
@@ -1582,12 +1582,12 @@ static WRITE16_DEVICE_HANDLER( i80186_internal_port_w )
temp = (data & 0x0fff) << 8;
if (data & 0x1000)
{
- memory_install_readwrite16_device_handler(state->i80186.cpu->memory().space(ADDRESS_SPACE_PROGRAM), device, temp, temp + 0xff, 0, 0, i80186_internal_port_r, i80186_internal_port_w);
+ memory_install_readwrite16_device_handler(state->i80186.cpu->memory().space(AS_PROGRAM), device, temp, temp + 0xff, 0, 0, i80186_internal_port_r, i80186_internal_port_w);
}
else
{
temp &= 0xffff;
- memory_install_readwrite16_device_handler(state->i80186.cpu->memory().space(ADDRESS_SPACE_IO), device, temp, temp + 0xff, 0, 0, i80186_internal_port_r, i80186_internal_port_w);
+ memory_install_readwrite16_device_handler(state->i80186.cpu->memory().space(AS_IO), device, temp, temp + 0xff, 0, 0, i80186_internal_port_r, i80186_internal_port_w);
}
/* popmessage("Sound CPU reset");*/
break;
@@ -2207,24 +2207,24 @@ WRITE8_DEVICE_HANDLER( ataxx_80186_control_w )
*
*************************************/
-ADDRESS_MAP_START( leland_80186_map_program, ADDRESS_SPACE_PROGRAM, 16 )
+ADDRESS_MAP_START( leland_80186_map_program, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x03fff) AM_MIRROR(0x1c000) AM_RAM
AM_RANGE(0x20000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-ADDRESS_MAP_START( ataxx_80186_map_io, ADDRESS_SPACE_IO, 16 )
+ADDRESS_MAP_START( ataxx_80186_map_io, AS_IO, 16 )
AM_RANGE(0xff00, 0xffff) AM_DEVREADWRITE("custom", i80186_internal_port_r, i80186_internal_port_w)
ADDRESS_MAP_END
-ADDRESS_MAP_START( redline_80186_map_io, ADDRESS_SPACE_IO, 16 )
+ADDRESS_MAP_START( redline_80186_map_io, AS_IO, 16 )
AM_RANGE(0x6000, 0x6fff) AM_DEVWRITE("custom", redline_dac_w)
AM_RANGE(0xff00, 0xffff) AM_DEVREADWRITE("custom", i80186_internal_port_r, i80186_internal_port_w)
ADDRESS_MAP_END
-ADDRESS_MAP_START( leland_80186_map_io, ADDRESS_SPACE_IO, 16 )
+ADDRESS_MAP_START( leland_80186_map_io, AS_IO, 16 )
AM_RANGE(0x0000, 0x000b) AM_DEVWRITE("custom", dac_w)
AM_RANGE(0x0080, 0x008b) AM_DEVWRITE("custom", dac_w)
AM_RANGE(0x00c0, 0x00cb) AM_DEVWRITE("custom", dac_w)
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 3d32da0692a..9265c66d052 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->eabank = "bank1";
- memory_install_read_bank(audiocpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x000, 0x7ff, 0, 0, "bank1");
+ memory_install_read_bank(audiocpu->memory().space(AS_PROGRAM), 0x000, 0x7ff, 0, 0, "bank1");
memory_configure_bank(machine, "bank1", 0, 1, machine->region("audiocpu")->base(), 0);
memory_configure_bank(machine, "bank1", 1, 1, machine->region("audiocpu")->base() + 0x1000, 0x800);
}
@@ -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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("audiocpu")->memory().space(AS_PROGRAM);
#if USE_8039
set_ea(machine, 1);
@@ -588,12 +588,12 @@ WRITE8_HANDLER( mario_sh3_w )
*
*************************************/
-static ADDRESS_MAP_START( mario_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mario_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROMBANK("bank1") AM_REGION("audiocpu", 0)
AM_RANGE(0x0800, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mario_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mario_sound_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READ(mario_sh_tune_r) AM_DEVWRITE("discrete", mario_sh_sound_w)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READWRITE(mario_sh_p1_r, mario_sh_p1_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READWRITE(mario_sh_p2_r, mario_sh_p2_w)
@@ -601,7 +601,7 @@ static ADDRESS_MAP_START( mario_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(mario_sh_t1_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( masao_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( masao_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w)
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index 54a49d158a4..424bb6cf7dc 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -443,7 +443,7 @@ static const ay8910_interface ssio_ay8910_interface_2 =
/********* memory interfaces ***********/
/* address map verified from schematics */
-static ADDRESS_MAP_START( ssio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ssio_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x0c00) AM_RAM
@@ -565,7 +565,7 @@ void csdeluxe_reset_w(running_machine *machine, int state)
/********* memory interfaces ***********/
/* address map determined by PAL; not verified */
-static ADDRESS_MAP_START( csdeluxe_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( csdeluxe_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x1ffff)
AM_RANGE(0x000000, 0x007fff) AM_ROM
@@ -684,7 +684,7 @@ void soundsgood_reset_w(running_machine *machine, int state)
/********* memory interfaces ***********/
/* address map determined by PAL; not verified */
-static ADDRESS_MAP_START( soundsgood_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( soundsgood_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x7ffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
@@ -787,7 +787,7 @@ void turbocs_reset_w(running_machine *machine, int state)
/********* memory interfaces ***********/
/* address map verified from schematics */
-static ADDRESS_MAP_START( turbocs_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( turbocs_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x3800) AM_RAM
AM_RANGE(0x4000, 0x4003) AM_MIRROR(0x3ffc) AM_DEVREADWRITE("tcspia", pia6821_alt_r, pia6821_alt_w)
@@ -917,7 +917,7 @@ void squawkntalk_reset_w(running_machine *machine, int state)
/* address map verified from schematics */
/* note that jumpers control the ROM sizes; if these are changed, use the alternate */
/* address map below */
-static ADDRESS_MAP_START( squawkntalk_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( squawkntalk_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */
AM_RANGE(0x0080, 0x0083) AM_MIRROR(0x4f6c) AM_DEVREADWRITE("sntpia0", pia6821_r, pia6821_w)
@@ -929,7 +929,7 @@ ADDRESS_MAP_END
/* alternate address map if the ROM jumpers are changed to support a smaller */
/* ROM size of 2k */
#ifdef UNUSED_FUNCTION
-ADDRESS_MAP_START( squawkntalk_alt_map, ADDRESS_SPACE_PROGRAM, 8 )
+ADDRESS_MAP_START( squawkntalk_alt_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */
AM_RANGE(0x0080, 0x0083) AM_MIRROR(0x676c) AM_DEVREADWRITE("sntpia0", pia6821_r, pia6821_w)
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index 4bc1570034c..4538eabc672 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -558,13 +558,13 @@ MACHINE_RESET( helifire_sound )
}
-static ADDRESS_MAP_START( n8080_sound_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( n8080_sound_cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3ff)
AM_RANGE(0x0000, 0x03ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( n8080_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( n8080_sound_io_map, AS_IO, 8 )
AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ(n8080_8035_t0_r)
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(n8080_8035_t1_r)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READ(n8080_8035_p1_r)
@@ -573,7 +573,7 @@ static ADDRESS_MAP_START( n8080_sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( helifire_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( helifire_sound_io_map, AS_IO, 8 )
AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ(helifire_8035_t0_r)
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(helifire_8035_t1_r)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READ(helifire_8035_p2_r)
diff --git a/src/mame/audio/namco52.c b/src/mame/audio/namco52.c
index ae7fb625825..40db760d817 100644
--- a/src/mame/audio/namco52.c
+++ b/src/mame/audio/namco52.c
@@ -170,7 +170,7 @@ static TIMER_CALLBACK( external_clock_pulse )
DEVICE INTERFACE
***************************************************************************/
-static ADDRESS_MAP_START( namco_52xx_map_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( namco_52xx_map_io, AS_IO, 8 )
AM_RANGE(MB88_PORTK, MB88_PORTK) AM_READ(namco_52xx_K_r)
AM_RANGE(MB88_PORTO, MB88_PORTO) AM_WRITE(namco_52xx_O_w)
AM_RANGE(MB88_PORTP, MB88_PORTP) AM_WRITE(namco_52xx_P_w)
diff --git a/src/mame/audio/namco54.c b/src/mame/audio/namco54.c
index 999669d0278..89c90620cb1 100644
--- a/src/mame/audio/namco54.c
+++ b/src/mame/audio/namco54.c
@@ -137,7 +137,7 @@ WRITE8_DEVICE_HANDLER( namco_54xx_write )
DEVICE INTERFACE
***************************************************************************/
-static ADDRESS_MAP_START( namco_54xx_map_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( namco_54xx_map_io, AS_IO, 8 )
AM_RANGE(MB88_PORTK, MB88_PORTK) AM_READ(namco_54xx_K_r)
AM_RANGE(MB88_PORTO, MB88_PORTO) AM_WRITE(namco_54xx_O_w)
AM_RANGE(MB88_PORTR0, MB88_PORTR0) AM_READ(namco_54xx_R0_r)
diff --git a/src/mame/audio/namcoc7x.c b/src/mame/audio/namcoc7x.c
index 537f1e28a18..297c11e5310 100644
--- a/src/mame/audio/namcoc7x.c
+++ b/src/mame/audio/namcoc7x.c
@@ -90,7 +90,7 @@ void namcoc7x_on_driver_init(running_machine *machine)
// install speedup cheat
for (cpu = machine->device("maincpu"); cpu != NULL; cpu = cpu->typenext())
if (cpu->type() == M37702)
- memory_install_readwrite16_handler(cpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x82, 0x83, 0, 0, speedup_r, speedup_w);
+ memory_install_readwrite16_handler(cpu->memory().space(AS_PROGRAM), 0x82, 0x83, 0, 0, speedup_r, speedup_w);
}
void namcoc7x_set_host_ram(UINT32 *hostram)
@@ -125,7 +125,7 @@ static WRITE16_HANDLER( c7x_shared_w )
}
}
-ADDRESS_MAP_START( namcoc7x_mcu_map, ADDRESS_SPACE_PROGRAM, 16 )
+ADDRESS_MAP_START( namcoc7x_mcu_map, AS_PROGRAM, 16 )
AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE("c352", c352_r, c352_w)
AM_RANGE(0x004000, 0x00bfff) AM_RAM AM_BASE(&namcoc7x_mcuram)
AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("c7x", 0x8c000)
@@ -136,7 +136,7 @@ ADDRESS_MAP_START( namcoc7x_mcu_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x308000, 0x308003) AM_NOP // volume control IC?
ADDRESS_MAP_END
-ADDRESS_MAP_START( namcoc7x_mcu_share_map, ADDRESS_SPACE_PROGRAM, 16 )
+ADDRESS_MAP_START( namcoc7x_mcu_share_map, AS_PROGRAM, 16 )
AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE("c352", c352_r, c352_w )
AM_RANGE(0x004000, 0x00bfff) AM_READWRITE( c7x_shared_r, c7x_shared_w ) AM_BASE(&namcoc7x_mcuram)
AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("c7x", 0x8c000)
@@ -178,7 +178,7 @@ static READ8_HANDLER( mcu_port7_r )
return 0;
}
-ADDRESS_MAP_START( namcoc7x_mcu_io, ADDRESS_SPACE_IO, 8 )
+ADDRESS_MAP_START( namcoc7x_mcu_io, AS_IO, 8 )
AM_RANGE(M37710_PORT4, M37710_PORT4) AM_READ( mcu_port4_r ) AM_WRITE( mcu_port4_w )
AM_RANGE(M37710_PORT5, M37710_PORT5) AM_READ( mcu_port5_r ) AM_WRITE( mcu_port5_w )
AM_RANGE(M37710_PORT6, M37710_PORT6) AM_READ( mcu_port6_r ) AM_WRITENOP
diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c
index 75a7e869fc3..7853e643cab 100644
--- a/src/mame/audio/qix.c
+++ b/src/mame/audio/qix.c
@@ -152,7 +152,7 @@ static WRITE_LINE_DEVICE_HANDLER( qix_pia_sint )
*
*************************************/
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x5ffc) AM_DEVREADWRITE("sndpia2", pia6821_r, pia6821_w)
AM_RANGE(0x4000, 0x4003) AM_MIRROR(0x3ffc) AM_DEVREADWRITE("sndpia1", pia6821_r, pia6821_w)
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index fcf011c7379..3a58961e1b8 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -125,7 +125,7 @@ static const ay8910_interface redalert_ay8910_interface =
};
-static ADDRESS_MAP_START( redalert_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( redalert_audio_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x0c00) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0ffe) AM_READNOP AM_DEVWRITE("aysnd", redalert_AY8910_w)
@@ -182,7 +182,7 @@ static I8085_CONFIG( redalert_voice_i8085_config )
};
-static ADDRESS_MAP_START( redalert_voice_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( redalert_voice_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_NOP
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x3c00) AM_RAM
@@ -344,7 +344,7 @@ static WRITE8_DEVICE_HANDLER( demoneye_ay8910_data_w )
}
-static ADDRESS_MAP_START( demoneye_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( demoneye_audio_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x0500, 0x0503) AM_DEVREADWRITE("sndpia", pia6821_r, pia6821_w)
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index afed316879f..a080ebdb067 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -125,7 +125,7 @@ WRITE8_HANDLER( hotshock_sh_irqtrigger_w )
READ8_DEVICE_HANDLER( hotshock_soundlatch_r )
{
cputag_set_input_line(device->machine, "audiocpu", 0, CLEAR_LINE);
- return soundlatch_r(device->machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM),0);
+ return soundlatch_r(device->machine->device("audiocpu")->memory().space(AS_PROGRAM),0);
}
static void filter_w(device_t *device, int data)
@@ -289,12 +289,12 @@ static const ay8910_interface ad2083_ay8910_interface_2 =
DEVCB_NULL
};
-static ADDRESS_MAP_START( ad2083_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ad2083_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ad2083_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ad2083_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_DEVWRITE("tmsprom", ad2083_tms5110_ctrl_w)
AM_RANGE(0x10, 0x10) AM_DEVWRITE("ay1", ay8910_address_w)
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index 05c1d223abd..f5c6b6cb579 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -800,7 +800,7 @@ static const tms36xx_interface monsterb_tms3617_interface =
*
*************************************/
-static ADDRESS_MAP_START( monsterb_7751_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( monsterb_7751_portmap, AS_IO, 8 )
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(n7751_t1_r)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READ(n7751_command_r)
AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READ(n7751_rom_r)
diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c
index e145d6dda71..50388ed8e50 100644
--- a/src/mame/audio/segasnd.c
+++ b/src/mame/audio/segasnd.c
@@ -239,12 +239,12 @@ WRITE8_HANDLER( sega_speech_control_w )
*
*************************************/
-static ADDRESS_MAP_START( speech_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( speech_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x0800) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( speech_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( speech_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READ(speech_rom_r)
AM_RANGE(0x00, 0xff) AM_DEVWRITE("speech", sp0250_w)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READWRITE(speech_p1_r, speech_p1_w)
@@ -889,17 +889,17 @@ static WRITE8_HANDLER( usb_workram_w )
*
*************************************/
-static ADDRESS_MAP_START( usb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( usb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE(&usb.program_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( usb_map_rom, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( usb_map_rom, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( usb_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( usb_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READWRITE(usb_workram_r, usb_workram_w)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READWRITE(usb_p1_r, usb_p1_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(usb_p2_w)
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index d054f8212cc..74337dc95e7 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -103,7 +103,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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device(cpu)->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine, UINT8, length);
UINT8 *rom = machine->region(cpu)->base();
int i;
@@ -470,7 +470,7 @@ const ym2203_interface seibu_ym2203_interface =
/***************************************************************************/
-ADDRESS_MAP_START( seibu_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+ADDRESS_MAP_START( seibu_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_WRITE(seibu_pending_w)
@@ -488,7 +488,7 @@ ADDRESS_MAP_START( seibu_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-ADDRESS_MAP_START( seibu2_airraid_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+ADDRESS_MAP_START( seibu2_airraid_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_WRITE(seibu_pending_w)
@@ -506,7 +506,7 @@ ADDRESS_MAP_START( seibu2_airraid_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-ADDRESS_MAP_START( seibu2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+ADDRESS_MAP_START( seibu2_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_WRITE(seibu_pending_w)
@@ -524,7 +524,7 @@ ADDRESS_MAP_START( seibu2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-ADDRESS_MAP_START( seibu2_raiden2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+ADDRESS_MAP_START( seibu2_raiden2_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_WRITE(seibu_pending_w)
@@ -545,7 +545,7 @@ ADDRESS_MAP_START( seibu2_raiden2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x401a, 0x401a) AM_NOP
ADDRESS_MAP_END
-ADDRESS_MAP_START( seibu_newzeroteam_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+ADDRESS_MAP_START( seibu_newzeroteam_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_WRITE(seibu_pending_w)
@@ -563,7 +563,7 @@ ADDRESS_MAP_START( seibu_newzeroteam_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-ADDRESS_MAP_START( seibu3_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+ADDRESS_MAP_START( seibu3_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_WRITE(seibu_pending_w)
@@ -581,7 +581,7 @@ ADDRESS_MAP_START( seibu3_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-ADDRESS_MAP_START( seibu3_adpcm_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+ADDRESS_MAP_START( seibu3_adpcm_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_WRITE(seibu_pending_w)
diff --git a/src/mame/audio/t5182.c b/src/mame/audio/t5182.c
index 828b5966144..432501def0f 100644
--- a/src/mame/audio/t5182.c
+++ b/src/mame/audio/t5182.c
@@ -295,7 +295,7 @@ const ym2151_interface t5182_ym2151_interface =
// 90XX reset
// A0XX
// rest unused
-ADDRESS_MAP_START( t5182_map, ADDRESS_SPACE_PROGRAM, 8 )
+ADDRESS_MAP_START( t5182_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM // internal ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_MIRROR(0x1800) // internal RAM
AM_RANGE(0x4000, 0x40ff) AM_RAM AM_MIRROR(0x3F00) AM_BASE(&t5182_sharedram) // 2016 with four 74ls245s, one each for main and t5182 address and data. pins 23, 22, 20, 19, 18 are all tied low so only 256 bytes are usable
@@ -313,7 +313,7 @@ ADDRESS_MAP_END
// 30 R coin inputs (bits 0 and 1, active high)
// 40 W external ROM banking? (the only 0 bit enables a ROM)
// 50 W test mode status flags (bit 0 = ROM test fail, bit 1 = RAM test fail, bit 2 = YM2151 IRQ not received)
-ADDRESS_MAP_START( t5182_io, ADDRESS_SPACE_IO, 8 )
+ADDRESS_MAP_START( t5182_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x10, 0x10) AM_WRITE(t5182_sharedram_semaphore_snd_acquire_w)
diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c
index 564cc3e2b58..2dac10af581 100644
--- a/src/mame/audio/taito_en.c
+++ b/src/mame/audio/taito_en.c
@@ -240,7 +240,7 @@ static WRITE16_HANDLER(es5510_dsp_w)
static UINT16 *sound_ram;
-static ADDRESS_MAP_START( f3_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f3_sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_MIRROR(0x30000) AM_SHARE("share1") AM_BASE(&sound_ram)
AM_RANGE(0x140000, 0x140fff) AM_READWRITE(f3_68000_share_r, f3_68000_share_w)
AM_RANGE(0x200000, 0x20001f) AM_DEVREADWRITE("ensoniq", es5505_r, es5505_w)
diff --git a/src/mame/audio/taito_zm.c b/src/mame/audio/taito_zm.c
index 11db7a0044e..fd90e166b60 100644
--- a/src/mame/audio/taito_zm.c
+++ b/src/mame/audio/taito_zm.c
@@ -15,7 +15,7 @@
#include "audio/taito_zm.h"
#include "sound/zsg2.h"
-static ADDRESS_MAP_START(taitozoom_map, ADDRESS_SPACE_PROGRAM, 16)
+static ADDRESS_MAP_START(taitozoom_map, AS_PROGRAM, 16)
AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("mn10200", 0)
AM_RANGE(0x400000, 0x40ffff) AM_RAM
AM_RANGE(0x800000, 0x800fff) AM_DEVREADWRITE("zsg2", zsg2_r, zsg2_w)
@@ -41,7 +41,7 @@ static WRITE8_HANDLER(tms_ctrl_w)
tms_ctrl = data;
}
-static ADDRESS_MAP_START(taitozoom_io_map, ADDRESS_SPACE_IO, 8)
+static ADDRESS_MAP_START(taitozoom_io_map, AS_IO, 8)
AM_RANGE(MN10200_PORT1, MN10200_PORT1) AM_READWRITE(tms_ctrl_r, tms_ctrl_w)
ADDRESS_MAP_END
diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c
index a1547c4c0a2..87e2f93d3f4 100644
--- a/src/mame/audio/timeplt.c
+++ b/src/mame/audio/timeplt.c
@@ -165,7 +165,7 @@ WRITE8_HANDLER( timeplt_sh_irqtrigger_w )
*
*************************************/
-static ADDRESS_MAP_START( timeplt_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( timeplt_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w)
@@ -176,7 +176,7 @@ static ADDRESS_MAP_START( timeplt_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( locomotn_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( locomotn_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM
AM_RANGE(0x3000, 0x3fff) AM_DEVWRITE("timeplt_audio", timeplt_filter_w)
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index eba57879340..0a01f345577 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -95,7 +95,7 @@ static WRITE8_HANDLER( narc_slave_sync_w );
****************************************************************************/
/* CVSD readmem/writemem structures */
-static ADDRESS_MAP_START( williams_cvsd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_cvsd_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x1ffe) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x4000, 0x4003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE("cvsdpia", pia6821_r, pia6821_w)
@@ -107,7 +107,7 @@ ADDRESS_MAP_END
/* NARC master readmem/writemem structures */
-static ADDRESS_MAP_START( williams_narc_master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_narc_master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x03fe) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_WRITE(narc_master_talkback_w)
@@ -121,7 +121,7 @@ static ADDRESS_MAP_START( williams_narc_master_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* NARC slave readmem/writemem structures */
-static ADDRESS_MAP_START( williams_narc_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_narc_slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x03ff) AM_DEVWRITE("cvsd", cvsd_clock_set_w)
AM_RANGE(0x2400, 0x2400) AM_MIRROR(0x03ff) AM_DEVWRITE("cvsd", cvsd_digit_clock_clear_w)
@@ -136,7 +136,7 @@ ADDRESS_MAP_END
/* ADPCM readmem/writemem structures */
-static ADDRESS_MAP_START( williams_adpcm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_adpcm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x03ff) AM_WRITE(adpcm_bank_select_w)
AM_RANGE(0x2400, 0x2401) AM_MIRROR(0x03fe) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -486,7 +486,7 @@ void williams_cvsd_data_w(running_machine *machine, int data)
void williams_cvsd_reset_w(int state)
{
- address_space *space = sound_cpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = sound_cpu->memory().space(AS_PROGRAM);
/* going high halts the CPU */
if (state)
@@ -581,7 +581,7 @@ static WRITE8_HANDLER( narc_slave_sync_w )
void williams_narc_data_w(int data)
{
- address_space *space = sound_cpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = sound_cpu->memory().space(AS_PROGRAM);
soundlatch_w(space, 0, data & 0xff);
device_set_input_line(sound_cpu, INPUT_LINE_NMI, (data & 0x100) ? CLEAR_LINE : ASSERT_LINE);
@@ -598,7 +598,7 @@ void williams_narc_reset_w(int state)
/* going high halts the CPU */
if (state)
{
- address_space *space = sound_cpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = sound_cpu->memory().space(AS_PROGRAM);
narc_master_bank_select_w(space, 0, 0);
narc_slave_bank_select_w(space, 0, 0);
init_audio_state(space->machine);
@@ -668,7 +668,7 @@ static WRITE8_HANDLER( adpcm_talkback_w )
void williams_adpcm_data_w(int data)
{
- address_space *space = sound_cpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = sound_cpu->memory().space(AS_PROGRAM);
soundlatch_w(space, 0, data & 0xff);
if (!(data & 0x200))
{
@@ -684,7 +684,7 @@ void williams_adpcm_reset_w(int state)
/* going high halts the CPU */
if (state)
{
- address_space *space = sound_cpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = sound_cpu->memory().space(AS_PROGRAM);
adpcm_bank_select_w(space, 0, 0);
init_audio_state(space->machine);
device_set_input_line(sound_cpu, INPUT_LINE_RESET, ASSERT_LINE);
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index 7424c8ebcc9..205d76fa691 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -86,7 +86,7 @@ static TIMER_DEVICE_CALLBACK( c1942_scanline )
}
-static ADDRESS_MAP_START( c1942_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( c1942_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM")
@@ -105,7 +105,7 @@ static ADDRESS_MAP_START( c1942_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c
index 69f1cea492f..1be4a09d9d7 100644
--- a/src/mame/drivers/1943.c
+++ b/src/mame/drivers/1943.c
@@ -50,7 +50,7 @@ static READ8_HANDLER( c1943_protection_r )
/* Memory Maps */
-static ADDRESS_MAP_START( c1943_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( c1943_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_ROMBANK("bank1")
AM_RANGE(0x9000, 0x9fff) AM_ROMBANK("bank2")
@@ -80,7 +80,7 @@ static ADDRESS_MAP_START( c1943_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE_SIZE_MEMBER(_1943_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r)
@@ -603,7 +603,7 @@ static DRIVER_INIT( 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)
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc007, 0xc007, 0, 0, _1943b_c007_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc007, 0xc007, 0, 0, _1943b_c007_r);
}
diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c
index 00a31b662c4..5e8c92a2b5f 100644
--- a/src/mame/drivers/1945kiii.c
+++ b/src/mame/drivers/1945kiii.c
@@ -144,7 +144,7 @@ static WRITE16_HANDLER( k3_soundbanks_w )
state->oki2->set_bank_base((data & 2) ? 0x40000 : 0);
}
-static ADDRESS_MAP_START( k3_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( k3_map, AS_PROGRAM, 16 )
AM_RANGE(0x0009ce, 0x0009cf) AM_WRITENOP // bug in code? (clean up log)
AM_RANGE(0x0009d2, 0x0009d3) AM_WRITENOP // bug in code? (clean up log)
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index 2f2f5e0b0e9..7420a705e93 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -204,7 +204,7 @@ static WRITE8_HANDLER( sprite_lookup_w )
state->sprite_color_lookup[offset] = data;
}
-static ADDRESS_MAP_START( 20pacgal_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( 20pacgal_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x03fff) AM_ROM
AM_RANGE(0x04000, 0x07fff) AM_ROM
AM_RANGE(0x08000, 0x09fff) AM_ROM
@@ -231,7 +231,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( 20pacgal_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( 20pacgal_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x3f) AM_NOP /* Z180 internal registers */
AM_RANGE(0x40, 0x7f) AM_NOP /* Z180 internal registers */
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index 1b413825c57..311457b00d7 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -242,7 +242,7 @@ static WRITE16_HANDLER( charram_w )
gfx_element_mark_dirty(space->machine->gfx[1], offset / 16);
}
-static ADDRESS_MAP_START( drill_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( drill_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x300000, 0x3000ff) AM_RAM
diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c
index efac5cc905c..83b0fbb952f 100644
--- a/src/mame/drivers/39in1.c
+++ b/src/mame/drivers/39in1.c
@@ -1463,7 +1463,7 @@ static DRIVER_INIT( 39in1 )
memory_install_read32_handler (space, 0xa0151648, 0xa015164b, 0, 0, prot_cheater_r);
}
-static ADDRESS_MAP_START( 39in1_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( 39in1_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0007ffff) AM_ROM
AM_RANGE(0x00400000, 0x005fffff) AM_ROM AM_REGION("data", 0)
AM_RANGE(0x04000000, 0x047fffff) AM_READWRITE( cpld_r, cpld_w )
diff --git a/src/mame/drivers/3super8.c b/src/mame/drivers/3super8.c
index 2ff1eb4d307..21109958701 100644
--- a/src/mame/drivers/3super8.c
+++ b/src/mame/drivers/3super8.c
@@ -48,7 +48,7 @@ static SCREEN_UPDATE(3super8)
return 0;
}
-static ADDRESS_MAP_START( map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index fc57c80da74..0a52436f331 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -631,7 +631,7 @@ static WRITE8_HANDLER( to_main_w )
/***************************************************************************/
-static ADDRESS_MAP_START( 40love_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( 40love_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM /* M5517P on main board */
AM_RANGE(0x8800, 0x8800) AM_DEVREADWRITE("bmcu", buggychl_mcu_r, buggychl_mcu_w)
@@ -656,7 +656,7 @@ static ADDRESS_MAP_START( 40love_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_READWRITE(fortyl_pixram_r, fortyl_pixram_w) /* banked pixel layer */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( undoukai_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( undoukai_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE_MEMBER(fortyl_state, mcu_ram) /* M5517P on main board */
@@ -754,7 +754,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_3_w ) /* unknown */
// popmessage("SND3 0=%02x 1=%02x 2=%02x 3=%02x", state->snd_ctrl0, state->snd_ctrl1, state->snd_ctrl2, state->snd_ctrl3);
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("aysnd", ay8910_address_data_w)
diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c
index 3afb73f2319..f0a38ee4789 100644
--- a/src/mame/drivers/4enraya.c
+++ b/src/mame/drivers/4enraya.c
@@ -69,7 +69,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_w )
state->last_snd_ctrl = data;
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xdfff) AM_WRITE(fenraya_videoram_w) AM_BASE_SIZE_MEMBER(_4enraya_state, videoram, videoram_size)
@@ -77,7 +77,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_NOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW")
AM_RANGE(0x01, 0x01) AM_READ_PORT("INPUTS")
diff --git a/src/mame/drivers/4roses.c b/src/mame/drivers/4roses.c
index 998c44c0fce..1282fe8b1fa 100644
--- a/src/mame/drivers/4roses.c
+++ b/src/mame/drivers/4roses.c
@@ -199,7 +199,7 @@ public:
* Memory map information *
*************************/
-static ADDRESS_MAP_START( 4roses_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( 4roses_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM // AM_SHARE("nvram")
AM_RANGE(0x6000, 0x6fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE_MEMBER(funworld_state, videoram)
AM_RANGE(0x7000, 0x7fff) AM_RAM_WRITE(funworld_colorram_w) AM_BASE_MEMBER(funworld_state, colorram)
diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c
index 9a726f82827..af26718f6c2 100644
--- a/src/mame/drivers/5clown.c
+++ b/src/mame/drivers/5clown.c
@@ -716,7 +716,7 @@ static WRITE8_HANDLER( snd_a02_w )
* Memory map information *
*************************/
-static ADDRESS_MAP_START( fclown_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fclown_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
@@ -791,7 +791,7 @@ ADDRESS_MAP_END
*/
-static ADDRESS_MAP_START( fcaudio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fcaudio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0800) AM_WRITE(snd_800_w)
AM_RANGE(0x0a02, 0x0a02) AM_WRITE(snd_a02_w)
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index 7b9406d5df4..17227028144 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -342,7 +342,7 @@ INPUT_PORTS_END
/* */
/*******************************************************/
-static ADDRESS_MAP_START( invadpt2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( invadpt2_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_shift_count_w)
@@ -408,7 +408,7 @@ MACHINE_CONFIG_END
/* */
/*******************************************************/
-static ADDRESS_MAP_START( spcewars_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spcewars_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_shift_count_w)
@@ -463,7 +463,7 @@ MACHINE_CONFIG_END
/* */
/*******************************************************/
-static ADDRESS_MAP_START( astropal_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( astropal_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1")
@@ -526,7 +526,7 @@ MACHINE_CONFIG_END
/* */
/*******************************************************/
-static ADDRESS_MAP_START( cosmo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cosmo_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE_SIZE_MEMBER(_8080bw_state, main_ram, main_ram_size)
AM_RANGE(0x4000, 0x57ff) AM_ROM
@@ -534,7 +534,7 @@ static ADDRESS_MAP_START( cosmo_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* at least one of these MWA8_NOPs must be sound related */
-static ADDRESS_MAP_START( cosmo_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cosmo_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITENOP
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITENOP
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_WRITENOP
@@ -634,7 +634,7 @@ INPUT_PORTS_END
/* */
/*******************************************************/
-static ADDRESS_MAP_START( invrvnge_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( invrvnge_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_shift_count_w)
@@ -767,7 +767,7 @@ INPUT_PORTS_END
/* */
/*******************************************************/
-static ADDRESS_MAP_START( lrescue_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( lrescue_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_shift_count_w)
@@ -901,7 +901,7 @@ INPUT_PORTS_END
/* */
/*******************************************************/
-static ADDRESS_MAP_START( rollingc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rollingc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE_SIZE_MEMBER(_8080bw_state, main_ram, main_ram_size)
AM_RANGE(0x4000, 0x5fff) AM_ROM
@@ -910,7 +910,7 @@ static ADDRESS_MAP_START( rollingc_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rollingc_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rollingc_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(rollingc_sh_port_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_shift_count_w)
@@ -965,7 +965,7 @@ MACHINE_CONFIG_END
/* */
/*******************************************************/
-static ADDRESS_MAP_START( schaser_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( schaser_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE_SIZE_MEMBER(_8080bw_state, main_ram, main_ram_size)
AM_RANGE(0x4000, 0x5fff) AM_ROM
@@ -973,7 +973,7 @@ static ADDRESS_MAP_START( schaser_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( schaser_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( schaser_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_shift_count_w)
@@ -1090,7 +1090,7 @@ MACHINE_CONFIG_END
/* */
/*******************************************************/
-static ADDRESS_MAP_START( schasercv_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( schasercv_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_shift_count_w)
@@ -1159,7 +1159,7 @@ static CUSTOM_INPUT( sflush_80_r )
return (field->port->machine->primary_screen->vpos() & 0x80) ? 1 : 0;
}
-static ADDRESS_MAP_START( sflush_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sflush_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE_SIZE_MEMBER(_8080bw_state, main_ram, main_ram_size)
AM_RANGE(0x8008, 0x8008) AM_READ_PORT("PADDLE")
@@ -1229,7 +1229,7 @@ MACHINE_CONFIG_END
/* */
/*******************************************************/
-static ADDRESS_MAP_START( lupin3_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( lupin3_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_shift_count_w)
@@ -1386,7 +1386,7 @@ static MACHINE_START( polaris )
// you will get a nice sound that accurately follows the plane.
// It sounds better then the actual circuit used.
// Probably an unfinished feature.
-static ADDRESS_MAP_START( polaris_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( polaris_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_DEVWRITE("mb14241", mb14241_shift_count_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("discrete", polaris_sh_port_1_w)
@@ -1556,7 +1556,7 @@ INPUT_PORTS_END
/* */
/*******************************************************/
-static ADDRESS_MAP_START( ballbomb_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ballbomb_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_shift_count_w)
@@ -1603,13 +1603,13 @@ MACHINE_CONFIG_END
/* */
/*******************************************************/
-static ADDRESS_MAP_START( yosakdon_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( yosakdon_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE_SIZE_MEMBER(_8080bw_state, main_ram, main_ram_size)
AM_RANGE(0x4000, 0x43ff) AM_WRITEONLY /* what's this? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( yosakdon_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( yosakdon_io_map, AS_IO, 8 )
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN0")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1")
AM_RANGE(0x03, 0x03) AM_WRITE(yosakdon_sh_port_1_w)
@@ -1739,7 +1739,7 @@ static READ8_HANDLER(indianbt_r)
return space->machine->rand();
}
-static ADDRESS_MAP_START( indianbt_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( indianbt_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ(indianbt_r)
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN0")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_shift_count_w)
@@ -1785,7 +1785,7 @@ static WRITE8_HANDLER( steelwkr_sh_port_3_w )
coin_lockout_global_w(space->machine, !(~data & 0x03)); /* possibly */
}
-static ADDRESS_MAP_START( steelwkr_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( steelwkr_io_map, AS_IO, 8 )
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_DEVWRITE("mb14241", mb14241_shift_count_w)
AM_RANGE(0x03, 0x03) AM_DEVREAD("mb14241", mb14241_shift_result_r) AM_WRITE(invadpt2_sh_port_1_w)
@@ -1945,14 +1945,14 @@ static INPUT_PORTS_START( skylove )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(1)
INPUT_PORTS_END
-static ADDRESS_MAP_START( shuttlei_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shuttlei_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE_SIZE_MEMBER(_8080bw_state, main_ram, main_ram_size)
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_SHARE("share1") // shuttlei
AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE("share1") // skylove (is it mirrored, or different PCB hookup?)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shuttlei_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( shuttlei_io_map, AS_IO, 8 )
AM_RANGE(0xfc, 0xfc) AM_WRITENOP /* game writes 0xAA every so often (perhaps when base hit?) */
AM_RANGE(0xfd, 0xfd) AM_WRITE(shuttlei_sh_port_1_w)
AM_RANGE(0xfe, 0xfe) AM_READ_PORT("DSW") AM_WRITE(shuttlei_sh_port_2_w)
@@ -2018,13 +2018,13 @@ static MACHINE_RESET( darthvdr )
}
-static ADDRESS_MAP_START( darthvdr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( darthvdr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_ROM
AM_RANGE(0x1800, 0x1fff) AM_RAM
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE_SIZE_MEMBER(_8080bw_state, main_ram, main_ram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( darthvdr_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( darthvdr_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
AM_RANGE(0x01, 0x01) AM_READ_PORT("P2")
AM_RANGE(0x00, 0x0f) AM_WRITENOP
@@ -2093,7 +2093,7 @@ MACHINE_CONFIG_END
*
*************************************/
-static ADDRESS_MAP_START( vortex_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( vortex_io_map, AS_IO, 8 )
// I/O map is same as invaders but with A9 (used as A1 for I/O) inverted
ADDRESS_MAP_GLOBAL_MASK(0xFF)
AM_RANGE(0x02, 0x02) AM_MIRROR(0x04) AM_READ_PORT("IN0")
@@ -2339,7 +2339,7 @@ BOARD 2:
// the invaders shifter stuff doesn't seem correct for this, if i hook up the count_w the gfx are corrupt, otherwise they're incorrectly offset?
// might need custom implementation
-static ADDRESS_MAP_START( modelr_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( modelr_io_map, AS_IO, 8 )
// AM_RANGE(0x00, 0x00) AM_DEVWRITE("mb14241", mb14241_shift_count_w)
// AM_RANGE(0x01, 0x01) AM_DEVREAD("mb14241", mb14241_shift_result_r)
AM_RANGE(0x02, 0x02) AM_DEVWRITE("mb14241", mb14241_shift_data_w)
diff --git a/src/mame/drivers/86lions.c b/src/mame/drivers/86lions.c
index a350862e510..798484d772f 100644
--- a/src/mame/drivers/86lions.c
+++ b/src/mame/drivers/86lions.c
@@ -85,7 +85,7 @@ static READ8_HANDLER( test_r )
}
-static ADDRESS_MAP_START( lions_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lions_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(_86lions_state, lions_vram)
AM_RANGE(0x0800, 0x0fff) AM_RAM
AM_RANGE(0x1800, 0x1800) AM_DEVWRITE("crtc", mc6845_address_w)
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index 5a4ed293f91..2cae66c1b51 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -134,7 +134,7 @@ static WRITE8_HANDLER( k052109_051960_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE_MEMBER(_88games_state, banked_rom) /* banked ROM + palette RAM */
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_be_w) AM_BASE_MEMBER(_88games_state, paletteram_1000) /* banked ROM + palette RAM */
AM_RANGE(0x2000, 0x2fff) AM_RAM
@@ -154,7 +154,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_WRITE(speech_msg_w)
diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c
index 6f7b71611d3..bf01411bd9d 100644
--- a/src/mame/drivers/ace.c
+++ b/src/mame/drivers/ace.c
@@ -162,7 +162,7 @@ static READ8_HANDLER( unk_r )
/* 3x3106 - SRAM 256x1 */
/* 1x3622 - ROM 512x4 - doesn't seem to be used ????????????*/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x09ff) AM_ROM
diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c
index baec557273c..3201d2653f9 100644
--- a/src/mame/drivers/acefruit.c
+++ b/src/mame/drivers/acefruit.c
@@ -274,7 +274,7 @@ static PALETTE_INIT( acefruit )
palette_set_color( machine, 15, MAKE_RGB(0xff, 0x00, 0x00) );
}
-static ADDRESS_MAP_START( acefruit_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( acefruit_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x20ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_MEMBER(acefruit_state, videoram)
@@ -296,7 +296,7 @@ static ADDRESS_MAP_START( acefruit_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( acefruit_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( acefruit_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_NOP /* ? */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index 0193600f5d9..f405e6a872f 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -450,7 +450,7 @@ static WRITE16_HANDLER(ac_unk2_w)
popmessage("UNK-2 enabled %04x",data);
}
-static ADDRESS_MAP_START( acommand_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( acommand_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x082000, 0x082005) AM_WRITE(ac_bgscroll_w)
AM_RANGE(0x082100, 0x082105) AM_WRITE(ac_txscroll_w)
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index f0778c6a815..9e18e80e456 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -63,7 +63,7 @@ static WRITE8_HANDLER( actfancr_sound_w )
/******************************************************************************/
-static ADDRESS_MAP_START( actfan_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( actfan_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x02ffff) AM_ROM
AM_RANGE(0x060000, 0x06001f) AM_WRITE(actfancr_pf1_control_w)
AM_RANGE(0x062000, 0x063fff) AM_READWRITE(actfancr_pf1_data_r, actfancr_pf1_data_w) AM_BASE_MEMBER(actfancr_state, pf1_data)
@@ -81,7 +81,7 @@ static ADDRESS_MAP_START( actfan_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1f0000, 0x1f3fff) AM_RAM AM_BASE_MEMBER(actfancr_state, main_ram) /* Main ram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( triothep_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( triothep_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04001f) AM_WRITE(actfancr_pf2_control_w)
AM_RANGE(0x044000, 0x045fff) AM_READWRITE(actfancr_pf2_data_r, actfancr_pf2_data_w) AM_BASE_MEMBER(actfancr_state, pf2_data)
@@ -101,7 +101,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( dec0_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dec0_s_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3812_w)
@@ -616,12 +616,12 @@ static READ8_HANDLER( cyclej_r )
static DRIVER_INIT( actfancr )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f0026, 0x1f0027, 0, 0, cycle_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f0026, 0x1f0027, 0, 0, cycle_r);
}
static DRIVER_INIT( actfancrj )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f0026, 0x1f0027, 0, 0, cyclej_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f0026, 0x1f0027, 0, 0, cyclej_r);
}
diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c
index 4f1c0a23e0d..271c46ceb1f 100644
--- a/src/mame/drivers/adp.c
+++ b/src/mame/drivers/adp.c
@@ -433,7 +433,7 @@ static READ8_DEVICE_HANDLER(t2_r)
return res;
}
-static ADDRESS_MAP_START( skattv_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( skattv_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x800080, 0x800081) AM_DEVREADWRITE("hd63484", hd63484_status_r, hd63484_address_w)
AM_RANGE(0x800082, 0x800083) AM_DEVREADWRITE("hd63484", hd63484_data_r, hd63484_data_w)
@@ -445,7 +445,7 @@ static ADDRESS_MAP_START( skattv_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffc000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( quickjac_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( quickjac_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE8("duart68681", duart68681_r, duart68681_w, 0xff )
AM_RANGE(0x800080, 0x800081) AM_DEVREADWRITE("hd63484", hd63484_status_r, hd63484_address_w) // bad
@@ -454,7 +454,7 @@ static ADDRESS_MAP_START( quickjac_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffc000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( backgamn_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( backgamn_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x100000, 0x10003f) AM_RAM
AM_RANGE(0x200000, 0x20003f) AM_RAM
@@ -499,7 +499,7 @@ static WRITE8_HANDLER( ramdac_io_w )
}
}
-static ADDRESS_MAP_START( funland_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( funland_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x800080, 0x800081) AM_DEVREADWRITE("hd63484", hd63484_status_r, hd63484_address_w)
AM_RANGE(0x800082, 0x800083) AM_DEVREADWRITE("hd63484", hd63484_data_r, hd63484_data_w)
@@ -510,7 +510,7 @@ static ADDRESS_MAP_START( funland_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfc0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fstation_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fstation_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
//400000-40001f?
AM_RANGE(0x800080, 0x800081) AM_DEVREADWRITE("hd63484", hd63484_status_r, hd63484_address_w)
diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c
index 2e0bf1f703d..34f8db6f119 100644
--- a/src/mame/drivers/aeroboto.c
+++ b/src/mame/drivers/aeroboto.c
@@ -73,7 +73,7 @@ static WRITE8_HANDLER ( aeroboto_1a2_w )
state->disable_irq = 1;
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x01a2, 0x01a2) AM_WRITE(aeroboto_1a2_w) // affects IRQ line (more protection?)
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(aeroboto_state, mainram) // main RAM
AM_RANGE(0x0800, 0x08ff) AM_RAM // tile color buffer; copied to 0x2000
@@ -96,7 +96,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM // main ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x9000, 0x9001) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x9002, 0x9002) AM_DEVREAD("ay1", ay8910_r)
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index d5aa49cfaf8..34a92e24d60 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -140,7 +140,7 @@ static WRITE8_HANDLER( aerfboot_okim6295_banking_w )
memcpy(&oki[0x20000], &oki[((data & 0x3) * 0x20000) + 0x40000], 0x20000);
}
-static ADDRESS_MAP_START( pspikes_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pspikes_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE_SIZE_MEMBER(aerofgt_state, spriteram1, spriteram1_size)
@@ -154,7 +154,7 @@ static ADDRESS_MAP_START( pspikes_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff006, 0xfff007) AM_READWRITE(pending_command_r, sound_command_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pspikesb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pspikesb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE_SIZE_MEMBER(aerofgt_state, spriteram1, spriteram1_size)
@@ -171,7 +171,7 @@ static ADDRESS_MAP_START( pspikesb_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff008, 0xfff009) AM_DEVWRITE("oki", pspikesb_oki_banking_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spikes91_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( spikes91_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE_SIZE_MEMBER(aerofgt_state, spriteram1, spriteram1_size)
@@ -191,7 +191,7 @@ static ADDRESS_MAP_START( spikes91_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff008, 0xfff009) AM_WRITE(spikes91_lookup_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pspikesc_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pspikesc_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE_SIZE_MEMBER(aerofgt_state, spriteram1, spriteram1_size)
@@ -206,7 +206,7 @@ static ADDRESS_MAP_START( pspikesc_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff006, 0xfff007) AM_DEVREADWRITE8_MODERN("oki", okim6295_device, read, write, 0x00ff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( karatblz_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( karatblz_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x081fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE_MEMBER(aerofgt_state, bg1videoram)
@@ -227,7 +227,7 @@ static ADDRESS_MAP_START( karatblz_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0ff00e, 0x0ff00f) AM_WRITE(aerofgt_bg2scrolly_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spinlbrk_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( spinlbrk_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE_MEMBER(aerofgt_state, bg1videoram)
AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE(aerofgt_bg2videoram_w) AM_BASE_MEMBER(aerofgt_state, bg2videoram)
@@ -241,7 +241,7 @@ static ADDRESS_MAP_START( spinlbrk_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff006, 0xfff007) AM_WRITE(sound_command_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( turbofrc_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( turbofrc_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */
@@ -263,7 +263,7 @@ static ADDRESS_MAP_START( turbofrc_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0ff00e, 0x0ff00f) AM_WRITE(turbofrc_sound_command_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aerofgtb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( aerofgtb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */
AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE_MEMBER(aerofgt_state, bg1videoram)
@@ -283,7 +283,7 @@ static ADDRESS_MAP_START( aerofgtb_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0ff000, 0x0fffff) AM_RAM AM_BASE_MEMBER(aerofgt_state, rasterram) /* used only for the scroll registers */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aerofgt_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( aerofgt_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x1a0000, 0x1a07ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x1b0000, 0x1b07ff) AM_RAM AM_BASE_MEMBER(aerofgt_state, rasterram) /* used only for the scroll registers */
@@ -308,7 +308,7 @@ static ADDRESS_MAP_START( aerofgt_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffffc0, 0xffffc1) AM_WRITE(sound_command_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aerfboot_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( aerfboot_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */
AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE_MEMBER(aerofgt_state, bg1videoram)
@@ -337,7 +337,7 @@ static ADDRESS_MAP_START( aerfboot_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x10c000, 0x117fff) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aerfboo2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( aerfboo2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* work RAM */
AM_RANGE(0x0d0000, 0x0d1fff) AM_RAM_WRITE(aerofgt_bg1videoram_w) AM_BASE_MEMBER(aerofgt_state, bg1videoram)
@@ -365,7 +365,7 @@ static ADDRESS_MAP_START( aerfboo2_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0ff000, 0x0fffff) AM_RAM AM_BASE_MEMBER(aerofgt_state, rasterram) /* used only for the scroll registers */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wbbc97_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wbbc97_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
AM_RANGE(0x500000, 0x50ffff) AM_RAM /* work RAM */
AM_RANGE(0x600000, 0x605fff) AM_RAM AM_BASE_SIZE_MEMBER(aerofgt_state, spriteram1, spriteram1_size)
@@ -381,20 +381,20 @@ static ADDRESS_MAP_START( wbbc97_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff00e, 0xfff00f) AM_WRITE(wbbc97_bitmap_enable_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( turbofrc_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( turbofrc_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(aerofgt_sh_bankswitch_w)
AM_RANGE(0x14, 0x14) AM_READWRITE(soundlatch_r, pending_command_clear_w)
AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aerofgt_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( aerofgt_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w)
AM_RANGE(0x04, 0x04) AM_WRITE(aerofgt_sh_bankswitch_w)
@@ -402,7 +402,7 @@ static ADDRESS_MAP_START( aerofgt_sound_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x0c, 0x0c) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aerfboot_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( aerfboot_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_WRITE(aerfboot_okim6295_banking_w)
@@ -410,7 +410,7 @@ static ADDRESS_MAP_START( aerfboot_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wbbc97_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wbbc97_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index f3271ed70bd..70185570015 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -350,7 +350,7 @@ static WRITE8_HANDLER( airbustr_coin_counter_w )
}
/* Memory Maps */
-static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_DEVREADWRITE("pandora", pandora_spriteram_r, pandora_spriteram_w)
@@ -359,14 +359,14 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( master_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(master_bankswitch_w)
AM_RANGE(0x01, 0x01) AM_WRITENOP // ???
AM_RANGE(0x02, 0x02) AM_WRITE(master_nmi_trigger_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(airbustr_videoram2_w) AM_BASE_MEMBER(airbustr_state, videoram2)
@@ -379,7 +379,7 @@ static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( slave_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(slave_bankswitch_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(soundcommand2_r, soundcommand_w)
@@ -392,13 +392,13 @@ static ADDRESS_MAP_START( slave_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x38, 0x38) AM_WRITENOP // ???
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3")
AM_RANGE(0xc000, 0xdfff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(sound_bankswitch_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
@@ -798,7 +798,7 @@ ROM_END
static DRIVER_INIT( airbustr )
{
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe000, 0xefff, 0, 0, devram_r); // protection device lives here
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_PROGRAM), 0xe000, 0xefff, 0, 0, devram_r); // protection device lives here
}
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index abd75302bfc..01c80cbce51 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -25,7 +25,7 @@ static WRITE8_HANDLER( sound_bank_w );
/****************************************************************************/
-static ADDRESS_MAP_START( ajax_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ajax_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01c0) AM_READWRITE(ajax_ls138_f10_r, ajax_ls138_f10_w) /* bankswitch + sound command + FIRQ command */
AM_RANGE(0x0800, 0x0807) AM_DEVREADWRITE("k051960", k051937_r, k051937_w) /* sprite control registers */
AM_RANGE(0x0c00, 0x0fff) AM_DEVREADWRITE("k051960", k051960_r, k051960_w) /* sprite RAM 2128SL at J7 */
@@ -36,7 +36,7 @@ static ADDRESS_MAP_START( ajax_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM N11 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ajax_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ajax_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_DEVREADWRITE("k051316", k051316_r, k051316_w) /* 051316 zoom/rotation layer */
AM_RANGE(0x0800, 0x080f) AM_DEVWRITE("k051316", k051316_ctrl_w) /* 051316 control registers */
AM_RANGE(0x1000, 0x17ff) AM_DEVREAD("k051316", k051316_rom_r) /* 051316 (ROM test) */
@@ -47,7 +47,7 @@ static ADDRESS_MAP_START( ajax_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM I16 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ajax_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ajax_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM F6 */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM 2128SL at D16 */
AM_RANGE(0x9000, 0x9000) AM_WRITE(sound_bank_w) /* 007232 bankswitch */
diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c
index 163ec90a41a..5178f1f87e2 100644
--- a/src/mame/drivers/albazc.c
+++ b/src/mame/drivers/albazc.c
@@ -149,7 +149,7 @@ static WRITE8_HANDLER( albazc_vregs_w )
/* main cpu */
-static ADDRESS_MAP_START( hanaroku_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hanaroku_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_MEMBER(albazc_state, spriteram1)
AM_RANGE(0x9000, 0x97ff) AM_RAM AM_BASE_MEMBER(albazc_state, spriteram2)
diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c
index 651822dd84d..320bf0b21bf 100644
--- a/src/mame/drivers/albazg.c
+++ b/src/mame/drivers/albazg.c
@@ -250,7 +250,7 @@ static const ppi8255_interface ppi8255_intf =
/***************************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa7fc, 0xa7fc) AM_WRITE(prot_lock_w)
@@ -263,7 +263,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x01, 0x01) AM_DEVWRITE("crtc", mc6845_register_w)
diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c
index 98c0f51f141..6c8b46ff09f 100644
--- a/src/mame/drivers/aleck64.c
+++ b/src/mame/drivers/aleck64.c
@@ -181,7 +181,7 @@ static READ32_HANDLER( aleck_dips_r )
return 0;
}
-static ADDRESS_MAP_START( n64_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( n64_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE(&rdram) // RDRAM
AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_SHARE("dmem") // RSP DMEM
AM_RANGE(0x04001000, 0x04001fff) AM_RAM AM_SHARE("imem") // RSP IMEM
@@ -202,7 +202,7 @@ static ADDRESS_MAP_START( n64_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xd0010000, 0xd00109ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rsp_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( rsp_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00000fff) AM_RAM AM_SHARE("dmem")
AM_RANGE(0x00001000, 0x00001fff) AM_RAM AM_SHARE("imem")
AM_RANGE(0x04000000, 0x04000fff) AM_RAM AM_BASE(&rsp_dmem) AM_SHARE("dmem")
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 56f9cf581b1..c596547530a 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -221,7 +221,7 @@ static CUSTOM_INPUT( lightgun_holster_r )
static WRITE8_DEVICE_HANDLER( alg_cia_0_porta_w )
{
- address_space *space = device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device("maincpu")->memory().space(AS_PROGRAM);
/* switch banks as appropriate */
memory_set_bank(device->machine, "bank1", data & 1);
@@ -277,7 +277,7 @@ static WRITE8_DEVICE_HANDLER( alg_cia_1_porta_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map_r1, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map_r1, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE_SIZE_MEMBER(alg_state, chip_ram, chip_ram_size)
AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w)
@@ -290,7 +290,7 @@ static ADDRESS_MAP_START( main_map_r1, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_map_r2, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map_r2, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE_SIZE_MEMBER(alg_state, chip_ram, chip_ram_size)
AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w)
@@ -303,7 +303,7 @@ static ADDRESS_MAP_START( main_map_r2, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_map_picmatic, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map_picmatic, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE_SIZE_MEMBER(alg_state, chip_ram, chip_ram_size)
AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w)
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index 596b7c3c692..709887dfeaf 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -122,7 +122,7 @@ static WRITE8_HANDLER( k052109_051960_w )
k051960_w(state->k051960, offset - 0x3c00, data);
}
-static ADDRESS_MAP_START( aliens_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( aliens_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE_MEMBER(aliens_state, ram) /* palette + work RAM */
AM_RANGE(0x0400, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") /* banked ROM */
@@ -137,7 +137,7 @@ static ADDRESS_MAP_START( aliens_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM e24_j02.bin */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aliens_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( aliens_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM g04_b03.bin */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/allied.c b/src/mame/drivers/allied.c
index 6f44e160947..11f8c29eddd 100644
--- a/src/mame/drivers/allied.c
+++ b/src/mame/drivers/allied.c
@@ -10,7 +10,7 @@ public:
: driver_device(machine, config) { }
};
-static ADDRESS_MAP_START( allied_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( allied_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1400, 0x1fff) AM_ROM
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index 35339566aac..d67b0978963 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -660,7 +660,7 @@ static READ16_HANDLER( alpha_V_trigger_r )
/******************************************************************************/
-static ADDRESS_MAP_START( kyros_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( kyros_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM // main program
AM_RANGE(0x020000, 0x020fff) AM_RAM AM_BASE_MEMBER(alpha68k_state, shared_ram) // work RAM
AM_RANGE(0x040000, 0x041fff) AM_RAM AM_BASE_MEMBER(alpha68k_state, spriteram) // sprite RAM
@@ -670,7 +670,7 @@ static ADDRESS_MAP_START( kyros_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0e0000, 0x0e0001) AM_READWRITE(kyros_dip_r, kyros_sound_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( alpha68k_I_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( alpha68k_I_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // main program
AM_RANGE(0x080000, 0x083fff) AM_RAM // work RAM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE_MEMBER(alpha68k_state, spriteram) // video RAM
@@ -681,7 +681,7 @@ static ADDRESS_MAP_START( alpha68k_I_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x380000, 0x380001) AM_READ_PORT("IN2") AM_WRITE(paddlema_soundlatch_w) // LSB: sound latch write and RST38 trigger, joy3, joy4
ADDRESS_MAP_END
-static ADDRESS_MAP_START( alpha68k_II_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( alpha68k_II_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE_MEMBER(alpha68k_state, shared_ram)
AM_RANGE(0x080000, 0x080001) AM_READ(control_1_r) /* Joysticks */
@@ -700,7 +700,7 @@ static ADDRESS_MAP_START( alpha68k_II_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x800000, 0x83ffff) AM_ROMBANK("bank8")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( alpha68k_V_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( alpha68k_V_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM AM_BASE_MEMBER(alpha68k_state, shared_ram)
AM_RANGE(0x080000, 0x080001) AM_READWRITE(control_1_r, alpha68k_V_sound_w) /* Joysticks */
@@ -720,7 +720,7 @@ ADDRESS_MAP_END
static READ16_HANDLER(sound_cpu_r) { return 1; }
-static ADDRESS_MAP_START( tnextspc_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tnextspc_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x070000, 0x073fff) AM_RAM
AM_RANGE(0x0a0000, 0x0a3fff) AM_RAM AM_BASE_MEMBER(alpha68k_state, spriteram)
@@ -745,13 +745,13 @@ static WRITE8_HANDLER( sound_bank_w )
memory_set_bank(space->machine, "bank7", data);
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank7")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kyros_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kyros_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
@@ -767,7 +767,7 @@ static ADDRESS_MAP_START( kyros_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
*/
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sstingry_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sstingry_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xc100, 0xc100) AM_READ(soundlatch_r)
@@ -776,12 +776,12 @@ static ADDRESS_MAP_START( sstingry_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc106, 0xc10e) AM_WRITENOP // soundboard I/O's, ignored
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jongbou_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jongbou_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( alpha68k_I_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( alpha68k_I_s_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xe000, 0xe000) AM_READWRITE(soundlatch_r, soundlatch_clear_w)
AM_RANGE(0xe800, 0xe800) AM_DEVREADWRITE("ymsnd", ym3812_status_port_r, ym3812_control_port_w)
@@ -791,13 +791,13 @@ static ADDRESS_MAP_START( alpha68k_I_s_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tnextspc_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tnextspc_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_READWRITE(soundlatch_r, soundlatch_clear_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(soundlatch_r, soundlatch_clear_w)
AM_RANGE(0x08, 0x08) AM_DEVWRITE("dac", dac_signed_w)
@@ -806,7 +806,7 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x0e, 0x0e) AM_WRITE(sound_bank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kyros_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kyros_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x11) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x80, 0x80) AM_DEVWRITE("ym2", ym2203_write_port_w)
@@ -815,7 +815,7 @@ static ADDRESS_MAP_START( kyros_sound_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x91, 0x91) AM_DEVWRITE("ym3", ym2203_control_port_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jongbou_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jongbou_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("aysnd", ay8910_address_w)
AM_RANGE(0x01, 0x01) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w)
@@ -823,7 +823,7 @@ static ADDRESS_MAP_START( jongbou_sound_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x06, 0x06) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tnextspc_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tnextspc_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ymsnd", ym3812_status_port_r, ym3812_control_port_w)
AM_RANGE(0x20, 0x20) AM_DEVWRITE("ymsnd", ym3812_write_port_w)
@@ -3108,7 +3108,7 @@ static DRIVER_INIT( kyros )
static DRIVER_INIT( jongbou )
{
alpha68k_state *state = machine->driver_data<alpha68k_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0c0000, 0x0c0001, 0, 0, jongbou_inputs_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0c0000, 0x0c0001, 0, 0, jongbou_inputs_r);
state->invert_controls = 0;
state->microcontroller_id = 0x00ff;
state->coin_id = 0x23 | (0x24 << 8);
diff --git a/src/mame/drivers/alvg.c b/src/mame/drivers/alvg.c
index c9254ea85b8..46bb32eb7a7 100644
--- a/src/mame/drivers/alvg.c
+++ b/src/mame/drivers/alvg.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( alvg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( alvg_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_RAM
AM_RANGE(0x4000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c
index eb9d562a4bf..b70e09a6f96 100644
--- a/src/mame/drivers/amaticmg.c
+++ b/src/mame/drivers/amaticmg.c
@@ -426,7 +426,7 @@ static PALETTE_INIT( amaticmg )
* Memory Map Information *
************************************/
-static ADDRESS_MAP_START( amaticmg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( amaticmg_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x3ffff) AM_ROM
// AM_RANGE(0x0000, 0x0000) AM_RAM // AM_SHARE("nvram")
// AM_RANGE(0x0000, 0x0000) AM_DEVWRITE("crtc", mc6845_address_w)
@@ -435,7 +435,7 @@ static ADDRESS_MAP_START( amaticmg_map, ADDRESS_SPACE_PROGRAM, 8 )
// AM_RANGE(0x0000, 0x0000) AM_RAM_WRITE(amaticmg_colorram_w) AM_BASE(&amaticmg_colorram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( amaticmg_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( amaticmg_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
// AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index ee8e1580028..45e800affb7 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -63,7 +63,7 @@ static WRITE8_HANDLER( flip_screen_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(watchdog_reset_r)
@@ -79,7 +79,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xcc07, 0xcc07) AM_WRITE(ambush_coin_counter_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_address_w)
AM_RANGE(0x01, 0x01) AM_DEVWRITE("ay1", ay8910_data_w)
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index d1aae06818f..b3a310904d7 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -602,13 +602,13 @@ static WRITE8_HANDLER( ampoker2_watchdog_reset_w )
* Memory map information *
*************************/
-static ADDRESS_MAP_START( ampoker2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ampoker2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(ampoker2_videoram_w) AM_BASE_MEMBER(ampoker2_state, videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ampoker2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ampoker2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x08, 0x0f) AM_WRITENOP /* inexistent in the real hardware */
AM_RANGE(0x10, 0x10) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index a0b288a62f9..2faa0a29ad6 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -74,7 +74,7 @@ static WRITE8_HANDLER( amspdwy_sound_w )
device_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( amspdwy_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( amspdwy_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0x801f) AM_WRITE(amspdwy_paletteram_w) AM_BASE_GENERIC(paletteram)// Palette
AM_RANGE(0x9000, 0x93ff) AM_MIRROR(0x0400) AM_RAM_WRITE(amspdwy_videoram_w) AM_BASE_MEMBER(amspdwy_state, videoram) // Layer, mirrored?
@@ -98,7 +98,7 @@ static READ8_HANDLER( amspdwy_port_r )
return tracks[offset];
}
-static ADDRESS_MAP_START( amspdwy_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( amspdwy_portmap, AS_IO, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ(amspdwy_port_r)
ADDRESS_MAP_END
@@ -112,7 +112,7 @@ ADDRESS_MAP_END
***************************************************************************/
-static ADDRESS_MAP_START( amspdwy_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( amspdwy_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
// AM_RANGE(0x8000, 0x8000) AM_WRITENOP // ? Written with 0 at the start
AM_RANGE(0x9000, 0x9000) AM_READ(soundlatch_r) // From Main CPU
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index 5c6fb910b97..91ecf2dfb8a 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -193,7 +193,7 @@ contain a level.
*/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM
@@ -211,7 +211,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf005, 0xf005) AM_WRITE(angelkds_layer_ctrl_write)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP // 00 on start-up, not again
AM_RANGE(0x42, 0x42) AM_WRITE(angelkds_cpu_bank_write)
@@ -227,7 +227,7 @@ ADDRESS_MAP_END
/* sub cpu */
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xaaa9, 0xaaa9) AM_READNOP
@@ -235,7 +235,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xaaac, 0xaaac) AM_READNOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sub_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w)
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index 707a6f01a0f..ef6f0ff2fbd 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -213,7 +213,7 @@ static WRITE8_HANDLER( appoooh_adpcm_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank1")
@@ -229,7 +229,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76496_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE("sn2", sn76496_w)
@@ -598,7 +598,7 @@ static DRIVER_INIT(robowres)
static DRIVER_INIT(robowresb)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
space->set_decrypted_region(0x0000, 0x7fff, machine->region("maincpu")->base() + 0x1c000);
}
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index 577a1941fd6..c4734b5d432 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -136,7 +136,7 @@ static WRITE8_HANDLER( aquarium_oki_w )
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0xc00000, 0xc00fff) AM_RAM_WRITE(aquarium_mid_videoram_w) AM_BASE_MEMBER(aquarium_state, mid_videoram)
AM_RANGE(0xc01000, 0xc01fff) AM_RAM_WRITE(aquarium_bak_videoram_w) AM_BASE_MEMBER(aquarium_state, bak_videoram)
@@ -154,13 +154,13 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( snd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( snd_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( snd_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( snd_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(aquarium_oki_r, aquarium_oki_w)
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index db50dfa86ad..ac9b7f64991 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -182,7 +182,7 @@ static WRITE8_HANDLER( mcu_port_p_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_WRITE(arabian_videoram_w)
AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x01ff) AM_READ_PORT("IN0")
@@ -199,7 +199,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io_map, AS_IO, 8 )
AM_RANGE(0xc800, 0xc800) AM_MIRROR(0x01ff) AM_DEVWRITE("aysnd", ay8910_address_w)
AM_RANGE(0xca00, 0xca00) AM_MIRROR(0x01ff) AM_DEVWRITE("aysnd", ay8910_data_w)
ADDRESS_MAP_END
@@ -212,7 +212,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8 )
AM_RANGE(MB88_PORTK, MB88_PORTK ) AM_READ(mcu_portk_r)
AM_RANGE(MB88_PORTO, MB88_PORTO ) AM_WRITE(mcu_port_o_w)
AM_RANGE(MB88_PORTP, MB88_PORTP ) AM_WRITE(mcu_port_p_w)
diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c
index 11a45d5255e..3f6572b5f2d 100644
--- a/src/mame/drivers/arcadecl.c
+++ b/src/mame/drivers/arcadecl.c
@@ -151,7 +151,7 @@ static WRITE16_HANDLER( latch_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x21ffff) AM_RAM AM_BASE_MEMBER(arcadecl_state, bitmap)
AM_RANGE(0x3c0000, 0x3c07ff) AM_RAM_WRITE(atarigen_expanded_666_paletteram_w) AM_BASE_GENERIC(paletteram)
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index 140c2428e17..02f47256726 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -105,11 +105,11 @@ static WRITE8_DEVICE_HANDLER( 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 */
- memory_install_write_bank(device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1");
+ memory_install_write_bank(device->machine->device("maincpu")->memory().space(AS_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1");
else
/* overlay enabled, map Amiga system ROM on 0x000000 */
- memory_unmap_write(device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0);
+ memory_unmap_write(device->machine->device("maincpu")->memory().space(AS_PROGRAM), 0x000000, 0x07ffff, 0, 0);
/* bit 2 = Power Led on Amiga */
set_led_status(device->machine, 0, (data & 2) ? 0 : 1);
@@ -191,7 +191,7 @@ static void arcadia_reset_coins(running_machine *machine)
*
*************************************/
-static ADDRESS_MAP_START( amiga_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( amiga_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE_SIZE_MEMBER(arcadia_state, chip_ram, chip_ram_size)
AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w)
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index 304e96a3e79..faaf72990ff 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -179,7 +179,7 @@ static WRITE8_HANDLER( argus_bankselect_w )
***************************************************************************/
-static ADDRESS_MAP_START( argus_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( argus_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM")
@@ -203,7 +203,7 @@ static ADDRESS_MAP_START( argus_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( valtric_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( valtric_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM")
@@ -227,7 +227,7 @@ static ADDRESS_MAP_START( valtric_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( butasan_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( butasan_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM")
@@ -254,26 +254,26 @@ static ADDRESS_MAP_START( butasan_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf680, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map_a, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map_a, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map_b, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map_b, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
#if 0
-static ADDRESS_MAP_START( sound_portmap_1, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap_1, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
ADDRESS_MAP_END
#endif
-static ADDRESS_MAP_START( sound_portmap_2, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap_2, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w)
diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c
index dacefaea0fd..0e396a73e63 100644
--- a/src/mame/drivers/aristmk4.c
+++ b/src/mame/drivers/aristmk4.c
@@ -786,7 +786,7 @@ static READ8_HANDLER(mk4_printer_r)
return 0;
}
-static ADDRESS_MAP_START( aristmk4_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( aristmk4_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(aristmk4_state, mkiv_vram) // video ram - chips U49 / U50
AM_RANGE(0x0800, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1800) AM_DEVREADWRITE("crtc", mc6845_status_r, mc6845_address_w)
@@ -826,7 +826,7 @@ The U87 personality rom is not required, therefore game rom code mapping is from
*/
-static ADDRESS_MAP_START( aristmk4_poker_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( aristmk4_poker_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(aristmk4_state, mkiv_vram) // video ram - chips U49 / U50
AM_RANGE(0x0800, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1800) AM_DEVREADWRITE("crtc", mc6845_status_r, mc6845_address_w)
diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c
index 61b465aaa7e..04b57e1507c 100644
--- a/src/mame/drivers/aristmk5.c
+++ b/src/mame/drivers/aristmk5.c
@@ -189,7 +189,7 @@ static WRITE32_HANDLER( sram_banksel_w )
memory_set_bank(space->machine,"sram_bank", (data & 0xc0) >> 6);
}
-static ADDRESS_MAP_START( aristmk5_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( aristmk5_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x01ffffff) AM_READWRITE(archimedes_memc_logical_r, archimedes_memc_logical_w)
AM_RANGE(0x02000000, 0x02ffffff) AM_RAM AM_BASE(&archimedes_memc_physmem) /* physical RAM - 16 MB for now, should be 512k for the A310 */
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index e16ae9d0e29..6990ad3e334 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -563,7 +563,7 @@ DIP locations verified for:
/* Memory Maps */
-static ADDRESS_MAP_START( arkanoid_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( arkanoid_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("aysnd", ay8910_address_data_w)
@@ -578,7 +578,7 @@ static ADDRESS_MAP_START( arkanoid_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_READNOP /* fixes instant death in final level */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bootleg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bootleg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd000, 0xd000) AM_DEVWRITE("aysnd", ay8910_address_w)
@@ -593,7 +593,7 @@ static ADDRESS_MAP_START( bootleg_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_READNOP /* fixes instant death in final level */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hexa_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hexa_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_RAM
@@ -604,7 +604,7 @@ static ADDRESS_MAP_START( hexa_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(arkanoid_videoram_w) AM_BASE_SIZE_MEMBER(arkanoid_state, videoram, videoram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(arkanoid_68705_port_a_r, arkanoid_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_READ_PORT("MUX")
@@ -1446,10 +1446,10 @@ ROM_END
static void arkanoid_bootleg_init( running_machine *machine )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf000, 0xf000, 0, 0, arkanoid_bootleg_f000_r );
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf002, 0xf002, 0, 0, arkanoid_bootleg_f002_r );
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd018, 0xd018, 0, 0, arkanoid_bootleg_d018_w );
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd008, 0xd008, 0, 0, arkanoid_bootleg_d008_r );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf000, 0xf000, 0, 0, arkanoid_bootleg_f000_r );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf002, 0xf002, 0, 0, arkanoid_bootleg_f002_r );
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd018, 0xd018, 0, 0, arkanoid_bootleg_d018_w );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd008, 0xd008, 0, 0, arkanoid_bootleg_d008_r );
}
static DRIVER_INIT( arkangc )
@@ -1541,7 +1541,7 @@ static DRIVER_INIT( tetrsark )
ROM[x] = ROM[x] ^ 0x94;
}
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd008, 0xd008, 0, 0, tetrsark_d008_w );
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd008, 0xd008, 0, 0, tetrsark_d008_w );
}
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index c0cb21eedfb..5e0c9ac54d0 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -257,7 +257,7 @@ static WRITE16_HANDLER( legion_command_c )
*
*************************************/
-static ADDRESS_MAP_START( terraf_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( terraf_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x04ffff) AM_ROM
AM_RANGE(0x060000, 0x0603ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x060400, 0x063fff) AM_RAM
@@ -283,7 +283,7 @@ static ADDRESS_MAP_START( terraf_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* the same for now */
-static ADDRESS_MAP_START( terrafb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( terrafb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x04ffff) AM_ROM
AM_RANGE(0x060000, 0x0603ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x060400, 0x063fff) AM_RAM
@@ -308,7 +308,7 @@ static ADDRESS_MAP_START( terrafb_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0c0000, 0x0c0001) AM_WRITE(terraf_fg_scroll_msb_arm_w) /* written between two consecutive writes to 7c008 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kodure_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( kodure_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x061000, 0x063fff) AM_RAM
@@ -330,7 +330,7 @@ static ADDRESS_MAP_START( kodure_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffd000, 0xffd001) AM_WRITENOP /* ? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cclimbr2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cclimbr2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x061000, 0x063fff) AM_RAM
@@ -353,7 +353,7 @@ static ADDRESS_MAP_START( cclimbr2_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x07c00c, 0x07c00d) AM_WRITENOP /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( legion_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( legion_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x061000, 0x063fff) AM_RAM
@@ -376,7 +376,7 @@ static ADDRESS_MAP_START( legion_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x07c00c, 0x07c00d) AM_WRITENOP /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( legiono_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( legiono_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04003f) AM_WRITEONLY AM_BASE_MEMBER(armedf_state, legion_cmd)
AM_RANGE(0x040040, 0x05ffff) AM_ROM
@@ -401,7 +401,7 @@ static ADDRESS_MAP_START( legiono_map, ADDRESS_SPACE_PROGRAM, 16 )
//AM_RANGE(0x07c00c, 0x07c00d) AM_WRITENOP /* Watchdog ? cycle 0000 -> 0100 -> 0200 back to 0000 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( armedf_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( armedf_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x061000, 0x065fff) AM_RAM
@@ -424,26 +424,26 @@ static ADDRESS_MAP_START( armedf_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xf7ff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cclimbr2_soundmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cclimbr2_soundmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( terrafb_extraz80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( terrafb_extraz80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( terrafb_extraz80_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( terrafb_extraz80_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x0, 0x1) AM_DEVWRITE("ymsnd", ym3812_w)
AM_RANGE(0x2, 0x2) AM_DEVWRITE("dac1", dac_signed_w)
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index 1a939c400dd..ceaef5e2160 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -424,7 +424,7 @@ static WRITE16_HANDLER( protection_bit_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x220000, 0x23ffff) AM_RAM
AM_RANGE(0x240000, 0x240fff) AM_RAM AM_SHARE("nvram")
@@ -441,7 +441,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( stonebal_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( stonebal_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x27ffff) AM_RAM
AM_RANGE(0x280000, 0x280fff) AM_RAM AM_SHARE("nvram")
@@ -464,7 +464,7 @@ static READ16_HANDLER(unk_r)
return space->machine->rand();
}
-static ADDRESS_MAP_START( shtstar_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( shtstar_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x27ffff) AM_RAM
AM_RANGE(0x280000, 0x280fff) AM_RAM AM_SHARE("nvram")
@@ -505,7 +505,7 @@ static const tms34010_config tms_config =
};
-static ADDRESS_MAP_START( tms_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tms_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_BASE_MEMBER(artmagic_state, vram0)
AM_RANGE(0x00400000, 0x005fffff) AM_RAM AM_BASE_MEMBER(artmagic_state, vram1)
AM_RANGE(0x00800000, 0x0080007f) AM_READWRITE(artmagic_blitter_r, artmagic_blitter_w)
@@ -515,7 +515,7 @@ static ADDRESS_MAP_START( tms_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( stonebal_tms_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( stonebal_tms_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_BASE_MEMBER(artmagic_state, vram0)
AM_RANGE(0x00400000, 0x005fffff) AM_RAM AM_BASE_MEMBER(artmagic_state, vram1)
AM_RANGE(0x00800000, 0x0080007f) AM_READWRITE(artmagic_blitter_r, artmagic_blitter_w)
@@ -532,16 +532,16 @@ ADDRESS_MAP_END
*************************************/
/* see adp.c */
-static ADDRESS_MAP_START( shtstar_subcpu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( shtstar_subcpu_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0xffc000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shtstar_guncpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shtstar_guncpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shtstar_guncpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( shtstar_guncpu_io_map, AS_IO, 8 )
AM_RANGE(0xc000, 0xcfff) AM_RAM
ADDRESS_MAP_END
@@ -1172,7 +1172,7 @@ static DRIVER_INIT( ultennis )
state->protection_handler = ultennis_protection;
/* additional (protection?) hack */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x300000, 0x300001, 0, 0, ultennis_hack_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x300000, 0x300001, 0, 0, ultennis_hack_r);
}
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 945dedcbbbd..f907e7c4b83 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -96,7 +96,7 @@ static WRITE16_HANDLER( ashnojoe_soundlatch_w )
}
}
-static ADDRESS_MAP_START( ashnojoe_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ashnojoe_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x040000, 0x041fff) AM_RAM_WRITE(ashnojoe_tileram3_w) AM_BASE_MEMBER(ashnojoe_state, tileram_3)
AM_RANGE(0x042000, 0x043fff) AM_RAM_WRITE(ashnojoe_tileram4_w) AM_BASE_MEMBER(ashnojoe_state, tileram_4)
@@ -138,13 +138,13 @@ static READ8_HANDLER( sound_latch_status_r )
return state->soundlatch_status;
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank4")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x02, 0x02) AM_WRITE(adpcm_w)
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index a118636d7b3..2ba276af382 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -174,7 +174,7 @@ static WRITE16_HANDLER( protection_w )
}
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x107fff) AM_RAM
AM_RANGE(0x180000, 0x1807ff) AM_DEVREADWRITE("k053244", k053245_word_r, k053245_word_w)
@@ -197,7 +197,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x440000, 0x44003f) AM_DEVWRITE("k056832", k056832_word_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf801, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_status_port_r, ym2151_data_port_w)
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index 616f15e49f1..857bcb57064 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -234,7 +234,7 @@ static WRITE8_HANDLER( llander_led_w )
*
*************************************/
-static ADDRESS_MAP_START( asteroid_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( asteroid_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x02ff) AM_RAMBANK("bank1") AM_BASE_MEMBER(asteroid_state, ram1)
@@ -255,7 +255,7 @@ static ADDRESS_MAP_START( asteroid_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( astdelux_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( astdelux_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x02ff) AM_RAMBANK("bank1") AM_BASE_MEMBER(asteroid_state, ram1)
@@ -281,7 +281,7 @@ static ADDRESS_MAP_START( astdelux_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( llander_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( llander_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_MIRROR(0x1f00)
AM_RANGE(0x2000, 0x2000) AM_READ_PORT("IN0")
@@ -921,14 +921,14 @@ ROM_END
static DRIVER_INIT( asteroidb )
{
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x2000, 0, 0, "IN0");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2003, 0x2003, 0, 0, "HS");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2000, 0x2000, 0, 0, "IN0");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2003, 0x2003, 0, 0, "HS");
}
static DRIVER_INIT( asterock )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x2007, 0, 0, asterock_IN0_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2000, 0x2007, 0, 0, asterock_IN0_r);
}
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index 77cd8e1b1c4..8ea7ca741d8 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -394,7 +394,7 @@ static WRITE8_HANDLER( spaceint_sound2_w )
*
*************************************/
-static ADDRESS_MAP_START( kamikaze_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kamikaze_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x1bff) AM_ROM
AM_RANGE(0x1c00, 0x1fff) AM_RAM
@@ -402,20 +402,20 @@ static ADDRESS_MAP_START( kamikaze_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spaceint_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spaceint_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x4000, 0x5fff) AM_RAM_WRITE(spaceint_videoram_w) AM_BASE_SIZE_MEMBER(astinvad_state, videoram, videoram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kamikaze_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kamikaze_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xff) AM_READWRITE(kamikaze_ppi_r, kamikaze_ppi_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spaceint_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spaceint_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index b0510446920..5e47be9ced6 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -425,7 +425,7 @@ static WRITE8_HANDLER( profpac_banksw_w )
int bank = (data >> 5) & 3;
/* this is accessed from I/O space but modifies program space, so we normalize here */
- space = space->cpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ space = space->cpu->memory().space(AS_PROGRAM);
/* remember the banking bits for save state support */
profpac_bank = data;
@@ -458,7 +458,7 @@ static WRITE8_HANDLER( profpac_banksw_w )
static STATE_POSTLOAD( profbank_banksw_restore )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *space = machine->device("maincpu")->memory().space(AS_IO);
profpac_banksw_w(space, 0, profpac_bank);
}
@@ -583,7 +583,7 @@ static WRITE8_HANDLER( tenpindx_lights_w )
*
*************************************/
-static ADDRESS_MAP_START( seawolf2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( seawolf2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE_MEMBER(astrocde_state, videoram)
@@ -591,14 +591,14 @@ static ADDRESS_MAP_START( seawolf2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ebases_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ebases_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE_MEMBER(astrocde_state, videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spacezap_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spacezap_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE_MEMBER(astrocde_state, videoram)
@@ -607,7 +607,7 @@ static ADDRESS_MAP_START( spacezap_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wow_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wow_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE_MEMBER(astrocde_state, videoram)
@@ -617,7 +617,7 @@ static ADDRESS_MAP_START( wow_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( robby_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( robby_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE_MEMBER(astrocde_state, videoram)
@@ -628,7 +628,7 @@ static ADDRESS_MAP_START( robby_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( profpac_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( profpac_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
AM_RANGE(0x4000, 0x7fff) AM_READWRITE(profpac_videoram_r, profpac_videoram_w)
@@ -640,7 +640,7 @@ static ADDRESS_MAP_START( profpac_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( demndrgn_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( demndrgn_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x0000, 0x3fff) AM_WRITE(astrocade_funcgen_w)
AM_RANGE(0x4000, 0x7fff) AM_READWRITE(profpac_videoram_r, profpac_videoram_w)
@@ -651,7 +651,7 @@ static ADDRESS_MAP_START( demndrgn_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tenpin_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tenpin_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
@@ -665,19 +665,19 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map, AS_IO, 8 )
AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( port_map_mono_pattern, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map_mono_pattern, AS_IO, 8 )
AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w)
AM_RANGE(0xa55b, 0xa55b) AM_WRITE(protected_ram_enable_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( port_map_stereo_pattern, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map_stereo_pattern, AS_IO, 8 )
AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
AM_RANGE(0x0050, 0x0058) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_DEVWRITE("astrocade2", astrocade_sound_w)
AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w)
@@ -685,7 +685,7 @@ static ADDRESS_MAP_START( port_map_stereo_pattern, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( port_map_16col_pattern, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map_16col_pattern, AS_IO, 8 )
AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
AM_RANGE(0x0050, 0x0058) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_DEVWRITE("astrocade2", astrocade_sound_w)
AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w)
@@ -697,7 +697,7 @@ static ADDRESS_MAP_START( port_map_16col_pattern, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( port_map_16col_pattern_nosound, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map_16col_pattern_nosound, AS_IO, 8 )
AM_RANGE(0x0000, 0x0019) AM_MIRROR(0xff00) AM_MASK(0xffff) AM_READWRITE(astrocade_data_chip_register_r, astrocade_data_chip_register_w)
AM_RANGE(0x0078, 0x007e) AM_MIRROR(0xff00) AM_WRITE(astrocade_pattern_board_w)
AM_RANGE(0x00bf, 0x00bf) AM_MIRROR(0xff00) AM_WRITE(profpac_page_select_w)
@@ -708,7 +708,7 @@ static ADDRESS_MAP_START( port_map_16col_pattern_nosound, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tenpin_sub_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tenpin_sub_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x90, 0x93) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w)
AM_RANGE(0x97, 0x97) AM_READ(soundlatch_r)
@@ -1729,54 +1729,54 @@ ROM_END
static DRIVER_INIT( seawolf2 )
{
astrocade_video_config = 0x00;
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x40, 0x40, 0, 0xff18, seawolf2_sound_1_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x41, 0x41, 0, 0xff18, seawolf2_sound_2_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x42, 0x43, 0, 0xff18, seawolf2_lamps_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x40, 0x40, 0, 0xff18, seawolf2_sound_1_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x41, 0x41, 0, 0xff18, seawolf2_sound_2_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x42, 0x43, 0, 0xff18, seawolf2_lamps_w);
}
static DRIVER_INIT( ebases )
{
astrocade_video_config = AC_SOUND_PRESENT;
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x20, 0x20, 0, 0xff07, ebases_coin_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x28, 0x28, 0, 0xff07, ebases_trackball_select_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x20, 0x20, 0, 0xff07, ebases_coin_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x28, 0x28, 0, 0xff07, ebases_trackball_select_w);
}
static DRIVER_INIT( spacezap )
{
astrocade_video_config = AC_SOUND_PRESENT | AC_MONITOR_BW;
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x13, 0x13, 0x03ff, 0xff00, spacezap_io_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x13, 0x13, 0x03ff, 0xff00, spacezap_io_r);
}
static DRIVER_INIT( wow )
{
astrocade_video_config = AC_SOUND_PRESENT | AC_LIGHTPEN_INTS | AC_STARS;
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x15, 0x15, 0x0fff, 0xff00, wow_io_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x17, 0x17, 0xffff, 0xff00, wow_speech_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x15, 0x15, 0x0fff, 0xff00, wow_io_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x17, 0x17, 0xffff, 0xff00, wow_speech_r);
}
static DRIVER_INIT( gorf )
{
astrocade_video_config = AC_SOUND_PRESENT | AC_LIGHTPEN_INTS | AC_STARS;
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x15, 0x15, 0x0fff, 0xff00, gorf_io_1_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x16, 0x16, 0x0fff, 0xff00, gorf_io_2_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x17, 0x17, 0xffff, 0xff00, gorf_speech_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x15, 0x15, 0x0fff, 0xff00, gorf_io_1_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x16, 0x16, 0x0fff, 0xff00, gorf_io_2_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x17, 0x17, 0xffff, 0xff00, gorf_speech_r);
}
static DRIVER_INIT( robby )
{
astrocade_video_config = AC_SOUND_PRESENT;
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x15, 0x15, 0x0fff, 0xff00, robby_io_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x15, 0x15, 0x0fff, 0xff00, robby_io_r);
}
static DRIVER_INIT( profpac )
{
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *iospace = machine->device("maincpu")->memory().space(AS_IO);
astrocade_video_config = AC_SOUND_PRESENT;
memory_install_read8_handler(iospace, 0x14, 0x14, 0x0fff, 0xff00, profpac_io_1_r);
@@ -1790,7 +1790,7 @@ static DRIVER_INIT( profpac )
static DRIVER_INIT( demndrgn )
{
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *iospace = machine->device("maincpu")->memory().space(AS_IO);
astrocade_video_config = 0x00;
memory_install_read8_handler(iospace, 0x14, 0x14, 0x1fff, 0xff00, demndrgn_io_r);
@@ -1806,7 +1806,7 @@ static DRIVER_INIT( demndrgn )
static DRIVER_INIT( tenpindx )
{
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *iospace = machine->device("maincpu")->memory().space(AS_IO);
astrocade_video_config = 0x00;
memory_install_read_port(iospace, 0x60, 0x60, 0x0000, 0xff00, "P60");
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index 16df1fc2ae2..df79c961569 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -283,7 +283,7 @@ static WRITE16_HANDLER( astrocorp_palette_w )
);
}
-static ADDRESS_MAP_START( showhand_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( showhand_map, AS_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x01ffff ) AM_ROM
AM_RANGE( 0x050000, 0x050fff ) AM_RAM AM_BASE_SIZE_MEMBER(astrocorp_state, spriteram, spriteram_size)
AM_RANGE( 0x052000, 0x052001 ) AM_WRITE(astrocorp_draw_sprites_w)
@@ -298,7 +298,7 @@ static ADDRESS_MAP_START( showhand_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x0d0000, 0x0d0001 ) AM_READ(astrocorp_unk_r) AM_DEVWRITE8_MODERN("oki", okim6295_device, write, 0xff00)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( showhanc_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( showhanc_map, AS_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x01ffff ) AM_ROM
AM_RANGE( 0x060000, 0x0601ff ) AM_RAM_WRITE(astrocorp_palette_w) AM_BASE_MEMBER(astrocorp_state, paletteram)
AM_RANGE( 0x070000, 0x070001 ) AM_DEVWRITE("oki", astrocorp_sound_bank_w)
@@ -313,7 +313,7 @@ static ADDRESS_MAP_START( showhanc_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x0e0000, 0x0e0001 ) AM_READ(astrocorp_unk_r) AM_DEVWRITE8_MODERN("oki", okim6295_device, write, 0xff00)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( skilldrp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( skilldrp_map, AS_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x03ffff ) AM_ROM
AM_RANGE( 0x200000, 0x200fff ) AM_RAM AM_BASE_SIZE_MEMBER(astrocorp_state, spriteram, spriteram_size)
AM_RANGE( 0x202000, 0x202001 ) AM_WRITE(astrocorp_draw_sprites_w)
@@ -328,7 +328,7 @@ static ADDRESS_MAP_START( skilldrp_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x600000, 0x600001 ) AM_DEVREADWRITE8_MODERN("oki", okim6295_device, read, write, 0x00ff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( speeddrp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( speeddrp_map, AS_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x01ffff ) AM_ROM
AM_RANGE( 0x280000, 0x283fff ) AM_RAM AM_SHARE("nvram") // battery
AM_RANGE( 0x380000, 0x380fff ) AM_RAM AM_BASE_SIZE_MEMBER(astrocorp_state, spriteram, spriteram_size)
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index 4e50bbf6c6a..4b825b751c0 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -584,7 +584,7 @@ static MACHINE_RESET( abattle )
*
*************************************/
-static ADDRESS_MAP_START( astrof_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( astrof_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM
AM_RANGE(0x2000, 0x3fff) AM_NOP
AM_RANGE(0x4000, 0x5fff) AM_RAM_WRITE(astrof_videoram_w) AM_BASE_SIZE_MEMBER(astrof_state, videoram, videoram_size)
@@ -603,7 +603,7 @@ static ADDRESS_MAP_START( astrof_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spfghmk2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spfghmk2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM
AM_RANGE(0x2000, 0x3fff) AM_NOP
AM_RANGE(0x4000, 0x5fff) AM_RAM_WRITE(astrof_videoram_w) AM_BASE_SIZE_MEMBER(astrof_state, videoram, videoram_size)
@@ -622,7 +622,7 @@ static ADDRESS_MAP_START( spfghmk2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tomahawk_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tomahawk_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM
AM_RANGE(0x2000, 0x3fff) AM_NOP
AM_RANGE(0x4000, 0x5fff) AM_RAM_WRITE(tomahawk_videoram_w) AM_BASE_SIZE_MEMBER(astrof_state, videoram, videoram_size)
@@ -1308,8 +1308,8 @@ static DRIVER_INIT( abattle )
rom[i] = prom[rom[i]];
/* set up protection handlers */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa003, 0xa003, 0, 0, shoot_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa004, 0xa004, 0, 0, abattle_coin_prot_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa003, 0xa003, 0, 0, shoot_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa004, 0xa004, 0, 0, abattle_coin_prot_r);
}
@@ -1322,8 +1322,8 @@ static DRIVER_INIT( afire )
rom[i] = ~rom[i];
/* set up protection handlers */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa003, 0xa003, 0, 0, shoot_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa004, 0xa004, 0, 0, afire_coin_prot_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa003, 0xa003, 0, 0, shoot_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa004, 0xa004, 0, 0, afire_coin_prot_r);
}
@@ -1336,8 +1336,8 @@ static DRIVER_INIT( sstarbtl )
rom[i] = ~rom[i];
/* set up protection handlers */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa003, 0xa003, 0, 0, shoot_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa004, 0xa004, 0, 0, abattle_coin_prot_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa003, 0xa003, 0, 0, shoot_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa004, 0xa004, 0, 0, abattle_coin_prot_r);
}
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index 81d750a2497..bafa45db5e2 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -311,7 +311,7 @@ static WRITE16_HANDLER( cadash_share_w )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( bonzeadv_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bonzeadv_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x0fffff) AM_ROM
AM_RANGE(0x10c000, 0x10ffff) AM_RAM
@@ -331,7 +331,7 @@ static ADDRESS_MAP_START( bonzeadv_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE("pc090oj", pc090oj_word_r, pc090oj_word_w) /* sprite ram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( asuka_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( asuka_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x1076f0, 0x1076f1) AM_READNOP /* Mofflott init does dummy reads here */
@@ -346,7 +346,7 @@ static ADDRESS_MAP_START( asuka_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE("pc090oj", pc090oj_word_r, pc090oj_word_w) /* sprite ram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cadash_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cadash_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080003) AM_WRITE(asuka_spritectrl_w)
AM_RANGE(0x0c0000, 0x0c0001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0x00ff)
@@ -360,7 +360,7 @@ static ADDRESS_MAP_START( cadash_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc20000, 0xc2000f) AM_DEVREADWRITE("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( eto_map, ADDRESS_SPACE_PROGRAM, 16 ) /* N.B. tc100scn mirror overlaps spriteram */
+static ADDRESS_MAP_START( eto_map, AS_PROGRAM, 16 ) /* N.B. tc100scn mirror overlaps spriteram */
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10000f) AM_DEVREADWRITE("tc0110pcr", tc0110pcr_word_r, tc0110pcr_step1_word_w)
AM_RANGE(0x200000, 0x203fff) AM_RAM
@@ -378,7 +378,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( bonzeadv_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bonzeadv_z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM
@@ -392,7 +392,7 @@ static ADDRESS_MAP_START( bonzeadv_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x8fff) AM_RAM
@@ -406,7 +406,7 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* no MSM5205 */
-static ADDRESS_MAP_START( cadash_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cadash_z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x8fff) AM_RAM
@@ -431,12 +431,12 @@ communicates with m68k S with its own shared ram. In short:
m68k M -> z180 M <-> z180 S <- m68k S
*/
-static ADDRESS_MAP_START( cadash_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cadash_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&cadash_shared_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cadash_sub_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cadash_sub_io, AS_IO, 8 )
AM_RANGE(0x00, 0x3f) AM_RAM // z180 internal I/O regs
ADDRESS_MAP_END
diff --git a/src/mame/drivers/atari_s1.c b/src/mame/drivers/atari_s1.c
index f991f2b36d2..b121d331667 100644
--- a/src/mame/drivers/atari_s1.c
+++ b/src/mame/drivers/atari_s1.c
@@ -12,7 +12,7 @@ public:
: driver_device(machine, config) { }
};
-static ADDRESS_MAP_START( atari_s1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( atari_s1_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
diff --git a/src/mame/drivers/atari_s2.c b/src/mame/drivers/atari_s2.c
index dd31eb4b9d7..ec93daf79a1 100644
--- a/src/mame/drivers/atari_s2.c
+++ b/src/mame/drivers/atari_s2.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( atari_s2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( atari_s2_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0700) AM_RAM
diff --git a/src/mame/drivers/atari_s3.c b/src/mame/drivers/atari_s3.c
index 0b972f74a0c..438665ccc5c 100644
--- a/src/mame/drivers/atari_s3.c
+++ b/src/mame/drivers/atari_s3.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( atari_s3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( atari_s3_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0700) AM_RAM
diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c
index c9eae096a6c..742f3eb7889 100644
--- a/src/mame/drivers/atarifb.c
+++ b/src/mame/drivers/atarifb.c
@@ -147,7 +147,7 @@ static PALETTE_INIT( atarifb )
*
*************************************/
-static ADDRESS_MAP_START( atarifb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( atarifb_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x025f) AM_RAM_WRITE(atarifb_alpha1_videoram_w) AM_BASE_MEMBER(atarifb_state, alphap1_videoram)
@@ -167,7 +167,7 @@ static ADDRESS_MAP_START( atarifb_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( atarifb4_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( atarifb4_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x025f) AM_RAM_WRITE(atarifb_alpha1_videoram_w) AM_BASE_MEMBER(atarifb_state, alphap1_videoram)
@@ -188,7 +188,7 @@ static ADDRESS_MAP_START( atarifb4_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( abaseb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( abaseb_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x025f) AM_RAM_WRITE(atarifb_alpha1_videoram_w) AM_BASE_MEMBER(atarifb_state, alphap1_videoram)
@@ -208,7 +208,7 @@ static ADDRESS_MAP_START( abaseb_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( soccer_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( soccer_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x025f) AM_RAM_WRITE(atarifb_alpha1_videoram_w) AM_BASE_MEMBER(atarifb_state, alphap1_videoram)
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index 5dd6f234269..192641791a5 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -192,7 +192,7 @@ static void pitfightb_cheap_slapstic_init(running_machine *machine)
atarig1_state *state = machine->driver_data<atarig1_state>();
/* install a read handler */
- state->bslapstic_base = memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x038000, 0x03ffff, 0, 0, pitfightb_cheap_slapstic_r);
+ state->bslapstic_base = memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x038000, 0x03ffff, 0, 0, pitfightb_cheap_slapstic_r);
/* allocate memory for a copy of bank 0 */
state->bslapstic_bank0 = auto_alloc_array(machine, UINT8, 0x2000);
@@ -210,7 +210,7 @@ static void pitfightb_cheap_slapstic_init(running_machine *machine)
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x037fff) AM_ROM
AM_RANGE(0x038000, 0x03ffff) AM_ROM /* pitfight slapstic goes here */
AM_RANGE(0x040000, 0x077fff) AM_ROM
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index b494edcbd49..cc172ddfd91 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -348,7 +348,7 @@ static WRITE16_HANDLER( guardians_sloop_data_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x080001) AM_ROM
AM_RANGE(0xe00000, 0xe00001) AM_READ_PORT("IN0")
AM_RANGE(0xe00002, 0xe00003) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index 3ed8e517f94..c5d012cd159 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -81,7 +81,7 @@ static MACHINE_RESET( atarigt )
static void cage_irq_callback(running_machine *machine, int reason)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
if (reason)
atarigen_sound_int_gen(machine->device("maincpu"));
@@ -603,7 +603,7 @@ static WRITE32_HANDLER( colorram_protection_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0xc00000, 0xc00003) AM_READWRITE(sound_data_r, sound_data_w)
AM_RANGE(0xd00014, 0xd00017) AM_READ(analog_port0_r)
@@ -1282,7 +1282,7 @@ static DRIVER_INIT( tmek )
state->protection_w = tmek_protection_w;
/* temp hack */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd72000, 0xd75fff, 0, 0, tmek_pf_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd72000, 0xd75fff, 0, 0, tmek_pf_w);
}
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index ee85740a0b7..404e770579e 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -1149,7 +1149,7 @@ static READ32_HANDLER( atarigx2_protection_r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0xc80000, 0xc80fff) AM_RAM
@@ -2246,7 +2246,7 @@ static DRIVER_INIT( rrreveng )
state->playfield_base = 0x000;
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xca0fc0, 0xca0fc3, 0, 0, rrreveng_prot_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xca0fc0, 0xca0fc3, 0, 0, rrreveng_prot_r);
}
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index e97166e05d5..05f3e4fc7ff 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -467,7 +467,7 @@ static WRITE8_HANDLER( led_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x087fff) AM_ROM /* slapstic maps here */
AM_RANGE(0x2e0000, 0x2e0001) AM_READ(atarisy1_int3state_r)
@@ -501,7 +501,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE_MODERN("via6522_0", via6522_device, read, write)
AM_RANGE(0x1800, 0x1801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index d1383127358..6117c0fed48 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -346,7 +346,7 @@ static WRITE16_HANDLER( bankselect_w )
static STATE_POSTLOAD( bankselect_postload )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
atarisy2_state *state = machine->driver_data<atarisy2_state>();
bankselect_w(space, 0, state->bankselect[0], 0xffff);
@@ -799,7 +799,7 @@ static WRITE8_HANDLER( coincount_w )
*************************************/
/* full memory map derived from schematics */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x11ff) AM_MIRROR(0x0200) AM_RAM_WRITE(atarisy2_paletteram_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x1400, 0x1403) AM_MIRROR(0x007c) AM_READWRITE(adc_r, bankselect_w) AM_BASE_MEMBER(atarisy2_state, bankselect)
@@ -830,7 +830,7 @@ ADDRESS_MAP_END
*************************************/
/* full memory map derived from schematics */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x2000) AM_RAM
AM_RANGE(0x1000, 0x17ff) AM_MIRROR(0x2000) AM_RAM AM_SHARE("eeprom")
AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x2780) AM_DEVREADWRITE("pokey1", pokey_r, pokey_w)
diff --git a/src/mame/drivers/atarisy4.c b/src/mame/drivers/atarisy4.c
index 6c8ccdf9856..274330bb287 100644
--- a/src/mame/drivers/atarisy4.c
+++ b/src/mame/drivers/atarisy4.c
@@ -626,7 +626,7 @@ static WRITE16_HANDLER( dsp1_bank_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_BASE_MEMBER(atarisy4_state, m68k_ram)
AM_RANGE(0x010000, 0x01ffff) AM_RAM
AM_RANGE(0x580000, 0x580001) AM_READ_PORT("JOYSTICK")
@@ -647,13 +647,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( dsp0_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dsp0_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfff)
AM_RANGE(0x0000, 0x07ff) AM_RAMBANK("dsp0_bank0")
AM_RANGE(0x0800, 0x0fff) AM_RAMBANK("dsp0_bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dsp0_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( dsp0_io_map, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_WRITE(dsp0_bank_w)
AM_RANGE(TMS32010_BIO, TMS32010_BIO) AM_READ(dsp0_bio_r)
ADDRESS_MAP_END
@@ -665,13 +665,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( dsp1_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dsp1_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfff)
AM_RANGE(0x0000, 0x07ff) AM_RAMBANK("dsp1_bank0")
AM_RANGE(0x0800, 0x0fff) AM_RAMBANK("dsp1_bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dsp1_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( dsp1_io_map, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_WRITE(dsp1_bank_w)
AM_RANGE(TMS32010_BIO, TMS32010_BIO) AM_READ(dsp1_bio_r)
ADDRESS_MAP_END
@@ -962,7 +962,7 @@ next_line:
static DRIVER_INIT( laststar )
{
atarisy4_state *state = machine->driver_data<atarisy4_state>();
- address_space *main = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *main = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* Allocate 16kB of shared RAM */
state->shared_ram[0] = auto_alloc_array_clear(machine, UINT16, 0x2000);
@@ -974,7 +974,7 @@ static DRIVER_INIT( laststar )
/* Set up the DSP */
memory_set_bankptr(machine, "dsp0_bank0", state->shared_ram[0]);
memory_set_bankptr(machine, "dsp0_bank1", &state->shared_ram[0][0x800]);
- load_ldafile(machine->device("dsp0")->memory().space(ADDRESS_SPACE_PROGRAM), machine->region("dsp")->base());
+ load_ldafile(machine->device("dsp0")->memory().space(AS_PROGRAM), machine->region("dsp")->base());
}
static DRIVER_INIT( airrace )
@@ -985,17 +985,17 @@ static DRIVER_INIT( airrace )
state->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(ADDRESS_SPACE_PROGRAM), machine->region("code")->base());
+ load_hexfile(machine->device("maincpu")->memory().space(AS_PROGRAM), machine->region("code")->base());
/* Set up the first DSP */
memory_set_bankptr(machine, "dsp0_bank0", state->shared_ram[0]);
memory_set_bankptr(machine, "dsp0_bank1", &state->shared_ram[0][0x800]);
- load_ldafile(machine->device("dsp0")->memory().space(ADDRESS_SPACE_PROGRAM), machine->region("dsp")->base());
+ load_ldafile(machine->device("dsp0")->memory().space(AS_PROGRAM), machine->region("dsp")->base());
/* Set up the second DSP */
memory_set_bankptr(machine, "dsp1_bank0", state->shared_ram[1]);
memory_set_bankptr(machine, "dsp1_bank1", &state->shared_ram[1][0x800]);
- load_ldafile(machine->device("dsp1")->memory().space(ADDRESS_SPACE_PROGRAM), machine->region("dsp")->base());
+ load_ldafile(machine->device("dsp1")->memory().space(AS_PROGRAM), machine->region("dsp")->base());
}
static MACHINE_RESET( atarisy4 )
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index cb4ccb5b8bb..2f807511f5d 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -45,7 +45,7 @@
*
*************************************/
-static ADDRESS_MAP_START( master_map_program, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( master_map_program, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank2") AM_WRITE(ataxx_battery_ram_w) AM_SHARE("battery")
@@ -54,7 +54,7 @@ static ADDRESS_MAP_START( master_map_program, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_map_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( master_map_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x04, 0x04) AM_DEVREAD("custom", leland_80186_response_r)
AM_RANGE(0x05, 0x05) AM_DEVWRITE("custom", leland_80186_command_hi_w)
@@ -74,7 +74,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( slave_map_program, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_map_program, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x9fff) AM_ROMBANK("bank3")
AM_RANGE(0xa000, 0xdfff) AM_ROM
@@ -85,7 +85,7 @@ static ADDRESS_MAP_START( slave_map_program, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( slave_map_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x60, 0x7f) AM_READWRITE(ataxx_svram_port_r, ataxx_svram_port_w)
ADDRESS_MAP_END
@@ -711,7 +711,7 @@ static DRIVER_INIT( ataxx )
leland_rotate_memory(machine, "slave");
/* set up additional input ports */
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x00, 0x03, 0, 0, ataxx_trackball_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0x00, 0x03, 0, 0, ataxx_trackball_r);
}
@@ -721,7 +721,7 @@ static DRIVER_INIT( ataxxj )
leland_rotate_memory(machine, "slave");
/* set up additional input ports */
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x00, 0x03, 0, 0, ataxx_trackball_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0x00, 0x03, 0, 0, ataxx_trackball_r);
}
@@ -731,9 +731,9 @@ static DRIVER_INIT( wsf )
leland_rotate_memory(machine, "slave");
/* set up additional input ports */
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P1_P2");
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x0e, 0x0e, 0, 0, "P3_P4");
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, "BUTTONS");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x0d, 0x0d, 0, 0, "P1_P2");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x0e, 0x0e, 0, 0, "P3_P4");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x0f, 0x0f, 0, 0, "BUTTONS");
}
@@ -743,14 +743,14 @@ static DRIVER_INIT( indyheat )
leland_rotate_memory(machine, "slave");
/* set up additional input ports */
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x00, 0x02, 0, 0, indyheat_wheel_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x08, 0x0b, 0, 0, indyheat_analog_r);
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P1");
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x0e, 0x0e, 0, 0, "P2");
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, "P3");
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0x00, 0x02, 0, 0, indyheat_wheel_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0x08, 0x0b, 0, 0, indyheat_analog_r);
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x0d, 0x0d, 0, 0, "P1");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x0e, 0x0e, 0, 0, "P2");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x0f, 0x0f, 0, 0, "P3");
/* set up additional output ports */
- memory_install_write8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x08, 0x0b, 0, 0, indyheat_analog_w);
+ memory_install_write8_handler(machine->device("master")->memory().space(AS_IO), 0x08, 0x0b, 0, 0, indyheat_analog_w);
}
@@ -760,9 +760,9 @@ static DRIVER_INIT( brutforc )
leland_rotate_memory(machine, "slave");
/* set up additional input ports */
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P2");
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x0e, 0x0e, 0, 0, "P1");
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, "P3");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x0d, 0x0d, 0, 0, "P2");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x0e, 0x0e, 0, 0, "P1");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x0f, 0x0f, 0, 0, "P3");
}
@@ -772,12 +772,12 @@ static DRIVER_INIT( asylum )
leland_rotate_memory(machine, "slave");
/* asylum appears to have some extra RAM for the slave CPU */
- memory_install_ram(machine->device("slave")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf000, 0xfffb, 0, 0, NULL);
+ memory_install_ram(machine->device("slave")->memory().space(AS_PROGRAM), 0xf000, 0xfffb, 0, 0, NULL);
/* set up additional input ports */
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x0d, 0x0d, 0, 0, "P2");
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x0e, 0x0e, 0, 0, "P1");
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, "P3");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x0d, 0x0d, 0, 0, "P2");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x0e, 0x0e, 0, 0, "P1");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x0f, 0x0f, 0, 0, "P3");
}
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index 4f1a8cc50d0..926142d8efd 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -207,7 +207,7 @@ static WRITE8_HANDLER( nvram_enable_w )
*************************************/
/* full address map derived from schematics */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(atetris_videoram_w) AM_BASE_MEMBER(atetris_state, videoram)
AM_RANGE(0x2000, 0x20ff) AM_MIRROR(0x0300) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_BASE_GENERIC(paletteram)
@@ -224,7 +224,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( atetrisb2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( atetrisb2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(atetris_videoram_w) AM_BASE_MEMBER(atetris_state, videoram)
AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_BASE_GENERIC(paletteram)
diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c
index 72b9ce746e0..d07a991fbfb 100644
--- a/src/mame/drivers/attckufo.c
+++ b/src/mame/drivers/attckufo.c
@@ -117,7 +117,7 @@ static WRITE8_HANDLER(attckufo_io_w)
*/
}
-static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE_MEMBER(attckufo_state, mainram)
AM_RANGE(0x1000, 0x100f) AM_DEVREADWRITE("mos6560", mos6560_port_r, mos6560_port_w)
diff --git a/src/mame/drivers/atvtrack.c b/src/mame/drivers/atvtrack.c
index 52009197b47..6f9ef5dd076 100644
--- a/src/mame/drivers/atvtrack.c
+++ b/src/mame/drivers/atvtrack.c
@@ -78,11 +78,11 @@ SCREEN_UPDATE(atvtrack)
return 0;
}
-static ADDRESS_MAP_START( atvtrack_map, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( atvtrack_map, AS_PROGRAM, 64 )
AM_RANGE(0x00000000, 0x001fffff) AM_ROM AM_REGION("maincpu", 0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( atvtrack_port, ADDRESS_SPACE_IO, 64 )
+static ADDRESS_MAP_START( atvtrack_port, AS_IO, 64 )
ADDRESS_MAP_END
diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c
index 35a21ff7a59..2c8b087afe7 100644
--- a/src/mame/drivers/avalnche.c
+++ b/src/mame/drivers/avalnche.c
@@ -111,7 +111,7 @@ static WRITE8_HANDLER( avalance_start_lamp_w )
set_led_status(space->machine, 2, data & 1);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_SIZE_MEMBER(avalnche_state, videoram, videoram_size)
AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0ffc) AM_READ_PORT("IN0")
@@ -129,7 +129,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0x7fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( catch_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( catch_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_SIZE_MEMBER(avalnche_state, videoram, videoram_size)
AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0ffc) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/avt.c b/src/mame/drivers/avt.c
index cf38bcd1ba0..ad8b77ed4b3 100644
--- a/src/mame/drivers/avt.c
+++ b/src/mame/drivers/avt.c
@@ -545,7 +545,7 @@ static PALETTE_INIT( avt )
*********************************************/
/* avtnfl, avtbingo */
-static ADDRESS_MAP_START( avt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( avt_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0x9fff) AM_RAM // AM_SHARE("nvram")
@@ -553,7 +553,7 @@ static ADDRESS_MAP_START( avt_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(avt_colorram_w) AM_BASE_MEMBER(avt_state, colorram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( avt_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( avt_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// AM_RANGE(0x00, 0x03) unk, maybe IO
// AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 6a9f5fcac61..43d1f306433 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -76,7 +76,7 @@ static READ16_HANDLER( joystick_r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00bfff) AM_ROM
AM_RANGE(0x022000, 0x0220ff) AM_READ(nvram_r) AM_WRITEONLY AM_SHARE("nvram")
AM_RANGE(0x027000, 0x027001) AM_READ(joystick_r)
@@ -97,7 +97,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8800) AM_READ(aztarac_snd_command_r)
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 5fbd5320a91..a86a02688cd 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -248,7 +248,7 @@ static WRITE32_HANDLER( backfire_spriteram2_w )
-static ADDRESS_MAP_START( backfire_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( backfire_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10001f) AM_DEVREADWRITE("tilegen1", deco16ic_pf_control_dword_r, deco16ic_pf_control_dword_w)
AM_RANGE(0x110000, 0x111fff) AM_DEVREADWRITE("tilegen1", deco16ic_pf1_data_dword_r, deco16ic_pf1_data_dword_w)
@@ -685,7 +685,7 @@ static DRIVER_INIT( backfire )
deco156_decrypt(machine);
machine->device("maincpu")->set_clock_scale(4.0f); /* core timings aren't accurate */
descramble_sound(machine);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0170018, 0x017001b, 0, 0, backfire_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0170018, 0x017001b, 0, 0, backfire_speedup_r );
}
GAME( 1995, backfire, 0, backfire, backfire, 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 50bf06b0069..fce8e50410c 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -186,7 +186,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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = screen.machine->device("audiocpu")->memory().space(AS_PROGRAM);
/* sound IRQ is on 32V */
if (scanline & 32)
@@ -381,7 +381,7 @@ static WRITE8_HANDLER( audio_io_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0xfc0000, 0xfc1fff) AM_READWRITE(sound_busy_r, atarigen_sound_reset_w)
AM_RANGE(0xfd0000, 0xfd1fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_SHARE("eeprom")
@@ -410,7 +410,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x2800, 0x2bff) AM_READWRITE(audio_io_r, audio_io_w)
@@ -638,7 +638,7 @@ static READ16_HANDLER( badlandsb_unk_r )
return 0xffff;
}
-static ADDRESS_MAP_START( bootleg_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bootleg_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index 18b947fde77..ed3b81b8991 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -70,7 +70,7 @@ DIP locations verified for:
static WRITE8_DEVICE_HANDLER( bagman_ls259_w )
{
bagman_state *state = device->machine->driver_data<bagman_state>();
- address_space *space = device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device("maincpu")->memory().space(AS_PROGRAM);
bagman_pal16r6_w(space, offset,data); /*this is just a simulation*/
if (state->ls259_buf[offset] != (data&1) )
@@ -110,7 +110,7 @@ static WRITE8_DEVICE_HANDLER( bagman_interrupt_w )
cpu_interrupt_enable(device, data);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(bagman_videoram_w) AM_BASE_MEMBER(bagman_state, videoram)
@@ -139,7 +139,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( pickin_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pickin_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x7000, 0x77ff) AM_RAM
AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(bagman_videoram_w) AM_BASE_MEMBER(bagman_state, videoram)
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( pickin_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xb800) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x08, 0x09) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x0c, 0x0c) AM_DEVREAD("aysnd", ay8910_r)
@@ -934,7 +934,7 @@ static DRIVER_INIT( bagman )
/* Unmap video enable register, not available on earlier hardware revision(s)
Bagman is supposed to have glitches during screen transitions */
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa003, 0xa003, 0, 0);
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa003, 0xa003, 0, 0);
*state->video_enable = 1;
}
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index 8f2b16b7fa1..0b02bec0c75 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -242,7 +242,7 @@ DIP locations verified for:
*
*************************************/
-static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(balsente_state, spriteram)
AM_RANGE(0x0800, 0x7fff) AM_RAM_WRITE(balsente_videoram_w) AM_BASE_MEMBER(balsente_state, videoram)
AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(balsente_paletteram_w) AM_BASE_GENERIC(paletteram)
@@ -272,7 +272,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x5fff) AM_RAM
AM_RANGE(0x6000, 0x7fff) AM_WRITE(balsente_m6850_sound_w)
@@ -280,7 +280,7 @@ static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_READWRITE(balsente_counter_8253_r, balsente_counter_8253_w)
AM_RANGE(0x08, 0x0f) AM_READ(balsente_counter_state_r)
@@ -299,7 +299,7 @@ ADDRESS_MAP_END
*************************************/
/* CPU 1 read addresses */
-static ADDRESS_MAP_START( shrike68k_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( shrike68k_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x003fff) AM_ROM
AM_RANGE(0x010000, 0x01001f) AM_RAM AM_BASE_MEMBER(balsente_state, shrike_io)
AM_RANGE(0x018000, 0x018fff) AM_RAM AM_BASE_MEMBER(balsente_state, shrike_shared)
@@ -2134,48 +2134,48 @@ static DRIVER_INIT( minigolf2 ) { expand_roms(machine, 0x0c); config_shoo
static DRIVER_INIT( toggle ) { expand_roms(machine, EXPAND_ALL); config_shooter_adc(machine, FALSE, 0 /* noanalog */); }
static DRIVER_INIT( nametune )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
memory_install_write8_handler(space, 0x9f00, 0x9f00, 0, 0, balsente_rombank2_select_w);
expand_roms(machine, EXPAND_NONE | SWAP_HALVES); config_shooter_adc(machine, FALSE, 0 /* noanalog */);
}
static DRIVER_INIT( nstocker )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
memory_install_write8_handler(space, 0x9f00, 0x9f00, 0, 0, balsente_rombank2_select_w);
expand_roms(machine, EXPAND_NONE | SWAP_HALVES); config_shooter_adc(machine, TRUE, 1);
}
static DRIVER_INIT( sfootbal )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
memory_install_write8_handler(space, 0x9f00, 0x9f00, 0, 0, balsente_rombank2_select_w);
expand_roms(machine, EXPAND_ALL | SWAP_HALVES); config_shooter_adc(machine, FALSE, 0);
}
static DRIVER_INIT( spiker )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
memory_install_readwrite8_handler(space, 0x9f80, 0x9f8f, 0, 0, spiker_expand_r, spiker_expand_w);
memory_install_write8_handler(space, 0x9f00, 0x9f00, 0, 0, balsente_rombank2_select_w);
expand_roms(machine, EXPAND_ALL | SWAP_HALVES); config_shooter_adc(machine, FALSE, 1);
}
static DRIVER_INIT( stompin )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
memory_install_write8_handler(space, 0x9f00, 0x9f00, 0, 0, balsente_rombank2_select_w);
expand_roms(machine, 0x0c | SWAP_HALVES); config_shooter_adc(machine, FALSE, 32);
}
static DRIVER_INIT( rescraid ) { expand_roms(machine, EXPAND_NONE); config_shooter_adc(machine, FALSE, 0 /* noanalog */); }
static DRIVER_INIT( grudge )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
memory_install_read8_handler(space, 0x9400, 0x9400, 0, 0, grudge_steering_r);
expand_roms(machine, EXPAND_NONE); config_shooter_adc(machine, FALSE, 0);
}
static DRIVER_INIT( shrike )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
memory_install_readwrite8_handler(space, 0x9e00, 0x9fff, 0, 0, shrike_shared_6809_r, shrike_shared_6809_w);
memory_install_write8_handler(space, 0x9e01, 0x9e01, 0, 0, shrike_sprite_select_w );
- memory_install_readwrite16_handler(machine->device("68k")->memory().space(ADDRESS_SPACE_PROGRAM), 0x10000, 0x1001f, 0, 0, shrike_io_68k_r, shrike_io_68k_w);
+ memory_install_readwrite16_handler(machine->device("68k")->memory().space(AS_PROGRAM), 0x10000, 0x1001f, 0, 0, shrike_io_68k_r, shrike_io_68k_w);
expand_roms(machine, EXPAND_ALL); config_shooter_adc(machine, FALSE, 32);
}
diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c
index 5f6b5c754ab..ef3763f07cc 100644
--- a/src/mame/drivers/bankp.c
+++ b/src/mame/drivers/bankp.c
@@ -103,7 +103,7 @@
*
*************************************/
-static ADDRESS_MAP_START( bankp_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bankp_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(bankp_videoram_w) AM_BASE_MEMBER(bankp_state, videoram)
@@ -112,7 +112,7 @@ static ADDRESS_MAP_START( bankp_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc00, 0xffff) AM_RAM_WRITE(bankp_colorram2_w) AM_BASE_MEMBER(bankp_state, colorram2)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bankp_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bankp_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_DEVWRITE("sn1", sn76496_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_DEVWRITE("sn2", sn76496_w)
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index 633158b21e9..081da1797ae 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -161,7 +161,7 @@ static WRITE8_HANDLER( baraduke_irq_ack_w )
-static ADDRESS_MAP_START( baraduke_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( baraduke_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_READWRITE(baraduke_spriteram_r,baraduke_spriteram_w) AM_BASE_MEMBER(baraduke_state, spriteram) /* Sprite RAM */
AM_RANGE(0x2000, 0x3fff) AM_READWRITE(baraduke_videoram_r,baraduke_videoram_w) AM_BASE_MEMBER(baraduke_state, videoram) /* Video RAM */
AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE("namco", namcos1_cus30_r,namcos1_cus30_w) /* PSG device, shared RAM */
@@ -180,7 +180,7 @@ static READ8_HANDLER( soundkludge_r )
return ((state->counter++) >> 4) & 0xff;
}
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x001f) AM_READWRITE(m6801_io_r,m6801_io_w)/* internal registers */
AM_RANGE(0x0080, 0x00ff) AM_RAM /* built in RAM */
AM_RANGE(0x1105, 0x1105) AM_READ(soundkludge_r) /* cures speech */
@@ -198,7 +198,7 @@ static READ8_HANDLER( readFF )
return 0xff;
}
-static ADDRESS_MAP_START( mcu_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_port_map, AS_IO, 8 )
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_READ(inputport_r) /* input ports read */
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_WRITE(inputport_select_w) /* input port select */
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READ(readFF) /* leds won't work otherwise */
diff --git a/src/mame/drivers/bartop52.c b/src/mame/drivers/bartop52.c
index f9d18f8cf5a..3e94051e8ab 100644
--- a/src/mame/drivers/bartop52.c
+++ b/src/mame/drivers/bartop52.c
@@ -33,7 +33,7 @@ public:
};
-static ADDRESS_MAP_START(a5200_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(a5200_mem, AS_PROGRAM, 8)
AM_RANGE(0x0000, 0x3fff) AM_RAM
AM_RANGE(0x4000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc0ff) AM_READWRITE(atari_gtia_r, atari_gtia_w)
diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c
index 93a3aa56b14..1016a1e93f2 100644
--- a/src/mame/drivers/batman.c
+++ b/src/mame/drivers/batman.c
@@ -128,7 +128,7 @@ static WRITE16_HANDLER( latch_w )
/* full map verified from schematics and GALs */
/* addresses in the 1xxxxx region map to /WAIT */
/* addresses in the 2xxxxx region map to /WAIT2 */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x3fffff)
AM_RANGE(0x000000, 0x0bffff) AM_ROM
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index f725120b2b1..01d5a783753 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -98,7 +98,7 @@ static INTERRUPT_GEN( battlane_cpu1_interrupt )
*
*************************************/
-static ADDRESS_MAP_START( battlane_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( battlane_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(battlane_tileram_w) AM_SHARE("share2") AM_BASE_MEMBER(battlane_state, tileram)
AM_RANGE(0x1800, 0x18ff) AM_RAM_WRITE(battlane_spriteram_w) AM_SHARE("share3") AM_BASE_MEMBER(battlane_state, spriteram)
diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c
index 58151023325..f8f80199025 100644
--- a/src/mame/drivers/battlera.c
+++ b/src/mame/drivers/battlera.c
@@ -65,7 +65,7 @@ static READ8_HANDLER( control_data_r )
/******************************************************************************/
-static ADDRESS_MAP_START( battlera_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( battlera_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_READWRITE(HuC6270_debug_r, HuC6270_debug_w) /* Cheat to edit vram data */
AM_RANGE(0x1e0800, 0x1e0801) AM_WRITE(battlera_sound_w)
@@ -77,7 +77,7 @@ static ADDRESS_MAP_START( battlera_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( battlera_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( battlera_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0x01) AM_WRITE(HuC6270_register_w)
AM_RANGE(0x02, 0x03) AM_WRITE(HuC6270_data_w)
ADDRESS_MAP_END
@@ -108,7 +108,7 @@ static WRITE8_DEVICE_HANDLER( battlera_adpcm_reset_w )
msm5205_reset_w(device, 0);
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x040001) AM_DEVWRITE("ymsnd", ym2203_w)
AM_RANGE(0x080000, 0x080001) AM_WRITE(battlera_adpcm_data_w)
diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c
index 8bb5b2587a3..4731c08b3e8 100644
--- a/src/mame/drivers/battlex.c
+++ b/src/mame/drivers/battlex.c
@@ -76,7 +76,7 @@ static CUSTOM_INPUT( battlex_in0_b4_r )
*
*************************************/
-static ADDRESS_MAP_START( battlex_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( battlex_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(battlex_videoram_w) AM_BASE_MEMBER(battlex_state, videoram)
AM_RANGE(0x9000, 0x91ff) AM_RAM AM_BASE_MEMBER(battlex_state, spriteram)
@@ -85,7 +85,7 @@ static ADDRESS_MAP_START( battlex_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1")
AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index 484be6f37d7..37ed70e1e81 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -57,7 +57,7 @@ static WRITE8_HANDLER( battlnts_bankswitch_w )
*
*************************************/
-static ADDRESS_MAP_START( battlnts_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( battlnts_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_DEVREADWRITE("k007342", k007342_r, k007342_w) /* Color RAM + Video RAM */
AM_RANGE(0x2000, 0x21ff) AM_DEVREADWRITE("k007420", k007420_r, k007420_w) /* Sprite RAM */
AM_RANGE(0x2200, 0x23ff) AM_DEVREADWRITE("k007342", k007342_scroll_r, k007342_scroll_w) /* Scroll RAM */
@@ -77,7 +77,7 @@ static ADDRESS_MAP_START( battlnts_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM 777e02.bin */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( battlnts_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( battlnts_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM 777c01.rom */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym1", ym3812_r, ym3812_w) /* YM3812 (chip 1) */
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index 27427d0f300..a8394091df1 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -327,7 +327,7 @@ static READ16_HANDLER( mechatt_gun_r )
/*******************************************************************************/
-static ADDRESS_MAP_START( bbusters_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bbusters_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM AM_BASE_MEMBER(bbusters_state, ram)
AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE(bbusters_video_w) AM_BASE_MEMBER(bbusters_state, videoram)
@@ -357,7 +357,7 @@ ADDRESS_MAP_END
/*******************************************************************************/
-static ADDRESS_MAP_START( mechatt_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mechatt_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x06ffff) AM_ROM
AM_RANGE(0x070000, 0x07ffff) AM_RAM AM_BASE_MEMBER(bbusters_state, ram)
AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE(bbusters_video_w) AM_BASE_MEMBER(bbusters_state, videoram)
@@ -378,19 +378,19 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_READWRITE(soundlatch_r, sound_status_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w)
AM_RANGE(0xc0, 0xc1) AM_WRITENOP /* -> Main CPU */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sounda_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sounda_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2608_r, ym2608_w)
AM_RANGE(0xc0, 0xc1) AM_WRITENOP /* -> Main CPU */
@@ -666,7 +666,7 @@ static const ym2610_interface ym2610_config =
static SCREEN_EOF( bbuster )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space,0,0,0xffff);
buffer_spriteram16_2_w(space,0,0,0xffff);
@@ -674,7 +674,7 @@ static SCREEN_EOF( bbuster )
static SCREEN_EOF( mechatt )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space,0,0,0xffff);
}
diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c
index 2b61f0f58a1..b2e6c087728 100644
--- a/src/mame/drivers/beaminv.c
+++ b/src/mame/drivers/beaminv.c
@@ -230,7 +230,7 @@ static READ8_HANDLER( controller_r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_ROM
AM_RANGE(0x1800, 0x1fff) AM_RAM
AM_RANGE(0x2400, 0x2400) AM_MIRROR(0x03ff) AM_READ_PORT("DSW")
@@ -248,7 +248,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(controller_select_w) /* to be confirmed */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index 762d0300f81..4a60d20e403 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -311,7 +311,7 @@ WRITE32_MEMBER( beathead_state::coin_count_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32, beathead_state)
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 32, beathead_state)
AM_RANGE(0x00000000, 0x0001ffff) AM_RAM AM_BASE(m_ram_base)
AM_RANGE(0x01800000, 0x01bfffff) AM_ROM AM_REGION("user1", 0) AM_BASE(m_rom_base)
AM_RANGE(0x40000000, 0x400007ff) AM_RAM_WRITE(eeprom_data_w) AM_SHARE("nvram")
diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c
index 5d4e9e8e8a8..b1e4b630edf 100644
--- a/src/mame/drivers/beezer.c
+++ b/src/mame/drivers/beezer.c
@@ -13,14 +13,14 @@
#include "sound/dac.h"
#include "includes/beezer.h"
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_RAM AM_BASE_MEMBER(beezer_state, videoram)
AM_RANGE(0xc000, 0xcfff) AM_ROMBANK("bank1")
AM_RANGE(0xd000, 0xdfff) AM_ROM AM_WRITE(beezer_bankswitch_w) // ROM at G1, bankswitch
AM_RANGE(0xe000, 0xffff) AM_ROM // ROMS at G3, G5
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM // RAM at 0D
AM_RANGE(0x0800, 0x0fff) AM_RAM // optional RAM at 2D (can be rom here instead)
AM_RANGE(0x1000, 0x1007) AM_MIRROR(0x07F8) AM_DEVREADWRITE("custom", beezer_sh6840_r, beezer_sh6840_w)
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index 56d230b5b70..4f73d67f13e 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -571,7 +571,7 @@ static READ8_HANDLER( berzerk_audio_r )
static SOUND_RESET(berzerk)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *space = machine->device("maincpu")->memory().space(AS_IO);
/* clears the flip-flop controlling the volume and freq on the speech chip */
berzerk_audio_w(space, 4, 0x40);
}
@@ -584,7 +584,7 @@ static SOUND_RESET(berzerk)
*
*************************************/
-static ADDRESS_MAP_START( berzerk_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( berzerk_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM
AM_RANGE(0x0800, 0x0bff) AM_MIRROR(0x0400) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x1000, 0x3fff) AM_ROM
@@ -595,7 +595,7 @@ static ADDRESS_MAP_START( berzerk_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( frenzy_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( frenzy_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE_MEMBER(berzerk_state, videoram) AM_SIZE_MEMBER(berzerk_state, videoram_size) AM_SHARE("share1")
AM_RANGE(0x6000, 0x7fff) AM_RAM_WRITE(magicram_w) AM_SHARE("share1")
@@ -612,7 +612,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( berzerk_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( berzerk_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x3f) AM_NOP
AM_RANGE(0x40, 0x47) AM_READWRITE(berzerk_audio_r, berzerk_audio_w)
@@ -1209,7 +1209,7 @@ ROM_END
static DRIVER_INIT( moonwarp )
{
- address_space *io = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *io = machine->device("maincpu")->memory().space(AS_IO);
memory_install_read8_handler (io, 0x48, 0x48, 0, 0, moonwarp_p1_r);
memory_install_read8_handler (io, 0x4a, 0x4a, 0, 0, moonwarp_p2_r);
}
diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c
index 28022592991..4c429abf262 100644
--- a/src/mame/drivers/bestleag.c
+++ b/src/mame/drivers/bestleag.c
@@ -227,7 +227,7 @@ static WRITE16_DEVICE_HANDLER( oki_bank_w )
/* Memory Map */
-static ADDRESS_MAP_START( bestleag_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bestleag_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x0d2000, 0x0d3fff) AM_NOP // left over from the original game (only read / written in memory test)
AM_RANGE(0x0e0000, 0x0e3fff) AM_RAM_WRITE(bestleag_bgram_w) AM_BASE_MEMBER(bestleag_state, bgram)
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index b9e7185fbe9..c0f13dd5b18 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -1325,14 +1325,14 @@ static MACHINE_RESET( bfcobra )
***************************************************************************/
-static ADDRESS_MAP_START( z80_prog_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_prog_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank4")
AM_RANGE(0x4000, 0x7fff) AM_RAMBANK("bank1")
AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank2")
AM_RANGE(0xc000, 0xffff) AM_RAMBANK("bank3")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( z80_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x23) AM_READWRITE(chipset_r, chipset_w)
AM_RANGE(0x24, 0x24) AM_DEVWRITE("acia6850_0", acia6850_ctrl_w)
@@ -1459,7 +1459,7 @@ static WRITE8_DEVICE_HANDLER( upd_w )
upd7759_start_w(device, data & 0x40 ? 0 : 1);
}
-static ADDRESS_MAP_START( m6809_prog_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m6809_prog_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x2000, 0x2000) AM_RAM // W 'B', 6F
AM_RANGE(0x2200, 0x2200) AM_RAM // W 'F'
diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c
index 3d2a34153eb..65846373d2a 100644
--- a/src/mame/drivers/bfm_sc1.c
+++ b/src/mame/drivers/bfm_sc1.c
@@ -762,7 +762,7 @@ static MACHINE_RESET( bfm_sc1 )
// scorpion1 board memory map ///////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////
-static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1FFF) AM_RAM AM_SHARE("nvram") //8k RAM
AM_RANGE(0x2000, 0x21FF) AM_WRITE(reel34_w) // reel 2+3 latch
@@ -805,7 +805,7 @@ ADDRESS_MAP_END
// scorpion1 board + adder2 expansion memory map ////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////
-static ADDRESS_MAP_START( memmap_adder2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memmap_adder2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1FFF) AM_RAM AM_SHARE("nvram") //8k RAM
AM_RANGE(0x2000, 0x21FF) AM_WRITE(reel34_w) // reel 2+3 latch
@@ -854,7 +854,7 @@ ADDRESS_MAP_END
// scorpion1 board + upd7759 soundcard memory map ///////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////
-static ADDRESS_MAP_START( sc1_nec_uk, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sc1_nec_uk, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1FFF) AM_RAM AM_SHARE("nvram") //8k RAM
AM_RANGE(0x2000, 0x21FF) AM_WRITE(reel34_w) // reel 2+3 latch
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index bb64a2e9cb9..53b11567e34 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -1464,7 +1464,7 @@ static SCREEN_UPDATE( addersc2 )
// memory map for scorpion2 board video addon /////////////////////////////
-static ADDRESS_MAP_START( memmap_vid, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memmap_vid, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram") //8k RAM
AM_RANGE(0x2000, 0x2000) AM_READ(vfd_status_hop_r) // vfd status register
@@ -2718,7 +2718,7 @@ static MACHINE_RESET( dm01_init )
}
-static ADDRESS_MAP_START( sc2_memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sc2_memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram") //8k
AM_RANGE(0x2000, 0x2000) AM_READ(vfd_status_r)
AM_RANGE(0x2000, 0x20FF) AM_WRITE(reel12_w)
@@ -2767,7 +2767,7 @@ ADDRESS_MAP_END
/* memory map for scorpion3 board */
-static ADDRESS_MAP_START( sc3_memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sc3_memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram") //8k
AM_RANGE(0x2000, 0x2000) AM_READ(vfd_status_r)
AM_RANGE(0x2000, 0x20FF) AM_WRITE(reel12_w)
@@ -2816,7 +2816,7 @@ ADDRESS_MAP_END
/* memory map for scorpion2 board + dm01 dot matrix board */
-static ADDRESS_MAP_START( memmap_sc2_dm01, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memmap_sc2_dm01, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram") //8k
AM_RANGE(0x2000, 0x2000) AM_READ(vfd_status_dm01_r)
AM_RANGE(0x2000, 0x20FF) AM_WRITE(reel12_w)
diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c
index aeb96e84c31..d4d70cf4840 100644
--- a/src/mame/drivers/bfmsys85.c
+++ b/src/mame/drivers/bfmsys85.c
@@ -415,7 +415,7 @@ static MACHINE_START( bfm_sys85 )
// memory map for bellfruit system85 board ////////////////////////////////
-static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram") //8k RAM
AM_RANGE(0x2000, 0x21FF) AM_WRITE(reel34_w) // reel 3+4 latch
diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c
index b72a100ab77..e5e9a2cbd37 100644
--- a/src/mame/drivers/big10.c
+++ b/src/mame/drivers/big10.c
@@ -139,13 +139,13 @@ static READ8_HANDLER( mux_r )
* Memory Map *
**************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(mux_r) /* present in test mode */
AM_RANGE(0x02, 0x02) AM_READ_PORT("SYSTEM") /* coins and service */
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index 22e49d62c57..87081c940db 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -307,7 +307,7 @@ INPUT_PORTS_END
/*****************************************************************************/
/* Main CPU */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd7ff) AM_ROMBANK("bank1")
@@ -318,7 +318,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf840, 0xf8ff) AM_RAM AM_BASE_MEMBER(bigevglf_state, spriteram2) /* spriteram (x,y,offset in spriteram1,palette) */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bigevglf_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bigevglf_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP /* video ram enable ???*/
AM_RANGE(0x01, 0x01) AM_WRITE(bigevglf_gfxcontrol_w) /* plane select */
@@ -333,7 +333,7 @@ ADDRESS_MAP_END
/*********************************************************************************/
/* Sub CPU */
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE("share1") /* shared with main CPU */
@@ -353,7 +353,7 @@ static READ8_HANDLER( sub_cpu_mcu_coin_port_r )
return bigevglf_mcu_status_r(space, 0) | (input_port_read(space->machine, "PORT04") & 3) | state->mcu_coin_bit5; /* bit 0 and bit 1 - coin inputs */
}
-static ADDRESS_MAP_START( bigevglf_sub_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bigevglf_sub_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("PORT00")
AM_RANGE(0x01, 0x01) AM_READNOP
@@ -379,7 +379,7 @@ ADDRESS_MAP_END
/*********************************************************************************/
/* Sound CPU */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("aysnd", ay8910_address_data_w)
@@ -397,7 +397,7 @@ ADDRESS_MAP_END
/*********************************************************************************/
/* MCU */
-static ADDRESS_MAP_START( m68705_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m68705_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(bigevglf_68705_port_a_r, bigevglf_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(bigevglf_68705_port_b_r, bigevglf_68705_port_b_w)
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index 6a0ee72ecdc..0ec1be0b0c4 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -308,7 +308,7 @@ static SCREEN_UPDATE( bigfghtr )
static SCREEN_EOF( bigfghtr )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
}
@@ -487,7 +487,7 @@ static READ8_HANDLER( soundlatch_clear_r )
return 0;
}
-static ADDRESS_MAP_START( mainmem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mainmem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x0805ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x080600, 0x083fff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE_MEMBER(bigfghtr_state, sharedram)
@@ -513,12 +513,12 @@ static ADDRESS_MAP_START( mainmem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x400000, 0x400001) AM_READ(latch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( soundmem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( soundmem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xf7ff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( soundport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( soundport, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x0, 0x1) AM_DEVWRITE("ymsnd", ym3812_w)
AM_RANGE(0x2, 0x2) AM_DEVWRITE("dac1", dac_signed_w)
diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c
index 80206267e15..b2c79f48bca 100644
--- a/src/mame/drivers/bigstrkb.c
+++ b/src/mame/drivers/bigstrkb.c
@@ -34,7 +34,7 @@ lev 7 : 0x7c : 0000 05be - xxx
/* some regions might be too large */
-static ADDRESS_MAP_START( bigstrkb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bigstrkb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
// AM_RANGE(0x0c0000, 0x0cffff) AM_READWRITE(megasys1_vregs_C_r, megasys1_vregs_C_w) AM_BASE(&megasys1_vregs)
diff --git a/src/mame/drivers/bingo.c b/src/mame/drivers/bingo.c
index 3e2616cd44b..c70a363893a 100644
--- a/src/mame/drivers/bingo.c
+++ b/src/mame/drivers/bingo.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( bingo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bingo_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x1eff) AM_ROM
AM_RANGE(0x1f00, 0x1fff) AM_RAM
diff --git a/src/mame/drivers/bingoc.c b/src/mame/drivers/bingoc.c
index 889615da72d..bd97227c695 100644
--- a/src/mame/drivers/bingoc.c
+++ b/src/mame/drivers/bingoc.c
@@ -104,7 +104,7 @@ static WRITE8_DEVICE_HANDLER( bingoc_play_w )
// printf("%02x\n",data);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10007f) AM_READ(bingoc_rand_r) //comms? lamps?
AM_RANGE(0x180000, 0x18007f) AM_READ(bingoc_rand_r) //comms? lamps?
@@ -114,12 +114,12 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff8000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x4fff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x40, 0x40) AM_DEVWRITE("upd", bingoc_play_w)
diff --git a/src/mame/drivers/bingor.c b/src/mame/drivers/bingor.c
index 1ce086cbd47..f302824d4fa 100644
--- a/src/mame/drivers/bingor.c
+++ b/src/mame/drivers/bingor.c
@@ -506,7 +506,7 @@ static READ16_HANDLER( test_r )
}
#endif
-static ADDRESS_MAP_START( bingor_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bingor_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x0ffff) AM_RAM
AM_RANGE(0x90000, 0x9ffff) AM_ROM AM_REGION("gfx", 0)
AM_RANGE(0xa0300, 0xa031f) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBIIII_word_w) AM_BASE_GENERIC(paletteram) //wrong
@@ -514,7 +514,7 @@ static ADDRESS_MAP_START( bingor_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bingor_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( bingor_io, AS_IO, 16 )
// AM_RANGE(0x0000, 0x00ff) AM_READ( test_r )
AM_RANGE(0x0100, 0x0101) AM_DEVWRITE8("saa", saa1099_data_w, 0x00ff)
AM_RANGE(0x0102, 0x0103) AM_DEVWRITE8("saa", saa1099_control_w, 0x00ff)
@@ -526,7 +526,7 @@ static READ8_HANDLER( test8_r )
return space->machine->rand();
}
-static ADDRESS_MAP_START( pic_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pic_io_map, AS_IO, 8 )
AM_RANGE(0x02, 0x02) AM_READ(test8_r)
AM_RANGE(0x10, 0x10) AM_READNOP
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index 511f962b7e2..b89cf4db002 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -146,7 +146,7 @@ static INTERRUPT_GEN( bionicc_interrupt )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0xfe0000, 0xfe07ff) AM_RAM /* RAM? */
AM_RANGE(0xfe0800, 0xfe0cff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
@@ -166,7 +166,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index 21cbe3c15c1..2c861498c0a 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -149,7 +149,7 @@ static READ16_HANDLER( bishi_K056832_rom_r )
return k056832_bishi_rom_word_r(state->k056832, ouroffs, mem_mask);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x400000, 0x407fff) AM_RAM // Work RAM
AM_RANGE(0x800000, 0x800001) AM_READWRITE(control_r, control_w)
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index dfdaf8956b7..67e9586ce45 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -82,13 +82,13 @@ static READ8_HANDLER( bking3_ext_check_r )
return 0x31; //no "bad rom.", no "bad ext."
}
-static ADDRESS_MAP_START( bking_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bking_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
AM_RANGE(0x9000, 0x97ff) AM_RAM_WRITE(bking_playfield_w) AM_BASE_MEMBER(bking_state, playfield_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bking_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bking_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(bking_xld1_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(bking_yld1_w)
@@ -107,7 +107,7 @@ static ADDRESS_MAP_START( bking_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x07, 0x1f) AM_READ(bking_pos_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bking3_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bking3_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(bking_xld1_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(bking_yld1_w)
@@ -131,7 +131,7 @@ static ADDRESS_MAP_START( bking3_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x8f, 0x8f) AM_WRITE(bking3_addr_l_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bking_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bking_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x2fff) AM_ROM //only bking3
AM_RANGE(0x4000, 0x43ff) AM_RAM
diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c
index f665d2369f6..1c1548617cd 100644
--- a/src/mame/drivers/blackt96.c
+++ b/src/mame/drivers/blackt96.c
@@ -168,7 +168,7 @@ static WRITE16_HANDLER( blackt96_80000_w )
}
-static ADDRESS_MAP_START( blackt96_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( blackt96_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("P1_P2") AM_WRITE(blackt96_80000_w)
AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("IN1") AM_WRITE(blackt96_c0000_w) // COIN INPUT
@@ -473,7 +473,7 @@ static WRITE8_HANDLER( blackt96_soundio_port02_w )
}
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_WRITE( blackt96_soundio_port00_w )
AM_RANGE(0x01, 0x01) AM_READWRITE( blackt96_soundio_port01_r, blackt96_soundio_port01_w )
AM_RANGE(0x02, 0x02) AM_READWRITE( blackt96_soundio_port02_r, blackt96_soundio_port02_w )
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index 34ad52aa384..93efc8a03dd 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -124,7 +124,7 @@ static WRITE8_DEVICE_HANDLER( bladestl_speech_ctrl_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_DEVREADWRITE("k007342", k007342_r, k007342_w) /* Color RAM + Video RAM */
AM_RANGE(0x2000, 0x21ff) AM_DEVREADWRITE("k007420", k007420_r, k007420_w) /* Sprite RAM */
AM_RANGE(0x2200, 0x23ff) AM_DEVREADWRITE("k007342", k007342_scroll_r, k007342_scroll_w) /* Scroll RAM */
@@ -146,7 +146,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) /* YM2203 */
AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("upd", bladestl_speech_ctrl_w) /* UPD7759 */
diff --git a/src/mame/drivers/blitz.c b/src/mame/drivers/blitz.c
index 474afcd2e86..fcca0adc0f0 100644
--- a/src/mame/drivers/blitz.c
+++ b/src/mame/drivers/blitz.c
@@ -469,7 +469,7 @@ static WRITE8_DEVICE_HANDLER( sound_w )
* Memory Map Information *
*********************************************/
-static ADDRESS_MAP_START( megadpkr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( megadpkr_map, AS_PROGRAM, 8 )
// ADDRESS_MAP_GLOBAL_MASK(0x7fff) // seems that hardware is playing with A14 & A15 CPU lines...
AM_RANGE(0x0000, 0x07ff) AM_RAM //AM_SHARE("nvram") /* battery backed RAM */
@@ -590,7 +590,7 @@ ADDRESS_MAP_END
/*
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/blitz68k.c b/src/mame/drivers/blitz68k.c
index d3564566187..33bf829dfbd 100644
--- a/src/mame/drivers/blitz68k.c
+++ b/src/mame/drivers/blitz68k.c
@@ -594,7 +594,7 @@ static WRITE16_HANDLER( sound_write_w )
}
#endif
-static ADDRESS_MAP_START( ilpag_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ilpag_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1fffff) AM_ROM AM_REGION("blitter", 0)
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_SHARE("nvram")
@@ -619,7 +619,7 @@ static ADDRESS_MAP_START( ilpag_map, ADDRESS_SPACE_PROGRAM, 16 )
// AM_RANGE(0xc00300, 0xc00301) AM_WRITE(irq_callback_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( steaser_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( steaser_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x1fffff) AM_ROM AM_REGION("blitter", 0)
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_SHARE("nvram")
@@ -687,7 +687,7 @@ static WRITE8_HANDLER( bankrob_mcu2_w )
logerror("%s: mcu2 written with %02x\n", space->machine->describe_context(), data);
}
-static ADDRESS_MAP_START( bankrob_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bankrob_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
@@ -769,7 +769,7 @@ static WRITE8_HANDLER( bankroba_mcu2_w )
logerror("%s: mcu2 written with %02x\n", space->machine->describe_context(), data);
}
-static ADDRESS_MAP_START( bankroba_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bankroba_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
@@ -906,7 +906,7 @@ static WRITE16_HANDLER( cjffruit_mcu_w )
logerror("%s: mcu written with %02x\n", space->machine->describe_context(),data >> 8);
}
-static ADDRESS_MAP_START( cjffruit_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cjffruit_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x400000, 0x41ffff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x480000, 0x4807ff) AM_RAM
@@ -1002,7 +1002,7 @@ static WRITE16_HANDLER( deucesw2_leds3_w )
}
}
-static ADDRESS_MAP_START( deucesw2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( deucesw2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x400000, 0x41ffff) AM_RAM
@@ -1073,7 +1073,7 @@ static WRITE8_HANDLER( dualgame_mcu2_w )
logerror("%s: mcu2 written with %02x\n", space->machine->describe_context(), data);
}
-static ADDRESS_MAP_START( dualgame_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dualgame_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
@@ -1172,7 +1172,7 @@ static READ16_HANDLER( hermit_track_r )
((0xf - ((input_port_read(space->machine, "TRACK_X") + 0x7) & 0xf)) << 8) ;
}
-static ADDRESS_MAP_START( hermit_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hermit_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x400000, 0x41ffff) AM_RAM
@@ -1240,7 +1240,7 @@ static WRITE8_HANDLER( maxidbl_mcu2_w )
logerror("%s: mcu2 written with %02x\n", space->machine->describe_context(), data);
}
-static ADDRESS_MAP_START( maxidbl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( maxidbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index 8fc71ebead1..38609168b2b 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -71,7 +71,7 @@ static WRITE8_HANDLER( blktiger_coinlockout_w )
}
-static ADDRESS_MAP_START( blktiger_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( blktiger_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_READWRITE(blktiger_bgvideoram_r, blktiger_bgvideoram_w)
@@ -82,7 +82,7 @@ static ADDRESS_MAP_START( blktiger_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blktiger_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( blktiger_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(soundlatch_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(blktiger_bankswitch_w)
@@ -99,7 +99,7 @@ static ADDRESS_MAP_START( blktiger_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x0e, 0x0e) AM_WRITE(blktiger_screen_layout_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blktigerbl_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( blktigerbl_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(soundlatch_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(blktiger_bankswitch_w)
@@ -116,7 +116,7 @@ static ADDRESS_MAP_START( blktigerbl_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x0e, 0x0e) AM_WRITE(blktiger_screen_layout_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blktiger_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( blktiger_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r)
@@ -124,11 +124,11 @@ static ADDRESS_MAP_START( blktiger_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe002, 0xe003) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blktiger_mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( blktiger_mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blktiger_mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( blktiger_mcu_io_map, AS_IO, 8 )
AM_RANGE(MCS51_PORT_P0,MCS51_PORT_P0) AM_READWRITE(blktiger_from_main_r,blktiger_to_main_w)
AM_RANGE(MCS51_PORT_P1,MCS51_PORT_P3) AM_WRITENOP /* other ports unknown */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index b15d6f1bae8..7d0928aceec 100644
--- a/src/mame/drivers/blmbycar.c
+++ b/src/mame/drivers/blmbycar.c
@@ -101,7 +101,7 @@ static READ16_HANDLER( blmbycar_opt_wheel_r )
***************************************************************************/
-static ADDRESS_MAP_START( blmbycar_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( blmbycar_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0xfec000, 0xfeffff) AM_RAM
AM_RANGE(0x100000, 0x103fff) AM_WRITEONLY // ???
@@ -136,7 +136,7 @@ static READ16_HANDLER( waterball_unk_r )
return state->retvalue;
}
-static ADDRESS_MAP_START( watrball_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( watrball_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0xfec000, 0xfeffff) AM_RAM
AM_RANGE(0x100000, 0x103fff) AM_WRITEONLY // ???
diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c
index b1d2b233450..3c84bb81967 100644
--- a/src/mame/drivers/blockade.c
+++ b/src/mame/drivers/blockade.c
@@ -120,13 +120,13 @@ static WRITE8_HANDLER( blockade_coin_latch_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM AM_MIRROR(0x6000)
AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(blockade_videoram_w) AM_BASE_MEMBER(blockade_state, videoram) AM_MIRROR(0x6c00)
AM_RANGE(0x9000, 0x90ff) AM_RAM AM_MIRROR(0x6f00)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io_map, AS_IO, 8 )
AM_RANGE(0x01, 0x01) AM_READWRITE(blockade_input_port_0_r, blockade_coin_latch_w)
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1")
AM_RANGE(0x02, 0x02) AM_DEVWRITE("discrete", blockade_sound_freq_w)
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index 78057b18965..381761c6e20 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -96,7 +96,7 @@ static WRITE8_HANDLER( k052109_051960_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x1f84, 0x1f84) AM_WRITE(soundlatch_w)
AM_RANGE(0x1f88, 0x1f88) AM_WRITE(blockhl_sh_irqtrigger_w)
AM_RANGE(0x1f8c, 0x1f8c) AM_WRITE(watchdog_reset_w)
@@ -112,7 +112,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index 51a4710e0f8..eabacbd0bb7 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -99,7 +99,7 @@ static WRITE16_HANDLER( blockout_sound_command_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("P1")
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("P2")
@@ -117,7 +117,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x280200, 0x2805ff) AM_RAM_WRITE(blockout_paletteram_w) AM_BASE_MEMBER(blockout_state, paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c
index 81dc3a3acfe..3b302537d3b 100644
--- a/src/mame/drivers/bloodbro.c
+++ b/src/mame/drivers/bloodbro.c
@@ -115,7 +115,7 @@ DIP locations verified for:
/* Memory Maps */
-static ADDRESS_MAP_START( bloodbro_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bloodbro_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x08afff) AM_RAM
AM_RANGE(0x08b000, 0x08bfff) AM_RAM AM_BASE_SIZE_MEMBER(bloodbro_state, spriteram, spriteram_size)
@@ -137,7 +137,7 @@ static ADDRESS_MAP_START( bloodbro_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0e0004, 0x0e0005) AM_READ_PORT("IN1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( weststry_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( weststry_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x08afff) AM_RAM
AM_RANGE(0x08b000, 0x08bfff) AM_RAM AM_BASE_SIZE_MEMBER(bloodbro_state, spriteram, spriteram_size)
diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c
index b5a75726a4c..9d4dd98fa55 100644
--- a/src/mame/drivers/blstroid.c
+++ b/src/mame/drivers/blstroid.c
@@ -90,7 +90,7 @@ static READ16_HANDLER( inputs_r )
*************************************/
/* full map verified from schematics */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x03ffff) AM_MIRROR(0x7c0000) AM_ROM
AM_RANGE(0xff8000, 0xff8001) AM_MIRROR(0x7f81fe) AM_WRITE(watchdog_reset16_w)
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index a07d644eabf..53e19343d8f 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -89,7 +89,7 @@ static WRITE8_HANDLER( blueprnt_coin_counter_w )
*
*************************************/
-static ADDRESS_MAP_START( blueprnt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( blueprnt_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // service mode checks for 8 chips = 64K
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(blueprnt_videoram_w) AM_MIRROR(0x400) AM_BASE_MEMBER(blueprnt_state, videoram)
@@ -103,7 +103,7 @@ static ADDRESS_MAP_START( blueprnt_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf3ff) AM_RAM_WRITE(blueprnt_colorram_w) AM_BASE_MEMBER(blueprnt_state, colorram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x2000, 0x2fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index 6c75ff0cf6b..2fe318c084d 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -324,7 +324,7 @@ static NVRAM_HANDLER( bmcbowl )
}
-static ADDRESS_MAP_START( bmcbowl_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bmcbowl_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x090000, 0x090001) AM_WRITE(bmc_RAMDAC_offset_w)
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index 848ad52330e..27370e7297b 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -1260,7 +1260,7 @@ static WRITE32_HANDLER( bnstars1_mahjong_select_w )
// printf("%08x\n",state->bnstars1_mahjong_select);
}
-static ADDRESS_MAP_START( bnstars_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( bnstars_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_ROM
AM_RANGE(0xfcc00004, 0xfcc00007) AM_READ( bnstars1_r )
@@ -1300,7 +1300,7 @@ static ADDRESS_MAP_START( bnstars_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
#if 0
-static ADDRESS_MAP_START( bnstars_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bnstars_z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
ADDRESS_MAP_END
#endif
diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c
index d74076b42ea..6bbf08d429c 100644
--- a/src/mame/drivers/bogeyman.c
+++ b/src/mame/drivers/bogeyman.c
@@ -48,7 +48,7 @@ static WRITE8_HANDLER( bogeyman_8910_control_w )
/* Memory Map */
-static ADDRESS_MAP_START( bogeyman_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bogeyman_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(bogeyman_videoram2_w) AM_BASE_MEMBER(bogeyman_state, videoram2)
AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(bogeyman_colorram2_w) AM_BASE_MEMBER(bogeyman_state, colorram2)
diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c
index 1352cd0cbf8..29a6e7ddcc7 100644
--- a/src/mame/drivers/bombjack.c
+++ b/src/mame/drivers/bombjack.c
@@ -130,7 +130,7 @@ static READ8_HANDLER( bombjack_soundlatch_r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(bombjack_videoram_w) AM_BASE_MEMBER(bombjack_state, videoram)
@@ -151,13 +151,13 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xdfff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ(bombjack_soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( audio_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x10, 0x11) AM_DEVWRITE("ay2", ay8910_address_data_w)
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index 858462ac9fa..2f945cc722f 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -89,7 +89,7 @@
#include "video/deco16ic.h"
#include "video/decocomn.h"
-static ADDRESS_MAP_START( boogwing_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( boogwing_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
@@ -127,7 +127,7 @@ static ADDRESS_MAP_START( boogwing_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_NOP
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index 9dc99eadfe1..ff5f5b05961 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -175,7 +175,7 @@ static WRITE8_HANDLER( sound_bank_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(bottom9_bankedram1_r, bottom9_bankedram1_w)
AM_RANGE(0x1f80, 0x1f80) AM_WRITE(bankswitch_w)
AM_RANGE(0x1f90, 0x1f90) AM_WRITE(bottom9_1f90_w)
@@ -195,7 +195,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_WRITE(sound_bank_w)
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index 0c41855ebb3..803bb6d2495 100644
--- a/src/mame/drivers/boxer.c
+++ b/src/mame/drivers/boxer.c
@@ -289,7 +289,7 @@ static WRITE8_HANDLER( boxer_led_w )
*
*************************************/
-static ADDRESS_MAP_START( boxer_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( boxer_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x03ff) AM_RAM AM_BASE_MEMBER(boxer_state, tile_ram)
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index 0756267a10d..02d8f2c7d81 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -104,7 +104,7 @@ static INPUT_CHANGED( coin_inserted )
*
*************************************/
-static ADDRESS_MAP_START( brkthru_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( brkthru_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM_WRITE(brkthru_fgram_w) AM_BASE_SIZE_MEMBER(brkthru_state, fg_videoram, fg_videoram_size)
AM_RANGE(0x0400, 0x0bff) AM_RAM
AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(brkthru_bgram_w) AM_BASE_SIZE_MEMBER(brkthru_state, videoram, videoram_size)
@@ -122,7 +122,7 @@ static ADDRESS_MAP_START( brkthru_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* same as brktrhu, but xor 0x1000 below 8k */
-static ADDRESS_MAP_START( darwin_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( darwin_map, AS_PROGRAM, 8 )
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(brkthru_fgram_w) AM_BASE_SIZE_MEMBER(brkthru_state, fg_videoram, fg_videoram_size)
AM_RANGE(0x1400, 0x1bff) AM_RAM
AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(brkthru_bgram_w) AM_BASE_SIZE_MEMBER(brkthru_state, videoram, videoram_size)
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START( darwin_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym2", ym3526_w)
AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c
index 63e7eb1b0f8..028aa31f01e 100644
--- a/src/mame/drivers/bsktball.c
+++ b/src/mame/drivers/bsktball.c
@@ -74,7 +74,7 @@ static PALETTE_INIT( bsktball )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM /* Zero Page RAM */
AM_RANGE(0x0800, 0x0800) AM_READ(bsktball_in0_r)
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index be0ddbe9eb8..d36c324e31f 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -355,7 +355,7 @@ static WRITE8_HANDLER( disco_w )
}
-static ADDRESS_MAP_START( btime_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( btime_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_WRITE(btime_w) /* override the following entries to */
/* support ROM decryption */
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(btime_state, rambase)
@@ -372,7 +372,7 @@ static ADDRESS_MAP_START( btime_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cookrace_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cookrace_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE_MEMBER(btime_state, rambase)
AM_RANGE(0x0500, 0x3fff) AM_ROM
AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_BASE_SIZE_MEMBER(btime_state, videoram, videoram_size)
@@ -392,7 +392,7 @@ static ADDRESS_MAP_START( cookrace_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfff9, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tisland_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tisland_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_WRITE(tisland_w) /* override the following entries to */
/* support ROM decryption */
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(btime_state, rambase)
@@ -410,7 +410,7 @@ static ADDRESS_MAP_START( tisland_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x9000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( zoar_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( zoar_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_WRITE(zoar_w) /* override the following entries to */
/* support ROM decryption */
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(btime_state, rambase)
@@ -430,7 +430,7 @@ static ADDRESS_MAP_START( zoar_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lnc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lnc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_WRITE(lnc_w) /* override the following entries to */
/* support ROM decryption */
AM_RANGE(0x0000, 0x3bff) AM_RAM AM_BASE_MEMBER(btime_state, rambase)
@@ -447,7 +447,7 @@ static ADDRESS_MAP_START( lnc_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mmonkey_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mmonkey_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_WRITE(mmonkey_w) /* override the following entries to */
/* support ROM decryption */
AM_RANGE(0x0000, 0x3bff) AM_RAM AM_BASE_MEMBER(btime_state, rambase)
@@ -464,7 +464,7 @@ static ADDRESS_MAP_START( mmonkey_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bnj_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bnj_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(btime_state, rambase)
AM_RANGE(0x1000, 0x1000) AM_READ_PORT("DSW1")
AM_RANGE(0x1001, 0x1001) AM_READ_PORT("DSW2") AM_WRITE(bnj_video_control_w)
@@ -482,7 +482,7 @@ static ADDRESS_MAP_START( bnj_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( disco_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( disco_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_WRITE(disco_w) /* override the following entries to */
/* support ROM decryption */
AM_RANGE(0x0000, 0x04ff) AM_RAM AM_BASE_MEMBER(btime_state, rambase)
@@ -501,7 +501,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM AM_BASE_MEMBER(btime_state, audio_rambase)
AM_RANGE(0x2000, 0x3fff) AM_DEVWRITE("ay1", ay8910_data_w)
AM_RANGE(0x4000, 0x5fff) AM_DEVWRITE("ay1", ay8910_address_w)
@@ -512,7 +512,7 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_MIRROR(0x1000) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( disco_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( disco_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x4000, 0x4fff) AM_DEVWRITE("ay1", ay8910_data_w)
AM_RANGE(0x5000, 0x5fff) AM_DEVWRITE("ay1", ay8910_address_w)
@@ -2071,7 +2071,7 @@ ROM_END
static void decrypt_C10707_cpu(running_machine *machine, const char *cputag)
{
- address_space *space = machine->device(cputag)->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device(cputag)->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x10000);
UINT8 *rom = machine->region(cputag)->base();
offs_t addr;
@@ -2101,7 +2101,7 @@ static READ8_HANDLER( wtennis_reset_hack_r )
static void init_rom1(running_machine *machine)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
decrypted = auto_alloc_array(machine, UINT8, 0x10000);
@@ -2176,7 +2176,7 @@ static DRIVER_INIT( cookrace )
btime_state *state = machine->driver_data<btime_state>();
decrypt_C10707_cpu(machine, "maincpu");
- memory_install_read_bank(machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10");
+ memory_install_read_bank(machine->device("audiocpu")->memory().space(AS_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10");
memory_set_bankptr(machine, "bank10", machine->region("audiocpu")->base() + 0xe200);
state->audio_nmi_enable_type = AUDIO_ENABLE_DIRECT;
}
@@ -2193,9 +2193,9 @@ static DRIVER_INIT( wtennis )
btime_state *state = machine->driver_data<btime_state>();
decrypt_C10707_cpu(machine, "maincpu");
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc15f, 0xc15f, 0, 0, wtennis_reset_hack_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc15f, 0xc15f, 0, 0, wtennis_reset_hack_r);
- memory_install_read_bank(machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10");
+ memory_install_read_bank(machine->device("audiocpu")->memory().space(AS_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10");
memory_set_bankptr(machine, "bank10", machine->region("audiocpu")->base() + 0xe200);
state->audio_nmi_enable_type = AUDIO_ENABLE_AY8910;
}
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index 6b986413e64..4dc65524735 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -173,7 +173,7 @@ static WRITE8_HANDLER( bsmt2000_port_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM
AM_RANGE(0x20000000, 0x2000007f) AM_READ_PORT("P1")
AM_RANGE(0x20000080, 0x200000ff) AM_READ_PORT("P2")
@@ -209,12 +209,12 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
AM_RANGE(0x0000, 0x7fff) AM_WRITE(bsmt2000_port_w)
AM_RANGE(0x8000, 0x8000) AM_READWRITE(sound_data_r, sound_data_w)
AM_RANGE(0x8002, 0x8002) AM_WRITE(sound_int_state_w)
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index 6f166d50c97..ae0cf426024 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -285,7 +285,7 @@ TODO:
*
*************************************/
-static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdcff) AM_RAM AM_BASE_SIZE_MEMBER(bublbobl_state, videoram, videoram_size)
@@ -299,12 +299,12 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc00, 0xffff) AM_RAM AM_BASE_MEMBER(bublbobl_state, mcu_sharedram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
@@ -315,7 +315,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM // space for diagnostic ROM?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_READWRITE(bublbobl_mcu_ddr1_r, bublbobl_mcu_ddr1_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(bublbobl_mcu_ddr2_r, bublbobl_mcu_ddr2_w)
AM_RANGE(0x0002, 0x0002) AM_READWRITE(bublbobl_mcu_port1_r, bublbobl_mcu_port1_w)
@@ -329,7 +329,7 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
// The 68705 is from a bootleg, the original MCU is a 6801U4
-static ADDRESS_MAP_START( bootlegmcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bootlegmcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x000, 0x000) AM_READWRITE(bublbobl_68705_port_a_r, bublbobl_68705_port_a_w)
AM_RANGE(0x001, 0x001) AM_READWRITE(bublbobl_68705_port_b_r, bublbobl_68705_port_b_w)
@@ -341,7 +341,7 @@ static ADDRESS_MAP_START( bootlegmcu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x080, 0x7ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bootleg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bootleg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdcff) AM_RAM AM_BASE_SIZE_MEMBER(bublbobl_state, videoram, videoram_size)
@@ -365,7 +365,7 @@ static ADDRESS_MAP_START( bootleg_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tokio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tokio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdcff) AM_RAM AM_BASE_SIZE_MEMBER(bublbobl_state, videoram, videoram_size)
@@ -385,12 +385,12 @@ static ADDRESS_MAP_START( tokio_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfe00, 0xfe00) AM_READ(tokio_mcu_r) AM_WRITENOP // ???
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tokio_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tokio_slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x97ff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tokio_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tokio_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_READWRITE(soundlatch_r, bublbobl_sound_status_w)
@@ -1555,7 +1555,7 @@ static DRIVER_INIT( tokiob )
{
DRIVER_INIT_CALL(tokio);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfe00, 0xfe00, 0, 0, tokiob_mcu_r );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfe00, 0xfe00, 0, 0, tokiob_mcu_r );
}
static DRIVER_INIT( dland )
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index c234b563e00..bda227bba3b 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -132,7 +132,7 @@ static WRITE8_HANDLER( sound_enable_w )
-static ADDRESS_MAP_START( buggychl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( buggychl_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM /* A22-04 (23) */
AM_RANGE(0x4000, 0x7fff) AM_ROM /* A22-05 (22) */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* 6116 SRAM (36) */
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( buggychl_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xdc06, 0xdc06) AM_WRITE(buggychl_bg_scrollx_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x4800, 0x4801) AM_DEVWRITE("ay1", ay8910_address_data_w)
diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c
index d4e42c243d3..3e6f15a78ba 100644
--- a/src/mame/drivers/buster.c
+++ b/src/mame/drivers/buster.c
@@ -49,7 +49,7 @@ static SCREEN_UPDATE(buster)
return 0;
}
-static ADDRESS_MAP_START( mainmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mainmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_RAM AM_BASE_MEMBER(buster_state, rom)
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x5000, 0x5fff) AM_RAM AM_BASE_MEMBER(buster_state, vram)
diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c
index 24d127ce053..d86dcd15c04 100644
--- a/src/mame/drivers/bwidow.c
+++ b/src/mame/drivers/bwidow.c
@@ -362,7 +362,7 @@ static WRITE8_HANDLER( irq_ack_w )
*
*************************************/
-static ADDRESS_MAP_START( bwidow_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bwidow_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE(&avgdvg_vectorram) AM_SIZE(&avgdvg_vectorram_size) AM_REGION("maincpu", 0x2000)
AM_RANGE(0x2800, 0x5fff) AM_ROM
@@ -383,7 +383,7 @@ static ADDRESS_MAP_START( bwidow_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spacduel_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spacduel_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0800, 0x0800) AM_READ_PORT("IN0")
AM_RANGE(0x0900, 0x0907) AM_READ(spacduel_IN3_r) /* IN1 */
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index e6a233602d8..8a6b8474862 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -47,7 +47,7 @@ static INTERRUPT_GEN ( bwp1_interrupt )
state->ffcount--;
latch_data = state->sound_fifo[state->fftail];
state->fftail = (state->fftail + 1) & (MAX_SOUNDS - 1);
- soundlatch_w(device->memory().space(ADDRESS_SPACE_PROGRAM), 0, latch_data);
+ soundlatch_w(device->memory().space(AS_PROGRAM), 0, latch_data);
device_set_input_line(state->audiocpu, DECO16_IRQ_LINE, HOLD_LINE); // SNDREQ
}
break;
@@ -194,7 +194,7 @@ static WRITE8_HANDLER( bwp2_ctrl_w )
// CPU Memory Maps
// Main CPU
-static ADDRESS_MAP_START( bwp1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bwp1_map, AS_PROGRAM, 8 )
AM_RANGE(0x1b00, 0x1b07) AM_READ(bwp1_io_r)
AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(bwp12_sharedram1_w) AM_BASE_MEMBER(bwing_state, bwp1_sharedram1)
AM_RANGE(0x0800, 0x0fff) AM_RAM
@@ -210,7 +210,7 @@ ADDRESS_MAP_END
// Sub CPU
-static ADDRESS_MAP_START( bwp2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bwp2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(bwp12_sharedram1_w) AM_BASE_MEMBER(bwing_state, bwp2_sharedram1)
AM_RANGE(0x0800, 0x0fff) AM_RAM
AM_RANGE(0x1800, 0x1803) AM_WRITE(bwp2_ctrl_w)
@@ -219,7 +219,7 @@ ADDRESS_MAP_END
// Sound CPU
-static ADDRESS_MAP_START( bwp3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bwp3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x0200) AM_DEVWRITE("dac", dac_signed_w)
AM_RANGE(0x1000, 0x1000) AM_WRITE(bwp3_nmiack_w)
@@ -233,7 +233,7 @@ static ADDRESS_MAP_START( bwp3_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bwp3_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bwp3_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("VBLANK") AM_WRITE(bwp3_u8F_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/by17.c b/src/mame/drivers/by17.c
index 10e44faba36..2623523060e 100644
--- a/src/mame/drivers/by17.c
+++ b/src/mame/drivers/by17.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( by17_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( by17_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x007f) AM_RAM
diff --git a/src/mame/drivers/by35.c b/src/mame/drivers/by35.c
index 0cf230c7b44..77123277910 100644
--- a/src/mame/drivers/by35.c
+++ b/src/mame/drivers/by35.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( by35_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( by35_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x007f) AM_RAM
diff --git a/src/mame/drivers/by6803.c b/src/mame/drivers/by6803.c
index ab702a1ba0d..d3ee86dc881 100644
--- a/src/mame/drivers/by6803.c
+++ b/src/mame/drivers/by6803.c
@@ -15,7 +15,7 @@ public:
};
-static ADDRESS_MAP_START( by6803_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( by6803_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x00ff) AM_RAM
AM_RANGE(0x1000, 0x17ff) AM_RAM
diff --git a/src/mame/drivers/by68701.c b/src/mame/drivers/by68701.c
index dac5cb7e92e..fbc33166735 100644
--- a/src/mame/drivers/by68701.c
+++ b/src/mame/drivers/by68701.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( by68701_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( by68701_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x00ff) AM_RAM
AM_RANGE(0x0400, 0x04ff) AM_RAM
diff --git a/src/mame/drivers/byvid.c b/src/mame/drivers/byvid.c
index e9472f57d37..a2b52ab5228 100644
--- a/src/mame/drivers/byvid.c
+++ b/src/mame/drivers/byvid.c
@@ -15,13 +15,13 @@ public:
: driver_device(machine, config) { }
};
-static ADDRESS_MAP_START( by133_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( by133_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x1000, 0x7fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( by133_video_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( by133_video_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index ebc6e7f1cd6..ff63911bf82 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -296,7 +296,7 @@ static WRITE8_DEVICE_HANDLER( redbaron_joysound_w )
*
*************************************/
-static ADDRESS_MAP_START( bzone_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bzone_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0800, 0x0800) AM_READ_PORT("IN0")
@@ -316,7 +316,7 @@ static ADDRESS_MAP_START( bzone_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x3000, 0x7fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( redbaron_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( redbaron_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0800, 0x0800) AM_READ_PORT("IN0")
@@ -797,7 +797,7 @@ static WRITE8_HANDLER( analog_select_w )
static DRIVER_INIT( bradley )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
memory_install_ram(space, 0x400, 0x7ff, 0, 0, NULL);
memory_install_read_port(space, 0x1808, 0x1808, 0, 0, "1808");
memory_install_read_port(space, 0x1809, 0x1809, 0, 0, "1809");
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index b0aa99b4134..68868a069a1 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -119,7 +119,7 @@ static WRITE16_HANDLER( cabalbl_sound_irq_trigger_word_w )
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x3ffff) AM_ROM
AM_RANGE(0x40000, 0x437ff) AM_RAM
AM_RANGE(0x43800, 0x43fff) AM_RAM AM_BASE_SIZE_MEMBER(cabal_state, spriteram, spriteram_size)
@@ -138,7 +138,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe8000, 0xe800d) AM_READWRITE(seibu_main_word_r, seibu_main_word_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cabalbl_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cabalbl_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x3ffff) AM_ROM
AM_RANGE(0x40000, 0x437ff) AM_RAM
AM_RANGE(0x43800, 0x43fff) AM_RAM AM_BASE_SIZE_MEMBER(cabal_state, spriteram, spriteram_size)
@@ -182,7 +182,7 @@ static WRITE8_HANDLER( cabalbl_coin_w )
//data & 0x40? video enable?
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4001, 0x4001) AM_WRITE(seibu_irq_clear_w)
@@ -201,7 +201,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cabalbl_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cabalbl_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x2fff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_WRITE(soundlatch3_w)
@@ -227,21 +227,21 @@ static WRITE8_DEVICE_HANDLER( cabalbl_adpcm_w )
msm5205_vclk_w(device,0);
}
-static ADDRESS_MAP_START( cabalbl_talk1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cabalbl_talk1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cabalbl_talk1_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cabalbl_talk1_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch3_r)
AM_RANGE(0x01, 0x01) AM_DEVWRITE("msm1", cabalbl_adpcm_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cabalbl_talk2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cabalbl_talk2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cabalbl_talk2_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cabalbl_talk2_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch4_r)
AM_RANGE(0x01, 0x01) AM_DEVWRITE("msm2", cabalbl_adpcm_w)
@@ -837,7 +837,7 @@ ROM_END
static void seibu_sound_bootleg(running_machine *machine,const char *cpu,int length)
{
- address_space *space = machine->device(cpu)->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device(cpu)->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine, UINT8, length);
UINT8 *rom = machine->region(cpu)->base();
diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c
index 7760152562c..364c0cbe06f 100644
--- a/src/mame/drivers/cabaret.c
+++ b/src/mame/drivers/cabaret.c
@@ -153,12 +153,12 @@ static WRITE8_HANDLER( cabaret_nmi_and_coins_w )
-static ADDRESS_MAP_START( cabaret_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cabaret_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x0efff ) AM_ROM
AM_RANGE( 0x0f000, 0x0ffff ) AM_RAM AM_REGION("maincpu", 0xf000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cabaret_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cabaret_portmap, AS_IO, 8 )
AM_RANGE( 0x0000, 0x003f ) AM_RAM // Z180 internal regs
AM_RANGE( 0x0080, 0x0080 ) AM_READ_PORT( "BUTTONS2" )
diff --git a/src/mame/drivers/calchase.c b/src/mame/drivers/calchase.c
index 14c484c3b73..7bbc0462448 100644
--- a/src/mame/drivers/calchase.c
+++ b/src/mame/drivers/calchase.c
@@ -472,7 +472,7 @@ static WRITE32_HANDLER(bios_ram_w)
}
}
-static ADDRESS_MAP_START( calchase_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( calchase_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0x000a0000, 0x000bffff) AM_RAM AM_BASE_MEMBER(calchase_state, vga_vram)
AM_RANGE(0x000c0000, 0x000c7fff) AM_RAM AM_REGION("video_bios", 0)
@@ -491,7 +491,7 @@ static ADDRESS_MAP_START( calchase_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfffe0000, 0xffffffff) AM_ROM AM_REGION("bios", 0) /* System BIOS */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( calchase_io, ADDRESS_SPACE_IO, 32)
+static ADDRESS_MAP_START( calchase_io, AS_IO, 32)
AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8("dma8237_1", i8237_r, i8237_w, 0xffffffff)
AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_1", pic8259_r, pic8259_w, 0xffffffff)
AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8("pit8254", pit8253_r, pit8253_w, 0xffffffff)
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index ea69478549f..ac9c209e048 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -834,7 +834,7 @@ static WRITE8_DEVICE_HANDLER( lamps_905_w )
* Memory map information *
*************************************************/
-static ADDRESS_MAP_START( sys903_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sys903_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0840, 0x0841) AM_DEVWRITE("ay8912", ay8910_address_data_w)
@@ -849,7 +849,7 @@ static ADDRESS_MAP_START( sys903_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1800, 0x3fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( s903mod_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( s903mod_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0840, 0x0841) AM_DEVWRITE("ay8912", ay8910_address_data_w)
@@ -862,7 +862,7 @@ static ADDRESS_MAP_START( s903mod_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1800, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sys905_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sys905_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x1040, 0x1041) AM_DEVWRITE("ay8912", ay8910_address_data_w)
@@ -875,7 +875,7 @@ static ADDRESS_MAP_START( sys905_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x2800, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sys906_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sys906_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x280c, 0x280f) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x2824, 0x2827) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index 605cfb98ce8..7709052c30b 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -236,7 +236,7 @@ static WRITE8_HANDLER( bogus_w )
*
*************************************/
-static ADDRESS_MAP_START( calorie_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( calorie_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -253,13 +253,13 @@ static ADDRESS_MAP_START( calorie_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( calorie_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( calorie_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xc000, 0xc000) AM_READ(calorie_soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( calorie_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( calorie_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x01, 0x01) AM_DEVREAD("ay1", ay8910_r)
@@ -550,7 +550,7 @@ static DRIVER_INIT( calorie )
static DRIVER_INIT( calorieb )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
space->set_decrypted_region(0x0000, 0x7fff, machine->region("maincpu")->base() + 0x10000);
}
diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c
index 80ff6b467ba..d061581944f 100644
--- a/src/mame/drivers/canyon.c
+++ b/src/mame/drivers/canyon.c
@@ -105,7 +105,7 @@ static WRITE8_HANDLER( canyon_led_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x100) AM_RAM
AM_RANGE(0x0400, 0x0401) AM_DEVWRITE("discrete", canyon_motor_w)
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index a9f3402df6a..4121d401800 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -229,7 +229,7 @@ void capbowl_state::init_nvram(nvram_device &nvram, void *base, size_t size)
*
*************************************/
-static ADDRESS_MAP_START( capbowl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( capbowl_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0x4000) AM_WRITEONLY AM_BASE_MEMBER(capbowl_state, rowaddress)
AM_RANGE(0x4800, 0x4800) AM_WRITE(capbowl_rom_select_w)
@@ -243,7 +243,7 @@ static ADDRESS_MAP_START( capbowl_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bowlrama_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bowlrama_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x001f) AM_READWRITE(bowlrama_blitter_r, bowlrama_blitter_w)
AM_RANGE(0x4000, 0x4000) AM_WRITEONLY AM_BASE_MEMBER(capbowl_state, rowaddress)
AM_RANGE(0x5000, 0x57ff) AM_RAM AM_SHARE("nvram")
@@ -263,7 +263,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x2000, 0x2000) AM_WRITENOP /* Not hooked up according to the schematics */
diff --git a/src/mame/drivers/capcom.c b/src/mame/drivers/capcom.c
index c35ec905cdd..9596e92e3a5 100644
--- a/src/mame/drivers/capcom.c
+++ b/src/mame/drivers/capcom.c
@@ -15,7 +15,7 @@ public:
};
-static ADDRESS_MAP_START( capcom_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( capcom_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c
index 7ba0284d2db..1667fb2c317 100644
--- a/src/mame/drivers/cardline.c
+++ b/src/mame/drivers/cardline.c
@@ -111,11 +111,11 @@ static WRITE8_HANDLER(lamps_w)
output_set_lamp_value(7,(data >> 7) & 1);
}
-static ADDRESS_MAP_START( mem_prg, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mem_prg, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mem_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mem_io, AS_IO, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2003, 0x2003) AM_READ_PORT("IN0")
AM_RANGE(0x2005, 0x2005) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c
index 5c58f65e016..3e5b01d6cc0 100644
--- a/src/mame/drivers/carjmbre.c
+++ b/src/mame/drivers/carjmbre.c
@@ -50,7 +50,7 @@ Notes:
*
*************************************/
-static ADDRESS_MAP_START( carjmbre_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( carjmbre_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
// AM_RANGE(0x8800, 0x8800) AM_READNOP // watchdog?
@@ -67,13 +67,13 @@ static ADDRESS_MAP_START( carjmbre_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xb800) AM_READ_PORT("DSW") AM_WRITE(soundlatch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( carjmbre_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( carjmbre_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x1000) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( carjmbre_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( carjmbre_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r)
AM_RANGE(0x10, 0x10) AM_WRITENOP //?? written on init/0xff sound command reset
diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c
index de69b2789d8..37d7714e7df 100644
--- a/src/mame/drivers/carpolo.c
+++ b/src/mame/drivers/carpolo.c
@@ -32,7 +32,7 @@
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x3000, 0x30ff) AM_WRITEONLY AM_BASE_MEMBER(carpolo_state, alpharam)
AM_RANGE(0x4000, 0x400f) AM_WRITEONLY AM_BASE_MEMBER(carpolo_state, spriteram)
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 063885ceff1..2220c95d129 100644
--- a/src/mame/drivers/carrera.c
+++ b/src/mame/drivers/carrera.c
@@ -62,7 +62,7 @@ public:
};
-static ADDRESS_MAP_START( carrera_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( carrera_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x4fff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM
AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("crtc", mc6845_address_w)
@@ -70,7 +70,7 @@ static ADDRESS_MAP_START( carrera_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE_MEMBER(carrera_state, tileram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c
index 2dda9fe3f8b..c4a732fbae9 100644
--- a/src/mame/drivers/caswin.c
+++ b/src/mame/drivers/caswin.c
@@ -149,7 +149,7 @@ static WRITE8_HANDLER( vvillage_lamps_w )
set_led_status(space->machine, 4, data & 0x10);
}
-static ADDRESS_MAP_START( vvillage_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vvillage_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_READ(vvillage_rng_r) //accessed by caswin only
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("nvram")
@@ -157,7 +157,7 @@ static ADDRESS_MAP_START( vvillage_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE(sc0_attr_w) AM_BASE_MEMBER(caswin_state, sc0_attr)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vvillage_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( vvillage_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01,0x01) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x02,0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w)
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index b916b94071f..7cd94df18f4 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -435,7 +435,7 @@ static const eeprom_interface eeprom_interface_93C46_pacslot =
Dangun Feveron
***************************************************************************/
-static ADDRESS_MAP_START( dfeveron_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dfeveron_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x00ff) // YMZ280
@@ -460,7 +460,7 @@ ADDRESS_MAP_END
Dodonpachi
***************************************************************************/
-static ADDRESS_MAP_START( ddonpach_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ddonpach_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x00ff) // YMZ280
@@ -511,7 +511,7 @@ WRITE16_HANDLER( donpachi_videoregs_w )
}
#endif
-static ADDRESS_MAP_START( donpachi_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( donpachi_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
AM_RANGE(0x200000, 0x207fff) AM_RAM_WRITE(cave_vram_1_w) AM_BASE_MEMBER(cave_state, vram_1) // Layer 1
@@ -537,7 +537,7 @@ ADDRESS_MAP_END
Esprade
***************************************************************************/
-static ADDRESS_MAP_START( esprade_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( esprade_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x00ff) // YMZ280
@@ -562,7 +562,7 @@ ADDRESS_MAP_END
Gaia Crusaders
***************************************************************************/
-static ADDRESS_MAP_START( gaia_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gaia_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x00ff) // YMZ280
@@ -592,7 +592,7 @@ ADDRESS_MAP_END
Guwange
***************************************************************************/
-static ADDRESS_MAP_START( guwange_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( guwange_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x300000, 0x300007) AM_READ(cave_irq_cause_r) // IRQ Cause
@@ -619,7 +619,7 @@ ADDRESS_MAP_END
Hotdog Storm
***************************************************************************/
-static ADDRESS_MAP_START( hotdogst_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hotdogst_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x300000, 0x30ffff) AM_RAM // RAM
/**/AM_RANGE(0x408000, 0x408fff) AM_RAM AM_BASE_SIZE_MEMBER(cave_state, paletteram, paletteram_size) // Palette
@@ -711,7 +711,7 @@ static CUSTOM_INPUT( korokoro_hopper_r )
}
-static ADDRESS_MAP_START( korokoro_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( korokoro_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x107fff) AM_WRITE(cave_vram_0_w) AM_BASE_MEMBER(cave_state, vram_0) // Layer 0
AM_RANGE(0x140000, 0x140005) AM_WRITEONLY AM_BASE_MEMBER(cave_state, vctrl_0) // Layer 0 Control
@@ -729,7 +729,7 @@ static ADDRESS_MAP_START( korokoro_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x300000, 0x30ffff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( crusherm_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( crusherm_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x107fff) AM_WRITE(cave_vram_0_w) AM_BASE_MEMBER(cave_state, vram_0) // Layer 0
AM_RANGE(0x140000, 0x140005) AM_WRITEONLY AM_BASE_MEMBER(cave_state, vctrl_0) // Layer 0 Control
@@ -750,7 +750,7 @@ ADDRESS_MAP_END
Mazinger Z
***************************************************************************/
-static ADDRESS_MAP_START( mazinger_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mazinger_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
/**/AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE_SIZE_MEMBER(cave_state, spriteram, spriteram_size) // Sprites
@@ -775,7 +775,7 @@ ADDRESS_MAP_END
Metamoqester
***************************************************************************/
-static ADDRESS_MAP_START( metmqstr_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( metmqstr_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x17ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x27ffff) AM_ROM // ROM
@@ -832,7 +832,7 @@ static WRITE16_HANDLER( pwrinst2_vctrl_1_w ) { cave_state *state = space->machin
static WRITE16_HANDLER( pwrinst2_vctrl_2_w ) { cave_state *state = space->machine->driver_data<cave_state>(); vctrl_w(state->vctrl_2, offset, data, mem_mask); }
static WRITE16_HANDLER( pwrinst2_vctrl_3_w ) { cave_state *state = space->machine->driver_data<cave_state>(); vctrl_w(state->vctrl_3, offset, data, mem_mask); }
-static ADDRESS_MAP_START( pwrinst2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pwrinst2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // RAM
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("IN0") // Inputs
@@ -868,7 +868,7 @@ static READ16_HANDLER( sailormn_input0_r )
return input_port_read(space->machine, "IN0");
}
-static ADDRESS_MAP_START( sailormn_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sailormn_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
AM_RANGE(0x110000, 0x110001) AM_RAM // (agallet)
@@ -944,7 +944,7 @@ static CUSTOM_INPUT( tjumpman_hopper_r )
return (state->hopper && !(field->port->machine->primary_screen->frame_number() % 10)) ? 0 : 1;
}
-static ADDRESS_MAP_START( tjumpman_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tjumpman_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_SHARE("nvram") // RAM
AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE_SIZE_MEMBER(cave_state, spriteram, spriteram_size) // Sprites
@@ -985,7 +985,7 @@ static WRITE16_HANDLER( pacslot_leds_w )
// popmessage("led %04X", data);
}
-static ADDRESS_MAP_START( pacslot_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pacslot_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_SHARE("nvram") // RAM
AM_RANGE(0x200000, 0x207fff) AM_RAM AM_BASE_SIZE_MEMBER(cave_state, spriteram, spriteram_size) // Sprites
@@ -1008,7 +1008,7 @@ ADDRESS_MAP_END
Uo Poko
***************************************************************************/
-static ADDRESS_MAP_START( uopoko_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( uopoko_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
AM_RANGE(0x300000, 0x300003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x00ff) // YMZ280
@@ -1035,12 +1035,12 @@ ADDRESS_MAP_END
***************************************************************************/
-static ADDRESS_MAP_START( oki_map, 0, 8 )
+static ADDRESS_MAP_START( oki_map, AS_0, 8 )
AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK("bank3")
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank4")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oki2_map, 0, 8 )
+static ADDRESS_MAP_START( oki2_map, AS_0, 8 )
AM_RANGE(0x00000, 0x1ffff) AM_ROMBANK("bank5")
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank6")
ADDRESS_MAP_END
@@ -1066,13 +1066,13 @@ static WRITE8_HANDLER( hotdogst_okibank_w )
memory_set_bank(space->machine, "bank4", bank2);
}
-static ADDRESS_MAP_START( hotdogst_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hotdogst_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2") // ROM (Banked)
AM_RANGE(0xe000, 0xffff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hotdogst_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hotdogst_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(hotdogst_rombank_w) // ROM bank
AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r) // From Main CPU
@@ -1095,14 +1095,14 @@ static WRITE8_HANDLER( mazinger_rombank_w )
memory_set_bank(space->machine, "bank2", data & 0x07);
}
-static ADDRESS_MAP_START( mazinger_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mazinger_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2") // ROM (Banked)
AM_RANGE(0xc000, 0xc7ff) AM_RAM // RAM
AM_RANGE(0xf800, 0xffff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mazinger_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mazinger_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(mazinger_rombank_w) // ROM bank
AM_RANGE(0x10, 0x10) AM_WRITE(soundlatch_ack_w) // To Main CPU
@@ -1142,13 +1142,13 @@ static WRITE8_HANDLER( metmqstr_okibank1_w )
memory_set_bank(space->machine, "bank6", bank2);
}
-static ADDRESS_MAP_START( metmqstr_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( metmqstr_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") // ROM (Banked)
AM_RANGE(0xe000, 0xffff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( metmqstr_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( metmqstr_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(metmqstr_rombank_w) // Rom Bank
AM_RANGE(0x20, 0x20) AM_READ(soundflags_r) // Communication
@@ -1174,13 +1174,13 @@ static WRITE8_HANDLER( pwrinst2_rombank_w )
memory_set_bank(space->machine, "bank1", data & 0x07);
}
-static ADDRESS_MAP_START( pwrinst2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pwrinst2_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // ROM (Banked)
AM_RANGE(0xe000, 0xffff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pwrinst2_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pwrinst2_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE_MODERN("oki1", okim6295_device, read, write) // M6295
AM_RANGE(0x08, 0x08) AM_DEVREADWRITE_MODERN("oki2", okim6295_device, read, write) //
@@ -1234,14 +1234,14 @@ static WRITE8_HANDLER( sailormn_okibank1_w )
memory_set_bank(space->machine, "bank6", bank2);
}
-static ADDRESS_MAP_START( sailormn_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sailormn_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") // ROM (Banked)
AM_RANGE(0xc000, 0xdfff) AM_READWRITE(mirror_ram_r, mirror_ram_w) AM_BASE_MEMBER(cave_state, mirror_ram) // RAM
AM_RANGE(0xe000, 0xffff) AM_READWRITE(mirror_ram_r, mirror_ram_w) // Mirrored RAM (agallet)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sailormn_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sailormn_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(sailormn_rombank_w) // Rom Bank
AM_RANGE(0x10, 0x10) AM_WRITE(soundlatch_ack_w) // To Main CPU
@@ -2165,7 +2165,7 @@ static MACHINE_CONFIG_START( hotdogst, cave_state )
MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
@@ -2273,7 +2273,7 @@ static MACHINE_CONFIG_START( mazinger, cave_state )
MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 2.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 2.0)
- MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MACHINE_CONFIG_END
@@ -2326,12 +2326,12 @@ static MACHINE_CONFIG_START( metmqstr, cave_state )
MCFG_OKIM6295_ADD("oki1", XTAL_32MHz / 16 , OKIM6295_PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_OKIM6295_ADD("oki2", XTAL_32MHz / 16 , OKIM6295_PIN7_HIGH)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MACHINE_CONFIG_END
@@ -2502,12 +2502,12 @@ static MACHINE_CONFIG_START( sailormn, cave_state )
MCFG_OKIM6295_ADD("oki1", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(0, oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, oki_map)
MCFG_OKIM6295_ADD("oki2", 2112000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(0, oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, oki2_map)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c
index c7fb71748ca..19ee10a73a0 100644
--- a/src/mame/drivers/cb2001.c
+++ b/src/mame/drivers/cb2001.c
@@ -555,14 +555,14 @@ WRITE16_HANDLER( cb2001_bg_w )
}
-static ADDRESS_MAP_START( cb2001_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cb2001_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x1ffff) AM_RAM
AM_RANGE(0x20000, 0x20fff) AM_RAM AM_BASE_MEMBER(cb2001_state, vram_fg)
AM_RANGE(0x21000, 0x21fff) AM_RAM_WRITE(&cb2001_bg_w) AM_BASE_MEMBER(cb2001_state, vram_bg)
AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cb2001_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( cb2001_io, AS_IO, 16 )
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE8("ppi8255_0", ppi8255_r, ppi8255_w, 0xffff) /* Input Ports */
AM_RANGE(0x10, 0x13) AM_DEVREADWRITE8("ppi8255_1", ppi8255_r, ppi8255_w, 0xffff) /* DIP switches */
AM_RANGE(0x20, 0x21) AM_DEVREAD8("aysnd", ay8910_r, 0xff00)
diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c
index 405a3c8ed49..f473937a1c2 100644
--- a/src/mame/drivers/cball.c
+++ b/src/mame/drivers/cball.c
@@ -124,7 +124,7 @@ static WRITE8_HANDLER( cball_wram_w )
-static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x03ff) AM_READ(cball_wram_r) AM_MASK(0x7f)
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index 92d82d2c56c..ed38648d1f5 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -111,7 +111,7 @@ static const eeprom_interface cbasebal_eeprom_intf =
*
*************************************/
-static ADDRESS_MAP_START( cbasebal_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cbasebal_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE_GENERIC(paletteram) /* palette + vram + scrollram */
@@ -119,7 +119,7 @@ static ADDRESS_MAP_START( cbasebal_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_BASE_SIZE_MEMBER(cbasebal_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cbasebal_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cbasebal_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(cbasebal_bankswitch_w)
AM_RANGE(0x01, 0x01) AM_WRITE_PORT("IO_01")
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index e089c865ce0..a9fede405df 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -104,7 +104,7 @@ static READ16_HANDLER( twocrude_control_r )
/******************************************************************************/
-static ADDRESS_MAP_START( twocrude_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( twocrude_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM AM_BASE_MEMBER(cbuster_state, ram)
@@ -129,7 +129,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c
index 2f30ec6a018..8ba4bc0592f 100644
--- a/src/mame/drivers/ccastles.c
+++ b/src/mame/drivers/ccastles.c
@@ -333,7 +333,7 @@ static WRITE8_HANDLER( nvram_w )
*************************************/
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0001) AM_WRITE(ccastles_bitmode_addr_w)
AM_RANGE(0x0002, 0x0002) AM_READWRITE(ccastles_bitmode_r, ccastles_bitmode_w)
AM_RANGE(0x0000, 0x7fff) AM_RAM_WRITE(ccastles_videoram_w) AM_BASE_MEMBER(ccastles_state, videoram)
diff --git a/src/mame/drivers/cchance.c b/src/mame/drivers/cchance.c
index 61aeb77434f..df156b3f151 100644
--- a/src/mame/drivers/cchance.c
+++ b/src/mame/drivers/cchance.c
@@ -73,7 +73,7 @@ static WRITE8_HANDLER( output_1_w )
state->bell_io = (data & 0x80)>>4;
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE_MEMBER(cchance_state, objram)
diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c
index f20ba3e009f..c065d3281d9 100644
--- a/src/mame/drivers/cchasm.c
+++ b/src/mame/drivers/cchasm.c
@@ -31,7 +31,7 @@
*
*************************************/
-static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( memmap, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x04000f) AM_DEVREADWRITE8("6840ptm", ptm6840_read, ptm6840_write, 0xff)
AM_RANGE(0x050000, 0x050001) AM_WRITE(cchasm_refresh_control_w)
@@ -47,7 +47,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x5000, 0x53ff) AM_RAM
@@ -62,7 +62,7 @@ static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7041, 0x7041) AM_NOP // TODO
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index b33cbac74e2..7be66555323 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -280,7 +280,7 @@ static MACHINE_RESET( cclimber )
/* Note that River Patrol reads/writes to a000-a4f0. This is a bug in the code.
The instruction at 0x0593 should say LD DE,$8000 */
-static ADDRESS_MAP_START( cclimber_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cclimber_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6bff) AM_RAM /* Crazy Kong only */
AM_RANGE(0x8000, 0x83ff) AM_RAM
@@ -303,7 +303,7 @@ static ADDRESS_MAP_START( cclimber_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xb800) AM_READ_PORT("SYSTEM")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cannonb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cannonb_map, AS_PROGRAM, 8 )
AM_RANGE(0x5045, 0x505f) AM_WRITENOP /* do not errorlog this */
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6bff) AM_RAM
@@ -326,7 +326,7 @@ static ADDRESS_MAP_START( cannonb_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xb800) AM_READ_PORT("SYSTEM")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( swimmer_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( swimmer_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x88ff) AM_MIRROR(0x0100) AM_RAM AM_BASE_MEMBER(cclimber_state, bigsprite_videoram)
@@ -347,7 +347,7 @@ static ADDRESS_MAP_START( swimmer_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM /* Guzzler only */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( yamato_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( yamato_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x7000, 0x7fff) AM_ROM
@@ -369,7 +369,7 @@ static ADDRESS_MAP_START( yamato_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xba00, 0xba00) AM_READ_PORT("START") /* maybe a mirror of b800 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( toprollr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( toprollr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROMBANK("bank1")
AM_RANGE(0x6000, 0x6bff) AM_RAM
AM_RANGE(0x8800, 0x88ff) AM_RAM AM_BASE_MEMBER(cclimber_state, bigsprite_videoram)
@@ -391,39 +391,39 @@ static ADDRESS_MAP_START( toprollr_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cclimber_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cclimber_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x08, 0x09) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x0c, 0x0c) AM_DEVREAD("aysnd", ay8910_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( yamato_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( yamato_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(yamato_p0_w) /* ??? */
AM_RANGE(0x01, 0x01) AM_WRITE(yamato_p1_w) /* ??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( swimmer_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( swimmer_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r)
AM_RANGE(0x4000, 0x4001) AM_RAM /* ??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( yamato_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( yamato_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM
AM_RANGE(0x5000, 0x53ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( swimmer_audio_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( swimmer_audio_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_data_address_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("ay2", ay8910_data_address_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( yamato_audio_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( yamato_audio_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_address_data_w)
diff --git a/src/mame/drivers/cd32.c b/src/mame/drivers/cd32.c
index 6011f6c03da..714b97dc600 100644
--- a/src/mame/drivers/cd32.c
+++ b/src/mame/drivers/cd32.c
@@ -121,7 +121,7 @@ static WRITE8_DEVICE_HANDLER( cd32_cia_0_portb_w )
logerror("%s:CIA0_portb_w(%02x)\n", device->machine->describe_context(), data);
}
-static ADDRESS_MAP_START( cd32_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( cd32_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x1fffff) AM_RAMBANK("bank1") AM_BASE_SIZE_MEMBER(cd32_state, chip_ram, chip_ram_size)
AM_RANGE(0x800000, 0x800003) AM_READ_PORT("DIPSW1")
diff --git a/src/mame/drivers/cdi.c b/src/mame/drivers/cdi.c
index 0620921c125..192ecf72a60 100644
--- a/src/mame/drivers/cdi.c
+++ b/src/mame/drivers/cdi.c
@@ -55,7 +55,7 @@ INLINE void verboselog(running_machine *machine, int n_level, const char *s_fmt,
* Memory maps *
*************************/
-static ADDRESS_MAP_START( cdimono1_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cdimono1_mem, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x0007ffff) AM_RAM AM_BASE_MEMBER(cdi_state,planea)
AM_RANGE(0x00200000, 0x0027ffff) AM_RAM AM_BASE_MEMBER(cdi_state,planeb)
#if ENABLE_UART_PRINTING
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index d092bbb14f1..db7e6b38068 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -686,7 +686,7 @@ static READ8_DEVICE_HANDLER( caterplr_AY8910_r )
*
*************************************/
-static ADDRESS_MAP_START( centiped_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( centiped_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE_MEMBER(centiped_state, rambase)
AM_RANGE(0x0400, 0x07bf) AM_RAM_WRITE(centiped_videoram_w) AM_BASE_MEMBER(centiped_state, videoram)
@@ -711,7 +711,7 @@ static ADDRESS_MAP_START( centiped_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( centipdb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( centipdb_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x4000) AM_RAM
AM_RANGE(0x0400, 0x07bf) AM_MIRROR(0x4000) AM_RAM_WRITE(centiped_videoram_w) AM_BASE_MEMBER(centiped_state, videoram)
@@ -745,7 +745,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( milliped_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( milliped_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x040f) AM_DEVREADWRITE("pokey", pokey_r, pokey_w)
@@ -778,7 +778,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( warlords_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( warlords_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x07bf) AM_RAM_WRITE(centiped_videoram_w) AM_BASE_MEMBER(centiped_state, videoram)
@@ -803,7 +803,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( mazeinv_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mazeinv_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x040f) AM_DEVREADWRITE("pokey", pokey_r, pokey_w)
@@ -837,7 +837,7 @@ ADDRESS_MAP_END
*
****************************************/
-static ADDRESS_MAP_START( bullsdrt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bullsdrt_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x6000) AM_READ_PORT("DSW1")
AM_RANGE(0x1080, 0x1080) AM_MIRROR(0x6000) AM_READ(centiped_IN0_r)
@@ -860,7 +860,7 @@ static ADDRESS_MAP_START( bullsdrt_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0x6fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bullsdrt_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bullsdrt_port_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_WRITE(bullsdrt_sprites_bank_w)
AM_RANGE(0x20, 0x3f) AM_WRITE(bullsdrt_tilesbank_w) AM_BASE_MEMBER(centiped_state, bullsdrt_tiles_bankram)
AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(bullsdrt_data_port_r) AM_DEVWRITE("snsnd", sn76496_w)
@@ -1985,7 +1985,7 @@ ROM_END
static DRIVER_INIT( caterplr )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
device_t *device = machine->device("pokey");
memory_install_readwrite8_device_handler(space, device, 0x1000, 0x100f, 0, 0, caterplr_AY8910_r, caterplr_AY8910_w);
memory_install_read8_device_handler(space, device, 0x1780, 0x1780, 0, 0, caterplr_rand_r);
@@ -1994,7 +1994,7 @@ static DRIVER_INIT( caterplr )
static DRIVER_INIT( magworm )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
device_t *device = machine->device("pokey");
memory_install_write8_device_handler(space, device, 0x1001, 0x1001, 0, 0, ay8910_address_w);
memory_install_readwrite8_device_handler(space, device, 0x1003, 0x1003, 0, 0, ay8910_r, ay8910_data_w);
diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c
index 51ef632349b..64d541e1e2b 100644
--- a/src/mame/drivers/chaknpop.c
+++ b/src/mame/drivers/chaknpop.c
@@ -38,7 +38,7 @@ static WRITE8_HANDLER ( coinlock_w )
***************************************************************************/
-static ADDRESS_MAP_START( chaknpop_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( chaknpop_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_MEMBER(chaknpop_state, mcu_ram)
AM_RANGE(0x8800, 0x8800) AM_READWRITE(chaknpop_mcu_port_a_r, chaknpop_mcu_port_a_w)
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c
index acf9495b299..f25c41fae84 100644
--- a/src/mame/drivers/cham24.c
+++ b/src/mame/drivers/cham24.c
@@ -220,7 +220,7 @@ static WRITE8_HANDLER( cham24_mapper_w )
}
}
-static ADDRESS_MAP_START( cham24_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cham24_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM /* NES RAM */
AM_RANGE(0x2000, 0x3fff) AM_DEVREADWRITE("ppu", ppu2c0x_r, ppu2c0x_w)
AM_RANGE(0x4000, 0x4013) AM_DEVREADWRITE("nes", nes_psg_r, nes_psg_w) /* PSG primary registers */
@@ -304,7 +304,7 @@ static MACHINE_START( cham24 )
memcpy(&dst[0xc000], &src[0x0f8000], 0x4000);
/* uses 8K swapping, all ROM!*/
- memory_install_read_bank(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
+ memory_install_read_bank(machine->device("ppu")->memory().space(AS_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", machine->region("gfx1")->base());
/* need nametable ram, though. I doubt this uses more than 2k, but it starts up configured for 4 */
@@ -315,7 +315,7 @@ static MACHINE_START( cham24 )
state->nt_page[3] = state->nt_ram + 0xc00;
/* and read/write handlers */
- memory_install_readwrite8_handler(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, nt_r, nt_w);
+ memory_install_readwrite8_handler(machine->device("ppu")->memory().space(AS_PROGRAM), 0x2000, 0x3eff, 0, 0, nt_r, nt_w);
}
static DRIVER_INIT( cham24 )
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index 6c8a188493b..d6ce2f98d73 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -213,7 +213,7 @@ static READ8_HANDLER( champbja_alt_protection_r )
*
*************************************/
-static ADDRESS_MAP_START( talbot_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( talbot_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE("share1") /* MCU shared RAM */
AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -240,7 +240,7 @@ static ADDRESS_MAP_START( talbot_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( champbas_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( champbas_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -272,7 +272,7 @@ static ADDRESS_MAP_START( champbas_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6800, 0x68ff) AM_READ(champbja_alt_protection_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( exctsccrb_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( exctsccrb_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
// AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE("share1") // MCU not used (though it's present on the board)
AM_RANGE(0x7000, 0x7001) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -298,7 +298,7 @@ static ADDRESS_MAP_START( exctsccrb_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( exctsccr_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( exctsccr_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x7c00, 0x7fff) AM_RAM
@@ -324,7 +324,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( champbas_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( champbas_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x7fff) AM_READ(soundlatch_r)
AM_RANGE(0x8000, 0x9fff) AM_WRITENOP // 4-bit return code to main CPU (not used)
@@ -334,7 +334,7 @@ static ADDRESS_MAP_START( champbas_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( exctsccr_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( exctsccr_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x8fff) AM_ROM
AM_RANGE(0xa000, 0xa7ff) AM_RAM
AM_RANGE(0xc008, 0xc008) AM_DEVWRITE("dac1", champbas_dac_w)
@@ -344,7 +344,7 @@ static ADDRESS_MAP_START( exctsccr_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
// AM_RANGE(0xc00f, 0xc00f) AM_WRITENOP /* ??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( exctsccr_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( exctsccr_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK( 0x00ff )
AM_RANGE(0x82, 0x83) AM_DEVWRITE("ay1", ay8910_data_address_w)
AM_RANGE(0x86, 0x87) AM_DEVWRITE("ay2", ay8910_data_address_w)
@@ -353,7 +353,7 @@ static ADDRESS_MAP_START( exctsccr_sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE("share1") /* main CPU shared RAM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c
index 3da0e960fd1..7b762bf06d2 100644
--- a/src/mame/drivers/champbwl.c
+++ b/src/mame/drivers/champbwl.c
@@ -204,7 +204,7 @@ static WRITE8_HANDLER( champbwl_objctrl_w )
state->objctrl[offset] = data;
}
-static ADDRESS_MAP_START( champbwl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( champbwl_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM AM_REGION("maincpu", 0x10000)
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram")
diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c
index 10174d88f7c..62464ddeaa6 100644
--- a/src/mame/drivers/chanbara.c
+++ b/src/mame/drivers/chanbara.c
@@ -201,7 +201,7 @@ static SCREEN_UPDATE( chanbara )
return 0;
}
-static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(chanbara_videoram_w) AM_BASE_MEMBER(chanbara_state, videoram)
AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(chanbara_colorram_w) AM_BASE_MEMBER(chanbara_state, colorram)
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index 920d32afcf0..7b7c8ff0542 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -104,7 +104,7 @@ static WRITE8_HANDLER( changela_68705_ddr_c_w )
}
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(changela_68705_port_a_r, changela_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(changela_68705_port_b_r, changela_68705_port_b_w)
@@ -219,7 +219,7 @@ static WRITE8_HANDLER( changela_coin_counter_w )
}
-static ADDRESS_MAP_START( changela_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( changela_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_BASE_MEMBER(changela_state, spriteram) /* OBJ0 RAM */
AM_RANGE(0x9000, 0x97ff) AM_RAM AM_BASE_MEMBER(changela_state, videoram) /* OBJ1 RAM */
diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c
index a408a2343cc..7145187fbe5 100644
--- a/src/mame/drivers/cheekyms.c
+++ b/src/mame/drivers/cheekyms.c
@@ -22,13 +22,13 @@ static INPUT_CHANGED( coin_inserted )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x3000, 0x33ff) AM_RAM
AM_RANGE(0x3800, 0x3bff) AM_RAM AM_BASE_MEMBER(cheekyms_state, videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW")
AM_RANGE(0x01, 0x01) AM_READ_PORT("INPUTS")
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index c8f6279b187..91927860eda 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -552,12 +552,12 @@ static WRITE32_HANDLER( smbus_w )
}
-static ADDRESS_MAP_START( xbox_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( xbox_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x07ffffff) AM_RAM
AM_RANGE(0xff000000, 0xffffffff) AM_ROM AM_REGION("bios", 0) AM_MIRROR(0x00f80000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START(xbox_map_io, ADDRESS_SPACE_IO, 32)
+static ADDRESS_MAP_START(xbox_map_io, AS_IO, 32)
AM_RANGE(0x0cf8, 0x0cff) AM_DEVREADWRITE("pcibus", pci_32le_r, pci_32le_w)
AM_RANGE(0x8000, 0x80ff) AM_READWRITE(dummy_r, dummy_w)
AM_RANGE(0xc000, 0xc0ff) AM_READWRITE(smbus_r, smbus_w)
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index 45d1d4259d2..9269835ebc8 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -305,7 +305,7 @@ static void saiyugoub1_m5205_irq_w( device_t *device )
state->adpcm_sound_irq = 1;
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE_MEMBER(ddragon_state, fgvideoram)
AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(ddragon_bgvideoram_w) AM_BASE_MEMBER(ddragon_state, bgvideoram)
@@ -326,7 +326,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x2000, 0x2000) AM_WRITE(chinagat_sub_bankswitch_w)
AM_RANGE(0x2800, 0x2800) AM_WRITEONLY /* Called on CPU start and after return from jump table */
@@ -336,7 +336,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -344,7 +344,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ym2203c_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ym2203c_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
// 8804 and/or 8805 make a gong sound when the coin goes in
@@ -362,7 +362,7 @@ static ADDRESS_MAP_START( ym2203c_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( saiyugoub1_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( saiyugoub1_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -370,12 +370,12 @@ static ADDRESS_MAP_START( saiyugoub1_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( i8748_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( i8748_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_ROM
AM_RANGE(0x0400, 0x07ff) AM_ROM /* i8749 version */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( i8748_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( i8748_portmap, AS_IO, 8 )
AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READ(saiyugoub1_mcu_command_r)
AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_DEVWRITE("adpcm", saiyugoub1_m5205_clk_w) /* Drives the clock on the m5205 at 1/8 of this frequency */
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(saiyugoub1_m5205_irq_r)
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index f19243f22ce..f5c8009f295 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -236,14 +236,14 @@ static WRITE8_DEVICE_HANDLER( chin_adpcm_w )
*
*************************************/
-static ADDRESS_MAP_START( chinsan_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( chinsan_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xf7ff) AM_RAM AM_BASE_MEMBER(chinsan_state, video)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( chinsan_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( chinsan_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(chinsan_port00_w)
AM_RANGE(0x01, 0x01) AM_READ(chinsan_input_port_0_r)
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index f6a33bdc85c..28fadfc456a 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -148,7 +148,7 @@ static WRITE8_HANDLER( chqflag_sh_irqtrigger_w )
/****************************************************************************/
-static ADDRESS_MAP_START( chqflag_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( chqflag_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM /* RAM */
AM_RANGE(0x1000, 0x17ff) AM_RAMBANK("bank1") /* banked RAM (RAM/051316 (chip 1)) */
AM_RANGE(0x1800, 0x1fff) AM_RAMBANK("bank2") /* palette + RAM */
@@ -190,7 +190,7 @@ static WRITE8_HANDLER( k007232_bankswitch_w )
k007232_set_bank(state->k007232_2, bank_A, bank_B);
}
-static ADDRESS_MAP_START( chqflag_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( chqflag_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */
AM_RANGE(0x9000, 0x9000) AM_WRITE(k007232_bankswitch_w) /* 007232 bankswitch */
diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c
index 2f1eaa1fe41..1df9be71702 100644
--- a/src/mame/drivers/chsuper.c
+++ b/src/mame/drivers/chsuper.c
@@ -102,7 +102,7 @@ static WRITE8_HANDLER( chsuper_vram_w )
vram[offset] = data;
}
-static ADDRESS_MAP_START( chsuper_prg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( chsuper_prg_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x0efff) AM_ROM
AM_RANGE(0x00000, 0x01fff) AM_WRITE( chsuper_vram_w )
AM_RANGE(0x0f000, 0x0ffff) AM_RAM AM_REGION("maincpu", 0xf000)
@@ -111,7 +111,7 @@ ADDRESS_MAP_END
// AM_RANGE(0xaff8, 0xaff8) AM_DEVWRITE_MODERN("oki", okim6295_device, write)
-static ADDRESS_MAP_START( chsuper_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( chsuper_portmap, AS_IO, 8 )
AM_RANGE( 0x0000, 0x003f ) AM_RAM // Z180 internal regs
AM_RANGE( 0x00e8, 0x00e8 ) AM_READ_PORT("IN0")
AM_RANGE( 0x00e9, 0x00e9 ) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c
index 64fce767ab2..4ecd55cbe1e 100644
--- a/src/mame/drivers/cidelsa.c
+++ b/src/mame/drivers/cidelsa.c
@@ -212,21 +212,21 @@ static COP400_INTERFACE( draco_cop_intf )
// Destroyer
-static ADDRESS_MAP_START( destryer_map, ADDRESS_SPACE_PROGRAM, 8, cidelsa_state )
+static ADDRESS_MAP_START( destryer_map, AS_PROGRAM, 8, cidelsa_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x20ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_device, char_ram_r, char_ram_w)
AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_device, page_ram_r, page_ram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( destryera_map, ADDRESS_SPACE_PROGRAM, 8, cidelsa_state )
+static ADDRESS_MAP_START( destryera_map, AS_PROGRAM, 8, cidelsa_state )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x3000, 0x30ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_device, char_ram_r, char_ram_w)
AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_device, page_ram_r, page_ram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( destryer_io_map, ADDRESS_SPACE_IO, 8, cidelsa_state )
+static ADDRESS_MAP_START( destryer_io_map, AS_IO, 8, cidelsa_state )
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN0") AM_WRITE(destryer_out1_w)
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN1")
AM_RANGE(0x03, 0x07) AM_WRITE(cdp1869_w)
@@ -234,14 +234,14 @@ ADDRESS_MAP_END
// Altair
-static ADDRESS_MAP_START( altair_map, ADDRESS_SPACE_PROGRAM, 8, cidelsa_state )
+static ADDRESS_MAP_START( altair_map, AS_PROGRAM, 8, cidelsa_state )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x30ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_device, char_ram_r, char_ram_w)
AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_device, page_ram_r, page_ram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( altair_io_map, ADDRESS_SPACE_IO, 8, cidelsa_state )
+static ADDRESS_MAP_START( altair_io_map, AS_IO, 8, cidelsa_state )
AM_RANGE(0x01, 0x01) AM_DEVREAD_LEGACY("ic23", cdp1852_data_r) AM_DEVWRITE_LEGACY("ic26", cdp1852_data_w)
AM_RANGE(0x02, 0x02) AM_DEVREAD_LEGACY("ic24", cdp1852_data_r)
AM_RANGE(0x04, 0x04) AM_DEVREAD_LEGACY("ic25", cdp1852_data_r)
@@ -250,25 +250,25 @@ ADDRESS_MAP_END
// Draco
-static ADDRESS_MAP_START( draco_map, ADDRESS_SPACE_PROGRAM, 8, cidelsa_state )
+static ADDRESS_MAP_START( draco_map, AS_PROGRAM, 8, cidelsa_state )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xf400, 0xf7ff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_device, char_ram_r, char_ram_w)
AM_RANGE(0xf800, 0xffff) AM_DEVREADWRITE(CDP1869_TAG, cdp1869_device, page_ram_r, page_ram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( draco_io_map, ADDRESS_SPACE_IO, 8, cidelsa_state )
+static ADDRESS_MAP_START( draco_io_map, AS_IO, 8, cidelsa_state )
AM_RANGE(0x01, 0x01) AM_DEVREAD_LEGACY("ic29", cdp1852_data_r) AM_DEVWRITE_LEGACY("ic32", cdp1852_data_w)
AM_RANGE(0x02, 0x02) AM_DEVREAD_LEGACY("ic30", cdp1852_data_r)
AM_RANGE(0x04, 0x04) AM_DEVREAD_LEGACY("ic31", cdp1852_data_r)
AM_RANGE(0x03, 0x07) AM_WRITE(cdp1869_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( draco_sound_map, ADDRESS_SPACE_PROGRAM, 8, cidelsa_state )
+static ADDRESS_MAP_START( draco_sound_map, AS_PROGRAM, 8, cidelsa_state )
AM_RANGE(0x000, 0x3ff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( draco_sound_io_map, ADDRESS_SPACE_IO, 8, cidelsa_state )
+static ADDRESS_MAP_START( draco_sound_io_map, AS_IO, 8, cidelsa_state )
AM_RANGE(COP400_PORT_D, COP400_PORT_D) AM_WRITE(draco_sound_bankswitch_w)
AM_RANGE(COP400_PORT_G, COP400_PORT_G) AM_WRITE(draco_sound_g_w)
AM_RANGE(COP400_PORT_L, COP400_PORT_L) AM_READWRITE(draco_sound_ay8910_r, draco_sound_ay8910_w)
diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c
index a203a319e75..d7f120d4230 100644
--- a/src/mame/drivers/cinemat.c
+++ b/src/mame/drivers/cinemat.c
@@ -290,38 +290,38 @@ static WRITE8_HANDLER( qb3_ram_bank_w )
*
*************************************/
-static ADDRESS_MAP_START( program_map_4k, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( program_map_4k, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xfff)
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( program_map_8k, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( program_map_8k, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x1000) AM_ROM
AM_RANGE(0x2000, 0x2fff) AM_MIRROR(0x1000) AM_ROM AM_REGION("maincpu", 0x1000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( program_map_16k, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( program_map_16k, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x3fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( program_map_32k, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( program_map_32k, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x7fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( data_map, AS_DATA, 16 )
AM_RANGE(0x0000, 0x00ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( data_map_qb3, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( data_map_qb3, AS_DATA, 16 )
AM_RANGE(0x0000, 0x03ff) AM_RAMBANK("bank1") AM_BASE_MEMBER(cinemat_state, rambase)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x0f) AM_READ(inputs_r)
AM_RANGE(0x10, 0x16) AM_READ(switches_r)
AM_RANGE(0x17, 0x17) AM_READ(coin_input_r)
@@ -1460,35 +1460,35 @@ static DRIVER_INIT( speedfrk )
{
cinemat_state *state = machine->driver_data<cinemat_state>();
state->gear = 0xe;
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x00, 0x03, 0, 0, speedfrk_wheel_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x04, 0x06, 0, 0, speedfrk_gear_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x00, 0x03, 0, 0, speedfrk_wheel_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x04, 0x06, 0, 0, speedfrk_gear_r);
}
static DRIVER_INIT( sundance )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x00, 0x0f, 0, 0, sundance_inputs_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x00, 0x0f, 0, 0, sundance_inputs_r);
}
static DRIVER_INIT( tailg )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x07, 0x07, 0, 0, mux_select_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x07, 0x07, 0, 0, mux_select_w);
}
static DRIVER_INIT( boxingb )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x0c, 0x0f, 0, 0, boxingb_dial_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x07, 0x07, 0, 0, mux_select_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x0c, 0x0f, 0, 0, boxingb_dial_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x07, 0x07, 0, 0, mux_select_w);
}
static DRIVER_INIT( qb3 )
{
cinemat_state *state = machine->driver_data<cinemat_state>();
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x0f, 0x0f, 0, 0, qb3_frame_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x00, 0x00, 0, 0, qb3_ram_bank_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x0f, 0x0f, 0, 0, qb3_frame_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x00, 0x00, 0, 0, qb3_ram_bank_w);
memory_configure_bank(machine, "bank1", 0, 4, state->rambase, 0x100*2);
}
diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c
index 604f1ae259a..5e2211439bf 100644
--- a/src/mame/drivers/circus.c
+++ b/src/mame/drivers/circus.c
@@ -58,7 +58,7 @@ static READ8_HANDLER( circus_paddle_r )
return input_port_read(space->machine, "PADDLE");
}
-static ADDRESS_MAP_START( circus_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( circus_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x2000) AM_WRITE(circus_clown_x_w)
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index 018b0e13aec..4392f4c9373 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -145,7 +145,7 @@ static WRITE8_HANDLER(circusc_sound_w)
-static ADDRESS_MAP_START( circusc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( circusc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x03f8) AM_WRITE(circusc_flipscreen_w) /* FLIP */
AM_RANGE(0x0001, 0x0001) AM_MIRROR(0x03f8) AM_WRITE(interrupt_enable_w) /* INTST */
// AM_RANGE(0x0002, 0x0002) AM_MIRROR(0x03f8) AM_WRITENOP /* MUT - not used /*
@@ -170,7 +170,7 @@ static ADDRESS_MAP_START( circusc_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x1c00) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x1fff) AM_READ(soundlatch_r) /* CS0 */
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 1d191a328a2..5bba75f3724 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -254,7 +254,7 @@ static WRITE16_HANDLER( bigrun_paletteram16_w )
if ( (offset >= 0x3600/2) && (offset <= 0x37ff/2) ) { palette_set_color(space->machine, 0xe00 + offset - 0x3600/2, MAKE_RGB(r,g,b) ); return;}
}
-static ADDRESS_MAP_START( bigrun_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bigrun_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x080000, 0x083fff) AM_READWRITE(bigrun_vregs_r, bigrun_vregs_w) AM_BASE_MEMBER(cischeat_state, vregs) // Vregs
AM_RANGE(0x084000, 0x087fff) AM_RAM // Linking with other units
@@ -307,7 +307,7 @@ static WRITE16_HANDLER( cischeat_paletteram16_w )
if ( (offset >= 0x5000/2) && (offset <= 0x5fff/2) ) { palette_set_color(space->machine, 0xe00 + offset - 0x5000/2, MAKE_RGB(r,g,b) ); return;}
}
-static ADDRESS_MAP_START( cischeat_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cischeat_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x080000, 0x087fff) AM_READWRITE(cischeat_vregs_r, cischeat_vregs_w) AM_BASE_MEMBER(cischeat_state, vregs) // Vregs
AM_RANGE(0x088000, 0x088fff) AM_RAM // Linking with other units
@@ -367,7 +367,7 @@ static WRITE16_HANDLER( f1gpstar_paletteram16_w )
098800-099000
0F8000-0F9000 */
-static ADDRESS_MAP_START( f1gpstar_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f1gpstar_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x080000, 0x087fff) AM_READWRITE(f1gpstar_vregs_r, f1gpstar_vregs_w) AM_BASE_MEMBER(cischeat_state, vregs) // Vregs
AM_RANGE(0x088000, 0x088fff) AM_RAM // Linking with other units
@@ -393,7 +393,7 @@ ADDRESS_MAP_END
**************************************************************************/
// Same as f1gpstar, but vregs are slightly different:
-static ADDRESS_MAP_START( f1gpstr2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f1gpstr2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x080000, 0x087fff) AM_READWRITE(f1gpstr2_vregs_r, f1gpstr2_vregs_w) AM_BASE_MEMBER(cischeat_state, vregs) // Vregs (slightly different from f1gpstar)
AM_RANGE(0x088000, 0x088fff) AM_RAM // Linking with other units
@@ -536,7 +536,7 @@ static WRITE16_HANDLER( scudhamm_oki_bank_w )
}
}
-static ADDRESS_MAP_START( scudhamm_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( scudhamm_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE(scudhamm_vregs_w) AM_BASE_MEMBER(cischeat_state, vregs) // Video Registers + RAM
AM_RANGE(0x0a0000, 0x0a3fff) AM_RAM_WRITE(cischeat_scrollram_0_w) AM_BASE_MEMBER(cischeat_state, scrollram[0]) // Scroll RAM 0
@@ -619,7 +619,7 @@ static WRITE16_HANDLER( armchmp2_leds_w )
}
}
-static ADDRESS_MAP_START( armchmp2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( armchmp2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE(scudhamm_vregs_w) AM_BASE_MEMBER(cischeat_state, vregs) // Video Registers + RAM
AM_RANGE(0x0a0000, 0x0a3fff) AM_RAM_WRITE(cischeat_scrollram_0_w) AM_BASE_MEMBER(cischeat_state, scrollram[0]) // Scroll RAM 0
@@ -648,14 +648,14 @@ ADDRESS_MAP_END
Big Run
**************************************************************************/
-static ADDRESS_MAP_START( bigrun_map2, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bigrun_map2, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x040000, 0x047fff) AM_READWRITE(sharedram1_r, sharedram1_w) // Shared RAM (with Main CPU)
AM_RANGE(0x080000, 0x0807ff) AM_RAM AM_BASE_MEMBER(cischeat_state, roadram[0]) // Road RAM
AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bigrun_map3, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bigrun_map3, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x040000, 0x047fff) AM_READWRITE(sharedram2_r, sharedram2_w) // Shared RAM (with Main CPU)
AM_RANGE(0x080000, 0x0807ff) AM_RAM AM_BASE_MEMBER(cischeat_state, roadram[1]) // Road RAM
@@ -667,7 +667,7 @@ ADDRESS_MAP_END
Cisco Heat
**************************************************************************/
-static ADDRESS_MAP_START( cischeat_map2, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cischeat_map2, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x040000, 0x047fff) AM_READWRITE(sharedram1_r, sharedram1_w) // Shared RAM (with Main CPU)
AM_RANGE(0x080000, 0x0807ff) AM_RAM AM_BASE_MEMBER(cischeat_state, roadram[0]) // Road RAM
@@ -676,7 +676,7 @@ static ADDRESS_MAP_START( cischeat_map2, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x200000, 0x23ffff) AM_READ(rom_2_r) // ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cischeat_map3, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cischeat_map3, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x040000, 0x047fff) AM_READWRITE(sharedram2_r, sharedram2_w) // Shared RAM (with Main CPU)
AM_RANGE(0x080000, 0x0807ff) AM_RAM AM_BASE_MEMBER(cischeat_state, roadram[1]) // Road RAM
@@ -691,7 +691,7 @@ ADDRESS_MAP_END
F1 GrandPrix Star
**************************************************************************/
-static ADDRESS_MAP_START( f1gpstar_map2, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f1gpstar_map2, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x080000, 0x0807ff) AM_READWRITE(sharedram1_r, sharedram1_w) // Shared RAM (with Main CPU)
AM_RANGE(0x100000, 0x1007ff) AM_RAM AM_BASE_MEMBER(cischeat_state, roadram[0]) // Road RAM
@@ -699,7 +699,7 @@ static ADDRESS_MAP_START( f1gpstar_map2, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x200000, 0x200001) AM_WRITENOP // watchdog
ADDRESS_MAP_END
-static ADDRESS_MAP_START( f1gpstar_map3, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f1gpstar_map3, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x080000, 0x0807ff) AM_READWRITE(sharedram2_r, sharedram2_w) // Shared RAM (with Main CPU)
AM_RANGE(0x100000, 0x1007ff) AM_RAM AM_BASE_MEMBER(cischeat_state, roadram[1]) // Road RAM
@@ -734,7 +734,7 @@ static WRITE16_HANDLER( bigrun_soundbank_w )
}
}
-static ADDRESS_MAP_START( bigrun_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bigrun_sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x040000, 0x040001) AM_READWRITE(soundlatch_word_r, bigrun_soundbank_w) // From Main CPU
AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w) // To Main CPU
@@ -755,7 +755,7 @@ static WRITE16_DEVICE_HANDLER( cischeat_soundbank_w )
if (ACCESSING_BITS_0_7) oki->set_bank_base(0x40000 * (data & 1) );
}
-static ADDRESS_MAP_START( cischeat_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cischeat_sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x040002, 0x040003) AM_DEVWRITE("oki1", cischeat_soundbank_w) // Sample Banking
AM_RANGE(0x040004, 0x040005) AM_DEVWRITE("oki2", cischeat_soundbank_w) // Sample Banking
@@ -772,7 +772,7 @@ ADDRESS_MAP_END
F1 GrandPrix Star
**************************************************************************/
-static ADDRESS_MAP_START( f1gpstar_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f1gpstar_sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x040004, 0x040005) AM_DEVWRITE("oki1", cischeat_soundbank_w) // Sample Banking (cischeat: 40002)
AM_RANGE(0x040008, 0x040009) AM_DEVWRITE("oki2", cischeat_soundbank_w) // Sample Banking (cischeat: 40004)
@@ -788,7 +788,7 @@ ADDRESS_MAP_END
F1 GrandPrix Star II
**************************************************************************/
-static ADDRESS_MAP_START( f1gpstr2_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f1gpstr2_sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x040004, 0x040005) AM_DEVWRITE("oki1", cischeat_soundbank_w) // Sample Banking
AM_RANGE(0x040008, 0x040009) AM_DEVWRITE("oki2", cischeat_soundbank_w) // Sample Banking
@@ -820,7 +820,7 @@ static WRITE16_HANDLER( f1gpstr2_io_w )
COMBINE_DATA(&state->vregs[offset + 0x1000/2]);
}
-static ADDRESS_MAP_START( f1gpstr2_io_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f1gpstr2_io_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x080000, 0x080fff) AM_READWRITE(f1gpstr2_io_r, f1gpstr2_io_w) //
AM_RANGE(0x100000, 0x100001) AM_WRITEONLY AM_BASE_MEMBER(cischeat_state, f1gpstr2_ioready) //
@@ -2554,7 +2554,7 @@ ROM_END
static DRIVER_INIT( wildplt )
{
- memory_install_read16_handler(machine->device("cpu1")->memory().space(ADDRESS_SPACE_PROGRAM), 0x080000, 0x087fff, 0, 0, wildplt_vregs_r );
+ memory_install_read16_handler(machine->device("cpu1")->memory().space(AS_PROGRAM), 0x080000, 0x087fff, 0, 0, wildplt_vregs_r );
DRIVER_INIT_CALL(f1gpstar);
}
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index 7e3acfe482a..97b17e85a58 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -27,7 +27,7 @@ static READ8_HANDLER( citycon_irq_ack_r )
return 0;
}
-static ADDRESS_MAP_START( citycon_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( citycon_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(citycon_videoram_w) AM_BASE_MEMBER(citycon_state, videoram)
AM_RANGE(0x2000, 0x20ff) AM_RAM_WRITE(citycon_linecolor_w) AM_BASE_MEMBER(citycon_state, linecolor)
@@ -42,7 +42,7 @@ static ADDRESS_MAP_START( citycon_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("aysnd", ay8910_address_data_w)
// AM_RANGE(0x4002, 0x4002) AM_DEVREAD("aysnd", ay8910_r) /* ?? */
diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c
index 60bfb7e45fd..7b73482d23d 100644
--- a/src/mame/drivers/clayshoo.c
+++ b/src/mame/drivers/clayshoo.c
@@ -216,7 +216,7 @@ static SCREEN_UPDATE( clayshoo )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x4000, 0x47ff) AM_ROM
@@ -233,7 +233,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index 7f72fc10264..905bb63d645 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -229,13 +229,13 @@ static MACHINE_RESET( cliffhgr )
/********************************************************/
-static ADDRESS_MAP_START( mainmem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mainmem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM /* ROM */
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("nvram") /* NVRAM */
AM_RANGE(0xe800, 0xefff) AM_RAM /* RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mainport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mainport, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x44, 0x44) AM_WRITE(TMS9928A_vram_w)
AM_RANGE(0x45, 0x45) AM_READ(TMS9928A_vram_r)
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index 303d88ad710..8cb68018fad 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -165,7 +165,7 @@ static WRITE8_HANDLER( cloak_nvram_enable_w )
*
*************************************/
-static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(cloak_videoram_w) AM_BASE_MEMBER(cloak_state, videoram)
AM_RANGE(0x0800, 0x0fff) AM_RAM AM_SHARE("share1")
@@ -196,7 +196,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0007) AM_RAM
AM_RANGE(0x0008, 0x000f) AM_READWRITE(graph_processor_r, graph_processor_w)
AM_RANGE(0x0010, 0x07ff) AM_RAM
diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c
index 075bac6348b..448781bb7ba 100644
--- a/src/mame/drivers/cloud9.c
+++ b/src/mame/drivers/cloud9.c
@@ -271,7 +271,7 @@ static WRITE8_HANDLER( nvram_store_w )
*
*************************************/
-static ADDRESS_MAP_START( cloud9_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cloud9_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0001) AM_WRITE(cloud9_bitmode_addr_w)
AM_RANGE(0x0002, 0x0002) AM_READWRITE(cloud9_bitmode_r, cloud9_bitmode_w)
AM_RANGE(0x0000, 0x4fff) AM_ROMBANK("bank1") AM_WRITE(cloud9_videoram_w)
diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c
index 852c0c8b3c5..026453daa76 100644
--- a/src/mame/drivers/clshroad.c
+++ b/src/mame/drivers/clshroad.c
@@ -37,7 +37,7 @@ static READ8_HANDLER( clshroad_input_r )
}
-static ADDRESS_MAP_START( clshroad_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( clshroad_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x95ff) AM_RAM
AM_RANGE(0x9600, 0x97ff) AM_RAM AM_SHARE("share1")
@@ -51,7 +51,7 @@ static ADDRESS_MAP_START( clshroad_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(clshroad_vram_0_w) AM_BASE_MEMBER(clshroad_state, vram_0) // Layer 0
ADDRESS_MAP_END
-static ADDRESS_MAP_START( clshroad_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( clshroad_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_DEVWRITE("custom", wiping_sound_w)
AM_RANGE(0x9600, 0x97ff) AM_RAM AM_SHARE("share1")
diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c
index a792072bd43..a6a26a1ec3f 100644
--- a/src/mame/drivers/cmmb.c
+++ b/src/mame/drivers/cmmb.c
@@ -164,7 +164,7 @@ static READ8_HANDLER( kludge_r )
}
/* overlap empty addresses */
-static ADDRESS_MAP_START( cmmb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cmmb_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xffff)
AM_RANGE(0x0000, 0x01ff) AM_RAM /* zero page address */
// AM_RANGE(0x13c0, 0x13ff) AM_RAM //spriteram
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index b3134f89cd8..6e2ab0fa66e 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -166,7 +166,7 @@ static WRITE16_HANDLER( cninja_pf34_control_w )
}
-static ADDRESS_MAP_START( cninja_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cninja_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x140000, 0x14000f) AM_WRITE(cninja_pf12_control_w)
@@ -198,7 +198,7 @@ static WRITE16_HANDLER( cninjabl_soundlatch_w )
// todo:
}
-static ADDRESS_MAP_START( cninjabl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cninjabl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x138000, 0x1387ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) /* bootleg sprite-ram (sprites rewritten here in new format) */
@@ -228,7 +228,7 @@ static ADDRESS_MAP_START( cninjabl_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1b4000, 0x1b4001) AM_WRITE(buffer_spriteram16_w) /* DMA flag */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( edrandy_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( edrandy_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x140000, 0x14000f) AM_WRITE(cninja_pf12_control_w)
@@ -256,7 +256,7 @@ static ADDRESS_MAP_START( edrandy_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( robocop2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( robocop2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x140000, 0x14000f) AM_WRITE(cninja_pf12_control_w)
@@ -283,7 +283,7 @@ static ADDRESS_MAP_START( robocop2_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1f8000, 0x1f8001) AM_READ_PORT("DSW3") /* Dipswitch #3 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mutantf_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mutantf_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
@@ -312,7 +312,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_r, ym2151_w)
@@ -324,7 +324,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map_mutantf, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map_mutantf, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READNOP AM_WRITENOP
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -336,7 +336,7 @@ static ADDRESS_MAP_START( sound_map_mutantf, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( stoneage_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( stoneage_s_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -2032,13 +2032,13 @@ static void cninja_patch( running_machine *machine )
static DRIVER_INIT( cninja )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1bc0a8, 0x1bc0a9, 0, 0, cninja_sound_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1bc0a8, 0x1bc0a9, 0, 0, cninja_sound_w);
cninja_patch(machine);
}
static DRIVER_INIT( stoneage )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1bc0a8, 0x1bc0a9, 0, 0, stoneage_sound_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1bc0a8, 0x1bc0a9, 0, 0, stoneage_sound_w);
}
static DRIVER_INIT( mutantf )
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index eee8a5fd718..f0da1441214 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -519,7 +519,7 @@ static READ8_HANDLER( cntsteer_adx_r )
/***************************************************************************/
-static ADDRESS_MAP_START( gekitsui_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gekitsui_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x11ff) AM_RAM AM_BASE_MEMBER(cntsteer_state, spriteram)
AM_RANGE(0x1200, 0x1fff) AM_RAM
@@ -529,7 +529,7 @@ static ADDRESS_MAP_START( gekitsui_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gekitsui_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gekitsui_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(cntsteer_background_w) AM_BASE_MEMBER(cntsteer_state, videoram2)
AM_RANGE(0x3000, 0x3000) AM_READ_PORT("DSW0")
@@ -542,7 +542,7 @@ static ADDRESS_MAP_START( gekitsui_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cntsteer_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cntsteer_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x11ff) AM_RAM AM_BASE_MEMBER(cntsteer_state, spriteram)
AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(cntsteer_foreground_vram_w) AM_BASE_MEMBER(cntsteer_state, videoram)
@@ -552,7 +552,7 @@ static ADDRESS_MAP_START( cntsteer_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cntsteer_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cntsteer_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(cntsteer_background_w) AM_BASE_MEMBER(cntsteer_state, videoram2) AM_SHARE("share3")
AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(cntsteer_background_w) AM_SHARE("share3")
@@ -583,7 +583,7 @@ static INTERRUPT_GEN ( sound_interrupt )
device_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
// AM_RANGE(0x1000, 0x1000) AM_WRITE(nmiack_w)
AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("ay1", ay8910_data_w)
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index b63cb875322..fe4acd4a060 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -198,7 +198,7 @@ static READ8_HANDLER( ff_r )
// Common memory map
-static ADDRESS_MAP_START( coinmstr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( coinmstr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(quizmstr_bg_w) AM_BASE_MEMBER(coinmstr_state, videoram)
@@ -209,7 +209,7 @@ ADDRESS_MAP_END
// Different I/O mappping for every game
-static ADDRESS_MAP_START( quizmstr_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( quizmstr_io_map, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(question_r)
@@ -226,7 +226,7 @@ static ADDRESS_MAP_START( quizmstr_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xc0, 0xc3) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( trailblz_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( trailblz_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(question_r)
AM_RANGE(0x00, 0x03) AM_WRITE(question_w)
@@ -240,7 +240,7 @@ static ADDRESS_MAP_START( trailblz_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xc1, 0xc3) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( supnudg2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( supnudg2_io_map, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(question_r)
@@ -262,7 +262,7 @@ static ADDRESS_MAP_START( supnudg2_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xc0, 0xc3) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pokeroul_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pokeroul_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x40) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x41, 0x41) AM_DEVWRITE("crtc", mc6845_register_w)
diff --git a/src/mame/drivers/coinmvga.c b/src/mame/drivers/coinmvga.c
index a8b376c9ed2..afc32265ba6 100644
--- a/src/mame/drivers/coinmvga.c
+++ b/src/mame/drivers/coinmvga.c
@@ -352,7 +352,7 @@ static READ16_HANDLER( test_r )
* Memory Map Information *
*************************/
-static ADDRESS_MAP_START( coinmvga_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( coinmvga_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("maincpu", 0) //maybe not
@@ -373,7 +373,7 @@ static ADDRESS_MAP_START( coinmvga_map, ADDRESS_SPACE_PROGRAM, 16 )
//0x800008 "arrow" w?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( coinmvga_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( coinmvga_io_map, AS_IO, 8 )
/* Digital I/O ports (ports 4-B are valid on 16-bit H8/3xx) */
// AM_RANGE(H8_PORT_4, H8_PORT_4)
// AM_RANGE(H8_PORT_5, H8_PORT_5)
diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c
index d126f2f55ee..5857847dc30 100644
--- a/src/mame/drivers/cojag.c
+++ b/src/mame/drivers/cojag.c
@@ -805,7 +805,7 @@ static WRITE32_HANDLER( area51mx_main_speedup_w )
*
*************************************/
-static ADDRESS_MAP_START( r3000_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( r3000_map, AS_PROGRAM, 32 )
AM_RANGE(0x04000000, 0x047fffff) AM_RAM AM_BASE(&jaguar_shared_ram) AM_SHARE("share1")
AM_RANGE(0x04800000, 0x04bfffff) AM_ROMBANK("bank1")
AM_RANGE(0x04c00000, 0x04dfffff) AM_ROMBANK("bank2")
@@ -834,7 +834,7 @@ static ADDRESS_MAP_START( r3000_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m68020_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( m68020_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x7fffff) AM_RAM AM_BASE(&jaguar_shared_ram) AM_SHARE("share1")
AM_RANGE(0x800000, 0x9fffff) AM_ROM AM_REGION("user1", 0) AM_BASE_MEMBER(cojag_state, rom_base)
AM_RANGE(0xa00000, 0xa1ffff) AM_RAM
@@ -867,7 +867,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( gpu_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gpu_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x7fffff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x800000, 0xbfffff) AM_ROMBANK("bank8")
AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK("bank9")
@@ -888,7 +888,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( dsp_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dsp_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x7fffff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x800000, 0xbfffff) AM_ROMBANK("bank8")
AM_RANGE(0xc00000, 0xdfffff) AM_ROMBANK("bank9")
@@ -1536,10 +1536,10 @@ static void cojag_common_init(running_machine *machine, UINT16 gpu_jump_offs, UI
/* install synchronization hooks for GPU */
if (cojag_is_r3000)
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x04f0b000 + gpu_jump_offs, 0x04f0b003 + gpu_jump_offs, 0, 0, gpu_jump_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x04f0b000 + gpu_jump_offs, 0x04f0b003 + gpu_jump_offs, 0, 0, gpu_jump_w);
else
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0b000 + gpu_jump_offs, 0xf0b003 + gpu_jump_offs, 0, 0, gpu_jump_w);
- memory_install_read32_handler(machine->device("gpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf03000 + gpu_jump_offs, 0xf03003 + gpu_jump_offs, 0, 0, gpu_jump_r);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0b000 + gpu_jump_offs, 0xf0b003 + gpu_jump_offs, 0, 0, gpu_jump_w);
+ memory_install_read32_handler(machine->device("gpu")->memory().space(AS_PROGRAM), 0xf03000 + gpu_jump_offs, 0xf03003 + gpu_jump_offs, 0, 0, gpu_jump_r);
state->gpu_jump_address = &jaguar_gpu_ram[gpu_jump_offs/4];
state->gpu_spin_pc = 0xf03000 + spin_pc;
@@ -1555,7 +1555,7 @@ static DRIVER_INIT( area51a )
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
- state->main_speedup = memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa02030, 0xa02033, 0, 0, area51_main_speedup_w);
+ state->main_speedup = memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa02030, 0xa02033, 0, 0, area51_main_speedup_w);
#endif
}
@@ -1568,7 +1568,7 @@ static DRIVER_INIT( area51 )
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
state->main_speedup_max_cycles = 120;
- state->main_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x100062e8, 0x100062eb, 0, 0, cojagr3k_main_speedup_r);
+ state->main_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x100062e8, 0x100062eb, 0, 0, cojagr3k_main_speedup_r);
#endif
}
@@ -1583,7 +1583,7 @@ static DRIVER_INIT( maxforce )
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
state->main_speedup_max_cycles = 120;
- state->main_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1000865c, 0x1000865f, 0, 0, cojagr3k_main_speedup_r);
+ state->main_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1000865c, 0x1000865f, 0, 0, cojagr3k_main_speedup_r);
#endif
}
@@ -1598,7 +1598,7 @@ static DRIVER_INIT( area51mx )
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
- state->main_speedup = memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa19550, 0xa19557, 0, 0, area51mx_main_speedup_w);
+ state->main_speedup = memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa19550, 0xa19557, 0, 0, area51mx_main_speedup_w);
#endif
}
@@ -1614,7 +1614,7 @@ static DRIVER_INIT( a51mxr3k )
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
state->main_speedup_max_cycles = 120;
- state->main_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x10006f0c, 0x10006f0f, 0, 0, cojagr3k_main_speedup_r);
+ state->main_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x10006f0c, 0x10006f0f, 0, 0, cojagr3k_main_speedup_r);
#endif
}
@@ -1627,7 +1627,7 @@ static DRIVER_INIT( fishfren )
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
state->main_speedup_max_cycles = 200;
- state->main_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x10021b60, 0x10021b63, 0, 0, cojagr3k_main_speedup_r);
+ state->main_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x10021b60, 0x10021b63, 0, 0, cojagr3k_main_speedup_r);
#endif
}
@@ -1641,8 +1641,8 @@ static void init_freeze_common(running_machine *machine, offs_t main_speedup_add
/* install speedup for main CPU */
state->main_speedup_max_cycles = 200;
if (main_speedup_addr != 0)
- state->main_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), main_speedup_addr, main_speedup_addr + 3, 0, 0, cojagr3k_main_speedup_r);
- state->main_gpu_wait = memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0400d900, 0x0400d900 + 3, 0, 0, main_gpu_wait_r);
+ state->main_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), main_speedup_addr, main_speedup_addr + 3, 0, 0, cojagr3k_main_speedup_r);
+ state->main_gpu_wait = memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0400d900, 0x0400d900 + 3, 0, 0, main_gpu_wait_r);
#endif
}
@@ -1662,7 +1662,7 @@ static DRIVER_INIT( vcircle )
#if ENABLE_SPEEDUP_HACKS
/* install speedup for main CPU */
state->main_speedup_max_cycles = 50;
- state->main_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x12005b34, 0x12005b37, 0, 0, cojagr3k_main_speedup_r);
+ state->main_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x12005b34, 0x12005b37, 0, 0, cojagr3k_main_speedup_r);
#endif
}
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index 752d767ea19..c589ce6eac2 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -384,7 +384,7 @@ static READ8_DEVICE_HANDLER ( combatsc_ym2203_r )
*
*************************************/
-static ADDRESS_MAP_START( combatsc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( combatsc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0007) AM_WRITE(combatsc_pf_control_w)
AM_RANGE(0x0020, 0x005f) AM_READWRITE(combatsc_scrollram_r, combatsc_scrollram_w)
// AM_RANGE(0x0060, 0x00ff) AM_WRITEONLY /* RAM */
@@ -411,7 +411,7 @@ static ADDRESS_MAP_START( combatsc_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( combatscb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( combatscb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x04ff) AM_RAM
AM_RANGE(0x0500, 0x0500) AM_WRITE(combatscb_bankselect_w)
AM_RANGE(0x0600, 0x06ff) AM_RAM AM_BASE_MEMBER(combatsc_state, paletteram) /* palette */
@@ -422,7 +422,7 @@ static ADDRESS_MAP_START( combatscb_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
#if 0
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM */
AM_RANGE(0x8000, 0x87ef) AM_RAM /* RAM */
AM_RANGE(0x87f0, 0x87ff) AM_RAM /* ??? */
@@ -434,7 +434,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
#endif
-static ADDRESS_MAP_START( combatsc_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( combatsc_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */
@@ -711,7 +711,7 @@ static MACHINE_START( combatsc )
static MACHINE_RESET( combatsc )
{
combatsc_state *state = machine->driver_data<combatsc_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int i;
memset(state->io_ram, 0x00, 0x4000);
@@ -995,7 +995,7 @@ ROM_END
static DRIVER_INIT( combatsc )
{
/* joystick instead of trackball */
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0404, 0x0404, 0, 0, "IN1");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0404, 0x0404, 0, 0, "IN1");
}
diff --git a/src/mame/drivers/comebaby.c b/src/mame/drivers/comebaby.c
index c718ae0e7f2..b61d136b0ee 100644
--- a/src/mame/drivers/comebaby.c
+++ b/src/mame/drivers/comebaby.c
@@ -78,7 +78,7 @@ static SCREEN_UPDATE(comebaby)
return 0;
}
-static ADDRESS_MAP_START( comebaby_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( comebaby_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0001ffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index 1ee6b3a3a13..2e6cad05f92 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -51,7 +51,7 @@ Note : there is an ingame typo bug that doesn't display the bonus life values
/* Memory Maps */
-static ADDRESS_MAP_START( commando_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( commando_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P1")
@@ -71,7 +71,7 @@ static ADDRESS_MAP_START( commando_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xff80, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
@@ -518,7 +518,7 @@ ROM_END
static DRIVER_INIT( commando )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0xc000);
int A;
@@ -538,7 +538,7 @@ static DRIVER_INIT( commando )
static DRIVER_INIT( spaceinv )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0xc000);
int A;
diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c
index b64aec96fcf..5ad89de2e39 100644
--- a/src/mame/drivers/compgolf.c
+++ b/src/mame/drivers/compgolf.c
@@ -59,7 +59,7 @@ static WRITE8_HANDLER( compgolf_ctrl_w )
*
*************************************/
-static ADDRESS_MAP_START( compgolf_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( compgolf_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(compgolf_video_w) AM_BASE_MEMBER(compgolf_state, videoram)
AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(compgolf_back_w) AM_BASE_MEMBER(compgolf_state, bg_ram)
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index 105fc052fe4..c88ea38d37a 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -59,7 +59,7 @@ static WRITE8_HANDLER( cpu_sound_command_w )
-static ADDRESS_MAP_START( contra_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( contra_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0007) AM_WRITE(contra_K007121_ctrl_0_w)
AM_RANGE(0x0010, 0x0010) AM_READ_PORT("SYSTEM")
AM_RANGE(0x0011, 0x0011) AM_READ_PORT("P1")
@@ -96,7 +96,7 @@ static ADDRESS_MAP_START( contra_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_READ(soundlatch_r)
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x4000, 0x4000) AM_WRITENOP /* read triggers irq reset and latch read (in the hardware only). */
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index ba962459a10..cada2eff3e4 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -653,7 +653,7 @@ static READ16_HANDLER( coolpool_input_r )
*
*************************************/
-static ADDRESS_MAP_START( amerdart_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( amerdart_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x000fffff) AM_RAM AM_BASE_MEMBER(coolpool_state,vram_base)
AM_RANGE(0x04000000, 0x0400000f) AM_WRITE(amerdart_misc_w)
AM_RANGE(0x05000000, 0x0500000f) AM_READWRITE(amerdart_iop_r, amerdart_iop_w)
@@ -663,7 +663,7 @@ static ADDRESS_MAP_START( amerdart_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( coolpool_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( coolpool_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_BASE_MEMBER(coolpool_state,vram_base)
AM_RANGE(0x01000000, 0x010000ff) AM_DEVREADWRITE8("tlc34076", tlc34076_r, tlc34076_w, 0x00ff) // IMSG176P-40
AM_RANGE(0x02000000, 0x020000ff) AM_READWRITE(coolpool_iop_r, coolpool_iop_w)
@@ -675,7 +675,7 @@ static ADDRESS_MAP_START( coolpool_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nballsht_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( nballsht_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_BASE_MEMBER(coolpool_state,vram_base)
AM_RANGE(0x02000000, 0x020000ff) AM_READWRITE(coolpool_iop_r, coolpool_iop_w)
AM_RANGE(0x03000000, 0x0300000f) AM_WRITE(coolpool_misc_w)
@@ -694,13 +694,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( amerdart_dsp_pgm_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( amerdart_dsp_pgm_map, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x0fff) AM_ROM
ADDRESS_MAP_END
/* 000 - 0FF TMS32015 Internal Data RAM (256 words) in Data Address Space */
-static ADDRESS_MAP_START( amerdart_dsp_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( amerdart_dsp_io_map, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_WRITE(dsp_romaddr_w)
AM_RANGE(0x02, 0x02) AM_WRITE(amerdart_dsp_answer_w)
AM_RANGE(0x03, 0x03) AM_DEVWRITE("dac", dsp_dac_w)
@@ -713,12 +713,12 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( coolpool_dsp_pgm_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( coolpool_dsp_pgm_map, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( coolpool_dsp_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( coolpool_dsp_io_map, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_WRITE(dsp_romaddr_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(dsp_cmd_r, dsp_answer_w)
AM_RANGE(0x03, 0x03) AM_DEVWRITE("dac", dsp_dac_w)
@@ -1200,7 +1200,7 @@ static DRIVER_INIT( amerdart )
static DRIVER_INIT( coolpool )
{
- memory_install_read16_handler(machine->device("dsp")->memory().space(ADDRESS_SPACE_IO), 0x07, 0x07, 0, 0, coolpool_input_r);
+ memory_install_read16_handler(machine->device("dsp")->memory().space(AS_IO), 0x07, 0x07, 0, 0, coolpool_input_r);
register_state_save(machine);
}
diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c
index b8c0e221771..b20808f580b 100644
--- a/src/mame/drivers/coolridr.c
+++ b/src/mame/drivers/coolridr.c
@@ -624,7 +624,7 @@ static WRITE32_HANDLER( sysh1_char_w )
}
}
-static ADDRESS_MAP_START( system_h1_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( system_h1_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_ROM AM_SHARE("share1") AM_WRITENOP
AM_RANGE(0x01000000, 0x01ffffff) AM_ROM AM_REGION("gfx_data",0x0000000)
@@ -642,7 +642,7 @@ static ADDRESS_MAP_START( system_h1_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x60000000, 0x600003ff) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( coolridr_submap, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( coolridr_submap, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0001ffff) AM_ROM AM_SHARE("share2")
AM_RANGE(0x01000000, 0x0100ffff) AM_RAM //communication RAM
@@ -679,7 +679,7 @@ ADDRESS_MAP_END
// SH-1 or SH-2 almost certainly copies the program down to here: the ROM containing the program is 32-bit wide and the 68000 is 16-bit
// the SCSP is believed to be hardcoded to decode the first 4 MB like this for a master/slave config
// (see also Model 3):
-static ADDRESS_MAP_START( system_h1_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( system_h1_sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
// AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE("scsp1", scsp_r, scsp_w)
AM_RANGE(0x800000, 0x80ffff) AM_RAM
@@ -1187,8 +1187,8 @@ static READ32_HANDLER( coolridr_hack2_r )
static DRIVER_INIT( coolridr )
{
-// memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x60d88a4, 0x060d88a7, 0, 0, coolridr_hack1_r );
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x60d8894, 0x060d8897, 0, 0, coolridr_hack2_r );
+// memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x60d88a4, 0x060d88a7, 0, 0, coolridr_hack1_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x60d8894, 0x060d8897, 0, 0, coolridr_hack2_r );
}
GAME( 1995, coolridr, 0, coolridr, coolridr, coolridr, ROT0, "Sega", "Cool Riders (US)",GAME_NOT_WORKING|GAME_NO_SOUND )
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index 19c929f88f7..55584366989 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -106,7 +106,7 @@ static CUSTOM_INPUT( mightguy_area_r )
*
*************************************/
-static ADDRESS_MAP_START( cop01_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cop01_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM /* c000-c7ff in cop01 */
AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(cop01_background_w) AM_BASE_MEMBER(cop01_state, bgvideoram)
@@ -114,7 +114,7 @@ static ADDRESS_MAP_START( cop01_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf3ff) AM_WRITE(cop01_foreground_w) AM_BASE_MEMBER(cop01_state, fgvideoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
AM_RANGE(0x01, 0x01) AM_READ_PORT("P2")
@@ -126,7 +126,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x45, 0x45) AM_WRITE(watchdog_reset_w) /* ? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mightguy_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mightguy_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
AM_RANGE(0x01, 0x01) AM_READ_PORT("P2")
@@ -138,13 +138,13 @@ static ADDRESS_MAP_START( mightguy_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x45, 0x45) AM_WRITE(watchdog_reset_w) /* ? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8000) AM_READNOP /* irq ack? */
AM_RANGE(0xc000, 0xc7ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( audio_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_address_data_w)
@@ -160,7 +160,7 @@ static READ8_HANDLER( kludge )
return state->timer++;
}
-static ADDRESS_MAP_START( mightguy_audio_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mightguy_audio_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym3526_w)
AM_RANGE(0x02, 0x02) AM_WRITENOP /* 1412M2? */
diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c
index 9e2f4eddeff..48cdbd88e1d 100644
--- a/src/mame/drivers/copsnrob.c
+++ b/src/mame/drivers/copsnrob.c
@@ -101,7 +101,7 @@ static WRITE8_HANDLER( copsnrob_misc2_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0500, 0x0507) AM_WRITE(copsnrob_misc_w)
diff --git a/src/mame/drivers/corona.c b/src/mame/drivers/corona.c
index 9082f226d0a..485b8d9c226 100644
--- a/src/mame/drivers/corona.c
+++ b/src/mame/drivers/corona.c
@@ -579,13 +579,13 @@ static WRITE8_DEVICE_HANDLER(ay_port_b_out)
RAM data is relocated to B800-B8FF
*/
-static ADDRESS_MAP_START( winner81_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( winner81_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xb800, 0xb8ff) AM_RAM // copied from 8000 (0x10 bytes, repeated)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winner81_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( winner81_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x70, 0x70) AM_WRITE(blitter_x_w)
AM_RANGE(0x71, 0x71) AM_WRITE(blitter_unk_w)
@@ -607,12 +607,12 @@ static ADDRESS_MAP_START( winner81_cpu_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xef, 0xef) AM_WRITE(wc_meters_w) /* meters: coin1 = bit0, coin2 = bit1, coinout = bit2 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winner81_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( winner81_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winner81_sound_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( winner81_sound_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(sound_latch_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
@@ -636,13 +636,13 @@ ADDRESS_MAP_END
FE ---> Sound Latch (writes 01, 02 and 03 during attract)...
*/
-static ADDRESS_MAP_START( winner82_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( winner82_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8000, 0x80ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winner82_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( winner82_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xf0, 0xf0) AM_WRITE(blitter_x_w)
AM_RANGE(0xf1, 0xf1) AM_WRITE(blitter_y_w)
@@ -661,12 +661,12 @@ static ADDRESS_MAP_START( winner82_cpu_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xff, 0xff) AM_READ_PORT("DSW2") /* no idea */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winner82_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( winner82_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x13ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winner82_sound_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( winner82_sound_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(sound_latch_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
@@ -700,13 +700,13 @@ ADDRESS_MAP_END
*/
-static ADDRESS_MAP_START( re800_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( re800_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram") //801a comm?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( re800_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( re800_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xf0, 0xf0) AM_WRITE(blitter_x_w)
AM_RANGE(0xf1, 0xf1) AM_WRITE(blitter_y_w)
@@ -722,12 +722,12 @@ static ADDRESS_MAP_START( re800_cpu_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xff, 0xff) AM_WRITE(ball_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( re800_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( re800_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( re800_sound_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( re800_sound_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(sound_latch_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
@@ -760,12 +760,12 @@ ADDRESS_MAP_END
*/
-static ADDRESS_MAP_START( luckyrlt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( luckyrlt_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( luckyrlt_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( luckyrlt_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xf0, 0xf0) AM_WRITE(blitter_x_w)
AM_RANGE(0xf1, 0xf1) AM_WRITE(blitter_y_w)
@@ -782,12 +782,12 @@ static ADDRESS_MAP_START( luckyrlt_cpu_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xfe, 0xfe) AM_WRITE(sound_latch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( luckyrlt_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( luckyrlt_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x13ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( luckyrlt_sound_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( luckyrlt_sound_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(sound_latch_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index 9b5bfd5b8c9..9119718db4b 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -319,7 +319,7 @@ static INTERRUPT_GEN( panic_interrupt )
/* only enabled if game in progress! */
if ((input_port_read(device->machine, "SYSTEM") & 0xc0) != 0xc0)
- panic_sound_output_w(device->memory().space(ADDRESS_SPACE_PROGRAM), 17, 1);
+ panic_sound_output_w(device->memory().space(AS_PROGRAM), 17, 1);
device_set_input_line_and_vector(device, 0, HOLD_LINE, 0xcf); /* RST 08h */
}
@@ -417,7 +417,7 @@ static WRITE8_HANDLER( flip_screen_w )
}
-static ADDRESS_MAP_START( panic_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( panic_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE_SIZE_MEMBER(cosmic_state, videoram, videoram_size)
AM_RANGE(0x6000, 0x601f) AM_WRITEONLY AM_BASE_SIZE_MEMBER(cosmic_state, spriteram, spriteram_size)
@@ -432,7 +432,7 @@ static ADDRESS_MAP_START( panic_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cosmica_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cosmica_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE_SIZE_MEMBER(cosmic_state, videoram, videoram_size)
AM_RANGE(0x6000, 0x601f) AM_WRITEONLY AM_BASE_SIZE_MEMBER(cosmic_state, spriteram, spriteram_size)
@@ -446,12 +446,12 @@ static ADDRESS_MAP_START( cosmica_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cosmicg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cosmicg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE_SIZE_MEMBER(cosmic_state, videoram, videoram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cosmicg_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cosmicg_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ(cosmicg_port_0_r)
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
AM_RANGE(0x00, 0x15) AM_WRITE(cosmicg_output_w)
@@ -459,7 +459,7 @@ static ADDRESS_MAP_START( cosmicg_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( magspot_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( magspot_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3800, 0x3807) AM_READ(magspot_coinage_dip_r)
AM_RANGE(0x4000, 0x401f) AM_WRITEONLY AM_BASE_SIZE_MEMBER(cosmic_state, spriteram, spriteram_size)
@@ -1596,17 +1596,17 @@ static DRIVER_INIT( cosmica )
static DRIVER_INIT( devzone )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4807, 0x4807, 0, 0, cosmic_background_enable_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4807, 0x4807, 0, 0, cosmic_background_enable_w);
}
static DRIVER_INIT( nomnlnd )
{
device_t *dac = machine->device("dac");
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5000, 0x5001, 0, 0, nomnlnd_port_0_1_r);
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4800, 0x4800, 0, 0);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4807, 0x4807, 0, 0, cosmic_background_enable_w);
- memory_install_write8_device_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), dac, 0x480a, 0x480a, 0, 0, dac_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5000, 0x5001, 0, 0, nomnlnd_port_0_1_r);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4800, 0x4800, 0, 0);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4807, 0x4807, 0, 0, cosmic_background_enable_w);
+ memory_install_write8_device_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), dac, 0x480a, 0x480a, 0, 0, dac_w);
}
static DRIVER_INIT( panic )
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index eec6335b185..3df7a9279f4 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -543,7 +543,7 @@ All PRGx go to B-board. Provision for up to 4MB of ROM space, which was never us
*/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
AM_RANGE(0x800000, 0x800007) AM_READ_PORT("IN1") /* Player input ports */
/* forgottn, willow, cawing, nemo, varth read from 800010. Probably debug input leftover from development */
@@ -584,7 +584,7 @@ SOUNDA15 = pin13 = ( I1 )
/SOUNDCE = pin12 = ! ( !I0 & (!I1 | ( I1 & !I2)) )
*/
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xd000, 0xd7ff) AM_RAM
@@ -596,7 +596,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf00a, 0xf00a) AM_READ(soundlatch2_r) /* Sound timer fade */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qsound_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( qsound_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x800000, 0x800007) AM_READ_PORT("IN1") /* Player input ports */
AM_RANGE(0x800018, 0x80001f) AM_READ(cps1_dsw_r) /* System input ports / Dip Switches */
@@ -614,7 +614,7 @@ static ADDRESS_MAP_START( qsound_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-ADDRESS_MAP_START( qsound_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) // used by cps2.c too
+ADDRESS_MAP_START( qsound_sub_map, AS_PROGRAM, 8 ) // used by cps2.c too
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* banked (contains music data) */
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE_MEMBER(cps_state, qsound_sharedram1)
@@ -3090,7 +3090,7 @@ static MACHINE_CONFIG_DERIVED( wofhfh, cps1_12MHz )
MACHINE_CONFIG_END
/* incomplete */
-static ADDRESS_MAP_START( sf2mdt_z80map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sf2mdt_z80map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xcfff) AM_ROM
AM_RANGE(0xd000, 0xd7ff) AM_RAM
ADDRESS_MAP_END
@@ -9965,10 +9965,10 @@ static DRIVER_INIT( 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 */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x800040, 0x800041, 0, 0, forgottn_dial_0_reset_w);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x800048, 0x800049, 0, 0, forgottn_dial_1_reset_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x800052, 0x800055, 0, 0, forgottn_dial_0_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80005a, 0x80005d, 0, 0, forgottn_dial_1_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x800040, 0x800041, 0, 0, forgottn_dial_0_reset_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x800048, 0x800049, 0, 0, forgottn_dial_1_reset_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x800052, 0x800055, 0, 0, forgottn_dial_0_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80005a, 0x80005d, 0, 0, forgottn_dial_1_r);
state->save_item(NAME(state->dial));
@@ -9982,8 +9982,8 @@ static DRIVER_INIT( 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 */
- memory_unmap_readwrite(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x800140, 0x80017f, 0, 0);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8001c0, 0x8001ff, 0, 0, cps1_cps_b_r, cps1_cps_b_w);
+ memory_unmap_readwrite(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x800140, 0x80017f, 0, 0);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8001c0, 0x8001ff, 0, 0, cps1_cps_b_r, cps1_cps_b_w);
DRIVER_INIT_CALL(cps1);
}
@@ -9991,7 +9991,7 @@ static DRIVER_INIT( sf2ee )
static DRIVER_INIT( sf2thndr )
{
/* This particular hack uses a modified B-board PAL which mirrors the CPS-B registers at an alternate address */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8001c0, 0x8001ff, 0, 0, cps1_cps_b_r, cps1_cps_b_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8001c0, 0x8001ff, 0, 0, cps1_cps_b_r, cps1_cps_b_w);
DRIVER_INIT_CALL(cps1);
}
@@ -9999,7 +9999,7 @@ static DRIVER_INIT( sf2thndr )
static DRIVER_INIT( sf2hack )
{
/* some SF2 hacks have some inputs wired to the LSB instead of MSB */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x800018, 0x80001f, 0, 0, cps1_hack_dsw_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x800018, 0x80001f, 0, 0, cps1_hack_dsw_r);
DRIVER_INIT_CALL(cps1);
}
@@ -10032,7 +10032,7 @@ static DRIVER_INIT( pang3n )
{
/* 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. */
- memory_install_readwrite_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80017a, 0x80017b, 0, 0, "EEPROMIN", "EEPROMOUT");
+ memory_install_readwrite_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80017a, 0x80017b, 0, 0, "EEPROMIN", "EEPROMOUT");
DRIVER_INIT_CALL(cps1);
}
@@ -10083,11 +10083,11 @@ static DRIVER_INIT( sf2mdt )
rom[i + 3] = rom[i + 6];
rom[i + 6] = tmp;
}
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x70c01a, 0x70c01b, 0, 0, sf2mdt_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x70c01c, 0x70c01d, 0, 0, sf2mdt_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x70c01e, 0x70c01f, 0, 0, sf2mdt_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x70c010, 0x70c011, 0, 0, sf2mdt_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x70c018, 0x70c019, 0, 0, sf2mdt_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x70c01a, 0x70c01b, 0, 0, sf2mdt_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x70c01c, 0x70c01d, 0, 0, sf2mdt_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x70c01e, 0x70c01f, 0, 0, sf2mdt_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x70c010, 0x70c011, 0, 0, sf2mdt_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x70c018, 0x70c019, 0, 0, sf2mdt_r);
DRIVER_INIT_CALL(cps1);
}
@@ -10095,7 +10095,7 @@ static DRIVER_INIT( sf2mdt )
static DRIVER_INIT( dinohunt )
{
// is this shared with the new sound hw?
- UINT8* ram = (UINT8*)memory_install_ram(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf18000, 0xf19fff, 0, 0, 0);
+ UINT8* ram = (UINT8*)memory_install_ram(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf18000, 0xf19fff, 0, 0, 0);
memset(ram,0xff,0x2000);
DRIVER_INIT_CALL(cps1);
}
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index b78d77e0dd8..7066e83a2bc 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -814,7 +814,7 @@ static READ16_HANDLER( joy_or_paddle_r )
*
*************************************/
-static ADDRESS_MAP_START( cps2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cps2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM /* 68000 ROM */
AM_RANGE(0x400000, 0x40000b) AM_RAM AM_BASE_SIZE_MEMBER(cps_state, output, output_size) /* CPS2 object output */
AM_RANGE(0x618000, 0x619fff) AM_READWRITE(qsound_sharedram1_r, qsound_sharedram1_w) /* Q RAM */
@@ -845,7 +845,7 @@ static ADDRESS_MAP_START( cps2_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dead_cps2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dead_cps2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM /* 68000 ROM */
AM_RANGE(0x400000, 0x40000b) AM_RAM AM_BASE_SIZE_MEMBER(cps_state, output, output_size) /* CPS2 object output */
AM_RANGE(0x618000, 0x619fff) AM_READWRITE(qsound_sharedram1_r, qsound_sharedram1_w) /* Q RAM */
@@ -8012,7 +8012,7 @@ static DRIVER_INIT ( pzloop2 )
state->save_item(NAME(state->readpaddle));
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x804000, 0x804001, 0, 0, joy_or_paddle_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x804000, 0x804001, 0, 0, joy_or_paddle_r);
}
static READ16_HANDLER( gigamn2_dummyqsound_r )
@@ -8030,7 +8030,7 @@ static WRITE16_HANDLER( gigamn2_dummyqsound_w )
static DRIVER_INIT( gigamn2 )
{
cps_state *state = machine->driver_data<cps_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT16 *rom = (UINT16 *)machine->region("maincpu")->base();
int length = machine->region("maincpu")->bytes();
@@ -8039,7 +8039,7 @@ static DRIVER_INIT( gigamn2 )
state->gigamn2_dummyqsound_ram = auto_alloc_array(machine, UINT16, 0x20000 / 2);
state->save_pointer(NAME(state->gigamn2_dummyqsound_ram), 0x20000 / 2);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x618000, 0x619fff, 0, 0, gigamn2_dummyqsound_r, gigamn2_dummyqsound_w); // no qsound..
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x618000, 0x619fff, 0, 0, gigamn2_dummyqsound_r, gigamn2_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 a4bb6ac27f1..d4b20727d57 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -2122,7 +2122,7 @@ static WRITE32_HANDLER( cps3_colourram_w )
/* there are more unknown writes, but you get the idea */
-static ADDRESS_MAP_START( cps3_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( cps3_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0007ffff) AM_ROM AM_REGION("user1", 0) // Bios ROM
AM_RANGE(0x02000000, 0x0207ffff) AM_RAM AM_BASE_MEMBER(cps3_state, mainram) // Main RAM
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index 388fe908798..c78e025fa46 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -196,7 +196,7 @@ static WRITE8_HANDLER( port_sound_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff) /* A15 is not decoded */
AM_RANGE(0x0000, 0x3fff) AM_ROM /* not fully populated */
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM
@@ -213,7 +213,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x0c) AM_READ_PORT("DSW0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x0c) AM_READ_PORT("IN0")
@@ -341,7 +341,7 @@ GFXDECODE_END
static MACHINE_RESET( crballoon )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 3dfea16d50d..cbd8313aa04 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -252,7 +252,7 @@ static WRITE8_DEVICE_HANDLER( crgolfhi_sample_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x5fff) AM_RAM
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
@@ -274,7 +274,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("aysnd", ay8910_address_data_w)
@@ -600,7 +600,7 @@ ROM_END
static DRIVER_INIT( crgolfhi )
{
device_t *msm = machine->device("msm");
- memory_install_write8_device_handler(machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM), msm, 0xa000, 0xa003, 0, 0, crgolfhi_sample_w);
+ memory_install_write8_device_handler(machine->device("audiocpu")->memory().space(AS_PROGRAM), msm, 0xa000, 0xa003, 0, 0, crgolfhi_sample_w);
}
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index 199b1871741..b771d755a7e 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -80,7 +80,7 @@ static WRITE8_HANDLER( k052109_051960_w )
/********************************************/
-static ADDRESS_MAP_START( crimfght_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( crimfght_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAMBANK("bank1") /* banked RAM */
AM_RANGE(0x0400, 0x1fff) AM_RAM /* RAM */
AM_RANGE(0x3f80, 0x3f80) AM_READ_PORT("SYSTEM")
@@ -98,7 +98,7 @@ static ADDRESS_MAP_START( crimfght_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( crimfght_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( crimfght_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM 821l01.h4 */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) /* YM2151 */
@@ -410,12 +410,12 @@ static KONAMI_SETLINES_CALLBACK( crimfght_banking )
/* bit 5 = select work RAM or palette */
if (lines & 0x20)
{
- memory_install_read_bank(device->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank3");
- memory_install_write8_handler(device->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w);
+ memory_install_read_bank(device->memory().space(AS_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank3");
+ memory_install_write8_handler(device->memory().space(AS_PROGRAM), 0x0000, 0x03ff, 0, 0, paletteram_xBBBBBGGGGGRRRRR_be_w);
memory_set_bankptr(device->machine, "bank3", device->machine->generic.paletteram.v);
}
else
- memory_install_readwrite_bank(device->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank1"); /* RAM */
+ memory_install_readwrite_bank(device->memory().space(AS_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank1"); /* RAM */
/* bit 6 = enable char ROM reading through the video RAM */
k052109_set_rmrd_line(state->k052109, (lines & 0x40) ? ASSERT_LINE : CLEAR_LINE);
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index a8f69925369..72743cc4d0a 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -44,7 +44,7 @@ static WRITE16_HANDLER ( crospang_soundlatch_w )
/* main cpu */
-static ADDRESS_MAP_START( crospang_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( crospang_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_WRITENOP // writes to rom quite often
AM_RANGE(0x100000, 0x100001) AM_WRITENOP
AM_RANGE(0x100002, 0x100003) AM_WRITE(crospang_fg_scrolly_w)
@@ -63,7 +63,7 @@ static ADDRESS_MAP_START( crospang_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x320000, 0x32ffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bestri_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bestri_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_WRITENOP // writes to rom quite often
AM_RANGE(0x100004, 0x100005) AM_WRITE(bestri_fg_scrollx_w)
@@ -87,12 +87,12 @@ ADDRESS_MAP_END
/* sound cpu */
-static ADDRESS_MAP_START( crospang_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( crospang_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( crospang_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( crospang_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
AM_RANGE(0x02, 0x02) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index c1044945636..45341d1ad83 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -186,7 +186,7 @@ static WRITE8_HANDLER( pending_command_clear_w )
-static ADDRESS_MAP_START( crshrace_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( crshrace_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x300000, 0x3fffff) AM_READ(extrarom1_r)
AM_RANGE(0x400000, 0x4fffff) AM_READ(extrarom2_r)
@@ -209,13 +209,13 @@ static ADDRESS_MAP_START( crshrace_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff044, 0xfff047) AM_WRITEONLY // ??? moves during race
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(crshrace_sh_bankswitch_w)
AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, pending_command_clear_w)
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index 6402ad4f4f5..7946f567dc6 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -160,7 +160,7 @@ public:
static void IntReq( running_machine *machine, int num )
{
crystal_state *state = machine->driver_data<crystal_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
UINT32 IntEn = space->read_dword(0x01800c08);
UINT32 IntPend = space->read_dword(0x01800c0c);
if (IntEn & (1 << num))
@@ -242,7 +242,7 @@ static WRITE32_HANDLER( IntAck_w )
static IRQ_CALLBACK( icallback )
{
crystal_state *state = device->machine->driver_data<crystal_state>();
- address_space *space = device->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->memory().space(AS_PROGRAM);
UINT32 IntPend = space->read_dword(0x01800c0c);
int i;
@@ -464,7 +464,7 @@ static WRITE32_HANDLER( DMA1_w )
}
-static ADDRESS_MAP_START( crystal_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( crystal_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0001ffff) AM_ROM AM_WRITENOP
AM_RANGE(0x01200000, 0x0120000f) AM_READ(Input_r)
@@ -634,7 +634,7 @@ static void SetVidReg( address_space *space, UINT16 reg, UINT16 val )
static SCREEN_UPDATE( crystal )
{
crystal_state *state = screen->machine->driver_data<crystal_state>();
- address_space *space = screen->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = screen->machine->device("maincpu")->memory().space(AS_PROGRAM);
int DoFlip;
UINT32 B0 = 0x0;
@@ -695,7 +695,7 @@ static SCREEN_UPDATE( crystal )
static SCREEN_EOF(crystal)
{
crystal_state *state = machine->driver_data<crystal_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 56f926eca21..f83145476d7 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -282,7 +282,7 @@ static READ8_HANDLER(pal_r)
return space->machine->generic.paletteram.u8[offset];
}
-static ADDRESS_MAP_START( cshooter_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cshooter_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xafff) AM_READ_BANK("bank1") AM_WRITEONLY
AM_RANGE(0xb000, 0xb0ff) AM_READONLY // sound related ?
@@ -312,7 +312,7 @@ static WRITE8_HANDLER( seibu_sound_comms_w )
seibu_main_word_w(space,offset,data,0x00ff);
}
-static ADDRESS_MAP_START( airraid_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( airraid_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_WRITENOP // rld result write-back
// AM_RANGE(0xb000, 0xb0ff) AM_RAM
@@ -338,7 +338,7 @@ ADDRESS_MAP_END
/* Sound CPU */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0xc000, 0xc001) AM_WRITENOP // AM_DEVWRITE("ym1", ym2203_w) ?
AM_RANGE(0xc800, 0xc801) AM_WRITENOP // AM_DEVWRITE("ym2", ym2203_w) ?
@@ -697,7 +697,7 @@ static DRIVER_INIT( cshooter )
static DRIVER_INIT( cshootere )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int A;
UINT8 *rom = machine->region("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 1b98fa495ef..1d023078858 100644
--- a/src/mame/drivers/csplayh5.c
+++ b/src/mame/drivers/csplayh5.c
@@ -102,7 +102,7 @@ static WRITE16_HANDLER( csplayh5_sound_w )
}
-static ADDRESS_MAP_START( csplayh5_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( csplayh5_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x200000, 0x200001) AM_READ_PORT("DSW") AM_WRITE(csplayh5_sound_w)
@@ -127,7 +127,7 @@ static READ16_HANDLER( test_r )
return space->machine->rand();
}
-static ADDRESS_MAP_START( csplayh5_sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( csplayh5_sub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x04002a, 0x04002b) AM_READ(test_r)
@@ -138,7 +138,7 @@ static ADDRESS_MAP_START( csplayh5_sub_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( csplayh5_sub_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( csplayh5_sub_io_map, AS_IO, 16 )
ADDRESS_MAP_END
#endif
@@ -360,13 +360,13 @@ static WRITE8_HANDLER( tmpz84c011_0_dir_pe_w )
}
-static ADDRESS_MAP_START( csplayh5_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( csplayh5_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( csplayh5_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( csplayh5_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w)
AM_RANGE(0x50, 0x50) AM_READWRITE(tmpz84c011_0_pa_r, tmpz84c011_0_pa_w)
@@ -587,7 +587,7 @@ static Z80CTC_INTERFACE( ctc_intf )
static MACHINE_RESET( csplayh5 )
{
csplayh5_state *state = machine->driver_data<csplayh5_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int i;
// initialize TMPZ84C011 PIO
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index e1c54891d49..c1efdf65c22 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -403,7 +403,7 @@ static WRITE16_HANDLER( write_sndram )
cubeqcpu_sndram_w(space->machine->device("sound_cpu"), offset, data, mem_mask);
}
-static ADDRESS_MAP_START( m68k_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( m68k_program_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0x03ffff)
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x020000, 0x027fff) AM_READWRITE(read_rotram, write_rotram)
@@ -420,11 +420,11 @@ ADDRESS_MAP_END
/* For the bit-sliced CPUs */
-static ADDRESS_MAP_START( rotate_map, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( rotate_map, AS_PROGRAM, 64 )
AM_RANGE(0x000, 0x1ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( line_sound_map, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( line_sound_map, AS_PROGRAM, 64 )
AM_RANGE(0x000, 0x0ff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c
index 163888d46c7..63fcaf10ef7 100644
--- a/src/mame/drivers/cultures.c
+++ b/src/mame/drivers/cultures.c
@@ -177,7 +177,7 @@ static WRITE8_HANDLER( bg_bank_w )
coin_counter_w(space->machine, 0, data & 0x10);
}
-static ADDRESS_MAP_START( cultures_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cultures_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xbfff) AM_RAM_WRITE(bg0_videoram_w) AM_BASE_MEMBER(cultures_state, bg0_videoram)
@@ -185,7 +185,7 @@ static ADDRESS_MAP_START( cultures_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cultures_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cultures_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_RAM
AM_RANGE(0x10, 0x13) AM_RAM
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index 6c70f03dd47..9d5cfd3f904 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -487,7 +487,7 @@ static WRITE8_HANDLER( audio_command_w )
*
*************************************/
-static ADDRESS_MAP_START( cvs_main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cvs_main_cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x13ff) AM_ROM
AM_RANGE(0x1400, 0x14ff) AM_MIRROR(0x6000) AM_READWRITE(cvs_bullet_ram_or_palette_r, cvs_bullet_ram_or_palette_w) AM_BASE_MEMBER(cvs_state, bullet_ram)
@@ -502,7 +502,7 @@ static ADDRESS_MAP_START( cvs_main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cvs_main_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cvs_main_cpu_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READWRITE(cvs_input_r, cvs_scroll_w)
AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READWRITE(cvs_collision_clear, cvs_video_fx_w)
AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READWRITE(cvs_collision_r, audio_command_w)
@@ -518,7 +518,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( cvs_dac_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cvs_dac_cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x107f) AM_RAM
@@ -529,7 +529,7 @@ static ADDRESS_MAP_START( cvs_dac_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cvs_dac_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cvs_dac_cpu_io_map, AS_IO, 8 )
/* doesn't look like it is used at all */
//AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(cvs_393hz_clock_r)
ADDRESS_MAP_END
@@ -542,7 +542,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( cvs_speech_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cvs_speech_cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x07ff) AM_ROM
AM_RANGE(0x1d00, 0x1d00) AM_WRITE(cvs_speech_rom_address_lo_w)
@@ -553,7 +553,7 @@ static ADDRESS_MAP_START( cvs_speech_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cvs_speech_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cvs_speech_cpu_io_map, AS_IO, 8 )
/* romclk is much more probable, 393 Hz results in timing issues */
// AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(cvs_393hz_clock_r)
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_DEVREAD("tms", tms_clock_r)
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index 47e86912856..4721c0a6f52 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -147,7 +147,7 @@ static WRITE16_HANDLER( p2_reset_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0xfc0000, 0xfc0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_SHARE("eeprom")
AM_RANGE(0xfc8000, 0xfcffff) AM_READ(atarigen_sound_upper_r)
@@ -180,7 +180,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( extra_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( extra_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0xfc0000, 0xfdffff) AM_WRITE(atarigen_video_int_ack_w)
AM_RANGE(0xfe0000, 0xfe0fff) AM_READ(special_port0_r)
@@ -207,7 +207,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x2800, 0x2801) AM_WRITE(cyberbal_sound_68k_6502_w)
@@ -230,7 +230,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sound_68k_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0xff8000, 0xff87ff) AM_READ(cyberbal_sound_68k_r)
AM_RANGE(0xff8800, 0xff8fff) AM_WRITE(cyberbal_sound_68k_w)
@@ -247,7 +247,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( cyberbal2p_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cyberbal2p_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0xfc0000, 0xfc0003) AM_READ_PORT("IN0")
AM_RANGE(0xfc2000, 0xfc2003) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index 8066a861c78..90407cec5f8 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -673,7 +673,7 @@ static READ8_HANDLER( soundport_r )
return state->io_ram[0] & 0xff;
}
-static ADDRESS_MAP_START( master_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( master_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x087fff) AM_RAM /*Work RAM*/
AM_RANGE(0x0a0000, 0x0a0fff) AM_RAM AM_BASE_MEMBER(cybertnk_state, spr_ram) // non-tile based sprite ram
@@ -685,7 +685,7 @@ static ADDRESS_MAP_START( master_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x110000, 0x1101ff) AM_READWRITE(io_r,io_w) AM_BASE_MEMBER(cybertnk_state, io_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( slave_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM /*Work RAM*/
AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM AM_BASE_MEMBER(cybertnk_state, roadram)
@@ -693,7 +693,7 @@ static ADDRESS_MAP_START( slave_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x140000, 0x140003) AM_NOP /*Watchdog? Written during loops and interrupts*/
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff ) AM_ROM
AM_RANGE(0x8000, 0x9fff ) AM_RAM
AM_RANGE(0xa001, 0xa001 ) AM_READ(soundport_r)
diff --git a/src/mame/drivers/cyclemb.c b/src/mame/drivers/cyclemb.c
index a2b8a6832cc..78964e5ba17 100644
--- a/src/mame/drivers/cyclemb.c
+++ b/src/mame/drivers/cyclemb.c
@@ -249,7 +249,7 @@ static WRITE8_HANDLER( cyclemb_flip_w )
// a bunch of other things are setted here
}
-static ADDRESS_MAP_START( cyclemb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cyclemb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_ROMBANK("bank1")
AM_RANGE(0x9000, 0x97ff) AM_RAM AM_BASE_MEMBER(cyclemb_state, vram)
@@ -260,20 +260,20 @@ static ADDRESS_MAP_START( cyclemb_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xbfff) AM_RAM //WRAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cyclemb_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cyclemb_io, AS_IO, 8 )
// ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xc000, 0xc000) AM_WRITE(cyclemb_bankswitch_w)
AM_RANGE(0xc09e, 0xc09f) AM_READWRITE(cyclemb_8741_0_r, cyclemb_8741_0_w)
AM_RANGE(0xc0bf, 0xc0bf) AM_WRITE(cyclemb_flip_w) //flip screen
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cyclemb_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cyclemb_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cyclemb_sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cyclemb_sound_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_address_data_w)
AM_RANGE(0x40, 0x40) AM_READ(soundlatch_r) AM_WRITE(soundlatch2_w)
diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c
index 877e0b95706..fab6513221e 100644
--- a/src/mame/drivers/d9final.c
+++ b/src/mame/drivers/d9final.c
@@ -103,7 +103,7 @@ static READ8_HANDLER( prot_latch_r )
}
-static ADDRESS_MAP_START( d9final_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( d9final_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_RAM
@@ -115,7 +115,7 @@ static ADDRESS_MAP_START( d9final_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf000) AM_READ(prot_latch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( d9final_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( d9final_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// AM_RANGE(0x00, 0x00) AM_WRITENOP //bit 0: irq enable? screen enable?
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSWA")
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index be5501fd1fb..8a730738598 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -97,7 +97,7 @@ static WRITE8_HANDLER(snd_w)
device_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8800, 0x97ff) AM_RAM
AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(background_w) AM_BASE_MEMBER(dacholer_state, bgvideoram)
@@ -105,7 +105,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe0ff) AM_RAM AM_BASE_SIZE_MEMBER(dacholer_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
AM_RANGE(0x01, 0x01) AM_READ_PORT("P2")
@@ -121,7 +121,7 @@ static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( snd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( snd_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0xd000, 0xe7ff) AM_RAM
ADDRESS_MAP_END
@@ -157,7 +157,7 @@ static WRITE8_HANDLER( music_irq_w )
state->music_interrupt_enable = data;
}
-static ADDRESS_MAP_START( snd_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( snd_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(soundlatch_r, soundlatch_clear_w )
AM_RANGE(0x04, 0x04) AM_WRITE(music_irq_w)
diff --git a/src/mame/drivers/dai3wksi.c b/src/mame/drivers/dai3wksi.c
index 33795c8afa8..f0a0fc2f4de 100644
--- a/src/mame/drivers/dai3wksi.c
+++ b/src/mame/drivers/dai3wksi.c
@@ -502,7 +502,7 @@ static const sn76477_interface dai3wksi_sn76477_ic81 =
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1bff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x2400, 0x24ff) AM_MIRROR(0x100) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c
index 2759b641935..f3c32cbe6a3 100644
--- a/src/mame/drivers/dambustr.c
+++ b/src/mame/drivers/dambustr.c
@@ -76,7 +76,7 @@ static WRITE8_DEVICE_HANDLER( dambustr_noise_enable_w )
}
-static ADDRESS_MAP_START( dambustr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dambustr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8000) AM_WRITE(dambustr_bg_color_w)
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index fa2d5ba3937..4e248a47bee 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -242,7 +242,7 @@ logerror("CPU #0 PC %06x: warning - write unmapped ioc offset %06x with %04x\n",
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( darius_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( darius_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM /* main RAM */
AM_RANGE(0x0a0000, 0x0a0001) AM_WRITE(cpua_ctrl_w)
@@ -259,7 +259,7 @@ static ADDRESS_MAP_START( darius_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe10000, 0xe10fff) AM_RAM /* ??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( darius_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( darius_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04ffff) AM_RAM /* local RAM */
AM_RANGE(0xc00000, 0xc0007f) AM_WRITE(darius_ioc_w) /* only writes $c00050 (?) */
@@ -490,7 +490,7 @@ static WRITE8_DEVICE_HANDLER( darius_write_portB1 )
Sound memory structures / ADPCM
*****************************************************/
-static ADDRESS_MAP_START( darius_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( darius_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
@@ -507,7 +507,7 @@ static ADDRESS_MAP_START( darius_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xdc00, 0xdc00) AM_WRITE(sound_bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( darius_sound2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( darius_sound2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM AM_WRITENOP
/* yes, no RAM */
ADDRESS_MAP_END
@@ -566,7 +566,7 @@ static WRITE8_DEVICE_HANDLER( adpcm_data_w )
msm5205_reset_w(device, !(data & 0x20)); /* my best guess, but it could be output enable as well */
}
-static ADDRESS_MAP_START( darius_sound2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( darius_sound2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(adpcm_command_read, adpcm_nmi_disable)
AM_RANGE(0x01, 0x01) AM_WRITE(adpcm_nmi_enable)
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 0a28aa93924..1f82fdecd15 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -306,7 +306,7 @@ static WRITE32_HANDLER( darkhors_unk1_w )
// if (ACCESSING_BITS_16_31) popmessage("%04X",data >> 16);
}
-static ADDRESS_MAP_START( darkhors_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( darkhors_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x400000, 0x41ffff) AM_RAM
@@ -342,7 +342,7 @@ static WRITE32_HANDLER( jclub2_tileram_w )
}
-static ADDRESS_MAP_START( jclub2_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( jclub2_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x400000, 0x41ffff) AM_RAM
@@ -369,7 +369,7 @@ static ADDRESS_MAP_START( jclub2_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jclub2o_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( jclub2o_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x400000, 0x41ffff) AM_RAM
@@ -718,7 +718,7 @@ static MACHINE_CONFIG_START( jclub2, darkhors_state )
MCFG_VIDEO_START(jclub2)
MACHINE_CONFIG_END
-static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( st0016_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("stsnd", st0016_snd_r, st0016_snd_w)
@@ -726,7 +726,7 @@ static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( st0016_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( st0016_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w)
//AM_RANGE(0xc0, 0xc0) AM_READ(cmd1_r)
diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c
index 107039624b4..3ba30535e54 100644
--- a/src/mame/drivers/darkmist.c
+++ b/src/mame/drivers/darkmist.c
@@ -37,7 +37,7 @@ static WRITE8_HANDLER(darkmist_hw_w)
memory_set_bankptr(space->machine, "bank1",&space->machine->region("maincpu")->base()[0x010000+((data&0x80)?0x4000:0)]);
}
-static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc801, 0xc801) AM_READ_PORT("P1")
@@ -402,7 +402,7 @@ static void decrypt_snd(running_machine *machine)
static DRIVER_INIT(darkmist)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int i, len;
UINT8 *ROM = machine->region("maincpu")->base();
UINT8 *buffer = auto_alloc_array(machine, UINT8, 0x10000);
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index a38af245eee..31e34434a3b 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -59,7 +59,7 @@ static READ16_HANDLER( darkseal_control_r )
/******************************************************************************/
-static ADDRESS_MAP_START( darkseal_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( darkseal_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE_MEMBER(darkseal_state, ram)
AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
@@ -82,7 +82,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 3ab828b9dd7..e22940bbbc6 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -213,7 +213,7 @@ static READ16_HANDLER( shared_ram_r )
/**********************************************************************************/
-static ADDRESS_MAP_START( dassault_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dassault_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM_DEVWRITE("deco_common", decocomn_nonbuffered_palette_w) AM_BASE_GENERIC(paletteram)
@@ -242,7 +242,7 @@ static ADDRESS_MAP_START( dassault_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x3fe000, 0x3fefff) AM_READWRITE(shared_ram_r, shared_ram_w) AM_BASE_MEMBER(dassault_state, shared_ram) /* Shared ram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dassault_sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dassault_sub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_WRITE(buffer_spriteram16_w)
@@ -257,7 +257,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_r, ym2151_w)
@@ -865,7 +865,7 @@ static DRIVER_INIT( dassault )
auto_free(machine, tmp);
/* Save time waiting on vblank bit */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3f8000, 0x3f8001, 0, 0, dassault_main_skip);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3f8000, 0x3f8001, 0, 0, dassault_main_skip);
}
static DRIVER_INIT( thndzone )
@@ -885,7 +885,7 @@ static DRIVER_INIT( thndzone )
auto_free(machine, tmp);
/* Save time waiting on vblank bit */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3f8000, 0x3f8001, 0, 0, thndzone_main_skip);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3f8000, 0x3f8001, 0, 0, thndzone_main_skip);
}
/**********************************************************************************/
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index 702e350ec81..6403f10a565 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -298,7 +298,7 @@ static WRITE16_HANDLER( dblewing_prot_w )
if ((offset * 2) == 0x788) { state->_788_data = data; return; }
}
-static ADDRESS_MAP_START( dblewing_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dblewing_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE("tilegen1", deco16ic_pf1_data_r, deco16ic_pf1_data_w)
@@ -336,7 +336,7 @@ static READ8_HANDLER(irq_latch_r)
return state->sound_irq;
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2151_status_port_r,ym2151_w)
@@ -346,7 +346,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf000) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io, AS_IO, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM AM_REGION("audio_data", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 17c7c8db99a..d9d84ec39fc 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -123,7 +123,7 @@ static void dbz_sound_irq( device_t *device, int irq )
device_set_input_line(state->audiocpu, 0, CLEAR_LINE);
}
-static ADDRESS_MAP_START( dbz_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dbz_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x480000, 0x48ffff) AM_RAM
AM_RANGE(0x490000, 0x491fff) AM_DEVREADWRITE("k056832", k056832_ram_word_r, k056832_ram_word_w) // '157 RAM is mirrored twice
@@ -160,7 +160,7 @@ ADDRESS_MAP_END
/* dbz sound */
/* IRQ: from YM2151. NMI: from 68000. Port 0: write to ack NMI */
-static ADDRESS_MAP_START( dbz_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dbz_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAM
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -168,7 +168,7 @@ static ADDRESS_MAP_START( dbz_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe001) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dbz_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dbz_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index f0c2bd88d4a..01dff9aee56 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -214,7 +214,7 @@ static WRITE8_HANDLER( bsmt_data_w )
*
*************************************/
-static ADDRESS_MAP_START( main_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_cpu_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
@@ -236,7 +236,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(sound_status_r, sound_control_w)
AM_RANGE(0x0800, 0x0fff) AM_READ(sound_command_r)
diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c
index a845ed91b89..fde7fb71412 100644
--- a/src/mame/drivers/dcon.c
+++ b/src/mame/drivers/dcon.c
@@ -20,7 +20,7 @@
/***************************************************************************/
-static ADDRESS_MAP_START( dcon_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dcon_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0x80000, 0x8bfff) AM_RAM
diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c
index 5634cb2ed31..4ed374cf353 100644
--- a/src/mame/drivers/dday.c
+++ b/src/mame/drivers/dday.c
@@ -55,7 +55,7 @@ write:
#include "includes/dday.h"
-static ADDRESS_MAP_START( dday_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dday_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4000) AM_WRITE(dday_sl_control_w)
AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE(dday_textvideoram_w) AM_BASE_MEMBER(dday_state, textvideoram)
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index fb5a12130be..6d20860c514 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -240,7 +240,7 @@ static WRITE8_HANDLER( i8257_LMSR_w )
}
}
-static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM AM_BASE_MEMBER(ddayjlc_state, mainram)
AM_RANGE(0x9000, 0x93ff) AM_RAM AM_BASE_MEMBER(ddayjlc_state, spriteram)
@@ -266,7 +266,7 @@ static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x3000, 0x3000) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w)
diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c
index e9b5ddab317..0026993140c 100644
--- a/src/mame/drivers/ddealer.c
+++ b/src/mame/drivers/ddealer.c
@@ -452,7 +452,7 @@ static WRITE16_HANDLER( ddealer_mcu_shared_w )
}
}
-static ADDRESS_MAP_START( ddealer, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ddealer, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -671,7 +671,7 @@ static READ16_HANDLER( ddealer_mcu_r )
static DRIVER_INIT( ddealer )
{
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfe01c, 0xfe01d, 0, 0, ddealer_mcu_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfe01c, 0xfe01d, 0, 0, ddealer_mcu_r );
}
ROM_START( ddealer )
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 6f758a4982d..62849709a28 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -1722,7 +1722,7 @@ static WRITE16_HANDLER( quiz365_protection_w )
COMBINE_DATA(state->quiz365_protection + offset);
}
-static ADDRESS_MAP_START( quiz365_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( quiz365_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x17ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x2003ff) AM_WRITE(ddenlovr_palette_w) // Palette
@@ -1785,7 +1785,7 @@ static CUSTOM_INPUT( ddenlovj_blitter_r )
return state->ddenlovr_blitter_irq_flag ? 0x03 : 0x00; // bit 4 = 1 -> blitter busy
}
-static ADDRESS_MAP_START( ddenlovj_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ddenlovj_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x2003ff) AM_WRITE(ddenlovr_palette_w) // Palette
@@ -1844,7 +1844,7 @@ static WRITE16_HANDLER( ddenlovrk_protection2_w )
state->oki->set_bank_base(((*state->protection2) & 0x7) * 0x40000);
}
-static ADDRESS_MAP_START( ddenlovrk_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ddenlovrk_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x100001) AM_RAM_READ(ddenlovrk_protection1_r) AM_BASE_MEMBER(dynax_state, protection1)
@@ -1883,7 +1883,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( ddenlovr_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ddenlovr_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x300000, 0x300001) AM_DEVWRITE("oki", ddenlovr_oki_bank_w)
@@ -1972,7 +1972,7 @@ static WRITE16_DEVICE_HANDLER( nettoqc_oki_bank_w )
}
}
-static ADDRESS_MAP_START( nettoqc_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( nettoqc_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x17ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x2003ff) AM_WRITE(ddenlovr_palette_w) // Palette
@@ -2037,14 +2037,14 @@ static WRITE8_HANDLER( rongrong_select_w )
}
-static ADDRESS_MAP_START( quizchq_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( quizchq_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM
AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked)
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_WRITE(rongrong_palette_w) // ROM (Banked)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( quizchq_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( quizchq_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_WRITE(rongrong_blitter_w)
AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r)
@@ -2074,14 +2074,14 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( rongrong_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rongrong_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM
AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked)
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_WRITE(rongrong_palette_w) // ROM (Banked)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rongrong_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rongrong_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_WRITE(rongrong_blitter_w)
AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r)
@@ -2186,7 +2186,7 @@ static READ8_HANDLER( mmpanic_link_r ) { return 0xff; }
/* Main CPU */
-static ADDRESS_MAP_START( mmpanic_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mmpanic_map, AS_PROGRAM, 8 )
AM_RANGE(0x0051, 0x0051) AM_READ(magic_r) // ?
AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM
@@ -2194,7 +2194,7 @@ static ADDRESS_MAP_START( mmpanic_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_WRITE(rongrong_palette_w) // ROM (Banked)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mmpanic_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mmpanic_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x0f) AM_DEVREADWRITE("rtc", msm6242_r, msm6242_w) // 6242RTC
@@ -2240,13 +2240,13 @@ ADDRESS_MAP_END
/* Sound CPU */
-static ADDRESS_MAP_START( mmpanic_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mmpanic_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM
AM_RANGE(0x6000, 0x66ff) AM_RAM // RAM
AM_RANGE(0x8000, 0xffff) AM_ROM // ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mmpanic_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mmpanic_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r)
AM_RANGE(0x02, 0x02) AM_READNOP // read just before port 00
@@ -2265,7 +2265,7 @@ ADDRESS_MAP_END
/* Main CPU */
-static ADDRESS_MAP_START( funkyfig_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( funkyfig_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked)
@@ -2356,7 +2356,7 @@ static WRITE8_HANDLER( funkyfig_lockout_w )
}
}
-static ADDRESS_MAP_START( funkyfig_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( funkyfig_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write) // Sound
AM_RANGE(0x01, 0x01) AM_WRITE(mmpanic_leds_w) // Leds
@@ -2389,7 +2389,7 @@ ADDRESS_MAP_END
/* Sound CPU */
-static ADDRESS_MAP_START( funkyfig_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( funkyfig_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r)
AM_RANGE(0x04, 0x04) AM_READNOP // read only once at the start
@@ -2409,7 +2409,7 @@ static WRITE8_HANDLER( hanakanz_rombank_w )
memory_set_bank(space->machine, "bank2", ((data & 0xf0) >> 4));
}
-static ADDRESS_MAP_START( hanakanz_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hanakanz_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM
AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked)
@@ -2539,7 +2539,7 @@ static READ8_HANDLER( hanakanz_rand_r )
return space->machine->rand();
}
-static ADDRESS_MAP_START( hanakanz_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hanakanz_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x2c, 0x2c) AM_READ(hanakanz_busy_r) AM_DEVWRITE("oki", hanakanz_oki_bank_w)
AM_RANGE(0x2e, 0x2e) AM_WRITE(hanakanz_blitter_reg_w)
@@ -2560,7 +2560,7 @@ static ADDRESS_MAP_START( hanakanz_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hkagerou_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hkagerou_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x2c, 0x2c) AM_READ(hanakanz_busy_r) AM_DEVWRITE("oki", hanakanz_oki_bank_w)
AM_RANGE(0x2e, 0x2e) AM_WRITE(hanakanz_blitter_reg_w)
@@ -2593,7 +2593,7 @@ static READ8_HANDLER( mjreach1_protection_r )
return state->prot_val;
}
-static ADDRESS_MAP_START( mjreach1_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjreach1_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x2c, 0x2c) AM_READ(hanakanz_busy_r) AM_DEVWRITE("oki", hanakanz_oki_bank_w)
AM_RANGE(0x2e, 0x2e) AM_WRITE(hanakanz_blitter_reg_w)
@@ -2725,7 +2725,7 @@ static WRITE8_DEVICE_HANDLER( mjchuuka_oki_bank_w )
#endif
}
-static ADDRESS_MAP_START( mjchuuka_portmap, ADDRESS_SPACE_IO, 8 ) // 16 bit I/O
+static ADDRESS_MAP_START( mjchuuka_portmap, AS_IO, 8 ) // 16 bit I/O
AM_RANGE(0x13, 0x13) AM_MIRROR(0xff00) AM_READ(hanakanz_rand_r)
AM_RANGE(0x1c, 0x1c) AM_MIRROR(0xff00) AM_WRITE(hanakanz_rombank_w)
AM_RANGE(0x1e, 0x1e) AM_MIRROR(0xff00) AM_DEVWRITE("oki", mjchuuka_oki_bank_w )
@@ -2753,7 +2753,7 @@ ADDRESS_MAP_END
Mahjong The Mysterious World
***************************************************************************/
-static ADDRESS_MAP_START( mjmyster_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjmyster_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM
AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked)
@@ -2849,7 +2849,7 @@ static WRITE8_HANDLER( mjmyster_blitter_w )
blitter_w(space, 0, offset, data, 0xfc);
}
-static ADDRESS_MAP_START( mjmyster_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjmyster_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_WRITE(mjmyster_blitter_w)
AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r)
@@ -2899,7 +2899,7 @@ static READ8_HANDLER( hginga_protection_r )
return rom[0x10000 + 0x8000 * (state->hginga_rombank & 0x7) + 0xf601 - 0x8000];
}
-static ADDRESS_MAP_START( hginga_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hginga_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM
AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked)
@@ -3029,7 +3029,7 @@ static WRITE8_HANDLER( hginga_blitter_w )
blitter_w(space, 0, offset, data, 0xfc);
}
-static ADDRESS_MAP_START( hginga_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hginga_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_WRITE(hginga_blitter_w)
AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r)
@@ -3133,7 +3133,7 @@ static READ8_HANDLER( hgokou_protection_r )
return rom[0x10000 + 0x8000 * (state->hginga_rombank & 0x7) + 0xe601 - 0x8000];
}
-static ADDRESS_MAP_START( hgokou_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hgokou_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM
AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked)
@@ -3144,7 +3144,7 @@ static ADDRESS_MAP_START( hgokou_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hgokou_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hgokou_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_WRITE(hginga_blitter_w)
AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r)
@@ -3231,7 +3231,7 @@ static WRITE8_HANDLER( hparadis_coin_w )
}
}
-static ADDRESS_MAP_START( hparadis_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hparadis_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM
AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked)
@@ -3240,7 +3240,7 @@ static ADDRESS_MAP_START( hparadis_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
// the RTC seems unused
-static ADDRESS_MAP_START( hparadis_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hparadis_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_WRITE(rongrong_blitter_w)
AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r)
@@ -3285,7 +3285,7 @@ static READ8_HANDLER( mjmywrld_coins_r )
return 0xff;
}
-static ADDRESS_MAP_START( mjmywrld_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjmywrld_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_WRITE(mjmyster_blitter_w)
AM_RANGE(0x03, 0x03) AM_READ(rongrong_gfxrom_r)
@@ -3363,7 +3363,7 @@ static READ16_HANDLER( akamaru_e0010d_r )
return 0xffff; // read but not used, it seems
}
-static ADDRESS_MAP_START( akamaru_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( akamaru_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0x213570, 0x213571) AM_WRITE(akamaru_protection1_w) // OKI bank
@@ -3471,7 +3471,7 @@ static WRITE8_HANDLER( mjflove_coincounter_w )
}
}
-static ADDRESS_MAP_START( mjflove_portmap, ADDRESS_SPACE_IO, 8 ) // 16 bit I/O
+static ADDRESS_MAP_START( mjflove_portmap, AS_IO, 8 ) // 16 bit I/O
AM_RANGE(0x0010, 0x0010) AM_READ(hanakanz_rand_r) AM_MIRROR(0xff00)
AM_RANGE(0x001c, 0x001c) AM_READ_PORT("DSW2") AM_MIRROR(0xff00)
AM_RANGE(0x001e, 0x001e) AM_WRITE(hanakanz_keyb_w) AM_MIRROR(0xff00)
@@ -3523,7 +3523,7 @@ static READ8_HANDLER( jongtei_busy_r )
return 0x04; // !bit 2 = blitter busy
}
-static ADDRESS_MAP_START( jongtei_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jongtei_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x2c, 0x2c) AM_READ(jongtei_busy_r) AM_DEVWRITE("oki", jongtei_okibank_w)
AM_RANGE(0x2e, 0x2e) AM_WRITE(hanakanz_blitter_reg_w)
@@ -3547,7 +3547,7 @@ ADDRESS_MAP_END
Mahjong Seiryu Densetsu
***************************************************************************/
-static ADDRESS_MAP_START( sryudens_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sryudens_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM
AM_RANGE(0x7000, 0x7fff) AM_RAMBANK("bank2") // RAM (Banked)
@@ -3596,7 +3596,7 @@ static WRITE8_HANDLER( sryudens_rambank_w )
//logerror("%04x: rambank = %02x\n", cpu_get_pc(space->cpu), data);
}
-static ADDRESS_MAP_START( sryudens_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sryudens_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
AM_RANGE(0x02, 0x03) AM_DEVWRITE("ymsnd", ym2413_w)
@@ -3713,7 +3713,7 @@ static READ8_HANDLER( daimyojn_year_hack_r )
return offset ? 1 : 0; // year = 0x10 (BCD)
}
-static ADDRESS_MAP_START( daimyojn_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( daimyojn_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x2c, 0x2c) AM_READ(jongtei_busy_r) AM_DEVWRITE("oki", daimyojn_okibank_w)
AM_RANGE(0x2e, 0x2e) AM_WRITE(daimyojn_palette_sel_w)
@@ -9107,7 +9107,7 @@ static DRIVER_INIT( rongrong )
version of the game might be a bootleg with the protection
patched. (both sets need this)
*/
- memory_nop_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x60d4, 0x60d4, 0, 0);
+ memory_nop_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x60d4, 0x60d4, 0, 0);
}
/***************************************************************************
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 1c7de4e4d28..f70c6df1594 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -501,7 +501,7 @@ static READ8_HANDLER( dd_adpcm_status_r )
*
*************************************/
-static ADDRESS_MAP_START( ddragon_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ddragon_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_BASE_MEMBER(ddragon_state, rambase)
AM_RANGE(0x1000, 0x11ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x1200, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE_GENERIC(paletteram2)
@@ -523,7 +523,7 @@ static ADDRESS_MAP_START( ddragon_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dd2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dd2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(ddragon_fgvideoram_w) AM_BASE_MEMBER(ddragon_state, fgvideoram)
AM_RANGE(0x2000, 0x2fff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w) AM_BASE_MEMBER(ddragon_state, spriteram)
@@ -551,7 +551,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x001f) AM_READWRITE(ddragon_hd63701_internal_registers_r, ddragon_hd63701_internal_registers_w)
AM_RANGE(0x001f, 0x0fff) AM_RAM
AM_RANGE(0x8000, 0x8fff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w)
@@ -559,14 +559,14 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ddragonba_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ddragonba_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x8000, 0x8fff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w)
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dd2_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dd2_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc3ff) AM_READWRITE(ddragon_spriteram_r, ddragon_spriteram_w)
AM_RANGE(0xd000, 0xd000) AM_WRITE(ddragon2_sub_irq_ack_w)
@@ -581,7 +581,7 @@ static WRITE8_HANDLER( ddragonba_port_w )
device_set_input_line(state->sub_cpu, state->sprite_irq, CLEAR_LINE );
}
-static ADDRESS_MAP_START( ddragonba_sub_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ddragonba_sub_portmap, AS_IO, 8 )
AM_RANGE(0x0000, 0xffff) AM_WRITE(ddragonba_port_w)
ADDRESS_MAP_END
@@ -593,7 +593,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r)
AM_RANGE(0x1800, 0x1800) AM_READ(dd_adpcm_status_r)
@@ -603,7 +603,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dd2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dd2_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("fmsnd", ym2151_r, ym2151_w)
@@ -619,7 +619,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0007) AM_RAM_WRITE(darktowr_mcu_w) AM_BASE_MEMBER(ddragon_state, darktowr_mcu_ports)
AM_RANGE(0x0008, 0x007f) AM_RAM
@@ -2021,7 +2021,7 @@ static DRIVER_INIT( darktowr )
state->sound_irq = M6809_IRQ_LINE;
state->ym_irq = M6809_FIRQ_LINE;
state->technos_video_hw = 0;
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3808, 0x3808, 0, 0, darktowr_bankswitch_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3808, 0x3808, 0, 0, darktowr_bankswitch_w);
}
@@ -2034,7 +2034,7 @@ static DRIVER_INIT( toffy )
state->sound_irq = M6809_IRQ_LINE;
state->ym_irq = M6809_FIRQ_LINE;
state->technos_video_hw = 0;
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3808, 0x3808, 0, 0, toffy_bankswitch_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3808, 0x3808, 0, 0, toffy_bankswitch_w);
/* the program rom has a simple bitswap encryption */
rom = machine->region("maincpu")->base();
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index 4898311bbe9..30603e503c4 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -207,7 +207,7 @@ static WRITE16_HANDLER( ddragon3_io_w )
*
*************************************/
-static ADDRESS_MAP_START( ddragon3_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ddragon3_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(ddragon3_fg_videoram_w) AM_BASE_MEMBER(ddragon3_state, fg_videoram) /* Foreground (32x32 Tiles - 4 by per tile) */
AM_RANGE(0x082000, 0x0827ff) AM_RAM_WRITE(ddragon3_bg_videoram_w) AM_BASE_MEMBER(ddragon3_state, bg_videoram) /* Background (32x32 Tiles - 2 by per tile) */
@@ -222,7 +222,7 @@ static ADDRESS_MAP_START( ddragon3_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM /* working RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dd3b_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dd3b_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(ddragon3_fg_videoram_w) AM_BASE_MEMBER(ddragon3_state, fg_videoram) /* Foreground (32x32 Tiles - 4 by per tile) */
AM_RANGE(0x081000, 0x081fff) AM_RAM AM_BASE_MEMBER(ddragon3_state, spriteram)
@@ -237,7 +237,7 @@ static ADDRESS_MAP_START( dd3b_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM /* working RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ctribe_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ctribe_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(ddragon3_fg_videoram_w) AM_BASE_MEMBER(ddragon3_state, fg_videoram) /* Foreground (32x32 Tiles - 4 by per tile) */
AM_RANGE(0x081000, 0x081fff) AM_RAM AM_BASE_MEMBER(ddragon3_state, spriteram)
@@ -253,7 +253,7 @@ static ADDRESS_MAP_START( ctribe_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM /* working RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE("ym2151", ym2151_r, ym2151_w)
@@ -262,7 +262,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe800, 0xe800) AM_DEVWRITE("oki", oki_bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ctribe_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ctribe_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ym2151", ym2151_status_port_r, ym2151_w)
diff --git a/src/mame/drivers/ddribble.c b/src/mame/drivers/ddribble.c
index 8d0200a17b7..9fa210e3f9f 100644
--- a/src/mame/drivers/ddribble.c
+++ b/src/mame/drivers/ddribble.c
@@ -113,7 +113,7 @@ static WRITE8_DEVICE_HANDLER( ddribble_vlm5030_ctrl_w )
}
-static ADDRESS_MAP_START( cpu0_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu0_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0004) AM_WRITE(K005885_0_w) /* video registers (005885 #1) */
AM_RANGE(0x0800, 0x0804) AM_WRITE(K005885_1_w) /* video registers (005885 #2) */
AM_RANGE(0x1800, 0x187f) AM_RAM AM_BASE_MEMBER(ddribble_state, paletteram) /* palette */
@@ -127,7 +127,7 @@ static ADDRESS_MAP_START( cpu0_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_READWRITE(ddribble_sharedram_r, ddribble_sharedram_w) /* shared RAM with CPU #0 */
AM_RANGE(0x2000, 0x27ff) AM_READWRITE(ddribble_snd_sharedram_r, ddribble_snd_sharedram_w) /* shared RAM with CPU #2 */
AM_RANGE(0x2800, 0x2800) AM_READ_PORT("DSW1")
@@ -141,7 +141,7 @@ static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(ddribble_state, snd_sharedram) /* shared RAM with CPU #1 */
AM_RANGE(0x1000, 0x1001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) /* YM2203 */
AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("vlm", vlm5030_data_w) /* Speech data */
diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c
index c4e94e193e7..b5df7663af3 100644
--- a/src/mame/drivers/ddz.c
+++ b/src/mame/drivers/ddz.c
@@ -25,7 +25,7 @@ public:
};
-static ADDRESS_MAP_START( ddz_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( ddz_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003fffff) AM_ROM AM_WRITENOP
ADDRESS_MAP_END
diff --git a/src/mame/drivers/de_1.c b/src/mame/drivers/de_1.c
index f03bb7e769d..f4dfcf70d0a 100644
--- a/src/mame/drivers/de_1.c
+++ b/src/mame/drivers/de_1.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( de_1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( de_1_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/de_2.c b/src/mame/drivers/de_2.c
index 54627038e7c..42a565521d1 100644
--- a/src/mame/drivers/de_2.c
+++ b/src/mame/drivers/de_2.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( de_2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( de_2_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/de_3.c b/src/mame/drivers/de_3.c
index cca1f9615b5..19ea5d5e02e 100644
--- a/src/mame/drivers/de_3.c
+++ b/src/mame/drivers/de_3.c
@@ -13,7 +13,7 @@ public:
};
-static ADDRESS_MAP_START( de_3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( de_3_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/de_3b.c b/src/mame/drivers/de_3b.c
index 89dc23c0171..5337f450378 100644
--- a/src/mame/drivers/de_3b.c
+++ b/src/mame/drivers/de_3b.c
@@ -13,7 +13,7 @@ public:
};
-static ADDRESS_MAP_START( de_3b_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( de_3b_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index c677191bd33..0279bfa8f3b 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -57,7 +57,7 @@ static READ16_HANDLER( ghunter_trackball_high_r )
/* Memory Maps */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x037ff) AM_RAM
AM_RANGE(0x03800, 0x03fff) AM_RAM AM_BASE_MEMBER(deadang_state, spriteram)
AM_RANGE(0x04000, 0x04fff) AM_RAM AM_SHARE("share1")
@@ -75,7 +75,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x037ff) AM_RAM
AM_RANGE(0x03800, 0x03fff) AM_RAM_WRITE(deadang_foreground_w) AM_BASE_MEMBER(deadang_state, video_data)
AM_RANGE(0x04000, 0x04fff) AM_RAM AM_SHARE("share1")
@@ -403,8 +403,8 @@ static DRIVER_INIT( ghunter )
seibu_sound_decrypt(machine, "audiocpu", 0x2000);
seibu_adpcm_decrypt(machine, "adpcm");
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80000, 0x80001, 0, 0, ghunter_trackball_low_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xb0000, 0xb0001, 0, 0, ghunter_trackball_high_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80000, 0x80001, 0, 0, ghunter_trackball_low_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xb0000, 0xb0001, 0, 0, ghunter_trackball_high_r);
}
/* Game Drivers */
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 5cc69395af8..0243acf11f4 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -273,7 +273,7 @@ static WRITE16_HANDLER( midres_sound_w )
/******************************************************************************/
-static ADDRESS_MAP_START( dec0_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dec0_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x240000, 0x240007) AM_WRITE(dec0_pf1_control_0_w) /* text layer */
AM_RANGE(0x240010, 0x240017) AM_WRITE(dec0_pf1_control_1_w)
@@ -300,14 +300,14 @@ static ADDRESS_MAP_START( dec0_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffc000, 0xffc7ff) AM_RAM AM_BASE_MEMBER(dec0_state, spriteram) /* Sprites */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( robocop_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( robocop_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x1f0000, 0x1f1fff) AM_RAM /* Main ram */
AM_RANGE(0x1f2000, 0x1f3fff) AM_RAM AM_BASE_MEMBER(dec0_state, robocop_shared_ram) /* Shared ram */
AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hippodrm_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hippodrm_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x180000, 0x1800ff) AM_READWRITE(hippodrm_shared_r, hippodrm_shared_w)
AM_RANGE(0x1a0000, 0x1a001f) AM_WRITE(dec0_pf3_control_8bit_w)
@@ -318,7 +318,7 @@ static ADDRESS_MAP_START( hippodrm_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1ff402, 0x1ff403) AM_READ_PORT("VBLANK")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slyspy_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( slyspy_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
/* These locations aren't real! They are just there so memory is allocated */
@@ -355,7 +355,7 @@ static ADDRESS_MAP_START( slyspy_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x31c000, 0x31c00f) AM_READ(slyspy_protection_r) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( midres_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( midres_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE_MEMBER(dec0_state, ram)
AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE_MEMBER(dec0_state, spriteram)
@@ -389,7 +389,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( dec0_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dec0_s_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3812_w)
@@ -399,7 +399,7 @@ static ADDRESS_MAP_START( dec0_s_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* Physical memory map (21 bits) */
-static ADDRESS_MAP_START( slyspy_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slyspy_s_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x090000, 0x090001) AM_DEVWRITE("ym2", ym3812_w)
AM_RANGE(0x0a0000, 0x0a0001) AM_READNOP /* Protection counter */
@@ -410,7 +410,7 @@ static ADDRESS_MAP_START( slyspy_s_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( midres_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( midres_s_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x108000, 0x108001) AM_DEVWRITE("ym2", ym3812_w)
AM_RANGE(0x118000, 0x118001) AM_DEVWRITE("ym1", ym2203_w)
@@ -421,7 +421,7 @@ static ADDRESS_MAP_START( midres_s_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( secretab_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( secretab_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x240000, 0x240007) AM_WRITE(dec0_pf2_control_0_w)
AM_RANGE(0x240010, 0x240017) AM_WRITE(dec0_pf2_control_1_w)
@@ -448,7 +448,7 @@ static ADDRESS_MAP_START( secretab_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb08000, 0xb087ff) AM_RAM AM_BASE_MEMBER(dec0_state, spriteram) /* Sprites */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( automat_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( automat_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x240000, 0x240007) AM_WRITE(dec0_pf1_control_0_w) /* text layer */
@@ -486,7 +486,7 @@ static WRITE8_HANDLER( automat_adpcm_w )
state->automat_adpcm_byte = data;
}
-static ADDRESS_MAP_START( automat_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( automat_s_map, AS_PROGRAM, 8 )
AM_RANGE(0xc000, 0xc7ff) AM_RAM
// AM_RANGE(0xc800, 0xc800) AM_WRITE(ym2203_control_port_0_w)
// AM_RANGE(0xc801, 0xc801) AM_WRITE(ym2203_write_port_0_w)
@@ -497,7 +497,7 @@ static ADDRESS_MAP_START( automat_s_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P3) AM_READWRITE(dec0_mcu_port_r, dec0_mcu_port_w)
ADDRESS_MAP_END
@@ -2905,10 +2905,10 @@ static DRIVER_INIT( convert_robocop_gfx4_to_automat )
static DRIVER_INIT( midresb )
{
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00180000, 0x0018000f, 0, 0, dec0_controls_r );
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x001a0000, 0x001a000f, 0, 0, dec0_rotary_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00180000, 0x0018000f, 0, 0, dec0_controls_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x001a0000, 0x001a000f, 0, 0, dec0_rotary_r );
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00180014, 0x00180015, 0, 0, midres_sound_w );
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00180014, 0x00180015, 0, 0, midres_sound_w );
}
/******************************************************************************/
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 55bcaa408c2..a63d822ca2a 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -54,7 +54,7 @@ To do:
/* Only used by ghostb, gondo, garyoret, other games can control buffering */
static SCREEN_EOF( dec8 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
@@ -487,7 +487,7 @@ static WRITE8_HANDLER( flip_screen_w ) { flip_screen_set(space->machine, data);
/******************************************************************************/
-static ADDRESS_MAP_START( cobra_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cobra_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0fff) AM_READWRITE(dec8_pf0_data_r, dec8_pf0_data_w) AM_BASE_MEMBER(dec8_state, pf0_data)
AM_RANGE(0x1000, 0x17ff) AM_READWRITE(dec8_pf1_data_r, dec8_pf1_data_w) AM_BASE_MEMBER(dec8_state, pf1_data)
@@ -510,7 +510,7 @@ static ADDRESS_MAP_START( cobra_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( meikyuh_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( meikyuh_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE_MEMBER(dec8_state, videoram, videoram_size)
@@ -534,7 +534,7 @@ static ADDRESS_MAP_START( meikyuh_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( srdarwin_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( srdarwin_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x0600, 0x07ff) AM_RAM AM_BASE_GENERIC(spriteram)
AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE(srdarwin_videoram_w) AM_BASE_MEMBER(dec8_state, videoram) AM_SIZE_GENERIC(spriteram)
@@ -557,7 +557,7 @@ static ADDRESS_MAP_START( srdarwin_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gondo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gondo_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE_MEMBER(dec8_state, videoram, videoram_size)
AM_RANGE(0x2000, 0x27ff) AM_READWRITE(dec8_pf0_data_r, dec8_pf0_data_w) AM_BASE_MEMBER(dec8_state, pf0_data)
@@ -580,7 +580,7 @@ static ADDRESS_MAP_START( gondo_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oscar_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( oscar_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0eff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x0f00, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_RAM AM_SHARE("share2")
@@ -603,7 +603,7 @@ static ADDRESS_MAP_START( oscar_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oscar_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( oscar_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0eff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x0f00, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_RAM AM_SHARE("share2")
@@ -611,7 +611,7 @@ static ADDRESS_MAP_START( oscar_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lastmisn_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lastmisn_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3") AM_BASE_GENERIC(paletteram)
AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4") AM_BASE_GENERIC(paletteram2)
@@ -637,7 +637,7 @@ static ADDRESS_MAP_START( lastmisn_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lastmisn_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lastmisn_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3")
AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4")
@@ -657,7 +657,7 @@ static ADDRESS_MAP_START( lastmisn_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shackled_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shackled_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3") AM_BASE_GENERIC(paletteram)
AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4") AM_BASE_GENERIC(paletteram2)
@@ -681,7 +681,7 @@ static ADDRESS_MAP_START( shackled_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shackled_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shackled_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3")
AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4")
@@ -706,7 +706,7 @@ static ADDRESS_MAP_START( shackled_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( csilver_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( csilver_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3") AM_BASE_GENERIC(paletteram)
AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4") AM_BASE_GENERIC(paletteram2)
@@ -731,7 +731,7 @@ static ADDRESS_MAP_START( csilver_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( csilver_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( csilver_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_SHARE("share3")
AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_SHARE("share4")
@@ -747,7 +747,7 @@ static ADDRESS_MAP_START( csilver_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( garyoret_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( garyoret_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(dec8_videoram_w) AM_BASE_SIZE_MEMBER(dec8_state, videoram, videoram_size)
AM_RANGE(0x2000, 0x27ff) AM_READWRITE(dec8_pf0_data_r, dec8_pf0_data_w) AM_BASE_MEMBER(dec8_state, pf0_data)
@@ -772,7 +772,7 @@ ADDRESS_MAP_END
/******************************************************************************/
/* Used for Cobra Command, Maze Hunter, Super Real Darwin etc */
-static ADDRESS_MAP_START( dec8_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dec8_s_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ym2", ym3812_w)
@@ -781,7 +781,7 @@ static ADDRESS_MAP_START( dec8_s_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* Used by Gondomania, Psycho-Nics Oscar & Garyo Retsuden */
-static ADDRESS_MAP_START( oscar_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( oscar_s_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ym2", ym3526_w)
@@ -790,7 +790,7 @@ static ADDRESS_MAP_START( oscar_s_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* Used by Last Mission, Shackled & Breywood */
-static ADDRESS_MAP_START( ym3526_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ym3526_s_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3526_w)
@@ -799,7 +799,7 @@ static ADDRESS_MAP_START( ym3526_s_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* Captain Silver - same sound system as Pocket Gal */
-static ADDRESS_MAP_START( csilver_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( csilver_s_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3526_w)
@@ -867,7 +867,7 @@ static WRITE8_HANDLER( dec8_mcu_to_main_w )
device_set_input_line(state->maincpu, M6809_IRQ_LINE, ASSERT_LINE);
}
-static ADDRESS_MAP_START( dec8_mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dec8_mcu_io_map, AS_IO, 8 )
AM_RANGE(MCS51_PORT_P0,MCS51_PORT_P3) AM_READWRITE(dec8_mcu_from_main_r, dec8_mcu_to_main_w)
ADDRESS_MAP_END
@@ -3417,7 +3417,7 @@ static DRIVER_INIT( dec8 )
static DRIVER_INIT( deco222 )
{
dec8_state *state = machine->driver_data<dec8_state>();
- address_space *space = machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("audiocpu")->memory().space(AS_PROGRAM);
int A;
UINT8 *decrypt;
UINT8 *rom;
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 6d522992704..ff74beb6e2e 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -120,7 +120,7 @@ static WRITE32_HANDLER( wcvol95_pf2_rowscroll_w ) { deco156_state *state = space
static WRITE32_HANDLER( wcvol95_spriteram_w ) { deco156_state *state = space->machine->driver_data<deco156_state>(); data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->spriteram[offset]); }
-static ADDRESS_MAP_START( hvysmsh_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( hvysmsh_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x107fff) AM_RAM
AM_RANGE(0x120000, 0x120003) AM_READ_PORT("INPUTS")
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START( hvysmsh_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x1e0000, 0x1e1fff) AM_READWRITE(wcvol95_spriteram_r, wcvol95_spriteram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wcvol95_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( wcvol95_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10001f) AM_DEVREADWRITE("tilegen1", deco16ic_pf_control_dword_r, deco16ic_pf_control_dword_w)
AM_RANGE(0x110000, 0x111fff) AM_DEVREADWRITE("tilegen1", deco16ic_pf1_data_dword_r, deco16ic_pf1_data_dword_w)
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 18e47e911bf..b747f06c0be 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -749,7 +749,7 @@ static WRITE32_HANDLER( deco32_pf3_rowscroll_w ) { deco32_state *state = space->
static WRITE32_HANDLER( deco32_pf4_rowscroll_w ) { deco32_state *state = space->machine->driver_data<deco32_state>(); COMBINE_DATA(&state->pf4_rowscroll32[offset]); data &= 0x0000ffff; mem_mask &= 0x0000ffff; COMBINE_DATA(&state->pf4_rowscroll[offset]); }
-static ADDRESS_MAP_START( captaven_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( captaven_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x100007) AM_READ(deco32_71_r)
@@ -782,7 +782,7 @@ static ADDRESS_MAP_START( captaven_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fghthist_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( fghthist_map, AS_PROGRAM, 32 )
// AM_RANGE(0x000000, 0x001fff) AM_ROM AM_WRITE(deco32_pf1_data_w) // wtf??
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x11ffff) AM_RAM AM_BASE_MEMBER(deco32_state, ram)
@@ -817,7 +817,7 @@ static ADDRESS_MAP_START( fghthist_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x208800, 0x208803) AM_WRITENOP /* ? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fghthsta_memmap, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( fghthsta_memmap, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x11ffff) AM_RAM AM_BASE_MEMBER(deco32_state, ram)
AM_RANGE(0x140000, 0x140003) AM_WRITENOP /* VBL irq ack */
@@ -848,7 +848,7 @@ ADDRESS_MAP_END
// the video drawing (especially sprite) code on this is too slow to cope with proper partial updates
// raster effects appear to need some work on it anyway?
-static ADDRESS_MAP_START( dragngun_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dragngun_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x11ffff) AM_RAM AM_BASE_MEMBER(deco32_state, ram)
AM_RANGE(0x120000, 0x120fff) AM_READ(dragngun_prot_r)
@@ -895,7 +895,7 @@ static ADDRESS_MAP_START( dragngun_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x500000, 0x500003) AM_WRITE(dragngun_sprite_control_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lockload_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( lockload_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x11ffff) AM_RAM AM_BASE_MEMBER(deco32_state, ram)
AM_RANGE(0x120000, 0x120fff) AM_READ(dragngun_prot_r)
@@ -941,7 +941,7 @@ static ADDRESS_MAP_START( lockload_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x500000, 0x500003) AM_WRITE(dragngun_sprite_control_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tattass_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( tattass_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0f7fff) AM_ROM
AM_RANGE(0x0f8000, 0x0fffff) AM_ROM AM_WRITENOP
@@ -986,7 +986,7 @@ static ADDRESS_MAP_START( tattass_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x200000, 0x200fff) AM_READWRITE(tattass_prot_r, tattass_prot_w) AM_BASE(&deco32_prot_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nslasher_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( nslasher_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x11ffff) AM_RAM AM_BASE_MEMBER(deco32_state, ram)
AM_RANGE(0x120000, 0x1200ff) AM_NOP /* ACIA (unused) */
@@ -1065,7 +1065,7 @@ static READ8_HANDLER(deco32_bsmt_status_r)
return bsmt->read_status() << 7;
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x120000, 0x120001) AM_DEVREADWRITE_MODERN("oki1", okim6295_device, read, write)
@@ -1076,7 +1076,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(h6280_irq_status_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tattass_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tattass_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_WRITE(deco32_bsmt_reset_w)
AM_RANGE(0x2002, 0x2003) AM_READ(soundlatch_r)
@@ -1095,7 +1095,7 @@ static READ8_HANDLER(latch_r)
return soundlatch_r(space,0);
}
-static ADDRESS_MAP_START( nslasher_sound, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nslasher_sound, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -1104,7 +1104,7 @@ static ADDRESS_MAP_START( nslasher_sound, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd000, 0xd000) AM_READ(latch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nslasher_io_sound, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( nslasher_io_sound, AS_IO, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM AM_REGION("audiocpu", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c
index 59c202d2872..53d49172dc7 100644
--- a/src/mame/drivers/deco_ld.c
+++ b/src/mame/drivers/deco_ld.c
@@ -180,7 +180,7 @@ static READ8_HANDLER( test_r )
return space->machine->rand();
}
-static ADDRESS_MAP_START( begas_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( begas_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
// AM_RANGE(0x1000, 0x1007) AM_NOP
AM_RANGE(0x1000, 0x1000) AM_READ(test_r)
@@ -199,7 +199,7 @@ static ADDRESS_MAP_START( begas_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cobra_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cobra_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_READ_PORT("IN1")
AM_RANGE(0x1001, 0x1001) AM_READ(test_r)//_PORT("IN2")
@@ -218,7 +218,7 @@ static ADDRESS_MAP_START( cobra_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rblaster_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rblaster_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
// AM_RANGE(0x1000, 0x1007) AM_NOP
AM_RANGE(0x1001, 0x1001) AM_WRITENOP //???
@@ -249,7 +249,7 @@ static INTERRUPT_GEN ( sound_interrupt )
}
-static ADDRESS_MAP_START( rblaster_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rblaster_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("ay1", ay8910_data_w)
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay1", ay8910_address_w)
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index cf993d0a909..3ea800f2e31 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -259,7 +259,7 @@ static READ32_HANDLER(stadhr96_prot_146_r)
/******************************************************************************/
-static ADDRESS_MAP_START( decomlc_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( decomlc_map, AS_PROGRAM, 32 )
AM_RANGE(0x0000000, 0x00fffff) AM_ROM AM_MIRROR(0xff000000)
AM_RANGE(0x0100000, 0x011ffff) AM_RAM AM_BASE_MEMBER(deco_mlc_state, mlc_ram) AM_MIRROR(0xff000000)
AM_RANGE(0x0200000, 0x020000f) AM_READNOP AM_MIRROR(0xff000000)/* IRQ control? */
@@ -745,7 +745,7 @@ static DRIVER_INIT( avengrgs )
sh2drc_add_pcflush(machine->device("maincpu"), 0x32dc);
state->mainCpuIsArm = 0;
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01089a0, 0x01089a3, 0, 0, avengrgs_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01089a0, 0x01089a3, 0, 0, avengrgs_speedup_r );
descramble_sound(machine);
}
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index 0c5c8b8ec51..e088c429f8f 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -115,7 +115,7 @@ static READ8_HANDLER( mirrorcolorram_r )
}
-static ADDRESS_MAP_START( decocass_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( decocass_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_RAM_WRITE(ram_w) AM_BASE_MEMBER(decocass_state, rambase)
AM_RANGE(0x6000, 0xbfff) AM_RAM_WRITE(charram_w) AM_BASE_MEMBER(decocass_state, charram) /* still RMS3 RAM */
AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(fgvideoram_w) AM_BASE_SIZE_MEMBER(decocass_state, fgvideoram, fgvideoram_size) /* DSP3 RAM */
@@ -156,7 +156,7 @@ static ADDRESS_MAP_START( decocass_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( decocass_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( decocass_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x17ff) AM_READWRITE(decocass_sound_nmi_enable_r, decocass_sound_nmi_enable_w)
AM_RANGE(0x1800, 0x1fff) AM_READWRITE(decocass_sound_data_ack_reset_r, decocass_sound_data_ack_reset_w)
@@ -170,7 +170,7 @@ static ADDRESS_MAP_START( decocass_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( decocass_mcu_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( decocass_mcu_portmap, AS_IO, 8 )
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READWRITE(i8041_p1_r, i8041_p1_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READWRITE(i8041_p2_r, i8041_p2_w)
ADDRESS_MAP_END
@@ -1324,7 +1324,7 @@ ROM_END
static DRIVER_INIT( decocass )
{
decocass_state *state = machine->driver_data<decocass_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
int A;
@@ -1363,8 +1363,8 @@ static DRIVER_INIT( decocrom )
state->decrypted2[i] = swap_bits_5_6(rom[i]);
/* convert charram to a banked ROM */
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0xafff, 0, 0, "bank1");
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0xafff, 0, 0, decocass_de0091_w);
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000, 0xafff, 0, 0, "bank1");
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000, 0xafff, 0, 0, decocass_de0091_w);
memory_configure_bank(machine, "bank1", 0, 1, state->charram, 0);
memory_configure_bank(machine, "bank1", 1, 1, machine->region("user3")->base(), 0);
memory_configure_bank_decrypted(machine, "bank1", 0, 1, &state->decrypted[0x6000], 0);
@@ -1372,7 +1372,7 @@ static DRIVER_INIT( decocrom )
memory_set_bank(machine, "bank1", 0);
/* install the bank selector */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe900, 0xe900, 0, 0, decocass_e900_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe900, 0xe900, 0, 0, decocass_e900_w);
state->save_pointer(NAME(state->decrypted2), romlength);
}
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index 54084825253..4e4989068da 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -78,7 +78,7 @@ static WRITE16_HANDLER( deniam_irq_ack_w )
cputag_set_input_line(space->machine, "maincpu", 4, CLEAR_LINE);
}
-static ADDRESS_MAP_START( deniam16b_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( deniam16b_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(deniam_videoram_w) AM_BASE_MEMBER(deniam_state, videoram)
AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(deniam_textram_w) AM_BASE_MEMBER(deniam_state, textram)
@@ -95,12 +95,12 @@ static ADDRESS_MAP_START( deniam16b_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xf7ff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_READ(soundlatch_r)
AM_RANGE(0x02, 0x03) AM_DEVWRITE("ymsnd", ym3812_w)
@@ -109,7 +109,7 @@ static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
/* identical to 16b, but handles sound directly */
-static ADDRESS_MAP_START( deniam16c_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( deniam16c_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(deniam_videoram_w) AM_BASE_MEMBER(deniam_state, videoram)
AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(deniam_textram_w) AM_BASE_MEMBER(deniam_state, textram)
diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c
index 835303a2f07..bf573700918 100644
--- a/src/mame/drivers/deshoros.c
+++ b/src/mame/drivers/deshoros.c
@@ -106,7 +106,7 @@ static WRITE8_HANDLER( io_w )
// printf("%02x -> [%02x]\n",data,offset);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x900f) AM_READWRITE(io_r,io_w) AM_BASE_MEMBER(deshoros_state, io_ram) //i/o area
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index 3dc68d5ad57..992a1a718ae 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -249,7 +249,7 @@ static READ8_HANDLER( destroyr_scanline_r )
}
-static ADDRESS_MAP_START( destroyr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( destroyr_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0xf00) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_READWRITE(destroyr_input_r, destroyr_output_w)
diff --git a/src/mame/drivers/dfruit.c b/src/mame/drivers/dfruit.c
index 5477f27b458..9a5543ef058 100644
--- a/src/mame/drivers/dfruit.c
+++ b/src/mame/drivers/dfruit.c
@@ -30,7 +30,7 @@ static SCREEN_UPDATE( dfruit )
return 0;
}
-static ADDRESS_MAP_START( dfruit_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dfruit_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* TODO: ROM banks! */
AM_RANGE(0x8000, 0x9fff) AM_RAM
@@ -52,7 +52,7 @@ static ADDRESS_MAP_START( dfruit_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dfruit_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dfruit_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c
index 375d86be808..8a04e3635bb 100644
--- a/src/mame/drivers/dgpix.c
+++ b/src/mame/drivers/dgpix.c
@@ -196,7 +196,7 @@ static READ32_HANDLER( vblank_r )
return input_port_read(space->machine, "VBLANK");
}
-static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x007fffff) AM_RAM
AM_RANGE(0x40000000, 0x4003ffff) AM_READWRITE(vram_r, vram_w)
AM_RANGE(0xe0000000, 0xe1ffffff) AM_READWRITE(flash_r, flash_w)
@@ -204,7 +204,7 @@ static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xffc00000, 0xffffffff) AM_ROM AM_REGION("user1", 0x1c00000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( io_map, AS_IO, 32 )
AM_RANGE(0x0200, 0x0203) AM_READNOP // used to sync with the protecion PIC? tested bits 0 and 1
AM_RANGE(0x0400, 0x0403) AM_READWRITE(vblank_r, vbuffer_w)
AM_RANGE(0x0a10, 0x0a13) AM_READ_PORT("INPUTS")
@@ -583,7 +583,7 @@ static DRIVER_INIT( xfiles )
rom[BYTE4_XOR_BE(0x3aa933)] = 0;
// protection related ?
-// memory_nop_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0c8b440, 0xf0c8b447, 0, 0);
+// memory_nop_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0c8b440, 0xf0c8b447, 0, 0);
state->flash_roms = 2;
}
@@ -604,7 +604,7 @@ static DRIVER_INIT( kdynastg )
rom[BYTE4_XOR_BE(0x3a45c9)] = 0;
// protection related ?
-// memory_nop_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x12341234, 0x12341243, 0, 0);
+// memory_nop_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x12341234, 0x12341243, 0, 0);
state->flash_roms = 4;
}
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index 474cafdbf81..e413de624a4 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -16,7 +16,7 @@
#include "video/decospr.h"
#include "video/decocomn.h"
-static ADDRESS_MAP_START( dietgo_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dietgo_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x20000f) AM_DEVWRITE("tilegen1", deco16ic_pf_control_w)
AM_RANGE(0x210000, 0x211fff) AM_DEVWRITE("tilegen1", deco16ic_pf1_data_w)
@@ -31,7 +31,7 @@ ADDRESS_MAP_END
/* Physical memory map (21 bits) */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_NOP /* YM2203 - this board doesn't have one */
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index d84e4effb5a..c9cdb07ac90 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -288,7 +288,7 @@ static WRITE8_HANDLER( discoboy_ram_att_w )
state->ram_att[offset] = data;
}
-static ADDRESS_MAP_START( discoboy_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( discoboy_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(rambank_r, rambank_w)
@@ -304,7 +304,7 @@ static READ8_HANDLER( discoboy_port_06_r )
return 0x00;
}
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSWA") AM_WRITE(discoboy_port_00_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM") AM_WRITE(discoboy_port_01_w)
@@ -328,7 +328,7 @@ static void splash_msm5205_int( device_t *device )
// state->adpcm_data = (state->adpcm_data << 4) & 0xf0;
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xec00, 0xec01) AM_DEVWRITE("ymsnd", ym3812_w)
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index 3dab19b84da..75ff5045b2a 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -139,7 +139,7 @@ static WRITE8_DEVICE_HANDLER( okibank_w )
-static ADDRESS_MAP_START( diverboy_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( diverboy_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04ffff) AM_RAM
AM_RANGE(0x080000, 0x083fff) AM_RAM AM_BASE_SIZE_MEMBER(diverboy_state, spriteram, spriteram_size)
@@ -156,7 +156,7 @@ static ADDRESS_MAP_START( diverboy_map, ADDRESS_SPACE_PROGRAM, 16 )
// AM_RANGE(0x340002, 0x340003) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( snd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( snd_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("oki", okibank_w)
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index 60f99d0ba42..0ea7be6b8fb 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -250,7 +250,7 @@ static WRITE8_HANDLER( cpu2_bankswitch_w )
/******************************************************************************/
-static ADDRESS_MAP_START( cpu0_am, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu0_am, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xafff) AM_ROMBANK("bank4")
AM_RANGE(0xb000, 0xbfff) AM_DEVREADWRITE("pandora", pandora_spriteram_r, pandora_spriteram_w)
@@ -260,14 +260,14 @@ static ADDRESS_MAP_START( cpu0_am, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu0_port_am, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu0_port_am, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(cpu0_bankswitch_w)
ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( cpu1_am, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu1_am, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(djboy_videoram_w) AM_BASE_MEMBER(djboy_state, videoram)
@@ -276,7 +276,7 @@ static ADDRESS_MAP_START( cpu1_am, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu1_port_am, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu1_port_am, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(cpu1_bankswitch_w)
AM_RANGE(0x02, 0x02) AM_WRITE(trigger_nmi_on_sound_cpu2)
@@ -290,13 +290,13 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( cpu2_am, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu2_am, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3")
AM_RANGE(0xc000, 0xdfff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_port_am, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu2_port_am, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(cpu2_bankswitch_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
@@ -398,7 +398,7 @@ static WRITE8_HANDLER( beast_p3_w )
}
/* Program/data maps are defined in the 8051 core */
-static ADDRESS_MAP_START( djboy_mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( djboy_mcu_io_map, AS_IO, 8 )
AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P0) AM_READWRITE(beast_p0_r, beast_p0_w)
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READWRITE(beast_p1_r, beast_p1_w)
AM_RANGE(MCS51_PORT_P2, MCS51_PORT_P2) AM_READWRITE(beast_p2_r, beast_p2_w)
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index 30de4cb36f6..c023e0a1428 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -465,7 +465,7 @@ static void ide_interrupt(device_t *device, int state)
*
*************************************/
-static ADDRESS_MAP_START( memory_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( memory_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // PRG ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // WORK RAM
AM_RANGE(0x480000, 0x48443f) AM_RAM_WRITE(paletteram32_w) // COLOR RAM
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index d4fffdb2c38..9fd39e8b14f 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -772,7 +772,7 @@ static WRITE8_DEVICE_HANDLER( dkong_z80dma_rdy_w )
*
*************************************/
-static ADDRESS_MAP_START( dkong_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dkong_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x6000, 0x6bff) AM_RAM
AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_SIZE_MEMBER(dkong_state, sprite_ram, sprite_ram_size) /* sprite set 1 */
@@ -793,7 +793,7 @@ static ADDRESS_MAP_START( dkong_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7d86, 0x7d87) AM_WRITE(dkong_palettebank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dkongjr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dkongjr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6bff) AM_RAM
AM_RANGE(0x6c00, 0x6fff) AM_RAM /* DK3 bootleg only */
@@ -822,7 +822,7 @@ static ADDRESS_MAP_START( dkongjr_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd000, 0xdfff) AM_ROM /* DK3 bootleg only */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dkong3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dkong3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM
AM_RANGE(0x6800, 0x6fff) AM_RAM
@@ -842,21 +842,21 @@ static ADDRESS_MAP_START( dkong3_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0x9fff) AM_ROM /* DK3 and bootleg DKjr only */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dkong3_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dkong3_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("z80dma", z80dma_r, z80dma_w) /* dma controller */
ADDRESS_MAP_END
/* Epos conversions */
-static ADDRESS_MAP_START( epos_readport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( epos_readport, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xff) AM_READ(epos_decrypt_rom) /* Switch protection logic */
ADDRESS_MAP_END
/* S2650 conversions */
-static ADDRESS_MAP_START( s2650_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( s2650_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x13ff) AM_RAM AM_BASE_SIZE_MEMBER(dkong_state, sprite_ram, sprite_ram_size) /* 0x7000 */
AM_RANGE(0x1400, 0x1400) AM_MIRROR(0x007f) AM_READ_PORT("IN0") AM_DEVWRITE("ls175.3d", latch8_w)
@@ -882,7 +882,7 @@ static ADDRESS_MAP_START( s2650_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7000, 0x7fff) AM_READWRITE(s2650_mirror_r, s2650_mirror_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( s2650_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( s2650_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ(s2650_port0_r)
AM_RANGE(0x01, 0x01) AM_READ(s2650_port1_r)
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE")
@@ -3040,7 +3040,7 @@ static DRIVER_INIT( drakton )
{7,1,4,0,3,6,2,5},
};
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" );
/* While the PAL supports up to 16 decryption methods, only four
are actually used in the PAL. Therefore, we'll take a little
@@ -3062,7 +3062,7 @@ static DRIVER_INIT( strtheat )
{6,3,4,1,0,7,2,5},
};
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" );
/* While the PAL supports up to 16 decryption methods, only four
are actually used in the PAL. Therefore, we'll take a little
@@ -3073,21 +3073,21 @@ static DRIVER_INIT( strtheat )
drakton_decrypt_rom(machine, 0x88, 0x1c000, bs[3]);
/* custom handlers supporting Joystick or Steering Wheel */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x7c00, 0x7c00, 0, 0, strtheat_inputport_0_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x7c80, 0x7c80, 0, 0, strtheat_inputport_1_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x7c00, 0x7c00, 0, 0, strtheat_inputport_0_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x7c80, 0x7c80, 0, 0, strtheat_inputport_1_r);
}
static DRIVER_INIT( dkongx )
{
UINT8 *decrypted;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
device_t *eeprom = machine->device("eeprom");
decrypted = auto_alloc_array(machine, UINT8, 0x10000);
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x5fff, 0, 0, "bank1" );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, "bank2" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x5fff, 0, 0, "bank1" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, "bank2" );
memory_install_write8_handler(space, 0xe000, 0xe000, 0, 0, braze_a15_w);
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index e37f852ea1a..5dfd115e6f0 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -374,7 +374,7 @@ static WRITE8_HANDLER( laserdisc_w )
*************************************/
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( dlus_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dlus_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa7ff) AM_MIRROR(0x1800) AM_RAM
AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fc7) AM_DEVREAD("aysnd", ay8910_r)
@@ -398,7 +398,7 @@ ADDRESS_MAP_END
*************************************/
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( dleuro_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dleuro_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa7ff) AM_MIRROR(0x1800) AM_RAM
AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x1800) AM_RAM AM_BASE_MEMBER(dlair_state, videoram)
@@ -418,7 +418,7 @@ ADDRESS_MAP_END
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( dleuro_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dleuro_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_MIRROR(0x7c) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w)
AM_RANGE(0x80, 0x83) AM_MIRROR(0x7c) AM_DEVREADWRITE("sio", z80sio_ba_cd_r, z80sio_ba_cd_w)
diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c
index 21d08945543..fd47edf0576 100644
--- a/src/mame/drivers/dmndrby.c
+++ b/src/mame/drivers/dmndrby.c
@@ -115,7 +115,7 @@ static WRITE8_HANDLER( output_w )
// popmessage("%02x|%02x|%02x|%02x|%02x|%02x|%02x|%02x|",state->io_port[0],state->io_port[1],state->io_port[2],state->io_port[3],state->io_port[4],state->io_port[5],state->io_port[6],state->io_port[7]);
}
-static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xc000, 0xc007) AM_READ(input_r)
@@ -132,7 +132,7 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd400, 0xd7ff) AM_RAM AM_BASE_MEMBER(dmndrby_state, dderby_vidattribs) // colours/ attrib ram
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dderby_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dderby_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x1000) AM_RAM //???
AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ay1", ay8910_address_data_w)
diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c
index da71427a95a..a7700ff1020 100644
--- a/src/mame/drivers/docastle.c
+++ b/src/mame/drivers/docastle.c
@@ -209,7 +209,7 @@ static WRITE8_DEVICE_HANDLER( idsoccer_adpcm_w )
}
/* Memory Maps */
-static ADDRESS_MAP_START( docastle_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( docastle_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x97ff) AM_RAM
AM_RANGE(0x9800, 0x99ff) AM_RAM AM_BASE_SIZE_MEMBER(docastle_state, spriteram, spriteram_size)
@@ -220,7 +220,7 @@ static ADDRESS_MAP_START( docastle_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe000) AM_WRITE(docastle_nmitrigger_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( docastle_map2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( docastle_map2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa008) AM_READWRITE(docastle_shared1_r, docastle_shared0_w)
@@ -237,7 +237,7 @@ static ADDRESS_MAP_START( docastle_map2, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xec00, 0xec00) AM_DEVWRITE("sn4", sn76496_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( docastle_map3, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( docastle_map3, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x8000, 0x8008) AM_READ(docastle_shared1_r) // ???
@@ -245,14 +245,14 @@ static ADDRESS_MAP_START( docastle_map3, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc432, 0xc435) AM_NOP // ???
ADDRESS_MAP_END
-static ADDRESS_MAP_START( docastle_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( docastle_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_NOP // goes to CRT 46505S
AM_RANGE(0x02, 0x02) AM_NOP // goes to CRT 46505S
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dorunrun_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dorunrun_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x37ff) AM_RAM
AM_RANGE(0x3800, 0x39ff) AM_RAM AM_BASE_SIZE_MEMBER(docastle_state, spriteram, spriteram_size)
@@ -264,7 +264,7 @@ static ADDRESS_MAP_START( dorunrun_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xb800) AM_WRITE(docastle_nmitrigger_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dorunrun_map2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dorunrun_map2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_DEVWRITE("sn1", sn76496_w)
@@ -282,7 +282,7 @@ static ADDRESS_MAP_START( dorunrun_map2, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( idsoccer_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( idsoccer_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x57ff) AM_RAM
AM_RANGE(0x5800, 0x59ff) AM_RAM AM_BASE_SIZE_MEMBER(docastle_state, spriteram, spriteram_size)
@@ -295,7 +295,7 @@ static ADDRESS_MAP_START( idsoccer_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe000) AM_WRITE(docastle_nmitrigger_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( idsoccer_map2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( idsoccer_map2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa008) AM_READWRITE(docastle_shared1_r, docastle_shared0_w)
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 147c2519e5c..41af2494f2f 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -64,7 +64,7 @@ static WRITE8_HANDLER( dogfgt_soundcontrol_w )
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE_MEMBER(dogfgt_state, sharedram)
AM_RANGE(0x0f80, 0x0fdf) AM_WRITEONLY AM_BASE_SIZE_MEMBER(dogfgt_state, spriteram, spriteram_size)
AM_RANGE(0x1000, 0x17ff) AM_WRITE(dogfgt_bgvideoram_w) AM_BASE_MEMBER(dogfgt_state, bgvideoram)
@@ -83,7 +83,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x2000, 0x27ff) AM_READWRITE(sharedram_r, sharedram_w)
AM_RANGE(0x4000, 0x4000) AM_WRITE(sub_irqack_w)
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index 45388092c40..26c1a36e6fe 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -164,7 +164,7 @@ static WRITE8_HANDLER( dominob_d008_w )
/* is there a purpose on this ? always set to 0x00 (read from 0xc47b in RAM) */
}
-static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM AM_WRITENOP // there are some garbage writes to ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
@@ -190,7 +190,7 @@ static READ8_HANDLER( dominob_unk_port02_r )
return 0xff;
}
-static ADDRESS_MAP_START( portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x02, 0x02) AM_READ(dominob_unk_port02_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index 5091f7f7157..266ae492c6c 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -116,7 +116,7 @@ static MACHINE_RESET( sound_ym2203 )
***************************************************************************/
-static ADDRESS_MAP_START( lastday_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lastday_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc007) AM_WRITE(dooyong_bgscroll8_w)
@@ -135,7 +135,7 @@ static ADDRESS_MAP_START( lastday_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pollux_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pollux_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -153,7 +153,7 @@ static ADDRESS_MAP_START( pollux_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gulfstrm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gulfstrm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -172,7 +172,7 @@ static ADDRESS_MAP_START( gulfstrm_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bluehawk_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bluehawk_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSWA")
@@ -192,7 +192,7 @@ static ADDRESS_MAP_START( bluehawk_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( flytiger_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( flytiger_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
@@ -211,7 +211,7 @@ static ADDRESS_MAP_START( flytiger_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE(dooyong_txvideoram8_w) AM_BASE_MEMBER(dooyong_state, txvideoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( primella_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( primella_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -229,7 +229,7 @@ static ADDRESS_MAP_START( primella_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc08, 0xfc0f) AM_WRITE(dooyong_fgscroll8_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rshark_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rshark_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfffff) /* super-x needs this and is similar */
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04cfff) AM_RAM
@@ -247,7 +247,7 @@ static ADDRESS_MAP_START( rshark_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0cc010, 0x0cc01f) AM_WRITE(dooyong_fg2scroll16_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( superx_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( superx_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x0d0000, 0x0dcfff) AM_RAM
@@ -265,7 +265,7 @@ static ADDRESS_MAP_START( superx_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x08c010, 0x08c01f) AM_WRITE(dooyong_fg2scroll16_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( popbingo_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( popbingo_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04cfff) AM_RAM
@@ -285,7 +285,7 @@ static ADDRESS_MAP_START( popbingo_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0dc000, 0x0dc01f) AM_RAM // registers of some kind?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lastday_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lastday_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r)
@@ -293,7 +293,7 @@ static ADDRESS_MAP_START( lastday_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf002, 0xf003) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pollux_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pollux_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r)
@@ -301,7 +301,7 @@ static ADDRESS_MAP_START( pollux_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf804, 0xf805) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bluehawk_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bluehawk_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c
index 3eb39cec646..24ff38b1772 100644
--- a/src/mame/drivers/dorachan.c
+++ b/src/mame/drivers/dorachan.c
@@ -144,7 +144,7 @@ static CUSTOM_INPUT( dorachan_v128_r )
*
*************************************/
-static ADDRESS_MAP_START( dorachan_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dorachan_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_ROM
AM_RANGE(0x1800, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x23ff) AM_ROM
@@ -164,7 +164,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( dorachan_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dorachan_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_WRITENOP
AM_RANGE(0x02, 0x02) AM_WRITENOP
diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c
index bd06a51a1be..af82bf93a44 100644
--- a/src/mame/drivers/dotrikun.c
+++ b/src/mame/drivers/dotrikun.c
@@ -96,13 +96,13 @@ static SCREEN_UPDATE( dotrikun )
*
*************************************/
-static ADDRESS_MAP_START( dotrikun_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dotrikun_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x85ff) AM_RAM AM_BASE_MEMBER(dotrikun_state, dotrikun_bitmap)
AM_RANGE(0x8600, 0x87ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("INPUTS") AM_WRITE(dotrikun_color_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c
index 340c6cb2c7f..a715609013c 100644
--- a/src/mame/drivers/dragrace.c
+++ b/src/mame/drivers/dragrace.c
@@ -167,7 +167,7 @@ static READ8_HANDLER( dragrace_scanline_r )
}
-static ADDRESS_MAP_START( dragrace_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dragrace_map, AS_PROGRAM, 8 )
AM_RANGE(0x0080, 0x00ff) AM_RAM
AM_RANGE(0x0800, 0x083f) AM_READ(dragrace_input_r)
AM_RANGE(0x0900, 0x091f) AM_WRITE(dragrace_misc_w)
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index 0a908bcf6fd..d9af87cda51 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -301,7 +301,7 @@ static WRITE32_HANDLER( dreamwld_6295_1_bank_w )
logerror("OKI1: unk bank write %x mem_mask %8x\n", data, mem_mask);
}
-static ADDRESS_MAP_START( dreamwld_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dreamwld_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_WRITENOP
AM_RANGE(0x400000, 0x401fff) AM_RAM AM_BASE_MEMBER(dreamwld_state, spriteram)
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index 536bf3e02ee..bfcb8e0fe0e 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -192,7 +192,7 @@ static READ8_HANDLER( PIC16C5X_T0_clk_r )
/***************************** 68000 Memory Map *****************************/
-static ADDRESS_MAP_START( drgnmst_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( drgnmst_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x800000, 0x800001) AM_READ_PORT("P1_P2")
AM_RANGE(0x800018, 0x800019) AM_READ_PORT("SYSTEM")
@@ -223,7 +223,7 @@ ADDRESS_MAP_END
/* $000 - 1FF PIC16C55 Internal Program ROM. Note: code is 12bits wide */
/* $000 - 01F PIC16C55 Internal Data RAM */
-static ADDRESS_MAP_START( drgnmst_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( drgnmst_sound_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READWRITE(pic16c5x_port0_r, drgnmst_pcm_banksel_w) /* 4 bit port */
AM_RANGE(0x01, 0x01) AM_READWRITE(drgnmst_snd_command_r, drgnmst_oki_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(drgnmst_snd_flag_r, drgnmst_snd_control_w)
diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c
index 0ef567b14ca..38ccbea0cef 100644
--- a/src/mame/drivers/dribling.c
+++ b/src/mame/drivers/dribling.c
@@ -213,7 +213,7 @@ static const ppi8255_interface ppi8255_intf[2] =
*
*************************************/
-static ADDRESS_MAP_START( dribling_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dribling_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE_MEMBER(dribling_state, videoram)
AM_RANGE(0x4000, 0x7fff) AM_ROM
@@ -221,7 +221,7 @@ static ADDRESS_MAP_START( dribling_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xff) AM_READWRITE(ioread, iowrite)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index 24767ce126f..924a52d45ff 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -77,14 +77,14 @@ static WRITE8_HANDLER( pcm_set_w )
*
*************************************/
-static ADDRESS_MAP_START( drmicro_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( drmicro_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(drmicro_videoram_w)
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76496_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE("sn2", sn76496_w)
diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c
index 10ca7addd88..9d46c18f237 100644
--- a/src/mame/drivers/drtomy.c
+++ b/src/mame/drivers/drtomy.c
@@ -159,7 +159,7 @@ static WRITE16_DEVICE_HANDLER( drtomy_okibank_w )
/* unknown bit 2 -> (data & 4) */
}
-static ADDRESS_MAP_START( drtomy_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( drtomy_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM /* ROM */
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(drtomy_vram_fg_w) AM_BASE_MEMBER(drtomy_state, videoram_fg) /* Video RAM FG */
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(drtomy_vram_bg_w) AM_BASE_MEMBER(drtomy_state, videoram_bg) /* Video RAM BG */
diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c
index 4767fc2dcbe..eaf5ffcb3ef 100644
--- a/src/mame/drivers/drw80pkr.c
+++ b/src/mame/drivers/drw80pkr.c
@@ -412,11 +412,11 @@ static DRIVER_INIT( drw80pkr )
* Memory map information *
*************************/
-static ADDRESS_MAP_START( drw80pkr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( drw80pkr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drw80pkr_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( drw80pkr_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READWRITE(drw80pkr_io_r, drw80pkr_io_w)
AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READWRITE(t0_r, t0_w)
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READWRITE(t1_r, t1_w)
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index 8ef3555a0e7..e5e22c1a37a 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -404,7 +404,7 @@ static WRITE8_HANDLER( dunhuang_layers_w )
Memory Maps
***************************************************************************/
-static ADDRESS_MAP_START( dunhuang_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dunhuang_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x7fff ) AM_RAM
AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK( "bank1" )
@@ -472,7 +472,7 @@ static WRITE8_HANDLER( dunhuang_82_w )
}
#endif
-static ADDRESS_MAP_START( dunhuang_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dunhuang_io_map, AS_IO, 8 )
AM_RANGE( 0x0000, 0x0000 ) AM_WRITE( dunhuang_pos_x_w )
AM_RANGE( 0x0001, 0x0001 ) AM_WRITE( dunhuang_pos_y_w )
AM_RANGE( 0x0002, 0x0004 ) AM_WRITE( dunhuang_tile_w )
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index 38b4028efc1..c7cb63f24a7 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -571,12 +571,12 @@ static READ8_HANDLER(qc_b8_r)
return space->machine->rand();
}
-static ADDRESS_MAP_START( mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_READWRITE(dwarfd_ram_r, dwarfd_ram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x02, 0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -590,12 +590,12 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xc1, 0xc1) AM_READ_PORT("DSW2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( qc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_READWRITE(dwarfd_ram_r, dwarfd_ram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qc_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( qc_io_map, AS_IO, 8 )
AM_IMPORT_FROM( io_map )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xb8, 0xb8) AM_READ(qc_b8_r)
diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c
index e617e52e912..8980614b045 100644
--- a/src/mame/drivers/dynadice.c
+++ b/src/mame/drivers/dynadice.c
@@ -91,13 +91,13 @@ static WRITE8_DEVICE_HANDLER( sound_control_w )
}
-static ADDRESS_MAP_START( dynadice_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dynadice_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(dynadice_videoram_w) AM_BASE_MEMBER(dynadice_state, videoram)
AM_RANGE(0x4000, 0x40ff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dynadice_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dynadice_io_map, AS_IO, 8 )
AM_RANGE(0x50, 0x50) AM_READ_PORT("IN0")
AM_RANGE(0x51, 0x51) AM_READ_PORT("IN1")
AM_RANGE(0x52, 0x52) AM_READ_PORT("DSW")
@@ -106,12 +106,12 @@ static ADDRESS_MAP_START( dynadice_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x70, 0x77) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dynadice_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dynadice_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dynadice_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dynadice_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r)
AM_RANGE(0x01, 0x01) AM_WRITE(soundlatch_clear_w)
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 082f9240369..112c63d8075 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -470,26 +470,26 @@ static WRITE8_HANDLER( yarunara_layer_half2_w )
hnoridur_layer_half2_w(space, 0, data >> 1);
}
-static ADDRESS_MAP_START( sprtmtch_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sprtmtch_mem_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM
AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hnoridur_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hnoridur_mem_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM
AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x8000, 0xffff ) AM_READ_BANK("bank1") AM_WRITE(hnoridur_palette_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcnpshnt_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcnpshnt_mem_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x6fff ) AM_RAM
AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x8000, 0xffff ) AM_READ_BANK("bank1") AM_WRITE(hnoridur_palette_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nanajign_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nanajign_mem_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x6fff ) AM_RAM
AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE("nvram")
@@ -497,14 +497,14 @@ static ADDRESS_MAP_START( nanajign_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjdialq2_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjdialq2_mem_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0800, 0x0fff ) AM_RAM
AM_RANGE( 0x1000, 0x1fff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x0000, 0x7fff ) AM_ROM
AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( yarunara_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( yarunara_mem_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x6fff ) AM_RAM
AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE("nvram")
@@ -512,14 +512,14 @@ static ADDRESS_MAP_START( yarunara_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x8000, 0x81ff ) AM_WRITE(yarunara_palette_w) // Palette or RTC
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jantouki_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jantouki_mem_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x6fff ) AM_RAM
AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jantouki_sound_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jantouki_sound_mem_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM
AM_RANGE( 0x7000, 0x7fff ) AM_RAM
AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK("bank2")
@@ -527,7 +527,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( hanamai_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hanamai_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x00 ) AM_WRITE(dynax_extra_scrollx_w) // screen scroll X
AM_RANGE( 0x20, 0x20 ) AM_WRITE(dynax_extra_scrolly_w) // screen scroll Y
@@ -563,7 +563,7 @@ static ADDRESS_MAP_START( hanamai_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hnoridur_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hnoridur_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x07 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller
@@ -640,14 +640,14 @@ static READ8_HANDLER( hjingi_keyboard_1_r )
return hanamai_keyboard_1_r(space, 0) | input_port_read(space->machine, "BET");
}
-static ADDRESS_MAP_START( hjingi_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hjingi_mem_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x01ff ) AM_ROM
AM_RANGE( 0x0200, 0x1fff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x2000, 0x7fff ) AM_ROM
AM_RANGE( 0x8000, 0xffff ) AM_READ_BANK("bank1") AM_WRITE(hnoridur_palette_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hjingi_io_map, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff)
+static ADDRESS_MAP_START( hjingi_io_map, AS_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x07 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller
@@ -795,7 +795,7 @@ static WRITE8_HANDLER( yarunara_blit_romregion_w )
logerror("%04x: unmapped romregion=%02X\n", cpu_get_pc(space->cpu), data);
}
-static ADDRESS_MAP_START( yarunara_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( yarunara_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x01 ) AM_WRITE(yarunara_input_w) // Controls
AM_RANGE( 0x02, 0x03 ) AM_READ(yarunara_input_r) //
@@ -828,7 +828,7 @@ ADDRESS_MAP_END
// Almost identical to hnoridur
-static ADDRESS_MAP_START( mcnpshnt_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcnpshnt_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x07 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
// AM_RANGE( 0x10, 0x10 ) AM_WRITENOP // CRT Controller
@@ -866,7 +866,7 @@ static ADDRESS_MAP_START( mcnpshnt_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sprtmtch_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sprtmtch_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x07 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
AM_RANGE( 0x10, 0x11 ) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) // 2 x DSW
@@ -894,7 +894,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjfriday_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjfriday_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x00 ) AM_WRITE(dynax_blit_pen_w) // Destination Pen
AM_RANGE( 0x01, 0x01 ) AM_WRITE(dynax_blit_palette01_w) // Layers Palettes (Low Bits)
@@ -920,7 +920,7 @@ static ADDRESS_MAP_START( mjfriday_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nanajign_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( nanajign_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x00 ) AM_DEVWRITE("msm", adpcm_reset_w) // MSM5205 reset
AM_RANGE( 0x02, 0x02 ) AM_WRITE(adpcm_data_w) // MSM5205 data
@@ -988,7 +988,7 @@ static WRITE8_HANDLER( jantouki_rombank_w )
set_led_status(space->machine, 0, data & 0x10); // maybe
}
-static ADDRESS_MAP_START( jantouki_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jantouki_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// AM_RANGE( 0x40, 0x41 ) AM_WRITENOP // CRT Controller
AM_RANGE( 0x48, 0x48 ) AM_WRITE(jantouki_rombank_w) // BANK ROM Select
@@ -1046,7 +1046,7 @@ static READ8_HANDLER( jantouki_soundlatch_status_r )
return (state->soundlatch_full) ? 0 : 0x80;
}
-static ADDRESS_MAP_START( jantouki_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jantouki_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x00 ) AM_WRITE(jantouki_sound_rombank_w) // BANK ROM Select
AM_RANGE( 0x10, 0x10 ) AM_WRITE(jantouki_sound_vblank_ack_w) // VBlank IRQ Ack
@@ -1086,7 +1086,7 @@ static WRITE8_HANDLER( mjelctrn_blitter_ack_w )
state->blitter_irq = 0;
}
-static ADDRESS_MAP_START( mjelctrn_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjelctrn_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x00 ) AM_DEVWRITE("msm", adpcm_reset_w) // MSM5205 reset
AM_RANGE( 0x02, 0x02 ) AM_WRITE(adpcm_data_w) // MSM5205 data
@@ -1235,7 +1235,7 @@ static READ8_HANDLER( unk_r )
return 0x78;
}
-static ADDRESS_MAP_START( htengoku_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( htengoku_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x07 ) AM_WRITE(dynax_blitter_rev2_w) // Blitter
AM_RANGE( 0x20, 0x20 ) AM_WRITE(htengoku_select_w) // Controls
@@ -1527,7 +1527,7 @@ static WRITE8_HANDLER( tenkai_blit_romregion_w )
logerror("%04x: unmapped romregion=%02X\n", cpu_get_pc(space->cpu), data);
}
-static ADDRESS_MAP_START( tenkai_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tenkai_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x6fff ) AM_RAM
AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE("nvram")
@@ -1555,7 +1555,7 @@ static ADDRESS_MAP_START( tenkai_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x100e1, 0x100e7 ) AM_WRITE(tenkai_blitter_rev2_w) // Blitter (inverted scroll values)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tenkai_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tenkai_io_map, AS_IO, 8 )
AM_RANGE( T90_P3, T90_P3 ) AM_READWRITE(tenkai_p3_r, tenkai_p3_w)
AM_RANGE( T90_P4, T90_P4 ) AM_WRITE(tenkai_p4_w)
AM_RANGE( T90_P5, T90_P5 ) AM_READ(tenkai_p5_r)
@@ -1700,13 +1700,13 @@ static WRITE8_HANDLER( gekisha_8000_w )
}
-static ADDRESS_MAP_START( gekisha_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gekisha_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM
AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x8000, 0xffff ) AM_READWRITE(gekisha_8000_r, gekisha_8000_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gekisha_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gekisha_io_map, AS_IO, 8 )
AM_RANGE( T90_P4, T90_P4 ) AM_WRITE(gekisha_p4_w)
ADDRESS_MAP_END
@@ -6517,7 +6517,7 @@ ROM_END
static DRIVER_INIT( mjreach )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x10060, 0x10060, 0, 0, yarunara_flipscreen_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x10060, 0x10060, 0, 0, yarunara_flipscreen_w);
}
/***************************************************************************
diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c
index 19c822c0324..36373f7364b 100644
--- a/src/mame/drivers/dynduke.c
+++ b/src/mame/drivers/dynduke.c
@@ -72,7 +72,7 @@ Also, implemented conditional port for Coin Mode (SW1:1)
/* Memory Maps */
-static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( master_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x06fff) AM_RAM
AM_RANGE(0x07000, 0x07fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x08000, 0x080ff) AM_RAM AM_BASE_MEMBER(dynduke_state, scroll_ram)
@@ -86,7 +86,7 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xa0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x05fff) AM_RAM
AM_RANGE(0x06000, 0x067ff) AM_RAM_WRITE(dynduke_background_w) AM_BASE_MEMBER(dynduke_state, back_data)
AM_RANGE(0x06800, 0x06fff) AM_RAM_WRITE(dynduke_foreground_w) AM_BASE_MEMBER(dynduke_state, fore_data)
@@ -98,7 +98,7 @@ static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* Memory map used by DlbDyn - probably an addressing PAL is different */
-static ADDRESS_MAP_START( masterj_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( masterj_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x06fff) AM_RAM
AM_RANGE(0x07000, 0x07fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x08000, 0x087ff) AM_RAM_WRITE(dynduke_text_w) AM_BASE_MEMBER(dynduke_state, videoram)
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index 27337de87e4..4fa71048c98 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -217,7 +217,7 @@ static WRITE8_DEVICE_HANDLER( egghunt_okibanking_w )
oki->set_bank_base((data & 0x10) ? 0x40000 : 0);
}
-static ADDRESS_MAP_START( egghunt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( egghunt_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(egghunt_atram_w) AM_BASE_MEMBER(egghunt_state, atram)
@@ -226,7 +226,7 @@ static ADDRESS_MAP_START( egghunt_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1") AM_WRITE(egghunt_vidram_bank_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM") AM_WRITE(egghunt_gfx_banking_w)
@@ -237,7 +237,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x07, 0x07) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
AM_RANGE(0xe001, 0xe001) AM_DEVREADWRITE("oki", egghunt_okibanking_r, egghunt_okibanking_w)
diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c
index dfeb0d00f26..150a3028b08 100644
--- a/src/mame/drivers/embargo.c
+++ b/src/mame/drivers/embargo.c
@@ -152,7 +152,7 @@ static WRITE8_HANDLER( input_select_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1e00, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE_SIZE_MEMBER(embargo_state, videoram, videoram_size)
@@ -166,7 +166,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io_map, AS_IO, 8 )
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN0") AM_WRITE(port_1_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(dial_r, port_2_w)
AM_RANGE(0x03, 0x03) AM_WRITENOP /* always 0xFE */
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index 0cf554f6239..4fdccf151f6 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -444,7 +444,7 @@ static const ay8910_interface ay8910_config =
-static ADDRESS_MAP_START( engima2_main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( engima2_main_cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM AM_WRITENOP
AM_RANGE(0x2000, 0x3fff) AM_MIRROR(0x4000) AM_RAM AM_BASE_MEMBER(enigma2_state, videoram)
@@ -460,7 +460,7 @@ static ADDRESS_MAP_START( engima2_main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( engima2a_main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( engima2a_main_cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM AM_WRITENOP
AM_RANGE(0x2000, 0x3fff) AM_MIRROR(0x4000) AM_RAM AM_BASE_MEMBER(enigma2_state, videoram)
AM_RANGE(0x4000, 0x4fff) AM_ROM AM_WRITENOP
@@ -469,7 +469,7 @@ static ADDRESS_MAP_START( engima2a_main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( engima2a_main_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( engima2a_main_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_NOP
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN0") AM_WRITENOP
@@ -481,7 +481,7 @@ static ADDRESS_MAP_START( engima2a_main_cpu_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( engima2_audio_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( engima2_audio_cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x1000) AM_ROM AM_WRITENOP
AM_RANGE(0x2000, 0x7fff) AM_NOP
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x1c00) AM_RAM
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index ace4fc7f376..a15609e0ad8 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -119,7 +119,7 @@ static READ32_HANDLER( hidctch3_pen2_r )
return xpos + (ypos*168*2);
}
-static ADDRESS_MAP_START( eolith_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( eolith_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM // fort2b wants ram here
AM_RANGE(0x40000000, 0x401fffff) AM_RAM
AM_RANGE(0x90000000, 0x9003ffff) AM_READWRITE(eolith_vram_r, eolith_vram_w)
@@ -1138,15 +1138,15 @@ static DRIVER_INIT( hidctch2 )
static DRIVER_INIT( hidctch3 )
{
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfc200000, 0xfc200003, 0, 0); // this generates pens vibration
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfc200000, 0xfc200003, 0, 0); // this generates pens vibration
// It is not clear why the first reads are needed too
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfce00000, 0xfce00003, 0, 0, hidctch3_pen1_r);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfce80000, 0xfce80003, 0, 0, hidctch3_pen1_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfce00000, 0xfce00003, 0, 0, hidctch3_pen1_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfce80000, 0xfce80003, 0, 0, hidctch3_pen1_r);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfcf00000, 0xfcf00003, 0, 0, hidctch3_pen2_r);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfcf80000, 0xfcf80003, 0, 0, hidctch3_pen2_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfcf00000, 0xfcf00003, 0, 0, hidctch3_pen2_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfcf80000, 0xfcf80003, 0, 0, hidctch3_pen2_r);
init_eolith_speedup(machine);
}
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index b646321cb6f..53d93e2b3c1 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -72,7 +72,7 @@ static READ16_HANDLER( vram_r )
return state->vram[offset + (0x10000/2) * state->vbuffer];
}
-static ADDRESS_MAP_START( eolith16_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( eolith16_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM
AM_RANGE(0x50000000, 0x5000ffff) AM_READWRITE(vram_r, vram_w)
AM_RANGE(0x90000000, 0x9000002f) AM_WRITENOP //?
diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c
index b293df6f411..e9f4780391b 100644
--- a/src/mame/drivers/epos.c
+++ b/src/mame/drivers/epos.c
@@ -57,14 +57,14 @@ static WRITE8_HANDLER( dealer_decrypt_rom )
*
*************************************/
-static ADDRESS_MAP_START( epos_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( epos_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_RAM AM_BASE_SIZE_MEMBER(epos_state, videoram, videoram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dealer_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dealer_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROMBANK("bank1")
AM_RANGE(0x6000, 0x6fff) AM_ROMBANK("bank2")
AM_RANGE(0x7000, 0x7fff) AM_RAM
@@ -77,7 +77,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW") AM_WRITE(watchdog_reset_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("SYSTEM") AM_WRITE(epos_port_1_w)
@@ -86,7 +86,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x06, 0x06) AM_DEVWRITE("aysnd", ay8910_address_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dealer_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dealer_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w)
AM_RANGE(0x20, 0x24) AM_WRITE(dealer_decrypt_rom)
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index 982fde76bee..c462a39418f 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -159,7 +159,7 @@ static WRITE16_HANDLER( sync_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x09ffff) AM_ROM
AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_SHARE("eeprom")
AM_RANGE(0x16cc00, 0x16cc01) AM_RAM AM_SHARE("share2")
@@ -184,7 +184,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( guts_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( guts_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x09ffff) AM_ROM
AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_SHARE("eeprom")
AM_RANGE(0x16cc00, 0x16cc01) AM_RAM AM_SHARE("share2")
@@ -217,7 +217,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( extra_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( extra_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x16cc00, 0x16cc01) AM_READWRITE(sync_r, sync_w) AM_SHARE("share2") AM_BASE_MEMBER(eprom_state, sync_data)
AM_RANGE(0x160000, 0x16ffff) AM_RAM AM_SHARE("share1")
@@ -730,8 +730,8 @@ static DRIVER_INIT( eprom )
atarijsa_init(machine, "260010", 0x0002);
/* install CPU synchronization handlers */
- state->sync_data = memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x16cc00, 0x16cc01, 0, 0, sync_r, sync_w);
- state->sync_data = memory_install_readwrite16_handler(machine->device("extra")->memory().space(ADDRESS_SPACE_PROGRAM), 0x16cc00, 0x16cc01, 0, 0, sync_r, sync_w);
+ state->sync_data = memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x16cc00, 0x16cc01, 0, 0, sync_r, sync_w);
+ state->sync_data = memory_install_readwrite16_handler(machine->device("extra")->memory().space(AS_PROGRAM), 0x16cc00, 0x16cc01, 0, 0, sync_r, sync_w);
}
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index e4d4e6d956a..779f1dff8af 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -700,7 +700,7 @@ static WRITE16_HANDLER( mcu_halt_clear_w )
-static ADDRESS_MAP_START( equites_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( equites_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM // ROM area is written several times (dev system?)
AM_RANGE(0x040000, 0x040fff) AM_RAM AM_SHARE("nvram") // nvram is for gekisou only
AM_RANGE(0x080000, 0x080fff) AM_READWRITE(equites_fg_videoram_r, equites_fg_videoram_w) // 8-bit
@@ -723,7 +723,7 @@ static ADDRESS_MAP_START( equites_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x780000, 0x780001) AM_WRITE(watchdog_reset16_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( splndrbt_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( splndrbt_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE_MEMBER(equites_state, workram) // work RAM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0") // joyport [2211]
@@ -746,7 +746,7 @@ static ADDRESS_MAP_START( splndrbt_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x600100, 0x6001ff) AM_RAM AM_BASE_MEMBER(equites_state, spriteram_2) // sprite RAM 2 (8-bit)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r)
AM_RANGE(0xc080, 0xc08d) AM_DEVWRITE("msm", msm5232_w)
@@ -759,12 +759,12 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe0ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
AM_RANGE(0x00e0, 0x00e5) AM_WRITE(equites_8155_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE_MEMBER(equites_state, mcu_ram) /* main CPU shared RAM */
ADDRESS_MAP_END
@@ -1899,8 +1899,8 @@ static DRIVER_INIT( gekisou )
unpack_region(machine, "gfx3");
// install special handlers for unknown device (protection?)
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x580000, 0x580001, 0, 0, gekisou_unknown_0_w);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5a0000, 0x5a0001, 0, 0, gekisou_unknown_1_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x580000, 0x580001, 0, 0, gekisou_unknown_0_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5a0000, 0x5a0001, 0, 0, gekisou_unknown_1_w);
}
static DRIVER_INIT( splndrbt )
@@ -1913,7 +1913,7 @@ static DRIVER_INIT( hvoltage )
unpack_region(machine, "gfx3");
#if HVOLTAGE_DEBUG
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x000038, 0x000039, 0, 0, hvoltage_debug_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x000038, 0x000039, 0, 0, hvoltage_debug_r);
#endif
}
diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c
index 1b84d8d37bf..f8e1302be5b 100644
--- a/src/mame/drivers/ertictac.c
+++ b/src/mame/drivers/ertictac.c
@@ -51,7 +51,7 @@ static READ32_HANDLER( ertictac_podule_r )
return 0;
}
-static ADDRESS_MAP_START( ertictac_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( ertictac_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x01ffffff) AM_READWRITE(archimedes_memc_logical_r, archimedes_memc_logical_w)
AM_RANGE(0x02000000, 0x02ffffff) AM_RAM AM_BASE(&archimedes_memc_physmem) /* physical RAM - 16 MB for now, should be 512k for the A310 */
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index 32d6ca5c71b..b580ac0638c 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -82,7 +82,7 @@ static WRITE16_HANDLER( esd16_sound_command_w )
AFAIK)
*/
-static ADDRESS_MAP_START( multchmp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( multchmp_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
AM_RANGE(0x200000, 0x2005ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram) // Palette
@@ -134,7 +134,7 @@ static WRITE16_HANDLER( esd_eeprom_w )
// logerror("(0x%06x) Unk EEPROM write: %04x %04x\n", cpu_get_pc(space->cpu), data, mem_mask);
}
-static ADDRESS_MAP_START( hedpanic_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hedpanic_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram) // Palette
@@ -162,7 +162,7 @@ ADDRESS_MAP_END
/* Multi Champ Deluxe, like Head Panic but different addresses */
-static ADDRESS_MAP_START( mchampdx_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mchampdx_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x300000, 0x303fff) AM_WRITE(esd16_vram_0_w) AM_BASE_MEMBER(esd16_state, vram_0) // Layers
@@ -190,7 +190,7 @@ ADDRESS_MAP_END
/* Tang Tang - like the others but again with different addresses */
-static ADDRESS_MAP_START( tangtang_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tangtang_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram) // RAM
AM_RANGE(0x200000, 0x2007ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(esd16_state, spriteram, spriteram_size) // Sprites
@@ -233,7 +233,7 @@ static WRITE8_HANDLER( esd16_sound_rombank_w )
memory_set_bank(space->machine, "bank1", bank);
}
-static ADDRESS_MAP_START( multchmp_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( multchmp_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM
AM_RANGE(0xf800, 0xffff) AM_RAM // RAM
@@ -248,7 +248,7 @@ static READ8_HANDLER( esd16_sound_command_r )
return soundlatch_r(space, 0);
}
-static ADDRESS_MAP_START( multchmp_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( multchmp_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym3812_w) // YM3812
AM_RANGE(0x02, 0x02) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write) // M6295
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index 7ae4c4765e4..8b9570a3818 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -151,7 +151,7 @@ static WRITE8_HANDLER(nmi_line_w)
/* PROGRAM MAPS */
-static ADDRESS_MAP_START( z80_0_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_0_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000,0x3fff) AM_ROM
AM_RANGE(0xe000,0xe7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xf000,0xf3ff) AM_RAM AM_BASE_MEMBER(esh_state, tile_ram)
@@ -160,7 +160,7 @@ ADDRESS_MAP_END
/* IO MAPS */
-static ADDRESS_MAP_START( z80_0_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( z80_0_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xf0,0xf0) AM_READ_PORT("IN0")
AM_RANGE(0xf1,0xf1) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index 58df3ef63c1..b955618bb35 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -110,7 +110,7 @@ static WRITE8_HANDLER( espial_master_soundlatch_w )
}
-static ADDRESS_MAP_START( espial_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( espial_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x4fff) AM_ROM
AM_RANGE(0x5800, 0x5fff) AM_RAM
AM_RANGE(0x6081, 0x6081) AM_READ_PORT("IN0")
@@ -135,7 +135,7 @@ ADDRESS_MAP_END
/* there are a lot of unmapped reads from all over memory as the
code uses POP instructions in a delay loop */
-static ADDRESS_MAP_START( netwars_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( netwars_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x5800, 0x5fff) AM_RAM
AM_RANGE(0x6081, 0x6081) AM_READ_PORT("IN0")
@@ -156,14 +156,14 @@ static ADDRESS_MAP_START( netwars_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( espial_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( espial_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_WRITE(espial_sound_nmi_enable_w)
AM_RANGE(0x6000, 0x6000) AM_READWRITE(soundlatch_r, soundlatch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( espial_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( espial_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/esripsys.c b/src/mame/drivers/esripsys.c
index d0134626e66..79c64f03c9f 100644
--- a/src/mame/drivers/esripsys.c
+++ b/src/mame/drivers/esripsys.c
@@ -608,7 +608,7 @@ static WRITE8_HANDLER( volume_dac_w )
*
*************************************/
-static ADDRESS_MAP_START( game_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( game_cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x4000, 0x42ff) AM_RAM AM_BASE_MEMBER(esripsys_state, pal_ram)
AM_RANGE(0x4300, 0x4300) AM_WRITE(esripsys_bg_intensity_w)
@@ -623,7 +623,7 @@ static ADDRESS_MAP_START( game_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( frame_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( frame_cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x4000, 0x4fff) AM_READWRITE(fdt_r, fdt_w)
AM_RANGE(0x6000, 0x6000) AM_READWRITE(f_status_r, f_status_w)
@@ -632,7 +632,7 @@ static ADDRESS_MAP_START( frame_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0fff) AM_RAM /* Not installed on later PCBs */
AM_RANGE(0x2008, 0x2009) AM_READWRITE(tms5220_r, tms5220_w)
@@ -649,7 +649,7 @@ static ADDRESS_MAP_START( sound_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( video_cpu_map, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( video_cpu_map, AS_PROGRAM, 64 )
AM_RANGE(0x000, 0x1ff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index 029474de3a5..4dd01df3995 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -131,7 +131,7 @@ static WRITE8_HANDLER( b800_w )
state->b800_prev = data;
}
-static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x9000, 0x9000) AM_WRITE(ettrivia_control_w)
@@ -143,7 +143,7 @@ static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(ettrivia_bg_w) AM_BASE_MEMBER(ettrivia_state, bg_videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
AM_RANGE(0x0000, 0xffff) AM_READ(ettrivia_question_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c
index 68076d6c1fc..3eb585936a8 100644
--- a/src/mame/drivers/exedexes.c
+++ b/src/mame/drivers/exedexes.c
@@ -26,7 +26,7 @@ static INTERRUPT_GEN( exedexes_interrupt )
}
-static ADDRESS_MAP_START( exedexes_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( exedexes_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P1")
@@ -48,7 +48,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index 38bfe15eedc..4c003bbc84c 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -191,7 +191,7 @@ static READ8_HANDLER( exerion_protection_r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6008, 0x600b) AM_READ(exerion_protection_r)
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE_MEMBER(exerion_state, main_ram)
@@ -216,7 +216,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c
index c7e3fb09e12..1922c986071 100644
--- a/src/mame/drivers/exidy.c
+++ b/src/mame/drivers/exidy.c
@@ -202,7 +202,7 @@ static WRITE8_HANDLER( fax_bank_select_w )
*
*************************************/
-static ADDRESS_MAP_START( exidy_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( exidy_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM AM_BASE_MEMBER(exidy_state, videoram)
AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x003f) AM_WRITEONLY AM_BASE_MEMBER(exidy_state, sprite1_xpos)
@@ -219,7 +219,7 @@ static ADDRESS_MAP_START( exidy_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sidetrac_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sidetrac_map, AS_PROGRAM, 8 )
AM_RANGE(0x0800, 0x3fff) AM_ROM
AM_RANGE(0x4800, 0x4fff) AM_ROM AM_BASE_MEMBER(exidy_state, characterram)
AM_RANGE(0x5200, 0x5200) AM_WRITE(targ_audio_1_w)
@@ -229,7 +229,7 @@ static ADDRESS_MAP_START( sidetrac_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( targ_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( targ_map, AS_PROGRAM, 8 )
AM_RANGE(0x0800, 0x3fff) AM_ROM
AM_RANGE(0x4800, 0x4fff) AM_RAM AM_BASE_MEMBER(exidy_state, characterram)
AM_RANGE(0x5200, 0x5200) AM_WRITE(targ_audio_1_w)
@@ -239,7 +239,7 @@ static ADDRESS_MAP_START( targ_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spectar_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spectar_map, AS_PROGRAM, 8 )
AM_RANGE(0x0800, 0x3fff) AM_ROM
AM_RANGE(0x4800, 0x4fff) AM_RAM AM_BASE_MEMBER(exidy_state, characterram)
AM_RANGE(0x5200, 0x5200) AM_WRITE(targ_audio_1_w)
@@ -249,7 +249,7 @@ static ADDRESS_MAP_START( spectar_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rallys_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rallys_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0800, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM AM_BASE_MEMBER(exidy_state, videoram)
@@ -271,7 +271,7 @@ static ADDRESS_MAP_START( rallys_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( venture_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( venture_map, AS_PROGRAM, 8 )
AM_RANGE(0x4800, 0x4fff) AM_RAM AM_BASE_MEMBER(exidy_state, characterram)
AM_RANGE(0x5200, 0x520f) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x8000, 0xffff) AM_ROM
@@ -279,7 +279,7 @@ static ADDRESS_MAP_START( venture_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pepper2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pepper2_map, AS_PROGRAM, 8 )
AM_RANGE(0x4800, 0x4fff) AM_NOP
AM_RANGE(0x5200, 0x520f) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x6000, 0x6fff) AM_RAM AM_BASE_MEMBER(exidy_state, characterram)
@@ -288,7 +288,7 @@ static ADDRESS_MAP_START( pepper2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fax_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fax_map, AS_PROGRAM, 8 )
AM_RANGE(0x0400, 0x07ff) AM_RAM
AM_RANGE(0x1a00, 0x1a00) AM_READ_PORT("IN4")
AM_RANGE(0x1c00, 0x1c00) AM_READ_PORT("IN3")
@@ -1439,7 +1439,7 @@ static DRIVER_INIT( phantoma )
state->color_latch[0] = 0x09;
/* the ROM is actually mapped high */
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf800, 0xffff, 0, 0, "bank1");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf800, 0xffff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0xf800);
}
@@ -1470,7 +1470,7 @@ static DRIVER_INIT( pepper2 )
static DRIVER_INIT( fax )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 69b509bf88a..0a1744e6e2c 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -303,9 +303,9 @@ void exidy440_bank_select(running_machine *machine, UINT8 bank)
if (state->showdown_bank_data[0] != NULL)
{
if (bank == 0 && state->bank != 0)
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, showdown_bank0_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x7fff, 0, 0, showdown_bank0_r);
else if (bank != 0 && state->bank == 0)
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank1");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank1");
}
/* select the bank and update the bank pointer */
@@ -467,7 +467,7 @@ static MACHINE_RESET( exidy440 )
*
*************************************/
-static ADDRESS_MAP_START( exidy440_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( exidy440_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_MEMBER(exidy440_state, imageram)
AM_RANGE(0x2000, 0x209f) AM_RAM_WRITE(exidy440_spriteram_w) AM_BASE_MEMBER(exidy440_state, spriteram)
AM_RANGE(0x20a0, 0x29ff) AM_RAM
@@ -1938,7 +1938,7 @@ static DRIVER_INIT( claypign )
{
DRIVER_INIT_CALL(exidy440);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2ec0, 0x2ec3, 0, 0, claypign_protection_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2ec0, 0x2ec3, 0, 0, claypign_protection_r);
}
@@ -1948,11 +1948,11 @@ static DRIVER_INIT( topsecex )
DRIVER_INIT_CALL(exidy440);
/* extra input ports and scrolling */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2ec5, 0x2ec5, 0, 0, topsecex_input_port_5_r);
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2ec6, 0x2ec6, 0, 0, "AN0");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2ec7, 0x2ec7, 0, 0, "IN4");
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2ec5, 0x2ec5, 0, 0, topsecex_input_port_5_r);
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2ec6, 0x2ec6, 0, 0, "AN0");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2ec7, 0x2ec7, 0, 0, "IN4");
- state->topsecex_yscroll = memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2ec1, 0x2ec1, 0, 0, topsecex_yscroll_w);
+ state->topsecex_yscroll = memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2ec1, 0x2ec1, 0, 0, topsecex_yscroll_w);
}
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index d90c7c00b83..0c77383bc83 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -368,7 +368,7 @@ static WRITE16_HANDLER(galsnew_vram_1_bank_w)
*
*************************************/
-static ADDRESS_MAP_START( galsnew_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( galsnew_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // main program
AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("user2",0) // other data
AM_RANGE(0x100000, 0x3fffff) AM_ROM AM_REGION("user1",0) // main data
@@ -411,7 +411,7 @@ ADDRESS_MAP_END
// bigger rom space, OKI commands moved
// no CALC mcu
-static ADDRESS_MAP_START( fantasia_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fantasia_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x4fffff) AM_ROM
AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE(&galsnew_bg_pixram)
AM_RANGE(0x520000, 0x53ffff) AM_RAM AM_BASE(&galsnew_fg_pixram)
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index 58b2e6408c3..9b0b9414566 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -243,7 +243,7 @@ static READ8_HANDLER( vblank_r )
return input_port_read(space->machine, "IN0");
}
-static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x05ff) AM_RAM AM_BASE_MEMBER(exprraid_state, main_ram)
AM_RANGE(0x0600, 0x07ff) AM_RAM AM_BASE_SIZE_MEMBER(exprraid_state, spriteram, spriteram_size)
AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(exprraid_videoram_w) AM_BASE_MEMBER(exprraid_state, videoram)
@@ -266,11 +266,11 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( master_io_map, AS_IO, 8 )
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN0")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ym2", ym3526_r, ym3526_w)
@@ -778,13 +778,13 @@ static DRIVER_INIT( exprraid )
static DRIVER_INIT( wexpressb )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3800, 0x3800, 0, 0, vblank_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3800, 0x3800, 0, 0, vblank_r);
exprraid_gfx_expand(machine);
}
static DRIVER_INIT( wexpressb2 )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xFFC0, 0xFFC0, 0, 0, vblank_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xFFC0, 0xFFC0, 0, 0, vblank_r);
exprraid_gfx_expand(machine);
}
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index c38522f119f..e9600879413 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -279,7 +279,7 @@ static WRITE8_HANDLER( sound_control_w )
*
*************************************/
-static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( master_map, AS_PROGRAM, 16 )
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0x00000000, 0x000fffff) AM_MIRROR(0xfc700000) AM_RAM AM_BASE_MEMBER(exterm_state, master_videoram)
AM_RANGE(0x00800000, 0x00bfffff) AM_MIRROR(0xfc400000) AM_RAM
@@ -296,7 +296,7 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 16 )
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0x00000000, 0x000fffff) AM_MIRROR(0xfbf00000) AM_RAM AM_BASE_MEMBER(exterm_state, slave_videoram)
AM_RANGE(0x04000000, 0x047fffff) AM_MIRROR(0xfb800000) AM_RAM
@@ -310,7 +310,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM
AM_RANGE(0x4000, 0x5fff) AM_DEVWRITE("ymsnd", ym2151_data_latch_w)
AM_RANGE(0x6000, 0x67ff) AM_WRITE(sound_nmi_rate_w)
@@ -322,7 +322,7 @@ static ADDRESS_MAP_START( sound_master_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x3800) AM_RAM
AM_RANGE(0x4000, 0x5fff) AM_READ(sound_slave_latch_r)
AM_RANGE(0x8000, 0xbfff) AM_DEVWRITE("dac", sound_slave_dac_w)
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index d9d096356e0..aab0523f597 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -140,7 +140,7 @@ static DRIVER_INIT( exzisus )
**************************************************************************/
-static ADDRESS_MAP_START( cpua_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpua_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
AM_RANGE(0xc000, 0xc5ff) AM_READWRITE(exzisus_objectram_1_r, exzisus_objectram_1_w) AM_BASE_MEMBER(exzisus_state, objectram1) AM_SIZE_MEMBER(exzisus_state, objectram_size1)
@@ -151,7 +151,7 @@ static ADDRESS_MAP_START( cpua_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_READWRITE(exzisus_sharedram_ab_r, exzisus_sharedram_ab_w) AM_BASE_MEMBER(exzisus_state, sharedram_ab)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc5ff) AM_READWRITE(exzisus_objectram_0_r, exzisus_objectram_0_w) AM_BASE_MEMBER(exzisus_state, objectram0) AM_SIZE_MEMBER(exzisus_state, objectram_size0)
@@ -170,7 +170,7 @@ static ADDRESS_MAP_START( cpub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_READWRITE(exzisus_sharedram_ab_r, exzisus_sharedram_ab_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpuc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpuc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x85ff) AM_READWRITE(exzisus_objectram_1_r, exzisus_objectram_1_w)
AM_RANGE(0x8600, 0x9fff) AM_READWRITE(exzisus_videoram_1_r, exzisus_videoram_1_w)
@@ -178,7 +178,7 @@ static ADDRESS_MAP_START( cpuc_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb000, 0xbfff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c
index 5e00778f62c..9517f3993ed 100644
--- a/src/mame/drivers/f-32.c
+++ b/src/mame/drivers/f-32.c
@@ -52,7 +52,7 @@ static SCREEN_UPDATE( mosaicf2 )
-static ADDRESS_MAP_START( common_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( common_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM
AM_RANGE(0x40000000, 0x4003ffff) AM_RAM AM_BASE_MEMBER(mosaicf2_state, videoram)
AM_RANGE(0x80000000, 0x80ffffff) AM_ROM AM_REGION("user2",0)
@@ -71,7 +71,7 @@ static READ32_HANDLER( f32_input_port_1_r )
}
-static ADDRESS_MAP_START( mosaicf2_io, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( mosaicf2_io, AS_IO, 32 )
AM_RANGE(0x4000, 0x4003) AM_DEVREAD8_MODERN("oki", okim6295_device, read, 0x000000ff)
AM_RANGE(0x4810, 0x4813) AM_DEVREAD8("ymsnd", ym2151_status_port_r, 0x000000ff)
AM_RANGE(0x5000, 0x5003) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index 0f9ad17e0d6..ba75831eb63 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -89,7 +89,7 @@ static WRITE8_HANDLER( pending_command_clear_w )
}
-static ADDRESS_MAP_START( f1gp_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f1gp_cpu1_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x2fffff) AM_READ(extrarom_r)
AM_RANGE(0xa00000, 0xbfffff) AM_READ(extrarom2_r)
@@ -118,7 +118,7 @@ static ADDRESS_MAP_START( f1gp_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff050, 0xfff051) AM_READ_PORT("DSW3")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( f1gp2_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f1gp2_cpu1_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x2fffff) AM_READ(extrarom_r)
AM_RANGE(0xa00000, 0xa07fff) AM_RAM AM_BASE_MEMBER(f1gp_state, sprcgram) // SPR-1 CG RAM + SPR-2 CG RAM
@@ -138,19 +138,19 @@ static ADDRESS_MAP_START( f1gp2_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff044, 0xfff047) AM_WRITE(f1gp_fgscroll_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( f1gp_cpu2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f1gp_cpu2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0xff8000, 0xffbfff) AM_RAM
AM_RANGE(0xffc000, 0xffcfff) AM_READWRITE(sharedram_r, sharedram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(f1gp_sh_bankswitch_w) // f1gp
AM_RANGE(0x0c, 0x0c) AM_WRITE(f1gp_sh_bankswitch_w) // f1gp2
@@ -183,7 +183,7 @@ static WRITE16_HANDLER( f1gpb_misc_w )
*/
}
-static ADDRESS_MAP_START( f1gpb_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f1gpb_cpu1_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x2fffff) AM_READ(extrarom_r)
AM_RANGE(0xa00000, 0xbfffff) AM_READ(extrarom2_r)
@@ -215,7 +215,7 @@ static ADDRESS_MAP_START( f1gpb_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff800, 0xfff809) AM_RAM AM_BASE_MEMBER(f1gp_state, rozregs)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( f1gpb_cpu2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f1gpb_cpu2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0xff8000, 0xffbfff) AM_RAM
AM_RANGE(0xffc000, 0xffcfff) AM_READWRITE(sharedram_r, sharedram_w)
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index a2b1a1337ed..4590ce4ff2d 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -125,7 +125,7 @@ static WRITE16_HANDLER( spriteram2_16_w )
spriteram_2[2 * offset + 1] = data >> 8;
}
-static ADDRESS_MAP_START( fantland_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fantland_map, AS_PROGRAM, 16 )
AM_RANGE( 0x00000, 0x07fff ) AM_RAM
AM_RANGE( 0x08000, 0x7ffff ) AM_ROM
@@ -145,7 +145,7 @@ ADDRESS_MAP_END
Galaxy Gunners
***************************************************************************/
-static ADDRESS_MAP_START( galaxygn_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( galaxygn_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x07fff ) AM_RAM
AM_RANGE( 0x10000, 0x2ffff ) AM_ROM
@@ -239,7 +239,7 @@ static READ8_HANDLER( borntofi_inputs_r )
return state->input_ret[offset];
}
-static ADDRESS_MAP_START( borntofi_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( borntofi_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x07fff ) AM_RAM
AM_RANGE( 0x10000, 0x2ffff ) AM_ROM
@@ -266,7 +266,7 @@ ADDRESS_MAP_END
Wheels Runner
***************************************************************************/
-static ADDRESS_MAP_START( wheelrun_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wheelrun_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x07fff) AM_RAM
AM_RANGE(0x30000, 0x3ffff) AM_ROM
@@ -293,19 +293,19 @@ ADDRESS_MAP_END
***************************************************************************/
-static ADDRESS_MAP_START( fantland_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fantland_sound_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x01fff ) AM_RAM
AM_RANGE( 0x80000, 0x9ffff ) AM_ROM
AM_RANGE( 0xc0000, 0xfffff ) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fantland_sound_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( fantland_sound_iomap, AS_IO, 8 )
AM_RANGE( 0x0080, 0x0080 ) AM_READ( soundlatch_r )
AM_RANGE( 0x0100, 0x0101 ) AM_DEVREADWRITE( "ymsnd", ym2151_r, ym2151_w )
AM_RANGE( 0x0180, 0x0180 ) AM_DEVWRITE( "dac", dac_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( galaxygn_sound_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( galaxygn_sound_iomap, AS_IO, 8 )
AM_RANGE( 0x0080, 0x0080 ) AM_READ( soundlatch_r )
AM_RANGE( 0x0100, 0x0101 ) AM_DEVREADWRITE( "ymsnd", ym2151_r, ym2151_w )
ADDRESS_MAP_END
@@ -407,7 +407,7 @@ static void borntofi_adpcm_int_2(device_t *device) { borntofi_adpcm_int(device,
static void borntofi_adpcm_int_3(device_t *device) { borntofi_adpcm_int(device, 3); }
-static ADDRESS_MAP_START( borntofi_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( borntofi_sound_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x003ff ) AM_RAM
AM_RANGE( 0x04000, 0x04000 ) AM_READ(soundlatch_r)
AM_RANGE( 0x04000, 0x0401f ) AM_WRITE(borntofi_msm5205_w)
@@ -420,7 +420,7 @@ ADDRESS_MAP_END
Wheels Runner
***************************************************************************/
-static ADDRESS_MAP_START( wheelrun_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wheelrun_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym3526_r, ym3526_w )
diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c
index 56bd12230d5..086544fc6e7 100644
--- a/src/mame/drivers/fastfred.c
+++ b/src/mame/drivers/fastfred.c
@@ -164,7 +164,7 @@ static READ8_HANDLER( imago_sprites_offset_r )
return 0xff; //not really used
}
-static ADDRESS_MAP_START( fastfred_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fastfred_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd000, 0xd3ff) AM_MIRROR(0x400) AM_RAM_WRITE(fastfred_videoram_w) AM_BASE_MEMBER(fastfred_state, videoram)
@@ -187,7 +187,7 @@ static ADDRESS_MAP_START( fastfred_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jumpcoas_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jumpcoas_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd000, 0xd03f) AM_RAM_WRITE(fastfred_attributes_w) AM_BASE_MEMBER(fastfred_state, attributesram)
@@ -214,7 +214,7 @@ static ADDRESS_MAP_START( jumpcoas_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( imago_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( imago_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x1fff) AM_READ(imago_sprites_offset_r)
AM_RANGE(0x2000, 0x6fff) AM_ROM
@@ -241,7 +241,7 @@ static ADDRESS_MAP_START( imago_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xf800) AM_READNOP AM_WRITE(soundlatch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r, interrupt_enable_w)
@@ -979,8 +979,8 @@ ROM_END
static DRIVER_INIT( flyboy )
{
fastfred_state *state = machine->driver_data<fastfred_state>();
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc085, 0xc099, 0, 0, flyboy_custom1_io_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc8fb, 0xc900, 0, 0, flyboy_custom2_io_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc085, 0xc099, 0, 0, flyboy_custom1_io_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc8fb, 0xc900, 0, 0, flyboy_custom2_io_r);
state->hardware_type = 1;
}
@@ -993,32 +993,32 @@ static DRIVER_INIT( flyboyb )
static DRIVER_INIT( fastfred )
{
fastfred_state *state = machine->driver_data<fastfred_state>();
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc800, 0xcfff, 0, 0, fastfred_custom_io_r);
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc800, 0xcfff, 0, 0);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc800, 0xcfff, 0, 0, fastfred_custom_io_r);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc800, 0xcfff, 0, 0);
state->hardware_type = 1;
}
static DRIVER_INIT( jumpcoas )
{
fastfred_state *state = machine->driver_data<fastfred_state>();
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc800, 0xcfff, 0, 0, jumpcoas_custom_io_r);
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc800, 0xcfff, 0, 0);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc800, 0xcfff, 0, 0, jumpcoas_custom_io_r);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc800, 0xcfff, 0, 0);
state->hardware_type = 0;
}
static DRIVER_INIT( boggy84b )
{
fastfred_state *state = machine->driver_data<fastfred_state>();
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc800, 0xcfff, 0, 0, jumpcoas_custom_io_r);
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc800, 0xcfff, 0, 0);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc800, 0xcfff, 0, 0, jumpcoas_custom_io_r);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc800, 0xcfff, 0, 0);
state->hardware_type = 2;
}
static DRIVER_INIT( boggy84 )
{
fastfred_state *state = machine->driver_data<fastfred_state>();
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc800, 0xcfff, 0, 0, boggy84_custom_io_r);
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc800, 0xcfff, 0, 0);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc800, 0xcfff, 0, 0, boggy84_custom_io_r);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc800, 0xcfff, 0, 0);
state->hardware_type = 2;
}
diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c
index f6670707989..a62bc7010d8 100644
--- a/src/mame/drivers/fastlane.c
+++ b/src/mame/drivers/fastlane.c
@@ -75,7 +75,7 @@ static WRITE8_DEVICE_HANDLER( fastlane_k007232_w )
}
-static ADDRESS_MAP_START( fastlane_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fastlane_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x005f) AM_RAM_WRITE(k007121_registers_w) AM_BASE_MEMBER(fastlane_state, k007121_regs) /* 007121 registers */
AM_RANGE(0x0800, 0x0800) AM_READ_PORT("DSW3")
AM_RANGE(0x0801, 0x0801) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index f00553cf5e5..0510f8167a6 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -116,7 +116,7 @@ static WRITE8_HANDLER(ee00_w)
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE_SIZE_MEMBER(fcombat_state, videoram, videoram_size)
@@ -137,7 +137,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index fc854d2d3d8..567c6d1482a 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -378,7 +378,7 @@ static SCREEN_UPDATE( kodb )
}
-static ADDRESS_MAP_START( fcrash_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fcrash_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x800030, 0x800031) AM_WRITE(cps1_coinctrl_w)
AM_RANGE(0x800100, 0x80013f) AM_RAM AM_BASE_MEMBER(cps_state, cps_a_regs) /* CPS-A custom */
@@ -391,7 +391,7 @@ static ADDRESS_MAP_START( fcrash_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xd000, 0xd7ff) AM_RAM
@@ -404,7 +404,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kodb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( kodb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
AM_RANGE(0x800000, 0x800007) AM_READ_PORT("IN1") /* Player input ports */
/* forgottn, willow, cawing, nemo, varth read from 800010. Probably debug input leftover from development */
diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c
index 06f568bda6d..022d233b90a 100644
--- a/src/mame/drivers/feversoc.c
+++ b/src/mame/drivers/feversoc.c
@@ -160,7 +160,7 @@ static WRITE32_HANDLER( output_w )
}
}
-static ADDRESS_MAP_START( feversoc_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( feversoc_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0003ffff) AM_ROM
AM_RANGE(0x02000000, 0x0203dfff) AM_RAM //work ram
AM_RANGE(0x0203e000, 0x0203ffff) AM_RAM AM_BASE_MEMBER(feversoc_state, spriteram)
diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c
index 5a6482e9e86..78ea5492974 100644
--- a/src/mame/drivers/fgoal.c
+++ b/src/mame/drivers/fgoal.c
@@ -205,7 +205,7 @@ static WRITE8_HANDLER( fgoal_sound2_w )
}
-static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ef) AM_RAM
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index 2968bf06b1c..7722efb2452 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -100,7 +100,7 @@ static WRITE8_HANDLER( i8039_T0_w )
*/
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0001, 0x0001) AM_WRITEONLY AM_BASE_MEMBER(finalizr_state, scroll)
AM_RANGE(0x0003, 0x0003) AM_WRITE(finalizr_videoctrl_w)
AM_RANGE(0x0004, 0x0004) AM_WRITE(finalizr_flipscreen_w)
@@ -128,11 +128,11 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READ(soundlatch_r)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(i8039_irqen_w)
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index e7f539d1fdc..78dc2c0d7de 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -1751,7 +1751,7 @@ static MACHINE_START( firebeat )
state->flash[2] = machine->device<fujitsu_29f016a_device>("flash2");
}
-static ADDRESS_MAP_START( firebeat_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( firebeat_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x01ffffff) AM_RAM AM_BASE_MEMBER(firebeat_state, work_ram)
AM_RANGE(0x70000000, 0x70000fff) AM_READWRITE(midi_uart_r, midi_uart_w)
AM_RANGE(0x70006000, 0x70006003) AM_WRITE(extend_board_irq_w)
@@ -1774,7 +1774,7 @@ static ADDRESS_MAP_START( firebeat_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x7ff80000, 0x7fffffff) AM_ROM AM_REGION("user1", 0) /* System BIOS */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( spu_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAM
AM_RANGE(0x340000, 0x34000f) AM_READ(spu_unk_r)
@@ -2216,9 +2216,9 @@ static void init_lights(running_machine *machine, write32_space_func out1, write
if(!out2) out1 = lamp_output2_w;
if(!out3) out1 = lamp_output3_w;
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x7d000804, 0x7d000807, 0, 0, out1);
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x7d000320, 0x7d000323, 0, 0, out2);
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x7d000324, 0x7d000327, 0, 0, out3);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x7d000804, 0x7d000807, 0, 0, out1);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x7d000320, 0x7d000323, 0, 0, out2);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x7d000324, 0x7d000327, 0, 0, out3);
}
static void init_firebeat(running_machine *machine)
diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c
index a0037d2b5d4..7734a87f9d7 100644
--- a/src/mame/drivers/firefox.c
+++ b/src/mame/drivers/firefox.c
@@ -487,7 +487,7 @@ static MACHINE_START( firefox )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8)
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(tileram_w) AM_BASE_MEMBER(firefox_state, tileram)
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE_MEMBER(firefox_state, spriteram)
@@ -533,7 +533,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x087f) AM_MIRROR(0x0700) AM_RAM /* RIOT ram */
AM_RANGE(0x0880, 0x089f) AM_MIRROR(0x07e0) AM_DEVREADWRITE("riot",riot6532_r, riot6532_w)
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index 7f87e9621ef..38d2776f3d5 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -349,7 +349,7 @@ static WRITE8_HANDLER( flip_screen_w )
}
-static ADDRESS_MAP_START( firetrap_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( firetrap_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -375,7 +375,7 @@ static ADDRESS_MAP_START( firetrap_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf016, 0xf016) AM_READ(firetrap_8751_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( firetrap_bootleg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( firetrap_bootleg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -402,7 +402,7 @@ static ADDRESS_MAP_START( firetrap_bootleg_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xf8ff) AM_ROM /* extra ROM in the bootleg with unprotection code */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ymsnd", ym3526_w)
AM_RANGE(0x2000, 0x2000) AM_WRITE(firetrap_adpcm_data_w) /* ADPCM data for the MSM5205 chip */
diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c
index f2d43db5eba..e65b51d0ddd 100644
--- a/src/mame/drivers/firetrk.c
+++ b/src/mame/drivers/firetrk.c
@@ -330,7 +330,7 @@ static WRITE8_HANDLER( crash_reset_w )
}
-static ADDRESS_MAP_START( firetrk_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( firetrk_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0700) AM_RAM AM_BASE_MEMBER(firetrk_state, alpha_num_ram)
AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0700) AM_RAM AM_BASE_MEMBER(firetrk_state, playfield_ram)
@@ -356,7 +356,7 @@ static ADDRESS_MAP_START( firetrk_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( superbug_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( superbug_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x00ff) AM_RAM
AM_RANGE(0x0100, 0x0100) AM_MIRROR(0x001f) AM_WRITEONLY AM_BASE_MEMBER(firetrk_state, scroll_y)
@@ -380,7 +380,7 @@ static ADDRESS_MAP_START( superbug_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( montecar_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( montecar_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0700) AM_RAM AM_BASE_MEMBER(firetrk_state, alpha_num_ram)
AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0700) AM_RAM AM_BASE_MEMBER(firetrk_state, playfield_ram)
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index 3ba9094ecb6..3c8167d5aba 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -123,7 +123,7 @@ static WRITE16_HANDLER(fitfight_700000_w)
state->fof_700000_data = data;
}
-static ADDRESS_MAP_START( fitfight_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fitfight_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_WRITEONLY AM_BASE_MEMBER(fitfight_state, fof_100000)
@@ -175,7 +175,7 @@ static ADDRESS_MAP_START( fitfight_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe00000, 0xe0ffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bbprot_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bbprot_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_WRITEONLY AM_BASE_MEMBER(fitfight_state, fof_100000)
@@ -209,7 +209,7 @@ ADDRESS_MAP_END
/* 7810 (?) sound cpu */
-static ADDRESS_MAP_START( snd_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( snd_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") /* ??? External ROM */
AM_RANGE(0x8000, 0x87ff) AM_RAM
@@ -249,7 +249,7 @@ static WRITE8_HANDLER(snd_portc_w)
//mame_printf_debug("PC W %x @%x\n",data,cpu_get_pc(space->cpu));
}
-static ADDRESS_MAP_START( snd_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( snd_io, AS_IO, 8 )
AM_RANGE(UPD7810_PORTA, UPD7810_PORTA) AM_READ(snd_porta_r) AM_WRITE(snd_porta_w)
AM_RANGE(UPD7810_PORTB, UPD7810_PORTB) AM_READ(snd_portb_r) AM_WRITE(snd_portb_w)
AM_RANGE(UPD7810_PORTC, UPD7810_PORTC) AM_READ(snd_portc_r) AM_WRITE(snd_portc_w)
@@ -978,7 +978,7 @@ static DRIVER_INIT( fitfight )
// UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base();
// mem16[0x0165B2/2] = 0x4e71; // for now so it boots
fitfight_state *state = machine->driver_data<fitfight_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x700000, 0x700001, 0, 0, fitfight_700000_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x700000, 0x700001, 0, 0, fitfight_700000_r);
state->bbprot_kludge = 0;
}
@@ -987,7 +987,7 @@ static DRIVER_INIT( histryma )
// UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base();
// mem16[0x017FDC/2] = 0x4e71; // for now so it boots
fitfight_state *state = machine->driver_data<fitfight_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x700000, 0x700001, 0, 0, histryma_700000_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x700000, 0x700001, 0, 0, histryma_700000_r);
state->bbprot_kludge = 0;
}
diff --git a/src/mame/drivers/flicker.c b/src/mame/drivers/flicker.c
index 341fc2f729c..782f37c623f 100644
--- a/src/mame/drivers/flicker.c
+++ b/src/mame/drivers/flicker.c
@@ -11,17 +11,17 @@ public:
};
-static ADDRESS_MAP_START( flicker_rom, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( flicker_rom, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x03FF) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(flicker_map, ADDRESS_SPACE_DATA, 8)
+static ADDRESS_MAP_START(flicker_map, AS_DATA, 8)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x00FF) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( flicker_io , ADDRESS_SPACE_IO, 8)
+static ADDRESS_MAP_START( flicker_io , AS_IO, 8)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 6934197af94..e60e615e33a 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -95,7 +95,7 @@ static WRITE8_HANDLER( multiply_w )
}
-static ADDRESS_MAP_START( flkatck_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( flkatck_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0007) AM_RAM_WRITE(flkatck_k007121_regs_w) /* 007121 registers */
AM_RANGE(0x0008, 0x03ff) AM_RAM /* RAM */
AM_RANGE(0x0400, 0x041f) AM_READWRITE(flkatck_ls138_r, flkatck_ls138_w) /* inputs, DIPS, bankswitch, counters, sound command */
@@ -106,7 +106,7 @@ static ADDRESS_MAP_START( flkatck_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( flkatck_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( flkatck_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */
AM_RANGE(0x9000, 0x9000) AM_READWRITE(multiply_r, multiply_w) /* ??? */
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index 49ddfdcf0b1..303045ae6e1 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -104,7 +104,7 @@ static WRITE8_HANDLER( sound_command_w )
cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( flower_cpu1_2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( flower_cpu1_2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITENOP //watchdog?
AM_RANGE(0xa001, 0xa001) AM_WRITE(flower_flipscreen_w)
@@ -128,7 +128,7 @@ static ADDRESS_MAP_START( flower_cpu1_2, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( flower_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( flower_sound_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4000) AM_WRITE(sn_irq_enable_w) AM_BASE_MEMBER(flower_state, sn_irq_enable)
AM_RANGE(0x4001, 0x4001) AM_WRITEONLY AM_BASE_MEMBER(flower_state, sn_nmi_enable)
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index 79eca33cb81..fc045ff49b4 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -71,7 +71,7 @@ static WRITE8_HANDLER( nmi_enable_w )
}
}
-static ADDRESS_MAP_START( flstory_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( flstory_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(flstory_videoram_w) AM_BASE_SIZE_MEMBER(flstory_state, videoram, videoram_size)
AM_RANGE(0xc800, 0xcfff) AM_RAM /* unknown */
@@ -97,7 +97,7 @@ static ADDRESS_MAP_START( flstory_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe7ff) AM_RAM /* work RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( onna34ro_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( onna34ro_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(flstory_videoram_w) AM_BASE_SIZE_MEMBER(flstory_state, videoram, videoram_size)
AM_RANGE(0xc800, 0xcfff) AM_RAM /* unknown */
@@ -126,12 +126,12 @@ ADDRESS_MAP_END
static CUSTOM_INPUT( victnine_mcu_status_bit01_r )
{
flstory_state *state = field->port->machine->driver_data<flstory_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
return (victnine_mcu_status_r(space, 0) & 3);
}
-static ADDRESS_MAP_START( victnine_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( victnine_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(flstory_videoram_w) AM_BASE_SIZE_MEMBER(flstory_state, videoram, videoram_size)
AM_RANGE(0xc800, 0xcfff) AM_RAM /* unknown */
@@ -340,7 +340,7 @@ static WRITE8_HANDLER( rumba_mcu_w )
state->mcu_param = 1;
}
-static ADDRESS_MAP_START( rumba_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rumba_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(flstory_videoram_w) AM_BASE_SIZE_MEMBER(flstory_state, videoram, videoram_size)
// AM_RANGE(0xc800, 0xcfff) AM_RAM /* unknown */
@@ -446,7 +446,7 @@ static WRITE8_DEVICE_HANDLER( sound_control_3_w ) /* unknown */
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("aysnd", ay8910_address_data_w)
@@ -460,7 +460,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_ROM /* space for diagnostics ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( flstory_m68705_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( flstory_m68705_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(flstory_68705_port_a_r, flstory_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(flstory_68705_port_b_r, flstory_68705_port_b_w)
diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c
index c0cdd3489dd..f2482a59fc3 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -241,7 +241,7 @@ static WRITE8_HANDLER( flyball_misc_w )
*
*************************************/
-static ADDRESS_MAP_START( flyball_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( flyball_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x100) AM_RAM
AM_RANGE(0x0800, 0x0800) AM_NOP
diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c
index 62887775194..c1e15d08f61 100644
--- a/src/mame/drivers/foodf.c
+++ b/src/mame/drivers/foodf.c
@@ -211,7 +211,7 @@ static WRITE16_HANDLER( analog_w )
*************************************/
// complete memory map derived from schematics
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x00ffff) AM_MIRROR(0x3e0000) AM_ROM
AM_RANGE(0x014000, 0x014fff) AM_MIRROR(0x3e3000) AM_RAM
diff --git a/src/mame/drivers/forte2.c b/src/mame/drivers/forte2.c
index 8c9b97c7058..09e5af5f779 100644
--- a/src/mame/drivers/forte2.c
+++ b/src/mame/drivers/forte2.c
@@ -37,12 +37,12 @@ public:
-static ADDRESS_MAP_START( program_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( program_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_mem, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_mem, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x98, 0x98) AM_READWRITE( TMS9928A_vram_r, TMS9928A_vram_w )
diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c
index 3b2f0be9343..b19f67a67d3 100644
--- a/src/mame/drivers/fortecar.c
+++ b/src/mame/drivers/fortecar.c
@@ -123,14 +123,14 @@ static const ay8910_interface ay8910_config =
DEVCB_HANDLER(ayportb_w)
};
-static ADDRESS_MAP_START( fortecar_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fortecar_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_ROM
AM_RANGE(0xd000, 0xd7ff) AM_RAM
AM_RANGE(0xd800, 0xffff) AM_RAM AM_BASE_MEMBER(fortecar_state, ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fortecar_ports, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( fortecar_ports, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x20, 0x20) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x21, 0x21) AM_DEVWRITE("crtc", mc6845_register_w)
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index 0c7591f2ee9..17b0548708b 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -162,7 +162,7 @@ static WRITE8_HANDLER( freekick_ff_w )
*
*************************************/
-static ADDRESS_MAP_START( pbillrd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pbillrd_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -182,7 +182,7 @@ static ADDRESS_MAP_START( pbillrd_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE("sn4", sn76496_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( freekickb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( freekickb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xcfff) AM_ROM
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(freek_videoram_w) AM_BASE_MEMBER(freekick_state, videoram) // tilemap
@@ -202,7 +202,7 @@ static ADDRESS_MAP_START( freekickb_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE("sn4", sn76496_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gigas_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gigas_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(freek_videoram_w) AM_BASE_MEMBER(freekick_state, videoram)
@@ -221,13 +221,13 @@ static ADDRESS_MAP_START( gigas_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc03, 0xfc03) AM_DEVWRITE("sn4", sn76496_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gigas_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gigas_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(spinner_r, spinner_select_w)
AM_RANGE(0x01, 0x01) AM_READNOP //unused dip 3
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oigas_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( oigas_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(spinner_r, spinner_select_w)
AM_RANGE(0x01, 0x01) AM_READNOP //unused dip 3
@@ -236,7 +236,7 @@ static ADDRESS_MAP_START( oigas_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x05, 0x05) AM_WRITE(oigas_5_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( freekickb_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( freekickb_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xff, 0xff) AM_READWRITE(freekick_ff_r, freekick_ff_w)
ADDRESS_MAP_END
@@ -1108,7 +1108,7 @@ ROM_END
static DRIVER_INIT(gigasb)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
space->set_decrypted_region(0x0000, 0xbfff, machine->region("maincpu")->base() + 0x10000);
}
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index c3a3bc6fbff..de34b2bc2aa 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -186,7 +186,7 @@ static WRITE8_HANDLER( fromanc2_subcpu_rombank_w )
*
*************************************/
-static ADDRESS_MAP_START( fromanc2_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fromanc2_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // MAIN ROM
AM_RANGE(0x802000, 0x802fff) AM_READNOP // ???
@@ -219,7 +219,7 @@ static ADDRESS_MAP_START( fromanc2_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd80000, 0xd8ffff) AM_RAM // WORK RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fromancr_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fromancr_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // MAIN ROM
AM_RANGE(0x800000, 0x803fff) AM_WRITE(fromancr_videoram_0_w) // VRAM BG (1P/2P)
@@ -247,7 +247,7 @@ static ADDRESS_MAP_START( fromancr_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd80000, 0xd8ffff) AM_RAM // WORK RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fromanc4_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fromanc4_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // MAIN ROM
AM_RANGE(0x400000, 0x7fffff) AM_ROM // DATA ROM
@@ -283,14 +283,14 @@ static ADDRESS_MAP_START( fromanc4_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fromanc2_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fromanc2_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM
AM_RANGE(0x4000, 0x7fff) AM_RAMBANK("bank1") // ROM(BANK) (is this comment correct? It was in the split address maps in a RAM configuration...
AM_RANGE(0x8000, 0xbfff) AM_RAM // RAM(WORK)
AM_RANGE(0xc000, 0xffff) AM_RAMBANK("bank2") // RAM(BANK)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fromanc2_sub_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( fromanc2_sub_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(fromanc2_subcpu_rombank_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(fromanc2_maincpu_r_l, fromanc2_maincpu_w_l) // to/from MAIN CPU
@@ -299,12 +299,12 @@ static ADDRESS_MAP_START( fromanc2_sub_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fromanc2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fromanc2_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fromanc2_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( fromanc2_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) AM_WRITENOP // snd cmd (1P) / ?
AM_RANGE(0x04, 0x04) AM_READ(soundlatch2_r) // snd cmd (2P)
diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c
index da12ba434c7..8bbb27fd74b 100644
--- a/src/mame/drivers/fromance.c
+++ b/src/mame/drivers/fromance.c
@@ -221,7 +221,7 @@ static WRITE8_HANDLER( fromance_coinctr_w )
*
*************************************/
-static ADDRESS_MAP_START( nekkyoku_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nekkyoku_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0xf000, 0xf000) AM_READ_PORT("SERVICE") AM_WRITE(fromance_portselect_w)
@@ -232,7 +232,7 @@ static ADDRESS_MAP_START( nekkyoku_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf005, 0xf005) AM_READ_PORT("DSW1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fromance_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fromance_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0x9e89, 0x9e89) AM_READNOP // unknown (idolmj)
@@ -252,7 +252,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( nekkyoku_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nekkyoku_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xefff) AM_READWRITE(fromance_videoram_r, fromance_videoram_w)
@@ -260,7 +260,7 @@ static ADDRESS_MAP_START( nekkyoku_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_READWRITE(fromance_paletteram_r, fromance_paletteram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fromance_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fromance_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_RAM
@@ -276,7 +276,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( nekkyoku_sub_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( nekkyoku_sub_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_WRITE(fromance_crtc_data_w)
AM_RANGE(0x11, 0x11) AM_WRITE(fromance_crtc_register_w)
@@ -290,7 +290,7 @@ static ADDRESS_MAP_START( nekkyoku_sub_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xe9, 0xea) AM_DEVWRITE("aysnd", ay8910_data_address_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( idolmj_sub_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( idolmj_sub_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_WRITE(fromance_crtc_data_w)
AM_RANGE(0x11, 0x11) AM_WRITE(fromance_crtc_register_w)
@@ -304,7 +304,7 @@ static ADDRESS_MAP_START( idolmj_sub_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x29, 0x2a) AM_DEVWRITE("aysnd", ay8910_data_address_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fromance_sub_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( fromance_sub_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_WRITE(fromance_crtc_data_w)
AM_RANGE(0x11, 0x11) AM_WRITE(fromance_crtc_register_w)
diff --git a/src/mame/drivers/funkball.c b/src/mame/drivers/funkball.c
index ed68abbb301..cb72831f53c 100644
--- a/src/mame/drivers/funkball.c
+++ b/src/mame/drivers/funkball.c
@@ -84,11 +84,11 @@ static SCREEN_UPDATE(funkball)
return 0;
}
-static ADDRESS_MAP_START(funkball_map, ADDRESS_SPACE_PROGRAM, 32)
+static ADDRESS_MAP_START(funkball_map, AS_PROGRAM, 32)
AM_RANGE(0xffff0000, 0xffffffff) AM_ROM AM_REGION("user1", 0) /* System BIOS */
ADDRESS_MAP_END
-static ADDRESS_MAP_START(funkball_io, ADDRESS_SPACE_IO, 32)
+static ADDRESS_MAP_START(funkball_io, AS_IO, 32)
ADDRESS_MAP_END
static INPUT_PORTS_START( funkball )
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index 45df02297cd..30e59f2f779 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -88,7 +88,7 @@ static WRITE8_HANDLER( funkybee_coin_counter_w )
coin_counter_w(space->machine, offset, data);
}
-static ADDRESS_MAP_START( funkybee_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( funkybee_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x4fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE(funkybee_videoram_w) AM_BASE_MEMBER(funkybee_state, videoram)
@@ -103,7 +103,7 @@ static ADDRESS_MAP_START( funkybee_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf802, 0xf802) AM_READ_PORT("IN2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x02, 0x02) AM_DEVREAD("aysnd", ay8910_r)
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index f6134988491..cff39ae0e12 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -100,7 +100,7 @@ Notes:
/******************************************************************************/
-static ADDRESS_MAP_START( funkyjet_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( funkyjet_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x120000, 0x1207ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x140000, 0x143fff) AM_RAM
@@ -118,7 +118,7 @@ ADDRESS_MAP_END
/******************************************************************************/
/* Physical memory map (21 bits) */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_NOP /* YM2203 - this board doesn't have one */
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index d46f9d02d45..946e207c968 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -791,7 +791,7 @@ static WRITE8_DEVICE_HANDLER(pia1_ca2_w)
* Memory map information *
*************************/
-static ADDRESS_MAP_START( funworld_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( funworld_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
@@ -825,7 +825,7 @@ static WRITE8_HANDLER( question_bank_w )
funquiz_question_bank = data;
}
-static ADDRESS_MAP_START( funquiz_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( funquiz_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
@@ -843,7 +843,7 @@ static ADDRESS_MAP_START( funquiz_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( magicrd2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( magicrd2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
@@ -859,7 +859,7 @@ static ADDRESS_MAP_START( magicrd2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cuoreuno_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cuoreuno_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0803) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w)
@@ -874,7 +874,7 @@ static ADDRESS_MAP_START( cuoreuno_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( saloon_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( saloon_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0800) AM_READ_PORT("IN0")
AM_RANGE(0x0a01, 0x0a01) AM_READ_PORT("IN1")
@@ -4238,7 +4238,7 @@ static DRIVER_INIT( multiwin )
******************************************************/
{
UINT8 *ROM = machine->region("maincpu")->base();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int x;
@@ -4271,7 +4271,7 @@ static DRIVER_INIT( royalcdc )
******************************************************/
UINT8 *ROM = machine->region("maincpu")->base();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int x;
diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c
index 5eda0350306..61574426ea1 100644
--- a/src/mame/drivers/funybubl.c
+++ b/src/mame/drivers/funybubl.c
@@ -79,7 +79,7 @@ static WRITE8_DEVICE_HANDLER( funybubl_oki_bank_sw )
}
-static ADDRESS_MAP_START( funybubl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( funybubl_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") // banked port 1?
AM_RANGE(0xc400, 0xcfff) AM_RAM_WRITE(funybubl_paldatawrite) AM_BASE_MEMBER(funybubl_state, paletteram) // palette
@@ -87,7 +87,7 @@ static ADDRESS_MAP_START( funybubl_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE(funybubl_vidram_bank_w) // vidram bank
AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(funybubl_cpurombank_w) // rom bank?
@@ -100,7 +100,7 @@ ADDRESS_MAP_END
/* Sound CPU */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("oki", funybubl_oki_bank_sw)
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index 85b091eea15..445dd28643a 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -76,7 +76,7 @@ static WRITE16_HANDLER( fuuki16_sound_command_w )
}
}
-static ADDRESS_MAP_START( fuuki16_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fuuki16_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // RAM
AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(fuuki16_vram_0_w) AM_BASE_MEMBER(fuuki16_state, vram_0) // Layers
@@ -122,13 +122,13 @@ static WRITE8_DEVICE_HANDLER( fuuki16_oki_banking_w )
oki->set_bank_base(((data & 6) >> 1) * 0x40000);
}
-static ADDRESS_MAP_START( fuuki16_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fuuki16_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM
AM_RANGE(0x6000, 0x7fff) AM_RAM // RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") // Banked ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fuuki16_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( fuuki16_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(fuuki16_sound_rombank_w) // ROM Bank
AM_RANGE(0x11, 0x11) AM_READ(soundlatch_r) AM_WRITENOP // From Main CPU / ? To Main CPU ?
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index 806f34617c2..cf00569c337 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -228,7 +228,7 @@ static WRITE32_HANDLER( fuuki32_vregs_w )
// Lines with empty comment are for debug only
-static ADDRESS_MAP_START( fuuki32_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( fuuki32_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // Work RAM
@@ -285,14 +285,14 @@ static WRITE8_HANDLER( snd_z80_w )
state->shared_ram[offset] = data;
}
-static ADDRESS_MAP_START( fuuki32_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fuuki32_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM // ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM // RAM
AM_RANGE(0x7ff0, 0x7fff) AM_READWRITE(snd_z80_r, snd_z80_w)
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") // ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fuuki32_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( fuuki32_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(fuuki32_sound_bw_w)
AM_RANGE(0x30, 0x30) AM_WRITENOP
diff --git a/src/mame/drivers/g627.c b/src/mame/drivers/g627.c
index a6fede206a3..16c6e7dee16 100644
--- a/src/mame/drivers/g627.c
+++ b/src/mame/drivers/g627.c
@@ -18,7 +18,7 @@ public:
};
-static ADDRESS_MAP_START( g627_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( g627_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 4fbfe09e3e2..2a68fcabeb5 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -111,7 +111,7 @@ static WRITE16_HANDLER(thoop_encrypted_w)
*
*************************************/
-static ADDRESS_MAP_START( bigkarnk_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bigkarnk_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM /* ROM */
AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(gaelco_vram_w) AM_BASE_MEMBER(gaelco_state, videoram) /* Video RAM */
AM_RANGE(0x102000, 0x103fff) AM_RAM /* Screen RAM */
@@ -129,7 +129,7 @@ static ADDRESS_MAP_START( bigkarnk_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff8000, 0xffffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bigkarnk_snd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bigkarnk_snd_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM /* RAM */
AM_RANGE(0x0800, 0x0801) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write) /* OKI6295 */
// AM_RANGE(0x0900, 0x0900) AM_WRITENOP /* enable sound output? */
@@ -138,7 +138,7 @@ static ADDRESS_MAP_START( bigkarnk_snd_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0c00, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( maniacsq_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( maniacsq_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(gaelco_vram_w) AM_BASE_MEMBER(gaelco_state, videoram) /* Video RAM */
AM_RANGE(0x102000, 0x103fff) AM_RAM /* Screen RAM */
@@ -155,7 +155,7 @@ static ADDRESS_MAP_START( maniacsq_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff0000, 0xffffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( squash_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( squash_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(gaelco_vram_encrypted_w) AM_BASE_MEMBER(gaelco_state, videoram) /* Video RAM */
AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(gaelco_encrypted_w) AM_BASE_MEMBER(gaelco_state, screen) /* Screen RAM */
@@ -172,7 +172,7 @@ static ADDRESS_MAP_START( squash_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff0000, 0xffffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( thoop_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( thoop_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(thoop_vram_encrypted_w) AM_BASE_MEMBER(gaelco_state, videoram) /* Video RAM */
AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(thoop_encrypted_w) AM_BASE_MEMBER(gaelco_state, screen) /* Screen RAM */
diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c
index afd1e2fd4e8..fdb2bd74f72 100644
--- a/src/mame/drivers/gaelco2.c
+++ b/src/mame/drivers/gaelco2.c
@@ -56,7 +56,7 @@ GFXDECODEINFO(0x0400000, 128)
MANIAC SQUARE (FINAL)
============================================================================*/
-static ADDRESS_MAP_START( maniacsq_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( maniacsq_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM /* ROM */
AM_RANGE(0x202890, 0x2028ff) AM_DEVREADWRITE("gaelco", gaelcosnd_r, gaelcosnd_w) /* Sound Registers */
AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(gaelco2_vram_w) AM_BASE_SIZE_GENERIC(spriteram) /* Video RAM */
@@ -214,7 +214,7 @@ static READ16_HANDLER(p1_gun_y) {return (input_port_read(space->machine, "LIGHT0
static READ16_HANDLER(p2_gun_x) {return (input_port_read(space->machine, "LIGHT1_X") * 320 / 0x100) + 1;}
static READ16_HANDLER(p2_gun_y) {return (input_port_read(space->machine, "LIGHT1_Y") * 240 / 0x100) - 4;}
-static ADDRESS_MAP_START( bang_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bang_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x202890, 0x2028ff) AM_DEVREADWRITE("gaelco", gaelcosnd_r, gaelcosnd_w) /* Sound Registers */
AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(gaelco2_vram_w) AM_BASE_SIZE_GENERIC(spriteram) /* Video RAM */
@@ -433,7 +433,7 @@ ROM_END
============================================================================*/
-static ADDRESS_MAP_START( alighunt_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( alighunt_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x202890, 0x2028ff) AM_DEVREADWRITE("gaelco", gaelcosnd_r, gaelcosnd_w) /* Sound Registers */
AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(gaelco2_vram_w) AM_BASE_SIZE_GENERIC(spriteram) /* Video RAM */
@@ -645,7 +645,7 @@ static READ16_HANDLER ( dallas_kludge_r )
return 0x0200;
}
-static ADDRESS_MAP_START( touchgo_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( touchgo_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x202890, 0x2028ff) AM_DEVREADWRITE("gaelco", gaelcosnd_r, gaelcosnd_w) /* Sound Registers */
AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(gaelco2_vram_w) AM_BASE_SIZE_GENERIC(spriteram) /* Video RAM */
@@ -911,7 +911,7 @@ ROM_END
SNOW BOARD
============================================================================*/
-static ADDRESS_MAP_START( snowboar_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( snowboar_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x202890, 0x2028ff) AM_DEVREADWRITE("gaelco", gaelcosnd_r, gaelcosnd_w) /* Sound Registers */
AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(gaelco2_vram_w) AM_BASE_SIZE_GENERIC(spriteram) /* Video RAM */
@@ -1097,7 +1097,7 @@ ROM_END
WORLD RALLY 2
============================================================================*/
-static ADDRESS_MAP_START( wrally2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wrally2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x202890, 0x2028ff) AM_DEVREADWRITE("gaelco", gaelcosnd_r, gaelcosnd_w) /* Sound Registers */
AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(gaelco2_vram_w) AM_BASE_SIZE_GENERIC(spriteram) /* Video RAM */
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index 8d11b207e6c..c3f8592174a 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -766,7 +766,7 @@ static WRITE32_HANDLER( unknown_13a_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(gaelco3d_paletteram_w) AM_BASE_GENERIC(paletteram)
@@ -797,7 +797,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main020_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( main020_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(gaelco3d_paletteram_020_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x51000c, 0x51000f) AM_READ_PORT("IN0")
@@ -827,19 +827,19 @@ static ADDRESS_MAP_START( main020_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfe0000, 0xfeffff) AM_RAM AM_BASE_MEMBER(gaelco3d_state, m68k_ram_base)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tms_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( tms_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x007fff) AM_READWRITE(tms_m68k_ram_r, tms_m68k_ram_w)
AM_RANGE(0x400000, 0x5fffff) AM_ROM AM_REGION("user2", 0)
AM_RANGE(0xc00000, 0xc00007) AM_WRITE(gaelco3d_render_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( adsp_program_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( adsp_program_map, AS_PROGRAM, 32 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE_MEMBER(gaelco3d_state, adsp_ram_base) /* 1k words internal RAM */
AM_RANGE(0x37ff, 0x37ff) AM_READNOP /* speedup hammers this for no apparent reason */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( adsp_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( adsp_data_map, AS_DATA, 16 )
AM_RANGE(0x0000, 0x0001) AM_WRITE(adsp_rombank_w)
AM_RANGE(0x0000, 0x1fff) AM_ROMBANK("bank1")
AM_RANGE(0x2000, 0x2000) AM_READWRITE(sound_data_r, sound_status_w)
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 9cace462a8b..903073ab0aa 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -393,7 +393,7 @@ static READ16_HANDLER( raiga_protection_r )
return state->prot;
}
-static ADDRESS_MAP_START( gaiden_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gaiden_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x060000, 0x063fff) AM_RAM
AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(gaiden_videoram_w) AM_BASE_MEMBER(gaiden_state, videoram)
@@ -419,7 +419,7 @@ static ADDRESS_MAP_START( gaiden_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x07a808, 0x07a809) AM_WRITE(gaiden_flip_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drgnbowl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( drgnbowl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x060000, 0x063fff) AM_RAM
AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(gaiden_videoram_w) AM_BASE_MEMBER(gaiden_state, videoram)
@@ -438,7 +438,7 @@ static ADDRESS_MAP_START( drgnbowl_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x07f006, 0x07f007) AM_WRITE(gaiden_fgscrollx_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xefff) AM_ROM /* raiga only */
AM_RANGE(0xf000, 0xf7ff) AM_RAM
@@ -449,12 +449,12 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drgnbowl_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( drgnbowl_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xf7ff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drgnbowl_sound_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( drgnbowl_sound_port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x80, 0x80) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
@@ -906,7 +906,7 @@ Others
2x 8x2 switches DIP
*/
-static ADDRESS_MAP_START( mastninj_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mastninj_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xc400, 0xc401) AM_DEVWRITE("ym1", ym2203_w)
@@ -915,7 +915,7 @@ static ADDRESS_MAP_START( mastninj_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
// AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mastninj_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mastninj_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x060000, 0x063fff) AM_RAM
AM_RANGE(0x070000, 0x070fff) AM_RAM_WRITE(gaiden_videoram_w) AM_BASE_MEMBER(gaiden_state, videoram)
@@ -1506,8 +1506,8 @@ static DRIVER_INIT( wildfang )
state->prot = 0;
state->jumpcode = 0;
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x07a006, 0x07a007, 0, 0, wildfang_protection_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x07a804, 0x07a805, 0, 0, wildfang_protection_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x07a006, 0x07a007, 0, 0, wildfang_protection_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x07a804, 0x07a805, 0, 0, wildfang_protection_w);
}
static DRIVER_INIT( raiga )
@@ -1519,8 +1519,8 @@ static DRIVER_INIT( raiga )
state->prot = 0;
state->jumpcode = 0;
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x07a006, 0x07a007, 0, 0, raiga_protection_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x07a804, 0x07a805, 0, 0, raiga_protection_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x07a006, 0x07a007, 0, 0, raiga_protection_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x07a804, 0x07a805, 0, 0, raiga_protection_w);
}
static void descramble_drgnbowl_gfx(running_machine *machine)
diff --git a/src/mame/drivers/gal3.c b/src/mame/drivers/gal3.c
index b3298a44212..cf42c2c1038 100644
--- a/src/mame/drivers/gal3.c
+++ b/src/mame/drivers/gal3.c
@@ -376,7 +376,7 @@ static WRITE32_HANDLER(rso_w)
state->rsoSharedRAM[offset+1] = v&0xffff;
}
-static ADDRESS_MAP_START( cpu_mst_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( cpu_mst_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_ROM
AM_RANGE(0x20000000, 0x20001fff) AM_RAM AM_BASE_MEMBER(gal3_state, nvmem) AM_SIZE_MEMBER(gal3_state, nvmem_size) //NVRAM
/// AM_RANGE(0x40000000, 0x4000ffff) AM_WRITE() //
@@ -393,7 +393,7 @@ static ADDRESS_MAP_START( cpu_mst_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xf2800000, 0xf2800fff) AM_READWRITE(rso_r, rso_w) //RSO PCB
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu_slv_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( cpu_slv_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0007ffff) AM_ROM
/// AM_RANGE(0x40000000, 0x4000ffff) AM_WRITE() //
AM_RANGE(0x44000000, 0x44000003) AM_READ_PORT("DSW_CPU_slv" )
@@ -422,7 +422,7 @@ static ADDRESS_MAP_START( cpu_slv_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xf2760000, 0xf2760003) AM_RAM //AM_READWRITE(namcos21_video_enable_r,namcos21_video_enable_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rs_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rs_cpu_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM //64K working RAM
@@ -486,7 +486,7 @@ static ADDRESS_MAP_START( rs_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
/// AM_RANGE(0xc44000, 0xffffff) AM_RAM /////////////
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sound_cpu_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM
/// AM_RANGE(0x0c0000, 0x0cffff) AM_RAM //00, 20, 30, 40, 50
@@ -502,7 +502,7 @@ static ADDRESS_MAP_START( sound_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
/// AM_RANGE(0x090000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( psn_b1_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( psn_b1_cpu_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0xffffff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index fd0507da5cd..b3612cc764e 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -888,7 +888,7 @@ static MACHINE_START( galaga )
static void bosco_latch_reset(running_machine *machine)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int i;
/* Reset all latches */
@@ -914,7 +914,7 @@ static MACHINE_RESET( battles )
/* the same memory map is used by all three CPUs; all RAM areas are shared */
-static ADDRESS_MAP_START( bosco_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bosco_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM AM_WRITENOP /* the only area different for each CPU */
AM_RANGE(0x6800, 0x6807) AM_READ(bosco_dsw_r)
AM_RANGE(0x6800, 0x681f) AM_DEVWRITE("namco", pacman_sound_w)
@@ -936,7 +936,7 @@ static ADDRESS_MAP_START( bosco_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( galaga_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( galaga_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM AM_WRITENOP /* the only area different for each CPU */
AM_RANGE(0x6800, 0x6807) AM_READ(bosco_dsw_r)
AM_RANGE(0x6800, 0x681f) AM_DEVWRITE("namco", pacman_sound_w)
@@ -953,7 +953,7 @@ static ADDRESS_MAP_START( galaga_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( xevious_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( xevious_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM AM_WRITENOP /* the only area different for each CPU */
AM_RANGE(0x6800, 0x6807) AM_READ(bosco_dsw_r)
AM_RANGE(0x6800, 0x681f) AM_DEVWRITE("namco", pacman_sound_w)
@@ -974,7 +974,7 @@ static ADDRESS_MAP_START( xevious_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( digdug_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( digdug_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM AM_WRITENOP /* the only area different for each CPU */
AM_RANGE(0x6800, 0x681f) AM_DEVWRITE("namco", pacman_sound_w)
AM_RANGE(0x6820, 0x6827) AM_WRITE(bosco_latch_w) /* misc latches */
@@ -994,12 +994,12 @@ ADDRESS_MAP_END
/* bootleg 4th CPU replacing the 5xXX chips */
-static ADDRESS_MAP_START( galaga_mem4, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( galaga_mem4, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x107f) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( battles_mem4, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( battles_mem4, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x4000, 0x4003) AM_READ(battles_input_port_r)
AM_RANGE(0x4001, 0x4001) AM_WRITE(battles_CPU4_coin_w)
@@ -1009,7 +1009,7 @@ static ADDRESS_MAP_START( battles_mem4, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0x80ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dzigzag_mem4, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dzigzag_mem4, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x107f) AM_RAM
AM_RANGE(0x4000, 0x4007) AM_READONLY // dip switches? bits 0 & 1 used
@@ -3212,7 +3212,7 @@ static DRIVER_INIT (gatsbee)
DRIVER_INIT_CALL(galaga);
/* Gatsbee has a larger character ROM, we need a handler for banking */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1000, 0x1000, 0, 0, gatsbee_bank_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1000, 0x1000, 0, 0, gatsbee_bank_w);
}
@@ -3253,8 +3253,8 @@ static DRIVER_INIT( xevios )
static DRIVER_INIT( battles )
{
/* replace the Namco I/O handlers with interface to the 4th CPU */
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x7000, 0x700f, 0, 0, battles_customio_data0_r, battles_customio_data0_w );
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x7100, 0x7100, 0, 0, battles_customio0_r, battles_customio0_w );
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x7000, 0x700f, 0, 0, battles_customio_data0_r, battles_customio_data0_w );
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x7100, 0x7100, 0, 0, battles_customio0_r, battles_customio0_w );
DRIVER_INIT_CALL(xevious);
}
diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c
index cc459338d25..2b6da92ef25 100644
--- a/src/mame/drivers/galastrm.c
+++ b/src/mame/drivers/galastrm.c
@@ -172,7 +172,7 @@ static WRITE32_HANDLER( galastrm_adstick_ctrl_w )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( galastrm_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( galastrm_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x21ffff) AM_RAM AM_BASE_MEMBER(galastrm_state, ram) /* main CPUA ram */
AM_RANGE(0x300000, 0x303fff) AM_RAM AM_BASE_SIZE_MEMBER(galastrm_state, spriteram, spriteram_size)
diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c
index ff54f540699..525094ccf31 100644
--- a/src/mame/drivers/galaxi.c
+++ b/src/mame/drivers/galaxi.c
@@ -267,7 +267,7 @@ static CUSTOM_INPUT( hopper_r )
}
-static ADDRESS_MAP_START( galaxi_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( galaxi_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM_WRITE(galaxi_bg1_w) AM_BASE_MEMBER(galaxi_state, bg1_ram)
diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c
index 2830b88f692..e5f74ab4553 100644
--- a/src/mame/drivers/galaxia.c
+++ b/src/mame/drivers/galaxia.c
@@ -117,7 +117,7 @@ static READ8_HANDLER(galaxia_video_r)
return state->video[offset];
}
-static ADDRESS_MAP_START( mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x13ff) AM_ROM
AM_RANGE(0x1400, 0x14ff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x1500, 0x15ff) AM_MIRROR(0x6000) AM_DEVREADWRITE("s2636_0", s2636_work_ram_r, s2636_work_ram_w)
@@ -129,7 +129,7 @@ static ADDRESS_MAP_START( mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7214, 0x7214) AM_READ_PORT("IN0")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN7")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( astrowar_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( astrowar_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x13ff) AM_ROM
AM_RANGE(0x1400, 0x14ff) AM_MIRROR(0x6000) AM_RAM
AM_RANGE(0x1500, 0x15ff) AM_MIRROR(0x6000) AM_DEVREADWRITE("s2636_0", s2636_work_ram_r, s2636_work_ram_w)
@@ -151,7 +151,7 @@ static ADDRESS_MAP_START( astrowar_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x2000, 0x33ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( astrowar_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( astrowar_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 15bd4a4dac8..8c9f0630308 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -783,7 +783,7 @@ static WRITE8_HANDLER( explorer_sound_control_w )
static READ8_DEVICE_HANDLER( explorer_sound_latch_r )
{
cputag_set_input_line(device->machine, "audiocpu", 0, CLEAR_LINE);
- return soundlatch_r(device->machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0);
+ return soundlatch_r(device->machine->device("audiocpu")->memory().space(AS_PROGRAM), 0);
}
@@ -1023,7 +1023,7 @@ static const ppi8255_interface scorpion_ppi8255_1_intf =
static INPUT_CHANGED( gmgalax_game_changed )
{
- address_space *space = field->port->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = field->port->machine->device("maincpu")->memory().space(AS_PROGRAM);
/* new value is the selected game */
gmgalax_selected_game = newval;
@@ -1354,13 +1354,13 @@ LATCH: (write 7000-77ff)
/* map derived from schematics */
-static ADDRESS_MAP_START( galaxian_map_discrete, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( galaxian_map_discrete, AS_PROGRAM, 8 )
AM_RANGE(0x6004, 0x6007) AM_MIRROR(0x07f8) AM_DEVWRITE(GAL_AUDIO, galaxian_lfo_freq_w)
AM_RANGE(0x6800, 0x6807) AM_MIRROR(0x07f8) AM_DEVWRITE(GAL_AUDIO, galaxian_sound_w)
AM_RANGE(0x7800, 0x7800) AM_MIRROR(0x07ff) AM_DEVWRITE(GAL_AUDIO, galaxian_pitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( galaxian_map_base, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( galaxian_map_base, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM
@@ -1382,20 +1382,20 @@ static ADDRESS_MAP_START( galaxian_map_base, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7800, 0x7800) AM_MIRROR(0x07ff) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( galaxian_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( galaxian_map, AS_PROGRAM, 8 )
AM_IMPORT_FROM(galaxian_map_base)
AM_IMPORT_FROM(galaxian_map_discrete)
ADDRESS_MAP_END
/* map derived from schematics */
-static ADDRESS_MAP_START( mooncrst_map_discrete, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mooncrst_map_discrete, AS_PROGRAM, 8 )
AM_RANGE(0xa004, 0xa007) AM_MIRROR(0x07f8) AM_DEVWRITE(GAL_AUDIO, galaxian_lfo_freq_w)
AM_RANGE(0xa800, 0xa807) AM_MIRROR(0x07f8) AM_DEVWRITE(GAL_AUDIO, galaxian_sound_w)
AM_RANGE(0xb800, 0xb800) AM_MIRROR(0x07ff) AM_DEVWRITE(GAL_AUDIO, galaxian_pitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mooncrst_map_base, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mooncrst_map_base, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x0400) AM_RAM
@@ -1416,7 +1416,7 @@ static ADDRESS_MAP_START( mooncrst_map_base, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xb800) AM_MIRROR(0x07ff) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mooncrst_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mooncrst_map, AS_PROGRAM, 8 )
AM_IMPORT_FROM(mooncrst_map_base)
AM_IMPORT_FROM(mooncrst_map_discrete)
ADDRESS_MAP_END
@@ -1425,7 +1425,7 @@ ADDRESS_MAP_END
/* map derived from schematics */
#if 0
-static ADDRESS_MAP_START( dambustr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dambustr_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
// AM_RANGE(0x8000, 0x8000) AM_WRITE(dambustr_bg_color_w)
@@ -1449,7 +1449,7 @@ ADDRESS_MAP_END
/* map derived from schematics */
-static ADDRESS_MAP_START( theend_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( theend_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
@@ -1468,7 +1468,7 @@ ADDRESS_MAP_END
/* map derived from schematics */
-static ADDRESS_MAP_START( scobra_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( scobra_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x4000) AM_RAM
@@ -1487,7 +1487,7 @@ static ADDRESS_MAP_START( scobra_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( anteateruk_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( anteateruk_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x03ff) AM_ROM
AM_RANGE(0x0400, 0x0bff) AM_RAM
@@ -1507,7 +1507,7 @@ static ADDRESS_MAP_START( anteateruk_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( anteaterg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( anteaterg_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x03ff) AM_ROM
AM_RANGE(0x0400, 0x0bff) AM_RAM
@@ -1529,7 +1529,7 @@ ADDRESS_MAP_END
/* map derived from schematics */
-static ADDRESS_MAP_START( frogger_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( frogger_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
@@ -1546,7 +1546,7 @@ ADDRESS_MAP_END
/* map derived from schematics */
-static ADDRESS_MAP_START( turtles_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( turtles_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x4000) AM_RAM
@@ -1568,7 +1568,7 @@ ADDRESS_MAP_END
/* this is the same as theend, except for separate RGB background controls
and some extra ROM space at $7000 and $C000 */
-static ADDRESS_MAP_START( sfx_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sfx_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE_MEMBER(galaxian_state, videoram)
@@ -1596,7 +1596,7 @@ ADDRESS_MAP_END
$8000-$afff: additional ROM area
$b000-$bfff: protection
*/
-static ADDRESS_MAP_START( jumpbug_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jumpbug_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
@@ -1618,7 +1618,7 @@ static ADDRESS_MAP_START( jumpbug_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( frogf_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( frogf_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
@@ -1635,7 +1635,7 @@ ADDRESS_MAP_END
/* mooncrst */
-static ADDRESS_MAP_START( mshuttle_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mshuttle_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
@@ -1654,7 +1654,7 @@ static ADDRESS_MAP_START( mshuttle_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mshuttle_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mshuttle_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x0f)
AM_RANGE(0x08, 0x08) AM_WRITE(mshuttle_ay8910_control_w)
@@ -1678,7 +1678,7 @@ static WRITE8_HANDLER( tenspot_unk_e000_w )
logerror("tenspot_unk_e000_w %02x\n",data);
}
-static ADDRESS_MAP_START( tenspot_select_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tenspot_select_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x07ff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
@@ -1697,40 +1697,40 @@ ADDRESS_MAP_END
*************************************/
/* Konami Frogger with 1 x AY-8910A */
-static ADDRESS_MAP_START( frogger_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( frogger_sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x1c00) AM_RAM
AM_RANGE(0x6000, 0x6fff) AM_MIRROR(0x1000) AM_WRITE(konami_sound_filter_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( frogger_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( frogger_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xff) AM_READWRITE(frogger_ay8910_r, frogger_ay8910_w)
ADDRESS_MAP_END
/* Konami generic with 2 x AY-8910A */
-static ADDRESS_MAP_START( konami_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( konami_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x6c00) AM_RAM
AM_RANGE(0x9000, 0x9fff) AM_MIRROR(0x6000) AM_WRITE(konami_sound_filter_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( konami_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( konami_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xff) AM_READWRITE(konami_ay8910_r, konami_ay8910_w)
ADDRESS_MAP_END
/* Checkman with 1 x AY-8910A */
-static ADDRESS_MAP_START( checkman_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( checkman_sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( checkman_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( checkman_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x03, 0x03) AM_READ(soundlatch_r)
@@ -1740,7 +1740,7 @@ ADDRESS_MAP_END
/* Checkman alternate with 1 x AY-8910A */
-static ADDRESS_MAP_START( checkmaj_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( checkmaj_sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
@@ -1750,14 +1750,14 @@ ADDRESS_MAP_END
/* King and Balloon with DAC */
-static ADDRESS_MAP_START( kingball_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kingball_sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kingball_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kingball_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_MIRROR(0xff) AM_READ(soundlatch_r) AM_DEVWRITE("dac", kingball_dac_w)
@@ -1765,12 +1765,12 @@ ADDRESS_MAP_END
/* SF-X sample player */
-static ADDRESS_MAP_START( sfx_sample_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sfx_sample_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x6c00) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sfx_sample_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sfx_sample_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xff) AM_READWRITE(sfx_sample_io_r, sfx_sample_io_w)
ADDRESS_MAP_END
@@ -2633,7 +2633,7 @@ static void common_init(
static void unmap_galaxian_sound(running_machine *machine, offs_t base)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
memory_unmap_write(space, base + 0x0004, base + 0x0007, 0, 0x07f8);
memory_unmap_write(space, base + 0x0800, base + 0x0807, 0, 0x07f8);
@@ -2656,7 +2656,7 @@ static DRIVER_INIT( galaxian )
static DRIVER_INIT( nolock )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* same as galaxian... */
DRIVER_INIT_CALL(galaxian);
@@ -2668,7 +2668,7 @@ static DRIVER_INIT( nolock )
static DRIVER_INIT( azurian )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -2680,7 +2680,7 @@ static DRIVER_INIT( azurian )
static DRIVER_INIT( gmgalax )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -2697,7 +2697,7 @@ static DRIVER_INIT( gmgalax )
static DRIVER_INIT( pisces )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -2709,7 +2709,7 @@ static DRIVER_INIT( pisces )
static DRIVER_INIT( batman2 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -2721,7 +2721,7 @@ static DRIVER_INIT( batman2 )
static DRIVER_INIT( frogg )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -2757,7 +2757,7 @@ static DRIVER_INIT( mooncrsu )
static DRIVER_INIT( mooncrgx )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -2769,7 +2769,7 @@ static DRIVER_INIT( mooncrgx )
static DRIVER_INIT( moonqsr )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x8000);
/* video extensions */
@@ -2787,7 +2787,7 @@ static WRITE8_HANDLER( artic_gfxbank_w )
static DRIVER_INIT( pacmanbl )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* same as galaxian... */
DRIVER_INIT_CALL(galaxian);
@@ -2849,7 +2849,7 @@ void tenspot_set_game_bank(running_machine* machine, int bank, int from_game)
static DRIVER_INIT( tenspot )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 */
@@ -2886,7 +2886,7 @@ static DRIVER_INIT( devilfsg )
static DRIVER_INIT( zigzag )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine, NULL, galaxian_draw_background, NULL, NULL);
@@ -2927,8 +2927,8 @@ static DRIVER_INIT( jumpbug )
static DRIVER_INIT( checkman )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -2947,7 +2947,7 @@ static DRIVER_INIT( checkman )
static DRIVER_INIT( checkmaj )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -2962,7 +2962,7 @@ static DRIVER_INIT( checkmaj )
static DRIVER_INIT( dingo )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -2977,8 +2977,8 @@ static DRIVER_INIT( dingo )
static DRIVER_INIT( dingoe )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -2999,7 +2999,7 @@ static DRIVER_INIT( dingoe )
static DRIVER_INIT( skybase )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -3017,7 +3017,7 @@ static DRIVER_INIT( skybase )
static void mshuttle_decode(running_machine *machine, const UINT8 convtable[8][16])
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x10000);
int A;
@@ -3095,7 +3095,7 @@ static DRIVER_INIT( mshuttlj )
static DRIVER_INIT( kingball )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -3112,7 +3112,7 @@ static DRIVER_INIT( kingball )
static DRIVER_INIT( scorpnmc )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -3133,7 +3133,7 @@ static DRIVER_INIT( scorpnmc )
static DRIVER_INIT( thepitm )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -3157,7 +3157,7 @@ static DRIVER_INIT( thepitm )
static DRIVER_INIT( theend )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine, theend_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -3176,7 +3176,7 @@ static DRIVER_INIT( scramble )
static DRIVER_INIT( explorer )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine, scramble_draw_bullet, scramble_draw_background, NULL, NULL);
@@ -3202,14 +3202,14 @@ static DRIVER_INIT( sfx )
galaxian_sfx_tilemap = TRUE;
/* sound board has space for extra ROM */
- memory_install_read_bank(machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1");
+ memory_install_read_bank(machine->device("audiocpu")->memory().space(AS_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", machine->region("audiocpu")->base());
}
static DRIVER_INIT( atlantis )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* video extensions */
common_init(machine, scramble_draw_bullet, scramble_draw_background, NULL, NULL);
@@ -3251,7 +3251,7 @@ static DRIVER_INIT( frogger )
static DRIVER_INIT( froggrmc )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -3296,12 +3296,12 @@ static DRIVER_INIT( amidar )
static DRIVER_INIT( scorpion )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 */
- memory_install_readwrite8_handler(machine->device("audiocpu")->memory().space(ADDRESS_SPACE_IO), 0x00, 0xff, 0, 0, scorpion_ay8910_r, scorpion_ay8910_w);
+ memory_install_readwrite8_handler(machine->device("audiocpu")->memory().space(AS_IO), 0x00, 0xff, 0, 0, scorpion_ay8910_r, scorpion_ay8910_w);
/* extra ROM */
memory_install_read_bank(space, 0x5800, 0x67ff, 0, 0, "bank1");
@@ -3310,7 +3310,7 @@ static DRIVER_INIT( scorpion )
/* no background related */
// memory_nop_write(space, 0x6803, 0x6803, 0, 0);
- memory_install_read8_handler(machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3000, 0x3000, 0, 0, scorpion_digitalker_intr_r);
+ memory_install_read8_handler(machine->device("audiocpu")->memory().space(AS_PROGRAM), 0x3000, 0x3000, 0, 0, scorpion_digitalker_intr_r);
/*
{
const UINT8 *rom = machine->region("speech")->base();
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index aebbb04f0c9..891cec9d977 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -407,7 +407,7 @@ static READ8_HANDLER( drivfrcg_port0_r )
return 0;
}
-static ADDRESS_MAP_START( galaxold_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( galaxold_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -437,7 +437,7 @@ static ADDRESS_MAP_START( galaxold_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mooncrst_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mooncrst_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -463,7 +463,7 @@ static ADDRESS_MAP_START( mooncrst_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rockclim_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rockclim_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_READWRITE(rockclim_videoram_r, rockclim_videoram_w) AM_BASE(&rockclim_videoram)//4800 - 4803 = bg scroll ?
AM_RANGE(0x4800, 0x4803) AM_WRITE(rockclim_scroll_w)
@@ -495,7 +495,7 @@ static ADDRESS_MAP_START( rockclim_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ckongg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ckongg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x9000, 0x93ff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -522,7 +522,7 @@ static ADDRESS_MAP_START( ckongg_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* Memory map based on mooncrst_map according to Z80 code - seems to be good but needs further checking */
-static ADDRESS_MAP_START( ckongmc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ckongmc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x9000, 0x93ff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -549,7 +549,7 @@ static ADDRESS_MAP_START( ckongmc_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( scramblb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( scramblb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -584,7 +584,7 @@ static READ8_HANDLER( scramb2_port0_r ) { return (input_port_read(space->machine
static READ8_HANDLER( scramb2_port1_r ) { return (input_port_read(space->machine, "IN1") >> offset) & 0x1; }
static READ8_HANDLER( scramb2_port2_r ) { return (input_port_read(space->machine, "IN2") >> offset) & 0x1; }
-static ADDRESS_MAP_START( scramb2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( scramb2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -609,7 +609,7 @@ static ADDRESS_MAP_START( scramb2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( _4in1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( _4in1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1") /* banked game code */
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -640,7 +640,7 @@ static ADDRESS_MAP_START( _4in1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bagmanmc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bagmanmc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -661,7 +661,7 @@ static ADDRESS_MAP_START( bagmanmc_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dkongjrm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dkongjrm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x7000, 0x7fff) AM_ROM
@@ -687,7 +687,7 @@ static ADDRESS_MAP_START( dkongjrm_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tazzmang, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tazzmang, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x7000, 0x7000) AM_READ_PORT("DSW0") /* mirror */
AM_RANGE(0x8000, 0x87ff) AM_RAM
@@ -712,7 +712,7 @@ static ADDRESS_MAP_START( tazzmang, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bongo, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bongo, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
AM_RANGE(0x8400, 0x87ff) AM_WRITENOP // not used
@@ -731,14 +731,14 @@ static ADDRESS_MAP_START( bongo, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bongo_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bongo_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x02, 0x02) AM_DEVREAD("aysnd", ay8910_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ozon1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ozon1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x4000, 0x4200) AM_RAM
AM_RANGE(0x4300, 0x43ff) AM_RAM
@@ -756,13 +756,13 @@ static ADDRESS_MAP_START( ozon1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8103, 0x8103) AM_WRITENOP //only one 9b at reset
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ozon1_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ozon1_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_data_address_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( harem_cpu1, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( harem_cpu1, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x47ff) AM_RAM
@@ -778,13 +778,13 @@ static ADDRESS_MAP_START( harem_cpu1, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xffe6, 0xffff) AM_RAM AM_BASE(&galaxold_spriteram) AM_SIZE(&galaxold_spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( harem_cpu2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( harem_cpu2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( harem_cpu2_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( harem_cpu2_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x04, 0x04) AM_DEVWRITE("ay1", ay8910_address_w)
AM_RANGE(0x08, 0x08) AM_DEVWRITE("ay1", ay8910_data_w)
@@ -795,7 +795,7 @@ static ADDRESS_MAP_START( harem_cpu2_io, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hunchbkg, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hunchbkg, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1480, 0x14bf) AM_MIRROR(0x6000) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(&galaxold_attributesram)
AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0x6000) AM_WRITEONLY AM_BASE(&galaxold_spriteram) AM_SIZE(&galaxold_spriteram_size)
@@ -824,13 +824,13 @@ ADDRESS_MAP_END
/* the nmi line seems to be inverted on the cpu plugin board */
READ8_DEVICE_HANDLER( ttl7474_trampoline ) { return ttl7474_output_comp_r(device); }
-static ADDRESS_MAP_START( hunchbkg_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hunchbkg_io, AS_IO, 8 )
AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READNOP // not used
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_DEVREAD("7474_9m_1", ttl7474_trampoline)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drivfrcg, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( drivfrcg, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1480, 0x14bf) AM_MIRROR(0x6000) AM_WRITE(galaxold_attributesram_w) AM_BASE(&galaxold_attributesram)
AM_RANGE(0x14c0, 0x14ff) AM_MIRROR(0x6000) AM_WRITEONLY AM_BASE(&galaxold_spriteram) AM_SIZE(&galaxold_spriteram_size)
@@ -852,13 +852,13 @@ static ADDRESS_MAP_START( drivfrcg, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0x6fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drivfrcg_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( drivfrcg_io, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ(drivfrcg_port0_r)
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE") AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( racknrol, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( racknrol, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1400, 0x143f) AM_MIRROR(0x6000) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(&galaxold_attributesram)
AM_RANGE(0x1440, 0x14bf) AM_MIRROR(0x6000) AM_RAM AM_BASE(&galaxold_spriteram) AM_SIZE(&galaxold_spriteram_size)
@@ -879,7 +879,7 @@ static ADDRESS_MAP_START( racknrol, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0x6fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( racknrol_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( racknrol_io, AS_IO, 8 )
AM_RANGE(0x1d, 0x1d) AM_DEVWRITE("sn1", sn76496_w)
AM_RANGE(0x1e, 0x1e) AM_DEVWRITE("sn2", sn76496_w)
AM_RANGE(0x1f, 0x1f) AM_DEVWRITE("sn3", sn76496_w)
@@ -901,7 +901,7 @@ static READ8_HANDLER( hexpoola_data_port_r )
return 0;
}
-static ADDRESS_MAP_START( hexpoola_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hexpoola_io, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READNOP
AM_RANGE(0x20, 0x3f) AM_WRITE(racknrol_tiles_bank_w) AM_BASE(&racknrol_tiles_bank)
AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ(hexpoola_data_port_r) AM_DEVWRITE("snsnd", sn76496_w)
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index af4948bab47..f5b34cb36c0 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -75,7 +75,7 @@ static WRITE8_HANDLER( ninjemak_videoreg_w )
-static ADDRESS_MAP_START( galivan_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( galivan_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
// The next three entires need to be looked at. It's ugly.
@@ -87,7 +87,7 @@ static ADDRESS_MAP_START( galivan_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe100, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ninjemak_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ninjemak_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
// The next three entires need to be looked at. It's ugly.
@@ -100,7 +100,7 @@ static ADDRESS_MAP_START( ninjemak_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe200, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
AM_RANGE(0x01, 0x01) AM_READ_PORT("P2")
@@ -116,7 +116,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xc0, 0xc0) AM_READ(IO_port_c0_r) /* dangar needs to return 0x58 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ninjemak_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ninjemak_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x80, 0x80) AM_READ_PORT("P1") AM_WRITE(ninjemak_gfxbank_w)
AM_RANGE(0x81, 0x81) AM_READ_PORT("P2")
@@ -128,12 +128,12 @@ static ADDRESS_MAP_START( ninjemak_io_map, ADDRESS_SPACE_IO, 8 )
// AM_RANGE(0x87, 0x87) AM_WRITENOP // ??
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym3526_w)
AM_RANGE(0x02, 0x02) AM_DEVWRITE("dac1", dac_w)
@@ -1043,20 +1043,20 @@ static WRITE8_HANDLER( youmab_84_w )
static DRIVER_INIT( youmab )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x82, 0x82, 0, 0, youmab_extra_bank_w); // banks rom at 0x8000? writes 0xff and 0x00 before executing code there
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x7fff, 0, 0, "bank3");
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x82, 0x82, 0, 0, youmab_extra_bank_w); // banks rom at 0x8000? writes 0xff and 0x00 before executing code there
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x7fff, 0, 0, "bank3");
memory_set_bankptr(machine, "bank3", machine->region("maincpu")->base());
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank2");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank2");
memory_configure_bank(machine, "bank2", 0, 2, machine->region("user2")->base(), 0x4000);
memory_set_bank(machine, "bank2", 0);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x81, 0x81, 0, 0, youmab_81_w); // ?? often, alternating values
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x84, 0x84, 0, 0, youmab_84_w); // ?? often, sequence..
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x81, 0x81, 0, 0, youmab_81_w); // ?? often, alternating values
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x84, 0x84, 0, 0, youmab_84_w); // ?? often, sequence..
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd800, 0xd81f, 0, 0); // scrolling isn't here..
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd800, 0xd81f, 0, 0); // scrolling isn't here..
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x8a, 0x8a, 0, 0, youmab_8a_r); // ???
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x8a, 0x8a, 0, 0, youmab_8a_r); // ???
}
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index 13e2542b73c..4eec266e2a6 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -83,7 +83,7 @@ static MACHINE_RESET( galpani2 )
static void galpani2_write_kaneko(device_t *device)
{
- address_space *dstspace = device->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *dstspace = device->memory().space(AS_PROGRAM);
int i,x,tpattidx;
unsigned char testpattern[] = {0xFF,0x55,0xAA,0xDD,0xBB,0x99};
@@ -113,8 +113,8 @@ static void galpani2_write_kaneko(device_t *device)
static WRITE8_HANDLER( galpani2_mcu_init_w )
{
running_machine *machine = space->machine;
- address_space *srcspace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
- address_space *dstspace = machine->device("sub")->memory().space(ADDRESS_SPACE_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 )
@@ -127,8 +127,8 @@ static WRITE8_HANDLER( galpani2_mcu_init_w )
static void galpani2_mcu_nmi1(running_machine *machine)
{
- address_space *srcspace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
- address_space *dstspace = machine->device("sub")->memory().space(ADDRESS_SPACE_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 )
@@ -289,7 +289,7 @@ static WRITE8_DEVICE_HANDLER( galpani2_oki2_bank_w )
}
-static ADDRESS_MAP_START( galpani2_mem1, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( galpani2_mem1, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE_MEMBER(galpani2_state, ram) // Work RAM
AM_RANGE(0x110000, 0x11000f) AM_RAM // ? corrupted? stack dumper on POST failure, pc+sr on gp2se
@@ -360,7 +360,7 @@ static READ16_HANDLER( galpani2_bankedrom_r )
else return 0xffff; //floating bus for absent ROMs
}
-static ADDRESS_MAP_START( galpani2_mem2, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( galpani2_mem2, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAM AM_BASE_MEMBER(galpani2_state, ram2) // Work RAM
AM_RANGE(0x400000, 0x4fffff) AM_RAM_WRITE(galpani2_bg15_w) AM_BASE_MEMBER(galpani2_state, bg15) // bg15
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index 681e4533525..6033598847d 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -861,7 +861,7 @@ static WRITE16_HANDLER( galpani3_framebuffer3_bgcol_w )
-static ADDRESS_MAP_START( galpani3_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( galpani3_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x17ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // area [B] - Work RAM
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index 9cf4c76bb1b..868488b5ede 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -212,7 +212,7 @@ static WRITE16_HANDLER( galpanic_bgvideoram_mirror_w )
}
}
-static ADDRESS_MAP_START( galpanic_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( galpanic_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
AM_RANGE(0x400000, 0x400001) AM_DEVREADWRITE8_MODERN("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE_MEMBER(galpanic_state, fgvideoram) AM_SIZE_MEMBER(galpanic_state, fgvideoram_size)
@@ -247,7 +247,7 @@ static READ8_DEVICE_HANDLER( comad_okim6295_r )
return retvalue;
}
-static ADDRESS_MAP_START( comad_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( comad_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x4fffff) AM_ROM
AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE_MEMBER(galpanic_state, fgvideoram) AM_SIZE_MEMBER(galpanic_state, fgvideoram_size)
AM_RANGE(0x520000, 0x53ffff) AM_RAM_WRITE(galpanic_bgvideoram_w) AM_BASE_MEMBER(galpanic_state, bgvideoram) /* + work RAM */
@@ -266,7 +266,7 @@ static ADDRESS_MAP_START( comad_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xf80000, 0xf80001) AM_DEVREAD8("oki", comad_okim6295_r, 0xff00) AM_DEVWRITE8_MODERN("oki", okim6295_device, write, 0xff00) /* newfant */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fantsia2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fantsia2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x4fffff) AM_ROM
AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE_MEMBER(galpanic_state, fgvideoram) AM_SIZE_MEMBER(galpanic_state, fgvideoram_size)
AM_RANGE(0x520000, 0x53ffff) AM_RAM_WRITE(galpanic_bgvideoram_w) AM_BASE_MEMBER(galpanic_state, bgvideoram) /* + work RAM */
@@ -284,7 +284,7 @@ static ADDRESS_MAP_START( fantsia2_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( galhustl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( galhustl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE_MEMBER(galpanic_state, fgvideoram) AM_SIZE_MEMBER(galpanic_state, fgvideoram_size)
AM_RANGE(0x520000, 0x53ffff) AM_WRITE(galpanic_bgvideoram_w) AM_BASE_MEMBER(galpanic_state, bgvideoram)
@@ -310,7 +310,7 @@ READ16_HANDLER( zipzap_random_read )
}
#endif
-static ADDRESS_MAP_START( zipzap_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( zipzap_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x4fffff) AM_ROM
AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE_MEMBER(galpanic_state, fgvideoram) AM_SIZE_MEMBER(galpanic_state, fgvideoram_size)
AM_RANGE(0x520000, 0x53ffff) AM_RAM_WRITE(galpanic_bgvideoram_w) AM_BASE_MEMBER(galpanic_state, bgvideoram)
@@ -331,7 +331,7 @@ static ADDRESS_MAP_START( zipzap_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc80000, 0xc8ffff) AM_RAM // main ram
ADDRESS_MAP_END
-static ADDRESS_MAP_START( supmodel_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( supmodel_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x4fffff) AM_ROM
AM_RANGE(0x500000, 0x51ffff) AM_RAM AM_BASE_MEMBER(galpanic_state, fgvideoram) AM_SIZE_MEMBER(galpanic_state, fgvideoram_size)
AM_RANGE(0x520000, 0x53ffff) AM_RAM_WRITE(galpanic_bgvideoram_w) AM_BASE_MEMBER(galpanic_state, bgvideoram)
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index b64eec0f9eb..5c0fedcef03 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -38,7 +38,7 @@ static WRITE16_HANDLER( soundcommand_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
AM_RANGE(0x700000, 0x703fff) AM_RAM /* galspnbl work RAM */
AM_RANGE(0x708000, 0x70ffff) AM_RAM /* galspnbl work RAM, bitmaps are decompressed here */
@@ -62,7 +62,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xa80050, 0xa80051) AM_WRITEONLY AM_BASE_MEMBER(galspnbl_state, scroll) /* ??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index 693afcd2953..c506431231f 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -512,7 +512,7 @@ static WRITE32_HANDLER(at_page32_w)
/*****************************************************************************/
-static ADDRESS_MAP_START( gamecstl_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gamecstl_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0x000a0000, 0x000affff) AM_RAM
AM_RANGE(0x000b0000, 0x000b7fff) AM_RAM AM_BASE_MEMBER(gamecstl_state, cga_ram)
@@ -523,7 +523,7 @@ static ADDRESS_MAP_START( gamecstl_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfffc0000, 0xffffffff) AM_ROM AM_REGION("user1", 0) /* System BIOS */
ADDRESS_MAP_END
-static ADDRESS_MAP_START(gamecstl_io, ADDRESS_SPACE_IO, 32)
+static ADDRESS_MAP_START(gamecstl_io, AS_IO, 32)
AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8("dma8237_1", i8237_r, i8237_w, 0xffffffff)
AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_1", pic8259_r, pic8259_w, 0xffffffff)
AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8("pit8254", pit8253_r, pit8253_w, 0xffffffff)
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index c0bc41d5eb7..8318240f346 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -194,7 +194,7 @@ static WRITE_LINE_DEVICE_HANDLER( r6532_irq )
static WRITE8_DEVICE_HANDLER( r6532_soundlatch_w )
{
- address_space *space = device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device("maincpu")->memory().space(AS_PROGRAM);
soundlatch_w(space, 0, data);
}
@@ -215,7 +215,7 @@ static const riot6532_interface r6532_interface =
*
*************************************/
-static ADDRESS_MAP_START( gameplan_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gameplan_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM
AM_RANGE(0x2000, 0x200f) AM_MIRROR(0x07f0) AM_DEVREADWRITE_MODERN("via6522_0", via6522_device, read, write) /* VIA 1 */
AM_RANGE(0x2800, 0x280f) AM_MIRROR(0x07f0) AM_DEVREADWRITE_MODERN("via6522_1", via6522_device, read, write) /* VIA 2 */
@@ -231,7 +231,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( gameplan_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gameplan_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x1780) AM_RAM /* 6532 internal RAM */
AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w)
AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_DEVWRITE("aysnd", ay8910_address_w)
@@ -242,7 +242,7 @@ ADDRESS_MAP_END
/* same as Gameplan, but larger ROM */
-static ADDRESS_MAP_START( leprechn_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( leprechn_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x1780) AM_RAM /* 6532 internal RAM */
AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE("riot", riot6532_r, riot6532_w)
AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_DEVWRITE("aysnd", ay8910_address_w)
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index de9fc54b621..727237439ff 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -269,7 +269,7 @@ static INTERRUPT_GEN( gaplus_interrupt_1 )
}
-static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(gaplus_videoram_r, gaplus_videoram_w) AM_BASE_MEMBER(gaplus_state, videoram) /* tilemap RAM (shared with CPU #2) */
AM_RANGE(0x0800, 0x1fff) AM_READWRITE(gaplus_spriteram_r, gaplus_spriteram_w) AM_BASE_MEMBER(gaplus_state, spriteram) /* shared RAM with CPU #2 (includes sprite RAM) */
AM_RANGE(0x6000, 0x63ff) AM_DEVREADWRITE("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with CPU #3 */
@@ -284,7 +284,7 @@ static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gaplusa_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gaplusa_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(gaplus_videoram_r, gaplus_videoram_w) AM_BASE_MEMBER(gaplus_state, videoram) /* tilemap RAM (shared with CPU #2) */
AM_RANGE(0x0800, 0x1fff) AM_READWRITE(gaplus_spriteram_r, gaplus_spriteram_w) AM_BASE_MEMBER(gaplus_state, spriteram) /* shared RAM with CPU #2 (includes sprite RAM) */
AM_RANGE(0x6000, 0x63ff) AM_DEVREADWRITE("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with CPU #3 */
@@ -299,7 +299,7 @@ static ADDRESS_MAP_START( gaplusa_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(gaplus_videoram_r, gaplus_videoram_w) /* tilemap RAM (shared with CPU #1) */
AM_RANGE(0x0800, 0x1fff) AM_READWRITE(gaplus_spriteram_r, gaplus_spriteram_w) /* shared RAM with CPU #1 */
// AM_RANGE(0x500f, 0x500f) AM_WRITENOP /* ??? written 256 times on startup */
@@ -307,7 +307,7 @@ static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_DEVREADWRITE("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with the main CPU + sound registers */
AM_RANGE(0x2000, 0x3fff) AM_READWRITE(watchdog_reset_r, watchdog_reset_w) /* watchdog? */
AM_RANGE(0x4000, 0x7fff) AM_WRITE(gaplus_irq_3_ctrl_w) /* interrupt enable/disable */
diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c
index 48509eb8bea..0bc637c2906 100644
--- a/src/mame/drivers/gatron.c
+++ b/src/mame/drivers/gatron.c
@@ -337,7 +337,7 @@ static const ppi8255_interface ppi8255_intf =
* Memory Map Information *
*************************/
-static ADDRESS_MAP_START( gat_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gat_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE(gat_videoram_w) AM_BASE_MEMBER(gatron_state, videoram)
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */
@@ -345,7 +345,7 @@ static ADDRESS_MAP_START( gat_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe000) AM_WRITE(output_port_0_w) /* lamps */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gat_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gat_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index f4b95b52d58..a25ef8e6d33 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -144,7 +144,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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = screen.machine->device("audiocpu")->memory().space(AS_PROGRAM);
/* sound IRQ is on 32V */
if (scanline & 32)
@@ -302,7 +302,7 @@ static WRITE8_HANDLER( mixer_w )
*************************************/
/* full map verified from schematics */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x037fff) AM_MIRROR(0x280000) AM_ROM
AM_RANGE(0x038000, 0x03ffff) AM_MIRROR(0x280000) AM_ROM /* slapstic maps here */
@@ -343,7 +343,7 @@ ADDRESS_MAP_END
*************************************/
/* full map verified from schematics */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x2000) AM_RAM
AM_RANGE(0x1000, 0x100f) AM_MIRROR(0x27c0) AM_WRITE(atarigen_6502_sound_w)
diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c
index f114fff3c78..f8cf93e15a0 100644
--- a/src/mame/drivers/gberet.c
+++ b/src/mame/drivers/gberet.c
@@ -150,7 +150,7 @@ static WRITE8_HANDLER( mrgoemon_flipscreen_w )
*
*************************************/
-static ADDRESS_MAP_START( gberet_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gberet_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(gberet_colorram_w) AM_BASE_MEMBER(gberet_state, colorram)
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(gberet_videoram_w) AM_BASE_MEMBER(gberet_state, videoram)
@@ -171,7 +171,7 @@ static ADDRESS_MAP_START( gberet_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf600, 0xf600) AM_WRITE(watchdog_reset_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gberetb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gberetb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(gberet_colorram_w) AM_BASE_MEMBER(gberet_state, colorram)
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(gberet_videoram_w) AM_BASE_MEMBER(gberet_state, videoram)
@@ -192,7 +192,7 @@ static ADDRESS_MAP_START( gberetb_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf900, 0xf901) AM_WRITE(gberetb_scroll_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mrgoemon_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mrgoemon_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(gberet_colorram_w) AM_BASE_MEMBER(gberet_state, colorram)
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(gberet_videoram_w) AM_BASE_MEMBER(gberet_state, videoram)
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index b655601ad6d..8874e3fc55d 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -155,7 +155,7 @@ static WRITE8_HANDLER( k052109_051960_w )
}
-static ADDRESS_MAP_START( gbusters_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gbusters_map, AS_PROGRAM, 8 )
AM_RANGE(0x1f80, 0x1f80) AM_WRITE(gbusters_coin_counter_w) /* coin counters */
AM_RANGE(0x1f84, 0x1f84) AM_WRITE(soundlatch_w) /* sound code # */
AM_RANGE(0x1f88, 0x1f88) AM_WRITE(gbusters_sh_irqtrigger_w) /* cause interrupt on audio CPU */
@@ -175,7 +175,7 @@ static ADDRESS_MAP_START( gbusters_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM 878n02.rom */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gbusters_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gbusters_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM 878h01.rom */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r */
diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c
index fb650b2c4e8..eafa0c56a7e 100644
--- a/src/mame/drivers/gcpinbal.c
+++ b/src/mame/drivers/gcpinbal.c
@@ -231,7 +231,7 @@ static void gcp_adpcm_int( device_t *device )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( gcpinbal_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gcpinbal_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE(gcpinbal_tilemaps_word_r, gcpinbal_tilemaps_word_w) AM_BASE_MEMBER(gcpinbal_state, tilemapram)
AM_RANGE(0xc80000, 0xc80fff) AM_RAM AM_BASE_SIZE_MEMBER(gcpinbal_state, spriteram, spriteram_size) /* sprite ram */
diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c
index a83a023709f..40a1703f28b 100644
--- a/src/mame/drivers/gei.c
+++ b/src/mame/drivers/gei.c
@@ -156,7 +156,7 @@ static WRITE8_DEVICE_HANDLER( lamps_w )
static WRITE8_DEVICE_HANDLER( sound_w )
{
- address_space *space = device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device("maincpu")->memory().space(AS_PROGRAM);
/* bit 3 - coin lockout, lamp10 in poker / lamp6 in trivia test modes */
coin_lockout_global_w(device->machine, ~data & 0x08);
@@ -197,7 +197,7 @@ static WRITE8_DEVICE_HANDLER( lamps2_w )
static WRITE8_DEVICE_HANDLER( nmi_w )
{
- address_space *space = device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device("maincpu")->memory().space(AS_PROGRAM);
/* bit 4 - play/raise button lamp, lamp 9 in selection test mode */
set_led_status(device->machine, 8,data & 0x10);
@@ -381,7 +381,7 @@ static WRITE8_HANDLER( signature2_w )
}
}
-static ADDRESS_MAP_START( getrivia_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( getrivia_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("nvram")
@@ -403,7 +403,7 @@ static ADDRESS_MAP_START( getrivia_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_RAM_WRITE(gei_bitmap_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gselect_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gselect_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0x40ff) AM_RAM AM_SHARE("nvram")
@@ -418,7 +418,7 @@ static ADDRESS_MAP_START( gselect_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
// TODO: where are mapped the lower 0x2000 bytes of the banks?
-static ADDRESS_MAP_START( amuse_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( amuse_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("nvram")
@@ -434,7 +434,7 @@ static ADDRESS_MAP_START( amuse_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_RAM_WRITE(gei_bitmap_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gepoker_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gepoker_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("nvram")
@@ -451,7 +451,7 @@ static ADDRESS_MAP_START( gepoker_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_RAM_WRITE(gei_bitmap_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( amuse1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( amuse1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_SHARE("nvram")
@@ -468,7 +468,7 @@ static ADDRESS_MAP_START( amuse1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_RAM_WRITE(gei_bitmap_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( findout_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( findout_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r,ppi8255_w)
@@ -489,7 +489,7 @@ static ADDRESS_MAP_START( findout_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_READ(catchall)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( quizvid_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( quizvid_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r,ppi8255_w)
@@ -507,7 +507,7 @@ static ADDRESS_MAP_START( quizvid_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_READ(catchall)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( suprpokr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( suprpokr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
@@ -519,7 +519,7 @@ static ADDRESS_MAP_START( suprpokr_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( geimulti_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( geimulti_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
@@ -532,7 +532,7 @@ static ADDRESS_MAP_START( geimulti_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_RAM_WRITE(gei_bitmap_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sprtauth_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sprtauth_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x4800, 0x4803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
diff --git a/src/mame/drivers/ggconnie.c b/src/mame/drivers/ggconnie.c
index 47146aab9b0..8a243a35309 100644
--- a/src/mame/drivers/ggconnie.c
+++ b/src/mame/drivers/ggconnie.c
@@ -124,7 +124,7 @@ static WRITE8_HANDLER(output_w)
// written in "Output Test" in test mode
}
-static ADDRESS_MAP_START( sgx_mem , ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START( sgx_mem , AS_PROGRAM, 8)
AM_RANGE( 0x000000, 0x0fffff) AM_ROM
AM_RANGE( 0x110000, 0x1edfff) AM_NOP
AM_RANGE( 0x1ee800, 0x1effff) AM_NOP
@@ -144,7 +144,7 @@ static ADDRESS_MAP_START( sgx_mem , ADDRESS_SPACE_PROGRAM, 8)
AM_RANGE( 0x1ff400, 0x1ff7ff) AM_READWRITE(h6280_irq_status_r, h6280_irq_status_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sgx_io , ADDRESS_SPACE_IO, 8)
+static ADDRESS_MAP_START( sgx_io , AS_IO, 8)
AM_RANGE( 0x00, 0x03) AM_READWRITE( sgx_vdc_r, sgx_vdc_w )
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c
index f45b44f2ec1..58783649c10 100644
--- a/src/mame/drivers/ghosteo.c
+++ b/src/mame/drivers/ghosteo.c
@@ -315,7 +315,7 @@ static WRITE32_HANDLER( sound_w )
}
}
-static ADDRESS_MAP_START( bballoon_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( bballoon_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00000fff) AM_RAM AM_BASE_MEMBER(ghosteo_state, steppingstone) AM_MIRROR(0x40000000)
AM_RANGE(0x10000000, 0x10000003) AM_READ_PORT("10000000")
AM_RANGE(0x10100000, 0x10100003) AM_READ_PORT("10100000")
@@ -437,7 +437,7 @@ static READ32_HANDLER( bballoon_speedup_r )
static MACHINE_RESET( bballoon )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4d000010, 0x4d000013, 0, 0, bballoon_speedup_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4d000010, 0x4d000013, 0, 0, bballoon_speedup_r);
s3c2410 = machine->device("s3c2410");
}
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index 128c3cd0ed3..e3a86a154b4 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -165,7 +165,7 @@ static void sound_nmi( device_t *device )
device_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( gijoe_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gijoe_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM AM_BASE_MEMBER(gijoe_state, spriteram) // Sprites
AM_RANGE(0x110000, 0x110007) AM_DEVWRITE("k053246", k053246_word_w)
@@ -196,7 +196,7 @@ static ADDRESS_MAP_START( gijoe_map, ADDRESS_SPACE_PROGRAM, 16 )
#endif
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xebff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xfa2f) AM_DEVREADWRITE("k054539", k054539_r, k054539_w)
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index 89b24bbd787..3698c125a75 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -64,7 +64,7 @@ f5d6 print 7 digit BCD number: d0.l to (a1)+ color $3000
*/
-static ADDRESS_MAP_START( ginganin_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ginganin_map, AS_PROGRAM, 16 )
/* The ROM area: 10000-13fff is written with: 0000 0000 0000 0001, at startup only. Why? */
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x020000, 0x023fff) AM_RAM
@@ -138,7 +138,7 @@ static WRITE8_HANDLER( MC6840_write_port_1_w )
state->MC6840_register1 = data;
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0800) AM_WRITE(MC6840_control_port_0_w) /* Takahiro Nogi. 1999/09/27 */
AM_RANGE(0x0801, 0x0801) AM_WRITE(MC6840_control_port_1_w) /* Takahiro Nogi. 1999/09/27 */
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index 9f361e19895..9750fff7159 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -374,7 +374,7 @@ static MACHINE_RESET( ppking )
state->flag1 = state->flag2 = 1;
}
-static ADDRESS_MAP_START( ppking_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ppking_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcbff) AM_RAM AM_BASE_MEMBER(gladiatr_state, spriteram)
AM_RANGE(0xcc00, 0xcfff) AM_WRITE(ppking_video_registers_w)
@@ -386,12 +386,12 @@ static ADDRESS_MAP_START( ppking_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ppking_cpu3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ppking_cpu3_map, AS_PROGRAM, 8 )
AM_RANGE(0x2000, 0x2fff) AM_ROM
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ppking_cpu1_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ppking_cpu1_io, AS_IO, 8 )
// ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xc000, 0xc000) AM_WRITE(gladiatr_spritebuffer_w)
AM_RANGE(0xc004, 0xc004) AM_NOP // WRITE(ppking_irq_patch_w)
@@ -399,7 +399,7 @@ static ADDRESS_MAP_START( ppking_cpu1_io, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xc0bf, 0xc0bf) AM_NOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ppking_cpu2_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ppking_cpu2_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x20, 0x21) AM_READ(qx1_r) AM_WRITE(qx1_w)
@@ -411,7 +411,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( gladiatr_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gladiatr_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcbff) AM_RAM AM_BASE_MEMBER(gladiatr_state, spriteram)
@@ -423,19 +423,19 @@ static ADDRESS_MAP_START( gladiatr_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gladiatr_cpu3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gladiatr_cpu3_map, AS_PROGRAM, 8 )
AM_RANGE(0x1000, 0x1fff) AM_DEVWRITE("msm", glad_adpcm_w)
AM_RANGE(0x2000, 0x2fff) AM_READ(glad_cpu_sound_command_r)
AM_RANGE(0x4000, 0xffff) AM_ROMBANK("bank2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gladiatr_cpu1_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gladiatr_cpu1_io, AS_IO, 8 )
// ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xc000, 0xc000) AM_WRITE(gladiatr_spritebuffer_w)
AM_RANGE(0xc001, 0xc001) AM_WRITE(gladiatr_spritebank_w)
@@ -446,7 +446,7 @@ static ADDRESS_MAP_START( gladiatr_cpu1_io, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xc0bf, 0xc0bf) AM_NOP // watchdog_reset_w doesn't work
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gladiatr_cpu2_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gladiatr_cpu2_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x20, 0x21) AM_READWRITE(TAITO8741_1_r, TAITO8741_1_w)
@@ -1030,7 +1030,7 @@ static DRIVER_INIT(ppking)
}
}
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf6a3,0xf6a3,0,0, f6a3_r );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf6a3,0xf6a3,0,0, f6a3_r );
}
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 4f860412fc1..92693578d6c 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -78,7 +78,7 @@ static WRITE16_HANDLER( glass_coin_w )
}
}
-static ADDRESS_MAP_START( glass_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( glass_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM /* ROM */
AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(glass_vram_w) AM_BASE_MEMBER(glass_state, videoram) /* Video RAM */
AM_RANGE(0x102000, 0x102fff) AM_RAM /* Extra Video RAM */
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index 3f1cc289fdd..0bad4c2815e 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -41,7 +41,7 @@ static WRITE8_HANDLER( gng_coin_counter_w )
coin_counter_w(space->machine, offset, data);
}
-static ADDRESS_MAP_START( gng_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gng_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1dff) AM_RAM
AM_RANGE(0x1e00, 0x1fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(gng_fgvideoram_w) AM_BASE_MEMBER(gng_state, fgvideoram)
@@ -67,7 +67,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r)
@@ -721,7 +721,7 @@ static READ8_HANDLER( diamond_hack_r )
static DRIVER_INIT( diamond )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x6000, 0, 0, diamond_hack_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000, 0x6000, 0, 0, diamond_hack_r);
}
diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c
index d2ae852c99b..aab5f121caa 100644
--- a/src/mame/drivers/go2000.c
+++ b/src/mame/drivers/go2000.c
@@ -57,7 +57,7 @@ static WRITE16_HANDLER( sound_cmd_w )
device_set_input_line(state->soundcpu, 0, HOLD_LINE);
}
-static ADDRESS_MAP_START( go2000_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( go2000_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM
AM_RANGE(0x600000, 0x60ffff) AM_RAM AM_BASE_MEMBER(go2000_state, videoram)
@@ -76,12 +76,12 @@ static WRITE8_HANDLER( go2000_pcm_1_bankswitch_w )
memory_set_bank(space->machine, "bank1", data & 0x07);
}
-static ADDRESS_MAP_START( go2000_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( go2000_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_ROM
AM_RANGE(0x0400, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( go2000_sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( go2000_sound_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac1", dac_w)
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index 8a5d039da75..8d03bb38f05 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -47,7 +47,7 @@ static READ16_HANDLER( goal92_inputs_r )
return 0;
}
-static ADDRESS_MAP_START( goal92_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( goal92_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1007ff) AM_RAM
AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE(goal92_background_w) AM_BASE_MEMBER(goal92_state, bg_data)
@@ -81,7 +81,7 @@ static WRITE8_HANDLER( adpcm_data_w )
state->msm5205next = data;
}
-static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", adpcm_control_w)
diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c
index 7867651d582..ffe4db68365 100644
--- a/src/mame/drivers/goindol.c
+++ b/src/mame/drivers/goindol.c
@@ -88,7 +88,7 @@ static WRITE8_HANDLER( prot_fcb0_w )
-static ADDRESS_MAP_START( goindol_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( goindol_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE_MEMBER(goindol_state, ram)
@@ -114,7 +114,7 @@ static ADDRESS_MAP_START( goindol_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfd99, 0xfd99) AM_WRITE(prot_fd99_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ymsnd", ym2203_w)
AM_RANGE(0xc000, 0xc7ff) AM_RAM
diff --git a/src/mame/drivers/goldngam.c b/src/mame/drivers/goldngam.c
index f17e655560d..8c9b4731e30 100644
--- a/src/mame/drivers/goldngam.c
+++ b/src/mame/drivers/goldngam.c
@@ -297,7 +297,7 @@ static READ16_HANDLER(unk_r)
return test1;
}
-static ADDRESS_MAP_START( swisspkr_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( swisspkr_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x400002, 0x400003) AM_NOP // hopper status read ?
@@ -347,7 +347,7 @@ ADDRESS_MAP_END
*/
-static ADDRESS_MAP_START( moviecrd_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( moviecrd_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0xc00000, 0xc3ffff) AM_RAM AM_BASE_MEMBER(goldngam_state, videoram)
diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c
index 49626b2a752..6ca691f5b06 100644
--- a/src/mame/drivers/goldnpkr.c
+++ b/src/mame/drivers/goldnpkr.c
@@ -1075,7 +1075,7 @@ static WRITE8_DEVICE_HANDLER( sound_w )
* Memory Map Information *
*********************************************/
-static ADDRESS_MAP_START( goldnpkr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( goldnpkr_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
@@ -1087,7 +1087,7 @@ static ADDRESS_MAP_START( goldnpkr_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x2000, 0x7fff) AM_ROM /* superdbl uses 0x2000..0x3fff address space */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pottnpkr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pottnpkr_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
@@ -1099,7 +1099,7 @@ static ADDRESS_MAP_START( pottnpkr_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x2000, 0x3fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( witchcrd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( witchcrd_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
@@ -1125,7 +1125,7 @@ ADDRESS_MAP_END
*/
-static ADDRESS_MAP_START( witchcrd_falcon_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( witchcrd_falcon_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */
AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
@@ -1138,7 +1138,7 @@ static ADDRESS_MAP_START( witchcrd_falcon_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0x7fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wildcard_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wildcard_map, AS_PROGRAM, 8 )
// ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
@@ -1160,7 +1160,7 @@ ADDRESS_MAP_END
*/
-static ADDRESS_MAP_START( wcrdxtnd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wcrdxtnd_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM //AM_SHARE("nvram") /* battery backed RAM */
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
@@ -1180,7 +1180,7 @@ ADDRESS_MAP_END
*/
-static ADDRESS_MAP_START( wildcrdb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wildcrdb_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */
AM_RANGE(0x0844, 0x0847) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w)
@@ -1194,13 +1194,13 @@ static ADDRESS_MAP_START( wildcrdb_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x3000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wildcrdb_mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wildcrdb_mcu_map, AS_PROGRAM, 8 )
// ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x2fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wildcrdb_mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( wildcrdb_mcu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
@@ -1213,7 +1213,7 @@ ADDRESS_MAP_END
*/
-static ADDRESS_MAP_START( genie_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( genie_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 850ecd2e337..42ce227e20e 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -137,7 +137,7 @@ static READ8_HANDLER( protection_r )
return data[state->dataoffset++];
}
-static ADDRESS_MAP_START( goldstar_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( goldstar_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xb7ff) AM_ROM
AM_RANGE(0xb800, 0xbfff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xc000, 0xc7ff) AM_ROM
@@ -168,7 +168,7 @@ static ADDRESS_MAP_START( goldstar_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfe00, 0xfe00) AM_READWRITE(protection_r,protection_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( goldstar_readport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( goldstar_readport, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_READ_PORT("DSW6")
ADDRESS_MAP_END
@@ -180,7 +180,7 @@ static WRITE8_HANDLER( ncb3_port81_w )
}
-static ADDRESS_MAP_START( ncb3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ncb3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xb7ff) AM_ROM
AM_RANGE(0xb800, 0xbfff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xc000, 0xc7ff) AM_ROM
@@ -205,7 +205,7 @@ static ADDRESS_MAP_START( ncb3_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf870, 0xf870) AM_DEVWRITE("snsnd", sn76496_w) /* guess... device is initialized, but doesn't seems to be used.*/
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ncb3_readwriteport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ncb3_readwriteport, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// AM_RANGE(0x00, 0x00) AM_READ(ncb3_unkread_r) // read from 0x00 when controls set1 is used...
// AM_RANGE(0x02, 0x02) AM_READ(ncb3_unkread_r) // read from 0x02 when controls set2 is used...
@@ -252,7 +252,7 @@ static WRITE8_HANDLER( cm_outport1_w )
/* lamps? */
}
-static ADDRESS_MAP_START( cm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xcfff) AM_ROM AM_WRITENOP
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("nvram")
@@ -274,7 +274,7 @@ static ADDRESS_MAP_START( cm_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc80, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nfm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nfm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xd7ff) AM_ROM AM_WRITENOP
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("nvram")
@@ -298,7 +298,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( cm_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cm_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x02, 0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -312,7 +312,7 @@ static ADDRESS_MAP_START( cm_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cmast91_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cmast91_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */
AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */
@@ -321,7 +321,7 @@ static ADDRESS_MAP_START( cmast91_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( amcoe1_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( amcoe1_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x02, 0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -334,7 +334,7 @@ static ADDRESS_MAP_START( amcoe1_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x20, 0x20) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( amcoe2_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( amcoe2_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x02, 0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -360,7 +360,7 @@ static WRITE8_HANDLER( lucky8_outport_w )
}
-static ADDRESS_MAP_START( lucky8_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lucky8_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE_MEMBER(goldstar_state,fg_vidram)
@@ -404,7 +404,7 @@ static WRITE8_HANDLER( magodds_outb860_w )
// popmessage("magodds_outb860_w %02x\n", data);
}
-static ADDRESS_MAP_START(magodds_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START(magodds_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
// where does the extra rom data map?? it seems like it should come straight after the existing rom, but it can't if this is a plain z80?
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("share1") AM_SHARE("nvram")
@@ -428,7 +428,7 @@ static ADDRESS_MAP_START(magodds_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("maincpu",0xc000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kkojnoli_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kkojnoli_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM /* definitely no NVRAM */
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE_MEMBER(goldstar_state,fg_vidram)
@@ -467,7 +467,7 @@ ADDRESS_MAP_END
// popmessage("Output: %02X", data);
//}
-static ADDRESS_MAP_START( ladylinr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ladylinr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE_MEMBER(goldstar_state,fg_vidram)
@@ -488,7 +488,7 @@ static ADDRESS_MAP_START( ladylinr_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wcat3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wcat3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(goldstar_fg_vidram_w) AM_BASE_MEMBER(goldstar_state,fg_vidram)
@@ -522,7 +522,7 @@ static READ8_HANDLER( unkch_unk_r )
/* newer / more capable hw */
-static ADDRESS_MAP_START( unkch_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( unkch_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xc000, 0xc1ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xc800, 0xc9ff) AM_RAM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w) AM_BASE_GENERIC(paletteram2)
@@ -574,7 +574,7 @@ static WRITE8_HANDLER( unkcm_0x12_w )
}
-static ADDRESS_MAP_START( unkch_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( unkch_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x02, 0x02) AM_WRITE(unkcm_0x02_w)
@@ -9853,8 +9853,8 @@ static DRIVER_INIT( schery97 )
ROM[i] = x;
}
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x1d, 0x1d, 0, 0, fixedvala8_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x2a, 0x2a, 0, 0, fixedvalb4_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x1d, 0x1d, 0, 0, fixedvala8_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x2a, 0x2a, 0, 0, fixedvalb4_r);
/* Oki 6295 at 0x20 */
}
@@ -9883,7 +9883,7 @@ static DRIVER_INIT( schery97a )
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x16, 0x16, 0, 0, fixedval38_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x16, 0x16, 0, 0, fixedval38_r);
/* Oki 6295 at 0x20 */
}
@@ -9910,7 +9910,7 @@ static DRIVER_INIT( skill98 )
ROM[i] = x;
}
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x1e, 0x1e, 0, 0, fixedvalea_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x1e, 0x1e, 0, 0, fixedvalea_r);
/* Oki 6295 at 0x20 */
}
@@ -9937,7 +9937,7 @@ static DRIVER_INIT( fb36xc1 )
ROM[i] = x;
}
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x31, 0x31, 0, 0, fixedval68_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x31, 0x31, 0, 0, fixedval68_r);
}
@@ -9974,11 +9974,11 @@ static DRIVER_INIT( fbse354 )
ROM[i] = x;
}
// nfb96b needs both of these
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x23, 0x23, 0, 0, fixedval80_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x5a, 0x5a, 0, 0, fixedvalaa_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x23, 0x23, 0, 0, fixedval80_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x5a, 0x5a, 0, 0, fixedvalaa_r);
// csel96b
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x6e, 0x6e, 0, 0, fixedval96_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x6e, 0x6e, 0, 0, fixedval96_r);
}
@@ -10006,7 +10006,7 @@ static DRIVER_INIT( fbse362 )
ROM[i] = x;
}
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x2e, 0x2e, 0, 0, fixedvalbe_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x2e, 0x2e, 0, 0, fixedvalbe_r);
}
@@ -10038,8 +10038,8 @@ static DRIVER_INIT( rp35 )
ROM[i] = x;
}
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x5e, 0x5e, 0, 0, fixedval84_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x36, 0x36, 0, 0, fixedval90_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x5e, 0x5e, 0, 0, fixedval84_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x36, 0x36, 0, 0, fixedval90_r);
}
static READ8_HANDLER( fixedvalb2_r )
@@ -10066,7 +10066,7 @@ static DRIVER_INIT( rp36 )
ROM[i] = x;
}
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x34, 0x34, 0, 0, fixedvalb2_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x34, 0x34, 0, 0, fixedvalb2_r);
}
static READ8_HANDLER( fixedval48_r )
@@ -10093,7 +10093,7 @@ static DRIVER_INIT( rp36c3 )
ROM[i] = x;
}
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x17, 0x17, 0, 0, fixedval48_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x17, 0x17, 0, 0, fixedval48_r);
}
static READ8_HANDLER( fixedval09_r )
@@ -10125,8 +10125,8 @@ static DRIVER_INIT( po33 )
ROM[i] = x;
}
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x32, 0x32, 0, 0, fixedval74_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x12, 0x12, 0, 0, fixedval09_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x32, 0x32, 0, 0, fixedval74_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x12, 0x12, 0, 0, fixedval09_r);
/* oki6295 at 0x20 */
}
@@ -10154,7 +10154,7 @@ static DRIVER_INIT( tc132axt )
ROM[i] = x;
}
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x21, 0x21, 0, 0, fixedval58_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x21, 0x21, 0, 0, fixedval58_r);
}
static READ8_HANDLER( fixedvale4_r )
@@ -10186,8 +10186,8 @@ static DRIVER_INIT( match133 )
ROM[i] = x;
}
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x16, 0x16, 0, 0, fixedvalc7_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x1a, 0x1a, 0, 0, fixedvale4_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x16, 0x16, 0, 0, fixedvalc7_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x1a, 0x1a, 0, 0, fixedvale4_r);
}
static DRIVER_INIT(cherrys)
@@ -10252,7 +10252,7 @@ static DRIVER_INIT( unkch4 )
static DRIVER_INIT( tonypok )
{
// the ppi doesn't seem to work properly, so just install the inputs directly
- address_space *io = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *io = machine->device("maincpu")->memory().space(AS_IO);
memory_install_read_port(io, 0x04, 0x04, 0, 0, "IN0" );
memory_install_read_port(io, 0x05, 0x05, 0, 0, "IN1" );
memory_install_read_port(io, 0x06, 0x06, 0, 0, "IN2" );
diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c
index 64b1e0fb52e..b47e09d5d40 100644
--- a/src/mame/drivers/gomoku.c
+++ b/src/mame/drivers/gomoku.c
@@ -38,7 +38,7 @@ static READ8_HANDLER( input_port_r )
}
-static ADDRESS_MAP_START( gomoku_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gomoku_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x47ff) AM_ROM
AM_RANGE(0x4800, 0x4fff) AM_RAM
AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE(gomoku_videoram_w) AM_BASE_MEMBER(gomoku_state, videoram)
diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c
index 1ac39b2bcfc..6e2dd1e1d4b 100644
--- a/src/mame/drivers/good.c
+++ b/src/mame/drivers/good.c
@@ -100,7 +100,7 @@ static SCREEN_UPDATE( good )
return 0;
}
-static ADDRESS_MAP_START( good_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( good_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
//AM_RANGE(0x270000, 0x270007) AM_RAM // scroll?
diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c
index 225ecea7997..bc5edc8d644 100644
--- a/src/mame/drivers/goodejan.c
+++ b/src/mame/drivers/goodejan.c
@@ -103,7 +103,7 @@ static WRITE16_HANDLER( mahjong_panel_w )
state->mux_data = data;
}
-static ADDRESS_MAP_START( goodejan_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( goodejan_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x0afff) AM_RAM
AM_RANGE(0x0c000, 0x0c7ff) AM_RAM_WRITE(seibucrtc_sc0vram_w) AM_BASE(&seibucrtc_sc0vram)
AM_RANGE(0x0c800, 0x0cfff) AM_RAM_WRITE(seibucrtc_sc3vram_w) AM_BASE(&seibucrtc_sc3vram)
@@ -116,7 +116,7 @@ static ADDRESS_MAP_START( goodejan_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/*totmejan CRT is at 8000-804f,goodejan is at 8040-807f(808f but not tested)*/
-static ADDRESS_MAP_START( common_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( common_io_map, AS_IO, 16 )
AM_RANGE(0x9000, 0x9001) AM_WRITE(goodejan_gfxbank_w)
AM_RANGE(0xb000, 0xb003) AM_WRITENOP
AM_RANGE(0xb004, 0xb005) AM_WRITE(mahjong_panel_w)
@@ -127,12 +127,12 @@ static ADDRESS_MAP_START( common_io_map, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0xd000, 0xd00f) AM_READWRITE(seibu_main_word_r, seibu_main_word_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( totmejan_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( totmejan_io_map, AS_IO, 16 )
AM_RANGE(0x8000, 0x804f) AM_RAM_WRITE(seibucrtc_vregs_w) AM_BASE(&seibucrtc_vregs)
AM_IMPORT_FROM(common_io_map)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( goodejan_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( goodejan_io_map, AS_IO, 16 )
AM_RANGE(0x8040, 0x807f) AM_RAM_WRITE(seibucrtc_vregs_w) AM_BASE(&seibucrtc_vregs)
AM_IMPORT_FROM(common_io_map)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index 2ef89909e38..dc529082afd 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -95,7 +95,7 @@ static WRITE16_DEVICE_HANDLER( gotcha_oki_bank_w )
}
-static ADDRESS_MAP_START( gotcha_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gotcha_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_WRITE(soundlatch_word_w)
AM_RANGE(0x100002, 0x100003) AM_WRITE(gotcha_lamps_w)
@@ -115,7 +115,7 @@ static ADDRESS_MAP_START( gotcha_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0xc002, 0xc003) AM_DEVWRITE_MODERN("oki", okim6295_device, write) // TWO addresses!
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index a21e90cfdca..c436f5123a4 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -248,9 +248,9 @@ static MACHINE_START( gottlieb )
if (state->laserdisc != NULL)
{
/* attach to the I/O ports */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x05805, 0x05807, 0, 0x07f8, laserdisc_status_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x05805, 0x05805, 0, 0x07f8, laserdisc_command_w); /* command for the player */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x05806, 0x05806, 0, 0x07f8, laserdisc_select_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x05805, 0x05807, 0, 0x07f8, laserdisc_status_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x05805, 0x05805, 0, 0x07f8, laserdisc_command_w); /* command for the player */
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x05806, 0x05806, 0, 0x07f8, laserdisc_select_w);
/* allocate a timer for serial transmission, and one for philips code processing */
state->laserdisc_bit_timer = machine->scheduler().timer_alloc(FUNC(laserdisc_bit_callback));
@@ -698,7 +698,7 @@ static INTERRUPT_GEN( gottlieb_interrupt )
*
*************************************/
-static ADDRESS_MAP_START( reactor_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( reactor_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xffff)
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x20ff) AM_MIRROR(0x0f00) AM_WRITEONLY AM_BASE_MEMBER(gottlieb_state, spriteram) /* FRSEL */
@@ -719,7 +719,7 @@ static ADDRESS_MAP_START( reactor_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gottlieb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gottlieb_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xffff)
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x1000, 0x1fff) AM_RAM AM_REGION("maincpu", 0x1000) /* or ROM */
@@ -2613,7 +2613,7 @@ static DRIVER_INIT( romtiles )
static DRIVER_INIT( stooges )
{
DRIVER_INIT_CALL(ramtiles);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x05803, 0x05803, 0, 0x07f8, stooges_output_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x05803, 0x05803, 0, 0x07f8, stooges_output_w);
}
diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c
index 9d7be34fefa..228ac47177a 100644
--- a/src/mame/drivers/gotya.c
+++ b/src/mame/drivers/gotya.c
@@ -39,7 +39,7 @@ TODO: Emulated sound
#include "includes/gotya.h"
-static ADDRESS_MAP_START( gotya_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gotya_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x5000, 0x5fff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/gp_1.c b/src/mame/drivers/gp_1.c
index 3ba8bc3afb7..3f07a87a71f 100644
--- a/src/mame/drivers/gp_1.c
+++ b/src/mame/drivers/gp_1.c
@@ -15,7 +15,7 @@ public:
};
-static ADDRESS_MAP_START( gp_1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gp_1_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gp_2.c b/src/mame/drivers/gp_2.c
index 2c8032b43f9..9d0a6cbd217 100644
--- a/src/mame/drivers/gp_2.c
+++ b/src/mame/drivers/gp_2.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( gp_2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gp_2_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index dbb978fd21e..f9e2185db45 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -297,7 +297,7 @@ static WRITE8_HANDLER( palette_write )
}
/* PROGRAM MAP */
-static ADDRESS_MAP_START( mainmem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mainmem, AS_PROGRAM, 8 )
AM_RANGE(0x0000,0xbfff) AM_ROM
AM_RANGE(0xc000,0xc7ff) AM_RAM AM_BASE_MEMBER(gpworld_state, sprite_RAM)
AM_RANGE(0xc800,0xcfff) AM_WRITE(palette_write) AM_BASE_MEMBER(gpworld_state, palette_RAM) /* The memory test reads at 0xc800 */
@@ -314,7 +314,7 @@ ADDRESS_MAP_END
/* I/O MAP */
-static ADDRESS_MAP_START( mainport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mainport, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01,0x01) AM_WRITE(misc_io_write)
AM_RANGE(0x80,0x80) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index 0d94760b8ca..2415cf14920 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -168,7 +168,7 @@ static WRITE8_DEVICE_HANDLER( sound_bank_w )
-static ADDRESS_MAP_START( gradius3_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gradius3_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM
AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram)
@@ -189,7 +189,7 @@ static ADDRESS_MAP_START( gradius3_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gradius3_map2, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gradius3_map2, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x140000, 0x140001) AM_WRITE(cpuB_irqenable_w)
@@ -202,7 +202,7 @@ static ADDRESS_MAP_START( gradius3_map2, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gradius3_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gradius3_s_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("k007232", sound_bank_w) /* 007232 bankswitch */
AM_RANGE(0xf010, 0xf010) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index a6e75ff6acd..f42522d3f47 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -517,7 +517,7 @@ GFXDECODE_END
*************************************/
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0400) AM_RAM
AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM AM_BASE_MEMBER(grchamp_state, radarram)
@@ -526,7 +526,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x78) AM_READ_PORT("ACCEL")
AM_RANGE(0x02, 0x02) AM_MIRROR(0x78) AM_READ(sub_to_main_comm_r)
@@ -545,7 +545,7 @@ ADDRESS_MAP_END
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(grchamp_left_w) AM_BASE_MEMBER(grchamp_state, leftram)
AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(grchamp_right_w) AM_BASE_MEMBER(grchamp_state, rightram)
@@ -555,7 +555,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sub_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_READ(main_to_sub_comm_r)
AM_RANGE(0x00, 0x0f) AM_MIRROR(0x70) AM_WRITE(cpu1_outputs_w)
@@ -563,7 +563,7 @@ ADDRESS_MAP_END
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x4800, 0x4801) AM_MIRROR(0x07f8) AM_DEVWRITE("ay1", ay8910_address_data_w)
diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c
index c5b9ab53624..ac561c3171d 100644
--- a/src/mame/drivers/gridlee.c
+++ b/src/mame/drivers/gridlee.c
@@ -306,7 +306,7 @@ static WRITE8_HANDLER( gridlee_coin_counter_w )
*************************************/
/* CPU 1 read addresses */
-static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE_MEMBER(gridlee_state, spriteram)
AM_RANGE(0x0800, 0x7fff) AM_RAM_WRITE(gridlee_videoram_w) AM_BASE_MEMBER(gridlee_state, videoram)
AM_RANGE(0x9000, 0x9000) AM_WRITE(led_0_w)
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index 0d05f141584..5ef0d9e0134 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -215,7 +215,7 @@ static WRITE32_HANDLER( motor_control_w )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( groundfx_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( groundfx_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x21ffff) AM_RAM AM_BASE_MEMBER(groundfx_state, ram) /* main CPUA ram */
AM_RANGE(0x300000, 0x303fff) AM_RAM AM_BASE_SIZE_MEMBER(groundfx_state, spriteram, spriteram_size) /* sprite ram */
@@ -464,7 +464,7 @@ static DRIVER_INIT( groundfx )
int data;
/* Speedup handlers */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x20b574, 0x20b577, 0, 0, irq_speedup_r_groundfx);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x20b574, 0x20b577, 0, 0, irq_speedup_r_groundfx);
/* 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 6f259962a81..31db8a9bc41 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -258,7 +258,7 @@ static WRITE32_HANDLER( gstream_tilemap3_scrolly_w )
state->tmap3_scrolly = data;
}
-static ADDRESS_MAP_START( gstream_32bit_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gstream_32bit_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003FFFFF) AM_RAM AM_BASE_MEMBER(gstream_state, workram) // work ram
// AM_RANGE(0x40000000, 0x40FFFFFF) AM_RAM // ?? lots of data gets copied here if present, but game runs without it??
AM_RANGE(0x80000000, 0x80003FFF) AM_RAM_WRITE(gstream_vram_w) AM_BASE_MEMBER(gstream_state, vram) // video ram
@@ -344,7 +344,7 @@ static WRITE32_HANDLER( gstream_oki_4040_w )
// data == 0 or data == 0x81
}
-static ADDRESS_MAP_START( gstream_io, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( gstream_io, AS_IO, 32 )
AM_RANGE(0x4000, 0x4003) AM_READ_PORT("IN0")
AM_RANGE(0x4010, 0x4013) AM_READ_PORT("IN1")
AM_RANGE(0x4020, 0x4023) AM_READ_PORT("IN2") // extra coin switches etc
@@ -634,7 +634,7 @@ static READ32_HANDLER( gstream_speedup_r )
static DRIVER_INIT( gstream )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd1ee0, 0xd1ee3, 0, 0, gstream_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd1ee0, 0xd1ee3, 0, 0, gstream_speedup_r );
}
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index 333f5311822..df6a009df1b 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -280,7 +280,7 @@ static const ym2610_interface ym2610_config =
-static ADDRESS_MAP_START( gstriker_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gstriker_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(MB60553_0_vram_w) AM_BASE_MEMBER(gstriker_state, MB60553[0].vram)
AM_RANGE(0x140000, 0x141fff) AM_RAM AM_BASE_MEMBER(gstriker_state, CG10103[0].vram)
@@ -302,13 +302,13 @@ static ADDRESS_MAP_START( gstriker_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffc000, 0xffffff) AM_RAM AM_BASE_MEMBER(gstriker_state, work_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w)
AM_RANGE(0x04, 0x04) AM_WRITE(gs_sh_bankswitch_w)
@@ -317,7 +317,7 @@ static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vgoal_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( vgoal_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(MB60553_0_vram_w) AM_BASE_MEMBER(gstriker_state, MB60553[0].vram)
AM_RANGE(0x140000, 0x141fff) AM_RAM AM_BASE_MEMBER(gstriker_state, CG10103[0].vram)
@@ -1022,11 +1022,11 @@ static void mcu_init( running_machine *machine )
state->pending_command = 0;
state->mcu_data = 0;
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x20008a, 0x20008b, 0, 0, twrldc94_mcu_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x20008a, 0x20008b, 0, 0, twrldc94_mcu_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x20008a, 0x20008b, 0, 0, twrldc94_mcu_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x20008a, 0x20008b, 0, 0, twrldc94_mcu_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x20008e, 0x20008f, 0, 0, twrldc94_prot_reg_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x20008e, 0x20008f, 0, 0, twrldc94_prot_reg_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x20008e, 0x20008f, 0, 0, twrldc94_prot_reg_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x20008e, 0x20008f, 0, 0, twrldc94_prot_reg_r);
}
static DRIVER_INIT( twrldc94 )
@@ -1049,8 +1049,8 @@ static DRIVER_INIT( vgoalsoc )
state->gametype = 3;
mcu_init( machine );
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200090, 0x200091, 0, 0, vbl_toggle_w); // vblank toggle
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200090, 0x200091, 0, 0, vbl_toggle_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200090, 0x200091, 0, 0, vbl_toggle_w); // vblank toggle
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200090, 0x200091, 0, 0, vbl_toggle_r);
}
/*** GAME DRIVERS ************************************************************/
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index 61a5c1b311b..c5b1369846e 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -332,7 +332,7 @@ static WRITE8_HANDLER( adpcm_soundcommand_w )
cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM , 8 )
+static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM , 8 )
AM_RANGE(0x0000, 0x8fff) AM_ROM
AM_RANGE(0x9000, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xa37f) AM_RAM
@@ -346,24 +346,24 @@ static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM , 8 )
AM_RANGE(0xb000, 0xb7ff) AM_RAM_WRITE(gsword_videoram_w) AM_BASE_MEMBER(gsword_state, videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu1_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu1_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x7e, 0x7f) AM_WRITE(TAITO8741_0_w) AM_READ(TAITO8741_0_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( josvolly_cpu1_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( josvolly_cpu1_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x7e, 0x7f) AM_WRITE(josvolly_8741_0_w) AM_READ(josvolly_8741_0_r)
ADDRESS_MAP_END
//
-static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_MEMBER(gsword_state, cpu2_ram)
AM_RANGE(0x6000, 0x6000) AM_WRITE(adpcm_soundcommand_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_READWRITE(TAITO8741_2_r,TAITO8741_2_w)
AM_RANGE(0x20, 0x21) AM_READWRITE(TAITO8741_3_r,TAITO8741_3_w)
@@ -380,14 +380,14 @@ ADDRESS_MAP_END
//
-static ADDRESS_MAP_START( cpu3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("msm", gsword_adpcm_data_w)
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( josvolly_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( josvolly_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_MEMBER(gsword_state, cpu2_ram)
@@ -400,7 +400,7 @@ static ADDRESS_MAP_START( josvolly_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xA000, 0xA001) AM_WRITE(josvolly_8741_1_w) AM_READ(josvolly_8741_1_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( josvolly_cpu2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( josvolly_cpu2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ay1", gsword_fake_0_r, gsword_AY8910_control_port_0_w)
AM_RANGE(0x01, 0x01) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w)
@@ -917,7 +917,7 @@ static DRIVER_INIT( gsword )
#endif
#if 1
/* hack for sound protection or time out function */
- memory_install_read8_handler(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4004, 0x4005, 0, 0, gsword_hack_r);
+ memory_install_read8_handler(machine->device("sub")->memory().space(AS_PROGRAM), 0x4004, 0x4005, 0, 0, gsword_hack_r);
#endif
}
@@ -932,7 +932,7 @@ static DRIVER_INIT( gsword2 )
#endif
#if 1
/* hack for sound protection or time out function */
- memory_install_read8_handler(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4004, 0x4005, 0, 0, gsword_hack_r);
+ memory_install_read8_handler(machine->device("sub")->memory().space(AS_PROGRAM), 0x4004, 0x4005, 0, 0, gsword_hack_r);
#endif
}
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index b58cf380f93..79f2d780b2b 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -400,7 +400,7 @@ static MACHINE_START( gticlub )
ppcdrc_add_fastram(machine->device("maincpu"), 0x00000000, 0x000fffff, FALSE, state->work_ram);
}
-static ADDRESS_MAP_START( gticlub_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gticlub_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x000fffff) AM_RAM AM_BASE_MEMBER(gticlub_state, work_ram) /* Work RAM */
AM_RANGE(0x74000000, 0x740000ff) AM_READWRITE(gticlub_k001604_reg_r, gticlub_k001604_reg_w)
AM_RANGE(0x74010000, 0x7401ffff) AM_RAM_WRITE(paletteram32_w) AM_BASE_GENERIC(paletteram)
@@ -423,7 +423,7 @@ ADDRESS_MAP_END
/**********************************************************************/
-static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sound_memmap, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE("k056800", k056800_sound_r, k056800_sound_w)
@@ -458,14 +458,14 @@ static WRITE32_HANDLER( dsp_dataram1_w )
state->sharc_dataram_1[offset] = data;
}
-static ADDRESS_MAP_START( sharc_map, ADDRESS_SPACE_DATA, 32 )
+static ADDRESS_MAP_START( sharc_map, AS_DATA, 32 )
AM_RANGE(0x400000, 0x41ffff) AM_READWRITE(cgboard_0_shared_sharc_r, cgboard_0_shared_sharc_w)
AM_RANGE(0x500000, 0x5fffff) AM_READWRITE(dsp_dataram0_r, dsp_dataram0_w)
AM_RANGE(0x600000, 0x6fffff) AM_READWRITE(K001005_r, K001005_w)
AM_RANGE(0x700000, 0x7000ff) AM_READWRITE(cgboard_0_comm_sharc_r, cgboard_0_comm_sharc_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hangplt_sharc0_map, ADDRESS_SPACE_DATA, 32 )
+static ADDRESS_MAP_START( hangplt_sharc0_map, AS_DATA, 32 )
AM_RANGE(0x0400000, 0x041ffff) AM_READWRITE(cgboard_0_shared_sharc_r, cgboard_0_shared_sharc_w)
AM_RANGE(0x0500000, 0x05fffff) AM_READWRITE(dsp_dataram0_r, dsp_dataram0_w)
AM_RANGE(0x1400000, 0x14fffff) AM_RAM
@@ -476,7 +476,7 @@ static ADDRESS_MAP_START( hangplt_sharc0_map, ADDRESS_SPACE_DATA, 32 )
AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK("bank5")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hangplt_sharc1_map, ADDRESS_SPACE_DATA, 32 )
+static ADDRESS_MAP_START( hangplt_sharc1_map, AS_DATA, 32 )
AM_RANGE(0x0400000, 0x041ffff) AM_READWRITE(cgboard_1_shared_sharc_r, cgboard_1_shared_sharc_w)
AM_RANGE(0x0500000, 0x05fffff) AM_READWRITE(dsp_dataram1_r, dsp_dataram1_w)
AM_RANGE(0x1400000, 0x14fffff) AM_RAM
diff --git a/src/mame/drivers/gts1.c b/src/mame/drivers/gts1.c
index 86c47dd2167..43497cd0e0e 100644
--- a/src/mame/drivers/gts1.c
+++ b/src/mame/drivers/gts1.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( gts1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gts1_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gts3.c b/src/mame/drivers/gts3.c
index 84f7991b1f5..11bf5fd5f9d 100644
--- a/src/mame/drivers/gts3.c
+++ b/src/mame/drivers/gts3.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( gts3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gts3_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gts80.c b/src/mame/drivers/gts80.c
index f3cc7494260..a61635c6023 100644
--- a/src/mame/drivers/gts80.c
+++ b/src/mame/drivers/gts80.c
@@ -16,7 +16,7 @@ public:
: driver_device(machine, config) { }
};
-static ADDRESS_MAP_START( gts80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gts80_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x1000, 0x17ff) AM_MIRROR(0xc000) AM_ROM
AM_RANGE(0x2000, 0x2fff) AM_MIRROR(0xc000) AM_ROM
diff --git a/src/mame/drivers/gts80a.c b/src/mame/drivers/gts80a.c
index 8a631560319..977fb0de0a3 100644
--- a/src/mame/drivers/gts80a.c
+++ b/src/mame/drivers/gts80a.c
@@ -17,14 +17,14 @@ public:
: driver_device(machine, config) { }
};
-static ADDRESS_MAP_START( gts80a_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gts80a_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x1000, 0x17ff) AM_MIRROR(0xc000) AM_ROM /* PROM */
AM_RANGE(0x2000, 0x2fff) AM_MIRROR(0xc000) AM_ROM /* u2 ROM */
AM_RANGE(0x3000, 0x3fff) AM_MIRROR(0xc000) AM_ROM /* u3 ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( caveman_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( caveman_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x1000, 0x17ff) AM_MIRROR(0xc000) AM_ROM /* PROM */
AM_RANGE(0x2000, 0x2fff) AM_MIRROR(0xc000) AM_ROM /* u2 ROM */
@@ -73,13 +73,13 @@ static MACHINE_CONFIG_START( gts80a_ss, gts80a_state )
MCFG_DEFAULT_LAYOUT(layout_pinball)
MACHINE_CONFIG_END
-static ADDRESS_MAP_START( video_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( video_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x08000, 0x0ffff) AM_ROM
AM_RANGE(0xf8000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( video_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( video_io_map, AS_IO, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/gts80b.c b/src/mame/drivers/gts80b.c
index be414762093..4a3fca167a0 100644
--- a/src/mame/drivers/gts80b.c
+++ b/src/mame/drivers/gts80b.c
@@ -16,7 +16,7 @@ public:
: driver_device(machine, config) { }
};
-static ADDRESS_MAP_START( gts80b_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gts80b_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x1000, 0x17ff) AM_MIRROR(0xc000) AM_ROM /* PROM */
AM_RANGE(0x2000, 0x2fff) AM_MIRROR(0xc000) AM_ROM /* u2 ROM */
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 1a449a5c38c..f4af7c309bd 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -594,7 +594,7 @@ static INPUT_CHANGED( coin_inserted )
if (newval == 0)
{
UINT32 credit;
- address_space *space = field->port->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = field->port->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;
@@ -679,7 +679,7 @@ static WRITE16_HANDLER( io_w )
*
*************************************/
-static ADDRESS_MAP_START( guab_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( guab_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x04ffff) AM_ROM AM_REGION("maincpu", 0x10000)
AM_RANGE(0x0c0000, 0x0c007f) AM_READWRITE(io_r, io_w)
diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c
index 8372349b98b..8507f1ed665 100644
--- a/src/mame/drivers/gumbo.c
+++ b/src/mame/drivers/gumbo.c
@@ -46,7 +46,7 @@ PCB Layout
#include "sound/okim6295.h"
#include "includes/gumbo.h"
-static ADDRESS_MAP_START( gumbo_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gumbo_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM // main ram
AM_RANGE(0x1b0000, 0x1b03ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram)
@@ -59,7 +59,7 @@ ADDRESS_MAP_END
/* Miss Puzzle has a different memory map */
-static ADDRESS_MAP_START( mspuzzle_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mspuzzle_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM // main ram
AM_RANGE(0x190000, 0x197fff) AM_RAM_WRITE(gumbo_fg_videoram_w) AM_BASE_MEMBER(gumbo_state, fg_videoram) // fg tilemap
@@ -70,7 +70,7 @@ static ADDRESS_MAP_START( mspuzzle_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1c0000, 0x1c1fff) AM_RAM_WRITE(gumbo_bg_videoram_w) AM_BASE_MEMBER(gumbo_state, bg_videoram) // bg tilemap
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dblpoint_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dblpoint_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM // main ram
AM_RANGE(0x1b0000, 0x1b03ff) AM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram)
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index 31b01ea2404..d43eec56706 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -191,7 +191,7 @@ static WRITE32_HANDLER( gunbustr_gun_w )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( gunbustr_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gunbustr_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x21ffff) AM_RAM AM_BASE_MEMBER(gunbustr_state, ram) /* main CPUA ram */
AM_RANGE(0x300000, 0x301fff) AM_RAM AM_BASE_SIZE_MEMBER(gunbustr_state, spriteram, spriteram_size) /* Sprite ram */
@@ -417,7 +417,7 @@ static READ32_HANDLER( main_cycle_r )
static DRIVER_INIT( gunbustr )
{
/* Speedup handler */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x203acc, 0x203acf, 0, 0, main_cycle_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x203acc, 0x203acf, 0, 0, main_cycle_r);
}
GAME( 1992, gunbustr, 0, gunbustr, gunbustr, gunbustr, ORIENTATION_FLIP_X, "Taito Corporation", "Gunbuster (Japan)", 0 )
diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c
index 4d7495e826b..0408836bf1b 100644
--- a/src/mame/drivers/gundealr.c
+++ b/src/mame/drivers/gundealr.c
@@ -141,7 +141,7 @@ static WRITE8_HANDLER( yamyam_protection_w )
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("DSW0")
@@ -159,7 +159,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE_MEMBER(gundealr_state, rambase)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
ADDRESS_MAP_END
@@ -579,7 +579,7 @@ static DRIVER_INIT( yamyam )
{
gundealr_state *state = machine->driver_data<gundealr_state>();
state->input_ports_hack = 1;
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe000, 0xe000, 0, 0, yamyam_protection_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe000, 0xe000, 0, 0, yamyam_protection_w);
}
diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c
index e5b00f434e5..33206bbaf7e 100644
--- a/src/mame/drivers/gunpey.c
+++ b/src/mame/drivers/gunpey.c
@@ -181,14 +181,14 @@ static WRITE8_HANDLER( gunpey_blitter_w )
/***************************************************************************************/
-static ADDRESS_MAP_START( mem_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x0ffff) AM_RAM
// AM_RANGE(0x50000, 0x500ff) AM_RAM
// AM_RANGE(0x50100, 0x502ff) AM_NOP
AM_RANGE(0x80000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( io_map, AS_IO, 16 )
AM_RANGE(0x7f40, 0x7f45) AM_READ8(gunpey_inputs_r,0xffff)
// AM_RANGE(0x7f48, 0x7f48) AM_WRITE(output_w)
diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c
index 1b8af537348..7dadeda6cb7 100644
--- a/src/mame/drivers/gunsmoke.c
+++ b/src/mame/drivers/gunsmoke.c
@@ -98,7 +98,7 @@ static READ8_HANDLER( gunsmoke_protection_r )
/* Memory Maps */
-static ADDRESS_MAP_START( gunsmoke_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gunsmoke_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM")
@@ -119,7 +119,7 @@ static ADDRESS_MAP_START( gunsmoke_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE_SIZE_MEMBER(gunsmoke_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index cc3e42319db..d69a3c8bdc1 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -144,7 +144,7 @@ static WRITE8_HANDLER( gyruss_i8039_irq_w )
}
-static ADDRESS_MAP_START( main_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_BASE_MEMBER(gyruss_state, colorram)
AM_RANGE(0x8400, 0x87ff) AM_RAM AM_BASE_MEMBER(gyruss_state, videoram)
@@ -160,7 +160,7 @@ static ADDRESS_MAP_START( main_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc185, 0xc185) AM_WRITEONLY AM_BASE_MEMBER(gyruss_state, flipscreen)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_READ(gyruss_scanline_r)
AM_RANGE(0x2000, 0x2000) AM_WRITE(interrupt_enable_w)
AM_RANGE(0x4000, 0x403f) AM_RAM
@@ -170,13 +170,13 @@ static ADDRESS_MAP_START( main_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM
AM_RANGE(0x8000, 0x8000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_cpu1_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( audio_cpu1_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("ay1", ay8910_address_w)
AM_RANGE(0x01, 0x01) AM_DEVREAD("ay1", ay8910_r)
@@ -197,11 +197,11 @@ static ADDRESS_MAP_START( audio_cpu1_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x18, 0x18) AM_WRITE(soundlatch2_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_cpu2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( audio_cpu2_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READ(soundlatch2_r)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("discrete", gyruss_dac_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(gyruss_irq_clear_w)
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index 9a97cdf192e..6c73a54232c 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -1554,7 +1554,7 @@ static INTERRUPT_GEN( halleys_interrupt )
latch_data = state->sound_fifo[state->fftail];
state->fftail = (state->fftail + 1) & (MAX_SOUNDS - 1);
state->latch_delay = (latch_data) ? 0 : 4;
- soundlatch_w( device->memory().space(ADDRESS_SPACE_PROGRAM), 0, latch_data);
+ soundlatch_w( device->memory().space(AS_PROGRAM), 0, latch_data);
cputag_set_input_line(device->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
}
@@ -1594,7 +1594,7 @@ static INTERRUPT_GEN( benberob_interrupt )
latch_data = state->sound_fifo[state->fftail];
state->fftail = (state->fftail + 1) & (MAX_SOUNDS - 1);
state->latch_delay = (latch_data) ? 0 : 4;
- soundlatch_w(device->memory().space(ADDRESS_SPACE_PROGRAM), 0, latch_data);
+ soundlatch_w(device->memory().space(AS_PROGRAM), 0, latch_data);
cputag_set_input_line(device->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
}
break;
@@ -1676,7 +1676,7 @@ static READ8_HANDLER( io_mirror_r )
//**************************************************************************
// Memory Maps
-static ADDRESS_MAP_START( halleys_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( halleys_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_READWRITE(blitter_r, blitter_w) AM_BASE_MEMBER(halleys_state, blitter_ram) AM_SIZE_MEMBER(halleys_state, blitter_ramsize)
AM_RANGE(0x1f00, 0x1fff) AM_WRITE(bgtile_w) // background tiles?(Ben Bero Beh only)
AM_RANGE(0x1000, 0xefff) AM_ROM
@@ -1702,7 +1702,7 @@ static ADDRESS_MAP_START( halleys_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x4800, 0x4801) AM_DEVWRITE("ay2", ay8910_address_data_w)
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index 6ccf8f23c0f..69466d2097b 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -70,7 +70,7 @@ static WRITE8_HANDLER( hanaawas_inputs_mux_w )
state->mux = data;
}
-static ADDRESS_MAP_START( hanaawas_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hanaawas_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_ROM
@@ -80,7 +80,7 @@ static ADDRESS_MAP_START( hanaawas_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(hanaawas_input_port_0_r, hanaawas_inputs_mux_w)
AM_RANGE(0x01, 0x01) AM_READNOP /* it must return 0 */
diff --git a/src/mame/drivers/hankin.c b/src/mame/drivers/hankin.c
index dbea2083f3f..f68806334c3 100644
--- a/src/mame/drivers/hankin.c
+++ b/src/mame/drivers/hankin.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( hankin_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hankin_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index 4c91e24b233..f45ff297481 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -400,7 +400,7 @@ static const dsp32_config dsp32c_config =
*
*************************************/
-static ADDRESS_MAP_START( driver_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( driver_68k_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x600000, 0x603fff) AM_READ(hd68k_port0_r)
@@ -419,7 +419,7 @@ static ADDRESS_MAP_START( driver_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( driver_gsp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( driver_gsp_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x0000200f) AM_NOP /* hit during self-test */
AM_RANGE(0x02000000, 0x0207ffff) AM_READWRITE(hdgsp_vram_2bpp_r, hdgsp_vram_1bpp_w)
@@ -432,7 +432,7 @@ static ADDRESS_MAP_START( driver_gsp_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( driver_msp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( driver_msp_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x000fffff) AM_RAM AM_SHARE("share1") AM_BASE_MEMBER(harddriv_state, msp_ram)
AM_RANGE(0x00700000, 0x007fffff) AM_RAM AM_SHARE("share1")
@@ -448,7 +448,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( multisync_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( multisync_68k_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x600000, 0x603fff) AM_READWRITE(atarigen_sound_upper_r, atarigen_sound_upper_w)
@@ -467,7 +467,7 @@ static ADDRESS_MAP_START( multisync_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( multisync_gsp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( multisync_gsp_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x0000200f) AM_NOP /* hit during self-test */
AM_RANGE(0x02000000, 0x020fffff) AM_READWRITE(hdgsp_vram_2bpp_r, hdgsp_vram_2bpp_w)
@@ -487,7 +487,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( multisync2_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( multisync2_68k_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x604000, 0x607fff) AM_WRITE(hd68k_nwr_w)
@@ -506,7 +506,7 @@ ADDRESS_MAP_END
/* GSP is identical to original multisync */
-static ADDRESS_MAP_START( multisync2_gsp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( multisync2_gsp_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x0000200f) AM_NOP /* hit during self-test */
AM_RANGE(0x02000000, 0x020fffff) AM_READWRITE(hdgsp_vram_2bpp_r, hdgsp_vram_2bpp_w)
@@ -526,13 +526,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( adsp_program_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( adsp_program_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_MEMBER(harddriv_state, adsp_pgm_memory)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( adsp_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( adsp_data_map, AS_DATA, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_MEMBER(harddriv_state, adsp_data_memory)
AM_RANGE(0x2000, 0x2fff) AM_READWRITE(hdadsp_special_r, hdadsp_special_w)
@@ -546,13 +546,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( ds3_program_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( ds3_program_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_RAM AM_BASE_MEMBER(harddriv_state, adsp_pgm_memory)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ds3_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( ds3_data_map, AS_DATA, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_MEMBER(harddriv_state, adsp_data_memory)
AM_RANGE(0x3800, 0x3bff) AM_RAM /* internal RAM */
@@ -561,13 +561,13 @@ static ADDRESS_MAP_START( ds3_data_map, ADDRESS_SPACE_DATA, 16 )
ADDRESS_MAP_END
#if 0
-static ADDRESS_MAP_START( ds3snd_program_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( ds3snd_program_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ds3snd_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( ds3snd_data_map, AS_DATA, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x3800, 0x3bff) AM_RAM /* internal RAM */
@@ -604,7 +604,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( dsk_dsp32_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dsk_dsp32_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x001fff) AM_RAM
AM_RANGE(0x600000, 0x63ffff) AM_RAM
@@ -619,7 +619,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( dsk2_dsp32_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dsk2_dsp32_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x001fff) AM_RAM
AM_RANGE(0x200000, 0x23ffff) AM_RAM
@@ -635,7 +635,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( driversnd_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( driversnd_68k_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0xff0000, 0xff0fff) AM_READWRITE(hdsnd68k_data_r, hdsnd68k_data_w)
@@ -649,7 +649,7 @@ static ADDRESS_MAP_START( driversnd_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( driversnd_dsp_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( driversnd_dsp_program_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000, 0xfff) AM_RAM AM_BASE_MEMBER(harddriv_state, sounddsp_ram)
ADDRESS_MAP_END
@@ -658,7 +658,7 @@ ADDRESS_MAP_END
/* $000 - 08F TMS32010 Internal Data RAM in Data Address Space */
-static ADDRESS_MAP_START( driversnd_dsp_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( driversnd_dsp_io_map, AS_IO, 16 )
AM_RANGE(0, 0) AM_READ(hdsnddsp_rom_r) AM_DEVWRITE("dac", hdsnddsp_dac_w)
AM_RANGE(1, 1) AM_READ(hdsnddsp_comram_r)
AM_RANGE(2, 2) AM_READ(hdsnddsp_compare_r)
@@ -3791,9 +3791,9 @@ static void init_multisync(running_machine *machine, int compact_inputs)
/* install handlers for the compact driving games' inputs */
if (compact_inputs)
{
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400001, 0, 0, hdc68k_wheel_r);
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x408000, 0x408001, 0, 0, hdc68k_wheel_edge_reset_w);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0xa80000, 0xafffff, 0, 0, hdc68k_port1_r);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x400000, 0x400001, 0, 0, hdc68k_wheel_r);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x408000, 0x408001, 0, 0, hdc68k_wheel_edge_reset_w);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0xa80000, 0xafffff, 0, 0, hdc68k_port1_r);
}
}
@@ -3804,18 +3804,18 @@ static void init_adsp(running_machine *machine)
harddriv_state *state = machine->driver_data<harddriv_state>();
/* install ADSP program RAM */
- memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x800000, 0x807fff, 0, 0, hd68k_adsp_program_r, hd68k_adsp_program_w);
+ memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x800000, 0x807fff, 0, 0, hd68k_adsp_program_r, hd68k_adsp_program_w);
/* install ADSP data RAM */
- memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x808000, 0x80bfff, 0, 0, hd68k_adsp_data_r, hd68k_adsp_data_w);
+ memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x808000, 0x80bfff, 0, 0, hd68k_adsp_data_r, hd68k_adsp_data_w);
/* install ADSP serial buffer RAM */
- memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x810000, 0x813fff, 0, 0, hd68k_adsp_buffer_r, hd68k_adsp_buffer_w);
+ memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x810000, 0x813fff, 0, 0, hd68k_adsp_buffer_r, hd68k_adsp_buffer_w);
/* install ADSP control locations */
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x818000, 0x81801f, 0, 0, hd68k_adsp_control_w);
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x818060, 0x81807f, 0, 0, hd68k_adsp_irq_clear_w);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x838000, 0x83ffff, 0, 0, hd68k_adsp_irq_state_r);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x818000, 0x81801f, 0, 0, hd68k_adsp_control_w);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x818060, 0x81807f, 0, 0, hd68k_adsp_irq_clear_w);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x838000, 0x83ffff, 0, 0, hd68k_adsp_irq_state_r);
}
@@ -3825,21 +3825,21 @@ static void init_ds3(running_machine *machine)
harddriv_state *state = machine->driver_data<harddriv_state>();
/* install ADSP program RAM */
- memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x800000, 0x807fff, 0, 0, hd68k_ds3_program_r, hd68k_ds3_program_w);
+ memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x800000, 0x807fff, 0, 0, hd68k_ds3_program_r, hd68k_ds3_program_w);
/* install ADSP data RAM */
- memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x808000, 0x80bfff, 0, 0, hd68k_adsp_data_r, hd68k_adsp_data_w);
- memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x80c000, 0x80dfff, 0, 0, hdds3_special_r, hdds3_special_w);
+ memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x808000, 0x80bfff, 0, 0, hd68k_adsp_data_r, hd68k_adsp_data_w);
+ memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x80c000, 0x80dfff, 0, 0, hdds3_special_r, hdds3_special_w);
/* install ADSP control locations */
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x820000, 0x8207ff, 0, 0, hd68k_ds3_gdata_r);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x820800, 0x820fff, 0, 0, hd68k_ds3_girq_state_r);
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x820000, 0x8207ff, 0, 0, hd68k_ds3_gdata_w);
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x821000, 0x8217ff, 0, 0, hd68k_adsp_irq_clear_w);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x822000, 0x8227ff, 0, 0, hd68k_ds3_sdata_r);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x822800, 0x822fff, 0, 0, hd68k_ds3_sirq_state_r);
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x822000, 0x8227ff, 0, 0, hd68k_ds3_sdata_w);
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x823800, 0x823fff, 0, 0, hd68k_ds3_control_w);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x820000, 0x8207ff, 0, 0, hd68k_ds3_gdata_r);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x820800, 0x820fff, 0, 0, hd68k_ds3_girq_state_r);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x820000, 0x8207ff, 0, 0, hd68k_ds3_gdata_w);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x821000, 0x8217ff, 0, 0, hd68k_adsp_irq_clear_w);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x822000, 0x8227ff, 0, 0, hd68k_ds3_sdata_r);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x822800, 0x822fff, 0, 0, hd68k_ds3_sirq_state_r);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x822000, 0x8227ff, 0, 0, hd68k_ds3_sdata_w);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x823800, 0x823fff, 0, 0, hd68k_ds3_control_w);
/* if we have a sound DSP, boot it */
if (state->ds4cpu1 != NULL)
@@ -3924,26 +3924,26 @@ static void init_dsk(running_machine *machine)
UINT8 *usr3 = machine->region("user3")->base();
/* install ASIC61 */
- memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x85c000, 0x85c7ff, 0, 0, hd68k_dsk_dsp32_r, hd68k_dsk_dsp32_w);
+ memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x85c000, 0x85c7ff, 0, 0, hd68k_dsk_dsp32_r, hd68k_dsk_dsp32_w);
/* install control registers */
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x85c800, 0x85c81f, 0, 0, hd68k_dsk_control_w);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x85c800, 0x85c81f, 0, 0, hd68k_dsk_control_w);
/* install extra RAM */
- memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x900000, 0x90ffff, 0, 0, hd68k_dsk_ram_r, hd68k_dsk_ram_w);
+ memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x900000, 0x90ffff, 0, 0, hd68k_dsk_ram_r, hd68k_dsk_ram_w);
state->dsk_ram = (UINT16 *)(usr3 + 0x40000);
/* install extra ZRAM */
- memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x910000, 0x910fff, 0, 0, hd68k_dsk_zram_r, hd68k_dsk_zram_w);
+ memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x910000, 0x910fff, 0, 0, hd68k_dsk_zram_r, hd68k_dsk_zram_w);
state->dsk_zram = (UINT16 *)(usr3 + 0x50000);
/* install ASIC65 */
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x914000, 0x917fff, 0, 0, asic65_data_w);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x914000, 0x917fff, 0, 0, asic65_r);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x918000, 0x91bfff, 0, 0, asic65_io_r);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x914000, 0x917fff, 0, 0, asic65_data_w);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x914000, 0x917fff, 0, 0, asic65_r);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x918000, 0x91bfff, 0, 0, asic65_io_r);
/* install extra ROM */
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x940000, 0x9fffff, 0, 0, hd68k_dsk_small_rom_r);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x940000, 0x9fffff, 0, 0, hd68k_dsk_small_rom_r);
state->dsk_rom = (UINT16 *)(usr3 + 0x00000);
/* set up the ASIC65 */
@@ -3958,22 +3958,22 @@ static void init_dsk2(running_machine *machine)
UINT8 *usr3 = machine->region("user3")->base();
/* install ASIC65 */
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x824000, 0x824003, 0, 0, asic65_data_w);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x824000, 0x824003, 0, 0, asic65_r);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x825000, 0x825001, 0, 0, asic65_io_r);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x824000, 0x824003, 0, 0, asic65_data_w);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x824000, 0x824003, 0, 0, asic65_r);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x825000, 0x825001, 0, 0, asic65_io_r);
/* install ASIC61 */
- memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x827000, 0x8277ff, 0, 0, hd68k_dsk_dsp32_r, hd68k_dsk_dsp32_w);
+ memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x827000, 0x8277ff, 0, 0, hd68k_dsk_dsp32_r, hd68k_dsk_dsp32_w);
/* install control registers */
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x827800, 0x82781f, 0, 0, hd68k_dsk_control_w);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x827800, 0x82781f, 0, 0, hd68k_dsk_control_w);
/* install extra RAM */
- memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x880000, 0x8bffff, 0, 0, hd68k_dsk_ram_r, hd68k_dsk_ram_w);
+ memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x880000, 0x8bffff, 0, 0, hd68k_dsk_ram_r, hd68k_dsk_ram_w);
state->dsk_ram = (UINT16 *)(usr3 + 0x100000);
/* install extra ROM */
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x900000, 0x9fffff, 0, 0, hd68k_dsk_rom_r);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x900000, 0x9fffff, 0, 0, hd68k_dsk_rom_r);
state->dsk_rom = (UINT16 *)(usr3 + 0x000000);
/* set up the ASIC65 */
@@ -3987,15 +3987,15 @@ static void init_dspcom(running_machine *machine)
harddriv_state *state = machine->driver_data<harddriv_state>();
/* install ASIC65 */
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x900000, 0x900003, 0, 0, asic65_data_w);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x900000, 0x900003, 0, 0, asic65_r);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x901000, 0x910001, 0, 0, asic65_io_r);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x900000, 0x900003, 0, 0, asic65_data_w);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x900000, 0x900003, 0, 0, asic65_r);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x901000, 0x910001, 0, 0, asic65_io_r);
/* set up the ASIC65 */
asic65_config(machine, ASIC65_STEELTAL);
/* install DSPCOM control */
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x904000, 0x90401f, 0, 0, hddspcom_control_w);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x904000, 0x90401f, 0, 0, hddspcom_control_w);
}
@@ -4007,9 +4007,9 @@ static void init_driver_sound(running_machine *machine)
hdsnd_init(machine);
/* install sound handlers */
- memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x840000, 0x840001, 0, 0, hd68k_snd_data_r, hd68k_snd_data_w);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x844000, 0x844001, 0, 0, hd68k_snd_status_r);
- memory_install_write16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x84c000, 0x84c001, 0, 0, hd68k_snd_reset_w);
+ memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x840000, 0x840001, 0, 0, hd68k_snd_data_r, hd68k_snd_data_w);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x844000, 0x844001, 0, 0, hd68k_snd_status_r);
+ memory_install_write16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x84c000, 0x84c001, 0, 0, hd68k_snd_reset_w);
}
@@ -4031,18 +4031,18 @@ static DRIVER_INIT( harddriv )
init_driver_sound(machine);
/* set up gsp speedup handler */
- state->gsp_speedup_addr[0] = memory_install_write16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff9fc00, 0xfff9fc0f, 0, 0, hdgsp_speedup1_w);
- state->gsp_speedup_addr[1] = memory_install_write16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfffcfc00, 0xfffcfc0f, 0, 0, hdgsp_speedup2_w);
- memory_install_read16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff9fc00, 0xfff9fc0f, 0, 0, hdgsp_speedup_r);
+ state->gsp_speedup_addr[0] = memory_install_write16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfff9fc00, 0xfff9fc0f, 0, 0, hdgsp_speedup1_w);
+ state->gsp_speedup_addr[1] = memory_install_write16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfffcfc00, 0xfffcfc0f, 0, 0, hdgsp_speedup2_w);
+ memory_install_read16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfff9fc00, 0xfff9fc0f, 0, 0, hdgsp_speedup_r);
state->gsp_speedup_pc = 0xffc00f10;
/* set up msp speedup handler */
- state->msp_speedup_addr = memory_install_write16_handler(state->msp->memory().space(ADDRESS_SPACE_PROGRAM), 0x00751b00, 0x00751b0f, 0, 0, hdmsp_speedup_w);
- memory_install_read16_handler(state->msp->memory().space(ADDRESS_SPACE_PROGRAM), 0x00751b00, 0x00751b0f, 0, 0, hdmsp_speedup_r);
+ state->msp_speedup_addr = memory_install_write16_handler(state->msp->memory().space(AS_PROGRAM), 0x00751b00, 0x00751b0f, 0, 0, hdmsp_speedup_w);
+ memory_install_read16_handler(state->msp->memory().space(AS_PROGRAM), 0x00751b00, 0x00751b0f, 0, 0, hdmsp_speedup_r);
state->msp_speedup_pc = 0x00723b00;
/* set up adsp speedup handlers */
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
}
@@ -4056,18 +4056,18 @@ static DRIVER_INIT( harddrivc )
init_driver_sound(machine);
/* set up gsp speedup handler */
- state->gsp_speedup_addr[0] = memory_install_write16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff9fc00, 0xfff9fc0f, 0, 0, hdgsp_speedup1_w);
- state->gsp_speedup_addr[1] = memory_install_write16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfffcfc00, 0xfffcfc0f, 0, 0, hdgsp_speedup2_w);
- memory_install_read16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff9fc00, 0xfff9fc0f, 0, 0, hdgsp_speedup_r);
+ state->gsp_speedup_addr[0] = memory_install_write16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfff9fc00, 0xfff9fc0f, 0, 0, hdgsp_speedup1_w);
+ state->gsp_speedup_addr[1] = memory_install_write16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfffcfc00, 0xfffcfc0f, 0, 0, hdgsp_speedup2_w);
+ memory_install_read16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfff9fc00, 0xfff9fc0f, 0, 0, hdgsp_speedup_r);
state->gsp_speedup_pc = 0xfff40ff0;
/* set up msp speedup handler */
- state->msp_speedup_addr = memory_install_write16_handler(state->msp->memory().space(ADDRESS_SPACE_PROGRAM), 0x00751b00, 0x00751b0f, 0, 0, hdmsp_speedup_w);
- memory_install_read16_handler(state->msp->memory().space(ADDRESS_SPACE_PROGRAM), 0x00751b00, 0x00751b0f, 0, 0, hdmsp_speedup_r);
+ state->msp_speedup_addr = memory_install_write16_handler(state->msp->memory().space(AS_PROGRAM), 0x00751b00, 0x00751b0f, 0, 0, hdmsp_speedup_w);
+ memory_install_read16_handler(state->msp->memory().space(AS_PROGRAM), 0x00751b00, 0x00751b0f, 0, 0, hdmsp_speedup_r);
state->msp_speedup_pc = 0x00723b00;
/* set up adsp speedup handlers */
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
}
@@ -4081,13 +4081,13 @@ static DRIVER_INIT( stunrun )
atarijsa_init(machine, "IN0", 0x0020);
/* set up gsp speedup handler */
- state->gsp_speedup_addr[0] = memory_install_write16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff9fc00, 0xfff9fc0f, 0, 0, hdgsp_speedup1_w);
- state->gsp_speedup_addr[1] = memory_install_write16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfffcfc00, 0xfffcfc0f, 0, 0, hdgsp_speedup2_w);
- memory_install_read16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff9fc00, 0xfff9fc0f, 0, 0, hdgsp_speedup_r);
+ state->gsp_speedup_addr[0] = memory_install_write16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfff9fc00, 0xfff9fc0f, 0, 0, hdgsp_speedup1_w);
+ state->gsp_speedup_addr[1] = memory_install_write16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfffcfc00, 0xfffcfc0f, 0, 0, hdgsp_speedup2_w);
+ memory_install_read16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfff9fc00, 0xfff9fc0f, 0, 0, hdgsp_speedup_r);
state->gsp_speedup_pc = 0xfff41070;
/* set up adsp speedup handlers */
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
}
@@ -4103,14 +4103,14 @@ static DRIVER_INIT( racedriv )
/* set up the slapstic */
slapstic_init(machine, 117);
- state->m68k_slapstic_base = memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0xe0000, 0xfffff, 0, 0, rd68k_slapstic_r, rd68k_slapstic_w);
+ state->m68k_slapstic_base = memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0xe0000, 0xfffff, 0, 0, rd68k_slapstic_r, rd68k_slapstic_w);
/* synchronization */
- state->rddsp32_sync[0] = memory_install_write32_handler(state->dsp32->memory().space(ADDRESS_SPACE_PROGRAM), 0x613c00, 0x613c03, 0, 0, rddsp32_sync0_w);
- state->rddsp32_sync[1] = memory_install_write32_handler(state->dsp32->memory().space(ADDRESS_SPACE_PROGRAM), 0x613e00, 0x613e03, 0, 0, rddsp32_sync1_w);
+ state->rddsp32_sync[0] = memory_install_write32_handler(state->dsp32->memory().space(AS_PROGRAM), 0x613c00, 0x613c03, 0, 0, rddsp32_sync0_w);
+ state->rddsp32_sync[1] = memory_install_write32_handler(state->dsp32->memory().space(AS_PROGRAM), 0x613e00, 0x613e03, 0, 0, rddsp32_sync1_w);
/* set up adsp speedup handlers */
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
}
@@ -4126,22 +4126,22 @@ static void racedrivc_init_common(running_machine *machine, offs_t gsp_protectio
/* set up the slapstic */
slapstic_init(machine, 117);
- state->m68k_slapstic_base = memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0xe0000, 0xfffff, 0, 0, rd68k_slapstic_r, rd68k_slapstic_w);
+ state->m68k_slapstic_base = memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0xe0000, 0xfffff, 0, 0, rd68k_slapstic_r, rd68k_slapstic_w);
/* synchronization */
- state->rddsp32_sync[0] = memory_install_write32_handler(state->dsp32->memory().space(ADDRESS_SPACE_PROGRAM), 0x613c00, 0x613c03, 0, 0, rddsp32_sync0_w);
- state->rddsp32_sync[1] = memory_install_write32_handler(state->dsp32->memory().space(ADDRESS_SPACE_PROGRAM), 0x613e00, 0x613e03, 0, 0, rddsp32_sync1_w);
+ state->rddsp32_sync[0] = memory_install_write32_handler(state->dsp32->memory().space(AS_PROGRAM), 0x613c00, 0x613c03, 0, 0, rddsp32_sync0_w);
+ state->rddsp32_sync[1] = memory_install_write32_handler(state->dsp32->memory().space(AS_PROGRAM), 0x613e00, 0x613e03, 0, 0, rddsp32_sync1_w);
/* set up protection hacks */
- state->gsp_protection = memory_install_write16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), gsp_protection, gsp_protection + 0x0f, 0, 0, hdgsp_protection_w);
+ state->gsp_protection = memory_install_write16_handler(state->gsp->memory().space(AS_PROGRAM), gsp_protection, gsp_protection + 0x0f, 0, 0, hdgsp_protection_w);
/* set up gsp speedup handler */
- state->gsp_speedup_addr[0] = memory_install_write16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff76f60, 0xfff76f6f, 0, 0, rdgsp_speedup1_w);
- memory_install_read16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff76f60, 0xfff76f6f, 0, 0, rdgsp_speedup1_r);
+ state->gsp_speedup_addr[0] = memory_install_write16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfff76f60, 0xfff76f6f, 0, 0, rdgsp_speedup1_w);
+ memory_install_read16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfff76f60, 0xfff76f6f, 0, 0, rdgsp_speedup1_r);
state->gsp_speedup_pc = 0xfff43a00;
/* set up adsp speedup handlers */
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
}
static DRIVER_INIT( racedrivc ) { racedrivc_init_common(machine, 0xfff95cd0); }
@@ -4166,34 +4166,34 @@ static void steeltal_init_common(running_machine *machine, offs_t ds3_transfer_p
init_dspcom(machine);
atarijsa_init(machine, "IN0", 0x0020);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x908000, 0x908001, 0, 0, steeltal_dummy_r);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x908000, 0x908001, 0, 0, steeltal_dummy_r);
/* set up the SLOOP */
if (!proto_sloop)
{
- state->m68k_slapstic_base = memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0xe0000, 0xfffff, 0, 0, st68k_sloop_r, st68k_sloop_w);
- state->m68k_sloop_alt_base = memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x4e000, 0x4ffff, 0, 0, st68k_sloop_alt_r);
+ state->m68k_slapstic_base = memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0xe0000, 0xfffff, 0, 0, st68k_sloop_r, st68k_sloop_w);
+ state->m68k_sloop_alt_base = memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0x4e000, 0x4ffff, 0, 0, st68k_sloop_alt_r);
}
else
- state->m68k_slapstic_base = memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0xe0000, 0xfffff, 0, 0, st68k_protosloop_r, st68k_protosloop_w);
+ state->m68k_slapstic_base = memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0xe0000, 0xfffff, 0, 0, st68k_protosloop_r, st68k_protosloop_w);
/* synchronization */
state->stmsp_sync[0] = &state->msp_ram[TOWORD(0x80010)];
- memory_install_write16_handler(state->msp->memory().space(ADDRESS_SPACE_PROGRAM), 0x80010, 0x8007f, 0, 0, stmsp_sync0_w);
+ memory_install_write16_handler(state->msp->memory().space(AS_PROGRAM), 0x80010, 0x8007f, 0, 0, stmsp_sync0_w);
state->stmsp_sync[1] = &state->msp_ram[TOWORD(0x99680)];
- memory_install_write16_handler(state->msp->memory().space(ADDRESS_SPACE_PROGRAM), 0x99680, 0x9968f, 0, 0, stmsp_sync1_w);
+ memory_install_write16_handler(state->msp->memory().space(AS_PROGRAM), 0x99680, 0x9968f, 0, 0, stmsp_sync1_w);
state->stmsp_sync[2] = &state->msp_ram[TOWORD(0x99d30)];
- memory_install_write16_handler(state->msp->memory().space(ADDRESS_SPACE_PROGRAM), 0x99d30, 0x99d4f, 0, 0, stmsp_sync2_w);
+ memory_install_write16_handler(state->msp->memory().space(AS_PROGRAM), 0x99d30, 0x99d4f, 0, 0, stmsp_sync2_w);
/* set up protection hacks */
- state->gsp_protection = memory_install_write16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff965d0, 0xfff965df, 0, 0, hdgsp_protection_w);
+ state->gsp_protection = memory_install_write16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfff965d0, 0xfff965df, 0, 0, hdgsp_protection_w);
/* set up msp speedup handlers */
- memory_install_read16_handler(state->msp->memory().space(ADDRESS_SPACE_PROGRAM), 0x80020, 0x8002f, 0, 0, stmsp_speedup_r);
+ memory_install_read16_handler(state->msp->memory().space(AS_PROGRAM), 0x80020, 0x8002f, 0, 0, stmsp_speedup_r);
/* set up adsp speedup handlers */
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1f99, 0x1f99, 0, 0, hdds3_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1f99, 0x1f99, 0, 0, hdds3_speedup_r);
state->ds3_speedup_addr = &state->adsp_data_memory[0x1f99];
state->ds3_speedup_pc = 0xff;
state->ds3_transfer_pc = ds3_transfer_pc;
@@ -4216,20 +4216,20 @@ static DRIVER_INIT( strtdriv )
/* set up the slapstic */
slapstic_init(machine, 117);
- state->m68k_slapstic_base = memory_install_readwrite16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0xe0000, 0xfffff, 0, 0, rd68k_slapstic_r, rd68k_slapstic_w);
+ state->m68k_slapstic_base = memory_install_readwrite16_handler(state->maincpu->memory().space(AS_PROGRAM), 0xe0000, 0xfffff, 0, 0, rd68k_slapstic_r, rd68k_slapstic_w);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0xa80000, 0xafffff, 0, 0, hda68k_port1_r);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0xa80000, 0xafffff, 0, 0, hda68k_port1_r);
/* synchronization */
- state->rddsp32_sync[0] = memory_install_write32_handler(state->dsp32->memory().space(ADDRESS_SPACE_PROGRAM), 0x613c00, 0x613c03, 0, 0, rddsp32_sync0_w);
- state->rddsp32_sync[1] = memory_install_write32_handler(state->dsp32->memory().space(ADDRESS_SPACE_PROGRAM), 0x613e00, 0x613e03, 0, 0, rddsp32_sync1_w);
+ state->rddsp32_sync[0] = memory_install_write32_handler(state->dsp32->memory().space(AS_PROGRAM), 0x613c00, 0x613c03, 0, 0, rddsp32_sync0_w);
+ state->rddsp32_sync[1] = memory_install_write32_handler(state->dsp32->memory().space(AS_PROGRAM), 0x613e00, 0x613e03, 0, 0, rddsp32_sync1_w);
/* set up protection hacks */
- state->gsp_protection = memory_install_write16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff960a0, 0xfff960af, 0, 0, hdgsp_protection_w);
+ state->gsp_protection = memory_install_write16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfff960a0, 0xfff960af, 0, 0, hdgsp_protection_w);
/* set up adsp speedup handlers */
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1f99, 0x1f99, 0, 0, hdds3_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1f99, 0x1f99, 0, 0, hdds3_speedup_r);
state->ds3_speedup_addr = &state->adsp_data_memory[0x1f99];
state->ds3_speedup_pc = 0xff;
state->ds3_transfer_pc = 0x43672;
@@ -4245,18 +4245,18 @@ static DRIVER_INIT( hdrivair )
init_ds3(machine);
init_dsk2(machine);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0xa80000, 0xafffff, 0, 0, hda68k_port1_r);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0xa80000, 0xafffff, 0, 0, hda68k_port1_r);
/* synchronization */
- state->rddsp32_sync[0] = memory_install_write32_handler(state->dsp32->memory().space(ADDRESS_SPACE_PROGRAM), 0x21fe00, 0x21fe03, 0, 0, rddsp32_sync0_w);
- state->rddsp32_sync[1] = memory_install_write32_handler(state->dsp32->memory().space(ADDRESS_SPACE_PROGRAM), 0x21ff00, 0x21ff03, 0, 0, rddsp32_sync1_w);
+ state->rddsp32_sync[0] = memory_install_write32_handler(state->dsp32->memory().space(AS_PROGRAM), 0x21fe00, 0x21fe03, 0, 0, rddsp32_sync0_w);
+ state->rddsp32_sync[1] = memory_install_write32_handler(state->dsp32->memory().space(AS_PROGRAM), 0x21ff00, 0x21ff03, 0, 0, rddsp32_sync1_w);
/* set up protection hacks */
- state->gsp_protection = memory_install_write16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff943f0, 0xfff943ff, 0, 0, hdgsp_protection_w);
+ state->gsp_protection = memory_install_write16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfff943f0, 0xfff943ff, 0, 0, hdgsp_protection_w);
/* set up adsp speedup handlers */
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1f99, 0x1f99, 0, 0, hdds3_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1f99, 0x1f99, 0, 0, hdds3_speedup_r);
state->ds3_speedup_addr = &state->adsp_data_memory[0x1f99];
state->ds3_speedup_pc = 0x2da;
state->ds3_transfer_pc = 0x407b8;
@@ -4272,18 +4272,18 @@ static DRIVER_INIT( hdrivairp )
init_ds3(machine);
init_dsk2(machine);
- memory_install_read16_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0xa80000, 0xafffff, 0, 0, hda68k_port1_r);
+ memory_install_read16_handler(state->maincpu->memory().space(AS_PROGRAM), 0xa80000, 0xafffff, 0, 0, hda68k_port1_r);
/* synchronization */
- state->rddsp32_sync[0] = memory_install_write32_handler(state->dsp32->memory().space(ADDRESS_SPACE_PROGRAM), 0x21fe00, 0x21fe03, 0, 0, rddsp32_sync0_w);
- state->rddsp32_sync[1] = memory_install_write32_handler(state->dsp32->memory().space(ADDRESS_SPACE_PROGRAM), 0x21ff00, 0x21ff03, 0, 0, rddsp32_sync1_w);
+ state->rddsp32_sync[0] = memory_install_write32_handler(state->dsp32->memory().space(AS_PROGRAM), 0x21fe00, 0x21fe03, 0, 0, rddsp32_sync0_w);
+ state->rddsp32_sync[1] = memory_install_write32_handler(state->dsp32->memory().space(AS_PROGRAM), 0x21ff00, 0x21ff03, 0, 0, rddsp32_sync1_w);
/* set up protection hacks */
- state->gsp_protection = memory_install_write16_handler(state->gsp->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff916c0, 0xfff916cf, 0, 0, hdgsp_protection_w);
+ state->gsp_protection = memory_install_write16_handler(state->gsp->memory().space(AS_PROGRAM), 0xfff916c0, 0xfff916cf, 0, 0, hdgsp_protection_w);
/* set up adsp speedup handlers */
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
- memory_install_read16_handler(state->adsp->memory().space(ADDRESS_SPACE_DATA), 0x1f9a, 0x1f9a, 0, 0, hdds3_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1fff, 0x1fff, 0, 0, hdadsp_speedup_r);
+ memory_install_read16_handler(state->adsp->memory().space(AS_DATA), 0x1f9a, 0x1f9a, 0, 0, hdds3_speedup_r);
state->ds3_speedup_addr = &state->adsp_data_memory[0x1f9a];
state->ds3_speedup_pc = 0x2d9;
state->ds3_transfer_pc = 0X407da;
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index c96405b35e9..4231cd20f34 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -36,7 +36,7 @@ static WRITE8_HANDLER( hcastle_coin_w )
-static ADDRESS_MAP_START( hcastle_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hcastle_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0007) AM_WRITE(hcastle_pf1_control_w)
AM_RANGE(0x0020, 0x003f) AM_RAM /* rowscroll? */
AM_RANGE(0x0200, 0x0207) AM_WRITE(hcastle_pf2_control_w)
@@ -71,7 +71,7 @@ static WRITE8_DEVICE_HANDLER( sound_bank_w )
k007232_set_bank(device, bank_A, bank_B );
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9800, 0x987f) AM_DEVWRITE("konami2", k051649_waveform_w)
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index 31fa4caa433..bd5f0df1b3e 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -104,7 +104,7 @@ if ((data & 0xdc) != 0x10) popmessage("coincntr %02x",data);
-static ADDRESS_MAP_START( hexion_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hexion_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xbfff) AM_RAM
diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c
index f49a7600bfc..f77f1008191 100644
--- a/src/mame/drivers/higemaru.c
+++ b/src/mame/drivers/higemaru.c
@@ -26,7 +26,7 @@ static INTERRUPT_GEN( higemaru_interrupt )
}
-static ADDRESS_MAP_START( higemaru_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( higemaru_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1")
AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c
index 2addb21c62b..f9e0c0b1244 100644
--- a/src/mame/drivers/highvdeo.c
+++ b/src/mame/drivers/highvdeo.c
@@ -268,7 +268,7 @@ static WRITE16_HANDLER( write1_w )
// popmessage("%04x %04x",t1,t3);
}
-static ADDRESS_MAP_START( tv_vcf_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tv_vcf_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/
AM_RANGE(0x00400, 0x03fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x40000, 0x4ffff) AM_RAM AM_BASE_MEMBER(highvdeo_state, blit_ram) /*blitter ram*/
@@ -276,7 +276,7 @@ static ADDRESS_MAP_START( tv_vcf_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tv_vcf_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( tv_vcf_io, AS_IO, 16 )
AM_RANGE(0x0000, 0x0001) AM_WRITE( write1_w ) // lamps
AM_RANGE(0x0006, 0x0007) AM_DEVWRITE( "oki", tv_oki6395_w )
AM_RANGE(0x0008, 0x0009) AM_READ( read1_r )
@@ -307,7 +307,7 @@ static WRITE16_DEVICE_HANDLER( tv_ncf_oki6395_w )
okim6376_w(device, 0, (1 << 4));
}
}
-static ADDRESS_MAP_START( tv_ncf_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tv_ncf_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/
AM_RANGE(0x00400, 0x03fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x20000, 0x2ffff) AM_RAM AM_BASE_MEMBER(highvdeo_state, blit_ram) /*blitter ram*/
@@ -315,7 +315,7 @@ static ADDRESS_MAP_START( tv_ncf_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tv_ncf_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( tv_ncf_io, AS_IO, 16 )
AM_RANGE(0x0000, 0x0001) AM_WRITE( write1_w ) // lamps
AM_RANGE(0x0008, 0x0009) AM_DEVWRITE( "oki", tv_ncf_oki6395_w )
AM_RANGE(0x000c, 0x000d) AM_READ( read1_r )
@@ -350,7 +350,7 @@ static WRITE16_HANDLER( tv_tcf_bankselect_w )
memory_set_bankptr(space->machine, "bank1", &ROM[bankaddress]);
}
-static ADDRESS_MAP_START( tv_tcf_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tv_tcf_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/
AM_RANGE(0x00400, 0x03fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x40000, 0x5d4bf) AM_RAM AM_BASE_MEMBER(highvdeo_state, blit_ram) /*blitter ram*/
@@ -359,7 +359,7 @@ static ADDRESS_MAP_START( tv_tcf_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tv_tcf_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( tv_tcf_io, AS_IO, 16 )
AM_RANGE(0x0000, 0x0001) AM_WRITE( write1_w ) // lamps
AM_RANGE(0x0006, 0x0007) AM_DEVWRITE( "oki", tv_oki6395_w )
AM_RANGE(0x0008, 0x0009) AM_READ( read1_r )
@@ -409,7 +409,7 @@ static WRITE16_HANDLER( write2_w )
}
}
-static ADDRESS_MAP_START( newmcard_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( newmcard_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/
AM_RANGE(0x00400, 0x0ffff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x40000, 0x7ffff) AM_RAM AM_BASE_MEMBER(highvdeo_state, blit_ram) /*blitter ram*/
@@ -417,7 +417,7 @@ static ADDRESS_MAP_START( newmcard_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( newmcard_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( newmcard_io, AS_IO, 16 )
AM_RANGE(0x0030, 0x0033) AM_READ( newmcard_status_r )
AM_RANGE(0x0030, 0x0031) AM_WRITE( tv_tcf_bankselect_w )
AM_RANGE(0x0000, 0x0001) AM_WRITE( write1_w ) // lamps
@@ -478,7 +478,7 @@ static WRITE16_HANDLER( brasil_status_w )
// popmessage("%04x",data);
}
-static ADDRESS_MAP_START( brasil_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( brasil_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x003ff) AM_RAM /*irq vector area*/
AM_RANGE(0x00400, 0x0ffff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x40000, 0x7ffff) AM_RAM AM_BASE_MEMBER(highvdeo_state, blit_ram) /*blitter ram*/
@@ -486,7 +486,7 @@ static ADDRESS_MAP_START( brasil_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("boot_prg",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( brasil_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( brasil_io, AS_IO, 16 )
AM_RANGE(0x0030, 0x0033) AM_READ( brasil_status_r )
AM_RANGE(0x0030, 0x0031) AM_WRITE( brasil_status_w )
AM_RANGE(0x0000, 0x0001) AM_WRITE( write1_w ) // lamps
@@ -1159,7 +1159,7 @@ static READ16_HANDLER( ciclone_status_r )
static DRIVER_INIT( ciclone )
{
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x0030, 0x0033, 0, 0, ciclone_status_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_IO), 0x0030, 0x0033, 0, 0, ciclone_status_r );
}
/*
@@ -1229,7 +1229,7 @@ static WRITE16_HANDLER( fashion_output_w )
static DRIVER_INIT( fashion )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x0002, 0x0003, 0, 0, fashion_output_w );
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_IO), 0x0002, 0x0003, 0, 0, fashion_output_w );
}
GAMEL( 2000, tour4000, 0, tv_vcf, tv_vcf, 0, ROT0, "High Video", "Tour 4000", 0, layout_fashion )
diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c
index b0d4f8341cd..6ae9c67e531 100644
--- a/src/mame/drivers/hikaru.c
+++ b/src/mame/drivers/hikaru.c
@@ -341,7 +341,7 @@ static INPUT_PORTS_START( hikaru )
PORT_START("IN0")
INPUT_PORTS_END
-static ADDRESS_MAP_START( hikaru_map, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( hikaru_map, AS_PROGRAM, 64 )
AM_RANGE(0x00000000, 0x001FFFFF) AM_ROM AM_SHARE("share1")
AM_RANGE(0x00400000, 0x004000FF) AM_NOP // unknown
AM_RANGE(0x00800000, 0x008000FF) AM_NOP // unknown
@@ -362,7 +362,7 @@ static ADDRESS_MAP_START( hikaru_map, ADDRESS_SPACE_PROGRAM, 64 )
AM_RANGE(0x1A000000, 0x1A0000FF) AM_NOP // unknown
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hikaru_map_slave, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( hikaru_map_slave, AS_PROGRAM, 64 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x001FFFFF) AM_ROM AM_SHARE("share1")
AM_RANGE(0x0C000000, 0x0DFFFFFF) AM_RAM
diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c
index 712db775cb2..3a4ae0432f2 100644
--- a/src/mame/drivers/himesiki.c
+++ b/src/mame/drivers/himesiki.c
@@ -106,7 +106,7 @@ static WRITE8_HANDLER( himesiki_sound_w )
/****************************************************************************/
-static ADDRESS_MAP_START( himesiki_prm0, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( himesiki_prm0, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE_MEMBER(himesiki_state, spriteram)
@@ -115,7 +115,7 @@ static ADDRESS_MAP_START( himesiki_prm0, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( himesiki_iom0, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( himesiki_iom0, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("1P")
AM_RANGE(0x01, 0x01) AM_READ_PORT("2P")
@@ -130,12 +130,12 @@ static ADDRESS_MAP_START( himesiki_iom0, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x0b, 0x0b) AM_WRITE(himesiki_sound_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( himesiki_prm1, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( himesiki_prm1, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( himesiki_iom1, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( himesiki_iom1, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym2203", ym2203_r, ym2203_w)
AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c
index 40468696867..823f71847c6 100644
--- a/src/mame/drivers/hitme.c
+++ b/src/mame/drivers/hitme.c
@@ -224,7 +224,7 @@ static WRITE8_DEVICE_HANDLER( output_port_1_w )
upper 8 bits.
*/
-static ADDRESS_MAP_START( hitme_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hitme_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x1fff)
AM_RANGE(0x0000, 0x09ff) AM_ROM
AM_RANGE(0x0c00, 0x0eff) AM_RAM_WRITE(hitme_vidram_w) AM_BASE_MEMBER(hitme_state, videoram)
@@ -240,7 +240,7 @@ static ADDRESS_MAP_START( hitme_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hitme_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hitme_portmap, AS_IO, 8 )
AM_RANGE(0x14, 0x14) AM_READ(hitme_port_0_r)
AM_RANGE(0x15, 0x15) AM_READ(hitme_port_1_r)
AM_RANGE(0x16, 0x16) AM_READ(hitme_port_2_r)
diff --git a/src/mame/drivers/hitpoker.c b/src/mame/drivers/hitpoker.c
index 446f677e83c..7e13a3ccae6 100644
--- a/src/mame/drivers/hitpoker.c
+++ b/src/mame/drivers/hitpoker.c
@@ -237,7 +237,7 @@ static READ8_HANDLER( test_r )
#endif
/* overlap empty rom addresses */
-static ADDRESS_MAP_START( hitpoker_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hitpoker_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM // stack ram
AM_RANGE(0x1000, 0x103f) AM_RAM // internal I/O
AM_RANGE(0x8000, 0xb5ff) AM_READWRITE(hitpoker_vram_r,hitpoker_vram_w)
@@ -259,7 +259,7 @@ static ADDRESS_MAP_START( hitpoker_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xbf00, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hitpoker_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hitpoker_io, AS_IO, 8 )
AM_RANGE(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA) AM_READWRITE(hitpoker_pic_r,hitpoker_pic_w) AM_BASE_MEMBER(hitpoker_state, sys_regs)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c
index cfb2da855fe..fff94e6a0cf 100644
--- a/src/mame/drivers/hnayayoi.c
+++ b/src/mame/drivers/hnayayoi.c
@@ -90,13 +90,13 @@ static WRITE8_DEVICE_HANDLER( adpcm_reset_inv_w )
}
-static ADDRESS_MAP_START( hnayayoi_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hnayayoi_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hnayayoi_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hnayayoi_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym2203_w)
AM_RANGE(0x02, 0x03) AM_DEVREAD("ymsnd", ym2203_r)
@@ -116,7 +116,7 @@ static ADDRESS_MAP_START( hnayayoi_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x62, 0x67) AM_WRITE(dynax_blitter_rev1_param_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hnfubuki_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hnfubuki_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8000, 0xfeff) AM_ROM
@@ -138,13 +138,13 @@ static ADDRESS_MAP_START( hnfubuki_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xff62, 0xff67) AM_WRITE(dynax_blitter_rev1_param_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( untoucha_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( untoucha_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( untoucha_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( untoucha_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_DEVWRITE("ymsnd", ym2203_control_port_w)
AM_RANGE(0x11, 0x11) AM_DEVREAD("ymsnd", ym2203_status_port_r)
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index e487f93eb47..7ef5640035a 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -1041,7 +1041,7 @@ static WRITE32_HANDLER( hng64_sprite_clear_odd_w )
<ElSemi> 0xBF800000-0xBF808000 S-RAM
<ElSemi> 0x60000000-0x60001000 Comm dualport ram
*/
-static ADDRESS_MAP_START( hng_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( hng_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00ffffff) AM_RAM AM_BASE_MEMBER(hng64_state, mainram)
AM_RANGE(0x04000000, 0x05ffffff) AM_WRITENOP AM_ROM AM_REGION("user3", 0) AM_BASE_MEMBER(hng64_state, cart)
@@ -1253,11 +1253,11 @@ WRITE8_HANDLER( hng64_comm_shared_w )
}
#endif
-static ADDRESS_MAP_START( hng_comm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hng_comm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000,0xffff) AM_READWRITE( hng64_comm_memory_r, hng64_comm_memory_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hng_comm_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hng_comm_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
/* Reserved for the KL5C80 internal hardware */
AM_RANGE(0x00, 0x07) AM_WRITE( hng64_comm_io_mmu ) AM_BASE_MEMBER(hng64_state, com_mmu_mem)
@@ -1278,7 +1278,7 @@ static ADDRESS_MAP_START( hng_comm_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hng_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hng_sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("bank2")
AM_RANGE(0xe0000, 0xfffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c
index 3f9d317fed6..64b799581af 100644
--- a/src/mame/drivers/holeland.c
+++ b/src/mame/drivers/holeland.c
@@ -18,7 +18,7 @@
#include "includes/holeland.h"
-static ADDRESS_MAP_START( holeland_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( holeland_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xbfff) AM_ROM
@@ -29,7 +29,7 @@ static ADDRESS_MAP_START( holeland_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf3ff) AM_RAM AM_BASE_SIZE_MEMBER(holeland_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( crzrally_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( crzrally_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xe000, 0xe3ff) AM_WRITE(holeland_colorram_w) AM_BASE_MEMBER(holeland_state, colorram)
@@ -39,7 +39,7 @@ static ADDRESS_MAP_START( crzrally_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xf801) AM_WRITE(holeland_pal_offs_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_READ(watchdog_reset_r) /* ? */
AM_RANGE(0x04, 0x04) AM_DEVREAD("ay1", ay8910_r)
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index be354bf6e07..7ea1326f381 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -542,7 +542,7 @@ static WRITE8_HANDLER( bankswitch_w )
/********************************************************************************/
-static ADDRESS_MAP_START( mrokumei_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mrokumei_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE(mrokumei_videoram_w) AM_BASE_MEMBER(homedata_state, videoram)
AM_RANGE(0x4000, 0x5fff) AM_RAM
AM_RANGE(0x6000, 0x6fff) AM_RAM /* work ram */
@@ -563,20 +563,20 @@ static ADDRESS_MAP_START( mrokumei_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mrokumei_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mrokumei_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xfffc, 0xfffd) AM_WRITENOP /* stack writes happen here, but there's no RAM */
AM_RANGE(0x8080, 0x8080) AM_WRITE(mrokumei_sound_bank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mrokumei_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mrokumei_sound_io_map, AS_IO, 8 )
AM_RANGE(0x0000, 0xffff) AM_READWRITE(mrokumei_sound_io_r, mrokumei_sound_io_w) /* read address is 16-bit, write address is only 8-bit */
ADDRESS_MAP_END
/********************************************************************************/
-static ADDRESS_MAP_START( reikaids_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( reikaids_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE(reikaids_videoram_w) AM_BASE_MEMBER(homedata_state, videoram)
AM_RANGE(0x4000, 0x5fff) AM_RAM
AM_RANGE(0x6000, 0x6fff) AM_RAM /* work RAM */
@@ -595,12 +595,12 @@ static ADDRESS_MAP_START( reikaids_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( reikaids_upd7807_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( reikaids_upd7807_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xfeff) AM_ROMBANK("bank2") /* External ROM (Banked) */
AM_RANGE(0xff00, 0xffff) AM_RAM /* Internal RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( reikaids_upd7807_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( reikaids_upd7807_io_map, AS_IO, 8 )
AM_RANGE(UPD7807_PORTA, UPD7807_PORTA) AM_READWRITE(reikaids_upd7807_porta_r, reikaids_upd7807_porta_w)
AM_RANGE(UPD7807_PORTB, UPD7807_PORTB) AM_DEVWRITE("dac", dac_signed_w)
AM_RANGE(UPD7807_PORTC, UPD7807_PORTC) AM_WRITE(reikaids_upd7807_portc_w)
@@ -610,7 +610,7 @@ ADDRESS_MAP_END
/**************************************************************************/
-static ADDRESS_MAP_START( pteacher_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pteacher_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE(mrokumei_videoram_w) AM_BASE_MEMBER(homedata_state, videoram)
AM_RANGE(0x4000, 0x5eff) AM_RAM
AM_RANGE(0x5f00, 0x5fff) AM_RAM
@@ -629,13 +629,13 @@ static ADDRESS_MAP_START( pteacher_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pteacher_upd7807_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pteacher_upd7807_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_WRITE(pteacher_snd_answer_w)
AM_RANGE(0x0000, 0xfeff) AM_ROMBANK("bank2") /* External ROM (Banked) */
AM_RANGE(0xff00, 0xffff) AM_RAM /* Internal RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pteacher_upd7807_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pteacher_upd7807_io_map, AS_IO, 8 )
AM_RANGE(UPD7807_PORTA, UPD7807_PORTA) AM_READWRITE(pteacher_upd7807_porta_r, pteacher_upd7807_porta_w)
AM_RANGE(UPD7807_PORTB, UPD7807_PORTB) AM_DEVWRITE("dac", dac_signed_w)
AM_RANGE(UPD7807_PORTC, UPD7807_PORTC) AM_READ_PORT("COIN") AM_WRITE(pteacher_upd7807_portc_w)
@@ -1222,7 +1222,7 @@ static MACHINE_RESET( homedata )
static MACHINE_RESET( pteacher )
{
homedata_state *state = machine->driver_data<homedata_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -1239,7 +1239,7 @@ static MACHINE_RESET( pteacher )
static MACHINE_RESET( reikaids )
{
homedata_state *state = machine->driver_data<homedata_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -1432,11 +1432,11 @@ static INPUT_PORTS_START( mirderby )
INPUT_PORTS_END
-static ADDRESS_MAP_START( cpu0_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu0_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_RAM // videoram
AM_RANGE(0x4000, 0x5fff) AM_RAM
AM_RANGE(0x6000, 0x6fff) AM_RAM /* work ram */
@@ -1461,7 +1461,7 @@ static WRITE8_HANDLER( mirderby_prot_w )
}
-static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_RAM_WRITE(mrokumei_videoram_w) AM_BASE_MEMBER(homedata_state, videoram)
AM_RANGE(0x4000, 0x5fff) AM_RAM
AM_RANGE(0x6000, 0x6fff) AM_RAM /* work ram */
@@ -2032,15 +2032,15 @@ static DRIVER_INIT( 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. */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8007, 0x8007, 0, 0, pteacher_blitter_bank_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8005, 0x8005, 0, 0, pteacher_gfx_bank_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8007, 0x8007, 0, 0, pteacher_blitter_bank_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8005, 0x8005, 0, 0, pteacher_gfx_bank_w);
}
static DRIVER_INIT( mjikaga )
{
/* Mahjong Ikagadesuka is different as well. */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x7802, 0x7802, 0, 0, pteacher_snd_r);
- memory_install_write8_handler(machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0123, 0x0123, 0, 0, pteacher_snd_answer_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x7802, 0x7802, 0, 0, pteacher_snd_r);
+ memory_install_write8_handler(machine->device("audiocpu")->memory().space(AS_PROGRAM), 0x0123, 0x0123, 0, 0, pteacher_snd_answer_w);
}
static DRIVER_INIT( reikaids )
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index f33f9fde69c..665d849ef2d 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -53,7 +53,7 @@ static const ppi8255_interface ppi8255_intf =
};
-static ADDRESS_MAP_START( homerun_memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( homerun_memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x9fff) AM_RAM_WRITE(homerun_videoram_w) AM_BASE_MEMBER(homerun_state, videoram)
@@ -69,7 +69,7 @@ static CUSTOM_INPUT( homerun_40_r )
return ret;
}
-static ADDRESS_MAP_START( homerun_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( homerun_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_WRITENOP /* ?? */
AM_RANGE(0x20, 0x20) AM_WRITENOP /* ?? */
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index b496af017ae..523fbf1372d 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -604,7 +604,7 @@ static WRITE32_HANDLER(gun_w)
/*****************************************************************************/
-static ADDRESS_MAP_START( hornet_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( hornet_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_BASE_MEMBER(hornet_state, workram) /* Work RAM */
AM_RANGE(0x74000000, 0x740000ff) AM_READWRITE(hornet_k037122_reg_r, hornet_k037122_reg_w)
AM_RANGE(0x74020000, 0x7403ffff) AM_READWRITE(hornet_k037122_sram_r, hornet_k037122_sram_w)
@@ -628,7 +628,7 @@ ADDRESS_MAP_END
/*****************************************************************************/
-static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sound_memmap, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* Work RAM */
AM_RANGE(0x200000, 0x200fff) AM_DEVREADWRITE("rfsnd", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */
@@ -671,7 +671,7 @@ static WRITE16_HANDLER(gn680_latch_w)
// WORD at 30000e: IRQ 4 tests bits 6 and 7, IRQ5 tests bits 4 and 5
// (vsync and hsync status for each of the two screens?)
-static ADDRESS_MAP_START( gn680_memmap, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gn680_memmap, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM
AM_RANGE(0x300000, 0x300001) AM_WRITE(gn680_sysctrl)
@@ -706,7 +706,7 @@ static WRITE32_HANDLER( dsp_dataram1_w )
state->sharc_dataram[1][offset] = data;
}
-static ADDRESS_MAP_START( sharc0_map, ADDRESS_SPACE_DATA, 32 )
+static ADDRESS_MAP_START( sharc0_map, AS_DATA, 32 )
AM_RANGE(0x0400000, 0x041ffff) AM_READWRITE(cgboard_0_shared_sharc_r, cgboard_0_shared_sharc_w)
AM_RANGE(0x0500000, 0x05fffff) AM_READWRITE(dsp_dataram0_r, dsp_dataram0_w) AM_BASE_MEMBER(hornet_state, sharc_dataram[0])
AM_RANGE(0x1400000, 0x14fffff) AM_RAM
@@ -716,7 +716,7 @@ static ADDRESS_MAP_START( sharc0_map, ADDRESS_SPACE_DATA, 32 )
AM_RANGE(0x3600000, 0x37fffff) AM_ROMBANK("bank5")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sharc1_map, ADDRESS_SPACE_DATA, 32 )
+static ADDRESS_MAP_START( sharc1_map, AS_DATA, 32 )
AM_RANGE(0x0400000, 0x041ffff) AM_READWRITE(cgboard_1_shared_sharc_r, cgboard_1_shared_sharc_w)
AM_RANGE(0x0500000, 0x05fffff) AM_READWRITE(dsp_dataram1_r, dsp_dataram1_w) AM_BASE_MEMBER(hornet_state, sharc_dataram[1])
AM_RANGE(0x1400000, 0x14fffff) AM_RAM
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index a58d04dc901..08cdcc3e60b 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -117,13 +117,13 @@ static WRITE8_HANDLER( hotblock_video_write )
}
}
-static ADDRESS_MAP_START( hotblock_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hotblock_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x0ffff) AM_RAM
AM_RANGE(0x10000, 0x1ffff) AM_READWRITE(hotblock_video_read, hotblock_video_write) AM_BASE_MEMBER(hotblock_state, vram)
AM_RANGE(0x20000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hotblock_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hotblock_io, AS_IO, 8 )
AM_RANGE(0x0000, 0x0000) AM_WRITE(hotblock_port0_w)
AM_RANGE(0x0004, 0x0004) AM_READWRITE(hotblock_port4_r, hotblock_port4_w)
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("aysnd", ay8910_address_data_w)
diff --git a/src/mame/drivers/hotstuff.c b/src/mame/drivers/hotstuff.c
index f7ebc67ae4f..f5e65a7e657 100644
--- a/src/mame/drivers/hotstuff.c
+++ b/src/mame/drivers/hotstuff.c
@@ -62,7 +62,7 @@ SCREEN_UPDATE( hotstuff )
return 0;
}
-static ADDRESS_MAP_START( hotstuff_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hotstuff_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM
diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c
index 5077a56267e..507715e8596 100644
--- a/src/mame/drivers/hshavoc.c
+++ b/src/mame/drivers/hshavoc.c
@@ -218,7 +218,7 @@ static DRIVER_INIT(hshavoc)
*/
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
memory_nop_write(space, 0x200000, 0x201fff, 0, 0);
}
diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c
index adb270199f0..7baa1940a73 100644
--- a/src/mame/drivers/hvyunit.c
+++ b/src/mame/drivers/hvyunit.c
@@ -409,7 +409,7 @@ static WRITE8_HANDLER( mermaid_p3_w )
*
*************************************/
-static ADDRESS_MAP_START( master_memory, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( master_memory, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_DEVREADWRITE("pandora", pandora_spriteram_r, pandora_spriteram_w)
@@ -417,7 +417,7 @@ static ADDRESS_MAP_START( master_memory, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( master_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(master_bankswitch_w)
AM_RANGE(0x01, 0x01) AM_WRITE(master_bankswitch_w) // correct?
@@ -425,7 +425,7 @@ static ADDRESS_MAP_START( master_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_memory, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_memory, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(hu_videoram_w) AM_BASE_MEMBER(hvyunit_state, videoram)
@@ -436,7 +436,7 @@ static ADDRESS_MAP_START( slave_memory, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( slave_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(slave_bankswitch_w)
AM_RANGE(0x02, 0x02) AM_WRITE(trigger_nmi_on_sound_cpu2)
@@ -451,13 +451,13 @@ static ADDRESS_MAP_START( slave_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_memory, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_memory, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3")
AM_RANGE(0xc000, 0xc7ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(sound_bankswitch_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
@@ -465,7 +465,7 @@ static ADDRESS_MAP_START( sound_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io, AS_IO, 8 )
AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P0) AM_READWRITE(mermaid_p0_r, mermaid_p0_w)
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READWRITE(mermaid_p1_r, mermaid_p1_w)
AM_RANGE(MCS51_PORT_P2, MCS51_PORT_P2) AM_READWRITE(mermaid_p2_r, mermaid_p2_w)
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index 39001d77882..7df650d0d80 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -48,12 +48,12 @@ static DRIVER_INIT( hyhoo2 )
}
-static ADDRESS_MAP_START( hyhoo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hyhoo_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hyhoo_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hyhoo_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c
index d1f209d4d0b..2f549b3da1a 100644
--- a/src/mame/drivers/hyperspt.c
+++ b/src/mame/drivers/hyperspt.c
@@ -27,7 +27,7 @@ static WRITE8_HANDLER( hyperspt_coin_counter_w )
}
-static ADDRESS_MAP_START( hyperspt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hyperspt_map, AS_PROGRAM, 8 )
AM_RANGE(0x1000, 0x10bf) AM_RAM AM_BASE_SIZE_MEMBER(hyperspt_state, spriteram, spriteram_size)
AM_RANGE(0x10c0, 0x10ff) AM_RAM AM_BASE_MEMBER(hyperspt_state, scroll) /* Scroll amount */
AM_RANGE(0x1400, 0x1400) AM_WRITE(watchdog_reset_w)
@@ -48,7 +48,7 @@ static ADDRESS_MAP_START( hyperspt_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( roadf_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( roadf_map, AS_PROGRAM, 8 )
AM_RANGE(0x1000, 0x10bf) AM_RAM AM_BASE_SIZE_MEMBER(hyperspt_state, spriteram, spriteram_size)
AM_RANGE(0x10c0, 0x10ff) AM_RAM AM_BASE_MEMBER(hyperspt_state, scroll) /* Scroll amount */
AM_RANGE(0x1400, 0x1400) AM_WRITE(watchdog_reset_w)
@@ -69,7 +69,7 @@ static ADDRESS_MAP_START( roadf_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
@@ -81,7 +81,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe002, 0xe002) AM_DEVWRITE("snsnd", konami_SN76496_w) /* This address triggers the SN chip to read the data port. */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( soundb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( soundb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index 88e7f580236..1933c826699 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -423,7 +423,7 @@ static WRITE16_HANDLER( hyprduel_blitter_w )
Memory Maps
***************************************************************************/
-static ADDRESS_MAP_START( hyprduel_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hyprduel_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(hyprduel_vram_0_w) AM_BASE_MEMBER(hyprduel_state, vram_0) /* Layer 0 */
AM_RANGE(0x420000, 0x43ffff) AM_RAM_WRITE(hyprduel_vram_1_w) AM_BASE_MEMBER(hyprduel_state, vram_1) /* Layer 1 */
@@ -455,7 +455,7 @@ static ADDRESS_MAP_START( hyprduel_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfe4000, 0xffffff) AM_RAM AM_SHARE("share3") AM_BASE_MEMBER(hyprduel_state, sharedram3)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hyprduel_map2, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hyprduel_map2, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x003fff) AM_RAM AM_SHARE("share1") /* shadow ($c00000 - $c03fff : vector) */
AM_RANGE(0x004000, 0x007fff) AM_READONLY AM_WRITENOP AM_SHARE("share3") /* shadow ($fe4000 - $fe7fff : read only) */
AM_RANGE(0x400000, 0x400003) AM_DEVREADWRITE8("ymsnd", ym2151_r, ym2151_w, 0x00ff )
@@ -469,7 +469,7 @@ ADDRESS_MAP_END
/* Magical Error - video is at 8x now */
-static ADDRESS_MAP_START( magerror_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( magerror_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x400000, 0x400001) AM_WRITE(hyprduel_subcpu_control_w)
AM_RANGE(0x800000, 0x81ffff) AM_RAM_WRITE(hyprduel_vram_0_w) AM_BASE_MEMBER(hyprduel_state, vram_0) /* Layer 0 */
@@ -501,7 +501,7 @@ static ADDRESS_MAP_START( magerror_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfe4000, 0xffffff) AM_RAM AM_SHARE("share3") AM_BASE_MEMBER(hyprduel_state, sharedram3)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( magerror_map2, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( magerror_map2, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x003fff) AM_RAM AM_SHARE("share1") /* shadow ($c00000 - $c03fff : vector) */
AM_RANGE(0x004000, 0x007fff) AM_READONLY AM_WRITENOP AM_SHARE("share3") /* shadow ($fe4000 - $fe7fff : read only) */
AM_RANGE(0x400000, 0x400003) AM_NOP
@@ -812,10 +812,10 @@ static DRIVER_INIT( hyprduel )
state->int_num = 0x02;
/* cpu synchronization (severe timings) */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc0040e, 0xc00411, 0, 0, hyprduel_cpusync_trigger1_w);
- memory_install_read16_handler(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00408, 0xc00409, 0, 0, hyprduel_cpusync_trigger1_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00408, 0xc00409, 0, 0, hyprduel_cpusync_trigger2_w);
- memory_install_read16_handler(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff34c, 0xfff34d, 0, 0, hyprduel_cpusync_trigger2_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc0040e, 0xc00411, 0, 0, hyprduel_cpusync_trigger1_w);
+ memory_install_read16_handler(machine->device("sub")->memory().space(AS_PROGRAM), 0xc00408, 0xc00409, 0, 0, hyprduel_cpusync_trigger1_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00408, 0xc00409, 0, 0, hyprduel_cpusync_trigger2_w);
+ memory_install_read16_handler(machine->device("sub")->memory().space(AS_PROGRAM), 0xfff34c, 0xfff34d, 0, 0, hyprduel_cpusync_trigger2_r);
}
static DRIVER_INIT( magerror )
diff --git a/src/mame/drivers/icecold.c b/src/mame/drivers/icecold.c
index bf26d210656..810122963ce 100644
--- a/src/mame/drivers/icecold.c
+++ b/src/mame/drivers/icecold.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( icecold_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( icecold_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index 72764cd7680..6ce1cddd195 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -446,12 +446,12 @@ static READ8_HANDLER( jingbell_magic_r )
-static ADDRESS_MAP_START( jingbell_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jingbell_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x0f3ff ) AM_ROM
AM_RANGE( 0x0f400, 0x0ffff ) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jingbell_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jingbell_portmap, AS_IO, 8 )
AM_RANGE( 0x0000, 0x003f ) AM_RAM // Z180 internal regs
AM_RANGE( 0x1000, 0x11ff ) AM_RAM_WRITE( bg_scroll_w ) AM_BASE_MEMBER(igs009_state, bg_scroll )
diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c
index 42beae2b957..1091e350f63 100644
--- a/src/mame/drivers/igs011.c
+++ b/src/mame/drivers/igs011.c
@@ -963,7 +963,7 @@ static WRITE16_HANDLER( igs011_prot_addr_w )
// state->prot2 = 0x00;
- address_space *sp = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *sp = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = space->machine->region("maincpu")->base();
// Plug previous address range with ROM access
@@ -1800,7 +1800,7 @@ static DRIVER_INIT( drgnwrldv21 )
drgnwrld_type2_decrypt(machine);
drgnwrld_gfx_decrypt(machine);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd4c0, 0xd4ff, 0, 0, drgnwrldv21_igs011_prot2_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd4c0, 0xd4ff, 0, 0, drgnwrldv21_igs011_prot2_r);
/*
// 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
@@ -1940,7 +1940,7 @@ static DRIVER_INIT( dbc )
dbc_decrypt(machine);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x10600, 0x107ff, 0, 0, dbc_igs011_prot2_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x10600, 0x107ff, 0, 0, dbc_igs011_prot2_r);
/*
// PROTECTION CHECKS
rom[0x04c42/2] = 0x602e; // 004C42: 6604 bne 4c48 (rom test error otherwise)
@@ -1969,7 +1969,7 @@ static DRIVER_INIT( ryukobou )
ryukobou_decrypt(machine);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x10600, 0x107ff, 0, 0, ryukobou_igs011_prot2_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x10600, 0x107ff, 0, 0, ryukobou_igs011_prot2_r);
// PROTECTION CHECKS
// rom[0x2df68/2] = 0x4e75; // 02DF68: 4E56 FE00 link A6, #-$200 (fills palette with pink otherwise)
@@ -2117,7 +2117,7 @@ static DRIVER_INIT( nkishusp )
***************************************************************************/
-static ADDRESS_MAP_START( drgnwrld, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( drgnwrld, AS_PROGRAM, 16 )
// drgnwrld: IGS011 protection dynamically mapped at 1dd7x
// AM_RANGE( 0x01dd70, 0x01dd77 ) AM_WRITE( igs011_prot1_w )
// AM_RANGE( 0x01dd78, 0x01dd79 ) AM_READ ( igs011_prot1_r )
@@ -2151,7 +2151,7 @@ static ADDRESS_MAP_START( drgnwrld, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0xa88000, 0xa88001 ) AM_READ( igs_3_dips_r )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drgnwrld_igs012, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( drgnwrld_igs012, AS_PROGRAM, 16 )
// IGS012
AM_RANGE( 0x001600, 0x00160f ) AM_WRITE( igs012_prot_swap_w ) AM_MIRROR(0x01c000) // swap (a5 / 55)
AM_RANGE( 0x001610, 0x00161f ) AM_READ ( igs012_prot_r ) AM_MIRROR(0x01c000) // read (mode 0)
@@ -2196,7 +2196,7 @@ static WRITE16_DEVICE_HANDLER( lhb_okibank_w )
// popmessage("oki %04x",data);
}
-static ADDRESS_MAP_START( lhb, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( lhb, AS_PROGRAM, 16 )
// lhb: IGS011 protection dynamically mapped at 834x
// AM_RANGE( 0x008340, 0x008347 ) AM_WRITE( igs011_prot1_w )
// AM_RANGE( 0x008348, 0x008349 ) AM_READ ( igs011_prot1_r )
@@ -2236,7 +2236,7 @@ static ADDRESS_MAP_START( lhb, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x888000, 0x888001 ) AM_READ( igs_5_dips_r )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( xymg, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( xymg, AS_PROGRAM, 16 )
// xymg: IGS011 protection dynamically mapped at 834x
// AM_RANGE( 0x008340, 0x008347 ) AM_WRITE( igs011_prot1_w )
// AM_RANGE( 0x008348, 0x008349 ) AM_READ ( igs011_prot1_r )
@@ -2275,7 +2275,7 @@ static ADDRESS_MAP_START( xymg, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x888000, 0x888001 ) AM_READ( igs_3_dips_r )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wlcc, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wlcc, AS_PROGRAM, 16 )
// wlcc: IGS011 protection dynamically mapped at 834x
// AM_RANGE( 0x008340, 0x008347 ) AM_WRITE( igs011_prot1_w )
// AM_RANGE( 0x008348, 0x008349 ) AM_READ ( igs011_prot1_r )
@@ -2314,7 +2314,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( lhb2, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( lhb2, AS_PROGRAM, 16 )
// lhb2: IGS011 protection dynamically mapped at 1ff8x
// AM_RANGE( 0x01ff80, 0x01ff87 ) AM_WRITE( igs011_prot1_w )
// AM_RANGE( 0x01ff88, 0x01ff89 ) AM_READ ( igs011_prot1_r )
@@ -2411,7 +2411,7 @@ static WRITE16_HANDLER( vbowl_link_1_w ) { }
static WRITE16_HANDLER( vbowl_link_2_w ) { }
static WRITE16_HANDLER( vbowl_link_3_w ) { }
-static ADDRESS_MAP_START( vbowl, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( vbowl, AS_PROGRAM, 16 )
// vbowl: IGS011 protection dynamically mapped at 834x
// AM_RANGE( 0x008340, 0x008347 ) AM_WRITE( igs011_prot1_w )
// AM_RANGE( 0x008348, 0x008349 ) AM_READ ( igs011_prot1_r )
diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c
index 82899b10a2e..f639ba586c9 100644
--- a/src/mame/drivers/igs017.c
+++ b/src/mame/drivers/igs017.c
@@ -1073,7 +1073,7 @@ static DRIVER_INIT( slqz2 )
Memory Maps
***************************************************************************/
-static ADDRESS_MAP_START( iqblocka_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( iqblocka_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x0dfff ) AM_ROM
AM_RANGE( 0x0e000, 0x0efff ) AM_RAM
AM_RANGE( 0x0f000, 0x0ffff ) AM_RAM
@@ -1141,7 +1141,7 @@ static READ8_HANDLER( input_r )
}
}
-static ADDRESS_MAP_START( iqblocka_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( iqblocka_io, AS_IO, 8 )
AM_RANGE( 0x0000, 0x003f ) AM_RAM // internal regs
AM_RANGE( 0x1000, 0x17ff ) AM_RAM AM_BASE_MEMBER(igs017_state, spriteram)
@@ -1271,7 +1271,7 @@ static WRITE16_HANDLER( mgcs_paletteram_xRRRRRGGGGGBBBBB_w )
palette_set_color_rgb(space->machine, offset/2, pal5bit(rgb >> 0), pal5bit(rgb >> 5), pal5bit(rgb >> 10));
}
-static ADDRESS_MAP_START( mgcs, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mgcs, AS_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x07ffff ) AM_ROM
AM_RANGE( 0x300000, 0x303fff ) AM_RAM
AM_RANGE( 0x49c000, 0x49c003 ) AM_WRITE( mgcs_magic_w )
@@ -1374,7 +1374,7 @@ static READ16_HANDLER( sdmg2_magic_r )
return 0xffff;
}
-static ADDRESS_MAP_START( sdmg2, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sdmg2, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x1f0000, 0x1fffff) AM_RAM
AM_RANGE(0x202000, 0x202fff) AM_READWRITE( spriteram_lsb_r, spriteram_lsb_w ) AM_BASE_MEMBER(igs017_state, spriteram)
@@ -1495,7 +1495,7 @@ static READ16_HANDLER( mgdha_magic_r )
return 0xffff;
}
-static ADDRESS_MAP_START( mgdha_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mgdha_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x600000, 0x603fff) AM_RAM
AM_RANGE(0x876000, 0x876003) AM_WRITE( mgdha_magic_w )
diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c
index 83ff4db38d4..2c041ebb7ec 100644
--- a/src/mame/drivers/igs_m027.c
+++ b/src/mame/drivers/igs_m027.c
@@ -191,7 +191,7 @@ static SCREEN_UPDATE(igs_majhong)
***************************************************************************/
-static ADDRESS_MAP_START( igs_majhong_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( igs_majhong_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00003fff) AM_ROM /* Internal ROM */
AM_RANGE(0x08000000, 0x0807ffff) AM_ROM AM_REGION("user1", 0)/* Game ROM */
AM_RANGE(0x10000000, 0x100003ff) AM_RAM AM_BASE_MEMBER(igs_m027_state, igs_mainram)// main ram for asic?
diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c
index 15309867344..17b88f72fbb 100644
--- a/src/mame/drivers/igspoker.c
+++ b/src/mame/drivers/igspoker.c
@@ -324,12 +324,12 @@ static READ8_HANDLER( exp_rom_r )
return rom[offset+0x10000];
}
-static ADDRESS_MAP_START( igspoker_prg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( igspoker_prg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_RAM AM_REGION("maincpu", 0xf000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( igspoker_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( igspoker_io_map, AS_IO, 8 )
AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE( paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_BASE_GENERIC( paletteram )
AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE( paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_BASE_GENERIC( paletteram2 )
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSW1") /* DSW1 */
@@ -937,7 +937,7 @@ static INPUT_PORTS_START( igs_ncs )
INPUT_PORTS_END
-static ADDRESS_MAP_START( number10_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( number10_io_map, AS_IO, 8 )
AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE( paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_BASE_GENERIC( paletteram )
AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE( paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_BASE_GENERIC( paletteram2 )
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSW1") /* DSW1 */
@@ -960,7 +960,7 @@ static ADDRESS_MAP_START( number10_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x0000, 0xffff) AM_READ( exp_rom_r )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpokerpk_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpokerpk_io_map, AS_IO, 8 )
AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE( paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_BASE_GENERIC( paletteram )
AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE( paletteram_xBBBBBGGGGGRRRRR_split2_w ) AM_BASE_GENERIC( paletteram2 )
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSW1") /* DSW1 */
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index b0c2763cbc2..7ef6861b1ae 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -42,7 +42,7 @@ static WRITE8_HANDLER( ikki_coin_counters )
*
*************************************/
-static ADDRESS_MAP_START( ikki_cpu1, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ikki_cpu1, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
@@ -58,7 +58,7 @@ static ADDRESS_MAP_START( ikki_cpu1, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe00a, 0xe00b) AM_WRITEONLY AM_BASE_MEMBER(ikki_state, scroll)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ikki_cpu2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ikki_cpu2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE_SIZE_MEMBER(ikki_state, spriteram, spriteram_size)
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c
index d1121bc6bed..7477c0f2c2e 100644
--- a/src/mame/drivers/imolagp.c
+++ b/src/mame/drivers/imolagp.c
@@ -349,12 +349,12 @@ static WRITE8_HANDLER( vreg_data_w )
}
}
-static ADDRESS_MAP_START( readport_master, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( readport_master, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(trigger_slave_nmi_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( imolagp_master, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( imolagp_master, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x2800, 0x2800) AM_READ_PORT("2800") /* gas */
@@ -371,7 +371,7 @@ static ADDRESS_MAP_START( imolagp_master, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0x6000) AM_READ_PORT("DSWB") /* DSWB */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( readport_slave, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( readport_slave, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x05,0x05) AM_READ(imola_slave_port05r)
AM_RANGE(0x06,0x06) AM_READ(imola_slave_port06r)
@@ -379,7 +379,7 @@ static ADDRESS_MAP_START( readport_slave, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x82,0x82) AM_READ(imola_slave_port82r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( imolagp_slave, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( imolagp_slave, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_ROM
AM_RANGE(0x0800, 0x0bff) AM_ROM
AM_RANGE(0x1000, 0x13ff) AM_ROM
diff --git a/src/mame/drivers/inder.c b/src/mame/drivers/inder.c
index 902f1592696..76bbe12e20d 100644
--- a/src/mame/drivers/inder.c
+++ b/src/mame/drivers/inder.c
@@ -10,7 +10,7 @@ public:
: driver_device(machine, config) { }
};
-static ADDRESS_MAP_START( inder_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( inder_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c
index fed837d55c9..141dd6d62fa 100644
--- a/src/mame/drivers/intrscti.c
+++ b/src/mame/drivers/intrscti.c
@@ -30,14 +30,14 @@ static READ8_HANDLER( unk_r )
return space->machine->rand();
}
-static ADDRESS_MAP_START( intrscti_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( intrscti_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM
AM_RANGE(0x7000, 0x77ff) AM_RAM AM_BASE_MEMBER(intrscti_state, ram) // video ram
AM_RANGE(0x8000, 0x8fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( readport, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ( unk_r )
AM_RANGE(0x01, 0x01) AM_READ( unk_r )
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index 578c6a7618e..ea03f14bd08 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -127,7 +127,7 @@ static CUSTOM_INPUT( soundflag_r )
******************************************************************************/
-static ADDRESS_MAP_START( inufuku_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( inufuku_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // main rom
AM_RANGE(0x100000, 0x100007) AM_WRITENOP // ?
@@ -164,13 +164,13 @@ ADDRESS_MAP_END
******************************************************************************/
-static ADDRESS_MAP_START( inufuku_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( inufuku_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( inufuku_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( inufuku_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(inufuku_soundrombank_w)
AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, pending_command_clear_w)
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index 68d0bae3e32..d01a916a948 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -120,13 +120,13 @@ static const ppi8255_interface ppi8255_intf =
};
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE_MEMBER(iqblock_state, rambase)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
AM_RANGE(0x2000, 0x23ff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split1_w)
AM_RANGE(0x2800, 0x2bff) AM_WRITE(paletteram_xBBBBBGGGGGRRRRR_split2_w)
AM_RANGE(0x6000, 0x603f) AM_WRITE(iqblock_fgscroll_w)
@@ -444,7 +444,7 @@ static DRIVER_INIT( iqblock )
machine->generic.paletteram2.u8 = rom + 0x12800;
state->fgvideoram = rom + 0x16800;
state->bgvideoram = rom + 0x17000;
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfe26, 0xfe26, 0, 0, iqblock_prot_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfe26, 0xfe26, 0, 0, iqblock_prot_w);
state->video_type=1;
}
@@ -467,7 +467,7 @@ static DRIVER_INIT( grndtour )
machine->generic.paletteram2.u8 = rom + 0x12800;
state->fgvideoram = rom + 0x16800;
state->bgvideoram = rom + 0x17000;
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfe39, 0xfe39, 0, 0, grndtour_prot_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfe39, 0xfe39, 0, 0, grndtour_prot_w);
state->video_type=0;
}
diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c
index 9da6095ba49..e8bd0a2446d 100644
--- a/src/mame/drivers/irobot.c
+++ b/src/mame/drivers/irobot.c
@@ -125,7 +125,7 @@ static WRITE8_HANDLER( irobot_clearfirq_w )
*
*************************************/
-static ADDRESS_MAP_START( irobot_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( irobot_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0fff) AM_RAMBANK("bank2")
AM_RANGE(0x1000, 0x103f) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index a7aeaeb9da4..6aabbe42510 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -57,7 +57,7 @@ static WRITE8_DEVICE_HANDLER( ironhors_filter_w )
*
*************************************/
-static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0002) AM_RAM
AM_RANGE(0x0003, 0x0003) AM_RAM_WRITE(ironhors_charbank_w)
AM_RANGE(0x0004, 0x0004) AM_RAM AM_BASE_MEMBER(ironhors_state, interrupt_enable)
@@ -85,18 +85,18 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x8000, 0x8000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( slave_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym2203", ym2203_r, ym2203_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( farwest_master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( farwest_master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0002) AM_RAM
//20=31db
@@ -130,7 +130,7 @@ static ADDRESS_MAP_START( farwest_master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( farwest_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( farwest_slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym2203", ym2203_r, ym2203_w)
@@ -442,7 +442,7 @@ static READ8_DEVICE_HANDLER( farwest_soundlatch_r )
{
ironhors_state *state = device->machine->driver_data<ironhors_state>();
- return soundlatch_r(state->soundcpu->memory().space(ADDRESS_SPACE_PROGRAM), 0);
+ return soundlatch_r(state->soundcpu->memory().space(AS_PROGRAM), 0);
}
static const ym2203_interface farwest_ym2203_config =
diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c
index 222b728d70f..838f931d214 100644
--- a/src/mame/drivers/istellar.c
+++ b/src/mame/drivers/istellar.c
@@ -167,7 +167,7 @@ static WRITE8_HANDLER(z80_2_ldp_write)
/* PROGRAM MAPS */
-static ADDRESS_MAP_START( z80_0_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_0_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000,0x9fff) AM_ROM
AM_RANGE(0xa000,0xa7ff) AM_RAM
AM_RANGE(0xa800,0xabff) AM_RAM AM_BASE_MEMBER(istellar_state, tile_ram)
@@ -175,12 +175,12 @@ static ADDRESS_MAP_START( z80_0_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb000,0xb3ff) AM_RAM AM_BASE_MEMBER(istellar_state, sprite_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_1_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_1_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000,0x1fff) AM_ROM
AM_RANGE(0x4000,0x47ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_2_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_2_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000,0x17ff) AM_ROM
AM_RANGE(0x1800,0x1fff) AM_RAM
AM_RANGE(0xc000,0xc000) AM_READ(z80_2_unknown_read) /* Seems to be thrown away every time it's read - maybe interrupt related? */
@@ -188,7 +188,7 @@ ADDRESS_MAP_END
/* IO MAPS */
-static ADDRESS_MAP_START( z80_0_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( z80_0_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00,0x00) AM_READ_PORT("IN0")
AM_RANGE(0x02,0x02) AM_READ_PORT("DSW1")
@@ -197,14 +197,14 @@ static ADDRESS_MAP_START( z80_0_io, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x05,0x05) AM_READWRITE(z80_0_latch1_read,z80_0_latch2_write)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_1_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( z80_1_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00,0x00) AM_NOP /*AM_READWRITE(z80_1_slatch_read,z80_1_slatch_write)*/
AM_RANGE(0x01,0x01) AM_NOP /*AM_READWRITE(z80_1_nmienable,z80_1_soundwrite_front)*/
AM_RANGE(0x02,0x02) AM_NOP /*AM_WRITE(z80_1_soundwrite_rear)*/
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_2_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( z80_2_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00,0x00) AM_READWRITE(z80_2_ldp_read,z80_2_ldp_write)
AM_RANGE(0x01,0x01) AM_READWRITE(z80_2_latch2_read,z80_2_latch1_write)
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 20ff929a477..99d1cf2e941 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -703,7 +703,7 @@ static READ8_HANDLER( sound_data_buffer_r )
static WRITE8_DEVICE_HANDLER( drivedge_portb_out )
{
- address_space *space = device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device("maincpu")->memory().space(AS_PROGRAM);
// logerror("PIA port B write = %02x\n", data);
/* bit 0 controls the fan light */
@@ -728,7 +728,7 @@ static WRITE8_DEVICE_HANDLER( drivedge_turbo_light )
static WRITE8_DEVICE_HANDLER( pia_portb_out )
{
- address_space *space = device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device("maincpu")->memory().space(AS_PROGRAM);
// logerror("PIA port B write = %02x\n", data);
/* bit 4 controls the ticket dispenser */
@@ -914,7 +914,7 @@ void itech32_state::nvram_init(nvram_device &nvram, void *base, size_t length)
*************************************/
/*------ Time Killers memory layout ------*/
-static ADDRESS_MAP_START( timekill_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( timekill_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x003fff) AM_RAM AM_BASE_MEMBER(itech32_state, main_ram) AM_SHARE("nvram")
AM_RANGE(0x040000, 0x040001) AM_READ_PORT("P1")
AM_RANGE(0x048000, 0x048001) AM_READ_PORT("P2")
@@ -932,7 +932,7 @@ ADDRESS_MAP_END
/*------ BloodStorm and later games memory layout ------*/
-static ADDRESS_MAP_START( bloodstm_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bloodstm_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_BASE_MEMBER(itech32_state, main_ram) AM_SHARE("nvram")
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("P1") AM_WRITE(int1_ack_w)
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("P2")
@@ -996,7 +996,7 @@ static WRITE32_HANDLER( test2_w )
}
#endif
-static ADDRESS_MAP_START( drivedge_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( drivedge_map, AS_PROGRAM, 32 )
#if LOG_DRIVEDGE_UNINIT_RAM
AM_RANGE(0x000100, 0x0003ff) AM_MIRROR(0x40000) AM_READWRITE(test1_r, test1_w)
AM_RANGE(0x000c00, 0x007fff) AM_MIRROR(0x40000) AM_READWRITE(test2_r, test2_w)
@@ -1024,20 +1024,20 @@ AM_RANGE(0x000c00, 0x007fff) AM_MIRROR(0x40000) AM_READWRITE(test2_r, test2_w)
AM_RANGE(0x600000, 0x607fff) AM_ROM AM_REGION("user1", 0) AM_BASE_MEMBER(itech32_state, main_rom)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drivedge_tms1_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( drivedge_tms1_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x001fff) AM_RAM AM_BASE_MEMBER(itech32_state, tms1_boot)
AM_RANGE(0x008000, 0x0083ff) AM_MIRROR(0x400) AM_RAM_WRITE(tms1_trigger_w) AM_SHARE("share1") AM_BASE_MEMBER(itech32_state, tms1_ram)
AM_RANGE(0x080000, 0x0bffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drivedge_tms2_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( drivedge_tms2_map, AS_PROGRAM, 32 )
AM_RANGE(0x008000, 0x0083ff) AM_MIRROR(0x8400) AM_RAM_WRITE(tms2_trigger_w) AM_SHARE("share2") AM_BASE_MEMBER(itech32_state, tms2_ram)
AM_RANGE(0x080000, 0x08ffff) AM_RAM
ADDRESS_MAP_END
/*------ 68EC020-based memory layout ------*/
-static ADDRESS_MAP_START( itech020_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( itech020_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x007fff) AM_RAM AM_BASE_MEMBER(itech32_state, main_ram)
AM_RANGE(0x080000, 0x080003) AM_READ_PORT("P1") AM_WRITE(int1_ack32_w)
AM_RANGE(0x100000, 0x100003) AM_READ_PORT("P2")
@@ -1068,7 +1068,7 @@ ADDRESS_MAP_END
*************************************/
/*------ Rev 1 sound board memory layout ------*/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_WRITE(sound_return_w)
AM_RANGE(0x0400, 0x0400) AM_READ(sound_data_r)
AM_RANGE(0x0800, 0x083f) AM_MIRROR(0x80) AM_DEVREADWRITE("ensoniq", es5506_r, es5506_w)
@@ -1082,7 +1082,7 @@ ADDRESS_MAP_END
/*------ Rev 2 sound board memory layout ------*/
-static ADDRESS_MAP_START( sound_020_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_020_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x400) AM_READ(sound_data_r)
AM_RANGE(0x0800, 0x083f) AM_MIRROR(0x80) AM_DEVREADWRITE("ensoniq", es5506_r, es5506_w)
AM_RANGE(0x0c00, 0x0c00) AM_WRITE(sound_bank_w)
@@ -4008,8 +4008,8 @@ static DRIVER_INIT( drivedge )
state->planes = 1;
state->is_drivedge = 1;
- memory_install_read32_handler(machine->device("dsp1")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8382, 0x8382, 0, 0, drivedge_tms1_speedup_r);
- memory_install_read32_handler(machine->device("dsp2")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8382, 0x8382, 0, 0, drivedge_tms2_speedup_r);
+ memory_install_read32_handler(machine->device("dsp1")->memory().space(AS_PROGRAM), 0x8382, 0x8382, 0, 0, drivedge_tms1_speedup_r);
+ memory_install_read32_handler(machine->device("dsp2")->memory().space(AS_PROGRAM), 0x8382, 0x8382, 0, 0, drivedge_tms2_speedup_r);
}
@@ -4026,11 +4026,11 @@ static DRIVER_INIT( wcbowl )
state->vram_height = 1024;
state->planes = 1;
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x680000, 0x680001, 0, 0, trackball_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x680000, 0x680001, 0, 0, trackball_r);
- memory_nop_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x578000, 0x57ffff, 0, 0);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x680080, 0x680081, 0, 0, wcbowl_prot_result_r);
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x680080, 0x680081, 0, 0);
+ memory_nop_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x578000, 0x57ffff, 0, 0);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x680080, 0x680081, 0, 0, wcbowl_prot_result_r);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x680080, 0x680081, 0, 0);
}
@@ -4044,8 +4044,8 @@ static void init_sftm_common(running_machine *machine, int prot_addr)
state->itech020_prot_address = prot_addr;
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x300000, 0x300003, 0, 0, itech020_color2_w);
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x380000, 0x380003, 0, 0, itech020_color1_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x300000, 0x300003, 0, 0, itech020_color2_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x380000, 0x380003, 0, 0, itech020_color1_w);
}
@@ -4076,10 +4076,10 @@ static void init_shuffle_bowl_common(running_machine *machine, int prot_addr)
state->itech020_prot_address = prot_addr;
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x300000, 0x300003, 0, 0, itech020_color2_w);
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x380000, 0x380003, 0, 0, itech020_color1_w);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x180800, 0x180803, 0, 0, trackball32_4bit_p1_r);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x181000, 0x181003, 0, 0, trackball32_4bit_p2_r);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x300000, 0x300003, 0, 0, itech020_color2_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x380000, 0x380003, 0, 0, itech020_color1_w);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x180800, 0x180803, 0, 0, trackball32_4bit_p1_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x181000, 0x181003, 0, 0, trackball32_4bit_p2_r);
}
@@ -4098,7 +4098,7 @@ static DRIVER_INIT( wcbowln ) /* PIC 16C54 labeled as ITBWL-3 */
static void install_timekeeper(running_machine *machine)
{
device_t *device = machine->device("m48t02");
- memory_install_readwrite32_device_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), device, 0x681000, 0x6817ff, 0, 0, timekeeper_32be_r, timekeeper_32be_w);
+ memory_install_readwrite32_device_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), device, 0x681000, 0x6817ff, 0, 0, timekeeper_32be_r, timekeeper_32be_w);
}
static DRIVER_INIT( wcbowlt ) /* PIC 16C54 labeled as ITBWL-3 */
@@ -4130,7 +4130,7 @@ static DRIVER_INIT( gt3d )
Hacked versions of this PCB have been found with GT97
through GTClassic. This is _NOT_ a factory modification
*/
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x200003, 0, 0, trackball32_8bit_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x200003, 0, 0, trackball32_8bit_r);
init_gt_common(machine);
}
@@ -4143,8 +4143,8 @@ static DRIVER_INIT( aama )
board share the same sound CPU code and sample ROMs.
This board has all versions of GT for it, GT3D through GTClassic
*/
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x180800, 0x180803, 0, 0, trackball32_4bit_p1_r);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x181000, 0x181003, 0, 0, trackball32_4bit_p2_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x180800, 0x180803, 0, 0, trackball32_4bit_p1_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x181000, 0x181003, 0, 0, trackball32_4bit_p2_r);
init_gt_common(machine);
}
@@ -4168,7 +4168,7 @@ static DRIVER_INIT( s_ver )
board: GT97 v1.21S, GT98, GT99, GT2K & GT Classic Versions 1.00S
Trackball info is read through 200202 (actually 200203).
*/
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200200, 0x200203, 0, 0, trackball32_4bit_p1_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200200, 0x200203, 0, 0, trackball32_4bit_p1_r);
init_gt_common(machine);
}
@@ -4182,7 +4182,7 @@ static DRIVER_INIT( gt3dl )
Player 1 trackball read through 200003
Player 2 trackball read through 200002
*/
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x200003, 0, 0, trackball32_4bit_combined_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x200003, 0, 0, trackball32_4bit_combined_r);
init_gt_common(machine);
}
@@ -4190,7 +4190,7 @@ static DRIVER_INIT( gt3dl )
static DRIVER_INIT( gt2kp )
{
/* a little extra protection */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x680000, 0x680003, 0, 0, gt2kp_prot_result_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x680000, 0x680003, 0, 0, gt2kp_prot_result_r);
DRIVER_INIT_CALL(aama);
/* The protection code is:
@@ -4211,7 +4211,7 @@ Label1 bne.s Label1 ; Infinite loop if result isn't 0x01
static DRIVER_INIT( gtclasscp )
{
/* a little extra protection */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x680000, 0x680003, 0, 0, gtclass_prot_result_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x680000, 0x680003, 0, 0, gtclass_prot_result_r);
DRIVER_INIT_CALL(aama);
/* The protection code is:
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index cb3e76fc0dc..1f114896f05 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -854,7 +854,7 @@ static WRITE16_HANDLER( palette16_w )
*************************************/
/*------ common layout with TMS34061 at 0000 ------*/
-static ADDRESS_MAP_START( tmslo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tmslo_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_READWRITE(itech8_tms34061_r, itech8_tms34061_w)
AM_RANGE(0x1100, 0x1100) AM_WRITENOP
AM_RANGE(0x1120, 0x1120) AM_WRITE(sound_data_w)
@@ -870,7 +870,7 @@ ADDRESS_MAP_END
/*------ common layout with TMS34061 at 1000 ------*/
-static ADDRESS_MAP_START( tmshi_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tmshi_map, AS_PROGRAM, 8 )
AM_RANGE(0x1000, 0x1fff) AM_READWRITE(itech8_tms34061_r, itech8_tms34061_w)
AM_RANGE(0x0100, 0x0100) AM_WRITENOP
AM_RANGE(0x0120, 0x0120) AM_WRITE(sound_data_w)
@@ -886,7 +886,7 @@ ADDRESS_MAP_END
/*------ Golden Tee Golf II 1992 layout ------*/
-static ADDRESS_MAP_START( gtg2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gtg2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0100, 0x0100) AM_READ_PORT("40") AM_WRITE(itech8_nmi_ack_w)
AM_RANGE(0x0120, 0x0120) AM_READ_PORT("60") AM_WRITE(itech8_page_w)
AM_RANGE(0x0140, 0x015f) AM_WRITE(itech8_palette_w)
@@ -902,7 +902,7 @@ ADDRESS_MAP_END
/*------ Ninja Clowns layout ------*/
-static ADDRESS_MAP_START( ninclown_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ninclown_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00007f) AM_RAM AM_REGION("maincpu", 0)
AM_RANGE(0x000080, 0x003fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x004000, 0x07ffff) AM_ROM
@@ -925,7 +925,7 @@ ADDRESS_MAP_END
*************************************/
/*------ YM2203-based sound ------*/
-static ADDRESS_MAP_START( sound2203_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound2203_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_WRITENOP
AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r)
AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x0002) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
@@ -936,7 +936,7 @@ ADDRESS_MAP_END
/*------ YM2608B-based sound ------*/
-static ADDRESS_MAP_START( sound2608b_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound2608b_map, AS_PROGRAM, 8 )
AM_RANGE(0x1000, 0x1000) AM_WRITENOP
AM_RANGE(0x2000, 0x2000) AM_READ(sound_data_r)
AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE("ymsnd", ym2608_r, ym2608_w)
@@ -946,7 +946,7 @@ ADDRESS_MAP_END
/*------ YM3812-based sound ------*/
-static ADDRESS_MAP_START( sound3812_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound3812_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_WRITENOP
AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r)
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
@@ -958,7 +958,7 @@ ADDRESS_MAP_END
/*------ external YM3812-based sound board ------*/
-static ADDRESS_MAP_START( sound3812_external_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound3812_external_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_WRITENOP
AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r)
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
@@ -976,12 +976,12 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( slikz80_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slikz80_mem_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slikz80_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( slikz80_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(slikz80_port_r, slikz80_port_w)
ADDRESS_MAP_END
@@ -2634,25 +2634,25 @@ ROM_END
static DRIVER_INIT( grmatch )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0160, 0x0160, 0, 0, grmatch_palette_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0180, 0x0180, 0, 0, grmatch_xscroll_w);
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01e0, 0x01ff, 0, 0);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0160, 0x0160, 0, 0, grmatch_palette_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0180, 0x0180, 0, 0, grmatch_xscroll_w);
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01e0, 0x01ff, 0, 0);
}
static DRIVER_INIT( slikshot )
{
- memory_install_read8_handler (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0180, 0x0180, 0, 0, slikshot_z80_r);
- memory_install_read8_handler (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01cf, 0x01cf, 0, 0, slikshot_z80_control_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01cf, 0x01cf, 0, 0, slikshot_z80_control_w);
+ memory_install_read8_handler (machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0180, 0x0180, 0, 0, slikshot_z80_r);
+ memory_install_read8_handler (machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01cf, 0x01cf, 0, 0, slikshot_z80_control_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01cf, 0x01cf, 0, 0, slikshot_z80_control_w);
}
static DRIVER_INIT( sstrike )
{
- memory_install_read8_handler (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1180, 0x1180, 0, 0, slikshot_z80_r);
- memory_install_read8_handler (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x11cf, 0x11cf, 0, 0, slikshot_z80_control_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x11cf, 0x11cf, 0, 0, slikshot_z80_control_w);
+ memory_install_read8_handler (machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1180, 0x1180, 0, 0, slikshot_z80_r);
+ memory_install_read8_handler (machine->device("maincpu")->memory().space(AS_PROGRAM), 0x11cf, 0x11cf, 0, 0, slikshot_z80_control_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x11cf, 0x11cf, 0, 0, slikshot_z80_control_w);
}
@@ -2691,15 +2691,15 @@ static DRIVER_INIT( neckneck )
static DRIVER_INIT( rimrockn )
{
/* additional input ports */
- memory_install_read_port (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0161, 0x0161, 0, 0, "161");
- memory_install_read_port (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0162, 0x0162, 0, 0, "162");
- memory_install_read_port (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0163, 0x0163, 0, 0, "163");
- memory_install_read_port (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0164, 0x0164, 0, 0, "164");
- memory_install_read_port (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0165, 0x0165, 0, 0, "165");
+ memory_install_read_port (machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0161, 0x0161, 0, 0, "161");
+ memory_install_read_port (machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0162, 0x0162, 0, 0, "162");
+ memory_install_read_port (machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0163, 0x0163, 0, 0, "163");
+ memory_install_read_port (machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0164, 0x0164, 0, 0, "164");
+ memory_install_read_port (machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0165, 0x0165, 0, 0, "165");
/* different banking mechanism (disable the old one) */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01a0, 0x01a0, 0, 0, rimrockn_bank_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01c0, 0x01df, 0, 0, itech8_blitter_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01a0, 0x01a0, 0, 0, rimrockn_bank_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01c0, 0x01df, 0, 0, itech8_blitter_w);
}
diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c
index 5aae6fc7421..b01343cd78d 100644
--- a/src/mame/drivers/itgambl2.c
+++ b/src/mame/drivers/itgambl2.c
@@ -141,7 +141,7 @@ static SCREEN_UPDATE( itgambl2 )
* Memory map information *
*************************/
-static ADDRESS_MAP_START( itgambl2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( itgambl2_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xffffff)
AM_RANGE(0x000000, 0xffffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c
index 26b2663f881..e2e11ad8af5 100644
--- a/src/mame/drivers/itgambl3.c
+++ b/src/mame/drivers/itgambl3.c
@@ -129,7 +129,7 @@ static SCREEN_UPDATE( itgambl3 )
* Memory map information *
*************************/
-static ADDRESS_MAP_START( itgambl3_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( itgambl3_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xffffff)
AM_RANGE(0x000000, 0xffffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c
index d82c1787c49..2c2e1fd3ed7 100644
--- a/src/mame/drivers/itgamble.c
+++ b/src/mame/drivers/itgamble.c
@@ -85,7 +85,7 @@ static SCREEN_UPDATE( itgamble )
* Memory map information *
*************************/
-static ADDRESS_MAP_START( itgamble_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( itgamble_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xffffff)
AM_RANGE(0x000000, 0xffffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index 2952d867338..78e3879b250 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -137,7 +137,7 @@ static READ8_HANDLER( striv_question_r )
*
*************************************/
-static ADDRESS_MAP_START( jack_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jack_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x5fff) AM_RAM
AM_RANGE(0xb000, 0xb07f) AM_RAM AM_BASE_SIZE_MEMBER(jack_state, spriteram, spriteram_size)
@@ -155,7 +155,7 @@ static ADDRESS_MAP_START( jack_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( joinem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( joinem_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0xb000, 0xb0ff) AM_RAM AM_BASE_SIZE_MEMBER(jack_state, spriteram, spriteram_size)
@@ -172,13 +172,13 @@ static ADDRESS_MAP_START( joinem_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x6000, 0x6fff) AM_WRITENOP /* R/C filter ??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w)
AM_RANGE(0x80, 0x80) AM_DEVWRITE("aysnd", ay8910_address_w)
@@ -1306,7 +1306,7 @@ ROM_END
static void treahunt_decode( running_machine *machine )
{
int A;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x4000);
int data;
@@ -1414,10 +1414,10 @@ static DRIVER_INIT( striv )
}
// Set-up the weirdest questions read ever done
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xcfff, 0, 0, striv_question_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc000, 0xcfff, 0, 0, striv_question_r);
// Nop out unused sprites writes
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xb000, 0xb0ff, 0, 0);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xb000, 0xb0ff, 0, 0);
state->timer_rate = 128;
}
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index 6a6f73d4e29..7f119da3e31 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -163,7 +163,7 @@ static WRITE8_HANDLER( jackal_spriteram_w )
*
*************************************/
-static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0003) AM_RAM AM_BASE_MEMBER(jackal_state, videoctrl) // scroll + other things
AM_RANGE(0x0004, 0x0004) AM_WRITE(jackal_flipscreen_w)
AM_RANGE(0x0010, 0x0010) AM_READ_PORT("DSW1")
@@ -182,7 +182,7 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_MEMBER(jackal_state, paletteram) // self test only checks 0x4000-0x423f, 007327 should actually go up to 4fff
AM_RANGE(0x6000, 0x605f) AM_RAM // SOUND RAM (Self test check 0x6000-605f, 0x7c00-0x7fff)
diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c
index f67560146a3..15e7ee40338 100644
--- a/src/mame/drivers/jackie.c
+++ b/src/mame/drivers/jackie.c
@@ -352,12 +352,12 @@ static READ8_HANDLER( expram_r )
}
-static ADDRESS_MAP_START( jackie_prg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jackie_prg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_RAM AM_REGION("maincpu", 0xf000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jackie_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jackie_io_map, AS_IO, 8 )
AM_RANGE(0x0520, 0x0524) AM_WRITE(jackie_unk_reg1_lo_w)
AM_RANGE(0x0d20, 0x0d24) AM_WRITE(jackie_unk_reg1_hi_w)
AM_RANGE(0x0560, 0x0564) AM_WRITE(jackie_unk_reg2_lo_w)
diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c
index ed56ddd0a0d..b96f427ebc0 100644
--- a/src/mame/drivers/jackpool.c
+++ b/src/mame/drivers/jackpool.c
@@ -166,7 +166,7 @@ static WRITE16_HANDLER( jackpool_io_w )
#endif
}
-static ADDRESS_MAP_START( jackpool_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( jackpool_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x120000, 0x1200ff) AM_RAM
diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c
index 9cfc9e594bb..139eb4bf45a 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -130,7 +130,7 @@ static WRITE8_DEVICE_HANDLER( jailbrek_speech_w )
vlm5030_rst(device, (data >> 2) & 1);
}
-static ADDRESS_MAP_START( jailbrek_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jailbrek_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(jailbrek_colorram_w) AM_BASE_MEMBER(jailbrek_state, colorram)
AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE(jailbrek_videoram_w) AM_BASE_MEMBER(jailbrek_state, videoram)
AM_RANGE(0x1000, 0x10bf) AM_RAM AM_BASE_SIZE_MEMBER(jailbrek_state, spriteram, spriteram_size)
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index 5f079279cd0..9bd76a4d7bd 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -688,7 +688,7 @@ static WRITE16_HANDLER( 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(ADDRESS_SPACE_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*/
@@ -958,7 +958,7 @@ static WRITE16_HANDLER( jalmah_flip_screen_w )
// popmessage("%04x",data);
}
-static ADDRESS_MAP_START( jalmah, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( jalmah, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("DSW")
@@ -982,7 +982,7 @@ static ADDRESS_MAP_START( jalmah, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE_MEMBER(jalmah_state, jm_mcu_code)/*extra RAM for MCU code prg (NOT ON REAL HW!!!)*/
ADDRESS_MAP_END
-static ADDRESS_MAP_START( urashima, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( urashima, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("DSW")
@@ -2394,8 +2394,8 @@ static READ16_HANDLER( suchipi_mcu_r )
static DRIVER_INIT( urashima )
{
jalmah_state *state = machine->driver_data<jalmah_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80004, 0x80005, 0, 0, urashima_mcu_r );
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80012, 0x80013, 0, 0, urashima_mcu_w );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80004, 0x80005, 0, 0, urashima_mcu_r );
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80012, 0x80013, 0, 0, urashima_mcu_w );
state->mcu_prg = 0x12;
}
@@ -2403,8 +2403,8 @@ static DRIVER_INIT( urashima )
static DRIVER_INIT( daireika )
{
jalmah_state *state = machine->driver_data<jalmah_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80004, 0x80005, 0, 0, daireika_mcu_r );
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80012, 0x80013, 0, 0, daireika_mcu_w );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80004, 0x80005, 0, 0, daireika_mcu_r );
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80012, 0x80013, 0, 0, daireika_mcu_w );
state->mcu_prg = 0x11;
}
@@ -2412,8 +2412,8 @@ static DRIVER_INIT( daireika )
static DRIVER_INIT( mjzoomin )
{
jalmah_state *state = machine->driver_data<jalmah_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80004, 0x80005, 0, 0, mjzoomin_mcu_r );
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80012, 0x80013, 0, 0, mjzoomin_mcu_w );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80004, 0x80005, 0, 0, mjzoomin_mcu_r );
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80012, 0x80013, 0, 0, mjzoomin_mcu_w );
state->mcu_prg = 0x13;
}
@@ -2421,7 +2421,7 @@ static DRIVER_INIT( mjzoomin )
static DRIVER_INIT( kakumei )
{
jalmah_state *state = machine->driver_data<jalmah_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80004, 0x80005, 0, 0, kakumei_mcu_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80004, 0x80005, 0, 0, kakumei_mcu_r );
state->mcu_prg = 0x21;
}
@@ -2429,7 +2429,7 @@ static DRIVER_INIT( kakumei )
static DRIVER_INIT( kakumei2 )
{
jalmah_state *state = machine->driver_data<jalmah_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80004, 0x80005, 0, 0, kakumei_mcu_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80004, 0x80005, 0, 0, kakumei_mcu_r );
state->mcu_prg = 0x22;
}
@@ -2437,7 +2437,7 @@ static DRIVER_INIT( kakumei2 )
static DRIVER_INIT( suchipi )
{
jalmah_state *state = machine->driver_data<jalmah_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80004, 0x80005, 0, 0, suchipi_mcu_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80004, 0x80005, 0, 0, suchipi_mcu_r );
state->mcu_prg = 0x23;
}
diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c
index 09113083aec..0678f30296e 100644
--- a/src/mame/drivers/jangou.c
+++ b/src/mame/drivers/jangou.c
@@ -384,12 +384,12 @@ static WRITE8_HANDLER( slave_com_w )
*
*************************************/
-static ADDRESS_MAP_START( cpu0_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu0_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu0_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu0_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01,0x01) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x02,0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -403,11 +403,11 @@ static ADDRESS_MAP_START( cpu0_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu1_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu1_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00,0x00) AM_READ(sound_latch_r)
AM_RANGE(0x01,0x01) AM_WRITE(cvsd_w)
@@ -421,18 +421,18 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( jngolady_cpu0_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jngolady_cpu0_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xe000, 0xe000) AM_READWRITE(master_com_r,master_com_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jngolady_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jngolady_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jngolady_cpu1_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jngolady_cpu1_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00,0x00) AM_READ(sound_latch_r)
AM_RANGE(0x01,0x01) AM_WRITE(adpcm_w)
@@ -440,7 +440,7 @@ static ADDRESS_MAP_START( jngolady_cpu1_io, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nsc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nsc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM //internal ram for irq etc.
AM_RANGE(0x8000, 0x8000) AM_WRITENOP //write-only,irq related?
AM_RANGE(0x9000, 0x9000) AM_READWRITE(slave_com_r,slave_com_w)
@@ -454,13 +454,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( cntrygrl_cpu0_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cntrygrl_cpu0_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
// AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cntrygrl_cpu0_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cntrygrl_cpu0_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01,0x01) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x02,0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -479,12 +479,12 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( roylcrdn_cpu0_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( roylcrdn_cpu0_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x7000, 0x77ff) AM_RAM AM_SHARE("nvram") /* MK48Z02B-15 ZEROPOWER RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( roylcrdn_cpu0_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( roylcrdn_cpu0_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01,0x01) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x02,0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -1360,7 +1360,7 @@ static READ8_HANDLER( jngolady_rng_r )
static DRIVER_INIT( jngolady )
{
- memory_install_read8_handler(machine->device("nsc")->memory().space(ADDRESS_SPACE_PROGRAM), 0x08, 0x08, 0, 0, jngolady_rng_r );
+ memory_install_read8_handler(machine->device("nsc")->memory().space(AS_PROGRAM), 0x08, 0x08, 0, 0, jngolady_rng_r );
}
static DRIVER_INIT (luckygrl)
diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c
index 304c9fee9eb..622d8c94959 100644
--- a/src/mame/drivers/jantotsu.c
+++ b/src/mame/drivers/jantotsu.c
@@ -324,13 +324,13 @@ static void jan_adpcm_int( device_t *device )
*
*************************************/
-static ADDRESS_MAP_START( jantotsu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jantotsu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xe000, 0xffff) AM_READWRITE(jantotsu_bitmap_r, jantotsu_bitmap_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jantotsu_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jantotsu_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1") AM_DEVWRITE("sn1", sn76496_w)
AM_RANGE(0x01, 0x01) AM_READ(jantotsu_dsw2_r) AM_DEVWRITE("sn2", sn76496_w)
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 5e60335b9d1..0d1c6ef9c78 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -504,7 +504,7 @@ static WRITE16_HANDLER( jchan_suprnova_sprite32regs_2_w )
}
-static ADDRESS_MAP_START( jchan_main, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( jchan_main, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // Work RAM - [A] grid tested, cleared ($9d6-$a54)
@@ -529,7 +529,7 @@ static ADDRESS_MAP_START( jchan_main, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jchan_sub, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( jchan_sub, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM - grid tested, cleared ($612-$6dc)
@@ -789,8 +789,8 @@ static DRIVER_INIT( jchan )
jchan_state *state = machine->driver_data<jchan_state>();
DRIVER_INIT_CALL( decrypt_toybox_rom );
// install these here, putting them in the memory map causes issues
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x403ffe, 0x403fff, 0, 0, main2sub_cmd_w );
- memory_install_write16_handler(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400001, 0, 0, sub2main_cmd_w );
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x403ffe, 0x403fff, 0, 0, main2sub_cmd_w );
+ memory_install_write16_handler(machine->device("sub")->memory().space(AS_PROGRAM), 0x400000, 0x400001, 0, 0, sub2main_cmd_w );
memset(state->mcu_com, 0, 4 * sizeof( UINT16 ) );
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c
index d7e42eb73e8..6806a8edaeb 100644
--- a/src/mame/drivers/jedi.c
+++ b/src/mame/drivers/jedi.c
@@ -268,7 +268,7 @@ static WRITE8_HANDLER( nvram_enable_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x08ff) AM_MIRROR(0x0300) AM_RAM_WRITE(nvram_data_w) AM_SHARE("nvram")
AM_RANGE(0x0c00, 0x0c00) AM_MIRROR(0x03fe) AM_READ_PORT("0c00") AM_WRITENOP
diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c
index 6246b587296..a77d049eeb5 100644
--- a/src/mame/drivers/jokrwild.c
+++ b/src/mame/drivers/jokrwild.c
@@ -191,7 +191,7 @@ static READ8_HANDLER( rng_r )
* Memory Map Information *
*************************/
-static ADDRESS_MAP_START( jokrwild_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jokrwild_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM_WRITE(jokrwild_videoram_w) AM_BASE_MEMBER(jokrwild_state, videoram)
AM_RANGE(0x0400, 0x07ff) AM_RAM //FIXME: backup RAM
AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(jokrwild_colorram_w) AM_BASE_MEMBER(jokrwild_state, colorram)
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index ed429b30268..24337aae2d8 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -188,7 +188,7 @@ static WRITE8_HANDLER( jollyjgr_coin_lookout_w )
*
*************************************/
-static ADDRESS_MAP_START( jollyjgr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jollyjgr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8ff8, 0x8ff8) AM_READ_PORT("DSW1")
@@ -205,7 +205,7 @@ static ADDRESS_MAP_START( jollyjgr_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xffff) AM_RAM AM_BASE_MEMBER(jollyjgr_state, bitmap)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fspider_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fspider_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8ff8, 0x8ff8) AM_READ_PORT("DSW1")
diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c
index e9932d6ba43..093c4fbb636 100644
--- a/src/mame/drivers/jongkyo.c
+++ b/src/mame/drivers/jongkyo.c
@@ -217,7 +217,7 @@ static WRITE8_HANDLER( unknown_w )
*
*************************************/
-static ADDRESS_MAP_START( jongkyo_memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jongkyo_memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM AM_WRITE(videoram2_w) // wrong, this doesn't seem to be video ram on write..
AM_RANGE(0x4000, 0x6bff) AM_ROM // fixed rom
AM_RANGE(0x6c00, 0x6fff) AM_ROMBANK("bank1") // banked (8 banks)
@@ -226,7 +226,7 @@ static ADDRESS_MAP_START( jongkyo_memmap, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jongkyo_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jongkyo_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// R 01 keyboard
AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r)
diff --git a/src/mame/drivers/jp.c b/src/mame/drivers/jp.c
index cc92111d5a6..3db5a539a5f 100644
--- a/src/mame/drivers/jp.c
+++ b/src/mame/drivers/jp.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( jp_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jp_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index 8c4b801d8d8..7bb5a8d10ce 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -579,7 +579,7 @@ static WRITE16_HANDLER( jpmio_w )
* Main CPU memory handlers
*
*************************************/
-static ADDRESS_MAP_START( m68k_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( m68k_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x000fffff) AM_ROM
AM_RANGE(0x00100000, 0x001fffff) AM_ROM
AM_RANGE(0x00400000, 0x00403fff) AM_RAM AM_SHARE("nvram")
@@ -609,7 +609,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( tms_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tms_program_map, AS_PROGRAM, 16 )
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0x00000000, 0x003fffff) AM_MIRROR(0xf8000000) AM_RAM AM_BASE_MEMBER(jpmimpct_state, vram)
AM_RANGE(0x00800000, 0x00ffffff) AM_MIRROR(0xf8000000) AM_ROM AM_REGION("user1", 0x100000)
@@ -1246,7 +1246,7 @@ static READ16_HANDLER( ump_r )
* Main CPU memory handlers
*
*************************************/
-static ADDRESS_MAP_START( awp68k_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( awp68k_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x000fffff) AM_ROM
AM_RANGE(0x00100000, 0x001fffff) AM_ROM
AM_RANGE(0x00400000, 0x00403fff) AM_RAM AM_SHARE("nvram")
diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c
index 7606a6487b4..261614590e7 100644
--- a/src/mame/drivers/jpmsys5.c
+++ b/src/mame/drivers/jpmsys5.c
@@ -280,7 +280,7 @@ static READ16_DEVICE_HANDLER( jpm_upd7759_r )
*
*************************************/
-static ADDRESS_MAP_START( 68000_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( 68000_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x01fffe, 0x01ffff) AM_WRITE(rombank_w)
AM_RANGE(0x020000, 0x03ffff) AM_ROMBANK("bank1")
diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c
index 5cccab2ef1c..bf80f8c661a 100644
--- a/src/mame/drivers/jrpacman.c
+++ b/src/mame/drivers/jrpacman.c
@@ -127,7 +127,7 @@ static WRITE8_HANDLER( jrpacman_interrupt_vector_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM_WRITE(jrpacman_videoram_w) AM_BASE_MEMBER(jrpacman_state, videoram)
AM_RANGE(0x4800, 0x4fef) AM_RAM
@@ -151,7 +151,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0, 0) AM_WRITE(jrpacman_interrupt_vector_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/jubilee.c b/src/mame/drivers/jubilee.c
index 751420b3ae2..3f43ccea7ea 100644
--- a/src/mame/drivers/jubilee.c
+++ b/src/mame/drivers/jubilee.c
@@ -160,7 +160,7 @@ static INTERRUPT_GEN( jubileep_interrupt )
* Memory Map Information *
*************************/
//59a
-static ADDRESS_MAP_START( jubileep_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jubileep_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x30ff) AM_WRITE(jubileep_videoram_w) AM_BASE_MEMBER(jubilee_state, videoram) /* wrong... just placed somewhere */
@@ -182,7 +182,7 @@ static READ8_HANDLER(unk_r)
return (space->machine->rand() & 0xff);
}
-static ADDRESS_MAP_START( jubileep_cru_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jubileep_cru_map, AS_IO, 8 )
// AM_RANGE(0x0000, 0xffff) AM_READ(unk_r)
// AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("crtc", mc6845_status_r, mc6845_address_w)
// AM_RANGE(0x01, 0x01) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index bd0a2028cec..fdaa6a6878a 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -268,7 +268,7 @@ static WRITE8_HANDLER( junofrst_coin_counter_w )
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_RAM AM_BASE_MEMBER(junofrst_state, videoram)
AM_RANGE(0x8000, 0x800f) AM_RAM AM_BASE_MEMBER(junofrst_state, paletteram)
AM_RANGE(0x8010, 0x8010) AM_READ_PORT("DSW2")
@@ -291,7 +291,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r)
@@ -303,12 +303,12 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READ(soundlatch2_r)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(i8039_irqen_and_status_w)
diff --git a/src/mame/drivers/jvh.c b/src/mame/drivers/jvh.c
index 5bf97cda7e8..6c4c68619b3 100644
--- a/src/mame/drivers/jvh.c
+++ b/src/mame/drivers/jvh.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( jvh_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jvh_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index af140681a13..80bc5f333b6 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -360,7 +360,7 @@ static WRITE16_HANDLER( kaneko16_eeprom_w )
The Berlin Wall
***************************************************************************/
-static ADDRESS_MAP_START( berlwall, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( berlwall, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // Work RAM
AM_RANGE(0x30e000, 0x30ffff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) // Sprites
@@ -404,7 +404,7 @@ static WRITE16_DEVICE_HANDLER( bakubrkr_oki_bank_sw )
}
}
-static ADDRESS_MAP_START( bakubrkr, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bakubrkr, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM
AM_RANGE(0x400000, 0x40001f) AM_DEVREAD("ay1", kaneko16_YM2149_r) // Sound
@@ -438,7 +438,7 @@ ADDRESS_MAP_END
Blaze On
***************************************************************************/
-static ADDRESS_MAP_START( blazeon, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( blazeon, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x300000, 0x30ffff) AM_RAM // Work RAM
AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(paletteram16_xGGGGGRRRRRBBBBB_word_w) AM_BASE_GENERIC(paletteram) // Palette
@@ -497,7 +497,7 @@ static WRITE16_HANDLER( bloodwar_coin_lockout_w )
}
}
-static ADDRESS_MAP_START( bloodwar, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bloodwar, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE(&kaneko16_mcu_ram) // Shared With MCU
@@ -559,7 +559,7 @@ static WRITE16_DEVICE_HANDLER( bonkadv_oki_1_bank_w )
}
-static ADDRESS_MAP_START( bonkadv, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bonkadv, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // Work RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE(&kaneko16_mcu_ram) // Shared With MCU
@@ -635,7 +635,7 @@ static WRITE16_DEVICE_HANDLER( gtmr_oki_1_bank_w )
}
}
-static ADDRESS_MAP_START( gtmr_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gtmr_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0ffffd) AM_ROM // ROM
AM_RANGE(0x0ffffe, 0x0fffff) AM_READ(gtmr_wheel_r) // Wheel Value
@@ -711,7 +711,7 @@ static READ16_HANDLER( gtmr2_IN1_r )
return (input_port_read(space->machine, "P2") & (input_port_read(space->machine, "FAKE") | ~0x7100));
}
-static ADDRESS_MAP_START( gtmr2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gtmr2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0ffffd) AM_ROM // ROM
AM_RANGE(0x0ffffe, 0x0fffff) AM_READ(gtmr2_wheel_r) // Wheel Value
@@ -764,7 +764,7 @@ ADDRESS_MAP_END
Magical Crystal
***************************************************************************/
-static ADDRESS_MAP_START( mgcrystl, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mgcrystl, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x300000, 0x30ffff) AM_RAM // Work RAM
AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE("ay1", kaneko16_YM2149_r, kaneko16_YM2149_w) // Sound
@@ -829,7 +829,7 @@ static WRITE16_HANDLER( brapboys_oki_bank_w )
}
-static ADDRESS_MAP_START( shogwarr, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( shogwarr, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE(&kaneko16_mainram) // Work RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(calc3_mcu_ram_w) AM_BASE(&kaneko16_mcu_ram) // Shared With MCU
@@ -871,12 +871,12 @@ ADDRESS_MAP_END
Blaze On
***************************************************************************/
-static ADDRESS_MAP_START( blazeon_soundmem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( blazeon_soundmem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blazeon_soundport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( blazeon_soundport, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x06, 0x06) AM_READ(soundlatch_r)
@@ -2150,12 +2150,12 @@ static const UINT16 shogwarr_default_eeprom[64] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0000, 0x0000, 0xFFFF
};
-static ADDRESS_MAP_START( shogwarr_oki1_map, 0, 8 )
+static ADDRESS_MAP_START( shogwarr_oki1_map, AS_0, 8 )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("bank10")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shogwarr_oki2_map, 0, 8 )
+static ADDRESS_MAP_START( shogwarr_oki2_map, AS_0, 8 )
AM_RANGE(0x00000, 0x3ffff) AM_ROMBANK("bank11")
ADDRESS_MAP_END
@@ -2189,11 +2189,11 @@ static MACHINE_CONFIG_START( shogwarr, driver_device )
MCFG_OKIM6295_ADD("oki1", XTAL_16MHz/8, OKIM6295_PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(0, shogwarr_oki1_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, shogwarr_oki1_map)
MCFG_OKIM6295_ADD("oki2", XTAL_16MHz/8, OKIM6295_PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(0, shogwarr_oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, shogwarr_oki2_map)
MACHINE_CONFIG_END
@@ -2208,14 +2208,14 @@ static const UINT16 brapboys_default_eeprom[64] = {
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0035, 0xFFFF, 0xFFFF, 0xFFFF
};
-static ADDRESS_MAP_START( brapboys_oki2_map, 0, 8 )
+static ADDRESS_MAP_START( brapboys_oki2_map, AS_0, 8 )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x20000, 0x3ffff) AM_ROMBANK("bank11")
ADDRESS_MAP_END
static MACHINE_CONFIG_DERIVED( brapboys, shogwarr )
MCFG_SOUND_MODIFY("oki2")
- MCFG_DEVICE_ADDRESS_MAP(0, brapboys_oki2_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, brapboys_oki2_map)
MCFG_DEVICE_REMOVE("eeprom")
MCFG_EEPROM_93C46_ADD("eeprom")
@@ -3877,7 +3877,7 @@ static DRIVER_INIT( shogwarr )
static DRIVER_INIT( brapboys )
{
// sample banking is different on brap boys for the music, why? GALs / PALs ?
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe00000, 0xe00001, 0, 0, brapboys_oki_bank_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe00000, 0xe00001, 0, 0, brapboys_oki_bank_w);
// 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 dc9796c642c..bfaf832736f 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -183,7 +183,7 @@ static MACHINE_START( kangaroo_mcu )
kangaroo_state *state = machine->driver_data<kangaroo_state>();
MACHINE_START_CALL(kangaroo);
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xef00, 0xefff, 0, 0, mcu_sim_r, mcu_sim_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xef00, 0xefff, 0, 0, mcu_sim_r, mcu_sim_w);
state->save_item(NAME(state->clock));
}
@@ -252,7 +252,7 @@ static WRITE8_HANDLER( kangaroo_coin_counter_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_WRITE(kangaroo_videoram_w)
AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank1")
@@ -272,7 +272,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READ(soundlatch_r)
@@ -282,7 +282,7 @@ ADDRESS_MAP_END
/* yes, this is identical */
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 05f65a2dc16..9e5fa1b0130 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -426,7 +426,7 @@ static READ16_HANDLER( karnov_control_r )
*
*************************************/
-static ADDRESS_MAP_START( karnov_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( karnov_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x063fff) AM_RAM AM_BASE_MEMBER(karnov_state, ram)
AM_RANGE(0x080000, 0x080fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
@@ -439,7 +439,7 @@ static ADDRESS_MAP_START( karnov_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( karnov_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( karnov_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym1", ym2203_w)
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index dea1853440a..ef7df83634b 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -108,7 +108,7 @@ static WRITE8_HANDLER( sound_msm_w )
state->msm_play_lo_nibble = 1;
}
-static ADDRESS_MAP_START( kchampvs_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kchampvs_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(kchamp_videoram_w) AM_BASE_MEMBER(kchamp_state, videoram)
@@ -118,7 +118,7 @@ static ADDRESS_MAP_START( kchampvs_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kchampvs_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kchampvs_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_WRITE(kchamp_flipscreen_w)
AM_RANGE(0x01, 0x01) AM_WRITE(control_w)
@@ -128,12 +128,12 @@ static ADDRESS_MAP_START( kchampvs_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xc0, 0xc0) AM_READ_PORT("DSW")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kchampvs_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kchampvs_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kchampvs_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kchampvs_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_data_address_w)
AM_RANGE(0x01, 0x01) AM_READ(soundlatch_r)
@@ -163,7 +163,7 @@ static WRITE8_HANDLER( kc_sound_control_w )
// DAC_set_volume(0, (data == 1) ? 255 : 0, 0);
}
-static ADDRESS_MAP_START( kchamp_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kchamp_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(kchamp_videoram_w) AM_BASE_MEMBER(kchamp_state, videoram)
@@ -172,7 +172,7 @@ static ADDRESS_MAP_START( kchamp_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xeb00, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kchamp_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kchamp_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x80, 0x80) AM_READ_PORT("DSW") AM_WRITE(kchamp_flipscreen_w)
AM_RANGE(0x81, 0x81) AM_WRITE(control_w)
@@ -182,12 +182,12 @@ static ADDRESS_MAP_START( kchamp_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xa8, 0xa8) AM_READWRITE(sound_reset_r, sound_command_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kchamp_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kchamp_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe2ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kchamp_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kchamp_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_data_address_w)
AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_data_address_w)
@@ -730,7 +730,7 @@ ROM_END
static UINT8 *decrypt_code(running_machine *machine)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x10000);
UINT8 *rom = machine->region("maincpu")->base();
int A;
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index c66f09f2855..043156d1f30 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -480,7 +480,7 @@ static WRITE16_HANDLER( kickgoal_eeprom_w )
/* Memory Maps *****************************************************************/
-static ADDRESS_MAP_START( kickgoal_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( kickgoal_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
/// AM_RANGE(0x30001e, 0x30001f) AM_DEVWRITE("oki", kickgoal_snd_w)
AM_RANGE(0x800000, 0x800001) AM_READ_PORT("P1_P2")
@@ -504,11 +504,11 @@ ADDRESS_MAP_END
/* $000 - 7FF PIC16C57 Internal Program ROM. Note: code is 12bits wide */
/* $000 - 07F PIC16C57 Internal Data RAM */
-static ADDRESS_MAP_START( kickgoal_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kickgoal_sound_io_map, AS_IO, 8 )
/* Unknown without the PIC dump */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( actionhw_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( actionhw_io_map, AS_IO, 8 )
/* Unknown without the PIC dump */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c
index 80f37276e7c..d0eed5c55e1 100644
--- a/src/mame/drivers/kingdrby.c
+++ b/src/mame/drivers/kingdrby.c
@@ -371,19 +371,19 @@ static WRITE8_HANDLER( led_array_w )
*
*************************************/
-static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x33ff) AM_RAM AM_MIRROR(0xc00) AM_SHARE("share1")
AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(sc0_vram_w) AM_BASE_MEMBER(kingdrby_state, vram)
AM_RANGE(0x5000, 0x53ff) AM_RAM_WRITE(sc0_attr_w) AM_BASE_MEMBER(kingdrby_state, attr)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( master_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_NOP //interrupt ack
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x3fff) AM_ROM //sound rom tested for the post check
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_SHARE("nvram") //backup ram
@@ -403,7 +403,7 @@ static WRITE8_HANDLER( kingdrbb_lamps_w )
// (same as the inputs but active high)
}
-static ADDRESS_MAP_START( slave_1986_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_1986_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x3fff) AM_ROM //sound rom tested for the post check
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_SHARE("nvram") //backup ram
@@ -422,28 +422,28 @@ static ADDRESS_MAP_START( slave_1986_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("DSW")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( slave_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_NOP //interrupt ack
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x40) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x40, 0x41) AM_DEVWRITE("aysnd", ay8910_data_address_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cowrace_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cowrace_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cowrace_sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cowrace_sound_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x41) AM_DEVWRITE("aysnd", ym2203_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index 4ce37f46c02..e47b7a1301c 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -48,7 +48,7 @@ static WRITE8_HANDLER( sound_command_w )
}
-static ADDRESS_MAP_START( kingobox_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kingobox_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc3ff) AM_RAM /* work ram */
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("share2") /* shared with sprite cpu */
@@ -68,7 +68,7 @@ static ADDRESS_MAP_START( kingobox_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc05, 0xfc05) AM_READ_PORT("EXTRA")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kingobox_video_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kingobox_video_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM /* work ram */
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE("share1") /* shared with main */
@@ -78,7 +78,7 @@ static ADDRESS_MAP_START( kingobox_video_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(kingofb_colorram2_w) AM_BASE_MEMBER(kingofb_state, colorram2) /* foreground colorram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kingobox_sprite_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kingobox_sprite_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM /* work ram */
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE("share2") /* shared with main */
@@ -86,13 +86,13 @@ static ADDRESS_MAP_START( kingobox_sprite_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc400, 0xc43f) AM_RAM /* something related to scroll? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kingobox_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kingobox_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0x8000, 0x8000) AM_WRITENOP /* ??? */
AM_RANGE(0xc000, 0xc3ff) AM_RAM /* work ram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kingobox_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kingobox_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac", dac_w)
AM_RANGE(0x08, 0x08) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w)
@@ -100,7 +100,7 @@ static ADDRESS_MAP_START( kingobox_sound_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
/* Ring King */
-static ADDRESS_MAP_START( ringking_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ringking_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc3ff) AM_RAM /* work ram */
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share2") /* shared with sprite cpu */
@@ -119,7 +119,7 @@ static ADDRESS_MAP_START( ringking_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf7ff) AM_RAM /* ???? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ringking_video_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ringking_video_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM /* work ram */
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1") /* shared with main */
@@ -129,7 +129,7 @@ static ADDRESS_MAP_START( ringking_video_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa400, 0xa7ff) AM_RAM_WRITE(kingofb_colorram2_w) AM_BASE_MEMBER(kingofb_state, colorram2) /* foreground colorram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ringking_sprite_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ringking_sprite_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM /* work ram */
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share2") /* shared with main */
@@ -137,7 +137,7 @@ static ADDRESS_MAP_START( ringking_sprite_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa400, 0xa43f) AM_RAM /* something related to scroll? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ringking_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ringking_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac", dac_w)
AM_RANGE(0x02, 0x02) AM_DEVREAD("aysnd", ay8910_r)
diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c
index 0e2ab483539..3bd93c26117 100644
--- a/src/mame/drivers/kingpin.c
+++ b/src/mame/drivers/kingpin.c
@@ -99,12 +99,12 @@ INPUT_PORTS_END
/* Main CPU */
/* There's an OKI MSM5126-25RS in here - (2k RAM) */
/* A 3.6V battery traces directly to U19, rendering it nvram */
-static ADDRESS_MAP_START( kingpin_program_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kingpin_program_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kingpin_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kingpin_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(io_read_missing_dips)
AM_RANGE(0x01, 0x01) AM_READ_PORT("DSW")
@@ -126,7 +126,7 @@ ADDRESS_MAP_END
/* Sound CPU */
/* There's an OKI MSM5126-25RS in here - (2k RAM) */
-static ADDRESS_MAP_START( kingpin_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kingpin_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x8400, 0x8bff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c
index b9d05b6e727..b2d311e0b8f 100644
--- a/src/mame/drivers/kinst.c
+++ b/src/mame/drivers/kinst.c
@@ -397,7 +397,7 @@ static WRITE32_HANDLER( kinst_control_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x0007ffff) AM_RAM AM_BASE_MEMBER(kinst_state, rambase)
AM_RANGE(0x08000000, 0x087fffff) AM_RAM AM_BASE_MEMBER(kinst_state, rambase2)
diff --git a/src/mame/drivers/kissproto.c b/src/mame/drivers/kissproto.c
index d09a2a470d3..02432c75827 100644
--- a/src/mame/drivers/kissproto.c
+++ b/src/mame/drivers/kissproto.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( kissp_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kissp_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c
index 83f2a7e198d..bc1215b7239 100644
--- a/src/mame/drivers/klax.c
+++ b/src/mame/drivers/klax.c
@@ -82,7 +82,7 @@ static MACHINE_RESET( klax )
*
*************************************/
-static ADDRESS_MAP_START( klax_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( klax_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r,atarigen_eeprom_w) AM_SHARE("eeprom")
AM_RANGE(0x1f0000, 0x1fffff) AM_WRITE(atarigen_eeprom_enable_w)
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index e989dccd078..d1053d59936 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -44,7 +44,7 @@ static WRITE8_HANDLER( sound_cmd_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(kncljoe_videoram_w) AM_BASE_MEMBER(kncljoe_state, videoram)
AM_RANGE(0xd000, 0xd001) AM_WRITE(kncljoe_scroll_w) AM_BASE_MEMBER(kncljoe_state, scrollregs)
@@ -108,14 +108,14 @@ static WRITE8_DEVICE_HANDLER(unused_w)
//unused - no MSM on the pcb
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x0fff) AM_WRITENOP
AM_RANGE(0x1000, 0x1fff) AM_WRITE(sound_irq_ack_w)
AM_RANGE(0x2000, 0x7fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_DEVREADWRITE("aysnd", m6803_port1_r, m6803_port1_w)
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_DEVREADWRITE("aysnd", m6803_port2_r, m6803_port2_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c
index 3b46535661e..8e5309a9f64 100644
--- a/src/mame/drivers/koftball.c
+++ b/src/mame/drivers/koftball.c
@@ -151,7 +151,7 @@ static WRITE16_HANDLER(bmc_2_videoram_w)
tilemap_mark_tile_dirty(state->tilemap_2, offset);
}
-static ADDRESS_MAP_START( koftball_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( koftball_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x220000, 0x22ffff) AM_RAM AM_BASE_MEMBER(koftball_state, main_ram)
diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c
index 4dd3cb116f2..5d477854f9b 100644
--- a/src/mame/drivers/koikoi.c
+++ b/src/mame/drivers/koikoi.c
@@ -219,7 +219,7 @@ static WRITE8_HANDLER( io_w )
*
*************************************/
-static ADDRESS_MAP_START( koikoi_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( koikoi_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM
AM_RANGE(0x7000, 0x77ff) AM_RAM_WRITE(vram_w) AM_BASE_MEMBER(koikoi_state, videoram)
@@ -227,7 +227,7 @@ static ADDRESS_MAP_START( koikoi_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x9000, 0x9007) AM_READWRITE(io_r, io_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( koikoi_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( koikoi_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x02, 0x02) AM_WRITENOP //watchdog
AM_RANGE(0x03, 0x03) AM_DEVREAD("aysnd", ay8910_r)
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index 7afc19bfee3..d976976475f 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -160,7 +160,7 @@ static READ32_HANDLER( pcmram_r )
/* Video */
-static ADDRESS_MAP_START( konamigq_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( konamigq_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_SHARE("share1") /* ram */
AM_RANGE(0x1f000000, 0x1f00001f) AM_READWRITE(am53cf96_r, am53cf96_w)
AM_RANGE(0x1f100000, 0x1f10000f) AM_WRITE(soundr3k_w)
@@ -267,7 +267,7 @@ static WRITE16_HANDLER(tms57002_control_word_w)
}
/* 68000 memory handling */
-static ADDRESS_MAP_START( konamigq_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( konamigq_sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x2004ff) AM_READWRITE(dual539_r,dual539_w)
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index 81024d9a4ae..c24c22a9894 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -159,7 +159,7 @@ static READ32_HANDLER( mb89371_r )
return 0xffffffff;
}
-static ADDRESS_MAP_START( konamigv_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( konamigv_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_SHARE("share1") /* ram */
AM_RANGE(0x1f000000, 0x1f00001f) AM_READWRITE(am53cf96_r, am53cf96_w)
AM_RANGE(0x1f100000, 0x1f100003) AM_READ_PORT("P1")
@@ -540,9 +540,9 @@ static DRIVER_INIT( simpbowl )
state->flash8[2] = machine->device<fujitsu_29f016a_device>("flash2");
state->flash8[3] = machine->device<fujitsu_29f016a_device>("flash3");
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f680080, 0x1f68008f, 0, 0, flash_r, flash_w );
- memory_install_read32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f6800c0, 0x1f6800c7, 0, 0, trackball_r );
- memory_install_read32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f6800c8, 0x1f6800cb, 0, 0, unknown_r ); /* ?? */
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f680080, 0x1f68008f, 0, 0, flash_r, flash_w );
+ memory_install_read32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f6800c0, 0x1f6800c7, 0, 0, trackball_r );
+ memory_install_read32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f6800c8, 0x1f6800cb, 0, 0, unknown_r ); /* ?? */
DRIVER_INIT_CALL(konamigv);
}
@@ -633,9 +633,9 @@ static DRIVER_INIT( btchamp )
state->flash16[0] = machine->device<sharp_lh28f400_device>("flash");
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f680080, 0x1f68008f, 0, 0, btc_trackball_r, btc_trackball_w );
- memory_nop_write ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f6800e0, 0x1f6800e3, 0, 0 );
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f380000, 0x1f3fffff, 0, 0, btcflash_r, btcflash_w );
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f680080, 0x1f68008f, 0, 0, btc_trackball_r, btc_trackball_w );
+ memory_nop_write ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f6800e0, 0x1f6800e3, 0, 0 );
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f380000, 0x1f3fffff, 0, 0, btcflash_r, btcflash_w );
DRIVER_INIT_CALL(konamigv);
}
@@ -688,8 +688,8 @@ static WRITE32_HANDLER( tokimeki_serial_w )
static DRIVER_INIT( tokimosh )
{
- memory_install_read32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f680080, 0x1f680083, 0, 0, tokimeki_serial_r );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f680090, 0x1f680093, 0, 0, tokimeki_serial_w );
+ memory_install_read32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f680080, 0x1f680083, 0, 0, tokimeki_serial_r );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f680090, 0x1f680093, 0, 0, tokimeki_serial_w );
DRIVER_INIT_CALL(konamigv);
}
@@ -721,13 +721,13 @@ static DRIVER_INIT( kdeadeye )
state->flash16[0] = machine->device<sharp_lh28f400_device>("flash");
- memory_install_read_port ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f680080, 0x1f680083, 0, 0, "GUNX1" );
- memory_install_read_port ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f680090, 0x1f680093, 0, 0, "GUNY1" );
- memory_install_read_port ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f6800a0, 0x1f6800a3, 0, 0, "GUNX2" );
- memory_install_read_port ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f6800b0, 0x1f6800b3, 0, 0, "GUNY2" );
- memory_install_read_port ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f6800c0, 0x1f6800c3, 0, 0, "BUTTONS" );
- memory_install_write32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f6800e0, 0x1f6800e3, 0, 0, kdeadeye_0_w );
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f380000, 0x1f3fffff, 0, 0, btcflash_r, btcflash_w );
+ memory_install_read_port ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f680080, 0x1f680083, 0, 0, "GUNX1" );
+ memory_install_read_port ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f680090, 0x1f680093, 0, 0, "GUNY1" );
+ memory_install_read_port ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f6800a0, 0x1f6800a3, 0, 0, "GUNX2" );
+ memory_install_read_port ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f6800b0, 0x1f6800b3, 0, 0, "GUNY2" );
+ memory_install_read_port ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f6800c0, 0x1f6800c3, 0, 0, "BUTTONS" );
+ memory_install_write32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f6800e0, 0x1f6800e3, 0, 0, kdeadeye_0_w );
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f380000, 0x1f3fffff, 0, 0, btcflash_r, btcflash_w );
DRIVER_INIT_CALL(konamigv);
}
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 1191995021b..f0eb039ea36 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -538,7 +538,7 @@ static WRITE32_HANDLER( control_w )
waitskip.mask = MASK; \
resume_trigger= 1000; \
memory_install_read32_handler \
- (0, ADDRESS_SPACE_PROGRAM, (BASE+START)&~3, (BASE+END)|3, 0, 0, waitskip_r);}
+ (0, AS_PROGRAM, (BASE+START)&~3, (BASE+END)|3, 0, 0, waitskip_r);}
static int suspension_active, resume_trigger;
#ifdef UNUSED_FUNCTION
@@ -1159,7 +1159,7 @@ static WRITE32_HANDLER( type1_cablamps_w )
/* 68EC020 memory handlers */
/**********************************************************************************/
-static ADDRESS_MAP_START( gx_base_memmap, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gx_base_memmap, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM // BIOS ROM
AM_RANGE(0x200000, 0x3fffff) AM_ROM // main program ROM
AM_RANGE(0x400000, 0x7fffff) AM_ROM // data ROM
@@ -1191,7 +1191,7 @@ static ADDRESS_MAP_START( gx_base_memmap, ADDRESS_SPACE_PROGRAM, 32 )
#endif
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gx_type1_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gx_type1_map, AS_PROGRAM, 32 )
AM_RANGE(0xd4a000, 0xd4a01f) AM_READ(gx6bppspr_r) // sprite ROM readback
AM_RANGE(0xd90000, 0xd97fff) AM_RAM_WRITE(konamigx_palette_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xdc0000, 0xdc1fff) AM_RAM // LAN RAM? (Racin' Force has, Open Golf doesn't)
@@ -1211,13 +1211,13 @@ static ADDRESS_MAP_START( gx_type1_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_IMPORT_FROM(gx_base_memmap)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gx_type2_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gx_type2_map, AS_PROGRAM, 32 )
AM_RANGE(0xcc0000, 0xcc0003) AM_WRITE(esc_w)
AM_RANGE(0xd90000, 0xd97fff) AM_RAM_WRITE(konamigx_palette_w) AM_BASE_GENERIC(paletteram)
AM_IMPORT_FROM(gx_base_memmap)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gx_type3_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gx_type3_map, AS_PROGRAM, 32 )
AM_RANGE(0xd90000, 0xd97fff) AM_RAM
//AM_RANGE(0xcc0000, 0xcc0007) AM_WRITE(type4_prot_w)
AM_RANGE(0xe00000, 0xe0001f) AM_RAM AM_BASE((UINT32**)&K053936_0_ctrl)
@@ -1231,7 +1231,7 @@ static ADDRESS_MAP_START( gx_type3_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_IMPORT_FROM(gx_base_memmap)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gx_type4_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gx_type4_map, AS_PROGRAM, 32 )
AM_RANGE(0xcc0000, 0xcc0007) AM_WRITE(type4_prot_w)
AM_RANGE(0xd90000, 0xd97fff) AM_RAM
AM_RANGE(0xe00000, 0xe0001f) AM_RAM AM_BASE((UINT32**)&K053936_0_ctrl)
@@ -1313,7 +1313,7 @@ static WRITE16_HANDLER(tms57002_control_word_w)
}
/* 68000 memory handling */
-static ADDRESS_MAP_START( gxsndmap, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gxsndmap, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE(&gx_sndram)
AM_RANGE(0x200000, 0x2004ff) AM_READWRITE(dual539_r, dual539_w)
@@ -1324,7 +1324,7 @@ static ADDRESS_MAP_START( gxsndmap, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x580000, 0x580001) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gxtmsmap, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( gxtmsmap, AS_DATA, 8 )
AM_RANGE(0x000000, 0x03ffff) AM_RAM
ADDRESS_MAP_END
@@ -3771,8 +3771,8 @@ static DRIVER_INIT(konamigx)
switch (gameDefs[i].special)
{
case 1: // LE2 guns
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd44000, 0xd44003, 0, 0, le2_gun_H_r );
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd44004, 0xd44007, 0, 0, le2_gun_V_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd44000, 0xd44003, 0, 0, le2_gun_H_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd44004, 0xd44007, 0, 0, le2_gun_V_r );
break;
case 2: // tkmmpzdm hack
@@ -3808,7 +3808,7 @@ static DRIVER_INIT(konamigx)
break;
case 7: // install type 4 Xilinx protection for non-type 3/4 games
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xcc0000, 0xcc0007, 0, 0, type4_prot_w );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xcc0000, 0xcc0007, 0, 0, type4_prot_w );
break;
case 8: // tbyahhoo
@@ -3828,14 +3828,14 @@ static DRIVER_INIT(konamigx)
switch (readback)
{
case BPP5:
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd4a000, 0xd4a00f, 0, 0, gx5bppspr_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd4a000, 0xd4a00f, 0, 0, gx5bppspr_r);
break;
case BPP66:
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd00000, 0xd01fff, 0, 0, K056832_6bpp_rom_long_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd00000, 0xd01fff, 0, 0, K056832_6bpp_rom_long_r);
case BPP6:
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd4a000, 0xd4a00f, 0, 0, gx6bppspr_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd4a000, 0xd4a00f, 0, 0, gx6bppspr_r);
break;
}
diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c
index 89a68ad0e2a..00ca8f9480c 100644
--- a/src/mame/drivers/konamim2.c
+++ b/src/mame/drivers/konamim2.c
@@ -1107,7 +1107,7 @@ static READ64_HANDLER(cpu_r)
return 0;
}
-static ADDRESS_MAP_START( m2_main, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( m2_main, AS_PROGRAM, 64 )
AM_RANGE(0x00010040, 0x00010047) AM_READWRITE(irq_enable_r, irq_enable_w)
AM_RANGE(0x00010050, 0x00010057) AM_READ(irq_active_r)
AM_RANGE(0x00020000, 0x00020007) AM_READWRITE(unk4_r, unk4_w)
diff --git a/src/mame/drivers/kongambl.c b/src/mame/drivers/kongambl.c
index 46f41ed6fd9..c4a523a87c2 100644
--- a/src/mame/drivers/kongambl.c
+++ b/src/mame/drivers/kongambl.c
@@ -73,7 +73,7 @@ static WRITE32_HANDLER( eeprom_w )
}
}
-static ADDRESS_MAP_START( kongambl_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( kongambl_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // main program
AM_RANGE(0x080000, 0x0fffff) AM_ROM AM_REGION("maincpu", 0) // mirror
AM_RANGE(0x100000, 0x11ffff) AM_RAM // work RAM
@@ -103,7 +103,7 @@ static INPUT_PORTS_START( kongambl )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE("eeprom", eeprom_set_cs_line)
INPUT_PORTS_END
-static ADDRESS_MAP_START( kongamaud_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( kongamaud_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM // main program (mirrored?)
AM_RANGE(0x100000, 0x10ffff) AM_RAM // work RAM
AM_RANGE(0x200000, 0x2000ff) AM_RAM // unknown (YMZ280b? Shared with 68020?)
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index b7a87b03cad..94ad46e0357 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -42,7 +42,7 @@ static WRITE8_HANDLER( kopunch_coin_w )
-static ADDRESS_MAP_START( kopunch_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kopunch_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE(kopunch_videoram_w) AM_BASE_MEMBER(kopunch_state, videoram)
@@ -50,7 +50,7 @@ static ADDRESS_MAP_START( kopunch_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7100, 0x7aff) AM_RAM // ???
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kopunch_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kopunch_io_map, AS_IO, 8 )
AM_RANGE(0x30, 0x30) AM_READ_PORT("P1")
AM_RANGE(0x31, 0x32) AM_READ(kopunch_in_r)
AM_RANGE(0x33, 0x33) AM_WRITENOP
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index df5c2235994..5c072e78d52 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -104,7 +104,7 @@ static WRITE8_HANDLER(tomaincpu_w)
soundlatch_w(space, 0, data);
}
-static ADDRESS_MAP_START( maincpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( maincpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x9fff) AM_ROM
@@ -122,7 +122,7 @@ static ADDRESS_MAP_START( maincpu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xbfff) AM_RAM AM_BASE_SIZE_MEMBER(ksayakyu_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( soundcpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( soundcpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
AM_RANGE(0xa001, 0xa001) AM_DEVREAD("ay1", ay8910_r)
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index 40a87b1c154..0341eb93be6 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -1205,7 +1205,7 @@ static WRITE32_HANDLER( flash_w )
}
}
-static ADDRESS_MAP_START( konami573_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( konami573_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_SHARE("share1") /* ram */
AM_RANGE(0x1f000000, 0x1f3fffff) AM_READWRITE( flash_r, flash_w )
AM_RANGE(0x1f400000, 0x1f400003) AM_READ_PORT( "IN0" ) AM_WRITE_PORT( "OUT0" )
@@ -1472,7 +1472,7 @@ static WRITE32_HANDLER( ge765pwbba_w )
static DRIVER_INIT( ge765pwbba )
{
DRIVER_INIT_CALL(konami573);
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f640000, 0x1f6400ff, 0, 0, ge765pwbba_r, ge765pwbba_w );
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f640000, 0x1f6400ff, 0, 0, ge765pwbba_r, ge765pwbba_w );
}
/*
@@ -1584,7 +1584,7 @@ static void gx700pwfbf_init( running_machine *machine, void (*output_callback_fu
state->gx700pwfbf_output_callback = output_callback_func;
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f640000, 0x1f6400ff, 0, 0, gx700pwbf_io_r, gx700pwbf_io_w );
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f640000, 0x1f6400ff, 0, 0, gx700pwbf_io_r, gx700pwbf_io_w );
state->save_item( NAME(state->gx700pwbf_output_data) );
}
@@ -1825,7 +1825,7 @@ static DRIVER_INIT( gtrfrks )
{
DRIVER_INIT_CALL(konami573);
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f600000, 0x1f6000ff, 0, 0, gtrfrks_io_r, gtrfrks_io_w );
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f600000, 0x1f6000ff, 0, 0, gtrfrks_io_r, gtrfrks_io_w );
}
/* GX894 digital i/o */
@@ -2140,7 +2140,7 @@ static void gx894pwbba_init( running_machine *machine, void (*output_callback_fu
state->gx894pwbba_output_callback = output_callback_func;
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f640000, 0x1f6400ff, 0, 0, gx894pwbba_r, gx894pwbba_w );
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f640000, 0x1f6400ff, 0, 0, gx894pwbba_r, gx894pwbba_w );
state->gx894_ram_write_offset = 0;
state->gx894_ram_read_offset = 0;
@@ -2167,7 +2167,7 @@ static DRIVER_INIT( gtrfrkdigital )
gx894pwbba_init( machine, NULL );
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f600000, 0x1f6000ff, 0, 0, gtrfrks_io_r, gtrfrks_io_w );
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f600000, 0x1f6000ff, 0, 0, gtrfrks_io_r, gtrfrks_io_w );
}
/* ddr solo */
@@ -2460,7 +2460,7 @@ static DRIVER_INIT( dmx )
gx894pwbba_init( machine, dmx_output_callback );
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f600000, 0x1f6000ff, 0, 0, dmx_io_w );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f600000, 0x1f6000ff, 0, 0, dmx_io_w );
}
/* salary man champ */
@@ -2620,7 +2620,7 @@ static DRIVER_INIT( mamboagg )
gx894pwbba_init( machine, mamboagg_output_callback );
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f600000, 0x1f6000ff, 0, 0, mamboagg_io_w );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f600000, 0x1f6000ff, 0, 0, mamboagg_io_w );
}
@@ -2941,7 +2941,7 @@ static READ32_HANDLER( gunmania_r )
static DRIVER_INIT( gunmania )
{
DRIVER_INIT_CALL(konami573);
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f640000, 0x1f6400ff, 0, 0, gunmania_r, gunmania_w );
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f640000, 0x1f6400ff, 0, 0, gunmania_r, gunmania_w );
}
/* ADC0834 Interface */
diff --git a/src/mame/drivers/kungfur.c b/src/mame/drivers/kungfur.c
index fda1dfbd7ef..66209107937 100644
--- a/src/mame/drivers/kungfur.c
+++ b/src/mame/drivers/kungfur.c
@@ -201,7 +201,7 @@ static WRITE8_DEVICE_HANDLER( kungfur_adpcm2_w )
C000-FFFF ; R ; ROM space.
*/
-static ADDRESS_MAP_START( kungfur_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kungfur_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("adpcm1", kungfur_adpcm1_w)
AM_RANGE(0x4004, 0x4004) AM_DEVWRITE("adpcm2", kungfur_adpcm2_w)
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index 6fca4f6520b..d3ccb6690e4 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -47,7 +47,7 @@ static WRITE8_HANDLER( kyugo_sub_cpu_control_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(kyugo_bgvideoram_w) AM_BASE_MEMBER(kyugo_state, bgvideoram)
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(kyugo_bgattribram_w) AM_BASE_MEMBER(kyugo_state, bgattribram)
@@ -69,7 +69,7 @@ ADDRESS_MAP_END
*************************************/
#define Main_PortMap( name, base ) \
-static ADDRESS_MAP_START( name##_portmap, ADDRESS_SPACE_IO, 8 ) \
+static ADDRESS_MAP_START( name##_portmap, AS_IO, 8 ) \
ADDRESS_MAP_GLOBAL_MASK(0xff) \
AM_RANGE(base+0, base+0) AM_WRITE(interrupt_enable_w) \
AM_RANGE(base+1, base+1) AM_WRITE(kyugo_flipscreen_w) \
@@ -90,7 +90,7 @@ Main_PortMap( srdmissn, 0x08 )
*************************************/
#define Sub_MemMap( name, rom_end, shared, in0, in1, in2 ) \
-static ADDRESS_MAP_START( name##_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) \
+static ADDRESS_MAP_START( name##_sub_map, AS_PROGRAM, 8 ) \
AM_RANGE(0x0000, rom_end) AM_ROM \
AM_RANGE(shared, shared+0x7ff) AM_RAM AM_SHARE("share1") \
AM_RANGE(in0, in0) AM_READ_PORT("SYSTEM") \
@@ -113,7 +113,7 @@ Sub_MemMap( flashgala,0x7fff, 0xe000, 0xc040, 0xc080, 0xc0c0 )
*************************************/
#define Sub_PortMap( name, ay0_base, ay1_base ) \
-static ADDRESS_MAP_START( name##_sub_portmap, ADDRESS_SPACE_IO, 8 ) \
+static ADDRESS_MAP_START( name##_sub_portmap, AS_IO, 8 ) \
ADDRESS_MAP_GLOBAL_MASK(0xff) \
AM_RANGE(ay0_base+0, ay0_base+1) AM_DEVWRITE("ay1", ay8910_address_data_w) \
AM_RANGE(ay0_base+2, ay0_base+2) AM_DEVREAD("ay1", ay8910_r) \
@@ -465,7 +465,7 @@ static MACHINE_START( kyugo )
static MACHINE_RESET( kyugo )
{
kyugo_state *state = machine->driver_data<kyugo_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
// must start with interrupts and sub CPU disabled
cpu_interrupt_enable(machine->device("maincpu"), 0);
kyugo_sub_cpu_control_w(space, 0, 0);
@@ -1333,7 +1333,7 @@ ROM_END
static DRIVER_INIT( gyrodine )
{
/* add watchdog */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe000, 0xe000, 0, 0, watchdog_reset_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe000, 0xe000, 0, 0, watchdog_reset_w);
}
@@ -1342,10 +1342,10 @@ static DRIVER_INIT( srdmissn )
kyugo_state *state = machine->driver_data<kyugo_state>();
/* shared RAM is mapped at 0xe000 as well */
- memory_install_ram(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe000, 0xe7ff, 0, 0, state->shared_ram);
+ memory_install_ram(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe000, 0xe7ff, 0, 0, state->shared_ram);
/* extra RAM on sub CPU */
- memory_install_ram(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8800, 0x8fff, 0, 0, NULL);
+ memory_install_ram(machine->device("sub")->memory().space(AS_PROGRAM), 0x8800, 0x8fff, 0, 0, NULL);
}
diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c
index 8138b662015..6811a0e6ab0 100644
--- a/src/mame/drivers/labyrunr.c
+++ b/src/mame/drivers/labyrunr.c
@@ -45,7 +45,7 @@ static WRITE8_HANDLER( labyrunr_bankswitch_w )
coin_counter_w(space->machine, 1, data & 0x10);
}
-static ADDRESS_MAP_START( labyrunr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( labyrunr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0007) AM_DEVWRITE("k007121", k007121_ctrl_w)
AM_RANGE(0x0020, 0x005f) AM_RAM AM_BASE_MEMBER(labyrunr_state, scrollram)
AM_RANGE(0x0800, 0x0800) AM_DEVREADWRITE("ym1", ym2203_read_port_r, ym2203_write_port_w)
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index 6731c836307..616a4e1b4ed 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -129,7 +129,7 @@ static WRITE8_HANDLER( sraider_misc_w )
}
}
-static ADDRESS_MAP_START( ladybug_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ladybug_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x7000, 0x73ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(ladybug_state, spriteram, spriteram_size)
@@ -147,7 +147,7 @@ static ADDRESS_MAP_START( ladybug_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sraider_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sraider_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x7000, 0x73ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(ladybug_state, spriteram, spriteram_size)
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( sraider_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sraider_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sraider_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM
AM_RANGE(0x8000, 0x8000) AM_READ(sraider_sound_low_r)
@@ -175,7 +175,7 @@ static ADDRESS_MAP_START( sraider_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sraider_cpu2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sraider_cpu2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("sn1", sn76496_w)
AM_RANGE(0x08, 0x08) AM_DEVWRITE("sn2", sn76496_w)
@@ -1062,7 +1062,7 @@ static DRIVER_INIT( dorodon )
/* decode the opcodes */
offs_t i;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x6000);
UINT8 *rom = machine->region("maincpu")->base();
UINT8 *table = machine->region("user1")->base();
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index d9d7ffe7f97..0d6e3d941a2 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -134,7 +134,7 @@ static READ8_HANDLER( snd_flag_r )
return state->snd_flag | 0xfd;
}
-static ADDRESS_MAP_START( ladyfrog_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ladyfrog_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc07f) AM_RAM
AM_RANGE(0xc080, 0xc87f) AM_READWRITE(ladyfrog_videoram_r, ladyfrog_videoram_w) AM_BASE_SIZE_MEMBER(ladyfrog_state, videoram, videoram_size)
@@ -155,7 +155,7 @@ static ADDRESS_MAP_START( ladyfrog_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ladyfrog_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ladyfrog_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc801) AM_WRITENOP
diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c
index cb9d66524af..abe1a506380 100644
--- a/src/mame/drivers/laserbas.c
+++ b/src/mame/drivers/laserbas.c
@@ -106,7 +106,7 @@ static WRITE8_HANDLER(vrambank_w)
state->vrambank = data & 0x40;
}
-static ADDRESS_MAP_START( laserbas_memory, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( laserbas_memory, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0xbfff) AM_READWRITE(vram_r, vram_w)
AM_RANGE(0xc000, 0xf7ff) AM_ROM
@@ -114,7 +114,7 @@ static ADDRESS_MAP_START( laserbas_memory, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc00, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( laserbas_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( laserbas_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x1f) AM_WRITE(vrambank_w)
AM_RANGE(0x20, 0x20) AM_READ(read_unk) AM_WRITENOP//write = ram/rom bank ? at fc00-f800 ?
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index 12697bad03d..0e184377a72 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -166,7 +166,7 @@ static WRITE8_HANDLER( laserbat_cntmov_w )
*/
-static ADDRESS_MAP_START( laserbat_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( laserbat_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x13ff) AM_ROM
AM_RANGE(0x2000, 0x33ff) AM_ROM
AM_RANGE(0x3800, 0x3bff) AM_ROM
@@ -182,7 +182,7 @@ static ADDRESS_MAP_START( laserbat_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1c00, 0x1fff) AM_MIRROR(0x6000) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( laserbat_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( laserbat_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_WRITE(laserbat_cnteff_w)
AM_RANGE(0x01, 0x01) AM_WRITE(video_extra_w)
AM_RANGE(0x02, 0x02) AM_READ(laserbat_input_r) AM_WRITE(laserbat_csound1_w)
@@ -193,7 +193,7 @@ static ADDRESS_MAP_START( laserbat_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( catnmous_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( catnmous_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_WRITE(soundlatch_w) // soundlatch ?
AM_RANGE(0x01, 0x01) AM_WRITE(video_extra_w)
AM_RANGE(0x02, 0x02) AM_READ(laserbat_input_r)
@@ -205,7 +205,7 @@ static ADDRESS_MAP_START( catnmous_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
// the same as in zaccaria.c ?
-static ADDRESS_MAP_START( catnmous_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( catnmous_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x500c, 0x500f) AM_DEVREADWRITE("pia", pia6821_r, pia6821_w)
AM_RANGE(0xf000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index e01be750428..9ae0b59a119 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -79,7 +79,7 @@ static WRITE8_HANDLER( sound_select_w )
}
-static ADDRESS_MAP_START( lasso_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lasso_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(lasso_videoram_w) AM_BASE_MEMBER(lasso_state, videoram)
AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(lasso_colorram_w) AM_BASE_MEMBER(lasso_state, colorram)
@@ -96,7 +96,7 @@ static ADDRESS_MAP_START( lasso_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lasso_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lasso_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x5000, 0x7fff) AM_ROM
AM_RANGE(0xb000, 0xb000) AM_WRITEONLY AM_BASE_MEMBER(lasso_state, chip_data)
@@ -107,14 +107,14 @@ static ADDRESS_MAP_START( lasso_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lasso_coprocessor_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lasso_coprocessor_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE_MEMBER(lasso_state, bitmap_ram)
AM_RANGE(0x8000, 0x8fff) AM_MIRROR(0x7000) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( chameleo_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( chameleo_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(lasso_videoram_w) AM_BASE_MEMBER(lasso_state, videoram)
AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(lasso_colorram_w) AM_BASE_MEMBER(lasso_state, colorram)
@@ -133,7 +133,7 @@ static ADDRESS_MAP_START( chameleo_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( chameleo_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( chameleo_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x1000, 0x1fff) AM_ROM
AM_RANGE(0x6000, 0x7fff) AM_ROM
@@ -145,7 +145,7 @@ static ADDRESS_MAP_START( chameleo_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wwjgtin_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wwjgtin_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(lasso_videoram_w) AM_BASE_MEMBER(lasso_state, videoram)
AM_RANGE(0x0c00, 0x0fff) AM_RAM_WRITE(lasso_colorram_w) AM_BASE_MEMBER(lasso_state, colorram)
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( wwjgtin_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wwjgtin_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wwjgtin_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x4000, 0x7fff) AM_MIRROR(0x8000) AM_ROM
AM_RANGE(0xb000, 0xb000) AM_WRITEONLY AM_BASE_MEMBER(lasso_state, chip_data)
@@ -175,7 +175,7 @@ static ADDRESS_MAP_START( wwjgtin_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pinbo_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pinbo_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(lasso_videoram_w) AM_BASE_MEMBER(lasso_state, videoram)
AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(lasso_colorram_w) AM_BASE_MEMBER(lasso_state, colorram)
@@ -192,13 +192,13 @@ static ADDRESS_MAP_START( pinbo_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pinbo_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pinbo_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pinbo_audio_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pinbo_audio_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x02, 0x02) AM_DEVREAD("ay1", ay8910_r)
diff --git a/src/mame/drivers/lastbank.c b/src/mame/drivers/lastbank.c
index da0f2cc5bba..685ad4b1e56 100644
--- a/src/mame/drivers/lastbank.c
+++ b/src/mame/drivers/lastbank.c
@@ -30,7 +30,7 @@ static SCREEN_UPDATE( lastbank )
return 0;
}
-static ADDRESS_MAP_START( lastbank_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lastbank_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* TODO: ROM banks! */
AM_RANGE(0x8000, 0x9fff) AM_RAM
@@ -50,7 +50,7 @@ static ADDRESS_MAP_START( lastbank_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lastbank_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( lastbank_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index 1425034fbc8..d6ee1d24895 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -133,7 +133,7 @@ static WRITE16_HANDLER( lastduel_sound_w )
/******************************************************************************/
-static ADDRESS_MAP_START( lastduel_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( lastduel_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0xfc0000, 0xfc0003) AM_WRITENOP /* Written rarely */
AM_RANGE(0xfc0800, 0xfc0fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
@@ -149,7 +149,7 @@ static ADDRESS_MAP_START( lastduel_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfe0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( madgear_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( madgear_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0xfc1800, 0xfc1fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0xfc4000, 0xfc4001) AM_READ_PORT("DSW1") AM_WRITE(lastduel_flip_w)
@@ -166,7 +166,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM
AM_RANGE(0xe800, 0xe801) AM_DEVREADWRITE("ym1", ym2203_r,ym2203_w)
@@ -179,7 +179,7 @@ static WRITE8_HANDLER( mg_bankswitch_w )
memory_set_bank(space->machine, "bank1", data & 0x01);
}
-static ADDRESS_MAP_START( madgear_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( madgear_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xcfff) AM_ROMBANK("bank1")
AM_RANGE(0xd000, 0xd7ff) AM_RAM
diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c
index a1e5d58c406..8a55f37578b 100644
--- a/src/mame/drivers/lastfght.c
+++ b/src/mame/drivers/lastfght.c
@@ -405,7 +405,7 @@ static WRITE16_HANDLER( lastfght_sound_w )
Memory Maps
***************************************************************************/
-static ADDRESS_MAP_START( lastfght_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( lastfght_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xffffff)
AM_RANGE( 0x000000, 0x07ffff ) AM_ROM AM_REGION("maincpu", 0)
diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c
index 1233838ac8d..8915dceb195 100644
--- a/src/mame/drivers/lazercmd.c
+++ b/src/mame/drivers/lazercmd.c
@@ -402,7 +402,7 @@ static READ8_HANDLER( lazercmd_hardware_r )
*
*************************************************************/
-static ADDRESS_MAP_START( lazercmd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lazercmd_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0bff) AM_ROM
AM_RANGE(0x1c00, 0x1c1f) AM_RAM
AM_RANGE(0x1c20, 0x1eff) AM_RAM AM_BASE_SIZE_MEMBER(lazercmd_state, videoram, videoram_size)
@@ -411,7 +411,7 @@ static ADDRESS_MAP_START( lazercmd_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( medlanes_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( medlanes_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0bff) AM_ROM
AM_RANGE(0x1000, 0x17ff) AM_ROM
AM_RANGE(0x1c00, 0x1c1f) AM_RAM
@@ -421,7 +421,7 @@ static ADDRESS_MAP_START( medlanes_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bbonk_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bbonk_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0bff) AM_ROM
AM_RANGE(0x1c00, 0x1c1f) AM_RAM
AM_RANGE(0x1c20, 0x1eff) AM_RAM AM_BASE_SIZE_MEMBER(lazercmd_state, videoram, videoram_size)
@@ -430,7 +430,7 @@ static ADDRESS_MAP_START( bbonk_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lazercmd_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( lazercmd_portmap, AS_IO, 8 )
AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READWRITE(lazercmd_ctrl_port_r, lazercmd_ctrl_port_w)
AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READWRITE(lazercmd_data_port_r, lazercmd_data_port_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index 3bcf65f7f36..a301b0483a0 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -79,7 +79,7 @@ Preliminary COP MCU memory map
/*****************************************************************************/
-static ADDRESS_MAP_START( legionna_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( legionna_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE(legionna_mcu_r, legionna_mcu_w) AM_BASE(&cop_mcu_ram) /* COP mcu */
@@ -94,7 +94,7 @@ static ADDRESS_MAP_START( legionna_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( heatbrl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( heatbrl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE(heatbrl_mcu_r, heatbrl_mcu_w) AM_BASE(&cop_mcu_ram) /* COP mcu */
@@ -107,7 +107,7 @@ static ADDRESS_MAP_START( heatbrl_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x108000, 0x11ffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( godzilla_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( godzilla_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE(godzilla_mcu_r, godzilla_mcu_w) AM_BASE(&cop_mcu_ram) /* COP mcu */
@@ -132,7 +132,7 @@ static WRITE16_HANDLER( denjin_paletteram16_xBBBBBGGGGGRRRRR_word_w )
paletteram16_xBBBBBGGGGGRRRRR_word_w(space,offset,data,mem_mask);
}
-static ADDRESS_MAP_START( denjinmk_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( denjinmk_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE(denjinmk_mcu_r, denjinmk_mcu_w) AM_BASE(&cop_mcu_ram) /* COP mcu */
@@ -149,7 +149,7 @@ static ADDRESS_MAP_START( denjinmk_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x11f000, 0x11ffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( grainbow_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( grainbow_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE(grainbow_mcu_r, grainbow_mcu_w) AM_BASE(&cop_mcu_ram) /* COP mcu */
@@ -165,7 +165,7 @@ static ADDRESS_MAP_START( grainbow_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x108000, 0x11ffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cupsoc_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cupsoc_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE(cupsoc_mcu_r,cupsoc_mcu_w) AM_BASE(&cop_mcu_ram)
@@ -184,7 +184,7 @@ static ADDRESS_MAP_START( cupsoc_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x11e000, 0x11ffff) AM_RAM /*Stack Ram*/
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cupsocs_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cupsocs_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100400, 0x1007ff) AM_READWRITE(cupsocs_mcu_r,cupsocs_mcu_w) AM_BASE(&cop_mcu_ram)
@@ -203,7 +203,7 @@ static ADDRESS_MAP_START( cupsocs_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x11e000, 0x11ffff) AM_RAM /*Stack Ram*/
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cupsocbl_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cupsocbl_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
//AM_RANGE(0x100000, 0x1003ff) AM_RAM
AM_RANGE(0x100000, 0x1007ff) AM_READWRITE(copdxbl_0_r,copdxbl_0_w) AM_BASE(&cop_mcu_ram)
@@ -229,7 +229,7 @@ static WRITE8_DEVICE_HANDLER( okim_rombank_w )
downcast<okim6295_device *>(device)->set_bank_base(0x40000 * (data & 0x7));
}
-static ADDRESS_MAP_START( cupsocbl_sound_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cupsocbl_sound_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("oki", okim_rombank_w)
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index a23a972cf0c..205f3a9fe3b 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -62,7 +62,7 @@
*
*************************************/
-static ADDRESS_MAP_START( master_map_program, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( master_map_program, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xdfff) AM_ROMBANK("bank2") AM_WRITE(leland_battery_ram_w) AM_SHARE("battery")
@@ -72,7 +72,7 @@ static ADDRESS_MAP_START( master_map_program, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_map_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( master_map_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xf0, 0xf0) AM_WRITE(leland_master_alt_bankswitch_w)
AM_RANGE(0xf2, 0xf2) AM_DEVREADWRITE("custom", leland_80186_response_r, leland_80186_command_lo_w)
@@ -88,7 +88,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( slave_small_map_program, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_small_map_program, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0xdfff) AM_ROMBANK("bank3")
AM_RANGE(0xe000, 0xefff) AM_RAM
@@ -98,7 +98,7 @@ static ADDRESS_MAP_START( slave_small_map_program, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_large_map_program, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_large_map_program, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank3")
AM_RANGE(0xc000, 0xc000) AM_WRITE(leland_slave_large_banksw_w)
@@ -108,7 +108,7 @@ static ADDRESS_MAP_START( slave_large_map_program, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( slave_map_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x1f) AM_READWRITE(leland_svram_port_r, leland_svram_port_w)
AM_RANGE(0x40, 0x5f) AM_READWRITE(leland_svram_port_r, leland_svram_port_w)
@@ -1981,11 +1981,11 @@ ROM_END
static void init_master_ports(running_machine *machine, UINT8 mvram_base, UINT8 io_base)
{
/* set up the master CPU VRAM I/O */
- memory_install_readwrite8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), mvram_base, mvram_base + 0x1f, 0, 0, leland_mvram_port_r, leland_mvram_port_w);
+ memory_install_readwrite8_handler(machine->device("master")->memory().space(AS_IO), mvram_base, mvram_base + 0x1f, 0, 0, leland_mvram_port_r, leland_mvram_port_w);
/* set up the master CPU I/O ports */
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), io_base, io_base + 0x1f, 0, 0, leland_master_input_r);
- memory_install_write8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), io_base, io_base + 0x0f, 0, 0, leland_master_output_w);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), io_base, io_base + 0x1f, 0, 0, leland_master_input_r);
+ memory_install_write8_handler(machine->device("master")->memory().space(AS_IO), io_base, io_base + 0x0f, 0, 0, leland_master_output_w);
}
@@ -2002,8 +2002,8 @@ static DRIVER_INIT( cerberus )
init_master_ports(machine, 0x40, 0x80);
/* set up additional input ports */
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x80, 0x80, 0, 0, cerberus_dial_1_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x90, 0x90, 0, 0, cerberus_dial_2_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0x80, 0x80, 0, 0, cerberus_dial_1_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0x90, 0x90, 0, 0, cerberus_dial_2_r);
}
@@ -2052,7 +2052,7 @@ static DRIVER_INIT( 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. */
- state->alleymas_kludge_mem = memory_install_write8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe0ca, 0xe0ca, 0, 0, alleymas_joystick_kludge);
+ state->alleymas_kludge_mem = memory_install_write8_handler(machine->device("master")->memory().space(AS_PROGRAM), 0xe0ca, 0xe0ca, 0, 0, alleymas_joystick_kludge);
}
@@ -2077,9 +2077,9 @@ static DRIVER_INIT( dangerz )
init_master_ports(machine, 0x40, 0x80);
/* set up additional input ports */
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xf4, 0xf4, 0, 0, dangerz_input_upper_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xf8, 0xf8, 0, 0, dangerz_input_y_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xfc, 0xfc, 0, 0, dangerz_input_x_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xf4, 0xf4, 0, 0, dangerz_input_upper_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xf8, 0xf8, 0, 0, dangerz_input_y_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xfc, 0xfc, 0, 0, dangerz_input_x_r);
}
@@ -2128,10 +2128,10 @@ static DRIVER_INIT( redlin2p )
init_master_ports(machine, 0x00, 0xc0);
/* set up additional input ports */
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xc0, 0xc0, 0, 0, redline_pedal_1_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xd0, 0xd0, 0, 0, redline_pedal_2_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xf8, 0xf8, 0, 0, redline_wheel_2_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xfb, 0xfb, 0, 0, redline_wheel_1_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xc0, 0xc0, 0, 0, redline_pedal_1_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xd0, 0xd0, 0, 0, redline_pedal_2_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xf8, 0xf8, 0, 0, redline_wheel_2_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xfb, 0xfb, 0, 0, redline_wheel_1_r);
}
@@ -2162,9 +2162,9 @@ static DRIVER_INIT( viper )
init_master_ports(machine, 0x00, 0xc0);
/* set up additional input ports */
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xa4, 0xa4, 0, 0, dangerz_input_upper_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xb8, 0xb8, 0, 0, dangerz_input_y_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xbc, 0xbc, 0, 0, dangerz_input_x_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xa4, 0xa4, 0, 0, dangerz_input_upper_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xb8, 0xb8, 0, 0, dangerz_input_y_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xbc, 0xbc, 0, 0, dangerz_input_x_r);
}
@@ -2182,8 +2182,8 @@ static DRIVER_INIT( teamqb )
init_master_ports(machine, 0x40, 0x80);
/* set up additional input ports */
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x7c, 0x7c, 0, 0, "IN4");
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN5");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x7c, 0x7c, 0, 0, "IN4");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x7f, 0x7f, 0, 0, "IN5");
}
@@ -2201,8 +2201,8 @@ static DRIVER_INIT( aafb )
init_master_ports(machine, 0x00, 0xc0);
/* set up additional input ports */
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x7c, 0x7c, 0, 0, "IN4");
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN5");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x7c, 0x7c, 0, 0, "IN4");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x7f, 0x7f, 0, 0, "IN5");
}
@@ -2220,8 +2220,8 @@ static DRIVER_INIT( aafbb )
init_master_ports(machine, 0x80, 0x40);
/* set up additional input ports */
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x7c, 0x7c, 0, 0, "IN4");
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN5");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x7c, 0x7c, 0, 0, "IN4");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x7f, 0x7f, 0, 0, "IN5");
}
@@ -2239,8 +2239,8 @@ static DRIVER_INIT( aafbd2p )
init_master_ports(machine, 0x00, 0x40);
/* set up additional input ports */
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x7c, 0x7c, 0, 0, "IN4");
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN5");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x7c, 0x7c, 0, 0, "IN4");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x7f, 0x7f, 0, 0, "IN5");
}
@@ -2259,9 +2259,9 @@ static DRIVER_INIT( offroad )
init_master_ports(machine, 0x40, 0x80); /* yes, this is intentional */
/* set up additional input ports */
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xf8, 0xf8, 0, 0, offroad_wheel_3_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xf9, 0xf9, 0, 0, offroad_wheel_1_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xfb, 0xfb, 0, 0, offroad_wheel_2_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xf8, 0xf8, 0, 0, offroad_wheel_3_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xf9, 0xf9, 0, 0, offroad_wheel_1_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xfb, 0xfb, 0, 0, offroad_wheel_2_r);
}
@@ -2279,9 +2279,9 @@ static DRIVER_INIT( offroadt )
init_master_ports(machine, 0x80, 0x40);
/* set up additional input ports */
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xf8, 0xf8, 0, 0, offroad_wheel_3_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xf9, 0xf9, 0, 0, offroad_wheel_1_r);
- memory_install_read8_handler(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0xfb, 0xfb, 0, 0, offroad_wheel_2_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xf8, 0xf8, 0, 0, offroad_wheel_3_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xf9, 0xf9, 0, 0, offroad_wheel_1_r);
+ memory_install_read8_handler(machine->device("master")->memory().space(AS_IO), 0xfb, 0xfb, 0, 0, offroad_wheel_2_r);
}
@@ -2299,7 +2299,7 @@ static DRIVER_INIT( pigout )
init_master_ports(machine, 0x00, 0x40);
/* set up additional input ports */
- memory_install_read_port(machine->device("master")->memory().space(ADDRESS_SPACE_IO), 0x7f, 0x7f, 0, 0, "IN4");
+ memory_install_read_port(machine->device("master")->memory().space(AS_IO), 0x7f, 0x7f, 0, 0, "IN4");
}
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index 18fd82c168e..eacaf7b4c08 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -93,7 +93,7 @@ static WRITE8_HANDLER( lemmings_sound_ack_w )
/******************************************************************************/
-static ADDRESS_MAP_START( lemmings_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( lemmings_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
@@ -113,7 +113,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w)
AM_RANGE(0x1000, 0x1000) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index 4f35a3538d0..dd7a15b2b3d 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -472,7 +472,7 @@ static READ8_HANDLER( gunsaux_r )
return res;
}
-static ADDRESS_MAP_START( le_main, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( le_main, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROMBANK("bank1")
AM_RANGE(0x2000, 0x3fff) AM_RAM // work RAM
AM_RANGE(0x4000, 0x403f) AM_DEVWRITE("k056832", k056832_w)
@@ -492,7 +492,7 @@ static ADDRESS_MAP_START( le_main, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( le_sound, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( le_sound, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xfa2f) AM_DEVREADWRITE("k054539", k054539_r, k054539_w)
diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c
index f7add835d81..df6cdbcfe04 100644
--- a/src/mame/drivers/lethalj.c
+++ b/src/mame/drivers/lethalj.c
@@ -208,7 +208,7 @@ static WRITE16_HANDLER( cclownz_control_w )
*
*************************************/
-static ADDRESS_MAP_START( lethalj_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( lethalj_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM
AM_RANGE(0x04000000, 0x0400000f) AM_DEVREADWRITE8_MODERN("oki1", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x04000010, 0x0400001f) AM_DEVREADWRITE8_MODERN("oki2", okim6295_device, read, write, 0x00ff)
@@ -897,19 +897,19 @@ ROM_END
static DRIVER_INIT( ripribit )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x04100010, 0x0410001f, 0, 0, ripribit_control_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x04100010, 0x0410001f, 0, 0, ripribit_control_w);
}
static DRIVER_INIT( cfarm )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x04100010, 0x0410001f, 0, 0, cfarm_control_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x04100010, 0x0410001f, 0, 0, cfarm_control_w);
}
static DRIVER_INIT( cclownz )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x04100010, 0x0410001f, 0, 0, cclownz_control_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x04100010, 0x0410001f, 0, 0, cclownz_control_w);
}
diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c
index 9415f45aa55..8273d6c8319 100644
--- a/src/mame/drivers/lgp.c
+++ b/src/mame/drivers/lgp.c
@@ -138,7 +138,7 @@ static WRITE8_HANDLER(ldp_write)
/* PROGRAM MAPS */
-static ADDRESS_MAP_START( main_program_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_program_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000,0x7fff) AM_ROM
AM_RANGE(0xe000,0xe3ff) AM_RAM AM_BASE_MEMBER(lgp_state, tile_ram)
AM_RANGE(0xe400,0xe7ff) AM_RAM AM_BASE_MEMBER(lgp_state, tile_control_ram)
@@ -154,7 +154,7 @@ static ADDRESS_MAP_START( main_program_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000,0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_program_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_program_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000,0x3fff) AM_ROM
AM_RANGE(0x8000,0x83ff) AM_RAM
AM_RANGE(0x8400,0x8407) AM_RAM /* Needs handler! Communications? */
@@ -163,13 +163,13 @@ ADDRESS_MAP_END
/* IO MAPS */
-static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// AM_RANGE(0xfd,0xfd) AM_READ_PORT("IN_TEST")
// AM_RANGE(0xfe,0xfe) AM_READ_PORT("IN_TEST")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index e3f7ad38ade..d85d159db49 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -71,9 +71,9 @@ static WRITE8_HANDLER( deco16_bank_w )
state->bank = data;
if (state->bank)
- memory_install_read8_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0x800f, 0, 0, deco16_io_r);
+ memory_install_read8_handler(state->maincpu->memory().space(AS_PROGRAM), 0x8000, 0x800f, 0, 0, deco16_io_r);
else
- memory_install_read_bank(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0x800f, 0, 0, "bank1");
+ memory_install_read_bank(state->maincpu->memory().space(AS_PROGRAM), 0x8000, 0x800f, 0, 0, "bank1");
}
static READ8_HANDLER( prosoccr_bank_r )
@@ -181,9 +181,9 @@ static WRITE8_HANDLER( prosoccr_io_bank_w )
state->bank = data & 1;
if (state->bank)
- memory_install_read8_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0x800f, 0, 0, deco16_io_r);
+ memory_install_read8_handler(state->maincpu->memory().space(AS_PROGRAM), 0x8000, 0x800f, 0, 0, deco16_io_r);
else
- memory_install_read8_handler(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0x800f, 0, 0, prosoccr_charram_r);
+ memory_install_read8_handler(state->maincpu->memory().space(AS_PROGRAM), 0x8000, 0x800f, 0, 0, prosoccr_charram_r);
}
@@ -241,7 +241,7 @@ static WRITE8_HANDLER( prosport_charram_w )
*
*************************************/
-static ADDRESS_MAP_START( prosport_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( prosport_map, AS_PROGRAM, 8 )
AM_RANGE(0x0200, 0x021f) AM_RAM_WRITE(prosport_paletteram_w) AM_BASE_MEMBER(liberate_state, paletteram)
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x2000) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(prosport_bg_vram_w) AM_BASE_MEMBER(liberate_state, bg_vram)
@@ -255,7 +255,7 @@ static ADDRESS_MAP_START( prosport_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( liberate_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( liberate_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x3fff) AM_ROM /* Mirror of main rom */
AM_RANGE(0x4000, 0x7fff) AM_READ(deco16_bank_r)
@@ -268,7 +268,7 @@ static ADDRESS_MAP_START( liberate_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( prosoccr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( prosoccr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x3fff) AM_ROM /* Mirror of main rom */
AM_RANGE(0x4000, 0x7fff) AM_READ(prosoccr_bank_r)
@@ -281,17 +281,17 @@ static ADDRESS_MAP_START( prosoccr_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( deco16_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( deco16_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(deco16_bank_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("TILT")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( prosoccr_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( prosoccr_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(prosoccr_io_bank_w)
//AM_RANGE(0x01, 0x01) AM_READ_PORT("TILT")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( liberatb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( liberatb_map, AS_PROGRAM, 8 )
AM_RANGE(0x00fe, 0x00fe) AM_READ_PORT("IN0")
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x3fff) AM_ROM /* Mirror of main rom */
@@ -315,7 +315,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( prosoccr_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( prosoccr_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("ay1", ay8910_data_w)
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay1", ay8910_address_w)
@@ -326,7 +326,7 @@ static ADDRESS_MAP_START( prosoccr_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( liberate_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( liberate_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_WRITENOP
AM_RANGE(0x3000, 0x3000) AM_DEVWRITE("ay1", ay8910_data_w)
@@ -1357,7 +1357,7 @@ ROM_END
static void sound_cpu_decrypt(running_machine *machine)
{
- address_space *space = machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("audiocpu")->memory().space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x4000);
UINT8 *rom = machine->region("audiocpu")->base();
int i;
@@ -1385,13 +1385,13 @@ static DRIVER_INIT( yellowcb )
{
DRIVER_INIT_CALL(prosport);
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa000, 0xa000, 0, 0, "IN0");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa000, 0xa000, 0, 0, "IN0");
}
static DRIVER_INIT( liberate )
{
int A;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x10000);
UINT8 *ROM = machine->region("maincpu")->base();
diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c
index 76febb61785..85ea485a1db 100644
--- a/src/mame/drivers/liberatr.c
+++ b/src/mame/drivers/liberatr.c
@@ -214,7 +214,7 @@ READ8_MEMBER( liberatr_state::port0_r )
*
*************************************/
-static ADDRESS_MAP_START( liberatr_map, ADDRESS_SPACE_PROGRAM, 8, liberatr_state )
+static ADDRESS_MAP_START( liberatr_map, AS_PROGRAM, 8, liberatr_state )
AM_RANGE(0x0000, 0x0000) AM_RAM AM_SHARE("xcoord")
AM_RANGE(0x0001, 0x0001) AM_RAM AM_SHARE("ycoord")
AM_RANGE(0x0002, 0x0002) AM_READWRITE(bitmap_xy_r, bitmap_xy_w)
@@ -247,7 +247,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( liberat2_map, ADDRESS_SPACE_PROGRAM, 8, liberatr_state )
+static ADDRESS_MAP_START( liberat2_map, AS_PROGRAM, 8, liberatr_state )
AM_RANGE(0x0000, 0x0000) AM_RAM AM_SHARE("xcoord")
AM_RANGE(0x0001, 0x0001) AM_RAM AM_SHARE("ycoord")
AM_RANGE(0x0002, 0x0002) AM_READWRITE(bitmap_xy_r, bitmap_xy_w)
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index 114fb71fe44..c57eb1d915a 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -150,7 +150,7 @@ static WRITE32_HANDLER( spriteram_buffer_w )
MEMORY MAPS
*****************************************************************************************************/
-static ADDRESS_MAP_START( limenko_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( limenko_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_BASE_MEMBER(limenko_state, mainram)
AM_RANGE(0x40000000, 0x403fffff) AM_ROM AM_REGION("user2",0)
AM_RANGE(0x80000000, 0x80007fff) AM_RAM_WRITE(fg_videoram_w) AM_BASE_MEMBER(limenko_state, fg_videoram)
@@ -165,7 +165,7 @@ static ADDRESS_MAP_START( limenko_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xffe00000, 0xffffffff) AM_ROM AM_REGION("user1",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( limenko_io_map, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( limenko_io_map, AS_IO, 32 )
AM_RANGE(0x0000, 0x0003) AM_READ_PORT("IN0")
AM_RANGE(0x0800, 0x0803) AM_READ_PORT("IN1")
AM_RANGE(0x1000, 0x1003) AM_READ_PORT("IN2")
@@ -177,7 +177,7 @@ ADDRESS_MAP_END
/* Spotty memory map */
-static ADDRESS_MAP_START( spotty_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( spotty_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_BASE_MEMBER(limenko_state, mainram)
AM_RANGE(0x40002000, 0x400024d3) AM_RAM //?
AM_RANGE(0x80000000, 0x80007fff) AM_RAM_WRITE(fg_videoram_w) AM_BASE_MEMBER(limenko_state, fg_videoram)
@@ -192,7 +192,7 @@ static ADDRESS_MAP_START( spotty_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfff00000, 0xffffffff) AM_ROM AM_REGION("user1",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spotty_io_map, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( spotty_io_map, AS_IO, 32 )
AM_RANGE(0x0000, 0x0003) AM_READ_PORT("IN0")
AM_RANGE(0x0800, 0x0803) AM_READ_PORT("IN1")
AM_RANGE(0x0800, 0x0803) AM_WRITENOP // hopper related
@@ -223,7 +223,7 @@ static READ8_HANDLER( spotty_sound_r )
return space->machine->device<okim6295_device>("oki")->read(*space,0);
}
-static ADDRESS_MAP_START( spotty_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spotty_sound_io_map, AS_IO, 8 )
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READ(spotty_sound_r) AM_DEVWRITE_MODERN("oki", okim6295_device, write) //? sound latch and ?
AM_RANGE(MCS51_PORT_P3, MCS51_PORT_P3) AM_READWRITE(spotty_sound_cmd_r, spotty_sound_cmd_w) //not sure about anything...
ADDRESS_MAP_END
@@ -1041,7 +1041,7 @@ static READ32_HANDLER( spotty_speedup_r )
static DRIVER_INIT( dynabomb )
{
limenko_state *state = machine->driver_data<limenko_state>();
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe2784, 0xe2787, 0, 0, dynabomb_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe2784, 0xe2787, 0, 0, dynabomb_speedup_r );
state->spriteram_bit = 1;
}
@@ -1049,7 +1049,7 @@ static DRIVER_INIT( dynabomb )
static DRIVER_INIT( legendoh )
{
limenko_state *state = machine->driver_data<limenko_state>();
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x32ab0, 0x32ab3, 0, 0, legendoh_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x32ab0, 0x32ab3, 0, 0, legendoh_speedup_r );
state->spriteram_bit = 1;
}
@@ -1057,7 +1057,7 @@ static DRIVER_INIT( legendoh )
static DRIVER_INIT( sb2003 )
{
limenko_state *state = machine->driver_data<limenko_state>();
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x135800, 0x135803, 0, 0, sb2003_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x135800, 0x135803, 0, 0, sb2003_speedup_r );
state->spriteram_bit = 1;
}
@@ -1078,7 +1078,7 @@ static DRIVER_INIT( spotty )
dst[x+2] = (src[x+1]&0x0f) >> 0;
}
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6626c, 0x6626f, 0, 0, spotty_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6626c, 0x6626f, 0, 0, spotty_speedup_r );
state->spriteram_bit = 1;
}
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index 3e1b7724aa7..2dd265960bb 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -131,7 +131,7 @@ WRITE16_HANDLER( palette_reset_w )
}
/* this map is wrong because our VDP access is wrong! */
-static ADDRESS_MAP_START( littlerb_vdp_map8, 0, 16 )
+static ADDRESS_MAP_START( littlerb_vdp_map8, AS_0, 16 )
AM_RANGE(0x00000000, 0x0007ffff) AM_RAM_WRITE(region4_w)
/* these are definitely written by a non-incrementing access to the VDP */
@@ -182,7 +182,7 @@ public:
}
protected:
- virtual const address_space_config *memory_space_config(int spacenum = 0) const
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const
{
return (spacenum == 0) ? &m_space_config : NULL;
}
@@ -333,7 +333,7 @@ static WRITE16_HANDLER( littlerb_vdp_w )
}
-static ADDRESS_MAP_START( littlerb_main, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( littlerb_main, AS_PROGRAM, 16 )
AM_RANGE(0x000008, 0x000017) AM_WRITENOP
AM_RANGE(0x000020, 0x00002f) AM_WRITENOP
AM_RANGE(0x000070, 0x000073) AM_WRITENOP
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index d62fd8f798d..d815d5d7ca4 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -134,7 +134,7 @@ static READ8_HANDLER(sound_status_r)
return 0xff;
}
-static ADDRESS_MAP_START( lkage_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lkage_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM /* work ram */
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_BASE_GENERIC(paletteram)
@@ -164,11 +164,11 @@ static READ8_HANDLER( port_fetch_r )
return space->machine->region("user1")->base()[offset];
}
-static ADDRESS_MAP_START( lkage_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( lkage_io_map, AS_IO, 8 )
AM_RANGE(0x4000, 0x7fff) AM_READ(port_fetch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lkage_m68705_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lkage_m68705_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(lkage_68705_port_a_r,lkage_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(lkage_68705_port_b_r,lkage_68705_port_b_w)
@@ -184,7 +184,7 @@ ADDRESS_MAP_END
/* sound section is almost identical to Bubble Bobble, YM2203 instead of YM3526 */
-static ADDRESS_MAP_START( lkage_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lkage_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ym1", ym2203_r,ym2203_w)
@@ -977,9 +977,9 @@ static DRIVER_INIT( lkage )
static DRIVER_INIT( lkageb )
{
lkage_state *state = machine->driver_data<lkage_state>();
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf062, 0xf062, 0, 0, fake_mcu_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf087, 0xf087, 0, 0, fake_status_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf062, 0xf062, 0, 0, fake_mcu_w );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf062, 0xf062, 0, 0, fake_mcu_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf087, 0xf087, 0, 0, fake_status_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf062, 0xf062, 0, 0, fake_mcu_w );
state->sprite_dx=0;
}
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index cc560f1c8e2..d82e9d74c07 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -65,14 +65,14 @@ static WRITE16_HANDLER( adrst_w )
static READ16_HANDLER( main_gnd_r )
{
lockon_state *state = space->machine->driver_data<lockon_state>();
- address_space *gndspace = state->ground->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *gndspace = state->ground->memory().space(AS_PROGRAM);
return gndspace->read_word(V30_GND_ADDR | offset * 2);
}
static WRITE16_HANDLER( main_gnd_w )
{
lockon_state *state = space->machine->driver_data<lockon_state>();
- address_space *gndspace = state->ground->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *gndspace = state->ground->memory().space(AS_PROGRAM);
if (ACCESSING_BITS_0_7)
gndspace->write_byte(V30_GND_ADDR | (offset * 2 + 0), data);
@@ -83,14 +83,14 @@ static WRITE16_HANDLER( main_gnd_w )
static READ16_HANDLER( main_obj_r )
{
lockon_state *state = space->machine->driver_data<lockon_state>();
- address_space *objspace = state->object->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *objspace = state->object->memory().space(AS_PROGRAM);
return objspace->read_word(V30_OBJ_ADDR | offset * 2);
}
static WRITE16_HANDLER( main_obj_w )
{
lockon_state *state = space->machine->driver_data<lockon_state>();
- address_space *objspace = state->object->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *objspace = state->object->memory().space(AS_PROGRAM);
if (ACCESSING_BITS_0_7)
objspace->write_byte(V30_OBJ_ADDR | (offset * 2 + 0), data);
@@ -104,8 +104,8 @@ static WRITE16_HANDLER( tst_w )
if (offset < 0x800)
{
- address_space *gndspace = state->ground->memory().space(ADDRESS_SPACE_PROGRAM);
- address_space *objspace = state->object->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *gndspace = state->ground->memory().space(AS_PROGRAM);
+ address_space *objspace = state->object->memory().space(AS_PROGRAM);
if (ACCESSING_BITS_0_7)
gndspace->write_byte(V30_GND_ADDR | (offset * 2 + 0), data);
@@ -122,14 +122,14 @@ static WRITE16_HANDLER( tst_w )
static READ16_HANDLER( main_z80_r )
{
lockon_state *state = space->machine->driver_data<lockon_state>();
- address_space *sndspace = state->audiocpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *sndspace = state->audiocpu->memory().space(AS_PROGRAM);
return 0xff00 | sndspace->read_byte(offset);
}
static WRITE16_HANDLER( main_z80_w )
{
lockon_state *state = space->machine->driver_data<lockon_state>();
- address_space *sndspace = state->audiocpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *sndspace = state->audiocpu->memory().space(AS_PROGRAM);
sndspace->write_byte(offset, data);
}
@@ -153,7 +153,7 @@ static WRITE16_HANDLER( emres_w )
*
*************************************/
-static ADDRESS_MAP_START( main_v30, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_v30, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000, 0x03fff) AM_RAM
AM_RANGE(0x04000, 0x04003) AM_READWRITE(lockon_crtc_r, lockon_crtc_w)
@@ -175,7 +175,7 @@ static ADDRESS_MAP_START( main_v30, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ground_v30, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ground_v30, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000, 0x03fff) AM_RAM
AM_RANGE(0x04000, 0x04fff) AM_RAM AM_BASE_MEMBER(lockon_state, scene_ram)
@@ -188,7 +188,7 @@ static ADDRESS_MAP_START( ground_v30, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( object_v30, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( object_v30, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000, 0x03fff) AM_RAM
AM_RANGE(0x04000, 0x04001) AM_READWRITE(lockon_obj_4000_r, lockon_obj_4000_w)
@@ -198,7 +198,7 @@ static ADDRESS_MAP_START( object_v30, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_prg, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_prg, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x6fff) AM_ROM
AM_RANGE(0x7000, 0x7000) AM_WRITE(sound_vol)
@@ -206,7 +206,7 @@ static ADDRESS_MAP_START( sound_prg, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7800, 0x7fff) AM_MIRROR(0x8000) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x02, 0x02) AM_NOP
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index c2fcb380498..65036c8fe19 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -484,7 +484,7 @@ static READ8_HANDLER( protection_r )
*
*************************************/
-static ADDRESS_MAP_START( looping_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( looping_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(looping_videoram_w) AM_BASE_MEMBER(looping_state, videoram)
@@ -504,7 +504,7 @@ static ADDRESS_MAP_START( looping_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf803, 0xf803) AM_MIRROR(0x03fc) AM_READWRITE(adc_r, adc_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( looping_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( looping_io_map, AS_IO, 8 )
/* 400 = A16 */
/* 401 = A17 */
/* 402 = COLOR 9 */
@@ -519,7 +519,7 @@ ADDRESS_MAP_END
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( looping_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( looping_sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x37ff) AM_ROM
AM_RANGE(0x3800, 0x3bff) AM_RAM
@@ -531,7 +531,7 @@ static ADDRESS_MAP_START( looping_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x3e03, 0x3e03) AM_MIRROR(0x00f6) AM_NOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( looping_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( looping_sound_io_map, AS_IO, 8 )
AM_RANGE(0x000, 0x000) AM_WRITE(looping_souint_clr)
AM_RANGE(0x001, 0x007) AM_DEVWRITE("dac", looping_sound_sw)
AM_RANGE(0x008, 0x008) AM_DEVWRITE("aysnd", ay_enable_w)
@@ -542,15 +542,15 @@ ADDRESS_MAP_END
/* standard COP420 map */
-static ADDRESS_MAP_START( looping_cop_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( looping_cop_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( looping_cop_data_map, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( looping_cop_data_map, AS_DATA, 8 )
AM_RANGE(0x0000, 0x003f) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( looping_cop_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( looping_cop_io_map, AS_IO, 8 )
AM_RANGE(0x0100, 0x0107) AM_READWRITE(cop_io_r, cop_io_w)
ADDRESS_MAP_END
@@ -899,7 +899,7 @@ static DRIVER_INIT( looping )
rom[i] = BITSWAP8(rom[i], 0,1,2,3,4,5,6,7);
/* install protection handlers */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x7000, 0x7007, 0, 0, protection_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x7000, 0x7007, 0, 0, protection_r);
}
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index d19d0fb39a2..5be87e6de75 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -267,7 +267,7 @@ static WRITE16_HANDLER( lordgun_soundlatch_w )
cputag_set_input_line(space->machine, "soundcpu", INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( lordgun_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( lordgun_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_BASE_MEMBER(lordgun_state, priority_ram) // PRIORITY
@@ -299,7 +299,7 @@ static ADDRESS_MAP_START( lordgun_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aliencha_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( aliencha_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_BASE_MEMBER(lordgun_state, priority_ram) // PRIORITY
@@ -333,7 +333,7 @@ ADDRESS_MAP_END
***************************************************************************/
-static ADDRESS_MAP_START( lordgun_soundmem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lordgun_soundmem_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -345,7 +345,7 @@ static WRITE8_DEVICE_HANDLER( lordgun_okibank_w )
// popmessage("OKI %x", data);
}
-static ADDRESS_MAP_START( lordgun_soundio_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( lordgun_soundio_map, AS_IO, 8 )
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE( "ymsnd", ym3812_w )
AM_RANGE(0x2000, 0x2000) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
AM_RANGE(0x3000, 0x3000) AM_READ( soundlatch2_r )
@@ -355,7 +355,7 @@ static ADDRESS_MAP_START( lordgun_soundio_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aliencha_soundio_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( aliencha_soundio_map, AS_IO, 8 )
AM_RANGE(0x3000, 0x3000) AM_READ( soundlatch2_r )
AM_RANGE(0x4000, 0x4000) AM_READ( soundlatch_r )
AM_RANGE(0x5000, 0x5000) AM_WRITENOP // writes 03 then 07 at end of NMI
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index c9054b29bc4..1a04bd334fd 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -165,7 +165,7 @@ static WRITE8_HANDLER( lsasquad_bankswitch_w )
/* other bits unknown */
}
-static ADDRESS_MAP_START( lsasquad_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lsasquad_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xbfff) AM_RAM /* SRAM */
@@ -186,7 +186,7 @@ static ADDRESS_MAP_START( lsasquad_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xee00, 0xee00) AM_READWRITE(lsasquad_mcu_r,lsasquad_mcu_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lsasquad_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lsasquad_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2203_r,ym2203_w)
@@ -198,7 +198,7 @@ static ADDRESS_MAP_START( lsasquad_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_ROM /* space for diagnostic ROM? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lsasquad_m68705_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lsasquad_m68705_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(lsasquad_68705_port_a_r,lsasquad_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(lsasquad_68705_port_b_r,lsasquad_68705_port_b_w)
@@ -210,7 +210,7 @@ static ADDRESS_MAP_START( lsasquad_m68705_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( storming_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( storming_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xbfff) AM_RAM /* SRAM */
@@ -373,7 +373,7 @@ INPUT_PORTS_END
/* DAIKAIJU */
-static ADDRESS_MAP_START( daikaiju_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( daikaiju_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xbfff) AM_RAM /* SRAM */
@@ -393,7 +393,7 @@ static ADDRESS_MAP_START( daikaiju_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xee00, 0xee00) AM_READWRITE(lsasquad_mcu_r, lsasquad_mcu_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( daikaiju_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( daikaiju_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c
index eb18c90b666..652f74c6a0b 100644
--- a/src/mame/drivers/ltcasino.c
+++ b/src/mame/drivers/ltcasino.c
@@ -67,7 +67,7 @@ static WRITE8_HANDLER( ltcasino_tile_atr_w )
}
-static ADDRESS_MAP_START( ltcasino_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ltcasino_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xcfff) AM_ROM
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(ltcasino_tile_num_w) AM_BASE_MEMBER(ltcasino_state, tile_num_ram)
diff --git a/src/mame/drivers/ltd.c b/src/mame/drivers/ltd.c
index 1a10a9ba553..7a8e90cd19f 100644
--- a/src/mame/drivers/ltd.c
+++ b/src/mame/drivers/ltd.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( ltd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ltd_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c
index 5ff72af1085..f3fb3befc1b 100644
--- a/src/mame/drivers/luckgrln.c
+++ b/src/mame/drivers/luckgrln.c
@@ -363,7 +363,7 @@ static SCREEN_UPDATE(luckgrln)
return 0;
}
-static ADDRESS_MAP_START( mainmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mainmap, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x03fff) AM_ROM
AM_RANGE(0x10000, 0x1ffff) AM_ROM AM_REGION("rom_data",0x10000)
AM_RANGE(0x20000, 0x2ffff) AM_ROM AM_REGION("rom_data",0x00000)
@@ -542,7 +542,7 @@ static WRITE8_HANDLER(counters_w)
/* are some of these reads / writes mirrored? there seem to be far too many */
-static ADDRESS_MAP_START( portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff) // i think
AM_RANGE(0x0000, 0x003f) AM_RAM // Z180 internal regs
AM_RANGE(0x0060, 0x0060) AM_WRITE(output_w)
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index 227d33e6241..8ef7bc1e3bd 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -806,7 +806,7 @@ static INTERRUPT_GEN( nmi_interrupt )
* Memory Map Information *
*************************/
-static ADDRESS_MAP_START( lucky74_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lucky74_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_SHARE("nvram") /* NVRAM */
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(lucky74_fg_videoram_w) AM_BASE_MEMBER(lucky74_state, fg_videoram) /* VRAM1-1 */
@@ -826,7 +826,7 @@ static ADDRESS_MAP_START( lucky74_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xf803) AM_READWRITE(copro_sm7831_r, copro_sm7831_w) /* SM7831 Co-Processor */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lucky74_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( lucky74_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x05) AM_READWRITE(custom_09R81P_port_r, custom_09R81P_port_w) /* custom 09R81P (samples system) */
// AM_RANGE(0xff, 0xff) AM_READWRITE(???)
diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c
index 44450b1bcbb..bd7f2c6a19d 100644
--- a/src/mame/drivers/lvcards.c
+++ b/src/mame/drivers/lvcards.c
@@ -150,7 +150,7 @@ static READ8_HANDLER( payout_r )
return state->result;
}
-static ADDRESS_MAP_START( ponttehk_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ponttehk_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(lvcards_videoram_w) AM_BASE_MEMBER(lvcards_state, videoram)
@@ -160,7 +160,7 @@ static ADDRESS_MAP_START( ponttehk_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa002, 0xa002) AM_READ(payout_r) AM_WRITE(control_port_2a_w)//AM_WRITENOP // ???
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lvcards_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lvcards_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(lvcards_videoram_w) AM_BASE_MEMBER(lvcards_state, videoram)
@@ -171,13 +171,13 @@ static ADDRESS_MAP_START( lvcards_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xdfff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lvcards_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( lvcards_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_data_address_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lvpoker_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lvpoker_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(lvcards_videoram_w) AM_BASE_MEMBER(lvcards_state, videoram)
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index b3ee96081b0..ff8bd2eb293 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -90,7 +90,7 @@ static WRITE8_HANDLER( lwings_bankswitch_w )
static INTERRUPT_GEN( lwings_interrupt )
{
- if (interrupt_enable_r(device->memory().space(ADDRESS_SPACE_PROGRAM), 0))
+ if (interrupt_enable_r(device->memory().space(AS_PROGRAM), 0))
device_set_input_line_and_vector(device, 0, HOLD_LINE, 0xd7); /* RST 10h */
}
@@ -275,7 +275,7 @@ static WRITE8_DEVICE_HANDLER( msm5205_w )
msm5205_vclk_w(device, 0);
}
-static ADDRESS_MAP_START( avengers_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( avengers_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xddff) AM_RAM
@@ -299,7 +299,7 @@ static ADDRESS_MAP_START( avengers_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf80e, 0xf80e) AM_WRITE(lwings_bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lwings_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lwings_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xddff) AM_RAM
@@ -320,7 +320,7 @@ static ADDRESS_MAP_START( lwings_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf80e, 0xf80e) AM_WRITE(lwings_bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( trojan_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( trojan_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xddff) AM_RAM
@@ -344,7 +344,7 @@ static ADDRESS_MAP_START( trojan_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf80e, 0xf80e) AM_WRITE(lwings_bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lwings_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lwings_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r)
@@ -355,17 +355,17 @@ static ADDRESS_MAP_START( lwings_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* Yes, _no_ ram */
-static ADDRESS_MAP_START( trojan_adpcm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( trojan_adpcm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( avengers_adpcm_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( avengers_adpcm_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(avengers_adpcm_r)
AM_RANGE(0x01, 0x01) AM_DEVWRITE("5205", msm5205_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( trojan_adpcm_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( trojan_adpcm_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch2_r)
AM_RANGE(0x01, 0x01) AM_DEVWRITE("5205", msm5205_w)
diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c
index c600de11b72..81ab3585d8f 100644
--- a/src/mame/drivers/m10.c
+++ b/src/mame/drivers/m10.c
@@ -557,7 +557,7 @@ static INTERRUPT_GEN( m15_interrupt )
*
*************************************/
-static ADDRESS_MAP_START( m10_main, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m10_main, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x02ff) AM_RAM AM_BASE_MEMBER(m10_state, memory) /* scratch ram */
AM_RANGE(0x1000, 0x2fff) AM_ROM AM_BASE_MEMBER(m10_state, rom)
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_SIZE_MEMBER(m10_state, videoram, videoram_size)
@@ -571,7 +571,7 @@ static ADDRESS_MAP_START( m10_main, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc00, 0xffff) AM_ROM /* for the reset / interrupt vectors */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m11_main, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m11_main, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x02ff) AM_RAM AM_BASE_MEMBER(m10_state, memory) /* scratch ram */
AM_RANGE(0x1000, 0x2fff) AM_ROM AM_BASE_MEMBER(m10_state, rom)
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_SIZE_MEMBER(m10_state, videoram, videoram_size)
@@ -585,7 +585,7 @@ static ADDRESS_MAP_START( m11_main, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc00, 0xffff) AM_ROM /* for the reset / interrupt vectors */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m15_main, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m15_main, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x02ff) AM_RAM AM_BASE_MEMBER(m10_state, memory) /* scratch ram */
AM_RANGE(0x1000, 0x33ff) AM_ROM AM_BASE_MEMBER(m10_state, rom)
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_BASE_SIZE_MEMBER(m10_state, videoram, videoram_size)
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 47c03af88af..a0ac6fb5b1b 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -168,7 +168,7 @@ static WRITE16_HANDLER( m107_sound_reset_w )
/*****************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x9ffff) AM_ROM
AM_RANGE(0xa0000, 0xbffff) AM_ROMBANK("bank1")
AM_RANGE(0xd0000, 0xdffff) AM_RAM_WRITE(m107_vram_w) AM_BASE_MEMBER(m107_state, vram_data)
@@ -178,7 +178,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_READ_PORT("P1_P2")
AM_RANGE(0x02, 0x03) AM_READ_PORT("COINS_DSW3")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
@@ -206,14 +206,14 @@ static WRITE16_HANDLER( wpksoc_output_w )
popmessage("%04x",data);
}
-static ADDRESS_MAP_START( wpksoc_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wpksoc_map, AS_PROGRAM, 16 )
AM_RANGE(0xf0000, 0xf0001) AM_READ_PORT("WPK_DSW0")
AM_RANGE(0xf0002, 0xf0003) AM_READ_PORT("WPK_DSW1")
AM_RANGE(0xf0004, 0xf0005) AM_READ_PORT("WPK_DSW2")
AM_IMPORT_FROM(main_map)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wpksoc_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( wpksoc_io_map, AS_IO, 16 )
AM_RANGE(0x22, 0x23) AM_WRITE(wpksoc_output_w)
AM_RANGE(0xc0, 0xc1) AM_READ_PORT("WPK_IN0")
AM_RANGE(0xc2, 0xc3) AM_READ_PORT("WPK_IN1")
@@ -222,7 +222,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x9ff00, 0x9ffff) AM_WRITENOP /* Irq controller? */
AM_RANGE(0xa0000, 0xa3fff) AM_RAM
diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c
index d8941acba86..b6b33d19c58 100644
--- a/src/mame/drivers/m14.c
+++ b/src/mame/drivers/m14.c
@@ -198,14 +198,14 @@ static WRITE8_HANDLER( hopper_w )
*
*************************************/
-static ADDRESS_MAP_START( m14_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m14_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0xe000, 0xe3ff) AM_RAM_WRITE(m14_vram_w) AM_BASE_MEMBER(m14_state, video_ram)
AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE(m14_cram_w) AM_BASE_MEMBER(m14_state, color_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m14_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( m14_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xf8, 0xf8) AM_READ_PORT("AN_PADDLE") AM_WRITENOP
AM_RANGE(0xf9, 0xf9) AM_READ(input_buttons_r) AM_WRITENOP
diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c
index dacd001e340..2ef7c62edd8 100644
--- a/src/mame/drivers/m52.c
+++ b/src/mame/drivers/m52.c
@@ -58,7 +58,7 @@
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(m52_videoram_w) AM_BASE_MEMBER(m52_state, videoram)
AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(m52_colorram_w) AM_BASE_MEMBER(m52_state, colorram)
@@ -75,7 +75,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( alpha1v_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( alpha1v_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x6fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(m52_videoram_w) AM_BASE_MEMBER(m52_state, videoram)
AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(m52_colorram_w) AM_BASE_MEMBER(m52_state, colorram)
@@ -89,7 +89,7 @@ static ADDRESS_MAP_START( alpha1v_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x1f) AM_WRITE(m52_scroll_w)
AM_RANGE(0x40, 0x40) AM_MIRROR(0x1f) AM_WRITE(m52_bg1xpos_w)
diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c
index 1f0c5b2636e..a5a684dca5c 100644
--- a/src/mame/drivers/m57.c
+++ b/src/mame/drivers/m57.c
@@ -64,7 +64,7 @@
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(m57_videoram_w) AM_BASE_MEMBER(m57_state, videoram)
AM_RANGE(0x9000, 0x91ff) AM_RAM AM_BASE_MEMBER(m57_state, scrollram)
diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c
index d2e6dfbbb00..b1d22552763 100644
--- a/src/mame/drivers/m58.c
+++ b/src/mame/drivers/m58.c
@@ -24,7 +24,7 @@
*
*************************************/
-static ADDRESS_MAP_START( yard_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( yard_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(yard_videoram_w) AM_BASE_MEMBER(m58_state, videoram)
AM_RANGE(0x9000, 0x9fff) AM_WRITE(yard_scroll_panel_w)
diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c
index 0b4b5fe1d79..b5f1fe71929 100644
--- a/src/mame/drivers/m62.c
+++ b/src/mame/drivers/m62.c
@@ -172,7 +172,7 @@ static WRITE8_HANDLER( youjyudn_bankswitch_w )
}
-static ADDRESS_MAP_START( kungfum_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kungfum_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITE(m62_hscroll_low_w)
AM_RANGE(0xb000, 0xb000) AM_WRITE(m62_hscroll_high_w)
@@ -183,7 +183,7 @@ static ADDRESS_MAP_START( kungfum_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kungfum_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kungfum_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE(irem_sound_cmd_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
@@ -192,7 +192,7 @@ static ADDRESS_MAP_START( kungfum_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( battroad_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( battroad_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(m62_state, spriteram, spriteram_size)
@@ -201,7 +201,7 @@ static ADDRESS_MAP_START( battroad_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( battroad_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( battroad_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE(irem_sound_cmd_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
@@ -214,14 +214,14 @@ static ADDRESS_MAP_START( battroad_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x83, 0x83) AM_WRITE(battroad_bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ldrun_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ldrun_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(m62_state, spriteram, spriteram_size)
AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE_MEMBER(m62_state, m62_tileram)
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ldrun2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ldrun2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(m62_state, spriteram, spriteram_size)
@@ -229,7 +229,7 @@ static ADDRESS_MAP_START( ldrun2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ldrun2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ldrun2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE(irem_sound_cmd_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
@@ -240,7 +240,7 @@ static ADDRESS_MAP_START( ldrun2_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x80, 0x81) AM_WRITE(ldrun2_bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ldrun3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ldrun3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc800, 0xc800) AM_READ(ldrun3_prot_5_r)
AM_RANGE(0xcc00, 0xcc00) AM_READ(ldrun3_prot_7_r)
@@ -250,7 +250,7 @@ static ADDRESS_MAP_START( ldrun3_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ldrun3_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ldrun3_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE(irem_sound_cmd_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
@@ -261,7 +261,7 @@ static ADDRESS_MAP_START( ldrun3_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x81, 0x81) AM_WRITE(ldrun3_topbottom_mask_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ldrun4_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ldrun4_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(m62_state, spriteram, spriteram_size)
@@ -270,7 +270,7 @@ static ADDRESS_MAP_START( ldrun4_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ldrun4_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ldrun4_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE(irem_sound_cmd_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
@@ -281,7 +281,7 @@ static ADDRESS_MAP_START( ldrun4_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x83, 0x83) AM_WRITE(m62_hscroll_low_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lotlot_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lotlot_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(m62_textram_w) AM_BASE_MEMBER(m62_state, m62_textram)
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(m62_state, spriteram, spriteram_size)
@@ -289,7 +289,7 @@ static ADDRESS_MAP_START( lotlot_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kidniki_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kidniki_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(m62_tileram_w) AM_BASE_MEMBER(m62_state, m62_tileram)
@@ -298,7 +298,7 @@ static ADDRESS_MAP_START( kidniki_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kidniki_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kidniki_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE(irem_sound_cmd_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
@@ -313,7 +313,7 @@ static ADDRESS_MAP_START( kidniki_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x85, 0x85) AM_WRITE(kidniki_bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spelunkr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spelunkr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE(m62_tileram_w) AM_BASE_MEMBER(m62_state, m62_tileram)
@@ -328,7 +328,7 @@ static ADDRESS_MAP_START( spelunkr_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spelunk2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spelunk2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_ROMBANK("bank1")
AM_RANGE(0x9000, 0x9fff) AM_ROMBANK("bank2")
@@ -342,7 +342,7 @@ static ADDRESS_MAP_START( spelunk2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( youjyudn_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( youjyudn_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc0ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(m62_state, spriteram, spriteram_size)
@@ -351,7 +351,7 @@ static ADDRESS_MAP_START( youjyudn_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( youjyudn_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( youjyudn_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE(irem_sound_cmd_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(m62_flipscreen_w) /* + coin counters */
@@ -363,7 +363,7 @@ static ADDRESS_MAP_START( youjyudn_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x83, 0x83) AM_WRITE(youjyudn_bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( horizon_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( horizon_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc1ff) AM_RAM AM_BASE_SIZE_MEMBER(m62_state, spriteram, spriteram_size)
AM_RANGE(0xc800, 0xc83f) AM_RAM_WRITE(horizon_scrollram_w) AM_BASE_MEMBER(m62_state, scrollram)
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index e62e6fcdd9d..598e7c4c58f 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -430,7 +430,7 @@ static WRITE8_HANDLER( fghtbskt_samples_w )
sample_start_raw(state->samples, 0, state->samplebuf + ((data & 0xf0) << 8), 0x2000, 8000, 0);
}
-static ADDRESS_MAP_START( m63_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m63_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xd000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe1ff) AM_RAM
@@ -450,7 +450,7 @@ static ADDRESS_MAP_START( m63_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf806, 0xf806) AM_READ_PORT("DSW2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fghtbskt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fghtbskt_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
@@ -477,12 +477,12 @@ static ADDRESS_MAP_START( fghtbskt_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf807, 0xf807) AM_WRITE(fghtbskt_samples_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( i8039_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( i8039_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( i8039_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( i8039_port_map, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READWRITE(snddata_r, snddata_w)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_WRITE(p1_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(p2_w)
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index 894dd208ebf..d155607bb54 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -369,9 +369,9 @@ static READ8_HANDLER( m72_snd_cpu_sample_r )
INLINE DRIVER_INIT( m72_8751 )
{
m72_state *state = machine->driver_data<m72_state>();
- address_space *program = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
- address_space *io = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
- address_space *sndio = machine->device("soundcpu")->memory().space(ADDRESS_SPACE_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);
device_t *dac = machine->device("dac");
state->protection_ram = auto_alloc_array(machine, UINT16, 0x10000/2);
@@ -453,7 +453,7 @@ static int find_sample(int num)
static INTERRUPT_GEN(fake_nmi)
{
- address_space *space = device->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->memory().space(AS_PROGRAM);
int sample = m72_sample_r(space,0);
if (sample)
m72_sample_w(device->machine->device("dac"),0,sample);
@@ -750,9 +750,9 @@ static void install_protection_handler(running_machine *machine, const UINT8 *co
state->protection_ram = auto_alloc_array(machine, UINT16, 0x1000/2);
state->protection_code = code;
state->protection_crc = crc;
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xb0000, 0xb0fff, 0, 0, "bank1");
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xb0ffa, 0xb0ffb, 0, 0, protection_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xb0000, 0xb0fff, 0, 0, protection_w);
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xb0000, 0xb0fff, 0, 0, "bank1");
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xb0ffa, 0xb0ffb, 0, 0, protection_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xb0000, 0xb0fff, 0, 0, protection_w);
memory_set_bankptr(machine, "bank1", state->protection_ram);
}
@@ -760,28 +760,28 @@ static DRIVER_INIT( bchopper )
{
install_protection_handler(machine, bchopper_code,bchopper_crc);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xc0, 0xc1, 0, 0, bchopper_sample_trigger_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_IO), 0xc0, 0xc1, 0, 0, bchopper_sample_trigger_w);
}
static DRIVER_INIT( mrheli )
{
install_protection_handler(machine, bchopper_code,mrheli_crc);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xc0, 0xc1, 0, 0, bchopper_sample_trigger_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_IO), 0xc0, 0xc1, 0, 0, bchopper_sample_trigger_w);
}
static DRIVER_INIT( nspirit )
{
install_protection_handler(machine, nspirit_code,nspirit_crc);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xc0, 0xc1, 0, 0, nspirit_sample_trigger_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_IO), 0xc0, 0xc1, 0, 0, nspirit_sample_trigger_w);
}
static DRIVER_INIT( imgfight )
{
install_protection_handler(machine, imgfight_code,imgfight_crc);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xc0, 0xc1, 0, 0, imgfight_sample_trigger_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_IO), 0xc0, 0xc1, 0, 0, imgfight_sample_trigger_w);
}
static DRIVER_INIT( loht )
@@ -789,7 +789,7 @@ static DRIVER_INIT( loht )
m72_state *state = machine->driver_data<m72_state>();
install_protection_handler(machine, loht_code,loht_crc);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xc0, 0xc1, 0, 0, loht_sample_trigger_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_IO), 0xc0, 0xc1, 0, 0, loht_sample_trigger_w);
/* since we skip the startup tests, clear video RAM to prevent garbage on title screen */
memset(state->videoram2,0,0x4000);
@@ -799,33 +799,33 @@ static DRIVER_INIT( xmultiplm72 )
{
install_protection_handler(machine, xmultiplm72_code,xmultiplm72_crc);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xc0, 0xc1, 0, 0, xmultiplm72_sample_trigger_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_IO), 0xc0, 0xc1, 0, 0, xmultiplm72_sample_trigger_w);
}
static DRIVER_INIT( dbreedm72 )
{
install_protection_handler(machine, dbreedm72_code,dbreedm72_crc);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xc0, 0xc1, 0, 0, dbreedm72_sample_trigger_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_IO), 0xc0, 0xc1, 0, 0, dbreedm72_sample_trigger_w);
}
static DRIVER_INIT( airduel )
{
install_protection_handler(machine, airduel_code,airduel_crc);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xc0, 0xc1, 0, 0, airduel_sample_trigger_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_IO), 0xc0, 0xc1, 0, 0, airduel_sample_trigger_w);
}
static DRIVER_INIT( dkgenm72 )
{
install_protection_handler(machine, dkgenm72_code,dkgenm72_crc);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xc0, 0xc1, 0, 0, dkgenm72_sample_trigger_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_IO), 0xc0, 0xc1, 0, 0, dkgenm72_sample_trigger_w);
}
static DRIVER_INIT( gallop )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xc0, 0xc1, 0, 0, gallop_sample_trigger_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_IO), 0xc0, 0xc1, 0, 0, gallop_sample_trigger_w);
}
@@ -882,7 +882,7 @@ static READ16_HANDLER( poundfor_trackball_r )
#define CPU1_MEMORY(NAME,ROMSIZE,WORKRAM) \
-static ADDRESS_MAP_START( NAME##_map, ADDRESS_SPACE_PROGRAM, 16 ) \
+static ADDRESS_MAP_START( NAME##_map, AS_PROGRAM, 16 ) \
AM_RANGE(0x00000, ROMSIZE-1) AM_ROM \
AM_RANGE(WORKRAM, WORKRAM+0x3fff) AM_RAM /* work RAM */ \
AM_RANGE(0xc0000, 0xc03ff) AM_RAM AM_BASE_SIZE_MEMBER(m72_state, spriteram, spriteram_size) \
@@ -901,7 +901,7 @@ CPU1_MEMORY( rtype, 0x40000, 0x40000 )
CPU1_MEMORY( xmultiplm72, 0x80000, 0x80000 )
CPU1_MEMORY( dbreedm72, 0x80000, 0x90000 )
-static ADDRESS_MAP_START( xmultipl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( xmultipl_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0x9c000, 0x9ffff) AM_RAM /* work RAM */
AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITEONLY /* leftover from protection?? */
@@ -913,7 +913,7 @@ static ADDRESS_MAP_START( xmultipl_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dbreed_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dbreed_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0x88000, 0x8bfff) AM_RAM /* work RAM */
AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITEONLY /* leftover from protection?? */
@@ -925,7 +925,7 @@ static ADDRESS_MAP_START( dbreed_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rtype2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rtype2_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0xb0000, 0xb0001) AM_WRITE(m72_irq_line_w)
AM_RANGE(0xbc000, 0xbc001) AM_WRITE(m72_dmaon_w)
@@ -938,7 +938,7 @@ static ADDRESS_MAP_START( rtype2_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( majtitle_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( majtitle_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0xa0000, 0xa03ff) AM_RAM AM_BASE_MEMBER(m72_state, majtitle_rowscrollram)
AM_RANGE(0xa4000, 0xa4bff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_BASE_GENERIC(paletteram2)
@@ -954,7 +954,7 @@ static ADDRESS_MAP_START( majtitle_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hharry_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hharry_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0xa0000, 0xa3fff) AM_RAM /* work RAM */
AM_RANGE(0xb0ffe, 0xb0fff) AM_WRITEONLY /* leftover from protection?? */
@@ -966,7 +966,7 @@ static ADDRESS_MAP_START( hharry_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hharryu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hharryu_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0xa0000, 0xa0bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xa8000, 0xa8bff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_BASE_GENERIC(paletteram2)
@@ -980,7 +980,7 @@ static ADDRESS_MAP_START( hharryu_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kengo_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( kengo_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0xa0000, 0xa0bff) AM_READWRITE(m72_palette1_r, m72_palette1_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xa8000, 0xa8bff) AM_READWRITE(m72_palette2_r, m72_palette2_w) AM_BASE_GENERIC(paletteram2)
@@ -994,7 +994,7 @@ static ADDRESS_MAP_START( kengo_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m72_portmap, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( m72_portmap, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0")
AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
@@ -1010,7 +1010,7 @@ static ADDRESS_MAP_START( m72_portmap, ADDRESS_SPACE_IO, 16 )
/* { 0xc0, 0xc0 trigger sample, filled by init_ function */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rtype2_portmap, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( rtype2_portmap, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0")
AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
@@ -1023,7 +1023,7 @@ static ADDRESS_MAP_START( rtype2_portmap, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x86, 0x87) AM_WRITE(m72_scrollx2_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( poundfor_portmap, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( poundfor_portmap, AS_IO, 16 )
AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
AM_RANGE(0x08, 0x0f) AM_READ(poundfor_trackball_r)
@@ -1036,7 +1036,7 @@ static ADDRESS_MAP_START( poundfor_portmap, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x86, 0x87) AM_WRITE(m72_scrollx2_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( majtitle_portmap, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( majtitle_portmap, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0")
AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
@@ -1050,7 +1050,7 @@ static ADDRESS_MAP_START( majtitle_portmap, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x8e, 0x8f) AM_WRITE(majtitle_gfx_ctrl_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hharry_portmap, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( hharry_portmap, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0")
AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
@@ -1065,7 +1065,7 @@ static ADDRESS_MAP_START( hharry_portmap, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x86, 0x87) AM_WRITE(m72_scrollx2_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kengo_portmap, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( kengo_portmap, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0")
AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
@@ -1079,16 +1079,16 @@ static ADDRESS_MAP_START( kengo_portmap, ADDRESS_SPACE_IO, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_ram_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_ram_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_RAM AM_BASE_MEMBER(m72_state, soundram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_rom_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_rom_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rtype_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rtype_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r)
@@ -1096,7 +1096,7 @@ static ADDRESS_MAP_START( rtype_sound_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r)
@@ -1105,7 +1105,7 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rtype2_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rtype2_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r)
@@ -1116,7 +1116,7 @@ static ADDRESS_MAP_START( rtype2_sound_portmap, ADDRESS_SPACE_IO, 8 )
// AM_RANGE(0x87, 0x87) AM_WRITENOP /* ??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( poundfor_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( poundfor_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x13) AM_WRITE(poundfor_sample_addr_w)
AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -1124,7 +1124,7 @@ static ADDRESS_MAP_START( poundfor_sound_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x42, 0x42) AM_WRITE(m72_sound_irq_ack_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8 )
/* External access */
AM_RANGE(0x0000, 0x0000) AM_READWRITE(m72_mcu_sample_r, m72_mcu_low_w)
AM_RANGE(0x0001, 0x0001) AM_WRITE(m72_mcu_high_w)
diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c
index 73898ef28fe..2016c32f598 100644
--- a/src/mame/drivers/m79amb.c
+++ b/src/mame/drivers/m79amb.c
@@ -132,7 +132,7 @@ static WRITE8_HANDLER( m79amb_8002_w )
output_set_value("EXP_LAMP", data ? 1 : 0);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x5fff) AM_RAM_WRITE(ramtek_videoram_w) AM_BASE_MEMBER(m79amb_state, videoram)
AM_RANGE(0x6000, 0x63ff) AM_RAM /* ?? */
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index 6285b506980..4994adc086d 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -81,7 +81,7 @@ static WRITE16_HANDLER( unknown_w )
/***************************************************************************/
-static ADDRESS_MAP_START( m90_main_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( m90_main_cpu_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0x80000, 0x8ffff) AM_ROMBANK("bank1") /* Quiz F1 only */
AM_RANGE(0xa0000, 0xa3fff) AM_RAM
@@ -90,7 +90,7 @@ static ADDRESS_MAP_START( m90_main_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dynablsb_main_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dynablsb_main_cpu_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x3ffff) AM_ROM
AM_RANGE(0x6000e, 0x60fff) AM_RAM AM_BASE_SIZE_MEMBER(m90_state, spriteram, spriteram_size)
AM_RANGE(0xa0000, 0xa3fff) AM_RAM
@@ -99,7 +99,7 @@ static ADDRESS_MAP_START( dynablsb_main_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bomblord_main_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bomblord_main_cpu_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0xa0000, 0xa3fff) AM_RAM
AM_RANGE(0xc000e, 0xc0fff) AM_RAM AM_BASE_SIZE_MEMBER(m90_state, spriteram, spriteram_size)
@@ -108,7 +108,7 @@ static ADDRESS_MAP_START( bomblord_main_cpu_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m90_main_cpu_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( m90_main_cpu_io_map, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_WRITE(m72_sound_command_w)
AM_RANGE(0x00, 0x01) AM_READ_PORT("P1_P2")
AM_RANGE(0x02, 0x03) AM_WRITE(m90_coincounter_w)
@@ -119,7 +119,7 @@ static ADDRESS_MAP_START( m90_main_cpu_io_map, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x80, 0x8f) AM_WRITE(m90_video_control_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dynablsb_cpu_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( dynablsb_cpu_io_map, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_WRITE(m72_sound_command_w)
AM_RANGE(0x00, 0x01) AM_READ_PORT("P1_P2")
AM_RANGE(0x02, 0x03) AM_WRITE(m90_coincounter_w)
@@ -133,12 +133,12 @@ ADDRESS_MAP_END
/*****************************************************************************/
-static ADDRESS_MAP_START( m90_sound_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m90_sound_cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m90_sound_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( m90_sound_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r)
@@ -148,7 +148,7 @@ static ADDRESS_MAP_START( m90_sound_cpu_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bbmanw_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bbmanw_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x42, 0x42) AM_READWRITE(soundlatch_r, m72_sound_irq_ack_w)
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index f5d5383bc27..12577f4fb13 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -385,7 +385,7 @@ static WRITE16_HANDLER( m92_sound_reset_w )
/*****************************************************************************/
/* appears to be an earlier board */
-static ADDRESS_MAP_START( lethalth_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( lethalth_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0x80000, 0x8ffff) AM_RAM_WRITE(m92_vram_w) AM_BASE_MEMBER(m92_state, vram_data)
AM_RANGE(0xe0000, 0xeffff) AM_RAM /* System ram */
@@ -396,7 +396,7 @@ static ADDRESS_MAP_START( lethalth_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM AM_REGION("maincpu", 0x7fff0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m92_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( m92_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x9ffff) AM_ROM
AM_RANGE(0xa0000, 0xbffff) AM_ROMBANK("bank1")
AM_RANGE(0xc0000, 0xcffff) AM_ROMBANK("bank2") /* Mirror of rom: Used by In The Hunt as protection */
@@ -409,7 +409,7 @@ static ADDRESS_MAP_START( m92_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m92_portmap, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( m92_portmap, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_READ_PORT("P1_P2")
AM_RANGE(0x02, 0x03) AM_READ_PORT("COINS_DSW3")
AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW")
@@ -428,7 +428,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x9ff00, 0x9ffff) AM_WRITENOP /* Irq controller? */
AM_RANGE(0xa0000, 0xa3fff) AM_RAM
@@ -2155,7 +2155,7 @@ static DRIVER_INIT( majtitl2 )
init_m92(machine, 1);
/* This game has an eprom on the game board */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0000, 0xf3fff, 0, 0, m92_eeprom_r, m92_eeprom_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0000, 0xf3fff, 0, 0, m92_eeprom_r, m92_eeprom_w);
state->game_kludge = 2;
}
@@ -2178,7 +2178,7 @@ static DRIVER_INIT( lethalth )
state->irq_vectorbase = 0x20;
/* NOP out the bankswitcher */
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x20, 0x21, 0, 0);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_IO), 0x20, 0x21, 0, 0);
}
static DRIVER_INIT( nbbatman )
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index 55a7109e783..2e142f5da85 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -402,7 +402,7 @@ static WRITE32_HANDLER( macrossp_palette_fade_w )
/*** MEMORY MAPS *************************************************************/
-static ADDRESS_MAP_START( macrossp_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( macrossp_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
AM_RANGE(0x800000, 0x802fff) AM_RAM AM_BASE_SIZE_MEMBER(macrossp_state, spriteram, spriteram_size)
/* SCR A Layer */
@@ -437,7 +437,7 @@ static ADDRESS_MAP_START( macrossp_map, ADDRESS_SPACE_PROGRAM, 32 )
// AM_RANGE(0xfe0000, 0xfe0003) AM_NOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( macrossp_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( macrossp_sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x207fff) AM_RAM
AM_RANGE(0x400000, 0x40007f) AM_DEVREADWRITE8("ensoniq", es5506_r, es5506_w, 0x00ff)
@@ -792,13 +792,13 @@ static WRITE32_HANDLER( quizmoon_speedup_w )
static DRIVER_INIT( macrossp )
{
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf10158, 0xf1015b, 0, 0, macrossp_speedup_w );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf10158, 0xf1015b, 0, 0, macrossp_speedup_w );
}
static DRIVER_INIT( quizmoon )
{
#ifdef UNUSED_FUNCTION
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf00020, 0xf00023, 0, 0, quizmoon_speedup_w );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf00020, 0xf00023, 0, 0, quizmoon_speedup_w );
#endif
}
diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c
index 4cea8bfcda3..57fd99b7762 100644
--- a/src/mame/drivers/macs.c
+++ b/src/mame/drivers/macs.c
@@ -77,7 +77,7 @@ public:
static MACHINE_RESET(macs);
-static ADDRESS_MAP_START( macs_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( macs_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROMBANK("bank4")
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w)
@@ -170,7 +170,7 @@ static WRITE8_HANDLER( macs_output_w )
}
}
-static ADDRESS_MAP_START( macs_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( macs_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w) /* video/crt regs ? */
AM_RANGE(0xc0, 0xc7) AM_READWRITE(macs_input_r,macs_output_w)
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index 37d29a142b5..d457098d6ad 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -78,7 +78,7 @@ static WRITE8_DEVICE_HANDLER( madalien_portB_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x6000, 0x63ff) AM_RAM_WRITE(madalien_videoram_w) AM_BASE_MEMBER(madalien_state, videoram)
@@ -106,7 +106,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM
AM_RANGE(0x6000, 0x6003) AM_MIRROR(0x1ffc) AM_RAM /* unknown device in an epoxy block, might be tilt detection */
AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x1ffc) AM_READ(madalien_sound_command_r)
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 5574df210d3..6f4bbc54d03 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -36,7 +36,7 @@ static WRITE16_HANDLER( madmotor_sound_w )
/******************************************************************************/
-static ADDRESS_MAP_START( madmotor_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( madmotor_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x180000, 0x18001f) AM_WRITEONLY AM_BASE_MEMBER(madmotor_state, pf1_control)
AM_RANGE(0x184000, 0x1847ff) AM_RAM AM_BASE_MEMBER(madmotor_state, pf1_rowscroll)
@@ -59,7 +59,7 @@ ADDRESS_MAP_END
/******************************************************************************/
/* Physical memory map (21 bits) */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE("ym1", ym2203_r,ym2203_w)
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_r,ym2151_w)
diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c
index 5cd43d62e14..1e91eed5beb 100644
--- a/src/mame/drivers/magic10.c
+++ b/src/mame/drivers/magic10.c
@@ -282,7 +282,7 @@ static WRITE16_HANDLER( magic10_out_w )
* Memory Maps *
***************************/
-static ADDRESS_MAP_START( magic10_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( magic10_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(layer1_videoram_w) AM_BASE_MEMBER(magic10_state, layer1_videoram)
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(layer0_videoram_w) AM_BASE_MEMBER(magic10_state, layer0_videoram)
@@ -298,7 +298,7 @@ static ADDRESS_MAP_START( magic10_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x600000, 0x603fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( magic10a_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( magic10a_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(layer1_videoram_w) AM_BASE_MEMBER(magic10_state, layer1_videoram)
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(layer0_videoram_w) AM_BASE_MEMBER(magic10_state, layer0_videoram)
@@ -314,7 +314,7 @@ static ADDRESS_MAP_START( magic10a_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x600000, 0x603fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( magic102_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( magic102_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(layer1_videoram_w) AM_BASE_MEMBER(magic10_state, layer1_videoram)
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(layer0_videoram_w) AM_BASE_MEMBER(magic10_state, layer0_videoram)
@@ -333,7 +333,7 @@ static ADDRESS_MAP_START( magic102_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x700080, 0x700087) AM_RAM AM_BASE_MEMBER(magic10_state, vregs) // video registers?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hotslot_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hotslot_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(layer1_videoram_w) AM_BASE_MEMBER(magic10_state, layer1_videoram)
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(layer0_videoram_w) AM_BASE_MEMBER(magic10_state, layer0_videoram)
@@ -352,7 +352,7 @@ static ADDRESS_MAP_START( hotslot_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x700080, 0x700087) AM_RAM AM_BASE_MEMBER(magic10_state, vregs)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sgsafari_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sgsafari_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(layer1_videoram_w) AM_BASE_MEMBER(magic10_state, layer1_videoram)
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(layer0_videoram_w) AM_BASE_MEMBER(magic10_state, layer0_videoram)
diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c
index a78bb5a5bfd..9f5888364c8 100644
--- a/src/mame/drivers/magicard.c
+++ b/src/mame/drivers/magicard.c
@@ -645,7 +645,7 @@ static WRITE16_HANDLER( scc68070_mmu_w )
* Memory Maps *
*************************/
-static ADDRESS_MAP_START( magicard_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( magicard_mem, AS_PROGRAM, 16 )
// ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_RANGE(0x00000000, 0x0017ffff) AM_MIRROR(0x7fe00000) AM_RAM AM_BASE_MEMBER(magicard_state, magicram) /*only 0-7ffff accessed in Magic Card*/
AM_RANGE(0x00180000, 0x001ffbff) AM_MIRROR(0x7fe00000) AM_RAM AM_REGION("maincpu", 0)
diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c
index a64126b5615..9752d6f84c8 100644
--- a/src/mame/drivers/magicfly.c
+++ b/src/mame/drivers/magicfly.c
@@ -573,7 +573,7 @@ static WRITE8_HANDLER( mux_port_w )
* Memory map information *
*************************/
-static ADDRESS_MAP_START( magicfly_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( magicfly_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") /* MK48Z02B NVRAM */
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c
index bfd4314474c..36601d5df9a 100644
--- a/src/mame/drivers/magictg.c
+++ b/src/mame/drivers/magictg.c
@@ -141,7 +141,7 @@ static const mips3_config r4600_config =
};
-static ADDRESS_MAP_START( magictg_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( magictg_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00ffffff) AM_RAM
AM_RANGE(0x1fc00000, 0x1fc7ffff) AM_WRITENOP AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index 01750079938..c842ac10ff2 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -204,7 +204,7 @@ static WRITE16_HANDLER( magmax_vreg_w )
-static ADDRESS_MAP_START( magmax_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( magmax_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x013fff) AM_ROM
AM_RANGE(0x018000, 0x018fff) AM_RAM
AM_RANGE(0x020000, 0x0207ff) AM_RAM AM_BASE_MEMBER(magmax_state, videoram)
@@ -220,13 +220,13 @@ static ADDRESS_MAP_START( magmax_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x03001e, 0x03001f) AM_WRITENOP /* IRQ ack */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( magmax_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( magmax_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4000) AM_READ(magmax_sound_irq_ack)
AM_RANGE(0x6000, 0x67ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( magmax_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( magmax_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_address_data_w)
diff --git a/src/mame/drivers/magtouch.c b/src/mame/drivers/magtouch.c
index 01ac7f07fe1..a73d8cadbc7 100644
--- a/src/mame/drivers/magtouch.c
+++ b/src/mame/drivers/magtouch.c
@@ -149,7 +149,7 @@ static WRITE8_HANDLER(magtouch_io_w)
}
}
-static ADDRESS_MAP_START( magtouch_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( magtouch_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0x000a0000, 0x000bffff) AM_RAM
AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0)
@@ -159,7 +159,7 @@ static ADDRESS_MAP_START( magtouch_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xffff0000, 0xffffffff) AM_ROM AM_REGION("bios", 0 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( magtouch_io, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( magtouch_io, AS_IO, 32 )
AM_IMPORT_FROM(pcat32_io_common)
AM_RANGE(0x02e0, 0x02e7) AM_READWRITE8(magtouch_io_r, magtouch_io_w, 0xffffffff)
AM_RANGE(0x03f8, 0x03ff) AM_DEVREADWRITE8("ns16450_0", ins8250_r, ins8250_w, 0xffffffff)
@@ -186,7 +186,7 @@ static const struct pc_vga_interface vga_interface =
NULL,
NULL,
NULL,
- ADDRESS_SPACE_IO,
+ AS_IO,
0x0000
};
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index 51bd6475bbb..156c11b6814 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -166,7 +166,7 @@ static WRITE8_HANDLER( k052109_051960_w )
}
-static ADDRESS_MAP_START( mainevt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mainevt_map, AS_PROGRAM, 8 )
AM_RANGE(0x1f80, 0x1f80) AM_WRITE(mainevt_bankswitch_w)
AM_RANGE(0x1f84, 0x1f84) AM_WRITE(soundlatch_w) /* probably */
AM_RANGE(0x1f88, 0x1f88) AM_WRITE(mainevt_sh_irqtrigger_w) /* probably */
@@ -191,7 +191,7 @@ static ADDRESS_MAP_START( mainevt_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( devstors_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( devstors_map, AS_PROGRAM, 8 )
AM_RANGE(0x1f80, 0x1f80) AM_WRITE(mainevt_bankswitch_w)
AM_RANGE(0x1f84, 0x1f84) AM_WRITE(soundlatch_w) /* probably */
AM_RANGE(0x1f88, 0x1f88) AM_WRITE(mainevt_sh_irqtrigger_w) /* probably */
@@ -215,7 +215,7 @@ static ADDRESS_MAP_START( devstors_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mainevt_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mainevt_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("upd", upd7759_port_w)
@@ -226,7 +226,7 @@ static ADDRESS_MAP_START( mainevt_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf000) AM_WRITE(mainevt_sh_bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( devstors_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( devstors_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index 85900b48ae9..61affe0a88a 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -143,7 +143,7 @@ static CUSTOM_INPUT( mainsnk_sound_r )
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0")
AM_RANGE(0xc100, 0xc100) AM_READ_PORT("IN1")
@@ -159,7 +159,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(mainsnk_fgram_w) AM_BASE_MEMBER(mainsnk_state, fgram) // + work RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(sound_command_r)
@@ -169,7 +169,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe008, 0xe009) AM_DEVWRITE("ay2", ay8910_address_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READNOP
ADDRESS_MAP_END
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c
index e4365b936c8..ef2c5b1c3c0 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -98,7 +98,7 @@ static READ8_HANDLER( s2636_portA_r )
}
}
-static ADDRESS_MAP_START( malzak_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( malzak_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x0bff) AM_ROM
AM_RANGE(0x0c00, 0x0fff) AM_ROMBANK("bank1")
@@ -118,7 +118,7 @@ static ADDRESS_MAP_START( malzak_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( malzak2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( malzak2_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x0bff) AM_ROM
AM_RANGE(0x0c00, 0x0fff) AM_ROMBANK("bank1")
@@ -183,7 +183,7 @@ static READ8_HANDLER( collision_r )
return 0xd0 + state->collision_counter;
}
-static ADDRESS_MAP_START( malzak_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( malzak_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ(collision_r) // returns where a collision can occur.
AM_RANGE(0x40, 0x40) AM_WRITE(port40_w) // possibly sound codes for dual SN76477s
AM_RANGE(0x60, 0x60) AM_WRITE(port60_w) // possibly playfield scroll X offset
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 36739710cb7..9f0a92c9972 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -717,7 +717,7 @@ static WRITE8_HANDLER( mappy_latch_w )
static MACHINE_RESET( superpac )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int i;
/* Reset all latches */
@@ -727,7 +727,7 @@ static MACHINE_RESET( superpac )
static MACHINE_RESET( phozon )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int i;
/* Reset all latches */
@@ -737,7 +737,7 @@ static MACHINE_RESET( phozon )
static MACHINE_RESET( mappy )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int i;
/* Reset all latches */
@@ -872,7 +872,7 @@ static INTERRUPT_GEN( mappy_interrupt_1 )
}
-static ADDRESS_MAP_START( superpac_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( superpac_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(superpac_videoram_w) AM_BASE_MEMBER(mappy_state,videoram) /* video RAM */
AM_RANGE(0x0800, 0x1fff) AM_RAM AM_BASE_MEMBER(mappy_state,spriteram) /* work RAM with embedded sprite RAM */
AM_RANGE(0x2000, 0x2000) AM_READWRITE(superpac_flipscreen_r, superpac_flipscreen_w)
@@ -884,7 +884,7 @@ static ADDRESS_MAP_START( superpac_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( phozon_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( phozon_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(superpac_videoram_w) AM_SHARE("share2") AM_BASE_MEMBER(mappy_state,videoram) /* video RAM */
AM_RANGE(0x0800, 0x1fff) AM_RAM AM_BASE_MEMBER(mappy_state,spriteram) AM_SHARE("share3") /* shared RAM with CPU #2/sprite RAM*/
AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with the sound CPU */
@@ -895,7 +895,7 @@ static ADDRESS_MAP_START( phozon_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mappy_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mappy_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM_WRITE(mappy_videoram_w) AM_BASE_MEMBER(mappy_state,videoram) /* video RAM */
AM_RANGE(0x1000, 0x27ff) AM_RAM AM_BASE_MEMBER(mappy_state,spriteram) /* work RAM with embedded sprite RAM */
AM_RANGE(0x3800, 0x3fff) AM_WRITE(mappy_scroll_w) /* scroll */
@@ -908,18 +908,18 @@ static ADDRESS_MAP_START( mappy_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( superpac_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( superpac_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_DEVREADWRITE("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with the main CPU (also sound registers) */
AM_RANGE(0x2000, 0x200f) AM_WRITE(superpac_latch_w) /* various control bits */
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( phozon_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( phozon_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_DEVREADWRITE("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with the main CPU + sound registers */
AM_RANGE(0xe000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mappy_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mappy_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_DEVREADWRITE("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with the main CPU (also sound registers) */
AM_RANGE(0x2000, 0x200f) AM_WRITE(mappy_latch_w) /* various control bits */
AM_RANGE(0xe000, 0xffff) AM_ROM /* ROM code */
@@ -927,7 +927,7 @@ ADDRESS_MAP_END
/* extra CPU only present in Phozon */
-static ADDRESS_MAP_START( phozon_cpu3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( phozon_cpu3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(superpac_videoram_w) AM_SHARE("share2") /* video RAM */
AM_RANGE(0x0800, 0x1fff) AM_RAM AM_SHARE("share3") /* shared RAM with CPU #2/sprite RAM*/
AM_RANGE(0x4000, 0x43ff) AM_DEVREADWRITE("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with CPU #2 */
@@ -2240,13 +2240,13 @@ static DRIVER_INIT( grobda )
the DAC might be built-in after all.
*/
device_t *dac = machine->device("dac");
- memory_install_write8_device_handler(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), dac, 0x0002, 0x0002, 0, 0, grobda_DAC_w );
+ memory_install_write8_device_handler(machine->device("sub")->memory().space(AS_PROGRAM), dac, 0x0002, 0x0002, 0, 0, grobda_DAC_w );
}
static DRIVER_INIT( digdug2 )
{
/* appears to not use the watchdog */
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0x8000, 0, 0);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0x8000, 0, 0);
}
diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c
index 490f37d1a9f..a17be0a456d 100644
--- a/src/mame/drivers/marineb.c
+++ b/src/mame/drivers/marineb.c
@@ -81,7 +81,7 @@ static MACHINE_START( marineb )
state->save_item(NAME(state->marineb_active_low_flipscreen));
}
-static ADDRESS_MAP_START( marineb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( marineb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(marineb_videoram_w) AM_BASE_MEMBER(marineb_state, videoram)
@@ -99,12 +99,12 @@ static ADDRESS_MAP_START( marineb_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( marineb_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( marineb_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x08, 0x09) AM_DEVWRITE("ay1", ay8910_address_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wanted_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( wanted_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_address_data_w)
diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c
index 13017407b15..45d78bfa2a7 100644
--- a/src/mame/drivers/marinedt.c
+++ b/src/mame/drivers/marinedt.c
@@ -286,7 +286,7 @@ static WRITE8_HANDLER( marinedt_pf_w )
}
-static ADDRESS_MAP_START( marinedt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( marinedt_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x37ff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x4400, 0x47ff) AM_RAM //unused, vram mirror?
@@ -294,7 +294,7 @@ static ADDRESS_MAP_START( marinedt_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4c00, 0x4c00) AM_WRITENOP //?? maybe off by one error
ADDRESS_MAP_END
-static ADDRESS_MAP_START( marinedt_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( marinedt_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW0") //dips coinage
AM_RANGE(0x01, 0x01) AM_READ(marinedt_port1_r) //trackball xy muxed
diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c
index 4b346e71b57..5237e9978b7 100644
--- a/src/mame/drivers/mario.c
+++ b/src/mame/drivers/mario.c
@@ -127,7 +127,7 @@ static WRITE8_DEVICE_HANDLER( mario_z80dma_rdy_w )
*
*************************************/
-static ADDRESS_MAP_START( mario_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mario_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_SIZE_MEMBER(mario_state, spriteram, spriteram_size) /* physical sprite ram */
@@ -146,7 +146,7 @@ static ADDRESS_MAP_START( mario_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( masao_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( masao_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x7000, 0x73ff) AM_RAM AM_BASE_SIZE_MEMBER(mario_state, spriteram, spriteram_size) /* physical sprite ram */
@@ -165,7 +165,7 @@ static ADDRESS_MAP_START( masao_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mario_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mario_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("z80dma", z80dma_r, z80dma_w) /* dma controller */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c
index 4886778d62a..5989ae9fd71 100644
--- a/src/mame/drivers/markham.c
+++ b/src/mame/drivers/markham.c
@@ -21,7 +21,7 @@ static READ8_HANDLER( markham_e004_r )
/****************************************************************************/
-static ADDRESS_MAP_START( markham_master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( markham_master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
@@ -45,7 +45,7 @@ static ADDRESS_MAP_START( markham_master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe00e, 0xe00e) AM_WRITE(markham_flipscreen_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( markham_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( markham_slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("share1")
diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c
index 455882abb4c..b7945a41e66 100644
--- a/src/mame/drivers/mastboy.c
+++ b/src/mame/drivers/mastboy.c
@@ -696,7 +696,7 @@ static INTERRUPT_GEN( mastboy_interrupt )
/* Memory Maps */
-static ADDRESS_MAP_START( mastboy_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mastboy_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM // Internal ROM
AM_RANGE(0x4000, 0x7fff) AM_ROM // External ROM
@@ -739,7 +739,7 @@ static READ8_HANDLER( mastboy_nmi_read )
return 0x00;
}
-static ADDRESS_MAP_START( mastboy_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mastboy_io_map, AS_IO, 8 )
AM_RANGE(0x38, 0x38) AM_READ(mastboy_port_38_read)
AM_RANGE(0x39, 0x39) AM_READ(mastboy_nmi_read)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index 58295090102..62573874b91 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -66,7 +66,7 @@ static WRITE8_HANDLER( maniach_sh_command_w )
*
*************************************/
-static ADDRESS_MAP_START( matmania_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( matmania_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x077f) AM_RAM
AM_RANGE(0x0780, 0x07df) AM_WRITEONLY AM_BASE_SIZE_MEMBER(matmania_state, spriteram, spriteram_size)
AM_RANGE(0x1000, 0x13ff) AM_RAM AM_BASE_SIZE_MEMBER(matmania_state, videoram2, videoram2_size)
@@ -83,7 +83,7 @@ static ADDRESS_MAP_START( matmania_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( maniach_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( maniach_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x077f) AM_RAM
AM_RANGE(0x0780, 0x07df) AM_RAM AM_BASE_SIZE_MEMBER(matmania_state, spriteram, spriteram_size)
AM_RANGE(0x1000, 0x13ff) AM_RAM AM_BASE_SIZE_MEMBER(matmania_state, videoram2, videoram2_size)
@@ -103,7 +103,7 @@ static ADDRESS_MAP_START( maniach_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( matmania_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( matmania_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ay1", ay8910_data_address_w)
AM_RANGE(0x2002, 0x2003) AM_DEVWRITE("ay2", ay8910_data_address_w)
@@ -112,7 +112,7 @@ static ADDRESS_MAP_START( matmania_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( maniach_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( maniach_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ymsnd", ym3526_w)
AM_RANGE(0x2002, 0x2002) AM_DEVWRITE("dac", dac_signed_w)
@@ -121,7 +121,7 @@ static ADDRESS_MAP_START( maniach_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( maniach_mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( maniach_mcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(maniach_68705_port_a_r,maniach_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(maniach_68705_port_b_r,maniach_68705_port_b_w)
diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c
index f594f3bbef7..805f7e98fbe 100644
--- a/src/mame/drivers/maxaflex.c
+++ b/src/mame/drivers/maxaflex.c
@@ -267,7 +267,7 @@ int atari_input_disabled(running_machine *machine)
-static ADDRESS_MAP_START(a600xl_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(a600xl_mem, AS_PROGRAM, 8)
AM_RANGE(0x0000, 0x3fff) AM_RAM
AM_RANGE(0x5000, 0x57ff) AM_ROM AM_REGION("maincpu", 0x5000) /* self test */
AM_RANGE(0x8000, 0xbfff) AM_ROM /* game cartridge */
@@ -281,7 +281,7 @@ static ADDRESS_MAP_START(a600xl_mem, ADDRESS_SPACE_PROGRAM, 8)
AM_RANGE(0xd800, 0xffff) AM_ROM /* OS */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_mem, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READ( mcu_portA_r ) AM_WRITE( mcu_portA_w )
AM_RANGE(0x0001, 0x0001) AM_READ( mcu_portB_r ) AM_WRITE( mcu_portB_w )
diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c
index 7cb92b9ec66..b0eaa77ce0a 100644
--- a/src/mame/drivers/maygay1b.c
+++ b/src/mame/drivers/maygay1b.c
@@ -759,7 +759,7 @@ static WRITE8_HANDLER( m1_latch_w )
}
-static ADDRESS_MAP_START( m1_memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m1_memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x2000, 0x2000) AM_WRITE(reel12_w)
diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c
index f638f73311a..7aea5fa8250 100644
--- a/src/mame/drivers/maygayv1.c
+++ b/src/mame/drivers/maygayv1.c
@@ -666,7 +666,7 @@ static WRITE16_HANDLER( vsync_int_ctrl )
cputag_set_input_line(space->machine, "maincpu", 3, CLEAR_LINE);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x100000, 0x17ffff) AM_ROM AM_REGION("maincpu", 0x80000)
@@ -758,15 +758,15 @@ static WRITE8_HANDLER( mcu_w )
}
-static ADDRESS_MAP_START( sound_prg, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_prg, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_data, ADDRESS_SPACE_DATA, 8 )
+static ADDRESS_MAP_START( sound_data, AS_DATA, 8 )
AM_RANGE(0x0000, 0xffff) AM_RAM // nothing?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READWRITE(mcu_r, mcu_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index 7e072eb566c..21919046a75 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -135,7 +135,7 @@ static READ8_HANDLER( key_matrix_r )
*
*************************************/
-static ADDRESS_MAP_START( mayumi_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mayumi_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM AM_SHARE("nvram")
@@ -143,7 +143,7 @@ static ADDRESS_MAP_START( mayumi_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mayumi_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mayumi_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x30, 0x30) AM_READ_PORT("IN0") AM_WRITE(bank_sel_w)
AM_RANGE(0xc0, 0xc0) AM_WRITE(input_sel_w)
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index 3ec5e7e1f4f..1c000f51f33 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -964,7 +964,7 @@ static WRITE8_HANDLER( sound_nmi_clear_w )
*
*************************************/
-static ADDRESS_MAP_START( mazerbla_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mazerbla_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xd800, 0xd800) AM_READ(cfb_zpu_int_req_clr)
@@ -972,7 +972,7 @@ static ADDRESS_MAP_START( mazerbla_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe800, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mazerbla_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mazerbla_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x4c, 0x4f) AM_READWRITE(ls670_1_r, ls670_0_w)
AM_RANGE(0x60, 0x60) AM_WRITE(zpu_bcd_decoder_w)
@@ -982,19 +982,19 @@ static ADDRESS_MAP_START( mazerbla_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x6e, 0x6f) AM_WRITE(zpu_led_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mazerbla_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mazerbla_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM /* main RAM (stack) */
AM_RANGE(0x8000, 0x83ff) AM_RAM /* waveform ???*/
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mazerbla_cpu2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mazerbla_cpu2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(vsb_ls273_audio_control_w)
AM_RANGE(0x80, 0x83) AM_READWRITE(ls670_0_r, ls670_1_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mazerbla_cpu3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mazerbla_cpu3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x37ff) AM_ROM
AM_RANGE(0x3800, 0x3fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank1") /* GFX roms */
@@ -1005,7 +1005,7 @@ static ADDRESS_MAP_START( mazerbla_cpu3_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_READ(vcu_set_clr_addr_r) /* palette? LOAD */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mazerbla_cpu3_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mazerbla_cpu3_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_WRITE(cfb_backgnd_color_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(cfb_port_02_r, cfb_led_w) /* Read = VCU status ? */
@@ -1021,7 +1021,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( greatgun_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( greatgun_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x4c, 0x4c) AM_WRITE(main_sound_w)
AM_RANGE(0x60, 0x60) AM_WRITE(zpu_bcd_decoder_w)
@@ -1032,7 +1032,7 @@ static ADDRESS_MAP_START( greatgun_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
/* Great Guns has a little different banking layout */
-static ADDRESS_MAP_START( greatgun_cpu3_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( greatgun_cpu3_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP
AM_RANGE(0x01, 0x01) AM_WRITE(cfb_backgnd_color_w)
@@ -1042,7 +1042,7 @@ static ADDRESS_MAP_START( greatgun_cpu3_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x05, 0x05) AM_WRITE(cfb_vbank_w) //visible/writable videopage select?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( greatgun_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( greatgun_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVREAD("ay1", ay8910_r)
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 732fa99df2d..3a7236b9487 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -172,7 +172,7 @@ static READ16_HANDLER( mcat_wd_r )
}
-static ADDRESS_MAP_START( mcatadv_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mcatadv_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
@@ -211,7 +211,7 @@ static WRITE8_HANDLER ( mcatadv_sound_bw_w )
}
-static ADDRESS_MAP_START( mcatadv_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcatadv_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM // ROM
AM_RANGE(0x4000, 0xbfff) AM_ROMBANK("bank1") // ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM // RAM
@@ -219,19 +219,19 @@ static ADDRESS_MAP_START( mcatadv_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf000) AM_WRITE(mcatadv_sound_bw_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcatadv_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcatadv_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x80, 0x80) AM_READWRITE(soundlatch_r, soundlatch2_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nost_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nost_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nost_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( nost_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVWRITE("ymsnd", ym2610_w)
AM_RANGE(0x04, 0x07) AM_DEVREAD("ymsnd", ym2610_r)
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index 678971c3353..4b6fcd8792e 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -615,7 +615,7 @@ static WRITE8_HANDLER( demoderb_op4_w )
*************************************/
/* address map verified from schematics */
-static ADDRESS_MAP_START( cpu_90009_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu_90009_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x6fff) AM_ROM
AM_RANGE(0x7000, 0x77ff) AM_MIRROR(0x0800) AM_RAM AM_SHARE("nvram")
@@ -626,7 +626,7 @@ static ADDRESS_MAP_START( cpu_90009_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* upper I/O map determined by PAL; only SSIO ports are verified from schematics */
-static ADDRESS_MAP_START( cpu_90009_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu_90009_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
SSIO_INPUT_PORTS
@@ -644,7 +644,7 @@ ADDRESS_MAP_END
*************************************/
/* address map verified from schematics */
-static ADDRESS_MAP_START( cpu_90010_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu_90010_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x1800) AM_RAM AM_SHARE("nvram")
@@ -653,7 +653,7 @@ static ADDRESS_MAP_START( cpu_90010_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* upper I/O map determined by PAL; only SSIO ports are verified from schematics */
-static ADDRESS_MAP_START( cpu_90010_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu_90010_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
SSIO_INPUT_PORTS
@@ -671,7 +671,7 @@ ADDRESS_MAP_END
*************************************/
/* address map verified from schematics */
-static ADDRESS_MAP_START( cpu_91490_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu_91490_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("nvram")
@@ -681,7 +681,7 @@ static ADDRESS_MAP_START( cpu_91490_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* upper I/O map determined by PAL; only SSIO ports are verified from schematics */
-static ADDRESS_MAP_START( cpu_91490_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu_91490_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
SSIO_INPUT_PORTS
@@ -699,14 +699,14 @@ ADDRESS_MAP_END
*************************************/
/* address map verified from schematics */
-static ADDRESS_MAP_START( ipu_91695_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ipu_91695_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
/* I/O verified from schematics */
-static ADDRESS_MAP_START( ipu_91695_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ipu_91695_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_MIRROR(0xe0) AM_DEVREADWRITE("ipu_pio0", z80pio_cd_ba_r, z80pio_cd_ba_w)
@@ -2580,7 +2580,7 @@ static DRIVER_INIT( twotiger )
mcr_init(machine, 90010, 91399, 90913);
mcr_sound_init(machine, MCR_SSIO);
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe800, 0xefff, 0, 0x1000, twotiger_videoram_r, twotiger_videoram_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe800, 0xefff, 0, 0x1000, twotiger_videoram_r, twotiger_videoram_w);
}
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index 96b3697ee9b..0d0ec6a948b 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -488,7 +488,7 @@ static READ8_HANDLER( turbotag_kludge_r )
*************************************/
/* address map verified from schematics */
-static ADDRESS_MAP_START( mcrmono_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcrmono_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("nvram")
@@ -500,7 +500,7 @@ static ADDRESS_MAP_START( mcrmono_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* I/O map verified from schematics */
-static ADDRESS_MAP_START( mcrmono_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcrmono_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x78) AM_READ_PORT("MONO.IP0")
@@ -522,7 +522,7 @@ ADDRESS_MAP_END
*************************************/
/* address map verified from schematics */
-static ADDRESS_MAP_START( spyhunt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spyhunt_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(spyhunt_videoram_w) AM_BASE_MEMBER(mcr3_state, videoram)
@@ -533,7 +533,7 @@ static ADDRESS_MAP_START( spyhunt_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* upper I/O map determined by PAL; only SSIO ports and scroll registers are verified from schematics */
-static ADDRESS_MAP_START( spyhunt_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spyhunt_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
SSIO_INPUT_PORTS
@@ -1541,16 +1541,16 @@ static void mcr_common_init(running_machine *machine, int sound_board)
static DRIVER_INIT( demoderm )
{
mcr_common_init(machine, MCR_TURBO_CHIP_SQUEAK);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x01, 0x01, 0, 0, demoderm_ip1_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x02, 0x02, 0, 0, demoderm_ip2_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x06, 0x06, 0, 0, demoderm_op6_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x01, 0x01, 0, 0, demoderm_ip1_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x02, 0x02, 0, 0, demoderm_ip2_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x06, 0x06, 0, 0, demoderm_op6_w);
}
static DRIVER_INIT( sarge )
{
mcr_common_init(machine, MCR_TURBO_CHIP_SQUEAK);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x06, 0x06, 0, 0, turbocs_data_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x06, 0x06, 0, 0, turbocs_data_w);
}
@@ -1558,10 +1558,10 @@ static DRIVER_INIT( maxrpm )
{
mcr3_state *state = machine->driver_data<mcr3_state>();
mcr_common_init(machine, MCR_TURBO_CHIP_SQUEAK);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x01, 0x01, 0, 0, maxrpm_ip1_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x02, 0x02, 0, 0, maxrpm_ip2_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x05, 0x05, 0, 0, maxrpm_op5_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x06, 0x06, 0, 0, maxrpm_op6_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x01, 0x01, 0, 0, maxrpm_ip1_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x02, 0x02, 0, 0, maxrpm_ip2_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x05, 0x05, 0, 0, maxrpm_op5_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x06, 0x06, 0, 0, maxrpm_op6_w);
state_save_register_global(machine, state->maxrpm_adc_control);
state_save_register_global(machine, state->maxrpm_adc_select);
@@ -1574,26 +1574,26 @@ static DRIVER_INIT( maxrpm )
static DRIVER_INIT( rampage )
{
mcr_common_init(machine, MCR_SOUNDS_GOOD);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x04, 0x04, 0, 0, rampage_ip4_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x06, 0x06, 0, 0, rampage_op6_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x04, 0x04, 0, 0, rampage_ip4_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x06, 0x06, 0, 0, rampage_op6_w);
}
static DRIVER_INIT( powerdrv )
{
mcr_common_init(machine, MCR_SOUNDS_GOOD);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x02, 0x02, 0, 0, powerdrv_ip2_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x05, 0x05, 0, 0, powerdrv_op5_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x06, 0x06, 0, 0, powerdrv_op6_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x02, 0x02, 0, 0, powerdrv_ip2_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x05, 0x05, 0, 0, powerdrv_op5_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x06, 0x06, 0, 0, powerdrv_op6_w);
}
static DRIVER_INIT( stargrds )
{
mcr_common_init(machine, MCR_SOUNDS_GOOD);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x00, 0x00, 0, 0, stargrds_ip0_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x05, 0x05, 0, 0, stargrds_op5_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x06, 0x06, 0, 0, stargrds_op6_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x00, 0x00, 0, 0, stargrds_ip0_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x05, 0x05, 0, 0, stargrds_op5_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x06, 0x06, 0, 0, stargrds_op6_w);
}
@@ -1635,7 +1635,7 @@ static DRIVER_INIT( turbotag )
machine->device<cpu_device>("csdcpu")->suspend(SUSPEND_REASON_DISABLE, 1);
/* kludge for bad ROM read */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0b53, 0x0b53, 0, 0, turbotag_kludge_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0b53, 0x0b53, 0, 0, turbotag_kludge_r);
}
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index 07da9daff88..fca06aec4d5 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -306,7 +306,7 @@ static READ16_HANDLER( trisport_port_1_r )
*
*************************************/
-static ADDRESS_MAP_START( mcr68_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mcr68_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
@@ -330,7 +330,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( zwackery_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( zwackery_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x037fff) AM_ROM
AM_RANGE(0x080000, 0x080fff) AM_RAM
@@ -352,7 +352,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( pigskin_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pigskin_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
@@ -377,7 +377,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( trisport_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( trisport_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
@@ -1575,7 +1575,7 @@ static DRIVER_INIT( xenophob )
state->timing_factor = attotime::from_hz(machine->device("maincpu")->unscaled_clock() / 10) * (256 + 16);
/* install control port handler */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0c0000, 0x0cffff, 0, 0, xenophobe_control_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0c0000, 0x0cffff, 0, 0, xenophobe_control_w);
}
@@ -1588,9 +1588,9 @@ static DRIVER_INIT( spyhunt2 )
state->timing_factor = attotime::from_hz(machine->device("maincpu")->unscaled_clock() / 10) * (256 + 16);
/* analog port handling is a bit tricky */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0c0000, 0x0cffff, 0, 0, spyhunt2_control_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0d0000, 0x0dffff, 0, 0, spyhunt2_port_0_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0e0000, 0x0effff, 0, 0, spyhunt2_port_1_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0c0000, 0x0cffff, 0, 0, spyhunt2_control_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0d0000, 0x0dffff, 0, 0, spyhunt2_port_0_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0e0000, 0x0effff, 0, 0, spyhunt2_port_1_r);
}
@@ -1605,10 +1605,10 @@ static DRIVER_INIT( blasted )
state->timing_factor = attotime::from_hz(machine->device("maincpu")->unscaled_clock() / 10) * (256 + 16);
/* handle control writes */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0c0000, 0x0cffff, 0, 0, blasted_control_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0c0000, 0x0cffff, 0, 0, blasted_control_w);
/* 6840 is mapped to the lower 8 bits */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0a0000, 0x0a000f, 0, 0, mcr68_6840_lower_r, mcr68_6840_lower_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0a0000, 0x0a000f, 0, 0, mcr68_6840_lower_r, mcr68_6840_lower_w);
}
static DRIVER_INIT( intlaser )
@@ -1620,7 +1620,7 @@ static DRIVER_INIT( intlaser )
state->timing_factor = attotime::from_hz(machine->device("maincpu")->unscaled_clock() / 10) * (256 + 16);
/* handle control writes */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0c0000, 0x0cffff, 0, 0, blasted_control_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0c0000, 0x0cffff, 0, 0, blasted_control_w);
}
@@ -1635,13 +1635,13 @@ static DRIVER_INIT( archrivl )
state->timing_factor = attotime::from_hz(machine->device("maincpu")->unscaled_clock() / 10) * (256 + 16);
/* handle control writes */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0c0000, 0x0cffff, 0, 0, archrivl_control_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0c0000, 0x0cffff, 0, 0, archrivl_control_w);
/* 49-way joystick handling is a bit tricky */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0e0000, 0x0effff, 0, 0, archrivl_port_1_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0e0000, 0x0effff, 0, 0, archrivl_port_1_r);
/* 6840 is mapped to the lower 8 bits */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0a0000, 0x0a000f, 0, 0, mcr68_6840_lower_r, mcr68_6840_lower_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0a0000, 0x0a000f, 0, 0, mcr68_6840_lower_r, mcr68_6840_lower_w);
}
diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c
index ca2157330c0..410ce8acc6e 100644
--- a/src/mame/drivers/meadows.c
+++ b/src/mame/drivers/meadows.c
@@ -339,7 +339,7 @@ static PALETTE_INIT( meadows )
*
*************************************/
-static ADDRESS_MAP_START( meadows_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( meadows_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0bff) AM_ROM
AM_RANGE(0x0c00, 0x0c00) AM_READ_PORT("INPUTS")
AM_RANGE(0x0c01, 0x0c01) AM_READ_PORT("STICK")
@@ -352,7 +352,7 @@ static ADDRESS_MAP_START( meadows_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(meadows_videoram_w) AM_BASE_MEMBER(meadows_state, videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bowl3d_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bowl3d_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0bff) AM_ROM
AM_RANGE(0x0c00, 0x0c00) AM_READ_PORT("INPUTS1")
AM_RANGE(0x0c01, 0x0c01) AM_READ_PORT("INPUTS2")
@@ -365,7 +365,7 @@ static ADDRESS_MAP_START( bowl3d_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(meadows_videoram_w) AM_BASE_MEMBER(meadows_state, videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( minferno_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( minferno_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0bff) AM_ROM
AM_RANGE(0x1c00, 0x1eff) AM_RAM_WRITE(meadows_videoram_w) AM_BASE_MEMBER(meadows_state, videoram)
AM_RANGE(0x1f00, 0x1f00) AM_READ_PORT("JOY1")
@@ -378,7 +378,7 @@ static ADDRESS_MAP_START( minferno_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( minferno_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( minferno_io_map, AS_IO, 8 )
AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READ_PORT("DSW2")
ADDRESS_MAP_END
@@ -390,7 +390,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0bff) AM_ROM
AM_RANGE(0x0c00, 0x0c03) AM_READWRITE(audio_hardware_r, audio_hardware_w)
AM_RANGE(0x0e00, 0x0eff) AM_RAM
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 20fdaed27d9..dbf40347eac 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -894,7 +894,7 @@ static I8237_INTERFACE( dma8237_2_config )
/*****************************************************************************/
-static ADDRESS_MAP_START( mediagx_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( mediagx_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM AM_BASE_MEMBER(mediagx_state, main_ram)
AM_RANGE(0x000a0000, 0x000affff) AM_RAM
AM_RANGE(0x000b0000, 0x000b7fff) AM_RAM AM_BASE_MEMBER(mediagx_state, cga_ram)
@@ -907,7 +907,7 @@ static ADDRESS_MAP_START( mediagx_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfffc0000, 0xffffffff) AM_ROM AM_REGION("bios", 0) /* System BIOS */
ADDRESS_MAP_END
-static ADDRESS_MAP_START(mediagx_io, ADDRESS_SPACE_IO, 32)
+static ADDRESS_MAP_START(mediagx_io, AS_IO, 32)
AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8("dma8237_1", i8237_r, i8237_w, 0xffffffff)
AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_master", io20_r, io20_w, 0xffffffff)
AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8("pit8254", pit8253_r, pit8253_w, 0xffffffff)
@@ -1255,7 +1255,7 @@ static void install_speedups(running_machine *machine, const speedup_entry *entr
state->speedup_count = count;
for (i = 0; i < count; i++)
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), entries[i].offset, entries[i].offset + 3, 0, 0, speedup_handlers[i]);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), entries[i].offset, entries[i].offset + 3, 0, 0, speedup_handlers[i]);
#ifdef MAME_DEBUG
machine->add_notifier(MACHINE_NOTIFY_EXIT, report_speedups);
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 5d68638e8f0..73f5be88760 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -991,7 +991,7 @@ static WRITE16_HANDLER( pico_68k_io_write )
}
}
-static ADDRESS_MAP_START( pico_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pico_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
AM_RANGE(0x800000, 0x80001f) AM_READWRITE(pico_68k_io_read, pico_68k_io_write)
diff --git a/src/mame/drivers/megadrvb.c b/src/mame/drivers/megadrvb.c
index 9a93195a2a7..1fa4271cfda 100644
--- a/src/mame/drivers/megadrvb.c
+++ b/src/mame/drivers/megadrvb.c
@@ -664,8 +664,8 @@ static DRIVER_INIT( aladmdb )
#endif
// 220000 = writes to mcu? 330000 = reads?
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x220000, 0x220001, 0, 0, aladmdb_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x330000, 0x330001, 0, 0, aladmdb_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x220000, 0x220001, 0, 0, aladmdb_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x330000, 0x330001, 0, 0, aladmdb_r);
megadrive_6buttons_pad = 0;
DRIVER_INIT_CALL(megadrij);
@@ -714,7 +714,7 @@ static DRIVER_INIT( mk3mdb )
rom[0x07] = 0x02;
rom[0x06] = 0x10;
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x770070, 0x770075, 0, 0, mk3mdb_dsw_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x770070, 0x770075, 0, 0, mk3mdb_dsw_r );
megadrive_6buttons_pad = 1;
DRIVER_INIT_CALL(megadriv);
@@ -722,13 +722,13 @@ static DRIVER_INIT( mk3mdb )
static DRIVER_INIT( ssf2mdb )
{
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xA130F0, 0xA130FF, 0, 0); // custom banking is disabled (!)
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x5fffff, 0, 0, "bank5");
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x5fffff, 0, 0);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xA130F0, 0xA130FF, 0, 0); // custom banking is disabled (!)
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x5fffff, 0, 0, "bank5");
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x5fffff, 0, 0);
memory_set_bankptr(machine, "bank5", machine->region( "maincpu" )->base() + 0x400000 );
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x770070, 0x770075, 0, 0, ssf2mdb_dsw_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x770070, 0x770075, 0, 0, ssf2mdb_dsw_r );
megadrive_6buttons_pad = 1;
DRIVER_INIT_CALL(megadrij);
@@ -770,7 +770,7 @@ static DRIVER_INIT( srmdb )
rom[0x06] = 0xd2;
rom[0x07] = 0x00;
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x770070, 0x770075, 0, 0, srmdb_dsw_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x770070, 0x770075, 0, 0, srmdb_dsw_r );
megadrive_6buttons_pad = 0;
DRIVER_INIT_CALL(megadriv);
@@ -778,11 +778,11 @@ static DRIVER_INIT( srmdb )
static DRIVER_INIT(topshoot)
{
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200050, 0x200051, 0, 0, topshoot_200051_r );
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200042, 0x200043, 0, 0, "IN0");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200044, 0x200045, 0, 0, "IN1");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200046, 0x200047, 0, 0, "IN2");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200048, 0x200049, 0, 0, "IN3");
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200050, 0x200051, 0, 0, topshoot_200051_r );
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200042, 0x200043, 0, 0, "IN0");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200044, 0x200045, 0, 0, "IN1");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200046, 0x200047, 0, 0, "IN2");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200048, 0x200049, 0, 0, "IN3");
megadrive_6buttons_pad = 0;
DRIVER_INIT_CALL(megadriv);
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index c17b4a94ad3..d7667daa27f 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -580,7 +580,7 @@ static WRITE8_HANDLER( megaplay_game_w )
state->mp_bios_bank_addr = ((state->mp_bios_bank_addr >> 1) | (data << 23)) & 0xff8000;
}
-static ADDRESS_MAP_START( megaplay_bios_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( megaplay_bios_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_RAM
AM_RANGE(0x5000, 0x5fff) AM_RAM
@@ -601,7 +601,7 @@ static ADDRESS_MAP_START( megaplay_bios_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* basically from src/drivers/segasyse.c */
-static ADDRESS_MAP_START( megaplay_bios_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( megaplay_bios_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x7f, 0x7f) AM_DEVWRITE("sn2", sn76496_w) /* SN76489 */
AM_RANGE(0xbe, 0xbe) AM_READWRITE(sms_vdp_data_r, sms_vdp_data_w) /* VDP */
@@ -885,13 +885,13 @@ static DRIVER_INIT(megaplay)
mplay_start(machine);
/* for now ... */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa10000, 0xa1001f, 0, 0, megaplay_io_read, megaplay_io_write);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa10000, 0xa1001f, 0, 0, megaplay_io_read, megaplay_io_write);
/* megaplay has ram shared with the bios cpu here */
- memory_install_ram(machine->device("genesis_snd_z80")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x3fff, 0, 0, &state->ic36_ram[0]);
+ memory_install_ram(machine->device("genesis_snd_z80")->memory().space(AS_PROGRAM), 0x2000, 0x3fff, 0, 0, &state->ic36_ram[0]);
/* instead of a RAM mirror the 68k sees the extra ram of the 2nd z80 too */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa02000, 0xa03fff, 0, 0, megadriv_68k_read_z80_extra_ram, megadriv_68k_write_z80_extra_ram);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa02000, 0xa03fff, 0, 0, megadriv_68k_read_z80_extra_ram, megadriv_68k_write_z80_extra_ram);
DRIVER_INIT_CALL(megatech_bios); // create the SMS vdp etc.
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index b1f44477be9..22887a1f8fb 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -168,7 +168,7 @@ static INTERRUPT_GEN( interrupt_A )
}
-static ADDRESS_MAP_START( megasys1A_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( megasys1A_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("SYSTEM")
@@ -250,7 +250,7 @@ static WRITE16_HANDLER( ip_select_w )
}
-static ADDRESS_MAP_START( megasys1B_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( megasys1B_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x044000, 0x0443ff) AM_RAM_WRITE(megasys1_vregs_A_w) AM_BASE_MEMBER(megasys1_state, vregs)
@@ -273,7 +273,7 @@ ADDRESS_MAP_END
#define INTERRUPT_NUM_C INTERRUPT_NUM_B
#define interrupt_C interrupt_B
-static ADDRESS_MAP_START( megasys1C_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( megasys1C_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_READWRITE(megasys1_vregs_C_r,megasys1_vregs_C_w) AM_BASE_MEMBER(megasys1_state, vregs)
@@ -296,7 +296,7 @@ static INTERRUPT_GEN( interrupt_D )
device_set_input_line(device, 2, HOLD_LINE);
}
-static ADDRESS_MAP_START( megasys1D_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( megasys1D_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0c9fff) AM_RAM_WRITE(megasys1_vregs_D_w) AM_BASE_MEMBER(megasys1_state, vregs)
AM_RANGE(0x0ca000, 0x0cbfff) AM_RAM AM_BASE_MEMBER(megasys1_state, objectram)
@@ -390,7 +390,7 @@ static READ8_DEVICE_HANDLER( oki_status_r )
***************************************************************************/
-static ADDRESS_MAP_START( megasys1A_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( megasys1A_sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x040000, 0x040001) AM_READ(soundlatch_word_r)
AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w) // to main cpu
@@ -408,7 +408,7 @@ ADDRESS_MAP_END
***************************************************************************/
-static ADDRESS_MAP_START( megasys1B_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( megasys1B_sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x040000, 0x040001) AM_READWRITE(soundlatch_word_r,soundlatch2_word_w) /* from/to main cpu */
AM_RANGE(0x060000, 0x060001) AM_READWRITE(soundlatch_word_r,soundlatch2_word_w) /* from/to main cpu */
@@ -427,14 +427,14 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
AM_RANGE(0xf000, 0xf000) AM_WRITENOP /* ?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( z80_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
ADDRESS_MAP_END
@@ -3702,7 +3702,7 @@ static READ16_HANDLER( edfbl_input_r )
static DRIVER_INIT( edfbl )
{
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe0002, 0xe000b, 0, 0, edfbl_input_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe0002, 0xe000b, 0, 0, edfbl_input_r);
}
@@ -3761,13 +3761,13 @@ static DRIVER_INIT( jitsupro )
RAM[0x438/2] = 0x4e71; //
/* the sound code writes oki commands to both the lsb and msb */
- memory_install_write16_device_handler(machine->device("soundcpu")->memory().space(ADDRESS_SPACE_PROGRAM), oki1, 0xa0000, 0xa0003, 0, 0, okim6295_both_w);
- memory_install_write16_device_handler(machine->device("soundcpu")->memory().space(ADDRESS_SPACE_PROGRAM), oki2, 0xc0000, 0xc0003, 0, 0, okim6295_both_w);
+ memory_install_write16_device_handler(machine->device("soundcpu")->memory().space(AS_PROGRAM), oki1, 0xa0000, 0xa0003, 0, 0, okim6295_both_w);
+ memory_install_write16_device_handler(machine->device("soundcpu")->memory().space(AS_PROGRAM), oki2, 0xc0000, 0xc0003, 0, 0, okim6295_both_w);
}
static DRIVER_INIT( peekaboo )
{
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x100000, 0x100001, 0, 0, protection_peekaboo_r, protection_peekaboo_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x100000, 0x100001, 0, 0, protection_peekaboo_r, protection_peekaboo_w);
}
static DRIVER_INIT( phantasm )
@@ -3814,7 +3814,7 @@ static DRIVER_INIT( soldamj )
astyanax_rom_decode(machine, "maincpu");
/* Sprite RAM is mirrored */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8c000, 0x8cfff, 0, 0, soldamj_spriteram16_r, soldamj_spriteram16_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8c000, 0x8cfff, 0, 0, soldamj_spriteram16_r, soldamj_spriteram16_w);
}
static DRIVER_INIT( soldam )
@@ -3822,7 +3822,7 @@ static DRIVER_INIT( soldam )
phantasm_rom_decode(machine, "maincpu");
/* Sprite RAM is mirrored */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8c000, 0x8cfff, 0, 0, soldamj_spriteram16_r, soldamj_spriteram16_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8c000, 0x8cfff, 0, 0, soldamj_spriteram16_r, soldamj_spriteram16_w);
}
@@ -3847,7 +3847,7 @@ static DRIVER_INIT( monkelf )
UINT16 *ROM = (UINT16*)machine->region("maincpu")->base();
ROM[0x00744/2] = 0x4e71;
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe0000, 0xe000f, 0, 0, monkelf_input_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe0000, 0xe000f, 0, 0, monkelf_input_r);
state->ram += 0x10000/2;
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index bf0305a248f..701ba14f44f 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -364,7 +364,7 @@ static WRITE8_HANDLER( megatech_banked_ram_w )
-static ADDRESS_MAP_START( megatech_bios_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( megatech_bios_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM // from bios rom (0x0000-0x2fff populated in ROM)
AM_RANGE(0x3000, 0x3fff) AM_READWRITE(megatech_banked_ram_r, megatech_banked_ram_w) // copies instruction data here at startup, must be banked
AM_RANGE(0x4000, 0x5fff) AM_RAM // plain ram?
@@ -401,7 +401,7 @@ static WRITE8_HANDLER (megatech_bios_port_7f_w)
-static ADDRESS_MAP_START( megatech_bios_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( megatech_bios_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x3f, 0x3f) AM_WRITE(megatech_bios_port_ctrl_w)
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index 6e8f98d069e..603b2537143 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -78,7 +78,7 @@ static WRITE8_HANDLER( megazone_coin_counter_w )
-static ADDRESS_MAP_START( megazone_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( megazone_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0001) AM_WRITE(megazone_coin_counter_w) /* coin counter 2, coin counter 1 */
AM_RANGE(0x0005, 0x0005) AM_WRITE(megazone_flipscreen_w)
AM_RANGE(0x0007, 0x0007) AM_WRITE(interrupt_enable_w)
@@ -94,7 +94,7 @@ static ADDRESS_MAP_START( megazone_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM /* 4000->5FFF is a debug rom */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( megazone_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( megazone_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x2000) AM_WRITE(megazone_i8039_irq_w) /* START line. Interrupts 8039 */
AM_RANGE(0x4000, 0x4000) AM_WRITE(soundlatch_w) /* CODE line. Command Interrupts 8039 */
@@ -109,18 +109,18 @@ static ADDRESS_MAP_START( megazone_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( megazone_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( megazone_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("aysnd", ay8910_address_w)
AM_RANGE(0x00, 0x02) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x02, 0x02) AM_DEVWRITE("aysnd", ay8910_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( megazone_i8039_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( megazone_i8039_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( megazone_i8039_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( megazone_i8039_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READ(soundlatch_r)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(i8039_irqen_and_status_w)
diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c
index b031eb416aa..7525a200dad 100644
--- a/src/mame/drivers/meijinsn.c
+++ b/src/mame/drivers/meijinsn.c
@@ -163,7 +163,7 @@ static READ16_HANDLER( alpha_mcu_r )
-static ADDRESS_MAP_START( meijinsn_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( meijinsn_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080e00, 0x080fff) AM_READ(alpha_mcu_r) AM_WRITENOP
AM_RANGE(0x100000, 0x107fff) AM_RAM AM_BASE_MEMBER(meijinsn_state, videoram)
@@ -174,12 +174,12 @@ static ADDRESS_MAP_START( meijinsn_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1a0000, 0x1a0001) AM_READ_PORT("P1") AM_WRITE(sound_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( meijinsn_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( meijinsn_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( meijinsn_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( meijinsn_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x01, 0x01) AM_DEVREAD("aysnd", ay8910_r)
diff --git a/src/mame/drivers/mephisto.c b/src/mame/drivers/mephisto.c
index db7c35efb80..56f4f8e611e 100644
--- a/src/mame/drivers/mephisto.c
+++ b/src/mame/drivers/mephisto.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( mephisto_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mephisto_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000, 0x0ffff) AM_ROM
AM_RANGE(0x10000, 0x1ffff) AM_RAM
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index 38aae7df56b..4d9ebaa0888 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -349,7 +349,7 @@ static CUSTOM_INPUT(rndbit_r)
return field->port->machine->rand();
}
-static ADDRESS_MAP_START( pitboss_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pitboss_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM
AM_RANGE(0xa000, 0xa003) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
@@ -361,7 +361,7 @@ static ADDRESS_MAP_START( pitboss_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( casino5_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( casino5_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank2")
@@ -377,7 +377,7 @@ static ADDRESS_MAP_START( casino5_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bigappg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bigappg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xbfff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xc004, 0xc007) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
@@ -389,7 +389,7 @@ static ADDRESS_MAP_START( bigappg_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dodge_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dodge_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xbfff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xc004, 0xc007) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
@@ -406,7 +406,7 @@ ADDRESS_MAP_END
* ==> mirror 1DF3 & ~effective_addr_lines
* */
-static ADDRESS_MAP_START( trvwhiz_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( trvwhiz_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4c00, 0x4cff) AM_READWRITE(questions_r, high_offset_w)
AM_RANGE(0x5400, 0x54ff) AM_WRITE(low_offset_w)
@@ -421,13 +421,13 @@ static ADDRESS_MAP_START( trvwhiz_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( trvwhiz_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( trvwhiz_io_map, AS_IO, 8 )
AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("aysnd", ay8910_address_w)
AM_RANGE(0x8100, 0x8100) AM_DEVWRITE("aysnd", ay8910_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( phrcraze_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( phrcraze_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xbfff) AM_RAM
AM_RANGE(0xc008, 0xc00b) AM_MIRROR(0x1df0) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
@@ -442,13 +442,13 @@ static ADDRESS_MAP_START( phrcraze_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( phrcraze_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( phrcraze_io_map, AS_IO, 8 )
AM_RANGE(0xc004, 0xc004) AM_MIRROR(0x1cf3) AM_DEVWRITE("aysnd", ay8910_address_w)
AM_RANGE(0xc104, 0xc104) AM_MIRROR(0x1cf3) AM_DEVWRITE("aysnd", ay8910_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tictac_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tictac_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM
AM_RANGE(0xc004, 0xc007) AM_MIRROR(0x1df0) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
@@ -463,13 +463,13 @@ static ADDRESS_MAP_START( tictac_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tictac_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tictac_io_map, AS_IO, 8 )
AM_RANGE(0xc00c, 0xc00c) AM_MIRROR(0x1cf3) AM_DEVWRITE("aysnd", ay8910_address_w)
AM_RANGE(0xc10c, 0xc10c) AM_MIRROR(0x1cf3) AM_DEVWRITE("aysnd", ay8910_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( trvwhziv_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( trvwhziv_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xbfff) AM_RAM
AM_RANGE(0xc004, 0xc007) AM_MIRROR(0x1df0) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
@@ -484,7 +484,7 @@ static ADDRESS_MAP_START( trvwhziv_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dtrvwz5_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dtrvwz5_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xb000, 0xb0ff) AM_ROM /* protection? code jumps here */
@@ -500,7 +500,7 @@ static ADDRESS_MAP_START( dtrvwz5_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_READWRITE(palette_r, palette_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( couple_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( couple_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE_MEMBER(merit_state, backup_ram)
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index c6559533d8d..446af87b9a5 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -564,12 +564,12 @@ static READ8_HANDLER(meritm_ds1644_r)
*
*************************************/
-static ADDRESS_MAP_START( meritm_crt250_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( meritm_crt250_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( meritm_crt250_questions_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( meritm_crt250_questions_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROMBANK("bank1")
AM_RANGE(0x0000, 0x0000) AM_WRITE(meritm_crt250_questions_lo_w)
AM_RANGE(0x0001, 0x0001) AM_WRITE(meritm_crt250_questions_hi_w)
@@ -577,7 +577,7 @@ static ADDRESS_MAP_START( meritm_crt250_questions_map, ADDRESS_SPACE_PROGRAM, 8
AM_RANGE(0xe000, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( meritm_crt250_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( meritm_crt250_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_READWRITE(v9938_0_vram_r, v9938_0_vram_w)
AM_RANGE(0x11, 0x11) AM_READWRITE(v9938_0_status_r, v9938_0_command_w)
@@ -595,7 +595,7 @@ static ADDRESS_MAP_START( meritm_crt250_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xff, 0xff) AM_WRITE(meritm_crt250_bank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( meritm_crt250_crt258_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( meritm_crt250_crt258_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_READWRITE(v9938_0_vram_r, v9938_0_vram_w)
AM_RANGE(0x11, 0x11) AM_READWRITE(v9938_0_status_r, v9938_0_command_w)
@@ -614,13 +614,13 @@ static ADDRESS_MAP_START( meritm_crt250_crt258_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xff, 0xff) AM_WRITE(meritm_crt250_bank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( meritm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( meritm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0xdfff) AM_ROMBANK("bank2")
AM_RANGE(0xe000, 0xffff) AM_RAMBANK("bank3") AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( meritm_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( meritm_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(meritm_psd_a15_w)
AM_RANGE(0x01, 0x01) AM_WRITE(watchdog_reset_w)
@@ -1831,7 +1831,7 @@ static DRIVER_INIT(megat3te)
ds1204_init(machine, megat3_ds1204_key, megat3_ds1204_nvram);
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff8, 0xffff, 0, 0, meritm_ds1644_r, meritm_ds1644_w );
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfff8, 0xffff, 0, 0, meritm_ds1644_r, meritm_ds1644_w );
};
@@ -1850,7 +1850,7 @@ static DRIVER_INIT(megat4te)
ds1204_init(machine, 0, megat4te_ds1204_nvram);
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff8, 0xffff, 0, 0, meritm_ds1644_r, meritm_ds1644_w );
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfff8, 0xffff, 0, 0, meritm_ds1644_r, meritm_ds1644_w );
};
@@ -1861,7 +1861,7 @@ static DRIVER_INIT(megat4st)
ds1204_init(machine, 0, megat4te_ds1204_nvram);
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff8, 0xffff, 0, 0, meritm_ds1644_r, meritm_ds1644_w );
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfff8, 0xffff, 0, 0, meritm_ds1644_r, meritm_ds1644_w );
};
@@ -1881,7 +1881,7 @@ static DRIVER_INIT(megat5t)
ds1204_init(machine, 0, megat5_ds1204_nvram);
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfff8, 0xffff, 0, 0, meritm_ds1644_r, meritm_ds1644_w );
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfff8, 0xffff, 0, 0, meritm_ds1644_r, meritm_ds1644_w );
}
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index 7ca0c619464..f779d4f870a 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -138,7 +138,7 @@ static WRITE8_HANDLER( mermaid_ay8910_control_port_w )
/* Memory Map */
-static ADDRESS_MAP_START( mermaid_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mermaid_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE(mermaid_videoram2_w) AM_BASE_MEMBER(mermaid_state, videoram2)
@@ -196,7 +196,7 @@ static WRITE8_HANDLER( rougien_sample_playback_w )
state->adpcm_play_reg = data & 1;
}
-static ADDRESS_MAP_START( rougien_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rougien_map, AS_PROGRAM, 8 )
AM_RANGE(0xe002, 0xe002) AM_WRITE(rougien_sample_playback_w)
AM_RANGE(0xe802, 0xe802) AM_WRITE(rougien_sample_rom_hi_w)
AM_RANGE(0xe803, 0xe803) AM_WRITE(rougien_sample_rom_lo_w)
diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c
index 567171f8b40..925ff8b9f1e 100644
--- a/src/mame/drivers/metalmx.c
+++ b/src/mame/drivers/metalmx.c
@@ -449,7 +449,7 @@ static READ32_HANDLER( dsp32c_2_r )
static WRITE32_HANDLER( host_gsp_w )
{
- address_space *gsp_space = space->machine->device("gsp")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *gsp_space = 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);
@@ -457,7 +457,7 @@ static WRITE32_HANDLER( host_gsp_w )
static READ32_HANDLER( host_gsp_r )
{
- address_space *gsp_space = space->machine->device("gsp")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *gsp_space = space->machine->device("gsp")->memory().space(AS_PROGRAM);
UINT32 val;
val = gsp_space->read_word((0xc0000000 + (offset << 5) + 0x10) / 8);
@@ -527,7 +527,7 @@ static WRITE32_HANDLER( timer_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x3fffff) AM_ROM
AM_RANGE(0x400000, 0x4000ff) AM_READWRITE(host_gsp_r, host_gsp_w)
@@ -559,11 +559,11 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( adsp_program_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( adsp_program_map, AS_PROGRAM, 32 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE_MEMBER(metalmx_state, adsp_internal_program_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( adsp_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( adsp_data_map, AS_DATA, 16 )
AM_RANGE(0x3800, 0x39ff) AM_RAM
AM_RANGE(0x2000, 0x2007) AM_RAM
AM_RANGE(0x3fe0, 0x3fff) AM_RAM // TODO: CPU control registers
@@ -576,7 +576,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( gsp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gsp_map, AS_PROGRAM, 16 )
AM_RANGE(0x88800000, 0x8880000f) AM_RAM /* ? */
AM_RANGE(0x88c00000, 0x88c0000f) AM_RAM /* ? */
AM_RANGE(0xc0000000, 0xc00003ff) AM_READWRITE(tms34020_io_register_r, tms34020_io_register_w)
@@ -591,7 +591,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( dsp32c_1_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dsp32c_1_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x03ffff) AM_RAM
AM_RANGE(0x600000, 0x67ffff) AM_RAM
@@ -608,7 +608,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( dsp32c_2_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dsp32c_2_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x03ffff) AM_RAM
AM_RANGE(0x600000, 0x67ffff) AM_RAM
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index ad46224cb21..594972da298 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -57,7 +57,7 @@ static WRITE8_HANDLER( metlclsh_ack_nmi )
device_set_input_line(state->maincpu, INPUT_LINE_NMI, CLEAR_LINE);
}
-static ADDRESS_MAP_START( metlclsh_master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( metlclsh_master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xa000, 0xbfff) AM_ROM
@@ -107,7 +107,7 @@ static WRITE8_HANDLER( metlclsh_flipscreen_w )
flip_screen_set(space->machine, data & 1);
}
-static ADDRESS_MAP_START( metlclsh_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( metlclsh_slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0") AM_WRITE(metlclsh_gfxbank_w) // bg tiles bank
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index daa6fa4c75b..319f1373987 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -129,7 +129,7 @@ static READ16_HANDLER( metro_irq_cause_r )
static void update_irq_state( running_machine *machine )
{
metro_state *state = machine->driver_data<metro_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
/* Get the pending IRQs (only the enabled ones, e.g. where irq_enable is *0*) */
UINT16 irq = metro_irq_cause_r(space, 0, 0xffff) & ~*state->irq_enable;
@@ -340,7 +340,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->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = driver_state->maincpu->memory().space(AS_PROGRAM);
UINT8 data = 0;
switch (ioline)
@@ -814,14 +814,14 @@ static WRITE16_HANDLER( metro_blitter_w )
*/
-static ADDRESS_MAP_START( metro_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( metro_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM /* External ROM */
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") /* External ROM (Banked) */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* External RAM */
AM_RANGE(0xff00, 0xffff) AM_RAM /* Internal RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( metro_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( metro_sound_io_map, AS_IO, 8 )
AM_RANGE(UPD7810_PORTA, UPD7810_PORTA) AM_READWRITE(metro_porta_r, metro_porta_w)
AM_RANGE(UPD7810_PORTB, UPD7810_PORTB) AM_WRITE(metro_portb_w)
AM_RANGE(UPD7810_PORTC, UPD7810_PORTC) AM_WRITE(metro_sound_rombank_w)
@@ -830,7 +830,7 @@ ADDRESS_MAP_END
/*****************/
-static ADDRESS_MAP_START( daitorid_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( daitorid_sound_io_map, AS_IO, 8 )
AM_RANGE(UPD7810_PORTA, UPD7810_PORTA) AM_READWRITE(metro_porta_r, metro_porta_w)
AM_RANGE(UPD7810_PORTB, UPD7810_PORTB) AM_WRITE(daitorid_portb_w)
AM_RANGE(UPD7810_PORTC, UPD7810_PORTC) AM_WRITE(daitorid_sound_rombank_w)
@@ -872,7 +872,7 @@ static READ16_HANDLER( balcube_dsw_r )
}
-static ADDRESS_MAP_START( balcube_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( balcube_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xf00000, 0xf0ffff) AM_RAM // RAM
AM_RANGE(0x300000, 0x300001) AM_DEVREAD8("ymf", ymf278b_r, 0x00ff) // Sound
@@ -907,7 +907,7 @@ ADDRESS_MAP_END
***************************************************************************/
-static ADDRESS_MAP_START( daitoa_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( daitoa_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xf00000, 0xf0ffff) AM_RAM // RAM
AM_RANGE(0x400000, 0x400001) AM_DEVREAD8("ymf", ymf278b_r, 0x00ff) // Sound
@@ -941,7 +941,7 @@ ADDRESS_MAP_END
Bang Bang Ball
***************************************************************************/
-static ADDRESS_MAP_START( bangball_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bangball_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xf00000, 0xf0ffff) AM_RAM // RAM
AM_RANGE(0xf10000, 0xf10fff) AM_RAM // RAM (bug in the ram test routine)
@@ -976,7 +976,7 @@ ADDRESS_MAP_END
Battle Bubble
***************************************************************************/
-static ADDRESS_MAP_START( batlbubl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( batlbubl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x11ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
AM_RANGE(0x120000, 0x13ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE_MEMBER(metro_state, vram_1) // Layer 1
@@ -1012,7 +1012,7 @@ ADDRESS_MAP_END
Mouse Shooter GoGo
***************************************************************************/
-static ADDRESS_MAP_START( msgogo_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( msgogo_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x11ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
AM_RANGE(0x120000, 0x13ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE_MEMBER(metro_state, vram_1) // Layer 1
@@ -1045,7 +1045,7 @@ ADDRESS_MAP_END
Daitoride
***************************************************************************/
-static ADDRESS_MAP_START( daitorid_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( daitorid_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x800000, 0x80ffff) AM_RAM // RAM
AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1078,7 +1078,7 @@ ADDRESS_MAP_END
Dharma Doujou
***************************************************************************/
-static ADDRESS_MAP_START( dharma_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dharma_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // RAM
AM_RANGE(0x800000, 0x81ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1132,7 +1132,7 @@ KARATOUR_VRAM( 0 )
KARATOUR_VRAM( 1 )
KARATOUR_VRAM( 2 )
-static ADDRESS_MAP_START( karatour_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( karatour_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xffc000, 0xffffff) AM_RAM // RAM
AM_RANGE(0x400000, 0x400001) AM_READWRITE(metro_soundstatus_r, metro_soundstatus_w) // From Sound CPU
@@ -1169,7 +1169,7 @@ ADDRESS_MAP_END
/* same limited tilemap access as karatour */
-static ADDRESS_MAP_START( kokushi_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( kokushi_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x7fc000, 0x7fffff) AM_RAM // RAM
AM_RANGE(0x860000, 0x86ffff) AM_READ(metro_bankedrom_r) // Banked ROM
@@ -1201,7 +1201,7 @@ ADDRESS_MAP_END
Last Fortress
***************************************************************************/
-static ADDRESS_MAP_START( lastfort_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( lastfort_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // RAM
AM_RANGE(0x800000, 0x81ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1235,7 +1235,7 @@ ADDRESS_MAP_END
/* the German version is halfway between lastfort and ladykill (karatour) memory maps */
/* todo: clean up input reads etc. */
-static ADDRESS_MAP_START( lastforg_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( lastforg_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x400001) AM_READWRITE(metro_soundstatus_r, metro_soundstatus_w) // From / To Sound CPU
AM_RANGE(0x400002, 0x400003) AM_READ_PORT("IN0") // Inputs
@@ -1333,7 +1333,7 @@ static WRITE16_DEVICE_HANDLER( gakusai_eeprom_w )
}
}
-static ADDRESS_MAP_START( gakusai_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gakusai_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
AM_RANGE(0x200000, 0x21ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1370,7 +1370,7 @@ ADDRESS_MAP_END
Mahjong Gakuensai 2
***************************************************************************/
-static ADDRESS_MAP_START( gakusai2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gakusai2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
AM_RANGE(0x600000, 0x61ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1439,7 +1439,7 @@ static WRITE16_DEVICE_HANDLER( dokyusp_eeprom_reset_w )
}
}
-static ADDRESS_MAP_START( dokyusp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dokyusp_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
AM_RANGE(0x200000, 0x21ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1476,7 +1476,7 @@ ADDRESS_MAP_END
Mahjong Doukyuusei
***************************************************************************/
-static ADDRESS_MAP_START( dokyusei_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dokyusei_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1516,7 +1516,7 @@ ADDRESS_MAP_END
Pang Pom's
***************************************************************************/
-static ADDRESS_MAP_START( pangpoms_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pangpoms_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0xc00000, 0xc0ffff) AM_RAM // RAM
AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1552,7 +1552,7 @@ ADDRESS_MAP_END
Poitto!
***************************************************************************/
-static ADDRESS_MAP_START( poitto_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( poitto_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // RAM
AM_RANGE(0xc00000, 0xc1ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1585,7 +1585,7 @@ ADDRESS_MAP_END
Sky Alert
***************************************************************************/
-static ADDRESS_MAP_START( skyalert_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( skyalert_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0xc00000, 0xc0ffff) AM_RAM // RAM
AM_RANGE(0x800000, 0x81ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1621,7 +1621,7 @@ ADDRESS_MAP_END
Pururun
***************************************************************************/
-static ADDRESS_MAP_START( pururun_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pururun_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x800000, 0x80ffff) AM_RAM // RAM
AM_RANGE(0xc00000, 0xc1ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1654,7 +1654,7 @@ ADDRESS_MAP_END
Toride II Adauchi Gaiden
***************************************************************************/
-static ADDRESS_MAP_START( toride2g_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( toride2g_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x400000, 0x4cffff) AM_RAM // RAM (4xc000-4xffff mirrored?)
AM_RANGE(0xc00000, 0xc1ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1717,20 +1717,20 @@ static const ym2610_interface blzntrnd_ym2610_interface =
blzntrnd_irqhandler
};
-static ADDRESS_MAP_START( blzntrnd_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( blzntrnd_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blzntrnd_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( blzntrnd_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(blzntrnd_sh_bankswitch_w)
AM_RANGE(0x40, 0x40) AM_READ(soundlatch_r) AM_WRITENOP
AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("ymsnd", ym2610_r,ym2610_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blzntrnd_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( blzntrnd_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
// AM_RANGE(0x300000, 0x300001) AM_READNOP // Sound
@@ -1775,7 +1775,7 @@ static WRITE16_DEVICE_HANDLER( mouja_sound_rombank_w )
state->oki->set_bank_base(((data >> 3) & 0x07) * 0x40000);
}
-static ADDRESS_MAP_START( mouja_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mouja_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xf00000, 0xf0ffff) AM_RAM // RAM
AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE_MEMBER(metro_state, vram_0) // Layer 0
@@ -1856,7 +1856,7 @@ static WRITE16_HANDLER( vram_2_clr_w )
// H8/3007 CPU
-static ADDRESS_MAP_START( puzzlet_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( puzzlet_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x430000, 0x433fff) AM_RAM
AM_RANGE(0x470000, 0x47dfff) AM_RAM
@@ -1905,7 +1905,7 @@ static WRITE8_HANDLER( puzzlet_portb_w )
// popmessage("PORTB %02x", data);
}
-static ADDRESS_MAP_START( puzzlet_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( puzzlet_io_map, AS_IO, 8 )
AM_RANGE(H8_PORT_7, H8_PORT_7) AM_READ_PORT("IN2")
AM_RANGE(H8_SERIAL_1, H8_SERIAL_1) AM_READ_PORT("IN0") // coin
AM_RANGE(H8_PORT_B, H8_PORT_B) AM_READ_PORT("DSW0") AM_WRITE(puzzlet_portb_w)
@@ -6023,7 +6023,7 @@ static void metro_common( running_machine *machine )
static DRIVER_INIT( metro )
{
metro_state *state = machine->driver_data<metro_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
metro_common(machine);
@@ -6056,7 +6056,7 @@ static DRIVER_INIT( karatour )
static DRIVER_INIT( daitorid )
{
metro_state *state = machine->driver_data<metro_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
metro_common(machine);
diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c
index 19cce3498dc..3c17c8a52ff 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -81,7 +81,7 @@ static READ8_DEVICE_HANDLER( kiki_ym2203_r )
*
*************************************/
-static ADDRESS_MAP_START( mexico86_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mexico86_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* banked roms */
AM_RANGE(0xc000, 0xe7ff) AM_RAM AM_SHARE("share1") /* shared with sound cpu */
@@ -96,14 +96,14 @@ static ADDRESS_MAP_START( mexico86_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("share2") /* communication ram - to connect 4 players's subboard */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mexico86_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mexico86_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xa7ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0xa800, 0xbfff) AM_RAM
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", kiki_ym2203_r,ym2203_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mexico86_m68705_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mexico86_m68705_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(mexico86_68705_port_a_r,mexico86_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(mexico86_68705_port_b_r,mexico86_68705_port_b_w)
@@ -124,7 +124,7 @@ static WRITE8_HANDLER( mexico86_sub_output_w )
/*---- --x- <unknown, always high, irq ack?>*/
}
-static ADDRESS_MAP_START( mexico86_sub_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mexico86_sub_cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM /* sub cpu ram */
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("share2") /* shared with main */
diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c
index 1db8773bddd..331140f79f1 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -181,7 +181,7 @@ static WRITE8_HANDLER( mgolf_wram_w )
-static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0040, 0x0040) AM_READ_PORT("40")
diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c
index cdaded7a805..dd0873e8bf1 100644
--- a/src/mame/drivers/mhavoc.c
+++ b/src/mame/drivers/mhavoc.c
@@ -231,7 +231,7 @@ static WRITE8_HANDLER( dual_pokey_w )
*
*************************************/
-static ADDRESS_MAP_START( alpha_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( alpha_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x07ff) AM_RAMBANK("bank1") AM_BASE_MEMBER(mhavoc_state, zram0)
AM_RANGE(0x0800, 0x09ff) AM_RAM
@@ -262,7 +262,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( gamma_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gamma_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM /* Program RAM (2K) */
AM_RANGE(0x0800, 0x0fff) AM_RAM AM_MIRROR (0x1800)
AM_RANGE(0x2000, 0x203f) AM_READWRITE(quad_pokey_r, quad_pokey_w) /* Quad Pokey read */
@@ -285,7 +285,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( alphaone_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( alphaone_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x07ff) AM_RAMBANK("bank1") AM_BASE_MEMBER(mhavoc_state, zram0)
AM_RANGE(0x0800, 0x09ff) AM_RAM
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index 9cbde3c04d8..845c04800e7 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -196,7 +196,7 @@ INPUT_PORTS_END
*
*************************************/
-static ADDRESS_MAP_START( hostmem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hostmem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x143fff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x800000, 0x83ffff) AM_RAM AM_BASE_MEMBER(micro3d_state, shared_ram)
@@ -220,7 +220,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( vgbmem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( vgbmem, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE_MEMBER(micro3d_state, micro3d_sprite_vram)
AM_RANGE(0x00800000, 0x00bfffff) AM_RAM
AM_RANGE(0x00c00000, 0x00c0000f) AM_READ_PORT("VGB_SW")
@@ -242,11 +242,11 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( drmath_prg, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( drmath_prg, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x000fffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drmath_data, ADDRESS_SPACE_DATA, 32 )
+static ADDRESS_MAP_START( drmath_data, AS_DATA, 32 )
AM_RANGE(0x00000000, 0x000fffff) AM_ROM AM_REGION("drmath", 0)
AM_RANGE(0x00800000, 0x0083ffff) AM_READWRITE(micro3d_shared_r, micro3d_shared_w)
AM_RANGE(0x00400000, 0x004fffff) AM_RAM
@@ -267,11 +267,11 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( soundmem_prg, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( soundmem_prg, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( soundmem_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( soundmem_io, AS_IO, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0xfd00, 0xfd01) AM_DEVREADWRITE("ym2151", ym2151_r, ym2151_w)
AM_RANGE(0xfe00, 0xfe00) AM_DEVWRITE("upd7759", micro3d_upd7759_w)
diff --git a/src/mame/drivers/micropin.c b/src/mame/drivers/micropin.c
index adf48b58814..ffacf054f99 100644
--- a/src/mame/drivers/micropin.c
+++ b/src/mame/drivers/micropin.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( micropin_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( micropin_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index 415f1ef3f77..fd7ea1f60a7 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -253,7 +253,7 @@ static WRITE16_HANDLER( livequiz_coin_w )
#endif
}
-static ADDRESS_MAP_START( livequiz_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( livequiz_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x900000, 0x900001) AM_READ_PORT("DSW_PLAYER1")
@@ -330,7 +330,7 @@ static WRITE16_HANDLER( hammer_led_w )
#endif
}
-static ADDRESS_MAP_START( hammer_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hammer_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x900000, 0x900001) AM_READ_PORT("DSW")
diff --git a/src/mame/drivers/midqslvr.c b/src/mame/drivers/midqslvr.c
index cab8d32b3de..876a7d00378 100644
--- a/src/mame/drivers/midqslvr.c
+++ b/src/mame/drivers/midqslvr.c
@@ -42,12 +42,12 @@ static SCREEN_UPDATE(midqslvr)
return 0;
}
-static ADDRESS_MAP_START(midqslvr_map, ADDRESS_SPACE_PROGRAM, 32)
+static ADDRESS_MAP_START(midqslvr_map, AS_PROGRAM, 32)
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0xfff80000, 0xffffffff) AM_ROM AM_REGION("user1", 0) /* System BIOS */
ADDRESS_MAP_END
-static ADDRESS_MAP_START(midqslvr_io, ADDRESS_SPACE_IO, 32)
+static ADDRESS_MAP_START(midqslvr_io, AS_IO, 32)
ADDRESS_MAP_END
static INPUT_PORTS_START( midqslvr )
diff --git a/src/mame/drivers/midtunit.c b/src/mame/drivers/midtunit.c
index 296d1946320..e04bb35ad68 100644
--- a/src/mame/drivers/midtunit.c
+++ b/src/mame/drivers/midtunit.c
@@ -39,7 +39,7 @@
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x003fffff) AM_READWRITE(midtunit_vram_r, midtunit_vram_w)
AM_RANGE(0x01000000, 0x013fffff) AM_RAM
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index af47b7e54ee..e5ece8626f0 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -475,7 +475,7 @@ static void midvplus_xf1_w(tms3203x_device &device, UINT8 val)
*
*************************************/
-static ADDRESS_MAP_START( midvunit_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( midvunit_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x01ffff) AM_RAM AM_BASE_MEMBER(midvunit_state, ram_base)
AM_RANGE(0x400000, 0x41ffff) AM_RAM
AM_RANGE(0x600000, 0x600000) AM_WRITE(midvunit_dma_queue_w)
@@ -508,7 +508,7 @@ ADDRESS_MAP_END
static const tms3203x_config midvplus_config = { 0, NULL, midvplus_xf1_w };
-static ADDRESS_MAP_START( midvplus_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( midvplus_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x01ffff) AM_RAM AM_BASE_MEMBER(midvunit_state, ram_base)
AM_RANGE(0x400000, 0x41ffff) AM_RAM AM_BASE_MEMBER(midvunit_state, fastram_base)
AM_RANGE(0x600000, 0x600000) AM_WRITE(midvunit_dma_queue_w)
@@ -1600,7 +1600,7 @@ static void init_crusnusa_common(running_machine *machine, offs_t speedup)
state->adc_shift = 24;
/* speedups */
- state->generic_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), speedup, speedup + 1, 0, 0, generic_speedup_r);
+ state->generic_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), speedup, speedup + 1, 0, 0, generic_speedup_r);
}
static DRIVER_INIT( crusnusa ) { init_crusnusa_common(machine, 0xc93e); }
static DRIVER_INIT( crusnu40 ) { init_crusnusa_common(machine, 0xc957); }
@@ -1614,21 +1614,21 @@ static void init_crusnwld_common(running_machine *machine, offs_t speedup)
state->adc_shift = 16;
/* control register is different */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x994000, 0x994000, 0, 0, crusnwld_control_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x994000, 0x994000, 0, 0, crusnwld_control_w);
/* valid values are 450 or 460 */
midway_serial_pic_init(machine, 450);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x991030, 0x991030, 0, 0, offroadc_serial_status_r);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x996000, 0x996000, 0, 0, offroadc_serial_data_r);
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x996000, 0x996000, 0, 0, offroadc_serial_data_w);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x991030, 0x991030, 0, 0, offroadc_serial_status_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x996000, 0x996000, 0, 0, offroadc_serial_data_r);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x996000, 0x996000, 0, 0, offroadc_serial_data_w);
/* install strange protection device */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x9d0000, 0x9d1fff, 0, 0, bit_data_r);
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x9d0000, 0x9d0000, 0, 0, bit_reset_w);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x9d0000, 0x9d1fff, 0, 0, bit_data_r);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x9d0000, 0x9d0000, 0, 0, bit_reset_w);
/* speedups */
if (speedup)
- state->generic_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), speedup, speedup + 1, 0, 0, generic_speedup_r);
+ state->generic_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), speedup, speedup + 1, 0, 0, generic_speedup_r);
}
static DRIVER_INIT( crusnwld ) { init_crusnwld_common(machine, 0xd4c0); }
#if 0
@@ -1643,15 +1643,15 @@ static DRIVER_INIT( offroadc )
state->adc_shift = 16;
/* control register is different */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x994000, 0x994000, 0, 0, crusnwld_control_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x994000, 0x994000, 0, 0, crusnwld_control_w);
/* valid values are 230 or 234 */
midway_serial_pic2_init(machine, 230, 94);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x991030, 0x991030, 0, 0, offroadc_serial_status_r);
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x996000, 0x996000, 0, 0, offroadc_serial_data_r, offroadc_serial_data_w);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x991030, 0x991030, 0, 0, offroadc_serial_status_r);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x996000, 0x996000, 0, 0, offroadc_serial_data_r, offroadc_serial_data_w);
/* speedups */
- state->generic_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x195aa, 0x195aa, 0, 0, generic_speedup_r);
+ state->generic_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x195aa, 0x195aa, 0, 0, generic_speedup_r);
}
@@ -1677,7 +1677,7 @@ static DRIVER_INIT( wargods )
midway_serial_pic2_set_default_nvram(default_nvram);
/* speedups */
- state->generic_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2f4c, 0x2f4c, 0, 0, generic_speedup_r);
+ state->generic_speedup = memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2f4c, 0x2f4c, 0, 0, generic_speedup_r);
}
diff --git a/src/mame/drivers/midwunit.c b/src/mame/drivers/midwunit.c
index ca1b31fc715..3a0085adf18 100644
--- a/src/mame/drivers/midwunit.c
+++ b/src/mame/drivers/midwunit.c
@@ -102,7 +102,7 @@ Notes:
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x003fffff) AM_READWRITE(midtunit_vram_r, midtunit_vram_w)
AM_RANGE(0x01000000, 0x013fffff) AM_RAM
AM_RANGE(0x01400000, 0x0145ffff) AM_READWRITE(midwunit_cmos_r, midwunit_cmos_w) AM_SHARE("nvram")
diff --git a/src/mame/drivers/midxunit.c b/src/mame/drivers/midxunit.c
index dbf03cab28c..f7c0be6c5b7 100644
--- a/src/mame/drivers/midxunit.c
+++ b/src/mame/drivers/midxunit.c
@@ -98,7 +98,7 @@ There's a separate sound board also, but it wasn't available so is not documente
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x003fffff) AM_READWRITE(midtunit_vram_data_r, midtunit_vram_data_w)
AM_RANGE(0x00800000, 0x00bfffff) AM_READWRITE(midtunit_vram_color_r, midtunit_vram_color_w)
AM_RANGE(0x20000000, 0x20ffffff) AM_RAM
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index 059f6931697..8987039ea4f 100644
--- a/src/mame/drivers/midyunit.c
+++ b/src/mame/drivers/midyunit.c
@@ -175,7 +175,7 @@ static CUSTOM_INPUT( adpcm_irq_state_r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x001fffff) AM_READWRITE(midyunit_vram_r, midyunit_vram_w)
AM_RANGE(0x01000000, 0x010fffff) AM_RAM
AM_RANGE(0x01400000, 0x0140ffff) AM_READWRITE(midyunit_cmos_r, midyunit_cmos_w)
@@ -191,7 +191,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( yawdim_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( yawdim_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x97ff) AM_DEVWRITE("oki", yawdim_oki_bank_w)
diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c
index abe09de18fb..27c2671c813 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -567,7 +567,7 @@ static READ32_HANDLER( invasn_gun_r )
*
*************************************/
-static ADDRESS_MAP_START( zeus_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( zeus_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x03ffff) AM_RAM AM_BASE(&ram_base)
AM_RANGE(0x400000, 0x41ffff) AM_RAM
@@ -582,7 +582,7 @@ static ADDRESS_MAP_START( zeus_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( zeus2_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( zeus2_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x03ffff) AM_RAM AM_BASE(&ram_base)
AM_RANGE(0x400000, 0x43ffff) AM_RAM
@@ -1122,7 +1122,7 @@ static READ8_HANDLER( PIC16C5X_T0_clk_r )
return 0;
}
-static ADDRESS_MAP_START( pic_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pic_io_map, AS_IO, 8 )
AM_RANGE(PIC16C5x_T0, PIC16C5x_T0) AM_READ(PIC16C5X_T0_clk_r)
ADDRESS_MAP_END
@@ -1413,7 +1413,7 @@ static DRIVER_INIT( invasn )
{
dcs2_init(machine, 0, 0);
midway_ioasic_init(machine, MIDWAY_IOASIC_STANDARD, 468/* or 488 */, 94, NULL);
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x9c0000, 0x9c0000, 0, 0, invasn_gun_r, invasn_gun_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x9c0000, 0x9c0000, 0, 0, invasn_gun_r, invasn_gun_w);
}
@@ -1423,8 +1423,8 @@ static DRIVER_INIT( crusnexo )
midway_ioasic_init(machine, MIDWAY_IOASIC_STANDARD, 472/* or 476,477,478,110 */, 99, NULL);
memory_configure_bank(machine, "bank1", 0, 3, machine->region("user2")->base(), 0x400000*4);
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x9b0004, 0x9b0007, 0, 0, crusnexo_leds_r, crusnexo_leds_w);
- memory_install_write32_handler (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8d0009, 0x8d000a, 0, 0, keypad_select_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x9b0004, 0x9b0007, 0, 0, crusnexo_leds_r, crusnexo_leds_w);
+ memory_install_write32_handler (machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8d0009, 0x8d000a, 0, 0, keypad_select_w);
}
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index 26933e66cf6..95ff88aed92 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -89,7 +89,7 @@ static WRITE8_HANDLER( mikie_coin_counter_w )
*
*************************************/
-static ADDRESS_MAP_START( mikie_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mikie_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_WRITE(mikie_coin_counter_w)
AM_RANGE(0x2002, 0x2002) AM_WRITE(mikie_sh_irqtrigger_w)
@@ -112,7 +112,7 @@ static ADDRESS_MAP_START( mikie_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x8000, 0x8000) AM_WRITENOP // sound command latch
diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c
index e8af2e8e10c..bac2f6ccb01 100644
--- a/src/mame/drivers/mil4000.c
+++ b/src/mame/drivers/mil4000.c
@@ -270,7 +270,7 @@ static WRITE16_HANDLER( output_w )
// popmessage("%04x\n",data);
}
-static ADDRESS_MAP_START( mil4000_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mil4000_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x500000, 0x503fff) AM_RAM_WRITE(sc0_vram_w) AM_BASE_MEMBER(mil4000_state, sc0_vram) // CY62256L-70, U77
AM_RANGE(0x504000, 0x507fff) AM_RAM_WRITE(sc1_vram_w) AM_BASE_MEMBER(mil4000_state, sc1_vram) // CY62256L-70, U77
diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c
index 310ff000c41..1d91a5e02d5 100644
--- a/src/mame/drivers/miniboy7.c
+++ b/src/mame/drivers/miniboy7.c
@@ -266,7 +266,7 @@ static PALETTE_INIT( miniboy7 )
* Memory Map Information *
***********************************/
-static ADDRESS_MAP_START( miniboy7_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( miniboy7_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM? */
AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE(miniboy7_videoram_w) AM_BASE_MEMBER(miniboy7_state, videoram)
AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(miniboy7_colorram_w) AM_BASE_MEMBER(miniboy7_state, colorram)
diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c
index 394d9b5cb1f..7bf7227264c 100644
--- a/src/mame/drivers/minivadr.c
+++ b/src/mame/drivers/minivadr.c
@@ -58,7 +58,7 @@ static SCREEN_UPDATE( minivadr )
}
-static ADDRESS_MAP_START( minivadr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( minivadr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE_SIZE_MEMBER(minivadr_state, videoram, videoram_size)
AM_RANGE(0xe008, 0xe008) AM_READ_PORT("INPUTS") AM_WRITENOP // W - ???
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index a641a49a6bd..d9acb5c5b61 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -95,7 +95,7 @@ static SCREEN_UPDATE( mirage )
static SCREEN_EOF( mirage )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space,0,0,0xffff);
}
@@ -135,7 +135,7 @@ static WRITE16_HANDLER( okim0_rombank_w )
state->oki_bgm->set_bank_base(0x40000 * (data & 0x7));
}
-static ADDRESS_MAP_START( mirage_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mirage_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
/* tilemaps */
AM_RANGE(0x100000, 0x101fff) AM_DEVREADWRITE("tilegen1", deco16ic_pf1_data_r, deco16ic_pf1_data_w) // 0x100000 - 0x101fff tested
diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c
index 31c1c4ebf75..660c1f73958 100644
--- a/src/mame/drivers/mirax.c
+++ b/src/mame/drivers/mirax.c
@@ -221,7 +221,7 @@ static WRITE8_HANDLER( mirax_sound_cmd_w )
cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( mirax_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mirax_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc800, 0xd7ff) AM_RAM
AM_RANGE(0xe000, 0xe3ff) AM_RAM AM_BASE_MEMBER(mirax_state, videoram)
@@ -240,7 +240,7 @@ static ADDRESS_MAP_START( mirax_main_map, ADDRESS_SPACE_PROGRAM, 8 )
// AM_RANGE(0xf900, 0xf900) //sound cmd mirror? ack?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mirax_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mirax_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 201cdd84e55..5007a58ba32 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -156,7 +156,7 @@ static WRITE8_HANDLER( missb2_bg_bank_w )
/* Memory Maps */
-static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdcff) AM_RAM AM_BASE_SIZE_MEMBER(missb2_state, videoram, videoram_size)
@@ -179,7 +179,7 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xff98, 0xff98) AM_WRITENOP // ???
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x9000, 0x9fff) AM_ROMBANK("bank2") // ROM data for the background palette ram
AM_RANGE(0xa000, 0xafff) AM_ROMBANK("bank3") // ROM data for the background palette ram
@@ -194,7 +194,7 @@ ADDRESS_MAP_END
// Looks like the original bublbobl code modified to support the OKI M6295.
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index c64252912a7..2614f802199 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -827,7 +827,7 @@ static READ8_HANDLER( missile_r )
*************************************/
/* complete memory map derived from schematics (implemented above) */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_READWRITE(missile_r, missile_w) AM_BASE_MEMBER(missile_state, videoram)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index 14299707261..d57c0362da0 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -302,7 +302,7 @@ static WRITE8_HANDLER( input_w )
*
*************************************/
-static ADDRESS_MAP_START( mgakuen_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mgakuen_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(mgakuen_paletteram_r, mgakuen_paletteram_w) /* palette RAM */
@@ -312,7 +312,7 @@ static ADDRESS_MAP_START( mgakuen_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_READWRITE(mgakuen_objram_r, mgakuen_objram_w) /* OBJ RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mitchell_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mitchell_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(pang_paletteram_r,pang_paletteram_w) /* Banked palette RAM */
@@ -321,7 +321,7 @@ static ADDRESS_MAP_START( mitchell_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mitchell_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mitchell_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(pang_gfxctrl_w) /* Palette bank, layer enable, coin counters, more */
AM_RANGE(0x00, 0x02) AM_READ(input_r) /* The Mahjong games and Block Block need special input treatment */
@@ -338,7 +338,7 @@ static ADDRESS_MAP_START( mitchell_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
/* spangbl */
-static ADDRESS_MAP_START( spangbl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spangbl_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") AM_WRITENOP
AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(pang_paletteram_r, pang_paletteram_w) /* Banked palette RAM */
@@ -347,7 +347,7 @@ static ADDRESS_MAP_START( spangbl_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spangbl_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spangbl_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x02) AM_READ(input_r)
AM_RANGE(0x00, 0x00) AM_WRITE(pangbl_gfxctrl_w) /* Palette bank, layer enable, coin counters, more */
@@ -371,13 +371,13 @@ static WRITE8_HANDLER( spangbl_msm5205_data_w )
}
#endif
-static ADDRESS_MAP_START( spangbl_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spangbl_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
// AM_RANGE(0xec00, 0xec00) AM_WRITE( spangbl_msm5205_data_w )
AM_RANGE(0xf000, 0xf3ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spangbl_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spangbl_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
@@ -389,7 +389,7 @@ static WRITE8_DEVICE_HANDLER( oki_banking_w )
state->oki->set_bank_base(0x40000 * (data & 3));
}
-static ADDRESS_MAP_START( mstworld_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mstworld_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("oki", oki_banking_w)
@@ -404,7 +404,7 @@ static WRITE8_HANDLER(mstworld_sound_w)
device_set_input_line(state->audiocpu, 0, HOLD_LINE);
}
-static ADDRESS_MAP_START( mstworld_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mstworld_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(mstworld_gfxctrl_w) /* Palette bank, layer enable, coin counters, more */
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
@@ -2099,7 +2099,7 @@ ROM_END
static void bootleg_decode( running_machine *machine )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
space->set_decrypted_region(0x0000, 0x7fff, machine->region("maincpu")->base() + 0x50000);
memory_configure_bank_decrypted(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x60000, 0x4000);
}
@@ -2210,8 +2210,8 @@ static DRIVER_INIT( mgakuen )
mitchell_state *state = machine->driver_data<mitchell_state>();
state->input_type = 1;
configure_banks(machine);
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x03, 0x03, 0, 0, "DSW0");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x04, 0x04, 0, 0, "DSW1");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_IO), 0x03, 0x03, 0, 0, "DSW0");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_IO), 0x04, 0x04, 0, 0, "DSW1");
}
static DRIVER_INIT( mgakuen2 )
{
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index 507d7967469..4387a631c4d 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -169,7 +169,7 @@ static NVRAM_HANDLER( mjkjidai )
-static ADDRESS_MAP_START( mjkjidai_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjkjidai_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -180,7 +180,7 @@ static ADDRESS_MAP_START( mjkjidai_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xf7ff) AM_RAM_WRITE(mjkjidai_videoram_w) AM_BASE_MEMBER(mjkjidai_state,videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjkjidai_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjkjidai_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(keyboard_r)
AM_RANGE(0x01, 0x01) AM_READNOP // ???
diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c
index 9ee0f9ac671..4e407120616 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -273,13 +273,13 @@ static READ8_HANDLER( mjsister_keys_r )
*
*************************************/
-static ADDRESS_MAP_START( mjsister_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjsister_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_WRITE(mjsister_videoram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjsister_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjsister_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_WRITENOP /* HD46505? */
AM_RANGE(0x10, 0x10) AM_DEVWRITE("aysnd", ay8910_address_w)
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index 69a12dcfe78..fc93d93284a 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -452,7 +452,7 @@ static WRITE16_HANDLER( ml_mecha_ram_w )
COMBINE_DATA(state->mecha_ram+offset*2);
}
-static ADDRESS_MAP_START( mlanding_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mlanding_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM
@@ -490,7 +490,7 @@ ADDRESS_MAP_END
/* Sub CPU Map */
-static ADDRESS_MAP_START( mlanding_sub_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mlanding_sub_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM
AM_RANGE(0x050000, 0x0503ff) AM_RAM AM_SHARE("share3")
@@ -514,7 +514,7 @@ static WRITE8_HANDLER( ml_msm_start_msb_w )
state->adpcm_pos = (state->adpcm_pos & 0x00ff00) | ((data & 0x0f)<<16) | 0x20;
}
-static ADDRESS_MAP_START( mlanding_z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mlanding_z80_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x8fff) AM_RAM
@@ -555,7 +555,7 @@ static READ8_HANDLER( test_r )
}
//mecha driver ?
-static ADDRESS_MAP_START( mlanding_z80_sub_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mlanding_z80_sub_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_MEMBER(mlanding_state, mecha_ram)
AM_RANGE(0x8800, 0x8fff) AM_RAM
@@ -564,15 +564,15 @@ static ADDRESS_MAP_START( mlanding_z80_sub_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x9800, 0x9803) AM_READ(test_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( DSP_map_program, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( DSP_map_program, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE("share3")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( DSP_map_data, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( DSP_map_data, AS_DATA, 16 )
AM_RANGE(0x0000, 0x1fff) AM_READWRITE(ml_dotram_r,ml_dotram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( DSP_map_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( DSP_map_io, AS_IO, 16 )
AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ(dsp_HOLD_signal_r)
// AM_RANGE(TMS32025_HOLDA, TMS32025_HOLDA) AM_WRITE(dsp_HOLDA_signal_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 88dee9c0103..ba4b3e7fa11 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -865,7 +865,7 @@ static WRITE16_HANDLER( snd_latch_to_68k_w )
device_spin_until_time(space->cpu, attotime::from_usec(40));
}
-static ADDRESS_MAP_START( model1_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( model1_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK("bank1")
AM_RANGE(0x200000, 0x2fffff) AM_ROM
@@ -908,12 +908,12 @@ static ADDRESS_MAP_START( model1_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfc0000, 0xffffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( model1_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( model1_io, AS_IO, 16 )
AM_RANGE(0xd20000, 0xd20003) AM_READ(model1_tgp_copro_ram_r)
AM_RANGE(0xd80000, 0xd80003) AM_READ(model1_tgp_copro_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( model1_vr_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( model1_vr_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK("bank1")
AM_RANGE(0x200000, 0x2fffff) AM_ROM
@@ -956,7 +956,7 @@ static ADDRESS_MAP_START( model1_vr_mem, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfc0000, 0xffffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( model1_vr_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( model1_vr_io, AS_IO, 16 )
AM_RANGE(0xd20000, 0xd20003) AM_READ(model1_vr_tgp_ram_r)
AM_RANGE(0xd80000, 0xd80003) AM_READ(model1_vr_tgp_r)
ADDRESS_MAP_END
@@ -992,7 +992,7 @@ static WRITE16_HANDLER( m1_snd_68k_latch2_w )
{
}
-static ADDRESS_MAP_START( model1_snd, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( model1_snd, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0xc20000, 0xc20001) AM_READWRITE( m1_snd_68k_latch_r, m1_snd_68k_latch1_w )
AM_RANGE(0xc20002, 0xc20003) AM_READWRITE( m1_snd_v60_ready_r, m1_snd_68k_latch2_w )
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 063955ab2df..c715f987e26 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -1351,7 +1351,7 @@ static WRITE32_HANDLER(model2_3d_zclip_w)
}
/* common map for all Model 2 versions */
-static ADDRESS_MAP_START( model2_base_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( model2_base_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_ROM AM_WRITENOP
AM_RANGE(0x00500000, 0x005fffff) AM_RAM AM_BASE_MEMBER(model2_state, workram)
@@ -1399,7 +1399,7 @@ static ADDRESS_MAP_START( model2_base_mem, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
/* original Model 2 overrides */
-static ADDRESS_MAP_START( model2o_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( model2o_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00200000, 0x0021ffff) AM_RAM
AM_RANGE(0x00220000, 0x0023ffff) AM_ROM AM_REGION("maincpu", 0x20000)
@@ -1430,7 +1430,7 @@ static ADDRESS_MAP_START( model2o_mem, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
/* 2A-CRX overrides */
-static ADDRESS_MAP_START( model2a_crx_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( model2a_crx_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00200000, 0x0023ffff) AM_RAM
AM_RANGE(0x00804000, 0x00807fff) AM_READWRITE(geo_prg_r, geo_prg_w)
@@ -1459,7 +1459,7 @@ static ADDRESS_MAP_START( model2a_crx_mem, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
/* 2B-CRX overrides */
-static ADDRESS_MAP_START( model2b_crx_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( model2b_crx_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00200000, 0x0023ffff) AM_RAM
AM_RANGE(0x00804000, 0x00807fff) AM_READWRITE(geo_prg_r, geo_prg_w)
@@ -1494,7 +1494,7 @@ static ADDRESS_MAP_START( model2b_crx_mem, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
/* 2C-CRX overrides */
-static ADDRESS_MAP_START( model2c_crx_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( model2c_crx_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00200000, 0x0023ffff) AM_RAM
AM_RANGE(0x00804000, 0x00807fff) AM_READWRITE(geo_prg_r, geo_prg_w)
@@ -1858,7 +1858,7 @@ static WRITE16_HANDLER( m1_snd_68k_latch2_w )
{
}
-static ADDRESS_MAP_START( model1_snd, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( model1_snd, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x0bffff) AM_ROM AM_REGION("audiocpu", 0x20000) // mirror of second program ROM
AM_RANGE(0xc20000, 0xc20001) AM_READWRITE( m1_snd_68k_latch_r, m1_snd_68k_latch1_w )
@@ -1893,7 +1893,7 @@ static WRITE16_HANDLER( model2snd_ctrl )
}
}
-static ADDRESS_MAP_START( model2_snd, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( model2_snd, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_RAM AM_REGION("audiocpu", 0) AM_BASE_MEMBER(model2_state, soundram)
AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE("scsp", scsp_r, scsp_w)
AM_RANGE(0x400000, 0x400001) AM_WRITE(model2snd_ctrl)
@@ -1955,7 +1955,7 @@ static WRITE32_HANDLER(copro_sharc_buffer_w)
state->bufferram[offset & 0x7fff] = data;
}
-static ADDRESS_MAP_START( copro_sharc_map, ADDRESS_SPACE_DATA, 32 )
+static ADDRESS_MAP_START( copro_sharc_map, AS_DATA, 32 )
AM_RANGE(0x0400000, 0x0bfffff) AM_READ(copro_sharc_input_fifo_r)
AM_RANGE(0x0c00000, 0x13fffff) AM_WRITE(copro_sharc_output_fifo_w)
AM_RANGE(0x1400000, 0x1bfffff) AM_READWRITE(copro_sharc_buffer_r, copro_sharc_buffer_w)
@@ -1963,7 +1963,7 @@ static ADDRESS_MAP_START( copro_sharc_map, ADDRESS_SPACE_DATA, 32 )
ADDRESS_MAP_END
#if 0
-static ADDRESS_MAP_START( geo_sharc_map, ADDRESS_SPACE_DATA, 32 )
+static ADDRESS_MAP_START( geo_sharc_map, AS_DATA, 32 )
ADDRESS_MAP_END
#endif
@@ -1982,7 +1982,7 @@ static WRITE32_HANDLER(copro_tgp_buffer_w)
state->bufferram[offset&0x7fff] = data;
}
-static ADDRESS_MAP_START( copro_tgp_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( copro_tgp_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00007fff) AM_RAM AM_BASE_MEMBER(model2_state, tgp_program)
AM_RANGE(0x00400000, 0x00407fff) AM_READWRITE(copro_tgp_buffer_r, copro_tgp_buffer_w)
AM_RANGE(0xff800000, 0xff9fffff) AM_ROM AM_REGION("tgp", 0)
@@ -2126,12 +2126,12 @@ static READ8_HANDLER( driveio_port_str_r )
return sega_str[offset];
}
-static ADDRESS_MAP_START( drive_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( drive_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drive_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( drive_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP //watchdog
AM_RANGE(0x23, 0x23) AM_WRITE(driveio_port_w)
@@ -4995,7 +4995,7 @@ ROM_END
static DRIVER_INIT( genprot )
{
model2_state *state = machine->driver_data<model2_state>();
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w);
state->protstate = state->protpos = 0;
}
@@ -5004,7 +5004,7 @@ static DRIVER_INIT( pltkids )
model2_state *state = machine->driver_data<model2_state>();
UINT32 *ROM = (UINT32 *)machine->region("maincpu")->base();
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w);
state->protstate = state->protpos = 0;
// fix bug in program: it destroys the interrupt table and never fixes it
@@ -5016,7 +5016,7 @@ static DRIVER_INIT( zerogun )
model2_state *state = machine->driver_data<model2_state>();
UINT32 *ROM = (UINT32 *)machine->region("maincpu")->base();
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w);
state->protstate = state->protpos = 0;
// fix bug in program: it destroys the interrupt table and never fixes it
@@ -5025,7 +5025,7 @@ static DRIVER_INIT( zerogun )
static DRIVER_INIT( daytonam )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x240000, 0x24ffff, 0, 0, maxx_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x240000, 0x24ffff, 0, 0, maxx_r );
}
/* very crude support for let the game set itself into stand-alone mode */
@@ -5061,8 +5061,8 @@ static DRIVER_INIT( sgt24h )
model2_state *state = machine->driver_data<model2_state>();
UINT32 *ROM = (UINT32 *)machine->region("maincpu")->base();
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w);
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01a10000, 0x01a1ffff, 0, 0, jaleco_network_r, jaleco_network_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01a10000, 0x01a1ffff, 0, 0, jaleco_network_r, jaleco_network_w);
state->protstate = state->protpos = 0;
@@ -5072,7 +5072,7 @@ static DRIVER_INIT( sgt24h )
static DRIVER_INIT( overrev )
{
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01a10000, 0x01a1ffff, 0, 0, jaleco_network_r, jaleco_network_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01a10000, 0x01a1ffff, 0, 0, jaleco_network_r, jaleco_network_w);
//TODO: cache patch?
}
@@ -5083,7 +5083,7 @@ static DRIVER_INIT( doa )
model2_state *state = machine->driver_data<model2_state>();
UINT32 *ROM = (UINT32 *)machine->region("maincpu")->base();
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w);
state->protstate = state->protpos = 0;
ROM[0x630/4] = 0x08000004;
@@ -5092,12 +5092,12 @@ static DRIVER_INIT( doa )
static DRIVER_INIT( rchase2 )
{
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01c00008, 0x01c0000b, 0, 0, rchase2_devices_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01c00008, 0x01c0000b, 0, 0, rchase2_devices_w);
}
static DRIVER_INIT( srallyc )
{
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01c00008, 0x01c0000b, 0, 0, srallyc_devices_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01c00008, 0x01c0000b, 0, 0, srallyc_devices_w);
}
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 20928b1e50a..acb621d8033 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -1016,7 +1016,7 @@ static WRITE64_HANDLER(scsi_w)
static UINT32 scsi_fetch(running_machine *machine, UINT32 dsp)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT32 result;
result = space->read_dword(dsp);
return FLIPENDIAN_INT32(result);
@@ -1118,7 +1118,7 @@ static WRITE64_HANDLER( 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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
switch(dst >> 24)
{
case 0x88: /* Display List End Trigger */
@@ -1790,7 +1790,7 @@ static WRITE64_HANDLER(daytona2_rombank_w)
}
}
-static ADDRESS_MAP_START( model3_mem, ADDRESS_SPACE_PROGRAM, 64)
+static ADDRESS_MAP_START( model3_mem, AS_PROGRAM, 64)
AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE_MEMBER(model3_state, work_ram) /* work RAM */
AM_RANGE(0x84000000, 0x8400003f) AM_READ( real3d_status_r )
@@ -4910,7 +4910,7 @@ static WRITE16_HANDLER( model3snd_ctrl )
}
}
-static ADDRESS_MAP_START( model3_snd, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( model3_snd, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_RAM AM_REGION("scsp1", 0) AM_BASE_MEMBER(model3_state, soundram)
AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE("scsp1", scsp_r, scsp_w)
AM_RANGE(0x200000, 0x27ffff) AM_RAM AM_REGION("scsp2", 0)
@@ -5187,35 +5187,35 @@ static DRIVER_INIT( model3_10 )
{
interleave_vroms(machine);
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc0000000, 0xc00000ff, 0, 0, scsi_r, scsi_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc0000000, 0xc00000ff, 0, 0, scsi_r, scsi_w );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_r, mpc105_addr_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc105_data_r, mpc105_data_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc105_reg_r, mpc105_reg_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_r, mpc105_addr_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc105_data_r, mpc105_data_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc105_reg_r, mpc105_reg_w );
}
static DRIVER_INIT( model3_15 )
{
interleave_vroms(machine);
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_r, mpc105_addr_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc105_data_r, mpc105_data_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc105_reg_r, mpc105_reg_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_r, mpc105_addr_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc105_data_r, mpc105_data_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc105_reg_r, mpc105_reg_w );
}
static DRIVER_INIT( model3_20 )
{
interleave_vroms(machine);
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc2000000, 0xc20000ff, 0, 0, real3d_dma_r, real3d_dma_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc2000000, 0xc20000ff, 0, 0, real3d_dma_r, real3d_dma_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfec00000, 0xfedfffff, 0, 0, mpc106_addr_r, mpc106_addr_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfee00000, 0xfeffffff, 0, 0, mpc106_data_r, mpc106_data_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc106_reg_r, mpc106_reg_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfec00000, 0xfedfffff, 0, 0, mpc106_addr_r, mpc106_addr_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfee00000, 0xfeffffff, 0, 0, mpc106_data_r, mpc106_data_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc106_reg_r, mpc106_reg_w );
}
static DRIVER_INIT( lostwsga )
@@ -5224,7 +5224,7 @@ static DRIVER_INIT( lostwsga )
DRIVER_INIT_CALL(model3_15);
/* TODO: there's an M68K device at 0xC0000000 - FF, maybe lightgun controls ? */
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc1000000, 0xc10000ff, 0, 0, scsi_r, scsi_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc1000000, 0xc10000ff, 0, 0, scsi_r, scsi_w );
rom[0x7374f0/4] = 0x38840004; /* This seems to be an actual bug in the original code */
}
@@ -5235,7 +5235,7 @@ static DRIVER_INIT( scud )
DRIVER_INIT_CALL(model3_15);
/* TODO: network device at 0xC0000000 - FF */
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
rom[(0x71275c^4)/4] = 0x60000000;
rom[(0x71277c^4)/4] = 0x60000000;
@@ -5247,7 +5247,7 @@ static DRIVER_INIT( scudp )
DRIVER_INIT_CALL(model3_15);
/* TODO: network device at 0xC0000000 - FF */
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc1000000, 0xc10000ff, 0, 0, scsi_r, scsi_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc1000000, 0xc10000ff, 0, 0, scsi_r, scsi_w );
rom[(0x713724^4)/4] = 0x60000000;
rom[(0x713744^4)/4] = 0x60000000;
@@ -5263,7 +5263,7 @@ static DRIVER_INIT( lemans24 )
UINT32 *rom = (UINT32*)machine->region("user1")->base();
DRIVER_INIT_CALL(model3_15);
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc1000000, 0xc10000ff, 0, 0, scsi_r, scsi_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc1000000, 0xc10000ff, 0, 0, scsi_r, scsi_w );
rom[(0x73fe38^4)/4] = 0x38840004; /* This seems to be an actual bug in the original code */
@@ -5294,15 +5294,15 @@ static DRIVER_INIT( vs215 )
rom[(0x70e710^4)/4] = 0x60000000;
interleave_vroms(machine);
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc106_addr_r, mpc106_addr_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfec00000, 0xfedfffff, 0, 0, mpc106_addr_r, mpc106_addr_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc106_data_r, mpc106_data_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfee00000, 0xfeffffff, 0, 0, mpc106_data_r, mpc106_data_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc106_reg_r, mpc106_reg_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc106_addr_r, mpc106_addr_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfec00000, 0xfedfffff, 0, 0, mpc106_addr_r, mpc106_addr_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc106_data_r, mpc106_data_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfee00000, 0xfeffffff, 0, 0, mpc106_data_r, mpc106_data_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc106_reg_r, mpc106_reg_w );
}
static DRIVER_INIT( vs29815 )
@@ -5313,15 +5313,15 @@ static DRIVER_INIT( vs29815 )
rom[(0x60290c^4)/4] = 0x60000000;
interleave_vroms(machine);
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc106_addr_r, mpc106_addr_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfec00000, 0xfedfffff, 0, 0, mpc106_addr_r, mpc106_addr_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc106_data_r, mpc106_data_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfee00000, 0xfeffffff, 0, 0, mpc106_data_r, mpc106_data_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc106_reg_r, mpc106_reg_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc106_addr_r, mpc106_addr_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfec00000, 0xfedfffff, 0, 0, mpc106_addr_r, mpc106_addr_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc106_data_r, mpc106_data_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfee00000, 0xfeffffff, 0, 0, mpc106_data_r, mpc106_data_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc106_reg_r, mpc106_reg_w );
}
static DRIVER_INIT( bass )
@@ -5332,27 +5332,27 @@ static DRIVER_INIT( bass )
rom[(0x7999c8^4)/4] = 0x60000000;
interleave_vroms(machine);
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc106_addr_r, mpc106_addr_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfec00000, 0xfedfffff, 0, 0, mpc106_addr_r, mpc106_addr_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc106_data_r, mpc106_data_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfee00000, 0xfeffffff, 0, 0, mpc106_data_r, mpc106_data_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc106_reg_r, mpc106_reg_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc106_addr_r, mpc106_addr_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfec00000, 0xfedfffff, 0, 0, mpc106_addr_r, mpc106_addr_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc106_data_r, mpc106_data_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfee00000, 0xfeffffff, 0, 0, mpc106_data_r, mpc106_data_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc106_reg_r, mpc106_reg_w );
}
static DRIVER_INIT( getbass )
{
interleave_vroms(machine);
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xff000000, 0xff7fffff, 0, 0, "bank1" );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf9000000, 0xf90000ff, 0, 0, scsi_r, scsi_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_r, mpc105_addr_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc105_data_r, mpc105_data_w );
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc105_reg_r, mpc105_reg_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0800cf8, 0xf0800cff, 0, 0, mpc105_addr_r, mpc105_addr_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf0c00cf8, 0xf0c00cff, 0, 0, mpc105_data_r, mpc105_data_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf8fff000, 0xf8fff0ff, 0, 0, mpc105_reg_r, mpc105_reg_w );
}
static DRIVER_INIT( vs2 )
@@ -5423,7 +5423,7 @@ static DRIVER_INIT( harley )
DRIVER_INIT_CALL(model3_20);
state->network_ram = auto_alloc_array_clear(machine, UINT64, 0x10000);
- memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc0000000, 0xc00fffff, 0, 0, network_r, network_w );
+ memory_install_readwrite64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc0000000, 0xc00fffff, 0, 0, network_r, network_w );
rom[(0x50e8d4^4)/4] = 0x60000000;
rom[(0x50e8f4^4)/4] = 0x60000000;
@@ -5491,8 +5491,8 @@ static DRIVER_INIT( daytona2 )
UINT32 *rom = (UINT32*)machine->region("user1")->base();
DRIVER_INIT_CALL(model3_20);
- memory_install_write64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc3800000, 0xc3800007, 0, 0, daytona2_rombank_w );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc3000000, 0xc37fffff, 0, 0, "bank2" );
+ memory_install_write64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc3800000, 0xc3800007, 0, 0, daytona2_rombank_w );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc3000000, 0xc37fffff, 0, 0, "bank2" );
//rom[(0x68468c^4)/4] = 0x60000000;
rom[(0x6063c4^4)/4] = 0x60000000;
@@ -5505,8 +5505,8 @@ static DRIVER_INIT( dayto2pe )
UINT32 *rom = (UINT32*)machine->region("user1")->base();
DRIVER_INIT_CALL(model3_20);
- memory_install_write64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc3800000, 0xc3800007, 0, 0, daytona2_rombank_w );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc3000000, 0xc37fffff, 0, 0, "bank2" );
+ memory_install_write64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc3800000, 0xc3800007, 0, 0, daytona2_rombank_w );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc3000000, 0xc37fffff, 0, 0, "bank2" );
rom[(0x606784^4)/4] = 0x60000000;
rom[(0x69a3fc^4)/4] = 0x60000000; // jump to encrypted code
diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c
index 052e0838c11..e05f99c96fc 100644
--- a/src/mame/drivers/mogura.c
+++ b/src/mame/drivers/mogura.c
@@ -126,14 +126,14 @@ static WRITE8_HANDLER ( mogura_gfxram_w )
}
-static ADDRESS_MAP_START( mogura_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mogura_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM // main ram
AM_RANGE(0xe000, 0xefff) AM_RAM_WRITE(mogura_gfxram_w) AM_BASE_MEMBER(mogura_state, gfxram) // ram based characters
AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE(mogura_tileram_w) AM_BASE_MEMBER(mogura_state, tileram) // tilemap
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mogura_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mogura_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP // ??
AM_RANGE(0x08, 0x08) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c
index 1cce41c00c7..427f88676d9 100644
--- a/src/mame/drivers/mole.c
+++ b/src/mame/drivers/mole.c
@@ -192,7 +192,7 @@ static READ8_HANDLER( mole_protection_r )
*
*************************************/
-static ADDRESS_MAP_START( mole_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mole_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0800, 0x08ff) AM_READ(mole_protection_r)
AM_RANGE(0x0800, 0x0800) AM_WRITENOP // ???
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index 293a27a21b0..5df0a8bbb6b 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -54,7 +54,7 @@ static WRITE8_HANDLER( momoko_bg_read_bank_w )
/****************************************************************************/
-static ADDRESS_MAP_START( momoko_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( momoko_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd064, 0xd0ff) AM_RAM AM_BASE_SIZE_MEMBER(momoko_state, spriteram, spriteram_size)
@@ -78,7 +78,7 @@ static ADDRESS_MAP_START( momoko_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf007, 0xf007) AM_WRITE(momoko_bg_priority_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( momoko_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( momoko_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_WRITENOP /* unknown */
diff --git a/src/mame/drivers/monzagp.c b/src/mame/drivers/monzagp.c
index 175ab831d2e..9e77405d537 100644
--- a/src/mame/drivers/monzagp.c
+++ b/src/mame/drivers/monzagp.c
@@ -111,7 +111,7 @@ static SCREEN_UPDATE(monzagp)
return 0;
}
-static ADDRESS_MAP_START( monzagp_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( monzagp_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
@@ -211,7 +211,7 @@ static WRITE8_HANDLER(port3_w)
#define I8039_bus 0x120
*/
-static ADDRESS_MAP_START( monzagp_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( monzagp_io, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READWRITE(rng_r,port_w)
AM_RANGE(0x100, 0x100) AM_WRITE(port0_w)
AM_RANGE(0x101, 0x101) AM_WRITE(port1_w)
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index 57a3ffbe768..ab71a9337a2 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -258,7 +258,7 @@ static WRITE16_DEVICE_HANDLER( moobl_oki_bank_w )
downcast<okim6295_device *>(device)->set_bank_base((data & 0x0f) * 0x40000);
}
-static ADDRESS_MAP_START( moo_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( moo_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0c003f) AM_DEVWRITE("k056832", k056832_word_w)
AM_RANGE(0x0c2000, 0x0c2007) AM_DEVWRITE("k053246", k053246_word_w)
@@ -296,7 +296,7 @@ static ADDRESS_MAP_START( moo_map, ADDRESS_SPACE_PROGRAM, 16 )
#endif
ADDRESS_MAP_END
-static ADDRESS_MAP_START( moobl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( moobl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0c003f) AM_DEVWRITE("k056832", k056832_word_w)
AM_RANGE(0x0c2000, 0x0c2007) AM_DEVWRITE("k053246", k053246_word_w)
@@ -322,7 +322,7 @@ static ADDRESS_MAP_START( moobl_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1c0000, 0x1c1fff) AM_RAM_WRITE(paletteram16_xrgb_word_be_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bucky_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bucky_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM
AM_RANGE(0x090000, 0x09ffff) AM_RAM AM_BASE_MEMBER(moo_state, spriteram) /* Sprite RAM */
@@ -362,7 +362,7 @@ static ADDRESS_MAP_START( bucky_map, ADDRESS_SPACE_PROGRAM, 16 )
#endif
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM
diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c
index 2a82d6bd54b..93ff486a543 100644
--- a/src/mame/drivers/mosaic.c
+++ b/src/mame/drivers/mosaic.c
@@ -91,7 +91,7 @@ static READ8_HANDLER( gfire2_protection_r )
-static ADDRESS_MAP_START( mosaic_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mosaic_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x0ffff) AM_ROM
AM_RANGE(0x20000, 0x21fff) AM_RAM
AM_RANGE(0x22000, 0x22fff) AM_RAM_WRITE(mosaic_bgvideoram_w) AM_BASE_MEMBER(mosaic_state, bgvideoram)
@@ -99,7 +99,7 @@ static ADDRESS_MAP_START( mosaic_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x24000, 0x241ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gfire2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gfire2_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x0ffff) AM_ROM
AM_RANGE(0x10000, 0x17fff) AM_RAM
AM_RANGE(0x22000, 0x22fff) AM_RAM_WRITE(mosaic_bgvideoram_w) AM_BASE_MEMBER(mosaic_state, bgvideoram)
@@ -107,7 +107,7 @@ static ADDRESS_MAP_START( gfire2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x24000, 0x241ff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mosaic_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mosaic_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x3f) AM_WRITENOP /* Z180 internal registers */
AM_RANGE(0x30, 0x30) AM_READNOP /* Z180 internal registers */
@@ -117,7 +117,7 @@ static ADDRESS_MAP_START( mosaic_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x76, 0x76) AM_READ_PORT("P2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gfire2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gfire2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x3f) AM_WRITENOP /* Z180 internal registers */
AM_RANGE(0x30, 0x30) AM_READNOP /* Z180 internal registers */
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index 978f68333a5..a9e6c16fd57 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -66,7 +66,7 @@ static INTERRUPT_GEN( mouser_sound_nmi_assert )
device_set_input_line(device, INPUT_LINE_NMI, ASSERT_LINE);
}
-static ADDRESS_MAP_START( mouser_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mouser_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6bff) AM_RAM
AM_RANGE(0x8800, 0x88ff) AM_WRITENOP /* unknown */
@@ -82,14 +82,14 @@ static ADDRESS_MAP_START( mouser_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mouser_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mouser_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x3000, 0x3000) AM_READ(mouser_sound_byte_r)
AM_RANGE(0x4000, 0x4000) AM_WRITE(mouser_sound_nmi_clear_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mouser_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mouser_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_data_address_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("ay2", ay8910_data_address_w)
@@ -300,7 +300,7 @@ static DRIVER_INIT( mouser )
/* Decode the opcodes */
offs_t i;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x6000);
UINT8 *table = machine->region("user1")->base();
diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c
index eedde40636d..a23a981c4ef 100644
--- a/src/mame/drivers/mpoker.c
+++ b/src/mame/drivers/mpoker.c
@@ -468,7 +468,7 @@ static WRITE8_HANDLER( outport7_w )
//}
*/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
// AM_RANGE(0x0158, 0x0158) AM_WRITE (muxed_w)
AM_RANGE(0x3800, 0x38ff) AM_RAM AM_SHARE("nvram") /* NVRAM = 2x SCM5101E */
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index ba855efdef2..df0f3459bec 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -2523,7 +2523,7 @@ static TIMER_DEVICE_CALLBACK( gen_50hz )
}
}
-static ADDRESS_MAP_START( mod2_memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mod2_memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0810) AM_READWRITE(characteriser_r,characteriser_w)
@@ -2543,7 +2543,7 @@ static ADDRESS_MAP_START( mod2_memmap, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank1") /* 64k paged ROM (4 pages) */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mod4_yam_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mod4_yam_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0810) AM_READWRITE(characteriser_r,characteriser_w)
@@ -2566,7 +2566,7 @@ static ADDRESS_MAP_START( mod4_yam_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank1") // 64k paged ROM (4 pages)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mod4_oki_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mod4_oki_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0810) AM_READWRITE(characteriser_r,characteriser_w)
@@ -2591,7 +2591,7 @@ static ADDRESS_MAP_START( mod4_oki_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank1") // 64k paged ROM (4 pages)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mpu4_bwb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mpu4_bwb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x083F) AM_READWRITE(bwb_characteriser_r,bwb_characteriser_w)// Game selects a random value within this range
@@ -2619,7 +2619,7 @@ ADDRESS_MAP_END
// memory map for barcrest mpu4 board /////////////////////////////////////
-static ADDRESS_MAP_START( dutch_memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dutch_memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index ce53ead76db..a63ed5be3e9 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -1958,7 +1958,7 @@ static MACHINE_RESET( mpu4_vid )
state->prot_col = 0;
}
-static ADDRESS_MAP_START( mpu4_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mpu4_68k_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x7fffff) AM_ROM
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE_MEMBER(mpu4_state, vid_mainram)
AM_RANGE(0x900000, 0x900001) AM_DEVWRITE8("saa", saa1099_data_w, 0x00ff)
@@ -1974,7 +1974,7 @@ static ADDRESS_MAP_START( mpu4_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* TODO: Fix up MPU4 map*/
-static ADDRESS_MAP_START( mpu4_6809_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mpu4_6809_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0800) AM_DEVREADWRITE("acia6850_0", acia6850_stat_r, acia6850_ctrl_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("acia6850_0", acia6850_data_r, acia6850_data_w)
@@ -1991,7 +1991,7 @@ static ADDRESS_MAP_START( mpu4_6809_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("maincpu",0) /* 64k EPROM on board, only this region read */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vp_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( vp_68k_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x7fffff) AM_ROM
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE_MEMBER(mpu4_state, vid_mainram)
AM_RANGE(0x810000, 0x81ffff) AM_RAM /* ? */
@@ -2008,7 +2008,7 @@ static ADDRESS_MAP_START( vp_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
/* AM_RANGE(0xffd000, 0xffd00f) AM_READWRITE(characteriser16_r, characteriser16_w) Word-based version of old CHR??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bwbvid_6809_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bwbvid_6809_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0800) AM_DEVREADWRITE("acia6850_0", acia6850_stat_r, acia6850_ctrl_w)
AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("acia6850_0", acia6850_data_r, acia6850_data_w)
@@ -2025,7 +2025,7 @@ static ADDRESS_MAP_START( bwbvid_6809_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("maincpu",0) /* 64k EPROM on board, only this region read */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bwbvid_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bwbvid_68k_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x7fffff) AM_ROM
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE_MEMBER(mpu4_state, vid_mainram)
AM_RANGE(0x810000, 0x81ffff) AM_RAM /* ? */
@@ -2042,7 +2042,7 @@ static ADDRESS_MAP_START( bwbvid_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
//AM_RANGE(0xa00004, 0xa0000f) AM_READWRITE(bwb_characteriser16_r, bwb_characteriser16_w)//AM_READWRITE(adpcm_r, adpcm_w) CHR ?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bwbvid5_68k_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bwbvid5_68k_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x7fffff) AM_ROM
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE_MEMBER(mpu4_state, vid_mainram)
AM_RANGE(0x810000, 0x81ffff) AM_RAM /* ? */
@@ -2192,7 +2192,7 @@ static const mc6845_interface hd6845_intf =
};
-static ADDRESS_MAP_START( dealem_memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dealem_memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
@@ -2828,7 +2828,7 @@ static DRIVER_INIT (crmaze3a)
static DRIVER_INIT (mating)
{
mpu4_state *state = machine->driver_data<mpu4_state>();
- address_space *space = machine->device("video")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("video")->memory().space(AS_PROGRAM);
device_t *device = machine->device("oki");
/* The Mating Game has an extra 256kB RAM on the program card */
diff --git a/src/mame/drivers/mpu5.c b/src/mame/drivers/mpu5.c
index 5b2c74a3f39..09c365e583b 100644
--- a/src/mame/drivers/mpu5.c
+++ b/src/mame/drivers/mpu5.c
@@ -25,7 +25,7 @@ public:
};
-static ADDRESS_MAP_START( mpu5_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( mpu5_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x2fffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index a91845fcec7..d03f1630a6c 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -39,11 +39,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 */
- memory_install_write_bank(device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1");
+ memory_install_write_bank(device->machine->device("maincpu")->memory().space(AS_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1");
else
/* overlay enabled, map Amiga system ROM on 0x000000 */
- memory_unmap_write(device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0);
+ memory_unmap_write(device->machine->device("maincpu")->memory().space(AS_PROGRAM), 0x000000, 0x07ffff, 0, 0);
}
@@ -138,7 +138,7 @@ static WRITE16_HANDLER( coin_chip_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE_SIZE_MEMBER(amiga_state, chip_ram, chip_ram_size)
AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w)
diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c
index 1d70fb27340..719b46a4fbc 100644
--- a/src/mame/drivers/mrdo.c
+++ b/src/mame/drivers/mrdo.c
@@ -40,7 +40,7 @@ static READ8_HANDLER( mrdo_SECRE_r )
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(mrdo_bgvideoram_w) AM_BASE_MEMBER(mrdo_state, bgvideoram)
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(mrdo_fgvideoram_w) AM_BASE_MEMBER(mrdo_state, fgvideoram)
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index f7c6b2d74f5..5e90fe8a77a 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -162,7 +162,7 @@ static WRITE8_HANDLER( mrflea_data1_w )
*
*************************************/
-static ADDRESS_MAP_START( mrflea_master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mrflea_master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(mrflea_videoram_w) AM_BASE_MEMBER(mrflea_state, videoram)
@@ -170,7 +170,7 @@ static ADDRESS_MAP_START( mrflea_master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xec00, 0xecff) AM_RAM_WRITE(mrflea_spriteram_w) AM_BASE_MEMBER(mrflea_state, spriteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mrflea_master_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mrflea_master_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP /* watchdog? */
AM_RANGE(0x40, 0x40) AM_WRITE(mrflea_io_w)
@@ -181,14 +181,14 @@ static ADDRESS_MAP_START( mrflea_master_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mrflea_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mrflea_slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x80ff) AM_RAM
AM_RANGE(0x9000, 0x905a) AM_RAM /* ? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mrflea_slave_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mrflea_slave_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP /* watchdog */
AM_RANGE(0x10, 0x10) AM_READ(mrflea_interrupt_type_r) AM_WRITENOP /* ? / irq ACK */
diff --git a/src/mame/drivers/mrgame.c b/src/mame/drivers/mrgame.c
index 83d8c7313e3..9d5580d1877 100644
--- a/src/mame/drivers/mrgame.c
+++ b/src/mame/drivers/mrgame.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( mrgame_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mrgame_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c
index cdb021fefd9..6a6b1d90b73 100644
--- a/src/mame/drivers/mrjong.c
+++ b/src/mame/drivers/mrjong.c
@@ -67,7 +67,7 @@ static READ8_HANDLER( io_0x03_r )
*
*************************************/
-static ADDRESS_MAP_START( mrjong_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mrjong_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa7ff) AM_RAM
@@ -75,7 +75,7 @@ static ADDRESS_MAP_START( mrjong_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe400, 0xe7ff) AM_RAM_WRITE(mrjong_colorram_w) AM_BASE_MEMBER(mrjong_state, colorram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mrjong_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mrjong_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P2") AM_WRITE(mrjong_flipscreen_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76496_w)
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index f01fe74264f..ed5bf59dff2 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -352,7 +352,7 @@ static WRITE32_HANDLER( pip_w )
}
-static ADDRESS_MAP_START( ms32_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( ms32_map, AS_PROGRAM, 32 )
/* RAM areas verified by testing on real hw - usually accessed at the 0xfc000000 + mirror */
AM_RANGE(0xc0000000, 0xc0007fff) AM_READWRITE8 (ms32_nvram_r8, ms32_nvram_w8, 0x000000ff) AM_MIRROR(0x3c1fe000) // nvram is 8-bit wide, 0x2000 in size */
/* AM_RANGE(0xc0008000, 0xc01fffff) // mirrors of nvramram, handled above */
@@ -420,7 +420,7 @@ static WRITE32_HANDLER( ms32_irq5_guess_w )
irq_raise(space->machine, 5);
}
-static ADDRESS_MAP_START( f1superb_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( f1superb_map, AS_PROGRAM, 32 )
AM_RANGE(0xfd0e0000, 0xfd0e0003) AM_READ(ms32_read_inputs3)
AM_RANGE(0xfce00004, 0xfce00023) AM_RAM // regs?
@@ -1379,7 +1379,7 @@ static WRITE8_HANDLER( to_main_w )
irq_raise(space->machine, 1);
}
-static ADDRESS_MAP_START( ms32_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ms32_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3eff) AM_ROM
AM_RANGE(0x3f00, 0x3f0f) AM_DEVREADWRITE("ymf", ymf271_r,ymf271_w)
AM_RANGE(0x3f10, 0x3f10) AM_READWRITE(latch_r,to_main_w)
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index 1ab675782c4..52327fec552 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -175,7 +175,7 @@ static WRITE8_HANDLER( msisaac_mcu_w )
#endif
}
-static ADDRESS_MAP_START( msisaac_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( msisaac_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM
AM_RANGE(0xe800, 0xefff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_BASE_GENERIC(paletteram)
@@ -264,7 +264,7 @@ static WRITE8_HANDLER( sound_control_1_w )
//popmessage("SND1 0=%2x 1=%2x", state->snd_ctrl0, state->snd_ctrl1);
}
-static ADDRESS_MAP_START( msisaac_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( msisaac_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w)
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index d202661ce2c..6f648e19e76 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -172,7 +172,7 @@ static READ16_HANDLER ( mugsmash_input_ports_r )
}
#endif
-static ADDRESS_MAP_START( mugsmash_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mugsmash_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(mugsmash_videoram1_w) AM_BASE_MEMBER(mugsmash_state, videoram1)
AM_RANGE(0x082000, 0x082fff) AM_RAM_WRITE(mugsmash_videoram2_w) AM_BASE_MEMBER(mugsmash_state, videoram2)
@@ -192,7 +192,7 @@ static ADDRESS_MAP_START( mugsmash_map, ADDRESS_SPACE_PROGRAM, 16 )
#endif
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mugsmash_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mugsmash_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w)
diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c
index cd7fe0cab8e..38fe883a25e 100644
--- a/src/mame/drivers/multfish.c
+++ b/src/mame/drivers/multfish.c
@@ -668,7 +668,7 @@ DRIVER_INIT( lhauntent )
ent_decode(machine, 0x22, 0x44, 0x44, 0xbb, 0x24240);
}
-static ADDRESS_MAP_START( multfish_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( multfish_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_WRITE(multfish_vid_w)
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE("m48t35", multfish_timekeeper_r, multfish_timekeeper_w)
@@ -902,7 +902,7 @@ static WRITE8_HANDLER( multfish_dispenable_w )
state->disp_enable = data;
}
-static ADDRESS_MAP_START( multfish_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( multfish_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_READ_PORT("IN0")
AM_RANGE(0x11, 0x11) AM_READ_PORT("IN1")
@@ -957,7 +957,7 @@ static ADDRESS_MAP_START( multfish_portmap, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf8, 0xfd) AM_WRITE(multfish_bank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rollfr_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rollfr_portmap, AS_IO, 8 )
AM_RANGE(0x33, 0x33) AM_WRITE(rollfr_hopper_w)
AM_IMPORT_FROM(multfish_portmap)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index 98cd27a83ac..c0281da916e 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -325,7 +325,7 @@ static WRITE8_HANDLER(multigam_mapper2_w)
*******************************************************/
-static ADDRESS_MAP_START( multigam_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( multigam_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM /* NES RAM */
AM_RANGE(0x0800, 0x0fff) AM_RAM /* additional RAM */
AM_RANGE(0x2000, 0x3fff) AM_DEVREADWRITE("ppu", ppu2c0x_r, ppu2c0x_w)
@@ -343,7 +343,7 @@ static ADDRESS_MAP_START( multigam_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM AM_WRITE(multigam_mapper2_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( multigmt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( multigmt_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM /* NES RAM */
AM_RANGE(0x0800, 0x0fff) AM_RAM /* additional RAM */
AM_RANGE(0x3000, 0x3000) AM_WRITE(multigam_switch_prg_rom)
@@ -542,7 +542,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);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, multigam3_mmc3_rom_switch_w );
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, multigam3_mmc3_rom_switch_w );
state->multigam3_mmc3_banks[0] = 0x1e;
state->multigam3_mmc3_banks[1] = 0x1f;
@@ -614,7 +614,7 @@ static WRITE8_HANDLER(multigm3_switch_prg_rom)
*******************************************************/
-static ADDRESS_MAP_START( multigm3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( multigm3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM /* NES RAM */
AM_RANGE(0x0800, 0x0fff) AM_RAM /* additional RAM */
AM_RANGE(0x2000, 0x3fff) AM_DEVREADWRITE("ppu", ppu2c0x_r, ppu2c0x_w)
@@ -653,7 +653,7 @@ static void multigam_init_mapper02(running_machine *machine, UINT8* prg_base, in
multigam_state *state = machine->driver_data<multigam_state>();
UINT8* mem = machine->region("maincpu")->base();
memcpy(mem + 0x8000, prg_base + prg_size - 0x8000, 0x8000);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, multigam3_mapper02_rom_switch_w );
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, multigam3_mapper02_rom_switch_w );
state->mapper02_prg_base = prg_base;
state->mapper02_prg_size = prg_size;
@@ -810,7 +810,7 @@ static void multigam_init_mmc1(running_machine *machine, UINT8 *prg_base, int pr
memcpy(&dst[0x8000], prg_base + (prg_size - 0x8000), 0x8000);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, mmc1_rom_switch_w );
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, mmc1_rom_switch_w );
state->mmc1_reg_write_enable = 1;
state->mmc1_rom_mask = (prg_size / 0x4000) - 1;
@@ -856,8 +856,8 @@ static void supergm3_set_bank(running_machine *machine)
state->supergm3_chr_bank == 0x40 )
{
// VRAM
- memory_install_read_bank(ppu->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
- memory_install_write_bank(ppu->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
+ memory_install_read_bank(ppu->memory().space(AS_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
+ memory_install_write_bank(ppu->memory().space(AS_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", state->vram);
if (state->supergm3_chr_bank == 0x40)
@@ -865,15 +865,15 @@ static void supergm3_set_bank(running_machine *machine)
}
else
{
- memory_install_read_bank(ppu->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank2");
- memory_install_read_bank(ppu->memory().space(ADDRESS_SPACE_PROGRAM), 0x0400, 0x07ff, 0, 0, "bank3");
- memory_install_read_bank(ppu->memory().space(ADDRESS_SPACE_PROGRAM), 0x0800, 0x0bff, 0, 0, "bank4");
- memory_install_read_bank(ppu->memory().space(ADDRESS_SPACE_PROGRAM), 0x0c00, 0x0fff, 0, 0, "bank5");
- memory_install_read_bank(ppu->memory().space(ADDRESS_SPACE_PROGRAM), 0x1000, 0x13ff, 0, 0, "bank6");
- memory_install_read_bank(ppu->memory().space(ADDRESS_SPACE_PROGRAM), 0x1400, 0x17ff, 0, 0, "bank7");
- memory_install_read_bank(ppu->memory().space(ADDRESS_SPACE_PROGRAM), 0x1800, 0x1bff, 0, 0, "bank8");
- memory_install_read_bank(ppu->memory().space(ADDRESS_SPACE_PROGRAM), 0x1c00, 0x1fff, 0, 0, "bank9");
- memory_unmap_write(ppu->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0);
+ memory_install_read_bank(ppu->memory().space(AS_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank2");
+ memory_install_read_bank(ppu->memory().space(AS_PROGRAM), 0x0400, 0x07ff, 0, 0, "bank3");
+ memory_install_read_bank(ppu->memory().space(AS_PROGRAM), 0x0800, 0x0bff, 0, 0, "bank4");
+ memory_install_read_bank(ppu->memory().space(AS_PROGRAM), 0x0c00, 0x0fff, 0, 0, "bank5");
+ memory_install_read_bank(ppu->memory().space(AS_PROGRAM), 0x1000, 0x13ff, 0, 0, "bank6");
+ memory_install_read_bank(ppu->memory().space(AS_PROGRAM), 0x1400, 0x17ff, 0, 0, "bank7");
+ memory_install_read_bank(ppu->memory().space(AS_PROGRAM), 0x1800, 0x1bff, 0, 0, "bank8");
+ memory_install_read_bank(ppu->memory().space(AS_PROGRAM), 0x1c00, 0x1fff, 0, 0, "bank9");
+ memory_unmap_write(ppu->memory().space(AS_PROGRAM), 0x0000, 0x1fff, 0, 0);
set_videorom_bank(machine, 0, 8, 0, 8);
}
@@ -930,7 +930,7 @@ static WRITE8_HANDLER(supergm3_chr_bank_w)
*******************************************************/
-static ADDRESS_MAP_START( supergm3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( supergm3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM /* NES RAM */
AM_RANGE(0x0800, 0x0fff) AM_RAM /* additional RAM */
AM_RANGE(0x2000, 0x3fff) AM_DEVREADWRITE("ppu", ppu2c0x_r, ppu2c0x_w)
@@ -1113,7 +1113,7 @@ static MACHINE_RESET( multigam )
static MACHINE_RESET( multigm3 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* reset the ppu */
multigm3_switch_prg_rom(space, 0, 0x01 );
};
@@ -1127,8 +1127,8 @@ static MACHINE_START( multigam )
state->nt_page[2] = state->nt_ram + 0x800;
state->nt_page[3] = state->nt_ram + 0xc00;
- memory_install_readwrite8_handler(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w);
- memory_install_read_bank(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
+ memory_install_readwrite8_handler(machine->device("ppu")->memory().space(AS_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w);
+ memory_install_read_bank(machine->device("ppu")->memory().space(AS_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", machine->region("gfx1")->base());
}
@@ -1141,16 +1141,16 @@ static MACHINE_START( multigm3 )
state->nt_page[2] = state->nt_ram + 0x800;
state->nt_page[3] = state->nt_ram + 0xc00;
- memory_install_readwrite8_handler(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w);
+ memory_install_readwrite8_handler(machine->device("ppu")->memory().space(AS_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w);
- memory_install_read_bank(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank2");
- memory_install_read_bank(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0400, 0x07ff, 0, 0, "bank3");
- memory_install_read_bank(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0800, 0x0bff, 0, 0, "bank4");
- memory_install_read_bank(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0c00, 0x0fff, 0, 0, "bank5");
- memory_install_read_bank(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1000, 0x13ff, 0, 0, "bank6");
- memory_install_read_bank(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1400, 0x17ff, 0, 0, "bank7");
- memory_install_read_bank(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1800, 0x1bff, 0, 0, "bank8");
- memory_install_read_bank(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1c00, 0x1fff, 0, 0, "bank9");
+ memory_install_read_bank(machine->device("ppu")->memory().space(AS_PROGRAM), 0x0000, 0x03ff, 0, 0, "bank2");
+ memory_install_read_bank(machine->device("ppu")->memory().space(AS_PROGRAM), 0x0400, 0x07ff, 0, 0, "bank3");
+ memory_install_read_bank(machine->device("ppu")->memory().space(AS_PROGRAM), 0x0800, 0x0bff, 0, 0, "bank4");
+ memory_install_read_bank(machine->device("ppu")->memory().space(AS_PROGRAM), 0x0c00, 0x0fff, 0, 0, "bank5");
+ memory_install_read_bank(machine->device("ppu")->memory().space(AS_PROGRAM), 0x1000, 0x13ff, 0, 0, "bank6");
+ memory_install_read_bank(machine->device("ppu")->memory().space(AS_PROGRAM), 0x1400, 0x17ff, 0, 0, "bank7");
+ memory_install_read_bank(machine->device("ppu")->memory().space(AS_PROGRAM), 0x1800, 0x1bff, 0, 0, "bank8");
+ memory_install_read_bank(machine->device("ppu")->memory().space(AS_PROGRAM), 0x1c00, 0x1fff, 0, 0, "bank9");
set_videorom_bank(machine, 0, 8, 0, 8);
};
@@ -1164,7 +1164,7 @@ static MACHINE_START( supergm3 )
state->nt_page[2] = state->nt_ram + 0x800;
state->nt_page[3] = state->nt_ram + 0xc00;
- memory_install_readwrite8_handler(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w);
+ memory_install_readwrite8_handler(machine->device("ppu")->memory().space(AS_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w);
state->vram = auto_alloc_array(machine, UINT8, 0x2000);
state->multigmc_mmc3_6000_ram = auto_alloc_array(machine, UINT8, 0x2000);
@@ -1343,7 +1343,7 @@ ROM_END
static DRIVER_INIT( multigam )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
multigam_switch_prg_rom(space, 0x0, 0x01);
}
@@ -1359,7 +1359,7 @@ static void multigm3_decrypt(UINT8* mem, int memsize, const UINT8* decode_nibble
static DRIVER_INIT(multigm3)
{
multigam_state *state = machine->driver_data<multigam_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 };
@@ -1373,7 +1373,7 @@ static DRIVER_INIT(multigm3)
static DRIVER_INIT(multigmt)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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/munchmo.c b/src/mame/drivers/munchmo.c
index 2a3b53dc1f8..87e7b5b9c6b 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -90,7 +90,7 @@ static WRITE8_HANDLER( sound_nmi_ack_w )
*
*************************************/
-static ADDRESS_MAP_START( mnchmobl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mnchmobl_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
AM_RANGE(0xa000, 0xa3ff) AM_MIRROR(0x0400) AM_RAM AM_BASE_MEMBER(munchmo_state, sprite_xpos)
@@ -114,7 +114,7 @@ static ADDRESS_MAP_START( mnchmobl_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xbf03, 0xbf03) AM_READ_PORT("P2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x2000) AM_READ(soundlatch_r)
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("ay1", ay8910_data_w)
diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c
index 3f6500415e6..e00b2ee5d45 100644
--- a/src/mame/drivers/murogem.c
+++ b/src/mame/drivers/murogem.c
@@ -109,7 +109,7 @@ public:
};
-static ADDRESS_MAP_START( murogem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( murogem_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x4001, 0x4001) AM_DEVWRITE("crtc", mc6845_register_w)
diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c
index 23b9a9de00f..e71466386f3 100644
--- a/src/mame/drivers/murogmbl.c
+++ b/src/mame/drivers/murogmbl.c
@@ -73,7 +73,7 @@ static PALETTE_INIT( murogmbl )
}
}
-static ADDRESS_MAP_START( murogmbl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( murogmbl_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fFf) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x4800, 0x4bff) AM_RAM
diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c
index 2eb3c586adf..2c01c5f95b6 100644
--- a/src/mame/drivers/mustache.c
+++ b/src/mame/drivers/mustache.c
@@ -42,7 +42,7 @@ YM2151:
#define YM_CLOCK (XTAL1/4)
-static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM_WRITE(mustache_videoram_w) AM_BASE_MEMBER(mustache_state, videoram)
diff --git a/src/mame/drivers/mw18w.c b/src/mame/drivers/mw18w.c
index 3fba0a5d54d..5fd537d9e5f 100644
--- a/src/mame/drivers/mw18w.c
+++ b/src/mame/drivers/mw18w.c
@@ -71,12 +71,12 @@ static CUSTOM_INPUT( mw18w_sensors_r )
-static ADDRESS_MAP_START( mw18w_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mw18w_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mw18w_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mw18w_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(mw18w_sound0_w)
diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c
index f4a13e4573b..42ed8d7c32e 100644
--- a/src/mame/drivers/mw8080bw.c
+++ b/src/mame/drivers/mw8080bw.c
@@ -207,7 +207,7 @@ static WRITE8_HANDLER( mw8080bw_reversable_shift_count_w)
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM AM_WRITENOP
AM_RANGE(0x2000, 0x3fff) AM_MIRROR(0x4000) AM_RAM AM_BASE_SIZE_MEMBER(mw8080bw_state, main_ram, main_ram_size)
@@ -324,7 +324,7 @@ static CUSTOM_INPUT( seawolf_erase_input_r )
}
-static ADDRESS_MAP_START( seawolf_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( seawolf_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ(mw8080bw_shift_result_rev_r)
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN0")
@@ -437,7 +437,7 @@ static WRITE8_HANDLER( gunfight_io_w )
}
-static ADDRESS_MAP_START( gunfight_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gunfight_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1")
@@ -633,7 +633,7 @@ static WRITE8_HANDLER( tornbase_io_w )
}
-static ADDRESS_MAP_START( tornbase_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tornbase_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1")
@@ -753,7 +753,7 @@ MACHINE_CONFIG_END
*
*************************************/
-static ADDRESS_MAP_START( zzzap_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( zzzap_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1")
@@ -920,7 +920,7 @@ static WRITE8_HANDLER( maze_io_w )
}
-static ADDRESS_MAP_START( maze_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( maze_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
@@ -990,7 +990,7 @@ static MACHINE_START( boothill )
}
-static ADDRESS_MAP_START( boothill_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( boothill_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1")
@@ -1084,7 +1084,7 @@ static WRITE8_HANDLER( checkmat_io_w )
}
-static ADDRESS_MAP_START( checkmat_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( checkmat_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
@@ -1220,7 +1220,7 @@ static CUSTOM_INPUT( desertgu_dip_sw_0_1_r )
}
-static ADDRESS_MAP_START( desertgu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( desertgu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ(mw8080bw_shift_result_rev_r)
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN0")
@@ -1342,7 +1342,7 @@ static CUSTOM_INPUT( dplay_pitch_right_input_r )
}
-static ADDRESS_MAP_START( dplay_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dplay_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1")
@@ -1520,7 +1520,7 @@ static MACHINE_START( gmissile )
}
-static ADDRESS_MAP_START( gmissile_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gmissile_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1")
@@ -1616,7 +1616,7 @@ static MACHINE_START( m4 )
}
-static ADDRESS_MAP_START( m4_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( m4_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1")
@@ -1732,7 +1732,7 @@ static CUSTOM_INPUT( clowns_controller_r )
}
-static ADDRESS_MAP_START( clowns_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( clowns_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1")
@@ -1869,7 +1869,7 @@ MACHINE_CONFIG_END
*
*************************************/
-static ADDRESS_MAP_START( spacwalk_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spacwalk_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
@@ -1963,7 +1963,7 @@ MACHINE_CONFIG_END
*
*************************************/
-static ADDRESS_MAP_START( shuffle_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( shuffle_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf) /* yes, 4, and no mirroring on the read handlers */
AM_RANGE(0x01, 0x01) AM_DEVREAD("mb14241", mb14241_shift_result_r)
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN0")
@@ -2043,7 +2043,7 @@ MACHINE_CONFIG_END
*
*************************************/
-static ADDRESS_MAP_START( dogpatch_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dogpatch_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1")
@@ -2208,7 +2208,7 @@ static WRITE8_HANDLER( spcenctr_io_w )
}
-static ADDRESS_MAP_START( spcenctr_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spcenctr_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_MIRROR(0xfc) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0xfc) AM_READ_PORT("IN1")
@@ -2315,7 +2315,7 @@ static MACHINE_START( phantom2 )
}
-static ADDRESS_MAP_START( phantom2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( phantom2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ(mw8080bw_shift_result_rev_r)
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN0")
@@ -2441,7 +2441,7 @@ static WRITE8_HANDLER( bowler_lights_2_w )
}
-static ADDRESS_MAP_START( bowler_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bowler_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf) /* no masking on the reads, all 4 bits are decoded */
AM_RANGE(0x01, 0x01) AM_READ(bowler_shift_result_r)
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN0")
@@ -2632,7 +2632,7 @@ int invaders_is_cabinet_cocktail(running_machine *machine)
}
-static ADDRESS_MAP_START( invaders_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( invaders_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1")
@@ -2763,7 +2763,7 @@ static CUSTOM_INPUT( blueshrk_coin_input_r )
}
-static ADDRESS_MAP_START( blueshrk_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( blueshrk_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ(mw8080bw_shift_result_rev_r)
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN0")
@@ -2843,7 +2843,7 @@ static UINT32 invad2ct_coin_input_r(void *param)
#endif
-static ADDRESS_MAP_START( invad2ct_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( invad2ct_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x04) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_MIRROR(0x04) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index 1e503322946..593368e11a6 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -172,7 +172,7 @@ static WRITE16_HANDLER( mwarr_brightness_w )
*
*************************************/
-static ADDRESS_MAP_START( mwarr_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mwarr_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x1007ff) AM_RAM_WRITE(bg_videoram_w) AM_BASE_MEMBER(mwarr_state, bg_videoram)
AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE(mlow_videoram_w) AM_BASE_MEMBER(mwarr_state, mlow_videoram)
diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c
index f19fa625f63..bba5a62e5bb 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -99,7 +99,7 @@ static WRITE8_HANDLER( mystston_ay8910_select_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x077f) AM_RAM
AM_RANGE(0x0780, 0x07df) AM_RAM AM_BASE_MEMBER(mystston_state, spriteram)
AM_RANGE(0x07e0, 0x0fff) AM_RAM
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index bcf7e5aa452..28a1d453419 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -259,7 +259,7 @@ static WRITE16_HANDLER( K053247_scattered_word_w )
/* 68000 memory handlers */
/* Mystic Warriors */
-static ADDRESS_MAP_START( mystwarr_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mystwarr_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // main program
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE_MEMBER(mystwarr_state, gx_workram)
AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(K053247_scattered_word_r,K053247_scattered_word_w) AM_BASE_MEMBER(mystwarr_state, spriteram)
@@ -297,7 +297,7 @@ static ADDRESS_MAP_START( mystwarr_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* Metamorphic Force */
-static ADDRESS_MAP_START( metamrph_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( metamrph_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // main program
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE_MEMBER(mystwarr_state, gx_workram)
AM_RANGE(0x210000, 0x210fff) AM_READWRITE(K053247_word_r,K053247_word_w)
@@ -340,7 +340,7 @@ static ADDRESS_MAP_START( metamrph_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* Violent Storm */
-static ADDRESS_MAP_START( viostorm_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( viostorm_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // main program
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE_MEMBER(mystwarr_state, gx_workram)
AM_RANGE(0x210000, 0x210fff) AM_READWRITE(K053247_word_r,K053247_word_w)
@@ -438,7 +438,7 @@ static WRITE16_HANDLER( mccontrol_w )
}
/* Martial Champion */
-static ADDRESS_MAP_START( martchmp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( martchmp_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // main program
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE_MEMBER(mystwarr_state, gx_workram) // work RAM
AM_RANGE(0x300000, 0x3fffff) AM_ROM // data ROM
@@ -479,7 +479,7 @@ static ADDRESS_MAP_START( martchmp_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* Ultimate Battler Dadandarn */
-static ADDRESS_MAP_START( dadandrn_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dadandrn_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // main program and data ROM
AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(K053247_scattered_word_r,K053247_scattered_word_w) AM_BASE_MEMBER(mystwarr_state, spriteram)
AM_RANGE(0x410000, 0x411fff) AM_READWRITE(K056832_ram_word_r,K056832_ram_word_w) // tilemap RAM
@@ -527,7 +527,7 @@ ADDRESS_MAP_END
// a00000 = the 128k tilemap
// 800000 = the 256k tilemap
// c00000 = 936 tiles (7fffff window)
-static ADDRESS_MAP_START( gaiapols_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gaiapols_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x2fffff) AM_ROM // main program
AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(K053247_scattered_word_r,K053247_scattered_word_w) AM_BASE_MEMBER(mystwarr_state, spriteram)
AM_RANGE(0x410000, 0x411fff) AM_READWRITE(K056832_ram_word_r,K056832_ram_word_w) // tilemap RAM
@@ -595,7 +595,7 @@ static WRITE8_HANDLER( sound_bankswitch_w )
quite similar to xexex/gijoe/asterix's sound.
*/
-static ADDRESS_MAP_START( mystwarr_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mystwarr_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
AM_RANGE(0x0000, 0xbfff) AM_WRITENOP
diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c
index bac94cc5402..e1e6066422d 100644
--- a/src/mame/drivers/n8080.c
+++ b/src/mame/drivers/n8080.c
@@ -35,20 +35,20 @@ static READ8_HANDLER( n8080_shift_r )
return state->shift_data >> (8 - state->shift_bits);
}
-static ADDRESS_MAP_START( main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE_MEMBER(n8080_state, videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( helifire_main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( helifire_main_cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_RAM AM_BASE_MEMBER(n8080_state, videoram)
AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_MEMBER(n8080_state, colorram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c
index fd2c1218fe1..d83915284e7 100644
--- a/src/mame/drivers/namcofl.c
+++ b/src/mame/drivers/namcofl.c
@@ -229,7 +229,7 @@ static WRITE32_HANDLER( namcofl_share_w )
COMBINE_DATA(state->shareram+offset*2+1);
}
-static ADDRESS_MAP_START( namcofl_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( namcofl_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x000fffff) AM_RAMBANK("bank1")
AM_RANGE(0x10000000, 0x100fffff) AM_RAMBANK("bank2")
AM_RANGE(0x20000000, 0x201fffff) AM_ROM AM_REGION("user1", 0) /* data */
@@ -330,14 +330,14 @@ static READ8_HANDLER(dac2_r) { return 0xff; }
static READ8_HANDLER(dac1_r) { return 0xff; }
static READ8_HANDLER(dac0_r) { return 0xff; }
-static ADDRESS_MAP_START( namcoc75_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( namcoc75_am, AS_PROGRAM, 16 )
AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE("c352", c352_r, c352_w)
AM_RANGE(0x004000, 0x00bfff) AM_RAM_WRITE(mcu_shared_w) AM_BASE_MEMBER(namcofl_state, shareram)
AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("c75", 0)
AM_RANGE(0x200000, 0x27ffff) AM_ROM AM_REGION("c75data", 0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( namcoc75_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( namcoc75_io, AS_IO, 8 )
AM_RANGE(M37710_PORT6, M37710_PORT6) AM_READWRITE(port6_r, port6_w)
AM_RANGE(M37710_PORT7, M37710_PORT7) AM_READ(port7_r)
AM_RANGE(M37710_ADC7_L, M37710_ADC7_L) AM_READ(dac7_r)
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index a9813ee6cc3..9f7340d54f3 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -500,7 +500,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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
if( source>=0x400000 && source<0xc00000 )
{
@@ -746,7 +746,7 @@ static WRITE16_HANDLER( mcu_mailbox_w_mcu )
COMBINE_DATA(&state->mcu_mailbox[offset%8]);
}
-static ADDRESS_MAP_START( namcona1_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( namcona1_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_RAM AM_BASE_MEMBER(namcona1_state, workram)
AM_RANGE(0x3f8000, 0x3fffff) AM_READWRITE(mcu_mailbox_r, mcu_mailbox_w_68k)
AM_RANGE(0x400000, 0xbfffff) AM_ROM AM_REGION("maincpu", 0x280000) /* data */
@@ -763,7 +763,7 @@ static ADDRESS_MAP_START( namcona1_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( namcona2_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( namcona2_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_RAM AM_BASE_MEMBER(namcona1_state, workram)
AM_RANGE(0x3f8000, 0x3fffff) AM_READWRITE(mcu_mailbox_r, mcu_mailbox_w_68k)
AM_RANGE(0x400000, 0xbfffff) AM_ROM AM_REGION("maincpu", 0x280000) /* data */
@@ -833,7 +833,7 @@ static WRITE16_DEVICE_HANDLER(snd_w)
}
}
-static ADDRESS_MAP_START( namcona1_mcu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( namcona1_mcu_map, AS_PROGRAM, 16 )
AM_RANGE(0x000800, 0x000fff) AM_READWRITE(mcu_mailbox_r, mcu_mailbox_w_mcu) // "Mailslot" communications ports
AM_RANGE(0x001000, 0x001fff) AM_DEVREADWRITE("c140", snd_r, snd_w) // C140-alike sound chip
AM_RANGE(0x002000, 0x002fff) AM_READWRITE(na1mcu_shared_r, na1mcu_shared_w) // mirror of first page of shared work RAM
@@ -964,7 +964,7 @@ static READ8_HANDLER( portana_r )
return (port & bitnum[offset>>1]) ? 0xff : 0x00;
}
-static ADDRESS_MAP_START( namcona1_mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( namcona1_mcu_io_map, AS_IO, 8 )
AM_RANGE(M37710_PORT4, M37710_PORT4) AM_READWRITE( port4_r, port4_w )
AM_RANGE(M37710_PORT5, M37710_PORT5) AM_READWRITE( port5_r, port5_w )
AM_RANGE(M37710_PORT6, M37710_PORT6) AM_READWRITE( port6_r, port6_w )
diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c
index 5056332423b..157701359bb 100644
--- a/src/mame/drivers/namconb1.c
+++ b/src/mame/drivers/namconb1.c
@@ -854,7 +854,7 @@ static WRITE32_HANDLER(namconb_share_w)
COMBINE_DATA(state->namconb_shareram+offset*2);
}
-static ADDRESS_MAP_START( namconb1_am, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( namconb1_am, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10001f) AM_READ(gunbulet_gun_r)
AM_RANGE(0x1c0000, 0x1cffff) AM_RAM
@@ -872,7 +872,7 @@ static ADDRESS_MAP_START( namconb1_am, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x700000, 0x707fff) AM_RAM AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( namconb2_am, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( namconb2_am, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x1c0000, 0x1cffff) AM_RAM
AM_RANGE(0x1e4000, 0x1e4003) AM_READWRITE(randgen_r,srand_w)
@@ -917,7 +917,7 @@ static WRITE16_HANDLER( nbmcu_shared_w )
}
}
-static ADDRESS_MAP_START( namcoc75_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( namcoc75_am, AS_PROGRAM, 16 )
AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE("c352", c352_r, c352_w)
AM_RANGE(0x004000, 0x00bfff) AM_RAM_WRITE(nbmcu_shared_w) AM_BASE_MEMBER(namconb1_state, namconb_shareram)
AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("c75", 0)
@@ -1004,7 +1004,7 @@ static READ8_HANDLER(dac0_r) // bit 6
return (input_port_read_safe(space->machine, "P3", 0xff)<<7)&0x80;
}
-static ADDRESS_MAP_START( namcoc75_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( namcoc75_io, AS_IO, 8 )
AM_RANGE(M37710_PORT6, M37710_PORT6) AM_READWRITE(port6_r, port6_w)
AM_RANGE(M37710_PORT7, M37710_PORT7) AM_READ(port7_r)
AM_RANGE(M37710_ADC7_L, M37710_ADC7_L) AM_READ(dac7_r)
diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c
index b49c6a3054e..02071926029 100644
--- a/src/mame/drivers/namcond1.c
+++ b/src/mame/drivers/namcond1.c
@@ -75,7 +75,7 @@ Notes:
/*************************************************************/
-static ADDRESS_MAP_START( namcond1_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( namcond1_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(namcond1_shared_ram_r,namcond1_shared_ram_w) AM_BASE_MEMBER(namcond1_state, shared_ram)
AM_RANGE(0x800000, 0x80000f) AM_READWRITE(ygv608_r,ygv608_w)
@@ -250,7 +250,7 @@ static WRITE8_HANDLER( mcu_pa_write )
}
/* H8/3002 MCU stuff */
-static ADDRESS_MAP_START( nd1h8rwmap, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( nd1h8rwmap, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_READWRITE( sharedram_sub_r, sharedram_sub_w )
AM_RANGE(0xa00000, 0xa07fff) AM_DEVREADWRITE( "c352", c352_r, c352_w )
@@ -261,7 +261,7 @@ static ADDRESS_MAP_START( nd1h8rwmap, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc00040, 0xc00041) AM_NOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nd1h8iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( nd1h8iomap, AS_IO, 8 )
AM_RANGE(H8_PORT_7, H8_PORT_7) AM_READ( mcu_p7_read )
AM_RANGE(H8_PORT_A, H8_PORT_A) AM_READWRITE( mcu_pa_read, mcu_pa_write )
AM_RANGE(H8_ADC_0_L, H8_ADC_3_H) AM_NOP // MCU reads these, but the games have no analog controls
diff --git a/src/mame/drivers/namcops2.c b/src/mame/drivers/namcops2.c
index 9bae6334db9..02cc869b940 100644
--- a/src/mame/drivers/namcops2.c
+++ b/src/mame/drivers/namcops2.c
@@ -43,7 +43,7 @@ static SCREEN_UPDATE(system246)
return 0;
}
-static ADDRESS_MAP_START(ps2_map, ADDRESS_SPACE_PROGRAM, 32)
+static ADDRESS_MAP_START(ps2_map, AS_PROGRAM, 32)
AM_RANGE(0x00000000, 0x01ffffff) AM_RAM // 32 MB RAM in consumer PS2s, do these have more?
AM_RANGE(0x1fc00000, 0x1fdfffff) AM_ROM AM_REGION("bios", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index 0252ff2155c..c535f3bc516 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -428,7 +428,7 @@ static WRITE8_HANDLER( namcos1_dac1_w )
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAMBANK("bank1")
AM_RANGE(0x2000, 0x3fff) AM_RAMBANK("bank2")
AM_RANGE(0x4000, 0x5fff) AM_RAMBANK("bank3")
@@ -448,7 +448,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAMBANK("bank9")
AM_RANGE(0x2000, 0x3fff) AM_RAMBANK("bank10")
AM_RANGE(0x4000, 0x5fff) AM_RAMBANK("bank11")
@@ -466,7 +466,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank17") /* Banked ROMs */
AM_RANGE(0x4000, 0x4001) AM_DEVREAD("ymsnd", ym2151_status_port_r)
AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -480,7 +480,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x001f) AM_READWRITE(m6801_io_r, m6801_io_w)
AM_RANGE(0x0080, 0x00ff) AM_RAM /* built in RAM */
AM_RANGE(0x1000, 0x1003) AM_READ(dsw_r)
@@ -497,7 +497,7 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_port_map, AS_IO, 8 )
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_READ_PORT("COIN") AM_WRITE(namcos1_coin_w)
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READNOP AM_WRITE(namcos1_dac_gain_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c
index a7ba853ba85..e097e9d4b1b 100644
--- a/src/mame/drivers/namcos10.c
+++ b/src/mame/drivers/namcos10.c
@@ -280,7 +280,7 @@ public:
: psx_state(machine, config) { }
};
-static ADDRESS_MAP_START( namcos10_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( namcos10_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00ffffff) AM_RAM AM_SHARE("share1") /* ram */
AM_RANGE(0x1f800000, 0x1f8003ff) AM_RAM /* scratchpad */
AM_RANGE(0x1f801000, 0x1f801007) AM_WRITENOP
@@ -309,8 +309,8 @@ ADDRESS_MAP_END
static void memm_driver_init( running_machine *machine )
{
psx_driver_init(machine);
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f300000, 0x1f300003, 0, 0, namcos10_bank_w );
- memory_install_read_bank( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank1" );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f300000, 0x1f300003, 0, 0, namcos10_bank_w );
+ memory_install_read_bank( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank1" );
memory_configure_bank( machine, "bank1", 0, 16, machine->region( "user2" )->base(), 4 * 1024 * 1024 );
}
@@ -399,15 +399,15 @@ static void memn_driver_init( running_machine *machine )
nand_copy( (UINT32 *)( BIOS + 0x0000000 ), 0x08000, 0x001c000 );
nand_copy( (UINT32 *)( BIOS + 0x0020000 ), 0x24000, 0x03e0000 );
- memory_install_read32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f400003, 0, 0, nand_status_r );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f410000, 0x1f410003, 0, 0, nand_address1_w );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f420000, 0x1f420003, 0, 0, nand_address2_w );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f430000, 0x1f430003, 0, 0, nand_address3_w );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f440000, 0x1f440003, 0, 0, nand_address4_w );
- memory_install_read32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f450000, 0x1f450003, 0, 0, nand_data_r );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb60000, 0x1fb60003, 0, 0, watchdog_w );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xbf500000, 0xbf5007d7, 0, 0, nand_block_w );
- memory_install_read32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xbf500000, 0xbf5007d7, 0, 0, nand_block_r );
+ memory_install_read32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f400000, 0x1f400003, 0, 0, nand_status_r );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f410000, 0x1f410003, 0, 0, nand_address1_w );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f420000, 0x1f420003, 0, 0, nand_address2_w );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f430000, 0x1f430003, 0, 0, nand_address3_w );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f440000, 0x1f440003, 0, 0, nand_address4_w );
+ memory_install_read32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f450000, 0x1f450003, 0, 0, nand_data_r );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb60000, 0x1fb60003, 0, 0, watchdog_w );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0xbf500000, 0xbf5007d7, 0, 0, nand_block_w );
+ memory_install_read32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0xbf500000, 0xbf5007d7, 0, 0, nand_block_r );
psx_driver_init(machine);
}
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 67e96625072..e82aba1c52a 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -699,7 +699,7 @@ static READ32_HANDLER( lightgun_r )
return data;
}
-static ADDRESS_MAP_START( namcos11_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( namcos11_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_SHARE("share1") /* ram */
AM_RANGE(0x1f800000, 0x1f8003ff) AM_RAM /* scratchpad */
AM_RANGE(0x1f801000, 0x1f801007) AM_WRITENOP
@@ -787,7 +787,7 @@ static READ16_HANDLER( c76_inputs_r )
return 0xff;
}
-ADDRESS_MAP_START( c76_map, ADDRESS_SPACE_PROGRAM, 16 )
+ADDRESS_MAP_START( c76_map, AS_PROGRAM, 16 )
AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE("c352", c352_r, c352_w )
AM_RANGE(0x001000, 0x001007) AM_READ( c76_inputs_r )
AM_RANGE(0x004000, 0x00bfff) AM_READWRITE( c76_shared_r, c76_shared_w )
@@ -849,7 +849,7 @@ static READ8_HANDLER(pocketrc_steer_r)
return input_port_read(space->machine, "STEERING");
}
-ADDRESS_MAP_START( c76_io_map, ADDRESS_SPACE_IO, 8 )
+ADDRESS_MAP_START( c76_io_map, AS_IO, 8 )
AM_RANGE(M37710_ADC7_L, M37710_ADC7_L) AM_READ(dac7_r)
AM_RANGE(M37710_ADC6_L, M37710_ADC6_L) AM_READ(dac6_r)
AM_RANGE(M37710_ADC5_L, M37710_ADC5_L) AM_READ(dac5_r)
@@ -915,12 +915,12 @@ static DRIVER_INIT( namcos11 )
namcos11_state *state = machine->driver_data<namcos11_state>();
int n_game;
- memory_install_readwrite16_handler(machine->device("c76")->memory().space(ADDRESS_SPACE_PROGRAM), 0x82, 0x83, 0, 0, c76_speedup_r, c76_speedup_w);
+ memory_install_readwrite16_handler(machine->device("c76")->memory().space(AS_PROGRAM), 0x82, 0x83, 0, 0, c76_speedup_r, c76_speedup_w);
if( strcmp( machine->gamedrv->name, "pocketrc" ) == 0 )
{
- memory_install_read8_handler(machine->device("c76")->memory().space(ADDRESS_SPACE_IO), M37710_ADC0_L, M37710_ADC0_L, 0, 0, pocketrc_steer_r);
- memory_install_read8_handler(machine->device("c76")->memory().space(ADDRESS_SPACE_IO), M37710_ADC1_L, M37710_ADC1_L, 0, 0, pocketrc_gas_r);
+ memory_install_read8_handler(machine->device("c76")->memory().space(AS_IO), M37710_ADC0_L, M37710_ADC0_L, 0, 0, pocketrc_steer_r);
+ memory_install_read8_handler(machine->device("c76")->memory().space(AS_IO), M37710_ADC1_L, M37710_ADC1_L, 0, 0, pocketrc_gas_r);
}
psx_driver_init(machine);
@@ -932,7 +932,7 @@ static DRIVER_INIT( namcos11 )
{
if( namcos11_config_table[ n_game ].keycus_r != NULL )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fa20000, 0x1fa2ffff, 0, 0, namcos11_config_table[ n_game ].keycus_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fa20000, 0x1fa2ffff, 0, 0, namcos11_config_table[ n_game ].keycus_r );
}
if( namcos11_config_table[ n_game ].n_daughterboard != 0 )
{
@@ -940,14 +940,14 @@ static DRIVER_INIT( namcos11 )
UINT32 len = machine->region( "user2" )->bytes();
UINT8 *rgn = machine->region( "user2" )->base();
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f0fffff, 0, 0, "bank1" );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f100000, 0x1f1fffff, 0, 0, "bank2" );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f200000, 0x1f2fffff, 0, 0, "bank3" );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f300000, 0x1f3fffff, 0, 0, "bank4" );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f4fffff, 0, 0, "bank5" );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f500000, 0x1f5fffff, 0, 0, "bank6" );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f600000, 0x1f6fffff, 0, 0, "bank7" );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f700000, 0x1f7fffff, 0, 0, "bank8" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f0fffff, 0, 0, "bank1" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f100000, 0x1f1fffff, 0, 0, "bank2" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f200000, 0x1f2fffff, 0, 0, "bank3" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f300000, 0x1f3fffff, 0, 0, "bank4" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f400000, 0x1f4fffff, 0, 0, "bank5" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f500000, 0x1f5fffff, 0, 0, "bank6" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f600000, 0x1f6fffff, 0, 0, "bank7" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f700000, 0x1f7fffff, 0, 0, "bank8" );
for( bank = 0; bank < 8; bank++ )
{
@@ -957,20 +957,20 @@ static DRIVER_INIT( namcos11 )
if( namcos11_config_table[ n_game ].n_daughterboard == 32 )
{
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fa10020, 0x1fa1002f, 0, 0, bankswitch_rom32_w );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fa10020, 0x1fa1002f, 0, 0, bankswitch_rom32_w );
}
if( namcos11_config_table[ n_game ].n_daughterboard == 64 )
{
state->m_n_bankoffset = 0;
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f080000, 0x1f080003, 0, 0, bankswitch_rom64_upper_w );
- memory_nop_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fa10020, 0x1fa1002f, 0, 0 );
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fa10020, 0x1fa1002f, 0, 0, bankswitch_rom64_w );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f080000, 0x1f080003, 0, 0, bankswitch_rom64_upper_w );
+ memory_nop_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fa10020, 0x1fa1002f, 0, 0 );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fa10020, 0x1fa1002f, 0, 0, bankswitch_rom64_w );
state->save_item( NAME(state->m_n_bankoffset) );
}
}
else
{
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fa10020, 0x1fa1002f, 0, 0 );
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fa10020, 0x1fa1002f, 0, 0 );
}
break;
}
@@ -979,8 +979,8 @@ static DRIVER_INIT( namcos11 )
if( strcmp( machine->gamedrv->name, "ptblank2a" ) == 0 )
{
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f788000, 0x1f788003, 0, 0, lightgun_w );
- memory_install_read32_handler (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f780000, 0x1f78000f, 0, 0, lightgun_r );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f788000, 0x1f788003, 0, 0, lightgun_w );
+ memory_install_read32_handler (machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f780000, 0x1f78000f, 0, 0, lightgun_r );
}
}
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index eacbc7f9de3..5c05f448231 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1211,7 +1211,7 @@ static WRITE32_HANDLER( s12_dma_bias_w )
state->m_n_dmabias = data;
}
-static ADDRESS_MAP_START( namcos12_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( namcos12_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_SHARE("share1") /* ram */
AM_RANGE(0x1f000000, 0x1f000003) AM_READNOP AM_WRITE(bankoffset_w) /* banking */
AM_RANGE(0x1f080000, 0x1f083fff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE_MEMBER(namcos12_state, sharedram) /* shared ram?? */
@@ -1293,8 +1293,8 @@ static READ32_HANDLER( system11gun_r )
static void system11gun_install( running_machine *machine )
{
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f788000, 0x1f788003, 0, 0, system11gun_w );
- memory_install_read32_handler (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f780000, 0x1f78000f, 0, 0, system11gun_r );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f788000, 0x1f788003, 0, 0, system11gun_w );
+ memory_install_read32_handler (machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f780000, 0x1f78000f, 0, 0, system11gun_r );
}
static WRITE32_HANDLER( kcoff_w )
@@ -1366,7 +1366,7 @@ static READ32_HANDLER( tektagt_protection_3_r )
static MACHINE_RESET( namcos12 )
{
namcos12_state *state = machine->driver_data<namcos12_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
psx_machine_init(machine);
bankoffset_w(space,0,0,0xffffffff);
state->has_tektagt_dma = 0;
@@ -1412,7 +1412,7 @@ static MACHINE_RESET( namcos12 )
}
/* H8/3002 MCU stuff */
-static ADDRESS_MAP_START( s12h8rwmap, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( s12h8rwmap, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_READWRITE( sharedram_sub_r, sharedram_sub_w )
AM_RANGE(0x280000, 0x287fff) AM_DEVREADWRITE( "c352", c352_r, c352_w )
@@ -1593,7 +1593,7 @@ static READ8_HANDLER( s12_mcu_gun_v_r )
return 0;
}
-static ADDRESS_MAP_START( s12h8iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( s12h8iomap, AS_IO, 8 )
AM_RANGE(H8_PORT_7, H8_PORT_7) AM_READ_PORT("DSW")
AM_RANGE(H8_PORT_8, H8_PORT_8) AM_READ( s12_mcu_p8_r ) AM_WRITENOP
AM_RANGE(H8_PORT_A, H8_PORT_A) AM_READWRITE( s12_mcu_pa_r, s12_mcu_pa_w )
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index a6bc8009be8..601c0c5d9f9 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -590,7 +590,7 @@ static WRITE8_HANDLER( namcos2_dpram_byte_w )
0xc00000 ONWARDS are unverified memory locations on the video board
*/
-static ADDRESS_MAP_START( namcos2_68k_default_cpu_board_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( namcos2_68k_default_cpu_board_am, AS_PROGRAM, 16 )
AM_RANGE(0x200000, 0x3fffff) AM_READ(namcos2_68k_data_rom_r)
AM_RANGE(0x400000, 0x41ffff) AM_READWRITE(namco_tilemapvideoram16_r,namco_tilemapvideoram16_w)
AM_RANGE(0x420000, 0x42003f) AM_READWRITE(namco_tilemapcontrol16_r,namco_tilemapcontrol16_w)
@@ -603,7 +603,7 @@ ADDRESS_MAP_END
/*************************************************************/
-static ADDRESS_MAP_START( common_default_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( common_default_am, AS_PROGRAM, 16 )
AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE(namcos2_sprite_ram_r,namcos2_sprite_ram_w) AM_BASE(&namcos2_sprite_ram)
AM_RANGE(0xc40000, 0xc40001) AM_READWRITE(namcos2_gfx_ctrl_r,namcos2_gfx_ctrl_w)
AM_RANGE(0xc80000, 0xc9ffff) AM_READWRITE(namcos2_68k_roz_ram_r,namcos2_68k_roz_ram_w) AM_BASE(&namcos2_68k_roz_ram)
@@ -612,7 +612,7 @@ static ADDRESS_MAP_START( common_default_am, ADDRESS_SPACE_PROGRAM, 16 )
AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_default_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( master_default_am, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM)
AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W)
@@ -620,7 +620,7 @@ static ADDRESS_MAP_START( master_default_am, ADDRESS_SPACE_PROGRAM, 16 )
AM_IMPORT_FROM( common_default_am )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_default_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( slave_default_am, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM)
AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w)
@@ -630,7 +630,7 @@ ADDRESS_MAP_END
/*************************************************************/
-static ADDRESS_MAP_START( common_finallap_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( common_finallap_am, AS_PROGRAM, 16 )
AM_RANGE(0x300000, 0x33ffff) AM_READ(namcos2_flap_prot_r)
AM_RANGE(0x800000, 0x80ffff) AM_READ(namcos2_sprite_ram_r) AM_WRITE(namcos2_sprite_ram_w) AM_BASE(&namcos2_sprite_ram)
AM_RANGE(0x840000, 0x840001) AM_READ(namcos2_gfx_ctrl_r) AM_WRITE(namcos2_gfx_ctrl_w)
@@ -639,7 +639,7 @@ static ADDRESS_MAP_START( common_finallap_am, ADDRESS_SPACE_PROGRAM, 16 )
AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_finallap_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( master_finallap_am, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM)
AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W)
@@ -647,7 +647,7 @@ static ADDRESS_MAP_START( master_finallap_am, ADDRESS_SPACE_PROGRAM, 16 )
AM_IMPORT_FROM( common_finallap_am )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_finallap_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( slave_finallap_am, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM)
AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w)
@@ -656,14 +656,14 @@ ADDRESS_MAP_END
/*************************************************************/
-static ADDRESS_MAP_START( common_sgunner_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( common_sgunner_am, AS_PROGRAM, 16 )
AM_RANGE(0x800000, 0x8141ff) AM_READWRITE(namco_obj16_r,namco_obj16_w)
AM_RANGE(0x818000, 0x818001) AM_WRITENOP
AM_RANGE(0xa00000, 0xa0000f) AM_READWRITE(namcos2_68k_key_r,namcos2_68k_key_w)
AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_sgunner_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( master_sgunner_am, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM)
AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W)
@@ -671,7 +671,7 @@ static ADDRESS_MAP_START( master_sgunner_am, ADDRESS_SPACE_PROGRAM, 16 )
AM_IMPORT_FROM( common_sgunner_am )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_sgunner_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( slave_sgunner_am, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM)
AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w)
@@ -680,7 +680,7 @@ ADDRESS_MAP_END
/*************************************************************/
-static ADDRESS_MAP_START( common_metlhawk_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( common_metlhawk_am, AS_PROGRAM, 16 )
AM_RANGE(0xc00000, 0xc03fff) AM_READWRITE(namcos2_sprite_ram_r,namcos2_sprite_ram_w) AM_BASE(&namcos2_sprite_ram) \
AM_RANGE(0xc40000, 0xc4ffff) AM_READWRITE(namco_rozvideoram16_r,namco_rozvideoram16_w) \
AM_RANGE(0xd00000, 0xd0001f) AM_READWRITE(namco_rozcontrol16_r,namco_rozcontrol16_w) \
@@ -688,7 +688,7 @@ static ADDRESS_MAP_START( common_metlhawk_am, ADDRESS_SPACE_PROGRAM, 16 )
AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_metlhawk_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( master_metlhawk_am, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM)
AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W)
@@ -696,7 +696,7 @@ static ADDRESS_MAP_START( master_metlhawk_am, ADDRESS_SPACE_PROGRAM, 16 )
AM_IMPORT_FROM( common_metlhawk_am )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_metlhawk_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( slave_metlhawk_am, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM)
AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w)
@@ -705,7 +705,7 @@ ADDRESS_MAP_END
/*************************************************************/
-static ADDRESS_MAP_START( common_luckywld_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( common_luckywld_am, AS_PROGRAM, 16 )
AM_RANGE(0x800000, 0x8141ff) AM_READWRITE(namco_obj16_r,namco_obj16_w)
AM_RANGE(0x818000, 0x818001) AM_NOP /* enable? */
AM_RANGE(0x81a000, 0x81a001) AM_WRITENOP /* enable? */
@@ -718,7 +718,7 @@ static ADDRESS_MAP_START( common_luckywld_am, ADDRESS_SPACE_PROGRAM, 16 )
AM_IMPORT_FROM( namcos2_68k_default_cpu_board_am )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_luckywld_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( master_luckywld_am, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAMBANK(NAMCOS2_68K_MASTER_RAM)
AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W)
@@ -726,7 +726,7 @@ static ADDRESS_MAP_START( master_luckywld_am, ADDRESS_SPACE_PROGRAM, 16 )
AM_IMPORT_FROM( common_luckywld_am )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_luckywld_am, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( slave_luckywld_am, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAMBANK(NAMCOS2_68K_SLAVE_RAM)
AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w)
@@ -737,7 +737,7 @@ ADDRESS_MAP_END
/* 6809 SOUND CPU Memory declarations */
/*************************************************************/
-static ADDRESS_MAP_START( sound_default_am, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_default_am, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank6") /* banked */
AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w)
AM_RANGE(0x5000, 0x6fff) AM_DEVREADWRITE("c140", c140_r,c140_w)
@@ -756,7 +756,7 @@ ADDRESS_MAP_END
/* 68705 IO CPU Memory declarations */
/*************************************************************/
-static ADDRESS_MAP_START( mcu_default_am, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_default_am, AS_PROGRAM, 8 )
/* input ports and dips are mapped here */
AM_RANGE(0x0000, 0x0000) AM_READNOP /* Keep logging quiet */
AM_RANGE(0x0001, 0x0001) AM_READ(namcos2_input_port_0_r)
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index c58624e64f9..e80194b2b41 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -798,17 +798,17 @@ static WRITE16_HANDLER( dsp_xf_w )
if (ENABLE_LOGGING) logerror("xf(%d)\n",data);
}
-static ADDRESS_MAP_START( master_dsp_program, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( master_dsp_program, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x0fff) AM_ROM /* BIOS */
AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(&master_dsp_code)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_dsp_data, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( master_dsp_data, AS_DATA, 16 )
AM_RANGE(0x2000, 0x200f) AM_READWRITE(dspcuskey_r,dspcuskey_w)
AM_RANGE(0x8000, 0xffff) AM_READWRITE(dspram16_r,dspram16_w) /* 0x8000 words */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_dsp_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( master_dsp_io, AS_IO, 16 )
AM_RANGE(0x00,0x00) AM_READWRITE(dsp_port0_r,dsp_port0_w)
AM_RANGE(0x01,0x01) AM_READWRITE(dsp_port1_r,dsp_port1_w)
AM_RANGE(0x02,0x02) AM_READWRITE(dsp_port2_r,dsp_port2_w)
@@ -927,16 +927,16 @@ static READ16_HANDLER( slave_portf_r )
return 1;
}
-static ADDRESS_MAP_START( slave_dsp_program, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( slave_dsp_program, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x0fff) AM_ROM /* BIOS */
AM_RANGE(0x8000, 0x8fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_dsp_data, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( slave_dsp_data, AS_DATA, 16 )
/* no external data memory */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_dsp_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( slave_dsp_io, AS_IO, 16 )
AM_RANGE(0x00,0x00) AM_READWRITE(slave_port0_r,slave_port0_w)
AM_RANGE(0x02,0x02) AM_READ(slave_port2_r)
AM_RANGE(0x03,0x03) AM_READWRITE(slave_port3_r,slave_port3_w)
@@ -1126,7 +1126,7 @@ static READ16_HANDLER( NAMCO_C139_SCI_register_r ){ return 0; }
AM_RANGE(0xc00000, 0xcfffff) AM_READ(data2_r) /* Cyber Sled */ \
AM_RANGE(0xd00000, 0xdfffff) AM_READ(data2_r) \
-static ADDRESS_MAP_START( namcos21_68k_master, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( namcos21_68k_master, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* private work RAM */
AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W)// AM_BASE(&namcos2_eeprom) AM_SIZE(&namcos2_eeprom_size)
@@ -1134,7 +1134,7 @@ static ADDRESS_MAP_START( namcos21_68k_master, ADDRESS_SPACE_PROGRAM, 16 )
NAMCO21_68K_COMMON
ADDRESS_MAP_END
-static ADDRESS_MAP_START( namcos21_68k_slave, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( namcos21_68k_slave, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAM /* private work RAM */
AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w)
@@ -1279,17 +1279,17 @@ static READ16_HANDLER( winrun_table_r )
return winrun_polydata[offset];
}
-static ADDRESS_MAP_START( winrun_dsp_program, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( winrun_dsp_program, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winrun_dsp_data, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( winrun_dsp_data, AS_DATA, 16 )
AM_RANGE( 0x2000, 0x200f ) AM_READWRITE(winrun_cuskey_r,winrun_cuskey_w)
AM_RANGE( 0x4000, 0x4fff ) AM_READWRITE(winrun_dspcomram_r,winrun_dspcomram_w)
AM_RANGE( 0x8000, 0xffff ) AM_READ(winrun_table_r )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( winrun_dsp_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( winrun_dsp_io, AS_IO, 16 )
AM_RANGE(0x08,0x09) AM_READWRITE(winrun_dsp_pointrom_data_r,winrun_dsp_pointrom_addr_w)
AM_RANGE(0x0a,0x0a) AM_WRITE(winrun_dsp_render_w)
AM_RANGE(0x0b,0x0b) AM_WRITENOP
@@ -1355,7 +1355,7 @@ static WRITE16_HANDLER( winrun_dspcomram_control_w )
COMBINE_DATA( &winrun_dspcomram_control[offset] );
}
-static ADDRESS_MAP_START( am_master_winrun, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( am_master_winrun, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* work RAM */
AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W)// AM_BASE(&namcos2_eeprom) AM_SIZE(&namcos2_eeprom_size)
@@ -1375,7 +1375,7 @@ static ADDRESS_MAP_START( am_master_winrun, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb80000, 0xb8000f) AM_READWRITE(NAMCO_C139_SCI_register_r,NAMCO_C139_SCI_register_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( am_slave_winrun, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( am_slave_winrun, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAM
AM_RANGE(0x1c0000, 0x1fffff) AM_READWRITE(namcos2_68k_slave_C148_r,namcos2_68k_slave_C148_w)
@@ -1387,7 +1387,7 @@ static ADDRESS_MAP_START( am_slave_winrun, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb80000, 0xb8000f) AM_READWRITE(NAMCO_C139_SCI_register_r,NAMCO_C139_SCI_register_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( am_gpu_winrun, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( am_gpu_winrun, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READWRITE(winrun_gpu_color_r,winrun_gpu_color_w) /* ? */
AM_RANGE(0x180000, 0x19ffff) AM_RAM /* work RAM */
@@ -1405,7 +1405,7 @@ ADDRESS_MAP_END
/* SOUND 6809 CPU Memory declarations */
/*************************************************************/
-static ADDRESS_MAP_START( am_sound_winrun, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( am_sound_winrun, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank6") /* banked */
AM_RANGE(0x3000, 0x3003) AM_WRITENOP /* ? */
AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w)
@@ -1425,7 +1425,7 @@ ADDRESS_MAP_END
/* I/O HD63705 MCU Memory declarations */
/*************************************************************/
-static ADDRESS_MAP_START( am_mcu_winrun, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( am_mcu_winrun, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_READNOP
AM_RANGE(0x0001, 0x0001) AM_READ_PORT("PORTB") /* p1,p2 start */
AM_RANGE(0x0002, 0x0002) AM_READ_PORT("PORTC") /* coins */
@@ -1464,7 +1464,7 @@ ADDRESS_MAP_END
AM_RANGE(0xb80000, 0xb8000f) AM_READWRITE(NAMCO_C139_SCI_register_r,NAMCO_C139_SCI_register_w) \
-static ADDRESS_MAP_START( driveyes_68k_master, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( driveyes_68k_master, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* private work RAM */
AM_RANGE(0x180000, 0x183fff) AM_READWRITE(NAMCOS2_68K_eeprom_R,NAMCOS2_68K_eeprom_W)// AM_BASE(&namcos2_eeprom) AM_SIZE(&namcos2_eeprom_size)
@@ -1478,7 +1478,7 @@ static ADDRESS_MAP_START( driveyes_68k_master, ADDRESS_SPACE_PROGRAM, 16 )
DRIVEYES_68K_COMMON
ADDRESS_MAP_END
-static ADDRESS_MAP_START( driveyes_68k_slave, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( driveyes_68k_slave, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* private work RAM */
AM_RANGE(0x1c0000, 0x1fffff) AM_READ(namcos2_68k_slave_C148_r) AM_WRITE(namcos2_68k_slave_C148_w)
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index c8dd98b98e5..66388aba8ec 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -1808,18 +1808,18 @@ static WRITE16_HANDLER( master_render_device_w )
}
}
-static ADDRESS_MAP_START( master_dsp_program, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( master_dsp_program, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x0fff) AM_ROM /* internal ROM (4k words) */
AM_RANGE(0x4000, 0x7fff) AM_ROM AM_BASE(&mpMasterExternalRAM)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_dsp_data, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( master_dsp_data, AS_DATA, 16 )
AM_RANGE(0x1000, 0x3fff) AM_RAM
AM_RANGE(0x4000, 0x7fff) AM_READ(master_external_ram_r) AM_WRITE(master_external_ram_w)
AM_RANGE(0x8000, 0xffff) AM_READ(namcos22_dspram16_r) AM_WRITE(namcos22_dspram16_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( master_dsp_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( master_dsp_io, AS_IO, 16 )
AM_RANGE(0x0,0x0) AM_WRITE(point_ram_loword_iw) AM_READ(point_ram_loword_r)
AM_RANGE(0x1,0x1) AM_WRITE(point_ram_hiword_w) AM_READ(point_ram_hiword_ir)
AM_RANGE(0x2,0x2) AM_WRITE(dsp_unk2_w) AM_READ(pdp_begin_r)
@@ -1901,16 +1901,16 @@ static WRITE16_HANDLER( dsp_slave_portb_w )
/* The slave dsp uses this to transmit a command sequence to an external device. */
}
-static ADDRESS_MAP_START( slave_dsp_program, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( slave_dsp_program, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x0fff) AM_ROM /* internal ROM */
AM_RANGE(0x8000, 0x9fff) AM_ROM AM_BASE(&mpSlaveExternalRAM)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_dsp_data, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( slave_dsp_data, AS_DATA, 16 )
AM_RANGE(0x8000, 0x9fff) AM_READ(slave_external_ram_r) AM_WRITE(slave_external_ram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slave_dsp_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( slave_dsp_io, AS_IO, 16 )
/* unknown signal */
AM_RANGE(0x3,0x3) AM_READ(dsp_slave_port3_r)
@@ -2441,7 +2441,7 @@ static WRITE32_HANDLER( alpinesa_prot_w )
} /* alpinesa_prot_w */
/* Namco Super System 22 */
-static ADDRESS_MAP_START( namcos22s_am, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( namcos22s_am, AS_PROGRAM, 32 )
AM_RANGE(0x200000, 0x200003) AM_READ(alpinesa_prot_r)
AM_RANGE(0x300000, 0x300003) AM_WRITE(alpinesa_prot_w)
AM_RANGE(0x000000, 0x3fffff) AM_ROM
@@ -2516,7 +2516,7 @@ static MACHINE_RESET(namcoss22)
*/
// Super System 22 M37710
-static ADDRESS_MAP_START( mcu_program, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mcu_program, AS_PROGRAM, 16 )
AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE( "c352", c352_r, c352_w )
AM_RANGE(0x004000, 0x00bfff) AM_READWRITE( s22mcu_shared_r, s22mcu_shared_w )
AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("user4", 0xc000)
@@ -2528,7 +2528,7 @@ static ADDRESS_MAP_START( mcu_program, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
// System 22 37702
-static ADDRESS_MAP_START( mcu_s22_program, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mcu_s22_program, AS_PROGRAM, 16 )
AM_RANGE(0x002000, 0x002fff) AM_DEVREADWRITE( "c352", c352_r, c352_w )
AM_RANGE(0x004000, 0x00bfff) AM_READWRITE( s22mcu_shared_r, s22mcu_shared_w )
AM_RANGE(0x00c000, 0x00ffff) AM_ROM AM_REGION("mcu", 0)
@@ -2836,7 +2836,7 @@ static READ8_HANDLER( airco22_mcu_adc_r )
}
}
-static ADDRESS_MAP_START( mcu_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io, AS_IO, 8 )
AM_RANGE(M37710_PORT4, M37710_PORT4) AM_READ( mcu_port4_r ) AM_WRITE( mcu_port4_w )
AM_RANGE(M37710_PORT5, M37710_PORT5) AM_READ( mcu_port5_r ) AM_WRITE( mcu_port5_w )
AM_RANGE(M37710_PORT6, M37710_PORT6) AM_READ( mcu_port6_r ) AM_WRITENOP
@@ -2848,7 +2848,7 @@ static READ8_HANDLER( mcu_port4_s22_r )
return p4 | 0x10; // for C74, 0x10 selects sound MCU role, 0x00 selects control-reading role
}
-static ADDRESS_MAP_START( mcu_s22_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_s22_io, AS_IO, 8 )
AM_RANGE(M37710_PORT4, M37710_PORT4) AM_READ( mcu_port4_s22_r )
ADDRESS_MAP_END
@@ -2919,7 +2919,7 @@ MACHINE_CONFIG_END
/* Namco System 22 */
-static ADDRESS_MAP_START( namcos22_am, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( namcos22_am, AS_PROGRAM, 32 )
/**
* Program ROM (2M bytes)
* Mounted position: LLB: CPU 4D, LMB: CPU 2D, UMB: CPU 8D, UUB: CPU 6D
@@ -5777,19 +5777,19 @@ static READ16_HANDLER( mcuc74_speedup_r )
static void install_c74_speedup(running_machine *machine)
{
- memory_install_readwrite16_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80, 0x81, 0, 0, mcuc74_speedup_r, mcu_speedup_w);
+ memory_install_readwrite16_handler(machine->device("mcu")->memory().space(AS_PROGRAM), 0x80, 0x81, 0, 0, mcuc74_speedup_r, mcu_speedup_w);
}
static void install_130_speedup(running_machine *machine)
{
// install speedup cheat for 1.30 MCU BIOS
- memory_install_readwrite16_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x82, 0x83, 0, 0, mcu130_speedup_r, mcu_speedup_w);
+ memory_install_readwrite16_handler(machine->device("mcu")->memory().space(AS_PROGRAM), 0x82, 0x83, 0, 0, mcu130_speedup_r, mcu_speedup_w);
}
static void install_141_speedup(running_machine *machine)
{
// install speedup cheat for 1.41 MCU BIOS
- memory_install_readwrite16_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x82, 0x83, 0, 0, mcu141_speedup_r, mcu_speedup_w);
+ memory_install_readwrite16_handler(machine->device("mcu")->memory().space(AS_PROGRAM), 0x82, 0x83, 0, 0, mcu141_speedup_r, mcu_speedup_w);
}
static void namcos22_init( running_machine *machine, enum namcos22_gametype game_type )
@@ -5808,7 +5808,7 @@ static DRIVER_INIT( alpiner )
{
namcos22s_init(machine, NAMCOS22_ALPINE_RACER);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, alpineracer_mcu_adc_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, alpineracer_mcu_adc_r);
install_130_speedup(machine);
}
@@ -5817,7 +5817,7 @@ static DRIVER_INIT( alpiner2 )
{
namcos22s_init(machine, NAMCOS22_ALPINE_RACER_2);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, alpineracer_mcu_adc_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, alpineracer_mcu_adc_r);
install_130_speedup(machine);
}
@@ -5826,7 +5826,7 @@ static DRIVER_INIT( alpinesa )
{
namcos22s_init(machine, NAMCOS22_ALPINE_SURFER);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, alpineracer_mcu_adc_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, alpineracer_mcu_adc_r);
install_141_speedup(machine);
}
@@ -5835,7 +5835,7 @@ static DRIVER_INIT( airco22 )
{
namcos22s_init(machine, NAMCOS22_AIR_COMBAT22);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, airco22_mcu_adc_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, airco22_mcu_adc_r);
}
static DRIVER_INIT( propcycl )
@@ -5859,7 +5859,7 @@ static DRIVER_INIT( propcycl )
namcos22s_init(machine, NAMCOS22_PROP_CYCLE);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, propcycle_mcu_adc_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, propcycle_mcu_adc_r);
install_141_speedup(machine);
}
@@ -5945,7 +5945,7 @@ static DRIVER_INIT( cybrcyc )
namcos22s_init(machine, NAMCOS22_CYBER_CYCLES);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, cybrcycc_mcu_adc_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, cybrcycc_mcu_adc_r);
install_130_speedup(machine);
}
@@ -5961,21 +5961,21 @@ static DRIVER_INIT( tokyowar )
{
namcos22s_init(machine, NAMCOS22_TOKYO_WARS);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, tokyowar_mcu_adc_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, tokyowar_mcu_adc_r);
}
static DRIVER_INIT( aquajet )
{
namcos22s_init(machine, NAMCOS22_AQUA_JET);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, aquajet_mcu_adc_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, aquajet_mcu_adc_r);
}
static DRIVER_INIT( dirtdash )
{
namcos22s_init(machine, NAMCOS22_DIRT_DASH);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, aquajet_mcu_adc_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_IO), M37710_ADC0_L, M37710_ADC7_H, 0, 0, aquajet_mcu_adc_r);
}
/************************************************************************************/
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index 3461f0c70f2..0c250bd000c 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -2044,7 +2044,7 @@ static MACHINE_START( s23 )
c361_timer->adjust(attotime::never);
}
-static ADDRESS_MAP_START( gorgon_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gorgon_map, AS_PROGRAM, 32 )
ADDRESS_MAP_GLOBAL_MASK(0xfffffff)
AM_RANGE(0x00000000, 0x003fffff) AM_RAM
AM_RANGE(0x01000000, 0x010000ff) AM_READWRITE( p3d_r, p3d_w )
@@ -2075,7 +2075,7 @@ static ADDRESS_MAP_START( gorgon_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x0fc00000, 0x0fffffff) AM_WRITENOP AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ss23_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( ss23_map, AS_PROGRAM, 32 )
ADDRESS_MAP_GLOBAL_MASK(0xfffffff)
AM_RANGE(0x00000000, 0x00ffffff) AM_RAM
AM_RANGE(0x01000000, 0x010000ff) AM_READWRITE( p3d_r, p3d_w )
@@ -2119,14 +2119,14 @@ static WRITE32_HANDLER( sh2_shared_w )
COMBINE_DATA(&gmen_sh2_shared[offset]);
}
-static ADDRESS_MAP_START( gmen_mips_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gmen_mips_map, AS_PROGRAM, 32 )
AM_IMPORT_FROM(ss23_map)
AM_RANGE(0x0e400000, 0x0e400003) AM_READ( gmen_trigger_sh2 )
AM_RANGE(0x0e700000, 0x0e707fff) AM_READWRITE( sh2_shared_r, sh2_shared_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gmen_sh2_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gmen_sh2_map, AS_PROGRAM, 32 )
AM_RANGE( 0x00000000, 0x00007fff ) AM_RAM AM_BASE(&gmen_sh2_shared)
AM_RANGE( 0x04000000, 0x043fffff ) AM_RAM // SH-2 main work RAM
ADDRESS_MAP_END
@@ -2173,7 +2173,7 @@ static WRITE16_HANDLER( sub_interrupt_main_w )
}
/* H8/3002 MCU stuff */
-static ADDRESS_MAP_START( s23h8rwmap, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( s23h8rwmap, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_READWRITE( sharedram_sub_r, sharedram_sub_w )
AM_RANGE(0x280000, 0x287fff) AM_DEVREADWRITE( "c352", c352_r, c352_w )
@@ -2512,7 +2512,7 @@ static WRITE8_HANDLER(s23_mcu_p6_w)
// printf("%02x to port 6\n", data);
}
-static ADDRESS_MAP_START( s23h8iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( s23h8iomap, AS_IO, 8 )
AM_RANGE(H8_PORT_6, H8_PORT_6) AM_READWRITE( s23_mcu_p6_r, s23_mcu_p6_w )
AM_RANGE(H8_PORT_7, H8_PORT_7) AM_READ_PORT( "H8PORT" )
AM_RANGE(H8_PORT_8, H8_PORT_8) AM_READ( s23_mcu_p8_r ) AM_WRITENOP
@@ -2528,7 +2528,7 @@ static ADDRESS_MAP_START( s23h8iomap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
// version without serial hookup to I/O board for games where the PIC isn't dumped
-static ADDRESS_MAP_START( s23h8noiobmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( s23h8noiobmap, AS_IO, 8 )
AM_RANGE(H8_PORT_6, H8_PORT_6) AM_READWRITE( s23_mcu_p6_r, s23_mcu_p6_w )
AM_RANGE(H8_PORT_7, H8_PORT_7) AM_READ_PORT( "H8PORT" )
AM_RANGE(H8_PORT_8, H8_PORT_8) AM_READ( s23_mcu_p8_r ) AM_WRITENOP
@@ -2585,7 +2585,7 @@ static READ8_HANDLER(iob_r)
}
/* H8/3334 (Namco C78) I/O board MCU */
-static ADDRESS_MAP_START( s23iobrdmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( s23iobrdmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM AM_REGION("ioboard", 0)
AM_RANGE(0x6000, 0x6000) AM_READ_PORT("TC2P0") // 0-1 = coin 0-3 = coin connect, 0-5 = test 0-6 = down select, 0-7 = up select, 0-8 = enter
AM_RANGE(0x6001, 0x6001) AM_READ_PORT("TC2P1") // 1-1 = gun trigger 1-2 = foot pedal
@@ -2598,7 +2598,7 @@ static ADDRESS_MAP_START( s23iobrdmap, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
// gorgon map
-static ADDRESS_MAP_START( gorgoniobrdmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gorgoniobrdmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM AM_REGION("ioboard", 0)
AM_RANGE(0x6000, 0x6000) AM_READ_PORT("RRP0") // 0-5 = start
AM_RANGE(0x6001, 0x6001) AM_READ_PORT("RRP1") //
@@ -2615,7 +2615,7 @@ ADDRESS_MAP_END
port 5 bit 2 = LED to indicate transmitting packet to main
port 4 bit 2 = SENSE line back to main (0 = asserted, 1 = dropped)
*/
-static ADDRESS_MAP_START( s23iobrdiomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( s23iobrdiomap, AS_IO, 8 )
AM_RANGE(H8_PORT_4, H8_PORT_4) AM_READWRITE( s23_iob_p4_r, s23_iob_p4_w )
AM_RANGE(H8_PORT_5, H8_PORT_5) AM_NOP // status LED in bit 2
AM_RANGE(H8_PORT_6, H8_PORT_6) AM_NOP // unknown
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index 77d326eb7b4..196bd095310 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -333,7 +333,7 @@ static MACHINE_RESET( namco86 )
-static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_READWRITE(rthunder_videoram1_r,rthunder_videoram1_w) AM_BASE_MEMBER(namcos86_state, rthunder_videoram1)
AM_RANGE(0x2000, 0x3fff) AM_READWRITE(rthunder_videoram2_r,rthunder_videoram2_w) AM_BASE_MEMBER(namcos86_state, rthunder_videoram2)
@@ -364,7 +364,7 @@ ADDRESS_MAP_END
#define CPU2_MEMORY(NAME,ADDR_SPRITE,ADDR_VIDEO1,ADDR_VIDEO2,ADDR_ROM,ADDR_BANK,ADDR_WDOG,ADDR_INT) \
-static ADDRESS_MAP_START( NAME##_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) \
+static ADDRESS_MAP_START( NAME##_cpu2_map, AS_PROGRAM, 8 ) \
AM_RANGE(ADDR_SPRITE+0x0000, ADDR_SPRITE+0x1fff) AM_READWRITE(rthunder_spriteram_r,rthunder_spriteram_w) AM_BASE_MEMBER(namcos86_state, rthunder_spriteram) \
AM_RANGE(ADDR_VIDEO1+0x0000, ADDR_VIDEO1+0x1fff) AM_READWRITE(rthunder_videoram1_r,rthunder_videoram1_w) \
AM_RANGE(ADDR_VIDEO2+0x0000, ADDR_VIDEO2+0x1fff) AM_READWRITE(rthunder_videoram2_r,rthunder_videoram2_w) \
@@ -389,7 +389,7 @@ CPU2_MEMORY( wndrmomo, 0x2000, 0x4000, 0x6000, UNUSED, UNUSED, 0xc000, 0xc800 )
#define MCU_MEMORY(NAME,ADDR_LOWROM,ADDR_INPUT,ADDR_UNK1,ADDR_UNK2) \
-static ADDRESS_MAP_START( NAME##_mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) \
+static ADDRESS_MAP_START( NAME##_mcu_map, AS_PROGRAM, 8 ) \
AM_RANGE(0x0000, 0x001f) AM_READWRITE(m6801_io_r,m6801_io_w) \
AM_RANGE(0x0080, 0x00ff) AM_RAM \
AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("namco", namcos1_cus30_r, namcos1_cus30_w) /* PSG device, shared RAM */ \
@@ -422,7 +422,7 @@ static READ8_HANDLER( readFF )
return 0xff;
}
-static ADDRESS_MAP_START( mcu_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_port_map, AS_IO, 8 )
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_READ_PORT("IN2")
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READ(readFF) /* leds won't work otherwise */
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_WRITE(namcos86_coin_w)
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index b44cb697595..d75708ad020 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -1554,7 +1554,7 @@ static WRITE64_DEVICE_HANDLER( eeprom_93c46a_w )
* Naomi 1 address map
*/
-static ADDRESS_MAP_START( naomi_map, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( naomi_map, AS_PROGRAM, 64 )
/* Area 0 */
AM_RANGE(0x00000000, 0x001fffff) AM_MIRROR(0xa2000000) AM_ROM AM_REGION("maincpu", 0) // BIOS
@@ -1603,7 +1603,7 @@ static ADDRESS_MAP_START( naomi_map, ADDRESS_SPACE_PROGRAM, 64 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( naomi_port, ADDRESS_SPACE_IO, 64 )
+static ADDRESS_MAP_START( naomi_port, AS_IO, 64 )
AM_RANGE(0x00, 0x0f) AM_DEVREADWRITE("main_eeprom", eeprom_93c46a_r, eeprom_93c46a_w)
ADDRESS_MAP_END
@@ -1696,7 +1696,7 @@ static WRITE64_HANDLER( aw_modem_w )
mame_printf_verbose("MODEM: [%08x=%x] write %" I64FMT "x to %x, mask %" I64FMT "x\n", 0x600000+reg*4, dat, data, offset, mem_mask);
}
-static ADDRESS_MAP_START( aw_map, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( aw_map, AS_PROGRAM, 64 )
/* Area 0 */
AM_RANGE(0x00000000, 0x0001ffff) AM_READWRITE( aw_flash_r, aw_flash_w ) AM_REGION("awflash", 0)
AM_RANGE(0xa0000000, 0xa001ffff) AM_READWRITE( aw_flash_r, aw_flash_w ) AM_REGION("awflash", 0)
@@ -1770,7 +1770,7 @@ static const aica_interface aica_config =
};
-static ADDRESS_MAP_START( dc_audio_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dc_audio_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE( &dc_sound_ram ) /* shared with SH-4 */
AM_RANGE(0x00800000, 0x00807fff) AM_DEVREADWRITE("aica", dc_arm_aica_r, dc_arm_aica_w)
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index 9ba99c0332a..604a673ea45 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -246,7 +246,7 @@ static WRITE8_HANDLER( popflame_protection_w )
-static ADDRESS_MAP_START( naughtyb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( naughtyb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_MEMBER(naughtyb_state, videoram)
@@ -259,7 +259,7 @@ static ADDRESS_MAP_START( naughtyb_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xbfff) AM_READ(dsw0_port_r) // DSW0
ADDRESS_MAP_END
-static ADDRESS_MAP_START( popflame_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( popflame_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_MEMBER(naughtyb_state, videoram)
@@ -854,10 +854,10 @@ ROM_END
static DRIVER_INIT( popflame )
{
/* install a handler to catch protection checks */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x9000, 0x9000, 0, 0, popflame_protection_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x9090, 0x9090, 0, 0, popflame_protection_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x9000, 0x9000, 0, 0, popflame_protection_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x9090, 0x9090, 0, 0, popflame_protection_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xb000, 0xb0ff, 0, 0, popflame_protection_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xb000, 0xb0ff, 0, 0, popflame_protection_w);
}
@@ -887,7 +887,7 @@ static WRITE8_HANDLER( trvmstr_questions_w )
static DRIVER_INIT( trvmstr )
{
/* install questions' handlers */
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xc002, 0, 0, trvmstr_questions_r, trvmstr_questions_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc000, 0xc002, 0, 0, trvmstr_questions_r, trvmstr_questions_w);
}
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index 851aa5e80a1..9b3c40cee4f 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -280,17 +280,17 @@ static DRIVER_INIT( barline )
nb1413m3_type = NB1413M3_BARLINE;
}
-static ADDRESS_MAP_START( mjsikaku_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjsikaku_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xf7ff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( secolove_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( secolove_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ojousan_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ojousan_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x6fff) AM_ROM
AM_RANGE(0x7000, 0x7fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8000, 0xffff) AM_ROM
@@ -304,7 +304,7 @@ static READ8_HANDLER( ff_r )
return 0xff;
}
-static ADDRESS_MAP_START( secolove_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( secolove_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -329,7 +329,7 @@ static WRITE8_HANDLER( barline_output_w )
coin_counter_w(space->machine, 0,data & 0x02);
}
-static ADDRESS_MAP_START( barline_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( barline_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_sndrombank1_w)
@@ -347,7 +347,7 @@ static ADDRESS_MAP_START( barline_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( crystalg_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( crystalg_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -367,7 +367,7 @@ static ADDRESS_MAP_START( crystalg_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( otonano_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( otonano_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -386,7 +386,7 @@ static ADDRESS_MAP_START( otonano_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kaguya_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kaguya_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -406,7 +406,7 @@ static ADDRESS_MAP_START( kaguya_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( iemoto_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( iemoto_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -428,7 +428,7 @@ static ADDRESS_MAP_START( iemoto_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( seiha_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( seiha_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -449,7 +449,7 @@ static ADDRESS_MAP_START( seiha_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjgaiden_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjgaiden_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -469,7 +469,7 @@ static ADDRESS_MAP_START( mjgaiden_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf0, 0xf0) AM_WRITE(mjsikaku_scrolly_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( p16bit_LCD_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( p16bit_LCD_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -495,7 +495,7 @@ static ADDRESS_MAP_START( p16bit_LCD_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjsikaku_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjsikaku_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -516,7 +516,7 @@ static ADDRESS_MAP_START( mjsikaku_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mmsikaku_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mmsikaku_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index f9a8ab5da8a..5ea51277eda 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -329,82 +329,82 @@ static DRIVER_INIT( taiwanmb )
}
-static ADDRESS_MAP_START( gionbana_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gionbana_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mgion_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mgion_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
AM_RANGE(0xf400, 0xf40f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( omotesnd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( omotesnd_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hanamomo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hanamomo_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
AM_RANGE(0xf400, 0xf40f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( scandalm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( scandalm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( club90s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( club90s_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf80f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xfc00, 0xfdff) AM_READWRITE(nbmj8891_palette_type1_r,nbmj8891_palette_type1_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lovehous_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lovehous_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( maiko_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( maiko_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
AM_RANGE(0xf400, 0xf40f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hnxmasev_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hnxmasev_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf200, 0xf3ff) AM_READWRITE(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
AM_RANGE(0xf700, 0xf70f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hnageman_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hnageman_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mmaiko_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mmaiko_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
AM_RANGE(0xf400, 0xf40f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hanaoji_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hanaoji_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf200, 0xf3ff) AM_READWRITE(nbmj8891_palette_type2_r,nbmj8891_palette_type2_w)
AM_RANGE(0xf700, 0xf70f) AM_READWRITE(nbmj8891_clut_r,nbmj8891_clut_w)
@@ -416,7 +416,7 @@ static READ8_HANDLER( taiwanmb_unk_r )
return 0x00; // MCU or 1413M3 STATUS?
}
-static ADDRESS_MAP_START( taiwanmb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( taiwanmb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xec00, 0xedff) AM_READWRITE(nbmj8891_palette_type3_r,nbmj8891_palette_type3_w)
AM_RANGE(0xf800, 0xfeff) AM_RAM AM_SHARE("nvram")
@@ -438,7 +438,7 @@ static ADDRESS_MAP_START( taiwanmb_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gionbana_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gionbana_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -457,7 +457,7 @@ static ADDRESS_MAP_START( gionbana_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mgion_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mgion_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -476,7 +476,7 @@ static ADDRESS_MAP_START( mgion_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( omotesnd_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( omotesnd_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x07) AM_WRITE(nbmj8891_blitter_w)
@@ -498,7 +498,7 @@ static ADDRESS_MAP_START( omotesnd_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hanamomo_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hanamomo_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -517,7 +517,7 @@ static ADDRESS_MAP_START( hanamomo_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( msjiken_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( msjiken_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -536,7 +536,7 @@ static ADDRESS_MAP_START( msjiken_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( scandal_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( scandal_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x40, 0x4f) AM_WRITE(nbmj8891_clut_w)
@@ -555,7 +555,7 @@ static ADDRESS_MAP_START( scandal_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( scandalm_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( scandalm_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x07) AM_WRITE(nbmj8891_blitter_w)
@@ -575,7 +575,7 @@ static ADDRESS_MAP_START( scandalm_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bananadr_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bananadr_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x07) AM_WRITE(nbmj8891_blitter_w)
@@ -595,7 +595,7 @@ static ADDRESS_MAP_START( bananadr_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lovehous_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( lovehous_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -614,7 +614,7 @@ static ADDRESS_MAP_START( lovehous_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( maiko_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( maiko_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -633,7 +633,7 @@ static ADDRESS_MAP_START( maiko_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( taiwanmb_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( taiwanmb_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x81, 0x81) AM_DEVREAD("fmsnd", ay8910_r)
diff --git a/src/mame/drivers/nbmj8900.c b/src/mame/drivers/nbmj8900.c
index 92d7850ae1b..cde2ee6d7d6 100644
--- a/src/mame/drivers/nbmj8900.c
+++ b/src/mame/drivers/nbmj8900.c
@@ -108,21 +108,21 @@ static DRIVER_INIT( togenkyo )
}
-static ADDRESS_MAP_START( ohpaipee_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ohpaipee_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8900_clut_r, nbmj8900_clut_w)
AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8900_palette_type1_r, nbmj8900_palette_type1_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( togenkyo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( togenkyo_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8900_clut_r, nbmj8900_clut_w)
AM_RANGE(0xf400, 0xf5ff) AM_READWRITE(nbmj8900_palette_type1_r, nbmj8900_palette_type1_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ohpaipee_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ohpaipee_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index e8226527144..78283a6db85 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -190,70 +190,70 @@ static DRIVER_INIT( av2mj2rg )
}
-static ADDRESS_MAP_START( pstadium_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pstadium_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE(nbmj8991_palette_type3_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram") // finalbny
ADDRESS_MAP_END
-static ADDRESS_MAP_START( triplew1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( triplew1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE(nbmj8991_palette_type3_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xf200, 0xf20f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram") // mjgottub
ADDRESS_MAP_END
-static ADDRESS_MAP_START( triplew2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( triplew2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE(nbmj8991_palette_type3_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xf400, 0xf40f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjlstory_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjlstory_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE(nbmj8991_palette_type3_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xf700, 0xf70f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( galkoku_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( galkoku_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf400, 0xf5ff) AM_RAM_WRITE(nbmj8991_palette_type1_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram") // hyouban
ADDRESS_MAP_END
-static ADDRESS_MAP_START( galkaika_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( galkaika_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf400, 0xf5ff) AM_RAM_WRITE(nbmj8991_palette_type2_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram") // tokimbsj
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tokyogal_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tokyogal_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE(nbmj8991_palette_type2_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xf400, 0xf40f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( av2mj1bb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( av2mj1bb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf1ff) AM_RAM_WRITE(nbmj8991_palette_type3_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xf500, 0xf50f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( av2mj2rg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( av2mj2rg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf00f) AM_READWRITE(nbmj8991_clut_r,nbmj8991_clut_w)
AM_RANGE(0xf200, 0xf3ff) AM_RAM_WRITE(nbmj8991_palette_type3_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( galkoku_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( galkoku_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READWRITE(nb1413m3_sndrom_r,nbmj8991_blitter_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("fmsnd", ym3812_w)
@@ -267,7 +267,7 @@ static ADDRESS_MAP_START( galkoku_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hyouban_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hyouban_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_READWRITE(nb1413m3_sndrom_r,nbmj8991_blitter_w)
AM_RANGE(0x81, 0x81) AM_DEVREAD("fmsnd", ay8910_r)
@@ -282,7 +282,7 @@ static ADDRESS_MAP_START( hyouban_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf1, 0xf1) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pstadium_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pstadium_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_WRITE(nbmj8991_blitter_w)
AM_RANGE(0x80, 0x80) AM_WRITE(nbmj8991_sound_w)
@@ -295,7 +295,7 @@ static ADDRESS_MAP_START( pstadium_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf8, 0xf8) AM_READ(nb1413m3_dipsw2_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( av2mj1bb_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( av2mj1bb_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x7f) AM_WRITE(nbmj8991_blitter_w)
AM_RANGE(0x80, 0x80) AM_WRITE(nbmj8991_sound_w)
@@ -310,13 +310,13 @@ static ADDRESS_MAP_START( av2mj1bb_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nbmj8991_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nbmj8991_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nbmj8991_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( nbmj8991_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(nbmj8991_sound_r) AM_DEVWRITE("dac1", DAC_WRITE)
AM_RANGE(0x02, 0x02) AM_DEVWRITE("dac2", DAC_WRITE)
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index b8ddfb19423..10dfb05f6c5 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -669,7 +669,7 @@ static Z80CTC_INTERFACE( ctc_intf_audio )
static MACHINE_RESET( sailorws )
{
nbmj9195_state *state = machine->driver_data<nbmj9195_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int i;
// initialize TMPZ84C011 PIO
@@ -682,7 +682,7 @@ static MACHINE_RESET( sailorws )
static DRIVER_INIT( nbmj9195 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *ROM = machine->region("audiocpu")->base();
// sound program patch
@@ -692,7 +692,7 @@ static DRIVER_INIT( nbmj9195 )
nbmj9195_soundbank_w(space, 0, 0);
}
-static ADDRESS_MAP_START( tmpz84c011_regs, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tmpz84c011_regs, AS_IO, 8 )
AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("main_ctc", z80ctc_r,z80ctc_w)
AM_RANGE(0x50, 0x50) AM_READWRITE(tmpz84c011_0_pa_r,tmpz84c011_0_pa_w)
AM_RANGE(0x51, 0x51) AM_READWRITE(tmpz84c011_0_pb_r,tmpz84c011_0_pb_w)
@@ -706,31 +706,31 @@ static ADDRESS_MAP_START( tmpz84c011_regs, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x44, 0x44) AM_READWRITE(tmpz84c011_0_dir_pe_r,tmpz84c011_0_dir_pe_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sailorws_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sailorws_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf1ff) AM_READWRITE(nbmj9195_palette_r,nbmj9195_palette_w)
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjuraden_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjuraden_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf200, 0xf3ff) AM_READWRITE(nbmj9195_palette_r,nbmj9195_palette_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( koinomp_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( koinomp_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe1ff) AM_READWRITE(nbmj9195_palette_r,nbmj9195_palette_w)
AM_RANGE(0xe800, 0xefff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ngpgal_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ngpgal_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xcfff) AM_ROM
AM_RANGE(0xd000, 0xd1ff) AM_READWRITE(nbmj9195_palette_r,nbmj9195_palette_w)
AM_RANGE(0xd800, 0xdfff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mscoutm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mscoutm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe5ff) AM_RAM
AM_RANGE(0xe600, 0xebff) AM_READWRITE(nbmj9195_nb22090_palette_r,nbmj9195_nb22090_palette_w)
@@ -738,7 +738,7 @@ static ADDRESS_MAP_START( mscoutm_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf200, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjegolf_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjegolf_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe5ff) AM_READWRITE(nbmj9195_nb22090_palette_r,nbmj9195_nb22090_palette_w)
AM_RANGE(0xe600, 0xebff) AM_RAM
@@ -746,7 +746,7 @@ static ADDRESS_MAP_START( mjegolf_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf200, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjuraden_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjuraden_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -761,7 +761,7 @@ static ADDRESS_MAP_START( mjuraden_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( koinomp_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( koinomp_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -781,7 +781,7 @@ static ADDRESS_MAP_START( koinomp_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( patimono_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( patimono_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -799,7 +799,7 @@ static ADDRESS_MAP_START( patimono_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_1_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mmehyou_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mmehyou_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -813,7 +813,7 @@ static ADDRESS_MAP_START( mmehyou_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_inputportsel_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gal10ren_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gal10ren_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -831,7 +831,7 @@ static ADDRESS_MAP_START( gal10ren_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xd8, 0xd8) AM_WRITE(nbmj9195_inputportsel_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( renaiclb_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( renaiclb_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -849,7 +849,7 @@ static ADDRESS_MAP_START( renaiclb_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf0, 0xff) AM_WRITE(nbmj9195_clut_0_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjlaman_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjlaman_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -868,7 +868,7 @@ static ADDRESS_MAP_START( mjlaman_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mkeibaou_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mkeibaou_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -887,7 +887,7 @@ static ADDRESS_MAP_START( mkeibaou_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pachiten_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pachiten_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -905,7 +905,7 @@ static ADDRESS_MAP_START( pachiten_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xe6, 0xe6) AM_WRITE(nbmj9195_inputportsel_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sailorws_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sailorws_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -923,7 +923,7 @@ static ADDRESS_MAP_START( sailorws_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf6, 0xf6) AM_WRITE(nbmj9195_inputportsel_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sailorwr_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sailorwr_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -942,7 +942,7 @@ static ADDRESS_MAP_START( sailorwr_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( psailor1_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( psailor1_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -960,7 +960,7 @@ static ADDRESS_MAP_START( psailor1_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf6, 0xf6) AM_WRITE(nbmj9195_inputportsel_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( psailor2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( psailor2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -978,7 +978,7 @@ static ADDRESS_MAP_START( psailor2_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf6, 0xf6) AM_WRITE(nbmj9195_inputportsel_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( otatidai_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( otatidai_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -996,7 +996,7 @@ static ADDRESS_MAP_START( otatidai_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xb8, 0xb8) AM_WRITE(nbmj9195_inputportsel_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( yosimoto_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( yosimoto_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -1014,7 +1014,7 @@ static ADDRESS_MAP_START( yosimoto_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_1_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jituroku_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jituroku_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -1032,7 +1032,7 @@ static ADDRESS_MAP_START( jituroku_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf8, 0xf8) AM_WRITE(nbmj9195_inputportsel_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ngpgal_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ngpgal_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -1046,7 +1046,7 @@ static ADDRESS_MAP_START( ngpgal_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_0_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjgottsu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjgottsu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -1060,7 +1060,7 @@ static ADDRESS_MAP_START( mjgottsu_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_inputportsel_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cmehyou_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cmehyou_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -1074,7 +1074,7 @@ static ADDRESS_MAP_START( cmehyou_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_0_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjkoiura_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjkoiura_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -1088,7 +1088,7 @@ static ADDRESS_MAP_START( mjkoiura_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xb0, 0xb0) AM_WRITE(nbmj9195_inputportsel_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mkoiuraa_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mkoiuraa_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -1102,7 +1102,7 @@ static ADDRESS_MAP_START( mkoiuraa_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xd0, 0xdf) AM_WRITE(nbmj9195_clut_0_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mscoutm_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mscoutm_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -1122,7 +1122,7 @@ static ADDRESS_MAP_START( mscoutm_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf0, 0xff) AM_WRITE(nbmj9195_clut_1_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( imekura_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( imekura_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -1142,7 +1142,7 @@ static ADDRESS_MAP_START( imekura_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf0, 0xff) AM_WRITE(nbmj9195_clut_1_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjegolf_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjegolf_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_IMPORT_FROM( tmpz84c011_regs )
@@ -1164,13 +1164,13 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( sailorws_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sailorws_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sailorws_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sailorws_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("audio_ctc", z80ctc_r,z80ctc_w)
AM_RANGE(0x50, 0x50) AM_READWRITE(tmpz84c011_1_pa_r,tmpz84c011_1_pa_w)
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index ba5a870c855..edab80e591f 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -296,7 +296,7 @@ static WRITE8_DEVICE_HANDLER( city_sound_bank_w )
}
-static ADDRESS_MAP_START( nemesis_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( nemesis_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04ffff) AM_RAM_WRITE(nemesis_charram_word_w) AM_BASE_SIZE_MEMBER(nemesis_state, charram, charram_size)
AM_RANGE(0x050000, 0x051fff) AM_RAM
@@ -327,7 +327,7 @@ static ADDRESS_MAP_START( nemesis_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x060000, 0x067fff) AM_RAM /* WORK RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gx400_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gx400_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM /* ROM BIOS */
AM_RANGE(0x010000, 0x01ffff) AM_RAM
AM_RANGE(0x020000, 0x0287ff) AM_READWRITE(gx400_sharedram_word_r, gx400_sharedram_word_w)
@@ -362,7 +362,7 @@ static ADDRESS_MAP_START( gx400_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x080000, 0x0bffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( konamigt_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( konamigt_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04ffff) AM_RAM_WRITE(nemesis_charram_word_w) AM_BASE_SIZE_MEMBER(nemesis_state, charram, charram_size)
AM_RANGE(0x050000, 0x051fff) AM_RAM
@@ -394,7 +394,7 @@ static ADDRESS_MAP_START( konamigt_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x070000, 0x070001) AM_READ(konamigt_input_word_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rf2_gx400_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rf2_gx400_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM /* ROM BIOS */
AM_RANGE(0x010000, 0x01ffff) AM_RAM
AM_RANGE(0x020000, 0x0287ff) AM_READWRITE(gx400_sharedram_word_r, gx400_sharedram_word_w)
@@ -430,7 +430,7 @@ static ADDRESS_MAP_START( rf2_gx400_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0xa000, 0xafff) AM_DEVWRITE("k007232", k005289_pitch_A_w)
@@ -446,7 +446,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe405, 0xe405) AM_DEVWRITE("ay2", ay8910_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gx400_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gx400_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x87ff) AM_RAM AM_BASE_MEMBER(nemesis_state, gx400_shared_ram)
AM_RANGE(0xa000, 0xafff) AM_DEVWRITE("k007232", k005289_pitch_A_w)
@@ -466,7 +466,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( salamand_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( salamand_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x087fff) AM_RAM
AM_RANGE(0x090000, 0x091fff) AM_RAM_WRITE(salamander_palette_word_w) AM_BASE_MEMBER(nemesis_state, paletteram)
@@ -491,7 +491,7 @@ static ADDRESS_MAP_START( salamand_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x190f80, 0x190fff) AM_BASE_MEMBER(nemesis_state, yscroll2)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blkpnthr_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( blkpnthr_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x081fff) AM_RAM_WRITE(salamander_palette_word_w) AM_BASE_MEMBER(nemesis_state, paletteram)
AM_RANGE(0x090000, 0x097fff) AM_RAM
@@ -516,7 +516,7 @@ static ADDRESS_MAP_START( blkpnthr_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x190000, 0x190fff) AM_RAM AM_BASE_SIZE_MEMBER(nemesis_state, spriteram, spriteram_size) /* more sprite ram ??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( citybomb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( citybomb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x080000, 0x087fff) AM_RAM
AM_RANGE(0x0e0000, 0x0e1fff) AM_RAM_WRITE(salamander_palette_word_w) AM_BASE_MEMBER(nemesis_state, paletteram)
@@ -543,7 +543,7 @@ static ADDRESS_MAP_START( citybomb_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x310000, 0x310fff) AM_RAM AM_BASE_SIZE_MEMBER(nemesis_state, spriteram, spriteram_size) /* more sprite ram ??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nyanpani_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( nyanpani_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x040000, 0x047fff) AM_RAM
AM_RANGE(0x060000, 0x061fff) AM_RAM_WRITE(salamander_palette_word_w) AM_BASE_MEMBER(nemesis_state, paletteram)
@@ -576,7 +576,7 @@ static READ8_HANDLER( wd_r )
return state->frame_counter;
}
-static ADDRESS_MAP_START( sal_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sal_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
@@ -587,7 +587,7 @@ static ADDRESS_MAP_START( sal_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("vlm", salamand_speech_start_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blkpnthr_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( blkpnthr_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
@@ -596,7 +596,7 @@ static ADDRESS_MAP_START( blkpnthr_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe000) AM_READ(wd_r) /* watchdog?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( city_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( city_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9800, 0x987f) AM_DEVWRITE("k051649", k051649_waveform_w)
@@ -611,7 +611,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( hcrash_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hcrash_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x05ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c
index 17b7ed6d74e..3e5ab5f1cb9 100644
--- a/src/mame/drivers/neodrvr.c
+++ b/src/mame/drivers/neodrvr.c
@@ -8112,7 +8112,7 @@ static DRIVER_INIT( kf2k3pcb )
neo_pcm2_swap(machine, 5);
state->fixed_layer_bank_type = 2;
install_pvc_protection(machine);
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc7ffff, 0, 0, "bios" ); // 512k bios
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00000, 0xc7ffff, 0, 0, "bios" ); // 512k bios
}
static DRIVER_INIT( kof2003 )
@@ -8188,18 +8188,18 @@ static DRIVER_INIT( jockeygp )
kof2000_neogeo_gfx_decrypt(machine, 0xac);
/* install some extra RAM */
- memory_install_ram(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x201fff, 0, 0, NULL);
+ memory_install_ram(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x201fff, 0, 0, NULL);
-// memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x280000, 0x280001, 0, 0, "IN5");
-// memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2c0000, 0x2c0001, 0, 0, "IN6");
+// memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x280000, 0x280001, 0, 0, "IN5");
+// memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2c0000, 0x2c0001, 0, 0, "IN6");
}
static DRIVER_INIT( vliner )
{
- memory_install_ram(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x201fff, 0, 0, NULL);
+ memory_install_ram(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x201fff, 0, 0, NULL);
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x280000, 0x280001, 0, 0, "IN5");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2c0000, 0x2c0001, 0, 0, "IN6");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x280000, 0x280001, 0, 0, "IN5");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2c0000, 0x2c0001, 0, 0, "IN6");
DRIVER_INIT_CALL(neogeo);
}
@@ -8207,7 +8207,7 @@ static DRIVER_INIT( vliner )
static DRIVER_INIT( kog )
{
/* overlay cartridge ROM */
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0ffffe, 0x0fffff, 0, 0, "JUMPER");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0ffffe, 0x0fffff, 0, 0, "JUMPER");
kog_px_decrypt(machine);
neogeo_bootleg_sx_decrypt(machine, 1);
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 7d34a3ddbf4..50b727c81f7 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -738,7 +738,7 @@ static WRITE16_HANDLER( main_cpu_bank_select_w )
static void main_cpu_banking_init( running_machine *machine )
{
- address_space *mainspace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *mainspace = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* create vector banks */
memory_configure_bank(machine, NEOGEO_BANK_VECTORS, 0, 1, machine->region("mainbios")->base(), 0);
@@ -879,7 +879,7 @@ static void audio_cpu_banking_init( running_machine *machine )
set_audio_cpu_banking(machine);
state->audio_cpu_rom_source_last = 0;
- set_audio_cpu_rom_source(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0);
+ set_audio_cpu_rom_source(machine->device("maincpu")->memory().space(AS_PROGRAM), 0);
}
@@ -1035,7 +1035,7 @@ static STATE_POSTLOAD( neogeo_postload )
_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(ADDRESS_SPACE_PROGRAM));
+ _set_audio_cpu_rom_source(machine->device("maincpu")->memory().space(AS_PROGRAM));
set_outputs(machine);
}
@@ -1105,7 +1105,7 @@ static MACHINE_RESET( neogeo )
{
neogeo_state *state = machine->driver_data<neogeo_state>();
offs_t offs;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* reset system control registers */
for (offs = 0; offs < 8; offs++)
@@ -1135,7 +1135,7 @@ static MACHINE_RESET( neogeo )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00007f) AM_ROMBANK(NEOGEO_BANK_VECTORS)
AM_RANGE(0x000080, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_MIRROR(0x0f0000) AM_RAM
@@ -1169,7 +1169,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_MAIN_BANK)
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 3)
AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 2)
@@ -1186,7 +1186,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( audio_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( audio_io_map, AS_IO, 8 )
/*AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READWRITE(audio_command_r, audio_cpu_clear_nmi_w);*/ /* may not and NMI clear */
AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READ(audio_command_r)
AM_RANGE(0x04, 0x07) AM_MIRROR(0xff00) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w)
diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c
index e63e809d71a..5ada343fe0a 100644
--- a/src/mame/drivers/neoprint.c
+++ b/src/mame/drivers/neoprint.c
@@ -200,7 +200,7 @@ static WRITE8_HANDLER( audio_result_w )
state->audio_result = data;
}
-static ADDRESS_MAP_START( neoprint_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( neoprint_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
/* AM_RANGE(0x100000, 0x17ffff) multi-cart or banking, some writes points here if anything lies there too */
AM_RANGE(0x200000, 0x20ffff) AM_RAM
@@ -270,7 +270,7 @@ static READ16_HANDLER( rom_window_r )
return rom[offset | 0x80000/2 | state->bank_val*0x40000/2];
}
-static ADDRESS_MAP_START( nprsp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( nprsp_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x0fffff) AM_READ(rom_window_r)
AM_RANGE(0x200000, 0x200001) AM_READWRITE(neoprint_audio_result_r,audio_command_w)
@@ -297,7 +297,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( neoprint_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( neoprint_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM//AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_MAIN_BANK)
// AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 3)
// AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 2)
@@ -314,7 +314,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( neoprint_audio_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( neoprint_audio_io_map, AS_IO, 8 )
/*AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READWRITE(audio_command_r, audio_cpu_clear_nmi_w);*/ /* may not and NMI clear */
AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READ(audio_command_r) AM_WRITENOP
AM_RANGE(0x04, 0x07) AM_MIRROR(0xff00) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w)
diff --git a/src/mame/drivers/neptunp2.c b/src/mame/drivers/neptunp2.c
index de8df7d080f..dff5fdfb461 100644
--- a/src/mame/drivers/neptunp2.c
+++ b/src/mame/drivers/neptunp2.c
@@ -34,7 +34,7 @@ static READ8_HANDLER( test_r )
return space->machine->rand();
}
-static ADDRESS_MAP_START( neptunp2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( neptunp2_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0xbffff) AM_ROM
AM_RANGE(0xe0000, 0xeffff) AM_RAM
@@ -51,7 +51,7 @@ static ADDRESS_MAP_START( neptunp2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xffff0, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( neptunp2_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( neptunp2_io, AS_IO, 8 )
ADDRESS_MAP_END
diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c
index 667e904ff3c..03d0d03e3a6 100644
--- a/src/mame/drivers/news.c
+++ b/src/mame/drivers/news.c
@@ -19,7 +19,7 @@ driver by David Haywood
#include "sound/okim6295.h"
-static ADDRESS_MAP_START( news_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( news_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* 4000-7fff is written to during startup, probably leftover code */
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(news_fgram_w) AM_BASE_MEMBER(news_state, fgram)
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(news_bgram_w) AM_BASE_MEMBER(news_state, bgram)
diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c
index afbfb72179c..9b5a3818eaf 100644
--- a/src/mame/drivers/nightgal.c
+++ b/src/mame/drivers/nightgal.c
@@ -463,7 +463,7 @@ static READ8_DEVICE_HANDLER( input_2p_r )
* Night Gal
********************************/
#ifdef UNUSED_CODE
-static ADDRESS_MAP_START( nightgal_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nightgal_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc100, 0xc100) AM_READ(nsc_latch_r)
AM_RANGE(0xc200, 0xc200) AM_WRITE(nsc_latch_w)
@@ -471,7 +471,7 @@ static ADDRESS_MAP_START( nightgal_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nightgal_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( nightgal_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01,0x01) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x02,0x03) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -484,7 +484,7 @@ static ADDRESS_MAP_START( nightgal_io, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x12,0x14) AM_WRITE(blitter_w) //data for the nsc to be processed
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nsc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nsc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x0080) AM_READ(blitter_status_r)
AM_RANGE(0x0081, 0x0083) AM_READ(nsc_blit_r)
@@ -504,14 +504,14 @@ ADDRESS_MAP_END
* Sexy Gal
********************************/
-static ADDRESS_MAP_START( sexygal_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sexygal_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAM //???
AM_RANGE(0xe000, 0xefff) AM_READWRITE(royalqn_comm_r, royalqn_comm_w) AM_BASE_MEMBER(nightgal_state,comms_ram)
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sexygal_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sexygal_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00,0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
// AM_RANGE(0x10,0x10) AM_WRITE(output_w)
@@ -522,7 +522,7 @@ static ADDRESS_MAP_START( sexygal_io, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x14,0x14) AM_MIRROR(0xe8) AM_READNOP AM_WRITE(royalqn_blitter_2_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sexygal_nsc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sexygal_nsc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x0080) AM_READ(blitter_status_r)
AM_RANGE(0x0081, 0x0083) AM_READ(royalqn_nsc_blit_r)
@@ -539,14 +539,14 @@ ADDRESS_MAP_END
* Royal Queen
********************************/
-static ADDRESS_MAP_START( royalqn_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( royalqn_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_NOP
AM_RANGE(0xc000, 0xdfff) AM_READWRITE(royalqn_comm_r, royalqn_comm_w) AM_BASE_MEMBER(nightgal_state,comms_ram)
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( royalqn_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( royalqn_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01,0x01) AM_MIRROR(0xec) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x02,0x03) AM_MIRROR(0xec) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -560,7 +560,7 @@ static ADDRESS_MAP_START( royalqn_io, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x17,0x17) AM_MIRROR(0xe8) AM_NOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( royalqn_nsc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( royalqn_nsc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x0080) AM_READ(blitter_status_r)
AM_RANGE(0x0081, 0x0083) AM_READ(royalqn_nsc_blit_r)
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index f33e87f9ee0..a9207d25003 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -372,7 +372,7 @@ static WRITE8_HANDLER( omegaf_io_protection_w )
*
*************************************/
-static ADDRESS_MAP_START( ninjakd2_main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ninjakd2_main_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("KEYCOIN")
@@ -393,7 +393,7 @@ static ADDRESS_MAP_START( ninjakd2_main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mnight_main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mnight_main_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xd9ff) AM_RAM
@@ -414,7 +414,7 @@ static ADDRESS_MAP_START( mnight_main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( robokid_main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( robokid_main_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(paletteram_RRRRGGGGBBBBxxxx_be_w) AM_BASE_GENERIC(paletteram)
@@ -442,7 +442,7 @@ static ADDRESS_MAP_START( robokid_main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( omegaf_main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( omegaf_main_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("KEYCOIN")
@@ -469,7 +469,7 @@ static ADDRESS_MAP_START( omegaf_main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ninjakd2_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ninjakd2_sound_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
@@ -477,7 +477,7 @@ static ADDRESS_MAP_START( ninjakd2_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf000) AM_WRITE(ninjakd2_pcm_play_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ninjakd2_sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ninjakd2_sound_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("2203.1", ym2203_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("2203.2", ym2203_w)
@@ -1444,7 +1444,7 @@ static DRIVER_INIT( ninjakd2 )
static DRIVER_INIT( bootleg )
{
- address_space *space = machine->device("soundcpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("soundcpu")->memory().space(AS_PROGRAM);
space->set_decrypted_region(0x0000, 0x7fff, machine->region("soundcpu")->base() + 0x10000);
gfx_unscramble(machine);
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index 518a677e178..680eb6bf7b3 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -426,7 +426,7 @@ static WRITE16_HANDLER( tc0100scn_triple_screen_w )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( ninjaw_master_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ninjaw_master_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* main ram */
AM_RANGE(0x200000, 0x200001) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_portreg_r, tc0220ioc_portreg_w, 0x00ff)
@@ -449,7 +449,7 @@ ADDRESS_MAP_END
// NB there could be conflicts between which cpu writes what to the
// palette, as our interleaving won't match the original board.
-static ADDRESS_MAP_START( ninjaw_slave_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ninjaw_slave_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM /* main ram */
AM_RANGE(0x200000, 0x200001) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_portreg_r, tc0220ioc_portreg_w, 0x00ff)
@@ -462,7 +462,7 @@ static ADDRESS_MAP_START( ninjaw_slave_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x360000, 0x360007) AM_DEVREADWRITE("tc0110pcr_3", tc0110pcr_word_r, tc0110pcr_step1_word_w) /* palette (3rd screen) */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( darius2_master_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( darius2_master_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM /* main ram */
AM_RANGE(0x200000, 0x200001) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_portreg_r, tc0220ioc_portreg_w, 0x00ff)
@@ -482,7 +482,7 @@ static ADDRESS_MAP_START( darius2_master_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x360000, 0x360007) AM_DEVREADWRITE("tc0110pcr_3", tc0110pcr_word_r, tc0110pcr_step1_word_w) /* palette (3rd screen) */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( darius2_slave_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( darius2_slave_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM /* main ram */
AM_RANGE(0x200000, 0x200001) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_portreg_r, tc0220ioc_portreg_w, 0x00ff)
@@ -495,7 +495,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( ninjaw_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ninjaw_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10")
AM_RANGE(0xc000, 0xdfff) AM_RAM
diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c
index f542c21fb72..cc73b81ddaa 100644
--- a/src/mame/drivers/nitedrvr.c
+++ b/src/mame/drivers/nitedrvr.c
@@ -42,7 +42,7 @@
/* Memory Map */
-static ADDRESS_MAP_START( nitedrvr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nitedrvr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_MIRROR(0x100) // SCRAM
AM_RANGE(0x0200, 0x027f) AM_RAM_WRITE(nitedrvr_videoram_w) AM_MIRROR(0x180) AM_BASE_MEMBER(nitedrvr_state, videoram) // PFW
AM_RANGE(0x0400, 0x05ff) AM_WRITE(nitedrvr_hvc_w) AM_BASE_MEMBER(nitedrvr_state, hvc) // POSH, POSV, CHAR, Watchdog
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index b934dba26bc..d6b2f893491 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -272,7 +272,7 @@ static Z80CTC_INTERFACE( ctc_intf )
static MACHINE_RESET( niyanpai )
{
niyanpai_state *state = machine->driver_data<niyanpai_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int i;
// initialize TMPZ84C011 PIO
@@ -338,7 +338,7 @@ static READ16_HANDLER( musobana_inputport_0_r )
static CUSTOM_INPUT( musobana_outcoin_flag_r )
{
niyanpai_state *state = field->port->machine->driver_data<niyanpai_state>();
- address_space *space = field->port->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = field->port->machine->device("maincpu")->memory().space(AS_PROGRAM);
// tmp68301_parallel_interface[0x05]
// bit 0 coin counter
// bit 2 motor on
@@ -356,7 +356,7 @@ static WRITE16_HANDLER ( musobana_inputport_w )
state->musobana_inputport = data;
}
-static ADDRESS_MAP_START( tmp68301_regs, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tmp68301_regs, AS_PROGRAM, 16 )
AM_RANGE(0xfffc00, 0xfffc0f) AM_READWRITE(tmp68301_address_decoder_r,tmp68301_address_decoder_w)
AM_RANGE(0xfffc80, 0xfffc9f) AM_READWRITE(tmp68301_interrupt_controller_r,tmp68301_interrupt_controller_w)
AM_RANGE(0xfffd00, 0xfffd0f) AM_READWRITE(tmp68301_parallel_interface_r,tmp68301_parallel_interface_w)
@@ -364,7 +364,7 @@ static ADDRESS_MAP_START( tmp68301_regs, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfffe00, 0xfffe4f) AM_READWRITE(tmp68301_timer_r,tmp68301_timer_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( niyanpai_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( niyanpai_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x040fff) AM_RAM AM_SHARE("nvram")
@@ -399,7 +399,7 @@ static ADDRESS_MAP_START( niyanpai_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_IMPORT_FROM( tmp68301_regs )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( musobana_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( musobana_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x040fff) AM_RAM
@@ -437,7 +437,7 @@ static ADDRESS_MAP_START( musobana_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_IMPORT_FROM( tmp68301_regs )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mhhonban_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mhhonban_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x040fff) AM_RAM
@@ -478,13 +478,13 @@ static ADDRESS_MAP_START( mhhonban_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( niyanpai_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( niyanpai_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( niyanpai_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( niyanpai_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x13) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w)
AM_RANGE(0x50, 0x50) AM_READWRITE(tmpz84c011_0_pa_r, tmpz84c011_0_pa_w)
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index c86a98be912..829209dfb4b 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -323,7 +323,7 @@ static WRITE8_DEVICE_HANDLER( oki_banking_w )
********************************************************************/
-static ADDRESS_MAP_START( nmg5_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( nmg5_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x120000, 0x12ffff) AM_RAM
AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -343,7 +343,7 @@ static ADDRESS_MAP_START( nmg5_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE_MEMBER(nmg5_state, bitmap)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pclubys_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pclubys_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x440000, 0x4407ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -368,17 +368,17 @@ ADDRESS_MAP_END
********************************************************************/
-static ADDRESS_MAP_START( nmg5_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nmg5_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pclubys_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pclubys_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xf7ff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("oki", oki_banking_w)
AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 23cd30e5735..57d30b6713b 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -311,7 +311,7 @@ static WRITE16_HANDLER( afega_soundlatch_w )
/***************************************************************************/
-static ADDRESS_MAP_START( vandyke_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( vandyke_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -329,7 +329,7 @@ static ADDRESS_MAP_START( vandyke_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE_MEMBER(nmk16_state, mainram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vandykeb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( vandykeb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -348,7 +348,7 @@ static ADDRESS_MAP_START( vandykeb_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE_MEMBER(nmk16_state, mainram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( manybloc_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( manybloc_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -365,7 +365,7 @@ static ADDRESS_MAP_START( manybloc_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE_MEMBER(nmk16_state, mainram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tharrier_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tharrier_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ(tharrier_mcu_r) // AM_READ_PORT("IN1")
@@ -385,7 +385,7 @@ static ADDRESS_MAP_START( tharrier_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_BASE_MEMBER(nmk16_state, mainram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tharrier_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tharrier_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xf000, 0xf000) AM_READWRITE(soundlatch_r,soundlatch2_w)
@@ -395,7 +395,7 @@ static ADDRESS_MAP_START( tharrier_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf700, 0xf700) AM_WRITE(tharrier_oki6295_bankswitch_1_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tharrier_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tharrier_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
ADDRESS_MAP_END
@@ -403,7 +403,7 @@ ADDRESS_MAP_END
//Read input port 1 030c8/ BAD
//3478 GOOD
-static ADDRESS_MAP_START( mustang_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mustang_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -420,7 +420,7 @@ static ADDRESS_MAP_START( mustang_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_BASE_MEMBER(nmk16_state, mainram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mustangb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mustangb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -438,7 +438,7 @@ static ADDRESS_MAP_START( mustangb_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( twinactn_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( twinactn_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -456,7 +456,7 @@ static ADDRESS_MAP_START( twinactn_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( acrobatm_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( acrobatm_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x3ffff) AM_ROM
AM_RANGE(0x80000, 0x8ffff) AM_RAM AM_BASE_MEMBER(nmk16_state, mainram)
AM_RANGE(0xc0000, 0xc0001) AM_READ_PORT("IN0")
@@ -474,7 +474,7 @@ static ADDRESS_MAP_START( acrobatm_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd4000, 0xd47ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE_MEMBER(nmk16_state, nmk_txvideoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bioship_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bioship_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -653,7 +653,7 @@ static WRITE16_HANDLER( hachamf_mainram_w )
}
}
-static ADDRESS_MAP_START( hachamf_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hachamf_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
/* I/O Region */
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
@@ -881,7 +881,7 @@ static TIMER_DEVICE_CALLBACK( hachamf_mcu_sim )
mcu_run(timer.machine,0);
}
-static ADDRESS_MAP_START( tdragon_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tdragon_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x044022, 0x044023) AM_READNOP /* No Idea */
// AM_RANGE(0x0b0000, 0x0b7fff) AM_RAM /* Work RAM */
@@ -904,7 +904,7 @@ static ADDRESS_MAP_START( tdragon_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE_MEMBER(nmk16_state, nmk_txvideoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tdragonb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tdragonb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x044022, 0x044023) AM_READNOP /* No Idea */
AM_RANGE(0x0b0000, 0x0bffff) AM_RAM AM_BASE_MEMBER(nmk16_state, mainram)
@@ -921,7 +921,7 @@ static ADDRESS_MAP_START( tdragonb_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0d0000, 0x0d07ff) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE_MEMBER(nmk16_state, nmk_txvideoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ssmissin_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ssmissin_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x0b0000, 0x0bffff) AM_RAM AM_BASE_MEMBER(nmk16_state, mainram)
AM_RANGE(0x0c0000, 0x0c0001) AM_READ_PORT("IN0")
@@ -937,7 +937,7 @@ static ADDRESS_MAP_START( ssmissin_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0d0000, 0x0d07ff) AM_MIRROR(0x1800) AM_RAM_WRITE(nmk_txvideoram_w) AM_BASE_MEMBER(nmk16_state, nmk_txvideoram) //mirror for airattck
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ssmissin_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ssmissin_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_WRITE(ssmissin_soundbank_w)
@@ -945,7 +945,7 @@ static ADDRESS_MAP_START( ssmissin_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( strahl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( strahl_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x3ffff) AM_ROM
AM_RANGE(0x80000, 0x80001) AM_READ_PORT("IN0")
AM_RANGE(0x80002, 0x80003) AM_READ_PORT("IN1")
@@ -964,7 +964,7 @@ static ADDRESS_MAP_START( strahl_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xf0000, 0xfffff) AM_RAM AM_BASE_MEMBER(nmk16_state, mainram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( macross_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( macross_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -982,7 +982,7 @@ static ADDRESS_MAP_START( macross_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM_WRITE(nmk16_mainram_strange_w) AM_BASE_MEMBER(nmk16_state, mainram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gunnail_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gunnail_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -1002,7 +1002,7 @@ static ADDRESS_MAP_START( gunnail_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0f0000, 0x0fffff) AM_RAM AM_BASE_MEMBER(nmk16_state, mainram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( macross2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( macross2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("IN0")
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("IN1")
@@ -1028,7 +1028,7 @@ static ADDRESS_MAP_START( macross2_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1f0000, 0x1fffff) AM_RAM AM_BASE_MEMBER(nmk16_state, mainram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( raphero_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( raphero_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("IN0")
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("IN1")
@@ -1075,7 +1075,7 @@ static WRITE8_HANDLER( raphero_sound_rombank_w )
memory_set_bankptr(space->machine, "bank1",space->machine->region("audiocpu")->base() + 0x10000 + (data & 0x07) * 0x4000);
}
-static ADDRESS_MAP_START( raphero_sound_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( raphero_sound_mem_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
@@ -1088,7 +1088,7 @@ static ADDRESS_MAP_START( raphero_sound_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( macross2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( macross2_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* banked ROM */
AM_RANGE(0xa000, 0xa000) AM_READNOP /* IRQ ack? watchdog? */
@@ -1097,7 +1097,7 @@ static ADDRESS_MAP_START( macross2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf000) AM_READWRITE(soundlatch_r,soundlatch2_w) /* from 68000 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( macross2_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( macross2_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x80, 0x80) AM_DEVREADWRITE_MODERN("oki1", okim6295_device, read, write)
@@ -1105,7 +1105,7 @@ static ADDRESS_MAP_START( macross2_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x90, 0x97) AM_DEVWRITE("nmk112", nmk112_okibank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bjtwin_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bjtwin_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0")
AM_RANGE(0x080002, 0x080003) AM_READ_PORT("IN1")
@@ -4598,8 +4598,8 @@ static DRIVER_INIT( bjtwin )
static READ16_HANDLER( vandykeb_r ) { return 0x0000; }
static DRIVER_INIT (vandykeb)
{
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x08000e, 0x08000f, 0, 0, vandykeb_r );
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x08001e, 0x08001f, 0, 0 );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x08000e, 0x08000f, 0, 0, vandykeb_r );
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x08001e, 0x08001f, 0, 0 );
}
@@ -4638,7 +4638,7 @@ static WRITE16_HANDLER( afega_scroll1_w )
*/
-static ADDRESS_MAP_START( afega, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( afega, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("IN0") // Buttons
@@ -4707,7 +4707,7 @@ static WRITE8_DEVICE_HANDLER( spec2k_oki1_banking_w )
downcast<okim6295_device *>(device)->set_bank_base(0x40000);
}
-static ADDRESS_MAP_START( afega_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( afega_sound_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0003, 0x0003) AM_WRITENOP // bug in sound prg?
AM_RANGE(0x0004, 0x0004) AM_WRITENOP // bug in sound prg?
AM_RANGE(0x0000, 0xefff) AM_ROM
@@ -4717,7 +4717,7 @@ static ADDRESS_MAP_START( afega_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf80a, 0xf80a) AM_DEVREADWRITE_MODERN("oki1", okim6295_device, read, write) // M6295
ADDRESS_MAP_END
-static ADDRESS_MAP_START( firehawk_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( firehawk_sound_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xfff0, 0xfff0) AM_READ(soundlatch_r)
@@ -4738,7 +4738,7 @@ static WRITE8_DEVICE_HANDLER( twinactn_oki_bank_w )
// logerror("%04x: oki bank %02x\n", cpu_get_pc(space->cpu), data);
}
-static ADDRESS_MAP_START( twinactn_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( twinactn_sound_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("oki1", twinactn_oki_bank_w)
diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c
index eff2b5ade6c..5fc7243ad35 100644
--- a/src/mame/drivers/norautp.c
+++ b/src/mame/drivers/norautp.c
@@ -809,13 +809,13 @@ static READ8_HANDLER( test2_r )
+----------+---------+--------------+--------+--------------+--------+--------------+------------------------+
*/
-static ADDRESS_MAP_START( norautp_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( norautp_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_SHARE("nvram") /* 6116 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( norautp_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( norautp_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x60, 0x63) AM_MIRROR(0x1c) AM_DEVREADWRITE("ppi8255_0", i8255a_r, i8255a_w)
AM_RANGE(0xa0, 0xa3) AM_MIRROR(0x1c) AM_DEVREADWRITE("ppi8255_1", i8255a_r, i8255a_w)
@@ -840,39 +840,39 @@ ADDRESS_MAP_END
*/
-static ADDRESS_MAP_START( nortest1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nortest1_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x5000, 0x57ff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( norautxp_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( norautxp_map, AS_PROGRAM, 8 )
// ADDRESS_MAP_GLOBAL_MASK(~0x4000)
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x3fff) AM_ROM /* need to be checked */
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE("nvram") /* HM6116 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( norautx4_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( norautx4_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE("nvram") /* 6116 */
ADDRESS_MAP_END
#ifdef UNUSED_CODE
-static ADDRESS_MAP_START( norautx8_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( norautx8_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* need to be checked */
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("nvram") /* 6116 */
ADDRESS_MAP_END
#endif
-static ADDRESS_MAP_START( kimble_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kimble_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xc800, 0xc9ff) AM_RAM /* working RAM? */
ADDRESS_MAP_END
#ifdef UNUSED_CODE
-static ADDRESS_MAP_START( norautxp_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( norautxp_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
#endif
@@ -880,25 +880,25 @@ ADDRESS_MAP_END
/*********** 8080 based **********/
-static ADDRESS_MAP_START( dphl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dphl_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff) /* A15 not connected */
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x5000, 0x53ff) AM_RAM AM_SHARE("nvram") /* should be 2x 0x100 segments (4x 2111) */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dphla_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dphla_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ssjkrpkr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ssjkrpkr_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dphltest_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dphltest_map, AS_PROGRAM, 8 )
// ADDRESS_MAP_GLOBAL_MASK(0x7fff) /* A15 not connected */
AM_RANGE(0x0000, 0x6fff) AM_ROM
AM_RANGE(0x7000, 0x7fff) AM_RAM
@@ -918,12 +918,12 @@ ADDRESS_MAP_END
The code read on port $62, when is suppossed to be set as output.
*/
-static ADDRESS_MAP_START( kimbldhl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kimbldhl_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drhl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( drhl_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff) /* A15 not connected */
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x5000, 0x53ff) AM_RAM AM_SHARE("nvram")
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index 0d1ab245eae..52ceaaf19c2 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -176,7 +176,7 @@ static MACHINE_START( ninjakun )
*
*************************************/
-static ADDRESS_MAP_START( nova2001_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nova2001_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa7ff) AM_RAM_WRITE(nova2001_fg_videoram_w) AM_BASE_MEMBER(nova2001_state, fg_videoram)
AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE(nova2001_bg_videoram_w) AM_BASE_MEMBER(nova2001_state, bg_videoram)
@@ -194,7 +194,7 @@ static ADDRESS_MAP_START( nova2001_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ninjakun_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ninjakun_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w)
@@ -213,7 +213,7 @@ static ADDRESS_MAP_START( ninjakun_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe400, 0xe7ff) AM_RAM AM_SHARE("share6")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ninjakun_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ninjakun_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x7fff) AM_ROM AM_REGION("maincpu", 0x2000)
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w)
@@ -233,7 +233,7 @@ static ADDRESS_MAP_START( ninjakun_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pkunwar_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pkunwar_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_MEMBER(nova2001_state, spriteram)
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(nova2001_bg_videoram_w) AM_BASE_MEMBER(nova2001_state, bg_videoram)
@@ -245,13 +245,13 @@ static ADDRESS_MAP_START( pkunwar_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pkunwar_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pkunwar_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(pkunwar_flipscreen_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( raiders5_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( raiders5_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_MEMBER(nova2001_state, spriteram)
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(nova2001_fg_videoram_w) AM_BASE_MEMBER(nova2001_state, fg_videoram)
@@ -267,7 +267,7 @@ static ADDRESS_MAP_START( raiders5_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( raiders5_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( raiders5_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x8001, 0x8001) AM_DEVREAD("ay1", ay8910_r)
@@ -283,7 +283,7 @@ static ADDRESS_MAP_START( raiders5_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe002, 0xe002) AM_WRITE(pkunwar_flipscreen_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( raiders5_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( raiders5_io, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READNOP /* unknown */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/nsm.c b/src/mame/drivers/nsm.c
index 8b0bc4c596d..4bc96061a18 100644
--- a/src/mame/drivers/nsm.c
+++ b/src/mame/drivers/nsm.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( nsm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nsm_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/nsmpoker.c b/src/mame/drivers/nsmpoker.c
index cce8445ea38..c62e26e512e 100644
--- a/src/mame/drivers/nsmpoker.c
+++ b/src/mame/drivers/nsmpoker.c
@@ -160,7 +160,7 @@ static READ8_HANDLER( debug_r )
* Memory Map Information *
*************************/
-static ADDRESS_MAP_START( nsmpoker_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nsmpoker_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x9000, 0xafff) AM_RAM // OK... cleared at beginning.
AM_RANGE(0xb000, 0xcfff) AM_ROM // WRONG... just to map the last rom somewhere.
@@ -168,7 +168,7 @@ static ADDRESS_MAP_START( nsmpoker_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE(nsmpoker_colorram_w) AM_BASE_MEMBER(nsmpoker_state, colorram) // WRONG... just a placeholder.
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nsmpoker_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( nsmpoker_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xf0, 0xf0) AM_READ(debug_r) // kind of trap at begining
ADDRESS_MAP_END
diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c
index 98f1e307e50..5edcd282703 100644
--- a/src/mame/drivers/nss.c
+++ b/src/mame/drivers/nss.c
@@ -309,7 +309,7 @@ public:
};
-static ADDRESS_MAP_START( snes_map, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START( snes_map, AS_PROGRAM, 8)
AM_RANGE(0x000000, 0x2fffff) AM_READWRITE(snes_r_bank1, snes_w_bank1) /* I/O and ROM (repeats for each bank) */
AM_RANGE(0x300000, 0x3fffff) AM_READWRITE(snes_r_bank2, snes_w_bank2) /* I/O and ROM (repeats for each bank) */
AM_RANGE(0x400000, 0x5fffff) AM_READ(snes_r_bank3) /* ROM (and reserved in Mode 20) */
@@ -330,7 +330,7 @@ static WRITE8_DEVICE_HANDLER( spc_ram_100_w )
spc_ram_w(device, offset + 0x100, data);
}
-static ADDRESS_MAP_START( spc_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spc_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ef) AM_DEVREADWRITE("spc700", spc_ram_r, spc_ram_w) /* lower 32k ram */
AM_RANGE(0x00f0, 0x00ff) AM_DEVREADWRITE("spc700", spc_io_r, spc_io_w) /* spc io */
AM_RANGE(0x0100, 0xffff) AM_DEVWRITE("spc700", spc_ram_100_w)
@@ -412,7 +412,7 @@ static WRITE8_HANDLER( m50458_w )
}
-static ADDRESS_MAP_START( bios_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bios_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8fff) AM_RAM // vram perhaps?
@@ -484,7 +484,7 @@ static WRITE8_HANDLER( port82_w ) // EEPROM2?
*/
}
-static ADDRESS_MAP_START( bios_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bios_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(port00_r)
AM_RANGE(0x01, 0x01) AM_READ(port01_r)
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index 414539c472c..d59b17afe99 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -488,7 +488,7 @@ static MACHINE_START( nwktr )
ppcdrc_add_fastram(machine->device("maincpu"), 0x00000000, 0x003fffff, FALSE, state->work_ram);
}
-static ADDRESS_MAP_START( nwktr_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( nwktr_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_BASE_MEMBER(nwktr_state, work_ram) /* Work RAM */
AM_RANGE(0x74000000, 0x740000ff) AM_DEVREADWRITE("k001604", k001604_reg_r, k001604_reg_w)
AM_RANGE(0x74010000, 0x74017fff) AM_RAM_WRITE(paletteram32_w) AM_BASE_GENERIC(paletteram)
@@ -511,7 +511,7 @@ ADDRESS_MAP_END
/*****************************************************************************/
-static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sound_memmap, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* Work RAM */
AM_RANGE(0x200000, 0x200fff) AM_DEVREADWRITE("rfsnd", rf5c400_r, rf5c400_w) /* Ricoh RF5C400 */
@@ -534,7 +534,7 @@ static WRITE32_HANDLER( dsp_dataram_w )
state->sharc_dataram[offset] = data;
}
-static ADDRESS_MAP_START( sharc_map, ADDRESS_SPACE_DATA, 32 )
+static ADDRESS_MAP_START( sharc_map, AS_DATA, 32 )
AM_RANGE(0x0400000, 0x041ffff) AM_READWRITE(cgboard_0_shared_sharc_r, cgboard_0_shared_sharc_w)
AM_RANGE(0x0500000, 0x05fffff) AM_READWRITE(dsp_dataram_r, dsp_dataram_w)
AM_RANGE(0x1400000, 0x14fffff) AM_RAM
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index ffe2aa19114..dbe3cd1595c 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -345,7 +345,7 @@ static WRITE8_HANDLER( nycaptor_generic_control_w )
memory_set_bankptr(space->machine, "bank1", space->machine->region("maincpu")->base() + 0x10000 + ((data&0x08)>>3)*0x4000 );
}
-static ADDRESS_MAP_START( nycaptor_master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nycaptor_master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE_MEMBER(nycaptor_state, videoram, videoram_size)
@@ -371,7 +371,7 @@ static ADDRESS_MAP_START( nycaptor_master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_READWRITE(nycaptor_sharedram_r, nycaptor_sharedram_w) AM_BASE_MEMBER(nycaptor_state, sharedram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nycaptor_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nycaptor_slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_READWRITE(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE_MEMBER(nycaptor_state, videoram, videoram_size)
AM_RANGE(0xd800, 0xd800) AM_READ_PORT("DSWA")
@@ -390,7 +390,7 @@ static ADDRESS_MAP_START( nycaptor_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_READWRITE(nycaptor_sharedram_r, nycaptor_sharedram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nycaptor_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nycaptor_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc801) AM_DEVWRITE("ay1", ay8910_address_data_w)
@@ -406,7 +406,7 @@ static ADDRESS_MAP_START( nycaptor_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_NOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nycaptor_m68705_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nycaptor_m68705_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(nycaptor_68705_port_a_r, nycaptor_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(nycaptor_68705_port_b_r, nycaptor_68705_port_b_w)
@@ -452,7 +452,7 @@ static WRITE8_HANDLER( cyclshtg_generic_control_w )
}
-static ADDRESS_MAP_START( cyclshtg_master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cyclshtg_master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_READWRITE(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE_MEMBER(nycaptor_state, videoram, videoram_size)
@@ -477,7 +477,7 @@ static ADDRESS_MAP_START( cyclshtg_master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_READWRITE(nycaptor_sharedram_r, nycaptor_sharedram_w) AM_BASE_MEMBER(nycaptor_state, sharedram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cyclshtg_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cyclshtg_slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_READWRITE(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE_MEMBER(nycaptor_state, videoram, videoram_size)
AM_RANGE(0xd800, 0xd800) AM_READ_PORT("DSWA")
@@ -501,7 +501,7 @@ static READ8_HANDLER( unk_r )
return space->machine->rand();
}
-static ADDRESS_MAP_START( bronx_master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bronx_master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_READWRITE(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE_MEMBER(nycaptor_state, videoram, videoram_size)
@@ -526,7 +526,7 @@ static ADDRESS_MAP_START( bronx_master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_READWRITE(nycaptor_sharedram_r, nycaptor_sharedram_w) AM_BASE_MEMBER(nycaptor_state, sharedram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bronx_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bronx_slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_READWRITE(nycaptor_videoram_r, nycaptor_videoram_w) AM_BASE_SIZE_MEMBER(nycaptor_state, videoram, videoram_size)
AM_RANGE(0xd800, 0xd800) AM_READ_PORT("DSWA")
@@ -546,7 +546,7 @@ static ADDRESS_MAP_START( bronx_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_READWRITE(nycaptor_sharedram_r, nycaptor_sharedram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bronx_slave_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bronx_slave_io_map, AS_IO, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index e8a3ad3b79d..16ce161c2b6 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -214,7 +214,7 @@ static WRITE8_DEVICE_HANDLER( pia_2_port_b_w )
state->star_enable = data & 0x10;
/* bits 5-7 go to the music board connector */
- audio_2_command_w(state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM), 0, data & 0xe0);
+ audio_2_command_w(state->maincpu->memory().space(AS_PROGRAM), 0, data & 0xe0);
}
@@ -538,7 +538,7 @@ static WRITE8_HANDLER( nyny_pia_1_2_w )
}
-static ADDRESS_MAP_START( nyny_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nyny_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_MEMBER(nyny_state, videoram1)
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE_MEMBER(nyny_state, colorram1)
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE_MEMBER(nyny_state, videoram2)
@@ -556,7 +556,7 @@ static ADDRESS_MAP_START( nyny_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nyny_audio_1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nyny_audio_1_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */
AM_RANGE(0x0080, 0x0fff) AM_NOP
@@ -573,7 +573,7 @@ static ADDRESS_MAP_START( nyny_audio_1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nyny_audio_2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nyny_audio_2_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */
AM_RANGE(0x0080, 0x0fff) AM_NOP
diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c
index 86ee4b0f91a..39865ee7d2d 100644
--- a/src/mame/drivers/offtwall.c
+++ b/src/mame/drivers/offtwall.c
@@ -275,7 +275,7 @@ static READ16_HANDLER( unknown_verify_r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x037fff) AM_ROM
AM_RANGE(0x038000, 0x03ffff) AM_READ(bankrom_r) AM_REGION("maincpu", 0x38000) AM_BASE_MEMBER(offtwall_state, bankrom_base)
AM_RANGE(0x120000, 0x120fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_SHARE("eeprom")
@@ -497,9 +497,9 @@ static DRIVER_INIT( offtwall )
atarijsa_init(machine, "260010", 0x0040);
/* install son-of-slapstic workarounds */
- state->spritecache_count = memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3fde42, 0x3fde43, 0, 0, spritecache_count_r);
- state->bankswitch_base = memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x037ec2, 0x037f39, 0, 0, bankswitch_r);
- state->unknown_verify_base = memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3fdf1e, 0x3fdf1f, 0, 0, unknown_verify_r);
+ state->spritecache_count = memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3fde42, 0x3fde43, 0, 0, spritecache_count_r);
+ state->bankswitch_base = memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x037ec2, 0x037f39, 0, 0, bankswitch_r);
+ state->unknown_verify_base = memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3fdf1e, 0x3fdf1f, 0, 0, unknown_verify_r);
}
@@ -510,9 +510,9 @@ static DRIVER_INIT( offtwalc )
atarijsa_init(machine, "260010", 0x0040);
/* install son-of-slapstic workarounds */
- state->spritecache_count = memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3fde42, 0x3fde43, 0, 0, spritecache_count_r);
- state->bankswitch_base = memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x037eca, 0x037f43, 0, 0, bankswitch_r);
- state->unknown_verify_base = memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3fdf24, 0x3fdf25, 0, 0, unknown_verify_r);
+ state->spritecache_count = memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3fde42, 0x3fde43, 0, 0, spritecache_count_r);
+ state->bankswitch_base = memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x037eca, 0x037f43, 0, 0, bankswitch_r);
+ state->unknown_verify_base = memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3fdf24, 0x3fdf25, 0, 0, unknown_verify_r);
}
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index 937fe7a77dd..65629cb4fec 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -39,7 +39,7 @@ static WRITE16_HANDLER( ohmygod_ctrl_w )
}
}
-static ADDRESS_MAP_START( ohmygod_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ohmygod_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x300000, 0x303fff) AM_RAM
AM_RANGE(0x304000, 0x307fff) AM_RAM_WRITE(ohmygod_videoram_w) AM_BASE_MEMBER(ohmygod_state, videoram)
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index 52b101e66a8..2214f94f535 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -198,7 +198,7 @@ static WRITE8_HANDLER( ccasino_coinctr_w )
}
-static ADDRESS_MAP_START( ojankohs_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ojankohs_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(ojankohs_videoram_w)
AM_RANGE(0x9000, 0x9fff) AM_RAM_WRITE(ojankohs_colorram_w)
@@ -208,7 +208,7 @@ static ADDRESS_MAP_START( ojankohs_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ojankoy_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ojankoy_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM_WRITE(ojankohs_videoram_w)
AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(ojankohs_colorram_w)
@@ -217,14 +217,14 @@ static ADDRESS_MAP_START( ojankoy_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ojankoc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ojankoc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") AM_WRITE(ojankoc_videoram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ojankohs_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ojankohs_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(ojankohs_portselect_w)
AM_RANGE(0x01, 0x01) AM_READWRITE(ojankohs_keymatrix_r, ojankohs_rombank_w)
@@ -238,7 +238,7 @@ static ADDRESS_MAP_START( ojankohs_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x11, 0x11) AM_WRITENOP // unknown
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ojankoy_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ojankoy_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(ojankohs_portselect_w)
AM_RANGE(0x01, 0x01) AM_READWRITE(ojankohs_keymatrix_r, ojankoy_rombank_w)
@@ -249,7 +249,7 @@ static ADDRESS_MAP_START( ojankoy_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x06, 0x07) AM_DEVWRITE("aysnd", ay8910_data_address_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ccasino_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ccasino_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(ojankohs_portselect_w)
AM_RANGE(0x01, 0x01) AM_READWRITE(ojankohs_keymatrix_r, ojankohs_rombank_w)
@@ -264,7 +264,7 @@ static ADDRESS_MAP_START( ccasino_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x11, 0x11) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ojankoc_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ojankoc_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x1f) AM_WRITE(ojankoc_palette_w)
AM_RANGE(0xf9, 0xf9) AM_WRITE(ojankohs_msm5205_w)
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index 9b9d33be26c..3d15559eae8 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -245,7 +245,7 @@ static WRITE8_HANDLER( sound_command_w )
}
-static ADDRESS_MAP_START( olibochu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( olibochu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(olibochu_videoram_w) AM_BASE_MEMBER(olibochu_state, videoram)
AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(olibochu_colorram_w) AM_BASE_MEMBER(olibochu_state, colorram)
@@ -264,7 +264,7 @@ static ADDRESS_MAP_START( olibochu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( olibochu_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( olibochu_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM
AM_RANGE(0x7000, 0x7000) AM_READ(soundlatch_r) /* likely ay8910 input port, not direct */
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index ecd9b04448f..481479896c3 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -240,7 +240,7 @@ public:
static MACHINE_RESET( omegrace )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
}
@@ -334,7 +334,7 @@ static WRITE8_HANDLER( omegrace_soundlatch_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4bff) AM_RAM
AM_RANGE(0x5c00, 0x5cff) AM_RAM AM_SHARE("nvram") /* NVRAM */
@@ -343,7 +343,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x08, 0x08) AM_READ(omegrace_vg_go_r)
AM_RANGE(0x09, 0x09) AM_READ(watchdog_reset_r)
@@ -366,13 +366,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM
AM_RANGE(0x1000, 0x13ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_port, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_port, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) /* likely ay8910 input port, not direct */
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w)
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index c9132604da9..75edfb5e848 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -102,7 +102,7 @@ static WRITE16_DEVICE_HANDLER( soundbank_w )
-static ADDRESS_MAP_START( oneshot_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( oneshot_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x087fff) AM_RAM
AM_RANGE(0x0c0000, 0x0c07ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -125,7 +125,7 @@ static ADDRESS_MAP_START( oneshot_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x19c034, 0x19c035) AM_READ_PORT("P2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( oneshot_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( oneshot_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8000) AM_READWRITE(soundlatch_r,soundlatch_w)
AM_RANGE(0x8001, 0x87ff) AM_RAM
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index 4900b4beb32..7b6b882797c 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -160,7 +160,7 @@ static WRITE8_HANDLER(palette2_w)
*
*************************************/
-static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_REGION("maincpu", 0x10000)
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc800, 0xc87f) AM_RAM_WRITE(palette1_w) AM_BASE_MEMBER(onetwo_state, paletteram)
@@ -169,7 +169,7 @@ static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_cpu_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_cpu_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1") AM_WRITE(onetwo_coin_counters_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("DSW2") AM_WRITE(onetwo_soundlatch_w)
@@ -178,13 +178,13 @@ static ADDRESS_MAP_START( main_cpu_io, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x04, 0x04) AM_READ_PORT("SYSTEM")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_cpu_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_cpu_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ymsnd", ym3812_status_port_r, ym3812_control_port_w)
AM_RANGE(0x20, 0x20) AM_DEVWRITE("ymsnd", ym3812_write_port_w)
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index 9a8f52104b9..fdd7345c3ef 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -357,7 +357,7 @@ static WRITE8_DEVICE_HANDLER( sound_bankswitch_w )
***********************************************************/
-static ADDRESS_MAP_START( opwolf_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( opwolf_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x0f0000, 0x0f07ff) AM_MIRROR(0xf000) AM_READ(opwolf_cchip_data_r)
AM_RANGE(0x0f0802, 0x0f0803) AM_MIRROR(0xf000) AM_READ(opwolf_cchip_status_r)
@@ -381,7 +381,7 @@ static ADDRESS_MAP_START( opwolf_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( opwolfb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( opwolfb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x0f0008, 0x0f000b) AM_READ(opwolf_in_r) /* coins and buttons */
AM_RANGE(0x0ff000, 0x0fffff) AM_READWRITE(cchip_r,cchip_w)
@@ -406,7 +406,7 @@ ADDRESS_MAP_END
This extra Z80 substitutes for the c-chip in the bootleg
*/
-static ADDRESS_MAP_START( opwolfb_sub_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( opwolfb_sub_z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8800, 0x8800) AM_READ(z80_input1_r) /* read at PC=$637: poked to $c004 */
AM_RANGE(0x9000, 0x9000) AM_WRITENOP /* unknown write, 0 then 1 each interrupt */
@@ -541,7 +541,7 @@ static WRITE8_HANDLER( opwolf_adpcm_e_w )
// logerror("CPU #1 e00%i-data=%2x pc=%4x\n",offset,data,cpu_get_pc(space->cpu) );
}
-static ADDRESS_MAP_START( opwolf_sound_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( opwolf_sound_z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10")
AM_RANGE(0x8000, 0x8fff) AM_RAM
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index d1803a8a36b..ac0d5673446 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -105,7 +105,7 @@ static WRITE8_HANDLER( orbit_misc_w )
*
*************************************/
-static ADDRESS_MAP_START( orbit_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( orbit_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x0700) AM_RAM
AM_RANGE(0x0800, 0x0800) AM_MIRROR(0x07ff) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/othello.c b/src/mame/drivers/othello.c
index 5c69da4aadd..52f25223eca 100644
--- a/src/mame/drivers/othello.c
+++ b/src/mame/drivers/othello.c
@@ -124,7 +124,7 @@ static SCREEN_UPDATE( othello )
return 0;
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x8000, 0x97ff) AM_NOP /* not populated */
AM_RANGE(0x9800, 0x9fff) AM_RAM AM_BASE_MEMBER(othello_state, videoram)
@@ -179,7 +179,7 @@ static WRITE8_HANDLER( tilebank_w )
logerror("tilebank -> %x\n", data);
}
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x08, 0x08) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x09, 0x09) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
@@ -229,12 +229,12 @@ static WRITE8_HANDLER( ay_data_w )
if (state->ay_select & 2) ay8910_data_w(state->ay2, 0, data);
}
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( audio_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(latch_r)
AM_RANGE(0x01, 0x01) AM_WRITE(ay_data_w)
@@ -308,7 +308,7 @@ static READ8_HANDLER( n7751_t1_r )
return 0;
}
-static ADDRESS_MAP_START( n7751_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( n7751_portmap, AS_IO, 8 )
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(n7751_t1_r)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READ(n7751_command_r)
AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READ(n7751_rom_r)
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index 191741f969f..575b61be1a0 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -82,7 +82,7 @@ static READ16_HANDLER( calendar_r )
}
-static ADDRESS_MAP_START( othldrby_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( othldrby_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x20000f) AM_READWRITE(calendar_r, calendar_w)
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 94acded1863..47a667b5943 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -459,7 +459,7 @@ static WRITE8_HANDLER( othunder_TC0310FAM_w )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( othunder_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( othunder_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM
AM_RANGE(0x090000, 0x09000f) AM_READWRITE(othunder_tc0220ioc_r, othunder_tc0220ioc_w)
@@ -477,7 +477,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10")
AM_RANGE(0xc000, 0xdfff) AM_RAM
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 27ba1ca347b..cf3da7892c5 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -156,7 +156,7 @@ static WRITE16_HANDLER( overdriv_cpuB_irq6_w )
}
-static ADDRESS_MAP_START( overdriv_master_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( overdriv_master_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM /* work RAM */
AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -183,7 +183,7 @@ static ADDRESS_MAP_START( overdriv_master_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x238000, 0x238001) AM_WRITE(overdriv_cpuB_irq5_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( overdriv_slave_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( overdriv_slave_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM /* work RAM */
AM_RANGE(0x0c0000, 0x0c1fff) AM_RAM
@@ -199,7 +199,7 @@ static ADDRESS_MAP_START( overdriv_slave_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x220000, 0x221fff) AM_READNOP // K053250 #1 gfx ROM read (LSB)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( overdriv_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( overdriv_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0200, 0x0201) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w)
AM_RANGE(0x0400, 0x042f) AM_DEVREADWRITE("k053260_1", k053260_r, k053260_w)
AM_RANGE(0x0600, 0x062f) AM_DEVREADWRITE("k053260_2", k053260_r, k053260_w)
diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c
index dd68cbd8166..9b1662cd5c8 100644
--- a/src/mame/drivers/pachifev.c
+++ b/src/mame/drivers/pachifev.c
@@ -130,7 +130,7 @@ static READ8_HANDLER(controls_r)
return output_bit;
}
-static ADDRESS_MAP_START( pachifev_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pachifev_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM
@@ -150,7 +150,7 @@ static ADDRESS_MAP_START( pachifev_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfffc, 0xffff) AM_NOP /* nmi */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pachifev_cru, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pachifev_cru, AS_IO, 8 )
AM_RANGE(0x000, 0x000) AM_READ(controls_r)
ADDRESS_MAP_END
@@ -309,7 +309,7 @@ static INTERRUPT_GEN( 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(ADDRESS_SPACE_PROGRAM);
+ address_space *ramspace = device->memory().space(AS_PROGRAM);
UINT8 player = 0;
if ((ramspace->read_byte(0xe00f) == 0x01) && ((input_port_read(device->machine, "DSW1") & 0x08) == 0x00))
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index 81a4ce49b4b..3ab12894706 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -235,7 +235,7 @@ static WRITE8_HANDLER( pacland_irq_2_ctrl_w )
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM_WRITE(pacland_videoram_w) AM_BASE_MEMBER(pacland_state, videoram)
AM_RANGE(0x1000, 0x1fff) AM_RAM_WRITE(pacland_videoram2_w) AM_BASE_MEMBER(pacland_state, videoram2)
AM_RANGE(0x2000, 0x37ff) AM_RAM AM_BASE_MEMBER(pacland_state, spriteram)
@@ -251,7 +251,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x9000, 0x9fff) AM_WRITE(pacland_flipscreen_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x001f) AM_READWRITE(m6801_io_r, m6801_io_w)
AM_RANGE(0x0080, 0x00ff) AM_RAM
AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("namco", namcos1_cus30_r, namcos1_cus30_w) /* PSG device, shared RAM */
@@ -269,7 +269,7 @@ static READ8_HANDLER( readFF )
return 0xff;
}
-static ADDRESS_MAP_START( mcu_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_port_map, AS_IO, 8 )
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_READ_PORT("IN2")
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_WRITE(pacland_coin_w)
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READ(readFF) /* leds won't work otherwise */
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index 49411dcd32f..dcdfd1d2003 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -893,7 +893,7 @@ static WRITE8_HANDLER( mspacman_enable_decode_w ) { mspacman_enable_deco
*
*************************************/
-static ADDRESS_MAP_START( pacman_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pacman_map, AS_PROGRAM, 8 )
//A lot of games don't have an a15 at the cpu. Generally only games with a cpu daughter board can access the full 32k of romspace.
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x8000) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE_MEMBER(pacman_state, videoram)
@@ -922,7 +922,7 @@ ADDRESS_MAP_END
// exist on any Pacman or Puckman board I have seen. DW
-static ADDRESS_MAP_START( mspacman_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mspacman_map, AS_PROGRAM, 8 )
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE_MEMBER(pacman_state, videoram)
AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE_MEMBER(pacman_state, colorram)
AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READ(pacman_read_nop) AM_WRITENOP
@@ -961,7 +961,7 @@ static ADDRESS_MAP_START( mspacman_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( woodpek_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( woodpek_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE_MEMBER(pacman_state, videoram)
AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE_MEMBER(pacman_state, colorram)
@@ -988,7 +988,7 @@ static ADDRESS_MAP_START( woodpek_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( alibaba_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( alibaba_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE_MEMBER(pacman_state, videoram)
AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE_MEMBER(pacman_state, colorram)
@@ -1020,7 +1020,7 @@ static ADDRESS_MAP_START( alibaba_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dremshpr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dremshpr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE_MEMBER(pacman_state, videoram)
AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE_MEMBER(pacman_state, colorram)
@@ -1050,7 +1050,7 @@ static ADDRESS_MAP_START( dremshpr_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( epos_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( epos_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x8000) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE_MEMBER(pacman_state, videoram)
AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE_MEMBER(pacman_state, colorram)
@@ -1076,7 +1076,7 @@ static ADDRESS_MAP_START( epos_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( s2650games_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( s2650games_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x8000) AM_ROMBANK("bank1")
AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0xe000) AM_WRITE(s2650games_colorram_w) AM_BASE_MEMBER(pacman_state, colorram)
AM_RANGE(0x1400, 0x141f) AM_MIRROR(0xe000) AM_WRITE(s2650games_scroll_w)
@@ -1106,7 +1106,7 @@ static ADDRESS_MAP_START( s2650games_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rocktrv2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rocktrv2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(pacman_videoram_w) AM_BASE_MEMBER(pacman_state, videoram)
AM_RANGE(0x4400, 0x47ff) AM_RAM_WRITE(pacman_colorram_w) AM_BASE_MEMBER(pacman_state, colorram)
@@ -1133,7 +1133,7 @@ static ADDRESS_MAP_START( rocktrv2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bigbucks_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bigbucks_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(pacman_videoram_w) AM_BASE_MEMBER(pacman_state, videoram)
AM_RANGE(0x4400, 0x47ff) AM_RAM_WRITE(pacman_colorram_w) AM_BASE_MEMBER(pacman_state, colorram)
@@ -1154,7 +1154,7 @@ static ADDRESS_MAP_START( bigbucks_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mschamp_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mschamp_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE_MEMBER(pacman_state, videoram)
AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE_MEMBER(pacman_state, colorram)
@@ -1180,7 +1180,7 @@ static ADDRESS_MAP_START( mschamp_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( crushs_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( crushs_map, AS_PROGRAM, 8 )
//A lot of games don't have an a15 at the cpu. Generally only games with a cpu daughter board can access the full 32k of romspace.
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x8000) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE_MEMBER(pacman_state, videoram)
@@ -1212,63 +1212,63 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( writeport, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(pacman_interrupt_vector_w) /* Pac-Man only */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vanvan_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( vanvan_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_DEVWRITE("namco", sn76496_w)
AM_RANGE(0x02, 0x02) AM_DEVWRITE("sn2", sn76496_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dremshpr_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dremshpr_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x06, 0x07) AM_DEVWRITE("namco", ay8910_data_address_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( piranha_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( piranha_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(piranha_interrupt_vector_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nmouse_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( nmouse_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(nmouse_interrupt_vector_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( theglobp_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( theglobp_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READ(theglobp_decrypt_rom) /* Switch protection logic */
AM_IMPORT_FROM(writeport)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( acitya_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( acitya_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READ(acitya_decrypt_rom) /* Switch protection logic */
AM_IMPORT_FROM(writeport)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mschamp_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mschamp_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ(mschamp_kludge_r)
AM_IMPORT_FROM(writeport)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bigbucks_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bigbucks_portmap, AS_IO, 8 )
AM_RANGE(0x0000, 0xffff) AM_READ(bigbucks_question_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( s2650games_writeport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( s2650games_writeport, AS_IO, 8 )
AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_DEVWRITE("namco", sn76496_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( drivfrcp_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( drivfrcp_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READNOP
AM_RANGE(0x01, 0x01) AM_READ(drivfrcp_port1_r)
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("Sense")
AM_IMPORT_FROM(s2650games_writeport)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( _8bpm_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( _8bpm_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READNOP
AM_RANGE(0x01, 0x01) AM_READ(_8bpm_port1_r)
AM_RANGE(0xe0, 0xe0) AM_READNOP
@@ -1276,13 +1276,13 @@ static ADDRESS_MAP_START( _8bpm_portmap, ADDRESS_SPACE_IO, 8 )
AM_IMPORT_FROM(s2650games_writeport)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( porky_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( porky_portmap, AS_IO, 8 )
AM_RANGE(0x01, 0x01) AM_READ(porky_port1_r)
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("Sense")
AM_IMPORT_FROM(s2650games_writeport)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( crushs_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( crushs_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("namco", ay8910_data_address_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("DSW2")
@@ -5308,7 +5308,7 @@ ROM_END
static void maketrax_rom_decode(running_machine *machine)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x4000);
UINT8 *rom = machine->region("maincpu")->base();
@@ -5332,15 +5332,15 @@ static void maketrax_rom_decode(running_machine *machine)
static DRIVER_INIT( maketrax )
{
/* set up protection handlers */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5080, 0x50bf, 0, 0, maketrax_special_port2_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x50c0, 0x50ff, 0, 0, maketrax_special_port3_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5080, 0x50bf, 0, 0, maketrax_special_port2_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x50c0, 0x50ff, 0, 0, maketrax_special_port3_r);
maketrax_rom_decode(machine);
}
static void korosuke_rom_decode(running_machine *machine)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x4000);
UINT8 *rom = machine->region("maincpu")->base();
@@ -5364,8 +5364,8 @@ static void korosuke_rom_decode(running_machine *machine)
static DRIVER_INIT( korosuke )
{
/* set up protection handlers */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5080, 0x5080, 0, 0, korosuke_special_port2_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x50c0, 0x50ff, 0, 0, korosuke_special_port3_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5080, 0x5080, 0, 0, korosuke_special_port2_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x50c0, 0x50ff, 0, 0, korosuke_special_port3_r);
korosuke_rom_decode(machine);
}
@@ -5707,10 +5707,10 @@ static READ8_HANDLER( cannonbp_protection_r )
static DRIVER_INIT( cannonbp )
{
/* extra memory */
- memory_install_ram(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4800, 0x4bff, 0, 0, NULL);
+ memory_install_ram(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4800, 0x4bff, 0, 0, NULL);
/* protection? */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3000, 0x3fff, 0, 0, cannonbp_protection_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3000, 0x3fff, 0, 0, cannonbp_protection_r);
}
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index feb0f759032..85a76e04e8a 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -134,7 +134,7 @@ static WRITE8_HANDLER( pandoras_z80_irqtrigger_w )
-static ADDRESS_MAP_START( pandoras_master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pandoras_master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1") AM_BASE_MEMBER(pandoras_state, spriteram) /* Work RAM (Shared with CPU B) */
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(pandoras_cram_w) AM_SHARE("share2") AM_BASE_MEMBER(pandoras_state, colorram) /* Color RAM (shared with CPU B) */
AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(pandoras_vram_w) AM_SHARE("share3") AM_BASE_MEMBER(pandoras_state, videoram) /* Video RAM (shared with CPU B) */
@@ -149,7 +149,7 @@ static ADDRESS_MAP_START( pandoras_master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pandoras_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pandoras_slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("share1") /* Work RAM (Shared with CPU A) */
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(pandoras_cram_w) AM_SHARE("share2") /* Color RAM (shared with CPU A) */
AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(pandoras_vram_w) AM_SHARE("share3") /* Video RAM (shared with CPU A) */
@@ -167,7 +167,7 @@ static ADDRESS_MAP_START( pandoras_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pandoras_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pandoras_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM /* ROM */
AM_RANGE(0x2000, 0x23ff) AM_RAM /* RAM */
AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r) /* soundlatch_r */
@@ -178,11 +178,11 @@ static ADDRESS_MAP_START( pandoras_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xa000) AM_WRITE(soundlatch2_w) /* sound command to the 8039 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pandoras_i8039_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pandoras_i8039_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pandoras_i8039_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pandoras_i8039_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0xff) AM_READ(soundlatch2_r)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_WRITE(i8039_irqen_and_status_w)
diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c
index 03c7759fc55..502fdba80c0 100644
--- a/src/mame/drivers/pangofun.c
+++ b/src/mame/drivers/pangofun.c
@@ -109,7 +109,7 @@ public:
};
-static ADDRESS_MAP_START( pcat_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( pcat_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0x000a0000, 0x000bffff) AM_RAM
AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0)
@@ -118,7 +118,7 @@ static ADDRESS_MAP_START( pcat_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xffff0000, 0xffffffff) AM_ROM AM_REGION("bios", 0 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pcat_io, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( pcat_io, AS_IO, 32 )
AM_IMPORT_FROM(pcat32_io_common)
AM_RANGE(0x0070, 0x007f) AM_DEVREADWRITE8_MODERN("rtc", mc146818_device, read, write, 0xffffffff)
ADDRESS_MAP_END
@@ -166,7 +166,7 @@ static const struct pc_vga_interface vga_interface ={
NULL,
NULL,
NULL,
- ADDRESS_SPACE_IO,
+ AS_IO,
0x0000
};
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index 84f2ab80c8b..71a3e97fd15 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -187,7 +187,7 @@ static WRITE8_HANDLER(t5182shared_w)
}
-static ADDRESS_MAP_START( panicr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( panicr_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x01fff) AM_RAM AM_BASE_MEMBER(panicr_state, mainram)
AM_RANGE(0x02000, 0x02fff) AM_RAM AM_BASE_MEMBER(panicr_state, spriteram)
AM_RANGE(0x03000, 0x03fff) AM_RAM
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index 39b6b244e99..069542a335f 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -76,27 +76,27 @@ static WRITE8_HANDLER( torus_coin_counter_w )
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(paradise_vram_0_w) AM_BASE_MEMBER(paradise_state, vram_0) /* Foreground */ \
-static ADDRESS_MAP_START( paradise_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( paradise_map, AS_PROGRAM, 8 )
STANDARD_MAP
AM_RANGE(0xd800, 0xd8ff) AM_RAM // RAM
AM_RANGE(0xd900, 0xe0ff) AM_RAM AM_BASE_SIZE_MEMBER(paradise_state, spriteram, spriteram_size) // Sprites
AM_RANGE(0xe100, 0xffff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tgtball_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tgtball_map, AS_PROGRAM, 8 )
STANDARD_MAP
AM_RANGE(0xd800, 0xd8ff) AM_RAM // RAM
AM_RANGE(0xd900, 0xd9ff) AM_RAM AM_BASE_SIZE_MEMBER(paradise_state, spriteram, spriteram_size) // Sprites
AM_RANGE(0xda00, 0xffff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( torus_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( torus_map, AS_PROGRAM, 8 )
STANDARD_MAP
AM_RANGE(0xd800, 0xdfff) AM_RAM AM_BASE_SIZE_MEMBER(paradise_state, spriteram, spriteram_size) // Sprites
AM_RANGE(0xe000, 0xffff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( paradise_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( paradise_io_map, AS_IO, 8 )
AM_RANGE(0x0000, 0x17ff) AM_RAM_WRITE(paradise_palette_w) AM_BASE_MEMBER(paradise_state, paletteram) // Palette
AM_RANGE(0x1800, 0x1800) AM_WRITE(paradise_priority_w) // Layers priority
AM_RANGE(0x2001, 0x2001) AM_WRITE(paradise_flipscreen_w) // Flip Screen
@@ -113,7 +113,7 @@ static ADDRESS_MAP_START( paradise_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x8000, 0xffff) AM_RAM_WRITE(paradise_pixmap_w) AM_BASE_MEMBER(paradise_state, videoram) // Pixmap
ADDRESS_MAP_END
-static ADDRESS_MAP_START( torus_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( torus_io_map, AS_IO, 8 )
AM_RANGE(0x0000, 0x17ff) AM_RAM_WRITE(paradise_palette_w) AM_BASE_MEMBER(paradise_state, paletteram) // Palette
AM_RANGE(0x1800, 0x1800) AM_WRITE(paradise_priority_w) // Layers priority
AM_RANGE(0x2001, 0x2001) AM_WRITE(paradise_flipscreen_w) // Flip Screen
@@ -1050,14 +1050,14 @@ static DRIVER_INIT (tgtball)
{
paradise_state *state = machine->driver_data<paradise_state>();
state->sprite_inc = 4;
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x2001, 0x2001, 0, 0, tgtball_flipscreen_w );
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x2001, 0x2001, 0, 0, tgtball_flipscreen_w );
}
static DRIVER_INIT (torus)
{
paradise_state *state = machine->driver_data<paradise_state>();
state->sprite_inc = 4;
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x2070, 0x2070, 0, 0, torus_coin_counter_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x2070, 0x2070, 0, 0, torus_coin_counter_w);
}
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index 89e5984bd41..7827d2bc5a3 100644
--- a/src/mame/drivers/paranoia.c
+++ b/src/mame/drivers/paranoia.c
@@ -64,7 +64,7 @@ static INPUT_PORTS_START( paranoia )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
INPUT_PORTS_END
-static ADDRESS_MAP_START( pce_mem , ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START( pce_mem , AS_PROGRAM, 8)
AM_RANGE( 0x000000, 0x03FFFF) AM_ROM
AM_RANGE( 0x1F0000, 0x1F1FFF) AM_RAM AM_MIRROR(0x6000) AM_BASE( &pce_user_ram )
AM_RANGE( 0x1FE000, 0x1FE3FF) AM_READWRITE( vdc_0_r, vdc_0_w )
@@ -75,7 +75,7 @@ static ADDRESS_MAP_START( pce_mem , ADDRESS_SPACE_PROGRAM, 8)
AM_RANGE( 0x1FF400, 0x1FF7FF) AM_READWRITE( h6280_irq_status_r, h6280_irq_status_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pce_io , ADDRESS_SPACE_IO, 8)
+static ADDRESS_MAP_START( pce_io , AS_IO, 8)
AM_RANGE( 0x00, 0x03) AM_READWRITE( vdc_0_r, vdc_0_w )
ADDRESS_MAP_END
@@ -97,7 +97,7 @@ static WRITE8_HANDLER( paranoia_8085_8155_w )
}
}
-static ADDRESS_MAP_START(paranoia_8085_map, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(paranoia_8085_map, AS_PROGRAM, 8)
AM_RANGE( 0x0000, 0x7fff) AM_ROM
AM_RANGE( 0x8000, 0x80ff) AM_RAM
AM_RANGE( 0x8100, 0x8105) AM_WRITE( paranoia_8085_8155_w )
@@ -105,10 +105,10 @@ static ADDRESS_MAP_START(paranoia_8085_map, ADDRESS_SPACE_PROGRAM, 8)
AM_RANGE( 0xe000, 0xe1ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START(paranoia_8085_io_map, ADDRESS_SPACE_IO, 8)
+static ADDRESS_MAP_START(paranoia_8085_io_map, AS_IO, 8)
ADDRESS_MAP_END
-static ADDRESS_MAP_START(paranoia_z80_map, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(paranoia_z80_map, AS_PROGRAM, 8)
AM_RANGE( 0x0000, 0x3fff) AM_ROM
AM_RANGE( 0x6000, 0x67ff) AM_RAM
AM_RANGE( 0x7000, 0x73ff) AM_RAM
@@ -132,7 +132,7 @@ static WRITE8_HANDLER(paranoia_z80_io_37_w)
{
}
-static ADDRESS_MAP_START(paranoia_z80_io_map, ADDRESS_SPACE_IO, 8)
+static ADDRESS_MAP_START(paranoia_z80_io_map, AS_IO, 8)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x01 ) AM_READ( paranoia_z80_io_01_r )
AM_RANGE( 0x02, 0x02 ) AM_READ( paranoia_z80_io_02_r )
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index 4e4671d9fdc..4ca64393261 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -144,7 +144,7 @@ static WRITE8_HANDLER( sound_arm_nmi_w )
/********************************************/
-static ADDRESS_MAP_START( parodius_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( parodius_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE_MEMBER(parodius_state, ram)
AM_RANGE(0x0800, 0x1fff) AM_RAM
AM_RANGE(0x3f8c, 0x3f8c) AM_READ_PORT("P1")
@@ -164,7 +164,7 @@ static ADDRESS_MAP_START( parodius_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( parodius_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( parodius_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w)
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index da419ff521c..a1743b0bb4a 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -206,7 +206,7 @@ static WRITE16_HANDLER( pasha2_lamps_w )
(data & 0x400) ? 'B' : '-');
}
-static ADDRESS_MAP_START( pasha2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pasha2_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_BASE_MEMBER(pasha2_state, wram)
AM_RANGE(0x40000000, 0x4001ffff) AM_RAM_WRITE(bitmap_0_w)
AM_RANGE(0x40020000, 0x4003ffff) AM_RAM_WRITE(bitmap_1_w)
@@ -222,7 +222,7 @@ static ADDRESS_MAP_START( pasha2_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff80000, 0xffffffff) AM_ROM AM_REGION("user1",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pasha2_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( pasha2_io, AS_IO, 16 )
AM_RANGE(0x08, 0x0b) AM_READNOP //sound status?
AM_RANGE(0x18, 0x1b) AM_READNOP //sound status?
AM_RANGE(0x20, 0x23) AM_WRITE(pasha2_lamps_w)
@@ -471,7 +471,7 @@ static READ16_HANDLER( pasha2_speedup_r )
static DRIVER_INIT( pasha2 )
{
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x95744, 0x95747, 0, 0, pasha2_speedup_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x95744, 0x95747, 0, 0, pasha2_speedup_r );
memory_set_bankptr(machine, "bank1", machine->region("user2")->base());
}
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index c8acbff0f29..453000ca6e3 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -108,7 +108,7 @@
/* todo: check all memory regions actually readable / read from */
-static ADDRESS_MAP_START( pass_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pass_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(pass_bg_videoram_w) AM_BASE_MEMBER(pass_state, bg_videoram) // Background
@@ -120,12 +120,12 @@ static ADDRESS_MAP_START( pass_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* sound cpu */
-static ADDRESS_MAP_START( pass_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pass_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pass_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pass_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r)
AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index 1eae4e2ed0b..6a5e0dfd12c 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -50,7 +50,7 @@ static READ8_HANDLER( pastelg_sndrom_r )
return ROM[pastelg_blitter_src_addr_r(space) & 0x7fff];
}
-static ADDRESS_MAP_START( pastelg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pastelg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
@@ -61,7 +61,7 @@ static READ8_HANDLER( pastelg_irq_ack_r )
return 0;
}
-static ADDRESS_MAP_START( pastelg_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pastelg_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// AM_RANGE(0x00, 0x00) AM_WRITENOP
AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
@@ -114,7 +114,7 @@ static WRITE8_HANDLER( threeds_inputportsel_w )
state->mux_data = ~data;
}
-static ADDRESS_MAP_START( threeds_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( threeds_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x81, 0x81) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x82, 0x83) AM_DEVWRITE("aysnd", ay8910_data_address_w)
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index 79a66cd8775..b4c4ed2f777 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -79,7 +79,7 @@ static WRITE8_HANDLER( pbaction_sh_command_w )
}
-static ADDRESS_MAP_START( pbaction_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pbaction_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE_MEMBER(pbaction_state, work_ram)
@@ -98,7 +98,7 @@ static ADDRESS_MAP_START( pbaction_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe800, 0xe800) AM_WRITE(pbaction_sh_command_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pbaction_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pbaction_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x8000, 0x8000) AM_READ(soundlatch_r)
@@ -106,7 +106,7 @@ static ADDRESS_MAP_START( pbaction_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pbaction_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pbaction_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x11) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x20, 0x21) AM_DEVWRITE("ay2", ay8910_address_data_w)
@@ -484,7 +484,7 @@ static DRIVER_INIT( pbactio3 )
pbaction_decode(machine, "maincpu");
/* install a protection (?) workaround */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xc000, 0, 0, pbactio3_prot_kludge_r );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc000, 0xc000, 0, 0, pbactio3_prot_kludge_r );
}
static DRIVER_INIT( pbactio4 )
diff --git a/src/mame/drivers/pcat_dyn.c b/src/mame/drivers/pcat_dyn.c
index 528b2e484d3..e65e325fc3b 100644
--- a/src/mame/drivers/pcat_dyn.c
+++ b/src/mame/drivers/pcat_dyn.c
@@ -38,7 +38,7 @@ public:
//ce9b8
/* TODO: understand the proper ROM loading.*/
-static ADDRESS_MAP_START( pcat_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( pcat_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0x000a0000, 0x000bffff) AM_RAM
AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0)
@@ -53,7 +53,7 @@ static ADDRESS_MAP_START( pcat_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xffff0000, 0xffffffff) AM_ROM AM_REGION("bios", 0 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pcat_io, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( pcat_io, AS_IO, 32 )
AM_IMPORT_FROM(pcat32_io_common)
AM_RANGE(0x0070, 0x007f) AM_DEVREADWRITE8_MODERN("rtc", mc146818_device, read, write, 0xffffffff)
ADDRESS_MAP_END
@@ -102,7 +102,7 @@ static const struct pc_vga_interface vga_interface =
NULL,
NULL,
NULL,
- ADDRESS_SPACE_IO,
+ AS_IO,
0x0000
};
diff --git a/src/mame/drivers/pcat_nit.c b/src/mame/drivers/pcat_nit.c
index ba325dd290e..8bc60e54e6a 100644
--- a/src/mame/drivers/pcat_nit.c
+++ b/src/mame/drivers/pcat_nit.c
@@ -164,7 +164,7 @@ static WRITE8_HANDLER(pcat_nit_rombank_w)
}
}
-static ADDRESS_MAP_START( pcat_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( pcat_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0x000a0000, 0x000bffff) AM_RAM
AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0)
@@ -190,7 +190,7 @@ static READ8_HANDLER(pcat_nit_io_r)
}
}
-static ADDRESS_MAP_START( pcat_nit_io, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( pcat_nit_io, AS_IO, 32 )
AM_IMPORT_FROM(pcat32_io_common)
AM_RANGE(0x0278, 0x027f) AM_READ8(pcat_nit_io_r, 0xffffffff) AM_WRITENOP
AM_RANGE(0x03f8, 0x03ff) AM_DEVREADWRITE8("ns16450_0", ins8250_r, ins8250_w, 0xffffffff)
@@ -217,7 +217,7 @@ static const struct pc_vga_interface vga_interface =
NULL,
NULL,
NULL,
- ADDRESS_SPACE_IO,
+ AS_IO,
0x0000
};
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index abb7839064c..4a3c6461611 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -70,7 +70,7 @@ static READ8_DEVICE_HANDLER( pcktgal_adpcm_reset_r )
/***************************************************************************/
-static ADDRESS_MAP_START( pcktgal_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pcktgal_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE(pcktgal_videoram_w) AM_BASE_MEMBER(pcktgal_state, videoram)
AM_RANGE(0x1000, 0x11ff) AM_RAM AM_BASE_SIZE_MEMBER(pcktgal_state, spriteram, spriteram_size)
@@ -87,7 +87,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( pcktgal_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pcktgal_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3812_w)
@@ -407,7 +407,7 @@ ROM_END
static DRIVER_INIT( deco222 )
{
int A;
- address_space *space = machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("audiocpu")->memory().space(AS_PROGRAM);
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x10000);
UINT8 *rom = machine->region("audiocpu")->base();
diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c
index c7c1bdf6a55..714ae793e71 100644
--- a/src/mame/drivers/pcxt.c
+++ b/src/mame/drivers/pcxt.c
@@ -705,7 +705,7 @@ static IRQ_CALLBACK(irq_callback)
return r;
}
-static ADDRESS_MAP_START( filetto_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( filetto_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x003ff) AM_RAM //irq vectors
AM_RANGE(0x00400, 0x007ff) AM_RAM AM_BASE_MEMBER(pcxt_state, work_ram)
AM_RANGE(0x00800, 0x9ffff) AM_RAM //work RAM 640KB
@@ -714,7 +714,7 @@ static ADDRESS_MAP_START( filetto_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( filetto_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( filetto_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3ff)
AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE("dma8237_1", i8237_r, i8237_w ) //8237 DMA Controller
AM_RANGE(0x0020, 0x002f) AM_DEVREADWRITE("pic8259_1", pic8259_r, pic8259_w ) //8259 Interrupt control
@@ -743,7 +743,7 @@ static ADDRESS_MAP_START( filetto_io, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x03f8, 0x03ff) AM_RAM //rs232c (serial) port
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tetriskr_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tetriskr_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3ff)
AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE("dma8237_1", i8237_r, i8237_w ) //8237 DMA Controller
AM_RANGE(0x0020, 0x002f) AM_DEVREADWRITE("pic8259_1", pic8259_r, pic8259_w ) //8259 Interrupt control
diff --git a/src/mame/drivers/pengadvb.c b/src/mame/drivers/pengadvb.c
index 78b5839f037..409b5ca6662 100644
--- a/src/mame/drivers/pengadvb.c
+++ b/src/mame/drivers/pengadvb.c
@@ -50,7 +50,7 @@ static void mem_map_banks(running_machine *machine)
{
case 0:
{
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" );
memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base());
break;
};
@@ -58,7 +58,7 @@ static void mem_map_banks(running_machine *machine)
case 2:
case 3:
{
- memory_unmap_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0);
+ memory_unmap_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x3fff, 0, 0);
break;
}
}
@@ -69,16 +69,16 @@ static void mem_map_banks(running_machine *machine)
{
case 0:
{
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x5fff, 0, 0, "bank21" );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank22" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x5fff, 0, 0, "bank21" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank22" );
memory_set_bankptr(machine, "bank21", machine->region("maincpu")->base() + 0x4000);
memory_set_bankptr(machine, "bank22", machine->region("maincpu")->base() + 0x4000 + 0x2000);
break;
}
case 1:
{
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x5fff, 0, 0, "bank21" );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank22" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x5fff, 0, 0, "bank21" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank22" );
memory_set_bankptr(machine, "bank21", machine->region("game")->base() + state->mem_banks[0]*0x2000);
memory_set_bankptr(machine, "bank22", machine->region("game")->base() + state->mem_banks[1]*0x2000);
break;
@@ -86,7 +86,7 @@ static void mem_map_banks(running_machine *machine)
case 2:
case 3:
{
- memory_unmap_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0);
+ memory_unmap_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x7fff, 0, 0);
break;
}
}
@@ -97,8 +97,8 @@ static void mem_map_banks(running_machine *machine)
{
case 1:
{
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0x9fff, 0, 0, "bank31" );
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa000, 0xbfff, 0, 0, "bank32" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0x9fff, 0, 0, "bank31" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa000, 0xbfff, 0, 0, "bank32" );
memory_set_bankptr(machine, "bank31", machine->region("game")->base() + state->mem_banks[2]*0x2000);
memory_set_bankptr(machine, "bank32", machine->region("game")->base() + state->mem_banks[3]*0x2000);
break;
@@ -107,7 +107,7 @@ static void mem_map_banks(running_machine *machine)
case 2:
case 3:
{
- memory_unmap_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0);
+ memory_unmap_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xbfff, 0, 0);
break;
}
}
@@ -121,12 +121,12 @@ static void mem_map_banks(running_machine *machine)
case 1:
case 2:
{
- memory_unmap_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0);
+ memory_unmap_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc000, 0xffff, 0, 0);
break;
}
case 3:
{
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0, "bank4" );
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc000, 0xffff, 0, 0, "bank4" );
memory_set_bankptr(machine, "bank4", state->main_mem);
break;
}
@@ -159,7 +159,7 @@ static WRITE8_HANDLER(mem_w)
}
-static ADDRESS_MAP_START( program_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( program_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0x5fff) AM_ROMBANK("bank21")
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank22")
@@ -169,7 +169,7 @@ static ADDRESS_MAP_START( program_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_WRITE(mem_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_mem, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_mem, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x98, 0x98) AM_READWRITE( TMS9928A_vram_r, TMS9928A_vram_w )
diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c
index 1d6f4c1a130..912264ee3c1 100644
--- a/src/mame/drivers/pengo.c
+++ b/src/mame/drivers/pengo.c
@@ -111,7 +111,7 @@ static WRITE8_HANDLER( pengo_coin_counter_w )
}
-static ADDRESS_MAP_START( pengo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pengo_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(pacman_videoram_w) AM_BASE_MEMBER(pengo_state, videoram) /* video and color RAM, scratchpad RAM, sprite codes */
AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(pacman_colorram_w) AM_BASE_MEMBER(pengo_state, colorram)
@@ -134,7 +134,7 @@ static ADDRESS_MAP_START( pengo_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jrpacmbl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jrpacmbl_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(jrpacman_videoram_w) AM_BASE_MEMBER(pengo_state, videoram)
AM_RANGE(0x8800, 0x8fef) AM_RAM
@@ -674,7 +674,7 @@ static DRIVER_INIT( 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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x8000);
UINT8 *rom = machine->region("maincpu")->base();
int A;
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index 7be3d9d7a09..9da75435d48 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -730,11 +730,11 @@ GFXDECODE_END
* Memory map information *
*************************/
-static ADDRESS_MAP_START( peplus_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( peplus_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM AM_BASE_MEMBER(peplus_state, program_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( peplus_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( peplus_iomap, AS_IO, 8 )
// Battery-backed RAM (0x1000-0x01fff Extended RAM for Superboards Only)
AM_RANGE(0x0000, 0x1fff) AM_READWRITE(peplus_cmos_r, peplus_cmos_w) AM_SHARE("cmos")
diff --git a/src/mame/drivers/peyper.c b/src/mame/drivers/peyper.c
index 5ca0f8b826b..8ac52f960f9 100644
--- a/src/mame/drivers/peyper.c
+++ b/src/mame/drivers/peyper.c
@@ -10,13 +10,13 @@ public:
: driver_device(machine, config) { }
};
-static ADDRESS_MAP_START( peyper_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( peyper_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x5FFF) AM_ROM
AM_RANGE(0x6000, 0x67FF) AM_RAM //AM_BASE_GENERIC(nvram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( peyper_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( peyper_io, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 429729b3526..894c7a4edc4 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -574,7 +574,7 @@ static WRITE16_HANDLER( pgm_calendar_w )
/*** Memory Maps *************************************************************/
-static ADDRESS_MAP_START( pgm_mem, ADDRESS_SPACE_PROGRAM, 16)
+static ADDRESS_MAP_START( pgm_mem, AS_PROGRAM, 16)
AM_RANGE(0x000000, 0x01ffff) AM_ROM /* BIOS ROM */
AM_RANGE(0x100000, 0x5fffff) AM_ROMBANK("bank1") /* Game ROM */
@@ -604,7 +604,7 @@ static ADDRESS_MAP_START( pgm_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0xc10000, 0xc1ffff) AM_READWRITE(z80_ram_r, z80_ram_w) /* Z80 Program */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( killbld_mem, ADDRESS_SPACE_PROGRAM, 16)
+static ADDRESS_MAP_START( killbld_mem, AS_PROGRAM, 16)
AM_RANGE(0x000000, 0x01ffff) AM_ROM /* BIOS ROM */
AM_RANGE(0x100000, 0x2fffff) AM_ROMBANK("bank1") /* Game ROM */
AM_RANGE(0x300000, 0x303fff) AM_RAM AM_BASE_MEMBER(pgm_state, sharedprotram) // Shared with protection device
@@ -635,7 +635,7 @@ static ADDRESS_MAP_START( killbld_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0xc10000, 0xc1ffff) AM_READWRITE(z80_ram_r, z80_ram_w) /* Z80 Program */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( olds_mem, ADDRESS_SPACE_PROGRAM, 16)
+static ADDRESS_MAP_START( olds_mem, AS_PROGRAM, 16)
AM_RANGE(0x000000, 0x01ffff) AM_ROM /* BIOS ROM */
AM_RANGE(0x100000, 0x3fffff) AM_ROMBANK("bank1") /* Game ROM */
AM_RANGE(0x400000, 0x403fff) AM_RAM AM_BASE_MEMBER(pgm_state, sharedprotram) // Shared with protection device
@@ -666,7 +666,7 @@ static ADDRESS_MAP_START( olds_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0xc10000, 0xc1ffff) AM_READWRITE(z80_ram_r, z80_ram_w) /* Z80 Program */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kov2_mem, ADDRESS_SPACE_PROGRAM, 16)
+static ADDRESS_MAP_START( kov2_mem, AS_PROGRAM, 16)
AM_RANGE(0x000000, 0x01ffff) AM_ROM /* BIOS ROM */
AM_RANGE(0x100000, 0x5fffff) AM_ROMBANK("bank1") /* Game ROM */
@@ -699,7 +699,7 @@ static ADDRESS_MAP_START( kov2_mem, ADDRESS_SPACE_PROGRAM, 16)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cavepgm_mem, ADDRESS_SPACE_PROGRAM, 16)
+static ADDRESS_MAP_START( cavepgm_mem, AS_PROGRAM, 16)
AM_RANGE(0x000000, 0x3fffff) AM_ROM
AM_RANGE(0x700006, 0x700007) AM_WRITENOP // Watchdog?
@@ -725,18 +725,18 @@ static ADDRESS_MAP_START( cavepgm_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0xc10000, 0xc1ffff) AM_READWRITE(z80_ram_r, z80_ram_w) /* Z80 Program */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_RAM AM_BASE_MEMBER(pgm_state, z80_mainram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( z80_io, AS_IO, 8 )
AM_RANGE(0x8000, 0x8003) AM_DEVREADWRITE("ics", ics2115_device::read, ics2115_device::write)
AM_RANGE(0x8100, 0x81ff) AM_READWRITE(soundlatch3_r, z80_l3_w)
AM_RANGE(0x8200, 0x82ff) AM_READWRITE(soundlatch_r, soundlatch_w)
AM_RANGE(0x8400, 0x84ff) AM_READWRITE(soundlatch2_r, soundlatch2_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( arm7_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( arm7_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00003fff) AM_ROM
AM_RANGE(0x08000000, 0x083fffff) AM_ROM AM_REGION("user1", 0)
AM_RANGE(0x10000000, 0x100003ff) AM_RAM
@@ -827,7 +827,7 @@ static WRITE16_HANDLER( kovsh_arm7_ram_w )
COMBINE_DATA(&share16[BYTE_XOR_LE(offset << 1)]);
}
-static ADDRESS_MAP_START( kovsh_mem, ADDRESS_SPACE_PROGRAM, 16)
+static ADDRESS_MAP_START( kovsh_mem, AS_PROGRAM, 16)
AM_RANGE(0x000000, 0x01ffff) AM_ROM /* BIOS ROM */
AM_RANGE(0x100000, 0x4effff) AM_ROMBANK("bank1") /* Game ROM */
@@ -871,7 +871,7 @@ static READ32_HANDLER( kovsh_exrom_r )
return 0x00000000;
}
-static ADDRESS_MAP_START( kovsh_arm7_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( kovsh_arm7_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00003fff) AM_ROM
AM_RANGE(0x08100000, 0x083fffff) AM_READ(kovsh_exrom_r) // unpopulated, returns 0 to keep checksum happy
AM_RANGE(0x10000000, 0x100003ff) AM_RAM // internal ram for asic
@@ -942,7 +942,7 @@ static WRITE16_HANDLER( svg_latch_68k_w )
COMBINE_DATA(&state->kov2_latchdata_68k_w);
}
-static ADDRESS_MAP_START( svg_68k_mem, ADDRESS_SPACE_PROGRAM, 16)
+static ADDRESS_MAP_START( svg_68k_mem, AS_PROGRAM, 16)
AM_RANGE(0x000000, 0x07ffff) AM_ROM /* BIOS ROM */
AM_RANGE(0x100000, 0x1fffff) AM_ROMBANK("bank1") /* Game ROM */
@@ -975,7 +975,7 @@ static ADDRESS_MAP_START( svg_68k_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0x5c0300, 0x5c0301) AM_READWRITE(arm7_latch_68k_r, svg_latch_68k_w) /* ARM7 Latch */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( svg_arm7_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( svg_arm7_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00003fff) AM_ROM
AM_RANGE(0x08000000, 0x087fffff) AM_ROM AM_REGION("user1", 0)
AM_RANGE(0x10000000, 0x100003ff) AM_RAM
@@ -4443,8 +4443,8 @@ static DRIVER_INIT( orlegend )
pgm_state *state = machine->driver_data<pgm_state>();
pgm_basic_init(machine);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xC0400e, 0xC0400f, 0, 0, pgm_asic3_r, pgm_asic3_w);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xC04000, 0xC04001, 0, 0, pgm_asic3_reg_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xC0400e, 0xC0400f, 0, 0, pgm_asic3_r, pgm_asic3_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xC04000, 0xC04001, 0, 0, pgm_asic3_reg_w);
state->asic3_reg = 0;
state->asic3_latch[0] = 0;
@@ -4477,7 +4477,7 @@ static void drgwld2_common_init(running_machine *machine)
select and after failing in the 2nd stage (probably there are other checks
out there).
*/
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd80000, 0xd80003, 0, 0, dw2_d80000_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd80000, 0xd80003, 0, 0, dw2_d80000_r);
}
static DRIVER_INIT( drgw2 )
@@ -4710,8 +4710,8 @@ static DRIVER_INIT( ddp2 )
// should actually be kov2-like, but keep this simulation for now just to demonstrate it. It will need the internal ARM rom to work properly.
ddp2_protram = auto_alloc_array(machine, UINT16, 0x10000);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd00000, 0xd0ffff, 0, 0, ddp2_protram_r, ddp2_protram_w);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd10000, 0xd10001, 0, 0, ddp2_asic27_0xd10000_r, ddp2_asic27_0xd10000_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd00000, 0xd0ffff, 0, 0, ddp2_protram_r, ddp2_protram_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd10000, 0xd10001, 0, 0, ddp2_asic27_0xd10000_r, ddp2_asic27_0xd10000_w);
}
@@ -5112,7 +5112,7 @@ static DRIVER_INIT( killbld )
pgm_basic_init(machine);
pgm_killbld_decrypt(machine);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd40000, 0xd40003, 0, 0, killbld_igs025_prot_r, killbld_igs025_prot_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd40000, 0xd40003, 0, 0, killbld_igs025_prot_r, killbld_igs025_prot_w);
state->kb_cmd = 0;
state->kb_reg = 0;
@@ -5278,7 +5278,7 @@ static DRIVER_INIT( drgw3 )
}
}
*/
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xDA5610, 0xDA5613, 0, 0, drgw3_igs025_prot_r, drgw3_igs025_prot_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xDA5610, 0xDA5613, 0, 0, drgw3_igs025_prot_r, drgw3_igs025_prot_w);
pgm_dw3_decrypt(machine);
}
@@ -5295,11 +5295,11 @@ static DRIVER_INIT( puzzli2 )
pgm_basic_init(machine);
kovsh_latch_init(machine);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x500000, 0x500003, 0, 0, asic28_r, asic28_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x500000, 0x500003, 0, 0, asic28_r, asic28_w);
/* 0x4f0000 - ? is actually ram shared with the protection device,
the protection device provides the region code */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4f0000, 0x4fffff, 0, 0, sango_protram_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4f0000, 0x4fffff, 0, 0, sango_protram_r);
pgm_puzzli2_decrypt(machine);
@@ -5531,8 +5531,8 @@ static DRIVER_INIT( olds )
pgm_state *state = machine->driver_data<pgm_state>();
pgm_basic_init(machine);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xdcb400, 0xdcb403, 0, 0, olds_r, olds_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8178f4, 0x8178f5, 0, 0, olds_prot_swap_r);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xdcb400, 0xdcb403, 0, 0, olds_r, olds_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8178f4, 0x8178f5, 0, 0, olds_prot_swap_r);
state->kb_cmd = 0;
state->kb_reg = 0;
@@ -5796,17 +5796,17 @@ static READ16_HANDLER( ddp3_asic_r )
void install_asic27a_ddp3(running_machine* machine)
{
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x500000, 0x500005, 0, 0, ddp3_asic_r, ddp3_asic_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x500000, 0x500005, 0, 0, ddp3_asic_r, ddp3_asic_w);
}
void install_asic27a_ket(running_machine* machine)
{
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400005, 0, 0, ddp3_asic_r, ddp3_asic_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x400005, 0, 0, ddp3_asic_r, ddp3_asic_w);
}
void install_asic27a_espgal(running_machine* machine)
{
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400005, 0, 0, ddp3_asic_r, ddp3_asic_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x400005, 0, 0, ddp3_asic_r, ddp3_asic_w);
}
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index 03f1f3b0504..0f5048d9fa9 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -38,7 +38,7 @@ Pleiads:
#include "includes/phoenix.h"
-static ADDRESS_MAP_START( phoenix_memory_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( phoenix_memory_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_READ_BANK("bank1") AM_WRITE(phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */
AM_RANGE(0x5000, 0x53ff) AM_WRITE(phoenix_videoreg_w)
@@ -49,7 +49,7 @@ static ADDRESS_MAP_START( phoenix_memory_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7800, 0x7bff) AM_READ_PORT("DSW0") /* DSW */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pleiads_memory_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pleiads_memory_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_READ_BANK("bank1") AM_WRITE(phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */
AM_RANGE(0x5000, 0x53ff) AM_WRITE(pleiads_videoreg_w)
@@ -60,7 +60,7 @@ static ADDRESS_MAP_START( pleiads_memory_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7800, 0x7bff) AM_READ_PORT("DSW0") /* DSW */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( survival_memory_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( survival_memory_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4fff) AM_READ_BANK("bank1") AM_WRITE(phoenix_videoram_w) /* 2 pages selected by bit 0 of the video register */
AM_RANGE(0x5000, 0x53ff) AM_WRITE(phoenix_videoreg_w)
@@ -1056,7 +1056,7 @@ ROM_END
static DRIVER_INIT( condor )
{
/* additional inputs for coinage */
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5000, 0x5000, 0, 0, "DSW1");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5000, 0x5000, 0, 0, "DSW1");
}
diff --git a/src/mame/drivers/photon.c b/src/mame/drivers/photon.c
index ee2f211a34c..a0cc9fb7928 100644
--- a/src/mame/drivers/photon.c
+++ b/src/mame/drivers/photon.c
@@ -139,7 +139,7 @@ static I8255A_INTERFACE( pk8000_ppi8255_interface_2 )
DEVCB_HANDLER(pk8000_84_portc_w)
};
-static ADDRESS_MAP_START(pk8000_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START(pk8000_mem, AS_PROGRAM, 8)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE( 0x0000, 0x3fff ) AM_READ_BANK("bank1") AM_WRITE_BANK("bank5")
AM_RANGE( 0x4000, 0x7fff ) AM_READ_BANK("bank2") AM_WRITE_BANK("bank6")
@@ -147,7 +147,7 @@ static ADDRESS_MAP_START(pk8000_mem, ADDRESS_SPACE_PROGRAM, 8)
AM_RANGE( 0xc000, 0xffff ) AM_READ_BANK("bank4") AM_WRITE_BANK("bank8")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pk8000_io , ADDRESS_SPACE_IO, 8)
+static ADDRESS_MAP_START( pk8000_io , AS_IO, 8)
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("ppi8255_1", i8255a_r, i8255a_w)
AM_RANGE(0x84, 0x87) AM_DEVREADWRITE("ppi8255_2", i8255a_r, i8255a_w)
diff --git a/src/mame/drivers/photon2.c b/src/mame/drivers/photon2.c
index e50a9e9015d..17f9a568828 100644
--- a/src/mame/drivers/photon2.c
+++ b/src/mame/drivers/photon2.c
@@ -216,13 +216,13 @@ static WRITE8_HANDLER(photon2_misc_w)
*
*************************************/
-static ADDRESS_MAP_START (spectrum_mem, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START (spectrum_mem, AS_PROGRAM, 8)
AM_RANGE(0x0000, 0x3fff) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0x5aff) AM_RAM AM_BASE_MEMBER(photon2_state, spectrum_video_ram )
AM_RANGE(0x5b00, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START (spectrum_io, ADDRESS_SPACE_IO, 8)
+static ADDRESS_MAP_START (spectrum_io, AS_IO, 8)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x1f, 0x1f) AM_READ_PORT("JOY")
AM_RANGE(0x5b, 0x5b) AM_READ_PORT("COIN") AM_WRITE(photon2_misc_w)
diff --git a/src/mame/drivers/photoply.c b/src/mame/drivers/photoply.c
index 2dc7afbe5cd..7aa92336eb2 100644
--- a/src/mame/drivers/photoply.c
+++ b/src/mame/drivers/photoply.c
@@ -304,7 +304,7 @@ static const struct pit8253_config at_pit8254_config =
}
};
-static ADDRESS_MAP_START( photoply_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( photoply_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0x000a0000, 0x000bffff) AM_RAM AM_BASE_MEMBER(photoply_state, vga_vram)
AM_RANGE(0x000c0000, 0x000c7fff) AM_RAM AM_REGION("video_bios", 0) //???
@@ -370,7 +370,7 @@ static WRITE32_HANDLER( vga_regs_w )
}
}
-static ADDRESS_MAP_START( photoply_io, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( photoply_io, AS_IO, 32 )
AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8("dma8237_1", i8237_r, i8237_w, 0xffffffff)
AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_1", pic8259_r, pic8259_w, 0xffffffff)
AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8("pit8254", pit8253_r, pit8253_w, 0xffffffff)
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index baaba69bfe1..7ac709f40d9 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -89,7 +89,7 @@ static INTERRUPT_GEN( pingpong_interrupt )
}
}
-static ADDRESS_MAP_START( pingpong_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pingpong_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(pingpong_colorram_w) AM_BASE_MEMBER(pingpong_state, colorram)
AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(pingpong_videoram_w) AM_BASE_MEMBER(pingpong_state, videoram)
@@ -106,7 +106,7 @@ static ADDRESS_MAP_START( pingpong_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa600, 0xa600) AM_WRITE(watchdog_reset_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( merlinmm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( merlinmm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x5000, 0x53ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x5400, 0x57ff) AM_RAM
@@ -591,18 +591,18 @@ static DRIVER_INIT( cashquiz )
ROM[i] = BITSWAP8(ROM[i],0,1,2,3,4,5,6,7);
/* questions banking handlers */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x4000, 0, 0, cashquiz_question_bank_high_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4001, 0x4001, 0, 0, cashquiz_question_bank_low_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x4000, 0, 0, cashquiz_question_bank_high_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4001, 0x4001, 0, 0, cashquiz_question_bank_low_w);
// 8 independents banks for questions
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5000, 0x50ff, 0, 0, "bank1");
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5100, 0x51ff, 0, 0, "bank2");
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5200, 0x52ff, 0, 0, "bank3");
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5300, 0x53ff, 0, 0, "bank4");
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5400, 0x54ff, 0, 0, "bank5");
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5500, 0x55ff, 0, 0, "bank6");
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5600, 0x56ff, 0, 0, "bank7");
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5700, 0x57ff, 0, 0, "bank8");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5000, 0x50ff, 0, 0, "bank1");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5100, 0x51ff, 0, 0, "bank2");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5200, 0x52ff, 0, 0, "bank3");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5300, 0x53ff, 0, 0, "bank4");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5400, 0x54ff, 0, 0, "bank5");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5500, 0x55ff, 0, 0, "bank6");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5600, 0x56ff, 0, 0, "bank7");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5700, 0x57ff, 0, 0, "bank8");
// setup default banks
memory_set_bankptr(machine, "bank1", machine->region("user1")->base() + 0x100*0 );
diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c
index d5f306a0812..d1f26165965 100644
--- a/src/mame/drivers/pinkiri8.c
+++ b/src/mame/drivers/pinkiri8.c
@@ -58,7 +58,7 @@ public:
};
-static ADDRESS_MAP_START( janshi_vdp_map8, 0, 8 )
+static ADDRESS_MAP_START( janshi_vdp_map8, AS_0, 8 )
AM_RANGE(0xfc0000, 0xfc1fff) AM_RAM AM_BASE_MEMBER(pinkiri8_state, janshi_back_vram) // bg tilemap?
AM_RANGE(0xfc2000, 0xfc2fff) AM_RAM AM_BASE_MEMBER(pinkiri8_state, janshi_vram1) // xpos, colour, tile number etc.
@@ -90,7 +90,7 @@ public:
protected:
virtual void device_config_complete();
virtual bool device_validity_check(emu_options &options, const game_driver &driver) const;
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
address_space_config m_space_config;
};
@@ -138,7 +138,7 @@ bool janshi_vdp_device_config::device_validity_check(emu_options &options, const
return error;
}
-const address_space_config *janshi_vdp_device_config::memory_space_config(int spacenum) const
+const address_space_config *janshi_vdp_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == 0) ? &m_space_config : NULL;
}
@@ -407,7 +407,7 @@ static SCREEN_UPDATE( pinkiri8 )
return 0;
}
-static ADDRESS_MAP_START( pinkiri8_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pinkiri8_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x0bfff) AM_ROM
AM_RANGE(0x0c000, 0x0dfff) AM_RAM
AM_RANGE(0x0e000, 0x0ffff) AM_ROM
@@ -495,7 +495,7 @@ static READ8_HANDLER( mux_p1_r )
return 0xff;
}
-static ADDRESS_MAP_START( pinkiri8_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pinkiri8_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x3f) AM_RAM //Z180 internal I/O
AM_RANGE(0x60, 0x60) AM_WRITE(output_regs_w)
@@ -1250,9 +1250,9 @@ static READ8_HANDLER( ronjan_patched_prot_r )
static DRIVER_INIT( ronjan )
{
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x90, 0x90, 0, 0, ronjan_prot_r, ronjan_prot_w);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x66, 0x66, 0, 0, ronjan_prot_status_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x9f, 0x9f, 0, 0, ronjan_patched_prot_r);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x90, 0x90, 0, 0, ronjan_prot_r, ronjan_prot_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x66, 0x66, 0, 0, ronjan_prot_status_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x9f, 0x9f, 0, 0, ronjan_patched_prot_r);
}
GAME( 1992, janshi, 0, pinkiri8, janshi, 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 555dedf5d8e..6b5bfaceb24 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -263,7 +263,7 @@ static READ8_HANDLER( sound_command_r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1")
@@ -272,7 +272,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_WRITE(fromance_crtc_data_w)
AM_RANGE(0x11, 0x11) AM_WRITE(fromance_crtc_register_w)
@@ -293,14 +293,14 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x04, 0x04) AM_WRITE(sound_bankswitch_w)
AM_RANGE(0x16, 0x16) AM_READ(sound_command_r)
@@ -309,7 +309,7 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hatris_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hatris_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_MIRROR(0x08) AM_DEVREADWRITE("ymsnd", ym2608_r, ym2608_w)
AM_RANGE(0x04, 0x04) AM_READ(sound_command_r)
@@ -882,14 +882,14 @@ static DRIVER_INIT( pipedrm )
/* sprite RAM lives at the end of palette RAM */
state->spriteram = &machine->generic.paletteram.u8[0xc00];
state->spriteram_size = 0x400;
- memory_install_ram(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xcc00, 0xcfff, 0, 0, state->spriteram);
+ memory_install_ram(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xcc00, 0xcfff, 0, 0, state->spriteram);
}
static DRIVER_INIT( hatris )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x20, 0x20, 0, 0, sound_command_nonmi_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x21, 0x21, 0, 0, fromance_gfxreg_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x20, 0x20, 0, 0, sound_command_nonmi_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x21, 0x21, 0, 0, fromance_gfxreg_w);
}
diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c
index 40c5bc5fcab..f80937d779c 100644
--- a/src/mame/drivers/pipeline.c
+++ b/src/mame/drivers/pipeline.c
@@ -183,7 +183,7 @@ static WRITE8_DEVICE_HANDLER(protection_w)
device->machine->scheduler().boost_interleave(attotime::zero, attotime::from_usec(100));
}
-static ADDRESS_MAP_START( cpu0_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu0_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x97ff) AM_RAM_WRITE(vram1_w) AM_BASE_MEMBER(pipeline_state, vram1)
@@ -194,13 +194,13 @@ static ADDRESS_MAP_START( cpu0_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb840, 0xb840) AM_NOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu1_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu1_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ppi8255_2", ppi8255_r, ppi8255_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_port, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_port, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ctc", z80ctc_r, z80ctc_w)
AM_RANGE(0x06, 0x07) AM_NOP
@@ -224,7 +224,7 @@ static WRITE8_HANDLER(mcu_ddrA_w)
state->ddrA=data;
}
-static ADDRESS_MAP_START( mcu_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_READ(mcu_portA_r) AM_WRITE(mcu_portA_w)
AM_RANGE(0x0004, 0x0004) AM_WRITE(mcu_ddrA_w)
AM_RANGE(0x0010, 0x007f) AM_RAM
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index c379b3e8b3e..e136ea8e4d6 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -162,7 +162,7 @@ static CUSTOM_INPUT( prot_r )
/* Memory Maps */
-static ADDRESS_MAP_START( pirates_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pirates_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // main ram
AM_RANGE(0x300000, 0x300001) AM_READ_PORT("INPUTS")
@@ -461,7 +461,7 @@ static DRIVER_INIT( genix )
/* If this value is increased then something has gone wrong and the protection failed */
/* Write-protect it for now */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x109e98, 0x109e9b, 0, 0, genix_prot_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x109e98, 0x109e9b, 0, 0, genix_prot_r );
}
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index 7a8fa970375..49abd250a5a 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -92,7 +92,7 @@ static WRITE8_HANDLER(pitnrun_vflip_w)
flip_screen_y_set(space->machine, data);
}
-static ADDRESS_MAP_START( pitnrun_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pitnrun_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(pitnrun_videoram_w) AM_BASE_MEMBER(pitnrun_state, videoram)
@@ -118,12 +118,12 @@ static ADDRESS_MAP_START( pitnrun_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf000) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pitnrun_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pitnrun_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3800, 0x3bff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pitnrun_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pitnrun_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(soundlatch_clear_w)
AM_RANGE(0x8c, 0x8d) AM_DEVWRITE("ay2", ay8910_address_data_w)
@@ -134,7 +134,7 @@ static ADDRESS_MAP_START( pitnrun_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x98, 0x98) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pitnrun_mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pitnrun_mcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(pitnrun_68705_portA_r,pitnrun_68705_portA_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(pitnrun_68705_portB_r,pitnrun_68705_portB_w)
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index 34edecc0e21..234c33aed73 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -94,7 +94,7 @@ static WRITE16_HANDLER( pkscramble_output_w )
coin_counter_w(space->machine, 0, data & 0x80);
}
-static ADDRESS_MAP_START( pkscramble_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pkscramble_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0x7ffff)
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x040000, 0x0400ff) AM_RAM AM_SHARE("nvram")
diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c
index 1c927aa91eb..77e7c19485a 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -71,7 +71,7 @@ static WRITE16_DEVICE_HANDLER(pktgaldx_oki_bank_w)
/**********************************************************************************/
-static ADDRESS_MAP_START( pktgaldx_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pktgaldx_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE("tilegen1", deco16ic_pf1_data_r, deco16ic_pf1_data_w)
@@ -120,7 +120,7 @@ cpu #0 (PC=0000923C): unmapped program memory word read from 00167DB2 & 00FF
/* do the 300000 addresses somehow interact with the protection addresses on this bootleg? */
/* or maybe protection writes go to sound ... */
-static ADDRESS_MAP_START( pktgaldb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pktgaldb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM AM_BASE_MEMBER(pktgaldx_state, pktgaldb_fgram) // fgram on original?
AM_RANGE(0x102000, 0x102fff) AM_RAM // bgram on original?
diff --git a/src/mame/drivers/play_1.c b/src/mame/drivers/play_1.c
index 025a9ebd119..69e9a5d81e0 100644
--- a/src/mame/drivers/play_1.c
+++ b/src/mame/drivers/play_1.c
@@ -13,7 +13,7 @@ public:
: driver_device(machine, config) { }
};
-static ADDRESS_MAP_START( play_1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( play_1_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/play_2.c b/src/mame/drivers/play_2.c
index e84a467d3d3..0a54c880e18 100644
--- a/src/mame/drivers/play_2.c
+++ b/src/mame/drivers/play_2.c
@@ -13,7 +13,7 @@ public:
: driver_device(machine, config) { }
};
-static ADDRESS_MAP_START( play_2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( play_2_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/play_3.c b/src/mame/drivers/play_3.c
index 103f4e322db..9d776d8746f 100644
--- a/src/mame/drivers/play_3.c
+++ b/src/mame/drivers/play_3.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( play_3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( play_3_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/play_5.c b/src/mame/drivers/play_5.c
index dde46f46349..2899e5d80a4 100644
--- a/src/mame/drivers/play_5.c
+++ b/src/mame/drivers/play_5.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( play_5_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( play_5_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index 29bffc36a9d..c7e65255177 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -368,7 +368,7 @@ static WRITE8_DEVICE_HANDLER( psg_4017_w )
/******************************************************************************/
/* BIOS */
-static ADDRESS_MAP_START( bios_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bios_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM // 8V
AM_RANGE(0x8800, 0x8fff) AM_READWRITE(ram_8w_r, ram_8w_w) AM_BASE_MEMBER(playch10_state, ram_8w) // 8W
@@ -377,7 +377,7 @@ static ADDRESS_MAP_START( bios_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_READWRITE(pc10_prot_r, pc10_prot_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bios_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bios_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("BIOS") AM_WRITE(pc10_SDCS_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("SW1") AM_WRITE(pc10_CNTRLMASK_w)
@@ -394,7 +394,7 @@ static ADDRESS_MAP_START( bios_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x10, 0x13) AM_WRITE(time_w) AM_BASE_MEMBER(playch10_state, timedata)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cart_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cart_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_MIRROR(0x1800) AM_BASE_MEMBER(playch10_state, work_ram)
AM_RANGE(0x2000, 0x3fff) AM_DEVREADWRITE("ppu", ppu2c0x_r, ppu2c0x_w)
AM_RANGE(0x4011, 0x4011) AM_DEVWRITE("dac", dac_w)
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index 2b23b6e65d6..6ca0bf0e2b0 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -188,7 +188,7 @@ static WRITE8_HANDLER( playmark_oki_w )
static WRITE8_HANDLER( playmark_snd_control_w )
{
playmark_state *state = space->machine->driver_data<playmark_state>();
-// address_space *space = device->machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+// address_space *space = device->machine->device("audiocpu")->memory().space(AS_PROGRAM);
/* This port controls communications to and from the 68K, and the OKI
device.
@@ -222,7 +222,7 @@ static READ8_HANDLER( PIC16C5X_T0_clk_r )
/***************************** 68000 Memory Maps ****************************/
-static ADDRESS_MAP_START( bigtwin_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bigtwin_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x304000, 0x304001) AM_NOP /* watchdog? irq ack? */
AM_RANGE(0x440000, 0x4403ff) AM_RAM AM_BASE_SIZE_MEMBER(playmark_state, spriteram, spriteram_size)
@@ -246,7 +246,7 @@ static ADDRESS_MAP_START( bigtwin_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bigtwinb_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bigtwinb_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(hrdtimes_bgvideoram_w) AM_BASE_MEMBER(playmark_state, videoram3)
AM_RANGE(0x104000, 0x107fff) AM_RAM_WRITE(hrdtimes_fgvideoram_w) AM_BASE_MEMBER(playmark_state, videoram2)
@@ -265,7 +265,7 @@ static ADDRESS_MAP_START( bigtwinb_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wbeachvl_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wbeachvl_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE_SIZE_MEMBER(playmark_state, spriteram, spriteram_size)
AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(wbeachvl_bgvideoram_w) AM_BASE_MEMBER(playmark_state, videoram3)
@@ -287,7 +287,7 @@ static ADDRESS_MAP_START( wbeachvl_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( excelsr_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( excelsr_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x2fffff) AM_ROM
AM_RANGE(0x304000, 0x304001) AM_WRITENOP /* watchdog? irq ack? */
AM_RANGE(0x440000, 0x440cff) AM_RAM AM_BASE_SIZE_MEMBER(playmark_state, spriteram, spriteram_size)
@@ -307,7 +307,7 @@ static ADDRESS_MAP_START( excelsr_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hotmind_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hotmind_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(hrdtimes_bgvideoram_w) AM_BASE_MEMBER(playmark_state, videoram3)
AM_RANGE(0x104000, 0x107fff) AM_RAM_WRITE(hrdtimes_fgvideoram_w) AM_BASE_MEMBER(playmark_state, videoram2)
@@ -325,7 +325,7 @@ static ADDRESS_MAP_START( hotmind_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff0000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hrdtimes_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hrdtimes_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x0bffff) AM_RAM
AM_RANGE(0x0c0000, 0x0fffff) AM_ROM AM_REGION("maincpu", 0x0c0000)
@@ -353,7 +353,7 @@ ADDRESS_MAP_END
/* $000 - 7FF PIC16C57 Internal Program ROM. Note: code is 12bits wide */
/* $000 - 07F PIC16C57 Internal Data RAM */
-static ADDRESS_MAP_START( playmark_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( playmark_sound_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_DEVWRITE("oki", playmark_oki_banking_w)
AM_RANGE(0x01, 0x01) AM_READWRITE(playmark_snd_command_r, playmark_oki_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(playmark_snd_flag_r, playmark_snd_control_w)
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 82869d37213..d20e941639c 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -512,7 +512,7 @@ static WRITE16_HANDLER( dsp56k_ram_bank04_write )
/**********************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x21ffff) AM_RAM_WRITE(plygonet_palette_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x400000, 0x40001f) AM_DEVREADWRITE16("k053936", k053936_ctrl_r, k053936_ctrl_w, 0xffffffff)
@@ -537,13 +537,13 @@ ADDRESS_MAP_END
/**********************************************************************************/
-static ADDRESS_MAP_START( dsp_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dsp_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x7000, 0x7fff) AM_RAM AM_BASE_MEMBER(polygonet_state, dsp56k_p_mirror) /* Unsure of size, but 0x1000 matches bank01 */
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_MEMBER(polygonet_state, dsp56k_p_8000)
AM_RANGE(0xc000, 0xc000) AM_READ(dsp56k_bootload_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dsp_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( dsp_data_map, AS_DATA, 16 )
AM_RANGE(0x0800, 0x5fff) AM_RAM /* Appears to not be affected by banking? */
AM_RANGE(0x6000, 0x6fff) AM_READWRITE(dsp56k_ram_bank00_read, dsp56k_ram_bank00_write)
AM_RANGE(0x7000, 0x7fff) AM_READWRITE(dsp56k_ram_bank01_read, dsp56k_ram_bank01_write) /* Mirrored in program space @ 0x7000 */
@@ -572,7 +572,7 @@ static INTERRUPT_GEN(audio_interrupt)
device_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
AM_RANGE(0x0000, 0xbfff) AM_WRITENOP
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index 01c7643d40e..847deca4f12 100644
--- a/src/mame/drivers/pntnpuzl.c
+++ b/src/mame/drivers/pntnpuzl.c
@@ -389,7 +389,7 @@ static READ16_HANDLER( pntnpuzl_28001a_r )
-static ADDRESS_MAP_START( pntnpuzl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pntnpuzl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080001) AM_READNOP //|
AM_RANGE(0x100000, 0x100001) AM_READNOP //| irq lines clear
diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c
index 1d53a2236a4..30a14ce69e3 100644
--- a/src/mame/drivers/pokechmp.c
+++ b/src/mame/drivers/pokechmp.c
@@ -105,7 +105,7 @@ static WRITE8_HANDLER( pokechmp_paletteram_w )
}
-static ADDRESS_MAP_START( pokechmp_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pokechmp_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE(pokechmp_videoram_w) AM_BASE_MEMBER(pokechmp_state, videoram)
AM_RANGE(0x1000, 0x11ff) AM_RAM AM_BASE_SIZE_MEMBER(pokechmp_state, spriteram, spriteram_size)
@@ -129,7 +129,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( pokechmp_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pokechmp_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3812_w)
diff --git a/src/mame/drivers/poker72.c b/src/mame/drivers/poker72.c
index 49018086636..9a461444033 100644
--- a/src/mame/drivers/poker72.c
+++ b/src/mame/drivers/poker72.c
@@ -92,7 +92,7 @@ static WRITE8_HANDLER( tile_bank_w )
state->tile_bank = (data & 4) >> 2;
}
-static ADDRESS_MAP_START( poker72_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( poker72_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM //work ram
AM_RANGE(0xe000, 0xefff) AM_RAM AM_BASE_MEMBER(poker72_state, vram)
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index c6f86dc6472..71f1f8c306b 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -458,7 +458,7 @@ static const namco_53xx_interface namco_53xx_intf =
static MACHINE_RESET( polepos )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int i;
/* Reset all latches */
@@ -476,7 +476,7 @@ static MACHINE_RESET( polepos )
* CPU memory structures
*********************************************************************/
-static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x37ff) AM_MIRROR(0x0800) AM_RAM AM_SHARE("nvram") /* Battery Backup */
AM_RANGE(0x4000, 0x47ff) AM_READWRITE(polepos_sprite_r, polepos_sprite_w) /* Motion Object */
@@ -497,14 +497,14 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa300, 0xa300) AM_MIRROR(0x0cff) AM_DEVWRITE("polepos", polepos_engine_sound_msb_w) /* Car Sound ( Upper Nibble ) */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( z80_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(polepos_adc_r) AM_WRITENOP
ADDRESS_MAP_END
/* the same memory map is used by both Z8002 CPUs; all RAM areas are shared */
-static ADDRESS_MAP_START( z8002_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( z8002_map, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x6000, 0x6001) AM_MIRROR(0x1ffe) AM_WRITE(polepos_z8002_nvi_enable_w) /* NVI enable - *NOT* shared by the two CPUs */
AM_RANGE(0x8000, 0x8fff) AM_READWRITE(polepos_sprite16_r, polepos_sprite16_w) AM_BASE_MEMBER(polepos_state, sprite16_memory) /* Motion Object */
@@ -1007,12 +1007,12 @@ static MACHINE_CONFIG_START( topracern, polepos_state )
MACHINE_CONFIG_END
-static ADDRESS_MAP_START( sound_z80_bootleg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_z80_bootleg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2700, 0x27ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_z80_bootleg_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_z80_bootleg_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
@@ -1986,15 +1986,15 @@ ROM_END
static DRIVER_INIT( topracern )
{
/* extra direct mapped inputs read */
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x02, 0x02, 0, 0, "STEER");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x03, 0x03, 0, 0, "IN0");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x04, 0x04, 0, 0, "DSWA");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_IO), 0x02, 0x02, 0, 0, "STEER");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_IO), 0x03, 0x03, 0, 0, "IN0");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_IO), 0x04, 0x04, 0, 0, "DSWA");
}
static DRIVER_INIT( polepos2 )
{
/* note that the bootleg version doesn't need this custom IC; it has a hacked ROM in its place */
- memory_install_read16_handler(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x5fff, 0, 0, polepos2_ic25_r);
+ memory_install_read16_handler(machine->device("sub")->memory().space(AS_PROGRAM), 0x4000, 0x5fff, 0, 0, polepos2_ic25_r);
}
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index 825c86f4ab3..efc6322142e 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -254,7 +254,7 @@ static const eeprom_interface eeprom_interface_policetr =
*
*************************************/
-static ADDRESS_MAP_START( policetr_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( policetr_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0001ffff) AM_RAM AM_BASE_MEMBER(policetr_state, rambase)
AM_RANGE(0x00200000, 0x0020000f) AM_WRITE(policetr_video_w)
AM_RANGE(0x00400000, 0x00400003) AM_READ(policetr_video_r)
@@ -273,7 +273,7 @@ static ADDRESS_MAP_START( policetr_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sshooter_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( sshooter_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0001ffff) AM_RAM AM_BASE_MEMBER(policetr_state, rambase)
AM_RANGE(0x00200000, 0x00200003) AM_WRITE(policetr_bsmt2000_data_w)
AM_RANGE(0x00300000, 0x00300003) AM_WRITE(policetr_palette_offset_w)
@@ -679,14 +679,14 @@ ROM_END
static DRIVER_INIT( policetr )
{
policetr_state *state = machine->driver_data<policetr_state>();
- state->speedup_data = memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00000fc8, 0x00000fcb, 0, 0, speedup_w);
+ state->speedup_data = memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00000fc8, 0x00000fcb, 0, 0, speedup_w);
state->speedup_pc = 0x1fc028ac;
}
static DRIVER_INIT( plctr13b )
{
policetr_state *state = machine->driver_data<policetr_state>();
- state->speedup_data = memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00000fc8, 0x00000fcb, 0, 0, speedup_w);
+ state->speedup_data = memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00000fc8, 0x00000fcb, 0, 0, speedup_w);
state->speedup_pc = 0x1fc028bc;
}
@@ -694,14 +694,14 @@ static DRIVER_INIT( plctr13b )
static DRIVER_INIT( sshooter )
{
policetr_state *state = machine->driver_data<policetr_state>();
- state->speedup_data = memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00018fd8, 0x00018fdb, 0, 0, speedup_w);
+ state->speedup_data = memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00018fd8, 0x00018fdb, 0, 0, speedup_w);
state->speedup_pc = 0x1fc03470;
}
static DRIVER_INIT( sshoot12 )
{
policetr_state *state = machine->driver_data<policetr_state>();
- state->speedup_data = memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00018fd8, 0x00018fdb, 0, 0, speedup_w);
+ state->speedup_data = memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00018fd8, 0x00018fdb, 0, 0, speedup_w);
state->speedup_pc = 0x1fc033e0;
}
diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c
index 2011edd3367..2d5f8dc7f3b 100644
--- a/src/mame/drivers/polyplay.c
+++ b/src/mame/drivers/polyplay.c
@@ -142,7 +142,7 @@ static INTERRUPT_GEN( coin_interrupt )
/* memory mapping */
-static ADDRESS_MAP_START( polyplay_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( polyplay_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0bff) AM_ROM
AM_RANGE(0x0c00, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x8fff) AM_ROM
@@ -153,7 +153,7 @@ ADDRESS_MAP_END
/* port mapping */
-static ADDRESS_MAP_START( polyplay_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( polyplay_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x80, 0x81) AM_WRITE(polyplay_sound_channel)
AM_RANGE(0x82, 0x82) AM_WRITE(polyplay_start_timer2)
diff --git a/src/mame/drivers/poo.c b/src/mame/drivers/poo.c
index 5cf9df037b8..af7aff5f2a1 100644
--- a/src/mame/drivers/poo.c
+++ b/src/mame/drivers/poo.c
@@ -146,7 +146,7 @@ static WRITE8_HANDLER( poo_vregs_w )
state->vram_colbank = data & 0x18;
}
-static ADDRESS_MAP_START( unclepoo_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( unclepoo_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_WRITENOP
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x97ff) AM_RAM
@@ -169,19 +169,19 @@ static ADDRESS_MAP_START( unclepoo_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( unclepoo_main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( unclepoo_main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( unclepoo_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( unclepoo_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_WRITENOP /* R/C filter ??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( unclepoo_sub_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( unclepoo_sub_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("ay", ay8910_r, ay8910_data_w)
AM_RANGE(0x80, 0x80) AM_DEVWRITE("ay", ay8910_address_w)
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index c66ae63d335..85fa61f6047 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -99,7 +99,7 @@ static READ8_HANDLER( poolshrk_irq_reset_r )
}
-static ADDRESS_MAP_START( poolshrk_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( poolshrk_cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x00ff) AM_MIRROR(0x2300) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_MIRROR(0x2000) AM_WRITEONLY AM_BASE_MEMBER(poolshrk_state, playfield_ram)
diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c
index 0892c64d2dd..a5d4a3b80e3 100644
--- a/src/mame/drivers/pooyan.c
+++ b/src/mame/drivers/pooyan.c
@@ -48,7 +48,7 @@ static WRITE8_HANDLER( irq_enable_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(pooyan_colorram_w) AM_BASE_MEMBER(pooyan_state, colorram)
AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(pooyan_videoram_w) AM_BASE_MEMBER(pooyan_state, videoram)
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index c712752458e..72739186f4f 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -64,7 +64,7 @@ static WRITE8_HANDLER( protection_w )
-static ADDRESS_MAP_START( skyskipr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( skyskipr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8c00, 0x8c02) AM_RAM AM_BASE_MEMBER(popeye_state, background_pos)
@@ -77,7 +77,7 @@ static ADDRESS_MAP_START( skyskipr_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe001) AM_READWRITE(protection_r,protection_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( popeye_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( popeye_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8bff) AM_RAM
@@ -91,7 +91,7 @@ static ADDRESS_MAP_START( popeye_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe001) AM_READWRITE(protection_r,protection_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( popeyebl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( popeyebl_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8c00, 0x8c02) AM_RAM AM_BASE_MEMBER(popeye_state, background_pos)
@@ -104,7 +104,7 @@ static ADDRESS_MAP_START( popeyebl_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe01f) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( popeye_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( popeye_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index b41d3d4a760..5ff78d70b88 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -152,7 +152,7 @@ static READ8_HANDLER( popper_soundcpu_nmi_r )
*
*************************************/
-static ADDRESS_MAP_START( popper_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( popper_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0xc000, 0xc1bf) AM_RAM
AM_RANGE(0xc1c0, 0xc1ff) AM_RAM_WRITE(popper_ol_videoram_w) AM_BASE_MEMBER(popper_state, ol_videoram)
@@ -175,7 +175,7 @@ static ADDRESS_MAP_START( popper_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xffff, 0xffff) AM_READNOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( popper_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( popper_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x8002, 0x8002) AM_READNOP //?? all read once at startup and the
diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c
index 334bb87d875..b27a36d899e 100644
--- a/src/mame/drivers/portrait.c
+++ b/src/mame/drivers/portrait.c
@@ -118,7 +118,7 @@ static WRITE8_HANDLER( portrait_negative_scroll_w )
state->scroll = - (data ^ 0xff);
}
-static ADDRESS_MAP_START( portrait_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( portrait_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(portrait_bgvideo_write) AM_BASE_MEMBER(portrait_state, bgvideoram)
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(portrait_fgvideo_write) AM_BASE_MEMBER(portrait_state, fgvideoram)
@@ -137,7 +137,7 @@ static ADDRESS_MAP_START( portrait_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( portrait_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( portrait_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 730cfc27dab..88d64ffeebb 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -74,7 +74,7 @@ static WRITE16_DEVICE_HANDLER( oki_banking )
}
}
-static ADDRESS_MAP_START( magicstk_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( magicstk_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x088000, 0x0883ff) AM_RAM_WRITE(bigtwin_paletteram_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x094000, 0x094001) AM_WRITENOP
@@ -93,7 +93,7 @@ static ADDRESS_MAP_START( magicstk_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x100000, 0x100fff) AM_RAM AM_BASE_SIZE_MEMBER(playmark_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( powerbal_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( powerbal_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x088000, 0x0883ff) AM_RAM_WRITE(bigtwin_paletteram_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x094000, 0x094001) AM_WRITENOP
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index 2d7a4cb3ba0..5600bc8eba0 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -72,7 +72,7 @@ static READ8_HANDLER( powerinb_fake_ym2203_r )
}
-static ADDRESS_MAP_START( powerins_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( powerins_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("P1_P2")
@@ -92,7 +92,7 @@ static ADDRESS_MAP_START( powerins_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* powerina: same as the original one but without the sound cpu (and inferior sound HW) */
-static ADDRESS_MAP_START( powerina_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( powerina_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("P1_P2")
@@ -112,7 +112,7 @@ static ADDRESS_MAP_START( powerina_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x180000, 0x18ffff) AM_RAM AM_BASE_MEMBER(powerins_state, spriteram) // RAM + Sprites
ADDRESS_MAP_END
-static ADDRESS_MAP_START( powerins_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( powerins_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
@@ -120,7 +120,7 @@ static ADDRESS_MAP_START( powerins_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
// AM_RANGE(0xe001, 0xe001) AM_WRITENOP // ?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( powerins_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( powerins_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym2203", ym2203_r, ym2203_w)
AM_RANGE(0x80, 0x80) AM_DEVREADWRITE_MODERN("oki1", okim6295_device, read, write)
@@ -128,7 +128,7 @@ static ADDRESS_MAP_START( powerins_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x90, 0x97) AM_DEVWRITE("nmk112", nmk112_okibank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( powerinb_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( powerinb_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(powerinb_fake_ym2203_r) AM_WRITENOP
AM_RANGE(0x01, 0x01) AM_NOP
diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c
index 798a13a6e20..9a88bbbc7e0 100644
--- a/src/mame/drivers/ppmast93.c
+++ b/src/mame/drivers/ppmast93.c
@@ -177,7 +177,7 @@ static WRITE8_HANDLER( ppmast93_port4_w )
memory_set_bankptr(space->machine, "bank1",&rom[0x10000+(bank*0x4000)]);
}
-static ADDRESS_MAP_START( ppmast93_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ppmast93_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM AM_WRITENOP AM_REGION("maincpu", 0x10000)
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(ppmast93_bgram_w) AM_BASE_MEMBER(ppmast93_state, bgram) AM_SHARE("share1")
@@ -186,7 +186,7 @@ static ADDRESS_MAP_START( ppmast93_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ppmast93_cpu1_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ppmast93_cpu1_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
AM_RANGE(0x02, 0x02) AM_READ_PORT("P2")
@@ -198,7 +198,7 @@ static ADDRESS_MAP_START( ppmast93_cpu1_io, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x04, 0x04) AM_WRITE(ppmast93_port4_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ppmast93_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ppmast93_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xfbff) AM_ROM AM_REGION("sub", 0x10000)
AM_RANGE(0xfc00, 0xfc00) AM_READ(soundlatch_r)
AM_RANGE(0xfd00, 0xffff) AM_RAM
@@ -216,7 +216,7 @@ static WRITE8_HANDLER(ppmast_sound_w)
}
}
-static ADDRESS_MAP_START( ppmast93_cpu2_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ppmast93_cpu2_io, AS_IO, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM AM_WRITE(ppmast_sound_w) AM_REGION("sub", 0x20000)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index 6dae28fc19e..af97377b5a4 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -25,7 +25,7 @@ static WRITE16_HANDLER( prehisle_sound16_w )
/*******************************************************************************/
-static ADDRESS_MAP_START( prehisle_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( prehisle_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x070000, 0x073fff) AM_RAM
AM_RANGE(0x090000, 0x0907ff) AM_RAM_WRITE(prehisle_fg_videoram16_w) AM_BASE_MEMBER(prehisle_state, videoram)
@@ -51,14 +51,14 @@ static WRITE8_DEVICE_HANDLER( D7759_upd_reset_w )
upd7759_reset_w(device, data & 0x80);
}
-static ADDRESS_MAP_START( prehisle_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( prehisle_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r)
AM_RANGE(0xf800, 0xf800) AM_WRITENOP // ???
ADDRESS_MAP_END
-static ADDRESS_MAP_START( prehisle_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( prehisle_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ymsnd", ym3812_status_port_r, ym3812_control_port_w)
AM_RANGE(0x20, 0x20) AM_DEVWRITE("ymsnd", ym3812_write_port_w)
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index bd3d29d02d4..2742c7a84c5 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -240,7 +240,7 @@ static WRITE8_HANDLER( progolf_videoram_w )
videoram[offset] = data;
}
-static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_RAM
AM_RANGE(0x6000, 0x7fff) AM_RAM_WRITE(progolf_charram_w) AM_BASE_MEMBER(progolf_state, fbram)
AM_RANGE(0x8000, 0x8fff) AM_READWRITE(progolf_videoram_r,progolf_videoram_w)
@@ -256,7 +256,7 @@ static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x4000, 0x4fff) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w)
AM_RANGE(0x5000, 0x5fff) AM_DEVWRITE("ay1", ay8910_address_w)
@@ -536,7 +536,7 @@ ROM_END
static DRIVER_INIT( progolf )
{
int A;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
UINT8* decrypted = auto_alloc_array(machine, UINT8, 0x10000);
@@ -550,7 +550,7 @@ static DRIVER_INIT( progolf )
static DRIVER_INIT( progolfa )
{
int A;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
UINT8* decrypted = auto_alloc_array(machine, UINT8, 0x10000);
diff --git a/src/mame/drivers/psattack.c b/src/mame/drivers/psattack.c
index fc2665ed89b..92bb3110c46 100644
--- a/src/mame/drivers/psattack.c
+++ b/src/mame/drivers/psattack.c
@@ -93,7 +93,7 @@ static READ32_HANDLER( psattack_unk_r )
return 0xffffffff;
}
-static ADDRESS_MAP_START( psattack_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( psattack_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_ROM
AM_RANGE(0x01402204, 0x01402207) AM_READ(psattack_unk_r)
AM_RANGE(0x01402804, 0x01402807) AM_READ(psattack_unk_r)
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 4ca329cab2a..d8c022248ab 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -317,7 +317,7 @@ static WRITE32_HANDLER( paletteram32_xRRRRRGGGGGBBBBB_dword_w )
paletteram16_xRRRRRGGGGGBBBBB_word_w(space, offset * 2 + 1, data, mem_mask);
}
-static ADDRESS_MAP_START( psikyo_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( psikyo_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM (not all used)
AM_RANGE(0x400000, 0x401fff) AM_RAM AM_BASE_SIZE_MEMBER(psikyo_state, spriteram, spriteram_size) // Sprites, buffered by two frames (list buffered + fb buffered)
AM_RANGE(0x600000, 0x601fff) AM_RAM_WRITE(paletteram32_xRRRRRGGGGGBBBBB_dword_w) AM_BASE_GENERIC(paletteram) // Palette
@@ -359,12 +359,12 @@ static WRITE32_HANDLER( s1945bl_oki_w )
printf("ACCESSING_BITS_0_7 ?? %08x %08x\n", data & 0x000000ff, mem_mask);
}
-static ADDRESS_MAP_START( s1945bl_oki_map, 0, 8 )
+static ADDRESS_MAP_START( s1945bl_oki_map, AS_0, 8 )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("okibank")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( psikyo_bootleg_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( psikyo_bootleg_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM (not all used)
AM_RANGE(0x200000, 0x200fff) AM_RAM AM_BASE_MEMBER(psikyo_state, bootleg_spritebuffer) // RAM (it copies the spritelist here, the HW probably doesn't have automatic buffering like the originals?
@@ -420,13 +420,13 @@ static WRITE8_HANDLER( sngkace_sound_bankswitch_w )
memory_set_bank(space->machine, "bank1", data & 0x03);
}
-static ADDRESS_MAP_START( sngkace_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sngkace_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM // ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM // RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1") // Banked ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sngkace_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sngkace_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w)
AM_RANGE(0x04, 0x04) AM_WRITE(sngkace_sound_bankswitch_w)
@@ -444,13 +444,13 @@ static WRITE8_HANDLER( gunbird_sound_bankswitch_w )
memory_set_bank(space->machine, "bank1", (data >> 4) & 0x03);
}
-static ADDRESS_MAP_START( gunbird_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gunbird_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0x81ff) AM_RAM // RAM
AM_RANGE(0x8200, 0xffff) AM_ROMBANK("bank1") // Banked ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gunbird_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gunbird_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(gunbird_sound_bankswitch_w)
AM_RANGE(0x04, 0x07) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w)
@@ -462,7 +462,7 @@ ADDRESS_MAP_END
Strikers 1945 / Tengai
***************************************************************************/
-static ADDRESS_MAP_START( s1945_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( s1945_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(gunbird_sound_bankswitch_w)
AM_RANGE(0x02, 0x03) AM_WRITENOP
@@ -1182,7 +1182,7 @@ static MACHINE_CONFIG_START( s1945bl, psikyo_state ) /* Bootleg hardware based o
MCFG_OKIM6295_ADD("oki", XTAL_16MHz/16, OKIM6295_PIN7_LOW) // ?? clock
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(0, s1945bl_oki_map)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, s1945bl_oki_map)
MACHINE_CONFIG_END
@@ -1842,10 +1842,10 @@ static DRIVER_INIT( sngkace )
}
/* input ports */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, sngkace_input_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00000, 0xc0000b, 0, 0, sngkace_input_r);
/* sound latch */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00010, 0xc00013, 0, 0, psikyo_soundlatch_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00010, 0xc00013, 0, 0, psikyo_soundlatch_w);
state->ka302c_banking = 0; // SH201B doesn't have any gfx banking
@@ -1895,13 +1895,13 @@ static DRIVER_INIT( tengai )
psikyo_state *state = machine->driver_data<psikyo_state>();
/* input ports */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, s1945_input_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00000, 0xc0000b, 0, 0, s1945_input_r);
/* sound latch */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00010, 0xc00013, 0, 0, s1945_soundlatch_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00010, 0xc00013, 0, 0, s1945_soundlatch_w);
/* protection */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00004, 0xc0000b, 0, 0, s1945_mcu_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00004, 0xc0000b, 0, 0, s1945_mcu_w);
s1945_mcu_init(machine);
state->s1945_mcu_table = 0;
@@ -1918,10 +1918,10 @@ static DRIVER_INIT( gunbird )
psikyo_state *state = machine->driver_data<psikyo_state>();
/* input ports */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, gunbird_input_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00000, 0xc0000b, 0, 0, gunbird_input_r);
/* sound latch */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00010, 0xc00013, 0, 0, psikyo_soundlatch_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00010, 0xc00013, 0, 0, psikyo_soundlatch_w);
state->ka302c_banking = 1;
@@ -1936,13 +1936,13 @@ static DRIVER_INIT( s1945 )
psikyo_state *state = machine->driver_data<psikyo_state>();
/* input ports */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, s1945_input_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00000, 0xc0000b, 0, 0, s1945_input_r);
/* sound latch */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00010, 0xc00013, 0, 0, s1945_soundlatch_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00010, 0xc00013, 0, 0, s1945_soundlatch_w);
/* protection and tile bank switching */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00004, 0xc0000b, 0, 0, s1945_mcu_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00004, 0xc0000b, 0, 0, s1945_mcu_w);
s1945_mcu_init(machine);
state->s1945_mcu_table = s1945_table;
@@ -1959,13 +1959,13 @@ static DRIVER_INIT( s1945a )
psikyo_state *state = machine->driver_data<psikyo_state>();
/* input ports */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, s1945_input_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00000, 0xc0000b, 0, 0, s1945_input_r);
/* sound latch */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00010, 0xc00013, 0, 0, s1945_soundlatch_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00010, 0xc00013, 0, 0, s1945_soundlatch_w);
/* protection and tile bank switching */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00004, 0xc0000b, 0, 0, s1945_mcu_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00004, 0xc0000b, 0, 0, s1945_mcu_w);
s1945_mcu_init(machine);
state->s1945_mcu_table = s1945a_table;
@@ -1982,13 +1982,13 @@ static DRIVER_INIT( s1945j )
psikyo_state *state = machine->driver_data<psikyo_state>();
/* input ports*/
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, s1945_input_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00000, 0xc0000b, 0, 0, s1945_input_r);
/* sound latch */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00010, 0xc00013, 0, 0, s1945_soundlatch_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00010, 0xc00013, 0, 0, s1945_soundlatch_w);
/* protection and tile bank switching */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00004, 0xc0000b, 0, 0, s1945_mcu_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00004, 0xc0000b, 0, 0, s1945_mcu_w);
s1945_mcu_init(machine);
state->s1945_mcu_table = s1945j_table;
@@ -2005,10 +2005,10 @@ static DRIVER_INIT( s1945jn )
psikyo_state *state = machine->driver_data<psikyo_state>();
/* input ports */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, gunbird_input_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00000, 0xc0000b, 0, 0, gunbird_input_r);
/* sound latch */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00010, 0xc00013, 0, 0, s1945_soundlatch_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00010, 0xc00013, 0, 0, s1945_soundlatch_w);
state->ka302c_banking = 1;
@@ -2022,10 +2022,10 @@ static DRIVER_INIT( s1945bl )
psikyo_state *state = machine->driver_data<psikyo_state>();
/* input ports */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00000, 0xc0000b, 0, 0, gunbird_input_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00000, 0xc0000b, 0, 0, gunbird_input_r);
/* sound latch */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00010, 0xc00013, 0, 0, s1945_soundlatch_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00010, 0xc00013, 0, 0, s1945_soundlatch_w);
state->ka302c_banking = 1;
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index 2589cee2598..5dd217d9216 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -374,7 +374,7 @@ static WRITE32_HANDLER( hotgmck_pcm_bank_w )
set_hotgmck_pcm_bank(space->machine, 1);
}
-static ADDRESS_MAP_START( ps4_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( ps4_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x000fffff) AM_ROM // program ROM (1 meg)
AM_RANGE(0x02000000, 0x021fffff) AM_ROMBANK("bank1") // data ROM
AM_RANGE(0x03000000, 0x030037ff) AM_RAM AM_BASE_SIZE_MEMBER(psikyo4_state, spriteram, spriteram_size)
@@ -1072,7 +1072,7 @@ static void install_hotgmck_pcm_bank(running_machine *machine)
set_hotgmck_pcm_bank(machine, 0);
set_hotgmck_pcm_bank(machine, 1);
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5800008, 0x580000b, 0, 0, hotgmck_pcm_bank_w );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5800008, 0x580000b, 0, 0, hotgmck_pcm_bank_w );
machine->state().register_postload(hotgmck_pcm_bank_postload, (void *)0);
machine->state().register_postload(hotgmck_pcm_bank_postload, (void *)1);
}
@@ -1086,17 +1086,17 @@ static DRIVER_INIT( hotgmck )
static DRIVER_INIT( loderndf )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000020, 0x6000023, 0, 0, loderndf_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000020, 0x6000023, 0, 0, loderndf_speedup_r );
}
static DRIVER_INIT( loderdfa )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000020, 0x6000023, 0, 0, loderdfa_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000020, 0x6000023, 0, 0, loderdfa_speedup_r );
}
static DRIVER_INIT( hotdebut )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x600001c, 0x600001f, 0, 0, hotdebut_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x600001c, 0x600001f, 0, 0, hotdebut_speedup_r );
}
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index d42f411d58b..d1beda8a6db 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -518,7 +518,7 @@ P1KEY11 29|30 P2KEY11
// ps3v1
-static ADDRESS_MAP_START( ps3v1_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( ps3v1_map, AS_PROGRAM, 32 )
// rom mapping
AM_RANGE(0x00000000, 0x000fffff) AM_ROM // program ROM (1 meg)
AM_RANGE(0x02000000, 0x021fffff) AM_ROMBANK("bank1") // data ROM
@@ -544,7 +544,7 @@ static ADDRESS_MAP_START( ps3v1_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
// ps5, ps5v2
-static ADDRESS_MAP_START( ps5_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( ps5_map, AS_PROGRAM, 32 )
// rom mapping
AM_RANGE(0x00000000, 0x000fffff) AM_ROM // program ROM (1 meg)
// inputs/eeprom
@@ -1270,7 +1270,7 @@ static DRIVER_INIT( mjgtaste )
{
sh2drc_set_options(machine->device("maincpu"), SH2DRC_FASTEST_OPTIONS);
/* needs to install mahjong controls too (can select joystick in test mode tho) */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x03000000, 0x03000003, 0, 0, mjgtaste_input_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x03000000, 0x03000003, 0, 0, mjgtaste_input_r);
}
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index 1860c4d3b73..1da68bd9eaa 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -406,7 +406,7 @@ static WRITE8_HANDLER( bombsa_flipscreen_w )
***************************************************************************/
-static ADDRESS_MAP_START( psychic5_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( psychic5_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_READWRITE(psychic5_paged_ram_r, psychic5_paged_ram_w)
@@ -422,20 +422,20 @@ static ADDRESS_MAP_START( psychic5_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( psychic5_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( psychic5_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( psychic5_soundport_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( psychic5_soundport_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym2", ym2203_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bombsa_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bombsa_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -454,14 +454,14 @@ static ADDRESS_MAP_START( bombsa_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_READWRITE(psychic5_paged_ram_r, bombsa_paged_ram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bombsa_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bombsa_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
AM_RANGE(0xf000, 0xf000) AM_WRITEONLY // Is this a confirm of some sort?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bombsa_soundport_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bombsa_soundport_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x80, 0x81) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w)
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index 6381c7dca2b..0bf8b82add6 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -303,7 +303,7 @@ static READ8_HANDLER (pturn_custom_r)
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xcfff) AM_WRITENOP AM_READ(pturn_custom_r)
@@ -337,7 +337,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) AM_WRITE(nmi_sub_enable_w)
@@ -472,7 +472,7 @@ static INTERRUPT_GEN( pturn_main_intgen )
static MACHINE_RESET( pturn )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
soundlatch_clear_w(space,0,0);
}
@@ -552,8 +552,8 @@ ROM_END
static DRIVER_INIT(pturn)
{
/*
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc0dd, 0xc0dd, 0, 0, pturn_protection_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc0db, 0xc0db, 0, 0, pturn_protection2_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc0dd, 0xc0dd, 0, 0, pturn_protection_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc0db, 0xc0db, 0, 0, pturn_protection2_r);
*/
}
diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c
index 1c4c5802ed4..a081037a9d4 100644
--- a/src/mame/drivers/puckpkmn.c
+++ b/src/mame/drivers/puckpkmn.c
@@ -126,7 +126,7 @@ static INPUT_PORTS_START( puckpkmn )
INPUT_PORTS_END
-static ADDRESS_MAP_START( puckpkmn_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( puckpkmn_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM /* Main 68k Program Roms */
AM_RANGE(0x700010, 0x700011) AM_READ_PORT("P2")
AM_RANGE(0x700012, 0x700013) AM_READ_PORT("P1")
@@ -158,7 +158,7 @@ static READ16_HANDLER(puckpkmna_4b2476_r)
return 0x3400;
}
-static ADDRESS_MAP_START( puckpkmna_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( puckpkmna_map, AS_PROGRAM, 16 )
AM_IMPORT_FROM( puckpkmn_map )
AM_RANGE(0x4b2476, 0x4b2477) AM_READ(puckpkmna_4b2476_r)
AM_RANGE(0x70001c, 0x70001d) AM_READ(puckpkmna_70001c_r)
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index 5d74a48e976..62044d2c6e1 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -313,7 +313,7 @@ static WRITE8_HANDLER( spunchout_exp_w )
-static ADDRESS_MAP_START( punchout_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( punchout_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xd000, 0xd7ff) AM_RAM
@@ -327,7 +327,7 @@ static ADDRESS_MAP_START( punchout_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( armwrest_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( armwrest_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xd000, 0xd7ff) AM_RAM
@@ -342,7 +342,7 @@ static ADDRESS_MAP_START( armwrest_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( punchout_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( punchout_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
@@ -365,7 +365,7 @@ static ADDRESS_MAP_START( punchout_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x07, 0x07) AM_MIRROR(0xf0) AM_MASK(0xf0) AM_READWRITE(spunchout_exp_r, spunchout_exp_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( punchout_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( punchout_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x4016, 0x4016) AM_READ(soundlatch_r)
AM_RANGE(0x4017, 0x4017) AM_READ(soundlatch2_r)
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index 150361cd741..0479c4c071c 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -149,7 +149,7 @@ static WRITE8_HANDLER( pushman_68000_w )
/******************************************************************************/
-static ADDRESS_MAP_START( pushman_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pushman_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x060000, 0x060007) AM_READWRITE(pushman_68705_r, pushman_68705_w)
AM_RANGE(0xfe0800, 0xfe17ff) AM_RAM AM_BASE_MEMBER(pushman_state, spriteram)
@@ -163,25 +163,25 @@ static ADDRESS_MAP_START( pushman_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffc000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0007) AM_READWRITE(pushman_68000_r, pushman_68000_w)
AM_RANGE(0x0010, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x80, 0x81) AM_DEVWRITE("ym2", ym2203_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bballs_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bballs_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x00000, 0x1ffff) AM_ROM
AM_RANGE(0x60000, 0x60007) AM_READWRITE(bballs_68705_r, bballs_68705_w)
diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c
index 87b1c93cce0..9b12348cba5 100644
--- a/src/mame/drivers/pzletime.c
+++ b/src/mame/drivers/pzletime.c
@@ -205,7 +205,7 @@ static CUSTOM_INPUT( ticket_status_r )
return (state->ticket && !(field->port->machine->primary_screen->frame_number() % 128));
}
-static ADDRESS_MAP_START( pzletime_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pzletime_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
AM_RANGE(0x700000, 0x700005) AM_RAM_WRITE(video_regs_w) AM_BASE_MEMBER(pzletime_state, video_regs)
AM_RANGE(0x800000, 0x800001) AM_DEVREADWRITE8_MODERN("oki", okim6295_device, read, write, 0x00ff)
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index 302e3553d06..7722fe28be0 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -340,7 +340,7 @@ static void gp2_ide_interrupt(device_t *device, int state)
*
*************************************/
-static ADDRESS_MAP_START( qdrmfgp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( qdrmfgp_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE_MEMBER(qdrmfgp_state, workram) /* work ram */
AM_RANGE(0x180000, 0x183fff) AM_RAM AM_SHARE("nvram") /* backup ram */
@@ -363,7 +363,7 @@ static ADDRESS_MAP_START( qdrmfgp_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qdrmfgp2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( qdrmfgp2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x110fff) AM_RAM AM_BASE_MEMBER(qdrmfgp_state, workram) /* work ram */
AM_RANGE(0x180000, 0x183fff) AM_RAM AM_SHARE("nvram") /* backup ram */
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index d45514a212d..1cbf4af2147 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -238,7 +238,7 @@ Interrupts:
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x8400, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8bff) AM_READNOP /* 6850 ACIA */
@@ -252,7 +252,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( zoo_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( zoo_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x0400, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0bff) AM_READNOP /* ACIA */
@@ -273,7 +273,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(qix_68705_portA_r, qix_68705_portA_w) AM_BASE_MEMBER(qix_state, _68705_port_out)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(qix_68705_portB_r, qix_68705_portB_w)
@@ -1257,8 +1257,8 @@ static int kram3_decrypt(int address, int value)
static DRIVER_INIT( kram3 )
{
- address_space *mainspace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
- address_space *videospace = machine->device("videocpu")->memory().space(ADDRESS_SPACE_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;
diff --git a/src/mame/drivers/quakeat.c b/src/mame/drivers/quakeat.c
index 41c4a4b22ea..646906a587a 100644
--- a/src/mame/drivers/quakeat.c
+++ b/src/mame/drivers/quakeat.c
@@ -83,11 +83,11 @@ static SCREEN_UPDATE(quake)
return 0;
}
-static ADDRESS_MAP_START( quake_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( quake_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0000ffff) AM_ROM AM_REGION("pc_bios", 0) /* BIOS */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( quake_io, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( quake_io, AS_IO, 32 )
// AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8("dma8237_1", dma8237_r, dma8237_w, 0xffffffff)
AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_1", pic8259_r, pic8259_w, 0xffffffff)
// AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8("pit8254", pit8253_r, pit8253_w, 0xffffffff)
diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c
index 2a1c5b17830..f0a5e0cc413 100644
--- a/src/mame/drivers/quantum.c
+++ b/src/mame/drivers/quantum.c
@@ -123,7 +123,7 @@ static WRITE16_HANDLER( led_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x013fff) AM_ROM
AM_RANGE(0x018000, 0x01cfff) AM_RAM
AM_RANGE(0x800000, 0x801fff) AM_RAM AM_BASE((UINT16 **)&avgdvg_vectorram) AM_SIZE(&avgdvg_vectorram_size)
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index 78f9cfd0fef..1ce94c29e7b 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -144,7 +144,7 @@ static READ8_HANDLER( audio_t1_r )
// memory map taken from the manual
-static ADDRESS_MAP_START( quasar, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( quasar, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x13ff) AM_ROM
AM_RANGE(0x1400, 0x14ff) AM_MIRROR(0x6000) AM_READWRITE(cvs_bullet_ram_or_palette_r, quasar_bullet_w) AM_BASE_MEMBER(quasar_state, bullet_ram)
AM_RANGE(0x1500, 0x15ff) AM_MIRROR(0x6000) AM_READWRITE(cvs_s2636_0_or_character_ram_r, cvs_s2636_0_or_character_ram_w)
@@ -157,7 +157,7 @@ static ADDRESS_MAP_START( quasar, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0x73ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( quasar_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( quasar_io, AS_IO, 8 )
AM_RANGE(0x00, 0x03) AM_READWRITE(quasar_IO_r, video_page_select_w)
AM_RANGE(0x08, 0x0b) AM_WRITE(io_page_select_w)
AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READWRITE(cvs_collision_clear, quasar_sh_command_w)
@@ -172,11 +172,11 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
AM_RANGE(0x00, 0x7f) AM_RAM
AM_RANGE(0x80, 0x80) AM_READ(quasar_sh_command_r)
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(audio_t1_r)
diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c
index 255828b94ca..469434e0678 100644
--- a/src/mame/drivers/queen.c
+++ b/src/mame/drivers/queen.c
@@ -42,7 +42,7 @@ static SCREEN_UPDATE(queen)
return 0;
}
-static ADDRESS_MAP_START( queen_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( queen_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0x000a0000, 0x000bffff) AM_RAM
AM_RANGE(0x000c0000, 0x000fffff) AM_ROM AM_REGION("bios", 0) AM_WRITENOP
@@ -55,7 +55,7 @@ static ADDRESS_MAP_START( queen_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfffc0000, 0xffffffff) AM_ROM AM_REGION("bios", 0) /* System BIOS */
ADDRESS_MAP_END
-static ADDRESS_MAP_START(queen_io, ADDRESS_SPACE_IO, 32)
+static ADDRESS_MAP_START(queen_io, AS_IO, 32)
AM_RANGE(0x0000, 0x001f) AM_RAM//AM_DEVREADWRITE8("dma8237_1", dma8237_r, dma8237_w, 0xffffffff)
AM_RANGE(0x0020, 0x003f) AM_RAM//AM_DEVREADWRITE8("pic8259_1", pic8259_r, pic8259_w, 0xffffffff)
AM_RANGE(0x0040, 0x005f) AM_RAM//AM_DEVREADWRITE8("pit8254", pit8253_r, pit8253_w, 0xffffffff)
diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c
index ccd5021f2c8..6c6db5918d9 100644
--- a/src/mame/drivers/quizdna.c
+++ b/src/mame/drivers/quizdna.c
@@ -30,7 +30,7 @@ static WRITE8_HANDLER( gekiretu_rombank_w )
/****************************************************************************/
-static ADDRESS_MAP_START( quizdna_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( quizdna_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x9fff) AM_WRITE(quizdna_fg_ram_w)
@@ -41,7 +41,7 @@ static ADDRESS_MAP_START( quizdna_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM_WRITE(paletteram_xBGR_RRRR_GGGG_BBBB_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gekiretu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gekiretu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x9fff) AM_WRITE(quizdna_fg_ram_w)
@@ -52,7 +52,7 @@ static ADDRESS_MAP_START( gekiretu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf200, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( quizdna_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( quizdna_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x02, 0x03) AM_WRITE(quizdna_bg_xscroll_w)
AM_RANGE(0x04, 0x04) AM_WRITE(quizdna_bg_yscroll_w)
@@ -67,7 +67,7 @@ static ADDRESS_MAP_START( quizdna_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gakupara_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gakupara_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_WRITE(quizdna_bg_xscroll_w)
AM_RANGE(0x02, 0x02) AM_WRITE(quizdna_bg_yscroll_w)
@@ -82,7 +82,7 @@ static ADDRESS_MAP_START( gakupara_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf0, 0xf0) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gekiretu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gekiretu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x02, 0x03) AM_WRITE(quizdna_bg_xscroll_w)
AM_RANGE(0x04, 0x04) AM_WRITE(quizdna_bg_yscroll_w)
diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c
index 931458f2f56..3bb7079a5ab 100644
--- a/src/mame/drivers/quizo.c
+++ b/src/mame/drivers/quizo.c
@@ -130,7 +130,7 @@ static WRITE8_HANDLER(port60_w)
memory_set_bankptr(space->machine, "bank1", &space->machine->region("user1")->base()[rombankLookup[data]*0x4000] );
}
-static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
@@ -138,7 +138,7 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x10, 0x10) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c
index bd96e56b841..acd2844aa9b 100644
--- a/src/mame/drivers/quizpani.c
+++ b/src/mame/drivers/quizpani.c
@@ -51,7 +51,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
#include "sound/okim6295.h"
#include "includes/quizpani.h"
-static ADDRESS_MAP_START( quizpani_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( quizpani_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("SYSTEM")
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("P1_P2")
diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c
index 81e7ac13224..25be35728c6 100644
--- a/src/mame/drivers/quizpun2.c
+++ b/src/mame/drivers/quizpun2.c
@@ -316,7 +316,7 @@ static WRITE8_HANDLER( quizpun2_soundlatch_w )
cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( quizpun2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( quizpun2_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x7fff ) AM_ROM
AM_RANGE( 0x8000, 0x9fff ) AM_ROMBANK("bank1")
@@ -328,7 +328,7 @@ static ADDRESS_MAP_START( quizpun2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0xe000, 0xffff ) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( quizpun2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( quizpun2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x40, 0x40 ) AM_WRITE( quizpun2_irq_ack )
AM_RANGE( 0x50, 0x50 ) AM_WRITE( quizpun2_soundlatch_w )
@@ -344,12 +344,12 @@ ADDRESS_MAP_END
Memory Maps - Sound CPU
***************************************************************************/
-static ADDRESS_MAP_START( quizpun2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( quizpun2_sound_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0xf7ff ) AM_ROM
AM_RANGE( 0xf800, 0xffff ) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( quizpun2_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( quizpun2_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x00 ) AM_WRITENOP // IRQ end
AM_RANGE( 0x20, 0x20 ) AM_WRITENOP // NMI end
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index 7caff58bb96..ae5a4fb79a1 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -419,7 +419,7 @@ static WRITE8_DEVICE_HANDLER( pia_comp_w )
}
-static ADDRESS_MAP_START( r2dtank_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( r2dtank_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_MEMBER(r2dtank_state, videoram)
AM_RANGE(0x2000, 0x3fff) AM_RAM
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE_MEMBER(r2dtank_state, colorram)
@@ -433,7 +433,7 @@ static ADDRESS_MAP_START( r2dtank_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( r2dtank_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( r2dtank_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */
AM_RANGE(0xd000, 0xd003) AM_DEVREADWRITE("pia_audio", pia6821_r, pia6821_w)
AM_RANGE(0xf000, 0xf000) AM_READWRITE(audio_command_r, audio_answer_w)
diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c
index 7021055afb3..ad903950d92 100644
--- a/src/mame/drivers/r2dx_v33.c
+++ b/src/mame/drivers/r2dx_v33.c
@@ -196,7 +196,7 @@ static SCREEN_UPDATE( rdx_v33 )
{
static UINT32 src_addr = 0x100000;
static int frame;
- address_space *space = screen->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = screen->machine->device("maincpu")->memory().space(AS_PROGRAM);
//if(input_code_pressed_once(screen->machine,KEYCODE_A))
// src_addr+=0x800;
@@ -347,7 +347,7 @@ static WRITE16_HANDLER( mcu_table2_w )
}
-static ADDRESS_MAP_START( rdx_v33_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rdx_v33_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x003ff) AM_RAM // vectors copied here
AM_RANGE(0x00400, 0x00407) AM_WRITE(mcu_table_w)
@@ -424,7 +424,7 @@ static WRITE16_HANDLER( nzerotea_sound_comms_w )
}
}
-static ADDRESS_MAP_START( nzerotea_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( nzerotea_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x003ff) AM_RAM //stack area
/* results from cop? */
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index 0a9d7378b77..9aaa66673d3 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -735,7 +735,7 @@ static WRITE32_DEVICE_HANDLER( rabbit_eeprom_write )
}
}
-static ADDRESS_MAP_START( rabbit_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( rabbit_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x000000, 0x000003) AM_WRITENOP // bug in code / emulation?
AM_RANGE(0x000010, 0x000013) AM_WRITENOP // bug in code / emulation?
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 96492c48a72..a1caa91cf3e 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -46,7 +46,7 @@
/******************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x06fff) AM_RAM
AM_RANGE(0x07000, 0x07fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x0a000, 0x0afff) AM_RAM AM_SHARE("share1") AM_BASE_MEMBER(raiden_state, shared_ram)
@@ -59,7 +59,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xa0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x01fff) AM_RAM
AM_RANGE(0x02000, 0x027ff) AM_RAM_WRITE(raiden_background_w) AM_BASE_MEMBER(raiden_state, back_data)
AM_RANGE(0x02800, 0x02fff) AM_RAM_WRITE(raiden_foreground_w) AM_BASE_MEMBER(raiden_state, fore_data)
@@ -71,7 +71,7 @@ ADDRESS_MAP_END
/************************* Alternate board set ************************/
-static ADDRESS_MAP_START( alt_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( alt_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x06fff) AM_RAM
AM_RANGE(0x07000, 0x07fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x08000, 0x08fff) AM_RAM AM_SHARE("share1") AM_BASE_MEMBER(raiden_state, shared_ram)
@@ -86,7 +86,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( raidenu_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( raidenu_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x06fff) AM_RAM
AM_RANGE(0x07000, 0x07fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x08000, 0x08035) AM_WRITEONLY AM_BASE_MEMBER(raiden_state, scroll_ram)
@@ -100,7 +100,7 @@ static ADDRESS_MAP_START( raidenu_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( raidenu_sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( raidenu_sub_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x05fff) AM_RAM
AM_RANGE(0x06000, 0x067ff) AM_RAM_WRITE(raiden_background_w) AM_BASE_MEMBER(raiden_state, back_data)
AM_RANGE(0x06800, 0x06fff) AM_RAM_WRITE(raiden_foreground_w) AM_BASE_MEMBER(raiden_state, fore_data)
@@ -244,7 +244,7 @@ static INTERRUPT_GEN( raiden_interrupt )
static SCREEN_EOF( raiden )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space,0,0,0xffff); /* Could be a memory location instead */
}
@@ -540,7 +540,7 @@ static READ16_HANDLER( sub_cpu_spin_r )
static DRIVER_INIT( raiden )
{
#ifdef SYNC_HACK
- memory_install_read16_handler(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4008, 0x4009, 0, 0, sub_cpu_spin_r);
+ memory_install_read16_handler(machine->device("sub")->memory().space(AS_PROGRAM), 0x4008, 0x4009, 0, 0, sub_cpu_spin_r);
#endif
}
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 1210c8147be..d9670ed30f8 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -1185,7 +1185,7 @@ WRITE16_MEMBER(raiden2_state::sprite_prot_dst2_w)
}
/* MEMORY MAPS */
-static ADDRESS_MAP_START( raiden2_cop_mem, ADDRESS_SPACE_PROGRAM, 16, raiden2_state )
+static ADDRESS_MAP_START( raiden2_cop_mem, AS_PROGRAM, 16, raiden2_state )
// AM_RANGE(0x0041c, 0x0041d) AM_WRITENOP // angle compare (for 0x6200 COP macro)
// AM_RANGE(0x0041e, 0x0041f) AM_WRITENOP // angle mod value (for 0x6200 COP macro)
AM_RANGE(0x00420, 0x00421) AM_WRITE(cop_itoa_low_w)
@@ -1244,7 +1244,7 @@ static ADDRESS_MAP_START( raiden2_cop_mem, ADDRESS_SPACE_PROGRAM, 16, raiden2_st
AM_RANGE(0x00762, 0x00763) AM_READ(sprite_prot_dst1_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( raiden2_mem, ADDRESS_SPACE_PROGRAM, 16, raiden2_state )
+static ADDRESS_MAP_START( raiden2_mem, AS_PROGRAM, 16, raiden2_state )
AM_RANGE(0x00000, 0x003ff) AM_RAM
AM_RANGE(0x0068e, 0x0068f) AM_WRITENOP //irq ack / sprite buffering?
@@ -1273,7 +1273,7 @@ static ADDRESS_MAP_START( raiden2_mem, ADDRESS_SPACE_PROGRAM, 16, raiden2_state
AM_RANGE(0x40000, 0xfffff) AM_ROM AM_REGION("mainprg", 0x40000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( raidendx_mem, ADDRESS_SPACE_PROGRAM, 16, raiden2_state )
+static ADDRESS_MAP_START( raidendx_mem, AS_PROGRAM, 16, raiden2_state )
AM_RANGE(0x00470, 0x00471) AM_READWRITE(cop_tile_bank_2_r,raidendx_cop_bank_2_w)
AM_RANGE(0x004d0, 0x004d7) AM_RAM //???
AM_RANGE(0x0062c, 0x0062d) AM_WRITE(tilemap_enable_w)
@@ -1282,7 +1282,7 @@ static ADDRESS_MAP_START( raidendx_mem, ADDRESS_SPACE_PROGRAM, 16, raiden2_state
AM_IMPORT_FROM( raiden2_mem )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( zeroteam_mem, ADDRESS_SPACE_PROGRAM, 16, raiden2_state )
+static ADDRESS_MAP_START( zeroteam_mem, AS_PROGRAM, 16, raiden2_state )
AM_RANGE(0x00000, 0x003ff) AM_RAM
AM_RANGE(0x00470, 0x00471) AM_WRITENOP
@@ -1312,7 +1312,7 @@ static ADDRESS_MAP_START( zeroteam_mem, ADDRESS_SPACE_PROGRAM, 16, raiden2_state
AM_RANGE(0x40000, 0xfffff) AM_ROM AM_REGION("mainprg", 0x40000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( xsedae_mem, ADDRESS_SPACE_PROGRAM, 16, raiden2_state )
+static ADDRESS_MAP_START( xsedae_mem, AS_PROGRAM, 16, raiden2_state )
AM_RANGE(0x00000, 0x003ff) AM_RAM
AM_RANGE(0x00470, 0x00471) AM_WRITENOP
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index c9f82a3ee16..8b8095dbb84 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -345,7 +345,7 @@ static WRITE16_HANDLER( jumping_sound_w )
MEMORY STRUCTURES
***************************************************************************/
-static ADDRESS_MAP_START( rainbow_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rainbow_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x10c000, 0x10ffff) AM_RAM /* main RAM */
AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -366,7 +366,7 @@ static ADDRESS_MAP_START( rainbow_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd00000, 0xd03fff) AM_DEVREADWRITE("pc090oj", pc090oj_word_r, pc090oj_word_w) /* sprite ram + other stuff */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jumping_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( jumping_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x09ffff) AM_ROM
AM_RANGE(0x10c000, 0x10ffff) AM_RAM /* main RAM */
AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -408,7 +408,7 @@ static READ8_HANDLER( jumping_latch_r )
}
-static ADDRESS_MAP_START( rainbow_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rainbow_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x8fff) AM_RAM
@@ -418,7 +418,7 @@ static ADDRESS_MAP_START( rainbow_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa001, 0xa001) AM_DEVREADWRITE("tc0140syt", tc0140syt_slave_comm_r, tc0140syt_slave_comm_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jumping_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jumping_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0xb000, 0xb001) AM_DEVREADWRITE("ym1", ym2203_r,ym2203_w)
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index 88b74a87068..a29d1d4443c 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -317,7 +317,7 @@ static WRITE8_HANDLER( locomotn_latch_w )
*
*************************************/
-static ADDRESS_MAP_START( rallyx_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rallyx_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(rallyx_videoram_w) AM_BASE_MEMBER(rallyx_state, videoram)
AM_RANGE(0x9800, 0x9fff) AM_RAM
@@ -333,13 +333,13 @@ static ADDRESS_MAP_START( rallyx_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa180, 0xa187) AM_WRITE(rallyx_latch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0, 0) AM_WRITE(rallyx_interrupt_vector_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jungler_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jungler_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(rallyx_videoram_w) AM_BASE_MEMBER(rallyx_state, videoram)
AM_RANGE(0x9800, 0x9fff) AM_RAM
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index 3a557d998a5..6413d6791b1 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -132,7 +132,7 @@ static WRITE16_HANDLER( latch_w )
*************************************/
/* full memory map deduced from schematics and GALs */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0x7fffff)
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x140000, 0x147fff) AM_MIRROR(0x438000) AM_ROM /* slapstic goes here */
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 9d6b6ae08ff..92dd3e87890 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -208,7 +208,7 @@ static WRITE8_DEVICE_HANDLER( rastan_msm5205_stop_w )
-static ADDRESS_MAP_START( rastan_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rastan_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x10c000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -231,7 +231,7 @@ static ADDRESS_MAP_START( rastan_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rastan_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rastan_s_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x8fff) AM_RAM
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index c0302286512..ff4cf21fca5 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -105,7 +105,7 @@ static WRITE16_DEVICE_HANDLER( eeprom_w )
}
-static ADDRESS_MAP_START( rbmk_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rbmk_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x500000, 0x50ffff) AM_RAM
@@ -123,7 +123,7 @@ static ADDRESS_MAP_START( rbmk_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rbmk_mcu_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rbmk_mcu_mem, AS_PROGRAM, 8 )
// AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
@@ -165,7 +165,7 @@ static WRITE8_HANDLER( mcu_io_mux_w )
state->mux_data = ~data;
}
-static ADDRESS_MAP_START( rbmk_mcu_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rbmk_mcu_io, AS_IO, 8 )
AM_RANGE(0x0ff00, 0x0ffff) AM_READWRITE( rbmk_mcu_io_r, rbmk_mcu_io_w )
AM_RANGE(MCS51_PORT_P3, MCS51_PORT_P3) AM_WRITE( mcu_io_mux_w )
diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c
index 333e6a4387e..2be5581614d 100644
--- a/src/mame/drivers/rcorsair.c
+++ b/src/mame/drivers/rcorsair.c
@@ -59,7 +59,7 @@ public:
};
-static ADDRESS_MAP_START( rcorsair_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rcorsair_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/re900.c b/src/mame/drivers/re900.c
index 5509533c9db..ab312e266bf 100644
--- a/src/mame/drivers/re900.c
+++ b/src/mame/drivers/re900.c
@@ -221,11 +221,11 @@ static WRITE8_HANDLER(re900_watchdog_reset_w)
* Memory Map Information *
*******************************/
-static ADDRESS_MAP_START( mem_prg, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mem_prg, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM AM_BASE_MEMBER(re900_state, rom)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mem_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mem_io, AS_IO, 8 )
AM_RANGE(0x0000, 0xbfff) AM_READ (rom_r)
AM_RANGE(0xc000, 0xdfff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xe000, 0xe000) AM_WRITE(TMS9928A_vram_w)
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index 089b9f0ce32..c4cb027d01b 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -158,7 +158,7 @@ static WRITE16_HANDLER( backup_ram_w )
***************************************************************************/
/*Basic memory map for this HW*/
-static ADDRESS_MAP_START( base_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( base_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM AM_BASE_MEMBER(realbrk_state, spriteram) // Sprites
AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram ) // Palette
@@ -173,7 +173,7 @@ static ADDRESS_MAP_START( base_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/*realbrk specific memory map*/
-static ADDRESS_MAP_START( realbrk_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( realbrk_mem, AS_PROGRAM, 16 )
AM_IMPORT_FROM(base_mem)
AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) //
AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0") // P1 & P2 (Inputs)
@@ -184,7 +184,7 @@ static ADDRESS_MAP_START( realbrk_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/*pkgnsh specific memory map*/
-static ADDRESS_MAP_START( pkgnsh_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pkgnsh_mem, AS_PROGRAM, 16 )
AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ymsnd", ym2413_w, 0xff00 ) // YM2413
AM_RANGE(0xc00000, 0xc00013) AM_READ(pkgnsh_input_r ) // P1 & P2 (Inputs)
AM_RANGE(0xff0000, 0xfffbff) AM_READWRITE(backup_ram_r,backup_ram_w) AM_BASE_MEMBER(realbrk_state, backup_ram) // RAM
@@ -192,7 +192,7 @@ static ADDRESS_MAP_START( pkgnsh_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/*pkgnshdx specific memory map*/
-static ADDRESS_MAP_START( pkgnshdx_mem, ADDRESS_SPACE_PROGRAM, 16)
+static ADDRESS_MAP_START( pkgnshdx_mem, AS_PROGRAM, 16)
AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) //
AM_RANGE(0xc00000, 0xc00013) AM_READ(pkgnshdx_input_r ) // P1 & P2 (Inputs)
AM_RANGE(0xc00004, 0xc00005) AM_WRITEONLY AM_BASE_MEMBER(realbrk_state, dsw_select) // DSW select
@@ -201,7 +201,7 @@ static ADDRESS_MAP_START( pkgnshdx_mem, ADDRESS_SPACE_PROGRAM, 16)
ADDRESS_MAP_END
/*dai2kaku specific memory map*/
-static ADDRESS_MAP_START( dai2kaku_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dai2kaku_mem, AS_PROGRAM, 16 )
AM_RANGE(0x605000, 0x6053ff) AM_RAM AM_BASE_MEMBER(realbrk_state, vram_0ras) // rasterinfo (0)
AM_RANGE(0x605400, 0x6057ff) AM_RAM AM_BASE_MEMBER(realbrk_state, vram_1ras) // rasterinfo (1)
AM_RANGE(0x800008, 0x80000b) AM_DEVWRITE8("ymsnd", ym2413_w, 0x00ff) //
diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c
index d6aeebffea1..5cea6e48b9c 100644
--- a/src/mame/drivers/redalert.c
+++ b/src/mame/drivers/redalert.c
@@ -150,7 +150,7 @@ static READ8_HANDLER( panther_unk_r )
*
*************************************/
-static ADDRESS_MAP_START( redalert_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( redalert_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(redalert_bitmap_videoram_w) AM_BASE_MEMBER(redalert_state, bitmap_videoram)
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE_MEMBER(redalert_state, charmap_videoram)
@@ -166,7 +166,7 @@ static ADDRESS_MAP_START( redalert_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_ROM AM_REGION("maincpu", 0x8000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ww3_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ww3_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(redalert_bitmap_videoram_w) AM_BASE_MEMBER(redalert_state, bitmap_videoram)
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE_MEMBER(redalert_state, charmap_videoram)
@@ -181,7 +181,7 @@ static ADDRESS_MAP_START( ww3_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_ROM AM_REGION("maincpu", 0x8000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( panther_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( panther_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(redalert_bitmap_videoram_w) AM_BASE_MEMBER(redalert_state, bitmap_videoram)
AM_RANGE(0x4000, 0x4fff) AM_RAM AM_BASE_MEMBER(redalert_state, charmap_videoram)
@@ -196,7 +196,7 @@ static ADDRESS_MAP_START( panther_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_ROM AM_REGION("maincpu", 0x8000)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( demoneye_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( demoneye_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(redalert_bitmap_videoram_w) AM_BASE_MEMBER(redalert_state, bitmap_videoram)
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE_MEMBER(redalert_state, charmap_videoram)
diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c
index 44c829e42c1..c619a2f9c3a 100644
--- a/src/mame/drivers/redclash.c
+++ b/src/mame/drivers/redclash.c
@@ -31,7 +31,7 @@ static WRITE8_HANDLER( irqack_w )
device_set_input_line(state->maincpu, 0, CLEAR_LINE);
}
-static ADDRESS_MAP_START( zerohour_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( zerohour_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x3000, 0x37ff) AM_RAM
AM_RANGE(0x3800, 0x3bff) AM_RAM AM_BASE_SIZE_MEMBER(ladybug_state, spriteram, spriteram_size)
@@ -50,7 +50,7 @@ static ADDRESS_MAP_START( zerohour_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7800, 0x7800) AM_WRITE(irqack_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( redclash_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( redclash_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
// AM_RANGE(0x3000, 0x3000) AM_WRITENOP
// AM_RANGE(0x3800, 0x3800) AM_WRITENOP
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index 00b7e47f240..33eee36b523 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -145,7 +145,7 @@ static WRITE16_HANDLER( audio_volume_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x3fffff)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index ffd3deaa25b..1c99bb4318b 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -280,7 +280,7 @@ static DRIVER_INIT( kuniokun )
static DRIVER_INIT( kuniokunb )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* Remove the MCU handlers */
memory_unmap_readwrite(space, 0x3804, 0x3804, 0, 0);
@@ -671,7 +671,7 @@ static WRITE8_HANDLER( renegade_coin_counter_w )
/********************************************************************************************/
-static ADDRESS_MAP_START( renegade_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( renegade_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1fff) AM_RAM_WRITE(renegade_videoram2_w) AM_BASE_MEMBER(renegade_state, videoram2)
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_BASE_MEMBER(renegade_state, spriteram)
@@ -690,7 +690,7 @@ static ADDRESS_MAP_START( renegade_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( renegade_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( renegade_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r)
AM_RANGE(0x1800, 0x1800) AM_WRITENOP // this gets written the same values as 0x2000
@@ -700,7 +700,7 @@ static ADDRESS_MAP_START( renegade_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( renegade_mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( renegade_mcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(renegade_68705_port_a_r, renegade_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(renegade_68705_port_b_r, renegade_68705_port_b_w)
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index da0b8b751c0..73750e72db6 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -101,7 +101,7 @@ static WRITE8_HANDLER( coinlockout_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x7fff, 0x7fff) AM_WRITE(coincounter_w)
AM_RANGE(0x7b00, 0x7bff) AM_ROM /* space for diagnostic ROM? The code looks */
@@ -131,7 +131,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xf800) AM_READ(cpu0_mf800_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(retofinv_fg_videoram_w) AM_SHARE("share2")
AM_RANGE(0x8800, 0x9fff) AM_RAM AM_SHARE("share1")
@@ -139,7 +139,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc804, 0xc804) AM_WRITE(irq1_ack_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r)
@@ -149,7 +149,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM /* space for diagnostic ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(retofinv_68705_portA_r, retofinv_68705_portA_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(retofinv_68705_portB_r, retofinv_68705_portB_w)
diff --git a/src/mame/drivers/rgum.c b/src/mame/drivers/rgum.c
index e068ac85e4f..d9993ee8b32 100644
--- a/src/mame/drivers/rgum.c
+++ b/src/mame/drivers/rgum.c
@@ -58,7 +58,7 @@ static SCREEN_UPDATE(royalgum)
return 0;
}
-static ADDRESS_MAP_START( rgum_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rgum_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM //not all of it?
AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w)
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index ec0a6caab54..dde7f556ab3 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -186,12 +186,12 @@ logerror("banksw %d\n",bank);
static MACHINE_RESET( themj )
{
- themj_rombank_w(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0, 0);
+ themj_rombank_w(machine->device("maincpu")->memory().space(AS_IO), 0, 0);
}
-static ADDRESS_MAP_START( rmhaihai_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rmhaihai_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa7ff) AM_RAM
AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE(rmhaihai_colorram_w) AM_BASE_MEMBER(rmhaihai_state, colorram)
@@ -202,7 +202,7 @@ static ADDRESS_MAP_START( rmhaihai_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM /* rmhaisei only */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rmhaihai_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rmhaihai_io_map, AS_IO, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ(samples_r)
AM_RANGE(0x8000, 0x8000) AM_READ(keyboard_r) AM_WRITENOP // ??
AM_RANGE(0x8001, 0x8001) AM_READNOP AM_WRITE(keyboard_w) // ??
@@ -215,7 +215,7 @@ static ADDRESS_MAP_START( rmhaihai_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xbc0c, 0xbc0c) AM_WRITENOP // ??
ADDRESS_MAP_END
-static ADDRESS_MAP_START( themj_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( themj_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xa7ff) AM_RAM
@@ -225,7 +225,7 @@ static ADDRESS_MAP_START( themj_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( themj_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( themj_io_map, AS_IO, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ(samples_r)
AM_RANGE(0x8000, 0x8000) AM_READ(keyboard_r) AM_WRITENOP // ??
AM_RANGE(0x8001, 0x8001) AM_READNOP AM_WRITE(keyboard_w) // ??
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index ee9284945f4..64e531c636f 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -94,7 +94,7 @@ static WRITE8_DEVICE_HANDLER( rockrage_speech_w )
vlm5030_st(device, (data >> 0) & 0x01);
}
-static ADDRESS_MAP_START( rockrage_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rockrage_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_DEVREADWRITE("k007342", k007342_r, k007342_w) /* Color RAM + Video RAM */
AM_RANGE(0x2000, 0x21ff) AM_DEVREADWRITE("k007420", k007420_r, k007420_w) /* Sprite RAM */
AM_RANGE(0x2200, 0x23ff) AM_DEVREADWRITE("k007342", k007342_scroll_r, k007342_scroll_w) /* Scroll RAM */
@@ -114,7 +114,7 @@ static ADDRESS_MAP_START( rockrage_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rockrage_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rockrage_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("vlm", vlm5030_data_w) /* VLM5030 */
AM_RANGE(0x3000, 0x3000) AM_DEVREAD("vlm", rockrage_VLM5030_busy_r) /* VLM5030 */
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("vlm", rockrage_speech_w) /* VLM5030 */
diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c
index ccfcb0e1239..7533777953d 100644
--- a/src/mame/drivers/rocnrope.c
+++ b/src/mame/drivers/rocnrope.c
@@ -37,7 +37,7 @@ static WRITE8_HANDLER( rocnrope_interrupt_vector_w )
*
*************************************/
-static ADDRESS_MAP_START( rocnrope_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rocnrope_map, AS_PROGRAM, 8 )
AM_RANGE(0x3080, 0x3080) AM_READ_PORT("SYSTEM")
AM_RANGE(0x3081, 0x3081) AM_READ_PORT("P1")
AM_RANGE(0x3082, 0x3082) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index 0c00c7f4538..afc781fa72e 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -133,7 +133,7 @@ static WRITE16_HANDLER( wizdfire_irq_ack_w )
/**********************************************************************************/
-static ADDRESS_MAP_START( rohga_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rohga_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x20000f) AM_DEVWRITE("tilegen1", deco16ic_pf_control_w)
@@ -165,7 +165,7 @@ static ADDRESS_MAP_START( rohga_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x3f0000, 0x3f3fff) AM_RAM /* Main ram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wizdfire_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wizdfire_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x200fff) AM_DEVREADWRITE("tilegen1", deco16ic_pf1_data_r, deco16ic_pf1_data_w)
@@ -196,7 +196,7 @@ static ADDRESS_MAP_START( wizdfire_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfdc000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nitrobal_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( nitrobal_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x200fff) AM_MIRROR(0x1000) AM_DEVREADWRITE("tilegen1", deco16ic_pf1_data_r, deco16ic_pf1_data_w)
@@ -229,7 +229,7 @@ static ADDRESS_MAP_START( nitrobal_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff8000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( schmeisr_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( schmeisr_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20000f) AM_DEVWRITE("tilegen1", deco16ic_pf_control_w)
AM_RANGE(0x240000, 0x24000f) AM_DEVWRITE("tilegen2", deco16ic_pf_control_w)
@@ -261,7 +261,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( rohga_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rohga_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_NOP
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w)
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index 5d88aff6eff..c6e042016e4 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -80,7 +80,7 @@ static READ8_HANDLER( pip_r )
return 0x7f;
}
-static ADDRESS_MAP_START( rollerg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rollerg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0010, 0x0010) AM_WRITE(rollerg_0010_w)
AM_RANGE(0x0020, 0x0020) AM_READWRITE(watchdog_reset_r,watchdog_reset_w)
AM_RANGE(0x0030, 0x0031) AM_DEVREADWRITE("k053260", rollerg_sound_r, k053260_w) /* K053260 */
@@ -102,7 +102,7 @@ static ADDRESS_MAP_START( rollerg_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rollerg_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rollerg_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa02f) AM_DEVREADWRITE("k053260", k053260_r,k053260_w)
diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c
index 95fdf0b99eb..3cefe194466 100644
--- a/src/mame/drivers/rollrace.c
+++ b/src/mame/drivers/rollrace.c
@@ -23,7 +23,7 @@ static WRITE8_HANDLER( ra_fake_d800_w )
/* logerror("d900: %02X\n",data);*/
}
-static ADDRESS_MAP_START( rollrace_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rollrace_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROM /* only rollace2 */
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -49,7 +49,7 @@ static ADDRESS_MAP_START( rollrace_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rollrace_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rollrace_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x2000, 0x2fff) AM_RAM
AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r,interrupt_enable_w)
diff --git a/src/mame/drivers/rotaryf.c b/src/mame/drivers/rotaryf.c
index 524e9d35879..e03d288aa38 100644
--- a/src/mame/drivers/rotaryf.c
+++ b/src/mame/drivers/rotaryf.c
@@ -84,7 +84,7 @@ static SCREEN_UPDATE( rotaryf )
}
-static ADDRESS_MAP_START( rotaryf_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rotaryf_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_MIRROR(0x4000) AM_ROM
// AM_RANGE(0x6ffb, 0x6ffb) AM_READ(random_r) ??
// AM_RANGE(0x6ffd, 0x6ffd) AM_READ(random_r) ??
@@ -94,7 +94,7 @@ static ADDRESS_MAP_START( rotaryf_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xa1ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rotaryf_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rotaryf_io_map, AS_IO, 8 )
// AM_RANGE(0x00, 0x00) AM_READ_PORT("UNK")
AM_RANGE(0x21, 0x21) AM_READ_PORT("COIN")
AM_RANGE(0x26, 0x26) AM_READ_PORT("DSW")
diff --git a/src/mame/drivers/roul.c b/src/mame/drivers/roul.c
index a2a13131c69..6b5979b37e8 100644
--- a/src/mame/drivers/roul.c
+++ b/src/mame/drivers/roul.c
@@ -177,12 +177,12 @@ static WRITE8_HANDLER( ball_w )
state->lamp_old = lamp;
}
-static ADDRESS_MAP_START( roul_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( roul_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( roul_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( roul_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xf0, 0xf4) AM_WRITE(blitter_cmd_w)
AM_RANGE(0xf5, 0xf5) AM_READ(blitter_status_r)
@@ -193,12 +193,12 @@ static ADDRESS_MAP_START( roul_cpu_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xfe, 0xfe) AM_WRITE(sound_latch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x13ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c
index 48644b148a5..ad3769fa598 100644
--- a/src/mame/drivers/route16.c
+++ b/src/mame/drivers/route16.c
@@ -220,7 +220,7 @@ static WRITE8_HANDLER ( speakres_out2_w )
*
*************************************/
-static ADDRESS_MAP_START( route16_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( route16_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
/*AM_RANGE(0x3000, 0x3001) AM_NOP protection device */
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, route16_sharedram_w) AM_BASE_MEMBER(route16_state, sharedram)
@@ -231,7 +231,7 @@ static ADDRESS_MAP_START( route16_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( routex_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( routex_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, route16_sharedram_w) AM_BASE_MEMBER(route16_state, sharedram)
AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
@@ -242,7 +242,7 @@ static ADDRESS_MAP_START( routex_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( stratvox_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( stratvox_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE_MEMBER(route16_state, sharedram)
AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
@@ -252,7 +252,7 @@ static ADDRESS_MAP_START( stratvox_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( speakres_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( speakres_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE_MEMBER(route16_state, sharedram)
AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
@@ -263,7 +263,7 @@ static ADDRESS_MAP_START( speakres_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ttmahjng_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ttmahjng_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE_MEMBER(route16_state, sharedram)
AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
@@ -275,14 +275,14 @@ static ADDRESS_MAP_START( ttmahjng_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( route16_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( route16_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, route16_sharedram_w)
AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE_MEMBER(route16_state, videoram2)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( stratvox_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( stratvox_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2800, 0x2800) AM_DEVWRITE("dac", dac_w)
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, sharedram_w)
@@ -290,7 +290,7 @@ static ADDRESS_MAP_START( stratvox_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu1_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu1_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x1ff)
AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x00ff) AM_DEVWRITE("ay8910", ay8910_data_w)
AM_RANGE(0x0100, 0x0100) AM_MIRROR(0x00ff) AM_DEVWRITE("ay8910", ay8910_address_w)
diff --git a/src/mame/drivers/rowamet.c b/src/mame/drivers/rowamet.c
index bba1260edb1..9535051643c 100644
--- a/src/mame/drivers/rowamet.c
+++ b/src/mame/drivers/rowamet.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( rowamet_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rowamet_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index a1de0af2cd3..d5cb9142d5e 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -460,7 +460,7 @@ static WRITE8_HANDLER ( mjclub_bank_w )
}
-static ADDRESS_MAP_START( royalmah_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( royalmah_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM AM_WRITE( royalmah_rom_w )
AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x8000, 0xffff ) AM_ROMBANK( "bank1" ) // banked ROMs not present in royalmah
@@ -468,7 +468,7 @@ static ADDRESS_MAP_START( royalmah_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjapinky_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjapinky_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM AM_WRITE( royalmah_rom_w )
AM_RANGE( 0x7000, 0x77ff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x7800, 0x7fff ) AM_RAM
@@ -480,7 +480,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( royalmah_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( royalmah_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r )
AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w )
@@ -488,7 +488,7 @@ static ADDRESS_MAP_START( royalmah_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ippatsu_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ippatsu_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r )
AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w )
@@ -498,7 +498,7 @@ static ADDRESS_MAP_START( ippatsu_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x13, 0x13 ) AM_READ_PORT("DSW3")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( suzume_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( suzume_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r )
AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w )
@@ -508,7 +508,7 @@ static ADDRESS_MAP_START( suzume_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x81, 0x81 ) AM_WRITE( suzume_bank_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dondenmj_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dondenmj_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r )
AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w)
@@ -519,7 +519,7 @@ static ADDRESS_MAP_START( dondenmj_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x87, 0x87 ) AM_WRITE( dynax_bank_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( makaijan_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( makaijan_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r )
AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w)
@@ -530,7 +530,7 @@ static ADDRESS_MAP_START( makaijan_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x86, 0x86 ) AM_WRITE( dynax_bank_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( daisyari_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( daisyari_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r )
AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w)
@@ -539,7 +539,7 @@ static ADDRESS_MAP_START( daisyari_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0xc0, 0xc0 ) AM_READWRITE( daisyari_dsw_r, daisyari_bank_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjclub_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjclub_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x00 ) AM_READWRITE( mjclub_dsw_r, mjclub_bank_w )
AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r )
@@ -548,7 +548,7 @@ static ADDRESS_MAP_START( mjclub_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjdiplob_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjdiplob_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r )
AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w )
@@ -559,7 +559,7 @@ static ADDRESS_MAP_START( mjdiplob_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x63, 0x63 ) AM_READ_PORT("DSW3") // DSW3
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tontonb_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tontonb_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r )
AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w )
@@ -570,7 +570,7 @@ static ADDRESS_MAP_START( tontonb_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x47, 0x47 ) AM_READ_PORT("DSW3") // DSW3
ADDRESS_MAP_END
-static ADDRESS_MAP_START( majs101b_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( majs101b_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r )
AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w )
@@ -579,7 +579,7 @@ static ADDRESS_MAP_START( majs101b_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x00, 0x00 ) AM_READWRITE( majs101b_dsw_r, dynax_bank_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjderngr_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjderngr_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r )
AM_RANGE( 0x02, 0x03 ) AM_DEVWRITE( "aysnd", ay8910_data_address_w )
@@ -592,7 +592,7 @@ static ADDRESS_MAP_START( mjderngr_iomap, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x60, 0x60 ) AM_WRITE( mjderngr_palbank_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjapinky_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjapinky_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x00 ) AM_WRITE( mjapinky_bank_w )
AM_RANGE( 0x01, 0x01 ) AM_DEVREAD( "aysnd", ay8910_r )
@@ -603,7 +603,7 @@ static ADDRESS_MAP_START( mjapinky_iomap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( janho_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( janho_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM AM_WRITE( royalmah_rom_w )
AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x8000, 0xffff ) AM_WRITEONLY AM_BASE_MEMBER(royalmah_state, videoram)
@@ -613,7 +613,7 @@ ADDRESS_MAP_END
/* this CPU makes little sense - what is it for? why so many addresses accessed?
-- it puts a value in shared ram to allow the main CPU to boot, then.. ?
*/
-static ADDRESS_MAP_START( janoh_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( janoh_sub_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x3fff ) AM_ROM
AM_RANGE( 0x4100, 0x413f ) AM_RAM
AM_RANGE( 0x6000, 0x607f ) AM_RAM
@@ -622,7 +622,7 @@ static ADDRESS_MAP_START( janoh_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0xf000, 0xffff ) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( janoh_sub_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( janoh_sub_iomap, AS_IO, 8 )
ADDRESS_MAP_END
/****************************************************************************
@@ -718,7 +718,7 @@ static WRITE8_HANDLER( jansou_sound_w )
-static ADDRESS_MAP_START( jansou_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jansou_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x3fff ) AM_ROM
AM_RANGE( 0x6000, 0x600f ) AM_WRITE(jansou_colortable_w)
@@ -736,12 +736,12 @@ static ADDRESS_MAP_START( jansou_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x8000, 0xffff ) AM_WRITEONLY AM_BASE_MEMBER(royalmah_state, videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jansou_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jansou_sub_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0xffff ) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jansou_sub_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jansou_sub_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) AM_DEVWRITE( "dac", dac_w )
ADDRESS_MAP_END
@@ -751,7 +751,7 @@ ADDRESS_MAP_END
Janputer '96
****************************************************************************/
-static ADDRESS_MAP_START( janptr96_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( janptr96_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff) AM_ROM
AM_RANGE( 0x6000, 0x6fff ) AM_RAMBANK("bank3") AM_SHARE("nvram") // nvram
AM_RANGE( 0x7000, 0x7fff ) AM_RAMBANK("bank2") // banked nvram
@@ -809,7 +809,7 @@ static WRITE8_HANDLER( janptr96_coin_counter_w )
coin_counter_w(space->machine, 1,data & 1); // out
}
-static ADDRESS_MAP_START( janptr96_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( janptr96_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x00 ) AM_WRITE( janptr96_rombank_w ) // BANK ROM Select
AM_RANGE( 0x1e, 0x1e ) AM_READWRITE( janptr96_dswsel_r, janptr96_dswsel_w )
@@ -892,7 +892,7 @@ static WRITE8_HANDLER( mjifb_videoram_w )
videoram[offset + 0x4000] = data;
}
-static ADDRESS_MAP_START( mjifb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjifb_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM
AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x8000, 0xbfff ) AM_READWRITE(mjifb_rom_io_r, mjifb_rom_io_w) AM_BASE_MEMBER(royalmah_state, videoram)
@@ -937,7 +937,7 @@ static WRITE8_HANDLER( mjifb_p8_w )
state->mjifb_rom_enable = (data & 0x08);
}
-static ADDRESS_MAP_START( mjifb_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjifb_iomap, AS_IO, 8 )
AM_RANGE( T90_P3, T90_P3 ) AM_READWRITE( mjifb_p3_r, mjifb_p3_w )
AM_RANGE( T90_P4, T90_P4 ) AM_WRITE( mjifb_p4_w )
AM_RANGE( T90_P5, T90_P5 ) AM_READ ( mjifb_p5_r )
@@ -997,7 +997,7 @@ static WRITE8_HANDLER( mjdejavu_rom_io_w )
logerror("%04X: unmapped input write at %04X = %02X\n", cpu_get_pc(space->cpu), offset,data);
}
-static ADDRESS_MAP_START( mjdejavu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjdejavu_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x6fff ) AM_ROM
AM_RANGE( 0x7000, 0x7fff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x8000, 0xbfff ) AM_READWRITE(mjdejavu_rom_io_r, mjdejavu_rom_io_w) AM_BASE_MEMBER(royalmah_state, videoram)
@@ -1032,7 +1032,7 @@ static WRITE8_HANDLER( mjtensin_6ff3_w )
mjtensin_update_rombank(space->machine);
}
-static ADDRESS_MAP_START( mjtensin_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjtensin_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x6fbf ) AM_RAM
AM_RANGE( 0x6fc1, 0x6fc1 ) AM_DEVREAD( "aysnd", ay8910_r )
@@ -1048,7 +1048,7 @@ static ADDRESS_MAP_START( mjtensin_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x8000, 0xffff ) AM_WRITEONLY AM_BASE_MEMBER(royalmah_state, videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjtensin_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjtensin_iomap, AS_IO, 8 )
AM_RANGE( T90_P3, T90_P3 ) AM_READ ( mjtensin_p3_r )
AM_RANGE( T90_P4, T90_P4 ) AM_WRITE( mjtensin_p4_w )
ADDRESS_MAP_END
@@ -1105,7 +1105,7 @@ static WRITE8_HANDLER( cafetime_7fe3_w )
// popmessage("%02x",data);
}
-static ADDRESS_MAP_START( cafetime_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cafetime_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x5fff ) AM_ROM
AM_RANGE( 0x6000, 0x7eff ) AM_RAM AM_SHARE("nvram")
AM_RANGE( 0x7fc1, 0x7fc1 ) AM_DEVREAD( "aysnd", ay8910_r )
@@ -1124,7 +1124,7 @@ static ADDRESS_MAP_START( cafetime_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cafetime_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cafetime_iomap, AS_IO, 8 )
AM_RANGE( T90_P3, T90_P3 ) AM_WRITE( cafetime_p3_w )
AM_RANGE( T90_P4, T90_P4 ) AM_WRITE( cafetime_p4_w )
ADDRESS_MAP_END
@@ -1243,7 +1243,7 @@ static READ8_HANDLER( mjvegasa_12500_r )
return 0xff;
}
-static ADDRESS_MAP_START( mjvegasa_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mjvegasa_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x05fff ) AM_ROM
AM_RANGE( 0x06000, 0x07fff ) AM_RAM AM_SHARE("nvram")
@@ -1264,7 +1264,7 @@ static ADDRESS_MAP_START( mjvegasa_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjvegasa_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mjvegasa_iomap, AS_IO, 8 )
AM_RANGE( T90_P3, T90_P3 ) AM_READWRITE( mjtensin_p3_r, mjvegasa_p3_w )
AM_RANGE( T90_P4, T90_P4 ) AM_WRITE( mjvegasa_p4_w )
ADDRESS_MAP_END
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index 61714c5aad9..d93362fc3fa 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -223,7 +223,7 @@ static WRITE8_DEVICE_HANDLER( upd_data_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x04ffff) AM_RAM AM_BASE_MEMBER(rpunch_state, bitmapram) AM_SIZE_MEMBER(rpunch_state, bitmapram_size)
@@ -251,7 +251,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0xf200, 0xf200) AM_READ(sound_command_r)
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index 33fba05f8ff..fac9970254b 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -81,7 +81,7 @@ static WRITE8_HANDLER( runaway_irq_ack_w )
}
-static ADDRESS_MAP_START( runaway_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( runaway_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x07bf) AM_RAM_WRITE(runaway_video_ram_w) AM_BASE_MEMBER(runaway_state, video_ram)
AM_RANGE(0x07c0, 0x07ff) AM_RAM AM_BASE_MEMBER(runaway_state, sprite_ram)
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index d014fe6bada..b4637119270 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -182,7 +182,7 @@ static INTERRUPT_GEN(rng_interrupt)
device_set_input_line(device, M68K_IRQ_5, ASSERT_LINE);
}
-static ADDRESS_MAP_START( rungun_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rungun_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x2fffff) AM_ROM // main program + data
AM_RANGE(0x300000, 0x3007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x380000, 0x39ffff) AM_RAM // work RAM
@@ -243,7 +243,7 @@ static INTERRUPT_GEN(audio_interrupt)
/* sound (this should be split into audio/xexex.c or pregx.c or so someday) */
-static ADDRESS_MAP_START( rungun_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rungun_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
AM_RANGE(0xc000, 0xdfff) AM_RAM
diff --git a/src/mame/drivers/s11.c b/src/mame/drivers/s11.c
index d194f52f0e5..42830dfb647 100644
--- a/src/mame/drivers/s11.c
+++ b/src/mame/drivers/s11.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( williams_s11_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_s11_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/s11a.c b/src/mame/drivers/s11a.c
index 2a9142f3745..f783cc197dc 100644
--- a/src/mame/drivers/s11a.c
+++ b/src/mame/drivers/s11a.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( williams_s11a_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_s11a_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/s11b.c b/src/mame/drivers/s11b.c
index 53ed8050141..63de9ca5cab 100644
--- a/src/mame/drivers/s11b.c
+++ b/src/mame/drivers/s11b.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( williams_s11b_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_s11b_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/s11c.c b/src/mame/drivers/s11c.c
index b931ae8487e..9ed9689ac04 100644
--- a/src/mame/drivers/s11c.c
+++ b/src/mame/drivers/s11c.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( williams_s11c_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_s11c_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/s3.c b/src/mame/drivers/s3.c
index 3c6302ff11c..650e3010d5c 100644
--- a/src/mame/drivers/s3.c
+++ b/src/mame/drivers/s3.c
@@ -13,7 +13,7 @@ public:
: driver_device(machine, config) { }
};
-static ADDRESS_MAP_START( williams_s3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_s3_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x6000, 0x67ff) AM_ROM
diff --git a/src/mame/drivers/s4.c b/src/mame/drivers/s4.c
index 4856dce4fd2..6f300cc09b8 100644
--- a/src/mame/drivers/s4.c
+++ b/src/mame/drivers/s4.c
@@ -13,7 +13,7 @@ public:
: driver_device(machine, config) { }
};
-static ADDRESS_MAP_START( williams_s4_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_s4_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/s6.c b/src/mame/drivers/s6.c
index 0682caec453..ab1bdcdfe08 100644
--- a/src/mame/drivers/s6.c
+++ b/src/mame/drivers/s6.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( williams_s6_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_s6_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/s6a.c b/src/mame/drivers/s6a.c
index 77d94a56466..a3ea9de95a1 100644
--- a/src/mame/drivers/s6a.c
+++ b/src/mame/drivers/s6a.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( williams_s6a_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_s6a_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/s7.c b/src/mame/drivers/s7.c
index 7c99bc1d7f9..f6989a63ae0 100644
--- a/src/mame/drivers/s7.c
+++ b/src/mame/drivers/s7.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( williams_s7_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_s7_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/s8.c b/src/mame/drivers/s8.c
index fc5bbbad3e5..bcc17a26d6d 100644
--- a/src/mame/drivers/s8.c
+++ b/src/mame/drivers/s8.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( williams_s8_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_s8_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/s9.c b/src/mame/drivers/s9.c
index 3b500cee19d..66b65f20dfe 100644
--- a/src/mame/drivers/s9.c
+++ b/src/mame/drivers/s9.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( williams_s9_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_s9_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c
index e54be560cda..b547c762ca8 100644
--- a/src/mame/drivers/safarir.c
+++ b/src/mame/drivers/safarir.c
@@ -145,7 +145,7 @@ static PALETTE_INIT( safarir )
static TILE_GET_INFO( get_bg_tile_info )
{
int color;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 code = ram_r(space,tile_index | 0x400);
if (code & 0x80)
@@ -167,7 +167,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static TILE_GET_INFO( get_fg_tile_info )
{
int color, flags;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 code = ram_r(space,tile_index);
@@ -336,7 +336,7 @@ static MACHINE_START( safarir )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_READWRITE(ram_r, ram_w) AM_SIZE_MEMBER(safarir_state,ram_size)
AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_READNOP AM_WRITE(ram_bank_w)
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index b52dce49597..bd356055e7d 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -221,7 +221,7 @@ static WRITE16_HANDLER( sandscrp_soundlatch_word_w )
}
}
-static ADDRESS_MAP_START( sandscrp, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sandscrp, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x100001) AM_WRITE(sandscrp_irq_cause_w) // IRQ Ack
@@ -285,13 +285,13 @@ static WRITE8_HANDLER( sandscrp_soundlatch_w )
soundlatch2_w(space,0,data);
}
-static ADDRESS_MAP_START( sandscrp_soundmem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sandscrp_soundmem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM // RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sandscrp_soundport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sandscrp_soundport, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(sandscrp_bankswitch_w) // ROM Bank
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w) // PORTA/B read
diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c
index cc9deb262b5..cc0e9bd93d0 100644
--- a/src/mame/drivers/sangho.c
+++ b/src/mame/drivers/sangho.c
@@ -66,20 +66,20 @@ static void pzlestar_map_banks(running_machine *machine)
switch(slot_select)
{
case 0:
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1");
- memory_install_write_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank5");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1");
+ memory_install_write_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank5");
memory_set_bankptr(machine, "bank1", state->ram);
memory_set_bankptr(machine, "bank5", state->ram);
break;
case 2:
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1");
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0);
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1");
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x3fff, 0, 0);
memory_set_bankptr(machine, "bank1", machine->region("user1")->base()+ 0x10000);
break;
case 1:
case 3:
- memory_unmap_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0);
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0);
+ memory_unmap_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x3fff, 0, 0);
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x3fff, 0, 0);
break;
}
@@ -88,24 +88,24 @@ static void pzlestar_map_banks(running_machine *machine)
switch(slot_select)
{
case 0:
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank2");
- memory_install_write_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank6");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank2");
+ memory_install_write_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank6");
memory_set_bankptr(machine, "bank2", state->ram + 0x4000);
memory_set_bankptr(machine, "bank6", state->ram + 0x4000);
break;
case 2:
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank2");
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0);
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank2");
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x7fff, 0, 0);
memory_set_bankptr(machine, "bank2", machine->region("user1")->base()+ 0x18000);
break;
case 3:
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank2");
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0);
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank2");
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x7fff, 0, 0);
memory_set_bankptr(machine, "bank2", machine->region("user1")->base()+ 0x20000 + (state->pzlestar_rom_bank*0x8000) + 0x4000);
break;
case 1:
- memory_unmap_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0);
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0);
+ memory_unmap_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x7fff, 0, 0);
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x7fff, 0, 0);
break;
}
@@ -114,20 +114,20 @@ static void pzlestar_map_banks(running_machine *machine)
switch(slot_select)
{
case 0:
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank3");
- memory_install_write_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank7");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank3");
+ memory_install_write_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank7");
memory_set_bankptr(machine, "bank3", state->ram + 0x8000);
memory_set_bankptr(machine, "bank7", state->ram + 0x8000);
break;
case 3:
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank3");
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0);
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank3");
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xbfff, 0, 0);
memory_set_bankptr(machine, "bank3", machine->region("user1")->base()+ 0x20000 + (state->pzlestar_rom_bank*0x8000));
break;
case 1:
case 2:
- memory_unmap_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0);
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0);
+ memory_unmap_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xbfff, 0, 0);
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xbfff, 0, 0);
break;
}
@@ -136,16 +136,16 @@ static void pzlestar_map_banks(running_machine *machine)
switch(slot_select)
{
case 0:
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0, "bank4");
- memory_install_write_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0, "bank8");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc000, 0xffff, 0, 0, "bank4");
+ memory_install_write_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc000, 0xffff, 0, 0, "bank8");
memory_set_bankptr(machine, "bank4", state->ram + 0xc000);
memory_set_bankptr(machine, "bank8", state->ram + 0xc000);
break;
case 1:
case 2:
case 3:
- memory_unmap_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0);
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0);
+ memory_unmap_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc000, 0xffff, 0, 0);
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc000, 0xffff, 0, 0);
break;
}
@@ -190,25 +190,25 @@ static void sexyboom_map_bank(running_machine *machine, int bank)
{
// ram
memory_set_bankptr(machine, read_bank_name, &state->ram[(banknum & 0x7f) * 0x4000]);
- memory_install_write_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), bank*0x4000, (bank+1)*0x4000 - 1, 0, 0, write_bank_name );
+ memory_install_write_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), bank*0x4000, (bank+1)*0x4000 - 1, 0, 0, write_bank_name );
memory_set_bankptr(machine, write_bank_name, &state->ram[(banknum & 0x7f) * 0x4000]);
}
else
{
// rom 0
memory_set_bankptr(machine, read_bank_name, machine->region("user1")->base()+0x4000*banknum);
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), bank*0x4000, (bank+1)*0x4000 - 1, 0, 0);
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), bank*0x4000, (bank+1)*0x4000 - 1, 0, 0);
}
}
else if (banktype == 0x82)
{
memory_set_bankptr(machine, read_bank_name, machine->region("user1")->base()+0x20000+banknum*0x4000);
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), bank*0x4000, (bank+1)*0x4000 - 1, 0, 0);
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), bank*0x4000, (bank+1)*0x4000 - 1, 0, 0);
}
else if (banktype == 0x80)
{
memory_set_bankptr(machine, read_bank_name, machine->region("user1")->base()+0x120000+banknum*0x4000);
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), bank*0x4000, (bank+1)*0x4000 - 1, 0, 0);
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), bank*0x4000, (bank+1)*0x4000 - 1, 0, 0);
}
else
{
@@ -223,7 +223,7 @@ static WRITE8_HANDLER(sexyboom_bank_w)
sexyboom_map_bank(space->machine, offset>>1);
}
-static ADDRESS_MAP_START( sangho_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sangho_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_READ_BANK("bank1") AM_WRITE_BANK("bank5")
AM_RANGE(0x4000, 0x7fff) AM_READ_BANK("bank2") AM_WRITE_BANK("bank6")
AM_RANGE(0x8000, 0xbfff) AM_READ_BANK("bank3") AM_WRITE_BANK("bank7")
@@ -232,7 +232,7 @@ ADDRESS_MAP_END
/* Puzzle Star Ports */
-static ADDRESS_MAP_START( pzlestar_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pzlestar_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x7c, 0x7d) AM_DEVWRITE( "ymsnd", ym2413_w )
AM_RANGE( 0x91, 0x91) AM_WRITE( pzlestar_bank_w )
@@ -248,7 +248,7 @@ ADDRESS_MAP_END
/* Sexy Boom Ports */
-static ADDRESS_MAP_START( sexyboom_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sexyboom_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x7c, 0x7d) AM_DEVWRITE( "ymsnd", ym2413_w )
AM_RANGE( 0xa0, 0xa0) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index 91946ef335e..8c41728fb87 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -163,7 +163,7 @@ static WRITE8_DEVICE_HANDLER( adpcm_w )
sp0256_ALD_w(device, 0, data);
}
-static ADDRESS_MAP_START( sauro_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sauro_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xe800, 0xebff) AM_RAM AM_BASE_SIZE_MEMBER(sauro_state, spriteram, spriteram_size)
@@ -173,7 +173,7 @@ static ADDRESS_MAP_START( sauro_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc00, 0xffff) AM_RAM_WRITE(tecfri_colorram2_w) AM_BASE_MEMBER(sauro_state, colorram2)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sauro_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sauro_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1")
AM_RANGE(0x20, 0x20) AM_READ_PORT("DSW2")
@@ -198,7 +198,7 @@ static ADDRESS_MAP_START( sauro_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xe0, 0xe0) AM_WRITE(watchdog_reset_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sauro_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sauro_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ymsnd", ym3812_w)
@@ -209,7 +209,7 @@ static ADDRESS_MAP_START( sauro_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( trckydoc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( trckydoc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xe800, 0xebff) AM_RAM AM_MIRROR(0x400) AM_BASE_SIZE_MEMBER(sauro_state, spriteram, spriteram_size)
diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c
index 3c8908e4bcd..1029e936ecf 100644
--- a/src/mame/drivers/savquest.c
+++ b/src/mame/drivers/savquest.c
@@ -53,12 +53,12 @@ static SCREEN_UPDATE(savquest)
return 0;
}
-static ADDRESS_MAP_START(savquest_map, ADDRESS_SPACE_PROGRAM, 32)
+static ADDRESS_MAP_START(savquest_map, AS_PROGRAM, 32)
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0xfffc0000, 0xffffffff) AM_ROM AM_REGION("user1", 0) /* System BIOS */
ADDRESS_MAP_END
-static ADDRESS_MAP_START(savquest_io, ADDRESS_SPACE_IO, 32)
+static ADDRESS_MAP_START(savquest_io, AS_IO, 32)
ADDRESS_MAP_END
static INPUT_PORTS_START( savquest )
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index 258c8105c8a..403b0b67d3c 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -61,7 +61,7 @@ static WRITE8_HANDLER( sbasketb_coin_counter_w )
}
-static ADDRESS_MAP_START( sbasketb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sbasketb_map, AS_PROGRAM, 8 )
AM_RANGE(0x2000, 0x2fff) AM_RAM
AM_RANGE(0x3000, 0x33ff) AM_RAM_WRITE(sbasketb_colorram_w) AM_BASE_MEMBER(sbasketb_state, colorram)
AM_RANGE(0x3400, 0x37ff) AM_RAM_WRITE(sbasketb_videoram_w) AM_BASE_MEMBER(sbasketb_state, videoram)
@@ -86,7 +86,7 @@ static ADDRESS_MAP_START( sbasketb_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sbasketb_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sbasketb_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index cbbe27c9562..43a5316d740 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -210,7 +210,7 @@ static READ8_HANDLER (controls_r)
return input_port_read(space->machine, "TRACKX");
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAM_WRITE(sbw_videoram_w) AM_BASE_MEMBER(sbowling_state,videoram)
AM_RANGE(0xf800, 0xf801) AM_DEVWRITE("aysnd", ay8910_address_data_w)
@@ -219,7 +219,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(watchdog_reset_w)
AM_RANGE(0x01, 0x01) AM_READWRITE(controls_r, pix_data_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(pix_data_r, pix_shift_w)
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index cf4557761d8..bb3980bb5e9 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -349,7 +349,7 @@ static SCREEN_UPDATE( sbrkout )
*************************************/
/* full memory map derived from schematics */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x380) AM_RAMBANK("bank1")
AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(sbrkout_videoram_w) AM_BASE_MEMBER(sbrkout_state, videoram)
diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c
index e5a009cb06c..9a05dc562ac 100644
--- a/src/mame/drivers/sbugger.c
+++ b/src/mame/drivers/sbugger.c
@@ -109,7 +109,7 @@ Sound PCB
/* memory maps */
-static ADDRESS_MAP_START( sbugger_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sbugger_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x37ff) AM_ROM
AM_RANGE(0xc800, 0xcbff) AM_RAM_WRITE(sbugger_videoram_attr_w) AM_BASE_MEMBER(sbugger_state,videoram_attr)
AM_RANGE(0xcc00, 0xcfff) AM_RAM_WRITE(sbugger_videoram_w) AM_BASE_MEMBER(sbugger_state,videoram)
@@ -117,7 +117,7 @@ static ADDRESS_MAP_START( sbugger_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf400, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sbugger_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sbugger_io_map, AS_IO, 8 )
AM_RANGE(0xe0, 0xe0) AM_WRITENOP // 8156 command/status reg (write c0 = command START = (start of timer)
AM_RANGE(0xe1, 0xe1) AM_READ_PORT("INPUTS") // 8156 PA
AM_RANGE(0xe2, 0xe2) AM_READ_PORT("DSW1") // 8156 PB
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index cef90a9bc5d..78f6eb54fe5 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -112,7 +112,7 @@ static WRITE8_DEVICE_HANDLER(hustler_ppi8255_w)
ppi8255_w(device, offset >> 3, data);
}
-static ADDRESS_MAP_START( type1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( type1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -132,7 +132,7 @@ static ADDRESS_MAP_START( type1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb000, 0xb000) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( type2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( type2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x883f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(&galaxold_attributesram)
@@ -152,7 +152,7 @@ static ADDRESS_MAP_START( type2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb00e, 0xb00e) AM_WRITE(galaxold_flip_screen_x_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hustler_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hustler_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -169,7 +169,7 @@ static ADDRESS_MAP_START( hustler_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe01f) AM_DEVREADWRITE("ppi8255_1", hustler_ppi8255_r, hustler_ppi8255_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hustlerb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hustlerb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -186,7 +186,7 @@ static ADDRESS_MAP_START( hustlerb_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc200, 0xc203) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mimonkey_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mimonkey_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -218,7 +218,7 @@ static WRITE8_HANDLER(scobra_soundram_w)
state->soundram[offset & 0x03ff] = data;
}
-static ADDRESS_MAP_START( scobra_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( scobra_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_READWRITE(scobra_soundram_r, scobra_soundram_w)
AM_RANGE(0x8000, 0x83ff) AM_WRITENOP AM_BASE_MEMBER(scobra_state, soundram) /* only here to initialize pointer */
@@ -226,14 +226,14 @@ static ADDRESS_MAP_START( scobra_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hustlerb_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hustlerb_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_WRITE(frogger_filter_w)
AM_RANGE(0x8000, 0x8fff) AM_RAM_READ(scobra_soundram_r) AM_BASE_MEMBER(scobra_state, soundram) /* only here to initialize pointer */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( scobra_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( scobra_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_DEVWRITE("ay1", ay8910_address_w)
AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w)
@@ -241,20 +241,20 @@ static ADDRESS_MAP_START( scobra_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hustler_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hustler_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x6000, 0x6fff) AM_WRITE(frogger_filter_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hustler_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hustler_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x40) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w)
AM_RANGE(0x80, 0x80) AM_DEVWRITE("aysnd", ay8910_address_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hustlerb_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hustlerb_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x40) AM_DEVWRITE("aysnd", ay8910_address_w)
AM_RANGE(0x80, 0x80) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w)
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index c66bca9f3a9..9701792f22a 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -61,7 +61,7 @@ static WRITE8_HANDLER( scotrsht_soundlatch_w )
cputag_set_input_line(space->machine, "audiocpu", 0, HOLD_LINE);
}
-static ADDRESS_MAP_START( scotrsht_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( scotrsht_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(scotrsht_colorram_w) AM_BASE_MEMBER(scotrsht_state, colorram)
AM_RANGE(0x0800, 0x0fff) AM_RAM_WRITE(scotrsht_videoram_w) AM_BASE_MEMBER(scotrsht_state, videoram)
AM_RANGE(0x1000, 0x10bf) AM_RAM AM_BASE_SIZE_MEMBER(scotrsht_state, spriteram, spriteram_size) /* sprites */
@@ -85,13 +85,13 @@ static ADDRESS_MAP_START( scotrsht_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( scotrsht_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( scotrsht_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x8000, 0x8000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( scotrsht_sound_port, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( scotrsht_sound_port, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index b717b2dbeb2..57453210abe 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -37,7 +37,7 @@ Notes:
-static ADDRESS_MAP_START( scramble_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( scramble_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -59,7 +59,7 @@ static ADDRESS_MAP_START( scramble_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( turpins_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( turpins_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -89,7 +89,7 @@ static ADDRESS_MAP_START( turpins_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_READONLY
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ckongs_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ckongs_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6bff) AM_RAM
AM_RANGE(0x7000, 0x7003) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
@@ -118,7 +118,7 @@ static WRITE8_DEVICE_HANDLER(mars_ppi8255_w)
}
-static ADDRESS_MAP_START( mars_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mars_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START( mars_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( newsin7_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( newsin7_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -162,7 +162,7 @@ static ADDRESS_MAP_START( newsin7_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mrkougar_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mrkougar_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -182,7 +182,7 @@ static ADDRESS_MAP_START( mrkougar_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hotshock_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hotshock_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x4800, 0x4bff) AM_RAM_WRITE(galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -206,7 +206,7 @@ static ADDRESS_MAP_START( hotshock_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hunchbks_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hunchbks_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1210, 0x1213) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
AM_RANGE(0x1400, 0x143f) AM_RAM_WRITE(galaxold_attributesram_w) AM_BASE(&galaxold_attributesram)
@@ -229,7 +229,7 @@ static ADDRESS_MAP_START( hunchbks_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mimonscr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mimonscr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) /* mirror address?, probably not */
AM_RANGE(0x4400, 0x47ff) AM_RAM
@@ -249,7 +249,7 @@ static ADDRESS_MAP_START( mimonscr_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ad2083_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ad2083_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x4800, 0x4bff) AM_READWRITE(galaxold_videoram_r, galaxold_videoram_w) AM_BASE(&galaxold_videoram)
@@ -275,7 +275,7 @@ static ADDRESS_MAP_START( ad2083_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe800, 0xebff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( triplep_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( triplep_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("8910.1", ay8910_data_address_w)
AM_RANGE(0x01, 0x01) AM_DEVREAD("8910.1", ay8910_r)
@@ -283,7 +283,7 @@ static ADDRESS_MAP_START( triplep_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x03, 0x03) AM_READ(triplep_pap_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hotshock_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hotshock_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_DEVWRITE("8910.1", ay8910_address_w)
AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("8910.1", ay8910_r, ay8910_data_w)
@@ -299,7 +299,7 @@ static READ8_HANDLER( hncholms_prot_r )
return 0;
}
-static ADDRESS_MAP_START( hunchbks_readport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hunchbks_readport, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ(hncholms_prot_r)
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE")
ADDRESS_MAP_END
@@ -1218,14 +1218,14 @@ static WRITE8_HANDLER(scramble_soundram_w)
scramble_soundram[offset & 0x03ff] = data;
}
-static ADDRESS_MAP_START( scramble_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( scramble_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_READWRITE(scramble_soundram_r, scramble_soundram_w)
AM_RANGE(0x8000, 0x83ff) AM_WRITENOP AM_BASE(&scramble_soundram) /* only here to initialize pointer */
AM_RANGE(0x9000, 0x9fff) AM_WRITE(scramble_filter_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( scramble_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( scramble_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_DEVWRITE("8910.1", ay8910_address_w)
AM_RANGE(0x20, 0x20) AM_DEVREADWRITE("8910.1", ay8910_r, ay8910_data_w)
diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c
index ab074e230dc..8554194695b 100644
--- a/src/mame/drivers/scregg.c
+++ b/src/mame/drivers/scregg.c
@@ -55,7 +55,7 @@ it as ASCII text.
#include "includes/btime.h"
-static ADDRESS_MAP_START( dommy_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dommy_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x2000, 0x23ff) AM_RAM AM_BASE_SIZE_MEMBER(btime_state, videoram, videoram_size)
AM_RANGE(0x2400, 0x27ff) AM_RAM AM_BASE_MEMBER(btime_state, colorram)
@@ -71,7 +71,7 @@ static ADDRESS_MAP_START( dommy_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( eggs_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( eggs_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1000, 0x13ff) AM_RAM AM_BASE_SIZE_MEMBER(btime_state, videoram, videoram_size)
AM_RANGE(0x1400, 0x17ff) AM_RAM AM_BASE_MEMBER(btime_state, colorram)
diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c
index e111a7e5961..e69895799fb 100644
--- a/src/mame/drivers/sderby.c
+++ b/src/mame/drivers/sderby.c
@@ -274,7 +274,7 @@ static WRITE16_HANDLER( roulette_out_w )
* Memory Maps *
***************************/
-static ADDRESS_MAP_START( sderby_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sderby_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(sderby_videoram_w) AM_BASE_MEMBER(sderby_state,videoram) /* bg */
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(sderby_md_videoram_w) AM_BASE_MEMBER(sderby_state,md_videoram) /* mid */
@@ -292,7 +292,7 @@ static ADDRESS_MAP_START( sderby_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffc000, 0xffffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spacewin_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( spacewin_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(sderby_videoram_w) AM_BASE_MEMBER(sderby_state,videoram) /* bg */
AM_RANGE(0x101000, 0x101fff) AM_RAM_WRITE(sderby_md_videoram_w) AM_BASE_MEMBER(sderby_state,md_videoram) /* mid */
@@ -313,7 +313,7 @@ static ADDRESS_MAP_START( spacewin_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x8fc000, 0x8fffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( roulette_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( roulette_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x440000, 0x440fff) AM_WRITEONLY AM_BASE_MEMBER(sderby_state,spriteram) AM_SIZE_MEMBER(sderby_state,spriteram_size)
AM_RANGE(0x500000, 0x500fff) AM_RAM_WRITE(sderby_videoram_w) AM_BASE_MEMBER(sderby_state,videoram) /* bg */
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index 510a88d4338..d19b4581159 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -1371,7 +1371,7 @@ static void voodoo_stall(device_t *device, int stall)
for (which = 0; which < 4; which++)
if (state->galileo.dma_stalled_on_voodoo[which])
{
- address_space *space = device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 */
@@ -1553,7 +1553,7 @@ static READ32_DEVICE_HANDLER( widget_r )
break;
case WREG_ANALOG:
- result = analog_port_r(device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0, mem_mask);
+ result = analog_port_r(device->machine->device("maincpu")->memory().space(AS_PROGRAM), 0, mem_mask);
break;
case WREG_ETHER_DATA:
@@ -1585,7 +1585,7 @@ static WRITE32_DEVICE_HANDLER( widget_w )
break;
case WREG_ANALOG:
- analog_port_w(device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0, data, mem_mask);
+ analog_port_w(device->machine->device("maincpu")->memory().space(AS_PROGRAM), 0, data, mem_mask);
break;
case WREG_ETHER_DATA:
@@ -1761,7 +1761,7 @@ static READ32_DEVICE_HANDLER( seattle_ide_r )
return ide_controller32_r(device, offset, mem_mask);
}
-static ADDRESS_MAP_START( seattle_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( seattle_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE_MEMBER(seattle_state, rambase) // wg3dh only has 4MB; sfrush, blitz99 8MB
AM_RANGE(0x08000000, 0x08ffffff) AM_DEVREAD("voodoo", voodoo_r) AM_WRITE(seattle_voodoo_w)
@@ -2821,22 +2821,22 @@ static void init_common(running_machine *machine, int ioasic, int serialnum, int
{
case PHOENIX_CONFIG:
/* original Phoenix board only has 4MB of RAM */
- memory_unmap_readwrite(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00400000, 0x007fffff, 0, 0);
+ memory_unmap_readwrite(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00400000, 0x007fffff, 0, 0);
break;
case SEATTLE_WIDGET_CONFIG:
/* set up the widget board */
device = machine->device("ethernet");
- memory_install_readwrite32_device_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), device, 0x16c00000, 0x16c0001f, 0, 0, widget_r, widget_w);
+ memory_install_readwrite32_device_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), device, 0x16c00000, 0x16c0001f, 0, 0, widget_r, widget_w);
break;
case FLAGSTAFF_CONFIG:
/* set up the analog inputs */
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x14000000, 0x14000003, 0, 0, analog_port_r, analog_port_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x14000000, 0x14000003, 0, 0, analog_port_r, analog_port_w);
/* set up the ethernet controller */
device = machine->device("ethernet");
- memory_install_readwrite32_device_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), device, 0x16c00000, 0x16c0003f, 0, 0, ethernet_r, ethernet_w);
+ memory_install_readwrite32_device_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), device, 0x16c00000, 0x16c0003f, 0, 0, ethernet_r, ethernet_w);
break;
}
}
@@ -2965,7 +2965,7 @@ static DRIVER_INIT( carnevil )
init_common(machine, MIDWAY_IOASIC_CARNEVIL, 469/* 469 or 486 or 528 */, 80, SEATTLE_CONFIG);
/* set up the gun */
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x16800000, 0x1680001f, 0, 0, carnevil_gun_r, carnevil_gun_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x16800000, 0x1680001f, 0, 0, carnevil_gun_r, carnevil_gun_w);
/* 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 91f1089c653..9acab5d29b5 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -602,7 +602,7 @@ static WRITE16_HANDLER( print_club_camera_w )
******************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x800000, 0x800001) AM_MIRROR(0x13fdfe) AM_READWRITE(prot_r, prot_w)
AM_RANGE(0x800200, 0x800201) AM_MIRROR(0x13fdfe) AM_WRITE(control_w)
@@ -1830,7 +1830,7 @@ static void segac2_common_init(running_machine* machine, int (*func)(int in))
genesis_other_hacks = 0;
if (upd != NULL)
- memory_install_write16_device_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), upd, 0x880000, 0x880001, 0, 0x13fefe, segac2_upd7759_w);
+ memory_install_write16_device_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), upd, 0x880000, 0x880001, 0, 0x13fefe, segac2_upd7759_w);
}
@@ -2087,7 +2087,7 @@ static DRIVER_INIT( tfrceacb )
{
/* disable the palette bank switching from the protection chip */
segac2_common_init(machine, NULL);
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x800000, 0x800001, 0, 0);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x800000, 0x800001, 0, 0);
}
static DRIVER_INIT( borench )
@@ -2174,36 +2174,36 @@ static DRIVER_INIT( pclub )
{
segac2_common_init(machine, prot_func_pclub);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x880120, 0x880121, 0, 0, printer_r );/*Print Club Vol.1*/
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x880124, 0x880125, 0, 0, printer_r );/*Print Club Vol.2*/
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x880124, 0x880125, 0, 0, print_club_camera_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x880120, 0x880121, 0, 0, printer_r );/*Print Club Vol.1*/
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x880124, 0x880125, 0, 0, printer_r );/*Print Club Vol.2*/
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x880124, 0x880125, 0, 0, print_club_camera_w);
}
static DRIVER_INIT( pclubjv2 )
{
segac2_common_init(machine, prot_func_pclubjv2);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x880120, 0x880121, 0, 0, printer_r );/*Print Club Vol.1*/
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x880124, 0x880125, 0, 0, printer_r );/*Print Club Vol.2*/
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x880124, 0x880125, 0, 0, print_club_camera_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x880120, 0x880121, 0, 0, printer_r );/*Print Club Vol.1*/
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x880124, 0x880125, 0, 0, printer_r );/*Print Club Vol.2*/
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x880124, 0x880125, 0, 0, print_club_camera_w);
}
static DRIVER_INIT( pclubjv4 )
{
segac2_common_init(machine, prot_func_pclubjv4);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x880120, 0x880121, 0, 0, printer_r );/*Print Club Vol.1*/
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x880124, 0x880125, 0, 0, printer_r );/*Print Club Vol.2*/
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x880124, 0x880125, 0, 0, print_club_camera_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x880120, 0x880121, 0, 0, printer_r );/*Print Club Vol.1*/
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x880124, 0x880125, 0, 0, printer_r );/*Print Club Vol.2*/
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x880124, 0x880125, 0, 0, print_club_camera_w);
}
static DRIVER_INIT( pclubjv5 )
{
segac2_common_init(machine, prot_func_pclubjv5);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x880120, 0x880121, 0, 0, printer_r );/*Print Club Vol.1*/
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x880124, 0x880125, 0, 0, printer_r );/*Print Club Vol.2*/
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x880124, 0x880125, 0, 0, print_club_camera_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x880120, 0x880121, 0, 0, printer_r );/*Print Club Vol.1*/
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x880124, 0x880125, 0, 0, printer_r );/*Print Club Vol.2*/
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x880124, 0x880125, 0, 0, print_club_camera_w);
}
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index 2c58d1de4b2..274abc5b822 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -311,7 +311,7 @@ covert megatech / megaplay drivers to use new code etc. etc.
static UINT8 f7_bank_value;
/* we have to fill in the ROM addresses for systeme due to the encrypted games */
-static ADDRESS_MAP_START( systeme_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( systeme_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* Fixed ROM */
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* Banked ROM */
ADDRESS_MAP_END
@@ -363,7 +363,7 @@ static void init_ports_systeme(running_machine *machine)
{
/* INIT THE PORTS *********************************************************************************************/
- address_space *io = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *io = machine->device("maincpu")->memory().space(AS_IO);
device_t *sn1 = machine->device("sn1");
device_t *sn2 = machine->device("sn2");
@@ -393,10 +393,10 @@ static void init_systeme_map(running_machine *machine)
memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000);
/* alternate way of accessing video ram */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, segasyse_videoram_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xbfff, 0, 0, segasyse_videoram_w);
/* main ram area */
- sms_mainram = (UINT8 *)memory_install_ram(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xffff, 0, 0, NULL);
+ sms_mainram = (UINT8 *)memory_install_ram(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc000, 0xffff, 0, 0, NULL);
memset(sms_mainram,0x00,0x4000);
init_ports_systeme(machine);
@@ -861,7 +861,7 @@ ROM_START( opaopa )
ROM_LOAD( "317-0042.key", 0x0000, 0x2000, CRC(d6312538) SHA1(494ac7f080775c21dc7d369e6ea78f3299e6975a) )
ROM_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
@@ -964,8 +964,8 @@ static DRIVER_INIT( ridleofp )
{
DRIVER_INIT_CALL(segasyse);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xf8, 0xf8, 0, 0, segae_ridleofp_port_f8_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xfa, 0xfa, 0, 0, segae_ridleofp_port_fa_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0xf8, 0xf8, 0, 0, segae_ridleofp_port_f8_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0xfa, 0xfa, 0, 0, segae_ridleofp_port_fa_w);
}
@@ -973,8 +973,8 @@ static DRIVER_INIT( hangonjr )
{
DRIVER_INIT_CALL(segasyse);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xf8, 0xf8, 0, 0, segae_hangonjr_port_f8_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xfa, 0xfa, 0, 0, segae_hangonjr_port_fa_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0xf8, 0xf8, 0, 0, segae_hangonjr_port_f8_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0xfa, 0xfa, 0, 0, segae_hangonjr_port_fa_w);
}
static DRIVER_INIT( opaopa )
diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c
index 07daea9f007..23ee344b30a 100644
--- a/src/mame/drivers/segag80r.c
+++ b/src/mame/drivers/segag80r.c
@@ -293,7 +293,7 @@ static WRITE8_HANDLER( coin_count_w )
static WRITE8_DEVICE_HANDLER( sindbadm_soundport_w )
{
- address_space *space = device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device("maincpu")->memory().space(AS_PROGRAM);
soundlatch_w(space, 0, data);
cputag_set_input_line(device->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
device->machine->scheduler().boost_interleave(attotime::zero, attotime::from_usec(50));
@@ -340,7 +340,7 @@ static const ppi8255_interface sindbadm_ppi_intf =
*************************************/
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM /* CPU board ROM */
AM_RANGE(0x0800, 0x7fff) AM_ROM /* PROM board ROM area */
AM_RANGE(0x8000, 0xbfff) AM_ROM /* PROM board ROM area */
@@ -350,7 +350,7 @@ ADDRESS_MAP_END
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xbe, 0xbf) AM_READWRITE(segag80r_video_port_r, segag80r_video_port_w)
AM_RANGE(0xf9, 0xf9) AM_MIRROR(0x04) AM_WRITE(coin_count_w)
@@ -359,7 +359,7 @@ static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_ppi8255_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_ppi8255_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x0c, 0x0f) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w)
AM_RANGE(0xbe, 0xbf) AM_READWRITE(segag80r_video_port_r, segag80r_video_port_w)
@@ -369,7 +369,7 @@ static ADDRESS_MAP_START( main_ppi8255_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sindbadm_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sindbadm_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x42, 0x43) AM_READWRITE(segag80r_video_port_r, segag80r_video_port_w)
AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("ppi8255", ppi8255_r, ppi8255_w)
@@ -385,7 +385,7 @@ ADDRESS_MAP_END
*************************************/
/* complete memory map derived from System 1 schematics */
-static ADDRESS_MAP_START( sindbadm_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sindbadm_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x1800) AM_RAM
AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x1ffc) AM_DEVWRITE("sn1", sindbadm_SN76496_w)
@@ -1447,11 +1447,11 @@ static DRIVER_INIT( astrob )
state->background_pcb = G80_BACKGROUND_NONE;
/* install speech board */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x38, 0x38, 0, 0, sega_speech_data_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x3b, 0x3b, 0, 0, sega_speech_control_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x38, 0x38, 0, 0, sega_speech_data_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x3b, 0x3b, 0, 0, sega_speech_control_w);
/* install Astro Blaster sound board */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x3e, 0x3f, 0, 0, astrob_sound_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x3e, 0x3f, 0, 0, astrob_sound_w);
}
@@ -1478,14 +1478,14 @@ static DRIVER_INIT( spaceod )
state->background_pcb = G80_BACKGROUND_SPACEOD;
/* configure ports for the background board */
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x08, 0x0f, 0, 0, spaceod_back_port_r, spaceod_back_port_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x08, 0x0f, 0, 0, spaceod_back_port_r, spaceod_back_port_w);
/* install Space Odyssey sound board */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x0e, 0x0f, 0, 0, spaceod_sound_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x0e, 0x0f, 0, 0, spaceod_sound_w);
/* install our wacky mangled ports */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xf8, 0xfb, 0, 0, spaceod_mangled_ports_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xfc, 0xfc, 0, 0, spaceod_port_fc_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0xf8, 0xfb, 0, 0, spaceod_mangled_ports_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0xfc, 0xfc, 0, 0, spaceod_port_fc_r);
}
@@ -1501,8 +1501,8 @@ static DRIVER_INIT( monsterb )
monsterb_expand_gfx(machine, "gfx1");
/* install background board handlers */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xb8, 0xbd, 0, 0, monsterb_back_port_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe000, 0xffff, 0, 0, monsterb_vidram_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0xb8, 0xbd, 0, 0, monsterb_back_port_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe000, 0xffff, 0, 0, monsterb_vidram_w);
}
@@ -1519,9 +1519,9 @@ static DRIVER_INIT( monster2 )
monsterb_expand_gfx(machine, "gfx1");
/* install background board handlers */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xb4, 0xb5, 0, 0, pignewt_back_color_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xb8, 0xbd, 0, 0, pignewt_back_port_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe000, 0xffff, 0, 0, pignewt_vidram_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0xb4, 0xb5, 0, 0, pignewt_back_color_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0xb8, 0xbd, 0, 0, pignewt_back_port_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe000, 0xffff, 0, 0, pignewt_vidram_w);
}
@@ -1537,13 +1537,13 @@ static DRIVER_INIT( pignewt )
monsterb_expand_gfx(machine, "gfx1");
/* install background board handlers */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xb4, 0xb5, 0, 0, pignewt_back_color_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0xb8, 0xbd, 0, 0, pignewt_back_port_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe000, 0xffff, 0, 0, pignewt_vidram_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0xb4, 0xb5, 0, 0, pignewt_back_color_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0xb8, 0xbd, 0, 0, pignewt_back_port_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe000, 0xffff, 0, 0, pignewt_vidram_w);
/* install Universal sound board */
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x3f, 0x3f, 0, 0, sega_usb_status_r, sega_usb_data_w);
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd000, 0xdfff, 0, 0, sega_usb_ram_r, usb_ram_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x3f, 0x3f, 0, 0, sega_usb_status_r, sega_usb_data_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd000, 0xdfff, 0, 0, sega_usb_ram_r, usb_ram_w);
}
@@ -1559,8 +1559,8 @@ static DRIVER_INIT( sindbadm )
state->background_pcb = G80_BACKGROUND_SINDBADM;
/* install background board handlers */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x40, 0x41, 0, 0, sindbadm_back_port_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe000, 0xffff, 0, 0, sindbadm_vidram_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x40, 0x41, 0, 0, sindbadm_back_port_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe000, 0xffff, 0, 0, sindbadm_vidram_w);
}
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index a6c1431a7df..79bb44837bd 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -390,7 +390,7 @@ static WRITE8_HANDLER( unknown_w )
*************************************/
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM /* CPU board ROM */
AM_RANGE(0x0800, 0xbfff) AM_ROM /* PROM board ROM area */
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(mainram_w) AM_BASE_MEMBER(segag80v_state, mainram)
@@ -399,7 +399,7 @@ ADDRESS_MAP_END
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xbc, 0xbc) /* AM_READ ??? */
AM_RANGE(0xbd, 0xbe) AM_WRITE(multiply_w)
@@ -1312,7 +1312,7 @@ ROM_END
static DRIVER_INIT( elim2 )
{
segag80v_state *state = machine->driver_data<segag80v_state>();
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *iospace = machine->device("maincpu")->memory().space(AS_IO);
/* configure security */
state->decrypt = segag80_security(70);
@@ -1327,7 +1327,7 @@ static DRIVER_INIT( elim2 )
static DRIVER_INIT( elim4 )
{
segag80v_state *state = machine->driver_data<segag80v_state>();
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *iospace = machine->device("maincpu")->memory().space(AS_IO);
/* configure security */
state->decrypt = segag80_security(76);
@@ -1346,7 +1346,7 @@ static DRIVER_INIT( elim4 )
static DRIVER_INIT( spacfury )
{
segag80v_state *state = machine->driver_data<segag80v_state>();
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *iospace = machine->device("maincpu")->memory().space(AS_IO);
/* configure security */
state->decrypt = segag80_security(64);
@@ -1363,7 +1363,7 @@ static DRIVER_INIT( spacfury )
static DRIVER_INIT( zektor )
{
segag80v_state *state = machine->driver_data<segag80v_state>();
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *iospace = machine->device("maincpu")->memory().space(AS_IO);
device_t *ay = machine->device("aysnd");
/* configure security */
@@ -1386,8 +1386,8 @@ static DRIVER_INIT( zektor )
static DRIVER_INIT( tacscan )
{
segag80v_state *state = machine->driver_data<segag80v_state>();
- address_space *pgmspace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *pgmspace = machine->device("maincpu")->memory().space(AS_PROGRAM);
+ address_space *iospace = machine->device("maincpu")->memory().space(AS_IO);
/* configure security */
state->decrypt = segag80_security(76);
@@ -1406,8 +1406,8 @@ static DRIVER_INIT( tacscan )
static DRIVER_INIT( startrek )
{
segag80v_state *state = machine->driver_data<segag80v_state>();
- address_space *pgmspace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *pgmspace = machine->device("maincpu")->memory().space(AS_PROGRAM);
+ address_space *iospace = machine->device("maincpu")->memory().space(AS_IO);
/* configure security */
state->decrypt = segag80_security(64);
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index 370dd2b9db9..4887c9852e6 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -285,7 +285,7 @@ static WRITE16_HANDLER( sharrier_io_w )
static WRITE8_DEVICE_HANDLER( sound_latch_w )
{
segas1x_state *state = device->machine->driver_data<segas1x_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
soundlatch_w(space, offset, data);
}
@@ -424,7 +424,7 @@ static READ8_HANDLER( sound_data_r )
*
*************************************/
-static ADDRESS_MAP_START( hangon_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hangon_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x20c000, 0x20ffff) AM_RAM
@@ -438,7 +438,7 @@ static ADDRESS_MAP_START( hangon_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe00000, 0xffffff) AM_READWRITE(hangon_io_r, hangon_io_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sharrier_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sharrier_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM AM_BASE(&workram)
@@ -460,7 +460,7 @@ ADDRESS_MAP_END
*************************************/
/* On Super Hang On there is a memory mapper, like the System16 one, todo: emulate it! */
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x7ffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
@@ -476,7 +476,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map_2203, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map_2203, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x0800) AM_RAM
@@ -484,28 +484,28 @@ static ADDRESS_MAP_START( sound_map_2203, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe0ff) AM_MIRROR(0x0f00) AM_DEVREADWRITE("pcm", sega_pcm_r, sega_pcm_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap_2203, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap_2203, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map_2151, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map_2151, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xf000, 0xf0ff) AM_MIRROR(0x700) AM_DEVREADWRITE("pcm", sega_pcm_r, sega_pcm_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap_2151, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap_2151, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap_2203x2, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap_2203x2, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
@@ -521,7 +521,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8 )
ADDRESS_MAP_END
@@ -1856,7 +1856,7 @@ static DRIVER_INIT( enduror )
static DRIVER_INIT( endurobl )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT16 *rom = (UINT16 *)machine->region("maincpu")->base();
UINT16 *decrypt = auto_alloc_array(machine, UINT16, 0x40000/2);
@@ -1870,7 +1870,7 @@ static DRIVER_INIT( endurobl )
static DRIVER_INIT( endurob2 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT16 *rom = (UINT16 *)machine->region("maincpu")->base();
UINT16 *decrypt = auto_alloc_array(machine, UINT16, 0x40000/2);
diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c
index 93021db7491..6a61b780dce 100644
--- a/src/mame/drivers/segald.c
+++ b/src/mame/drivers/segald.c
@@ -241,7 +241,7 @@ static WRITE8_HANDLER( astron_io_bankswitch_w )
/* PROGRAM MAP */
-static ADDRESS_MAP_START( mainmem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mainmem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
@@ -259,7 +259,7 @@ ADDRESS_MAP_END
/* I/O MAP */
-static ADDRESS_MAP_START( mainport, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mainport, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_WRITE(astron_io_bankswitch_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index 7f461750dd2..6df606d63f9 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -367,7 +367,7 @@ static const segaic16_memory_map_entry outrun_info[] =
static TIMER_CALLBACK( delayed_sound_data_w )
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
soundlatch_w(space, 0, param);
device_set_input_line(state->soundcpu, INPUT_LINE_NMI, ASSERT_LINE);
}
@@ -788,7 +788,7 @@ static WRITE16_HANDLER( shangon_custom_io_w )
*
*************************************/
-static ADDRESS_MAP_START( outrun_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( outrun_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0xffffff) AM_READWRITE(segaic16_memory_mapper_lsb_r, segaic16_memory_mapper_lsb_w)
ADDRESS_MAP_END
@@ -801,7 +801,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x05ffff) AM_ROM AM_BASE(&cpu1rom)
@@ -818,14 +818,14 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf0ff) AM_MIRROR(0x0700) AM_DEVREADWRITE("pcm", sega_pcm_r, sega_pcm_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 434d2ba4ee9..43d8f8d773c 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -598,7 +598,7 @@ static void dumpmtmt_i8751_sim(running_machine *machine)
static void quartet_i8751_sim(running_machine *machine)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
/* signal a VBLANK to the main CPU */
device_set_input_line(state->maincpu, 4, HOLD_LINE);
@@ -1002,7 +1002,7 @@ static INTERRUPT_GEN( mcu_irq_assert )
*
*************************************/
-static ADDRESS_MAP_START( system16a_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( system16a_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x03ffff) AM_MIRROR(0x380000) AM_ROM
AM_RANGE(0x400000, 0x407fff) AM_MIRROR(0xb88000) AM_RAM_WRITE(segaic16_tileram_0_w) AM_BASE(&segaic16_tileram_0)
@@ -1022,14 +1022,14 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xe800, 0xe800) AM_READ(sound_data_r)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -1045,7 +1045,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( n7751_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( n7751_portmap, AS_IO, 8 )
AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READ(n7751_rom_r)
AM_RANGE(MCS48_PORT_T1, MCS48_PORT_T1) AM_READ(n7751_t1_r)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w)
@@ -1061,7 +1061,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xffff) AM_READWRITE(mcu_io_r, mcu_io_w)
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READNOP AM_WRITE(mcu_control_w)
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index 556bd139fff..428d1487f31 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -1028,7 +1028,7 @@ static void sound_w(running_machine *machine, UINT8 data)
if (state->soundcpu != NULL)
{
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
soundlatch_w(space, 0, data & 0xff);
device_set_input_line(state->soundcpu, 0, HOLD_LINE);
}
@@ -1431,7 +1431,7 @@ static INTERRUPT_GEN( i8751_main_cpu_vblank )
static void altbeast_common_i8751_sim(running_machine *machine, offs_t soundoffs, offs_t inputoffs)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
UINT16 temp;
/* signal a VBLANK to the main CPU */
@@ -1471,7 +1471,7 @@ static void altbeast_i8751_sim(running_machine *machine)
static void ddux_i8751_sim(running_machine *machine)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
UINT16 temp;
/* signal a VBLANK to the main CPU */
@@ -1509,7 +1509,7 @@ static void goldnaxe_i8751_init(running_machine *machine)
static void goldnaxe_i8751_sim(running_machine *machine)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
UINT16 temp;
/* signal a VBLANK to the main CPU */
@@ -1541,7 +1541,7 @@ static void goldnaxe_i8751_sim(running_machine *machine)
static void tturf_i8751_sim(running_machine *machine)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
UINT16 temp;
/* signal a VBLANK to the main CPU */
@@ -1565,7 +1565,7 @@ static void tturf_i8751_sim(running_machine *machine)
static void wb3_i8751_sim(running_machine *machine)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
UINT16 temp;
/* signal a VBLANK to the main CPU */
@@ -1792,7 +1792,7 @@ static WRITE16_HANDLER( sjryuko_custom_io_w )
*
*************************************/
-static ADDRESS_MAP_START( system16b_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( system16b_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0xffffff) AM_READWRITE(segaic16_memory_mapper_lsb_r, segaic16_memory_mapper_lsb_w)
ADDRESS_MAP_END
@@ -1805,7 +1805,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xdfff) AM_ROMBANK("bank1")
@@ -1813,7 +1813,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -1830,7 +1830,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x001f) AM_MIRROR(0xff00) AM_READWRITE(segaic16_memory_mapper_r, segaic16_memory_mapper_w)
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READ_PORT("SERVICE")
@@ -6986,7 +6986,7 @@ static MACHINE_START( isgsm )
memory_set_bankptr(machine,ISGSM_MAIN_BANK, machine->region("bios")->base());
}
-static ADDRESS_MAP_START( isgsm_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( isgsm_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROMBANK(ISGSM_MAIN_BANK) // this area is ALWAYS read-only, even when the game is banked in
AM_RANGE(0x200000, 0x23ffff) AM_RAM // used during startup for decompression
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index 4bb5d54f170..efccf6dbc14 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -140,7 +140,7 @@ static const segaic16_memory_map_entry *const region_info_list[] =
static void sound_w(running_machine *machine, UINT8 data)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
soundlatch_w(space, 0, data & 0xff);
device_set_input_line(state->soundcpu, INPUT_LINE_NMI, PULSE_LINE);
@@ -606,7 +606,7 @@ static WRITE8_HANDLER( mcu_data_w )
*
*************************************/
-static ADDRESS_MAP_START( system18_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( system18_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0xffffff) AM_READWRITE(segaic16_memory_mapper_lsb_r, segaic16_memory_mapper_lsb_w)
ADDRESS_MAP_END
@@ -619,7 +619,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x9fff) AM_ROM AM_REGION("soundcpu", 0x10000)
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1")
@@ -628,7 +628,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x80, 0x83) AM_MIRROR(0x0c) AM_DEVREADWRITE("ym1", ym3438_r, ym3438_w)
@@ -645,7 +645,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
/* port 2 not used for high order address byte */
AM_RANGE(0x0000, 0x001f) AM_MIRROR(0xff00) AM_READWRITE(segaic16_memory_mapper_r, segaic16_memory_mapper_w)
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index c752688592b..840bf83b178 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -997,7 +997,7 @@ fc-ff ramhi
*/
-static ADDRESS_MAP_START( system24_cpu1_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( system24_cpu1_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_MIRROR(0x040000) AM_ROM AM_REGION("maincpu", 0)
AM_RANGE(0x080000, 0x0bffff) AM_MIRROR(0x040000) AM_RAM AM_SHARE("share1")
AM_RANGE(0x100000, 0x13ffff) AM_MIRROR(0x0c0000) AM_ROM AM_REGION("maincpu", 0)
@@ -1034,7 +1034,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( system24_cpu2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( system24_cpu2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_MIRROR(0x040000) AM_RAM AM_SHARE("share2")
AM_RANGE(0x080000, 0x0bffff) AM_MIRROR(0x040000) AM_RAM AM_SHARE("share1")
AM_RANGE(0x100000, 0x13ffff) AM_MIRROR(0x0c0000) AM_ROM AM_REGION("maincpu", 0)
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 296a2a53642..f435866571f 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -1200,7 +1200,7 @@ static WRITE8_HANDLER( sound_dummy_w )
*
*************************************/
-static ADDRESS_MAP_START( system32_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( system32_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_MIRROR(0x0f0000) AM_RAM AM_BASE_MEMBER(segas32_state, system32_workram)
@@ -1218,7 +1218,7 @@ static ADDRESS_MAP_START( system32_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( multi32_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( multi32_map, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xffffff)
AM_RANGE(0x000000, 0x1fffff) AM_ROM
@@ -1248,7 +1248,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( system32_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( system32_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM AM_REGION("soundcpu", 0x100000)
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x0ff0) AM_DEVWRITE("rfsnd", rf5c68_w)
@@ -1256,7 +1256,7 @@ static ADDRESS_MAP_START( system32_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE_MEMBER(segas32_state, z80_shared_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( system32_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( system32_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x80, 0x83) AM_MIRROR(0x0c) AM_DEVREADWRITE("ym1", ym3438_r, ym3438_w)
@@ -1269,14 +1269,14 @@ static ADDRESS_MAP_START( system32_sound_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( multi32_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( multi32_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM AM_REGION("soundcpu", 0x100000)
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_DEVREADWRITE("sega", multipcm_r, multipcm_w)
AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE_MEMBER(segas32_state, z80_shared_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( multi32_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( multi32_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x80, 0x83) AM_MIRROR(0x0c) AM_DEVREADWRITE("ymsnd", ym3438_r, ym3438_w)
@@ -1295,7 +1295,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( ga2_v25_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ga2_v25_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x0ffff) AM_ROM AM_REGION("mcu", 0)
AM_RANGE(0x10000, 0x1ffff) AM_RAM AM_BASE_MEMBER(segas32_state, ga2_dpram)
AM_RANGE(0xf0000, 0xfffff) AM_ROM AM_REGION("mcu", 0)
@@ -4010,14 +4010,14 @@ static DRIVER_INIT( arescue )
{
segas32_state *state = machine->driver_data<segas32_state>();
segas32_common_init(machine, analog_custom_io_r, analog_custom_io_w);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa00000, 0xa00007, 0, 0, arescue_dsp_r, arescue_dsp_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa00000, 0xa00007, 0, 0, arescue_dsp_r, arescue_dsp_w);
state->dual_pcb_comms = auto_alloc_array(machine, UINT16, 0x1000/2);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x810000, 0x810fff, 0, 0, dual_pcb_comms_r, dual_pcb_comms_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x818000, 0x818003, 0, 0, dual_pcb_masterslave);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x810000, 0x810fff, 0, 0, dual_pcb_comms_r, dual_pcb_comms_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x818000, 0x818003, 0, 0, dual_pcb_masterslave);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x810000, 0x810001, 0, 0, arescue_handshake_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x81000e, 0x81000f, 0, 0, arescue_slavebusy_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x810000, 0x810001, 0, 0, arescue_handshake_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x81000e, 0x81000f, 0, 0, arescue_slavebusy_r);
state->sw1_output = arescue_sw1_output;
}
@@ -4028,8 +4028,8 @@ static DRIVER_INIT( arabfgt )
segas32_common_init(machine, extra_custom_io_r, NULL);
/* install protection handlers */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa00100, 0xa0011f, 0, 0, arf_wakeup_protection_r);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa00000, 0xa00fff, 0, 0, arabfgt_protection_r, arabfgt_protection_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa00100, 0xa0011f, 0, 0, arf_wakeup_protection_r);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa00000, 0xa00fff, 0, 0, arabfgt_protection_r, arabfgt_protection_w);
}
@@ -4040,8 +4040,8 @@ static DRIVER_INIT( brival )
/* install protection handlers */
state->system32_protram = auto_alloc_array(machine, UINT16, 0x1000/2);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x20ba00, 0x20ba07, 0, 0, brival_protection_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa00000, 0xa00fff, 0, 0, brival_protection_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x20ba00, 0x20ba07, 0, 0, brival_protection_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa00000, 0xa00fff, 0, 0, brival_protection_w);
}
@@ -4051,7 +4051,7 @@ static DRIVER_INIT( darkedge )
segas32_common_init(machine, extra_custom_io_r, NULL);
/* install protection handlers */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa00000, 0xa7ffff, 0, 0, darkedge_protection_r, darkedge_protection_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa00000, 0xa7ffff, 0, 0, darkedge_protection_r, darkedge_protection_w);
state->system32_prot_vblank = darkedge_fd1149_vblank;
}
@@ -4060,7 +4060,7 @@ static DRIVER_INIT( dbzvrvs )
segas32_common_init(machine, NULL, NULL);
/* install protection handlers */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa00000, 0xa7ffff, 0, 0, dbzvrvs_protection_r, dbzvrvs_protection_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa00000, 0xa7ffff, 0, 0, dbzvrvs_protection_r, dbzvrvs_protection_w);
}
static WRITE16_HANDLER( f1en_comms_echo_w )
@@ -4076,10 +4076,10 @@ static DRIVER_INIT( f1en )
segas32_common_init(machine, analog_custom_io_r, analog_custom_io_w);
state->dual_pcb_comms = auto_alloc_array(machine, UINT16, 0x1000/2);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x810000, 0x810fff, 0, 0, dual_pcb_comms_r, dual_pcb_comms_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x818000, 0x818003, 0, 0, dual_pcb_masterslave);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x810000, 0x810fff, 0, 0, dual_pcb_comms_r, dual_pcb_comms_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x818000, 0x818003, 0, 0, dual_pcb_masterslave);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x810048, 0x810049, 0, 0, f1en_comms_echo_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x810048, 0x810049, 0, 0, f1en_comms_echo_w);
state->sw1_output = radm_sw1_output;
}
@@ -4098,7 +4098,7 @@ static DRIVER_INIT( ga2 )
segas32_common_init(machine, extra_custom_io_r, NULL);
decrypt_ga2_protrom(machine);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa00000, 0xa00fff, 0, 0, ga2_dpram_r, ga2_dpram_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa00000, 0xa00fff, 0, 0, ga2_dpram_r, ga2_dpram_w);
}
@@ -4165,7 +4165,7 @@ static DRIVER_INIT( scross )
segas32_state *state = machine->driver_data<segas32_state>();
multipcm_device *multipcm = machine->device<multipcm_device>("sega");
segas32_common_init(machine, analog_custom_io_r, analog_custom_io_w);
- memory_install_write8_device_handler(machine->device("soundcpu")->memory().space(ADDRESS_SPACE_PROGRAM), multipcm, 0xb0, 0xbf, 0, 0, scross_bank_w);
+ memory_install_write8_device_handler(machine->device("soundcpu")->memory().space(AS_PROGRAM), multipcm, 0xb0, 0xbf, 0, 0, scross_bank_w);
state->sw1_output = scross_sw1_output;
state->sw2_output = scross_sw2_output;
@@ -4183,7 +4183,7 @@ static DRIVER_INIT( sonic )
segas32_common_init(machine, sonic_custom_io_r, sonic_custom_io_w);
/* install protection handlers */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x20E5C4, 0x20E5C5, 0, 0, sonic_level_load_protection);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x20E5C4, 0x20E5C5, 0, 0, sonic_level_load_protection);
}
@@ -4208,7 +4208,7 @@ static DRIVER_INIT( svf )
static DRIVER_INIT( jleague )
{
segas32_common_init(machine, NULL, NULL);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x20F700, 0x20F705, 0, 0, jleague_protection_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x20F700, 0x20F705, 0, 0, jleague_protection_w);
}
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index acc25fb81b4..8013e02c50c 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -376,7 +376,7 @@ static void timer_ack_callback(running_machine *machine)
static TIMER_CALLBACK( delayed_sound_data_w )
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
soundlatch_w(space, 0, param);
device_set_input_line(state->soundcpu, INPUT_LINE_NMI, ASSERT_LINE);
@@ -709,7 +709,7 @@ static WRITE16_HANDLER( smgp_excs_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x3fffff)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
@@ -748,7 +748,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xfffff)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
@@ -770,14 +770,14 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf0ff) AM_MIRROR(0x0700) AM_DEVREADWRITE("pcm", sega_pcm_r, sega_pcm_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -792,13 +792,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( smgp_comm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( smgp_comm_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( smgp_comm_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( smgp_comm_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
@@ -2822,7 +2822,7 @@ static DRIVER_INIT( aburner2 )
state->road_priority = 0;
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x140006, 0x140007, 0, 0x00fff0, aburner2_iochip_0_D_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x140006, 0x140007, 0, 0x00fff0, aburner2_iochip_0_D_w);
}
@@ -2844,14 +2844,14 @@ static DRIVER_INIT( loffire )
state->adc_reverse[1] = state->adc_reverse[3] = 1;
/* install extra synchronization on core shared memory */
- state->loffire_sync = memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x29c000, 0x29c011, 0, 0, loffire_sync0_w);
+ state->loffire_sync = memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x29c000, 0x29c011, 0, 0, loffire_sync0_w);
}
static DRIVER_INIT( smgp )
{
xboard_generic_init(machine);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2f0000, 0x2f3fff, 0, 0, smgp_excs_r, smgp_excs_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2f0000, 0x2f3fff, 0, 0, smgp_excs_r, smgp_excs_w);
}
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index 8f8e5ef95f6..0028065a5e1 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -235,7 +235,7 @@ static void sound_cpu_irq(device_t *device, int state)
static TIMER_CALLBACK( delayed_sound_data_w )
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- address_space *space = state->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
soundlatch_w(space, 0, param);
device_set_input_line(state->soundcpu, INPUT_LINE_NMI, ASSERT_LINE);
@@ -415,7 +415,7 @@ static WRITE16_HANDLER( analog_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
@@ -437,7 +437,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( subx_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( subx_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
@@ -450,7 +450,7 @@ static ADDRESS_MAP_START( subx_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( suby_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( suby_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_RANGE(0x000000, 0x03ffff) AM_ROM
@@ -472,14 +472,14 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf0ff) AM_MIRROR(0x0700) AM_DEVREADWRITE("pcm", sega_pcm_r, sega_pcm_w)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index bda99e31a21..617c39b7d72 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1030,7 +1030,7 @@ static READ32_HANDLER( soundrom_r )
/********************************************************************/
-static ADDRESS_MAP_START( spi_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( spi_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00000417) AM_RAM
AM_RANGE(0x00000418, 0x0000041b) AM_READWRITE(spi_layer_bank_r, spi_layer_bank_w)
AM_RANGE(0x0000041c, 0x0000041f) AM_READNOP
@@ -1059,7 +1059,7 @@ static ADDRESS_MAP_START( spi_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xffe00000, 0xffffffff) AM_ROM AM_REGION("user1", 0) AM_SHARE("share2") /* ROM location in real-mode */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spisound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spisound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_RAMBANK("bank5")
AM_RANGE(0x4002, 0x4002) AM_WRITENOP /* ack RST 10 */
AM_RANGE(0x4003, 0x4003) AM_WRITENOP /* Unknown */
@@ -1127,7 +1127,7 @@ static const ymf271_interface ymf271_config =
/********************************************************************/
-static ADDRESS_MAP_START( seibu386_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( seibu386_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00000417) AM_RAM
AM_RANGE(0x00000418, 0x0000041b) AM_READWRITE(spi_layer_bank_r, spi_layer_bank_w)
AM_RANGE(0x0000041c, 0x0000041f) AM_READNOP
@@ -1156,7 +1156,7 @@ static WRITE32_HANDLER(input_select_w)
state->ejsakura_input_port = data;
}
-static ADDRESS_MAP_START( sys386f2_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( sys386f2_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0000000f) AM_RAM
AM_RANGE(0x00000010, 0x00000013) AM_READ(spi_int_r) /* Unknown */
AM_RANGE(0x00000090, 0x00000097) AM_RAM /* Unknown */
@@ -1826,9 +1826,9 @@ static MACHINE_RESET( spi )
cputag_set_input_line(machine, "soundcpu", INPUT_LINE_RESET, ASSERT_LINE );
device_set_irq_callback(machine->device("maincpu"), spi_irq_callback);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00000680, 0x00000683, 0, 0, sound_fifo_r);
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00000688, 0x0000068b, 0, 0, z80_prg_fifo_w);
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000068c, 0x0000068f, 0, 0, z80_enable_w);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00000680, 0x00000683, 0, 0, sound_fifo_r);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00000688, 0x0000068b, 0, 0, z80_prg_fifo_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000068c, 0x0000068f, 0, 0, z80_enable_w);
memory_set_bankptr(machine, "bank4", state->z80_rom);
memory_set_bankptr(machine, "bank5", state->z80_rom);
@@ -1911,8 +1911,8 @@ static MACHINE_RESET( sxx2f )
memcpy(state->z80_rom, rom, 0x40000);
- memory_install_write32_device_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), machine->device("eeprom"), 0x0000068c, 0x0000068f, 0, 0, eeprom_w);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00000680, 0x00000683, 0, 0, sb_coin_r);
+ memory_install_write32_device_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), machine->device("eeprom"), 0x0000068c, 0x0000068f, 0, 0, eeprom_w);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00000680, 0x00000683, 0, 0, sb_coin_r);
device_set_irq_callback(machine->device("maincpu"), spi_irq_callback);
@@ -2098,28 +2098,28 @@ static void init_spi(running_machine *machine)
static DRIVER_INIT( rdft )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00298d0, 0x00298d3, 0, 0, rdft_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00298d0, 0x00298d3, 0, 0, rdft_speedup_r );
init_spi(machine);
}
static DRIVER_INIT( senkyu )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0018cb4, 0x0018cb7, 0, 0, senkyu_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0018cb4, 0x0018cb7, 0, 0, senkyu_speedup_r );
init_spi(machine);
}
static DRIVER_INIT( senkyua )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0018c9c, 0x0018c9f, 0, 0, senkyua_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0018c9c, 0x0018c9f, 0, 0, senkyua_speedup_r );
init_spi(machine);
}
static DRIVER_INIT( batlball )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0018db4, 0x0018db7, 0, 0, batlball_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0018db4, 0x0018db7, 0, 0, batlball_speedup_r );
init_spi(machine);
}
@@ -2127,21 +2127,21 @@ static DRIVER_INIT( batlball )
static DRIVER_INIT( ejanhs )
{
// idle skip doesn't work properly?
-// memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x002d224, 0x002d227, 0, 0, ejanhs_speedup_r );
+// memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x002d224, 0x002d227, 0, 0, ejanhs_speedup_r );
init_spi(machine);
}
static DRIVER_INIT( viprp1 )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x001e2e0, 0x001e2e3, 0, 0, viprp1_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x001e2e0, 0x001e2e3, 0, 0, viprp1_speedup_r );
init_spi(machine);
}
static DRIVER_INIT( viprp1o )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x001d49c, 0x001d49f, 0, 0, viprp1o_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x001d49c, 0x001d49f, 0, 0, viprp1o_speedup_r );
init_spi(machine);
}
@@ -2154,12 +2154,12 @@ static void init_rf2(running_machine *machine)
state->flash[0] = machine->device<intel_e28f008sa_device>("flash0");
state->flash[1] = machine->device<intel_e28f008sa_device>("flash1");
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0282AC, 0x0282AF, 0, 0, rf2_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0282AC, 0x0282AF, 0, 0, rf2_speedup_r );
seibuspi_rise10_text_decrypt(machine->region("gfx1")->base());
seibuspi_rise10_bg_decrypt(machine->region("gfx2")->base(), machine->region("gfx2")->bytes());
seibuspi_rise10_sprite_decrypt(machine->region("gfx3")->base(), 0x600000);
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x560, 0x563, 0, 0, sprite_dma_start_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x560, 0x563, 0, 0, sprite_dma_start_w);
}
static DRIVER_INIT( rdft2 )
@@ -2179,12 +2179,12 @@ static void init_rfjet(running_machine *machine)
state->flash[0] = machine->device<intel_e28f008sa_device>("flash0");
state->flash[1] = machine->device<intel_e28f008sa_device>("flash1");
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x002894c, 0x002894f, 0, 0, rfjet_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x002894c, 0x002894f, 0, 0, rfjet_speedup_r );
seibuspi_rise11_text_decrypt(machine->region("gfx1")->base());
seibuspi_rise11_bg_decrypt(machine->region("gfx2")->base(), machine->region("gfx2")->bytes());
seibuspi_rise11_sprite_decrypt_rfjet(machine->region("gfx3")->base(), 0x800000);
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x560, 0x563, 0, 0, sprite_dma_start_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x560, 0x563, 0, 0, sprite_dma_start_w);
}
static DRIVER_INIT( rfjet )
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index 6d6c6aec6b1..5e325dcee24 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -111,7 +111,7 @@ static WRITE8_DEVICE_HANDLER( friskyt_portB_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x8820, 0x887f) AM_RAM AM_BASE_SIZE_MEMBER(seicross_state, spriteram, spriteram_size)
@@ -125,14 +125,14 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xb800) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_MIRROR(0x08) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x04, 0x04) AM_MIRROR(0x08) AM_DEVREAD("aysnd", ay8910_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_nvram_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_nvram_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x1000, 0x10ff) AM_RAM AM_BASE_SIZE_MEMBER(seicross_state, nvram, nvram_size)
AM_RANGE(0x2000, 0x2000) AM_DEVWRITE("dac", dac_w)
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START( mcu_nvram_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_no_nvram_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_no_nvram_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x1003, 0x1003) AM_READ_PORT("DSW1") /* DSW1 */
AM_RANGE(0x1005, 0x1005) AM_READ_PORT("DSW2") /* DSW2 */
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index 6edc06be3e6..510ac693737 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -115,7 +115,7 @@ static READ16_HANDLER( sengokmj_system_r )
return (input_port_read(space->machine, "SYSTEM") & 0xffbf) | state->hopper_io;
}
-static ADDRESS_MAP_START( sengokmj_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sengokmj_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x07fff) AM_RAM
AM_RANGE(0x08000, 0x09fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x0c000, 0x0c7ff) AM_RAM_WRITE(seibucrtc_sc0vram_w) AM_BASE(&seibucrtc_sc0vram)
@@ -127,7 +127,7 @@ static ADDRESS_MAP_START( sengokmj_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sengokmj_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( sengokmj_io_map, AS_IO, 16 )
AM_RANGE(0x4000, 0x400f) AM_READWRITE(seibu_main_word_r, seibu_main_word_w)
/*Areas from 8000-804f are for the custom Seibu CRTC.*/
AM_RANGE(0x8000, 0x804f) AM_RAM_WRITE(seibucrtc_vregs_w) AM_BASE(&seibucrtc_vregs)
diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c
index 0eaef0c8b32..e7767b51e98 100644
--- a/src/mame/drivers/senjyo.c
+++ b/src/mame/drivers/senjyo.c
@@ -109,7 +109,7 @@ static WRITE8_DEVICE_HANDLER( sound_cmd_w )
z80pio_astb_w(device, 1);
}
-static ADDRESS_MAP_START( senjyo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( senjyo_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(senjyo_fgvideoram_w) AM_BASE_MEMBER(senjyo_state, fgvideoram)
@@ -141,7 +141,7 @@ static ADDRESS_MAP_START( senjyo_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd005, 0xd005) AM_READ_PORT("DSW2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( senjyo_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( senjyo_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("sn1", sn76496_w)
@@ -154,7 +154,7 @@ static ADDRESS_MAP_START( senjyo_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
#endif
ADDRESS_MAP_END
-static ADDRESS_MAP_START( senjyo_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( senjyo_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("z80pio", z80pio_ba_cd_r, z80pio_ba_cd_w)
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("z80ctc", z80ctc_r, z80ctc_w)
@@ -179,7 +179,7 @@ static WRITE8_HANDLER(starforb_scrollx2)
state->scrollx1[offset] = data;
}
-static ADDRESS_MAP_START( starforb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( starforb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x93ff) AM_RAM_WRITE(senjyo_fgvideoram_w) AM_BASE_MEMBER(senjyo_state, fgvideoram)
@@ -211,7 +211,7 @@ static ADDRESS_MAP_START( starforb_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( starforb_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( starforb_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x8000, 0x8000) AM_DEVWRITE("sn1", sn76496_w)
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 94989079df3..db46f636ef1 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -1589,7 +1589,7 @@ static SCREEN_EOF( seta_buffer_sprites )
writing to sharedram! */
-static ADDRESS_MAP_START( tndrcade_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tndrcade_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ? 0
AM_RANGE(0x280000, 0x280001) AM_WRITENOP // ? 0 / 1 (sub cpu related?)
@@ -1610,7 +1610,7 @@ ADDRESS_MAP_END
(with slight variations, and Meta Fox protection hooked in)
***************************************************************************/
-static ADDRESS_MAP_START( downtown_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( downtown_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x09ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0x200000, 0x200001) AM_NOP // watchdog? (twineagl)
@@ -1667,7 +1667,7 @@ static WRITE16_HANDLER( calibr50_soundlatch_w )
}
}
-static ADDRESS_MAP_START( calibr50_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( calibr50_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x09ffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
AM_RANGE(0x100000, 0x100007) AM_READNOP // ? (same as a00010-a00017?)
@@ -1751,7 +1751,7 @@ static WRITE16_HANDLER( usclssic_lockout_w )
}
-static ADDRESS_MAP_START( usclssic_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( usclssic_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
AM_RANGE(0x800000, 0x800607) AM_RAM AM_BASE_MEMBER(seta_state, spriteram) // Sprites Y
@@ -1778,7 +1778,7 @@ ADDRESS_MAP_END
Athena no Hatena?
***************************************************************************/
-static ADDRESS_MAP_START( atehate_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( atehate_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x900000, 0x9fffff) AM_RAM // RAM
AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
@@ -1800,7 +1800,7 @@ ADDRESS_MAP_END
Blandia
***************************************************************************/
-static ADDRESS_MAP_START( blandia_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( blandia_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM (up to 2MB)
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM (main ram for zingzip, wrofaero writes to 20f000-20ffff)
AM_RANGE(0x210000, 0x21ffff) AM_RAM // RAM (gundhara)
@@ -1834,7 +1834,7 @@ ADDRESS_MAP_END
(with slight variations)
***************************************************************************/
-static ADDRESS_MAP_START( blandiap_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( blandiap_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM (up to 2MB)
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM (main ram for zingzip, wrofaero writes to 20f000-20ffff)
AM_RANGE(0x210000, 0x21ffff) AM_RAM // RAM (gundhara)
@@ -1915,7 +1915,7 @@ static WRITE16_HANDLER( zombraid_gun_w )
state->gun_old_clock = data & 1;
}
-static ADDRESS_MAP_START( wrofaero_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wrofaero_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM (up to 2MB)
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE_MEMBER(seta_state, workram) // RAM (pointer for zombraid crosshair hack)
AM_RANGE(0x210000, 0x21ffff) AM_RAM // RAM (gundhara)
@@ -1953,7 +1953,7 @@ static READ16_HANDLER( zingzipbl_unknown_r )
return 0x0000;
}
-static ADDRESS_MAP_START( zingzipbl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( zingzipbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM (up to 2MB)
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE_MEMBER(seta_state, workram) // RAM (pointer for zombraid crosshair hack)
AM_RANGE(0x210000, 0x21ffff) AM_RAM // RAM (gundhara)
@@ -1990,7 +1990,7 @@ static ADDRESS_MAP_START( zingzipbl_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xf00000, 0xf00001) AM_WRITENOP // ? Sound IRQ Ack
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jjsquawb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( jjsquawb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM (up to 2MB)
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE_MEMBER(seta_state, workram) // RAM (pointer for zombraid crosshair hack)
AM_RANGE(0x210000, 0x21ffff) AM_RAM // RAM (gundhara)
@@ -2026,7 +2026,7 @@ ADDRESS_MAP_END
Orbs
***************************************************************************/
-static ADDRESS_MAP_START( orbs_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( orbs_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xf00000, 0xf0ffff) AM_RAM // RAM
AM_RANGE(0x100000, 0x100001) AM_READNOP // ?
@@ -2110,7 +2110,7 @@ static WRITE16_HANDLER( keroppi_prize_w )
}
}
-static ADDRESS_MAP_START( keroppi_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( keroppi_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xf00000, 0xf0ffff) AM_RAM // RAM
AM_RANGE(0x100000, 0x100001) AM_READ(keroppi_protection_r) //
@@ -2143,7 +2143,7 @@ static MACHINE_START( keroppi )
***************************************************************************/
/* similar to krzybowl */
-static ADDRESS_MAP_START( blockcar_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( blockcar_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0xf00000, 0xf03fff) AM_RAM // RAM
AM_RANGE(0xf04000, 0xf041ff) AM_RAM // Backup RAM?
@@ -2167,7 +2167,7 @@ ADDRESS_MAP_END
Daioh
***************************************************************************/
-static ADDRESS_MAP_START( daioh_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( daioh_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM // RAM
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1
@@ -2198,7 +2198,7 @@ ADDRESS_MAP_END
Dragon Unit, Quiz Kokology, Quiz Kokology 2, Strike Gunner
***************************************************************************/
-static ADDRESS_MAP_START( drgnunit_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( drgnunit_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM // ROM
AM_RANGE(0xf00000, 0xf0ffff) AM_RAM // RAM (qzkklogy)
AM_RANGE(0xffc000, 0xffffff) AM_RAM // RAM (drgnunit,stg)
@@ -2278,7 +2278,7 @@ static WRITE16_HANDLER( setaroul_spr_w )
COMBINE_DATA(&spriteram16[realoffs]);
}
-static ADDRESS_MAP_START( setaroul_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( setaroul_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM // ROM
AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_BASE_MEMBER(seta_state, spriteram2) // Sprites Code + X + Attr (maybe not)
@@ -2309,7 +2309,7 @@ ADDRESS_MAP_END
Extreme Downhill / Sokonuke
***************************************************************************/
-static ADDRESS_MAP_START( extdwnhl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( extdwnhl_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
@@ -2342,7 +2342,7 @@ ADDRESS_MAP_END
(Kamen) Masked Riders Club Battle Race / Mad Shark
***************************************************************************/
-static ADDRESS_MAP_START( kamenrid_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( kamenrid_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1
@@ -2374,7 +2374,7 @@ static ADDRESS_MAP_START( kamenrid_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* almost identical to kamenrid */
-static ADDRESS_MAP_START( madshark_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( madshark_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") // P1
@@ -2430,7 +2430,7 @@ static READ16_HANDLER( krzybowl_input_r )
}
}
-static ADDRESS_MAP_START( krzybowl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( krzybowl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xf00000, 0xf0ffff) AM_RAM // RAM
AM_RANGE(0x100000, 0x100001) AM_READNOP // ?
@@ -2468,7 +2468,7 @@ static WRITE16_HANDLER( msgundam_vregs_w )
/* Mirror RAM is necessary or startup, to clear Work RAM after the test */
-static ADDRESS_MAP_START( msgundam_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( msgundam_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_MIRROR(0x70000) // RAM
@@ -2501,7 +2501,7 @@ ADDRESS_MAP_END
***************************************************************************/
/* similar to wrofaero */
-static ADDRESS_MAP_START( oisipuzl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( oisipuzl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x17ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
@@ -2529,7 +2529,7 @@ ADDRESS_MAP_END
/* Same as oisipuzl but with the sound system replaced */
-static ADDRESS_MAP_START( triplfun_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( triplfun_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x17ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
@@ -2593,7 +2593,7 @@ static READ16_HANDLER( kiwame_input_r )
}
}
-static ADDRESS_MAP_START( kiwame_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( kiwame_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE(kiwame_nvram_r, kiwame_nvram_w) AM_BASE_MEMBER(seta_state, kiwame_nvram) // NVRAM + Regs ?
@@ -2623,7 +2623,7 @@ static WRITE16_HANDLER( thunderl_protection_w )
/* Similar to downtown etc. */
-static ADDRESS_MAP_START( thunderl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( thunderl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM // ROM
AM_RANGE(0xffc000, 0xffffff) AM_RAM // RAM
AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
@@ -2646,7 +2646,7 @@ static ADDRESS_MAP_START( thunderl_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( thunderlbl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( thunderlbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM // ROM
AM_RANGE(0xffc000, 0xffffff) AM_RAM // RAM
// AM_RANGE(0x100000, 0x103fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
@@ -2688,7 +2688,7 @@ static WRITE16_HANDLER( wiggie_soundlatch_w )
}
-static ADDRESS_MAP_START( wiggie_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wiggie_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM // ROM
AM_RANGE(0xffc000, 0xffffff) AM_RAM // RAM
AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ?
@@ -2709,7 +2709,7 @@ static ADDRESS_MAP_START( wiggie_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe04000, 0xe07fff) AM_RAM // (wits)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wiggie_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wiggie_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
@@ -2721,7 +2721,7 @@ ADDRESS_MAP_END
Ultraman Club / SD Gundam Neo Battling
***************************************************************************/
-static ADDRESS_MAP_START( umanclub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( umanclub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x300000, 0x3003ff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, paletteram, paletteram_size) // Palette
@@ -2753,7 +2753,7 @@ static WRITE16_HANDLER( utoukond_soundlatch_w )
}
}
-static ADDRESS_MAP_START( utoukond_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( utoukond_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P1") // P1
@@ -2795,7 +2795,7 @@ static WRITE16_HANDLER( pairlove_prot_w )
state->pairslove_protram[offset] = data;
}
-static ADDRESS_MAP_START( pairlove_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pairlove_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x100001) AM_WRITENOP // ? 1 (start of interrupts, main loop: watchdog?)
AM_RANGE(0x200000, 0x200001) AM_WRITENOP // ? 0/1 (IRQ acknowledge?)
@@ -2818,7 +2818,7 @@ ADDRESS_MAP_END
Crazy Fight
***************************************************************************/
-static ADDRESS_MAP_START( crazyfgt_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( crazyfgt_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM
AM_RANGE(0x610000, 0x610001) AM_READ_PORT("COINS")
@@ -2877,7 +2877,7 @@ static READ16_HANDLER( inttoote_700000_r )
return state->inttoote_700000[offset] & 0x3f;
}
-static ADDRESS_MAP_START( inttoote_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( inttoote_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM (up to 2MB)
AM_RANGE(0x200000, 0x200001) AM_RAM_READ(inttoote_key_r) AM_BASE_MEMBER(seta_state, inttoote_key_select)
@@ -2940,7 +2940,7 @@ static READ16_HANDLER( unk_r )
}
/* same as International Toote but without the protection and different RTC hook-up */
-static ADDRESS_MAP_START( jockeyc_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( jockeyc_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM (up to 2MB)
AM_RANGE(0x200000, 0x200001) AM_READWRITE(jockeyc_mux_r,jockeyc_mux_w)
@@ -3004,7 +3004,7 @@ static WRITE8_HANDLER( sub_bankswitch_lockout_w )
static READ8_HANDLER( ff_r ) {return 0xff;}
-static ADDRESS_MAP_START( tndrcade_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tndrcade_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM // RAM
AM_RANGE(0x0800, 0x0800) AM_READ(ff_r) // ? (bits 0/1/2/3: 1 -> do test 0-ff/100-1e0/5001-57ff/banked rom)
//AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r) //
@@ -3026,7 +3026,7 @@ ADDRESS_MAP_END
Twin Eagle
***************************************************************************/
-static ADDRESS_MAP_START( twineagl_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( twineagl_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM // RAM
AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r) //
AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r) //
@@ -3068,7 +3068,7 @@ static READ8_HANDLER( downtown_ip_r )
return 0;
}
-static ADDRESS_MAP_START( downtown_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( downtown_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM // RAM
AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r) //
AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r) //
@@ -3087,7 +3087,7 @@ ADDRESS_MAP_END
static MACHINE_RESET(calibr50)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
sub_bankswitch_w(space, 0, 0);
}
@@ -3097,7 +3097,7 @@ static WRITE8_HANDLER( calibr50_soundlatch2_w )
device_spin_until_time(space->cpu, attotime::from_usec(50)); // Allow the other cpu to reply
}
-static ADDRESS_MAP_START( calibr50_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( calibr50_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_DEVREADWRITE("x1snd", seta_sound_r,seta_sound_w) // Sound
AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r) // From Main CPU
AM_RANGE(0x4000, 0x4000) AM_WRITE(sub_bankswitch_w) // Bankswitching
@@ -3111,7 +3111,7 @@ ADDRESS_MAP_END
Meta Fox
***************************************************************************/
-static ADDRESS_MAP_START( metafox_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( metafox_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM // RAM
AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r) //
AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r) //
@@ -3131,13 +3131,13 @@ ADDRESS_MAP_END
Ultra Toukon Densetsu
***************************************************************************/
-static ADDRESS_MAP_START( utoukond_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( utoukond_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xefff) AM_RAM
AM_RANGE(0xf000, 0xffff) AM_DEVREADWRITE("x1snd", seta_sound_r,seta_sound_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( utoukond_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( utoukond_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym3438_r, ym3438_w)
AM_RANGE(0x80, 0x80) AM_WRITENOP //?
@@ -8160,7 +8160,7 @@ static MACHINE_CONFIG_START( thunderl, seta_state )
MACHINE_CONFIG_END
-static ADDRESS_MAP_START( thunderlbl_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( thunderlbl_sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xdfff) AM_ROM//ROMBANK("bank1")
@@ -8168,7 +8168,7 @@ static ADDRESS_MAP_START( thunderlbl_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( thunderlbl_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( thunderlbl_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_MIRROR(0x3e) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -10057,10 +10057,10 @@ static WRITE16_HANDLER( twineagl_200100_w )
static DRIVER_INIT( twineagl )
{
/* debug? */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x800000, 0x8000ff, 0, 0, twineagl_debug_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x800000, 0x8000ff, 0, 0, twineagl_debug_r);
/* This allows 2 simultaneous players and the use of the "Copyright" Dip Switch. */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200100, 0x20010f, 0, 0, twineagl_200100_r, twineagl_200100_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200100, 0x20010f, 0, 0, twineagl_200100_r, twineagl_200100_w);
}
@@ -10091,7 +10091,7 @@ static WRITE16_HANDLER( downtown_protection_w )
static DRIVER_INIT( downtown )
{
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x2001ff, 0, 0, downtown_protection_r, downtown_protection_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x2001ff, 0, 0, downtown_protection_r, downtown_protection_w);
}
@@ -10111,7 +10111,7 @@ static READ16_HANDLER( arbalest_debug_r )
static DRIVER_INIT( arbalest )
{
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80000, 0x8000f, 0, 0, arbalest_debug_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x80000, 0x8000f, 0, 0, arbalest_debug_r);
}
@@ -10120,7 +10120,7 @@ static DRIVER_INIT( metafox )
UINT16 *RAM = (UINT16 *) machine->region("maincpu")->base();
/* This game uses the 21c000-21ffff area for protection? */
-// memory_nop_readwrite(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x21c000, 0x21ffff, 0, 0);
+// memory_nop_readwrite(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x21c000, 0x21ffff, 0, 0);
RAM[0x8ab1c/2] = 0x4e71; // patch protection test: "cp error"
RAM[0x8ab1e/2] = 0x4e71;
@@ -10164,14 +10164,14 @@ static DRIVER_INIT ( blandia )
static DRIVER_INIT( eightfrc )
{
- memory_nop_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x500004, 0x500005, 0, 0); // watchdog??
+ memory_nop_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x500004, 0x500005, 0, 0); // watchdog??
}
static DRIVER_INIT( zombraid )
{
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf00002, 0xf00003, 0, 0, zombraid_gun_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf00000, 0xf00001, 0, 0, zombraid_gun_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf00002, 0xf00003, 0, 0, zombraid_gun_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf00000, 0xf00001, 0, 0, zombraid_gun_w);
}
@@ -10189,7 +10189,7 @@ static DRIVER_INIT( kiwame )
static DRIVER_INIT( rezon )
{
- memory_nop_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x500006, 0x500007, 0, 0); // irq ack?
+ memory_nop_read(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x500006, 0x500007, 0, 0); // irq ack?
}
static DRIVER_INIT( wiggie )
@@ -10221,9 +10221,9 @@ static DRIVER_INIT( wiggie )
}
/* X1_010 is not used. */
- memory_nop_readwrite(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x100000, 0x103fff, 0, 0);
+ memory_nop_readwrite(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x100000, 0x103fff, 0, 0);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xB00008, 0xB00009, 0, 0, wiggie_soundlatch_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xB00008, 0xB00009, 0, 0, wiggie_soundlatch_w);
}
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index e186cccdcbd..251875efb9d 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -147,7 +147,7 @@ static WRITE16_HANDLER( grdians_lockout_w )
// popmessage("%04X", data & 0xffff);
}
-static ADDRESS_MAP_START( grdians_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( grdians_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x304000, 0x30ffff) AM_RAM // ? seems tile data
@@ -183,7 +183,7 @@ static WRITE16_DEVICE_HANDLER( gundamex_eeprom_w )
eeprom_set_cs_line(device, (data & 0x4) ? CLEAR_LINE : ASSERT_LINE);
}
-static ADDRESS_MAP_START( gundamex_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gundamex_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x500000, 0x57ffff) AM_ROM // ROM
@@ -249,7 +249,7 @@ static WRITE16_HANDLER( mj4simai_keyboard_w )
state->keyboard_row = data & 0xff;
}
-static ADDRESS_MAP_START( mj4simai_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mj4simai_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x600000, 0x600001) AM_READ(mj4simai_p1_r) // P1
@@ -273,7 +273,7 @@ ADDRESS_MAP_END
Kosodate Quiz My Angel
***************************************************************************/
-static ADDRESS_MAP_START( myangel_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( myangel_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x700000, 0x700001) AM_READ_PORT("P1") // P1
@@ -296,7 +296,7 @@ ADDRESS_MAP_END
Kosodate Quiz My Angel 2
***************************************************************************/
-static ADDRESS_MAP_START( myangel2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( myangel2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x600000, 0x600001) AM_READ_PORT("P1") // P1
@@ -341,7 +341,7 @@ static WRITE16_HANDLER( pzlbowl_coin_counter_w )
}
}
-static ADDRESS_MAP_START( pzlbowl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pzlbowl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x400300, 0x400301) AM_READ_PORT("DSW1") // DSW 1
@@ -364,7 +364,7 @@ ADDRESS_MAP_END
Penguin Bros
***************************************************************************/
-static ADDRESS_MAP_START( penbros_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( penbros_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x210000, 0x23ffff) AM_RAM // RAM
@@ -424,7 +424,7 @@ static WRITE16_HANDLER( reelquak_coin_w )
// popmessage("COIN %04X", data & 0xffff);
}
-static ADDRESS_MAP_START( reelquak_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( reelquak_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // RAM
AM_RANGE(0x300000, 0x303fff) AM_RAM AM_SHARE("nvram") // NVRAM (Battery Backed)
@@ -462,7 +462,7 @@ static WRITE16_HANDLER( samshoot_coin_w )
// popmessage("%04x",data);
}
-static ADDRESS_MAP_START( samshoot_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( samshoot_map, AS_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x1fffff ) AM_ROM
AM_RANGE( 0x200000, 0x20ffff ) AM_RAM
AM_RANGE( 0x300000, 0x30ffff ) AM_RAM AM_SHARE("nvram")
@@ -603,7 +603,7 @@ static WRITE32_DEVICE_HANDLER( oki_write )
}
-static ADDRESS_MAP_START( funcube_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( funcube_map, AS_PROGRAM, 32 )
AM_RANGE( 0x00000000, 0x0007ffff ) AM_ROM
AM_RANGE( 0x00200000, 0x0020ffff ) AM_RAM
@@ -624,7 +624,7 @@ ADDRESS_MAP_END
// Sub CPU
-static ADDRESS_MAP_START( funcube_sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( funcube_sub_map, AS_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x01ffff ) AM_ROM
AM_RANGE( 0x200000, 0x20017f ) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
@@ -739,7 +739,7 @@ static WRITE8_HANDLER( funcube_outputs_w )
}
-static ADDRESS_MAP_START( funcube_sub_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( funcube_sub_io, AS_IO, 8 )
AM_RANGE( H8_PORT_7, H8_PORT_7 ) AM_READ( funcube_coins_r )
AM_RANGE( H8_PORT_4, H8_PORT_4 ) AM_NOP // unused
AM_RANGE( H8_PORT_A, H8_PORT_A ) AM_READWRITE( funcube_outputs_r, funcube_outputs_w ) AM_BASE_MEMBER( seta2_state, funcube_outputs )
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index ae8e39a268b..212ee7bfff3 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -189,7 +189,7 @@ static WRITE8_DEVICE_HANDLER( msm5205_w )
-static ADDRESS_MAP_START( sf_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sf_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x04ffff) AM_ROM
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(sf_videoram_w) AM_BASE_SIZE_MEMBER(sf_state, videoram, videoram_size)
AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram)
@@ -211,7 +211,7 @@ static ADDRESS_MAP_START( sf_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffe000, 0xffffff) AM_RAM AM_BASE_MEMBER(sf_state, objectram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sfus_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sfus_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x04ffff) AM_ROM
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(sf_videoram_w) AM_BASE_SIZE_MEMBER(sf_state, videoram, videoram_size)
AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram)
@@ -233,7 +233,7 @@ static ADDRESS_MAP_START( sfus_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffe000, 0xffffff) AM_RAM AM_BASE_MEMBER(sf_state, objectram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sfjp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sfjp_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x04ffff) AM_ROM
AM_RANGE(0x800000, 0x800fff) AM_RAM_WRITE(sf_videoram_w) AM_BASE_SIZE_MEMBER(sf_state, videoram, videoram_size)
AM_RANGE(0xb00000, 0xb007ff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE_GENERIC(paletteram)
@@ -255,7 +255,7 @@ static ADDRESS_MAP_START( sfjp_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffe000, 0xffffff) AM_RAM AM_BASE_MEMBER(sf_state, objectram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r)
@@ -263,13 +263,13 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* Yes, _no_ ram */
-static ADDRESS_MAP_START( sound2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
AM_RANGE(0x0000, 0xffff) AM_WRITENOP /* avoid cluttering up error.log */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("msm1", msm5205_w)
AM_RANGE(0x01, 0x01) AM_DEVWRITE("msm2", msm5205_w)
diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c
index 45012a304d6..689e708acd4 100644
--- a/src/mame/drivers/sfbonus.c
+++ b/src/mame/drivers/sfbonus.c
@@ -1094,7 +1094,7 @@ static WRITE8_HANDLER( paletteram_io_w )
-static ADDRESS_MAP_START( sfbonus_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sfbonus_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROMBANK("bank1") AM_WRITE(sfbonus_videoram_w)
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE_MEMBER(sfbonus_state, nvram) AM_SIZE_MEMBER(sfbonus_state, nvram_size)
ADDRESS_MAP_END
@@ -1169,7 +1169,7 @@ static WRITE8_HANDLER( sfbonus_2c01_w )
}
-static ADDRESS_MAP_START( sfbonus_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sfbonus_io, AS_IO, 8 )
AM_RANGE(0x0400, 0x0400) AM_READ_PORT("KEY1")
AM_RANGE(0x0408, 0x0408) AM_READ_PORT("KEY2")
AM_RANGE(0x0410, 0x0410) AM_READ_PORT("KEY3")
diff --git a/src/mame/drivers/sfcbox.c b/src/mame/drivers/sfcbox.c
index b3ec951001e..882e971a5ec 100644
--- a/src/mame/drivers/sfcbox.c
+++ b/src/mame/drivers/sfcbox.c
@@ -62,7 +62,7 @@ PSS-64 - SUPER FAMICOM BOX Commercial Optional Cart (Only rumored to exist)
#include "includes/snes.h"
#include "audio/snes_snd.h"
-static ADDRESS_MAP_START( snes_map, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START( snes_map, AS_PROGRAM, 8)
AM_RANGE(0x000000, 0x2fffff) AM_READWRITE(snes_r_bank1, snes_w_bank1) /* I/O and ROM (repeats for each bank) */
AM_RANGE(0x300000, 0x3fffff) AM_READWRITE(snes_r_bank2, snes_w_bank2) /* I/O and ROM (repeats for each bank) */
AM_RANGE(0x400000, 0x5fffff) AM_READ(snes_r_bank3) /* ROM (and reserved in Mode 20) */
@@ -83,7 +83,7 @@ static WRITE8_DEVICE_HANDLER( spc_ram_100_w )
spc_ram_w(device, offset + 0x100, data);
}
-static ADDRESS_MAP_START( spc_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spc_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ef) AM_DEVREADWRITE("spc700", spc_ram_r, spc_ram_w) /* lower 32k ram */
AM_RANGE(0x00f0, 0x00ff) AM_DEVREADWRITE("spc700", spc_io_r, spc_io_w) /* spc io */
AM_RANGE(0x0100, 0xffff) AM_DEVWRITE("spc700", spc_ram_100_w)
diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c
index 67dfc7803a4..2112b18c05e 100644
--- a/src/mame/drivers/sfkick.c
+++ b/src/mame/drivers/sfkick.c
@@ -313,7 +313,7 @@ static WRITE8_HANDLER(page3_w)
-static ADDRESS_MAP_START( sfkick_map, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START( sfkick_map, AS_PROGRAM, 8)
AM_RANGE( 0x0000, 0x1fff) AM_ROMBANK("bank1")
AM_RANGE( 0x2000, 0x3fff) AM_ROMBANK("bank2")
AM_RANGE( 0x4000, 0x5fff) AM_ROMBANK("bank3")
@@ -328,7 +328,7 @@ static ADDRESS_MAP_START( sfkick_map, ADDRESS_SPACE_PROGRAM, 8)
AM_RANGE( 0xc000, 0xffff) AM_WRITE( page3_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sfkick_io_map, ADDRESS_SPACE_IO, 8)
+static ADDRESS_MAP_START( sfkick_io_map, AS_IO, 8)
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0xa0, 0xa7) AM_WRITE( soundlatch_w )
@@ -340,12 +340,12 @@ static ADDRESS_MAP_START( sfkick_io_map, ADDRESS_SPACE_IO, 8)
AM_RANGE( 0xb4, 0xb5) AM_RAM /* loopback ? req by sfkicka (MSX Bios leftover)*/
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sfkick_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sfkick_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sfkick_sound_io_map, ADDRESS_SPACE_IO, 8)
+static ADDRESS_MAP_START( sfkick_sound_io_map, AS_IO, 8)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r)
AM_RANGE(0x04, 0x05) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index 96c90156bfe..6bf237ab0d7 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -134,13 +134,13 @@ public:
*
*************************************/
-static ADDRESS_MAP_START( program_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( program_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // separate region needed for decrypting
AM_RANGE(0x8000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc3ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x7f, 0x7f) AM_DEVWRITE("snsnd", sn76496_w)
AM_RANGE(0xbe, 0xbe) AM_READWRITE(TMS9928A_vram_r, TMS9928A_vram_w)
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 9d664727f2b..9212e99369a 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -364,7 +364,7 @@ static TIMER_DEVICE_CALLBACK( shadfrce_scanline )
/* Memory Maps */
-static ADDRESS_MAP_START( shadfrce_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( shadfrce_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(shadfrce_bg0videoram_w) AM_BASE_MEMBER(shadfrce_state,bg0videoram) /* video */
AM_RANGE(0x101000, 0x101fff) AM_RAM
@@ -399,7 +399,7 @@ static WRITE8_DEVICE_HANDLER( oki_bankswitch_w )
downcast<okim6295_device *>(device)->set_bank_base((data & 1) * 0x40000);
}
-static ADDRESS_MAP_START( shadfrce_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shadfrce_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index d5139f408aa..9ef58b1cfb9 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -117,7 +117,7 @@ static WRITE16_HANDLER( heberpop_sound_command_w )
-static ADDRESS_MAP_START( shangha3_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( shangha3_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x200000, 0x200001) AM_READ_PORT("INPUTS")
@@ -135,7 +135,7 @@ static ADDRESS_MAP_START( shangha3_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x360000, 0x360001) AM_WRITE(shangha3_gfxlist_addr_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( heberpop_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( heberpop_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM_WRITE(paletteram16_RRRRRGGGGGBBBBBx_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x200000, 0x200001) AM_READ_PORT("INPUTS")
@@ -151,7 +151,7 @@ static ADDRESS_MAP_START( heberpop_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x800000, 0xb7ffff) AM_READ(heberpop_gfxrom_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( blocken_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( blocken_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("INPUTS")
AM_RANGE(0x100002, 0x100003) AM_READ_PORT("SYSTEM")
@@ -168,12 +168,12 @@ static ADDRESS_MAP_START( blocken_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( heberpop_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( heberpop_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xf7ff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( heberpop_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( heberpop_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym3438_r, ym3438_w)
AM_RANGE(0x80, 0x80) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index b5b277e6026..147c468fa4b 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -132,20 +132,20 @@ static WRITE16_HANDLER( shanghai_coin_w )
}
}
-static ADDRESS_MAP_START( shanghai_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( shanghai_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x03fff) AM_RAM
AM_RANGE(0x80000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shangha2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( shangha2_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x03fff) AM_RAM
AM_RANGE(0x04000, 0x041ff) AM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x80000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shanghai_portmap, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( shanghai_portmap, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("hd63484", hd63484_status_r, hd63484_address_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("hd63484", hd63484_data_r, hd63484_data_w)
AM_RANGE(0x20, 0x23) AM_DEVREADWRITE8("ymsnd", ym2203_r, ym2203_w, 0x00ff)
@@ -156,7 +156,7 @@ static ADDRESS_MAP_START( shanghai_portmap, ADDRESS_SPACE_IO, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shangha2_portmap, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( shangha2_portmap, AS_IO, 16 )
AM_RANGE(0x00, 0x01) AM_READ_PORT("P1")
AM_RANGE(0x10, 0x11) AM_READ_PORT("P2")
AM_RANGE(0x20, 0x21) AM_READ_PORT("SYSTEM")
@@ -171,7 +171,7 @@ static READ16_HANDLER( kothello_hd63484_status_r )
return 0xff22; /* write FIFO ready + command end + read FIFO ready */
}
-static ADDRESS_MAP_START( kothello_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( kothello_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x07fff) AM_RAM
AM_RANGE(0x08010, 0x08011) AM_READ(kothello_hd63484_status_r) AM_DEVWRITE("hd63484", hd63484_address_w)
AM_RANGE(0x08012, 0x08013) AM_DEVREADWRITE("hd63484", hd63484_data_r, hd63484_data_w)
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index 1a8d7f0553c..5a0759c69ba 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -235,7 +235,7 @@ GFXDECODE_END
/***************************************************************************************/
-static ADDRESS_MAP_START( chinhero_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( chinhero_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITENOP /* ? */
AM_RANGE(0xb000, 0xb000) AM_WRITE(shangkid_bbx_enable_w)
@@ -254,7 +254,7 @@ static ADDRESS_MAP_START( chinhero_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_BASE_MEMBER(shangkid_state, spriteram) AM_SHARE("share3")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shangkid_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shangkid_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xa000) AM_WRITENOP /* ? */
@@ -277,7 +277,7 @@ ADDRESS_MAP_END
/***************************************************************************************/
-static ADDRESS_MAP_START( chinhero_bbx_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( chinhero_bbx_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITENOP /* ? */
AM_RANGE(0xb000, 0xb000) AM_WRITE(shangkid_bbx_enable_w)
@@ -295,7 +295,7 @@ static ADDRESS_MAP_START( chinhero_bbx_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("share3")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shangkid_bbx_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shangkid_bbx_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITENOP /* ? */
AM_RANGE(0xb000, 0xb000) AM_WRITE(shangkid_bbx_enable_w)
@@ -314,29 +314,29 @@ static ADDRESS_MAP_START( shangkid_bbx_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("share3")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( chinhero_bbx_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( chinhero_bbx_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shangkid_bbx_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( shangkid_bbx_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
ADDRESS_MAP_END
/***************************************************************************************/
-static ADDRESS_MAP_START( chinhero_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( chinhero_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shangkid_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shangkid_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROMBANK("bank2") /* sample player writes to ROM area */
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(shangkid_soundlatch_r) AM_DEVWRITE("dac", dac_w)
ADDRESS_MAP_END
@@ -436,7 +436,7 @@ MACHINE_CONFIG_END
-static ADDRESS_MAP_START( dynamski_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dynamski_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE_MEMBER(shangkid_state, videoram) /* tilemap */
AM_RANGE(0xc800, 0xcbff) AM_RAM
@@ -451,7 +451,7 @@ static ADDRESS_MAP_START( dynamski_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf7ff) AM_RAM /* work ram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dynamski_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dynamski_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
/* ports are reversed */
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_data_address_w)
diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c
index 864b8f9b4eb..669e9740dba 100644
--- a/src/mame/drivers/shaolins.c
+++ b/src/mame/drivers/shaolins.c
@@ -27,7 +27,7 @@ static INTERRUPT_GEN( shaolins_interrupt )
-static ADDRESS_MAP_START( shaolins_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shaolins_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_WRITE(shaolins_nmi_w) /* bit 0 = flip screen, bit 1 = nmi enable, bit 2 = ? */
/* bit 3, bit 4 = coin counters */
AM_RANGE(0x0100, 0x0100) AM_WRITE(watchdog_reset_w)
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index 3bec559124d..1b71d838fe2 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -42,7 +42,7 @@ static WRITE8_HANDLER( sichuan2_coin_w )
-static ADDRESS_MAP_START( shisen_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shisen_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc800, 0xcaff) AM_RAM_WRITE(sichuan2_paletteram_w) AM_BASE_MEMBER(shisen_state, paletteram)
@@ -50,7 +50,7 @@ static ADDRESS_MAP_START( shisen_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shisen_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( shisen_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(sichuan2_dsw1_r, sichuan2_coin_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("DSW2") AM_WRITE(m72_sound_command_byte_w)
@@ -59,12 +59,12 @@ static ADDRESS_MAP_START( shisen_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x04, 0x04) AM_READ_PORT("COIN")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shisen_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shisen_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0xfd00, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shisen_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( shisen_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index c909eda4234..05c6c5a1803 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -64,7 +64,7 @@ static WRITE8_HANDLER( shootout_coin_counter_w )
/*******************************************************************************/
-static ADDRESS_MAP_START( shootout_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shootout_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_READ_PORT("DSW1") AM_WRITE(shootout_bankswitch_w)
AM_RANGE(0x1001, 0x1001) AM_READ_PORT("P1") AM_WRITE(shootout_flipscreen_w)
@@ -78,7 +78,7 @@ static ADDRESS_MAP_START( shootout_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shootouj_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shootouj_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_READ_PORT("DSW1")
AM_RANGE(0x1001, 0x1001) AM_READ_PORT("P1")
@@ -95,7 +95,7 @@ ADDRESS_MAP_END
/*******************************************************************************/
-static ADDRESS_MAP_START( shootout_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( shootout_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2203_r,ym2203_w)
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
@@ -409,7 +409,7 @@ ROM_END
static DRIVER_INIT( shootout )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int length = machine->region("maincpu")->bytes();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, length - 0x8000);
UINT8 *rom = machine->region("maincpu")->base();
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index 8ce220f14cb..5a480906566 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -274,7 +274,7 @@ static INTERRUPT_GEN( shougi_vblank_nmi )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM /* 2114 x 2 (0x400 x 4bit each) */
@@ -314,17 +314,17 @@ static READ8_HANDLER ( dummy_r )
return 0;
}
-static ADDRESS_MAP_START( readport_sub, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( readport_sub, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK( 0x00ff )
AM_RANGE(0x00, 0x00) AM_READ(dummy_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE("share2") /* 2114 x 2 (0x400 x 4bit each) */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c
index a59567afe14..fe455095b23 100644
--- a/src/mame/drivers/shuuz.c
+++ b/src/mame/drivers/shuuz.c
@@ -137,7 +137,7 @@ static READ16_HANDLER( special_port0_r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_SHARE("eeprom")
AM_RANGE(0x101000, 0x101fff) AM_WRITE(atarigen_eeprom_enable_w)
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index 22dcaa7e697..fd7b6b29b9c 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -69,7 +69,7 @@ static READ8_HANDLER( turtship_ports_r )
}
-static ADDRESS_MAP_START( sidearms_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sidearms_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE_GENERIC(paletteram)
@@ -90,7 +90,7 @@ static ADDRESS_MAP_START( sidearms_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( turtship_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( turtship_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -111,7 +111,7 @@ static ADDRESS_MAP_START( turtship_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(sidearms_colorram_w) AM_BASE_MEMBER(sidearms_state,colorram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sidearms_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sidearms_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r)
@@ -139,7 +139,7 @@ static WRITE8_HANDLER( whizz_bankswitch_w )
memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]);
}
-static ADDRESS_MAP_START( whizz_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( whizz_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_split1_w) AM_BASE_GENERIC(paletteram)
@@ -163,12 +163,12 @@ static ADDRESS_MAP_START( whizz_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( whizz_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( whizz_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( whizz_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( whizz_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x40, 0x40) AM_WRITENOP
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index c919a203d27..83a2239a1da 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -117,7 +117,7 @@ static WRITE8_HANDLER( sidepctj_i8751_w )
/******************************************************************************/
-static ADDRESS_MAP_START( sidepckt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sidepckt_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(sidepckt_videoram_w) AM_BASE_MEMBER(sidepckt_state,videoram) AM_SIZE_MEMBER(sidepckt_state,videoram_size)
AM_RANGE(0x1400, 0x17ff) AM_RAM // ???
@@ -136,7 +136,7 @@ static ADDRESS_MAP_START( sidepckt_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ym2", ym3526_w)
@@ -379,14 +379,14 @@ ROM_END
static DRIVER_INIT( sidepckt )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3014, 0x3014, 0, 0, sidepckt_i8751_r );
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3018, 0x3018, 0, 0, sidepckt_i8751_w );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3014, 0x3014, 0, 0, sidepckt_i8751_r );
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3018, 0x3018, 0, 0, sidepckt_i8751_w );
}
static DRIVER_INIT( sidepctj )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3014, 0x3014, 0, 0, sidepckt_i8751_r );
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3018, 0x3018, 0, 0, sidepctj_i8751_w );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3014, 0x3014, 0, 0, sidepckt_i8751_r );
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3018, 0x3018, 0, 0, sidepctj_i8751_w );
}
diff --git a/src/mame/drivers/sigmab52.c b/src/mame/drivers/sigmab52.c
index 0a1a39ad51a..3ba85128dd9 100644
--- a/src/mame/drivers/sigmab52.c
+++ b/src/mame/drivers/sigmab52.c
@@ -303,7 +303,7 @@ static READ8_HANDLER(unk_f721_r)
* Memory Maps *
*************************/
-static ADDRESS_MAP_START( jwildb52_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jwildb52_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_RAM
AM_RANGE(0x4000, 0x7fff) AM_RAMBANK("bank1")
@@ -348,7 +348,7 @@ ADDRESS_MAP_END
*/
#ifdef UNUSED_CODE
-static ADDRESS_MAP_START( sound_prog_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_prog_map, AS_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
#endif
diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c
index 14928daabb6..d11eb6574b4 100644
--- a/src/mame/drivers/sigmab98.c
+++ b/src/mame/drivers/sigmab98.c
@@ -427,7 +427,7 @@ static WRITE8_HANDLER( c8_w )
show_outputs();
}
-static ADDRESS_MAP_START( gegege_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gegege_mem_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x7fff ) AM_ROM
AM_RANGE( 0x8000, 0x9fff ) AM_ROMBANK("rombank")
@@ -445,7 +445,7 @@ static ADDRESS_MAP_START( gegege_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0xf000, 0xffff ) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gegege_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( gegege_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x01 ) AM_DEVWRITE( "ymz", ymz280b_w )
@@ -667,7 +667,7 @@ static READ8_HANDLER( sammymdl_coin_hopper_r )
}
static UINT8 *nvram;
-static ADDRESS_MAP_START( animalc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( animalc_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x3fff ) AM_ROM
AM_RANGE( 0x4000, 0x7fff ) AM_ROMBANK( "rombank" )
AM_RANGE( 0x8000, 0x8fff ) AM_RAMBANK( "rambank" ) AM_SHARE( "nvram" ) AM_BASE( &nvram )
@@ -685,7 +685,7 @@ static ADDRESS_MAP_START( animalc_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0xfe00, 0xffff ) AM_RAM // High speed internal RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( animalc_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( animalc_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x02, 0x03 ) AM_READWRITE( animalc_rombank_r, animalc_rombank_w )
AM_RANGE( 0x04, 0x05 ) AM_READWRITE( animalc_rambank_r, animalc_rambank_w )
@@ -913,14 +913,14 @@ static WRITE8_HANDLER( haekaka_coin_w )
show_3_outputs();
}
-static ADDRESS_MAP_START( haekaka_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( haekaka_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x7fff ) AM_ROM
AM_RANGE( 0xb000, 0xcfff ) AM_READWRITE( haekaka_b000_r, haekaka_b000_w )
AM_RANGE( 0xd000, 0xefff ) AM_RAM AM_SHARE( "nvram" ) AM_BASE( &nvram )
AM_RANGE( 0xfe00, 0xffff ) AM_RAM // High speed internal RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( haekaka_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( haekaka_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x02, 0x03 ) AM_READWRITE( haekaka_rombank_r, haekaka_rombank_w )
AM_RANGE( 0x04, 0x05 ) AM_READWRITE( haekaka_rambank_r, haekaka_rambank_w )
@@ -1144,7 +1144,7 @@ static READ8_HANDLER( itazuram_palette_r )
return space->machine->generic.paletteram.u8[offset];
}
-static ADDRESS_MAP_START( itazuram_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( itazuram_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x37ff ) AM_ROM
AM_RANGE( 0x3800, 0x47ff ) AM_READ_BANK( "rombank0" ) AM_WRITE_BANK( "sprbank0" )
AM_RANGE( 0x4800, 0x57ff ) AM_READ_BANK( "rombank1" ) AM_WRITE_BANK( "sprbank1" )
@@ -1159,7 +1159,7 @@ static ADDRESS_MAP_START( itazuram_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0xfe00, 0xffff ) AM_RAM // High speed internal RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( itazuram_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( itazuram_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x02, 0x03 ) AM_READWRITE( itazuram_rombank_r, itazuram_rombank_w )
AM_RANGE( 0x04, 0x05 ) AM_READWRITE( itazuram_rambank_r, itazuram_rambank_w )
@@ -1180,7 +1180,7 @@ ADDRESS_MAP_END
Pye-nage Taikai
***************************************************************************/
-static ADDRESS_MAP_START( pyenaget_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pyenaget_io, AS_IO, 8 )
AM_RANGE( 0x31, 0x31 ) AM_WRITE( sammymdl_coin_w )
AM_IMPORT_FROM( haekaka_io )
ADDRESS_MAP_END
@@ -1368,14 +1368,14 @@ static WRITE8_HANDLER( tdoboon_c000_w )
logerror("%s: unknown write to %02x = %02x with rombank = %02x\n", space->machine->describe_context(), offset+0xc000, data, rombank);
}
-static ADDRESS_MAP_START( tdoboon_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tdoboon_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0xbfff ) AM_ROM
AM_RANGE( 0xc000, 0xcfff ) AM_READWRITE( tdoboon_c000_r, tdoboon_c000_w )
AM_RANGE( 0xd000, 0xefff ) AM_RAM AM_SHARE( "nvram" ) AM_BASE( &nvram )
AM_RANGE( 0xfe00, 0xffff ) AM_RAM // High speed internal RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tdoboon_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tdoboon_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x02, 0x03 ) AM_READWRITE( tdoboon_rombank_r, tdoboon_rombank_w )
AM_RANGE( 0x04, 0x05 ) AM_READWRITE( tdoboon_rambank_r, tdoboon_rambank_w )
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index 3de92c77824..cbe56fdb979 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -152,7 +152,7 @@ static WRITE32_HANDLER(silk_coin_counter_w)
}
}
-static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x40c000, 0x40cfff) AM_RAM AM_BASE_MEMBER(silkroad_state,sprram) // sprites
AM_RANGE(0x600000, 0x603fff) AM_RAM_WRITE(paletteram32_xRRRRRGGGGGBBBBB_dword_w) AM_BASE_GENERIC(paletteram) // palette
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index ebfd1e9b982..c69c1421c21 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -248,7 +248,7 @@ static WRITE32_HANDLER( simpl156_pf2_rowscroll_w )
/* Memory Map controled by PALs */
/* Joe and Mac Returns */
-static ADDRESS_MAP_START( joemacr_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( joemacr_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x107fff) AM_READWRITE(simpl156_mainram_r, simpl156_mainram_w) AM_BASE_MEMBER(simpl156_state, mainram) // main ram
AM_RANGE(0x110000, 0x111fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w)
@@ -269,7 +269,7 @@ ADDRESS_MAP_END
/* Chain Reaction */
-static ADDRESS_MAP_START( chainrec_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( chainrec_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // rom (32-bit)
AM_RANGE(0x200000, 0x200003) AM_READ(simpl156_inputs_read)
AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE_MEMBER(simpl156_state, systemram) // work ram (32-bit)
@@ -290,7 +290,7 @@ ADDRESS_MAP_END
/* Magical Drop */
-static ADDRESS_MAP_START( magdrop_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( magdrop_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x200003) AM_READ(simpl156_inputs_read)
AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE_MEMBER(simpl156_state, systemram) // work ram (32-bit)
@@ -311,7 +311,7 @@ ADDRESS_MAP_END
/* Magical Drop Plus 1 */
-static ADDRESS_MAP_START( magdropp_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( magdropp_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x200003) AM_READ(simpl156_inputs_read)
AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE_MEMBER(simpl156_state, systemram) // work ram (32-bit)
@@ -332,7 +332,7 @@ ADDRESS_MAP_END
/* Mitchell MT5601-0 PCB (prtytime, charlien, osman) */
-static ADDRESS_MAP_START( mitchell156_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( mitchell156_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100003) AM_DEVREADWRITE8_MODERN("okisfx", okim6295_device, read, write, 0x000000ff)
AM_RANGE(0x140000, 0x140003) AM_DEVREADWRITE8_MODERN("okimusic", okim6295_device, read, write, 0x000000ff)
@@ -1074,7 +1074,7 @@ static READ32_HANDLER( joemacr_speedup_r )
static DRIVER_INIT( joemacr )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0201018, 0x020101b, 0, 0, joemacr_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0201018, 0x020101b, 0, 0, joemacr_speedup_r );
DRIVER_INIT_CALL(simpl156);
}
@@ -1088,7 +1088,7 @@ static READ32_HANDLER( chainrec_speedup_r )
static DRIVER_INIT( chainrec )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0201018, 0x020101b, 0, 0, chainrec_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0201018, 0x020101b, 0, 0, chainrec_speedup_r );
DRIVER_INIT_CALL(simpl156);
}
@@ -1102,7 +1102,7 @@ static READ32_HANDLER( prtytime_speedup_r )
static DRIVER_INIT( prtytime )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0201ae0, 0x0201ae3, 0, 0, prtytime_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0201ae0, 0x0201ae3, 0, 0, prtytime_speedup_r );
DRIVER_INIT_CALL(simpl156);
}
@@ -1117,7 +1117,7 @@ static READ32_HANDLER( charlien_speedup_r )
static DRIVER_INIT( charlien )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0201010, 0x0201013, 0, 0, charlien_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0201010, 0x0201013, 0, 0, charlien_speedup_r );
DRIVER_INIT_CALL(simpl156);
}
@@ -1131,7 +1131,7 @@ static READ32_HANDLER( osman_speedup_r )
static DRIVER_INIT( osman )
{
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0201010, 0x0201013, 0, 0, osman_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0201010, 0x0201013, 0, 0, osman_speedup_r );
DRIVER_INIT_CALL(simpl156);
}
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index 68597f339fc..114dedebf63 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -83,7 +83,7 @@ Custom ICs - 053260 - sound chip (QFP80)
***************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1f80, 0x1f80) AM_READ_PORT("COIN")
AM_RANGE(0x1f81, 0x1f81) AM_READ_PORT("TEST")
@@ -133,7 +133,7 @@ static WRITE8_HANDLER( z80_arm_nmi_w )
space->machine->scheduler().timer_set(attotime::from_usec(25), FUNC(nmi_callback)); /* kludge until the K053260 is emulated correctly */
}
-static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
AM_RANGE(0xf000, 0xf7ff) AM_RAM
diff --git a/src/mame/drivers/skeetsht.c b/src/mame/drivers/skeetsht.c
index f0cd5ad9db6..96104527935 100644
--- a/src/mame/drivers/skeetsht.c
+++ b/src/mame/drivers/skeetsht.c
@@ -169,14 +169,14 @@ static WRITE8_HANDLER( ay8910_w )
*
*************************************/
-static ADDRESS_MAP_START( hc11_pgm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hc11_pgm_map, AS_PROGRAM, 8 )
AM_RANGE(0x2800, 0x2807) AM_READWRITE(tms_r, tms_w)
AM_RANGE(0x1800, 0x1800) AM_WRITE(ay8910_w)
AM_RANGE(0xb600, 0xbdff) AM_RAM //internal EEPROM
AM_RANGE(0x0000, 0xffff) AM_ROM AM_REGION("68hc11", 0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hc11_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hc11_io_map, AS_IO, 8 )
AM_RANGE(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA) AM_READWRITE(hc11_porta_r, hc11_porta_w)
ADDRESS_MAP_END
@@ -187,7 +187,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( tms_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tms_program_map, AS_PROGRAM, 16 )
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w)
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_BASE_MEMBER(skeetsht_state,tms_vram)
AM_RANGE(0x00440000, 0x004fffff) AM_READWRITE(ramdac_r, ramdac_w)
diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c
index 2d0e359b577..e2caed18fd5 100644
--- a/src/mame/drivers/skimaxx.c
+++ b/src/mame/drivers/skimaxx.c
@@ -308,7 +308,7 @@ static READ32_HANDLER( skimaxx_analog_r )
*
*************************************/
-static ADDRESS_MAP_START( 68030_1_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( 68030_1_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_ROM
AM_RANGE(0x10000000, 0x10000003) AM_WRITE( skimaxx_sub_ctrl_w )
AM_RANGE(0x10100000, 0x1010000f) AM_READWRITE(m68k_tms_r, m68k_tms_w)//AM_NOP
@@ -341,7 +341,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( 68030_2_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( 68030_2_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003fffff) AM_ROM
AM_RANGE(0x20000000, 0x2007ffff) AM_READ ( skimaxx_blitter_r ) // do blit
@@ -365,7 +365,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( tms_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tms_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x000100ff) AM_RAM
AM_RANGE(0x00008000, 0x0003ffff) AM_RAM
AM_RANGE(0x00050000, 0x0005ffff) AM_RAM
diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c
index dbc377d70df..e7820859a2d 100644
--- a/src/mame/drivers/skullxbo.c
+++ b/src/mame/drivers/skullxbo.c
@@ -124,7 +124,7 @@ static WRITE16_HANDLER( skullxbo_mobwr_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0xff0000, 0xff07ff) AM_WRITE(skullxbo_mobmsb_w)
AM_RANGE(0xff0800, 0xff0bff) AM_WRITE(skullxbo_halt_until_hblank_0_w)
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index 0466a705073..b1998493b29 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -162,7 +162,7 @@ static WRITE8_HANDLER( nmi_enable_w )
}
-static ADDRESS_MAP_START( skyarmy_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( skyarmy_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(skyarmy_videoram_w) AM_BASE_MEMBER(skyarmy_state,videoram) /* Video RAM */
@@ -179,7 +179,7 @@ static ADDRESS_MAP_START( skyarmy_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa007, 0xa007) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( skyarmy_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( skyarmy_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x04, 0x05) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x06, 0x06) AM_DEVREAD("aysnd", ay8910_r)
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index 58b0b05f7a0..b63ebcec634 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -187,7 +187,7 @@ static WRITE8_DEVICE_HANDLER( skydiver_whistle_w )
*
*************************************/
-static ADDRESS_MAP_START( skydiver_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( skydiver_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x4300) AM_READWRITE(skydiver_wram_r, skydiver_wram_w)
AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x4000) AM_RAM /* RAM B1 */
diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c
index 3d28c25a937..214f9e9a3e5 100644
--- a/src/mame/drivers/skyfox.c
+++ b/src/mame/drivers/skyfox.c
@@ -35,7 +35,7 @@ Verified Dip locations and recommended settings with manual
Sky Fox
***************************************************************************/
-static ADDRESS_MAP_START( skyfox_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( skyfox_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM // ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM // RAM
AM_RANGE(0xd000, 0xd3ff) AM_RAM AM_BASE_SIZE_MEMBER(skyfox_state, spriteram, spriteram_size) // Sprites
@@ -63,7 +63,7 @@ ADDRESS_MAP_END
***************************************************************************/
-static ADDRESS_MAP_START( skyfox_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( skyfox_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM // RAM
// AM_RANGE(0x9000, 0x9001) AM_WRITENOP // ??
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index 22a6a26020a..5e73b3f175c 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -101,7 +101,7 @@ static MACHINE_START( skykid )
-static ADDRESS_MAP_START( skykid_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( skykid_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROMBANK("bank1") /* banked ROM */
AM_RANGE(0x2000, 0x2fff) AM_READWRITE(skykid_videoram_r,skykid_videoram_w) AM_BASE_MEMBER(skykid_state, videoram)/* Video RAM (background) */
AM_RANGE(0x4000, 0x47ff) AM_READWRITE(skykid_textram_r,skykid_textram_w) AM_BASE_MEMBER(skykid_state, textram) /* video RAM (text layer) */
@@ -117,7 +117,7 @@ static ADDRESS_MAP_START( skykid_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xa001) AM_WRITE(skykid_flipscreen_priority_w) /* flip screen & priority */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x001f) AM_READWRITE(m6801_io_r, m6801_io_w)
AM_RANGE(0x0080, 0x00ff) AM_RAM
AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("namco", namcos1_cus30_r, namcos1_cus30_w) /* PSG device, shared RAM */
@@ -134,7 +134,7 @@ static READ8_HANDLER( readFF )
return 0xff;
}
-static ADDRESS_MAP_START( mcu_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_port_map, AS_IO, 8 )
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_READ(inputport_r) /* input ports read */
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_WRITE(inputport_select_w) /* input port select */
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READ(readFF) /* leds won't work otherwise */
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index e7a41c00190..fe4f3e45022 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -342,7 +342,7 @@ static WRITE8_HANDLER( skylncr_nmi_enable_w )
* Memory Map *
**************************************/
-static ADDRESS_MAP_START( mem_map_skylncr, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mem_map_skylncr, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_SHARE("nvram")
@@ -400,7 +400,7 @@ static ADDRESS_MAP_START( mem_map_skylncr, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map_skylncr, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map_skylncr, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */
diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c
index 41535cffd90..96452a46dde 100644
--- a/src/mame/drivers/skyraid.c
+++ b/src/mame/drivers/skyraid.c
@@ -72,7 +72,7 @@ static WRITE8_HANDLER( skyraid_scroll_w )
}
-static ADDRESS_MAP_START( skyraid_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( skyraid_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_MIRROR(0x300)
AM_RANGE(0x0400, 0x040f) AM_WRITEONLY AM_BASE_MEMBER(skyraid_state, pos_ram)
AM_RANGE(0x0800, 0x087f) AM_RAM AM_MIRROR(0x480) AM_BASE_MEMBER(skyraid_state, alpha_num_ram)
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index a263a0c07ec..edb812bbefd 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -270,7 +270,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
#include "includes/slapfght.h"
-static ADDRESS_MAP_START( perfrman_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( perfrman_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x880f) AM_RAM AM_SHARE("share1")
@@ -280,7 +280,7 @@ static ADDRESS_MAP_START( perfrman_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tigerh_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tigerh_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc80f) AM_RAM AM_SHARE("share1")
@@ -295,7 +295,7 @@ static ADDRESS_MAP_START( tigerh_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(slapfight_fixcol_w) AM_BASE_MEMBER(slapfght_state, slapfight_fixcolorram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slapfght_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slapfght_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_RAM
@@ -312,7 +312,7 @@ static ADDRESS_MAP_START( slapfght_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(slapfight_fixcol_w) AM_BASE_MEMBER(slapfght_state, slapfight_fixcolorram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slapfighb2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slapfighb2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc7ff) AM_RAM
@@ -329,7 +329,7 @@ static ADDRESS_MAP_START( slapfighb2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(slapfight_fixcol_w) AM_BASE_MEMBER(slapfght_state, slapfight_fixcolorram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slapfght_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( slapfght_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(slapfight_port_00_w)
AM_RANGE(0x01, 0x01) AM_WRITE(slapfight_port_01_w)
@@ -342,7 +342,7 @@ static ADDRESS_MAP_START( slapfght_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x0c, 0x0d) AM_WRITE(slapfight_palette_bank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slapfight_m68705_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slapfight_m68705_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(slapfight_68705_portA_r, slapfight_68705_portA_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(slapfight_68705_portB_r, slapfight_68705_portB_w)
@@ -359,7 +359,7 @@ static READ8_HANDLER(tigerh_status_r)
return (slapfight_port_00_r(space, 0) & 0xf9)| ((tigerh_mcu_status_r(space, 0)));
}
-static ADDRESS_MAP_START( tigerh_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tigerh_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(tigerh_status_r, slapfight_port_00_w) /* status register */
AM_RANGE(0x01, 0x01) AM_WRITE(slapfight_port_01_w)
@@ -368,7 +368,7 @@ static ADDRESS_MAP_START( tigerh_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x07, 0x07) AM_WRITE(slapfight_port_07_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tigerhb_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tigerhb_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(slapfight_port_00_r, slapfight_port_00_w) /* status register */
AM_RANGE(0x01, 0x01) AM_WRITE(slapfight_port_01_w)
@@ -377,7 +377,7 @@ static ADDRESS_MAP_START( tigerhb_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x07, 0x07) AM_WRITE(slapfight_port_07_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tigerh_m68705_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tigerh_m68705_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(tigerh_68705_portA_r,tigerh_68705_portA_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(tigerh_68705_portB_r,tigerh_68705_portB_w)
@@ -389,7 +389,7 @@ static ADDRESS_MAP_START( tigerh_m68705_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( perfrman_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( perfrman_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x8800, 0x880f) AM_RAM AM_SHARE("share1")
AM_RANGE(0x8810, 0x8fff) AM_RAMBANK("bank1") /* Shared RAM with main CPU */
@@ -403,7 +403,7 @@ static ADDRESS_MAP_START( perfrman_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
// AM_RANGE(0xa0f0, 0xa0f0) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slapfght_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slapfght_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0xa080, 0xa080) AM_DEVWRITE("ay1", ay8910_address_w)
AM_RANGE(0xa081, 0xa081) AM_DEVREAD("ay1", ay8910_r)
@@ -737,7 +737,7 @@ static const ay8910_interface ay8910_interface_2 =
static SCREEN_EOF( perfrman )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
@@ -1742,12 +1742,12 @@ ROM_END
static DRIVER_INIT( tigerh )
{
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe803, 0xe803, 0, 0, tigerh_mcu_r, tigerh_mcu_w );
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe803, 0xe803, 0, 0, tigerh_mcu_r, tigerh_mcu_w );
}
static DRIVER_INIT( tigerhb )
{
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe803, 0xe803, 0, 0, tigerhb_e803_r, tigerhb_e803_w );
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe803, 0xe803, 0, 0, tigerhb_e803_r, tigerhb_e803_w );
}
@@ -1807,8 +1807,8 @@ static READ8_HANDLER( gtstarb1_port_0_read )
static void getstar_init( running_machine *machine )
{
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe803, 0xe803, 0, 0, getstar_e803_r, getstar_e803_w );
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x00, 0x00, 0, 0, slapfight_port_00_r );
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe803, 0xe803, 0, 0, getstar_e803_r, getstar_e803_w );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x00, 0x00, 0, 0, slapfight_port_00_r );
}
static DRIVER_INIT( getstar )
@@ -1834,7 +1834,7 @@ static DRIVER_INIT( gtstarb1 )
getstar_init(machine);
/* specific handlers for this bootleg */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x0, 0x0, 0, 0, gtstarb1_port_0_read );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x0, 0x0, 0, 0, gtstarb1_port_0_read );
/* 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 */
@@ -1851,13 +1851,13 @@ static DRIVER_INIT( gtstarb2 )
static DRIVER_INIT( slapfigh )
{
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe803, 0xe803, 0, 0, slapfight_mcu_r, slapfight_mcu_w );
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x00, 0x00, 0, 0, slapfight_mcu_status_r );
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe803, 0xe803, 0, 0, slapfight_mcu_r, slapfight_mcu_w );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x00, 0x00, 0, 0, slapfight_mcu_status_r );
}
static DRIVER_INIT( perfrman )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x00, 0x00, 0, 0, perfrman_port_00_r );
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x00, 0x00, 0, 0, perfrman_port_00_r );
}
/* ( YEAR NAME PARENT MACHINE INPUT INIT MONITOR COMPANY FULLNAME FLAGS ) */
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index 3287a12a329..49f14400998 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -289,7 +289,7 @@ static READ16_HANDLER( slapshot_msb_sound_r )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( slapshot_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( slapshot_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x500000, 0x50ffff) AM_RAM /* main RAM */
AM_RANGE(0x600000, 0x60ffff) AM_RAM AM_BASE_SIZE_MEMBER(slapshot_state, spriteram, spriteram_size) /* sprite ram */
@@ -304,7 +304,7 @@ static ADDRESS_MAP_START( slapshot_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd00000, 0xd00003) AM_READWRITE(slapshot_msb_sound_r, slapshot_msb_sound_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( opwolf3_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( opwolf3_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x500000, 0x50ffff) AM_RAM /* main RAM */
AM_RANGE(0x600000, 0x60ffff) AM_RAM AM_BASE_SIZE_MEMBER(slapshot_state, spriteram, spriteram_size) /* sprite ram */
@@ -323,7 +323,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( opwolf3_z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( opwolf3_z80_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10")
AM_RANGE(0xc000, 0xdfff) AM_RAM
diff --git a/src/mame/drivers/sleic.c b/src/mame/drivers/sleic.c
index 6fea735c831..422bf16b623 100644
--- a/src/mame/drivers/sleic.c
+++ b/src/mame/drivers/sleic.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( sleic_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sleic_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000, 0x1ffff) AM_RAM
AM_RANGE(0xe0000, 0xfffff) AM_ROM
diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c
index 47a0ac52772..f4476e7c0ef 100644
--- a/src/mame/drivers/sliver.c
+++ b/src/mame/drivers/sliver.c
@@ -427,7 +427,7 @@ static WRITE16_HANDLER(sound_w)
cputag_set_input_line(space->machine, "audiocpu", MCS51_INT0_LINE, HOLD_LINE);
}
-static ADDRESS_MAP_START( sliver_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sliver_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_WRITE(sliver_RAMDAC_offset_w)
@@ -464,11 +464,11 @@ static WRITE8_HANDLER(oki_setbank)
memcpy(sound+0x20000, sound+0x100000+0x20000*bank, 0x20000);
}
-static ADDRESS_MAP_START( soundmem_prg, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( soundmem_prg, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( soundmem_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( soundmem_io, AS_IO, 8 )
AM_RANGE(0x0100, 0x0100) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
AM_RANGE(0x0101, 0x0101) AM_READ(soundlatch_r)
/* ports */
diff --git a/src/mame/drivers/slotcarn.c b/src/mame/drivers/slotcarn.c
index 4092a1e7e3b..7a939968a63 100644
--- a/src/mame/drivers/slotcarn.c
+++ b/src/mame/drivers/slotcarn.c
@@ -179,7 +179,7 @@ static const mc6845_interface mc6845_intf =
* Memory Map *
*******************************/
-static ADDRESS_MAP_START( slotcarn_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slotcarn_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_BASE_MEMBER(slotcarn_state, backup_ram)
AM_RANGE(0x6800, 0x6fff) AM_RAM // spielbud
@@ -207,7 +207,7 @@ static ADDRESS_MAP_START( slotcarn_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
// spielbud - is the ay mirrored, or are there now 2?
-static ADDRESS_MAP_START( spielbud_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spielbud_io_map, AS_IO, 8 )
AM_RANGE(0xb000, 0xb000) AM_DEVWRITE("aysnd", ay8910_address_w)
AM_RANGE(0xb100, 0xb100) AM_DEVWRITE("aysnd", ay8910_data_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/sms.c b/src/mame/drivers/sms.c
index 004d5310ec6..952ae1b29cf 100644
--- a/src/mame/drivers/sms.c
+++ b/src/mame/drivers/sms.c
@@ -494,7 +494,7 @@ static PALETTE_INIT( sms )
*
*************************************/
-static ADDRESS_MAP_START( sms_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sms_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x007ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x00800, 0x00803) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
AM_RANGE(0x01000, 0x01007) AM_WRITE(video_w)
@@ -505,7 +505,7 @@ static ADDRESS_MAP_START( sms_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf8000, 0xfffff) AM_ROM // mirror for vectors
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sureshot_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sureshot_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x007ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x02000, 0x02007) AM_WRITE(video_w)
AM_RANGE(0x03000, 0x03003) AM_DEVREADWRITE("ppi8255_0", ppi8255_r, ppi8255_w)
@@ -514,7 +514,7 @@ static ADDRESS_MAP_START( sureshot_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf8000, 0xfffff) AM_ROM // mirror for vectors
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x27ff) AM_RAM
AM_RANGE(0x3100, 0x3103) AM_DEVREADWRITE("ppi8255_1", ppi8255_r, ppi8255_w)
diff --git a/src/mame/drivers/snesb.c b/src/mame/drivers/snesb.c
index 733f550d10c..3fa980fcb71 100644
--- a/src/mame/drivers/snesb.c
+++ b/src/mame/drivers/snesb.c
@@ -274,7 +274,7 @@ static READ8_HANDLER(denseib_770079_r)
-static ADDRESS_MAP_START( snesb_map, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START( snesb_map, AS_PROGRAM, 8)
AM_RANGE(0x000000, 0x2fffff) AM_READWRITE(snes_r_bank1, snes_w_bank1) /* I/O and ROM (repeats for each bank) */
AM_RANGE(0x300000, 0x3fffff) AM_READWRITE(snes_r_bank2, snes_w_bank2) /* I/O and ROM (repeats for each bank) */
AM_RANGE(0x400000, 0x5fffff) AM_READ(snes_r_bank3) /* ROM (and reserved in Mode 20) */
@@ -296,7 +296,7 @@ static WRITE8_DEVICE_HANDLER( spc_ram_100_w )
spc_ram_w(device, offset + 0x100, data);
}
-static ADDRESS_MAP_START( spc_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spc_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ef) AM_DEVREADWRITE("spc700", spc_ram_r, spc_ram_w) /* lower 32k ram */
AM_RANGE(0x00f0, 0x00ff) AM_DEVREADWRITE("spc700", spc_io_r, spc_io_w) /* spc io */
AM_RANGE(0x0100, 0xffff) AM_DEVWRITE("spc700", spc_ram_100_w)
@@ -553,7 +553,7 @@ static DRIVER_INIT(kinstb)
}
state->shared_ram = auto_alloc_array(machine, INT8, 0x100);
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x781000, 0x7810ff, 0, 0, sharedram_r, sharedram_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x781000, 0x7810ff, 0, 0, sharedram_r, sharedram_w);
DRIVER_INIT_CALL(snes_hirom);
}
@@ -595,7 +595,7 @@ static DRIVER_INIT( ffight2b )
rom[0x7ffc] = 0x54;
state->ffight2b_coins = 0;
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x7eadce, 0x7eadce, 0, 0, ffight2b_coin_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x7eadce, 0x7eadce, 0, 0, ffight2b_coin_r);
DRIVER_INIT_CALL(snes);
}
@@ -654,15 +654,15 @@ static DRIVER_INIT( sblast2b )
dst[0xfffd] = 0x7a;
/* protection checks */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x75bd37, 0x75bd37, 0, 0, sb2b_75bd37_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6a6000, 0x6a6fff, 0, 0, sb2b_6a6xxx_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x75bd37, 0x75bd37, 0, 0, sb2b_75bd37_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6a6000, 0x6a6fff, 0, 0, sb2b_6a6xxx_r);
/* extra inputs */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x770071, 0x770071, 0, 0, sb2b_770071_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x770079, 0x770079, 0, 0, sb2b_770079_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x770071, 0x770071, 0, 0, sb2b_770071_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x770079, 0x770079, 0, 0, sb2b_770079_r);
/* handler to read boot code */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x007000, 0x007fff, 0, 0, sb2b_7xxx_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x007000, 0x007fff, 0, 0, sb2b_7xxx_r);
DRIVER_INIT_CALL(snes_hirom);
}
@@ -685,9 +685,9 @@ static DRIVER_INIT( iron )
}
/* extra inputs */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x770071, 0x770071, 0, 0, iron_770071_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x770073, 0x770073, 0, 0, iron_770073_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x770079, 0x770079, 0, 0, iron_770079_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x770071, 0x770071, 0, 0, iron_770071_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x770073, 0x770073, 0, 0, iron_770073_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x770079, 0x770079, 0, 0, iron_770079_r);
DRIVER_INIT_CALL(snes);
}
@@ -730,8 +730,8 @@ static DRIVER_INIT( denseib )
rom[0xfffd] = 0xf7;
/* extra inputs */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x770071, 0x770071, 0, 0, denseib_770071_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x770079, 0x770079, 0, 0, denseib_770079_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x770071, 0x770071, 0, 0, denseib_770071_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x770079, 0x770079, 0, 0, denseib_770079_r);
DRIVER_INIT_CALL(snes_hirom);
}
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index d6836aa09dd..bfcfddab867 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -858,7 +858,7 @@ static CUSTOM_INPUT( snk_bonus_r )
/************************************************************************/
-static ADDRESS_MAP_START( marvins_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( marvins_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6000) AM_WRITE(marvins_palette_bank_w)
AM_RANGE(0x8000, 0x8000) AM_READ_PORT("IN0")
@@ -885,7 +885,7 @@ static ADDRESS_MAP_START( marvins_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xff00, 0xff00) AM_WRITE(marvins_scroll_msb_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( marvins_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( marvins_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8700, 0x8700) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_SHARE("share1")
@@ -906,7 +906,7 @@ ADDRESS_MAP_END
// vangrd2 accesses video registers at xxF1 instead of xx00
-static ADDRESS_MAP_START( madcrash_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( madcrash_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8000) AM_READ_PORT("IN0")
AM_RANGE(0x8100, 0x8100) AM_READ_PORT("IN1")
@@ -933,7 +933,7 @@ static ADDRESS_MAP_START( madcrash_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xff00, 0xff00) AM_MIRROR(0xff) AM_WRITE(snk_fg_scrollx_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( madcrash_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( madcrash_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x8700, 0x8700) AM_WRITE(snk_cpuB_nmi_ack_w) // vangrd2
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITE(snk_cpuB_nmi_ack_w) // madcrash
@@ -953,7 +953,7 @@ static ADDRESS_MAP_START( madcrash_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("share3")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( madcrush_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( madcrush_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8000) AM_READ_PORT("IN0")
AM_RANGE(0x8100, 0x8100) AM_READ_PORT("IN1")
@@ -980,7 +980,7 @@ static ADDRESS_MAP_START( madcrush_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xff00, 0xff00) AM_WRITE(marvins_scroll_msb_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( madcrush_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( madcrush_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITE(snk_cpuB_nmi_ack_w)
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1") // + work ram
@@ -1001,7 +1001,7 @@ static ADDRESS_MAP_START( madcrush_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jcross_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jcross_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
AM_RANGE(0xa100, 0xa100) AM_READ_PORT("IN1")
@@ -1022,7 +1022,7 @@ static ADDRESS_MAP_START( jcross_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xffff, 0xffff) AM_WRITENOP // simply a program patch to not write to two not existing video registers?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jcross_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jcross_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa700, 0xa700) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1")
@@ -1031,7 +1031,7 @@ static ADDRESS_MAP_START( jcross_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sgladiat_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sgladiat_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("IN0")
AM_RANGE(0xa100, 0xa100) AM_READ_PORT("IN1")
@@ -1053,7 +1053,7 @@ static ADDRESS_MAP_START( sgladiat_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf7ff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share3") AM_BASE_MEMBER(snk_state, tx_videoram) // + work RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sgladiat_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sgladiat_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
AM_RANGE(0xa600, 0xa600) AM_WRITE(sgladiat_flipscreen_w) // flip screen, bg palette bank
@@ -1069,7 +1069,7 @@ static ADDRESS_MAP_START( sgladiat_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hal21_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hal21_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0")
AM_RANGE(0xc100, 0xc100) AM_READ_PORT("IN1")
@@ -1089,7 +1089,7 @@ static ADDRESS_MAP_START( hal21_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share3") AM_BASE_MEMBER(snk_state, tx_videoram) // + work RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hal21_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hal21_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITE(snk_cpuB_nmi_ack_w)
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1")
@@ -1098,7 +1098,7 @@ static ADDRESS_MAP_START( hal21_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aso_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( aso_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0")
AM_RANGE(0xc100, 0xc100) AM_READ_PORT("IN1")
@@ -1120,7 +1120,7 @@ static ADDRESS_MAP_START( aso_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE_MEMBER(snk_state, tx_videoram) // + work RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aso_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( aso_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
@@ -1130,7 +1130,7 @@ static ADDRESS_MAP_START( aso_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tnk3_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tnk3_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0")
AM_RANGE(0xc100, 0xc100) AM_READ_PORT("IN1")
@@ -1153,7 +1153,7 @@ static ADDRESS_MAP_START( tnk3_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share3") AM_BASE_MEMBER(snk_state, tx_videoram) // + work RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tnk3_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tnk3_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w) // tnk3, athena
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w) // fitegolf
@@ -1164,7 +1164,7 @@ static ADDRESS_MAP_START( tnk3_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ikari_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ikari_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0")
AM_RANGE(0xc100, 0xc100) AM_READ_PORT("IN1")
@@ -1199,7 +1199,7 @@ static ADDRESS_MAP_START( ikari_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE_MEMBER(snk_state, tx_videoram) // + work RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ikari_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ikari_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
AM_RANGE(0xc980, 0xc980) AM_WRITE(ikari_unknown_video_w)
@@ -1219,7 +1219,7 @@ static ADDRESS_MAP_START( ikari_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bermudat_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bermudat_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0")
AM_RANGE(0xc100, 0xc100) AM_READ_PORT("IN1")
@@ -1263,7 +1263,7 @@ static ADDRESS_MAP_START( bermudat_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE_MEMBER(snk_state, tx_videoram) // + work RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bermudat_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bermudat_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
AM_RANGE(0xc800, 0xc800) AM_WRITE(snk_bg_scrolly_w)
@@ -1282,7 +1282,7 @@ static ADDRESS_MAP_START( bermudat_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gwar_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gwar_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0")
AM_RANGE(0xc100, 0xc100) AM_READ_PORT("IN1")
@@ -1309,7 +1309,7 @@ static ADDRESS_MAP_START( gwar_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE_MEMBER(snk_state, tx_videoram) // + work RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gwar_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gwar_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
AM_RANGE(0xc8c0, 0xc8c0) AM_WRITE(gwar_tx_bank_w) // char and palette bank
@@ -1320,7 +1320,7 @@ static ADDRESS_MAP_START( gwar_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gwara_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gwara_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0")
AM_RANGE(0xc100, 0xc100) AM_READ_PORT("IN1")
@@ -1346,7 +1346,7 @@ static ADDRESS_MAP_START( gwara_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfac0, 0xfac0) AM_WRITE(snk_sprite_split_point_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gwara_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gwara_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w)
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share1")
@@ -1357,7 +1357,7 @@ static ADDRESS_MAP_START( gwara_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tdfever_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tdfever_cpuA_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0")
AM_RANGE(0xc080, 0xc080) AM_READ_PORT("IN1")
@@ -1387,7 +1387,7 @@ static ADDRESS_MAP_START( tdfever_cpuA_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM_WRITE(snk_tx_videoram_w) AM_SHARE("share4") AM_BASE_MEMBER(snk_state, tx_videoram) // + work RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tdfever_cpuB_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tdfever_cpuB_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w) // tdfever, tdfever2
AM_RANGE(0xc700, 0xc700) AM_READWRITE(snk_cpuA_nmi_trigger_r, snk_cpuB_nmi_ack_w) // fsoccer
@@ -1400,7 +1400,7 @@ ADDRESS_MAP_END
/***********************************************************************/
-static ADDRESS_MAP_START( marvins_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( marvins_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x4000) AM_READ(marvins_soundlatch_r)
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ay1", ay8910_address_data_w)
@@ -1410,13 +1410,13 @@ static ADDRESS_MAP_START( marvins_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe7ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( marvins_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( marvins_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READNOP // read on startup, then the Z80 automatically pulls down the IORQ pin to ack irq
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jcross_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jcross_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(sgladiat_soundlatch_r)
@@ -1426,13 +1426,13 @@ static ADDRESS_MAP_START( jcross_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe004, 0xe005) AM_DEVWRITE("ay2", ay8910_address_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jcross_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jcross_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(sgladiat_sound_irq_ack_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hal21_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hal21_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(sgladiat_soundlatch_r)
@@ -1442,13 +1442,13 @@ static ADDRESS_MAP_START( hal21_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe008, 0xe009) AM_DEVWRITE("ay2", ay8910_address_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hal21_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hal21_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READNOP // read on startup, then the Z80 automatically pulls down the IORQ pin to ack irq
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tnk3_YM3526_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tnk3_YM3526_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
@@ -1458,7 +1458,7 @@ static ADDRESS_MAP_START( tnk3_YM3526_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe006, 0xe006) AM_READ(tnk3_ymirq_ack_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aso_YM3526_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( aso_YM3526_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r)
@@ -1469,7 +1469,7 @@ static ADDRESS_MAP_START( aso_YM3526_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf006, 0xf006) AM_READ(tnk3_ymirq_ack_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( YM3526_YM3526_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( YM3526_YM3526_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
@@ -1480,7 +1480,7 @@ static ADDRESS_MAP_START( YM3526_YM3526_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_status_r, snk_sound_status_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( YM3812_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( YM3812_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
@@ -1489,7 +1489,7 @@ static ADDRESS_MAP_START( YM3812_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_status_r, snk_sound_status_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( YM3526_Y8950_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( YM3526_Y8950_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
@@ -1500,7 +1500,7 @@ static ADDRESS_MAP_START( YM3526_Y8950_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_status_r, snk_sound_status_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( YM3812_Y8950_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( YM3812_Y8950_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
@@ -1511,7 +1511,7 @@ static ADDRESS_MAP_START( YM3812_Y8950_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_status_r, snk_sound_status_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( Y8950_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( Y8950_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
@@ -6253,7 +6253,7 @@ ROM_END
static DRIVER_INIT( countryc )
{
// replace coin counter with trackball select
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc300, 0xc300, 0, 0, countryc_trackball_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc300, 0xc300, 0, 0, countryc_trackball_w);
}
diff --git a/src/mame/drivers/snk6502.c b/src/mame/drivers/snk6502.c
index 94475cdd70f..6a515190246 100644
--- a/src/mame/drivers/snk6502.c
+++ b/src/mame/drivers/snk6502.c
@@ -323,7 +323,7 @@ static CUSTOM_INPUT( sasuke_count_r )
*
*************************************/
-static ADDRESS_MAP_START( sasuke_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sasuke_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(snk6502_videoram2_w) AM_BASE_MEMBER(snk6502_state, videoram2)
AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(snk6502_videoram_w) AM_BASE_MEMBER(snk6502_state, videoram)
@@ -342,7 +342,7 @@ static ADDRESS_MAP_START( sasuke_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( satansat_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( satansat_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(snk6502_videoram2_w) AM_BASE_MEMBER(snk6502_state, videoram2)
AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(snk6502_videoram_w) AM_BASE_MEMBER(snk6502_state, videoram)
@@ -361,7 +361,7 @@ static ADDRESS_MAP_START( satansat_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vanguard_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vanguard_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(snk6502_videoram2_w) AM_BASE_MEMBER(snk6502_state, videoram2)
AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(snk6502_videoram_w) AM_BASE_MEMBER(snk6502_state, videoram)
@@ -382,7 +382,7 @@ static ADDRESS_MAP_START( vanguard_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_ROM /* for the reset / interrupt vectors */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fantasy_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fantasy_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(snk6502_videoram2_w) AM_BASE_MEMBER(snk6502_state, videoram2)
AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(snk6502_videoram_w) AM_BASE_MEMBER(snk6502_state, videoram)
@@ -402,7 +402,7 @@ static ADDRESS_MAP_START( fantasy_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pballoon_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pballoon_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(snk6502_videoram2_w) AM_BASE_MEMBER(snk6502_state, videoram2)
AM_RANGE(0x0800, 0x0bff) AM_RAM_WRITE(snk6502_videoram_w) AM_BASE_MEMBER(snk6502_state, videoram)
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index bd06147a1ab..976dba06112 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -119,7 +119,7 @@ static WRITE16_HANDLER( sound_w )
/*******************************************************************************/
-static ADDRESS_MAP_START( pow_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pow_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM
AM_RANGE(0x080000, 0x080001) AM_READ(control_1_r)
@@ -136,7 +136,7 @@ static ADDRESS_MAP_START( pow_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(pow_paletteram16_word_w) AM_BASE_MEMBER(snk68_state, paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( searchar_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( searchar_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM
AM_RANGE(0x080000, 0x080005) AM_READ(protcontrols_r) /* Player 1 & 2 */
@@ -160,7 +160,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r) AM_WRITE(sound_status_w)
@@ -178,7 +178,7 @@ static WRITE8_DEVICE_HANDLER( D7759_upd_reset_w )
upd7759_reset_w(device, data & 0x80);
}
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("ymsnd", ym3812_status_port_r, ym3812_control_port_w)
AM_RANGE(0x20, 0x20) AM_DEVWRITE("ymsnd", ym3812_write_port_w)
diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c
index e7d455907bc..275bbfcd789 100644
--- a/src/mame/drivers/snookr10.c
+++ b/src/mame/drivers/snookr10.c
@@ -496,7 +496,7 @@ static WRITE8_HANDLER( output_port_1_w )
* Memory map information *
*************************/
-static ADDRESS_MAP_START( snookr10_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( snookr10_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x1000, 0x1000) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
AM_RANGE(0x3000, 0x3000) AM_READ_PORT("IN0") /* IN0 */
@@ -511,7 +511,7 @@ static ADDRESS_MAP_START( snookr10_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tenballs_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tenballs_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x1000, 0x1000) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
AM_RANGE(0x4000, 0x4000) AM_READ_PORT("IN0") /* IN0 */
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index af33755d720..9ee0b9f2f87 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -187,7 +187,7 @@ static WRITE16_HANDLER( semicom_soundcmd_w )
/* Snow Bros Memory Map */
-static ADDRESS_MAP_START( snowbros_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( snowbros_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x200000, 0x200001) AM_WRITE(watchdog_reset16_w)
@@ -203,12 +203,12 @@ static ADDRESS_MAP_START( snowbros_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xa00000, 0xa00001) AM_WRITE(snowbros_irq2_ack_w) /* IRQ 2 acknowledge */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, soundlatch_w) /* goes back to the main CPU, checked during boot */
@@ -260,17 +260,17 @@ static WRITE8_HANDLER( prot_io_w )
}
/* Semicom AT89C52 MCU */
-static ADDRESS_MAP_START( protection_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( protection_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( protection_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( protection_iomap, AS_IO, 8 )
AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P3) AM_READWRITE(prot_io_r,prot_io_w)
ADDRESS_MAP_END
/* Winter Bobble - bootleg GFX chip */
-static ADDRESS_MAP_START( wintbob_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wintbob_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x200000, 0x200001) AM_WRITE(watchdog_reset16_w)
@@ -288,7 +288,7 @@ ADDRESS_MAP_END
/* Honey Dolls */
-static ADDRESS_MAP_START( honeydol_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( honeydol_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE_MEMBER(snowbros_state, hyperpac_ram)
AM_RANGE(0x200000, 0x200001) AM_WRITENOP /* ? */
@@ -304,13 +304,13 @@ static ADDRESS_MAP_START( honeydol_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb01fff) AM_RAM AM_BASE_SIZE_MEMBER(snowbros_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( honeydol_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( honeydol_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xe010, 0xe010) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( honeydol_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( honeydol_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w) // not connected?
AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, soundlatch_w) /* goes back to the main CPU, checked during boot */
@@ -327,7 +327,7 @@ static WRITE16_HANDLER( twinadv_68000_sound_w )
}
}
-static ADDRESS_MAP_START( twinadv_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( twinadv_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x200001) AM_WRITE(watchdog_reset16_w)
@@ -353,7 +353,7 @@ static WRITE8_DEVICE_HANDLER( twinadv_oki_bank_w )
downcast<okim6295_device *>(device)->set_bank_base(bank * 0x40000);
}
-static ADDRESS_MAP_START( twinadv_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( twinadv_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x02, 0x02) AM_READWRITE(soundlatch_r, soundlatch_w) // back to 68k?
AM_RANGE(0x04, 0x04) AM_DEVWRITE("oki", twinadv_oki_bank_w) // oki bank?
@@ -368,7 +368,7 @@ sound hardware is also different
*/
-static ADDRESS_MAP_START( hyperpac_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hyperpac_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM AM_BASE_MEMBER(snowbros_state, hyperpac_ram)
AM_RANGE(0x300000, 0x300001) AM_WRITE(semicom_soundcmd_w)
@@ -384,7 +384,7 @@ static ADDRESS_MAP_START( hyperpac_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xa00000, 0xa00001) AM_WRITE(snowbros_irq2_ack_w) /* IRQ 2 acknowledge */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hyperpac_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hyperpac_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xcfff) AM_ROM
AM_RANGE(0xd000, 0xd7ff) AM_RAM
AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ymsnd", ym2151_r,ym2151_w)
@@ -502,7 +502,7 @@ static WRITE16_DEVICE_HANDLER( sb3_sound_w )
-static ADDRESS_MAP_START( snowbros3_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( snowbros3_map, AS_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x03ffff) AM_ROM
AM_RANGE( 0x100000, 0x103fff) AM_RAM
AM_RANGE( 0x200000, 0x200001) AM_WRITE(watchdog_reset16_w)
@@ -521,7 +521,7 @@ ADDRESS_MAP_END
/* Final Tetris */
-static ADDRESS_MAP_START( finalttr_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( finalttr_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE_MEMBER(snowbros_state, hyperpac_ram)
AM_RANGE(0x300000, 0x300001) AM_WRITE(semicom_soundcmd_w)
@@ -2272,7 +2272,7 @@ static DRIVER_INIT( moremorp )
// state->hyperpac_ram[0xf000/2 + i] = PROTDATA[i];
/* explicit check in the code */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x200001, 0, 0, moremorp_0a_read );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x200001, 0, 0, moremorp_0a_read );
}
@@ -2673,7 +2673,7 @@ static DRIVER_INIT(4in1boot)
memcpy(src,buffer,len);
auto_free(machine, buffer);
}
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x200001, 0, 0, _4in1_02_read );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x200001, 0, 0, _4in1_02_read );
}
static DRIVER_INIT(snowbro3)
@@ -2700,7 +2700,7 @@ static READ16_HANDLER( _3in1_read )
static DRIVER_INIT( 3in1semi )
{
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x200001, 0, 0, _3in1_read );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x200001, 0, 0, _3in1_read );
}
static READ16_HANDLER( cookbib3_read )
@@ -2710,7 +2710,7 @@ static READ16_HANDLER( cookbib3_read )
static DRIVER_INIT( cookbib3 )
{
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x200001, 0, 0, cookbib3_read );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x200001, 0, 0, cookbib3_read );
}
static DRIVER_INIT( pzlbreak )
diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c
index a85adac95e0..50ca0e72259 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -39,7 +39,7 @@ static READ8_HANDLER( solomon_0xe603_r )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd3ff) AM_RAM_WRITE(solomon_colorram_w) AM_BASE_MEMBER(solomon_state, colorram)
@@ -61,14 +61,14 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x8000, 0x8000) AM_READ(soundlatch_r)
AM_RANGE(0xffff, 0xffff) AM_WRITENOP /* watchdog? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x11) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x20, 0x21) AM_DEVWRITE("ay2", ay8910_address_data_w)
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index cec779693dd..898837b7e8b 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -79,7 +79,7 @@ static WRITE8_HANDLER( sonson_coin2_counter_w )
coin_counter_w(space->machine, 1, data & 1);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x13ff) AM_RAM_WRITE(sonson_videoram_w) AM_BASE_SIZE_MEMBER(sonson_state, videoram, videoram_size)
AM_RANGE(0x1400, 0x17ff) AM_RAM_WRITE(sonson_colorram_w) AM_BASE_MEMBER(sonson_state, colorram)
@@ -99,7 +99,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x4000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x4000, 0x4001) AM_DEVWRITE("ay2", ay8910_address_data_w)
diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c
index aa5b8abffac..73697d4793d 100644
--- a/src/mame/drivers/sothello.c
+++ b/src/mame/drivers/sothello.c
@@ -120,14 +120,14 @@ static READ8_HANDLER( soundcpu_status_r )
return state->soundcpu_busy;
}
-static ADDRESS_MAP_START( maincpu_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( maincpu_mem_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM AM_MIRROR(0x1800) AM_SHARE("share1")
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( maincpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( maincpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x00, 0x0f) AM_READ_PORT("INPUT1")
AM_RANGE( 0x10, 0x1f) AM_READ_PORT("INPUT2")
@@ -184,12 +184,12 @@ static WRITE8_HANDLER(soundcpu_int_clear_w)
cputag_set_input_line(space->machine, "soundcpu", 0, CLEAR_LINE );
}
-static ADDRESS_MAP_START( soundcpu_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( soundcpu_mem_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( soundcpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( soundcpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r)
AM_RANGE(0x01, 0x01) AM_WRITE(msm_data_w)
@@ -225,7 +225,7 @@ static READ8_HANDLER(subcpu_status_r)
return 0;
}
-static ADDRESS_MAP_START( subcpu_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( subcpu_mem_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_READWRITE(subcpu_status_r,subcpu_status_w)
AM_RANGE(0x2000, 0x77ff) AM_RAM
AM_RANGE(0x7800, 0x7fff) AM_RAM AM_SHARE("share1") /* upper 0x800 of 6264 is shared with main cpu */
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index 1e01fd39f0c..d424c02ad45 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -180,7 +180,7 @@ static MACHINE_START( spacefb )
static MACHINE_RESET( spacefb )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -197,7 +197,7 @@ static MACHINE_RESET( spacefb )
*
*************************************/
-static ADDRESS_MAP_START( spacefb_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spacefb_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_NOP
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x3c00) AM_RAM AM_BASE_MEMBER(spacefb_state, videoram) AM_SIZE_MEMBER(spacefb_state, videoram_size)
@@ -206,7 +206,7 @@ static ADDRESS_MAP_START( spacefb_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spacefb_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spacefb_audio_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3ff)
AM_RANGE(0x0000, 0x03ff) AM_ROM
ADDRESS_MAP_END
@@ -219,7 +219,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( spacefb_main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spacefb_main_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
AM_RANGE(0x01, 0x01) AM_READ_PORT("P2")
@@ -234,7 +234,7 @@ static ADDRESS_MAP_START( spacefb_main_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spacefb_audio_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spacefb_audio_io_map, AS_IO, 8 )
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READ(spacefb_audio_p2_r)
AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ(spacefb_audio_t0_r)
diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c
index 28704d9161b..9dde81381fc 100644
--- a/src/mame/drivers/spaceg.c
+++ b/src/mame/drivers/spaceg.c
@@ -323,7 +323,7 @@ static SCREEN_UPDATE( spaceg )
*
*************************************/
-static ADDRESS_MAP_START( spaceg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spaceg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x3000, 0x3fff) AM_ROM
AM_RANGE(0x7000, 0x77ff) AM_RAM
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index 6bfe90a1741..c6414343865 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -140,7 +140,7 @@ static WRITE16_HANDLER( soundcommand_w )
}
}
-static ADDRESS_MAP_START( spbactn_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( spbactn_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x3ffff) AM_ROM
AM_RANGE(0x40000, 0x43fff) AM_RAM // main ram
AM_RANGE(0x50000, 0x50fff) AM_RAM AM_BASE_MEMBER(spbactn_state,spvideoram)
@@ -186,7 +186,7 @@ static ADDRESS_MAP_START( spbactn_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xa0206, 0xa0207) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spbactn_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spbactn_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf800) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c
index 3ab172d0f7f..50bc787650f 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -80,7 +80,7 @@ static WRITE8_HANDLER( spcforce_soundtrigger_w )
}
-static ADDRESS_MAP_START( spcforce_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spcforce_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x7000, 0x7000) AM_READ_PORT("DSW") AM_WRITE(soundlatch_w)
@@ -94,11 +94,11 @@ static ADDRESS_MAP_START( spcforce_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xa3ff) AM_RAM AM_BASE_MEMBER(spcforce_state, scrollram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spcforce_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spcforce_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spcforce_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spcforce_sound_io_map, AS_IO, 8 )
AM_RANGE(MCS48_PORT_BUS, MCS48_PORT_BUS) AM_READ(soundlatch_r)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_WRITE(spcforce_SN76496_latch_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READWRITE(spcforce_SN76496_select_r, spcforce_SN76496_select_w)
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index c66e7b19206..67c1b2f004b 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -249,7 +249,7 @@ static READ8_HANDLER( port_0_r )
-static ADDRESS_MAP_START( spdodgeb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spdodgeb_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x10ff) AM_WRITEONLY AM_BASE_SIZE_MEMBER(spdodgeb_state, spriteram, spriteram_size)
AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(spdodgeb_videoram_w) AM_BASE_MEMBER(spdodgeb_state, videoram)
@@ -266,7 +266,7 @@ static ADDRESS_MAP_START( spdodgeb_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spdodgeb_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spdodgeb_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r)
AM_RANGE(0x2800, 0x2801) AM_DEVWRITE("ymsnd", ym3812_w)
diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c
index 22d9a96b9a4..fc6dc7df921 100644
--- a/src/mame/drivers/speedatk.c
+++ b/src/mame/drivers/speedatk.c
@@ -176,7 +176,7 @@ static WRITE8_HANDLER( key_matrix_status_w )
state->coin_settings = state->km_status & 0xf;
}
-static ADDRESS_MAP_START( speedatk_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( speedatk_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8000) AM_READWRITE(key_matrix_r,key_matrix_w)
AM_RANGE(0x8001, 0x8001) AM_READWRITE(key_matrix_status_r,key_matrix_status_w)
@@ -186,7 +186,7 @@ static ADDRESS_MAP_START( speedatk_mem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( speedatk_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( speedatk_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_WRITE(speedatk_6845_w) //h46505 address / data routing
AM_RANGE(0x24, 0x24) AM_WRITE(watchdog_reset_w)
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index b034712cbe5..1217217df72 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -65,7 +65,7 @@ static WRITE8_HANDLER( speedbal_coincounter_w )
/* unknown: (data & 0x10) and (data & 4) */
}
-static ADDRESS_MAP_START( main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdbff) AM_ROM
AM_RANGE(0xdc00, 0xdfff) AM_RAM AM_SHARE("share1") // shared with SOUND
AM_RANGE(0xe000, 0xe1ff) AM_RAM_WRITE(speedbal_background_videoram_w) AM_BASE_MEMBER(speedbal_state, background_videoram)
@@ -75,7 +75,7 @@ static ADDRESS_MAP_START( main_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xff00, 0xffff) AM_RAM AM_BASE_SIZE_MEMBER(speedbal_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW2")
AM_RANGE(0x10, 0x10) AM_READ_PORT("DSW1")
@@ -85,14 +85,14 @@ static ADDRESS_MAP_START( main_cpu_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x50, 0x50) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xd000, 0xdbff) AM_RAM
AM_RANGE(0xdc00, 0xdfff) AM_RAM AM_SHARE("share1") // shared with MAIN CPU
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_cpu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_cpu_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
AM_RANGE(0x40, 0x40) AM_WRITENOP
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index bca1203b126..70b7daca189 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -106,7 +106,7 @@ static WRITE8_DEVICE_HANDLER( oki_banking_w )
/* main cpu */
-static ADDRESS_MAP_START( speedspn_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( speedspn_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(paletteram_xxxxRRRRGGGGBBBB_le_w) AM_BASE_GENERIC(paletteram) /* RAM COLOUR */
AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(speedspn_attram_w) AM_BASE_MEMBER(speedspn_state, attram)
@@ -117,7 +117,7 @@ static ADDRESS_MAP_START( speedspn_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xffff) AM_ROMBANK("bank1") /* banked ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( speedspn_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( speedspn_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x07, 0x07) AM_WRITE(speedspn_global_display_w)
AM_RANGE(0x10, 0x10) AM_READ_PORT("SYSTEM")
@@ -131,7 +131,7 @@ ADDRESS_MAP_END
/* sound cpu */
-static ADDRESS_MAP_START( speedspn_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( speedspn_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("oki", oki_banking_w)
diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c
index db90e8fef3c..091a581f2e4 100644
--- a/src/mame/drivers/speglsht.c
+++ b/src/mame/drivers/speglsht.c
@@ -124,7 +124,7 @@ public:
};
-static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( st0016_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w)
@@ -137,7 +137,7 @@ static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE_MEMBER(speglsht_state, shared)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( st0016_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( st0016_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w)
AM_RANGE(0xe1, 0xe1) AM_WRITE(st0016_rom_bank_w)
@@ -221,7 +221,7 @@ static READ32_HANDLER(irq_ack_clear)
return 0;
}
-static ADDRESS_MAP_START( speglsht_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( speglsht_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x000fffff) AM_RAM
AM_RANGE(0x01000000, 0x01007fff) AM_RAM //tested - STATIC RAM
AM_RANGE(0x01600000, 0x0160004f) AM_READWRITE(cop_r, cop_w) AM_BASE_MEMBER(speglsht_state, cop_ram)
diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c
index a55c83a8f66..9463c941675 100644
--- a/src/mame/drivers/spiders.c
+++ b/src/mame/drivers/spiders.c
@@ -579,7 +579,7 @@ static READ8_DEVICE_HANDLER( gfx_rom_r )
*
*************************************/
-static ADDRESS_MAP_START( spiders_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spiders_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_RAM AM_BASE_MEMBER(spiders_state, ram)
AM_RANGE(0xc000, 0xc000) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0xc001, 0xc001) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w)
@@ -594,7 +594,7 @@ static ADDRESS_MAP_START( spiders_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spiders_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spiders_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x0080, 0x0083) AM_DEVREADWRITE("pia4", pia6821_r, pia6821_w)
AM_RANGE(0xf800, 0xffff) AM_ROM
diff --git a/src/mame/drivers/spinb.c b/src/mame/drivers/spinb.c
index f59ee80c862..2d02b457f9c 100644
--- a/src/mame/drivers/spinb.c
+++ b/src/mame/drivers/spinb.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( spinb_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spinb_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index 4f3c2dd92e8..bab5dd4dadb 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -88,7 +88,7 @@ static WRITE16_HANDLER( splash_coin_w )
}
}
-static ADDRESS_MAP_START( splash_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( splash_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM /* ROM */
AM_RANGE(0x800000, 0x83ffff) AM_RAM AM_BASE_MEMBER(splash_state, pixelram) /* Pixel Layer */
AM_RANGE(0x840000, 0x840001) AM_READ_PORT("DSW1")
@@ -120,7 +120,7 @@ static void splash_msm5205_int(device_t *device)
state->adpcm_data = (state->adpcm_data << 4) & 0xf0;
}
-static ADDRESS_MAP_START( splash_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( splash_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xd7ff) AM_ROM /* ROM */
AM_RANGE(0xd800, 0xd800) AM_WRITE(splash_adpcm_data_w) /* ADPCM data for the MSM5205 chip */
// AM_RANGE(0xe000, 0xe000) AM_WRITENOP /* ??? */
@@ -168,7 +168,7 @@ static void ym_irq(device_t *device, int state)
roldfrog_update_irq(device->machine);
}
-static ADDRESS_MAP_START( roldfrog_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( roldfrog_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM /* ROM */
AM_RANGE(0x400000, 0x407fff) AM_ROM AM_BASE_MEMBER(splash_state, protdata) /* Protection Data */
AM_RANGE(0x408000, 0x4087ff) AM_RAM /* Extra Ram */
@@ -189,7 +189,7 @@ static ADDRESS_MAP_START( roldfrog_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffc000, 0xffffff) AM_RAM /* Work RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( roldfrog_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( roldfrog_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x6fff) AM_ROM
AM_RANGE(0x7000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROM AM_ROMBANK("sound_bank")
@@ -201,7 +201,7 @@ static READ8_HANDLER(roldfrog_unk_r)
return 0xff;
}
-static ADDRESS_MAP_START( roldfrog_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( roldfrog_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x40, 0x40) AM_NOP
@@ -231,7 +231,7 @@ static WRITE16_HANDLER( funystrp_sh_irqtrigger_w )
cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( funystrp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( funystrp_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM /* ROM */
AM_RANGE(0x100000, 0x1fffff) AM_RAM /* protection? RAM */
AM_RANGE(0x800000, 0x83ffff) AM_RAM AM_BASE_MEMBER(splash_state, pixelram) /* Pixel Layer */
@@ -250,7 +250,7 @@ static ADDRESS_MAP_START( funystrp_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfe0000, 0xffffff) AM_RAM AM_MASK(0xffff) /* there's fe0000 <-> ff0000 compare */ /* Work RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( funystrp_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( funystrp_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x6fff) AM_ROM
AM_RANGE(0x7000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROM AM_ROMBANK("sound_bank")
@@ -290,7 +290,7 @@ static WRITE8_HANDLER(msm2_data_w)
state->msm_toggle2=0;
}
-static ADDRESS_MAP_START( funystrp_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( funystrp_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(msm1_data_w)
AM_RANGE(0x01, 0x01) AM_WRITE(msm2_data_w)
diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c
index f98ab762235..b82c09b8188 100644
--- a/src/mame/drivers/spoker.c
+++ b/src/mame/drivers/spoker.c
@@ -211,12 +211,12 @@ static READ8_HANDLER( spoker_magic_r )
-static ADDRESS_MAP_START( spoker_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spoker_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x0f3ff ) AM_ROM
AM_RANGE( 0x0f400, 0x0ffff ) AM_RAM AM_SHARE("nvram")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spoker_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spoker_portmap, AS_IO, 8 )
AM_RANGE( 0x0000, 0x003f ) AM_RAM // Z180 internal regs
AM_RANGE( 0x2000, 0x23ff ) AM_RAM_WRITE( paletteram_xBBBBBGGGGGRRRRR_split1_w ) AM_BASE_GENERIC( paletteram )
diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c
index a871b132e3b..60b5d81d170 100644
--- a/src/mame/drivers/spool99.c
+++ b/src/mame/drivers/spool99.c
@@ -203,7 +203,7 @@ static WRITE8_DEVICE_HANDLER( eeprom_dataline_w )
eeprom_write_bit(device, data & 0x01);
}
-static ADDRESS_MAP_START( spool99_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spool99_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_BASE_MEMBER(spool99_state,main)
AM_RANGE(0x0100, 0xaeff) AM_ROM AM_REGION("maincpu", 0x100) AM_WRITENOP
AM_RANGE(0xaf00, 0xafff) AM_READ(spool99_io_r)
@@ -249,7 +249,7 @@ static READ8_HANDLER( vcarn_io_r )
return ROM[0xa700+offset];
}
-static ADDRESS_MAP_START( vcarn_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vcarn_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_BASE_MEMBER(spool99_state,main)
AM_RANGE(0x0100, 0xa6ff) AM_ROM AM_REGION("maincpu", 0x100) AM_WRITENOP
AM_RANGE(0xa700, 0xa7ff) AM_READ(vcarn_io_r)
diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c
index 12e09d25058..104433bfb9e 100644
--- a/src/mame/drivers/sprcros2.c
+++ b/src/mame/drivers/sprcros2.c
@@ -102,7 +102,7 @@ static WRITE8_HANDLER( sprcros2_s_port3_w )
state->s_port3 = data;
}
-static ADDRESS_MAP_START( sprcros2_master_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sprcros2_master_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(sprcros2_fgvideoram_w) AM_BASE_MEMBER(sprcros2_state, fgvideoram)
@@ -113,7 +113,7 @@ static ADDRESS_MAP_START( sprcros2_master_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("share1") //shared with slave cpu
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sprcros2_master_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sprcros2_master_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_DEVWRITE("sn1", sn76496_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_DEVWRITE("sn2", sn76496_w)
@@ -123,7 +123,7 @@ static ADDRESS_MAP_START( sprcros2_master_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x07, 0x07) AM_WRITE(sprcros2_m_port7_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sprcros2_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sprcros2_slave_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank2")
AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(sprcros2_bgvideoram_w) AM_BASE_MEMBER(sprcros2_state, bgvideoram)
@@ -132,7 +132,7 @@ static ADDRESS_MAP_START( sprcros2_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE("share1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sprcros2_slave_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sprcros2_slave_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(sprcros2_bgscrollx_w)
AM_RANGE(0x01, 0x01) AM_WRITE(sprcros2_bgscrolly_w)
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index 2b4cf8e3f0a..23e65a0b400 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -256,7 +256,7 @@ static WRITE8_HANDLER( sprint2_lamp2_w )
}
-static ADDRESS_MAP_START( sprint2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sprint2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_READWRITE(sprint2_wram_r,sprint2_wram_w)
AM_RANGE(0x0400, 0x07ff) AM_RAM_WRITE(sprint2_video_ram_w) AM_BASE_MEMBER(sprint2_state, video_ram)
AM_RANGE(0x0818, 0x081f) AM_READ(sprint2_input_A_r)
diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c
index 373a86135da..6ac0fe10040 100644
--- a/src/mame/drivers/sprint4.c
+++ b/src/mame/drivers/sprint4.c
@@ -230,7 +230,7 @@ static WRITE8_DEVICE_HANDLER( sprint4_attract_w )
}
-static ADDRESS_MAP_START( sprint4_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sprint4_cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c
index 592ecde9277..1e1880eb4e1 100644
--- a/src/mame/drivers/sprint8.c
+++ b/src/mame/drivers/sprint8.c
@@ -102,7 +102,7 @@ static WRITE8_HANDLER( sprint8_int_reset_w )
}
-static ADDRESS_MAP_START( sprint8_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sprint8_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM
AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(sprint8_video_ram_w) AM_BASE_MEMBER(sprint8_state, video_ram)
AM_RANGE(0x1c00, 0x1c00) AM_READ(sprint8_collision_r)
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index 0dba63384be..b9847352135 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -384,7 +384,7 @@ static WRITE8_HANDLER( k052109_051960_w )
k051960_w(state->k051960, offset - 0x3c00, data);
}
-static ADDRESS_MAP_START( spy_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spy_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(spy_bankedram1_r, spy_bankedram1_w) AM_BASE_MEMBER(spy_state, ram)
AM_RANGE(0x0800, 0x1aff) AM_RAM
AM_RANGE(0x3f80, 0x3f80) AM_WRITE(bankswitch_w)
@@ -402,7 +402,7 @@ static ADDRESS_MAP_START( spy_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spy_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( spy_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_WRITE(sound_bank_w)
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index 060282d8f10..bcf0dd51698 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -394,7 +394,7 @@ static WRITE8_HANDLER( srmp3_rombank_w )
**************************************************************************/
-static ADDRESS_MAP_START( srmp2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( srmp2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x140000, 0x143fff) AM_RAM AM_BASE_MEMBER(srmp2_state,spriteram2.u16) /* Sprites Code + X + Attr */
@@ -415,7 +415,7 @@ static ADDRESS_MAP_START( srmp2_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjyuugi_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mjyuugi_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READ_PORT("SYSTEM") /* Coinage */
AM_RANGE(0x100000, 0x100001) AM_WRITE(mjyuugi_flags_w) /* Coin Counter */
@@ -456,7 +456,7 @@ static WRITE8_HANDLER( srmp3_flags_w )
}
-static ADDRESS_MAP_START( srmp3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( srmp3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") /* rom bank */
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE("nvram") /* work ram */
@@ -467,7 +467,7 @@ static ADDRESS_MAP_START( srmp3_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM AM_BASE_MEMBER(srmp2_state,spriteram3.u8)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( srmp3_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( srmp3_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x20, 0x20) AM_WRITENOP /* elapsed interrupt signal */
AM_RANGE(0x40, 0x40) AM_READ_PORT("SYSTEM") AM_WRITE(srmp3_flags_w) /* coin, service | GFX bank, counter, lockout */
@@ -480,7 +480,7 @@ static ADDRESS_MAP_START( srmp3_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xe2, 0xe2) AM_DEVREAD("aysnd", ay8910_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rmgoldyh_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rmgoldyh_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") /* rom bank */
AM_RANGE(0xa000, 0xafff) AM_RAM AM_SHARE("nvram") /* work ram */
@@ -509,7 +509,7 @@ static WRITE8_HANDLER( rmgoldyh_rombank_w )
memory_set_bankptr(space->machine, "bank1", &ROM[addr]);
}
-static ADDRESS_MAP_START( rmgoldyh_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rmgoldyh_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP /* watchdog */
AM_RANGE(0x60, 0x60) AM_WRITE(rmgoldyh_rombank_w) /* ROM bank select */
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index 51e115d5760..d98c48978c7 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -344,7 +344,7 @@ static READ32_HANDLER(irq_ack_clear)
return 0;
}
-static ADDRESS_MAP_START( srmp5_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( srmp5_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x000fffff) AM_RAM //maybe 0 - 2fffff ?
AM_RANGE(0x002f0000, 0x002f7fff) AM_RAM
AM_RANGE(0x01000000, 0x01000003) AM_WRITEONLY // 0xaa .. watchdog ?
@@ -375,7 +375,7 @@ static ADDRESS_MAP_START( srmp5_mem, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x2fc00000, 0x2fdfffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( st0016_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xe900, 0xe9ff) AM_DEVREADWRITE("stsnd", st0016_snd_r, st0016_snd_w)
@@ -405,7 +405,7 @@ static READ8_HANDLER(cmd_stat8_r)
return state->cmd_stat;
}
-static ADDRESS_MAP_START( st0016_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( st0016_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w)
AM_RANGE(0xc0, 0xc0) AM_READ(cmd1_r)
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index b73535331d3..9b39f54ae03 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -530,7 +530,7 @@ static WRITE16_HANDLER(paletteram_w)
}
}
-static ADDRESS_MAP_START( srmp6, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( srmp6, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x23ffff) AM_RAM // work RAM
AM_RANGE(0x600000, 0x7fffff) AM_ROMBANK("bank1") // banked ROM (used by ROM check)
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 10e460fdd6f..8f63e7c2e82 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -46,7 +46,7 @@ static WRITE8_HANDLER( srumbler_bankswitch_w )
static MACHINE_RESET( srumbler )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* initialize banked ROM pointers */
srumbler_bankswitch_w(space,0,0);
}
@@ -69,7 +69,7 @@ to the page register.
Ignore the warnings about writing to unmapped memory.
*/
-static ADDRESS_MAP_START( srumbler_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( srumbler_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1dff) AM_RAM /* RAM (of 1 sort or another) */
AM_RANGE(0x1e00, 0x1fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(srumbler_background_w) AM_BASE_MEMBER(srumbler_state, backgroundram)
@@ -95,7 +95,7 @@ static ADDRESS_MAP_START( srumbler_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_ROMBANK("f000") /* Banked ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( srumbler_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( srumbler_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym2", ym2203_w)
diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c
index 24c473c77eb..f97b8b7ad82 100644
--- a/src/mame/drivers/ssfindo.c
+++ b/src/mame/drivers/ssfindo.c
@@ -544,7 +544,7 @@ static READ32_HANDLER(randomized_r)
return space->machine->rand();
}
-static ADDRESS_MAP_START( ssfindo_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( ssfindo_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x000fffff) AM_ROM AM_REGION("user1", 0)
AM_RANGE(0x03200000, 0x032001ff) AM_READWRITE(PS7500_IO_r,PS7500_IO_w)
AM_RANGE(0x03012e60, 0x03012e67) AM_NOP
@@ -562,7 +562,7 @@ static ADDRESS_MAP_START( ssfindo_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x10000000, 0x11ffffff) AM_RAM AM_BASE_MEMBER(ssfindo_state, vram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ppcar_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( ppcar_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x000fffff) AM_ROM AM_REGION("user1", 0)
AM_RANGE(0x03200000, 0x032001ff) AM_READWRITE(PS7500_IO_r,PS7500_IO_w)
AM_RANGE(0x03012b00, 0x03012bff) AM_READ(randomized_r) AM_WRITENOP
@@ -588,7 +588,7 @@ static WRITE32_HANDLER(tetfight_unk_w)
//sound latch ?
}
-static ADDRESS_MAP_START( tetfight_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( tetfight_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_ROM AM_REGION("user1", 0)
AM_RANGE(0x03200000, 0x032001ff) AM_READWRITE(PS7500_IO_r,PS7500_IO_w)
AM_RANGE(0x03400000, 0x03400003) AM_WRITE(FIFO_w)
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index 21cafe9e2ad..cb085023a54 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -159,7 +159,7 @@ WRITE16_HANDLER( paletteram16_xbgr_word_be_tilehigh_w )
set_color_888(space->machine, (offset/2)+0x300, 0, 8, 16, state->tile_paletteram2[(offset) | 1] | (state->tile_paletteram2[(offset) & ~1] << 16) );
}
-static ADDRESS_MAP_START( sshangha_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sshangha_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10000f) AM_RAM AM_BASE_MEMBER(sshangha_state, sound_shared_ram)
@@ -190,7 +190,7 @@ static ADDRESS_MAP_START( sshangha_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xff4000, 0xff47ff) AM_READWRITE(sshangha_protection16_r,sshangha_protection16_w) AM_BASE_MEMBER(sshangha_state, prot_data)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sshanghb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sshanghb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x084000, 0x0847ff) AM_READ(sshanghb_protection16_r)
AM_RANGE(0x101000, 0x10100f) AM_RAM AM_BASE_MEMBER(sshangha_state, sound_shared_ram) /* the bootleg writes here */
@@ -235,7 +235,7 @@ static WRITE8_HANDLER(sshangha_sound_shared_w)
}
/* Note: there's rom data after 0x8000 but the game never seem to call a rom bank, left-over? */
-static ADDRESS_MAP_START( sshangha_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sshangha_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2203_r,ym2203_w)
AM_RANGE(0xc200, 0xc201) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c
index 1b33e4173ad..cd897d85b4f 100644
--- a/src/mame/drivers/ssingles.c
+++ b/src/mame/drivers/ssingles.c
@@ -302,7 +302,7 @@ static CUSTOM_INPUT(controls_r)
return data;
}
-static ADDRESS_MAP_START( ssingles_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ssingles_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_WRITE(ssingles_videoram_w)
AM_RANGE(0x0800, 0x08ff) AM_WRITE(ssingles_colorram_w)
AM_RANGE(0x0000, 0x1fff) AM_ROM
@@ -312,7 +312,7 @@ static ADDRESS_MAP_START( ssingles_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( atamanot_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( atamanot_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_WRITE(ssingles_videoram_w)
AM_RANGE(0x0800, 0x08ff) AM_WRITE(ssingles_colorram_w)
AM_RANGE(0x0000, 0x1fff) AM_ROM
@@ -324,7 +324,7 @@ static ADDRESS_MAP_START( atamanot_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc001, 0xc001) AM_READWRITE( c001_r, c001_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ssingles_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( ssingles_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("ay1", ay8910_address_w)
AM_RANGE(0x04, 0x04) AM_DEVWRITE("ay1", ay8910_data_w)
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index 22a70adf803..c0204b0588f 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -386,7 +386,7 @@ static WRITE16_HANDLER( powerbls_sound_w )
/* these will need verifying .. the game writes all over the place ... */
-static ADDRESS_MAP_START( sslam_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sslam_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x000400, 0x07ffff) AM_RAM
AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(sslam_bg_tileram_w) AM_BASE_MEMBER(sslam_state,bg_tileram)
AM_RANGE(0x104000, 0x107fff) AM_RAM_WRITE(sslam_md_tileram_w) AM_BASE_MEMBER(sslam_state,md_tileram)
@@ -409,7 +409,7 @@ static ADDRESS_MAP_START( sslam_program_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x000000, 0xffffff) AM_ROM /* I don't honestly know where the rom is mirrored .. so all unmapped reads / writes go to rom */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( powerbls_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( powerbls_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(powerbls_bg_tileram_w) AM_BASE_MEMBER(sslam_state,bg_tileram)
AM_RANGE(0x104000, 0x107fff) AM_RAM // not used
@@ -478,7 +478,7 @@ static WRITE8_HANDLER( playmark_snd_control_w )
// (data & 0x40) -> always set
}
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_WRITE(playmark_snd_control_w)
AM_RANGE(MCS51_PORT_P3, MCS51_PORT_P3) AM_READWRITE(playmark_snd_command_r, playmark_oki_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c
index 69c0a435ef9..dc5e7218fd5 100644
--- a/src/mame/drivers/ssozumo.c
+++ b/src/mame/drivers/ssozumo.c
@@ -21,7 +21,7 @@ static WRITE8_HANDLER( ssozumo_sh_command_w )
}
-static ADDRESS_MAP_START( ssozumo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ssozumo_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x077f) AM_RAM
AM_RANGE(0x0780, 0x07ff) AM_RAM AM_BASE_SIZE_MEMBER(ssozumo_state, spriteram, spriteram_size)
AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(ssozumo_videoram2_w) AM_BASE_MEMBER(ssozumo_state, videoram2)
@@ -39,7 +39,7 @@ static ADDRESS_MAP_START( ssozumo_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ssozumo_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ssozumo_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ay1", ay8910_data_address_w)
AM_RANGE(0x2002, 0x2003) AM_DEVWRITE("ay2", ay8910_data_address_w)
diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c
index 3fd59409b6a..a6736becb3c 100644
--- a/src/mame/drivers/sspeedr.c
+++ b/src/mame/drivers/sspeedr.c
@@ -77,14 +77,14 @@ static WRITE8_HANDLER( sspeedr_sound_w )
}
-static ADDRESS_MAP_START( sspeedr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sspeedr_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x2000, 0x21ff) AM_RAM
AM_RANGE(0x7f00, 0x7f17) AM_WRITE(sspeedr_score_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sspeedr_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sspeedr_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0")
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index 59e8a51769d..f8ad3f67e7d 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -53,7 +53,7 @@ static READ8_HANDLER(ssrj_wheel_r)
return retval;
}
-static ADDRESS_MAP_START( ssrj_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ssrj_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(ssrj_vram1_w) AM_BASE_MEMBER(ssrj_state, vram1)
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(ssrj_vram2_w) AM_BASE_MEMBER(ssrj_state, vram2)
diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c
index a5e7acad71c..9c781048b0d 100644
--- a/src/mame/drivers/sstrangr.c
+++ b/src/mame/drivers/sstrangr.c
@@ -139,7 +139,7 @@ static WRITE8_HANDLER( port_w )
-static ADDRESS_MAP_START( sstrangr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sstrangr_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_RAM AM_BASE_MEMBER(sstrangr_state,ram)
@@ -147,7 +147,7 @@ static ADDRESS_MAP_START( sstrangr_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sstrangr_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sstrangr_io_map, AS_IO, 8 )
AM_RANGE(0x41, 0x41) AM_READ_PORT("DSW")
AM_RANGE(0x42, 0x42) AM_READ_PORT("INPUTS")
AM_RANGE(0x44, 0x44) AM_READ_PORT("EXT") AM_WRITE(port_w)
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index 890c64311b5..54514f0a936 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -339,11 +339,11 @@ static MACHINE_RESET( ssv )
***************************************************************************/
-static ADDRESS_MAP_START( dsp_prg_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( dsp_prg_map, AS_PROGRAM, 32 )
AM_RANGE(0x0000, 0x3fff) AM_ROM AM_REGION("dspprg", 0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dsp_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( dsp_data_map, AS_DATA, 16 )
AM_RANGE(0x0000, 0x07ff) AM_ROM AM_REGION("dspdata", 0)
ADDRESS_MAP_END
@@ -440,7 +440,7 @@ static READ16_HANDLER( drifto94_rand_r )
return space->machine->rand() & 0xffff;
}
-static ADDRESS_MAP_START( drifto94_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( drifto94_map, AS_PROGRAM, 16 )
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 1 at the start
AM_RANGE(0x400000, 0x47ffff) AM_WRITEONLY // ?
AM_RANGE(0x480000, 0x480001) AM_READWRITE(dsp_dr_r, dsp_dr_w)
@@ -584,7 +584,7 @@ static WRITE16_HANDLER( gdfs_blitram_w )
}
}
-static ADDRESS_MAP_START( gdfs_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gdfs_map, AS_PROGRAM, 16 )
AM_RANGE(0x400000, 0x41ffff) AM_RAM_WRITE(gdfs_tmapram_w) AM_BASE_MEMBER(ssv_state, gdfs_tmapram)
AM_RANGE(0x420000, 0x43ffff) AM_RAM
AM_RANGE(0x440000, 0x44003f) AM_RAM AM_BASE_MEMBER(ssv_state, gdfs_tmapscroll)
@@ -623,7 +623,7 @@ static READ16_HANDLER( hypreact_input_r )
return 0xffff;
}
-static ADDRESS_MAP_START( hypreact_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hypreact_map, AS_PROGRAM, 16 )
AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 5 at the start
AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_inv_w) // Inverted lockout lines
@@ -639,7 +639,7 @@ ADDRESS_MAP_END
Hyper Reaction 2
***************************************************************************/
-static ADDRESS_MAP_START( hypreac2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hypreac2_map, AS_PROGRAM, 16 )
AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 5 at the start
AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_inv_w) // Inverted lockout lines
@@ -658,7 +658,7 @@ ADDRESS_MAP_END
static READ16_HANDLER( srmp4_input_r );
-static ADDRESS_MAP_START( janjans1_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( janjans1_map, AS_PROGRAM, 16 )
AM_RANGE(0x210000, 0x210001) AM_WRITENOP // koikois2 but not janjans1
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 1 at the start
AM_RANGE(0x210006, 0x210007) AM_READNOP
@@ -672,7 +672,7 @@ ADDRESS_MAP_END
Keith & Lucy
***************************************************************************/
-static ADDRESS_MAP_START( keithlcy_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( keithlcy_map, AS_PROGRAM, 16 )
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 1 at the start
AM_RANGE(0x210010, 0x210011) AM_WRITENOP //
AM_RANGE(0x21000e, 0x21000f) AM_READNOP //
@@ -685,7 +685,7 @@ ADDRESS_MAP_END
Meosis Magic
***************************************************************************/
-static ADDRESS_MAP_START( meosism_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( meosism_map, AS_PROGRAM, 16 )
AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r ) // Watchdog
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 5 at the start
// AM_RANGE(0x280000, 0x280001) AM_READNOP // ? read once, value not used
@@ -714,7 +714,7 @@ static WRITE16_HANDLER( ssv_mainram_w )
COMBINE_DATA(&state->mainram[offset]);
}
-static ADDRESS_MAP_START( mslider_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mslider_map, AS_PROGRAM, 16 )
AM_RANGE(0x010000, 0x01ffff) AM_READWRITE(ssv_mainram_r, ssv_mainram_w) // RAM Mirror
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 1 at the start
AM_RANGE(0x400000, 0x47ffff) AM_WRITEONLY // ?
@@ -727,7 +727,7 @@ ADDRESS_MAP_END
Gourmet Battle Quiz Ryohrioh CooKing
***************************************************************************/
-static ADDRESS_MAP_START( ryorioh_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ryorioh_map, AS_PROGRAM, 16 )
AM_RANGE(0x210000, 0x210001) AM_WRITE(watchdog_reset16_w) // Watchdog
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 1 at the start
SSV_MAP( 0xc00000 )
@@ -751,7 +751,7 @@ static READ16_HANDLER( srmp4_input_r )
return 0xffff;
}
-static ADDRESS_MAP_START( srmp4_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( srmp4_map, AS_PROGRAM, 16 )
AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 1,5 at the start
AM_RANGE(0xc0000a, 0xc0000b) AM_READ(srmp4_input_r) // Inputs
@@ -800,7 +800,7 @@ static READ16_HANDLER( srmp7_input_r )
return 0xffff;
}
-static ADDRESS_MAP_START( srmp7_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( srmp7_map, AS_PROGRAM, 16 )
AM_RANGE(0x010000, 0x050faf) AM_RAM // More RAM
AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 0,4 at the start
@@ -818,7 +818,7 @@ ADDRESS_MAP_END
Survival Arts
***************************************************************************/
-static ADDRESS_MAP_START( survarts_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( survarts_map, AS_PROGRAM, 16 )
AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 0,4 at the start
// AM_RANGE(0x290000, 0x290001) AM_READNOP // ?
@@ -870,7 +870,7 @@ static WRITE16_HANDLER( sxyreact_motor_w )
// popmessage("%04X",data); // 8 = motor on; 0 = motor off
}
-static ADDRESS_MAP_START( sxyreact_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sxyreact_map, AS_PROGRAM, 16 )
// AM_RANGE(0x020000, 0x03ffff) AM_READWRITE(ssv_mainram_r, ssv_mainram_w) // sxyreac2 reads / writes here, why?
AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 1 at the start
@@ -889,7 +889,7 @@ ADDRESS_MAP_END
/* comes as either a standalone board or a standard SSV rom board (verified) */
-static ADDRESS_MAP_START( twineag2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( twineag2_map, AS_PROGRAM, 16 )
AM_RANGE(0x010000, 0x03ffff) AM_RAM // More RAM
AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog (also value is cmp.b with mem 8)
AM_RANGE(0x480000, 0x480001) AM_READWRITE(dsp_dr_r, dsp_dr_w)
@@ -904,7 +904,7 @@ ADDRESS_MAP_END
/* standalone board based on SSV hardware */
-static ADDRESS_MAP_START( ultrax_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ultrax_map, AS_PROGRAM, 16 )
AM_RANGE(0x010000, 0x03ffff) AM_RAM // More RAM
AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog (also value is cmp.b with memory address 8)
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 2,6 at the start
@@ -955,7 +955,7 @@ static WRITE16_HANDLER(latch16_w)
space->machine->scheduler().synchronize();
}
-static ADDRESS_MAP_START( jsk_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( jsk_map, AS_PROGRAM, 16 )
AM_RANGE(0x050000, 0x05ffff) AM_READWRITE(ssv_mainram_r, ssv_mainram_w) // RAM Mirror?
AM_RANGE(0x210000, 0x210001) AM_WRITE(watchdog_reset16_w) // Watchdog
AM_RANGE(0x400000, 0x47ffff) AM_RAM // RAM?
@@ -964,7 +964,7 @@ static ADDRESS_MAP_START( jsk_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jsk_v810_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( jsk_v810_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0001ffff) AM_RAM
AM_RANGE(0x80000000, 0x8001ffff) AM_RAM
AM_RANGE(0xc0000000, 0xc001ffff) AM_RAM
@@ -1044,7 +1044,7 @@ static WRITE16_HANDLER( eaglshot_gfxram_w )
}
-static ADDRESS_MAP_START( eaglshot_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( eaglshot_map, AS_PROGRAM, 16 )
AM_RANGE(0x180000, 0x1bffff) AM_READWRITE(eaglshot_gfxram_r, eaglshot_gfxram_w)
AM_RANGE(0x210000, 0x210001) AM_READNOP /*AM_READ(watchdog_reset16_r)*/ // Watchdog
// AM_RANGE(0x210002, 0x210003) AM_WRITENOP // ? 0,4 at the start
diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c
index 1023da33fb0..fdf9b42ef0c 100644
--- a/src/mame/drivers/st0016.c
+++ b/src/mame/drivers/st0016.c
@@ -27,7 +27,7 @@ UINT32 st0016_rom_bank;
*
*************************************/
-static ADDRESS_MAP_START( st0016_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( st0016_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_READ(st0016_sprite_ram_r) AM_WRITE(st0016_sprite_ram_w)
@@ -73,7 +73,7 @@ WRITE8_HANDLER(st0016_rom_bank_w)
st0016_rom_bank=data;
}
-static ADDRESS_MAP_START( st0016_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( st0016_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w) /* video/crt regs ? */
AM_RANGE(0xc0, 0xc0) AM_READ_PORT("P1") AM_WRITE(mux_select_w)
@@ -129,7 +129,7 @@ static WRITE8_HANDLER(latch8_w)
space->machine->scheduler().synchronize();
}
-static ADDRESS_MAP_START( v810_mem,ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( v810_mem,AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0001ffff) AM_RAM
AM_RANGE(0x80000000, 0x8001ffff) AM_RAM
AM_RANGE(0xc0000000, 0xc001ffff) AM_RAM
@@ -137,7 +137,7 @@ static ADDRESS_MAP_START( v810_mem,ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfff80000, 0xffffffff) AM_ROMBANK("bank2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( st0016_m2_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( st0016_m2_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xbf) AM_READ(st0016_vregs_r) AM_WRITE(st0016_vregs_w)
AM_RANGE(0xc0, 0xc3) AM_READ(latch8_r) AM_WRITE(latch8_w)
diff --git a/src/mame/drivers/st_mp100.c b/src/mame/drivers/st_mp100.c
index b6e8f56ebc6..6e7d53af082 100644
--- a/src/mame/drivers/st_mp100.c
+++ b/src/mame/drivers/st_mp100.c
@@ -15,7 +15,7 @@ public:
};
-static ADDRESS_MAP_START( st_mp100_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( st_mp100_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/st_mp200.c b/src/mame/drivers/st_mp200.c
index 79506b5dcee..a5ae2ac985e 100644
--- a/src/mame/drivers/st_mp200.c
+++ b/src/mame/drivers/st_mp200.c
@@ -15,7 +15,7 @@ public:
};
-static ADDRESS_MAP_START( st_mp200_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( st_mp200_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c
index 01d2b186d6a..f9d6b88ba37 100644
--- a/src/mame/drivers/stactics.c
+++ b/src/mame/drivers/stactics.c
@@ -171,7 +171,7 @@ static INTERRUPT_GEN( stactics_interrupt )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x4000, 0x40ff) AM_MIRROR(0x0700) AM_RAM
AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index 1133ea25e3b..cda482f07df 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -53,7 +53,7 @@ static WRITE16_HANDLER( stadhero_control_w )
/******************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(stadhero_pf1_data_w) AM_BASE_MEMBER(stadhero_state, pf1_data)
AM_RANGE(0x240000, 0x240007) AM_RAM AM_BASE_MEMBER(stadhero_state, pf2_control_0)
@@ -67,7 +67,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x05ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x1000, 0x1001) AM_DEVWRITE("ym2", ym3812_w)
diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c
index b44c8ef6e5d..bc3186265cb 100644
--- a/src/mame/drivers/starcrus.c
+++ b/src/mame/drivers/starcrus.c
@@ -14,12 +14,12 @@ palazzol@home.com
#include "sound/samples.h"
#include "includes/starcrus.h"
-static ADDRESS_MAP_START( starcrus_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( starcrus_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x1000, 0x10ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( starcrus_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( starcrus_io_map, AS_IO, 8 )
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1") AM_WRITE(starcrus_s1_x_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("P2") AM_WRITE(starcrus_s1_y_w)
AM_RANGE(0x02, 0x02) AM_READWRITE(starcrus_coll_det_r, starcrus_s2_x_w)
diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c
index be4bc1ea8ad..e47f6d0dfb0 100644
--- a/src/mame/drivers/starfire.c
+++ b/src/mame/drivers/starfire.c
@@ -151,7 +151,7 @@ static READ8_HANDLER( fireone_input_r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_READWRITE(starfire_scratch_r, starfire_scratch_w)
AM_RANGE(0xa000, 0xbfff) AM_READWRITE(starfire_colorram_r, starfire_colorram_w) AM_BASE_MEMBER(starfire_state, starfire_colorram)
diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c
index 56a22965b08..7937d8ebce6 100644
--- a/src/mame/drivers/starshp1.c
+++ b/src/mame/drivers/starshp1.c
@@ -169,7 +169,7 @@ static WRITE8_HANDLER( starshp1_misc_w )
}
-static ADDRESS_MAP_START( starshp1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( starshp1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_MIRROR(0x100)
AM_RANGE(0x2c00, 0x3fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index 430e4aa5ae9..0c75c69af9c 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -49,7 +49,7 @@ static MACHINE_RESET( starwars )
/* ESB-specific */
if (state->is_esb)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* reset the slapstic */
slapstic_reset();
@@ -153,7 +153,7 @@ DIRECT_UPDATE_HANDLER( esb_setdirect )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_RAM AM_BASE(&avgdvg_vectorram) AM_SIZE(&avgdvg_vectorram_size) AM_REGION("maincpu", 0)
AM_RANGE(0x3000, 0x3fff) AM_ROM /* vector_rom */
AM_RANGE(0x4300, 0x431f) AM_READ_PORT("IN0")
@@ -190,7 +190,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_WRITE(starwars_sout_w)
AM_RANGE(0x0800, 0x0fff) AM_READ(starwars_sin_r) /* SIN Read */
AM_RANGE(0x1000, 0x107f) AM_RAM /* 6532 ram */
@@ -524,10 +524,10 @@ static DRIVER_INIT( esb )
space->set_direct_update_handler(direct_update_delegate_create_static(esb_setdirect, *machine));
/* install read/write handlers for it */
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0x9fff, 0, 0, esb_slapstic_r, esb_slapstic_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0x9fff, 0, 0, esb_slapstic_r, esb_slapstic_w);
/* install additional banking */
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa000, 0xffff, 0, 0, "bank2");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa000, 0xffff, 0, 0, "bank2");
/* prepare the matrix processor */
state->is_esb = 1;
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index 2a407339045..253006b70c7 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -288,14 +288,14 @@ static const ppi8255_interface ppi8255_intf =
*
*************************************/
-static ADDRESS_MAP_START( statriv2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( statriv2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x4800, 0x48ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0xc800, 0xcfff) AM_RAM_WRITE(statriv2_videoram_w) AM_BASE_MEMBER(statriv2_state, videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( statriv2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( statriv2_io_map, AS_IO, 8 )
AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("ppi", ppi8255_r, ppi8255_w)
AM_RANGE(0x28, 0x2b) AM_READ(question_data_r) AM_WRITEONLY AM_BASE_MEMBER(statriv2_state, question_offset)
AM_RANGE(0xb0, 0xb1) AM_DEVWRITE("aysnd", ay8910_address_data_w)
@@ -304,7 +304,7 @@ static ADDRESS_MAP_START( statriv2_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
#ifdef UNUSED_CODE
-static ADDRESS_MAP_START( statusbj_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( statusbj_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("ppi", ppi8255_r, ppi8255_w)
AM_RANGE(0xb0, 0xb1) AM_DEVWRITE("aysnd", ay8910_address_data_w)
@@ -1126,7 +1126,7 @@ static WRITE8_HANDLER( laserdisc_io_w )
static DRIVER_INIT( laserdisc )
{
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *iospace = machine->device("maincpu")->memory().space(AS_IO);
memory_install_readwrite8_handler(iospace, 0x28, 0x2b, 0, 0, laserdisc_io_r, laserdisc_io_w);
}
diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c
index 7a754eb1a4a..e44e8eda1c4 100644
--- a/src/mame/drivers/stepstag.c
+++ b/src/mame/drivers/stepstag.c
@@ -45,7 +45,7 @@ static READ16_HANDLER( unknown_read_0xffff00 )
return space->machine->rand();
}
-static ADDRESS_MAP_START( stepstag_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( stepstag_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
@@ -78,7 +78,7 @@ static READ16_HANDLER( unknown_sub_read_0xbe0004 )
}
-static ADDRESS_MAP_START( stepstag_sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( stepstag_sub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0xbe0004, 0xbe0005) AM_READ(unknown_sub_read_0xbe0004)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index cc9e54c64a7..3659fe5aa74 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -234,7 +234,7 @@ DONE? (check on real board)
#include "sound/msm5205.h"
#include "includes/stfight.h"
-static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* sf02.bin */
AM_RANGE(0xc000, 0xc0ff) AM_RAM AM_BASE_GENERIC(paletteram)
@@ -256,7 +256,7 @@ static ADDRESS_MAP_START( cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM AM_BASE_MEMBER(stfight_state, sprite_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w)
diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c
index 3a57509b026..9a1aa8e8bf2 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -89,7 +89,7 @@ static WRITE16_DEVICE_HANDLER( oki_bank_w )
downcast<okim6295_device *>(device)->set_bank_base(0x40000 * ((data>>8) & 3));
}
-static ADDRESS_MAP_START( stlforce_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( stlforce_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x1007ff) AM_RAM_WRITE(stlforce_bg_videoram_w) AM_BASE_MEMBER(stlforce_state,bg_videoram)
AM_RANGE(0x100800, 0x100fff) AM_RAM_WRITE(stlforce_mlow_videoram_w) AM_BASE_MEMBER(stlforce_state,mlow_videoram)
diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c
index e1c644a4351..030651f564b 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -77,7 +77,7 @@ static WRITE8_HANDLER( protection_w )
/****************************************************************************/
-static ADDRESS_MAP_START( strnskil_map1, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( strnskil_map1, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
@@ -96,7 +96,7 @@ static ADDRESS_MAP_START( strnskil_map1, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xd80a, 0xd80b) AM_WRITEONLY AM_BASE_MEMBER(strnskil_state, xscroll)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( strnskil_map2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( strnskil_map2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_BASE_SIZE_MEMBER(strnskil_state, spriteram, spriteram_size)
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
@@ -106,7 +106,7 @@ static ADDRESS_MAP_START( strnskil_map2, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8 )
// AM_RANGE(MB88_PORTK, MB88_PORTK) AM_READ(mcu_portk_r)
// AM_RANGE(MB88_PORTR0, MB88_PORTR0) AM_READWRITE(mcu_portr0_r, mcu_portr0_w)
ADDRESS_MAP_END
@@ -507,16 +507,16 @@ static DRIVER_INIT( pettanp )
// AM_RANGE(0xd806, 0xd806) AM_READ(protection_r) /* protection data read (pettanp) */
/* Fujitsu MB8841 4-Bit MCU */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd806, 0xd806, 0, 0, pettanp_protection_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd80d, 0xd80d, 0, 0, protection_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd806, 0xd806, 0, 0, pettanp_protection_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd80d, 0xd80d, 0, 0, protection_w);
}
static DRIVER_INIT( banbam )
{
/* Fujitsu MB8841 4-Bit MCU */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd806, 0xd806, 0, 0, banbam_protection_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd80d, 0xd80d, 0, 0, protection_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd806, 0xd806, 0, 0, banbam_protection_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd80d, 0xd80d, 0, 0, protection_w);
}
GAME( 1984, strnskil, 0, strnskil, strnskil, 0, ROT0, "Sun Electronics", "Strength & Skill", 0 )
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 3ba5ec82c2a..3a141633525 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -1989,7 +1989,7 @@ static READ32_HANDLER( stv_sh2_random_r )
}
#endif
-static ADDRESS_MAP_START( stv_mem, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( stv_mem, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0007ffff) AM_ROM AM_SHARE("share6") // bios
AM_RANGE(0x00100000, 0x0010007f) AM_READWRITE(stv_SMPC_r32, stv_SMPC_w32)
AM_RANGE(0x00180000, 0x0018ffff) AM_RAM AM_SHARE("share1") AM_BASE(&stv_backupram)
@@ -2018,7 +2018,7 @@ static ADDRESS_MAP_START( stv_mem, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x22000000, 0x24ffffff) AM_ROM AM_SHARE("share7") // cart mirror
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sound_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_RAM AM_BASE(&sound_ram)
AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE("scsp", scsp_r, scsp_w)
ADDRESS_MAP_END
@@ -2359,10 +2359,10 @@ DRIVER_INIT ( stv )
sh2drc_set_options(machine->device("slave"), SH2DRC_STRICT_VERIFY|SH2DRC_STRICT_PCREL);
/* debug .. watch the command buffer rsgun, cottonbm etc. appear to use to communicate between cpus */
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x60ffc44, 0x60ffc47, 0, 0, w60ffc44_write );
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x60ffc48, 0x60ffc4b, 0, 0, w60ffc48_write );
- memory_install_write32_handler(machine->device("slave")->memory().space(ADDRESS_SPACE_PROGRAM), 0x60ffc44, 0x60ffc47, 0, 0, w60ffc44_write );
- memory_install_write32_handler(machine->device("slave")->memory().space(ADDRESS_SPACE_PROGRAM), 0x60ffc48, 0x60ffc4b, 0, 0, w60ffc48_write );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x60ffc44, 0x60ffc47, 0, 0, w60ffc44_write );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x60ffc48, 0x60ffc4b, 0, 0, w60ffc48_write );
+ memory_install_write32_handler(machine->device("slave")->memory().space(AS_PROGRAM), 0x60ffc44, 0x60ffc47, 0, 0, w60ffc44_write );
+ memory_install_write32_handler(machine->device("slave")->memory().space(AS_PROGRAM), 0x60ffc48, 0x60ffc4b, 0, 0, w60ffc48_write );
smpc_ram[0x31] = 0x00; //CTG1=0 CTG0=0 (correct??)
// smpc_ram[0x33] = input_port_read(machine, "FAKE");
diff --git a/src/mame/drivers/stvinit.c b/src/mame/drivers/stvinit.c
index cf67db0ec4a..d4b53f50cca 100644
--- a/src/mame/drivers/stvinit.c
+++ b/src/mame/drivers/stvinit.c
@@ -308,7 +308,7 @@ DRIVER_INIT( astrass )
sh2drc_add_pcflush(machine->device("maincpu"), 0x60011b8);
sh2drc_add_pcflush(machine->device("maincpu"), 0x605b9da);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x06000770, 0x06000773, 0, 0, astrass_hack_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x06000770, 0x06000773, 0, 0, astrass_hack_r );
install_astrass_protection(machine);
diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c
index 2bf926fb64d..0a09dd8f55b 100644
--- a/src/mame/drivers/sub.c
+++ b/src/mame/drivers/sub.c
@@ -213,7 +213,7 @@ static SCREEN_UPDATE(sub)
return 0;
}
-static ADDRESS_MAP_START( subm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( subm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xafff) AM_ROM
AM_RANGE(0xb000, 0xbfff) AM_RAM
AM_RANGE(0xc000, 0xc3ff) AM_RAM AM_BASE_MEMBER(sub_state,attr)
@@ -248,18 +248,18 @@ static WRITE8_HANDLER( nmi_mask_w )
state->nmi_en = data & 1;
}
-static ADDRESS_MAP_START( subm_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( subm_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(soundlatch2_r, subm_to_sound_w) // to/from sound CPU
ADDRESS_MAP_END
-static ADDRESS_MAP_START( subm_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( subm_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_WRITE(nmi_mask_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( subm_sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( subm_sound_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READWRITE(soundlatch_r, soundlatch2_w) // to/from main CPU
AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_address_data_w)
diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c
index 9ac40cf0773..6381e2a5e52 100644
--- a/src/mame/drivers/subs.c
+++ b/src/mame/drivers/subs.c
@@ -46,7 +46,7 @@ static PALETTE_INIT( subs )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x0000) AM_DEVWRITE("discrete", subs_noise_reset_w)
AM_RANGE(0x0000, 0x0007) AM_READ(subs_control_r)
diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c
index 61eca2f496f..f90a4dd0213 100644
--- a/src/mame/drivers/subsino.c
+++ b/src/mame/drivers/subsino.c
@@ -772,7 +772,7 @@ static WRITE8_HANDLER( subsino_out_b_w )
* Memory Maps *
***************************************************************************/
-static ADDRESS_MAP_START( srider_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( srider_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x0bfff ) AM_ROM
AM_RANGE( 0x0c000, 0x0cfff ) AM_RAM
@@ -801,7 +801,7 @@ static ADDRESS_MAP_START( srider_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sharkpy_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sharkpy_map, AS_PROGRAM, 8 )
AM_RANGE( 0x09800, 0x09fff ) AM_RAM
AM_RANGE( 0x09000, 0x09000 ) AM_READ_PORT( "SW1" )
@@ -836,7 +836,7 @@ that announces to the player that the card deck changes. If the protection check
this event makes the game to reset without any money in the bank.
*/
-static ADDRESS_MAP_START( victor21_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( victor21_map, AS_PROGRAM, 8 )
AM_RANGE( 0x09800, 0x09fff ) AM_RAM
AM_RANGE( 0x09000, 0x09000 ) AM_WRITE( subsino_out_a_w )
@@ -919,7 +919,7 @@ static WRITE8_HANDLER( flash_w )
}
}
-static ADDRESS_MAP_START( victor5_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( victor5_map, AS_PROGRAM, 8 )
AM_IMPORT_FROM( victor21_map )
AM_RANGE( 0x0900a, 0x0900a ) AM_READWRITE( flash_r, flash_w )
AM_RANGE( 0x0900b, 0x0900b ) AM_READNOP //"flash" status, bit 0
@@ -932,7 +932,7 @@ static READ8_HANDLER( hwcheck_r )
return 0x55;
}
-static ADDRESS_MAP_START( crsbingo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( crsbingo_map, AS_PROGRAM, 8 )
AM_RANGE( 0x09800, 0x09fff ) AM_RAM
AM_RANGE( 0x09000, 0x09000 ) AM_READ_PORT( "SW1" )
@@ -981,7 +981,7 @@ static WRITE8_HANDLER( subsino_out_c_w )
// popmessage("data %02x\n",data);
}
-static ADDRESS_MAP_START( tisub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tisub_map, AS_PROGRAM, 8 )
AM_RANGE( 0x09800, 0x09fff ) AM_RAM
AM_RANGE( 0x09000, 0x09000 ) AM_READ_PORT( "SW1" )
@@ -1112,7 +1112,7 @@ static READ8_HANDLER( reel_scrollattr_r )
return state->reel1_attr[offset];
}
-static ADDRESS_MAP_START( stisub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( stisub_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x0bfff ) AM_ROM
AM_RANGE( 0x0c000, 0x0cfff ) AM_RAM
@@ -1153,7 +1153,7 @@ ADDRESS_MAP_END
Magic Train (Clear NVRAM ROM?)
***************************************************************************/
-static ADDRESS_MAP_START( mtrainnv_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mtrainnv_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x0bfff ) AM_ROM
AM_RANGE( 0x0c000, 0x0cfff ) AM_RAM
@@ -1190,7 +1190,7 @@ static ADDRESS_MAP_START( mtrainnv_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( subsino_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( subsino_iomap, AS_IO, 8 )
AM_RANGE( 0x0000, 0x003f ) AM_RAM // internal regs
ADDRESS_MAP_END
diff --git a/src/mame/drivers/subsino2.c b/src/mame/drivers/subsino2.c
index ba157e3434a..01f4c2d419c 100644
--- a/src/mame/drivers/subsino2.c
+++ b/src/mame/drivers/subsino2.c
@@ -934,7 +934,7 @@ static WRITE16_HANDLER( bishjan_outputs_w )
}
-static ADDRESS_MAP_START( bishjan_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bishjan_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xffffff)
AM_RANGE( 0x000000, 0x07ffff ) AM_ROM AM_REGION("maincpu", 0)
@@ -1115,7 +1115,7 @@ static READ8_HANDLER( mtrain_prot_r )
return "SUBSION"[offset];
}
-static ADDRESS_MAP_START( mtrain_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mtrain_map, AS_PROGRAM, 8 )
AM_RANGE( 0x00000, 0x06fff ) AM_ROM
AM_RANGE( 0x07800, 0x07fff ) AM_RAM AM_SHARE("nvram") // battery
@@ -1148,7 +1148,7 @@ static ADDRESS_MAP_START( mtrain_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE( 0x0a000, 0x0ffff ) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mtrain_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mtrain_io, AS_IO, 8 )
AM_RANGE( 0x0000, 0x003f ) AM_RAM // internal regs
ADDRESS_MAP_END
@@ -1182,7 +1182,7 @@ static WRITE8_HANDLER( saklove_outputs_w )
// popmessage("0: %02x - 1: %02x - 2: %02x - 3: %02x", state->outputs[0], state->outputs[1], state->outputs[2], state->outputs[3]);
}
-static ADDRESS_MAP_START( saklove_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( saklove_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x07fff) AM_RAM AM_SHARE("nvram") // battery
// read lo (L1) (only half tilemap?)
@@ -1207,7 +1207,7 @@ static ADDRESS_MAP_START( saklove_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe0000, 0xfffff) AM_ROM AM_REGION("maincpu",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( saklove_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( saklove_io, AS_IO, 8 )
AM_RANGE(0x0000, 0x0000) AM_WRITE( ss9601_scrollctrl_w )
AM_RANGE(0x0020, 0x0020) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
@@ -1273,7 +1273,7 @@ static WRITE8_HANDLER( xplan_outputs_w )
// popmessage("0: %02x - 1: %02x - 2: %02x - 3: %02x", state->outputs[0], state->outputs[1], state->outputs[2], state->outputs[3]);
}
-static ADDRESS_MAP_START( xplan_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( xplan_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x07fff) AM_RAM AM_SHARE("nvram") // battery
// write both (L1, byte_lo2)
@@ -1307,7 +1307,7 @@ static ADDRESS_MAP_START( xplan_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc0000, 0xfffff) AM_ROM AM_REGION("maincpu",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( xplan_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( xplan_io, AS_IO, 8 )
AM_RANGE(0x0000, 0x0000) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
AM_RANGE(0x0020, 0x0020) AM_WRITE( ss9601_byte_lo2_w )
@@ -1377,14 +1377,14 @@ static WRITE8_HANDLER( xtrain_outputs_w )
// popmessage("0: %02x - 1: %02x - 2: %02x - 3: %02x", state->outputs[0], state->outputs[1], state->outputs[2], state->outputs[3]);
}
-static ADDRESS_MAP_START( expcard_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( expcard_io, AS_IO, 8 )
// 306 = d, 307 = c, 308 = b, 309 = a
AM_RANGE(0x0306, 0x0309) AM_WRITE( expcard_outputs_w ) AM_BASE_MEMBER(subsino2_state, outputs )
AM_IMPORT_FROM( xplan_io )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( xtrain_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( xtrain_io, AS_IO, 8 )
// 306 = d, 307 = c, 308 = b, 309 = a
AM_RANGE(0x0306, 0x0309) AM_WRITE( xtrain_outputs_w ) AM_BASE_MEMBER(subsino2_state, outputs )
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 0d3814183f6..6496e299ad5 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -89,7 +89,7 @@ static WRITE16_HANDLER( bestbest_coin_w )
Back Street Soccer
***************************************************************************/
-static ADDRESS_MAP_START( bssoccer_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bssoccer_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM // RAM
AM_RANGE(0x400000, 0x4001ff) AM_READWRITE(suna16_paletteram16_r, suna16_paletteram16_w) // Banked Palette
@@ -108,7 +108,7 @@ ADDRESS_MAP_END
Ultra Balloon
***************************************************************************/
-static ADDRESS_MAP_START( uballoon_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( uballoon_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x800000, 0x803fff) AM_RAM // RAM
AM_RANGE(0x200000, 0x2001ff) AM_READWRITE(suna16_paletteram16_r, suna16_paletteram16_w) // Banked Palette
@@ -129,7 +129,7 @@ ADDRESS_MAP_END
Suna Quiz 6000 Academy
***************************************************************************/
-static ADDRESS_MAP_START( sunaq_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sunaq_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x500000, 0x500001) AM_READ_PORT("P1") AM_WRITE(suna16_soundlatch_w) // To Sound CPU
AM_RANGE(0x500002, 0x500003) AM_READ_PORT("P2") AM_WRITE(suna16_flipscreen_w) // Flip Screen
@@ -170,7 +170,7 @@ static WRITE16_HANDLER( bestbest_prot_w )
}
-static ADDRESS_MAP_START( bestbest_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bestbest_map, AS_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x03ffff ) AM_ROM AM_MIRROR(0xc0000) // ROM
AM_RANGE( 0x200000, 0x2fffff ) AM_ROM AM_REGION("user1", 0) // ROM
AM_RANGE( 0x500000, 0x500001 ) AM_READ_PORT("P1") AM_WRITE(suna16_soundlatch_w) // To Sound CPU
@@ -201,7 +201,7 @@ ADDRESS_MAP_END
Back Street Soccer
***************************************************************************/
-static ADDRESS_MAP_START( bssoccer_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bssoccer_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM // RAM
AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // YM2151
@@ -214,7 +214,7 @@ ADDRESS_MAP_END
Ultra Balloon
***************************************************************************/
-static ADDRESS_MAP_START( uballoon_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( uballoon_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM // ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM // RAM
AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // YM2151
@@ -225,7 +225,7 @@ ADDRESS_MAP_END
Suna Quiz 6000 Academy
***************************************************************************/
-static ADDRESS_MAP_START( sunaq_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sunaq_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xe82f) AM_ROM // ROM
AM_RANGE(0xe830, 0xf7ff) AM_RAM // RAM (writes to efxx, could be a program bug tho)
AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) // YM2151
@@ -236,7 +236,7 @@ ADDRESS_MAP_END
Best Of Best
***************************************************************************/
-static ADDRESS_MAP_START( bestbest_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bestbest_sound_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0xbfff ) AM_ROM // ROM
AM_RANGE( 0xc000, 0xc001 ) AM_DEVWRITE( "ymsnd", ym3526_w ) //
AM_RANGE( 0xc002, 0xc003 ) AM_DEVWRITE( "aysnd", ay8910_address_data_w ) // AY8910
@@ -281,12 +281,12 @@ static WRITE8_HANDLER( bssoccer_pcm_2_bankswitch_w )
/* Memory maps: Yes, *no* RAM */
-static ADDRESS_MAP_START( bssoccer_pcm_1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bssoccer_pcm_1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM // ROM
AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank1") // Banked ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bssoccer_pcm_2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bssoccer_pcm_2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM // ROM
AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank2") // Banked ROM
ADDRESS_MAP_END
@@ -300,7 +300,7 @@ static WRITE8_DEVICE_HANDLER( bssoccer_DAC_w )
dac_data_w( device, (data & 0xf) * 0x11 );
}
-static ADDRESS_MAP_START( bssoccer_pcm_1_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bssoccer_pcm_1_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch2_r) // From The Sound Z80
AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac1", bssoccer_DAC_w) // 2 x DAC
@@ -308,7 +308,7 @@ static ADDRESS_MAP_START( bssoccer_pcm_1_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x03, 0x03) AM_WRITE(bssoccer_pcm_1_bankswitch_w) // Rom Bank
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bssoccer_pcm_2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bssoccer_pcm_2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch3_r) // From The Sound Z80
AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac3", bssoccer_DAC_w) // 2 x DAC
@@ -333,12 +333,12 @@ static WRITE8_HANDLER( uballoon_pcm_1_bankswitch_w )
/* Memory maps: Yes, *no* RAM */
-static ADDRESS_MAP_START( uballoon_pcm_1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( uballoon_pcm_1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_ROM // ROM
AM_RANGE(0x0400, 0xffff) AM_ROMBANK("bank1") // Banked ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( uballoon_pcm_1_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( uballoon_pcm_1_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch2_r) // From The Sound Z80
AM_RANGE(0x00, 0x00) AM_DEVWRITE("dac1", bssoccer_DAC_w) // 2 x DAC
@@ -348,7 +348,7 @@ ADDRESS_MAP_END
static MACHINE_RESET(uballoon)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
uballoon_pcm_1_bankswitch_w(space, 0, 0);
}
@@ -357,11 +357,11 @@ static MACHINE_RESET(uballoon)
Best Of Best
***************************************************************************/
-static ADDRESS_MAP_START( bestbest_pcm_1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bestbest_pcm_1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bestbest_pcm_1_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bestbest_pcm_1_iomap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ (soundlatch2_r ) // From The Sound Z80
AM_RANGE(0x00, 0x00) AM_MIRROR(0x02) AM_DEVWRITE("dac1", bssoccer_DAC_w) // 2 x DAC
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index d67ee50412b..244ebd3bdf0 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -82,7 +82,7 @@ static DRIVER_INIT( hardhead )
/* Non encrypted bootleg */
static DRIVER_INIT( hardhedb )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
space->set_decrypted_region(0x0000, 0x7fff, machine->region("maincpu")->base() + 0x48000);
memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000);
}
@@ -95,7 +95,7 @@ static DRIVER_INIT( hardhedb )
static UINT8 *brickzn_decrypt(running_machine *machine)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *RAM = machine->region("maincpu")->base();
size_t size = machine->region("maincpu")->bytes();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, size);
@@ -205,7 +205,7 @@ static DRIVER_INIT( brickzn3 )
static DRIVER_INIT( hardhea2 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *RAM = machine->region("maincpu")->base();
size_t size = machine->region("maincpu")->bytes();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, size);
@@ -292,7 +292,7 @@ rom13: 0?, 1y, 2n, 3n ?,?,?,? (palettes)
static DRIVER_INIT( starfigh )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *RAM = machine->region("maincpu")->base();
size_t size = machine->region("maincpu")->bytes();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, size);
@@ -360,7 +360,7 @@ static DRIVER_INIT( starfigh )
static DRIVER_INIT( sparkman )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *RAM = machine->region("maincpu")->base();
size_t size = machine->region("maincpu")->bytes();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, size);
@@ -511,7 +511,7 @@ static WRITE8_HANDLER( hardhead_flipscreen_w )
coin_lockout_w ( space->machine, 1, data & 0x10);
}
-static ADDRESS_MAP_START( hardhead_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hardhead_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM
AM_RANGE(0xc000, 0xd7ff) AM_RAM // RAM
@@ -528,7 +528,7 @@ static ADDRESS_MAP_START( hardhead_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hardhead_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hardhead_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READNOP // ? IRQ Ack
ADDRESS_MAP_END
@@ -579,7 +579,7 @@ static WRITE8_HANDLER( sranger_prot_w )
space->write_byte(0xcd99,0xff);
}
-static ADDRESS_MAP_START( rranger_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rranger_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM
AM_RANGE(0xc000, 0xc000) AM_READWRITE(watchdog_reset_r, soundlatch_w) // To Sound CPU
@@ -597,7 +597,7 @@ static ADDRESS_MAP_START( rranger_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rranger_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rranger_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READNOP // ? IRQ Ack
ADDRESS_MAP_END
@@ -663,7 +663,7 @@ static WRITE8_HANDLER( brickzn_rombank_w )
state->rombank = data;
}
-static ADDRESS_MAP_START( brickzn_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( brickzn_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM
AM_RANGE(0xc040, 0xc040) AM_WRITE(brickzn_rombank_w ) // ROM Bank
@@ -767,7 +767,7 @@ static WRITE8_HANDLER( hardhea2_rambank_1_w )
}
-static ADDRESS_MAP_START( hardhea2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hardhea2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1") // P1 (Inputs)
@@ -827,7 +827,7 @@ static WRITE8_HANDLER( starfigh_spritebank_w )
state->spritebank = state->spritebank_latch;
}
-static ADDRESS_MAP_START( starfigh_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( starfigh_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1") // P1 (Inputs)
@@ -962,7 +962,7 @@ static WRITE8_HANDLER( sparkman_en_trash_w )
}
#endif
-static ADDRESS_MAP_START( sparkman_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sparkman_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("P1") // P1 (Inputs)
@@ -996,7 +996,7 @@ ADDRESS_MAP_END
Hard Head
***************************************************************************/
-static ADDRESS_MAP_START( hardhead_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hardhead_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
AM_RANGE(0xa002, 0xa003) AM_DEVWRITE("aysnd", ay8910_address_data_w )
@@ -1007,7 +1007,7 @@ static ADDRESS_MAP_START( hardhead_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hardhead_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hardhead_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x01, 0x01) AM_READNOP // ? IRQ Ack
ADDRESS_MAP_END
@@ -1017,7 +1017,7 @@ ADDRESS_MAP_END
Rough Ranger
***************************************************************************/
-static ADDRESS_MAP_START( rranger_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rranger_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM
AM_RANGE(0xa000, 0xa001) AM_DEVWRITE("ym1", ym2203_w ) // Samples + Music
AM_RANGE(0xa002, 0xa003) AM_DEVWRITE("ym2", ym2203_w ) // Music + FX
@@ -1031,7 +1031,7 @@ ADDRESS_MAP_END
Brick Zone
***************************************************************************/
-static ADDRESS_MAP_START( brickzn_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( brickzn_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM // ROM
AM_RANGE(0xc000, 0xc001) AM_DEVWRITE("ymsnd", ym3812_w )
AM_RANGE(0xc002, 0xc003) AM_DEVWRITE("aysnd", ay8910_address_data_w )
@@ -1043,7 +1043,7 @@ ADDRESS_MAP_END
/* PCM Z80 , 4 DACs (4 bits per sample), NO RAM !! */
-static ADDRESS_MAP_START( brickzn_pcm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( brickzn_pcm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM // ROM
ADDRESS_MAP_END
@@ -1055,7 +1055,7 @@ static WRITE8_HANDLER( brickzn_pcm_w )
}
-static ADDRESS_MAP_START( brickzn_pcm_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( brickzn_pcm_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch2_r ) // From Sound CPU
AM_RANGE(0x00, 0x03) AM_WRITE(brickzn_pcm_w ) // 4 x DAC
@@ -1695,7 +1695,7 @@ static INTERRUPT_GEN( hardhea2_interrupt )
static MACHINE_RESET( hardhea2 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
hardhea2_rambank_0_w(space,0,0);
}
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index 4b3f7f38836..b7f2a22c7f2 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -59,7 +59,7 @@ static WRITE16_HANDLER( sound_w )
/******************************************************************************/
-static ADDRESS_MAP_START( supbtime_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( supbtime_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x104000, 0x11ffff) AM_WRITENOP /* Nothing there */
@@ -76,7 +76,7 @@ static ADDRESS_MAP_START( supbtime_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x342000, 0x3427ff) AM_RAM AM_BASE_MEMBER(supbtime_state, pf2_rowscroll)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( chinatwn_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( chinatwn_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_WRITE(sound_w)
AM_RANGE(0x120000, 0x1207ff) AM_RAM AM_BASE_SIZE_MEMBER(supbtime_state, spriteram, spriteram_size)
@@ -94,7 +94,7 @@ ADDRESS_MAP_END
/******************************************************************************/
/* Physical memory map (21 bits) */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x1fffff)
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_NOP /* YM2203 - this board doesn't have one */
diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c
index 158492fb384..21f21218ee2 100644
--- a/src/mame/drivers/supdrapo.c
+++ b/src/mame/drivers/supdrapo.c
@@ -241,7 +241,7 @@ static MACHINE_RESET( supdrapo )
Memory Map
**********************************************************************/
-static ADDRESS_MAP_START( sdpoker_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sdpoker_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x4fff) AM_ROM
AM_RANGE(0x5000, 0x50ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x57ff, 0x57ff) AM_RAM AM_SHARE("share1")
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index 48eab915bea..15b14ad458c 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -226,7 +226,7 @@ static WRITE32_HANDLER( superchs_stick_w )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( superchs_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( superchs_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x11ffff) AM_RAM AM_BASE_MEMBER(superchs_state, ram)
AM_RANGE(0x140000, 0x141fff) AM_RAM AM_BASE_SIZE_MEMBER(superchs_state, spriteram, spriteram_size)
@@ -240,7 +240,7 @@ static ADDRESS_MAP_START( superchs_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x340000, 0x340003) AM_READWRITE(superchs_stick_r, superchs_stick_w) /* stick int request */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( superchs_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( superchs_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x600000, 0x60ffff) AM_DEVWRITE("tc0480scp", tc0480scp_word_w) /* Only written upon errors */
@@ -463,8 +463,8 @@ static READ16_HANDLER( sub_cycle_r )
static DRIVER_INIT( superchs )
{
/* Speedup handlers */
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x100000, 0x100003, 0, 0, main_cycle_r);
- memory_install_read16_handler(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0x80000a, 0x80000b, 0, 0, sub_cycle_r);
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x100000, 0x100003, 0, 0, main_cycle_r);
+ memory_install_read16_handler(machine->device("sub")->memory().space(AS_PROGRAM), 0x80000a, 0x80000b, 0, 0, sub_cycle_r);
}
GAMEL( 1992, superchs, 0, superchs, superchs, superchs, ROT0, "Taito America Corporation", "Super Chase - Criminal Termination (US)", 0, layout_superchs )
diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c
index 32557d05d7d..ff35d050ef4 100644
--- a/src/mame/drivers/superdq.c
+++ b/src/mame/drivers/superdq.c
@@ -198,13 +198,13 @@ static WRITE8_HANDLER( superdq_ld_w )
*
*************************************/
-static ADDRESS_MAP_START( superdq_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( superdq_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x5c00, 0x5fff) AM_RAM_WRITE(superdq_videoram_w) AM_BASE_MEMBER(superdq_state,videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( superdq_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( superdq_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(superdq_ld_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index 54b1f6534f4..2517cf04874 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -574,7 +574,7 @@ static MACHINE_START( pbillian )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xe0ff) AM_RAM AM_BASE_SIZE_MEMBER(superqix_state, spriteram, spriteram_size)
@@ -583,7 +583,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pbillian_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pbillian_port_map, AS_IO, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x0401, 0x0401) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x0402, 0x0403) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -596,7 +596,7 @@ static ADDRESS_MAP_START( pbillian_port_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x041b, 0x041b) AM_READNOP // input related? but probably not used
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hotsmash_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hotsmash_port_map, AS_IO, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x0401, 0x0401) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x0402, 0x0403) AM_DEVWRITE("aysnd", ay8910_data_address_w)
@@ -609,7 +609,7 @@ static ADDRESS_MAP_START( hotsmash_port_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x041b, 0x041b) AM_READNOP // input related? but probably not used
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sqix_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sqix_port_map, AS_IO, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x0401, 0x0401) AM_DEVREAD("ay1", ay8910_r)
AM_RANGE(0x0402, 0x0403) AM_DEVWRITE("ay1", ay8910_data_address_w)
@@ -622,7 +622,7 @@ static ADDRESS_MAP_START( sqix_port_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x8800, 0xf7ff) AM_RAM_WRITE(superqix_bitmapram2_w) AM_BASE_MEMBER(superqix_state, bitmapram2)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bootleg_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bootleg_port_map, AS_IO, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x0401, 0x0401) AM_DEVREAD("ay1", ay8910_r)
AM_RANGE(0x0402, 0x0403) AM_DEVWRITE("ay1", ay8910_data_address_w)
@@ -636,7 +636,7 @@ static ADDRESS_MAP_START( bootleg_port_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m68705_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m68705_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READ(hotsmash_68705_portA_r)
AM_RANGE(0x0001, 0x0001) AM_WRITE(hotsmash_68705_portB_w)
@@ -648,12 +648,12 @@ ADDRESS_MAP_END
/* I8751 memory handlers */
-static ADDRESS_MAP_START( bootleg_mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bootleg_mcu_io_map, AS_IO, 8 )
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_WRITE(bootleg_mcu_p1_w)
AM_RANGE(MCS51_PORT_P3, MCS51_PORT_P3) AM_READWRITE(bootleg_mcu_p3_r, mcu_p3_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sqixu_mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sqixu_mcu_io_map, AS_IO, 8 )
AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P0) AM_READ(sqixu_mcu_p0_r)
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_READ_PORT("DSW1")
AM_RANGE(MCS51_PORT_P2, MCS51_PORT_P2) AM_WRITE(sqixu_mcu_p2_w)
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index 9a4cdc31665..cf92ac79d5e 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -284,7 +284,7 @@ static SCREEN_UPDATE( supertnk )
static MACHINE_RESET( supertnk )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -300,7 +300,7 @@ static MACHINE_RESET( supertnk )
*
*************************************/
-static ADDRESS_MAP_START( supertnk_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( supertnk_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_ROM
AM_RANGE(0x0800, 0x17ff) AM_ROMBANK("bank1")
AM_RANGE(0x1800, 0x1bff) AM_RAM
@@ -320,7 +320,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( supertnk_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( supertnk_io_map, AS_IO, 8 )
AM_RANGE(0x0000, 0x0000) AM_WRITENOP
AM_RANGE(0x0400, 0x0400) AM_WRITE(supertnk_bitplane_select_0_w)
AM_RANGE(0x0401, 0x0401) AM_WRITE(supertnk_bitplane_select_1_w)
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index 4afe1c6832f..083a4845e31 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -295,7 +295,7 @@ static READ8_HANDLER( p2_r )
return (input_port_read(space->machine, "P2") & 0xf0) | ((input_port_read(space->machine, "P2_ANALOG") & 0xf));
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x4000, 0x4000) AM_WRITE( rom2_bank_select_w )
@@ -307,7 +307,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(p1_r)
AM_RANGE(0x01, 0x01) AM_READ(p2_r)
diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c
index 365b2805bfd..13dcf27705c 100644
--- a/src/mame/drivers/suprloco.c
+++ b/src/mame/drivers/suprloco.c
@@ -26,7 +26,7 @@ static WRITE8_HANDLER( suprloco_soundport_w )
device_spin_until_time(space->cpu, attotime::from_usec(50));
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc1ff) AM_RAM AM_BASE_SIZE_MEMBER(suprloco_state, spriteram, spriteram_size)
@@ -43,7 +43,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa003) AM_DEVWRITE("sn1", sn76496_w)
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index ec1272bb7cf..d1ca16054ce 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -724,7 +724,7 @@ static WRITE32_HANDLER( skns_v3t_w )
btiles[offset*4+3] = (data & 0x000000ff) >> 0;
}
-static ADDRESS_MAP_START( skns_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( skns_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0007ffff) AM_ROM /* BIOS ROM */
AM_RANGE(0x00400000, 0x0040000f) AM_WRITE(skns_io_w) /* I/O Write */
AM_RANGE(0x00400000, 0x00400003) AM_READ_PORT("400000")
@@ -966,7 +966,7 @@ static void init_skns(running_machine *machine)
sh2drc_set_options(machine->device("maincpu"), SH2DRC_FASTEST_OPTIONS);
sh2drc_add_pcflush(machine->device("maincpu"), 0x6f8);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000028, 0x600002b, 0, 0, bios_skip_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000028, 0x600002b, 0, 0, bios_skip_r );
}
static void set_drc_pcflush(running_machine *machine, UINT32 addr)
@@ -976,21 +976,21 @@ static void set_drc_pcflush(running_machine *machine, UINT32 addr)
static DRIVER_INIT( galpani4 ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-5,-1); init_skns(machine); }
static DRIVER_INIT( galpanis ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-5,-1); init_skns(machine); }
-static DRIVER_INIT( cyvern ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+0,+2); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x604d3c8, 0x604d3cb, 0, 0, cyvern_speedup_r ); set_drc_pcflush(machine, 0x402ebd2); }
-static DRIVER_INIT( galpans2 ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-1,-1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x60fb6bc, 0x60fb6bf, 0, 0, galpans2_speedup_r ); set_drc_pcflush(machine, 0x4049ae2); }
-static DRIVER_INIT( gutsn ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+0,+0); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x600c780, 0x600c783, 0, 0, gutsn_speedup_r ); set_drc_pcflush(machine, 0x402206e); }
-static DRIVER_INIT( panicstr ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-1,-1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x60f19e4, 0x60f19e7, 0, 0, panicstr_speedup_r ); set_drc_pcflush(machine, 0x404e68a); }
-static DRIVER_INIT( senknow ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+1,+1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x60000dc, 0x60000df, 0, 0, senknow_speedup_r ); set_drc_pcflush(machine, 0x4017dce); }
-static DRIVER_INIT( puzzloop ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6081d38, 0x6081d3b, 0, 0, puzzloop_speedup_r ); set_drc_pcflush(machine, 0x401da14); }
-static DRIVER_INIT( puzzloopj ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6086714, 0x6086717, 0, 0, puzzloopj_speedup_r ); set_drc_pcflush(machine, 0x401dca0); }
-static DRIVER_INIT( puzzloopa ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6085bcc, 0x6085bcf, 0, 0, puzzloopa_speedup_r ); set_drc_pcflush(machine, 0x401d9d4); }
-static DRIVER_INIT( puzzloopu ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6085cec, 0x6085cef, 0, 0, puzzloopu_speedup_r ); set_drc_pcflush(machine, 0x401dab0); }
-static DRIVER_INIT( jjparads ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000994, 0x6000997, 0, 0, jjparads_speedup_r ); set_drc_pcflush(machine, 0x4015e84); }
-static DRIVER_INIT( jjparad2 ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000984, 0x6000987, 0, 0, jjparad2_speedup_r ); set_drc_pcflush(machine, 0x401620a); }
-static DRIVER_INIT( ryouran ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000a14, 0x6000a17, 0, 0, ryouran_speedup_r ); set_drc_pcflush(machine, 0x40182ce); }
-static DRIVER_INIT( teljan ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6002fb4, 0x6002fb7, 0, 0, teljan_speedup_r ); set_drc_pcflush(machine, 0x401ba32); }
-static DRIVER_INIT( sengekis ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-192,-272); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x60b74bc, 0x60b74bf, 0, 0, sengekis_speedup_r ); set_drc_pcflush(machine, 0x60006ec); }
-static DRIVER_INIT( sengekij ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-192,-272); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x60b7380, 0x60b7383, 0, 0, sengekij_speedup_r ); set_drc_pcflush(machine, 0x60006ec); }
+static DRIVER_INIT( cyvern ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+0,+2); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x604d3c8, 0x604d3cb, 0, 0, cyvern_speedup_r ); set_drc_pcflush(machine, 0x402ebd2); }
+static DRIVER_INIT( galpans2 ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-1,-1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x60fb6bc, 0x60fb6bf, 0, 0, galpans2_speedup_r ); set_drc_pcflush(machine, 0x4049ae2); }
+static DRIVER_INIT( gutsn ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+0,+0); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x600c780, 0x600c783, 0, 0, gutsn_speedup_r ); set_drc_pcflush(machine, 0x402206e); }
+static DRIVER_INIT( panicstr ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-1,-1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x60f19e4, 0x60f19e7, 0, 0, panicstr_speedup_r ); set_drc_pcflush(machine, 0x404e68a); }
+static DRIVER_INIT( senknow ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+1,+1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x60000dc, 0x60000df, 0, 0, senknow_speedup_r ); set_drc_pcflush(machine, 0x4017dce); }
+static DRIVER_INIT( puzzloop ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6081d38, 0x6081d3b, 0, 0, puzzloop_speedup_r ); set_drc_pcflush(machine, 0x401da14); }
+static DRIVER_INIT( puzzloopj ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6086714, 0x6086717, 0, 0, puzzloopj_speedup_r ); set_drc_pcflush(machine, 0x401dca0); }
+static DRIVER_INIT( puzzloopa ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6085bcc, 0x6085bcf, 0, 0, puzzloopa_speedup_r ); set_drc_pcflush(machine, 0x401d9d4); }
+static DRIVER_INIT( puzzloopu ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-9,-1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6085cec, 0x6085cef, 0, 0, puzzloopu_speedup_r ); set_drc_pcflush(machine, 0x401dab0); }
+static DRIVER_INIT( jjparads ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000994, 0x6000997, 0, 0, jjparads_speedup_r ); set_drc_pcflush(machine, 0x4015e84); }
+static DRIVER_INIT( jjparad2 ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000984, 0x6000987, 0, 0, jjparad2_speedup_r ); set_drc_pcflush(machine, 0x401620a); }
+static DRIVER_INIT( ryouran ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000a14, 0x6000a17, 0, 0, ryouran_speedup_r ); set_drc_pcflush(machine, 0x40182ce); }
+static DRIVER_INIT( teljan ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(+5,+1); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6002fb4, 0x6002fb7, 0, 0, teljan_speedup_r ); set_drc_pcflush(machine, 0x401ba32); }
+static DRIVER_INIT( sengekis ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-192,-272); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x60b74bc, 0x60b74bf, 0, 0, sengekis_speedup_r ); set_drc_pcflush(machine, 0x60006ec); }
+static DRIVER_INIT( sengekij ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-192,-272); init_skns(machine); memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x60b7380, 0x60b7383, 0, 0, sengekij_speedup_r ); set_drc_pcflush(machine, 0x60006ec); }
static DRIVER_INIT( 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()
static DRIVER_INIT( galpans3 ) { machine->device<sknsspr_device>("spritegen")->skns_sprite_kludge(-1,-1); init_skns(machine); }
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index 4acf8227489..ad6801f96e3 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -161,7 +161,7 @@ static WRITE8_HANDLER( coin_lock_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(suprridr_bgram_w) AM_BASE_MEMBER(suprridr_state, bgram)
@@ -183,7 +183,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
@@ -196,13 +196,13 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x3800, 0x3bff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(sound_irq_ack_w)
AM_RANGE(0x8c, 0x8d) AM_DEVWRITE("ay1", ay8910_address_data_w)
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index e75e00e0711..a12dc363bfc 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -126,7 +126,7 @@ static WRITE8_HANDLER( suprslam_sh_bankswitch_w )
/*** MEMORY MAPS *************************************************************/
-static ADDRESS_MAP_START( suprslam_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( suprslam_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0xfb0000, 0xfb1fff) AM_RAM AM_BASE_MEMBER(suprslam_state, spriteram)
AM_RANGE(0xfc0000, 0xfcffff) AM_RAM AM_BASE_MEMBER(suprslam_state, sp_videoram)
@@ -148,13 +148,13 @@ static ADDRESS_MAP_START( suprslam_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff00c, 0xfff00d) AM_WRITEONLY AM_BASE_MEMBER(suprslam_state, spr_ctrl)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(suprslam_sh_bankswitch_w)
AM_RANGE(0x04, 0x04) AM_READWRITE(soundlatch_r, pending_command_clear_w)
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index 53dc53f0759..d76d661c8b9 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -90,7 +90,7 @@ static WRITE8_HANDLER( surpratk_5fc0_w )
/********************************************/
-static ADDRESS_MAP_START( surpratk_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( surpratk_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_READWRITE(bankedram_r, bankedram_w) AM_BASE_MEMBER(surpratk_state, ram)
AM_RANGE(0x0800, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") /* banked ROM */
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index 9d489eeb193..8bdcd017439 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -710,7 +710,7 @@ static WRITE8_HANDLER( nobb_outport24_w )
*************************************/
/* main memory map */
-static ADDRESS_MAP_START( system1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( system1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xcfff) AM_RAM AM_BASE_MEMBER(system1_state, ram)
@@ -724,7 +724,7 @@ static ADDRESS_MAP_START( system1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* same as normal System 1 except address map is shuffled (RAM/collision are swapped) */
-static ADDRESS_MAP_START( nobo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nobo_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xc3ff) AM_READWRITE(system1_mixer_collision_r, system1_mixer_collision_w)
@@ -738,7 +738,7 @@ static ADDRESS_MAP_START( nobo_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* I/O map for systems with an 8255 PPI */
-static ADDRESS_MAP_START( system1_ppi_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( system1_ppi_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x1f)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x03) AM_READ_PORT("P1")
AM_RANGE(0x04, 0x04) AM_MIRROR(0x03) AM_READ_PORT("P2")
@@ -750,7 +750,7 @@ static ADDRESS_MAP_START( system1_ppi_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
/* I/O map for systems with a Z80 PIO chip */
-static ADDRESS_MAP_START( system1_pio_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( system1_pio_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x1f)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x03) AM_READ_PORT("P1")
AM_RANGE(0x04, 0x04) AM_MIRROR(0x03) AM_READ_PORT("P2")
@@ -769,7 +769,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_MIRROR(0x1800) AM_RAM
AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x1fff) AM_DEVWRITE("sn1", sn76496_w)
@@ -785,14 +785,14 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0xffff) AM_READWRITE(mcu_io_r, mcu_io_w)
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_WRITE(mcu_control_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nob_mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( nob_mcu_io_map, AS_IO, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P0) AM_RAM AM_BASE_MEMBER(system1_state, nob_mcu_latch)
AM_RANGE(MCS51_PORT_P1, MCS51_PORT_P1) AM_WRITEONLY AM_BASE_MEMBER(system1_state, nob_mcu_status)
@@ -4546,11 +4546,11 @@ static DRIVER_INIT( dakkochn )
mc8123_decrypt_rom(machine, "maincpu", "key", "bank1", 4);
-// memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x00, 0x00, 0, 0, dakkochn_port_00_r);
-// memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x03, 0x03, 0, 0, dakkochn_port_03_r);
-// memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x04, 0x04, 0, 0, dakkochn_port_04_r);
+// memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x00, 0x00, 0, 0, dakkochn_port_00_r);
+// memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x03, 0x03, 0, 0, dakkochn_port_03_r);
+// memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x04, 0x04, 0, 0, dakkochn_port_04_r);
-// memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO), 0x15, 0x15, 0, 0, dakkochn_port_15_w);
+// memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_IO), 0x15, 0x15, 0, 0, dakkochn_port_15_w);
}
@@ -4608,8 +4608,8 @@ static READ8_HANDLER( nob_start_r )
static DRIVER_INIT( nob )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -4640,7 +4640,7 @@ static DRIVER_INIT( 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(ADDRESS_SPACE_IO);
+ address_space *iospace = machine->device("maincpu")->memory().space(AS_IO);
UINT8 *ROM2 = machine->region("soundcpu")->base();
ROM2[0x02f9] = 0x28;//'jr z' instead of 'jr'
@@ -4656,7 +4656,7 @@ static DRIVER_INIT( nobb )
static DRIVER_INIT( bootleg )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
space->set_decrypted_region(0x0000, 0x7fff, machine->region("maincpu")->base() + 0x10000);
DRIVER_INIT_CALL(bank00);
}
@@ -4664,7 +4664,7 @@ static DRIVER_INIT( bootleg )
static DRIVER_INIT( bootsys2 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
space->set_decrypted_region(0x0000, 0x7fff, machine->region("maincpu")->base() + 0x20000);
memory_configure_bank_decrypted(machine, "bank1", 0, 4, machine->region("maincpu")->base() + 0x30000, 0x4000);
DRIVER_INIT_CALL(bank0c);
@@ -4684,7 +4684,7 @@ static DRIVER_INIT( choplift )
static DRIVER_INIT( shtngmst )
{
- address_space *iospace = machine->device("maincpu")->memory().space(ADDRESS_SPACE_IO);
+ address_space *iospace = machine->device("maincpu")->memory().space(AS_IO);
memory_install_read_port(iospace, 0x12, 0x12, 0x00, 0x00, "TRIGGER");
memory_install_read_port(iospace, 0x18, 0x18, 0x00, 0x03, "18");
memory_install_read_port(iospace, 0x1c, 0x1c, 0x00, 0x02, "GUNX");
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 387adca2409..d169fd43497 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -120,7 +120,7 @@ static WRITE16_HANDLER( sound_command_nmi_w )
}
-static ADDRESS_MAP_START( shinobib_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( shinobib_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM // tilemap ram on the original, used as a buffer on the bootlegs
AM_RANGE(0x410000, 0x410fff) AM_RAM AM_BASE_MEMBER(segas1x_bootleg_state, textram)
@@ -176,7 +176,7 @@ static WRITE16_HANDLER( sys16_coinctrl_w )
}
}
-static ADDRESS_MAP_START( passshtb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( passshtb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x400000, 0x407fff) AM_RAM // tilemap ram on original, buffer on bootleg
@@ -260,7 +260,7 @@ static READ16_HANDLER( passht4b_io3_r )
return state->passht4b_io3_val;
}
-static ADDRESS_MAP_START( passht4b_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( passht4b_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x400000, 0x407fff) AM_RAM // tilemap ram on original, buffer on bootleg
AM_RANGE(0x409000, 0x40afff) AM_RAM AM_BASE_MEMBER(segas1x_bootleg_state, bg0_tileram)
@@ -309,7 +309,7 @@ static WRITE16_HANDLER( sys16_tilebank_w )
}
}
-static ADDRESS_MAP_START( wb3bbl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wb3bbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x3f0000, 0x3fffff) AM_WRITE(sys16_tilebank_w)
AM_RANGE(0x400000, 0x407fff) AM_RAM // tilemap ram on the original, used as a buffer on the bootlegs
@@ -429,7 +429,7 @@ static WRITE8_HANDLER( tturfbl_soundbank_w )
}
}
-static ADDRESS_MAP_START(tturfbl_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START(tturfbl_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_READ(tturfbl_soundbank_r)
AM_RANGE(0xe000, 0xe000) AM_WRITE(tturfbl_soundbank_w)
@@ -438,7 +438,7 @@ static ADDRESS_MAP_START(tturfbl_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tturfbl_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tturfbl_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x40, 0x40) AM_WRITENOP
@@ -447,13 +447,13 @@ ADDRESS_MAP_END
/*******************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_r)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r)
@@ -461,7 +461,7 @@ ADDRESS_MAP_END
// 7759
-static ADDRESS_MAP_START( sound_7759_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_7759_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xdfff) AM_ROMBANK("bank1")
AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_r)
@@ -479,7 +479,7 @@ static WRITE8_DEVICE_HANDLER( upd7759_bank_w ) //*
}
-static ADDRESS_MAP_START( sound_7759_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_7759_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x40, 0x40) AM_DEVWRITE("7759", upd7759_bank_w)
@@ -516,7 +516,7 @@ static void set_bg_page( running_machine *machine, int data )
}
#ifdef UNUSED_CODE
-static ADDRESS_MAP_START( bayroute_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bayroute_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x100000, 0x100003) AM_WRITENOP // tilebank control?
AM_RANGE(0x500000, 0x503fff) AM_RAM // work ram
@@ -541,7 +541,7 @@ ADDRESS_MAP_END
Flash Point (Datsu bootlegs = fpointbl, fpointbj)
Has sound latch at $E000 instead of I/O ports $C0-FF
*/
-static ADDRESS_MAP_START( fpointbl_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fpointbl_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
AM_RANGE(0xf800, 0xffff) AM_RAM
@@ -611,7 +611,7 @@ static WRITE16_HANDLER( s16bl_bgscrolly_w )
}
-static ADDRESS_MAP_START( goldnaxeb1_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( goldnaxeb1_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE_MEMBER(segas1x_bootleg_state, tileram)
AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE_MEMBER(segas1x_bootleg_state, textram)
@@ -636,7 +636,7 @@ static ADDRESS_MAP_START( goldnaxeb1_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffc000, 0xffffff) AM_RAM // work ram
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bayrouteb1_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bayrouteb1_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x500000, 0x503fff) AM_RAM // work ram
AM_RANGE(0x600000, 0x600fff) AM_RAM AM_BASE(&segaic16_spriteram_0)
@@ -709,7 +709,7 @@ static WRITE16_HANDLER( datsu_page3_w )
datsu_set_pages(space->machine);
}
-static ADDRESS_MAP_START( bayrouteb2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bayrouteb2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x500000, 0x503fff) AM_RAM // work ram
AM_RANGE(0x600000, 0x600fff) AM_RAM AM_BASE(&segaic16_spriteram_0)
@@ -733,7 +733,7 @@ static ADDRESS_MAP_START( bayrouteb2_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x901006, 0x901007) AM_READ_PORT("P2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dduxbl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dduxbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x3f0000, 0x3fffff) AM_WRITE(sys16_tilebank_w)
AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE_MEMBER(segas1x_bootleg_state, tileram)
@@ -832,7 +832,7 @@ static WRITE16_HANDLER( goldnaxeb2_bgpage_w )
set_bg_page(space->machine, page ^ 0xffff);
}
-static ADDRESS_MAP_START( goldnaxeb2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( goldnaxeb2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE_MEMBER(segas1x_bootleg_state, tileram)
AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE_MEMBER(segas1x_bootleg_state, textram)
@@ -860,7 +860,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( fpointbl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fpointbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE_MEMBER(segas1x_bootleg_state, tileram)
@@ -901,7 +901,7 @@ static WRITE16_HANDLER( eswat_tilebank0_w )
}
}
-static ADDRESS_MAP_START( eswatbl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( eswatbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x3e2000, 0x3e2001) AM_WRITE(eswat_tilebank0_w) // external tile bank ( > 0x4000 tiles )
@@ -930,7 +930,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( tetrisbl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tetrisbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE_MEMBER(segas1x_bootleg_state, tileram)
AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE_MEMBER(segas1x_bootleg_state, textram)
@@ -966,7 +966,7 @@ static READ16_HANDLER( beautyb_unkx_r )
return state->beautyb_unkx;
}
-static ADDRESS_MAP_START( beautyb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( beautyb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM AM_WRITENOP
AM_RANGE(0x010000, 0x03ffff) AM_WRITENOP
@@ -997,7 +997,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( tturfbl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tturfbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM // work ram
AM_RANGE(0x300000, 0x300fff) AM_RAM AM_BASE(&segaic16_spriteram_0)
@@ -1058,7 +1058,7 @@ static READ8_HANDLER( system18_bank_r )
return 0xff;
}
-static ADDRESS_MAP_START( sound_18_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_18_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xbfff) AM_READ(system18_bank_r)
/**** D/A register ****/
@@ -1083,7 +1083,7 @@ static WRITE8_HANDLER( sys18_soundbank_w )
state->sound_bank = NULL;
}
-static ADDRESS_MAP_START( sound_18_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_18_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x80, 0x83) AM_DEVREADWRITE("3438.0", ym3438_r, ym3438_w)
AM_RANGE(0x90, 0x93) AM_DEVREADWRITE("3438.1", ym3438_r, ym3438_w)
@@ -1145,7 +1145,7 @@ static WRITE16_HANDLER( sound_command_irq_w )
}
}
-static ADDRESS_MAP_START( shdancbl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( shdancbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE_MEMBER(segas1x_bootleg_state, tileram)
AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE_MEMBER(segas1x_bootleg_state, textram)
@@ -1262,7 +1262,7 @@ static WRITE8_HANDLER( shdancbl_bankctrl_w )
}
}
-static ADDRESS_MAP_START(shdancbl_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START(shdancbl_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_READ(shdancbl_soundbank_r)
AM_RANGE(0xc000, 0xc00f) AM_WRITENOP
@@ -1276,7 +1276,7 @@ static ADDRESS_MAP_START(shdancbl_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shdancbl_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( shdancbl_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xa0, 0xbf) AM_WRITENOP
AM_RANGE(0xc0, 0xdf) AM_READNOP
@@ -1289,7 +1289,7 @@ ADDRESS_MAP_END
***************************************************************************/
-static ADDRESS_MAP_START( mwalkbl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mwalkbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE_MEMBER(segas1x_bootleg_state, tileram)
AM_RANGE(0x410000, 0x410fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE_MEMBER(segas1x_bootleg_state, textram)
@@ -1331,7 +1331,7 @@ ADDRESS_MAP_END
***************************************************************************/
/* bootleg doesn't have real vdp or i/o */
-static ADDRESS_MAP_START( astormbl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( astormbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM_WRITE(sys16_tileram_w) AM_BASE_MEMBER(segas1x_bootleg_state, tileram)
AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE(sys16_textram_w) AM_BASE_MEMBER(segas1x_bootleg_state, textram)
@@ -3390,7 +3390,7 @@ static DRIVER_INIT( goldnaxeb1 )
int i;
UINT8 *ROM = machine->region("maincpu")->base();
UINT8 *KEY = machine->region("decryption")->base();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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/tagteam.c b/src/mame/drivers/tagteam.c
index d19db3818a8..6a26050f9ce 100644
--- a/src/mame/drivers/tagteam.c
+++ b/src/mame/drivers/tagteam.c
@@ -38,7 +38,7 @@ static WRITE8_HANDLER( sound_command_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x2000, 0x2000) AM_READ_PORT("P2") AM_WRITE(tagteam_flipscreen_w)
AM_RANGE(0x2001, 0x2001) AM_READ_PORT("P1") AM_WRITE(tagteam_control_w)
@@ -53,7 +53,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("ay1", ay8910_data_address_w)
AM_RANGE(0x2002, 0x2003) AM_DEVWRITE("ay2", ay8910_data_address_w)
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index d746d473832..37266421626 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -33,7 +33,7 @@ static WRITE8_DEVICE_HANDLER( sound_bankswitch_w )
memory_set_bank(device->machine, "bank3", data & 0x01);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x200000, 0x27ffff) AM_ROMBANK("bank1") /* extra ROM */
AM_RANGE(0x2c0000, 0x2dffff) AM_ROMBANK("bank2")
@@ -50,13 +50,13 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff008, 0xfff009) AM_WRITE(sound_command_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank3")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x07, 0x07) AM_READ(soundlatch_r) AM_WRITENOP /* the write is a clear pending command */
AM_RANGE(0x08, 0x0b) AM_DEVWRITE("ymsnd", ym2608_w)
diff --git a/src/mame/drivers/taito.c b/src/mame/drivers/taito.c
index b7abb0b1c1f..ca8d7aaff8f 100644
--- a/src/mame/drivers/taito.c
+++ b/src/mame/drivers/taito.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( taito_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( taito_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 21b770a8116..42dc4fe8c6d 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -483,7 +483,7 @@ static WRITE16_HANDLER( spacedxo_tc0220ioc_w )
AM_RANGE(ADDR+0x40000, ADDR+0x7ffff) AM_READWRITE(tc0180vcu_framebuffer_word_r, tc0180vcu_framebuffer_word_w)
-static ADDRESS_MAP_START( rastsag2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rastsag2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x600000, 0x607fff) AM_RAM /* Main RAM */ /*ashura up to 603fff only*/
@@ -494,7 +494,7 @@ static ADDRESS_MAP_START( rastsag2_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( crimec_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( crimec_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0xff00)
TC0180VCU_MEMRW( 0x400000 )
@@ -505,7 +505,7 @@ static ADDRESS_MAP_START( crimec_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tetrist_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tetrist_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x200001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -515,7 +515,7 @@ static ADDRESS_MAP_START( tetrist_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tetrista_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tetrista_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
TC0180VCU_MEMRW( 0x400000 )
@@ -527,7 +527,7 @@ static ADDRESS_MAP_START( tetrista_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hitice_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hitice_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
TC0180VCU_MEMRW( 0x400000 )
AM_RANGE(0x600000, 0x60000f) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0xff00)
@@ -543,7 +543,7 @@ static ADDRESS_MAP_START( hitice_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rambo3_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rambo3_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x200001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -562,7 +562,7 @@ static ADDRESS_MAP_START( rambo3_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pbobble_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pbobble_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
TC0180VCU_MEMRW( 0x400000 )
AM_RANGE(0x500000, 0x50000f) AM_READ(pbobble_input_bypass_r) AM_DEVWRITE("tc0640fio", tc0640fio_halfword_byteswap_w)
@@ -578,7 +578,7 @@ static ADDRESS_MAP_START( pbobble_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* identical to pbobble, above??? */
-static ADDRESS_MAP_START( spacedx_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( spacedx_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
TC0180VCU_MEMRW( 0x400000 )
AM_RANGE(0x500000, 0x50000f) AM_READ(pbobble_input_bypass_r) AM_DEVWRITE("tc0640fio", tc0640fio_halfword_byteswap_w)
@@ -593,7 +593,7 @@ static ADDRESS_MAP_START( spacedx_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x900000, 0x90ffff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spacedxo_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( spacedxo_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x100002, 0x100003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -608,7 +608,7 @@ static ADDRESS_MAP_START( spacedxo_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qzshowby_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( qzshowby_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20000f) AM_READ(pbobble_input_bypass_r) AM_DEVWRITE("tc0640fio", tc0640fio_halfword_byteswap_w)
AM_RANGE(0x200024, 0x200025) AM_READ_PORT("P3_P4_A") /* player 3,4 start */
@@ -624,7 +624,7 @@ static ADDRESS_MAP_START( qzshowby_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( viofight_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( viofight_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x200001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -635,7 +635,7 @@ static ADDRESS_MAP_START( viofight_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( masterw_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( masterw_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM /* Main RAM */
TC0180VCU_MEMRW( 0x400000 )
@@ -647,7 +647,7 @@ static ADDRESS_MAP_START( masterw_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( silentd_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( silentd_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READNOP AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x100002, 0x100003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -665,7 +665,7 @@ static ADDRESS_MAP_START( silentd_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( selfeena_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( selfeena_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* Main RAM */
TC0180VCU_MEMRW( 0x200000 )
@@ -677,7 +677,7 @@ static ADDRESS_MAP_START( selfeena_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sbm_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sbm_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* Main RAM */
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
@@ -689,7 +689,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( masterw_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( masterw_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x8fff) AM_RAM
@@ -698,7 +698,7 @@ static ADDRESS_MAP_START( masterw_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa001, 0xa001) AM_DEVREADWRITE("tc0140syt", tc0140syt_slave_comm_r, tc0140syt_slave_comm_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM
@@ -713,7 +713,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf200, 0xf200) AM_WRITE(bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( viofight_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( viofight_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x8fff) AM_RAM
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 22f1e8bc830..8b7f742894e 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -693,7 +693,7 @@ static READ16_HANDLER( cchip2_word_r )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( finalb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( finalb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x200007) AM_DEVREADWRITE("tc0110pcr", tc0110pcr_word_r, tc0110pcr_word_w) /* palette */
@@ -707,7 +707,7 @@ static ADDRESS_MAP_START( finalb_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00002, 0xb00003) AM_WRITENOP /* ?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dondokod_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dondokod_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
@@ -722,7 +722,7 @@ static ADDRESS_MAP_START( dondokod_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb0001f) AM_DEVWRITE8("tc0360pri", tc0360pri_w, 0x00ff) /* ?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( megab_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( megab_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x100002, 0x100003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -737,7 +737,7 @@ static ADDRESS_MAP_START( megab_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE_SIZE_MEMBER(taitof2_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( thundfox_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( thundfox_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0x00ff)
@@ -752,7 +752,7 @@ static ADDRESS_MAP_START( thundfox_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x800000, 0x80001f) AM_DEVWRITE8("tc0360pri", tc0360pri_w, 0xff00)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cameltry_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cameltry_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
@@ -768,7 +768,7 @@ static ADDRESS_MAP_START( cameltry_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd00000, 0xd0001f) AM_DEVWRITE8("tc0360pri", tc0360pri_w, 0x00ff) /* ?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qtorimon_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( qtorimon_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x200007) AM_DEVREADWRITE("tc0110pcr", tc0110pcr_word_r, tc0110pcr_word_w) /* palette */
@@ -781,7 +781,7 @@ static ADDRESS_MAP_START( qtorimon_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x910000, 0x9120ff) AM_WRITENOP /* error in init code ? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( liquidk_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( liquidk_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
@@ -794,7 +794,7 @@ static ADDRESS_MAP_START( liquidk_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb0001f) AM_DEVWRITE8("tc0360pri", tc0360pri_w, 0x00ff) /* ?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( quizhq_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( quizhq_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x200007) AM_DEVREADWRITE("tc0110pcr", tc0110pcr_word_r, tc0110pcr_word_w) /* palette */
@@ -815,7 +815,7 @@ static ADDRESS_MAP_START( quizhq_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x900000, 0x90ffff) AM_RAM AM_BASE_SIZE_MEMBER(taitof2_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ssi_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ssi_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10000f) AM_DEVREADWRITE("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
AM_RANGE(0x200000, 0x20ffff) AM_RAM
@@ -828,7 +828,7 @@ static ADDRESS_MAP_START( ssi_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x800000, 0x80ffff) AM_RAM AM_BASE_SIZE_MEMBER(taitof2_state, spriteram, spriteram_size) /* sprite ram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gunfront_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gunfront_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
@@ -842,7 +842,7 @@ static ADDRESS_MAP_START( gunfront_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb0001f) AM_DEVWRITE8("tc0360pri", tc0360pri_w, 0x00ff) /* ?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( growl_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( growl_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
@@ -865,7 +865,7 @@ static ADDRESS_MAP_START( growl_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb0001f) AM_DEVWRITE8("tc0360pri", tc0360pri_w, 0x00ff) /* ?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mjnquest_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mjnquest_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x110000, 0x11ffff) AM_RAM /* "sram" */
AM_RANGE(0x120000, 0x12ffff) AM_RAM
@@ -883,7 +883,7 @@ static ADDRESS_MAP_START( mjnquest_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x500000, 0x50ffff) AM_RAM AM_BASE_SIZE_MEMBER(taitof2_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( footchmp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( footchmp_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE_SIZE_MEMBER(taitof2_state, spriteram, spriteram_size)
@@ -905,7 +905,7 @@ static ADDRESS_MAP_START( footchmp_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xa00002, 0xa00003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( koshien_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( koshien_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
@@ -919,7 +919,7 @@ static ADDRESS_MAP_START( koshien_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb0001f) AM_DEVWRITE8("tc0360pri", tc0360pri_w, 0xff00)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( yuyugogo_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( yuyugogo_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
AM_RANGE(0x400000, 0x400001) AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0xff00)
@@ -933,7 +933,7 @@ static ADDRESS_MAP_START( yuyugogo_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd00000, 0xdfffff) AM_ROM AM_REGION("extra", 0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ninjak_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ninjak_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
@@ -949,7 +949,7 @@ static ADDRESS_MAP_START( ninjak_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb0001f) AM_DEVWRITE8("tc0360pri", tc0360pri_w, 0x00ff) /* b00002 written like a watchdog?! */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( solfigtr_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( solfigtr_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
@@ -970,7 +970,7 @@ static ADDRESS_MAP_START( solfigtr_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb0001f) AM_DEVWRITE8("tc0360pri", tc0360pri_w, 0x00ff) /* ?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qzquest_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( qzquest_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x17ffff) AM_ROM
AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
AM_RANGE(0x300000, 0x300001) AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0x00ff)
@@ -982,7 +982,7 @@ static ADDRESS_MAP_START( qzquest_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x720000, 0x72000f) AM_DEVREADWRITE("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pulirula_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pulirula_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x200000, 0x200001) AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -999,7 +999,7 @@ static ADDRESS_MAP_START( pulirula_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb0000f) AM_DEVREADWRITE("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( metalb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( metalb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x300000, 0x30ffff) AM_RAM AM_BASE_SIZE_MEMBER(taitof2_state, spriteram, spriteram_size)
@@ -1014,7 +1014,7 @@ static ADDRESS_MAP_START( metalb_map, ADDRESS_SPACE_PROGRAM, 16 )
// AM_RANGE(0xa00000, 0xa00001) AM_WRITENOP /* ??? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qzchikyu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( qzchikyu_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x17ffff) AM_ROM
AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
AM_RANGE(0x300000, 0x300001) AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0x00ff)
@@ -1026,7 +1026,7 @@ static ADDRESS_MAP_START( qzchikyu_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x720000, 0x72000f) AM_DEVREADWRITE("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( yesnoj_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( yesnoj_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x400000, 0x40ffff) AM_RAM AM_BASE_SIZE_MEMBER(taitof2_state, spriteram, spriteram_size)
@@ -1045,7 +1045,7 @@ static ADDRESS_MAP_START( yesnoj_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd00000, 0xd00001) AM_WRITENOP /* lots of similar writes */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( deadconx_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( deadconx_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE_SIZE_MEMBER(taitof2_state, spriteram, spriteram_size)
@@ -1066,7 +1066,7 @@ static ADDRESS_MAP_START( deadconx_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xa00002, 0xa00003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dinorex_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dinorex_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x2fffff) AM_ROM
AM_RANGE(0x300000, 0x30000f) AM_DEVREADWRITE("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
AM_RANGE(0x400000, 0x400fff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE_MEMBER(taitof2_state, sprite_extension, spriteext_size)
@@ -1081,7 +1081,7 @@ static ADDRESS_MAP_START( dinorex_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb00001) AM_WRITENOP /* watchdog? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qjinsei_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( qjinsei_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x200001) AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -1096,7 +1096,7 @@ static ADDRESS_MAP_START( qjinsei_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb0000f) AM_DEVREADWRITE("tc0510nio", tc0510nio_halfword_r, tc0510nio_halfword_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qcrayon_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( qcrayon_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
// AM_RANGE(0x200000, 0x200001) AM_WRITENOP /* unknown */
@@ -1112,7 +1112,7 @@ static ADDRESS_MAP_START( qcrayon_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb0001f) AM_DEVWRITE8("tc0360pri", tc0360pri_w, 0x00ff) /* ?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qcrayon2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( qcrayon2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x300000, 0x301fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
@@ -1127,7 +1127,7 @@ static ADDRESS_MAP_START( qcrayon2_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb017ff) AM_WRITE(taitof2_sprite_extension_w) AM_BASE_SIZE_MEMBER(taitof2_state, sprite_extension, spriteext_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( driftout_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( driftout_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x200001) AM_DEVWRITE8("tc0140syt", tc0140syt_port_w, 0xff00)
AM_RANGE(0x200002, 0x200003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0xff00)
@@ -1145,7 +1145,7 @@ static ADDRESS_MAP_START( driftout_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* same as driftout, except for sound address 0x200000 */
-static ADDRESS_MAP_START( driveout_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( driveout_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x200003) AM_READNOP AM_WRITE(driveout_sound_command_w)
AM_RANGE(0x300000, 0x30ffff) AM_RAM
@@ -1164,7 +1164,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2")
AM_RANGE(0xc000, 0xdfff) AM_RAM
@@ -1181,7 +1181,7 @@ ADDRESS_MAP_END
/* Alt version of Cameltry, YM2203 + M6925 sound */
-static ADDRESS_MAP_START( cameltrya_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cameltrya_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM // I can't see a bank control, but there ARE some bytes past 0x8000
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x9001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
@@ -1192,7 +1192,7 @@ static ADDRESS_MAP_START( cameltrya_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( driveout_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( driveout_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_WRITE(oki_bank_w)
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index c0b44b032f7..41492f0ba30 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -149,7 +149,7 @@ static WRITE32_HANDLER( f3_sound_bankswitch_w )
/******************************************************************************/
-static ADDRESS_MAP_START( f3_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( f3_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x300000, 0x30007f) AM_WRITE(f3_sound_bankswitch_w)
AM_RANGE(0x400000, 0x41ffff) AM_MIRROR(0x20000) AM_RAM AM_BASE_MEMBER(taito_f3_state, f3_ram)
@@ -3737,8 +3737,8 @@ static DRIVER_INIT( bubsympb )
}
}
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4a001c, 0x4a001f, 0, 0, bubsympb_oki_r );
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4a001c, 0x4a001f, 0, 0, bubsympb_oki_w );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4a001c, 0x4a001f, 0, 0, bubsympb_oki_r );
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4a001c, 0x4a001f, 0, 0, bubsympb_oki_w );
}
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index bd4cbebf070..80e9ba9ed4f 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -249,7 +249,7 @@ static WRITE8_HANDLER( sound_bankswitch_w )
***************************************************************************/
-static ADDRESS_MAP_START( syvalion_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( syvalion_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_MIRROR(0x010000) AM_RAM AM_BASE_MEMBER(taitoh_state, m68000_mainram)
AM_RANGE(0x200000, 0x200001) AM_READ8(syvalion_input_bypass_r, 0x00ff) AM_DEVWRITE8("tc0220ioc", tc0220ioc_portreg_w, 0x00ff)
@@ -260,7 +260,7 @@ static ADDRESS_MAP_START( syvalion_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x500800, 0x500fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( recordbr_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( recordbr_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_MIRROR(0x010000) AM_RAM AM_BASE_MEMBER(taitoh_state, m68000_mainram)
AM_RANGE(0x200000, 0x200001) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_portreg_r, tc0220ioc_portreg_w, 0x00ff)
@@ -271,7 +271,7 @@ static ADDRESS_MAP_START( recordbr_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x500800, 0x500fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dleague_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dleague_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_MIRROR(0x010000) AM_RAM AM_BASE_MEMBER(taitoh_state, m68000_mainram)
AM_RANGE(0x200000, 0x20000f) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0x00ff)
@@ -283,7 +283,7 @@ static ADDRESS_MAP_START( dleague_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index e1daf224928..6999a396f39 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -722,13 +722,13 @@ static READ8_HANDLER( horshoes_trackx_hi_r )
-static ADDRESS_MAP_START( fhawk_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fhawk_map, AS_PROGRAM, 8 )
COMMON_BANKS_MAP
AM_RANGE(0x8000, 0x9fff) AM_RAM AM_BASE_MEMBER(taitol_state, shared_ram)
AM_RANGE(0xa000, 0xbfff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fhawk_2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fhawk_2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank6")
AM_RANGE(0xc000, 0xc000) AM_WRITE(rombank2switch_w)
@@ -744,7 +744,7 @@ static ADDRESS_MAP_START( fhawk_2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_READWRITE(shared_r, shared_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fhawk_3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fhawk_3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank7")
AM_RANGE(0x8000, 0x9fff) AM_RAM
@@ -754,7 +754,7 @@ static ADDRESS_MAP_START( fhawk_3_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( raimais_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( raimais_map, AS_PROGRAM, 8 )
COMMON_BANKS_MAP
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_MEMBER(taitol_state, shared_ram)
AM_RANGE(0x8800, 0x8800) AM_READWRITE(mux_r, mux_w)
@@ -764,7 +764,7 @@ static ADDRESS_MAP_START( raimais_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa000, 0xbfff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( raimais_2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( raimais_2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(shared_r, shared_w)
@@ -779,7 +779,7 @@ static WRITE8_HANDLER( sound_bankswitch_w )
memory_set_bankptr (space->machine, "bank7", &RAM [0x10000 + (banknum * 0x4000)]);
}
-static ADDRESS_MAP_START( raimais_3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( raimais_3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank7")
AM_RANGE(0xc000, 0xdfff) AM_RAM
@@ -794,13 +794,13 @@ static ADDRESS_MAP_START( raimais_3_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( champwr_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( champwr_map, AS_PROGRAM, 8 )
COMMON_BANKS_MAP
AM_RANGE(0x8000, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xbfff) AM_RAM AM_BASE_MEMBER(taitol_state, shared_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( champwr_2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( champwr_2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank6")
AM_RANGE(0xc000, 0xdfff) AM_READWRITE(shared_r, shared_w)
@@ -816,7 +816,7 @@ static ADDRESS_MAP_START( champwr_2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf000) AM_READWRITE(rombank2switch_r, rombank2switch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( champwr_3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( champwr_3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank7")
AM_RANGE(0x8000, 0x8fff) AM_RAM
@@ -831,7 +831,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( kurikint_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kurikint_map, AS_PROGRAM, 8 )
COMMON_BANKS_MAP
AM_RANGE(0x8000, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE_MEMBER(taitol_state, shared_ram)
@@ -839,7 +839,7 @@ static ADDRESS_MAP_START( kurikint_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa801, 0xa801) AM_WRITE(mux_ctrl_w) AM_READNOP // Watchdog or interrupt ack (value ignored)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kurikint_2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kurikint_2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(shared_r, shared_w)
@@ -856,7 +856,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( puzznic_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( puzznic_map, AS_PROGRAM, 8 )
COMMON_BANKS_MAP
COMMON_SINGLE_MAP
AM_RANGE(0xa800, 0xa800) AM_READNOP // Watchdog
@@ -867,7 +867,7 @@ static ADDRESS_MAP_START( puzznic_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* bootleg, doesn't have the MCU */
-static ADDRESS_MAP_START( puzznici_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( puzznici_map, AS_PROGRAM, 8 )
COMMON_BANKS_MAP
COMMON_SINGLE_MAP
AM_RANGE(0xa800, 0xa800) AM_READNOP // Watchdog
@@ -879,7 +879,7 @@ static ADDRESS_MAP_START( puzznici_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( plotting_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( plotting_map, AS_PROGRAM, 8 )
COMMON_BANKS_MAP
COMMON_SINGLE_MAP
AM_RANGE(0xa800, 0xa800) AM_WRITENOP // Watchdog or interrupt ack
@@ -887,7 +887,7 @@ static ADDRESS_MAP_START( plotting_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( palamed_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( palamed_map, AS_PROGRAM, 8 )
COMMON_BANKS_MAP
COMMON_SINGLE_MAP
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN0")
@@ -899,7 +899,7 @@ static ADDRESS_MAP_START( palamed_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cachat_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cachat_map, AS_PROGRAM, 8 )
COMMON_BANKS_MAP
COMMON_SINGLE_MAP
AM_RANGE(0xa800, 0xa800) AM_READ_PORT("IN0")
@@ -912,7 +912,7 @@ static ADDRESS_MAP_START( cachat_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( horshoes_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( horshoes_map, AS_PROGRAM, 8 )
COMMON_BANKS_MAP
COMMON_SINGLE_MAP
AM_RANGE(0xa800, 0xa800) AM_READ(horshoes_tracky_lo_r)
@@ -933,7 +933,7 @@ static WRITE8_HANDLER (evilston_snd_w)
device_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( evilston_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( evilston_map, AS_PROGRAM, 8 )
COMMON_BANKS_MAP
AM_RANGE(0x8000, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_BASE_MEMBER(taitol_state, shared_ram)
@@ -945,7 +945,7 @@ static ADDRESS_MAP_START( evilston_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xa807, 0xa807) AM_READ_PORT("IN2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( evilston_2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( evilston_2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xe7ff) AM_READWRITE(shared_r, shared_w)
@@ -2898,7 +2898,7 @@ static DRIVER_INIT( evilston )
{
UINT8 *ROM = machine->region("audiocpu")->base();
ROM[0x72] = 0x45; /* reti -> retn ('dead' loop @ $1104 )*/
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa7fe, 0xa7fe, 0, 0, evilston_snd_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa7fe, 0xa7fe, 0, 0, evilston_snd_w);
}
diff --git a/src/mame/drivers/taito_o.c b/src/mame/drivers/taito_o.c
index 68154ccf164..0e365b75552 100644
--- a/src/mame/drivers/taito_o.c
+++ b/src/mame/drivers/taito_o.c
@@ -61,7 +61,7 @@ static READ16_HANDLER(io_r)
return retval;
}
-static ADDRESS_MAP_START( parentj_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( parentj_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_MIRROR(0x010000) AM_RAM
AM_RANGE(0x200000, 0x20000f) AM_READWRITE(io_r, io_w) /* TC0220IOC ? */
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 7733773ee1f..3a68101f0a5 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -421,7 +421,7 @@ static WRITE8_HANDLER( sound_bankswitch_w )
/**************************************************************************/
-static ADDRESS_MAP_START( superman_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( superman_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x300000, 0x300001) AM_WRITENOP /* written each frame at $3a9c, mostly 0x10 */
AM_RANGE(0x400000, 0x400001) AM_WRITENOP /* written each frame at $3aa2, mostly 0x10 */
@@ -438,7 +438,7 @@ static ADDRESS_MAP_START( superman_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xf00000, 0xf03fff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( daisenpu_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( daisenpu_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
// AM_RANGE(0x400000, 0x400001) AM_WRITENOP /* written each frame at $2ac, values change */
AM_RANGE(0x500000, 0x50000f) AM_READ(superman_dsw_input_r)
@@ -452,7 +452,7 @@ static ADDRESS_MAP_START( daisenpu_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xf00000, 0xf03fff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gigandes_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( gigandes_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x400000, 0x400001) AM_WRITENOP /* 0x1 written each frame at $d42, watchdog? */
AM_RANGE(0x500000, 0x500007) AM_READ(superman_dsw_input_r)
@@ -466,7 +466,7 @@ static ADDRESS_MAP_START( gigandes_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xf00000, 0xf03fff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ballbros_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ballbros_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x400000, 0x400001) AM_WRITENOP /* 0x1 written each frame at $c56, watchdog? */
AM_RANGE(0x500000, 0x50000f) AM_READ(superman_dsw_input_r)
@@ -483,7 +483,7 @@ ADDRESS_MAP_END
/**************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2")
AM_RANGE(0xc000, 0xdfff) AM_RAM
@@ -497,7 +497,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf200, 0xf200) AM_WRITE(sound_bankswitch_w) /* bankswitch ? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( daisenpu_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( daisenpu_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank2")
AM_RANGE(0xc000, 0xdfff) AM_RAM
@@ -1324,7 +1324,7 @@ ROM_END
static DRIVER_INIT( kyustrkr )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x900000, 0x90000f, 0, 0, kyustrkr_input_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x900000, 0x90000f, 0, 0, kyustrkr_input_w);
}
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index 6b2743fa13b..2ef158875c3 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -1523,7 +1523,7 @@ static WRITE16_HANDLER( spacegun_pancontrol )
***********************************************************/
-static ADDRESS_MAP_START( contcirc_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( contcirc_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
AM_RANGE(0x084000, 0x087fff) AM_RAM AM_SHARE("share1")
@@ -1535,7 +1535,7 @@ static ADDRESS_MAP_START( contcirc_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x400000, 0x4006ff) AM_RAM AM_BASE_SIZE_MEMBER(taitoz_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( contcirc_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( contcirc_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
AM_RANGE(0x084000, 0x087fff) AM_RAM AM_SHARE("share1")
@@ -1545,7 +1545,7 @@ static ADDRESS_MAP_START( contcirc_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( chasehq_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( chasehq_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x107fff) AM_RAM
AM_RANGE(0x108000, 0x10bfff) AM_RAM AM_SHARE("share1")
@@ -1561,7 +1561,7 @@ static ADDRESS_MAP_START( chasehq_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe00000, 0xe003ff) AM_READWRITE(chasehq_motor_r, chasehq_motor_w) /* motor cpu */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( chq_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( chq_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x108000, 0x10bfff) AM_RAM AM_SHARE("share1")
@@ -1569,7 +1569,7 @@ static ADDRESS_MAP_START( chq_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( enforce_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( enforce_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM AM_SHARE("share1")
@@ -1581,7 +1581,7 @@ static ADDRESS_MAP_START( enforce_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x620000, 0x62000f) AM_DEVREADWRITE("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( enforce_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( enforce_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM AM_SHARE("share1")
@@ -1591,7 +1591,7 @@ static ADDRESS_MAP_START( enforce_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bshark_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bshark_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x110000, 0x113fff) AM_RAM AM_SHARE("share1")
@@ -1604,7 +1604,7 @@ static ADDRESS_MAP_START( bshark_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xd20000, 0xd2000f) AM_DEVREADWRITE("tc0100scn", tc0100scn_ctrl_word_r, tc0100scn_ctrl_word_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bshark_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bshark_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x108000, 0x10bfff) AM_RAM
AM_RANGE(0x110000, 0x113fff) AM_RAM AM_SHARE("share1")
@@ -1617,7 +1617,7 @@ static ADDRESS_MAP_START( bshark_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sci_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sci_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x107fff) AM_RAM
AM_RANGE(0x108000, 0x10bfff) AM_RAM AM_SHARE("share1")
@@ -1633,7 +1633,7 @@ static ADDRESS_MAP_START( sci_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc08000, 0xc08001) AM_READWRITE(sci_spriteframe_r, sci_spriteframe_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sci_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sci_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM
AM_RANGE(0x208000, 0x20bfff) AM_RAM AM_SHARE("share1")
@@ -1641,7 +1641,7 @@ static ADDRESS_MAP_START( sci_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nightstr_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( nightstr_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x110000, 0x113fff) AM_RAM AM_SHARE("share1")
@@ -1656,7 +1656,7 @@ static ADDRESS_MAP_START( nightstr_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe40000, 0xe40007) AM_READWRITE(nightstr_stick_r, bshark_stick_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nightstr_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( nightstr_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM AM_SHARE("share1")
@@ -1664,7 +1664,7 @@ static ADDRESS_MAP_START( nightstr_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aquajack_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( aquajack_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM AM_SHARE("share1")
@@ -1676,7 +1676,7 @@ static ADDRESS_MAP_START( aquajack_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc40000, 0xc403ff) AM_RAM AM_BASE_SIZE_MEMBER(taitoz_state, spriteram, spriteram_size)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aquajack_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( aquajack_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM AM_SHARE("share1")
@@ -1688,7 +1688,7 @@ static ADDRESS_MAP_START( aquajack_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spacegun_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( spacegun_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x30c000, 0x30ffff) AM_RAM
AM_RANGE(0x310000, 0x31ffff) AM_RAM AM_SHARE("share1")
@@ -1698,7 +1698,7 @@ static ADDRESS_MAP_START( spacegun_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb00007) AM_DEVREADWRITE("tc0110pcr", tc0110pcr_word_r, tc0110pcr_step1_rbswap_word_w) /* palette */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spacegun_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( spacegun_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x20c000, 0x20ffff) AM_RAM
AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_SHARE("share1")
@@ -1712,7 +1712,7 @@ static ADDRESS_MAP_START( spacegun_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dblaxle_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dblaxle_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x200000, 0x203fff) AM_RAM
AM_RANGE(0x210000, 0x21ffff) AM_RAM AM_SHARE("share1")
@@ -1728,7 +1728,7 @@ static ADDRESS_MAP_START( dblaxle_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xc08000, 0xc08001) AM_READWRITE(sci_spriteframe_r, sci_spriteframe_w) /* set in int6, seems to stay zero */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dblaxle_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dblaxle_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x110000, 0x11ffff) AM_RAM AM_SHARE("share1")
@@ -1737,7 +1737,7 @@ static ADDRESS_MAP_START( dblaxle_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( racingb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( racingb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x110000, 0x11ffff) AM_RAM AM_SHARE("share1")
@@ -1752,7 +1752,7 @@ static ADDRESS_MAP_START( racingb_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xb08000, 0xb08001) AM_READWRITE(sci_spriteframe_r, sci_spriteframe_w) /* alternates 0/0x100 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( racingb_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( racingb_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x400000, 0x403fff) AM_RAM
AM_RANGE(0x410000, 0x41ffff) AM_RAM AM_SHARE("share1")
@@ -1763,7 +1763,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10")
AM_RANGE(0xc000, 0xdfff) AM_RAM
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index 29b5bb66c7b..352a36d0a9b 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -364,7 +364,7 @@ static WRITE8_HANDLER( sound_bankswitch_w )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( airsys_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( airsys_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x0c0000, 0x0cffff) AM_RAM AM_BASE_MEMBER(taitoair_state, m68000_mainram)
AM_RANGE(0x140000, 0x140001) AM_WRITE(system_control_w) /* Pause the TMS32025 */
@@ -384,7 +384,7 @@ ADDRESS_MAP_END
/************************** Z80 ****************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM
@@ -399,16 +399,16 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/********************************** TMS32025 ********************************/
-static ADDRESS_MAP_START( DSP_map_program, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( DSP_map_program, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( DSP_map_data, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( DSP_map_data, AS_DATA, 16 )
AM_RANGE(0x4000, 0x7fff) AM_READWRITE(lineram_r, lineram_w)
AM_RANGE(0x8000, 0xffff) AM_READWRITE(dspram_r, dspram_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( DSP_map_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( DSP_map_io, AS_IO, 16 )
AM_RANGE(TMS32025_HOLD, TMS32025_HOLD) AM_READ(dsp_HOLD_signal_r)
AM_RANGE(TMS32025_HOLDA, TMS32025_HOLDA) AM_WRITE(dsp_HOLDA_signal_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c
index c73c0e8e56f..ae44124432b 100644
--- a/src/mame/drivers/taitogn.c
+++ b/src/mame/drivers/taitogn.c
@@ -564,7 +564,7 @@ static WRITE32_HANDLER(flash_s3_w)
static void install_handlers(running_machine *machine, int mode)
{
- address_space *a = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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
memory_install_readwrite32_handler(a, 0x1f000000, 0x1f1fffff, 0, 0, flash_subbios_r, flash_subbios_w);
@@ -894,7 +894,7 @@ static DRIVER_INIT( coh3002t )
static DRIVER_INIT( coh3002t_mp )
{
DRIVER_INIT_CALL(coh3002t);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fa10100, 0x1fa10103, 0, 0, gnet_mahjong_panel_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fa10100, 0x1fa10103, 0, 0, gnet_mahjong_panel_r );
}
static MACHINE_RESET( coh3002t )
@@ -913,7 +913,7 @@ static MACHINE_RESET( coh3002t )
cputag_set_input_line(machine, "mn10200",INPUT_LINE_RESET,ASSERT_LINE); /* MCU */
}
-static ADDRESS_MAP_START( zn_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( zn_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_SHARE("share1") /* ram */
AM_RANGE(0x00400000, 0x007fffff) AM_RAM AM_SHARE("share1") /* ram mirror */
AM_RANGE(0x1f000000, 0x1f1fffff) AM_READWRITE(flash_s1_r, flash_s1_w)
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index 2121a8dbbe2..8711ab6278e 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -795,7 +795,7 @@ static WRITE32_HANDLER(jc_output_w)
//mame_printf_debug("jc_output_w: %d, %d\n", offset, (data >> 16) & 0xffff);
}
-static ADDRESS_MAP_START( taitojc_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( taitojc_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_ROM AM_MIRROR(0x200000)
AM_RANGE(0x00400000, 0x01bfffff) AM_ROM AM_REGION("gfx1", 0)
AM_RANGE(0x04000000, 0x040f7fff) AM_RAM AM_BASE_MEMBER(taitojc_state,vram)
@@ -858,12 +858,12 @@ static READ8_HANDLER(hc11_analog_r)
}
-static ADDRESS_MAP_START( hc11_pgm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hc11_pgm_map, AS_PROGRAM, 8 )
AM_RANGE(0x4000, 0x5fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("user1", 0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hc11_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hc11_io_map, AS_IO, 8 )
AM_RANGE(MC68HC11_IO_PORTA, MC68HC11_IO_PORTA ) AM_NOP
AM_RANGE(MC68HC11_IO_PORTG, MC68HC11_IO_PORTG ) AM_READWRITE(hc11_comm_r, hc11_comm_w)
AM_RANGE(MC68HC11_IO_PORTH, MC68HC11_IO_PORTH ) AM_NOP
@@ -1048,11 +1048,11 @@ static READ16_HANDLER(dsp_intersection_r)
0x7030: Unknown write
*/
-static ADDRESS_MAP_START( tms_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tms_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x4000, 0x7fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tms_data_map, ADDRESS_SPACE_DATA, 16 )
+static ADDRESS_MAP_START( tms_data_map, AS_DATA, 16 )
//AM_RANGE(0x1400, 0x1401) AM_RAM
AM_RANGE(0x6a01, 0x6a02) AM_WRITE(dsp_unk2_w)
AM_RANGE(0x6a11, 0x6a12) AM_NOP // same as 0x6a01..02 for the second renderer chip?
diff --git a/src/mame/drivers/taitopjc.c b/src/mame/drivers/taitopjc.c
index 9bda0cd43a0..96038449f11 100644
--- a/src/mame/drivers/taitopjc.c
+++ b/src/mame/drivers/taitopjc.c
@@ -77,7 +77,7 @@ static SCREEN_UPDATE( taitopjc )
return 0;
}
-static ADDRESS_MAP_START( ppc603e_mem, ADDRESS_SPACE_PROGRAM, 64)
+static ADDRESS_MAP_START( ppc603e_mem, AS_PROGRAM, 64)
AM_RANGE(0x00000000, 0x003fffff) AM_RAM // Work RAM
AM_RANGE(0x40000000, 0x40000007) AM_RAM // Screen RAM (+ others?) data port
AM_RANGE(0x40000008, 0x4000000f) AM_RAM // Screen RAM (+ others?) address port
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index c6ffe8a4fa1..3c2916b6c8f 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -198,7 +198,7 @@ static CUSTOM_INPUT( input_port_4_f0_r )
}
-static ADDRESS_MAP_START( taitosj_main_nomcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( taitosj_main_nomcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x87ff) AM_RAM
@@ -238,7 +238,7 @@ ADDRESS_MAP_END
/* only difference is taitosj_fake_ replaced with taitosj_mcu_ */
-static ADDRESS_MAP_START( taitosj_main_mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( taitosj_main_mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x87ff) AM_RAM
@@ -301,7 +301,7 @@ static CUSTOM_INPUT( kikstart_gear_r )
}
-static ADDRESS_MAP_START( kikstart_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kikstart_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x87ff) AM_RAM
@@ -340,7 +340,7 @@ static ADDRESS_MAP_START( kikstart_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( taitosj_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( taitosj_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x4800, 0x4801) AM_DEVWRITE("ay2", ay8910_address_data_w)
@@ -354,7 +354,7 @@ static ADDRESS_MAP_START( taitosj_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( taitosj_mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( taitosj_mcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(taitosj_68705_portA_r, taitosj_68705_portA_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(taitosj_68705_portB_r, taitosj_68705_portB_w)
@@ -2742,7 +2742,7 @@ static DRIVER_INIT( spacecr )
init_common(machine);
/* install protection handler */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd48b, 0xd48b, 0, 0, spacecr_prot_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd48b, 0xd48b, 0, 0, spacecr_prot_r);
}
static DRIVER_INIT( alpine )
@@ -2750,8 +2750,8 @@ static DRIVER_INIT( alpine )
init_common(machine);
/* install protection handlers */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd40b, 0xd40b, 0, 0, alpine_port_2_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd50f, 0xd50f, 0, 0, alpine_protection_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd40b, 0xd40b, 0, 0, alpine_port_2_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd50f, 0xd50f, 0, 0, alpine_protection_w);
}
static DRIVER_INIT( alpinea )
@@ -2759,8 +2759,8 @@ static DRIVER_INIT( alpinea )
init_common(machine);
/* install protection handlers */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd40b, 0xd40b, 0, 0, alpine_port_2_r);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd50e, 0xd50e, 0, 0, alpinea_bankswitch_w);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd40b, 0xd40b, 0, 0, alpine_port_2_r);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd50e, 0xd50e, 0, 0, alpinea_bankswitch_w);
}
static DRIVER_INIT( junglhbr )
@@ -2768,7 +2768,7 @@ static DRIVER_INIT( junglhbr )
init_common(machine);
/* inverter on bits 0 and 1 */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x9000, 0xbfff, 0, 0, junglhbr_characterram_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x9000, 0xbfff, 0, 0, junglhbr_characterram_w);
}
GAME( 1981, spaceskr, 0, nomcu, spaceskr, taitosj, ROT0, "Taito Corporation", "Space Seeker", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/taitotz.c b/src/mame/drivers/taitotz.c
index 0fc0224e057..d1331cb9a76 100644
--- a/src/mame/drivers/taitotz.c
+++ b/src/mame/drivers/taitotz.c
@@ -90,7 +90,7 @@ static SCREEN_UPDATE( taitotz )
return 0;
}
-static ADDRESS_MAP_START( ppc603e_mem, ADDRESS_SPACE_PROGRAM, 64)
+static ADDRESS_MAP_START( ppc603e_mem, AS_PROGRAM, 64)
AM_RANGE(0x00000000, 0x00000007) AM_RAM // Register/RAM access port? - Written 128k+256k times on boot
AM_RANGE(0x00000008, 0x0000000f) AM_RAM // Register/RAM address port?
AM_RANGE(0x40000000, 0x400fffff) AM_RAM // Work RAM
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index 1182f8aa1af..8ad2c26e21d 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -471,7 +471,7 @@ static WRITE32_HANDLER(at_page32_w)
/*****************************************************************************/
-static ADDRESS_MAP_START( taitowlf_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( taitowlf_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0x000a0000, 0x000affff) AM_RAM
AM_RANGE(0x000b0000, 0x000b7fff) AM_RAM AM_BASE_MEMBER(taitowlf_state, cga_ram)
@@ -482,7 +482,7 @@ static ADDRESS_MAP_START( taitowlf_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfffc0000, 0xffffffff) AM_ROM AM_REGION("user1", 0) /* System BIOS */
ADDRESS_MAP_END
-static ADDRESS_MAP_START(taitowlf_io, ADDRESS_SPACE_IO, 32)
+static ADDRESS_MAP_START(taitowlf_io, AS_IO, 32)
AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8("dma8237_1", i8237_r, i8237_w, 0xffffffff)
AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_1", pic8259_r, pic8259_w, 0xffffffff)
AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8("pit8254", pit8253_r, pit8253_w, 0xffffffff)
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index 0c8ee95cb11..2e60c25bb77 100644
--- a/src/mame/drivers/tank8.c
+++ b/src/mame/drivers/tank8.c
@@ -96,7 +96,7 @@ static WRITE8_DEVICE_HANDLER( tank8_motor_w )
discrete_sound_w(device, NODE_RELATIVE(TANK8_MOTOR1_EN, offset), data);
}
-static ADDRESS_MAP_START( tank8_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tank8_cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM
AM_RANGE(0x0400, 0x17ff) AM_ROM
AM_RANGE(0xf800, 0xffff) AM_ROM
diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c
index 804f33db658..687ac3448c7 100644
--- a/src/mame/drivers/tankbatt.c
+++ b/src/mame/drivers/tankbatt.c
@@ -161,7 +161,7 @@ static WRITE8_HANDLER( tankbatt_coin_lockout_w )
coin_lockout_w(space->machine, 1,data & 1);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x000f) AM_RAM AM_BASE_MEMBER(tankbatt_state, bulletsram) AM_SIZE_MEMBER(tankbatt_state, bulletsram_size)
AM_RANGE(0x0010, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x07ff) AM_RAM
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index 55c3bd34eb4..82099010c13 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -179,7 +179,7 @@ static READ8_HANDLER( some_changing_input )
return state->variable_data;
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x9fff) AM_ROMBANK("bank1")
AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank2")
@@ -198,7 +198,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
//AM_RANGE(0xf800, 0xffff) AM_READ(read_from_unmapped_memory) /* a bug in game code ? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( port_map_cpu2, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map_cpu2, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x10) AM_DEVWRITE("ay2", ay8910_data_w)
AM_RANGE(0x30, 0x30) AM_DEVREADWRITE("ay2", ay8910_r, ay8910_address_w)
@@ -207,7 +207,7 @@ static ADDRESS_MAP_START( port_map_cpu2, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( map_cpu2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( map_cpu2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x3fff) AM_WRITENOP /* garbage, written in initialization loop */
//0x4000 and 0x4040-0x4045 seem to be used (referenced in the code)
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 32b33bf16c6..45ca2b3e6ca 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -89,7 +89,7 @@ static WRITE16_HANDLER( sound_command_w )
cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
}
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(taotaido_bgvideoram_w) AM_BASE_MEMBER(taotaido_state, bgram) // bg ram?
AM_RANGE(0xa00000, 0xa01fff) AM_RAM AM_BASE_MEMBER(taotaido_state, spriteram) // sprite ram
@@ -131,13 +131,13 @@ static WRITE8_HANDLER( taotaido_sh_bankswitch_w )
memory_set_bankptr(space->machine, "bank1",rom + (data & 0x03) * 0x8000);
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w)
AM_RANGE(0x04, 0x04) AM_WRITE(taotaido_sh_bankswitch_w)
diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c
index c1ab8efc640..d5c94209d2c 100644
--- a/src/mame/drivers/targeth.c
+++ b/src/mame/drivers/targeth.c
@@ -59,7 +59,7 @@ static WRITE16_HANDLER( targeth_coin_counter_w )
coin_counter_w( space->machine, (offset >> 3) & 0x01, data & 0x01);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(targeth_vram_w) AM_BASE_MEMBER(targeth_state, videoram) /* Video RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE_MEMBER(targeth_state, vregs) /* Video Registers */
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 2c188cc0432..50b3a3107f5 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -211,7 +211,7 @@ static WRITE16_HANDLER(cyclwarr_sound_w)
/***************************************************************************/
-static ADDRESS_MAP_START( apache3_v30_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( apache3_v30_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x03fff) AM_RAM
AM_RANGE(0x04000, 0x07fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x08000, 0x08fff) AM_RAM_WRITE(apache3_palette_w) AM_BASE_GENERIC(paletteram)
@@ -225,7 +225,7 @@ static ADDRESS_MAP_START( apache3_v30_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xa0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( apache3_68000_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( apache3_68000_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0x80000, 0x83fff) AM_RAM AM_BASE_MEMBER(tatsumi_state, _68k_ram)
AM_RANGE(0x90000, 0x93fff) AM_RAM AM_BASE_MEMBER(tatsumi_state, spriteram)
@@ -237,7 +237,7 @@ static ADDRESS_MAP_START( apache3_68000_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe0000, 0xe7fff) AM_READWRITE(apache3_z80_r, apache3_z80_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( apache3_v20_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( apache3_v20_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x01fff) AM_RAM
AM_RANGE(0x04000, 0x04003) AM_NOP // piu select .. ?
AM_RANGE(0x06000, 0x06001) AM_READ_PORT("IN0") // esw
@@ -247,14 +247,14 @@ static ADDRESS_MAP_START( apache3_v20_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( apache3_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( apache3_z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_MEMBER(tatsumi_state, apache3_z80_ram)
AM_RANGE(0x8000, 0xffff) AM_WRITE(apache3_road_x_w)
ADDRESS_MAP_END
/*****************************************************************/
-static ADDRESS_MAP_START( roundup5_v30_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( roundup5_v30_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x07fff) AM_RAM
AM_RANGE(0x08000, 0x0bfff) AM_RAM_WRITE(roundup5_text_w) AM_BASE_MEMBER(tatsumi_state, videoram)
AM_RANGE(0x0c000, 0x0c003) AM_WRITE(roundup5_crt_w)
@@ -270,7 +270,7 @@ static ADDRESS_MAP_START( roundup5_v30_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x80000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( roundup5_68000_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( roundup5_68000_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x7ffff) AM_ROM
AM_RANGE(0x80000, 0x83fff) AM_RAM AM_BASE_MEMBER(tatsumi_state, _68k_ram)
AM_RANGE(0x90000, 0x93fff) AM_RAM AM_BASE_MEMBER(tatsumi_state, spriteram)
@@ -282,7 +282,7 @@ static ADDRESS_MAP_START( roundup5_68000_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe0000, 0xe0001) AM_WRITE(roundup5_e0000_w) AM_BASE_MEMBER(tatsumi_state, roundup5_e0000_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( roundup5_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( roundup5_z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xffef) AM_RAM
AM_RANGE(0xfff0, 0xfff1) AM_DEVREADWRITE("ymsnd", tatsumi_hack_ym2151_r, ym2151_w)
@@ -296,7 +296,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( cyclwarr_68000a_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cyclwarr_68000a_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_BASE_MEMBER(tatsumi_state, cyclwarr_cpua_ram)
AM_RANGE(0x03e000, 0x03efff) AM_RAM
AM_RANGE(0x040000, 0x043fff) AM_READWRITE(cyclwarr_cpu_bb_r, cyclwarr_cpu_bb_w)
@@ -318,7 +318,7 @@ static ADDRESS_MAP_START( cyclwarr_68000a_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x2c0000, 0x33ffff) AM_ROMBANK("bank1") /* CPU A ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cyclwarr_68000b_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cyclwarr_68000b_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_BASE_MEMBER(tatsumi_state, cyclwarr_cpub_ram)
AM_RANGE(0x080000, 0x08ffff) AM_READWRITE(cyclwarr_videoram1_r, cyclwarr_videoram1_w)
@@ -339,7 +339,7 @@ static ADDRESS_MAP_START( cyclwarr_68000b_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x2c0000, 0x33ffff) AM_ROMBANK("bank1") /* CPU A ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cyclwarr_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cyclwarr_z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xffef) AM_RAM
AM_RANGE(0xfff0, 0xfff1) AM_DEVREADWRITE("ymsnd", tatsumi_hack_ym2151_r, ym2151_w)
@@ -350,7 +350,7 @@ ADDRESS_MAP_END
/******************************************************************************/
-static ADDRESS_MAP_START( bigfight_68000a_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bigfight_68000a_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_BASE_MEMBER(tatsumi_state, cyclwarr_cpua_ram)
AM_RANGE(0x03e000, 0x03efff) AM_RAM
@@ -374,7 +374,7 @@ static ADDRESS_MAP_START( bigfight_68000a_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x200000, 0x27ffff) AM_ROMBANK("bank1") /* CPU B ROM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bigfight_68000b_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bigfight_68000b_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_BASE_MEMBER(tatsumi_state, cyclwarr_cpub_ram)
AM_RANGE(0x080000, 0x08ffff) AM_READWRITE(cyclwarr_videoram1_r, cyclwarr_videoram1_w)
AM_RANGE(0x090000, 0x09ffff) AM_READWRITE(cyclwarr_videoram0_r, cyclwarr_videoram0_w)
diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c
index a94e0e07a5c..d04208e4baa 100644
--- a/src/mame/drivers/tattack.c
+++ b/src/mame/drivers/tattack.c
@@ -67,7 +67,7 @@ static VIDEO_START( tattack )
state->tmap = tilemap_create( machine, get_tile_info,tilemap_scan_rows,8,8,32,32 );
}
-static ADDRESS_MAP_START( mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
// AM_RANGE(0x4000, 0x4000) AM_READNOP $315
AM_RANGE(0x5000, 0x53ff) AM_RAM AM_BASE_MEMBER(tattack_state, videoram)
diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c
index a5a54c22ad2..7279ec70301 100644
--- a/src/mame/drivers/taxidrvr.c
+++ b/src/mame/drivers/taxidrvr.c
@@ -146,7 +146,7 @@ static const ppi8255_interface ppi8255_intf[5] =
};
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM /* ??? */
AM_RANGE(0x9000, 0x9fff) AM_RAM /* ??? */
@@ -170,7 +170,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM
AM_RANGE(0x8000, 0x87ff) AM_RAM
@@ -182,13 +182,13 @@ static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe004, 0xe004) AM_READ_PORT("P2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu3_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu3_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x2000) AM_READNOP /* irq ack? */
AM_RANGE(0xfc00, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu3_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu3_port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x01, 0x01) AM_DEVREAD("ay1", ay8910_r)
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index a76580c5b67..5be037de665 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -87,7 +87,7 @@ static WRITE8_HANDLER( tbowl_sound_command_w )
/* Board B */
-static ADDRESS_MAP_START( 6206B_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( 6206B_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM
AM_RANGE(0xa000, 0xbfff) AM_RAM_WRITE(tbowl_bg2videoram_w) AM_BASE_MEMBER(tbowl_state, bg2videoram)
@@ -128,7 +128,7 @@ static WRITE8_HANDLER ( tbowl_trigger_nmi )
cputag_set_input_line(space->machine, "maincpu", INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( 6206C_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( 6206C_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_READONLY
AM_RANGE(0xc000, 0xd7ff) AM_WRITEONLY
@@ -186,7 +186,7 @@ static void tbowl_adpcm_int(device_t *device)
}
}
-static ADDRESS_MAP_START( 6206A_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( 6206A_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xd000, 0xd001) AM_DEVWRITE("ym1", ym3812_w)
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 6df7e87aadc..0c28ec59f78 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -163,7 +163,7 @@ static READ8_HANDLER( readFF )
/*******************************************************************/
-static ADDRESS_MAP_START( m6809_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m6809_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_RAM
AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(tceptor_tile_ram_w) AM_BASE_MEMBER(tceptor_state, tile_ram)
AM_RANGE(0x1c00, 0x1fff) AM_RAM_WRITE(tceptor_tile_attr_w) AM_BASE_MEMBER(tceptor_state, tile_attr)
@@ -183,7 +183,7 @@ static ADDRESS_MAP_START( m6809_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m6502_a_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m6502_a_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_SHARE("share2")
AM_RANGE(0x0100, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x02ff) AM_RAM
@@ -195,7 +195,7 @@ static ADDRESS_MAP_START( m6502_a_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m6502_b_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m6502_b_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_SHARE("share2")
AM_RANGE(0x0100, 0x01ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_DEVWRITE("dac", voice_w) // voice data
@@ -204,7 +204,7 @@ static ADDRESS_MAP_START( m6502_b_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m68k_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( m68k_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM // M68K ERROR 1
AM_RANGE(0x100000, 0x10ffff) AM_ROM // not sure
AM_RANGE(0x200000, 0x203fff) AM_RAM // M68K ERROR 0
@@ -216,7 +216,7 @@ static ADDRESS_MAP_START( m68k_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x001f) AM_READWRITE(m6801_io_r, m6801_io_w)
AM_RANGE(0x0080, 0x00ff) AM_RAM
AM_RANGE(0x1000, 0x13ff) AM_DEVREADWRITE("namco", namcos1_cus30_r, namcos1_cus30_w)
@@ -236,7 +236,7 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( mcu_io_map, AS_IO, 8 )
AM_RANGE(M6801_PORT1, M6801_PORT1) AM_READ(readFF) AM_WRITENOP
AM_RANGE(M6801_PORT2, M6801_PORT2) AM_READ(readFF) AM_WRITENOP
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c
index 270f7d00547..30c00ecb8ad 100644
--- a/src/mame/drivers/tcl.c
+++ b/src/mame/drivers/tcl.c
@@ -63,7 +63,7 @@ static SCREEN_UPDATE( tcl )
return 0;
}
-static ADDRESS_MAP_START( tcl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tcl_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* bfff ? */
ADDRESS_MAP_END
@@ -189,7 +189,7 @@ static DRIVER_INIT(tcl)
{
/* only the first part is decrypted (and verified)*/
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *dest = machine->region("maincpu")->base();
int len = machine->region("maincpu")->bytes();
UINT8 *src = auto_alloc_array(machine, UINT8, len);
diff --git a/src/mame/drivers/techno.c b/src/mame/drivers/techno.c
index 70d295bc318..8ea1fe2022c 100644
--- a/src/mame/drivers/techno.c
+++ b/src/mame/drivers/techno.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( techno_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( techno_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index 1eb3b644803..1f70c2b1364 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -133,7 +133,7 @@ static READ8_HANDLER( tecmo_dswb_h_r )
}
-static ADDRESS_MAP_START( rygar_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rygar_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(tecmo_txvideoram_w) AM_BASE_MEMBER(tecmo_state, txvideoram)
@@ -161,7 +161,7 @@ static ADDRESS_MAP_START( rygar_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf80b, 0xf80b) AM_WRITE(watchdog_reset_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( gemini_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( gemini_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd7ff) AM_RAM_WRITE(tecmo_txvideoram_w) AM_BASE_MEMBER(tecmo_state, txvideoram)
@@ -189,7 +189,7 @@ static ADDRESS_MAP_START( gemini_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf80b, 0xf80b) AM_WRITE(watchdog_reset_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( silkworm_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( silkworm_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc3ff) AM_RAM_WRITE(tecmo_bgvideoram_w) AM_BASE_MEMBER(tecmo_state, bgvideoram)
AM_RANGE(0xc400, 0xc7ff) AM_RAM_WRITE(tecmo_fgvideoram_w) AM_BASE_MEMBER(tecmo_state, fgvideoram)
@@ -218,7 +218,7 @@ static ADDRESS_MAP_START( silkworm_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf80b, 0xf80b) AM_WRITENOP /* ? if mapped to watchdog like in the others, causes reset */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rygar_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rygar_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x8000, 0x8001) AM_DEVWRITE("ymsnd", ym3812_w)
@@ -228,7 +228,7 @@ static ADDRESS_MAP_START( rygar_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf000) AM_WRITENOP /* NMI acknowledge */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tecmo_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tecmo_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x2000, 0x207f) AM_RAM /* Silkworm set #2 has a custom CPU which */
/* writes code to this area */
AM_RANGE(0x0000, 0x7fff) AM_ROM
@@ -1178,9 +1178,9 @@ static DRIVER_INIT( backfirt )
state->video_type = 2;
/* no MSM */
- memory_nop_write(machine->device("soundcpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xc000, 0, 0);
- memory_nop_write(machine->device("soundcpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd000, 0xd000, 0, 0);
- memory_nop_write(machine->device("soundcpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe000, 0xe000, 0, 0);
+ memory_nop_write(machine->device("soundcpu")->memory().space(AS_PROGRAM), 0xc000, 0xc000, 0, 0);
+ memory_nop_write(machine->device("soundcpu")->memory().space(AS_PROGRAM), 0xd000, 0xd000, 0, 0);
+ memory_nop_write(machine->device("soundcpu")->memory().space(AS_PROGRAM), 0xe000, 0xe000, 0, 0);
}
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index aa296b98e86..47e7189dbeb 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -43,7 +43,7 @@ static WRITE16_HANDLER( tecmo16_sound_command_w )
/******************************************************************************/
-static ADDRESS_MAP_START( fstarfrc_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fstarfrc_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* Main RAM */
AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE(tecmo16_charram_w) AM_BASE_MEMBER(tecmo16_state, charram)
@@ -66,7 +66,7 @@ static ADDRESS_MAP_START( fstarfrc_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x16001e, 0x16001f) AM_WRITE(tecmo16_scroll2_y_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ginkun_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ginkun_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* Main RAM */
AM_RANGE(0x110000, 0x110fff) AM_RAM_WRITE(tecmo16_charram_w) AM_BASE_MEMBER(tecmo16_state, charram)
@@ -91,7 +91,7 @@ static ADDRESS_MAP_START( ginkun_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x16001e, 0x16001f) AM_WRITE(tecmo16_scroll2_y_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xfbff) AM_RAM /* Sound RAM */
AM_RANGE(0xfc00, 0xfc00) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index 82621069d6c..1a8317f9ae2 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -395,7 +395,7 @@ static WRITE16_HANDLER( bg2_tilemap_lineram_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM // work ram
AM_RANGE(0x210000, 0x210001) AM_READNOP // single byte overflow on stack defined as 0x210000
@@ -525,13 +525,13 @@ static WRITE8_HANDLER( tecmosys_oki_bank_w )
memcpy( region+0x20000, region+0x80000 + upperbank * 0x20000, 0x20000 );
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xf7ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ymf", ymf262_r, ymf262_w)
AM_RANGE(0x10, 0x10) AM_DEVWRITE_MODERN("oki", okim6295_device, write)
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index 92b638d07f9..2bfcd9a81b3 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -217,7 +217,7 @@ static void tehkanwc_adpcm_int(device_t *device)
-static ADDRESS_MAP_START( main_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
@@ -243,7 +243,7 @@ static ADDRESS_MAP_START( main_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf870, 0xf870) AM_READ_PORT("DSW3") AM_WRITE(tehkanwc_flipscreen_y_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xcfff) AM_RAM AM_SHARE("share1")
@@ -258,7 +258,7 @@ static ADDRESS_MAP_START( sub_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf860, 0xf860) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x8001, 0x8001) AM_DEVWRITE("msm", msm_reset_w)/* MSM51xx reset */
@@ -267,7 +267,7 @@ static ADDRESS_MAP_START( sound_mem, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xc000) AM_READWRITE(soundlatch_r, sound_answer_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_port, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_port, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREAD("ay1", ay8910_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_data_address_w)
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index f76f1d9c224..b13ca9bf960 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -398,7 +398,7 @@ static WRITE8_HANDLER( tempest_coin_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x080f) AM_WRITEONLY AM_BASE(&avgdvg_colorram)
AM_RANGE(0x0c00, 0x0c00) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index 6892dd20be3..19977a67a86 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -197,7 +197,7 @@ static MACHINE_START( amazon )
state_save_register_global_array(machine, state->mAmazonProtReg);
}
-static ADDRESS_MAP_START( terracre_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( terracre_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x020000, 0x0201ff) AM_RAM AM_BASE_MEMBER(terracre_state, spriteram)
AM_RANGE(0x020200, 0x021fff) AM_RAM
@@ -214,7 +214,7 @@ static ADDRESS_MAP_START( terracre_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x028000, 0x0287ff) AM_WRITE(amazon_foreground_w) AM_BASE_MEMBER(terracre_state, videoram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( amazon_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( amazon_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x040000, 0x0401ff) AM_RAM AM_BASE_MEMBER(terracre_state, spriteram)
AM_RANGE(0x040200, 0x040fff) AM_RAM
@@ -231,12 +231,12 @@ static ADDRESS_MAP_START( amazon_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x070000, 0x070003) AM_READWRITE(amazon_protection_r, amazon_protection_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_3526_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_3526_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym3526_w)
AM_RANGE(0x02, 0x02) AM_DEVWRITE("dac1", dac_signed_w)
@@ -245,7 +245,7 @@ static ADDRESS_MAP_START( sound_3526_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x06, 0x06) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_2203_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_2203_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ym1", ym2203_w)
AM_RANGE(0x02, 0x02) AM_DEVWRITE("dac1", dac_signed_w)
@@ -1030,7 +1030,7 @@ static DRIVER_INIT( horekid )
{
terracre_state *state = machine->driver_data<terracre_state>();
state->mpProtData = mHoreKidProtData;
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x44004, 0x44005, 0, 0, horekid_IN2_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x44004, 0x44005, 0, 0, horekid_IN2_r);
}
/* YEAR, NAME, PARENT, MACHINE, INPUT, INIT, MONITOR, COMPANY, FULLNAME, FLAGS */
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 3674af42a8b..68c9c008f23 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -294,7 +294,7 @@ static WRITE16_HANDLER( tetrisp2_coincounter_w )
***************************************************************************/
-static ADDRESS_MAP_START( tetrisp2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tetrisp2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
@@ -351,7 +351,7 @@ static WRITE16_HANDLER( nndmseal_b20000_w )
// popmessage("%04x",data);
}
-static ADDRESS_MAP_START( nndmseal_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( nndmseal_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
@@ -397,7 +397,7 @@ static ADDRESS_MAP_START( nndmseal_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rockn1_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rockn1_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
@@ -431,7 +431,7 @@ static ADDRESS_MAP_START( rockn1_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rockn2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rockn2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
@@ -465,7 +465,7 @@ static ADDRESS_MAP_START( rockn2_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rocknms_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rocknms_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
@@ -500,7 +500,7 @@ static ADDRESS_MAP_START( rocknms_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rocknms_sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rocknms_sub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram2) // Object RAM
AM_RANGE(0x104000, 0x107fff) AM_RAM // Spare Object RAM
diff --git a/src/mame/drivers/tgtpanic.c b/src/mame/drivers/tgtpanic.c
index 8f031ec6a64..61ff1ca9160 100644
--- a/src/mame/drivers/tgtpanic.c
+++ b/src/mame/drivers/tgtpanic.c
@@ -80,12 +80,12 @@ static WRITE8_HANDLER( color_w )
*
*************************************/
-static ADDRESS_MAP_START( prg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( prg_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE_MEMBER(tgtpanic_state, ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(color_w)
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1")
diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c
index 8cea8c0e2eb..599ccf49746 100644
--- a/src/mame/drivers/thayers.c
+++ b/src/mame/drivers/thayers.c
@@ -578,13 +578,13 @@ static READ8_HANDLER( ssi263_register_r )
/* Memory Maps */
-static ADDRESS_MAP_START( thayers_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( thayers_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAM
AM_RANGE(0xc000, 0xdfff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( thayers_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( thayers_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x07) AM_READWRITE(ssi263_register_r, ssi263_register_w)
AM_RANGE(0x20, 0x20) AM_WRITE(control_w)
@@ -602,7 +602,7 @@ static ADDRESS_MAP_START( thayers_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xf7, 0xf7) AM_WRITE(den2_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( thayers_cop_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( thayers_cop_io_map, AS_IO, 8 )
AM_RANGE(COP400_PORT_L, COP400_PORT_L) AM_READWRITE(cop_l_r, cop_l_w)
AM_RANGE(COP400_PORT_G, COP400_PORT_G) AM_READWRITE(cop_g_r, cop_g_w)
AM_RANGE(COP400_PORT_D, COP400_PORT_D) AM_WRITE(cop_d_w)
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index 33d889b6b2d..28a91210cf6 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -150,7 +150,7 @@ static WRITE8_HANDLER( thedeep_e100_w )
logerror("pc %04x: e100 = %02x\n", cpu_get_pc(space->cpu),data);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // ROM (banked)
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -178,7 +178,7 @@ ADDRESS_MAP_END
***************************************************************************/
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x0801) AM_DEVWRITE("ymsnd", ym2203_w ) //
AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r ) // From Main CPU
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index 7c407f3451b..27b5508ef99 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -147,7 +147,7 @@ static WRITE8_HANDLER( thepit_sound_enable_w )
}
-static ADDRESS_MAP_START( thepit_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( thepit_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x4fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8bff) AM_MIRROR(0x0400) AM_RAM_WRITE(thepit_colorram_w) AM_BASE_MEMBER(thepit_state, colorram)
@@ -167,7 +167,7 @@ static ADDRESS_MAP_START( thepit_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xb800) AM_READWRITE(watchdog_reset_r, soundlatch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( intrepid_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( intrepid_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8c00, 0x8fff) AM_READWRITE(thepit_colorram_r, thepit_colorram_w) /* mirror for intrepi2 */
@@ -190,13 +190,13 @@ static ADDRESS_MAP_START( intrepid_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x3800, 0x3bff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( audio_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(soundlatch_clear_w)
AM_RANGE(0x8c, 0x8d) AM_DEVWRITE("ay2", ay8910_address_data_w)
@@ -1064,7 +1064,7 @@ static READ8_HANDLER( rtriv_question_r )
static DRIVER_INIT( rtriv )
{
// Set-up the weirdest questions read ever done
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x4fff, 0, 0, rtriv_question_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x4fff, 0, 0, rtriv_question_r);
}
diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c
index 6a26c48d800..40c72dbcefa 100644
--- a/src/mame/drivers/thief.c
+++ b/src/mame/drivers/thief.c
@@ -151,13 +151,13 @@ static READ8_HANDLER( thief_io_r )
return 0x00;
}
-static ADDRESS_MAP_START( sharkatt_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sharkatt_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM /* 2114 */
AM_RANGE(0xc000, 0xdfff) AM_READWRITE(thief_videoram_r, thief_videoram_w) /* 4116 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( thief_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( thief_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_WRITE(thief_blit_w)
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM /* 2114 */
@@ -170,7 +170,7 @@ static ADDRESS_MAP_START( thief_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP /* watchdog */
AM_RANGE(0x10, 0x10) AM_WRITE(thief_video_control_w)
diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c
index 65569323b15..fa04fc6e1d5 100644
--- a/src/mame/drivers/thoop2.c
+++ b/src/mame/drivers/thoop2.c
@@ -84,7 +84,7 @@ static READ16_HANDLER( DS5002FP_R )
return 0x55aa;
}
-static ADDRESS_MAP_START( thoop2_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( thoop2_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(thoop2_vram_w) AM_BASE_MEMBER(thoop2_state, videoram) /* Video RAM */
AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE_MEMBER(thoop2_state, vregs) /* Video Registers */
diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c
index e3be619faaf..c58ed89375f 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.c
@@ -150,7 +150,7 @@ static WRITE16_HANDLER( thunderj_atarivc_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x09ffff) AM_ROM
AM_RANGE(0x0e0000, 0x0e0fff) AM_READWRITE(atarigen_eeprom_r, atarigen_eeprom_w) AM_SHARE("eeprom")
AM_RANGE(0x160000, 0x16ffff) AM_RAM AM_SHARE("share1")
@@ -183,7 +183,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( extra_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( extra_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x060000, 0x07ffff) AM_ROM
AM_RANGE(0x160000, 0x16ffff) AM_RAM AM_SHARE("share1")
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index f87b4cd2c15..ccb7f82fcc8 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -406,7 +406,7 @@ static WRITE8_HANDLER( k052109_051960_w )
/***************************************************************************/
-static ADDRESS_MAP_START( scontra_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( scontra_map, AS_PROGRAM, 8 )
AM_RANGE(0x1f80, 0x1f80) AM_WRITE(scontra_bankswitch_w) /* bankswitch control + coin counters */
AM_RANGE(0x1f84, 0x1f84) AM_WRITE(soundlatch_w)
AM_RANGE(0x1f88, 0x1f88) AM_WRITE(thunderx_sh_irqtrigger_w) /* cause interrupt on audio CPU */
@@ -426,7 +426,7 @@ static ADDRESS_MAP_START( scontra_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( thunderx_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( thunderx_map, AS_PROGRAM, 8 )
AM_RANGE(0x1f80, 0x1f80) AM_WRITE(thunderx_videobank_w)
AM_RANGE(0x1f84, 0x1f84) AM_WRITE(soundlatch_w)
AM_RANGE(0x1f88, 0x1f88) AM_WRITE(thunderx_sh_irqtrigger_w) /* cause interrupt on audio CPU */
@@ -446,7 +446,7 @@ static ADDRESS_MAP_START( thunderx_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( scontra_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( scontra_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r */
@@ -455,7 +455,7 @@ static ADDRESS_MAP_START( scontra_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf000) AM_DEVWRITE("k007232", scontra_snd_bankswitch_w) /* 007232 bank select */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( thunderx_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( thunderx_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index efb9a542083..78219943666 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -120,7 +120,7 @@
static MACHINE_RESET( tiamc1 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
tiamc1_bankswitch_w(space, 0, 0);
}
@@ -131,13 +131,13 @@ static WRITE8_HANDLER( tiamc1_control_w )
}
-static ADDRESS_MAP_START( tiamc1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tiamc1_map, AS_PROGRAM, 8 )
AM_RANGE(0xb000, 0xb7ff) AM_WRITE(tiamc1_videoram_w)
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tiamc1_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tiamc1_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x4f) AM_WRITE(tiamc1_sprite_y_w) /* sprites Y */
AM_RANGE(0x50, 0x5f) AM_WRITE(tiamc1_sprite_x_w) /* sprites X */
diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c
index 9ee94f787c4..52603bd30d4 100644
--- a/src/mame/drivers/tickee.c
+++ b/src/mame/drivers/tickee.c
@@ -377,7 +377,7 @@ static WRITE16_DEVICE_HANDLER( sound_bank_w )
*
*************************************/
-static ADDRESS_MAP_START( tickee_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tickee_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_BASE_MEMBER(tickee_state, vram)
AM_RANGE(0x02000000, 0x02ffffff) AM_ROM AM_REGION("user1", 0)
AM_RANGE(0x04000000, 0x04003fff) AM_RAM AM_SHARE("nvram")
@@ -395,7 +395,7 @@ ADDRESS_MAP_END
/* addreses in the 04x range shifted slightly...*/
-static ADDRESS_MAP_START( ghoshunt_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ghoshunt_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_BASE_MEMBER(tickee_state, vram)
AM_RANGE(0x02000000, 0x02ffffff) AM_ROM AM_REGION("user1", 0)
AM_RANGE(0x04100000, 0x04103fff) AM_RAM AM_SHARE("nvram")
@@ -411,7 +411,7 @@ static ADDRESS_MAP_START( ghoshunt_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mouseatk_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mouseatk_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_BASE_MEMBER(tickee_state, vram)
AM_RANGE(0x02000000, 0x02ffffff) AM_ROM AM_REGION("user1", 0)
AM_RANGE(0x04000000, 0x04003fff) AM_RAM AM_SHARE("nvram")
@@ -428,7 +428,7 @@ ADDRESS_MAP_END
/* newer hardware */
-static ADDRESS_MAP_START( rapidfir_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rapidfir_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE_MEMBER(tickee_state, vram)
AM_RANGE(0x02000000, 0x027fffff) AM_READWRITE(rapidfir_transparent_r, rapidfir_transparent_w)
AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w)
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index e85b8c32c11..3670b730d11 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -167,7 +167,7 @@ static WRITE8_DEVICE_HANDLER( msm5205_w )
/***************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0xfe0800, 0xfe0cff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0xfe0d00, 0xfe1807) AM_RAM /* still part of OBJ RAM */
@@ -183,7 +183,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w)
@@ -191,16 +191,16 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x7f, 0x7f) AM_WRITE(soundlatch2_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sample_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sample_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sample_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sample_port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch2_r)
AM_RANGE(0x01, 0x01) AM_DEVWRITE("msm", msm5205_w)
@@ -766,12 +766,12 @@ ROM_END
static DRIVER_INIT( tigeroad )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfe4002, 0xfe4003, 0, 0, tigeroad_soundcmd_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfe4002, 0xfe4003, 0, 0, tigeroad_soundcmd_w);
}
static DRIVER_INIT( f1dream )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfe4002, 0xfe4003, 0, 0, f1dream_control_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfe4002, 0xfe4003, 0, 0, f1dream_control_w);
}
diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c
index 231e468f306..740785776ad 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -43,7 +43,7 @@ static WRITE8_HANDLER( sound_reset_w )
/***************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* rom */
AM_RANGE(0x8000, 0x87ff) AM_RAM /* ram */
AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(timelimt_videoram_w) AM_BASE_MEMBER(timelimt_state, videoram) /* video ram */
@@ -63,17 +63,17 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc804, 0xc804) AM_WRITENOP /* ???? not used */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(watchdog_reset_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x3800, 0x3bff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(soundlatch_clear_w)
AM_RANGE(0x8c, 0x8d) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_address_data_w)
diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c
index c3dd000e7f4..d47a07dd0d2 100644
--- a/src/mame/drivers/timeplt.c
+++ b/src/mame/drivers/timeplt.c
@@ -113,7 +113,7 @@ static READ8_HANDLER( psurge_protection_r )
*
*************************************/
-static ADDRESS_MAP_START( timeplt_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( timeplt_main_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0xa000, 0xa3ff) AM_RAM_WRITE(timeplt_colorram_w) AM_BASE_MEMBER(timeplt_state, colorram)
@@ -136,7 +136,7 @@ static ADDRESS_MAP_START( timeplt_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( psurge_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( psurge_main_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6004, 0x6004) AM_READ(psurge_protection_r)
@@ -158,7 +158,7 @@ static ADDRESS_MAP_START( psurge_main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc360, 0xc360) AM_MIRROR(0x0c9f) AM_READ_PORT("DSW0")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( chkun_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( chkun_main_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM
diff --git a/src/mame/drivers/timetrv.c b/src/mame/drivers/timetrv.c
index b79b3da89d6..41105bed2b2 100644
--- a/src/mame/drivers/timetrv.c
+++ b/src/mame/drivers/timetrv.c
@@ -73,13 +73,13 @@ static READ8_HANDLER( ld_r )
return space->machine->rand();
}
-static ADDRESS_MAP_START( timetrv_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( timetrv_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x0ffff) AM_RAM //irq vectors + work ram
AM_RANGE(0x10000, 0x107ff) AM_RAM
AM_RANGE(0xc0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( timetrv_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( timetrv_io, AS_IO, 8 )
AM_RANGE(0x0122, 0x0123) AM_WRITENOP //eeprom write bits
AM_RANGE(0x1000, 0x1000) AM_READ(test1_r) //inputs
AM_RANGE(0x1001, 0x1001) AM_READ(test2_r) //eeprom read bit + inputs
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 9733a6ca428..9c460606b1b 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -495,7 +495,7 @@ static READ16_HANDLER( tmaster_coins_r )
return input_port_read(space->machine, "COIN")|(space->machine->rand()&0x0800);
}
-static ADDRESS_MAP_START( tmaster_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tmaster_map, AS_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x1fffff ) AM_ROM
AM_RANGE( 0x200000, 0x27ffff ) AM_RAM
AM_RANGE( 0x280000, 0x28ffef ) AM_RAM AM_SHARE("nvram")
@@ -719,7 +719,7 @@ static READ16_HANDLER( dummy_read_01 )
return 0x3; // Pass the check at PC = 0xfae & a later one
}
-static ADDRESS_MAP_START( galgames_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( galgames_map, AS_PROGRAM, 16 )
AM_RANGE( 0x000000, 0x03ffff ) AM_READ_BANK(GALGAMES_BANK_000000_R) AM_WRITE_BANK(GALGAMES_BANK_000000_W) AM_BASE_MEMBER(tmaster_state, galgames_ram )
AM_RANGE( 0x040000, 0x1fffff ) AM_ROM AM_REGION( "maincpu", 0x40000 )
diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c
index a228a3c90cf..019190b8ede 100644
--- a/src/mame/drivers/tmmjprd.c
+++ b/src/mame/drivers/tmmjprd.c
@@ -659,7 +659,7 @@ static WRITE32_HANDLER( tmmjprd_brt_2_w )
}
}
-static ADDRESS_MAP_START( tmmjprd_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( tmmjprd_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200010, 0x200013) AM_READ(randomtmmjprds) // gfx chip status?
AM_RANGE(0x200980, 0x200983) AM_READ(randomtmmjprds) // sound chip status?
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 984ee3f4797..fd397d6338f 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -586,7 +586,7 @@ static WRITE16_HANDLER( cuebrick_nvbank_w )
state->cuebrick_nvram_bank = data >> 8;
}
-static ADDRESS_MAP_START( cuebrick_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cuebrick_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM /* main RAM */
AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */
@@ -607,7 +607,7 @@ static ADDRESS_MAP_START( cuebrick_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mia_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mia_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_RAM /* main RAM */
AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */
@@ -629,7 +629,7 @@ static ADDRESS_MAP_START( mia_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tmnt_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tmnt_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x063fff) AM_RAM /* main RAM */
AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(tmnt_paletteram_word_w) AM_BASE_GENERIC(paletteram)
@@ -650,7 +650,7 @@ static ADDRESS_MAP_START( tmnt_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( punkshot_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( punkshot_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM /* main RAM */
AM_RANGE(0x090000, 0x090fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -670,7 +670,7 @@ static ADDRESS_MAP_START( punkshot_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lgtnfght_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( lgtnfght_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0x090000, 0x093fff) AM_RAM /*main RAM */
@@ -699,7 +699,7 @@ static WRITE16_HANDLER( ssriders_soundkludge_w )
device_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff);
}
-static ADDRESS_MAP_START( blswhstl_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( blswhstl_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x180000, 0x183fff) AM_DEVREADWRITE("k052109", k052109_word_r, k052109_word_w)
AM_RANGE(0x204000, 0x207fff) AM_RAM /* main RAM */
@@ -743,7 +743,7 @@ static WRITE16_HANDLER( k053251_glfgreat_w )
}
}
-static ADDRESS_MAP_START( glfgreat_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( glfgreat_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */
AM_RANGE(0x104000, 0x107fff) AM_READWRITE(k053245_scattered_word_r, k053245_scattered_word_w) AM_BASE_MEMBER(tmnt_state, spriteram)
@@ -767,7 +767,7 @@ static ADDRESS_MAP_START( glfgreat_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( prmrsocr_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( prmrsocr_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */
AM_RANGE(0x104000, 0x107fff) AM_READWRITE(k053245_scattered_word_r, k053245_scattered_word_w) AM_BASE_MEMBER(tmnt_state, spriteram)
@@ -1032,7 +1032,7 @@ logerror("copy command %04x sprite %08x data %08x: %04x%04x %04x%04x modifiers
}
#endif
-static ADDRESS_MAP_START( tmnt2_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tmnt2_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_BASE_MEMBER(tmnt_state, tmnt2_rom)
AM_RANGE(0x104000, 0x107fff) AM_RAM AM_BASE_MEMBER(tmnt_state, sunset_104000) /* main RAM */
AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -1058,7 +1058,7 @@ static ADDRESS_MAP_START( tmnt2_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ssriders_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ssriders_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x104000, 0x107fff) AM_RAM /* main RAM */
AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -1084,7 +1084,7 @@ static ADDRESS_MAP_START( ssriders_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sunsetbl_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sunsetbl_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0bffff) AM_ROM
AM_RANGE(0x104000, 0x107fff) AM_RAM /* main RAM */
AM_RANGE(0x14c000, 0x14cfff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -1110,7 +1110,7 @@ static ADDRESS_MAP_START( sunsetbl_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( thndrx2_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( thndrx2_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* main RAM */
AM_RANGE(0x200000, 0x200fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -1129,7 +1129,7 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( mia_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mia_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
@@ -1138,7 +1138,7 @@ static ADDRESS_MAP_START( mia_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tmnt_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tmnt_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_READWRITE(tmnt_sres_r, tmnt_sres_w) /* title music & UPD7759C reset */
@@ -1151,7 +1151,7 @@ static ADDRESS_MAP_START( tmnt_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( punkshot_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( punkshot_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -1160,7 +1160,7 @@ static ADDRESS_MAP_START( punkshot_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( lgtnfght_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( lgtnfght_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -1168,7 +1168,7 @@ static ADDRESS_MAP_START( lgtnfght_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( glfgreat_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( glfgreat_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf82f) AM_DEVREADWRITE("k053260", k053260_r, k053260_w)
@@ -1176,7 +1176,7 @@ static ADDRESS_MAP_START( glfgreat_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ssriders_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ssriders_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -1185,7 +1185,7 @@ static ADDRESS_MAP_START( ssriders_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( thndrx2_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( thndrx2_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf801) AM_MIRROR(0x0010) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -1204,7 +1204,7 @@ static WRITE8_DEVICE_HANDLER( k054539_ctrl_w )
k054539_w(device, 0x200 + offset, data);
}
-static ADDRESS_MAP_START( prmrsocr_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( prmrsocr_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index c128abb556f..8c29355e416 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -746,7 +746,7 @@ static WRITE8_DEVICE_HANDLER( kabukiz_sample_w )
dac_data_w(device, data);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1") /* ROM + RAM */
AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_MEMBER(tnzs_state, objram)
@@ -762,7 +762,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_RAM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu0_type2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu0_type2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAMBANK("bank1") /* ROM + RAM */
AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_MEMBER(tnzs_state, objram)
@@ -776,7 +776,7 @@ static ADDRESS_MAP_START( cpu0_type2, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2")
AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w)
@@ -789,7 +789,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
/* all by insectx. */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kageki_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kageki_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2")
AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w)
@@ -810,7 +810,7 @@ static WRITE8_HANDLER( tnzsb_sound_command_w )
device_set_input_line_and_vector(state->audiocpu, 0, HOLD_LINE, 0xff);
}
-static ADDRESS_MAP_START( tnzsb_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tnzsb_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2")
AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w)
@@ -826,7 +826,7 @@ static ADDRESS_MAP_START( tnzsb_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf3ff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kabukiz_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kabukiz_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2")
AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w)
@@ -841,24 +841,24 @@ static ADDRESS_MAP_START( kabukiz_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf800, 0xfbff) AM_WRITE(paletteram_xRRRRRGGGGGBBBBB_le_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tnzsb_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tnzsb_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kabukiz_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kabukiz_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3")
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tnzsb_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tnzsb_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( i8742_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( i8742_io_map, AS_IO, 8 )
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_READ(tnzs_port1_r)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READWRITE(tnzs_port2_r, tnzs_port2_w)
AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0) AM_READ_PORT("COIN1")
@@ -884,7 +884,7 @@ static WRITE8_HANDLER( jpopnics_palette_w )
palette_set_color_rgb(space->machine, offset, r << 4, g << 4, b << 4);
}
-static ADDRESS_MAP_START( jpopnics_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jpopnics_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_MEMBER(tnzs_state, objram)
@@ -903,7 +903,7 @@ static WRITE8_HANDLER( jpopnics_subbankswitch_w )
memory_set_bank(space->machine, "bank2", data & 0x03);
}
-static ADDRESS_MAP_START( jpopnics_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jpopnics_sub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2")
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index 2ad93e60ec4..5aede3ddd35 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -349,7 +349,7 @@ To Do:
/***************************** 68000 Memory Map *****************************/
-static ADDRESS_MAP_START( rallybik_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( rallybik_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
@@ -369,7 +369,7 @@ static ADDRESS_MAP_START( rallybik_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1c8000, 0x1c8001) AM_WRITE(toaplan1_reset_sound)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( truxton_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( truxton_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x083fff) AM_RAM
AM_RANGE(0x0c0000, 0x0c0001) AM_READ(toaplan1_frame_done_r)
@@ -392,7 +392,7 @@ static ADDRESS_MAP_START( truxton_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1d0000, 0x1d0001) AM_WRITE(toaplan1_reset_sound)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hellfire_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hellfire_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x047fff) AM_RAM
AM_RANGE(0x080000, 0x080001) AM_READ_PORT("VBLANK")
@@ -415,7 +415,7 @@ static ADDRESS_MAP_START( hellfire_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x180008, 0x180009) AM_WRITE(toaplan1_reset_sound)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( zerowing_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( zerowing_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x087fff) AM_RAM
@@ -438,7 +438,7 @@ static ADDRESS_MAP_START( zerowing_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x4c0006, 0x4c0007) AM_READWRITE(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( demonwld_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( demonwld_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("VBLANK")
// AM_RANGE(0x400000, 0x400001) AM_WRITE(?? video frame related ??)
@@ -462,7 +462,7 @@ static ADDRESS_MAP_START( demonwld_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe0000a, 0xe0000b) AM_WRITE(demonwld_dsp_ctrl_w) /* DSP Comms control */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( samesame_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( samesame_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x040000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x080003) AM_WRITE(toaplan1_tile_offsets_w)
@@ -493,7 +493,7 @@ static ADDRESS_MAP_START( samesame_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1c0006, 0x1c0007) AM_READWRITE(toaplan1_spritesizeram16_r, toaplan1_spritesizeram16_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( outzone_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( outzone_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_READ(toaplan1_frame_done_r)
AM_RANGE(0x100002, 0x100003) AM_READWRITE(toaplan1_spriteram_offs_r, toaplan1_spriteram_offs_w)
@@ -515,7 +515,7 @@ static ADDRESS_MAP_START( outzone_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x340006, 0x340007) AM_WRITE(toaplan1_fcu_flipscreen_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vimana_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( vimana_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080003) AM_WRITE(toaplan1_tile_offsets_w)
AM_RANGE(0x080006, 0x080007) AM_WRITE(toaplan1_fcu_flipscreen_w)
@@ -546,12 +546,12 @@ ADDRESS_MAP_END
/***************************** Z80 Memory Map *******************************/
-static ADDRESS_MAP_START( toaplan1_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( toaplan1_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xffff) AM_RAM AM_BASE_MEMBER(toaplan1_state, sharedram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rallybik_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rallybik_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
AM_RANGE(0x10, 0x10) AM_READ_PORT("P2")
@@ -563,7 +563,7 @@ static ADDRESS_MAP_START( rallybik_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x70, 0x70) AM_READ_PORT("TJUMP")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( truxton_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( truxton_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
AM_RANGE(0x10, 0x10) AM_READ_PORT("P2")
@@ -575,7 +575,7 @@ static ADDRESS_MAP_START( truxton_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x70, 0x70) AM_READ_PORT("TJUMP")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hellfire_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( hellfire_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSWA")
AM_RANGE(0x10, 0x10) AM_READ_PORT("DSWB")
@@ -587,7 +587,7 @@ static ADDRESS_MAP_START( hellfire_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x70, 0x71) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( zerowing_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( zerowing_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
AM_RANGE(0x08, 0x08) AM_READ_PORT("P2")
@@ -599,7 +599,7 @@ static ADDRESS_MAP_START( zerowing_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xa8, 0xa9) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( demonwld_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( demonwld_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
AM_RANGE(0x20, 0x20) AM_READ_PORT("TJUMP")
@@ -611,7 +611,7 @@ static ADDRESS_MAP_START( demonwld_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xe0, 0xe0) AM_READ_PORT("DSWA")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( outzone_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( outzone_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
AM_RANGE(0x04, 0x04) AM_WRITE(toaplan1_coin_w) /* Coin counter/lockout */
@@ -626,13 +626,13 @@ ADDRESS_MAP_END
/***************************** TMS32010 Memory Map **************************/
-static ADDRESS_MAP_START( DSP_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( DSP_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x7ff) AM_ROM
ADDRESS_MAP_END
/* $000 - 08F TMS32010 Internal Data RAM in Data Address Space */
-static ADDRESS_MAP_START( DSP_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( DSP_io_map, AS_IO, 16 )
AM_RANGE(0, 0) AM_WRITE(demonwld_dsp_addrsel_w)
AM_RANGE(1, 1) AM_READWRITE(demonwld_dsp_r, demonwld_dsp_w)
AM_RANGE(3, 3) AM_WRITE(demonwld_dsp_bio_w)
@@ -642,7 +642,7 @@ ADDRESS_MAP_END
/***************************** HD647180 Memory Map **************************/
-static ADDRESS_MAP_START( hd647180_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hd647180_mem_map, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x03fff) AM_ROM /* Internal 16k byte ROM */
AM_RANGE(0x0fe00, 0x0ffff) AM_RAM /* Internal 512 byte RAM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index baff82d5356..41f8ddc5608 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -1105,7 +1105,7 @@ static INTERRUPT_GEN( bbakraid_snd_interrupt )
-static ADDRESS_MAP_START( tekipaki_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tekipaki_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x020000, 0x03ffff) AM_ROM // extra for Whoopee
AM_RANGE(0x080000, 0x082fff) AM_RAM
@@ -1122,7 +1122,7 @@ static ADDRESS_MAP_START( tekipaki_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ghox_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ghox_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x040001) AM_READ(ghox_p2_h_analog_r)
AM_RANGE(0x080000, 0x083fff) AM_RAM
@@ -1141,7 +1141,7 @@ static ADDRESS_MAP_START( ghox_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dogyuun_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dogyuun_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x200010, 0x200011) AM_READ_PORT("IN1")
@@ -1156,7 +1156,7 @@ static ADDRESS_MAP_START( dogyuun_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kbash_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( kbash_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x200000, 0x200fff) AM_READWRITE( shared_ram_r, shared_ram_w )
@@ -1170,7 +1170,7 @@ static ADDRESS_MAP_START( kbash_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kbash2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( kbash2_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x104000, 0x10401f) AM_RAM // Sound related?
@@ -1191,7 +1191,7 @@ static ADDRESS_MAP_START( kbash2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( truxton2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( truxton2_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200000, 0x20000d) AM_DEVREADWRITE("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
@@ -1215,7 +1215,7 @@ static ADDRESS_MAP_START( truxton2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pipibibs_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pipibibs_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x082fff) AM_RAM
AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -1231,7 +1231,7 @@ static ADDRESS_MAP_START( pipibibs_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
// odd scroll registers
-static ADDRESS_MAP_START( pipibibi_bootleg_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pipibibi_bootleg_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x082fff) AM_RAM
AM_RANGE(0x083000, 0x0837ff) AM_DEVREADWRITE("gp9001vdp0", pipibibi_bootleg_spriteram16_r, pipibibi_bootleg_spriteram16_w) // SpriteRAM
@@ -1253,7 +1253,7 @@ static ADDRESS_MAP_START( pipibibi_bootleg_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fixeight_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fixeight_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x200000, 0x200001) AM_READ_PORT("IN1")
@@ -1273,7 +1273,7 @@ static ADDRESS_MAP_START( fixeight_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fixeightbl_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fixeightbl_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // 0-7ffff ?
AM_RANGE(0x100000, 0x10ffff) AM_RAM // 100000-107fff 105000-105xxx 106000-106xxx 108000 - related to sound ?
AM_RANGE(0x200000, 0x200001) AM_READ_PORT("IN1")
@@ -1294,7 +1294,7 @@ static ADDRESS_MAP_START( fixeightbl_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vfive_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( vfive_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
// AM_RANGE(0x200000, 0x20ffff) AM_NOP // Read at startup by broken ROM checksum code - see notes
@@ -1309,7 +1309,7 @@ static ADDRESS_MAP_START( vfive_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( batsugun_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( batsugun_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x200010, 0x200011) AM_READ_PORT("IN1")
@@ -1324,7 +1324,7 @@ static ADDRESS_MAP_START( batsugun_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( snowbro2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( snowbro2_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x300000, 0x30000d) AM_DEVREADWRITE("gp9001vdp0", gp9001_vdp_r, gp9001_vdp_w)
@@ -1344,7 +1344,7 @@ static ADDRESS_MAP_START( snowbro2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mahoudai_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( mahoudai_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x218000, 0x21bfff) AM_READWRITE(shared_ram_r, shared_ram_w)
@@ -1367,7 +1367,7 @@ static ADDRESS_MAP_START( mahoudai_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( shippumd_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( shippumd_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x218000, 0x21bfff) AM_READWRITE(shared_ram_r, shared_ram_w)
@@ -1391,7 +1391,7 @@ static ADDRESS_MAP_START( shippumd_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bgaregga_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bgaregga_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM
AM_RANGE(0x218000, 0x21bfff) AM_READWRITE(shared_ram_r, shared_ram_w)
@@ -1414,7 +1414,7 @@ static ADDRESS_MAP_START( bgaregga_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( batrider_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( batrider_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
// actually 200000 - 20ffff is probably all main RAM, and the text and palette RAM are written via DMA
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE_MEMBER(toaplan2_state, txvideoram16, tx_vram_size)
@@ -1444,7 +1444,7 @@ static ADDRESS_MAP_START( batrider_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bbakraid_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( bbakraid_68k_mem, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
// actually 200000 - 20ffff is probably all main RAM, and the text and palette RAM are written via DMA
AM_RANGE(0x200000, 0x201fff) AM_RAM_WRITE(toaplan2_txvideoram16_w) AM_BASE_SIZE_MEMBER(toaplan2_state, txvideoram16, tx_vram_size)
@@ -1475,14 +1475,14 @@ ADDRESS_MAP_END
-static ADDRESS_MAP_START( pipibibs_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( pipibibs_sound_z80_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_MEMBER(toaplan2_state, shared_ram)
AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( raizing_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( raizing_sound_z80_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_MEMBER(toaplan2_state, shared_ram)
AM_RANGE(0xe000, 0xe001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -1491,7 +1491,7 @@ static ADDRESS_MAP_START( raizing_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bgaregga_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bgaregga_sound_z80_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE_MEMBER(toaplan2_state, shared_ram)
@@ -1505,14 +1505,14 @@ static ADDRESS_MAP_START( bgaregga_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( batrider_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( batrider_sound_z80_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xc000, 0xdfff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( batrider_sound_z80_port, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( batrider_sound_z80_port, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x40) AM_WRITE(soundlatch3_w)
AM_RANGE(0x42, 0x42) AM_WRITE(soundlatch4_w)
@@ -1528,13 +1528,13 @@ static ADDRESS_MAP_START( batrider_sound_z80_port, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bbakraid_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bbakraid_sound_z80_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM // No banking? ROM only contains code and data up to 0x28DC
AM_RANGE(0xc000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bbakraid_sound_z80_port, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( bbakraid_sound_z80_port, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x40) AM_WRITE(soundlatch3_w)
AM_RANGE(0x42, 0x42) AM_WRITE(soundlatch4_w)
@@ -1547,21 +1547,21 @@ ADDRESS_MAP_END
#ifdef USE_HD64x180
-static ADDRESS_MAP_START( hd647180_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hd647180_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xfe00, 0xffff) AM_RAM // Internal 512 bytes of RAM
ADDRESS_MAP_END
#endif
-static ADDRESS_MAP_START( v25_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( v25_mem, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x00001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x00004, 0x00004) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
AM_RANGE(0x80000, 0x87fff) AM_MIRROR(0x78000) AM_RAM AM_BASE_MEMBER(toaplan2_state, shared_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kbash_v25_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kbash_v25_mem, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x007ff) AM_RAM AM_BASE_MEMBER(toaplan2_state, shared_ram)
AM_RANGE(0x04000, 0x04001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x04002, 0x04002) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
@@ -1569,7 +1569,7 @@ static ADDRESS_MAP_START( kbash_v25_mem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fixeight_v25_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fixeight_v25_mem, AS_PROGRAM, 8 )
AM_RANGE(0x00004, 0x00004) AM_READ(fixeight_region_r)
AM_RANGE(0x0000a, 0x0000b) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x0000c, 0x0000c) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
@@ -1577,13 +1577,13 @@ static ADDRESS_MAP_START( fixeight_v25_mem, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vfive_v25_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vfive_v25_mem, AS_PROGRAM, 8 )
AM_RANGE(0x00000, 0x00001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x80000, 0x87fff) AM_MIRROR(0x78000) AM_RAM AM_BASE_MEMBER(toaplan2_state, shared_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( v25_port, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( v25_port, AS_IO, 8 )
AM_RANGE(V25_PORT_PT, V25_PORT_PT) AM_READ(v25_dswa_r)
AM_RANGE(V25_PORT_P0, V25_PORT_P0) AM_READ(v25_dswb_r)
AM_RANGE(V25_PORT_P1, V25_PORT_P1) AM_READ(v25_jmpr_r)
@@ -1591,7 +1591,7 @@ static ADDRESS_MAP_START( v25_port, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dogyuun_v25_port, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dogyuun_v25_port, AS_IO, 8 )
AM_RANGE(V25_PORT_PT, V25_PORT_PT) AM_READ(v25_dswb_r)
AM_RANGE(V25_PORT_P0, V25_PORT_P0) AM_READ(v25_dswa_r)
AM_RANGE(V25_PORT_P1, V25_PORT_P1) AM_READ(v25_jmpr_r)
@@ -1599,12 +1599,12 @@ static ADDRESS_MAP_START( dogyuun_v25_port, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fixeight_v25_port, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( fixeight_v25_port, AS_IO, 8 )
AM_RANGE(V25_PORT_P0, V25_PORT_P0) AM_READWRITE_PORT("EEPROM")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fixeightbl_oki, 0, 8 )
+static ADDRESS_MAP_START( fixeightbl_oki, AS_0, 8 )
AM_RANGE(0x00000, 0x2ffff) AM_ROM
AM_RANGE(0x30000, 0x3ffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
@@ -3617,7 +3617,7 @@ static MACHINE_CONFIG_START( fixeightbl, toaplan2_state )
MCFG_OKIM6295_ADD("oki", XTAL_14MHz/16, OKIM6295_PIN7_LOW)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MCFG_DEVICE_ADDRESS_MAP(0, fixeightbl_oki)
+ MCFG_DEVICE_ADDRESS_MAP(AS_0, fixeightbl_oki)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index f404f024d61..6eeb74d3c8e 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -90,7 +90,7 @@ static WRITE8_HANDLER( toki_adpcm_data_w )
/*****************************************************************************/
-static ADDRESS_MAP_START( toki_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( toki_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x06d7ff) AM_RAM
AM_RANGE(0x06d800, 0x06dfff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
@@ -106,7 +106,7 @@ static ADDRESS_MAP_START( toki_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* In the bootleg, sound and sprites are remapped to 0x70000 */
-static ADDRESS_MAP_START( tokib_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tokib_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x05ffff) AM_ROM
AM_RANGE(0x060000, 0x06dfff) AM_RAM
AM_RANGE(0x06e000, 0x06e7ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -130,7 +130,7 @@ ADDRESS_MAP_END
/*****************************************************************************/
-static ADDRESS_MAP_START( tokib_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tokib_audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", toki_adpcm_control_w) /* MSM5205 + ROM bank */
@@ -820,7 +820,7 @@ static DRIVER_INIT(jujub)
/* Decrypt data for z80 program */
{
- address_space *space = machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("audiocpu")->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x20000);
UINT8 *rom = machine->region("audiocpu")->base();
int i;
diff --git a/src/mame/drivers/tokyocop.c b/src/mame/drivers/tokyocop.c
index 562470ed8a0..714d67a8398 100644
--- a/src/mame/drivers/tokyocop.c
+++ b/src/mame/drivers/tokyocop.c
@@ -38,7 +38,7 @@ static SCREEN_UPDATE(tokyocop)
return 0;
}
-static ADDRESS_MAP_START( tokyocop_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( tokyocop_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0001ffff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c
index 0a18ae0770c..077a9ddd050 100644
--- a/src/mame/drivers/tomcat.c
+++ b/src/mame/drivers/tomcat.c
@@ -255,7 +255,7 @@ static WRITE8_HANDLER(tomcat_nvram_w)
state->nvram[offset] = data;
}
-static ADDRESS_MAP_START( tomcat_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tomcat_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x402000, 0x402001) AM_READ(tomcat_adcread_r) AM_WRITE(tomcat_adcon_w)
AM_RANGE(0x404000, 0x404001) AM_READ(tomcat_inputs_r) AM_WRITE(avgdvg_go_word_w)
@@ -285,11 +285,11 @@ static ADDRESS_MAP_START( tomcat_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xffd000, 0xffdfff) AM_READWRITE8(tomcat_nvram_r, tomcat_nvram_w, 0x00ff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dsp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( dsp_map, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE_MEMBER(tomcat_state, shared_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dsp_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( dsp_io_map, AS_IO, 16 )
AM_RANGE(TMS32010_BIO, TMS32010_BIO) AM_READ(dsp_BIO_r)
ADDRESS_MAP_END
@@ -307,7 +307,7 @@ static WRITE8_HANDLER(soundlatches_w)
}
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM
AM_RANGE(0x2000, 0x2001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x3000, 0x30df) AM_WRITE(soundlatches_w)
diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c
index 7b847254c48..993874881fe 100644
--- a/src/mame/drivers/toobin.c
+++ b/src/mame/drivers/toobin.c
@@ -106,7 +106,7 @@ static READ16_HANDLER( special_port1_r )
*************************************/
/* full address map decoded from schematics */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xc7ffff)
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0xc00000, 0xc07fff) AM_RAM_WRITE(atarigen_playfield_large_w) AM_BASE_MEMBER(toobin_state, playfield)
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index 9134a75e75b..f5c2ee20c0e 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -442,7 +442,7 @@ static WRITE8_DEVICE_HANDLER( topspeed_msm5205_stop_w )
***********************************************************/
-static ADDRESS_MAP_START( topspeed_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( topspeed_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE_SIZE_MEMBER(topspeed_state, sharedram, sharedram_size)
AM_RANGE(0x500000, 0x503fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -463,7 +463,7 @@ static ADDRESS_MAP_START( topspeed_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_BASE_MEMBER(topspeed_state, spritemap)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( topspeed_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( topspeed_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x400000, 0X40ffff) AM_READWRITE(sharedram_r, sharedram_w) AM_BASE_MEMBER(topspeed_state, sharedram)
AM_RANGE(0x880000, 0x880001) AM_READ8(topspeed_input_bypass_r, 0x00ff) AM_DEVWRITE8("tc0220ioc", tc0220ioc_portreg_w, 0x00ff)
@@ -474,7 +474,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10")
AM_RANGE(0x8000, 0x8fff) AM_RAM
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index b8554f03131..9ce30831358 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -307,7 +307,7 @@ static const pia6821_interface pia_u3_intf =
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_RAM
AM_RANGE(0x1000, 0x7fff) AM_ROM /* not fully populated */
AM_RANGE(0x8000, 0x9fff) AM_RAM AM_BASE_SIZE_MEMBER(toratora_state, videoram, videoram_size)
diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c
index c6ed99a47fa..4ffd09d4908 100644
--- a/src/mame/drivers/tourtabl.c
+++ b/src/mame/drivers/tourtabl.c
@@ -49,7 +49,7 @@ static READ8_HANDLER( tourtabl_get_databus_contents )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0100) AM_READWRITE(tia_r, tia_w)
AM_RANGE(0x0080, 0x00ff) AM_MIRROR(0x0100) AM_RAM
AM_RANGE(0x0280, 0x029f) AM_DEVREADWRITE("riot1", riot6532_r, riot6532_w)
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index cee73304c18..fc4e351e313 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -184,7 +184,7 @@ static WRITE16_HANDLER( toypop_m68000_interrupt_disable_w )
*
*************************************/
-static ADDRESS_MAP_START( liblrabl_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( liblrabl_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(toypop_videoram_w) AM_BASE_MEMBER(toypop_state,videoram) /* video RAM */
AM_RANGE(0x0800, 0x1fff) AM_RAM AM_BASE_MEMBER(toypop_state,spriteram) /* general RAM, area 1 */
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE_MEMBER(toypop_state,m68000_sharedram) /* shared RAM with the 68000 CPU */
@@ -202,7 +202,7 @@ static ADDRESS_MAP_START( liblrabl_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM /* ROM code */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( toypop_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( toypop_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM_WRITE(toypop_videoram_w) AM_BASE_MEMBER(toypop_state,videoram) /* video RAM */
AM_RANGE(0x0800, 0x1fff) AM_RAM AM_BASE_MEMBER(toypop_state,spriteram) /* general RAM, area 1 */
AM_RANGE(0x2800, 0x2fff) AM_RAM AM_BASE_MEMBER(toypop_state,m68000_sharedram) /* shared RAM with the 68000 CPU */
@@ -226,7 +226,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_DEVREADWRITE("namco", namco_snd_sharedram_r, namco_snd_sharedram_w) /* shared RAM with the main CPU + sound registers */
AM_RANGE(0x2000, 0x2000) AM_WRITE(toypop_sound_interrupt_disable_w) /* ??? toypop doesn't write here */
AM_RANGE(0x4000, 0x4000) AM_WRITE(toypop_sound_interrupt_enable_acknowledge_w)
@@ -242,7 +242,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( m68k_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( m68k_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x007fff) AM_ROM /* ROM code */
AM_RANGE(0x080000, 0x0bffff) AM_RAM /* RAM */
AM_RANGE(0x100000, 0x100fff) AM_READWRITE(toypop_m68000_sharedram_r, toypop_m68000_sharedram_w) /* shared RAM with the main CPU */
diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c
index 614d45cc937..10ec62baa5f 100644
--- a/src/mame/drivers/tp84.c
+++ b/src/mame/drivers/tp84.c
@@ -126,7 +126,7 @@ static WRITE8_HANDLER( tp84_sh_irqtrigger_w )
-static ADDRESS_MAP_START( tp84_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tp84_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x2000, 0x2000) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x2800, 0x2800) AM_READ_PORT("SYSTEM") AM_WRITEONLY AM_BASE_MEMBER(tp84_state, palette_bank)
AM_RANGE(0x2820, 0x2820) AM_READ_PORT("P1")
@@ -147,7 +147,7 @@ static ADDRESS_MAP_START( tp84_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tp84b_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tp84b_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE_MEMBER(tp84_state, bg_videoram)
AM_RANGE(0x0400, 0x07ff) AM_RAM AM_BASE_MEMBER(tp84_state, fg_videoram)
AM_RANGE(0x0800, 0x0bff) AM_RAM AM_BASE_MEMBER(tp84_state, bg_colorram)
@@ -169,7 +169,7 @@ static ADDRESS_MAP_START( tp84b_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8 )
// AM_RANGE(0x0000, 0x0000) AM_RAM /* Watch dog ?*/
AM_RANGE(0x2000, 0x2000) AM_READ(tp84_scanline_r) /* beam position */
AM_RANGE(0x4000, 0x4000) AM_WRITE(interrupt_enable_w)
@@ -180,7 +180,7 @@ static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( audio_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 93bed61a028..08b4a3f18c6 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -222,7 +222,7 @@ static WRITE8_HANDLER( questions_bank_w )
memory_set_bank(space->machine, "bank1", 7);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x007f) AM_WRITE(watchdog_reset_w) /* AFE */
AM_RANGE(0x1080, 0x1080) AM_MIRROR(0x0078) AM_WRITE(trackfld_flipscreen_w) /* FLIP */
AM_RANGE(0x1081, 0x1081) AM_MIRROR(0x0078) AM_WRITE(konami_sh_irqtrigger_w) /* 26 */ /* cause interrupt on audio CPU */
@@ -251,7 +251,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( yieartf_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( yieartf_map, AS_PROGRAM, 8 )
AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x007f) AM_WRITE(watchdog_reset_w) /* AFE */
AM_RANGE(0x1080, 0x1080) AM_MIRROR(0x0078) AM_WRITE(trackfld_flipscreen_w) /* FLIP */
AM_RANGE(0x1081, 0x1081) AM_MIRROR(0x0078) AM_WRITE(konami_sh_irqtrigger_w) /* 26 */ /* cause interrupt on audio CPU */
@@ -279,7 +279,7 @@ static ADDRESS_MAP_START( yieartf_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( reaktor_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( reaktor_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
/* all usual addresses +0x8000 */
AM_RANGE(0x9000, 0x9000) AM_WRITE(watchdog_reset_w)
@@ -306,7 +306,7 @@ static ADDRESS_MAP_START( reaktor_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* Reaktor reads / writes some I/O ports, no idea what they're connected to, if anything */
-static ADDRESS_MAP_START( reaktor_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( reaktor_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP
AM_RANGE(0x01, 0x01) AM_NOP
@@ -314,7 +314,7 @@ static ADDRESS_MAP_START( reaktor_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x03, 0x03) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mastkin_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mastkin_map, AS_PROGRAM, 8 )
AM_RANGE(0x1000, 0x1000) AM_WRITE(watchdog_reset_w)
AM_RANGE(0x10b0, 0x10b0) AM_WRITE(trackfld_flipscreen_w)
AM_RANGE(0x10b1, 0x10b1) AM_WRITE(konami_sh_irqtrigger_w)
@@ -339,7 +339,7 @@ static ADDRESS_MAP_START( mastkin_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wizzquiz_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wizzquiz_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_READWRITE(watchdog_reset_r, watchdog_reset_w)
AM_RANGE(0x1080, 0x1080) AM_WRITE(trackfld_flipscreen_w)
@@ -367,7 +367,7 @@ static ADDRESS_MAP_START( wizzquiz_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x1c00) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x1fff) AM_READ(soundlatch_r)
@@ -381,7 +381,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe004, 0xe004) AM_MIRROR(0x1ff8) AM_DEVWRITE("vlm", vlm5030_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( hyprolyb_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hyprolyb_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x1c00) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x1fff) AM_READ(soundlatch_r)
@@ -1412,7 +1412,7 @@ static DRIVER_INIT( trackfld )
static DRIVER_INIT( atlantol )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
UINT8 *decrypt;
int A;
diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c
index 07f2a034aae..9b22b5119b8 100644
--- a/src/mame/drivers/travrusa.c
+++ b/src/mame/drivers/travrusa.c
@@ -53,7 +53,7 @@ and 2764 eprom (swapped D3/D4 and D5/D6 data lines)
#include "includes/travrusa.h"
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM_WRITE(travrusa_videoram_w) AM_BASE_MEMBER(travrusa_state, videoram)
AM_RANGE(0x9000, 0x9000) AM_WRITE(travrusa_scroll_x_low_w)
diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c
index af6a8d3cfaa..871d1956d1b 100644
--- a/src/mame/drivers/triforce.c
+++ b/src/mame/drivers/triforce.c
@@ -400,7 +400,7 @@ Notes:
#include "cpu/powerpc/ppc.h"
#include "includes/naomibd.h"
-static ADDRESS_MAP_START( gc_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( gc_map, AS_PROGRAM, 32 )
AM_RANGE(0x7fe00000, 0x7fffffff) AM_ROM AM_REGION("maincpu", 0) AM_SHARE("share2") /* Program ROM */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c
index afe1d821d54..1168e68252e 100644
--- a/src/mame/drivers/triplhnt.c
+++ b/src/mame/drivers/triplhnt.c
@@ -135,7 +135,7 @@ static READ8_HANDLER( triplhnt_da_latch_r )
}
-static ADDRESS_MAP_START( triplhnt_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( triplhnt_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7fff)
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_MIRROR(0x300)
AM_RANGE(0x0400, 0x04ff) AM_WRITEONLY AM_BASE_MEMBER(triplhnt_state, playfield_ram)
diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c
index 902f128339b..2b24f63176a 100644
--- a/src/mame/drivers/truco.c
+++ b/src/mame/drivers/truco.c
@@ -24,7 +24,7 @@
/***************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_RAM /* general purpose ram */
AM_RANGE(0x1800, 0x7bff) AM_RAM AM_BASE_MEMBER(truco_state, videoram) /* video ram */
AM_RANGE(0x7c00, 0x7fff) AM_RAM AM_BASE_MEMBER(truco_state, battery_ram) /* battery backed ram */
diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c
index 4facaf2a68d..061f55ea208 100644
--- a/src/mame/drivers/trucocl.c
+++ b/src/mame/drivers/trucocl.c
@@ -78,7 +78,7 @@ static WRITE8_DEVICE_HANDLER( audio_dac_w )
device->machine->scheduler().timer_set( attotime::from_hz( 16000 ), FUNC(dac_irq ));
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(trucocl_videoram_w) AM_BASE_MEMBER(trucocl_state, videoram)
AM_RANGE(0x4400, 0x47ff) AM_RAM_WRITE(trucocl_colorram_w) AM_BASE_MEMBER(trucocl_state, colorram)
diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c
index 8611929c1d6..b20782f069b 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -208,7 +208,7 @@ static WRITE8_HANDLER( trvmadns_tileram_w )
}
-static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_ROMBANK("bank1")
AM_RANGE(0x7000, 0x7fff) AM_ROMBANK("bank2")
@@ -220,7 +220,7 @@ static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe004, 0xe004) AM_WRITE(w3)//NOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x02, 0x02) AM_READ_PORT("IN0")
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index b1d4c89cdc6..e9a4d85e3c6 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -58,7 +58,7 @@ static WRITE8_DEVICE_HANDLER( trvquest_misc_w )
// data & 1 -> led on/off ?
}
-static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram") // cmos ram
AM_RANGE(0x2000, 0x27ff) AM_RAM // main ram
AM_RANGE(0x3800, 0x380f) AM_DEVREADWRITE_MODERN("via6522_1", via6522_device, read, write)
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index 8201f1f7603..0d4e3e52a21 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -52,7 +52,7 @@ static WRITE8_HANDLER( tryout_bankswitch_w )
memory_set_bankptr(space->machine, "bank1", &RAM[bankaddress]);
}
-static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1000, 0x17ff) AM_RAM_WRITE(tryout_videoram_w) AM_BASE_MEMBER(tryout_state, videoram)
AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1")
@@ -73,7 +73,7 @@ static ADDRESS_MAP_START( main_cpu, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfff0, 0xffff) AM_ROM AM_REGION("maincpu", 0xbff0) /* reset vectors */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x4000, 0x4001) AM_DEVREADWRITE("ymsnd", ym2203_r, ym2203_w)
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index 019a4c194e8..cf1d5c0f779 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -118,7 +118,7 @@ static WRITE8_HANDLER( tsamurai_coin_counter_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -151,7 +151,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc03, 0xfc04) AM_WRITE(tsamurai_coin_counter_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( m660_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( m660_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
@@ -186,19 +186,19 @@ static ADDRESS_MAP_START( m660_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc07, 0xfc07) AM_WRITE(tsamurai_textbank2_w)/* Mission 660 uses a bit here */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( z80_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_m660_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( z80_m660_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITENOP /* ? */
AM_RANGE(0x01, 0x01) AM_WRITENOP /* Written continuously. Increments with level. */
AM_RANGE(0x02, 0x02) AM_WRITENOP /* Always follows above with 0x01 data */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vsgongf_audio_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( vsgongf_audio_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
ADDRESS_MAP_END
@@ -222,7 +222,7 @@ static READ8_HANDLER( sound_command3_r )
}
/*******************************************************************************/
-static ADDRESS_MAP_START( sound1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x6000, 0x6000) AM_READ(sound_command1_r)
AM_RANGE(0x6001, 0x6001) AM_WRITENOP /* ? - probably clear IRQ */
@@ -232,7 +232,7 @@ ADDRESS_MAP_END
/*******************************************************************************/
-static ADDRESS_MAP_START( sound2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x6000, 0x6000) AM_READ(sound_command2_r)
AM_RANGE(0x6001, 0x6001) AM_WRITENOP /* ? - probably clear IRQ */
@@ -242,7 +242,7 @@ ADDRESS_MAP_END
/*******************************************************************************/
-static ADDRESS_MAP_START( sound1_m660_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound1_m660_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ(sound_command1_r)
AM_RANGE(0xc001, 0xc001) AM_WRITENOP /* ? - probably clear IRQ */
@@ -252,7 +252,7 @@ ADDRESS_MAP_END
/*******************************************************************************/
-static ADDRESS_MAP_START( sound2_m660_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound2_m660_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ(sound_command2_r)
AM_RANGE(0xc001, 0xc001) AM_WRITENOP /* ? - probably clear IRQ */
@@ -262,7 +262,7 @@ ADDRESS_MAP_END
/*******************************************************************************/
-static ADDRESS_MAP_START( sound3_m660_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound3_m660_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ(sound_command3_r)
AM_RANGE(0xc001, 0xc001) AM_WRITENOP /* ? - probably clear IRQ */
@@ -270,7 +270,7 @@ static ADDRESS_MAP_START( sound3_m660_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfffc, 0xffff) AM_RAM /* CPU writes here - music data */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound3_m660_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound3_m660_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
ADDRESS_MAP_END
@@ -319,7 +319,7 @@ static WRITE8_HANDLER( vsgongf_sound_command_w )
cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
}
-static ADDRESS_MAP_START( vsgongf_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vsgongf_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa003, 0xa003) AM_READONLY
AM_RANGE(0xa006, 0xa006) AM_READ(vsgongf_a006_r) /* protection */
@@ -346,7 +346,7 @@ static ADDRESS_MAP_START( vsgongf_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc04, 0xfc04) AM_RAM_WRITE(tsamurai_textbank1_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_vsgongf_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_vsgongf_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_RAM /* work RAM */
AM_RANGE(0x8000, 0x8000) AM_READWRITE(soundlatch_r, vsgongf_sound_nmi_enable_w) /* NMI enable */
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index c4ff25ee592..ae16c1bf21f 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -131,14 +131,14 @@ static READ16_HANDLER( peno_rand2 )
}
#endif
-static ADDRESS_MAP_START( ttchamp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( ttchamp_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x0ffff) AM_RAM
AM_RANGE(0x10000, 0x1ffff) AM_RAM AM_BASE_MEMBER(ttchamp_state, peno_vram)
AM_RANGE(0x20000, 0x7ffff) AM_ROMBANK("bank1") // ?
AM_RANGE(0x80000, 0xfffff) AM_ROMBANK("bank2") // ?
ADDRESS_MAP_END
-static ADDRESS_MAP_START( ttchamp_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( ttchamp_io, AS_IO, 16 )
AM_RANGE(0x0000, 0x0001) AM_WRITENOP
AM_RANGE(0x0002, 0x0003) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index 6af207bd66a..b7ed0eb0dd4 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -144,7 +144,7 @@ static WRITE8_HANDLER( tubep_LS259_w )
}
-static ADDRESS_MAP_START( tubep_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tubep_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa7ff) AM_RAM
AM_RANGE(0xc000, 0xc7ff) AM_WRITE(tubep_textram_w) AM_BASE_MEMBER(tubep_state, textram) /* RAM on GFX PCB @B13 */
@@ -168,7 +168,7 @@ static WRITE8_HANDLER( tubep_soundlatch_w )
state->sound_latch = (data&0x7f) | 0x80;
}
-static ADDRESS_MAP_START( tubep_main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tubep_main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x80, 0x80) AM_READ_PORT("DSW1")
AM_RANGE(0x90, 0x90) AM_READ_PORT("DSW2")
@@ -200,7 +200,7 @@ static WRITE8_HANDLER( second_cpu_irq_line_clear_w )
}
-static ADDRESS_MAP_START( tubep_second_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tubep_second_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa000) AM_WRITE(tubep_background_a000_w)
AM_RANGE(0xc000, 0xc000) AM_WRITE(tubep_background_c000_w)
@@ -211,7 +211,7 @@ static ADDRESS_MAP_START( tubep_second_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tubep_second_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tubep_second_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x7f, 0x7f) AM_WRITE(second_cpu_irq_line_clear_w)
ADDRESS_MAP_END
@@ -241,14 +241,14 @@ static WRITE8_HANDLER( tubep_sound_unknown )
}
-static ADDRESS_MAP_START( tubep_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tubep_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0xd000, 0xd000) AM_READ(tubep_sound_irq_ack)
AM_RANGE(0xe000, 0xe7ff) AM_RAM /* 6116 #3 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tubep_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tubep_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ay1", ay8910_address_data_w)
AM_RANGE(0x02, 0x03) AM_DEVWRITE("ay2", ay8910_address_data_w)
@@ -364,7 +364,7 @@ static MACHINE_RESET( tubep )
*************************************/
/* MS2010-A CPU (equivalent to NSC8105 with one new opcode: 0xec) on graphics PCB */
-static ADDRESS_MAP_START( nsc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nsc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_SHARE("share3") AM_BASE_MEMBER(tubep_state, sprite_colorsharedram)
AM_RANGE(0x0800, 0x0fff) AM_RAM AM_SHARE("share2")
AM_RANGE(0x2000, 0x2009) AM_WRITE(tubep_sprite_control_w)
@@ -405,7 +405,7 @@ static WRITE8_HANDLER( rjammer_soundlatch_w )
}
-static ADDRESS_MAP_START( rjammer_main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rjammer_main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa7ff) AM_RAM /* MB8416 SRAM on daughterboard on main PCB (there are two SRAMs, this is the one on the left) */
AM_RANGE(0xc000, 0xc7ff) AM_WRITE(tubep_textram_w) AM_BASE_MEMBER(tubep_state, textram)/* RAM on GFX PCB @B13 */
@@ -413,7 +413,7 @@ static ADDRESS_MAP_START( rjammer_main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rjammer_main_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rjammer_main_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW2") /* a bug in game code (during attract mode) */
AM_RANGE(0x80, 0x80) AM_READ_PORT("DSW2")
@@ -428,7 +428,7 @@ static ADDRESS_MAP_START( rjammer_main_portmap, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rjammer_second_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rjammer_second_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xa000, 0xa7ff) AM_RAM /* M5M5117P @21G */
AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE("share1") /* MB8416 on daughterboard (the one on the right) */
@@ -437,7 +437,7 @@ static ADDRESS_MAP_START( rjammer_second_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rjammer_second_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rjammer_second_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0xb0, 0xb0) AM_WRITE(rjammer_background_page_w)
AM_RANGE(0xd0, 0xd0) AM_WRITE(rjammer_background_LS377_w)
@@ -604,13 +604,13 @@ static WRITE8_HANDLER( rjammer_voice_intensity_control_w )
}
-static ADDRESS_MAP_START( rjammer_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( rjammer_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM /* M5M5117P (M58125P @2C on schematics) */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( rjammer_sound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( rjammer_sound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(rjammer_soundlatch_r)
AM_RANGE(0x10, 0x10) AM_DEVWRITE("msm", rjammer_voice_startstop_w)
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index 7ce877a17de..a7e80913c6e 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -210,7 +210,7 @@ static MACHINE_RESET( tugboat )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM AM_BASE_MEMBER(tugboat_state, ram)
AM_RANGE(0x1060, 0x1061) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x10a0, 0x10a1) AM_WRITE(tugboat_hd46505_0_w) /* scrolling is performed changing the start_addr register (0C/0D) */
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index 9d3993628d7..7ebea13504d 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -656,7 +656,7 @@ static WRITE16_DEVICE_HANDLER( tumbleb2_soundmcu_w )
/******************************************************************************/
-static ADDRESS_MAP_START( tumblepopb_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tumblepopb_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
#if TUMBLEP_HACK
AM_RANGE(0x000000, 0x07ffff) AM_WRITEONLY /* To write levels modifications */
@@ -678,7 +678,7 @@ static ADDRESS_MAP_START( tumblepopb_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x342400, 0x34247f) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fncywld_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fncywld_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
#if FNCYWLD_HACK
AM_RANGE(0x000000, 0x0fffff) AM_WRITEONLY /* To write levels modifications */
@@ -707,7 +707,7 @@ static READ16_HANDLER( semibase_unknown_r )
return space->machine->rand();
}
-static ADDRESS_MAP_START( htchctch_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( htchctch_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10000f) AM_READ(semibase_unknown_r)
AM_RANGE(0x100000, 0x100001) AM_WRITE(semicom_soundcmd_w)
@@ -725,7 +725,7 @@ static ADDRESS_MAP_START( htchctch_main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jumppop_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( jumppop_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x120000, 0x123fff) AM_RAM AM_BASE_MEMBER(tumbleb_state, mainram)
AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram)
@@ -748,7 +748,7 @@ static WRITE16_HANDLER( jumpkids_sound_w )
device_set_input_line(state->audiocpu, 0, HOLD_LINE);
}
-static ADDRESS_MAP_START( suprtrio_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( suprtrio_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x700000, 0x700fff) AM_RAM AM_BASE_SIZE_MEMBER(tumbleb_state, spriteram, spriteram_size)
AM_RANGE(0xa00000, 0xa0000f) AM_RAM AM_BASE_MEMBER(tumbleb_state, control)
@@ -762,7 +762,7 @@ static ADDRESS_MAP_START( suprtrio_main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xf00000, 0xf07fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pangpang_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( pangpang_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x120000, 0x123fff) AM_RAM AM_BASE_MEMBER(tumbleb_state, mainram)
AM_RANGE(0x140000, 0x1407ff) AM_RAM_WRITE(paletteram16_xxxxBBBBGGGGRRRR_word_w) AM_BASE_GENERIC(paletteram)
@@ -796,7 +796,7 @@ static WRITE8_HANDLER( oki_sound_bank_w )
memcpy(&oki[0x30000], &oki[(data * 0x10000) + 0x40000], 0x10000);
}
-static ADDRESS_MAP_START( semicom_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( semicom_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xcfff) AM_ROM
AM_RANGE(0xd000, 0xd7ff) AM_RAM
AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -806,7 +806,7 @@ static ADDRESS_MAP_START( semicom_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf00e, 0xf00e) AM_WRITE(oki_sound_bank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( suprtrio_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( suprtrio_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xcfff) AM_ROM
AM_RANGE(0xd000, 0xd7ff) AM_RAM
AM_RANGE(0xf002, 0xf002) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
@@ -820,7 +820,7 @@ static WRITE8_HANDLER(jumppop_z80_bank_w)
memory_set_bankptr(space->machine, "bank1", space->machine->region("audiocpu")->base() + 0x10000 + (0x4000 * data));
}
-static ADDRESS_MAP_START( jumppop_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jumppop_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1")
AM_RANGE(0xf800, 0xffff) AM_RAM
@@ -833,7 +833,7 @@ static READ8_HANDLER(jumppop_z80latch_r)
return soundlatch_r(space, 0);
}
-static ADDRESS_MAP_START( jumppop_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( jumppop_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("ymsnd", ym3812_w)
AM_RANGE(0x02, 0x02) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
@@ -845,7 +845,7 @@ ADDRESS_MAP_END
/* Jump Kids */
-static ADDRESS_MAP_START( jumpkids_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( jumpkids_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_WRITE(jumpkids_sound_w)
AM_RANGE(0x120000, 0x123fff) AM_RAM AM_BASE_MEMBER(tumbleb_state, mainram)
@@ -873,7 +873,7 @@ static WRITE8_HANDLER( jumpkids_oki_bank_w )
memcpy(sound1 + 0x20000, sound2 + bank * 0x20000, 0x20000);
}
-static ADDRESS_MAP_START( jumpkids_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( jumpkids_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_WRITE(jumpkids_oki_bank_w)
@@ -930,11 +930,11 @@ static WRITE8_HANDLER( prot_io_w )
/* Semicom AT89C52 MCU */
-static ADDRESS_MAP_START( protection_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( protection_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( protection_iomap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( protection_iomap, AS_IO, 8 )
AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P3) AM_READWRITE(prot_io_r,prot_io_w)
ADDRESS_MAP_END
@@ -3395,7 +3395,7 @@ static DRIVER_INIT( tumbleb2 )
tumblepb_patch_code(machine, 0x000132);
#endif
- memory_install_write16_device_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), oki, 0x100000, 0x100001, 0, 0, tumbleb2_soundmcu_w );
+ memory_install_write16_device_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), oki, 0x100000, 0x100001, 0, 0, tumbleb2_soundmcu_w );
}
@@ -3433,7 +3433,7 @@ static READ16_HANDLER( bcstory_1a0_read )
static DRIVER_INIT ( bcstory )
{
tumblepb_gfx1_rearrange(machine);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x180008, 0x180009, 0, 0, bcstory_1a0_read ); // io should be here??
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x180008, 0x180009, 0, 0, bcstory_1a0_read ); // io should be here??
}
@@ -3675,7 +3675,7 @@ static DRIVER_INIT( htchctch )
HCROM[0x1e228/2] = 0x4e75;
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x140000, 0x1407ff, 0, 0 ); // kill palette writes as the interrupt code we don't have controls them
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x140000, 0x1407ff, 0, 0 ); // kill palette writes as the interrupt code we don't have controls them
{
@@ -3739,10 +3739,10 @@ static DRIVER_INIT( 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 */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x140000, 0x140fff, 0, 0, paletteram16_xxxxBBBBGGGGRRRR_word_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x140000, 0x140fff, 0, 0, paletteram16_xxxxBBBBGGGGRRRR_word_w);
/* slightly different banking */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x100002, 0x100003, 0, 0, chokchok_tilebank_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x100002, 0x100003, 0, 0, chokchok_tilebank_w);
}
static DRIVER_INIT( wlstar )
@@ -3751,7 +3751,7 @@ static DRIVER_INIT( wlstar )
tumblepb_gfx1_rearrange(machine);
/* slightly different banking */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x100002, 0x100003, 0, 0, wlstar_tilebank_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x100002, 0x100003, 0, 0, wlstar_tilebank_w);
state->protbase = 0x0000;
}
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index 9905217d65d..1e6e83faf35 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -106,7 +106,7 @@ static READ16_HANDLER( tumblepop_controls_r )
/******************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
#if TUMBLEP_HACK
AM_RANGE(0x000000, 0x07ffff) AM_WRITEONLY // To write levels modifications
AM_RANGE(0x000000, 0x07ffff) AM_ROM
@@ -129,7 +129,7 @@ ADDRESS_MAP_END
/******************************************************************************/
/* Physical memory map (21 bits) */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_NOP /* YM2203 - this board doesn't have one */
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c
index 657495548ca..73d30683786 100644
--- a/src/mame/drivers/tunhunt.c
+++ b/src/mame/drivers/tunhunt.c
@@ -132,7 +132,7 @@ static READ8_DEVICE_HANDLER( dsw2_4r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE_MEMBER(tunhunt_state,workram) /* Work RAM */
AM_RANGE(0x1080, 0x10ff) AM_WRITEONLY
AM_RANGE(0x1200, 0x12ff) AM_WRITEONLY
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index f47b03babc5..08aee3f364b 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -738,7 +738,7 @@ static WRITE8_DEVICE_HANDLER( buckrog_ppi8255_0_w )
*
*************************************/
-static ADDRESS_MAP_START( turbo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( turbo_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0xa000, 0xa0ff) AM_MIRROR(0x0700) AM_MASK(0x0f7) AM_RAM AM_BASE_MEMBER(turbo_state, spriteram)
AM_RANGE(0xa800, 0xa807) AM_MIRROR(0x07f8) AM_WRITE(turbo_coin_and_lamp_w)
@@ -764,7 +764,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( subroc3d_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( subroc3d_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xa000, 0xa3ff) AM_RAM AM_BASE_MEMBER(turbo_state, sprite_position) // CONT RAM
AM_RANGE(0xa400, 0xa7ff) AM_RAM AM_BASE_MEMBER(turbo_state, spriteram) // CONT RAM
@@ -788,7 +788,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( buckrog_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( buckrog_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(turbo_videoram_w) AM_BASE_MEMBER(turbo_state, videoram) // FIX PAGE
@@ -806,14 +806,14 @@ static ADDRESS_MAP_START( buckrog_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( buckrog_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( buckrog_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x0000, 0xdfff) AM_WRITE(buckrog_bitmap_w)
AM_RANGE(0xe000, 0xe7ff) AM_MIRROR(0x1800) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( buckrog_cpu2_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( buckrog_cpu2_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0xff) AM_READ(buckrog_cpu2_command_r)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/turrett.c b/src/mame/drivers/turrett.c
index 2534868856a..74249f31b3f 100644
--- a/src/mame/drivers/turrett.c
+++ b/src/mame/drivers/turrett.c
@@ -84,7 +84,7 @@ static SCREEN_UPDATE(turrett)
}
-static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( cpu_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0007ffff) AM_RAM
AM_RANGE(0x1fc00000, 0x1fdfffff) AM_ROM AM_REGION("maincpu", 0)
AM_RANGE(0x02000010, 0x02000013) AM_RAM
diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c
index e8289a7d8ba..e6abb7bdeef 100644
--- a/src/mame/drivers/tutankhm.c
+++ b/src/mame/drivers/tutankhm.c
@@ -118,7 +118,7 @@ static WRITE8_HANDLER( tutankhm_coin_counter_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_RAM AM_BASE_MEMBER(tutankhm_state, videoram)
AM_RANGE(0x8000, 0x800f) AM_MIRROR(0x00f0) AM_RAM AM_BASE_MEMBER(tutankhm_state, paletteram)
AM_RANGE(0x8100, 0x8100) AM_MIRROR(0x000f) AM_RAM AM_BASE_MEMBER(tutankhm_state, scroll)
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index ba26b45e389..c75921c8ae2 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -231,7 +231,7 @@ static WRITE16_HANDLER( cuebrickj_nvram_bank_w )
/* Memory Maps */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_DEVWRITE("upd", twin16_upd_reset_w)
@@ -243,7 +243,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf000) AM_DEVREAD("upd", twin16_upd_busy_r) // miaj writes 0 to it
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_READ_BANK(COMRAM_r) AM_WRITE_BANK(COMRAM_w)
// AM_RANGE(0x044000, 0x04ffff) AM_NOP // miaj
@@ -264,7 +264,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x140000, 0x143fff) AM_RAM AM_SHARE("share1") AM_BASE_SIZE_GENERIC(spriteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_READ_BANK(COMRAM_r) AM_WRITE_BANK(COMRAM_w)
// AM_RANGE(0x044000, 0x04ffff) AM_NOP // miaj
@@ -279,7 +279,7 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x780000, 0x79ffff) AM_RAM AM_BASE_MEMBER(twin16_state, sprite_gfx_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( fround_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( fround_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x043fff) AM_READ_BANK(COMRAM_r) AM_WRITE_BANK(COMRAM_w)
AM_RANGE(0x060000, 0x063fff) AM_RAM
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index 2b59ec63fc8..27158890775 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -271,7 +271,7 @@ Shark Zame
/***************************** 68000 Memory Map *****************************/
-static ADDRESS_MAP_START( main_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x02ffff) AM_ROM
AM_RANGE(0x030000, 0x033fff) AM_RAM /* 68K and DSP shared RAM */
AM_RANGE(0x040000, 0x040fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
@@ -301,12 +301,12 @@ ADDRESS_MAP_END
/***************************** Z80 Memory Map *******************************/
-static ADDRESS_MAP_START( sound_program_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_program_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE_MEMBER(twincobr_state, sharedram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
AM_RANGE(0x10, 0x10) AM_READ_PORT("SYSTEM") /* Twin Cobra - Coin/Start */
@@ -318,13 +318,13 @@ ADDRESS_MAP_END
/***************************** TMS32010 Memory Map **************************/
-static ADDRESS_MAP_START( DSP_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( DSP_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x7ff) AM_ROM
ADDRESS_MAP_END
/* $000 - 08F TMS32010 Internal Data RAM in Data Address Space */
-static ADDRESS_MAP_START( DSP_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( DSP_io_map, AS_IO, 16 )
AM_RANGE(0, 0) AM_WRITE(twincobr_dsp_addrsel_w)
AM_RANGE(1, 1) AM_READWRITE(twincobr_dsp_r, twincobr_dsp_w)
AM_RANGE(2, 2) AM_READWRITE(fsharkbt_dsp_r, fsharkbt_dsp_w)
@@ -335,7 +335,7 @@ ADDRESS_MAP_END
/******************* Flying Shark Bootleg i8741 Memory Map *******************/
-static ADDRESS_MAP_START( fsharkbt_i8741_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( fsharkbt_i8741_io_map, AS_IO, 8 )
/* IO map unknown as program code isn't dumped */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/twinkle.c b/src/mame/drivers/twinkle.c
index bfcb377ffb1..86e4eeca31c 100644
--- a/src/mame/drivers/twinkle.c
+++ b/src/mame/drivers/twinkle.c
@@ -625,7 +625,7 @@ static READ32_HANDLER(shared_psx_r)
return result;
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_SHARE("share1") /* ram */
AM_RANGE(0x1f000000, 0x1f0007ff) AM_READWRITE(shared_psx_r, shared_psx_w)
AM_RANGE(0x1f200000, 0x1f20001f) AM_READWRITE(am53cf96_r, am53cf96_w)
@@ -766,7 +766,7 @@ static WRITE16_HANDLER( shared_68k_w )
state->spu_shared[offset] = data & 0xff;
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x13ffff) AM_RAM
// 220000 = LEDs?
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 1131362f6e9..ce6a4539e15 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -90,13 +90,13 @@ static WRITE16_HANDLER( porte_paloff0_w )
state->paloff = 0;
}
-static ADDRESS_MAP_START( twins_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( twins_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x0ffff) AM_RAM
AM_RANGE(0x10000, 0x1ffff) AM_RAM AM_BASE_MEMBER(twins_state, videoram)
AM_RANGE(0x20000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( twins_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( twins_io, AS_IO, 16 )
AM_RANGE(0x0000, 0x0003) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff)
AM_RANGE(0x0002, 0x0003) AM_DEVREAD8("aysnd", ay8910_r, 0x00ff)
AM_RANGE(0x0004, 0x0005) AM_READWRITE(twins_port4_r, twins_port4_w)
@@ -261,7 +261,7 @@ static READ16_HANDLER( twinsa_unk_r )
return 0xffff;
}
-static ADDRESS_MAP_START( twinsa_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( twinsa_io, AS_IO, 16 )
AM_RANGE(0x0000, 0x0001) AM_READWRITE(twinsa_unk_r, porte_paloff0_w)
AM_RANGE(0x0002, 0x0003) AM_WRITE(porte_paloff0_w)
AM_RANGE(0x0004, 0x0005) AM_WRITE(twinsa_port4_w) // palette on this set
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index 0152ab3d1bc..0040014ae75 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -88,13 +88,13 @@ static INTERRUPT_GEN( z80_irq )
static READ16_HANDLER( z80_shared_r )
{
- address_space *cpu2space = space->machine->device("audio_cpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *cpu2space = space->machine->device("audio_cpu")->memory().space(AS_PROGRAM);
return cpu2space->read_byte(offset);
}
static WRITE16_HANDLER( z80_shared_w )
{
- address_space *cpu2space = space->machine->device("audio_cpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *cpu2space = space->machine->device("audio_cpu")->memory().space(AS_PROGRAM);
cpu2space->write_byte(offset, data & 0xff);
}
@@ -499,7 +499,7 @@ static const ppi8255_interface tx1_ppi8255_intf =
*
*************************************/
-static ADDRESS_MAP_START( tx1_main, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tx1_main, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x00fff) AM_MIRROR(0x1000) AM_RAM
AM_RANGE(0x02000, 0x02fff) AM_MIRROR(0x1000) AM_RAM
AM_RANGE(0x04000, 0x04fff) AM_MIRROR(0x1000) AM_RAM AM_SHARE("nvram")
@@ -515,7 +515,7 @@ static ADDRESS_MAP_START( tx1_main, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xf0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tx1_math, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( tx1_math, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x007ff) AM_RAM AM_BASE_MEMBER(tx1_state, math_ram)
AM_RANGE(0x00800, 0x00fff) AM_READWRITE(tx1_spcs_ram_r, tx1_spcs_ram_w)
AM_RANGE(0x01000, 0x01fff) AM_RAM AM_SHARE("share1")
@@ -530,7 +530,7 @@ static ADDRESS_MAP_START( tx1_math, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfc000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tx1_sound_prg, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( tx1_sound_prg, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x3000, 0x37ff) AM_RAM AM_MIRROR(0x800) AM_BASE_MEMBER(tx1_state, z80_ram)
AM_RANGE(0x4000, 0x4000) AM_WRITE(z80_intreq_w)
@@ -540,7 +540,7 @@ static ADDRESS_MAP_START( tx1_sound_prg, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb000, 0xbfff) AM_READWRITE(ts_r, ts_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tx1_sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tx1_sound_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x41) AM_DEVWRITE("aysnd", ay8910_data_address_w)
ADDRESS_MAP_END
@@ -552,7 +552,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( buggyboy_main, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( buggyboy_main, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x03fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x04000, 0x04fff) AM_READWRITE(tx1_crtc_r, tx1_crtc_w)
AM_RANGE(0x08000, 0x09fff) AM_RAM AM_BASE_MEMBER(tx1_state, vram)
@@ -567,7 +567,7 @@ static ADDRESS_MAP_START( buggyboy_main, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xf0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( buggybjr_main, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( buggybjr_main, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x03fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x04000, 0x04fff) AM_READWRITE(tx1_crtc_r, tx1_crtc_w)
AM_RANGE(0x08000, 0x08fff) AM_RAM AM_BASE_MEMBER(tx1_state, vram)
@@ -582,7 +582,7 @@ static ADDRESS_MAP_START( buggybjr_main, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xf0000, 0xfffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( buggyboy_math, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( buggyboy_math, AS_PROGRAM, 16 )
AM_RANGE(0x00000, 0x007ff) AM_RAM AM_BASE_MEMBER(tx1_state, math_ram)
AM_RANGE(0x00800, 0x00fff) AM_READWRITE(buggyboy_spcs_ram_r, buggyboy_spcs_ram_w)
AM_RANGE(0x01000, 0x01fff) AM_RAM AM_SHARE("share1")
@@ -597,7 +597,7 @@ static ADDRESS_MAP_START( buggyboy_math, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
/* Buggy Boy Sound PCB TC033A */
-static ADDRESS_MAP_START( buggyboy_sound_prg, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( buggyboy_sound_prg, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_MEMBER(tx1_state, z80_ram)
AM_RANGE(0x6000, 0x6001) AM_READ(bb_analog_r)
@@ -608,7 +608,7 @@ static ADDRESS_MAP_START( buggyboy_sound_prg, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* Buggy Boy Jr Sound PCB TC043 */
-static ADDRESS_MAP_START( buggybjr_sound_prg, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( buggybjr_sound_prg, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE_MEMBER(tx1_state, z80_ram)
AM_RANGE(0x5000, 0x5003) AM_DEVREADWRITE("buggyboy", tx1_pit8253_r, tx1_pit8253_w)
@@ -618,7 +618,7 @@ static ADDRESS_MAP_START( buggybjr_sound_prg, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
/* Common */
-static ADDRESS_MAP_START( buggyboy_sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( buggyboy_sound_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x40, 0x40) AM_DEVREAD("ym1", ay8910_r)
AM_RANGE(0x40, 0x41) AM_DEVWRITE("ym1", ay8910_data_address_w)
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index 896de9ee659..c7484386f01 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -129,7 +129,7 @@ static MACHINE_RESET( uapce )
state->jamma_if_control_latch = 0;
}
-static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START( z80_map, AS_PROGRAM, 8)
AM_RANGE( 0x0000, 0x07FF) AM_ROM
AM_RANGE( 0x0800, 0x0FFF) AM_RAM
AM_RANGE( 0x1000, 0x17FF) AM_WRITE( jamma_if_control_latch_w )
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( uapce )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(1)
INPUT_PORTS_END
-static ADDRESS_MAP_START( pce_mem , ADDRESS_SPACE_PROGRAM, 8)
+static ADDRESS_MAP_START( pce_mem , AS_PROGRAM, 8)
AM_RANGE( 0x000000, 0x09FFFF) AM_ROM
AM_RANGE( 0x1F0000, 0x1F1FFF) AM_RAM AM_MIRROR(0x6000) AM_BASE( &pce_user_ram )
AM_RANGE( 0x1FE000, 0x1FE3FF) AM_READWRITE( vdc_0_r, vdc_0_w )
@@ -188,7 +188,7 @@ static ADDRESS_MAP_START( pce_mem , ADDRESS_SPACE_PROGRAM, 8)
AM_RANGE( 0x1FF400, 0x1FF7FF) AM_READWRITE( h6280_irq_status_r, h6280_irq_status_w )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pce_io , ADDRESS_SPACE_IO, 8)
+static ADDRESS_MAP_START( pce_io , AS_IO, 8)
AM_RANGE( 0x00, 0x03) AM_READWRITE( vdc_0_r, vdc_0_w )
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index 8c14536c82b..cdf3f232fe2 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -32,7 +32,7 @@ static WRITE16_HANDLER( sound_irq_trigger_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM
AM_RANGE(0x180000, 0x183fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram)/* Palette */
@@ -55,7 +55,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x304800, 0x304fff) AM_DEVREADWRITE8("k051960", k051960_r, k051960_w, 0x00ff) /* Sprite RAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_RAM
AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r) /* Sound latch read */
@@ -64,7 +64,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w) /* YM2151 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
// AM_RANGE(0x00, 0x00) AM_WRITENOP /* ??? */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c
index 64e1ac36889..eb7c2fae9fc 100644
--- a/src/mame/drivers/ultratnk.c
+++ b/src/mame/drivers/ultratnk.c
@@ -151,7 +151,7 @@ static WRITE8_DEVICE_HANDLER( ultratnk_explosion_w )
}
-static ADDRESS_MAP_START( ultratnk_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( ultratnk_cpu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index 818d5aef2e0..d1daa6cef1a 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -104,7 +104,7 @@ static MACHINE_START( ultrsprt )
-static ADDRESS_MAP_START( ultrsprt_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( ultrsprt_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x0007ffff) AM_RAM AM_BASE_MEMBER(ultrsprt_state, vram)
AM_RANGE(0x70000000, 0x70000003) AM_READWRITE(eeprom_r, eeprom_w)
AM_RANGE(0x70000020, 0x70000023) AM_READ_PORT("P1")
@@ -146,7 +146,7 @@ static WRITE16_HANDLER( K056800_68k_w )
k056800_sound_w(k056800, (offset*2)+1, (data >> 0) & 0xff, 0x00ff);
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x0001ffff) AM_ROM
AM_RANGE(0x00100000, 0x00101fff) AM_RAM
AM_RANGE(0x00200000, 0x00200007) AM_WRITE(K056800_68k_w)
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index e557aaa5c54..54aa77b7985 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -462,7 +462,7 @@ static WRITE32_HANDLER( cbombers_adc_w )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( undrfire_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( undrfire_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x21ffff) AM_RAM AM_BASE_MEMBER(undrfire_state, ram)
AM_RANGE(0x300000, 0x303fff) AM_RAM AM_BASE_SIZE_MEMBER(undrfire_state, spriteram, spriteram_size)
@@ -483,7 +483,7 @@ static ADDRESS_MAP_START( undrfire_map, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cbombers_cpua_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( cbombers_cpua_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x21ffff) AM_RAM
AM_RANGE(0x300000, 0x303fff) AM_RAM AM_BASE_SIZE_MEMBER(undrfire_state, spriteram, spriteram_size)
@@ -502,7 +502,7 @@ static ADDRESS_MAP_START( cbombers_cpua_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_BASE_MEMBER(undrfire_state, shared_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cbombers_cpub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( cbombers_cpub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x400000, 0x40ffff) AM_RAM /* local ram */
// AM_RANGE(0x600000, 0x60ffff) AM_DEVWRITE("tc0480scp", tc0480scp_word_w) /* Only written upon errors */
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 0cd52931733..7579b6d08df 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -57,7 +57,7 @@ static WRITE16_DEVICE_HANDLER( burglarx_sound_bank_w )
}
}
-static ADDRESS_MAP_START( burglarx_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( burglarx_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
AM_RANGE(0x800000, 0x800001) AM_READ_PORT("INPUTS")
@@ -142,7 +142,7 @@ static READ16_HANDLER( unico_guny_1_msb_r )
return ((y&0xff) ^ (space->machine->primary_screen->frame_number()&1))<<8;
}
-static ADDRESS_MAP_START( zeropnt_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( zeropnt_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM // ROM
AM_RANGE(0xef0000, 0xefffff) AM_RAM // RAM
AM_RANGE(0x800030, 0x800031) AM_WRITENOP // ? 0
@@ -214,7 +214,7 @@ static WRITE32_DEVICE_HANDLER( zeropnt2_eeprom_w )
}
}
-static ADDRESS_MAP_START( zeropnt2_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( zeropnt2_map, AS_PROGRAM, 32 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM
AM_RANGE(0x800018, 0x80001b) AM_READ_PORT("SYSTEM")
AM_RANGE(0x800024, 0x800027) AM_DEVREADWRITE8_MODERN("oki1", okim6295_device, read, write, 0x00ff0000 ) // Sound
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index 180a230014b..5e071606b3a 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -91,11 +91,11 @@ static WRITE8_DEVICE_HANDLER( 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 */
- memory_install_write_bank(device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1");
+ memory_install_write_bank(device->machine->device("maincpu")->memory().space(AS_PROGRAM), 0x000000, 0x07ffff, 0, 0, "bank1");
else
/* overlay enabled, map Amiga system ROM on 0x000000 */
- memory_unmap_write(device->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x000000, 0x07ffff, 0, 0);
+ memory_unmap_write(device->machine->device("maincpu")->memory().space(AS_PROGRAM), 0x000000, 0x07ffff, 0, 0);
}
@@ -240,7 +240,7 @@ static WRITE8_DEVICE_HANDLER( upscope_cia_1_porta_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x07ffff) AM_RAMBANK("bank1") AM_BASE_SIZE_MEMBER(upscope_state, chip_ram, chip_ram_size)
AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w)
diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c
index a6757483349..eb116a49155 100644
--- a/src/mame/drivers/usgames.c
+++ b/src/mame/drivers/usgames.c
@@ -60,7 +60,7 @@ static WRITE8_HANDLER( lamps2_w )
-static ADDRESS_MAP_START( usgames_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( usgames_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x2000, 0x2000) AM_READ_PORT("DSW")
AM_RANGE(0x2010, 0x2010) AM_READ_PORT("INPUTS")
@@ -79,7 +79,7 @@ static ADDRESS_MAP_START( usgames_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( usg185_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( usg185_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x2000, 0x2001) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x2400, 0x2400) AM_READ_PORT("DSW")
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index 097e12b0781..d7a23061dc3 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -225,21 +225,21 @@ static WRITE32_DEVICE_HANDLER( aoh_oki_bank_w )
}
-static ADDRESS_MAP_START( common_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( common_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_BASE_MEMBER(vamphalf_state, wram)
AM_RANGE(0x40000000, 0x4003ffff) AM_RAM AM_BASE_MEMBER(vamphalf_state, tiles)
AM_RANGE(0x80000000, 0x8000ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xfff00000, 0xffffffff) AM_ROM AM_REGION("user1",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( common_32bit_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( common_32bit_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM AM_BASE_MEMBER(vamphalf_state, wram32)
AM_RANGE(0x40000000, 0x4003ffff) AM_RAM AM_BASE_MEMBER(vamphalf_state, tiles32)
AM_RANGE(0x80000000, 0x8000ffff) AM_RAM_WRITE(paletteram32_w) AM_BASE_GENERIC(paletteram)
AM_RANGE(0xfff00000, 0xffffffff) AM_ROM AM_REGION("user1",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vamphalf_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( vamphalf_io, AS_IO, 16 )
AM_RANGE(0x0c0, 0x0c1) AM_NOP // return 0, when oki chip is read / written
AM_RANGE(0x0c2, 0x0c3) AM_DEVREADWRITE8_MODERN("oki", okim6295_device, read, write, 0x00ff)
AM_RANGE(0x140, 0x143) AM_DEVWRITE8("ymsnd", ym2151_register_port_w, 0x00ff)
@@ -251,7 +251,7 @@ static ADDRESS_MAP_START( vamphalf_io, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x608, 0x60b) AM_DEVWRITE("eeprom", eeprom_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( misncrft_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( misncrft_io, AS_IO, 16 )
AM_RANGE(0x100, 0x103) AM_WRITE(flipscreen_w)
AM_RANGE(0x200, 0x203) AM_READ_PORT("P1_P2")
AM_RANGE(0x240, 0x243) AM_READ_PORT("SYSTEM")
@@ -259,7 +259,7 @@ static ADDRESS_MAP_START( misncrft_io, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x580, 0x583) AM_DEVREAD("eeprom", eeprom_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( coolmini_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( coolmini_io, AS_IO, 16 )
AM_RANGE(0x200, 0x203) AM_WRITE(flipscreen_w)
AM_RANGE(0x300, 0x303) AM_READ_PORT("SYSTEM")
AM_RANGE(0x304, 0x307) AM_READ_PORT("P1_P2")
@@ -271,7 +271,7 @@ static ADDRESS_MAP_START( coolmini_io, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x7c0, 0x7c3) AM_DEVREAD("eeprom", eeprom_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( suplup_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( suplup_io, AS_IO, 16 )
AM_RANGE(0x020, 0x023) AM_DEVWRITE("eeprom", eeprom_w)
AM_RANGE(0x040, 0x043) AM_READ_PORT("P1_P2")
AM_RANGE(0x060, 0x063) AM_READ_PORT("SYSTEM")
@@ -282,7 +282,7 @@ static ADDRESS_MAP_START( suplup_io, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x100, 0x103) AM_DEVREAD("eeprom", eeprom_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wyvernwg_io, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( wyvernwg_io, AS_IO, 32 )
AM_RANGE(0x1800, 0x1803) AM_READWRITE(wyvernwg_prot_r, wyvernwg_prot_w)
AM_RANGE(0x2000, 0x2003) AM_WRITE(flipscreen32_w)
AM_RANGE(0x2800, 0x2803) AM_READ_PORT("P1_P2")
@@ -292,7 +292,7 @@ static ADDRESS_MAP_START( wyvernwg_io, ADDRESS_SPACE_IO, 32 )
AM_RANGE(0x7c00, 0x7c03) AM_DEVREAD("eeprom", eeprom32_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( finalgdr_io, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( finalgdr_io, AS_IO, 32 )
AM_RANGE(0x2400, 0x2403) AM_READ(finalgdr_prot_r)
AM_RANGE(0x2800, 0x2803) AM_WRITE(finalgdr_backupram_bank_w)
AM_RANGE(0x2c00, 0x2dff) AM_READWRITE(finalgdr_backupram_r, finalgdr_backupram_w)
@@ -309,7 +309,7 @@ static ADDRESS_MAP_START( finalgdr_io, ADDRESS_SPACE_IO, 32 )
AM_RANGE(0x60a0, 0x60a3) AM_DEVWRITE("oki", finalgdr_oki_bank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mrkicker_io, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( mrkicker_io, AS_IO, 32 )
AM_RANGE(0x2400, 0x2403) AM_DEVREAD("eeprom", eeprom32_r)
AM_RANGE(0x4000, 0x4003) AM_READNOP //?
AM_RANGE(0x4000, 0x4003) AM_DEVWRITE("eeprom", finalgdr_eeprom_w)
@@ -324,7 +324,7 @@ static ADDRESS_MAP_START( mrkicker_io, ADDRESS_SPACE_IO, 32 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( jmpbreak_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( jmpbreak_io, AS_IO, 16 )
AM_RANGE(0x0c0, 0x0c3) AM_NOP // ?
AM_RANGE(0x100, 0x103) AM_WRITENOP // ?
AM_RANGE(0x240, 0x243) AM_READ_PORT("P1_P2")
@@ -337,7 +337,7 @@ static ADDRESS_MAP_START( jmpbreak_io, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x684, 0x687) AM_DEVREADWRITE8("ymsnd", ym2151_status_port_r, ym2151_data_port_w, 0x00ff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mrdig_io, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( mrdig_io, AS_IO, 16 )
AM_RANGE(0x500, 0x503) AM_READ_PORT("P1_P2")
AM_RANGE(0x3c0, 0x3c3) AM_DEVWRITE("eeprom", eeprom_w)
AM_RANGE(0x180, 0x183) AM_DEVREAD("eeprom", eeprom_r)
@@ -348,7 +348,7 @@ static ADDRESS_MAP_START( mrdig_io, ADDRESS_SPACE_IO, 16 )
AM_RANGE(0x0c4, 0x0c7) AM_DEVREADWRITE8("ymsnd", ym2151_status_port_r, ym2151_data_port_w, 0x00ff)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aoh_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( aoh_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_BASE_MEMBER(vamphalf_state, wram32)
AM_RANGE(0x40000000, 0x4003ffff) AM_RAM AM_BASE_MEMBER(vamphalf_state, tiles32)
AM_RANGE(0x80000000, 0x8000ffff) AM_RAM_WRITE(paletteram32_w) AM_BASE_GENERIC(paletteram)
@@ -357,7 +357,7 @@ static ADDRESS_MAP_START( aoh_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xffc00000, 0xffffffff) AM_ROM AM_REGION("user1",0)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( aoh_io, ADDRESS_SPACE_IO, 32 )
+static ADDRESS_MAP_START( aoh_io, AS_IO, 32 )
AM_RANGE(0x0480, 0x0483) AM_DEVWRITE("eeprom", eeprom32_w)
AM_RANGE(0x0620, 0x0623) AM_DEVREADWRITE8_MODERN("oki_2", okim6295_device, read, write, 0x0000ff00)
AM_RANGE(0x0660, 0x0663) AM_DEVREADWRITE8_MODERN("oki_1", okim6295_device, read, write, 0x0000ff00)
@@ -648,11 +648,11 @@ static GFXDECODE_START( vamphalf )
GFXDECODE_END
-static ADDRESS_MAP_START( qs1000_prg_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( qs1000_prg_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qs1000_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( qs1000_io_map, AS_IO, 8 )
AM_RANGE( 0x0000, 0x007f) AM_RAM // RAM? wavetable registers? not sure.
ADDRESS_MAP_END
@@ -1822,7 +1822,7 @@ static READ16_HANDLER( mrdig_speedup_r )
static DRIVER_INIT( vamphalf )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0004a840, 0x0004a843, 0, 0, vamphalf_speedup_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0004a840, 0x0004a843, 0, 0, vamphalf_speedup_r );
state->palshift = 0;
state->flip_bit = 0x80;
@@ -1831,7 +1831,7 @@ static DRIVER_INIT( vamphalf )
static DRIVER_INIT( vamphafk )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0004a6d0, 0x0004a6d3, 0, 0, vamphafk_speedup_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0004a6d0, 0x0004a6d3, 0, 0, vamphafk_speedup_r );
state->palshift = 0;
state->flip_bit = 0x80;
@@ -1840,7 +1840,7 @@ static DRIVER_INIT( vamphafk )
static DRIVER_INIT( misncrft )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00072eb4, 0x00072eb7, 0, 0, misncrft_speedup_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00072eb4, 0x00072eb7, 0, 0, misncrft_speedup_r );
state->palshift = 0;
state->flip_bit = 1;
@@ -1849,7 +1849,7 @@ static DRIVER_INIT( misncrft )
static DRIVER_INIT( coolmini )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x000d2e80, 0x000d2e83, 0, 0, coolmini_speedup_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x000d2e80, 0x000d2e83, 0, 0, coolmini_speedup_r );
state->palshift = 0;
state->flip_bit = 1;
@@ -1858,7 +1858,7 @@ static DRIVER_INIT( coolmini )
static DRIVER_INIT( suplup )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0011605c, 0x0011605f, 0, 0, suplup_speedup_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0011605c, 0x0011605f, 0, 0, suplup_speedup_r );
state->palshift = 8;
/* no flipscreen */
@@ -1867,7 +1867,7 @@ static DRIVER_INIT( suplup )
static DRIVER_INIT( luplup )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00115e84, 0x00115e87, 0, 0, luplup_speedup_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00115e84, 0x00115e87, 0, 0, luplup_speedup_r );
state->palshift = 8;
/* no flipscreen */
@@ -1876,7 +1876,7 @@ static DRIVER_INIT( luplup )
static DRIVER_INIT( luplup29 )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00113f08, 0x00113f0b, 0, 0, luplup29_speedup_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00113f08, 0x00113f0b, 0, 0, luplup29_speedup_r );
state->palshift = 8;
/* no flipscreen */
@@ -1885,7 +1885,7 @@ static DRIVER_INIT( luplup29 )
static DRIVER_INIT( puzlbang )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00113ecc, 0x00113ecf, 0, 0, puzlbang_speedup_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00113ecc, 0x00113ecf, 0, 0, puzlbang_speedup_r );
state->palshift = 8;
/* no flipscreen */
@@ -1894,7 +1894,7 @@ static DRIVER_INIT( puzlbang )
static DRIVER_INIT( wyvernwg )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00b56fc, 0x00b56ff, 0, 0, wyvernwg_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00b56fc, 0x00b56ff, 0, 0, wyvernwg_speedup_r );
state->palshift = 0;
state->flip_bit = 1;
@@ -1909,7 +1909,7 @@ static DRIVER_INIT( finalgdr )
vamphalf_state *state = machine->driver_data<vamphalf_state>();
state->finalgdr_backupram_bank = 1;
state->finalgdr_backupram = auto_alloc_array(machine, UINT8, 0x80*0x100);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x005e874, 0x005e877, 0, 0, finalgdr_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x005e874, 0x005e877, 0, 0, finalgdr_speedup_r );
machine->device<nvram_device>("nvram")->set_base(state->finalgdr_backupram, 0x80*0x100);
state->palshift = 0;
@@ -1926,7 +1926,7 @@ static DRIVER_INIT( mrkicker )
// backup ram isn't used
state->finalgdr_backupram_bank = 1;
state->finalgdr_backupram = auto_alloc_array(machine, UINT8, 0x80*0x100);
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00701a4, 0x00701a7, 0, 0, mrkicker_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00701a4, 0x00701a7, 0, 0, mrkicker_speedup_r );
machine->device<nvram_device>("nvram")->set_base(state->finalgdr_backupram, 0x80*0x100);
state->palshift = 0;
@@ -1940,7 +1940,7 @@ static DRIVER_INIT( mrkicker )
static DRIVER_INIT( dquizgo2 )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00cde70, 0x00cde73, 0, 0, dquizgo2_speedup_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00cde70, 0x00cde73, 0, 0, dquizgo2_speedup_r );
state->palshift = 0;
state->flip_bit = 1;
@@ -1949,7 +1949,7 @@ static DRIVER_INIT( dquizgo2 )
static DRIVER_INIT( aoh )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x028a09c, 0x028a09f, 0, 0, aoh_speedup_r );
+ memory_install_read32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x028a09c, 0x028a09f, 0, 0, aoh_speedup_r );
state->palshift = 0;
/* no flipscreen */
@@ -1958,8 +1958,8 @@ static DRIVER_INIT( aoh )
static DRIVER_INIT( jmpbreak )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00906fc, 0x00906ff, 0, 0, jmpbreak_speedup_r );
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe0000000, 0xe0000003, 0, 0, jmpbreak_flipscreen_w );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00906fc, 0x00906ff, 0, 0, jmpbreak_speedup_r );
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe0000000, 0xe0000003, 0, 0, jmpbreak_flipscreen_w );
state->palshift = 0;
}
@@ -1967,8 +1967,8 @@ static DRIVER_INIT( jmpbreak )
static DRIVER_INIT( mrdig )
{
vamphalf_state *state = machine->driver_data<vamphalf_state>();
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00a99c, 0x00a99f, 0, 0, mrdig_speedup_r );
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe0000000, 0xe0000003, 0, 0, jmpbreak_flipscreen_w );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00a99c, 0x00a99f, 0, 0, mrdig_speedup_r );
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe0000000, 0xe0000003, 0, 0, jmpbreak_flipscreen_w );
state->palshift = 0;
}
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index 288580239dd..7907c2587d6 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -47,7 +47,7 @@ static READ16_HANDLER( vaportra_control_r )
/******************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x100000, 0x100003) AM_WRITE(vaportra_priority_w)
AM_RANGE(0x100006, 0x100007) AM_WRITE(vaportra_sound_w)
@@ -76,7 +76,7 @@ static READ8_HANDLER( vaportra_soundlatch_r )
return soundlatch_r(space, offset);
}
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM
AM_RANGE(0x100000, 0x100001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x110000, 0x110001) AM_DEVREADWRITE("ym2", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index 564a4a54756..06ac8153852 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -103,7 +103,7 @@ static WRITE8_HANDLER( flip_screen_w )
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_READWRITE(vastar_bg2videoram_r, vastar_bg2videoram_w) AM_BASE_MEMBER(vastar_state,bg2videoram)
AM_RANGE(0x9000, 0x9fff) AM_READWRITE(vastar_bg1videoram_r, vastar_bg1videoram_w) AM_BASE_MEMBER(vastar_state,bg1videoram)
@@ -123,7 +123,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xcc00, 0xcc3f) AM_WRITEONLY AM_BASE_MEMBER(vastar_state,spriteram3) /* actually cc10-cc1f and cc30-cc3f */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(interrupt_enable_w)
AM_RANGE(0x01, 0x01) AM_WRITE(flip_screen_w)
@@ -131,7 +131,7 @@ static ADDRESS_MAP_START( main_port_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x40ff) AM_READWRITE(vastar_sharedram_r, vastar_sharedram_w)
AM_RANGE(0x8000, 0x8000) AM_READ_PORT("P2")
@@ -139,7 +139,7 @@ static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8080, 0x8080) AM_READ_PORT("SYSTEM")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( cpu2_port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
AM_RANGE(0x02, 0x02) AM_DEVREAD("aysnd", ay8910_r)
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index a9ac5b501d5..024c5124897 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -210,7 +210,7 @@ static WRITE8_HANDLER(vb_scrollx_lo_w)
//Cheaters note: Scores are stored in ram @ 0x57-0x58 (though the space is used for other things between matches)
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x0800, 0x08ff) AM_RAM AM_BASE_SIZE_MEMBER(vball_state, spriteram, spriteram_size)
AM_RANGE(0x1000, 0x1000) AM_READ_PORT("P1")
@@ -232,7 +232,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c
index 8af4e6099f2..60c8ef6b5e3 100644
--- a/src/mame/drivers/vcombat.c
+++ b/src/mame/drivers/vcombat.c
@@ -316,7 +316,7 @@ static WRITE16_DEVICE_HANDLER( vcombat_dac_w )
dac_signed_data_16_w(device, newval + 0x8000);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
AM_RANGE(0x300000, 0x30ffff) AM_WRITE(main_video_write)
@@ -351,7 +351,7 @@ ADDRESS_MAP_END
/* The first i860 - middle board */
-static ADDRESS_MAP_START( vid_0_map, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( vid_0_map, AS_PROGRAM, 64 )
AM_RANGE(0x00000000, 0x0001ffff) AM_RAM_WRITE(v0_fb_w) /* Shared framebuffer - half of the bits lost to 32-bit bus */
AM_RANGE(0x20000000, 0x20000007) AM_RAM AM_SHARE("share6") /* M0<-P0 com 1 (0x440000 in 68k-land) */
AM_RANGE(0x40000000, 0x401fffff) AM_ROM AM_REGION("gfx", 0)
@@ -362,7 +362,7 @@ ADDRESS_MAP_END
/* The second i860 - top board */
-static ADDRESS_MAP_START( vid_1_map, ADDRESS_SPACE_PROGRAM, 64 )
+static ADDRESS_MAP_START( vid_1_map, AS_PROGRAM, 64 )
AM_RANGE(0x00000000, 0x0001ffff) AM_RAM_WRITE(v1_fb_w) /* Half of the bits lost to 32-bit bus */
AM_RANGE(0x20000000, 0x20000007) AM_RAM AM_SHARE("share8") /* M0->P1 com 1 (0x540000 in 68k-land) */
AM_RANGE(0x40000000, 0x401fffff) AM_ROM AM_REGION("gfx", 0)
@@ -373,7 +373,7 @@ ADDRESS_MAP_END
/* Sound CPU */
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM
AM_RANGE(0x0c0000, 0x0c0001) AM_DEVWRITE("dac", vcombat_dac_w)
diff --git a/src/mame/drivers/vd.c b/src/mame/drivers/vd.c
index 9a4ccd72c5d..1b74c3dfb25 100644
--- a/src/mame/drivers/vd.c
+++ b/src/mame/drivers/vd.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( vd_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vd_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c
index a91b49d222b..de90f7ff783 100644
--- a/src/mame/drivers/vega.c
+++ b/src/mame/drivers/vega.c
@@ -25,7 +25,7 @@ public:
};
-static ADDRESS_MAP_START( vega_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vega_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c
index 0671624173a..1d9744cc747 100644
--- a/src/mame/drivers/vegaeo.c
+++ b/src/mame/drivers/vegaeo.c
@@ -94,7 +94,7 @@ static READ32_HANDLER( vegaeo_custom_read )
return input_port_read(space->machine, "SYSTEM");
}
-static ADDRESS_MAP_START( vega_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( vega_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x001fffff) AM_RAM
AM_RANGE(0x80000000, 0x80013fff) AM_READWRITE(vega_vram_r, vega_vram_w)
AM_RANGE(0xfc000000, 0xfc0000ff) AM_DEVREADWRITE8("at28c16", at28c16_r, at28c16_w, 0x000000ff)
diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c
index 8eeb875f73c..1c344e3bb4f 100644
--- a/src/mame/drivers/vegas.c
+++ b/src/mame/drivers/vegas.c
@@ -1559,7 +1559,7 @@ static void remap_dynamic_addresses(running_machine *machine)
/* unmap everything we know about */
for (addr = 0; addr < state->dynamic_count; addr++)
- memory_unmap_readwrite(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), dynamic[addr].start, dynamic[addr].end, 0, 0);
+ memory_unmap_readwrite(machine->device("maincpu")->memory().space(AS_PROGRAM), dynamic[addr].start, dynamic[addr].end, 0, 0);
/* the build the list of stuff */
state->dynamic_count = 0;
@@ -1682,7 +1682,7 @@ static void remap_dynamic_addresses(running_machine *machine)
if (LOG_DYNAMIC) logerror(" installing: %08X-%08X %s,%s\n", dynamic[addr].start, dynamic[addr].end, dynamic[addr].rdname, dynamic[addr].wrname);
if (dynamic[addr].mread == NOP_HANDLER)
- memory_nop_read(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), dynamic[addr].start, dynamic[addr].end, 0, 0);
+ memory_nop_read(machine->device("maincpu")->memory().space(AS_PROGRAM), dynamic[addr].start, dynamic[addr].end, 0, 0);
else if (dynamic[addr].mread != NULL)
space->install_legacy_read_handler(dynamic[addr].start, dynamic[addr].end, 0, 0, dynamic[addr].mread, dynamic[addr].rdname);
if (dynamic[addr].mwrite != NULL)
@@ -1707,7 +1707,7 @@ static void remap_dynamic_addresses(running_machine *machine)
*
*************************************/
-static ADDRESS_MAP_START( vegas_map_8mb, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( vegas_map_8mb, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x007fffff) AM_RAM AM_BASE_MEMBER(vegas_state, rambase) AM_SIZE_MEMBER(vegas_state, ramsize)
AM_RANGE(0x1fa00000, 0x1fa00fff) AM_READWRITE(nile_r, nile_w) AM_BASE_MEMBER(vegas_state, nile_regs)
@@ -1715,7 +1715,7 @@ static ADDRESS_MAP_START( vegas_map_8mb, ADDRESS_SPACE_PROGRAM, 32 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vegas_map_32mb, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( vegas_map_32mb, AS_PROGRAM, 32 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x00000000, 0x01ffffff) AM_RAM AM_BASE_MEMBER(vegas_state, rambase) AM_SIZE_MEMBER(vegas_state, ramsize)
AM_RANGE(0x1fa00000, 0x1fa00fff) AM_READWRITE(nile_r, nile_w) AM_BASE_MEMBER(vegas_state, nile_regs)
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index 938faf73611..cd11bce91e0 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -166,7 +166,7 @@ static WRITE8_HANDLER( 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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
if (select & 1)
{
@@ -235,7 +235,7 @@ static READ8_DEVICE_HANDLER( vendetta_sound_r )
/********************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROMBANK("bank1")
AM_RANGE(0x2000, 0x3fff) AM_RAM
AM_RANGE(0x5f80, 0x5f9f) AM_DEVREADWRITE("k054000", k054000_r, k054000_w)
@@ -260,7 +260,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( esckids_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( esckids_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM // 053248 64K SRAM
AM_RANGE(0x3f80, 0x3f80) AM_READ_PORT("P1")
AM_RANGE(0x3f81, 0x3f81) AM_READ_PORT("P2")
@@ -286,7 +286,7 @@ static ADDRESS_MAP_START( esckids_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xefff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c
index 27e1d7a614a..1b890c7535f 100644
--- a/src/mame/drivers/vertigo.c
+++ b/src/mame/drivers/vertigo.c
@@ -30,7 +30,7 @@
static READ16_DEVICE_HANDLER( vertigo_pit8254_lsb_r ) { return pit8253_r( device, offset ); }
static WRITE16_DEVICE_HANDLER( vertigo_pit8254_lsb_w ) { if (ACCESSING_BITS_0_7) pit8253_w(device, offset, data); }
-static ADDRESS_MAP_START( vertigo_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( vertigo_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x000007) AM_ROM
AM_RANGE(0x000008, 0x001fff) AM_RAM AM_MIRROR(0x010000)
AM_RANGE(0x002000, 0x003fff) AM_RAM AM_BASE_MEMBER(vertigo_state, vectorram)
@@ -56,7 +56,7 @@ ADDRESS_MAP_END
*************************************/
#if 0
-static ADDRESS_MAP_START( vertigo_motor, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vertigo_motor, AS_PROGRAM, 8 )
AM_RANGE(0x010, 0x07f) AM_RAM
AM_RANGE(0x080, 0x7ff) AM_ROM
ADDRESS_MAP_END
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index 9f900b4dd8a..fcc3ef48750 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -251,7 +251,7 @@ static WRITE8_HANDLER( depthch_io_w )
}
-static ADDRESS_MAP_START( depthch_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( depthch_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_RAM_WRITE(vicdual_videoram_w) AM_BASE_MEMBER(vicdual_state, videoram)
AM_RANGE(0x8400, 0x87ff) AM_MIRROR(0x7000) AM_RAM
@@ -259,7 +259,7 @@ static ADDRESS_MAP_START( depthch_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( depthch_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( depthch_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf)
/* no decoder, just logic gates, so in theory the
@@ -333,7 +333,7 @@ static WRITE8_HANDLER( safari_io_w )
}
-static ADDRESS_MAP_START( safari_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( safari_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_NOP /* unused */
AM_RANGE(0x8000, 0x8fff) AM_MIRROR(0x3000) AM_RAM
@@ -343,7 +343,7 @@ static ADDRESS_MAP_START( safari_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( safari_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( safari_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf)
/* no decoder, just logic gates, so in theory the
@@ -417,7 +417,7 @@ static WRITE8_HANDLER( frogs_io_w )
}
-static ADDRESS_MAP_START( frogs_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( frogs_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_RAM_WRITE(vicdual_videoram_w) AM_BASE_MEMBER(vicdual_state, videoram)
AM_RANGE(0x8400, 0x87ff) AM_MIRROR(0x7000) AM_RAM
@@ -425,7 +425,7 @@ static ADDRESS_MAP_START( frogs_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( frogs_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( frogs_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf)
/* no decoder, just logic gates, so in theory the
@@ -538,7 +538,7 @@ static WRITE8_HANDLER( headon_io_w )
}
-static ADDRESS_MAP_START( headon_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( headon_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x6000) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_NOP /* unused */
AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_RAM_WRITE(vicdual_videoram_w) AM_BASE_MEMBER(vicdual_state, videoram)
@@ -547,7 +547,7 @@ static ADDRESS_MAP_START( headon_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( headon_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( headon_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf)
/* no decoder, just logic gates, so in theory the
@@ -556,7 +556,7 @@ static ADDRESS_MAP_START( headon_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sspaceat_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sspaceat_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf)
/* no decoder, just logic gates, so in theory the
@@ -758,7 +758,7 @@ static WRITE8_HANDLER( digger_io_w )
}
-static ADDRESS_MAP_START( headon2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( headon2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x6000) AM_ROM
/* AM_RANGE(0x8000, 0x80ff) AM_MIRROR(0x3f00) */ /* schematics show this as battery backed RAM, but doesn't appear to be used */
AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_RAM_WRITE(vicdual_videoram_w) AM_BASE_MEMBER(vicdual_state, videoram)
@@ -767,7 +767,7 @@ static ADDRESS_MAP_START( headon2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( headon2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( headon2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x1f)
/* no decoder, just logic gates, so in theory the
@@ -776,7 +776,7 @@ static ADDRESS_MAP_START( headon2_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( digger_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( digger_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x1f)
/* no decoder, just logic gates, so in theory the
@@ -1038,7 +1038,7 @@ static WRITE8_HANDLER( alphaho_io_w )
}
-static ADDRESS_MAP_START( vicdual_dualgame_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vicdual_dualgame_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_RAM_WRITE(vicdual_videoram_w) AM_BASE_MEMBER(vicdual_state, videoram)
AM_RANGE(0x8400, 0x87ff) AM_MIRROR(0x7000) AM_RAM
@@ -1046,7 +1046,7 @@ static ADDRESS_MAP_START( vicdual_dualgame_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( invho2_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( invho2_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7f)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x7c) AM_READ_PORT("IN0")
@@ -1060,7 +1060,7 @@ static ADDRESS_MAP_START( invho2_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( invds_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( invds_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7f)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x7c) AM_READ_PORT("IN0")
@@ -1074,7 +1074,7 @@ static ADDRESS_MAP_START( invds_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sspacaho_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sspacaho_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7f)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x7c) AM_READ_PORT("IN0")
@@ -1088,7 +1088,7 @@ static ADDRESS_MAP_START( sspacaho_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( tranqgun_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( tranqgun_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x0c) AM_READ_PORT("IN0")
@@ -1102,7 +1102,7 @@ static ADDRESS_MAP_START( tranqgun_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( spacetrk_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( spacetrk_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7f)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x7c) AM_READ_PORT("IN0")
@@ -1116,7 +1116,7 @@ static ADDRESS_MAP_START( spacetrk_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( carnival_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( carnival_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7f)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x7c) AM_READ_PORT("IN0")
@@ -1130,7 +1130,7 @@ static ADDRESS_MAP_START( carnival_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( brdrline_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( brdrline_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x0c) AM_READ_PORT("IN0")
@@ -1144,7 +1144,7 @@ static ADDRESS_MAP_START( brdrline_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( pulsar_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( pulsar_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7f)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x7c) AM_READ_PORT("IN0")
@@ -1158,7 +1158,7 @@ static ADDRESS_MAP_START( pulsar_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( heiankyo_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( heiankyo_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x0c) AM_READ_PORT("IN0")
@@ -1172,7 +1172,7 @@ static ADDRESS_MAP_START( heiankyo_io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( alphaho_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( alphaho_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7f)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x7c) AM_READ_PORT("IN0")
@@ -2075,7 +2075,7 @@ static WRITE8_HANDLER( samurai_io_w )
/* dual game hardware */
-static ADDRESS_MAP_START( samurai_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( samurai_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM AM_WRITE(samurai_protection_w)
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x7000) AM_RAM_WRITE(vicdual_videoram_w) AM_BASE_MEMBER(vicdual_state, videoram)
AM_RANGE(0x8400, 0x87ff) AM_MIRROR(0x7000) AM_RAM
@@ -2083,7 +2083,7 @@ static ADDRESS_MAP_START( samurai_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( samurai_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( samurai_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7f)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x7c) AM_READ_PORT("IN0")
@@ -2188,7 +2188,7 @@ static WRITE8_HANDLER( nsub_io_w )
}
-static ADDRESS_MAP_START( nsub_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( nsub_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_NOP /* unused */
AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_RAM_WRITE(vicdual_videoram_w) AM_BASE_MEMBER(vicdual_state, videoram)
@@ -2197,7 +2197,7 @@ static ADDRESS_MAP_START( nsub_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( nsub_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( nsub_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf)
/* no decoder, just logic gates, so in theory the
@@ -2284,7 +2284,7 @@ static WRITE8_HANDLER( invinco_io_w )
}
-static ADDRESS_MAP_START( invinco_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( invinco_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x4000) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_NOP /* unused */
AM_RANGE(0xc000, 0xc3ff) AM_MIRROR(0x3000) AM_RAM_WRITE(vicdual_videoram_w) AM_BASE_MEMBER(vicdual_state, videoram)
@@ -2293,7 +2293,7 @@ static ADDRESS_MAP_START( invinco_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( invinco_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( invinco_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xf)
/* no decoder, just logic gates, so in theory the
diff --git a/src/mame/drivers/victory.c b/src/mame/drivers/victory.c
index 158dd6a66d9..7da7f2b1210 100644
--- a/src/mame/drivers/victory.c
+++ b/src/mame/drivers/victory.c
@@ -124,7 +124,7 @@ static WRITE8_HANDLER( lamp_control_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc0ff) AM_READ(victory_video_control_r)
AM_RANGE(0xc100, 0xc1ff) AM_WRITE(victory_video_control_w)
@@ -138,7 +138,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_MIRROR(0x03) AM_READ_PORT("SW2")
AM_RANGE(0x04, 0x04) AM_MIRROR(0x03) AM_READ_PORT("SW1")
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index a623577f022..5d4cb9c2107 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -193,7 +193,7 @@ static WRITE8_DEVICE_HANDLER( videopin_note_dvsr_w )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x01ff) AM_RAM
AM_RANGE(0x0200, 0x07ff) AM_RAM_WRITE(videopin_video_ram_w) AM_BASE_MEMBER(videopin_state, video_ram)
AM_RANGE(0x0800, 0x0800) AM_READ(videopin_misc_r) AM_DEVWRITE("discrete", videopin_note_dvsr_w)
diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c
index 424c062b5f3..d61806eb90d 100644
--- a/src/mame/drivers/videopkr.c
+++ b/src/mame/drivers/videopkr.c
@@ -936,11 +936,11 @@ static TIMER_DEVICE_CALLBACK(sound_t1_callback)
* Memory Map Information *
*************************/
-static ADDRESS_MAP_START( i8039_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( i8039_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( i8039_io_port, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( i8039_io_port, AS_IO, 8 )
AM_RANGE(0x00, 0xff ) AM_READWRITE(videopkr_io_r, videopkr_io_w)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1 ) AM_READWRITE(videopkr_p1_data_r, videopkr_p1_data_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2 ) AM_READWRITE(videopkr_p2_data_r, videopkr_p2_data_w)
@@ -948,22 +948,22 @@ static ADDRESS_MAP_START( i8039_io_port, ADDRESS_SPACE_IO, 8 )
AM_RANGE(MCS48_PORT_T0, MCS48_PORT_T0 ) AM_READ(videopkr_t0_latch)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( i8039_sound_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( i8039_sound_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( i8039_sound_port, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( i8039_sound_port, AS_IO, 8 )
AM_RANGE(0x00 , 0xff ) AM_READWRITE(sound_io_r, sound_io_w)
AM_RANGE(MCS48_PORT_P1, MCS48_PORT_P1) AM_DEVWRITE("dac", dac_w)
AM_RANGE(MCS48_PORT_P2, MCS48_PORT_P2) AM_READWRITE(sound_p2_r, sound_p2_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( i8051_sound_mem, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( i8051_sound_mem, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0fff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( i8051_sound_port, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( i8051_sound_port, AS_IO, 8 )
AM_RANGE(0x0000, 0x1ff) AM_RAM
/* ports */
AM_RANGE(MCS51_PORT_P0, MCS51_PORT_P0) AM_READWRITE(baby_sound_p0_r, baby_sound_p0_w)
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index 5910bc838ec..bb4a7f18238 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -61,7 +61,7 @@ static WRITE8_HANDLER( kikcubic_coin_w )
-static ADDRESS_MAP_START( vigilant_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vigilant_map, AS_PROGRAM, 8 )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* Fallthrough */
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc020, 0xc0df) AM_RAM AM_BASE_SIZE_MEMBER(vigilant_state, spriteram, spriteram_size)
@@ -70,7 +70,7 @@ static ADDRESS_MAP_START( vigilant_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vigilant_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( vigilant_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_WRITE(m72_sound_command_byte_w) /* SD */
AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(vigilant_out2_w) /* OUT2 */
@@ -82,7 +82,7 @@ static ADDRESS_MAP_START( vigilant_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x84, 0x84) AM_WRITE(vigilant_rear_color_w) /* RCOD */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kikcubic_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( kikcubic_map, AS_PROGRAM, 8 )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") /* Fallthrough */
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xc0ff) AM_RAM AM_BASE_SIZE_MEMBER(vigilant_state, spriteram, spriteram_size)
@@ -91,7 +91,7 @@ static ADDRESS_MAP_START( kikcubic_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( kikcubic_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( kikcubic_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("DSW1") AM_WRITE(kikcubic_coin_w) /* also flip screen, and...? */
AM_RANGE(0x01, 0x01) AM_READ_PORT("DSW2")
@@ -102,12 +102,12 @@ static ADDRESS_MAP_START( kikcubic_io_map, ADDRESS_SPACE_IO, 8 )
// AM_RANGE(0x07, 0x07) AM_WRITENOP /* ?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
AM_RANGE(0x80, 0x81) AM_READWRITE(soundlatch_r, vigilant_sample_addr_w) /* STL / STH */
@@ -116,7 +116,7 @@ static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r) /* S ROM C */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( buccanrs_sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( buccanrs_sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x02, 0x03) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w)
diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c
index f2173b4d433..165b6c5f7de 100644
--- a/src/mame/drivers/vindictr.c
+++ b/src/mame/drivers/vindictr.c
@@ -80,7 +80,7 @@ static READ16_HANDLER( port1_r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_GLOBAL_MASK(0x3fffff)
AM_RANGE(0x000000, 0x05ffff) AM_ROM
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index 06b8b176156..4f1968d4813 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -591,7 +591,7 @@ static WRITE64_HANDLER(voodoo3_lfb_w)
/*****************************************************************************/
-static ADDRESS_MAP_START(viper_map, ADDRESS_SPACE_PROGRAM, 64)
+static ADDRESS_MAP_START(viper_map, AS_PROGRAM, 64)
AM_RANGE(0x00000000, 0x00ffffff) AM_MIRROR(0x1000000) AM_RAM
AM_RANGE(0x80000000, 0x800fffff) AM_READWRITE(epic_64be_r, epic_64be_w)
AM_RANGE(0x82000000, 0x83ffffff) AM_DEVREADWRITE32("voodoo", banshee_r, banshee_w, U64(0xffffffffffffffff))
@@ -674,7 +674,7 @@ MACHINE_CONFIG_END
static DRIVER_INIT(viper)
{
-// memory_install_readwrite64_device_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), ide, 0xff200000, 0xff207fff, 0, 0, hdd_r, hdd_w ); //TODO
+// memory_install_readwrite64_device_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), ide, 0xff200000, 0xff207fff, 0, 0, hdd_r, hdd_w ); //TODO
}
static DRIVER_INIT(vipercf)
@@ -683,8 +683,8 @@ static DRIVER_INIT(vipercf)
DRIVER_INIT_CALL(viper);
- memory_install_readwrite64_device_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), ide, 0xff000000, 0xff000fff, 0, 0, cf_card_data_r, cf_card_data_w );
- memory_install_readwrite64_device_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), ide, 0xff200000, 0xff200fff, 0, 0, cf_card_r, cf_card_w );
+ memory_install_readwrite64_device_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), ide, 0xff000000, 0xff000fff, 0, 0, cf_card_data_r, cf_card_data_w );
+ memory_install_readwrite64_device_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), ide, 0xff200000, 0xff200fff, 0, 0, cf_card_r, cf_card_w );
}
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index 378979ff717..2b1026d041c 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -216,7 +216,7 @@ static WRITE8_DEVICE_HANDLER( vmetal_es8712_w )
}
-static ADDRESS_MAP_START( varia_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( varia_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x11ffff) AM_RAM_WRITE(vmetal_texttileram_w) AM_BASE_MEMBER(vmetal_state, texttileram)
AM_RANGE(0x120000, 0x13ffff) AM_RAM_WRITE(vmetal_mid1tileram_w) AM_BASE_MEMBER(vmetal_state, mid1tileram)
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index f0126bb294e..1b170889eee 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -61,7 +61,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM /* program */
AM_RANGE(0x080000, 0x0fffff) AM_ROM /* tiles */
AM_RANGE(0x100000, 0x103fff) AM_RAM /* main */
@@ -78,7 +78,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xf00c00, 0xf00c01) AM_WRITE(volfied_cchip_bank_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8800) AM_DEVWRITE("tc0140syt", tc0140syt_slave_port_w)
diff --git a/src/mame/drivers/vp101.c b/src/mame/drivers/vp101.c
index 3a42fc6a38b..1f1689455db 100644
--- a/src/mame/drivers/vp101.c
+++ b/src/mame/drivers/vp101.c
@@ -46,7 +46,7 @@ static WRITE32_HANDLER(tty_w) // set breakpoint at bfc01430 to catch when it's p
// printf("%c", data);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x07ffffff) AM_RAM // this is a sufficient amount to get "RAM OK"
AM_RANGE(0x1c000000, 0x1c000003) AM_WRITE(tty_w) // RSS OS code uses this one
AM_RANGE(0x1c000014, 0x1c000017) AM_READ(tty_ready_r)
diff --git a/src/mame/drivers/vpoker.c b/src/mame/drivers/vpoker.c
index 7f4e45c8f76..29e91c0173f 100644
--- a/src/mame/drivers/vpoker.c
+++ b/src/mame/drivers/vpoker.c
@@ -179,7 +179,7 @@ static WRITE8_HANDLER( blitter_w )
}
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x3fff)
AM_RANGE(0x0000, 0x01ff) AM_RAM /* vpoker has 0x100, 5acespkr has 0x200 */
AM_RANGE(0x0400, 0x0407) AM_DEVREADWRITE("6840ptm", ptm6840_read, ptm6840_write)
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index 027d5d17d44..63e03ba9f12 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -119,7 +119,7 @@ static SCREEN_UPDATE(vroulet)
/* Memory Maps */
-static ADDRESS_MAP_START( vroulet_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vroulet_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x67ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x8000, 0x8000) AM_NOP
@@ -130,7 +130,7 @@ static ADDRESS_MAP_START( vroulet_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xc000) AM_NOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vroulet_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( vroulet_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREAD("aysnd", ay8910_r)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_data_address_w)
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index 29cdc2fe4a0..71608e1f07e 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -208,7 +208,7 @@ static WRITE8_DEVICE_HANDLER( psg_4017_w )
nes_psg_w(device, 0x17, data);
}
-static ADDRESS_MAP_START( vsnes_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vsnes_cpu1_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM AM_BASE_MEMBER(vsnes_state, work_ram)
AM_RANGE(0x2000, 0x3fff) AM_DEVREADWRITE("ppu1", ppu2c0x_r, ppu2c0x_w)
AM_RANGE(0x4011, 0x4011) AM_DEVWRITE("dac1", dac_w)
@@ -222,7 +222,7 @@ static ADDRESS_MAP_START( vsnes_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( vsnes_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( vsnes_cpu2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM AM_BASE_MEMBER(vsnes_state, work_ram_1)
AM_RANGE(0x2000, 0x3fff) AM_DEVREADWRITE("ppu2", ppu2c0x_r, ppu2c0x_w)
AM_RANGE(0x4011, 0x4011) AM_DEVWRITE("dac2", dac_w)
diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c
index 9eb73484b5a..e2080724c60 100644
--- a/src/mame/drivers/vulgus.c
+++ b/src/mame/drivers/vulgus.c
@@ -55,7 +55,7 @@ static INTERRUPT_GEN( vulgus_interrupt )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x9fff) AM_ROM
AM_RANGE(0xc000, 0xc000) AM_READ_PORT("SYSTEM")
AM_RANGE(0xc001, 0xc001) AM_READ_PORT("P1")
@@ -73,7 +73,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xe000, 0xefff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_RAM
AM_RANGE(0x4000, 0x47ff) AM_WRITEONLY
diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c
index 34870f45ec4..3733ae84a65 100644
--- a/src/mame/drivers/wallc.c
+++ b/src/mame/drivers/wallc.c
@@ -159,7 +159,7 @@ static WRITE8_HANDLER( wallc_coin_counter_w )
coin_counter_w(space->machine, 0,data & 2);
}
-static ADDRESS_MAP_START( wallc_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wallc_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(wallc_videoram_w) AM_MIRROR(0xc00) AM_BASE_MEMBER(wallc_state, videoram) /* 2114, 2114 */
AM_RANGE(0xa000, 0xa3ff) AM_RAM /* 2114, 2114 */
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 10317aacb67..c5c0566c098 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -152,7 +152,7 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw )
address_space *mainspace;
UINT8 *RAM = space->machine->region("maincpu")->base();
- mainspace = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ mainspace = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
state->wardner_membank = data;
if (data)
@@ -188,7 +188,7 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw )
STATE_POSTLOAD( wardner_restore_bank )
{
wardner_state *state = machine->driver_data<wardner_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
wardner_ramrom_bank_sw(space,0,1); /* Dummy value to ensure restoration */
wardner_ramrom_bank_sw(space,0,state->wardner_membank);
@@ -197,7 +197,7 @@ STATE_POSTLOAD( wardner_restore_bank )
/***************************** Z80 Main Memory Map **************************/
-static ADDRESS_MAP_START( main_program_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_program_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x6fff) AM_ROM
AM_RANGE(0x7000, 0x7fff) AM_RAM
@@ -212,7 +212,7 @@ static ADDRESS_MAP_START( main_program_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc800, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( main_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVWRITE("crtc", mc6845_address_w)
AM_RANGE(0x02, 0x02) AM_DEVWRITE("crtc", mc6845_register_w)
@@ -237,7 +237,7 @@ ADDRESS_MAP_END
/***************************** Z80 Sound Memory Map *************************/
-static ADDRESS_MAP_START( sound_program_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_program_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x807f) AM_RAM
AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE("share1") /* Shared RAM with Main Z80 */
@@ -245,7 +245,7 @@ static ADDRESS_MAP_START( sound_program_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w)
ADDRESS_MAP_END
@@ -253,13 +253,13 @@ ADDRESS_MAP_END
/***************************** TMS32010 Memory Map **************************/
-static ADDRESS_MAP_START( DSP_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( DSP_program_map, AS_PROGRAM, 16 )
AM_RANGE(0x000, 0x5ff) AM_ROM
ADDRESS_MAP_END
/* $000 - 08F TMS32010 Internal Data RAM in Data Address Space */
-static ADDRESS_MAP_START( DSP_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( DSP_io_map, AS_IO, 16 )
AM_RANGE(0, 0) AM_WRITE(wardner_dsp_addrsel_w)
AM_RANGE(1, 1) AM_READWRITE(wardner_dsp_r, wardner_dsp_w)
AM_RANGE(3, 3) AM_WRITE(twincobr_dsp_bio_w)
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index 64efc82b413..7b1055a913d 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -303,7 +303,7 @@ static WRITE8_HANDLER( warpwarp_out3_w )
-static ADDRESS_MAP_START( geebee_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( geebee_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x400) AM_RAM_WRITE(geebee_videoram_w) AM_BASE_MEMBER(warpwarp_state, geebee_videoram) // mirror used by kaitei due to a bug
AM_RANGE(0x3000, 0x37ff) AM_ROM AM_REGION("gfx1", 0) // 3000-33ff in geebee
@@ -313,14 +313,14 @@ static ADDRESS_MAP_START( geebee_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7000, 0x7fff) AM_WRITE(geebee_out7_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( geebee_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( geebee_port_map, AS_IO, 8 )
AM_RANGE(0x50, 0x53) AM_READ(geebee_in_r)
AM_RANGE(0x60, 0x6f) AM_WRITE(geebee_out6_w)
AM_RANGE(0x70, 0x7f) AM_WRITE(geebee_out7_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( bombbee_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( bombbee_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x4000, 0x47ff) AM_RAM_WRITE(warpwarp_videoram_w) AM_BASE_MEMBER(warpwarp_state, videoram)
@@ -331,7 +331,7 @@ static ADDRESS_MAP_START( bombbee_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x6030, 0x603f) AM_WRITE(warpwarp_out3_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( warpwarp_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( warpwarp_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
AM_RANGE(0x4000, 0x47ff) AM_RAM_WRITE(warpwarp_videoram_w) AM_BASE_MEMBER(warpwarp_state, videoram)
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index 36b88c555cc..014b72e0e6d 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -231,7 +231,7 @@ static WRITE16_HANDLER( tc0100scn_dual_screen_w )
MEMORY STRUCTURES
***********************************************************/
-static ADDRESS_MAP_START( darius2d_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( darius2d_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* main ram */
AM_RANGE(0x200000, 0x213fff) AM_DEVREAD("tc0100scn_1", tc0100scn_word_r) AM_WRITE(tc0100scn_dual_screen_w) /* tilemaps (all screens) */
@@ -247,7 +247,7 @@ static ADDRESS_MAP_START( darius2d_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x830000, 0x830003) AM_READWRITE(warriorb_sound_r, warriorb_sound_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( warriorb_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( warriorb_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x1fffff) AM_ROM
AM_RANGE(0x200000, 0x213fff) AM_RAM
AM_RANGE(0x300000, 0x313fff) AM_DEVREAD("tc0100scn_1", tc0100scn_word_r) AM_WRITE(tc0100scn_dual_screen_w) /* tilemaps (all screens) */
@@ -264,7 +264,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10")
AM_RANGE(0xc000, 0xdfff) AM_RAM
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index f32557bbad3..a78b6f97010 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -108,7 +108,7 @@ static WRITE8_HANDLER( wc90_sound_command_w )
-static ADDRESS_MAP_START( wc90_map_1, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wc90_map_1, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM /* Main RAM */
AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(wc90_fgvideoram_w) AM_BASE_MEMBER(wc90_state, fgvideoram) /* fg video ram */
@@ -140,7 +140,7 @@ static ADDRESS_MAP_START( wc90_map_1, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfce0, 0xfce0) AM_WRITE(wc90_bankswitch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wc90_map_2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wc90_map_2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE_SIZE_MEMBER(wc90_state, spriteram, spriteram_size)
@@ -152,7 +152,7 @@ static ADDRESS_MAP_START( wc90_map_2, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc01, 0xfc01) AM_WRITE(watchdog_reset_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xf000, 0xf7ff) AM_RAM
AM_RANGE(0xf800, 0xf803) AM_DEVREADWRITE("ymsnd", ym2608_r, ym2608_w)
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index c290e02f8df..ee075400834 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -139,7 +139,7 @@ static WRITE8_HANDLER( adpcm_data_w )
}
-static ADDRESS_MAP_START( wc90b_map1, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wc90b_map1, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x9fff) AM_RAM /* Main RAM */
AM_RANGE(0xa000, 0xafff) AM_RAM_WRITE(wc90b_fgvideoram_w) AM_BASE_MEMBER(wc90b_state, fgvideoram)
@@ -160,7 +160,7 @@ static ADDRESS_MAP_START( wc90b_map1, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfd08, 0xfd08) AM_READ_PORT("DSW2")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wc90b_map2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wc90b_map2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xcfff) AM_RAM
AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_BASE_SIZE_MEMBER(wc90b_state, spriteram, spriteram_size)
@@ -172,7 +172,7 @@ static ADDRESS_MAP_START( wc90b_map2, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xfc00, 0xfc00) AM_WRITE(wc90b_bankswitch1_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_cpu, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank3")
AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", adpcm_control_w)
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index 7dbc4941786..5c3d3a9ed30 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -513,7 +513,7 @@ static WRITE16_HANDLER( blitter_w )
static WRITE16_HANDLER( wecleman_soundlatch_w );
-static ADDRESS_MAP_START( wecleman_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wecleman_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM // ROM (03c000-03ffff used as RAM sometimes!)
AM_RANGE(0x040494, 0x040495) AM_WRITE(wecleman_videostatus_w) AM_BASE_MEMBER(wecleman_state, videostatus) // cloud blending control (HACK)
AM_RANGE(0x040000, 0x043fff) AM_RAM // RAM
@@ -545,7 +545,7 @@ ADDRESS_MAP_END
static WRITE16_HANDLER( hotchase_soundlatch_w );
-static ADDRESS_MAP_START( hotchase_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hotchase_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x040000, 0x063fff) AM_RAM // RAM (weird size!?)
AM_RANGE(0x080000, 0x080011) AM_RAM_WRITE(blitter_w) AM_BASE_MEMBER(wecleman_state, blitter_regs) // Blitter
@@ -575,7 +575,7 @@ ADDRESS_MAP_END
WEC Le Mans 24 Sub CPU Handlers
***************************************************************************/
-static ADDRESS_MAP_START( wecleman_sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wecleman_sub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x00ffff) AM_ROM // ROM
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE_MEMBER(wecleman_state, roadram) AM_SIZE_MEMBER(wecleman_state, roadram_size) // Road
AM_RANGE(0x070000, 0x073fff) AM_RAM AM_SHARE("share1") // RAM (Shared with main CPU)
@@ -586,7 +586,7 @@ ADDRESS_MAP_END
Hot Chase Sub CPU Handlers
***************************************************************************/
-static ADDRESS_MAP_START( hotchase_sub_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( hotchase_sub_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM // ROM
AM_RANGE(0x020000, 0x020fff) AM_RAM AM_BASE_MEMBER(wecleman_state, roadram) AM_SIZE_MEMBER(wecleman_state, roadram_size) // Road
AM_RANGE(0x040000, 0x043fff) AM_RAM AM_SHARE("share1") // Shared with main CPU
@@ -642,7 +642,7 @@ static WRITE8_DEVICE_HANDLER( wecleman_K00723216_bank_w )
k007232_set_bank(device, 0, ~data&1 ); //* (wecleman062gre)
}
-static ADDRESS_MAP_START( wecleman_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wecleman_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_RAM
AM_RANGE(0x8500, 0x8500) AM_WRITENOP // incresed with speed (global volume)?
@@ -735,7 +735,7 @@ static WRITE8_DEVICE_HANDLER( hotchase_k007232_w )
k007232_w(device, offset ^ 1, data);
}
-static ADDRESS_MAP_START( hotchase_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( hotchase_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1000, 0x100d) AM_DEVREADWRITE("konami1", hotchase_k007232_r, hotchase_k007232_w) // 3 x K007232
AM_RANGE(0x2000, 0x200d) AM_DEVREADWRITE("konami2", hotchase_k007232_r, hotchase_k007232_w)
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index d1697711538..e0d2f1513be 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -354,7 +354,7 @@ static WRITE8_HANDLER( pending_command_clear_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x17ffff) AM_ROM
AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_BASE_MEMBER(welltris_state,pixelram) /* Graph_1 & 2*/
@@ -378,13 +378,13 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0xfff00e, 0xfff00f) AM_WRITENOP /* ?? */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x77ff) AM_ROM
AM_RANGE(0x7800, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0xffff) AM_ROMBANK("bank1")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(welltris_sh_bankswitch_w)
AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w)
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index bc5bd5501e4..07f0dcce081 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -647,7 +647,7 @@ static READ16_HANDLER( wgp_sound_r )
MEMORY STRUCTURES
*****************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x10ffff) AM_RAM /* main CPUA ram */
AM_RANGE(0x140000, 0x143fff) AM_RAM AM_BASE_SIZE_MEMBER(wgp_state, sharedram, sharedram_size)
@@ -666,7 +666,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x700000, 0x701fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBxxxx_word_w) AM_BASE_GENERIC(paletteram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 16 ) /* LAN areas not mapped... */
+static ADDRESS_MAP_START( cpu2_map, AS_PROGRAM, 16 ) /* LAN areas not mapped... */
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM
AM_RANGE(0x140000, 0x143fff) AM_READWRITE(sharedram_r,sharedram_w)
@@ -681,7 +681,7 @@ ADDRESS_MAP_END
/***************************************************************************/
-static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( z80_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10") /* Fallthrough */
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c
index 22eb116e470..f6f1ee879cf 100644
--- a/src/mame/drivers/wheelfir.c
+++ b/src/mame/drivers/wheelfir.c
@@ -653,7 +653,7 @@ static WRITE16_HANDLER(coin_cnt_w)
}
-static ADDRESS_MAP_START( wheelfir_main, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wheelfir_main, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
@@ -673,7 +673,7 @@ static ADDRESS_MAP_START( wheelfir_main, ADDRESS_SPACE_PROGRAM, 16 )
/* sub is sound cpu? the program roms contain lots of samples */
-static ADDRESS_MAP_START( wheelfir_sub, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wheelfir_sub, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM
AM_RANGE(0x200000, 0x20ffff) AM_RAM
diff --git a/src/mame/drivers/white_mod.c b/src/mame/drivers/white_mod.c
index 8b3ba1ac3e1..605831e89de 100644
--- a/src/mame/drivers/white_mod.c
+++ b/src/mame/drivers/white_mod.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( whitestar_mod_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( whitestar_mod_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/whitestar.c b/src/mame/drivers/whitestar.c
index c6ed1de8331..be89f57eeec 100644
--- a/src/mame/drivers/whitestar.c
+++ b/src/mame/drivers/whitestar.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( whitestar_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( whitestar_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wico.c b/src/mame/drivers/wico.c
index 8f28ecca31c..46d0e1a2019 100644
--- a/src/mame/drivers/wico.c
+++ b/src/mame/drivers/wico.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( wico_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wico_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index fe62cc4ed84..d2e84de037c 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -514,7 +514,7 @@
*
*************************************/
-static ADDRESS_MAP_START( defender_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( defender_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_RAM AM_BASE_MEMBER(williams_state, videoram)
/* range from 0xc000-0xcfff is mapped programmatically below */
AM_RANGE(0xc000, 0xc00f) AM_BASE_GENERIC(paletteram)
@@ -551,7 +551,7 @@ void defender_install_io_space(address_space *space)
*
*************************************/
-static ADDRESS_MAP_START( williams_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x8fff) AM_READ_BANK("bank1") AM_WRITEONLY AM_BASE_MEMBER(williams_state, videoram)
AM_RANGE(0x9000, 0xbfff) AM_RAM
AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITEONLY AM_BASE_GENERIC(paletteram)
@@ -566,7 +566,7 @@ static ADDRESS_MAP_START( williams_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( williams_extra_ram_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams_extra_ram_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x8fff) AM_READ_BANK("bank1") AM_WRITEONLY AM_BASE_MEMBER(williams_state, videoram)
AM_RANGE(0x9000, 0xbfff) AM_RAM
AM_RANGE(0xc000, 0xc00f) AM_MIRROR(0x03f0) AM_WRITEONLY AM_BASE_GENERIC(paletteram)
@@ -589,7 +589,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( blaster_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( blaster_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_READ_BANK("bank1") AM_WRITEONLY AM_BASE_MEMBER(williams_state, videoram)
AM_RANGE(0x4000, 0x8fff) AM_READ_BANK("bank2") AM_WRITEONLY
AM_RANGE(0xbb00, 0xbbff) AM_WRITEONLY AM_BASE_MEMBER(williams_state, blaster_palette_0)
@@ -617,7 +617,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( williams2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams2_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ_BANK("bank1") AM_WRITEONLY AM_BASE_MEMBER(williams_state, videoram)
AM_RANGE(0x8000, 0xbfff) AM_RAM
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(williams2_tileram_w) AM_BASE_MEMBER(williams_state, williams2_tileram)
@@ -639,7 +639,7 @@ static ADDRESS_MAP_START( williams2_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( williams2_extra_ram_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams2_extra_ram_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READ_BANK("bank1") AM_WRITEONLY AM_BASE_MEMBER(williams_state, videoram)
AM_RANGE(0x8000, 0xbfff) AM_RAM
AM_RANGE(0xc000, 0xc7ff) AM_RAM_WRITE(williams2_tileram_w) AM_BASE_MEMBER(williams_state, williams2_tileram)
@@ -669,14 +669,14 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( defender_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( defender_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */
AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE("pia_2", pia6821_r, pia6821_w)
AM_RANGE(0xb000, 0xffff) AM_ROM /* most games start at $F000, Sinistar starts at $B000 */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */
AM_RANGE(0x0080, 0x00ff) AM_RAM /* MC6810 RAM */
AM_RANGE(0x0400, 0x0403) AM_MIRROR(0x8000) AM_DEVREADWRITE("pia_2", pia6821_r, pia6821_w)
@@ -691,7 +691,7 @@ ADDRESS_MAP_END
*
*************************************/
-static ADDRESS_MAP_START( williams2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( williams2_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM /* internal RAM */
AM_RANGE(0x0080, 0x00ff) AM_RAM /* MC6810 RAM */
AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE("pia_2", pia6821_r, pia6821_w)
@@ -2729,7 +2729,7 @@ static DRIVER_INIT( mayday )
CONFIGURE_BLITTER(WILLIAMS_BLITTER_NONE, 0x0000);
/* install a handler to catch protection checks */
- state->mayday_protection = memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa190, 0xa191, 0, 0, mayday_protection_r);
+ state->mayday_protection = memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa190, 0xa191, 0, 0, mayday_protection_r);
}
@@ -2767,7 +2767,7 @@ static DRIVER_INIT( bubbles )
CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000);
/* bubbles has a full 8-bit-wide CMOS */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xcc00, 0xcfff, 0, 0, bubbles_cmos_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xcc00, 0xcfff, 0, 0, bubbles_cmos_w);
}
@@ -2814,13 +2814,13 @@ static DRIVER_INIT( spdball )
CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000);
/* add a third PIA */
- memory_install_readwrite8_device_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), pia_3, 0xc808, 0xc80b, 0, 0, pia6821_r, pia6821_w);
+ memory_install_readwrite8_device_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), pia_3, 0xc808, 0xc80b, 0, 0, pia6821_r, pia6821_w);
/* install extra input handlers */
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc800, 0xc800, 0, 0, "AN0");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc801, 0xc801, 0, 0, "AN1");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc802, 0xc802, 0, 0, "AN2");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc803, 0xc803, 0, 0, "AN3");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc800, 0xc800, 0, 0, "AN0");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc801, 0xc801, 0, 0, "AN1");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc802, 0xc802, 0, 0, "AN2");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc803, 0xc803, 0, 0, "AN3");
}
@@ -2828,7 +2828,7 @@ static DRIVER_INIT( alienar )
{
williams_state *state = machine->driver_data<williams_state>();
CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000);
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xcbff, 0xcbff, 0, 0);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xcbff, 0xcbff, 0, 0);
}
@@ -2836,7 +2836,7 @@ static DRIVER_INIT( alienaru )
{
williams_state *state = machine->driver_data<williams_state>();
CONFIGURE_BLITTER(WILLIAMS_BLITTER_SC01, 0xc000);
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xcbff, 0xcbff, 0, 0);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xcbff, 0xcbff, 0, 0);
}
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index 6338fbaddb8..ef896ba4d7e 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -102,7 +102,7 @@ static WRITE8_HANDLER( sound_irq_w )
//space->machine->scheduler().synchronize();
}
-static ADDRESS_MAP_START( wink_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wink_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9000, 0x97ff) AM_RAM AM_SHARE("nvram")
@@ -135,7 +135,7 @@ static WRITE8_HANDLER( prot_w )
//take a9-a15 and stuff them in a variable for later use.
}
-static ADDRESS_MAP_START( wink_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( wink_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x1f) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_le_w) AM_BASE_GENERIC(paletteram) //0x10-0x1f is likely to be something else
// AM_RANGE(0x20, 0x20) AM_WRITENOP //??? seems unused..
@@ -158,13 +158,13 @@ static ADDRESS_MAP_START( wink_io, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0xe0, 0xff) AM_READ(prot_r) //load math unit from buffer & lower address-bus
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wink_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wink_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x43ff) AM_RAM
AM_RANGE(0x8000, 0x8000) AM_READ(soundlatch_r)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( wink_sound_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( wink_sound_io, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_DEVREADWRITE("aysnd", ay8910_r, ay8910_data_w)
AM_RANGE(0x80, 0x80) AM_DEVWRITE("aysnd", ay8910_address_w)
diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c
index 8f5004500eb..76250f6122a 100644
--- a/src/mame/drivers/wiping.c
+++ b/src/mame/drivers/wiping.c
@@ -86,7 +86,7 @@ static WRITE8_HANDLER( subcpu_reset_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x8000, 0x83ff) AM_BASE_MEMBER(wiping_state, videoram)
AM_RANGE(0x8400, 0x87ff) AM_BASE_MEMBER(wiping_state, colorram)
@@ -102,7 +102,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xb800, 0xb800) AM_WRITE(watchdog_reset_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_DEVWRITE("wiping", wiping_sound_w)
AM_RANGE(0x9000, 0x93ff) AM_READWRITE(shared1_r,shared1_w)
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index 5a3ea5e4683..a01a4dd48c4 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -459,7 +459,7 @@ static const ym2203_interface ym2203_interface_1 =
NULL
};
-static ADDRESS_MAP_START( map_main, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( map_main, AS_PROGRAM, 8 )
AM_RANGE(0x0000, UNBANKED_SIZE-1) AM_ROM
AM_RANGE(UNBANKED_SIZE, 0x7fff) AM_ROMBANK("bank1")
AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
@@ -478,7 +478,7 @@ static ADDRESS_MAP_START( map_main, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( map_sub, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( map_sub, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
AM_RANGE(0x8008, 0x8009) AM_DEVREADWRITE("ym2", ym2203_r, ym2203_w)
@@ -868,7 +868,7 @@ static DRIVER_INIT(witch)
UINT8 *ROM = (UINT8 *)machine->region("maincpu")->base();
memory_set_bankptr(machine, "bank1", &ROM[0x10000+UNBANKED_SIZE]);
- memory_install_read8_handler(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0x7000, 0x700f, 0, 0, prot_read_700x);
+ memory_install_read8_handler(machine->device("sub")->memory().space(AS_PROGRAM), 0x7000, 0x700f, 0, 0, prot_read_700x);
state->bank = -1;
}
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index 81c04d1ac8a..048adbd206a 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -214,7 +214,7 @@ static WRITE8_HANDLER( wiz_coin_counter_w )
coin_counter_w(space->machine, offset,data);
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc801) AM_WRITE(wiz_coin_counter_w)
@@ -244,7 +244,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf818, 0xf818) AM_WRITE(wiz_bgcolor_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r,interrupt_enable_w) /* Stinger/Scion */
@@ -254,7 +254,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x7000, 0x7000) AM_READWRITE(soundlatch_r,interrupt_enable_w) /* Wiz */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( stinger_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( stinger_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r,interrupt_enable_w) /* Stinger/Scion */
@@ -1034,7 +1034,7 @@ static DRIVER_INIT( stinger )
{ 5,3,7, 0x80 },
{ 5,7,3, 0x28 }
};
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
int size = machine->region("maincpu")->bytes();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, size);
@@ -1071,13 +1071,13 @@ static DRIVER_INIT( stinger )
static DRIVER_INIT( scion )
{
- memory_nop_write(machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x4001, 0, 0);
+ memory_nop_write(machine->device("audiocpu")->memory().space(AS_PROGRAM), 0x4000, 0x4001, 0, 0);
}
static DRIVER_INIT( wiz )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xd400, 0xd400, 0, 0, wiz_protection_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xd400, 0xd400, 0, 0, wiz_protection_r);
}
diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c
index 76f1845aa26..0fb458c1876 100644
--- a/src/mame/drivers/wldarrow.c
+++ b/src/mame/drivers/wldarrow.c
@@ -171,7 +171,7 @@ static WRITE8_DEVICE_HANDLER( wldarrow_dac_4_w )
*
*************************************/
-static ADDRESS_MAP_START( wldarrow_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wldarrow_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x37ff) AM_ROM
AM_RANGE(0x3800, 0x3800) AM_READ_PORT("IN0")
AM_RANGE(0x4000, 0x5fff) AM_RAM AM_BASE_MEMBER(wldarrow_state, videoram_0) AM_SIZE_MEMBER(wldarrow_state, videoram_size)
diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c
index 805a12a5d07..fbe7daf2f52 100644
--- a/src/mame/drivers/wolfpack.c
+++ b/src/mame/drivers/wolfpack.c
@@ -109,7 +109,7 @@ static WRITE8_HANDLER( wolfpack_coldetres_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x00ff) AM_RAM AM_MIRROR(0x100)
AM_RANGE(0x1000, 0x1000) AM_READ_PORT("INPUTS")
AM_RANGE(0x1000, 0x10ff) AM_WRITEONLY AM_BASE_MEMBER(wolfpack_state, alpha_num_ram)
diff --git a/src/mame/drivers/wpc_95.c b/src/mame/drivers/wpc_95.c
index 41c6696dbf4..c3f13a9dc56 100644
--- a/src/mame/drivers/wpc_95.c
+++ b/src/mame/drivers/wpc_95.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( wpc_95_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wpc_95_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wpc_an.c b/src/mame/drivers/wpc_an.c
index ee974d980a9..66b1bb4b3fc 100644
--- a/src/mame/drivers/wpc_an.c
+++ b/src/mame/drivers/wpc_an.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( wpc_an_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wpc_an_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wpc_dcs.c b/src/mame/drivers/wpc_dcs.c
index a951f9c8b38..d99d18582bf 100644
--- a/src/mame/drivers/wpc_dcs.c
+++ b/src/mame/drivers/wpc_dcs.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( wpc_dcs_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wpc_dcs_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wpc_dot.c b/src/mame/drivers/wpc_dot.c
index 9e3309a3533..cc48436d892 100644
--- a/src/mame/drivers/wpc_dot.c
+++ b/src/mame/drivers/wpc_dot.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( wpc_dot_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wpc_dot_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wpc_flip1.c b/src/mame/drivers/wpc_flip1.c
index b3d83231cae..47b9dd4987c 100644
--- a/src/mame/drivers/wpc_flip1.c
+++ b/src/mame/drivers/wpc_flip1.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( wpc_flip1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wpc_flip1_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wpc_flip2.c b/src/mame/drivers/wpc_flip2.c
index 160b30bf99c..6ab31f1173a 100644
--- a/src/mame/drivers/wpc_flip2.c
+++ b/src/mame/drivers/wpc_flip2.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( wpc_flip2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wpc_flip2_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wpc_s.c b/src/mame/drivers/wpc_s.c
index 53c682afb9b..4463a053520 100644
--- a/src/mame/drivers/wpc_s.c
+++ b/src/mame/drivers/wpc_s.c
@@ -11,7 +11,7 @@ public:
};
-static ADDRESS_MAP_START( wpc_s_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( wpc_s_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c
index 0aff2b85bd6..749c78bf486 100644
--- a/src/mame/drivers/wrally.c
+++ b/src/mame/drivers/wrally.c
@@ -101,7 +101,7 @@ produces a high clock frequency, slow movements a low freq.
#include "includes/wrally.h"
-static ADDRESS_MAP_START( wrally_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( wrally_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* ROM */
AM_RANGE(0x100000, 0x103fff) AM_RAM_WRITE(wrally_vram_w) AM_BASE_MEMBER(wrally_state, videoram) /* encrypted Video RAM */
AM_RANGE(0x108000, 0x108007) AM_RAM AM_BASE_MEMBER(wrally_state, vregs) /* Video Registers */
@@ -138,11 +138,11 @@ static WRITE8_HANDLER( dallas_share_w )
shareram[BYTE_XOR_LE(offset) ^ 1] = data;
}
-static ADDRESS_MAP_START( dallas_rom, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( dallas_rom, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM /* Code in NVRAM */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( dallas_ram, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( dallas_ram, AS_IO, 8 )
AM_RANGE(0x0000, 0xffff) AM_READWRITE(dallas_share_r, dallas_share_w) AM_MASK(0x3fff) /* Shared RAM with the main CPU */
ADDRESS_MAP_END
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index 35719e15f03..710fbcdc079 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -159,7 +159,7 @@ static WRITE16_HANDLER ( wwfsstar_scrollwrite );
Pretty Straightforward
*******************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x080fff) AM_RAM_WRITE(wwfsstar_fg0_videoram_w) AM_BASE_MEMBER(wwfsstar_state,fg0_videoram) /* FG0 Ram */
AM_RANGE(0x0c0000, 0x0c0fff) AM_RAM_WRITE(wwfsstar_bg0_videoram_w) AM_BASE_MEMBER(wwfsstar_state,bg0_videoram) /* BG0 Ram */
@@ -177,7 +177,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM /* Work Ram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x8800, 0x8801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index 8c661bebc69..87dfba7c946 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -66,7 +66,7 @@ static WRITE16_HANDLER ( wwfwfest_irq_ack_w );
still some unknown writes however, sound cpu memory map is the same as dd3
*******************************************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x0c0000, 0x0c1fff) AM_RAM_WRITE(wwfwfest_fg0_videoram_w) AM_BASE_MEMBER(wwfwfest_state, fg0_videoram) /* FG0 Ram - 4 bytes per tile */
AM_RANGE(0x0c2000, 0x0c3fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) /* SPR Ram */
@@ -85,7 +85,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x1c0000, 0x1c3fff) AM_RAM /* Work Ram */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xc7ff) AM_RAM
AM_RANGE(0xc800, 0xc801) AM_DEVREADWRITE("ymsnd", ym2151_r, ym2151_w)
@@ -383,7 +383,7 @@ static const ym2151_interface ym2151_config =
static SCREEN_EOF( wwfwfest )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space,0,0,0xffff);
}
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index 3efd374613a..2b760e00452 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -399,7 +399,7 @@ READ8_HANDLER( mcu_comm_reset_r )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x2000, 0x27ff) AM_RAM_WRITE(xain_charram_w) AM_BASE_MEMBER(xain_state, charram)
AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(xain_bgram1_w) AM_BASE_MEMBER(xain_state, bgram1)
@@ -427,7 +427,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cpu_map_B, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cpu_map_B, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x2000, 0x2000) AM_WRITE(xain_irqA_assert_w)
AM_RANGE(0x2800, 0x2800) AM_WRITE(xain_irqB_clear_w)
@@ -436,7 +436,7 @@ static ADDRESS_MAP_START( cpu_map_B, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( mcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_READWRITE(xain_68705_port_a_r, xain_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_READWRITE(xain_68705_port_b_r, xain_68705_port_b_w)
@@ -450,7 +450,7 @@ static ADDRESS_MAP_START( mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0080, 0x07ff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x07ff) AM_RAM
AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r)
AM_RANGE(0x2800, 0x2801) AM_DEVWRITE("ym1", ym2203_w)
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index d13385ac0bd..6df09cc1a4d 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -321,7 +321,7 @@ static INTERRUPT_GEN( xexex_interrupt )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x08ffff) AM_RAM AM_BASE_MEMBER(xexex_state, workram) // work RAM
@@ -369,7 +369,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2")
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 202073f9e5d..550b467a684 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -109,7 +109,7 @@ static WRITE8_HANDLER( sound_bankswitch_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE("k053246", k053247_word_r, k053247_word_w)
@@ -130,7 +130,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x18c000, 0x197fff) AM_DEVREADWRITE("k052109", k052109_lsb_r, k052109_lsb_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank4")
AM_RANGE(0xc000, 0xdfff) AM_RAM
@@ -142,7 +142,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( 6p_main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( 6p_main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
AM_RANGE(0x080000, 0x0fffff) AM_ROM
AM_RANGE(0x100000, 0x100fff) AM_RAM AM_BASE_MEMBER(xmen_state, xmen6p_spriteramleft) /* sprites (screen 1) */
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index 4a0a418eca5..8e0994466ff 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -67,7 +67,7 @@ static WRITE16_DEVICE_HANDLER( eeprom_data_w )
}
-static ADDRESS_MAP_START( xorworld_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( xorworld_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x200000, 0x200001) AM_READ_PORT("P1")
AM_RANGE(0x400000, 0x400001) AM_READ_PORT("P2")
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index 30164f32fe5..00a10a21c14 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -206,7 +206,7 @@ static READ16_HANDLER( analogy_watchdog_r )
*
*************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x00000000, 0x0001ffff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x01000000, 0x010fffff) AM_RAM AM_BASE_MEMBER(xtheball_state, vram_bg)
AM_RANGE(0x02000000, 0x020fffff) AM_RAM AM_BASE_MEMBER(xtheball_state, vram_fg)
diff --git a/src/mame/drivers/xtom3d.c b/src/mame/drivers/xtom3d.c
index 1d6457e2777..e49661d6ed3 100644
--- a/src/mame/drivers/xtom3d.c
+++ b/src/mame/drivers/xtom3d.c
@@ -65,12 +65,12 @@ static SCREEN_UPDATE(xtom3d)
return 0;
}
-static ADDRESS_MAP_START(xtom3d_map, ADDRESS_SPACE_PROGRAM, 32)
+static ADDRESS_MAP_START(xtom3d_map, AS_PROGRAM, 32)
AM_RANGE(0x00000000, 0x0009ffff) AM_RAM
AM_RANGE(0xfffc0000, 0xffffffff) AM_ROM AM_REGION("user1", 0) /* System BIOS */
ADDRESS_MAP_END
-static ADDRESS_MAP_START(xtom3d_io, ADDRESS_SPACE_IO, 32)
+static ADDRESS_MAP_START(xtom3d_io, AS_IO, 32)
ADDRESS_MAP_END
static INPUT_PORTS_START( xtom3d )
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index 31139e81168..84f78dcc7c9 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -89,7 +89,7 @@ static MACHINE_START( xxmissio )
/****************************************************************************/
-static ADDRESS_MAP_START( map1, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( map1, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8001) AM_DEVREADWRITE("ym1", ym2203_r, ym2203_w)
@@ -112,7 +112,7 @@ static ADDRESS_MAP_START( map1, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( map2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( map2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x3fff) AM_ROM
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1")
diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c
index 8205a0d81e9..166dcd30dd9 100644
--- a/src/mame/drivers/xybots.c
+++ b/src/mame/drivers/xybots.c
@@ -82,7 +82,7 @@ static READ16_HANDLER( special_port1_r )
*************************************/
/* full map verified from schematics */
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000000, 0x007fff) AM_MIRROR(0x7c0000) AM_ROM
AM_RANGE(0x008000, 0x00ffff) AM_MIRROR(0x7c0000) AM_ROM /* slapstic maps here */
diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c
index cf7411ba8e6..ae54340c2a3 100644
--- a/src/mame/drivers/xyonix.c
+++ b/src/mame/drivers/xyonix.c
@@ -134,13 +134,13 @@ static WRITE8_HANDLER ( xyonix_io_w )
/* Mem / Port Maps ***********************************************************/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xbfff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
AM_RANGE(0xe000, 0xffff) AM_RAM_WRITE(xyonix_vidram_w) AM_BASE_MEMBER(xyonix_state,vidram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x20, 0x20) AM_READNOP AM_DEVWRITE("sn1", sn76496_w) /* SN76496 ready signal */
AM_RANGE(0x21, 0x21) AM_READNOP AM_DEVWRITE("sn2", sn76496_w)
diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c
index 52e403b8193..00f70494351 100644
--- a/src/mame/drivers/yiear.c
+++ b/src/mame/drivers/yiear.c
@@ -119,7 +119,7 @@ static INTERRUPT_GEN( yiear_nmi_interrupt )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_DEVREAD("vlm", yiear_speech_r)
AM_RANGE(0x4000, 0x4000) AM_WRITE(yiear_control_w)
AM_RANGE(0x4800, 0x4800) AM_WRITE(konami_SN76496_latch_w)
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 716ecb75321..162e2621a35 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -112,7 +112,7 @@ static WRITE16_HANDLER( yunsun16_sound_bank_w )
}
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x800000, 0x800001) AM_READ_PORT("INPUTS")
AM_RANGE(0x800018, 0x800019) AM_READ_PORT("SYSTEM")
@@ -157,7 +157,7 @@ number 0 on each voice. That sample is 00000-00000.
static DRIVER_INIT( magicbub )
{
// remove_mem_write16_handler (0, 0x800180, 0x800181 );
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x800188, 0x800189, 0, 0, magicbub_sound_command_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x800188, 0x800189, 0, 0, magicbub_sound_command_w);
}
/***************************************************************************
@@ -168,12 +168,12 @@ static DRIVER_INIT( magicbub )
***************************************************************************/
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0xdfff) AM_ROM
AM_RANGE(0xe000, 0xe7ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( sound_port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x10, 0x11) AM_DEVREADWRITE("ymsnd", ym3812_r, ym3812_w )
AM_RANGE(0x18, 0x18) AM_READ(soundlatch_r ) // From Main CPU
diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c
index ef0e1f022d8..f35ae6f2f25 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -65,7 +65,7 @@ static WRITE8_HANDLER( yunsung8_bankswitch_w )
d000-dfff Tiles ""
*/
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0001, 0x0001) AM_WRITE(yunsung8_bankswitch_w) // ROM Bank (again?)
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") // Banked ROM
AM_RANGE(0x0000, 0xbfff) AM_ROM
@@ -74,7 +74,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ_PORT("SYSTEM") AM_WRITE(yunsung8_videobank_w) // video RAM bank
AM_RANGE(0x01, 0x01) AM_READ_PORT("P1") AM_WRITE(yunsung8_bankswitch_w) // ROM Bank + Layers Enable
@@ -115,7 +115,7 @@ static WRITE8_HANDLER( yunsung8_adpcm_w )
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank2") // Banked ROM
AM_RANGE(0xe000, 0xe000) AM_DEVWRITE("msm", yunsung8_sound_bankswitch_w ) // ROM Bank
diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c
index d3c884a87c0..dd51f22f1f1 100644
--- a/src/mame/drivers/zac2650.c
+++ b/src/mame/drivers/zac2650.c
@@ -17,7 +17,7 @@
static WRITE8_HANDLER( tinvader_sound_w );
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x17ff) AM_ROM
AM_RANGE(0x1800, 0x1bff) AM_RAM_WRITE(tinvader_videoram_w) AM_BASE_MEMBER(zac2650_state, videoram)
AM_RANGE(0x1c00, 0x1cff) AM_RAM
@@ -30,7 +30,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x1f00, 0x1fff) AM_READWRITE(zac_s2636_r, zac_s2636_w) AM_BASE_MEMBER(zac2650_state, s2636_0_ram)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( port_map, AS_IO, 8 )
AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE")
ADDRESS_MAP_END
diff --git a/src/mame/drivers/zac_1.c b/src/mame/drivers/zac_1.c
index 04c3e5b5c49..5707e9b3035 100644
--- a/src/mame/drivers/zac_1.c
+++ b/src/mame/drivers/zac_1.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( zac_1_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( zac_1_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/zac_2.c b/src/mame/drivers/zac_2.c
index 7b163f21f26..7d9e4949857 100644
--- a/src/mame/drivers/zac_2.c
+++ b/src/mame/drivers/zac_2.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( zac_2_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( zac_2_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/zac_proto.c b/src/mame/drivers/zac_proto.c
index 0d4195e3458..d172e200ce0 100644
--- a/src/mame/drivers/zac_proto.c
+++ b/src/mame/drivers/zac_proto.c
@@ -14,7 +14,7 @@ public:
};
-static ADDRESS_MAP_START( zac_proto_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( zac_proto_map, AS_PROGRAM, 8 )
ADDRESS_MAP_UNMAP_HIGH
ADDRESS_MAP_END
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index d6aaae50f4d..23341484458 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -258,7 +258,7 @@ static WRITE8_HANDLER( nmienable_w )
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x63ff) AM_READONLY
AM_RANGE(0x6400, 0x6407) AM_READ(zaccaria_prot1_r)
@@ -300,7 +300,7 @@ ADDRESS_MAP_END
6821 PIA: CA1 comes from the master sound cpu's latch bit 7 (which is also connected to the AY chip at 4G's IOB1); CB1 comes from a periodic counter clocked by the 6802's clock, divided by 4096. CA2 and CB2 are disconnected. PA0-7 connect to the data busses of the AY-3-8910 chips; PB0 and PB1 connect to the BC1 and BDIR pins of the AY chip at 4G; PB2 and PB3 connect to the BC1 and BDIR pins of the AY chip at 4H.
*/
-static ADDRESS_MAP_START( sound_map_1, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map_1, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM
AM_RANGE(0x500c, 0x500f) AM_DEVREADWRITE("pia0", pia6821_r, pia6821_w) AM_MIRROR(0x1ff0)
AM_RANGE(0x8000, 0x9fff) AM_ROM AM_MIRROR(0x2000) // rom 13
@@ -327,7 +327,7 @@ ADDRESS_MAP_END
6821 PIA: PA0-7, CA2 and CB1 connect to the TMS5200; CA1 and CB2 are disconnected, though the test mode assumes there's something connected to CB2 (possibly another LED like the one connected to PB4); PB3 connects to 'ACS' which goes to the z80.
*/
-static ADDRESS_MAP_START( sound_map_2, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map_2, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x007f) AM_RAM /* 6802 internal ram */
AM_RANGE(0x0090, 0x0093) AM_DEVREADWRITE("pia1", pia6821_r, pia6821_w) AM_MIRROR(0x8F6C)
AM_RANGE(0x1000, 0x1000) AM_DEVWRITE("dac2", mc1408_data_w) AM_MIRROR(0x83FF) /* MC1408 */
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index 6705d60c189..ce5864adf0a 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -438,7 +438,7 @@ static CUSTOM_INPUT( zaxxon_coin_r )
*************************************/
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( zaxxon_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( zaxxon_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x5fff) AM_ROM
AM_RANGE(0x6000, 0x6fff) AM_RAM
AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x1c00) AM_RAM_WRITE(zaxxon_videoram_w) AM_BASE_MEMBER(zaxxon_state,videoram)
@@ -461,7 +461,7 @@ ADDRESS_MAP_END
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( congo_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( congo_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0xa000, 0xa3ff) AM_MIRROR(0x1800) AM_RAM_WRITE(zaxxon_videoram_w) AM_BASE_MEMBER(zaxxon_state,videoram)
@@ -487,7 +487,7 @@ ADDRESS_MAP_END
/* complete memory map derived from schematics */
-static ADDRESS_MAP_START( congo_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( congo_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x4000, 0x47ff) AM_MIRROR(0x1800) AM_RAM
AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x1fff) AM_DEVWRITE("sn1", sn76496_w)
@@ -1447,7 +1447,7 @@ static void zaxxonj_decode(running_machine *machine, const char *cputag)
};
int A;
- address_space *space = machine->device(cputag)->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device(cputag)->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region(cputag)->base();
int size = machine->region(cputag)->bytes();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, size);
@@ -1512,15 +1512,15 @@ static DRIVER_INIT( razmataz )
nprinces_decode(machine, "maincpu");
/* additional input ports are wired */
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc004, 0xc004, 0, 0x18f3, "SW04");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc008, 0xc008, 0, 0x18f3, "SW08");
- memory_install_read_port(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc00c, 0xc00c, 0, 0x18f3, "SW0C");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc004, 0xc004, 0, 0x18f3, "SW04");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc008, 0xc008, 0, 0x18f3, "SW08");
+ memory_install_read_port(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc00c, 0xc00c, 0, 0x18f3, "SW0C");
/* unknown behavior expected here */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc80a, 0xc80a, 0, 0, razmataz_counter_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc80a, 0xc80a, 0, 0, razmataz_counter_r);
/* connect the universal sound board */
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe03c, 0xe03c, 0, 0x1f00, sega_usb_status_r, sega_usb_data_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe03c, 0xe03c, 0, 0x1f00, sega_usb_status_r, sega_usb_data_w);
/* additional state saving */
state->save_item(NAME(state->razmataz_dial_pos));
@@ -1533,7 +1533,7 @@ static DRIVER_INIT( ixion )
szaxxon_decode(machine, "maincpu");
/* connect the universal sound board */
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xe03c, 0xe03c, 0, 0x1f00, sega_usb_status_r, sega_usb_data_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xe03c, 0xe03c, 0, 0x1f00, sega_usb_status_r, sega_usb_data_w);
}
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index e93c063248c..95eee0ad1d8 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -63,7 +63,7 @@ static WRITE16_HANDLER( zerozone_sound_w )
}
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x080000, 0x08000f) AM_READ(zerozone_input_r)
AM_RANGE(0x084000, 0x084001) AM_WRITE(zerozone_sound_w)
@@ -75,7 +75,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x0f8000, 0x0f87ff) AM_RAM /* Never read from */
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
AM_RANGE(0x9800, 0x9800) AM_DEVREADWRITE_MODERN("oki", okim6295_device, read, write)
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index e9856e4c6b2..2ce2da8b084 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -416,7 +416,7 @@ static WRITE32_HANDLER( coin_w )
}
}
-static ADDRESS_MAP_START( zn_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( zn_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x003fffff) AM_RAM AM_SHARE("share1") /* ram */
AM_RANGE(0x00400000, 0x007fffff) AM_RAM AM_SHARE("share1") /* ram mirror */
AM_RANGE(0x1f800000, 0x1f8003ff) AM_RAM /* scratchpad */
@@ -459,7 +459,7 @@ static ADDRESS_MAP_START( zn_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xfffe0130, 0xfffe0133) AM_WRITENOP
ADDRESS_MAP_END
-static ADDRESS_MAP_START( link_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( link_map, AS_PROGRAM, 8 )
ADDRESS_MAP_END
static void zn_driver_init( running_machine *machine )
@@ -711,13 +711,13 @@ static WRITE32_HANDLER( zn_qsound_w )
static DRIVER_INIT( coh1000c )
{
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" ); /* fixed game rom */
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" ); /* banked game rom */
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, bank_coh1000c_w ); /* bankswitch */
- memory_install_read32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb40010, 0x1fb40013, 0, 0, capcom_kickharness_r );
- memory_install_read32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb40020, 0x1fb40023, 0, 0, capcom_kickharness_r );
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fbfffff, 0, 0, "bank3" ); /* country rom */
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb60000, 0x1fb60003, 0, 0, zn_qsound_w );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" ); /* fixed game rom */
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" ); /* banked game rom */
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, bank_coh1000c_w ); /* bankswitch */
+ memory_install_read32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb40010, 0x1fb40013, 0, 0, capcom_kickharness_r );
+ memory_install_read32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb40020, 0x1fb40023, 0, 0, capcom_kickharness_r );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb80000, 0x1fbfffff, 0, 0, "bank3" ); /* country rom */
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb60000, 0x1fb60003, 0, 0, zn_qsound_w );
zn_driver_init(machine);
@@ -739,7 +739,7 @@ static MACHINE_RESET( coh1000c )
zn_machine_init(machine);
}
-static ADDRESS_MAP_START( qsound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( qsound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank10") /* banked (contains music data) */
AM_RANGE(0xd000, 0xd002) AM_DEVWRITE("qsound", qsound_w)
@@ -748,7 +748,7 @@ static ADDRESS_MAP_START( qsound_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xf000, 0xffff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( qsound_portmap, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( qsound_portmap, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r)
ADDRESS_MAP_END
@@ -928,13 +928,13 @@ static WRITE32_HANDLER( bank_coh3002c_w )
static DRIVER_INIT( coh3002c )
{
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" ); /* fixed game rom */
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" ); /* banked game rom */
- memory_install_read32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb40010, 0x1fb40013, 0, 0, capcom_kickharness_r );
- memory_install_read32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb40020, 0x1fb40023, 0, 0, capcom_kickharness_r );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, bank_coh3002c_w ); /* bankswitch */
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fbfffff, 0, 0, "bank3" ); /* country rom */
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb60000, 0x1fb60003, 0, 0, zn_qsound_w );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" ); /* fixed game rom */
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" ); /* banked game rom */
+ memory_install_read32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb40010, 0x1fb40013, 0, 0, capcom_kickharness_r );
+ memory_install_read32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb40020, 0x1fb40023, 0, 0, capcom_kickharness_r );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, bank_coh3002c_w ); /* bankswitch */
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb80000, 0x1fbfffff, 0, 0, "bank3" ); /* country rom */
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb60000, 0x1fb60003, 0, 0, zn_qsound_w );
zn_driver_init(machine);
}
@@ -1218,10 +1218,10 @@ static DRIVER_INIT( coh1000ta )
state->taitofx1_eeprom_size1 = 0x200; state->taitofx1_eeprom1 = auto_alloc_array( machine, UINT8, state->taitofx1_eeprom_size1 );
machine->device<nvram_device>("eeprom1")->set_base(state->taitofx1_eeprom1, state->taitofx1_eeprom_size1);
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked game rom */
- memory_install_write32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb40000, 0x1fb40003, 0, 0, bank_coh1000t_w ); /* bankswitch */
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fb80003, 0, 0, taitofx1a_ymsound_r, taitofx1a_ymsound_w );
- memory_install_readwrite_bank( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( state->taitofx1_eeprom_size1 - 1 ), 0, 0, "bank2" );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked game rom */
+ memory_install_write32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb40000, 0x1fb40003, 0, 0, bank_coh1000t_w ); /* bankswitch */
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb80000, 0x1fb80003, 0, 0, taitofx1a_ymsound_r, taitofx1a_ymsound_w );
+ memory_install_readwrite_bank( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( state->taitofx1_eeprom_size1 - 1 ), 0, 0, "bank2" );
zn_driver_init(machine);
}
@@ -1234,7 +1234,7 @@ static MACHINE_RESET( coh1000ta )
zn_machine_init(machine);
}
-static ADDRESS_MAP_START( fx1a_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( fx1a_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank10") /* Fallthrough */
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0xc000, 0xdfff) AM_RAM
@@ -1309,13 +1309,13 @@ static DRIVER_INIT( coh1000tb )
machine->device<nvram_device>("eeprom1")->set_base(state->taitofx1_eeprom1, state->taitofx1_eeprom_size1);
machine->device<nvram_device>("eeprom2")->set_base(state->taitofx1_eeprom2, state->taitofx1_eeprom_size2);
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked game rom */
- memory_install_readwrite_bank( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00000 + ( state->taitofx1_eeprom_size1 - 1 ), 0, 0, "bank2" );
- memory_install_write32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb40000, 0x1fb40003, 0, 0, bank_coh1000t_w ); /* bankswitch */
- memory_install_write32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb80000, 0x1fb8ffff, 0, 0, taitofx1b_volume_w );
- memory_install_write32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fba0000, 0x1fbaffff, 0, 0, taitofx1b_sound_w );
- memory_install_read32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fbc0000, 0x1fbc0003, 0, 0, taitofx1b_sound_r );
- memory_install_readwrite_bank( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( state->taitofx1_eeprom_size2 - 1 ), 0, 0, "bank3" );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked game rom */
+ memory_install_readwrite_bank( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb00000, 0x1fb00000 + ( state->taitofx1_eeprom_size1 - 1 ), 0, 0, "bank2" );
+ memory_install_write32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb40000, 0x1fb40003, 0, 0, bank_coh1000t_w ); /* bankswitch */
+ memory_install_write32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb80000, 0x1fb8ffff, 0, 0, taitofx1b_volume_w );
+ memory_install_write32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fba0000, 0x1fbaffff, 0, 0, taitofx1b_sound_w );
+ memory_install_read32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fbc0000, 0x1fbc0003, 0, 0, taitofx1b_sound_r );
+ memory_install_readwrite_bank( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fbe0000, 0x1fbe0000 + ( state->taitofx1_eeprom_size2 - 1 ), 0, 0, "bank3" );
zn_driver_init(machine);
}
@@ -1499,11 +1499,11 @@ static DRIVER_INIT( coh1000w )
{
device_t *ide = machine->device("ide");
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, "bank1" );
- memory_nop_write ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f000003, 0, 0 );
- memory_install_readwrite32_device_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), ide, 0x1f7e4000, 0x1f7e4fff, 0, 0, ide_controller32_r, ide_controller32_w );
- memory_nop_readwrite ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f7e8000, 0x1f7e8003, 0, 0 );
- memory_install_readwrite32_device_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), ide, 0x1f7f4000, 0x1f7f4fff, 0, 0, ide_controller32_r, ide_controller32_w );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, "bank1" );
+ memory_nop_write ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f000003, 0, 0 );
+ memory_install_readwrite32_device_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), ide, 0x1f7e4000, 0x1f7e4fff, 0, 0, ide_controller32_r, ide_controller32_w );
+ memory_nop_readwrite ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f7e8000, 0x1f7e8003, 0, 0 );
+ memory_install_readwrite32_device_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), ide, 0x1f7f4000, 0x1f7f4fff, 0, 0, ide_controller32_r, ide_controller32_w );
zn_driver_init(machine);
}
@@ -1689,9 +1689,9 @@ static WRITE32_HANDLER( coh1002e_latch_w )
static DRIVER_INIT( coh1002e )
{
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fa10300, 0x1fa10303, 0, 0, coh1002e_bank_w );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00007, 0, 0, coh1002e_latch_w );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fa10300, 0x1fa10303, 0, 0, coh1002e_bank_w );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb00000, 0x1fb00007, 0, 0, coh1002e_latch_w );
zn_driver_init(machine);
}
@@ -1702,7 +1702,7 @@ static MACHINE_RESET( coh1002e )
zn_machine_init(machine);
}
-static ADDRESS_MAP_START( psarc_snd_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( psarc_snd_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
AM_RANGE(0x080000, 0x0fffff) AM_RAM
AM_RANGE(0x100000, 0x10001f) AM_DEVREADWRITE8( "ymf", ymf271_r, ymf271_w, 0x00ff )
@@ -1833,12 +1833,12 @@ static READ32_HANDLER( bam2_unk_r )
static DRIVER_INIT( bam2 )
{
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" );
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" );
- memory_install_read32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00007, 0, 0, bam2_mcu_r );
- memory_install_read32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fa20000, 0x1fa20003, 0, 0, bam2_unk_r );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fa10300, 0x1fa10303, 0, 0, bam2_sec_w );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00007, 0, 0, bam2_mcu_w );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f3fffff, 0, 0, "bank1" );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f400000, 0x1f7fffff, 0, 0, "bank2" );
+ memory_install_read32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb00000, 0x1fb00007, 0, 0, bam2_mcu_r );
+ memory_install_read32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fa20000, 0x1fa20003, 0, 0, bam2_unk_r );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fa10300, 0x1fa10303, 0, 0, bam2_sec_w );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb00000, 0x1fb00007, 0, 0, bam2_mcu_w );
zn_driver_init(machine);
}
@@ -2152,18 +2152,18 @@ static DRIVER_INIT( coh1000a )
{
zn_state *state = machine->driver_data<zn_state>();
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, "bank1" );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fbfff00, 0x1fbfff03, 0, 0, acpsx_00_w );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fbfff10, 0x1fbfff13, 0, 0, acpsx_10_w );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f1fffff, 0, 0, "bank1" );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fbfff00, 0x1fbfff03, 0, 0, acpsx_00_w );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fbfff10, 0x1fbfff13, 0, 0, acpsx_10_w );
if( strcmp( machine->gamedrv->name, "nbajamex" ) == 0 )
{
state->nbajamex_eeprom_size = 0x8000;
state->nbajamex_eeprom = auto_alloc_array( machine, UINT8, state->nbajamex_eeprom_size );
- memory_install_readwrite_bank( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f200000, 0x1f200000 + ( state->nbajamex_eeprom_size - 1 ), 0, 0, "bank2" );
- memory_install_read32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fbfff08, 0x1fbfff0b, 0, 0, nbajamex_08_r );
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fbfff80, 0x1fbfff83, 0, 0, nbajamex_80_r, nbajamex_80_w );
+ memory_install_readwrite_bank( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f200000, 0x1f200000 + ( state->nbajamex_eeprom_size - 1 ), 0, 0, "bank2" );
+ memory_install_read32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fbfff08, 0x1fbfff0b, 0, 0, nbajamex_08_r );
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fbfff80, 0x1fbfff83, 0, 0, nbajamex_80_r, nbajamex_80_w );
memory_set_bankptr( machine, "bank2", state->nbajamex_eeprom ); /* ram/eeprom/?? */
}
@@ -2173,9 +2173,9 @@ static DRIVER_INIT( coh1000a )
{
device_t *ide = machine->device("ide");
- memory_install_read32_device_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), ide, 0x1fbfff8c, 0x1fbfff8f, 0, 0, jdredd_idestat_r );
- memory_nop_write ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fbfff8c, 0x1fbfff8f, 0, 0 );
- memory_install_readwrite32_device_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), ide, 0x1fbfff90, 0x1fbfff9f, 0, 0, jdredd_ide_r, jdredd_ide_w );
+ memory_install_read32_device_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), ide, 0x1fbfff8c, 0x1fbfff8f, 0, 0, jdredd_idestat_r );
+ memory_nop_write ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fbfff8c, 0x1fbfff8f, 0, 0 );
+ memory_install_readwrite32_device_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), ide, 0x1fbfff90, 0x1fbfff9f, 0, 0, jdredd_ide_r, jdredd_ide_w );
}
zn_driver_init(machine);
@@ -2330,8 +2330,8 @@ static WRITE32_HANDLER( coh1001l_bnk_w )
static DRIVER_INIT( coh1001l )
{
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked rom */
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, coh1001l_bnk_w );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" ); /* banked rom */
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, coh1001l_bnk_w );
zn_driver_init(machine);
}
@@ -2372,9 +2372,9 @@ static WRITE32_HANDLER( coh1002v_bnk_w )
static DRIVER_INIT( coh1002v )
{
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f27ffff, 0, 0, "bank1" );
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fbfffff, 0, 0, "bank2" );
- memory_install_write32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, coh1002v_bnk_w );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f27ffff, 0, 0, "bank1" );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb00000, 0x1fbfffff, 0, 0, "bank2" );
+ memory_install_write32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, coh1002v_bnk_w );
zn_driver_init(machine);
}
@@ -2574,9 +2574,9 @@ static WRITE32_HANDLER( cbaj_z80_w )
static DRIVER_INIT( coh1002m )
{
- memory_install_read_bank ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" );
- memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, cbaj_z80_r, cbaj_z80_w );
- memory_install_write32_handler ( machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1fb00004, 0x1fb00007, 0, 0, coh1002m_bank_w );
+ memory_install_read_bank ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1f000000, 0x1f7fffff, 0, 0, "bank1" );
+ memory_install_readwrite32_handler( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb00000, 0x1fb00003, 0, 0, cbaj_z80_r, cbaj_z80_w );
+ memory_install_write32_handler ( machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1fb00004, 0x1fb00007, 0, 0, coh1002m_bank_w );
zn_driver_init(machine);
}
@@ -2614,12 +2614,12 @@ static READ8_HANDLER( cbaj_z80_ready_r )
return ret;
}
-static ADDRESS_MAP_START( cbaj_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( cbaj_z80_map, AS_PROGRAM, 8 )
AM_RANGE( 0x0000, 0x7fff ) AM_ROM
AM_RANGE( 0x8000, 0xffff ) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( cbaj_z80_port_map, ADDRESS_SPACE_IO, 8)
+static ADDRESS_MAP_START( cbaj_z80_port_map, AS_IO, 8)
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE( 0x84, 0x85 ) AM_DEVREADWRITE( "ymz", ymz280b_r, ymz280b_w )
AM_RANGE( 0x90, 0x90 ) AM_READWRITE( cbaj_z80_latch_r, cbaj_z80_latch_w )
diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c
index 5bb5be0563d..fbb3c5205ee 100644
--- a/src/mame/drivers/zodiack.c
+++ b/src/mame/drivers/zodiack.c
@@ -167,7 +167,7 @@ static WRITE8_HANDLER( zodiack_control_w )
}
-static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x4fff) AM_ROM
AM_RANGE(0x5800, 0x5fff) AM_RAM
AM_RANGE(0x6081, 0x6081) AM_READ_PORT("DSW0") AM_WRITE(zodiack_control_w)
@@ -187,14 +187,14 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0xc000, 0xcfff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x4000, 0x4000) AM_WRITE(zodiac_sound_nmi_enable_w)
AM_RANGE(0x6000, 0x6000) AM_READWRITE(soundlatch_r, soundlatch_w)
ADDRESS_MAP_END
-static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x01) AM_DEVWRITE("aysnd", ay8910_address_data_w)
ADDRESS_MAP_END
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index 583c59bf9d7..217c97a7ab2 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -402,7 +402,7 @@ static MACHINE_START( zr107 )
ppcdrc_add_fastram(machine->device("maincpu"), 0x00000000, 0x000fffff, FALSE, state->workram);
}
-static ADDRESS_MAP_START( zr107_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( zr107_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x000fffff) AM_RAM AM_BASE_MEMBER(zr107_state, workram) /* Work RAM */
AM_RANGE(0x74000000, 0x74003fff) AM_DEVREADWRITE("k056832", k056832_ram_long_r, k056832_ram_long_w)
AM_RANGE(0x74020000, 0x7402003f) AM_DEVREADWRITE("k056832", k056832_long_r, k056832_long_w)
@@ -430,7 +430,7 @@ static WRITE32_HANDLER( jetwave_palette_w )
palette_set_color_rgb(space->machine, offset, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0));
}
-static ADDRESS_MAP_START( jetwave_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( jetwave_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x000fffff) AM_MIRROR(0x80000000) AM_RAM /* Work RAM */
AM_RANGE(0x74000000, 0x740000ff) AM_MIRROR(0x80000000) AM_DEVREADWRITE("k001604", k001604_reg_r, k001604_reg_w)
AM_RANGE(0x74010000, 0x7401ffff) AM_MIRROR(0x80000000) AM_RAM_WRITE(jetwave_palette_w) AM_BASE_GENERIC(paletteram)
@@ -475,7 +475,7 @@ static WRITE16_HANDLER( dual539_w )
k054539_w(space->machine->device("konami1"), offset, data>>8);
}
-static ADDRESS_MAP_START( sound_memmap, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( sound_memmap, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x01ffff) AM_ROM
AM_RANGE(0x100000, 0x103fff) AM_RAM /* Work RAM */
AM_RANGE(0x200000, 0x2004ff) AM_READWRITE(dual539_r, dual539_w)
@@ -504,7 +504,7 @@ static WRITE32_HANDLER( dsp_dataram_w )
state->sharc_dataram[offset] = data;
}
-static ADDRESS_MAP_START( sharc_map, ADDRESS_SPACE_DATA, 32 )
+static ADDRESS_MAP_START( sharc_map, AS_DATA, 32 )
AM_RANGE(0x400000, 0x41ffff) AM_READWRITE(cgboard_0_shared_sharc_r, cgboard_0_shared_sharc_w)
AM_RANGE(0x500000, 0x5fffff) AM_READWRITE(dsp_dataram_r, dsp_dataram_w)
AM_RANGE(0x600000, 0x6fffff) AM_READWRITE(K001005_r, K001005_w)
diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c
index ac97765fefc..03da3689e6e 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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->memory().space(AS_PROGRAM);
logerror("Executed RESET at PC=%06x\n", cpu_get_pc(space->cpu));
@@ -319,7 +319,7 @@ static TIMER_CALLBACK( scanline_callback )
if (scanline == 0)
{
/* signal VBLANK IRQ */
- amiga_custom_w(machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -934,7 +934,7 @@ static TIMER_CALLBACK( amiga_blitter_proc )
CUSTOM_REG(REG_DMACON) &= ~0x4000;
/* signal an interrupt */
- amiga_custom_w(machine->device("maincpu")->memory().space(ADDRESS_SPACE_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->blitter_timer->reset( );
@@ -1089,13 +1089,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(ADDRESS_SPACE_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(ADDRESS_SPACE_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);
}
@@ -1243,7 +1243,7 @@ static TIMER_CALLBACK( finish_serial_write )
CUSTOM_REG(REG_SERDATR) |= 0x3000;
/* signal an interrupt */
- amiga_custom_w(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), REG_INTREQ, 0x8000 | INTENA_TBE, 0xffff);
+ amiga_custom_w(machine->device("maincpu")->memory().space(AS_PROGRAM), REG_INTREQ, 0x8000 | INTENA_TBE, 0xffff);
}
@@ -1490,7 +1490,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(ADDRESS_SPACE_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 40d7a2a0f0b..24b1ae5b2de 100644
--- a/src/mame/machine/archimds.c
+++ b/src/mame/machine/archimds.c
@@ -118,7 +118,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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
static UINT8 *vram = machine->region("vram")->base();
UINT32 size;
@@ -136,7 +136,7 @@ static TIMER_CALLBACK( vidc_video_tick )
/* audio DMA */
static TIMER_CALLBACK( vidc_audio_tick )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 ulaw_comp;
INT16 res;
UINT8 ch;
diff --git a/src/mame/machine/asic65.c b/src/mame/machine/asic65.c
index e78880c2e5a..b2a7a6190f8 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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* rom-based means reset and clear states */
if (asic65.cpu != NULL)
@@ -513,12 +513,12 @@ static READ16_HANDLER( asci65_get_bio )
*
*************************************/
-static ADDRESS_MAP_START( asic65_program_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( asic65_program_map, AS_PROGRAM, 16 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000, 0xfff) AM_ROM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( asic65_io_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( asic65_io_map, AS_IO, 16 )
AM_RANGE(0, 0) AM_MIRROR(6) AM_READWRITE(asic65_68k_r, asic65_68k_w)
AM_RANGE(1, 1) AM_MIRROR(6) AM_READWRITE(asic65_stat_r, asic65_stat_w)
AM_RANGE(TMS32010_BIO, TMS32010_BIO) AM_READ(asci65_get_bio)
diff --git a/src/mame/machine/asteroid.c b/src/mame/machine/asteroid.c
index b33e02b11a2..9bccca5aee1 100644
--- a/src/mame/machine/asteroid.c
+++ b/src/mame/machine/asteroid.c
@@ -135,6 +135,6 @@ WRITE8_HANDLER( astdelux_led_w )
MACHINE_RESET( asteroid )
{
- asteroid_bank_switch_w(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0, 0);
- avgdvg_reset_w(machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 3a0a20f8b2e..d04681eacf2 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->gamedrv->name);
- memory_nop_readwrite(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5000, 0x57ff, 0, 0);
+ memory_nop_readwrite(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5000, 0x57ff, 0, 0);
}
else
{
logerror("%s MMU SELFTEST ROM\n", machine->gamedrv->name);
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5000, 0x57ff, 0, 0, "bank2");
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5000, 0x57ff, 0, 0);
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5000, 0x57ff, 0, 0, "bank2");
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5000, 0x57ff, 0, 0);
memory_set_bankptr(machine, "bank2", machine->region("maincpu")->base() + 0x5000);
}
}
diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c
index f737726a557..bf21f643083 100644
--- a/src/mame/machine/atarigen.c
+++ b/src/mame/machine/atarigen.c
@@ -496,7 +496,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->slapstic = memory_install_readwrite16_handler(device->memory().space(ADDRESS_SPACE_PROGRAM), base, base + 0x7fff, 0, mirror, atarigen_slapstic_r, atarigen_slapstic_w);
+ state->slapstic = memory_install_readwrite16_handler(device->memory().space(AS_PROGRAM), base, base + 0x7fff, 0, mirror, atarigen_slapstic_r, atarigen_slapstic_w);
/* allocate memory for a copy of bank 0 */
state->slapstic_bank0 = auto_alloc_array(device->machine, UINT8, 0x2000);
@@ -762,7 +762,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->sound_cpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->sound_cpu->memory().space(AS_PROGRAM);
/* unhalt and reset the sound CPU */
if (param == 0)
@@ -1123,7 +1123,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(ADDRESS_SPACE_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 93ea34c3738..3977b14a93b 100644
--- a/src/mame/machine/bagman.c
+++ b/src/mame/machine/bagman.c
@@ -212,7 +212,7 @@ UINT8 line;
MACHINE_RESET( bagman )
{
bagman_state *state = machine->driver_data<bagman_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 05ada79aeda..bdcf57c96a3 100644
--- a/src/mame/machine/balsente.c
+++ b/src/mame/machine/balsente.c
@@ -139,7 +139,7 @@ MACHINE_START( balsente )
MACHINE_RESET( balsente )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
balsente_state *state = machine->driver_data<balsente_state>();
int numbanks;
diff --git a/src/mame/machine/buggychl.c b/src/mame/machine/buggychl.c
index 1834140a084..97bcd3593b2 100644
--- a/src/mame/machine/buggychl.c
+++ b/src/mame/machine/buggychl.c
@@ -175,7 +175,7 @@ READ8_DEVICE_HANDLER( buggychl_mcu_status_r )
return res;
}
-ADDRESS_MAP_START( buggychl_mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
+ADDRESS_MAP_START( buggychl_mcu_map, AS_PROGRAM, 8 )
ADDRESS_MAP_GLOBAL_MASK(0x7ff)
AM_RANGE(0x0000, 0x0000) AM_DEVREADWRITE("bmcu", buggychl_68705_port_a_r, buggychl_68705_port_a_w)
AM_RANGE(0x0001, 0x0001) AM_DEVREADWRITE("bmcu", buggychl_68705_port_b_r, buggychl_68705_port_b_w)
diff --git a/src/mame/machine/cclimber.c b/src/mame/machine/cclimber.c
index dcbab9fdb83..87d9e4d9c82 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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("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 899fb7b3e61..fb5b596e260 100644
--- a/src/mame/machine/cd32.c
+++ b/src/mame/machine/cd32.c
@@ -171,7 +171,7 @@ static DEVICE_START( akiko )
akiko_state *state = get_safe_token(device);
state->machine = machine;
- state->space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ state->space = machine->device("maincpu")->memory().space(AS_PROGRAM);
state->c2p_input_index = 0;
state->c2p_output_index = 0;
diff --git a/src/mame/machine/cps2crpt.c b/src/mame/machine/cps2crpt.c
index c4d0584529a..d033f74c9f7 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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT16 *rom = (UINT16 *)machine->region("maincpu")->base();
int length = machine->region("maincpu")->bytes();
UINT16 *dec = auto_alloc_array(machine, UINT16, length/2);
diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c
index d0d6253a883..729b90bd33c 100644
--- a/src/mame/machine/dc.c
+++ b/src/mame/machine/dc.c
@@ -416,7 +416,7 @@ void dc_update_interrupt_status(running_machine *machine)
{
if((dc_sysctrl_regs[SB_G2DTNRM] & dc_sysctrl_regs[SB_ISTNRM]) || (dc_sysctrl_regs[SB_G2DTEXT] & dc_sysctrl_regs[SB_ISTEXT]))
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
printf("Wave DMA HW trigger\n");
wave_dma_execute(space);
@@ -428,7 +428,7 @@ void dc_update_interrupt_status(running_machine *machine)
{
if((dc_sysctrl_regs[SB_PDTNRM] & dc_sysctrl_regs[SB_ISTNRM]) || (dc_sysctrl_regs[SB_PDTEXT] & dc_sysctrl_regs[SB_ISTEXT]))
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 5b1176965b7..8124c97111e 100644
--- a/src/mame/machine/dec0.c
+++ b/src/mame/machine/dec0.c
@@ -542,8 +542,8 @@ DRIVER_INIT( hippodrm )
{
UINT8 *RAM = machine->region("sub")->base();
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x180000, 0x180fff, 0, 0, hippodrm_68000_share_r, hippodrm_68000_share_w);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xffc800, 0xffcfff, 0, 0, sprite_mirror_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x180000, 0x180fff, 0, 0, hippodrm_68000_share_r, hippodrm_68000_share_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xffc800, 0xffcfff, 0, 0, sprite_mirror_w);
h6280_decrypt(machine, "sub");
@@ -567,7 +567,7 @@ DRIVER_INIT( slyspy )
DRIVER_INIT( robocop )
{
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x180000, 0x180fff, 0, 0, robocop_68000_share_r, robocop_68000_share_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x180000, 0x180fff, 0, 0, robocop_68000_share_r, robocop_68000_share_w);
}
DRIVER_INIT( baddudes )
diff --git a/src/mame/machine/deco102.c b/src/mame/machine/deco102.c
index 6809ab4c195..6ad2c5fb5de 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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device(cputag)->memory().space(AS_PROGRAM);
UINT16 *rom = (UINT16 *)machine->region(cputag)->base();
int size = machine->region(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 46b96e1e4ba..55b5c75542a 100644
--- a/src/mame/machine/fd1089.c
+++ b/src/mame/machine/fd1089.c
@@ -404,7 +404,7 @@ static void clear_decrypted(running_machine &machine)
static void sys16_decrypt(running_machine *machine, const UINT8 *key,int cputype)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT16 *rom = (UINT16 *)machine->region("maincpu")->base();
int size = machine->region("maincpu")->bytes();
int A;
diff --git a/src/mame/machine/fddebug.c b/src/mame/machine/fddebug.c
index ecc93e045f9..ade9392fb86 100644
--- a/src/mame/machine/fddebug.c
+++ b/src/mame/machine/fddebug.c
@@ -712,7 +712,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(ADDRESS_SPACE_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);
@@ -1040,7 +1040,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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = debug_cpu_get_visible_cpu(machine)->memory().space(AS_PROGRAM);
int pc = cpu_get_pc(space->cpu);
int length, first = TRUE;
UINT8 instrdata[2];
@@ -1166,7 +1166,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(ADDRESS_SPACE_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 1c243c3423d..ace09ff88c4 100644
--- a/src/mame/machine/galaxold.c
+++ b/src/mame/machine/galaxold.c
@@ -217,7 +217,7 @@ DRIVER_INIT( dingoe )
rom[i] = BITSWAP8(rom[i],7,6,5,0,3,2,1,4);
}
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3001, 0x3001, 0, 0, dingoe_3001_r); /* Protection check */
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3001, 0x3001, 0, 0, dingoe_3001_r); /* Protection check */
}
#endif
@@ -266,19 +266,19 @@ CUSTOM_INPUT( _4in1_fake_port_r )
DRIVER_INIT( pisces )
{
/* the coin lockout was replaced */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6002, 0x6002, 0, 0, galaxold_gfxbank_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6002, 0x6002, 0, 0, galaxold_gfxbank_w);
}
DRIVER_INIT( checkmaj )
{
/* for the title screen */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3800, 0x3800, 0, 0, checkmaj_protection_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3800, 0x3800, 0, 0, checkmaj_protection_r);
}
DRIVER_INIT( dingo )
{
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3000, 0x3000, 0, 0, dingo_3000_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3035, 0x3035, 0, 0, dingo_3035_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3000, 0x3000, 0, 0, dingo_3000_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3035, 0x3035, 0, 0, dingo_3035_r);
}
@@ -296,7 +296,7 @@ static UINT8 decode_mooncrst(UINT8 data,offs_t addr)
DRIVER_INIT( mooncrsu )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa000, 0xa002, 0, 0, galaxold_gfxbank_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa000, 0xa002, 0, 0, galaxold_gfxbank_w);
}
DRIVER_INIT( mooncrst )
@@ -313,13 +313,13 @@ DRIVER_INIT( mooncrst )
DRIVER_INIT( mooncrgx )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x6002, 0, 0, galaxold_gfxbank_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000, 0x6002, 0, 0, galaxold_gfxbank_w);
}
DRIVER_INIT( moonqsr )
{
offs_t i;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("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( 4in1 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
offs_t i, len = machine->region("maincpu")->bytes();
UINT8 *RAM = machine->region("maincpu")->base();
@@ -421,5 +421,5 @@ INTERRUPT_GEN( hunchbks_vh_interrupt )
DRIVER_INIT( ladybugg )
{
/* Doesn't actually use the bank, but it mustn't have a coin lock! */
-memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6002, 0x6002, 0, 0, galaxold_gfxbank_w);
+memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6002, 0x6002, 0, 0, galaxold_gfxbank_w);
}
diff --git a/src/mame/machine/irobot.c b/src/mame/machine/irobot.c
index ea5dab5fedb..ef0939081a9 100644
--- a/src/mame/machine/irobot.c
+++ b/src/mame/machine/irobot.c
@@ -192,8 +192,8 @@ MACHINE_RESET( irobot )
/* 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(ADDRESS_SPACE_PROGRAM),0,0);
- irobot_out0_w(machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
state->combase = state->comRAM[0];
state->combase_mb = state->comRAM[1];
state->outx = 0;
diff --git a/src/mame/machine/kabuki.c b/src/mame/machine/kabuki.c
index 10574bfe0c4..990ed67e80d 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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, machine->region("maincpu")->bytes());
int numbanks = (machine->region("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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("audiocpu")->memory().space(AS_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x8000);
UINT8 *rom = machine->region("audiocpu")->base();
diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c
index 932259a52d8..a53fab0cb9c 100644
--- a/src/mame/machine/kaneko16.c
+++ b/src/mame/machine/kaneko16.c
@@ -1714,7 +1714,7 @@ static int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* d
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8* rom = machine->region("cpu1")->base();
UINT8 numregions;
UINT16 length;
@@ -2107,7 +2107,7 @@ void calc3_mcu_run(running_machine *machine)
{
UINT16 mcu_command;
int i;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
if ( calc3_mcu_status != (1|2|4|8) ) return;
diff --git a/src/mame/machine/konami1.c b/src/mame/machine/konami1.c
index 9e12124dc47..6a96968a439 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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device(cpu)->memory().space(AS_PROGRAM);
const UINT8 *rom = machine->region(cpu)->base();
int size = machine->region(cpu)->bytes();
int A;
diff --git a/src/mame/machine/konamigx.c b/src/mame/machine/konamigx.c
index eb300041ace..3a8e8a69733 100644
--- a/src/mame/machine/konamigx.c
+++ b/src/mame/machine/konamigx.c
@@ -442,7 +442,7 @@ static UINT32 fantjour_dma[8];
void fantjour_dma_install(running_machine *machine)
{
state_save_register_global_array(machine, fantjour_dma);
- memory_install_write32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xdb0000, 0xdb001f, 0, 0, fantjour_dma_w);
+ memory_install_write32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xdb0000, 0xdb001f, 0, 0, fantjour_dma_w);
memset(fantjour_dma, 0, sizeof(fantjour_dma));
}
diff --git a/src/mame/machine/mc8123.c b/src/mame/machine/mc8123.c
index 0b73e582bac..728759e09da 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(ADDRESS_SPACE_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 e63c9faed92..e99a3a13d9a 100644
--- a/src/mame/machine/mcr68.c
+++ b/src/mame/machine/mcr68.c
@@ -292,7 +292,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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device("maincpu")->memory().space(AS_PROGRAM);
csdeluxe_data_w(space, 0, (state << 4) | drvstate->zwackery_sound_data);
}
diff --git a/src/mame/machine/md_cart.c b/src/mame/machine/md_cart.c
index de50a306ed8..701c7f47504 100644
--- a/src/mame/machine/md_cart.c
+++ b/src/mame/machine/md_cart.c
@@ -883,8 +883,8 @@ static void install_sram_rw_handlers(running_machine *machine, bool mask_addr)
image->battery_load(state->md_cart.sram, state->md_cart.sram_end - state->md_cart.sram_start + 1, 0xff); // Dino Dini's Soccer needs backup RAM to be 1fill
memcpy(megadriv_backupram, state->md_cart.sram, state->md_cart.sram_end - state->md_cart.sram_start + 1);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), state->md_cart.sram_start & mask, state->md_cart.sram_end & mask, 0, 0, genesis_sram_read);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), state->md_cart.sram_start & mask, state->md_cart.sram_end & mask, 0, 0, genesis_sram_write);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), state->md_cart.sram_start & mask, state->md_cart.sram_end & mask, 0, 0, genesis_sram_read);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), state->md_cart.sram_start & mask, state->md_cart.sram_end & mask, 0, 0, genesis_sram_write);
state->md_cart.sram_handlers_installed = 1;
}
@@ -1025,8 +1025,8 @@ static void setup_megadriv_custom_mappers(running_machine *machine)
case CM_JCART:
case CM_JCART_SEPROM:
/* Codemasters PCB (J-Carts) */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x38fffe, 0x38ffff, 0, 0, jcart_ctrl_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x38fffe, 0x38ffff, 0, 0, jcart_ctrl_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x38fffe, 0x38ffff, 0, 0, jcart_ctrl_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x38fffe, 0x38ffff, 0, 0, jcart_ctrl_w);
break;
case SSF2:
@@ -1034,7 +1034,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);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa130f0, 0xa130ff, 0, 0, genesis_ssf2_bank_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa130f0, 0xa130ff, 0, 0, genesis_ssf2_bank_w);
break;
case LIONK3:
@@ -1043,8 +1043,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 */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x600000, 0x6fffff, 0, 0, l3alt_prot_r, l3alt_prot_w);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x700000, 0x7fffff, 0, 0, l3alt_bank_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x600000, 0x6fffff, 0, 0, l3alt_prot_r, l3alt_prot_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x700000, 0x7fffff, 0, 0, l3alt_bank_w);
break;
case SDK99:
@@ -1053,13 +1053,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 */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x600000, 0x6fffff, 0, 0, l3alt_prot_r, l3alt_prot_w);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x700000, 0x7fffff, 0, 0, l3alt_bank_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x600000, 0x6fffff, 0, 0, l3alt_prot_r, l3alt_prot_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x700000, 0x7fffff, 0, 0, l3alt_bank_w);
break;
case REDCLIFF:
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400001, 0, 0, redclif_prot2_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400004, 0x400005, 0, 0, redclif_prot_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x400001, 0, 0, redclif_prot2_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400004, 0x400005, 0, 0, redclif_prot_r);
break;
case REDCL_EN:
@@ -1067,8 +1067,8 @@ static void setup_megadriv_custom_mappers(running_machine *machine)
ROM[x] ^= 0x40;
memcpy(&ROM[0x000000], &ROM[VIRGIN_COPY_GEN + 4], 0x200000); /* default rom */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400001, 0, 0, redclif_prot2_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400004, 0x400005, 0, 0, redclif_prot_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x400001, 0, 0, redclif_prot2_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400004, 0x400005, 0, 0, redclif_prot_r);
break;
case RADICA:
@@ -1076,43 +1076,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)
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa13000, 0xa1307f, 0, 0, radica_bank_select);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa13000, 0xa1307f, 0, 0, radica_bank_select);
break;
case KOF99:
//memcpy(&ROM[0x000000],&ROM[VIRGIN_COPY_GEN],0x300000);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa13000, 0xa13001, 0, 0, kof99_A13000_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa13002, 0xa13003, 0, 0, kof99_A13002_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa1303e, 0xa1303f, 0, 0, kof99_00A1303E_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa13000, 0xa13001, 0, 0, kof99_A13000_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa13002, 0xa13003, 0, 0, kof99_A13002_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa1303e, 0xa1303f, 0, 0, kof99_00A1303E_r);
break;
case SOULBLAD:
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400002, 0x400003, 0, 0, soulb_400002_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400004, 0x400005, 0, 0, soulb_400004_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400006, 0x400007, 0, 0, soulb_400006_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400002, 0x400003, 0, 0, soulb_400002_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400004, 0x400005, 0, 0, soulb_400004_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400006, 0x400007, 0, 0, soulb_400006_r);
break;
case MJLOVER:
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400001, 0, 0, mjlovr_prot_1_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x401000, 0x401001, 0, 0, mjlovr_prot_2_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x400001, 0, 0, mjlovr_prot_1_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x401000, 0x401001, 0, 0, mjlovr_prot_2_r);
break;
case SQUIRRELK:
state->md_cart.squirrel_king_extra = 0;
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400007, 0, 0, squirrel_king_extra_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400007, 0, 0, squirrel_king_extra_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x400007, 0, 0, squirrel_king_extra_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x400007, 0, 0, squirrel_king_extra_w);
break;
case SMOUSE:
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400007, 0, 0, smous_prot_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x400007, 0, 0, smous_prot_r);
break;
case SMB:
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa13000, 0xa13001, 0, 0, smbro_prot_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa13000, 0xa13001, 0, 0, smbro_prot_r);
break;
case SMB2:
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa13000, 0xa13001, 0, 0, smb2_extra_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa13000, 0xa13001, 0, 0, smb2_extra_r);
break;
case KAIJU:
@@ -1120,7 +1120,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);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x700000, 0x7fffff, 0, 0, kaiju_bank_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x700000, 0x7fffff, 0, 0, kaiju_bank_w);
break;
case CHINFIGHT3:
@@ -1128,48 +1128,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);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x4fffff, 0, 0, chifi3_prot_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x600000, 0x6fffff, 0, 0, chifi3_bank_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x4fffff, 0, 0, chifi3_prot_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x600000, 0x6fffff, 0, 0, chifi3_bank_w);
break;
case LIONK2:
state->md_cart.lion2_prot1_data = state->md_cart.lion2_prot2_data = 0;
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400002, 0x400003, 0, 0, lion2_prot1_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400006, 0x400007, 0, 0, lion2_prot2_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400001, 0, 0, lion2_prot1_w);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400004, 0x400005, 0, 0, lion2_prot2_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400002, 0x400003, 0, 0, lion2_prot1_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400006, 0x400007, 0, 0, lion2_prot2_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x400001, 0, 0, lion2_prot1_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400004, 0x400005, 0, 0, lion2_prot2_w);
break;
case BUGSLIFE:
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa13000, 0xa13001, 0, 0, bugl_extra_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa13000, 0xa13001, 0, 0, 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. */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400001, 0, 0, elfwor_400000_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400002, 0x400003, 0, 0, elfwor_400002_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400004, 0x400005, 0, 0, elfwor_400004_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400006, 0x400007, 0, 0, elfwor_400006_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x400001, 0, 0, elfwor_400000_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400002, 0x400003, 0, 0, elfwor_400002_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400004, 0x400005, 0, 0, elfwor_400004_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400006, 0x400007, 0, 0, elfwor_400006_r);
break;
case ROCKMANX3:
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa13000, 0xa13001, 0, 0, rx3_extra_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa13000, 0xa13001, 0, 0, rx3_extra_r);
break;
case SBUBBOB:
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400001, 0, 0, sbub_extra1_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400002, 0x400003, 0, 0, sbub_extra2_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x400001, 0, 0, sbub_extra1_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400002, 0x400003, 0, 0, sbub_extra2_r);
break;
case KOF98:
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x480000, 0x480001, 0, 0, kof98_aa_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4800e0, 0x4800e1, 0, 0, kof98_aa_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4824a0, 0x4824a1, 0, 0, kof98_aa_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x488880, 0x488881, 0, 0, kof98_aa_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x480000, 0x480001, 0, 0, kof98_aa_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4800e0, 0x4800e1, 0, 0, kof98_aa_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4824a0, 0x4824a1, 0, 0, kof98_aa_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x488880, 0x488881, 0, 0, kof98_aa_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4a8820, 0x4a8821, 0, 0, kof98_0a_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4f8820, 0x4f8821, 0, 0, kof98_00_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4a8820, 0x4a8821, 0, 0, kof98_0a_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4f8820, 0x4f8821, 0, 0, kof98_00_r);
break;
case REALTEC:
@@ -1182,38 +1182,38 @@ 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 */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x400000, 0x400001, 0, 0, realtec_400000_w);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x402000, 0x402001, 0, 0, realtec_402000_w);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x404000, 0x404001, 0, 0, realtec_404000_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x400000, 0x400001, 0, 0, realtec_400000_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x402000, 0x402001, 0, 0, realtec_402000_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x404000, 0x404001, 0, 0, realtec_404000_w);
break;
case MC_SUP19IN1:
memcpy(&ROM[0x400000], &ROM[VIRGIN_COPY_GEN], 0x400000); // allow hard reset to menu
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa13000, 0xa13039, 0, 0, s19in1_bank);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa13000, 0xa13039, 0, 0, s19in1_bank);
break;
case MC_SUP15IN1:
memcpy(&ROM[0x400000], &ROM[VIRGIN_COPY_GEN], 0x200000); // allow hard reset to menu
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa13000, 0xa13039, 0, 0, s19in1_bank);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa13000, 0xa13039, 0, 0, s19in1_bank);
break;
case MC_12IN1:
memcpy(&ROM[0x000000], &ROM[VIRGIN_COPY_GEN], 0x400000); /* default rom */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa13000, 0xa1303f, 0, 0, mc_12in1_bank_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa13000, 0xa1303f, 0, 0, mc_12in1_bank_w);
break;
case TOPFIGHTER:
memcpy(&ROM[0x000000], &ROM[VIRGIN_COPY_GEN], 0x400000); /* default rom */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6f5344, 0x6f5345, 0, 0, topfig_6F5344_r );
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6bd294, 0x6bd295, 0, 0, topfig_6BD294_r );
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x645b44, 0x645b45, 0, 0, topfig_645B44_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6f5344, 0x6f5345, 0, 0, topfig_6F5344_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6bd294, 0x6bd295, 0, 0, topfig_6BD294_r );
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x645b44, 0x645b45, 0, 0, topfig_645B44_r );
/* readd */
- //memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x689b80, 0x689b81, 0, 0, MWA16_NOP);
- //memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6d8b02, 0x6d8b03, 0, 0, MWA16_NOP);
+ //memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x689b80, 0x689b81, 0, 0, MWA16_NOP);
+ //memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6d8b02, 0x6d8b03, 0, 0, MWA16_NOP);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x700000, 0x7fffff, 0, 0, topfig_bank_w );
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x700000, 0x7fffff, 0, 0, topfig_bank_w );
break;
}
@@ -1280,7 +1280,7 @@ static void setup_megadriv_custom_mappers(running_machine *machine)
}
/* install NOP handler for TMSS */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa14000, 0xa14003, 0, 0, genesis_TMSS_bank_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa14000, 0xa14003, 0, 0, genesis_TMSS_bank_w);
}
static void setup_megadriv_sram(device_image_interface &image)
@@ -1308,7 +1308,7 @@ static void setup_megadriv_sram(device_image_interface &image)
state->md_cart.sram_end = state->md_cart.sram_start + image.get_software_region_length("sram") - 1;
state->md_cart.sram_detected = 1;
megadriv_backupram = (UINT16*) (ROM + state->md_cart.sram_start);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa130f0, 0xa130f1, 0, 0, genesis_sram_toggle);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa130f0, 0xa130f1, 0, 0, genesis_sram_toggle);
if (state->md_cart.last_loaded_image_length <= state->md_cart.sram_start)
{
state->md_cart.sram_active = 1;
@@ -1330,39 +1330,39 @@ static void setup_megadriv_sram(device_image_interface &image)
state->md_cart.sram_end = state->md_cart.sram_start + image.get_software_region_length("fram") - 1;
state->md_cart.sram_detected = 1;
megadriv_backupram = (UINT16*) (ROM + state->md_cart.sram_start);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa130f0, 0xa130f1, 0, 0, sega_6658a_reg_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa130f0, 0xa130f1, 0, 0, sega_6658a_reg_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa130f0, 0xa130f1, 0, 0, sega_6658a_reg_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa130f0, 0xa130f1, 0, 0, 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->md_cart.has_serial_eeprom = 1;
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x200001, 0, 0, wboy_v_eeprom_r, wboy_v_eeprom_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x200001, 0, 0, wboy_v_eeprom_r, wboy_v_eeprom_w);
break;
case NBA_JAM:
state->md_cart.has_serial_eeprom = 1;
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x200001, 0, 0, nba_jam_eeprom_r, nba_jam_eeprom_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x200001, 0, 0, nba_jam_eeprom_r, nba_jam_eeprom_w);
break;
case NBA_JAM_TE:
case NFL_QB_96:
case C_SLAM: // same handling but different sizes
state->md_cart.has_serial_eeprom = 1;
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x200001, 0, 0, nba_jam_te_eeprom_r, nba_jam_te_eeprom_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x200001, 0, 0, nba_jam_te_eeprom_r, nba_jam_te_eeprom_w);
break;
case EA_NHLPA:
state->md_cart.has_serial_eeprom = 1;
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x200001, 0, 0, ea_nhlpa_eeprom_r, ea_nhlpa_eeprom_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x200001, 0, 0, ea_nhlpa_eeprom_r, ea_nhlpa_eeprom_w);
break;
case CODE_MASTERS:
case CM_JCART_SEPROM:
state->md_cart.has_serial_eeprom = 1;
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x300000, 0x300001, 0, 0, codemasters_eeprom_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x380000, 0x380001, 0, 0, codemasters_eeprom_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x300000, 0x300001, 0, 0, codemasters_eeprom_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x380000, 0x380001, 0, 0, codemasters_eeprom_r);
break;
}
@@ -1414,7 +1414,7 @@ static void setup_megadriv_sram(device_image_interface &image)
if (state->md_cart.last_loaded_image_length <= state->md_cart.sram_start)
state->md_cart.sram_active = 1;
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa130f0, 0xa130f1, 0, 0, genesis_sram_toggle);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa130f0, 0xa130f1, 0, 0, genesis_sram_toggle);
//printf("res: start %x, end %x, det %d, active %d\n", state->md_cart.sram_start, state->md_cart.sram_end, state->md_cart.sram_detected, state->md_cart.sram_active);
/* Sonic 1 included in Sonic Classics doesn't have SRAM and
diff --git a/src/mame/machine/megadriv.c b/src/mame/machine/megadriv.c
index 227d3ab42b7..132a8bc230b 100644
--- a/src/mame/machine/megadriv.c
+++ b/src/mame/machine/megadriv.c
@@ -2071,7 +2071,7 @@ WRITE16_HANDLER( megadriv_68k_io_write )
-static ADDRESS_MAP_START( megadriv_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( megadriv_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x3fffff) AM_ROM
/* (0x000000 - 0x3fffff) == GAME ROM (4Meg Max, Some games have special banking too) */
@@ -2354,7 +2354,7 @@ static READ8_HANDLER( megadriv_z80_unmapped_read )
return 0xff;
}
-static ADDRESS_MAP_START( megadriv_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( megadriv_z80_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAMBANK("bank1") AM_MIRROR(0x2000) // RAM can be accessed by the 68k
AM_RANGE(0x4000, 0x4003) AM_DEVREADWRITE("ymsnd", ym2612_r,ym2612_w)
@@ -2368,7 +2368,7 @@ static ADDRESS_MAP_START( megadriv_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x8000, 0xffff) AM_READWRITE(z80_read_68k_banked_data,z80_write_68k_banked_data) // The Z80 can read the 68k address space this way
ADDRESS_MAP_END
-static ADDRESS_MAP_START( megadriv_z80_io_map, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( megadriv_z80_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x0000, 0xff) AM_NOP
ADDRESS_MAP_END
@@ -2377,7 +2377,7 @@ ADDRESS_MAP_END
/************************************ Megadrive Bootlegs *************************************/
// smaller ROM region because some bootlegs check for RAM there
-static ADDRESS_MAP_START( md_bootleg_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( md_bootleg_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x0fffff) AM_ROM /* Cartridge Program Rom */
AM_RANGE(0x200000, 0x2023ff) AM_RAM // tested
@@ -2602,7 +2602,7 @@ static UINT16 dreq_src_addr[2],dreq_dst_addr[2],dreq_size;
static READ16_HANDLER( _32x_dreq_common_r )
{
- address_space* _68kspace = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space* _68kspace = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
switch (offset)
{
@@ -2673,7 +2673,7 @@ static READ16_HANDLER( _32x_dreq_common_r )
static WRITE16_HANDLER( _32x_dreq_common_w )
{
- address_space* _68kspace = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space* _68kspace = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
switch (offset)
{
@@ -2876,14 +2876,14 @@ static WRITE16_HANDLER( _32x_68k_a15100_w )
- memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x000070, 0x000073, 0, 0, _32x_68k_hint_vector_r, _32x_68k_hint_vector_w); // h interrupt vector
+ memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(AS_PROGRAM), 0x000070, 0x000073, 0, 0, _32x_68k_hint_vector_r, _32x_68k_hint_vector_w); // h interrupt vector
}
else
{
_32x_adapter_enabled = 0;
memory_install_rom(space, 0x0000000, 0x03fffff, 0, 0, space->machine->region("gamecart")->base());
- memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x000070, 0x000073, 0, 0, _32x_68k_hint_vector_r, _32x_68k_hint_vector_w); // h interrupt vector
+ memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(AS_PROGRAM), 0x000070, 0x000073, 0, 0, _32x_68k_hint_vector_r, _32x_68k_hint_vector_w); // h interrupt vector
}
}
@@ -3241,7 +3241,7 @@ static WRITE16_HANDLER( _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(ADDRESS_SPACE_PROGRAM);
+ address_space* _68kspace = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
if (space!= _68kspace)
{
@@ -3731,7 +3731,7 @@ _32X_MAP_RAM_WRITEHANDLERS(paletteram) // _32x_sh2_paletteram_w
// SH2 memory maps
/**********************************************************************************************/
-static ADDRESS_MAP_START( sh2_main_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( sh2_main_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00003fff) AM_ROM
AM_RANGE(0x00004000, 0x00004003) AM_READWRITE( _32x_sh2_master_4000_common_4002_r, _32x_sh2_master_4000_common_4002_w )
@@ -3760,7 +3760,7 @@ static ADDRESS_MAP_START( sh2_main_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0xc0000000, 0xc0000fff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( sh2_slave_map, ADDRESS_SPACE_PROGRAM, 32 )
+static ADDRESS_MAP_START( sh2_slave_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x00003fff) AM_ROM
AM_RANGE(0x00004000, 0x00004003) AM_READWRITE( _32x_sh2_slave_4000_common_4002_r, _32x_sh2_slave_4000_common_4002_w )
@@ -4580,7 +4580,7 @@ void CDC_End_Transfer(running_machine* machine)
void CDC_Do_DMA(running_machine* machine, int rate)
{
- address_space* space = machine->device("segacd_68k")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space* space = machine->device("segacd_68k")->memory().space(AS_PROGRAM);
UINT32 dstoffset, length;
UINT8 *dest;
@@ -5998,7 +5998,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(ADDRESS_SPACE_PROGRAM);
+ address_space* space = machine->device("maincpu")->memory().space(AS_PROGRAM);
segacd_4meg_prgbank = 0;
@@ -6012,21 +6012,21 @@ void segacd_init_main_cpu( running_machine* machine )
segacd_wordram_mapped = 1;
- memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x23ffff, 0, 0, segacd_main_dataram_part1_r, segacd_main_dataram_part1_w); // RAM shared with sub
+ memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x23ffff, 0, 0, segacd_main_dataram_part1_r, segacd_main_dataram_part1_w); // RAM shared with sub
- memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa12000, 0xa12001, 0, 0, scd_a12000_halt_reset_r, scd_a12000_halt_reset_w); // sub-cpu control
- memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa12002, 0xa12003, 0, 0, scd_a12002_memory_mode_r, scd_a12002_memory_mode_w); // memory mode / write protect
- //memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa12004, 0xa12005, 0, 0, segacd_cdc_mode_address_r, segacd_cdc_mode_address_w);
- memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa12006, 0xa12007, 0, 0, scd_a12006_hint_register_r, scd_a12006_hint_register_w); // where HINT points on main CPU
- //memory_install_read16_handler (space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa12008, 0xa12009, 0, 0, cdc_data_main_r);
+ memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa12000, 0xa12001, 0, 0, scd_a12000_halt_reset_r, scd_a12000_halt_reset_w); // sub-cpu control
+ memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa12002, 0xa12003, 0, 0, scd_a12002_memory_mode_r, scd_a12002_memory_mode_w); // memory mode / write protect
+ //memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa12004, 0xa12005, 0, 0, segacd_cdc_mode_address_r, segacd_cdc_mode_address_w);
+ memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa12006, 0xa12007, 0, 0, scd_a12006_hint_register_r, scd_a12006_hint_register_w); // where HINT points on main CPU
+ //memory_install_read16_handler (space->machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa12008, 0xa12009, 0, 0, cdc_data_main_r);
- memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa1200c, 0xa1200d, 0, 0, segacd_stopwatch_timer_r, segacd_stopwatch_timer_w); // starblad
+ memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa1200c, 0xa1200d, 0, 0, segacd_stopwatch_timer_r, segacd_stopwatch_timer_w); // starblad
- memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa1200e, 0xa1200f, 0, 0, segacd_comms_flags_r, segacd_comms_flags_maincpu_w); // communication flags block
+ memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa1200e, 0xa1200f, 0, 0, segacd_comms_flags_r, segacd_comms_flags_maincpu_w); // communication flags block
- memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa12010, 0xa1201f, 0, 0, segacd_comms_main_part1_r, segacd_comms_main_part1_w);
- memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa12020, 0xa1202f, 0, 0, segacd_comms_main_part2_r, segacd_comms_main_part2_w);
+ memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa12010, 0xa1201f, 0, 0, segacd_comms_main_part1_r, segacd_comms_main_part1_w);
+ memory_install_readwrite16_handler(space->machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa12020, 0xa1202f, 0, 0, segacd_comms_main_part2_r, segacd_comms_main_part2_w);
@@ -6770,7 +6770,7 @@ READ16_HANDLER( segacd_font_converted_r )
return retdata;
}
-static ADDRESS_MAP_START( segacd_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( segacd_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_RAM AM_BASE(&segacd_4meg_prgram)
AM_RANGE(0x080000, 0x0bffff) AM_READWRITE(segacd_sub_dataram_part1_r, segacd_sub_dataram_part1_w) AM_BASE(&segacd_dataram)
@@ -7116,12 +7116,12 @@ static READ16_HANDLER( svp_68k_cell2_r )
return ((UINT16 *)state->dram)[a1];
}
-static ADDRESS_MAP_START( svp_ssp_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( svp_ssp_map, AS_PROGRAM, 16 )
AM_RANGE(0x0000, 0x03ff) AM_ROMBANK("bank3")
AM_RANGE(0x0400, 0xffff) AM_ROMBANK("bank4")
ADDRESS_MAP_END
-static ADDRESS_MAP_START( svp_ext_map, ADDRESS_SPACE_IO, 16 )
+static ADDRESS_MAP_START( svp_ext_map, AS_IO, 16 )
ADDRESS_MAP_GLOBAL_MASK(0xf)
AM_RANGE(0*2, 0*2+1) AM_READWRITE(read_PM0, write_PM0)
AM_RANGE(1*2, 1*2+1) AM_READWRITE(read_PM1, write_PM1)
@@ -7167,13 +7167,13 @@ static void svp_init(running_machine *machine)
/* SVP stuff */
state->dram = auto_alloc_array(machine, UINT8, 0x20000);
- memory_install_ram(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x300000, 0x31ffff, 0, 0, state->dram);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa15000, 0xa150ff, 0, 0, svp_68k_io_r, svp_68k_io_w);
+ memory_install_ram(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x300000, 0x31ffff, 0, 0, state->dram);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa15000, 0xa150ff, 0, 0, svp_68k_io_r, svp_68k_io_w);
// "cell arrange" 1 and 2
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x390000, 0x39ffff, 0, 0, svp_68k_cell1_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3a0000, 0x3affff, 0, 0, svp_68k_cell2_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x390000, 0x39ffff, 0, 0, svp_68k_cell1_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3a0000, 0x3affff, 0, 0, svp_68k_cell2_r);
- memory_install_read16_handler(machine->device("svp")->memory().space(ADDRESS_SPACE_PROGRAM), 0x438, 0x438, 0, 0, svp_speedup_r);
+ memory_install_read16_handler(machine->device("svp")->memory().space(AS_PROGRAM), 0x438, 0x438, 0, 0, svp_speedup_r);
state->iram = auto_alloc_array(machine, UINT8, 0x800);
memory_set_bankptr(machine, "bank3", state->iram);
@@ -10046,27 +10046,27 @@ void megatech_set_megadrive_z80_as_megadrive_z80(running_machine *machine, const
device_t *ym = machine->device("ymsnd");
/* INIT THE PORTS *********************************************************************************************/
- memory_install_readwrite8_handler(machine->device(tag)->memory().space(ADDRESS_SPACE_IO), 0x0000, 0xffff, 0, 0, z80_unmapped_port_r, z80_unmapped_port_w);
+ memory_install_readwrite8_handler(machine->device(tag)->memory().space(AS_IO), 0x0000, 0xffff, 0, 0, z80_unmapped_port_r, z80_unmapped_port_w);
/* catch any addresses that don't get mapped */
- memory_install_readwrite8_handler(machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0xffff, 0, 0, z80_unmapped_r, z80_unmapped_w);
+ memory_install_readwrite8_handler(machine->device(tag)->memory().space(AS_PROGRAM), 0x0000, 0xffff, 0, 0, z80_unmapped_r, z80_unmapped_w);
- memory_install_readwrite_bank(machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
+ memory_install_readwrite_bank(machine->device(tag)->memory().space(AS_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1");
memory_set_bankptr(machine, "bank1", genz80.z80_prgram );
- memory_install_ram(machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, genz80.z80_prgram);
+ memory_install_ram(machine->device(tag)->memory().space(AS_PROGRAM), 0x0000, 0x1fff, 0, 0, genz80.z80_prgram);
// not allowed??
-// memory_install_readwrite_bank(machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x3fff, 0, 0, "bank1");
+// memory_install_readwrite_bank(machine->device(tag)->memory().space(AS_PROGRAM), 0x2000, 0x3fff, 0, 0, "bank1");
- memory_install_readwrite8_device_handler(machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), ym, 0x4000, 0x4003, 0, 0, ym2612_r, ym2612_w);
- memory_install_write8_handler (machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x6000, 0, 0, megadriv_z80_z80_bank_w);
- memory_install_write8_handler (machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0x6001, 0x6001, 0, 0, megadriv_z80_z80_bank_w);
- memory_install_read8_handler (machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0x6100, 0x7eff, 0, 0, megadriv_z80_unmapped_read);
- memory_install_readwrite8_handler(machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0x7f00, 0x7fff, 0, 0, megadriv_z80_vdp_read, megadriv_z80_vdp_write);
- memory_install_readwrite8_handler(machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, z80_read_68k_banked_data, z80_write_68k_banked_data);
+ memory_install_readwrite8_device_handler(machine->device(tag)->memory().space(AS_PROGRAM), ym, 0x4000, 0x4003, 0, 0, ym2612_r, ym2612_w);
+ memory_install_write8_handler (machine->device(tag)->memory().space(AS_PROGRAM), 0x6000, 0x6000, 0, 0, megadriv_z80_z80_bank_w);
+ memory_install_write8_handler (machine->device(tag)->memory().space(AS_PROGRAM), 0x6001, 0x6001, 0, 0, megadriv_z80_z80_bank_w);
+ memory_install_read8_handler (machine->device(tag)->memory().space(AS_PROGRAM), 0x6100, 0x7eff, 0, 0, megadriv_z80_unmapped_read);
+ memory_install_readwrite8_handler(machine->device(tag)->memory().space(AS_PROGRAM), 0x7f00, 0x7fff, 0, 0, megadriv_z80_vdp_read, megadriv_z80_vdp_write);
+ memory_install_readwrite8_handler(machine->device(tag)->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, z80_read_68k_banked_data, z80_write_68k_banked_data);
}
// these are tests for 'special case' hardware to make sure I don't break anything while rearranging things
@@ -10096,24 +10096,24 @@ DRIVER_INIT( _32x )
if (_32x_adapter_enabled == 0)
{
- memory_install_rom(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000000, 0x03fffff, 0, 0, machine->region("gamecart")->base());
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x000070, 0x000073, 0, 0, _32x_68k_hint_vector_r, _32x_68k_hint_vector_w); // h interrupt vector
+ memory_install_rom(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000000, 0x03fffff, 0, 0, machine->region("gamecart")->base());
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x000070, 0x000073, 0, 0, _32x_68k_hint_vector_r, _32x_68k_hint_vector_w); // h interrupt vector
};
a15100_reg = 0x0000;
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa15100, 0xa15101, 0, 0, _32x_68k_a15100_r, _32x_68k_a15100_w); // framebuffer control regs
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa15102, 0xa15103, 0, 0, _32x_68k_a15102_r, _32x_68k_a15102_w); // send irq to sh2
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa15104, 0xa15105, 0, 0, _32x_68k_a15104_r, _32x_68k_a15104_w); // 68k BANK rom set
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa15106, 0xa15107, 0, 0, _32x_68k_a15106_r, _32x_68k_a15106_w); // dreq stuff
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa15108, 0xa15113, 0, 0, _32x_dreq_common_r, _32x_dreq_common_w); // dreq src / dst / length /fifo
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa15100, 0xa15101, 0, 0, _32x_68k_a15100_r, _32x_68k_a15100_w); // framebuffer control regs
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa15102, 0xa15103, 0, 0, _32x_68k_a15102_r, _32x_68k_a15102_w); // send irq to sh2
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa15104, 0xa15105, 0, 0, _32x_68k_a15104_r, _32x_68k_a15104_w); // 68k BANK rom set
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa15106, 0xa15107, 0, 0, _32x_68k_a15106_r, _32x_68k_a15106_w); // dreq stuff
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa15108, 0xa15113, 0, 0, _32x_dreq_common_r, _32x_dreq_common_w); // dreq src / dst / length /fifo
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa1511a, 0xa1511b, 0, 0, _32x_68k_a1511a_r, _32x_68k_a1511a_w); // SEGA TV
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa1511a, 0xa1511b, 0, 0, _32x_68k_a1511a_r, _32x_68k_a1511a_w); // SEGA TV
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa15120, 0xa1512f, 0, 0, _32x_68k_commsram_r, _32x_68k_commsram_w); // comms reg 0-7
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa15130, 0xa1513f, 0, 0, _32x_pwm_r, _32x_68k_pwm_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa15120, 0xa1512f, 0, 0, _32x_68k_commsram_r, _32x_68k_commsram_w); // comms reg 0-7
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa15130, 0xa1513f, 0, 0, _32x_pwm_r, _32x_68k_pwm_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0a130ec, 0x0a130ef, 0, 0, _32x_68k_MARS_r); // system ID
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0a130ec, 0x0a130ef, 0, 0, _32x_68k_MARS_r); // system ID
/* Interrupts are masked / disabled at first */
diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c
index 4871dcfd915..485fa1c2133 100644
--- a/src/mame/machine/mhavoc.c
+++ b/src/mame/machine/mhavoc.c
@@ -86,7 +86,7 @@ MACHINE_START( mhavoc )
MACHINE_RESET( mhavoc )
{
mhavoc_state *state = machine->driver_data<mhavoc_state>();
- address_space *space = machine->device("alpha")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("alpha")->memory().space(AS_PROGRAM);
state->has_gamma_cpu = (machine->device("gamma") != NULL);
memory_configure_bank(machine, "bank1", 0, 1, state->zram0, 0);
@@ -340,6 +340,6 @@ DRIVER_INIT( mhavocrv )
{
/* install the speech support that was only optionally stuffed for use */
/* in the Return to Vax hack */
- memory_install_write8_handler(machine->device("gamma")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5800, 0x5800, 0, 0, mhavocrv_speech_data_w);
- memory_install_write8_handler(machine->device("gamma")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5900, 0x5900, 0, 0, mhavocrv_speech_strobe_w);
+ memory_install_write8_handler(machine->device("gamma")->memory().space(AS_PROGRAM), 0x5800, 0x5800, 0, 0, mhavocrv_speech_data_w);
+ memory_install_write8_handler(machine->device("gamma")->memory().space(AS_PROGRAM), 0x5900, 0x5900, 0, 0, mhavocrv_speech_strobe_w);
}
diff --git a/src/mame/machine/micro3d.c b/src/mame/machine/micro3d.c
index 2fed7a22ff5..dbbabedeec9 100644
--- a/src/mame/machine/micro3d.c
+++ b/src/mame/machine/micro3d.c
@@ -628,7 +628,7 @@ WRITE32_HANDLER( drmath_intr2_ack )
DRIVER_INIT( micro3d )
{
micro3d_state *state = machine->driver_data<micro3d_state>();
- address_space *space = machine->device("drmath")->memory().space(ADDRESS_SPACE_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);
@@ -647,7 +647,7 @@ DRIVER_INIT( micro3d )
DRIVER_INIT( botssa )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* Required to pass the hardware version check */
memory_install_read16_handler(space, 0x140000, 0x140001, 0, 0, botssa_140000_r );
diff --git a/src/mame/machine/midtunit.c b/src/mame/machine/midtunit.c
index f3583b09256..996554e5b9d 100644
--- a/src/mame/machine/midtunit.c
+++ b/src/mame/machine/midtunit.c
@@ -464,16 +464,16 @@ DRIVER_INIT( mktunit )
init_tunit_generic(machine, SOUND_ADPCM);
/* protection */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1b00000, 0x1b6ffff, 0, 0, mk_prot_r, mk_prot_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1b00000, 0x1b6ffff, 0, 0, mk_prot_r, mk_prot_w);
/* sound chip protection (hidden RAM) */
- memory_install_ram(machine->device("adpcm")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfb9c, 0xfbc6, 0, 0, NULL);
+ memory_install_ram(machine->device("adpcm")->memory().space(AS_PROGRAM), 0xfb9c, 0xfbc6, 0, 0, NULL);
}
DRIVER_INIT( mkturbo )
{
/* protection */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfffff400, 0xfffff40f, 0, 0, mkturbo_prot_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfffff400, 0xfffff40f, 0, 0, mkturbo_prot_r);
DRIVER_INIT_CALL(mktunit);
}
@@ -488,20 +488,20 @@ static void init_nbajam_common(running_machine *machine, int te_protection)
if (!te_protection)
{
nbajam_prot_table = nbajam_prot_values;
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1b14020, 0x1b2503f, 0, 0, nbajam_prot_r, nbajam_prot_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1b14020, 0x1b2503f, 0, 0, nbajam_prot_r, nbajam_prot_w);
}
else
{
nbajam_prot_table = nbajamte_prot_values;
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1b15f40, 0x1b37f5f, 0, 0, nbajam_prot_r, nbajam_prot_w);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1b95f40, 0x1bb7f5f, 0, 0, nbajam_prot_r, nbajam_prot_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1b15f40, 0x1b37f5f, 0, 0, nbajam_prot_r, nbajam_prot_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1b95f40, 0x1bb7f5f, 0, 0, nbajam_prot_r, nbajam_prot_w);
}
/* sound chip protection (hidden RAM) */
if (!te_protection)
- memory_install_ram(machine->device("adpcm")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfbaa, 0xfbd4, 0, 0, NULL);
+ memory_install_ram(machine->device("adpcm")->memory().space(AS_PROGRAM), 0xfbaa, 0xfbd4, 0, 0, NULL);
else
- memory_install_ram(machine->device("adpcm")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfbec, 0xfc16, 0, 0, NULL);
+ memory_install_ram(machine->device("adpcm")->memory().space(AS_PROGRAM), 0xfbec, 0xfc16, 0, 0, NULL);
}
DRIVER_INIT( nbajam )
@@ -520,19 +520,19 @@ DRIVER_INIT( jdreddp )
init_tunit_generic(machine, SOUND_ADPCM_LARGE);
/* looks like the watchdog needs to be disabled */
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01d81060, 0x01d8107f, 0, 0);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01d81060, 0x01d8107f, 0, 0);
/* protection */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1b00000, 0x1bfffff, 0, 0, jdredd_prot_r, jdredd_prot_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x1b00000, 0x1bfffff, 0, 0, jdredd_prot_r, jdredd_prot_w);
/* sound chip protection (hidden RAM) */
- memory_install_read_bank(machine->device("adpcm")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfbcf, 0xfbf9, 0, 0, "bank7");
- memory_install_write_bank(machine->device("adpcm")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfbcf, 0xfbf9, 0, 0, "bank9");
+ memory_install_read_bank(machine->device("adpcm")->memory().space(AS_PROGRAM), 0xfbcf, 0xfbf9, 0, 0, "bank7");
+ memory_install_write_bank(machine->device("adpcm")->memory().space(AS_PROGRAM), 0xfbcf, 0xfbf9, 0, 0, "bank9");
memory_set_bankptr(machine, "bank9", auto_alloc_array(machine, UINT8, 0x80));
#if ENABLE_ALL_JDREDD_LEVELS
/* how about the final levels? */
- jdredd_hack = memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xFFBA7FF0, 0xFFBA7FFf, 0, 0, jdredd_hack_r);
+ jdredd_hack = memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xFFBA7FF0, 0xFFBA7FFf, 0, 0, jdredd_hack_r);
#endif
}
@@ -553,13 +553,13 @@ DRIVER_INIT( mk2 )
midtunit_gfx_rom_large = 1;
/* protection */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00f20c60, 0x00f20c7f, 0, 0, mk2_prot_w);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x00f42820, 0x00f4283f, 0, 0, mk2_prot_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01a190e0, 0x01a190ff, 0, 0, mk2_prot_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01a191c0, 0x01a191df, 0, 0, mk2_prot_shift_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01a3d0c0, 0x01a3d0ff, 0, 0, mk2_prot_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01d9d1e0, 0x01d9d1ff, 0, 0, mk2_prot_const_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01def920, 0x01def93f, 0, 0, mk2_prot_const_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00f20c60, 0x00f20c7f, 0, 0, mk2_prot_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x00f42820, 0x00f4283f, 0, 0, mk2_prot_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01a190e0, 0x01a190ff, 0, 0, mk2_prot_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01a191c0, 0x01a191df, 0, 0, mk2_prot_shift_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01a3d0c0, 0x01a3d0ff, 0, 0, mk2_prot_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01d9d1e0, 0x01d9d1ff, 0, 0, mk2_prot_const_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01def920, 0x01def93f, 0, 0, mk2_prot_const_r);
}
diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c
index bad97a70027..f1f1d87e0de 100644
--- a/src/mame/machine/midwunit.c
+++ b/src/mame/machine/midwunit.c
@@ -254,14 +254,14 @@ DRIVER_INIT( umk3 )
{
midwunit_state *state = machine->driver_data<midwunit_state>();
init_mk3_common(machine);
- state->umk3_palette = memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0106a060, 0x0106a09f, 0, 0, umk3_palette_hack_w);
+ state->umk3_palette = memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0106a060, 0x0106a09f, 0, 0, umk3_palette_hack_w);
}
DRIVER_INIT( umk3r11 )
{
midwunit_state *state = machine->driver_data<midwunit_state>();
init_mk3_common(machine);
- state->umk3_palette = memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0106a060, 0x0106a09f, 0, 0, umk3_palette_hack_w);
+ state->umk3_palette = memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0106a060, 0x0106a09f, 0, 0, umk3_palette_hack_w);
}
@@ -347,7 +347,7 @@ DRIVER_INIT( wwfmania )
init_wunit_generic(machine);
/* enable I/O shuffling */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01800000, 0x0180000f, 0, 0, wwfmania_io_0_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01800000, 0x0180000f, 0, 0, wwfmania_io_0_w);
/* 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 805d4f6f033..fb1d59a4012 100644
--- a/src/mame/machine/midyunit.c
+++ b/src/mame/machine/midyunit.c
@@ -310,23 +310,23 @@ static void init_generic(running_machine *machine, int bpp, int sound, int prot_
{
case SOUND_CVSD_SMALL:
williams_cvsd_init(machine);
- memory_install_write8_handler(machine->device("cvsdcpu")->memory().space(ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, cvsd_protection_w);
+ memory_install_write8_handler(machine->device("cvsdcpu")->memory().space(AS_PROGRAM), prot_start, prot_end, 0, 0, cvsd_protection_w);
state->cvsd_protection_base = machine->region("cvsdcpu")->base() + 0x10000 + (prot_start - 0x8000);
break;
case SOUND_CVSD:
williams_cvsd_init(machine);
- memory_install_ram(machine->device("cvsdcpu")->memory().space(ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, NULL);
+ memory_install_ram(machine->device("cvsdcpu")->memory().space(AS_PROGRAM), prot_start, prot_end, 0, 0, NULL);
break;
case SOUND_ADPCM:
williams_adpcm_init(machine);
- memory_install_ram(machine->device("adpcm")->memory().space(ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, NULL);
+ memory_install_ram(machine->device("adpcm")->memory().space(AS_PROGRAM), prot_start, prot_end, 0, 0, NULL);
break;
case SOUND_NARC:
williams_narc_init(machine);
- memory_install_ram(machine->device("narc1cpu")->memory().space(ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, NULL);
+ memory_install_ram(machine->device("narc1cpu")->memory().space(AS_PROGRAM), prot_start, prot_end, 0, 0, NULL);
break;
case SOUND_YAWDIM:
@@ -499,7 +499,7 @@ static READ16_HANDLER( mkturbo_prot_r )
DRIVER_INIT( mkyturbo )
{
/* protection */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xfffff400, 0xfffff40f, 0, 0, mkturbo_prot_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xfffff400, 0xfffff40f, 0, 0, mkturbo_prot_r);
DRIVER_INIT_CALL(mkyunit);
}
@@ -521,12 +521,12 @@ static void term2_init_common(running_machine *machine, write16_space_func hack_
init_generic(machine, 6, SOUND_ADPCM, 0xfa8d, 0xfa9c);
/* special inputs */
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01c00000, 0x01c0005f, 0, 0, term2_input_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x01e00000, 0x01e0001f, 0, 0, term2_sound_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01c00000, 0x01c0005f, 0, 0, term2_input_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x01e00000, 0x01e0001f, 0, 0, term2_sound_w);
/* HACK: this prevents the freeze on the movies */
/* until we figure whats causing it, this is better than nothing */
- state->t2_hack_mem = memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x010aa0e0, 0x010aa0ff, 0, 0, hack_w);
+ state->t2_hack_mem = memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x010aa0e0, 0x010aa0ff, 0, 0, hack_w);
}
DRIVER_INIT( term2 ) { term2_init_common(machine, term2_hack_w); }
diff --git a/src/mame/machine/model1.c b/src/mame/machine/model1.c
index 49ed6cb4444..627b926086d 100644
--- a/src/mame/machine/model1.c
+++ b/src/mame/machine/model1.c
@@ -2246,7 +2246,7 @@ const mb86233_cpu_core model1_vr_tgp_config =
};
/* TGP memory map */
-ADDRESS_MAP_START( model1_vr_tgp_map, ADDRESS_SPACE_PROGRAM, 32 )
+ADDRESS_MAP_START( model1_vr_tgp_map, AS_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x000007ff) AM_RAM AM_REGION("tgp", 0)
AM_RANGE(0x00400000, 0x00407fff) AM_READWRITE(copro_ram_r, copro_ram_w)
AM_RANGE(0xff800000, 0xff87ffff) AM_ROM AM_REGION("user2", 0)
diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c
index e5256d843b4..f38177e740f 100644
--- a/src/mame/machine/n64.c
+++ b/src/mame/machine/n64.c
@@ -336,7 +336,7 @@ static UINT32 dp_clock = 0;
static void sp_dma(running_machine *machine, int direction)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
int i, c;
if (sp_dma_length == 0)
diff --git a/src/mame/machine/namco50.c b/src/mame/machine/namco50.c
index 05360470d57..56a1bd965a3 100644
--- a/src/mame/machine/namco50.c
+++ b/src/mame/machine/namco50.c
@@ -253,7 +253,7 @@ READ8_DEVICE_HANDLER( namco_50xx_read )
DEVICE INTERFACE
***************************************************************************/
-static ADDRESS_MAP_START( namco_50xx_map_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( namco_50xx_map_io, AS_IO, 8 )
AM_RANGE(MB88_PORTK, MB88_PORTK) AM_READ(namco_50xx_K_r)
AM_RANGE(MB88_PORTO, MB88_PORTO) AM_WRITE(namco_50xx_O_w)
AM_RANGE(MB88_PORTR0, MB88_PORTR0) AM_READ(namco_50xx_R0_r)
diff --git a/src/mame/machine/namco51.c b/src/mame/machine/namco51.c
index 4fbfc8bcb62..f96a6bf32c2 100644
--- a/src/mame/machine/namco51.c
+++ b/src/mame/machine/namco51.c
@@ -349,7 +349,7 @@ READ8_DEVICE_HANDLER( namco_51xx_read )
DEVICE INTERFACE
***************************************************************************/
-static ADDRESS_MAP_START( namco_51xx_map_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( namco_51xx_map_io, AS_IO, 8 )
// AM_RANGE(MB88_PORTK, MB88_PORTK) AM_READ(namco_51xx_K_r)
// AM_RANGE(MB88_PORTO, MB88_PORTO) AM_WRITE(namco_51xx_O_w)
// AM_RANGE(MB88_PORTR0, MB88_PORTR0) AM_READ(namco_51xx_R0_r)
diff --git a/src/mame/machine/namco53.c b/src/mame/machine/namco53.c
index e6e42f4cb21..878cd8c18ee 100644
--- a/src/mame/machine/namco53.c
+++ b/src/mame/machine/namco53.c
@@ -144,7 +144,7 @@ READ8_DEVICE_HANDLER( namco_53xx_read )
DEVICE INTERFACE
***************************************************************************/
-static ADDRESS_MAP_START( namco_53xx_map_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( namco_53xx_map_io, AS_IO, 8 )
AM_RANGE(MB88_PORTK, MB88_PORTK) AM_READ(namco_53xx_K_r)
AM_RANGE(MB88_PORTO, MB88_PORTO) AM_WRITE(namco_53xx_O_w)
AM_RANGE(MB88_PORTP, MB88_PORTP) AM_WRITE(namco_53xx_P_w)
diff --git a/src/mame/machine/namco62.c b/src/mame/machine/namco62.c
index fa5e5475171..c9662c76c05 100644
--- a/src/mame/machine/namco62.c
+++ b/src/mame/machine/namco62.c
@@ -37,7 +37,7 @@ INLINE namco_62xx_state *get_safe_token(device_t *device)
DEVICE INTERFACE
***************************************************************************/
-static ADDRESS_MAP_START( namco_62xx_map_io, ADDRESS_SPACE_IO, 8 )
+static ADDRESS_MAP_START( namco_62xx_map_io, AS_IO, 8 )
// AM_RANGE(MB88_PORTK, MB88_PORTK) AM_READ(namco_62xx_K_r)
// AM_RANGE(MB88_PORTO, MB88_PORTO) AM_WRITE(namco_62xx_O_w)
// AM_RANGE(MB88_PORTR0, MB88_PORTR0) AM_READ(namco_62xx_R0_r)
diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c
index cdc1f811b09..2df04baa58a 100644
--- a/src/mame/machine/namcos1.c
+++ b/src/mame/machine/namcos1.c
@@ -674,7 +674,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(ADDRESS_SPACE_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( tankfrc4 )
};
namcos1_driver_init(machine, &tankfrce_specific);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1400, 0x1401, 0, 0, faceoff_inputs_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_PROGRAM), 0x1400, 0x1401, 0, 0, faceoff_inputs_r);
}
/*******************************************************************************
@@ -1307,7 +1307,7 @@ static READ8_HANDLER( quester_paddle_r )
DRIVER_INIT( quester )
{
namcos1_driver_init(machine, NULL);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1400, 0x1401, 0, 0, quester_paddle_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_PROGRAM), 0x1400, 0x1401, 0, 0, quester_paddle_r);
}
@@ -1396,7 +1396,7 @@ static READ8_HANDLER( berabohm_buttons_r )
DRIVER_INIT( berabohm )
{
namcos1_driver_init(machine, NULL);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1400, 0x1401, 0, 0, berabohm_buttons_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_PROGRAM), 0x1400, 0x1401, 0, 0, berabohm_buttons_r);
}
@@ -1466,5 +1466,5 @@ static READ8_HANDLER( faceoff_inputs_r )
DRIVER_INIT( faceoff )
{
namcos1_driver_init(machine, NULL);
- memory_install_read8_handler(machine->device("mcu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x1400, 0x1401, 0, 0, faceoff_inputs_r);
+ memory_install_read8_handler(machine->device("mcu")->memory().space(AS_PROGRAM), 0x1400, 0x1401, 0, 0, faceoff_inputs_r);
}
diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c
index 1ce11fb2226..f040167132a 100644
--- a/src/mame/machine/namcos2.c
+++ b/src/mame/machine/namcos2.c
@@ -113,7 +113,7 @@ MACHINE_START( namcos2 )
MACHINE_RESET( namcos2 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 9aab1e11b6d..93a40f5076b 100644
--- a/src/mame/machine/naomi.c
+++ b/src/mame/machine/naomi.c
@@ -171,7 +171,7 @@ static void create_pic_from_retdat(running_machine* machine)
DRIVER_INIT(naomi)
{
- memory_install_read64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc2ad238, 0xc2ad23f, 0, 0, naomi_bios_idle_skip_r); // rev e bios
+ memory_install_read64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc2ad238, 0xc2ad23f, 0, 0, naomi_bios_idle_skip_r); // rev e bios
jvsboard_type = JVSBD_DEFAULT;
actel_id = 0xffff;
@@ -188,7 +188,7 @@ DRIVER_INIT(naomi2)
DRIVER_INIT(naomi_mp)
{
- memory_install_read64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc2ad238, 0xc2ad23f, 0, 0, naomi_bios_idle_skip_r); // rev e bios
+ memory_install_read64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc2ad238, 0xc2ad23f, 0, 0, naomi_bios_idle_skip_r); // rev e bios
jvsboard_type = JVSBD_MAHJONG;
actel_id = 0xffff;
@@ -205,7 +205,7 @@ static READ64_HANDLER( naomigd_ggxxsla_idle_skip_r )
DRIVER_INIT( ggxxsla )
{
- memory_install_read64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc1aae18, 0xc1aae1f, 0, 0, naomigd_ggxxsla_idle_skip_r);
+ memory_install_read64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc1aae18, 0xc1aae1f, 0, 0, naomigd_ggxxsla_idle_skip_r);
DRIVER_INIT_CALL(naomi);
}
@@ -220,7 +220,7 @@ static READ64_HANDLER( naomigd_ggxx_idle_skip_r )
DRIVER_INIT( ggxx )
{
- memory_install_read64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc1837b8, 0xc1837bf, 0, 0, naomigd_ggxx_idle_skip_r);
+ memory_install_read64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc1837b8, 0xc1837bf, 0, 0, naomigd_ggxx_idle_skip_r);
DRIVER_INIT_CALL(naomi);
}
@@ -236,7 +236,7 @@ static READ64_HANDLER( naomigd_ggxxrl_idle_skip_r )
DRIVER_INIT( ggxxrl )
{
- memory_install_read64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc18d6c8, 0xc18d6cf, 0, 0, naomigd_ggxxrl_idle_skip_r);
+ memory_install_read64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc18d6c8, 0xc18d6cf, 0, 0, naomigd_ggxxrl_idle_skip_r);
DRIVER_INIT_CALL(naomi);
}
@@ -251,7 +251,7 @@ static READ64_HANDLER( naomigd_sfz3ugd_idle_skip_r )
DRIVER_INIT( sfz3ugd )
{
- memory_install_read64_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc5dc900, 0xc5dc907, 0, 0, naomigd_sfz3ugd_idle_skip_r);
+ memory_install_read64_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xc5dc900, 0xc5dc907, 0, 0, naomigd_sfz3ugd_idle_skip_r);
DRIVER_INIT_CALL(naomi);
}
diff --git a/src/mame/machine/neoboot.c b/src/mame/machine/neoboot.c
index 8561b535006..43b52f5ae55 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 )
{
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fe000, 0x2fffff, 0, 0, kof10th_RAMB_r);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x23ffff, 0, 0, kof10th_custom_w);
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x240000, 0x2fffff, 0, 0, kof10th_bankswitch_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fe000, 0x2fffff, 0, 0, kof10th_RAMB_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x23ffff, 0, 0, kof10th_custom_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x240000, 0x2fffff, 0, 0, kof10th_bankswitch_w);
}
void decrypt_kof10th(running_machine *machine)
@@ -485,7 +485,7 @@ void patch_cthd2003( running_machine *machine )
UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base();
/* special ROM banking handler */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2ffff0, 0x2fffff, 0, 0, cthd2003_bankswitch_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2ffff0, 0x2fffff, 0, 0, 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
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM),0x2ffff0, 0x2fffff,0, 0, mslug5_prot_r, ms5plus_bankswitch_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM),0x2ffff0, 0x2fffff,0, 0, mslug5_prot_r, ms5plus_bankswitch_w);
}
@@ -972,7 +972,7 @@ void kf2k3bl_px_decrypt( running_machine *machine )
void kf2k3bl_install_protection(running_machine *machine)
{
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fe000, 0x2fffff, 0, 0, kof2003_r, kof2003_w );
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fe000, 0x2fffff, 0, 0, kof2003_r, kof2003_w );
}
@@ -1000,7 +1000,7 @@ void kf2k3pl_px_decrypt( running_machine *machine )
void kf2k3pl_install_protection(running_machine *machine)
{
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fe000, 0x2fffff, 0, 0, kof2003_r, kof2003p_w );
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fe000, 0x2fffff, 0, 0, kof2003_r, kof2003p_w );
}
@@ -1031,7 +1031,7 @@ void kf2k3upl_px_decrypt( running_machine *machine )
void kf2k3upl_install_protection(running_machine *machine)
{
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fe000, 0x2fffff, 0, 0, kof2003_r, kof2003_w );
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fe000, 0x2fffff, 0, 0, kof2003_r, kof2003_w );
}
diff --git a/src/mame/machine/neoprot.c b/src/mame/machine/neoprot.c
index 5c4425f8eab..d78b2c39f55 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. */
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x200000, 0x2fffff, 0, 0, fatfury2_protection_16_r, fatfury2_protection_16_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x200000, 0x2fffff, 0, 0, fatfury2_protection_16_r, fatfury2_protection_16_w);
state->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 */
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x20aaaa, 0x20aaab, 0, 0, kof98_prot_w);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x20aaaa, 0x20aaab, 0, 0, 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->neogeo_rng));
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), addr1, addr1 + 1, 0, 0, sma_random_r);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), addr2, addr2 + 1, 0, 0, sma_random_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), addr1, addr1 + 1, 0, 0, sma_random_r);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), addr2, addr2 + 1, 0, 0, sma_random_r);
}
void kof99_install_protection( running_machine *machine )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2ffff0, 0x2ffff1, 0, 0, kof99_bankswitch_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fe446, 0x2fe447, 0, 0, prot_9a37_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2ffff0, 0x2ffff1, 0, 0, kof99_bankswitch_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fe446, 0x2fe447, 0, 0, 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 )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fffc0, 0x2fffc1, 0, 0, garou_bankswitch_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fe446, 0x2fe447, 0, 0, prot_9a37_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fffc0, 0x2fffc1, 0, 0, garou_bankswitch_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fe446, 0x2fe447, 0, 0, prot_9a37_r);
sma_install_random_read_handler(machine, 0x2fffcc, 0x2ffff0);
}
@@ -430,8 +430,8 @@ void garou_install_protection( running_machine *machine )
void garouo_install_protection( running_machine *machine )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fffc0, 0x2fffc1, 0, 0, garouo_bankswitch_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fe446, 0x2fe447, 0, 0, prot_9a37_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fffc0, 0x2fffc1, 0, 0, garouo_bankswitch_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fe446, 0x2fe447, 0, 0, prot_9a37_r);
sma_install_random_read_handler(machine, 0x2fffcc, 0x2ffff0);
}
@@ -439,8 +439,8 @@ void garouo_install_protection( running_machine *machine )
void mslug3_install_protection( running_machine *machine )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fffe4, 0x2fffe5, 0, 0, mslug3_bankswitch_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fe446, 0x2fe447, 0, 0, prot_9a37_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fffe4, 0x2fffe5, 0, 0, mslug3_bankswitch_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fe446, 0x2fe447, 0, 0, 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 )
{
- memory_install_write16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fffec, 0x2fffed, 0, 0, kof2000_bankswitch_w);
- memory_install_read16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fe446, 0x2fe447, 0, 0, prot_9a37_r);
+ memory_install_write16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fffec, 0x2fffed, 0, 0, kof2000_bankswitch_w);
+ memory_install_read16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fe446, 0x2fe447, 0, 0, prot_9a37_r);
sma_install_random_read_handler(machine, 0x2fffd8, 0x2fffda);
}
@@ -540,5 +540,5 @@ void install_pvc_protection( running_machine *machine )
state->pvc_cartridge_ram = auto_alloc_array(machine, UINT16, 0x2000 / 2);
state->save_pointer(NAME(state->pvc_cartridge_ram), 0x2000 / 2);
- memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2fe000, 0x2fffff, 0, 0, pvc_prot_r, pvc_prot_w);
+ memory_install_readwrite16_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2fe000, 0x2fffff, 0, 0, pvc_prot_r, pvc_prot_w);
}
diff --git a/src/mame/machine/pcshare.c b/src/mame/machine/pcshare.c
index 917a817fe05..4392d16e3e9 100644
--- a/src/mame/machine/pcshare.c
+++ b/src/mame/machine/pcshare.c
@@ -317,7 +317,7 @@ static const struct pit8253_config at_pit8254_config =
}
};
-ADDRESS_MAP_START( pcat32_io_common, ADDRESS_SPACE_IO, 32 )
+ADDRESS_MAP_START( pcat32_io_common, AS_IO, 32 )
AM_RANGE(0x0000, 0x001f) AM_DEVREADWRITE8("dma8237_1", i8237_r, i8237_w, 0xffffffff)
AM_RANGE(0x0020, 0x003f) AM_DEVREADWRITE8("pic8259_1", pic8259_r, pic8259_w, 0xffffffff)
AM_RANGE(0x0040, 0x005f) AM_DEVREADWRITE8("pit8254", pit8253_r, pit8253_w, 0xffffffff)
diff --git a/src/mame/machine/pitnrun.c b/src/mame/machine/pitnrun.c
index df3f0b53eeb..5dbca22aecb 100644
--- a/src/mame/machine/pitnrun.c
+++ b/src/mame/machine/pitnrun.c
@@ -111,7 +111,7 @@ static TIMER_CALLBACK( pitnrun_mcu_status_real_w )
WRITE8_HANDLER( pitnrun_68705_portB_w )
{
pitnrun_state *state = space->machine->driver_data<pitnrun_state>();
- address_space *cpu0space = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
if (~data & 0x02)
{
/* 68705 is going to read data from the Z80 */
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index 1a4bfd8dc1f..9f382a5b87f 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -57,8 +57,8 @@ MACHINE_START( pc10 )
/* move to individual boards as documentation of actual boards allows */
state->nt_ram = auto_alloc_array(machine, UINT8, 0x1000);
- memory_install_readwrite8_handler(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0, 0x1fff, 0, 0, pc10_chr_r, pc10_chr_w);
- memory_install_readwrite8_handler(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, pc10_nt_r, pc10_nt_w);
+ memory_install_readwrite8_handler(machine->device("ppu")->memory().space(AS_PROGRAM), 0, 0x1fff, 0, 0, pc10_chr_r, pc10_chr_w);
+ memory_install_readwrite8_handler(machine->device("ppu")->memory().space(AS_PROGRAM), 0x2000, 0x3eff, 0, 0, pc10_nt_r, pc10_nt_w);
if (NULL != state->vram)
set_videoram_bank(machine, 0, 8, 0, 8);
@@ -81,8 +81,8 @@ MACHINE_START( playch10_hboard )
state->vram = auto_alloc_array(machine, UINT8, 0x2000);
- memory_install_readwrite8_handler(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0, 0x1fff, 0, 0, pc10_chr_r, pc10_chr_w);
- memory_install_readwrite8_handler(machine->device("ppu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, pc10_nt_r, pc10_nt_w);
+ memory_install_readwrite8_handler(machine->device("ppu")->memory().space(AS_PROGRAM), 0, 0x1fff, 0, 0, pc10_chr_r, pc10_chr_w);
+ memory_install_readwrite8_handler(machine->device("ppu")->memory().space(AS_PROGRAM), 0x2000, 0x3eff, 0, 0, pc10_nt_r, pc10_nt_w);
}
/*************************************
@@ -610,7 +610,7 @@ DRIVER_INIT( pcaboard )
{
playch10_state *state = machine->driver_data<playch10_state>();
/* switches vrom with writes to the $803e-$8041 area */
- memory_install_write8_handler(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0x8fff, 0, 0, aboard_vrom_switch_w );
+ memory_install_write8_handler(machine->device("cart")->memory().space(AS_PROGRAM), 0x8000, 0x8fff, 0, 0, aboard_vrom_switch_w );
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -643,7 +643,7 @@ DRIVER_INIT( pcbboard )
memcpy(&prg[0x08000], &prg[0x28000], 0x8000);
/* Roms are banked at $8000 to $bfff */
- memory_install_write8_handler(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, bboard_rom_switch_w );
+ memory_install_write8_handler(machine->device("cart")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, bboard_rom_switch_w );
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -669,7 +669,7 @@ DRIVER_INIT( pccboard )
{
playch10_state *state = machine->driver_data<playch10_state>();
/* switches vrom with writes to $6000 */
- memory_install_write8_handler(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x6000, 0, 0, cboard_vrom_switch_w );
+ memory_install_write8_handler(machine->device("cart")->memory().space(AS_PROGRAM), 0x6000, 0x6000, 0, 0, cboard_vrom_switch_w );
/* we have no vram, make sure switching games doesn't point to an old allocation */
state->vram = NULL;
@@ -693,7 +693,7 @@ DRIVER_INIT( pcdboard )
state->mmc1_rom_mask = 0x07;
/* MMC mapper at writes to $8000-$ffff */
- memory_install_write8_handler(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, mmc1_rom_switch_w );
+ memory_install_write8_handler(machine->device("cart")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, mmc1_rom_switch_w );
/* common init */
@@ -710,7 +710,7 @@ DRIVER_INIT( pcdboard_2 )
{
playch10_state *state = machine->driver_data<playch10_state>();
/* extra ram at $6000-$7fff */
- memory_install_ram(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, NULL );
+ memory_install_ram(machine->device("cart")->memory().space(AS_PROGRAM), 0x6000, 0x7fff, 0, 0, NULL );
/* common init */
DRIVER_INIT_CALL(pcdboard);
@@ -809,13 +809,13 @@ DRIVER_INIT( pceboard )
memcpy(&prg[0x08000], &prg[0x28000], 0x8000);
/* basically a mapper 9 on a nes */
- memory_install_write8_handler(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, eboard_rom_switch_w );
+ memory_install_write8_handler(machine->device("cart")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, eboard_rom_switch_w );
/* ppu_latch callback */
ppu2c0x_set_latch(machine->device("ppu"), mapper9_latch);
/* nvram at $6000-$6fff */
- memory_install_ram(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x6fff, 0, 0, NULL );
+ memory_install_ram(machine->device("cart")->memory().space(AS_PROGRAM), 0x6000, 0x6fff, 0, 0, NULL );
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -839,7 +839,7 @@ DRIVER_INIT( pcfboard )
state->mmc1_rom_mask = 0x07;
/* MMC mapper at writes to $8000-$ffff */
- memory_install_write8_handler(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, mmc1_rom_switch_w );
+ memory_install_write8_handler(machine->device("cart")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, mmc1_rom_switch_w );
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -851,7 +851,7 @@ DRIVER_INIT( pcfboard_2 )
{
playch10_state *state = machine->driver_data<playch10_state>();
/* extra ram at $6000-$6fff */
- memory_install_ram(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x6fff, 0, 0, NULL );
+ memory_install_ram(machine->device("cart")->memory().space(AS_PROGRAM), 0x6000, 0x6fff, 0, 0, NULL );
state->vram = NULL;
@@ -1024,10 +1024,10 @@ DRIVER_INIT( pcgboard )
memcpy(&prg[0x0c000], &prg[0x4c000], 0x4000);
/* MMC3 mapper at writes to $8000-$ffff */
- memory_install_write8_handler(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, gboard_rom_switch_w );
+ memory_install_write8_handler(machine->device("cart")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, gboard_rom_switch_w );
/* extra ram at $6000-$7fff */
- memory_install_ram(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, NULL );
+ memory_install_ram(machine->device("cart")->memory().space(AS_PROGRAM), 0x6000, 0x7fff, 0, 0, NULL );
state->gboard_banks[0] = 0x1e;
state->gboard_banks[1] = 0x1f;
@@ -1077,7 +1077,7 @@ DRIVER_INIT( pciboard )
memcpy(&prg[0x08000], &prg[0x10000], 0x8000);
/* Roms are banked at $8000 to $bfff */
- memory_install_write8_handler(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, iboard_rom_switch_w );
+ memory_install_write8_handler(machine->device("cart")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, iboard_rom_switch_w );
/* common init */
DRIVER_INIT_CALL(playch10);
@@ -1146,10 +1146,10 @@ DRIVER_INIT( pchboard )
memcpy(&prg[0x0c000], &prg[0x4c000], 0x4000);
/* Roms are banked at $8000 to $bfff */
- memory_install_write8_handler(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, hboard_rom_switch_w );
+ memory_install_write8_handler(machine->device("cart")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, hboard_rom_switch_w );
/* extra ram at $6000-$7fff */
- memory_install_ram(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, NULL );
+ memory_install_ram(machine->device("cart")->memory().space(AS_PROGRAM), 0x6000, 0x7fff, 0, 0, NULL );
state->gboard_banks[0] = 0x1e;
state->gboard_banks[1] = 0x1f;
@@ -1177,10 +1177,10 @@ DRIVER_INIT( pckboard )
state->mmc1_rom_mask = 0x0f;
/* extra ram at $6000-$7fff */
- memory_install_ram(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, NULL );
+ memory_install_ram(machine->device("cart")->memory().space(AS_PROGRAM), 0x6000, 0x7fff, 0, 0, NULL );
/* Roms are banked at $8000 to $bfff */
- memory_install_write8_handler(machine->device("cart")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, mmc1_rom_switch_w );
+ memory_install_write8_handler(machine->device("cart")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, mmc1_rom_switch_w );
/* common init */
DRIVER_INIT_CALL(playch10);
diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c
index 4c4b5ed2b6b..269fc5f860c 100644
--- a/src/mame/machine/scramble.c
+++ b/src/mame/machine/scramble.c
@@ -208,13 +208,13 @@ DRIVER_INIT( scramble_ppi )
static DRIVER_INIT( scobra )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa803, 0xa803, 0, 0, scrambold_background_enable_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa803, 0xa803, 0, 0, scrambold_background_enable_w);
}
#ifdef UNUSED_FUNCTION
DRIVER_INIT( atlantis )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6803, 0x6803, 0, 0, scrambold_background_enable_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6803, 0x6803, 0, 0, scrambold_background_enable_w);
}
DRIVER_INIT( scramble )
@@ -225,14 +225,14 @@ DRIVER_INIT( scramble )
DRIVER_INIT( stratgyx )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xb000, 0xb000, 0, 0, scrambold_background_green_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xb002, 0xb002, 0, 0, scrambold_background_blue_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xb00a, 0xb00a, 0, 0, scrambold_background_red_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xb000, 0xb000, 0, 0, scrambold_background_green_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xb002, 0xb002, 0, 0, scrambold_background_blue_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xb00a, 0xb00a, 0, 0, scrambold_background_red_w);
}
DRIVER_INIT( tazmani2 )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xb002, 0xb002, 0, 0, scrambold_background_enable_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xb002, 0xb002, 0, 0, scrambold_background_enable_w);
}
DRIVER_INIT( ckongs )
@@ -242,15 +242,15 @@ DRIVER_INIT( ckongs )
DRIVER_INIT( mariner )
{
/* extra ROM */
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5800, 0x67ff, 0, 0, "bank1");
- memory_unmap_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5800, 0x67ff, 0, 0);
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5800, 0x67ff, 0, 0, "bank1");
+ memory_unmap_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5800, 0x67ff, 0, 0);
memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0x5800);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x9008, 0x9008, 0, 0, mariner_protection_2_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xb401, 0xb401, 0, 0, mariner_protection_1_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x9008, 0x9008, 0, 0, mariner_protection_2_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xb401, 0xb401, 0, 0, mariner_protection_1_r);
/* ??? (it's NOT a background enable) */
- /*memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6803, 0x6803, 0, 0);*/
+ /*memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6803, 0x6803, 0, 0);*/
}
#ifdef UNUSED_FUNCTION
@@ -328,15 +328,15 @@ DRIVER_INIT( cavelon )
UINT8 *ROM = machine->region("maincpu")->base();
/* banked ROM */
- memory_install_read_bank(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1");
+ memory_install_read_bank(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1");
memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x00000], 0x10000);
cavelon_banksw(machine);
/* A15 switches memory banks */
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, cavelon_banksw_r, cavelon_banksw_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, cavelon_banksw_r, cavelon_banksw_w);
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x2000, 0, 0); /* ??? */
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x3800, 0x3801, 0, 0); /* looks suspicously like
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x2000, 0x2000, 0, 0); /* ??? */
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x3800, 0x3801, 0, 0); /* looks suspicously like
an AY8910, but not sure */
state_save_register_global(machine, cavelon_bank);
}
@@ -345,7 +345,7 @@ DRIVER_INIT( cavelon )
DRIVER_INIT( darkplnt )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xb00a, 0xb00a, 0, 0, darkplnt_bullet_color_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xb00a, 0xb00a, 0, 0, darkplnt_bullet_color_w);
}
DRIVER_INIT( mimonkey )
@@ -381,17 +381,17 @@ DRIVER_INIT( mimonkey )
ctr++;
}
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa804, 0xa804, 0, 0, scrambold_background_enable_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa804, 0xa804, 0, 0, scrambold_background_enable_w);
}
DRIVER_INIT( mimonsco )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xa804, 0xa804, 0, 0, scrambold_background_enable_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xa804, 0xa804, 0, 0, scrambold_background_enable_w);
}
DRIVER_INIT( mimonscr )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6804, 0x6804, 0, 0, scrambold_background_enable_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6804, 0x6804, 0, 0, scrambold_background_enable_w);
}
diff --git a/src/mame/machine/segacrp2.c b/src/mame/machine/segacrp2.c
index 1d0eb159e92..46a7d4f1549 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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device(cputag)->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region(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 a63e7b53705..1d9a1b1cdf3 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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device(cputag)->memory().space(AS_PROGRAM);
int length = machine->region(cputag)->bytes();
int cryptlen = MIN(length, 0x8000);
UINT8 *rom = machine->region(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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device(cputag)->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region(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(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device(cputag)->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region(cputag)->base();
decrypted = auto_alloc_array(machine, UINT8, 0x9000);
diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c
index de375687d79..0423f572d2b 100644
--- a/src/mame/machine/segaic16.c
+++ b/src/mame/machine/segaic16.c
@@ -212,13 +212,13 @@ static void memory_mapper_w(address_space *space, struct memory_mapper_chip *chi
/* 02 - read data into latches 00,01 from 2 * (address in 07,08,09) */
if (data == 0x01)
{
- address_space *targetspace = chip->cpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *targetspace = chip->cpu->memory().space(AS_PROGRAM);
offs_t addr = (chip->regs[0x0a] << 17) | (chip->regs[0x0b] << 9) | (chip->regs[0x0c] << 1);
targetspace->write_word(addr, (chip->regs[0x00] << 8) | chip->regs[0x01]);
}
else if (data == 0x02)
{
- address_space *targetspace = chip->cpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *targetspace = chip->cpu->memory().space(AS_PROGRAM);
offs_t addr = (chip->regs[0x07] << 17) | (chip->regs[0x08] << 9) | (chip->regs[0x09] << 1);
UINT16 result;
result = targetspace->read_word(addr);
@@ -295,7 +295,7 @@ static UINT16 memory_mapper_r(struct memory_mapper_chip *chip, offs_t offset, UI
static void update_memory_mapping(running_machine *machine, struct memory_mapper_chip *chip, int decrypt)
{
int rgnum;
- address_space *space = chip->cpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = chip->cpu->memory().space(AS_PROGRAM);
if (LOG_MEMORY_MAP) mame_printf_debug("----\nRemapping:\n");
diff --git a/src/mame/machine/segamsys.c b/src/mame/machine/segamsys.c
index d69cbc00d9e..87f223d7736 100644
--- a/src/mame/machine/segamsys.c
+++ b/src/mame/machine/segamsys.c
@@ -30,14 +30,14 @@ static struct sms_vdp *md_sms_vdp;
#define SMS_VDP_VRAM(address) chip->vram[(address)&0x3fff]
#ifdef UNUSED_FUNCTION
-static ADDRESS_MAP_START( sms_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( sms_map, AS_PROGRAM, 8 )
// AM_RANGE(0x0000 , 0xbfff) AM_ROM
// AM_RANGE(0xc000 , 0xdfff) AM_RAM AM_MIRROR(0x2000)
ADDRESS_MAP_END
#endif
-ADDRESS_MAP_START( sms_io_map, ADDRESS_SPACE_IO, 8 )
+ADDRESS_MAP_START( sms_io_map, AS_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
ADDRESS_MAP_END
@@ -1480,7 +1480,7 @@ 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(ADDRESS_SPACE_IO);
+ address_space *io = machine->device(tag)->memory().space(AS_IO);
memory_install_read8_handler (io, 0x00, 0x00, 0, 0, sms_ioport_gg00_r);
}
@@ -1643,7 +1643,7 @@ static void megatech_set_genz80_as_sms_standard_ports(running_machine *machine,
{
/* INIT THE PORTS *********************************************************************************************/
- address_space *io = machine->device(tag)->memory().space(ADDRESS_SPACE_IO);
+ address_space *io = machine->device(tag)->memory().space(AS_IO);
device_t *sn = machine->device("snsnd");
memory_install_readwrite8_handler(io, 0x0000, 0xffff, 0, 0, z80_unmapped_port_r, z80_unmapped_port_w);
@@ -1666,16 +1666,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 */
- memory_install_readwrite8_handler(machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0xffff, 0, 0, z80_unmapped_r, z80_unmapped_w);
+ memory_install_readwrite8_handler(machine->device(tag)->memory().space(AS_PROGRAM), 0x0000, 0xffff, 0, 0, z80_unmapped_r, z80_unmapped_w);
/* main ram area */
- sms_mainram = (UINT8 *)memory_install_ram(machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xdfff, 0, 0x2000, NULL);
+ sms_mainram = (UINT8 *)memory_install_ram(machine->device(tag)->memory().space(AS_PROGRAM), 0xc000, 0xdfff, 0, 0x2000, NULL);
memset(sms_mainram,0x00,0x2000);
megatech_set_genz80_as_sms_standard_ports(machine, tag);
/* fixed rom bank area */
- sms_rom = (UINT8 *)memory_install_rom(machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, NULL);
+ sms_rom = (UINT8 *)memory_install_rom(machine->device(tag)->memory().space(AS_PROGRAM), 0x0000, 0xbfff, 0, 0, NULL);
memcpy(sms_rom, machine->region("maincpu")->base(), 0xc000);
@@ -1683,14 +1683,14 @@ void megatech_set_genz80_as_sms_standard_map(running_machine *machine, const cha
{
- memory_install_write8_handler(machine->device(tag)->memory().space(ADDRESS_SPACE_PROGRAM), 0xfffc, 0xffff, 0, 0, mt_sms_standard_rom_bank_w);
+ memory_install_write8_handler(machine->device(tag)->memory().space(AS_PROGRAM), 0xfffc, 0xffff, 0, 0, mt_sms_standard_rom_bank_w);
}
else if (mapper == MAPPER_CODEMASTERS )
{
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x0000, 0, 0, codemasters_rom_bank_0000_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4000, 0x4000, 0, 0, codemasters_rom_bank_4000_w);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0x8000, 0, 0, codemasters_rom_bank_8000_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0000, 0x0000, 0, 0, codemasters_rom_bank_0000_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4000, 0x4000, 0, 0, codemasters_rom_bank_4000_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0x8000, 0, 0, codemasters_rom_bank_8000_w);
}
// smsgg_backupram = NULL;
}
diff --git a/src/mame/machine/segas32.c b/src/mame/machine/segas32.c
index d5da2d566d5..5904450ab9c 100644
--- a/src/mame/machine/segas32.c
+++ b/src/mame/machine/segas32.c
@@ -211,7 +211,7 @@ WRITE16_HANDLER(brival_protection_w)
void darkedge_fd1149_vblank(device_t *device)
{
- address_space *space = device->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->memory().space(AS_PROGRAM);
space->write_word(0x20f072, 0);
space->write_word(0x20f082, 0);
diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c
index d8fff56b884..3d1ffd9ad77 100644
--- a/src/mame/machine/snes.c
+++ b/src/mame/machine/snes.c
@@ -133,7 +133,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->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = state->maincpu->memory().space(AS_PROGRAM);
if (!(snes_ppu.screen_disabled)) //Reset OAM address, byuu says it happens at H=10
{
@@ -146,14 +146,14 @@ 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->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = state->maincpu->memory().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->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = state->maincpu->memory().space(AS_PROGRAM);
state->io_read(cpu0space->machine);
snes_ram[HVBJOY] &= 0xfe; /* Clear busy bit */
@@ -231,7 +231,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->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = state->maincpu->memory().space(AS_PROGRAM);
snes_hdma_init(cpu0space);
}
@@ -255,7 +255,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->maincpu->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = state->maincpu->memory().space(AS_PROGRAM);
int nextscan;
snes_ppu.beam.current_vert = machine->primary_screen->vpos();
@@ -1732,7 +1732,7 @@ 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(ADDRESS_SPACE_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 */
@@ -1987,7 +1987,7 @@ MACHINE_RESET( snes )
DRIVER_INIT( snes )
{
snes_state *state = machine->driver_data<snes_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT16 total_blocks, read_blocks;
UINT8 *rom;
@@ -2053,7 +2053,7 @@ DRIVER_INIT( snes )
DRIVER_INIT( snes_hirom )
{
snes_state *state = machine->driver_data<snes_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT16 total_blocks, read_blocks;
UINT8 *rom;
diff --git a/src/mame/machine/stfight.c b/src/mame/machine/stfight.c
index da0dea4eff0..58848b72acb 100644
--- a/src/mame/machine/stfight.c
+++ b/src/mame/machine/stfight.c
@@ -39,7 +39,7 @@ Encryption PAL 16R4 on CPU board
DRIVER_INIT( empcity )
{
stfight_state *state = machine->driver_data<stfight_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
UINT8 *rom = machine->region("maincpu")->base();
int A;
@@ -85,7 +85,7 @@ DRIVER_INIT( stfight )
MACHINE_RESET( stfight )
{
stfight_state *state = machine->driver_data<stfight_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
state->adpcm_data_offs = state->adpcm_data_end = 0;
state->toggle = 0;
state->fm_data = 0;
diff --git a/src/mame/machine/stvprot.c b/src/mame/machine/stvprot.c
index 5ebef897b0d..d5f2de95b64 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)
{
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4fffff0, 0x4ffffff, 0, 0, twcup98_prot_r, twcup98_prot_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4fffff0, 0x4ffffff, 0, 0, twcup98_prot_r, twcup98_prot_w);
}
/**************************
@@ -227,7 +227,7 @@ static WRITE32_HANDLER ( sss_prot_w )
void install_sss_protection(running_machine *machine)
{
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4fffff0, 0x4ffffff, 0, 0, sss_prot_r, sss_prot_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4fffff0, 0x4ffffff, 0, 0, sss_prot_r, sss_prot_w);
}
/*************************************
@@ -292,7 +292,7 @@ static WRITE32_HANDLER ( rsgun_prot_w )
void install_rsgun_protection(running_machine *machine)
{
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4fffff0, 0x4ffffff, 0, 0, rsgun_prot_r, rsgun_prot_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4fffff0, 0x4ffffff, 0, 0, rsgun_prot_r, rsgun_prot_w);
}
/*************************
@@ -387,7 +387,7 @@ static WRITE32_HANDLER ( elandore_prot_w )
void install_elandore_protection(running_machine *machine)
{
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4fffff0, 0x4ffffff, 0, 0, elandore_prot_r, elandore_prot_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4fffff0, 0x4ffffff, 0, 0, elandore_prot_r, elandore_prot_w);
}
/*************************
@@ -471,7 +471,7 @@ static WRITE32_HANDLER ( ffreveng_prot_w )
void install_ffreveng_protection(running_machine *machine)
{
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4fffff0, 0x4ffffff, 0, 0, ffreveng_prot_r, ffreveng_prot_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4fffff0, 0x4ffffff, 0, 0, ffreveng_prot_r, ffreveng_prot_w);
}
/************************
@@ -511,7 +511,7 @@ static WRITE32_HANDLER(astrass_prot_w)
void install_astrass_protection(running_machine *machine)
{
ctrl_index = -1;
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4fffff0, 0x4ffffff, 0, 0, astrass_prot_r, astrass_prot_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4fffff0, 0x4ffffff, 0, 0, astrass_prot_r, astrass_prot_w);
}
/**************************
@@ -663,9 +663,9 @@ void install_decathlt_protection(running_machine *machine)
decathlt_prot_uploadmode = 0;
decathlt_prot_uploadoffset = 0;
decathlt_part = 1;
- memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x37FFFF0, 0x37FFFFF, 0, 0, decathlt_prot_r, decathlt_prot_w);
+ memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x37FFFF0, 0x37FFFFF, 0, 0, decathlt_prot_r, decathlt_prot_w);
/* It uploads 2 tables here too, but nothing else, mirror? unused? */
-// memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x27FFFF0, 0x27FFFFF, 0, 0, decathlt_prot_r, decathlt_prot_w);
+// memory_install_readwrite32_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x27FFFF0, 0x27FFFFF, 0, 0, decathlt_prot_r, decathlt_prot_w);
}
void stv_register_protection_savestates(running_machine *machine)
diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c
index 7c1279dae80..39136441b27 100644
--- a/src/mame/machine/taitosj.c
+++ b/src/mame/machine/taitosj.c
@@ -38,7 +38,7 @@ MACHINE_START( taitosj )
MACHINE_RESET( taitosj )
{
taitosj_state *state = machine->driver_data<taitosj_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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);
@@ -218,7 +218,7 @@ WRITE8_HANDLER( taitosj_68705_portB_w )
}
if (~data & 0x10)
{
- address_space *cpu0space = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
LOG(("%04x: 68705 write %02x to address %04x\n",cpu_get_pc(space->cpu), state->portA_out, state->address));
cpu0space->write_byte(state->address, state->portA_out);
@@ -228,7 +228,7 @@ WRITE8_HANDLER( taitosj_68705_portB_w )
}
if (~data & 0x20)
{
- address_space *cpu0space = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
state->portA_in = cpu0space->read_byte(state->address);
LOG(("%04x: 68705 read %02x from address %04x\n", cpu_get_pc(space->cpu), state->portA_in, state->address));
}
diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c
index 9a11b0f3c98..9a9619a3f65 100644
--- a/src/mame/machine/tatsumi.c
+++ b/src/mame/machine/tatsumi.c
@@ -69,7 +69,7 @@ WRITE16_HANDLER( apache3_z80_ctrl_w )
READ16_HANDLER( apache3_v30_v20_r )
{
tatsumi_state *state = space->machine->driver_data<tatsumi_state>();
- address_space *targetspace = space->machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *targetspace = space->machine->device("audiocpu")->memory().space(AS_PROGRAM);
/* Each V20 byte maps to a V30 word */
if ((state->control_word & 0xe0) == 0xe0)
@@ -86,7 +86,7 @@ READ16_HANDLER( apache3_v30_v20_r )
WRITE16_HANDLER( apache3_v30_v20_w )
{
tatsumi_state *state = space->machine->driver_data<tatsumi_state>();
- address_space *targetspace = space->machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *targetspace = space->machine->device("audiocpu")->memory().space(AS_PROGRAM);
if ((state->control_word & 0xe0) != 0x80)
logerror("%08x: write unmapped v30 rom %08x\n", cpu_get_pc(space->cpu), offset);
@@ -152,7 +152,7 @@ WRITE16_HANDLER( apache3_rotate_w )
READ16_HANDLER( roundup_v30_z80_r )
{
tatsumi_state *state = space->machine->driver_data<tatsumi_state>();
- address_space *targetspace = space->machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *targetspace = space->machine->device("audiocpu")->memory().space(AS_PROGRAM);
/* Each Z80 byte maps to a V30 word */
if (state->control_word & 0x20)
@@ -164,7 +164,7 @@ READ16_HANDLER( roundup_v30_z80_r )
WRITE16_HANDLER( roundup_v30_z80_w )
{
tatsumi_state *state = space->machine->driver_data<tatsumi_state>();
- address_space *targetspace = space->machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *targetspace = space->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)
@@ -355,7 +355,7 @@ WRITE16_HANDLER( tatsumi_v30_68000_w )
// self-test in Tatsumi games. Needs fixed, but hack it here for now.
READ8_DEVICE_HANDLER(tatsumi_hack_ym2151_r)
{
- address_space *space = device->machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device("audiocpu")->memory().space(AS_PROGRAM);
int r=ym2151_status_port_r(device,0);
if (cpu_get_pc(space->cpu)==0x2aca || cpu_get_pc(space->cpu)==0x29fe
@@ -369,7 +369,7 @@ READ8_DEVICE_HANDLER(tatsumi_hack_ym2151_r)
// Mame really should emulate the OKI status reads even with Mame sound off.
READ8_DEVICE_HANDLER(tatsumi_hack_oki_r)
{
- address_space *space = device->machine->device("audiocpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = device->machine->device("audiocpu")->memory().space(AS_PROGRAM);
int r=downcast<okim6295_device *>(device)->read(*space,0);
if (cpu_get_pc(space->cpu)==0x2b70 || cpu_get_pc(space->cpu)==0x2bb5
diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c
index e1f71fdc011..bc6ee7d9879 100644
--- a/src/mame/machine/tnzs.c
+++ b/src/mame/machine/tnzs.c
@@ -514,7 +514,7 @@ DRIVER_INIT( drtoppel )
state->mcu_type = MCU_DRTOPPEL;
/* drtoppel writes to the palette RAM area even if it has PROMs! We have to patch it out. */
- memory_nop_write(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xf800, 0xfbff, 0, 0);
+ memory_nop_write(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xf800, 0xfbff, 0, 0);
}
DRIVER_INIT( chukatai )
@@ -528,7 +528,7 @@ DRIVER_INIT( tnzs )
tnzs_state *state = machine->driver_data<tnzs_state>();
state->mcu_type = MCU_TNZS;
/* we need to install a kludge to avoid problems with a bug in the original code */
-// memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xef10, 0xef10, 0, 0, tnzs_sync_kludge_w);
+// memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xef10, 0xef10, 0, 0, tnzs_sync_kludge_w);
}
DRIVER_INIT( tnzsb )
@@ -537,7 +537,7 @@ DRIVER_INIT( tnzsb )
state->mcu_type = MCU_NONE_TNZSB;
/* we need to install a kludge to avoid problems with a bug in the original code */
-// memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0xef10, 0xef10, 0, 0, tnzs_sync_kludge_w);
+// memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0xef10, 0xef10, 0, 0, tnzs_sync_kludge_w);
}
DRIVER_INIT( kabukiz )
@@ -555,9 +555,9 @@ DRIVER_INIT( insectx )
state->mcu_type = MCU_NONE_INSECTX;
/* this game has no mcu, replace the handler with plain input port handlers */
- memory_install_read_port(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc000, 0xc000, 0, 0, "IN0" );
- memory_install_read_port(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc001, 0xc001, 0, 0, "IN1" );
- memory_install_read_port(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0xc002, 0xc002, 0, 0, "IN2" );
+ memory_install_read_port(machine->device("sub")->memory().space(AS_PROGRAM), 0xc000, 0xc000, 0, 0, "IN0" );
+ memory_install_read_port(machine->device("sub")->memory().space(AS_PROGRAM), 0xc001, 0xc001, 0, 0, "IN1" );
+ memory_install_read_port(machine->device("sub")->memory().space(AS_PROGRAM), 0xc002, 0xc002, 0, 0, "IN2" );
}
DRIVER_INIT( kageki )
@@ -667,7 +667,7 @@ MACHINE_RESET( jpopnics )
static STATE_POSTLOAD( tnzs_postload )
{
tnzs_state *state = machine->driver_data<tnzs_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
memory_set_bank(machine, "bank1", state->bank1);
memory_set_bank(machine, "bank2", state->bank2);
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index e97c4283bc8..92d55817fd2 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -83,7 +83,7 @@ READ16_HANDLER( demonwld_dsp_r )
UINT16 input_data = 0;
switch (state->main_ram_seg) {
- case 0xc00000: mainspace = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ case 0xc00000: mainspace = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
input_data = mainspace->read_word(state->main_ram_seg + state->dsp_addr_w);
break;
default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n", cpu_get_previouspc(space->cpu), state->main_ram_seg + state->dsp_addr_w);
@@ -101,7 +101,7 @@ WRITE16_HANDLER( demonwld_dsp_w )
state->dsp_execute = 0;
switch (state->main_ram_seg) {
case 0xc00000: if ((state->dsp_addr_w < 3) && (data == 0)) state->dsp_execute = 1;
- mainspace = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ mainspace = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
mainspace->write_word(state->main_ram_seg + state->dsp_addr_w, data);
break;
default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n", cpu_get_previouspc(space->cpu), state->main_ram_seg + state->dsp_addr_w);
diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c
index 7d3f175e33e..3809864cc8b 100644
--- a/src/mame/machine/twincobr.c
+++ b/src/mame/machine/twincobr.c
@@ -64,7 +64,7 @@ READ16_HANDLER( twincobr_dsp_r )
switch (state->main_ram_seg) {
case 0x30000:
case 0x40000:
- case 0x50000: mainspace = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ case 0x50000: mainspace = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
input_data = mainspace->read_word(state->main_ram_seg + state->dsp_addr_w);
break;
default: logerror("DSP PC:%04x Warning !!! IO reading from %08x (port 1)\n",cpu_get_previouspc(space->cpu),state->main_ram_seg + state->dsp_addr_w); break;
@@ -83,7 +83,7 @@ WRITE16_HANDLER( twincobr_dsp_w )
switch (state->main_ram_seg) {
case 0x30000: if ((state->dsp_addr_w < 3) && (data == 0)) state->dsp_execute = 1;
case 0x40000:
- case 0x50000: mainspace = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ case 0x50000: mainspace = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
mainspace->write_word(state->main_ram_seg + state->dsp_addr_w, data);
break;
default: logerror("DSP PC:%04x Warning !!! IO writing to %08x (port 1)\n",cpu_get_previouspc(space->cpu),state->main_ram_seg + state->dsp_addr_w); break;
@@ -117,7 +117,7 @@ READ16_HANDLER( wardner_dsp_r )
switch (state->main_ram_seg) {
case 0x7000:
case 0x8000:
- case 0xa000: mainspace = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ case 0xa000: mainspace = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
input_data = mainspace->read_byte(state->main_ram_seg + (state->dsp_addr_w + 0))
| (mainspace->read_byte(state->main_ram_seg + (state->dsp_addr_w + 1)) << 8);
break;
@@ -137,7 +137,7 @@ WRITE16_HANDLER( wardner_dsp_w )
switch (state->main_ram_seg) {
case 0x7000: if ((state->dsp_addr_w < 3) && (data == 0)) state->dsp_execute = 1;
case 0x8000:
- case 0xa000: mainspace = space->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ case 0xa000: mainspace = space->machine->device("maincpu")->memory().space(AS_PROGRAM);
mainspace->write_byte(state->main_ram_seg + (state->dsp_addr_w + 0), (data & 0xff));
mainspace->write_byte(state->main_ram_seg + (state->dsp_addr_w + 1), ((data >> 8) & 0xff));
break;
diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c
index 4eaf3a4737e..8d37ca2ebd7 100644
--- a/src/mame/machine/vsnes.c
+++ b/src/mame/machine/vsnes.c
@@ -196,7 +196,7 @@ static void v_set_videorom_bank( running_machine* machine, int start, int count,
MACHINE_START( vsnes )
{
vsnes_state *state = machine->driver_data<vsnes_state>();
- address_space *ppu1_space = machine->device("ppu1")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *ppu1_space = machine->device("ppu1")->memory().space(AS_PROGRAM);
int i;
/* establish nametable ram */
@@ -252,12 +252,12 @@ MACHINE_START( vsdual )
state->nt_page[1][2] = state->nt_ram[1] + 0x800;
state->nt_page[1][3] = state->nt_ram[1] + 0xc00;
- memory_install_readwrite8_handler(machine->device("ppu1")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, vsnes_nt0_r, vsnes_nt0_w);
- memory_install_readwrite8_handler(machine->device("ppu2")->memory().space(ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, vsnes_nt1_r, vsnes_nt1_w);
+ memory_install_readwrite8_handler(machine->device("ppu1")->memory().space(AS_PROGRAM), 0x2000, 0x3eff, 0, 0, vsnes_nt0_r, vsnes_nt0_w);
+ memory_install_readwrite8_handler(machine->device("ppu2")->memory().space(AS_PROGRAM), 0x2000, 0x3eff, 0, 0, vsnes_nt1_r, vsnes_nt1_w);
// read only!
- memory_install_read_bank(machine->device("ppu1")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank2");
+ memory_install_read_bank(machine->device("ppu1")->memory().space(AS_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank2");
// read only!
- memory_install_read_bank(machine->device("ppu2")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank3");
+ memory_install_read_bank(machine->device("ppu2")->memory().space(AS_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank3");
memory_configure_bank(machine, "bank2", 0, state->vrom_size[0] / 0x2000, state->vrom[0], 0x2000);
memory_configure_bank(machine, "bank3", 0, state->vrom_size[1] / 0x2000, state->vrom[1], 0x2000);
memory_set_bank(machine, "bank2", 0);
@@ -354,7 +354,7 @@ static WRITE8_HANDLER( vsnormal_vrom_banking )
DRIVER_INIT( vsnormal )
{
/* vrom switching is enabled with bit 2 of $4016 */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4016, 0x4016, 0, 0, vsnormal_vrom_banking);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4016, 0x4016, 0, 0, vsnormal_vrom_banking);
}
/**********************************************************************************/
@@ -412,7 +412,7 @@ DRIVER_INIT( vsgun )
{
vsnes_state *state = machine->driver_data<vsnes_state>();
/* VROM switching is enabled with bit 2 of $4016 */
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4016, 0x4016, 0, 0, gun_in0_r, gun_in0_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4016, 0x4016, 0, 0, gun_in0_r, gun_in0_w);
state->do_vrom_bank = 1;
}
@@ -453,7 +453,7 @@ DRIVER_INIT( vskonami )
memcpy(&prg[0x08000], &prg[0x18000], 0x8000);
/* banking is done with writes to the $8000-$ffff area */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, vskonami_rom_banking);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, vskonami_rom_banking);
}
/***********************************************************************/
@@ -482,7 +482,7 @@ DRIVER_INIT( vsgshoe )
memcpy (&prg[0x08000], &prg[0x12000], 0x2000);
/* vrom switching is enabled with bit 2 of $4016 */
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4016, 0x4016, 0, 0, gun_in0_r, vsgshoe_gun_in0_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4016, 0x4016, 0, 0, gun_in0_r, vsgshoe_gun_in0_w);
state->do_vrom_bank = 1;
}
@@ -613,7 +613,7 @@ DRIVER_INIT( drmario )
memcpy(&prg[0x0c000], &prg[0x1c000], 0x4000);
/* MMC1 mapper at writes to $8000-$ffff */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, drmario_rom_banking);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, drmario_rom_banking);
state->drmario_shiftreg = 0;
state->drmario_shiftcount = 0;
@@ -638,7 +638,7 @@ DRIVER_INIT( vsvram )
memcpy(&prg[0x08000], &prg[0x28000], 0x8000);
/* banking is done with writes to the $8000-$ffff area */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, vsvram_rom_banking);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, vsvram_rom_banking);
/* allocate state->vram */
state->vram = auto_alloc_array(machine, UINT8, 0x2000);
@@ -802,10 +802,10 @@ DRIVER_INIT( MMC3 )
memcpy(&prg[0xe000], &prg[(MMC3_prg_chunks - 1) * 0x4000 + 0x12000], 0x2000);
/* MMC3 mapper at writes to $8000-$ffff */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, mapper4_w);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, mapper4_w);
/* extra ram at $6000-$7fff */
- memory_install_ram(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, NULL);
+ memory_install_ram(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000, 0x7fff, 0, 0, NULL);
}
/* Vs. RBI Baseball */
@@ -843,7 +843,7 @@ DRIVER_INIT( rbibb )
DRIVER_INIT_CALL(MMC3);
/* RBI Base ball hack */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5e00, 0x5e01, 0, 0, rbi_hack_r) ;
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5e00, 0x5e01, 0, 0, rbi_hack_r) ;
}
/* Vs. Super Xevious */
@@ -893,10 +893,10 @@ DRIVER_INIT( supxevs )
DRIVER_INIT_CALL(MMC3);
/* Vs. Super Xevious Protection */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x54ff, 0x54ff, 0, 0, supxevs_read_prot_1_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5678, 0x5678, 0, 0, supxevs_read_prot_2_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x578f, 0x578f, 0, 0, supxevs_read_prot_3_r);
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5567, 0x5567, 0, 0, supxevs_read_prot_4_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x54ff, 0x54ff, 0, 0, supxevs_read_prot_1_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5678, 0x5678, 0, 0, supxevs_read_prot_2_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x578f, 0x578f, 0, 0, supxevs_read_prot_3_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5567, 0x5567, 0, 0, supxevs_read_prot_4_r);
}
/* Vs. TKO Boxing */
@@ -926,7 +926,7 @@ DRIVER_INIT( tkoboxng )
DRIVER_INIT_CALL(MMC3);
/* security device at $5e00-$5e01 */
- memory_install_read8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x5e00, 0x5e01, 0, 0, tko_security_r);
+ memory_install_read8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x5e00, 0x5e01, 0, 0, tko_security_r);
}
/* Vs. Freedom Force */
@@ -936,7 +936,7 @@ DRIVER_INIT( vsfdf )
vsnes_state *state = machine->driver_data<vsnes_state>();
DRIVER_INIT_CALL(MMC3);
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4016, 0x4016, 0, 0, gun_in0_r, gun_in0_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4016, 0x4016, 0, 0, gun_in0_r, gun_in0_w);
state->do_vrom_bank = 0;
}
@@ -986,7 +986,7 @@ DRIVER_INIT( platoon )
memcpy(&prg[0x08000], &prg[0x10000], 0x4000);
memcpy(&prg[0x0c000], &prg[0x2c000], 0x4000);
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, mapper68_rom_banking);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x8000, 0xffff, 0, 0, mapper68_rom_banking);
}
/**********************************************************************************/
@@ -1010,10 +1010,10 @@ static READ8_HANDLER( set_bnglngby_irq_r )
DRIVER_INIT( bnglngby )
{
vsnes_state *state = machine->driver_data<vsnes_state>();
- memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x0231, 0x0231, 0, 0, set_bnglngby_irq_r, set_bnglngby_irq_w);
+ memory_install_readwrite8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x0231, 0x0231, 0, 0, set_bnglngby_irq_r, set_bnglngby_irq_w);
/* extra ram */
- memory_install_ram(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, NULL);
+ memory_install_ram(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000, 0x7fff, 0, 0, NULL);
state->ret = 0;
@@ -1046,11 +1046,11 @@ DRIVER_INIT( vsdual )
UINT8 *prg = machine->region("maincpu")->base();
/* vrom switching is enabled with bit 2 of $4016 */
- memory_install_write8_handler(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4016, 0x4016, 0, 0, vsdual_vrom_banking);
- memory_install_write8_handler(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0x4016, 0x4016, 0, 0, vsdual_vrom_banking);
+ memory_install_write8_handler(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x4016, 0x4016, 0, 0, vsdual_vrom_banking);
+ memory_install_write8_handler(machine->device("sub")->memory().space(AS_PROGRAM), 0x4016, 0x4016, 0, 0, vsdual_vrom_banking);
/* shared ram at $6000 */
- memory_install_ram(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, &prg[0x6000]);
- memory_install_ram(machine->device("sub")->memory().space(ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, &prg[0x6000]);
+ memory_install_ram(machine->device("maincpu")->memory().space(AS_PROGRAM), 0x6000, 0x7fff, 0, 0, &prg[0x6000]);
+ memory_install_ram(machine->device("sub")->memory().space(AS_PROGRAM), 0x6000, 0x7fff, 0, 0, &prg[0x6000]);
}
diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c
index 56a027309b1..6e055a6b675 100644
--- a/src/mame/machine/williams.c
+++ b/src/mame/machine/williams.c
@@ -432,7 +432,7 @@ TIMER_DEVICE_CALLBACK( williams2_endscreen_callback )
static STATE_POSTLOAD( williams2_postload )
{
williams_state *state = machine->driver_data<williams_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
williams2_bank_select_w(space, 0, state->vram_bank);
}
@@ -452,7 +452,7 @@ MACHINE_START( williams2 )
MACHINE_RESET( williams2 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* make sure our banking is reset */
williams2_bank_select_w(space, 0, 0);
@@ -725,7 +725,7 @@ WRITE8_HANDLER( williams2_7segment_w )
static STATE_POSTLOAD( defender_postload )
{
williams_state *state = machine->driver_data<williams_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
defender_bank_select_w(space, 0, state->vram_bank);
}
@@ -743,7 +743,7 @@ MACHINE_START( defender )
MACHINE_RESET( defender )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
MACHINE_RESET_CALL(williams_common);
diff --git a/src/mame/video/amiga.c b/src/mame/video/amiga.c
index 2bb5a73c54d..385c91e3518 100644
--- a/src/mame/video/amiga.c
+++ b/src/mame/video/amiga.c
@@ -207,7 +207,7 @@ int amiga_copper_execute_next(running_machine *machine, int xpos)
{
if (LOG_COPPER)
logerror("%02X.%02X: Write to %s = %04x\n", state->last_scanline, xpos / 2, amiga_custom_names[state->copper_pending_offset & 0xff], state->copper_pending_data);
- amiga_custom_w(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), state->copper_pending_offset, state->copper_pending_data, 0xffff);
+ amiga_custom_w(machine->device("maincpu")->memory().space(AS_PROGRAM), state->copper_pending_offset, state->copper_pending_data, 0xffff);
state->copper_pending_offset = 0;
}
@@ -263,7 +263,7 @@ int amiga_copper_execute_next(running_machine *machine, int xpos)
{
if (LOG_COPPER)
logerror("%02X.%02X: Write to %s = %04x\n", state->last_scanline, xpos / 2, amiga_custom_names[word0 & 0xff], word1);
- amiga_custom_w(machine->device("maincpu")->memory().space(ADDRESS_SPACE_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/armedf.c b/src/mame/video/armedf.c
index ba02ac5faa9..7a954fab801 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -466,7 +466,7 @@ SCREEN_UPDATE( armedf )
SCREEN_EOF( armedf )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
}
diff --git a/src/mame/video/astrocde.c b/src/mame/video/astrocde.c
index 1ab50af71b9..ab0b1b85e66 100644
--- a/src/mame/video/astrocde.c
+++ b/src/mame/video/astrocde.c
@@ -918,7 +918,7 @@ WRITE8_HANDLER( astrocade_pattern_board_w )
case 6: /* height of blit and initiator */
pattern_height = data;
- execute_blit(space->cpu->memory().space(ADDRESS_SPACE_PROGRAM));
+ execute_blit(space->cpu->memory().space(AS_PROGRAM));
break;
}
}
diff --git a/src/mame/video/atari.c b/src/mame/video/atari.c
index 94b0daa1742..441159bf13d 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(ADDRESS_SPACE_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(ADDRESS_SPACE_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(ADDRESS_SPACE_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 dc0d14c9014..c9b711781f6 100644
--- a/src/mame/video/atarisy1.c
+++ b/src/mame/video/atarisy1.c
@@ -386,7 +386,7 @@ WRITE16_HANDLER( atarisy1_spriteram_w )
TIMER_DEVICE_CALLBACK( atarisy1_int3off_callback )
{
- address_space *space = timer.machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 a50c3dedce8..ba3998b7660 100644
--- a/src/mame/video/avgdvg.c
+++ b/src/mame/video/avgdvg.c
@@ -1288,7 +1288,7 @@ WRITE16_HANDLER( avgdvg_reset_word_w )
MACHINE_RESET( avgdvg )
{
- avgdvg_reset_w (machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM),0,0);
+ avgdvg_reset_w (machine->device("maincpu")->memory().space(AS_PROGRAM),0,0);
}
diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c
index d0783fe9f08..33445c26a8d 100644
--- a/src/mame/video/bfm_adr2.c
+++ b/src/mame/video/bfm_adr2.c
@@ -494,7 +494,7 @@ void adder2_decode_char_roms(running_machine *machine)
// adder2 board memorymap /////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
-ADDRESS_MAP_START( adder2_memmap, ADDRESS_SPACE_PROGRAM, 8 )
+ADDRESS_MAP_START( adder2_memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x0000) AM_WRITE(adder2_screen_page_w) // screen access/display select
AM_RANGE(0x0000, 0x7FFF) AM_ROMBANK("bank2") // 8k paged ROM (4 pages)
diff --git a/src/mame/video/bfm_dm01.c b/src/mame/video/bfm_dm01.c
index 568a6431c00..e0bf2aad9dc 100644
--- a/src/mame/video/bfm_dm01.c
+++ b/src/mame/video/bfm_dm01.c
@@ -214,7 +214,7 @@ static WRITE8_HANDLER( unknown_w )
///////////////////////////////////////////////////////////////////////////
-ADDRESS_MAP_START( bfm_dm01_memmap, ADDRESS_SPACE_PROGRAM, 8 )
+ADDRESS_MAP_START( bfm_dm01_memmap, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_RAM // 8k RAM
AM_RANGE(0x2000, 0x2000) AM_READWRITE(control_r, control_w) // control reg
AM_RANGE(0x2800, 0x2800) AM_READWRITE(mux_r,mux_w) // mux
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index cf41160e9e3..765d96054d3 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -262,7 +262,7 @@ SCREEN_UPDATE( bionicc )
SCREEN_EOF( bionicc )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
}
diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c
index 6526a6363df..cf1ce384961 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -253,7 +253,7 @@ SCREEN_UPDATE( blktiger )
SCREEN_EOF( blktiger )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c
index ae6258dcc6b..90aa5c17432 100644
--- a/src/mame/video/blstroid.c
+++ b/src/mame/video/blstroid.c
@@ -90,7 +90,7 @@ VIDEO_START( blstroid )
static TIMER_CALLBACK( irq_off )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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/cidelsa.c b/src/mame/video/cidelsa.c
index 4af5381a1b9..5addf815802 100644
--- a/src/mame/video/cidelsa.c
+++ b/src/mame/video/cidelsa.c
@@ -113,12 +113,12 @@ WRITE_LINE_MEMBER( cidelsa_state::prd_w )
/* Page RAM */
-static ADDRESS_MAP_START( cidelsa_page_ram, 0, 8 )
+static ADDRESS_MAP_START( cidelsa_page_ram, AS_0, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000, 0x3ff) AM_RAM
ADDRESS_MAP_END
-static ADDRESS_MAP_START( draco_page_ram, 0, 8 )
+static ADDRESS_MAP_START( draco_page_ram, AS_0, 8 )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x000, 0x7ff) AM_RAM
ADDRESS_MAP_END
diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c
index ee306ad1a0f..f1fffefbeec 100644
--- a/src/mame/video/cischeat.c
+++ b/src/mame/video/cischeat.c
@@ -1463,7 +1463,7 @@ if ( input_code_pressed(screen->machine, KEYCODE_Z) || input_code_pressed(screen
if (msk != 0) state->active_layers &= msk;
#if 1
{
- address_space *space = screen->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = screen->machine->device("maincpu")->memory().space(AS_PROGRAM);
popmessage("Cmd: %04X Pos:%04X Lim:%04X Inp:%04X",
state->scudhamm_motor_command,
diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c
index 0934f0d84ab..de85a832d70 100644
--- a/src/mame/video/combatsc.c
+++ b/src/mame/video/combatsc.c
@@ -517,7 +517,7 @@ byte #4:
static void bootleg_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, const UINT8 *source, int circuit )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
const 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/commando.c b/src/mame/video/commando.c
index 859ff8c924f..f452df2150b 100644
--- a/src/mame/video/commando.c
+++ b/src/mame/video/commando.c
@@ -147,7 +147,7 @@ SCREEN_UPDATE( commando )
SCREEN_EOF( commando )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c
index 2c3917bc309..03eb9a18ef6 100644
--- a/src/mame/video/crshrace.c
+++ b/src/mame/video/crshrace.c
@@ -219,7 +219,7 @@ SCREEN_UPDATE( crshrace )
SCREEN_EOF( crshrace )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
buffer_spriteram16_2_w(space, 0, 0, 0xffff);
diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c
index 6b823cba887..41961825431 100644
--- a/src/mame/video/dc.c
+++ b/src/mame/video/dc.c
@@ -1949,7 +1949,7 @@ static void render_tri(bitmap_t *bitmap, texinfo *ti, const vert *v)
static void render_to_accumulation_buffer(running_machine *machine,bitmap_t *bitmap,const rectangle *cliprect)
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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 0be9b343d9e..79ce4ff524f 100644
--- a/src/mame/video/dogfgt.c
+++ b/src/mame/video/dogfgt.c
@@ -224,7 +224,7 @@ SCREEN_UPDATE( dogfgt )
if (state->lastflip != flip_screen_get(screen->machine) || state->lastpixcolor != state->pixcolor)
{
- address_space *space = screen->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = screen->machine->device("maincpu")->memory().space(AS_PROGRAM);
state->lastflip = flip_screen_get(screen->machine);
state->lastpixcolor = state->pixcolor;
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index a33516379aa..b7796dffbd4 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -933,14 +933,14 @@ VIDEO_START( popbingo )
SCREEN_EOF( dooyong )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
SCREEN_EOF( rshark )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
}
diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c
index ea6842e8d10..b9cbd890542 100644
--- a/src/mame/video/dynduke.c
+++ b/src/mame/video/dynduke.c
@@ -253,7 +253,7 @@ SCREEN_UPDATE( dynduke )
SCREEN_EOF( dynduke )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff); // Could be a memory location instead
}
diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c
index 417441b255b..2c58593afaa 100644
--- a/src/mame/video/exedexes.c
+++ b/src/mame/video/exedexes.c
@@ -247,7 +247,7 @@ SCREEN_UPDATE( exedexes )
SCREEN_EOF( exedexes )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c
index 9c0edd13baa..1906051fba0 100644
--- a/src/mame/video/gaelco2.c
+++ b/src/mame/video/gaelco2.c
@@ -512,7 +512,7 @@ SCREEN_UPDATE( gaelco2_dual )
SCREEN_EOF( gaelco2 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* sprites are one frame ahead */
buffer_spriteram16_w(space, 0, 0, 0xffff);
diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c
index 674865572f1..347470eb5a1 100644
--- a/src/mame/video/gng.c
+++ b/src/mame/video/gng.c
@@ -152,7 +152,7 @@ SCREEN_UPDATE( gng )
SCREEN_EOF( gng )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c
index 2be572501c2..abd6dce5915 100644
--- a/src/mame/video/gp9001.c
+++ b/src/mame/video/gp9001.c
@@ -199,7 +199,7 @@ static WRITE16_DEVICE_HANDLER( gp9001_spram_w )
COMBINE_DATA(&vdp->sp.vram16[offset]);
}
-static ADDRESS_MAP_START( gp9001vdp_map, 0, 16 )
+static ADDRESS_MAP_START( gp9001vdp_map, AS_0, 16 )
AM_RANGE(0x0000, 0x0fff) AM_DEVREADWRITE(DEVICE_SELF, gp9001_bg_tmap_r, gp9001_bg_tmap_w)
AM_RANGE(0x1000, 0x1fff) AM_DEVREADWRITE(DEVICE_SELF, gp9001_fg_tmap_r, gp9001_fg_tmap_w)
AM_RANGE(0x2000, 0x2fff) AM_DEVREADWRITE(DEVICE_SELF, gp9001_top_tmap_r, gp9001_top_tmap_w)
@@ -237,7 +237,7 @@ bool gp9001vdp_device_config::device_validity_check(emu_options &options, const
return error;
}
-const address_space_config *gp9001vdp_device_config::memory_space_config(int spacenum) const
+const address_space_config *gp9001vdp_device_config::memory_space_config(address_spacenum spacenum) const
{
return (spacenum == 0) ? &m_space_config : NULL;
}
diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h
index f49225126da..a1744adb360 100644
--- a/src/mame/video/gp9001.h
+++ b/src/mame/video/gp9001.h
@@ -11,7 +11,7 @@ public:
static void static_set_gfx_region(device_config *device, int gfxregion);
protected:
virtual bool device_validity_check(emu_options &options, const game_driver &driver) const;
- virtual const address_space_config *memory_space_config(int spacenum = 0) const;
+ virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
address_space_config m_space_config;
UINT8 m_gfxregion;
};
diff --git a/src/mame/video/gtia.c b/src/mame/video/gtia.c
index b216232f360..02781204dd3 100644
--- a/src/mame/video/gtia.c
+++ b/src/mame/video/gtia.c
@@ -154,7 +154,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(ADDRESS_SPACE_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 c0641c89f9c..9e432f241e1 100644
--- a/src/mame/video/hng64.c
+++ b/src/mame/video/hng64.c
@@ -1463,7 +1463,7 @@ SCREEN_UPDATE( hng64 )
// but it could be useful
if ( input_code_pressed_once(screen->machine, KEYCODE_L) )
{
- address_space *space = screen->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = screen->machine->device("maincpu")->memory().space(AS_PROGRAM);
space->write_byte(0x2f27c8, 0x2);
}
#endif
diff --git a/src/mame/video/jaguar.c b/src/mame/video/jaguar.c
index 273a243e503..14b5c060779 100644
--- a/src/mame/video/jaguar.c
+++ b/src/mame/video/jaguar.c
@@ -493,7 +493,7 @@ static void jaguar_set_palette(UINT16 vmode)
static UINT8 *get_jaguar_memory(running_machine *machine, UINT32 offset)
{
- address_space *space = machine->device("gpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("gpu")->memory().space(AS_PROGRAM);
return (UINT8 *)space->get_read_ptr(offset);
}
diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c
index ba4e706b298..15b42b9441a 100644
--- a/src/mame/video/lastduel.c
+++ b/src/mame/video/lastduel.c
@@ -308,7 +308,7 @@ SCREEN_UPDATE( madgear )
SCREEN_EOF( lastduel )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* Spriteram is always 1 frame ahead, suggesting buffering. I can't find
a register to control this so I assume it happens automatically
diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c
index 79ec148a5d5..b654a5355dd 100644
--- a/src/mame/video/leland.c
+++ b/src/mame/video/leland.c
@@ -293,7 +293,7 @@ WRITE8_HANDLER( leland_master_video_addr_w )
static TIMER_CALLBACK( leland_delayed_mvram_w )
{
- address_space *space = machine->device("master")->memory().space(ADDRESS_SPACE_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/lwings.c b/src/mame/video/lwings.c
index 0a88a7bab13..4f812a95a0d 100644
--- a/src/mame/video/lwings.c
+++ b/src/mame/video/lwings.c
@@ -293,7 +293,7 @@ SCREEN_UPDATE( trojan )
SCREEN_EOF( lwings )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c
index fd7c2315631..9521bbc21c7 100644
--- a/src/mame/video/namcos22.c
+++ b/src/mame/video/namcos22.c
@@ -2275,7 +2275,7 @@ SCREEN_UPDATE( namcos22s )
FILE *f = fopen( "dump.txt", "wb" );
if( f )
{
- address_space *space = screen->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = screen->machine->device("maincpu")->memory().space(AS_PROGRAM);
{
int i,bank;
@@ -2325,7 +2325,7 @@ SCREEN_UPDATE( namcos22 )
FILE *f = fopen( "dump.txt", "wb" );
if( f )
{
- address_space *space = screen->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = screen->machine->device("maincpu")->memory().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 fcbfcbf6685..5d90dae1beb 100644
--- a/src/mame/video/ojankohs.c
+++ b/src/mame/video/ojankohs.c
@@ -332,7 +332,7 @@ SCREEN_UPDATE( ojankoc )
if (state->screen_refresh)
{
- address_space *space = screen->machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = screen->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 17f591007ca..775312ea50d 100644
--- a/src/mame/video/popeye.c
+++ b/src/mame/video/popeye.c
@@ -283,7 +283,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re
{
popeye_state *state = machine->driver_data<popeye_state>();
int offs;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
if (state->lastflip != flip_screen_get(machine))
{
diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c
index 2ee27603264..5f9d6d1257a 100644
--- a/src/mame/video/ppu2c0x.c
+++ b/src/mame/video/ppu2c0x.c
@@ -166,7 +166,7 @@ INLINE const ppu2c0x_interface *get_interface( device_t *device )
/* default address map */
// make this INTERNAL, default should just be enough to avoid compile errors, print error messages!
-static ADDRESS_MAP_START( ppu2c0x, 0, 8 )
+static ADDRESS_MAP_START( ppu2c0x, AS_0, 8 )
AM_RANGE(0x3f00, 0x3fff) AM_READWRITE(ppu2c0x_palette_read, ppu2c0x_palette_write)
ADDRESS_MAP_END
diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c
index 3f69d642cba..e8fa58ab72c 100644
--- a/src/mame/video/psikyosh.c
+++ b/src/mame/video/psikyosh.c
@@ -1342,7 +1342,7 @@ popmessage ("%08x %08x %08x %08x\n%08x %08x %08x %08x",
SCREEN_EOF( psikyosh )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram32_w(space, 0, 0, 0xffffffff);
}
diff --git a/src/mame/video/psx.c b/src/mame/video/psx.c
index b8277ee8f67..1e4464bef4b 100644
--- a/src/mame/video/psx.c
+++ b/src/mame/video/psx.c
@@ -3939,7 +3939,7 @@ INTERRUPT_GEN( psx_vblank )
void psx_gpu_reset( running_machine *machine )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
psx_gpu_w(space, 1, 0, 0xffffffff );
}
diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c
index 55007618132..daab72c6ea5 100644
--- a/src/mame/video/qix.c
+++ b/src/mame/video/qix.c
@@ -360,7 +360,7 @@ static SCREEN_UPDATE( qix )
*
*************************************/
-static ADDRESS_MAP_START( qix_video_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( qix_video_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READWRITE(qix_videoram_r, qix_videoram_w)
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x8400, 0x87ff) AM_RAM AM_SHARE("nvram")
@@ -377,7 +377,7 @@ static ADDRESS_MAP_START( qix_video_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( zookeep_video_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( zookeep_video_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READWRITE(qix_videoram_r, qix_videoram_w)
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x8400, 0x87ff) AM_RAM AM_SHARE("nvram")
@@ -396,7 +396,7 @@ static ADDRESS_MAP_START( zookeep_video_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-static ADDRESS_MAP_START( slither_video_map, ADDRESS_SPACE_PROGRAM, 8 )
+static ADDRESS_MAP_START( slither_video_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_READWRITE(qix_videoram_r, slither_videoram_w)
AM_RANGE(0x8000, 0x83ff) AM_RAM AM_SHARE("share1")
AM_RANGE(0x8400, 0x87ff) AM_RAM AM_SHARE("nvram")
diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c
index ff956e74912..28e7ac14f04 100644
--- a/src/mame/video/sidearms.c
+++ b/src/mame/video/sidearms.c
@@ -368,7 +368,7 @@ SCREEN_UPDATE( sidearms )
SCREEN_EOF( sidearms )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c
index 929be04ece2..2d0155a555c 100644
--- a/src/mame/video/simpsons.c
+++ b/src/mame/video/simpsons.c
@@ -97,7 +97,7 @@ static WRITE8_HANDLER( 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(ADDRESS_SPACE_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 0a24cba4966..d429c614900 100644
--- a/src/mame/video/skydiver.c
+++ b/src/mame/video/skydiver.c
@@ -11,7 +11,7 @@
MACHINE_RESET( skydiver )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_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/srumbler.c b/src/mame/video/srumbler.c
index 389337a0fec..5a2a542bc41 100644
--- a/src/mame/video/srumbler.c
+++ b/src/mame/video/srumbler.c
@@ -172,7 +172,7 @@ SCREEN_UPDATE( srumbler )
SCREEN_EOF( srumbler )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram_w(space,0,0);
}
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index 434e086206b..a5c1c27923b 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -28,7 +28,7 @@ WRITE16_HANDLER( hitice_pixel_scroll_w )
static void hitice_clear_pixel_bitmap( running_machine *machine )
{
int i;
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
for (i = 0; i < 0x40000; i++)
hitice_pixelram_w(space, i, 0, 0xffff);
diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c
index 41e22b1e62a..3dfdf739077 100644
--- a/src/mame/video/tigeroad.c
+++ b/src/mame/video/tigeroad.c
@@ -173,7 +173,7 @@ SCREEN_UPDATE( tigeroad )
SCREEN_EOF( tigeroad )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
}
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index dd2771c64a9..6110b15a355 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -294,7 +294,7 @@ static void toaplan1_set_scrolls(running_machine *machine)
static STATE_POSTLOAD( rallybik_flipscreen )
{
toaplan1_state *state = machine->driver_data<toaplan1_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
rallybik_bcu_flipscreen_w(space, 0, state->bcu_flipscreen, 0xffff);
}
@@ -302,7 +302,7 @@ static STATE_POSTLOAD( rallybik_flipscreen )
static STATE_POSTLOAD( toaplan1_flipscreen )
{
toaplan1_state *state = machine->driver_data<toaplan1_state>();
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
toaplan1_bcu_flipscreen_w(space, 0, state->bcu_flipscreen, 0xffff);
}
diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c
index a59afc984d9..d75e38cc7ff 100644
--- a/src/mame/video/toki.c
+++ b/src/mame/video/toki.c
@@ -35,12 +35,12 @@ WRITE16_HANDLER( toki_control_w )
SCREEN_EOF( toki )
{
- buffer_spriteram16_w(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0, 0, 0xffff);
+ buffer_spriteram16_w(machine->device("maincpu")->memory().space(AS_PROGRAM), 0, 0, 0xffff);
}
SCREEN_EOF( tokib )
{
- buffer_spriteram16_w(machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM), 0, 0, 0xffff);
+ buffer_spriteram16_w(machine->device("maincpu")->memory().space(AS_PROGRAM), 0, 0, 0xffff);
}
static TILE_GET_INFO( get_text_tile_info )
diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c
index 4e9c2e05650..bf56b0ab499 100644
--- a/src/mame/video/twin16.c
+++ b/src/mame/video/twin16.c
@@ -553,7 +553,7 @@ SCREEN_EOF( twin16 )
memcpy(state->sprite_buffer,&machine->generic.spriteram.u16[0x1800],0x800*sizeof(UINT16));
}
else {
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
buffer_spriteram16_w(space,0,0,0xffff);
}
}
diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c
index 94a026680e3..f82a8090bd8 100644
--- a/src/mame/video/twincobr.c
+++ b/src/mame/video/twincobr.c
@@ -518,7 +518,7 @@ SCREEN_UPDATE( toaplan0 )
SCREEN_EOF( toaplan0 )
{
- address_space *space = machine->device("maincpu")->memory().space(ADDRESS_SPACE_PROGRAM);
+ address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
/* Spriteram is always 1 frame ahead, suggesting spriteram buffering.
There are no CPU output registers that control this so we
diff --git a/src/mame/video/vdc.c b/src/mame/video/vdc.c
index a5d6a511f0c..d3a82e7772b 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(ADDRESS_SPACE_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 573c3aa9542..4222be70ff6 100644
--- a/src/mame/video/vrender0.c
+++ b/src/mame/video/vrender0.c
@@ -403,7 +403,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(ADDRESS_SPACE_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;