summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-07-19 03:13:34 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-07-19 03:13:34 +0000
commit73aaf0db7e51053f0dc7a475b1cb138931c1fd7e (patch)
tree7e76082e809a4d431cdd077a30c6dc49463c9862
parentf7cd7a6c4ce09d29323f988c5aa6834273614895 (diff)
Tagged all the first CPUs for drivers (mostly as "main").
Added validity checks to ensure no duplicate sound or CPU tags. Fixed several duplicate sound tags from the last checkin. -listxml now outputs the tag names for CPUs and sound chips.
-rw-r--r--src/emu/info.c4
-rw-r--r--src/emu/validity.c22
-rw-r--r--src/mame/audio/exidy.c2
-rw-r--r--src/mame/audio/irem.c2
-rw-r--r--src/mame/drivers/actfancr.c4
-rw-r--r--src/mame/drivers/alpha68k.c12
-rw-r--r--src/mame/drivers/ambush.c2
-rw-r--r--src/mame/drivers/ampoker2.c2
-rw-r--r--src/mame/drivers/amspdwy.c2
-rw-r--r--src/mame/drivers/angelkds.c2
-rw-r--r--src/mame/drivers/appoooh.c4
-rw-r--r--src/mame/drivers/aquarium.c2
-rw-r--r--src/mame/drivers/arabian.c2
-rw-r--r--src/mame/drivers/arcadecl.c2
-rw-r--r--src/mame/drivers/arcadia.c2
-rw-r--r--src/mame/drivers/argus.c8
-rw-r--r--src/mame/drivers/armedf.c14
-rw-r--r--src/mame/drivers/ashnojoe.c2
-rw-r--r--src/mame/drivers/asterix.c2
-rw-r--r--src/mame/drivers/astinvad.c4
-rw-r--r--src/mame/drivers/astrocorp.c2
-rw-r--r--src/mame/drivers/asuka.c12
-rw-r--r--src/mame/drivers/atarig1.c2
-rw-r--r--src/mame/drivers/atarig42.c2
-rw-r--r--src/mame/drivers/atarigt.c2
-rw-r--r--src/mame/drivers/atarigx2.c2
-rw-r--r--src/mame/drivers/atarisy1.c2
-rw-r--r--src/mame/drivers/atetris.c4
-rw-r--r--src/mame/drivers/avalnche.c2
-rw-r--r--src/mame/drivers/aztarac.c2
-rw-r--r--src/mame/drivers/backfire.c2
-rw-r--r--src/mame/drivers/badlands.c4
-rw-r--r--src/mame/drivers/bagman.c6
-rw-r--r--src/mame/drivers/balsente.c4
-rw-r--r--src/mame/drivers/bankp.c2
-rw-r--r--src/mame/drivers/baraduke.c2
-rw-r--r--src/mame/drivers/batman.c2
-rw-r--r--src/mame/drivers/battlane.c2
-rw-r--r--src/mame/drivers/battlera.c2
-rw-r--r--src/mame/drivers/battlex.c2
-rw-r--r--src/mame/drivers/battlnts.c2
-rw-r--r--src/mame/drivers/bbusters.c4
-rw-r--r--src/mame/drivers/beaminv.c2
-rw-r--r--src/mame/drivers/beathead.c2
-rw-r--r--src/mame/drivers/beezer.c2
-rw-r--r--src/mame/drivers/bestleag.c2
-rw-r--r--src/mame/drivers/bfcobra.c2
-rw-r--r--src/mame/drivers/bigevglf.c2
-rw-r--r--src/mame/drivers/bigfghtr.c2
-rw-r--r--src/mame/drivers/bigstrkb.c2
-rw-r--r--src/mame/drivers/bionicc.c2
-rw-r--r--src/mame/drivers/bishjan.c2
-rw-r--r--src/mame/drivers/bladestl.c2
-rw-r--r--src/mame/drivers/blktiger.c2
-rw-r--r--src/mame/drivers/blmbycar.c4
-rw-r--r--src/mame/drivers/blockade.c2
-rw-r--r--src/mame/drivers/blockhl.c2
-rw-r--r--src/mame/drivers/blockout.c2
-rw-r--r--src/mame/drivers/blstroid.c2
-rw-r--r--src/mame/drivers/blueprnt.c2
-rw-r--r--src/mame/drivers/bnstars.c2
-rw-r--r--src/mame/drivers/bogeyman.c2
-rw-r--r--src/mame/drivers/bombjack.c2
-rw-r--r--src/mame/drivers/boogwing.c2
-rw-r--r--src/mame/drivers/bottom9.c2
-rw-r--r--src/mame/drivers/boxer.c2
-rw-r--r--src/mame/drivers/brkthru.c4
-rw-r--r--src/mame/drivers/bsktball.c2
-rw-r--r--src/mame/drivers/btoads.c2
-rw-r--r--src/mame/drivers/bublbobl.c2
-rw-r--r--src/mame/drivers/buggychl.c2
-rw-r--r--src/mame/drivers/bwing.c2
-rw-r--r--src/mame/drivers/cabal.c4
-rw-r--r--src/mame/drivers/calorie.c2
-rw-r--r--src/mame/drivers/canyon.c2
-rw-r--r--src/mame/drivers/cardline.c2
-rw-r--r--src/mame/drivers/carjmbre.c2
-rw-r--r--src/mame/drivers/carpolo.c2
-rw-r--r--src/mame/drivers/carrera.c2
-rw-r--r--src/mame/drivers/cave.c26
-rw-r--r--src/mame/drivers/cball.c2
-rw-r--r--src/mame/drivers/cbasebal.c2
-rw-r--r--src/mame/drivers/cbuster.c2
-rw-r--r--src/mame/drivers/ccastles.c2
-rw-r--r--src/mame/drivers/cchasm.c2
-rw-r--r--src/mame/drivers/cclimber.c2
-rw-r--r--src/mame/drivers/centiped.c2
-rw-r--r--src/mame/drivers/chaknpop.c6
-rw-r--r--src/mame/drivers/champbas.c8
-rw-r--r--src/mame/drivers/champbwl.c2
-rw-r--r--src/mame/drivers/changela.c2
-rw-r--r--src/mame/drivers/cheekyms.c2
-rw-r--r--src/mame/drivers/cherrym.c2
-rw-r--r--src/mame/drivers/cherrym2.c2
-rw-r--r--src/mame/drivers/chinagat.c6
-rw-r--r--src/mame/drivers/chinsan.c2
-rw-r--r--src/mame/drivers/chqflag.c2
-rw-r--r--src/mame/drivers/cidelsa.c8
-rw-r--r--src/mame/drivers/circus.c8
-rw-r--r--src/mame/drivers/circusc.c2
-rw-r--r--src/mame/drivers/citycon.c2
-rw-r--r--src/mame/drivers/clayshoo.c2
-rw-r--r--src/mame/drivers/cliffhgr.c2
-rw-r--r--src/mame/drivers/cloak.c2
-rw-r--r--src/mame/drivers/clshroad.c4
-rw-r--r--src/mame/drivers/cninja.c14
-rw-r--r--src/mame/drivers/cntsteer.c4
-rw-r--r--src/mame/drivers/combatsc.c4
-rw-r--r--src/mame/drivers/comebaby.c2
-rw-r--r--src/mame/drivers/commando.c2
-rw-r--r--src/mame/drivers/compgolf.c2
-rw-r--r--src/mame/drivers/contra.c2
-rw-r--r--src/mame/drivers/coolpool.c2
-rw-r--r--src/mame/drivers/cop01.c4
-rw-r--r--src/mame/drivers/copsnrob.c2
-rw-r--r--src/mame/drivers/cosmic.c2
-rw-r--r--src/mame/drivers/couple.c2
-rw-r--r--src/mame/drivers/cowrace.c2
-rw-r--r--src/mame/drivers/cps2.c2
-rw-r--r--src/mame/drivers/crbaloon.c2
-rw-r--r--src/mame/drivers/crgolf.c2
-rw-r--r--src/mame/drivers/crimfght.c2
-rw-r--r--src/mame/drivers/crospang.c4
-rw-r--r--src/mame/drivers/crshrace.c2
-rw-r--r--src/mame/drivers/crystal.c2
-rw-r--r--src/mame/drivers/cshooter.c4
-rw-r--r--src/mame/drivers/cubocd32.c2
-rw-r--r--src/mame/drivers/cultures.c2
-rw-r--r--src/mame/drivers/cvs.c2
-rw-r--r--src/mame/drivers/cyberbal.c4
-rw-r--r--src/mame/drivers/cybertnk.c2
-rw-r--r--src/mame/drivers/dacholer.c2
-rw-r--r--src/mame/drivers/darius.c2
-rw-r--r--src/mame/drivers/darkhors.c2
-rw-r--r--src/mame/drivers/darkmist.c2
-rw-r--r--src/mame/drivers/darkseal.c2
-rw-r--r--src/mame/drivers/dassault.c2
-rw-r--r--src/mame/drivers/dblewing.c2
-rw-r--r--src/mame/drivers/dbz.c2
-rw-r--r--src/mame/drivers/dcheese.c2
-rw-r--r--src/mame/drivers/dcon.c4
-rw-r--r--src/mame/drivers/dday.c2
-rw-r--r--src/mame/drivers/ddayjlc.c2
-rw-r--r--src/mame/drivers/ddrible.c2
-rw-r--r--src/mame/drivers/ddz.c2
-rw-r--r--src/mame/drivers/deadang.c2
-rw-r--r--src/mame/drivers/dec0.c16
-rw-r--r--src/mame/drivers/dec8.c18
-rw-r--r--src/mame/drivers/deco156.c4
-rw-r--r--src/mame/drivers/deco32.c14
-rw-r--r--src/mame/drivers/deco_mlc.c4
-rw-r--r--src/mame/drivers/decocass.c2
-rw-r--r--src/mame/drivers/deniam.c4
-rw-r--r--src/mame/drivers/destroyr.c2
-rw-r--r--src/mame/drivers/dgpix.c2
-rw-r--r--src/mame/drivers/dietgo.c2
-rw-r--r--src/mame/drivers/discoboy.c2
-rw-r--r--src/mame/drivers/diverboy.c2
-rw-r--r--src/mame/drivers/djboy.c2
-rw-r--r--src/mame/drivers/djmain.c4
-rw-r--r--src/mame/drivers/dmndrby.c2
-rw-r--r--src/mame/drivers/dogfgt.c2
-rw-r--r--src/mame/drivers/dominob.c2
-rw-r--r--src/mame/drivers/dooyong.c18
-rw-r--r--src/mame/drivers/dorachan.c2
-rw-r--r--src/mame/drivers/dotrikun.c2
-rw-r--r--src/mame/drivers/dragrace.c2
-rw-r--r--src/mame/drivers/dreamwld.c2
-rw-r--r--src/mame/drivers/drgnmst.c2
-rw-r--r--src/mame/drivers/dribling.c2
-rw-r--r--src/mame/drivers/drmicro.c2
-rw-r--r--src/mame/drivers/drtomy.c2
-rw-r--r--src/mame/drivers/dunhuang.c2
-rw-r--r--src/mame/drivers/dwarfd.c2
-rw-r--r--src/mame/drivers/dynadice.c2
-rw-r--r--src/mame/drivers/dynax.c2
-rw-r--r--src/mame/drivers/dynduke.c2
-rw-r--r--src/mame/drivers/egghunt.c2
-rw-r--r--src/mame/drivers/embargo.c2
-rw-r--r--src/mame/drivers/eolith16.c2
-rw-r--r--src/mame/drivers/epos.c4
-rw-r--r--src/mame/drivers/eprom.c4
-rw-r--r--src/mame/drivers/equites.c6
-rw-r--r--src/mame/drivers/ertictac.c2
-rw-r--r--src/mame/drivers/esh.c2
-rw-r--r--src/mame/drivers/ettrivia.c2
-rw-r--r--src/mame/drivers/exedexes.c2
-rw-r--r--src/mame/drivers/exerion.c2
-rw-r--r--src/mame/drivers/exidy440.c2
-rw-r--r--src/mame/drivers/exprraid.c2
-rw-r--r--src/mame/drivers/exterm.c2
-rw-r--r--src/mame/drivers/exzisus.c2
-rw-r--r--src/mame/drivers/fantland.c8
-rw-r--r--src/mame/drivers/fastlane.c2
-rw-r--r--src/mame/drivers/fcombat.c2
-rw-r--r--src/mame/drivers/fgoal.c2
-rw-r--r--src/mame/drivers/finalizr.c2
-rw-r--r--src/mame/drivers/findout.c2
-rw-r--r--src/mame/drivers/firebeat.c6
-rw-r--r--src/mame/drivers/firetrap.c4
-rw-r--r--src/mame/drivers/flkatck.c2
-rw-r--r--src/mame/drivers/flower.c2
-rw-r--r--src/mame/drivers/flstory.c6
-rw-r--r--src/mame/drivers/flyball.c2
-rw-r--r--src/mame/drivers/foodf.c2
-rw-r--r--src/mame/drivers/fortecar.c2
-rw-r--r--src/mame/drivers/fromanc2.c6
-rw-r--r--src/mame/drivers/fromance.c6
-rw-r--r--src/mame/drivers/funkybee.c2
-rw-r--r--src/mame/drivers/funkyjet.c2
-rw-r--r--src/mame/drivers/funybubl.c2
-rw-r--r--src/mame/drivers/fuukifg2.c2
-rw-r--r--src/mame/drivers/fuukifg3.c2
-rw-r--r--src/mame/drivers/gaelco.c8
-rw-r--r--src/mame/drivers/gaelco2.c12
-rw-r--r--src/mame/drivers/gaiden.c4
-rw-r--r--src/mame/drivers/galaga.c8
-rw-r--r--src/mame/drivers/galastrm.c2
-rw-r--r--src/mame/drivers/galaxia.c2
-rw-r--r--src/mame/drivers/galaxold.c8
-rw-r--r--src/mame/drivers/galivan.c4
-rw-r--r--src/mame/drivers/galpani2.c2
-rw-r--r--src/mame/drivers/galspnbl.c2
-rw-r--r--src/mame/drivers/gamecstl.c2
-rw-r--r--src/mame/drivers/gameplan.c2
-rw-r--r--src/mame/drivers/gaplus.c2
-rw-r--r--src/mame/drivers/gauntlet.c2
-rw-r--r--src/mame/drivers/gbusters.c2
-rw-r--r--src/mame/drivers/ghosteo.c2
-rw-r--r--src/mame/drivers/gijoe.c2
-rw-r--r--src/mame/drivers/ginganin.c2
-rw-r--r--src/mame/drivers/gladiatr.c4
-rw-r--r--src/mame/drivers/glass.c2
-rw-r--r--src/mame/drivers/gng.c2
-rw-r--r--src/mame/drivers/goal92.c2
-rw-r--r--src/mame/drivers/goindol.c2
-rw-r--r--src/mame/drivers/goldstar.c6
-rw-r--r--src/mame/drivers/gomoku.c2
-rw-r--r--src/mame/drivers/goodejan.c2
-rw-r--r--src/mame/drivers/gotcha.c2
-rw-r--r--src/mame/drivers/gotya.c2
-rw-r--r--src/mame/drivers/gpworld.c2
-rw-r--r--src/mame/drivers/gradius3.c2
-rw-r--r--src/mame/drivers/grchamp.c2
-rw-r--r--src/mame/drivers/gridlee.c2
-rw-r--r--src/mame/drivers/groundfx.c2
-rw-r--r--src/mame/drivers/gstriker.c4
-rw-r--r--src/mame/drivers/gsword.c4
-rw-r--r--src/mame/drivers/gticlub.c4
-rw-r--r--src/mame/drivers/gtipoker.c2
-rw-r--r--src/mame/drivers/gunbustr.c2
-rw-r--r--src/mame/drivers/gundealr.c2
-rw-r--r--src/mame/drivers/gunpey.c2
-rw-r--r--src/mame/drivers/gunsmoke.c6
-rw-r--r--src/mame/drivers/gyruss.c2
-rw-r--r--src/mame/drivers/hal21.c4
-rw-r--r--src/mame/drivers/hanaawas.c2
-rw-r--r--src/mame/drivers/hanaroku.c2
-rw-r--r--src/mame/drivers/hcastle.c2
-rw-r--r--src/mame/drivers/hexa.c2
-rw-r--r--src/mame/drivers/hexion.c2
-rw-r--r--src/mame/drivers/higemaru.c2
-rw-r--r--src/mame/drivers/hitme.c2
-rw-r--r--src/mame/drivers/hng64.c2
-rw-r--r--src/mame/drivers/holeland.c4
-rw-r--r--src/mame/drivers/homedata.c6
-rw-r--r--src/mame/drivers/homerun.c2
-rw-r--r--src/mame/drivers/hotblock.c2
-rw-r--r--src/mame/drivers/hyhoo.c2
-rw-r--r--src/mame/drivers/hyprduel.c4
-rw-r--r--src/mame/drivers/igs_180.c2
-rw-r--r--src/mame/drivers/ikki.c2
-rw-r--r--src/mame/drivers/imolagp.c2
-rw-r--r--src/mame/drivers/intrscti.c2
-rw-r--r--src/mame/drivers/inufuku.c2
-rw-r--r--src/mame/drivers/iqblock.c6
-rw-r--r--src/mame/drivers/irobot.c2
-rw-r--r--src/mame/drivers/ironhors.c2
-rw-r--r--src/mame/drivers/istellar.c2
-rw-r--r--src/mame/drivers/jackal.c2
-rw-r--r--src/mame/drivers/jackpool.c2
-rw-r--r--src/mame/drivers/jailbrek.c2
-rw-r--r--src/mame/drivers/jchan.c2
-rw-r--r--src/mame/drivers/jcross.c2
-rw-r--r--src/mame/drivers/jedi.c2
-rw-r--r--src/mame/drivers/jollyjgr.c2
-rw-r--r--src/mame/drivers/jongkyo.c2
-rw-r--r--src/mame/drivers/jpmimpct.c2
-rw-r--r--src/mame/drivers/jrpacman.c2
-rw-r--r--src/mame/drivers/junofrst.c2
-rw-r--r--src/mame/drivers/kaneko16.c10
-rw-r--r--src/mame/drivers/kangaroo.c2
-rw-r--r--src/mame/drivers/karnov.c4
-rw-r--r--src/mame/drivers/kchamp.c4
-rw-r--r--src/mame/drivers/kickgoal.c4
-rw-r--r--src/mame/drivers/kingobox.c4
-rw-r--r--src/mame/drivers/kingpin.c2
-rw-r--r--src/mame/drivers/kinst.c2
-rw-r--r--src/mame/drivers/klax.c2
-rw-r--r--src/mame/drivers/kncljoe.c2
-rw-r--r--src/mame/drivers/koikoi.c2
-rw-r--r--src/mame/drivers/konamigq.c2
-rw-r--r--src/mame/drivers/konamigv.c2
-rw-r--r--src/mame/drivers/konamim2.c2
-rw-r--r--src/mame/drivers/kopunch.c2
-rw-r--r--src/mame/drivers/ksayakyu.c2
-rw-r--r--src/mame/drivers/ksys573.c2
-rw-r--r--src/mame/drivers/labyrunr.c2
-rw-r--r--src/mame/drivers/ladybug.c4
-rw-r--r--src/mame/drivers/ladyfrog.c2
-rw-r--r--src/mame/drivers/laserbas.c2
-rw-r--r--src/mame/drivers/laserbat.c4
-rw-r--r--src/mame/drivers/lastduel.c4
-rw-r--r--src/mame/drivers/lastfght.c2
-rw-r--r--src/mame/drivers/lazercmd.c6
-rw-r--r--src/mame/drivers/legionna.c14
-rw-r--r--src/mame/drivers/lemmings.c2
-rw-r--r--src/mame/drivers/lgp.c2
-rw-r--r--src/mame/drivers/liberate.c6
-rw-r--r--src/mame/drivers/limenko.c4
-rw-r--r--src/mame/drivers/littlerb.c2
-rw-r--r--src/mame/drivers/lkage.c4
-rw-r--r--src/mame/drivers/lockon.c2
-rw-r--r--src/mame/drivers/looping.c2
-rw-r--r--src/mame/drivers/lordgun.c2
-rw-r--r--src/mame/drivers/lsasquad.c4
-rw-r--r--src/mame/drivers/ltcasino.c2
-rw-r--r--src/mame/drivers/lucky8.c2
-rw-r--r--src/mame/drivers/m57.c2
-rw-r--r--src/mame/drivers/m58.c2
-rw-r--r--src/mame/drivers/m63.c2
-rw-r--r--src/mame/drivers/m79amb.c2
-rw-r--r--src/mame/drivers/macrossp.c2
-rw-r--r--src/mame/drivers/madalien.c2
-rw-r--r--src/mame/drivers/madmotor.c2
-rw-r--r--src/mame/drivers/magmax.c2
-rw-r--r--src/mame/drivers/mainevt.c4
-rw-r--r--src/mame/drivers/mainsnk.c2
-rw-r--r--src/mame/drivers/mappy.c6
-rw-r--r--src/mame/drivers/marinedt.c2
-rw-r--r--src/mame/drivers/markham.c2
-rw-r--r--src/mame/drivers/marvins.c5
-rw-r--r--src/mame/drivers/matmania.c4
-rw-r--r--src/mame/drivers/mayumi.c2
-rw-r--r--src/mame/drivers/mazerbla.c4
-rw-r--r--src/mame/drivers/mcatadv.c2
-rw-r--r--src/mame/drivers/mcr68.c2
-rw-r--r--src/mame/drivers/meadows.c6
-rw-r--r--src/mame/drivers/mediagx.c2
-rw-r--r--src/mame/drivers/megaplay.c2
-rw-r--r--src/mame/drivers/megasys1.c4
-rw-r--r--src/mame/drivers/megatech.c2
-rw-r--r--src/mame/drivers/megazone.c2
-rw-r--r--src/mame/drivers/mermaid.c2
-rw-r--r--src/mame/drivers/metlclsh.c6
-rw-r--r--src/mame/drivers/metro.c42
-rw-r--r--src/mame/drivers/mgolf.c2
-rw-r--r--src/mame/drivers/micro3d.c2
-rw-r--r--src/mame/drivers/midas.c2
-rw-r--r--src/mame/drivers/midwunit.c2
-rw-r--r--src/mame/drivers/midxunit.c2
-rw-r--r--src/mame/drivers/midyunit.c2
-rw-r--r--src/mame/drivers/mikie.c2
-rw-r--r--src/mame/drivers/minivadr.c2
-rw-r--r--src/mame/drivers/mirage.c2
-rw-r--r--src/mame/drivers/mirax.c2
-rw-r--r--src/mame/drivers/missb2.c2
-rw-r--r--src/mame/drivers/missile.c2
-rw-r--r--src/mame/drivers/mitchell.c6
-rw-r--r--src/mame/drivers/mjkjidai.c2
-rw-r--r--src/mame/drivers/mjsister.c2
-rw-r--r--src/mame/drivers/mjsiyoub.c2
-rw-r--r--src/mame/drivers/mlanding.c2
-rw-r--r--src/mame/drivers/model1.c4
-rw-r--r--src/mame/drivers/model2.c8
-rw-r--r--src/mame/drivers/model3.c8
-rw-r--r--src/mame/drivers/mogura.c2
-rw-r--r--src/mame/drivers/mole.c2
-rw-r--r--src/mame/drivers/momoko.c2
-rw-r--r--src/mame/drivers/mouser.c2
-rw-r--r--src/mame/drivers/mquake.c2
-rw-r--r--src/mame/drivers/mrdo.c2
-rw-r--r--src/mame/drivers/mrflea.c2
-rw-r--r--src/mame/drivers/mrjong.c2
-rw-r--r--src/mame/drivers/ms32.c2
-rw-r--r--src/mame/drivers/msisaac.c2
-rw-r--r--src/mame/drivers/mugsmash.c2
-rw-r--r--src/mame/drivers/munchmo.c2
-rw-r--r--src/mame/drivers/murogem.c2
-rw-r--r--src/mame/drivers/mustache.c2
-rw-r--r--src/mame/drivers/mwarr.c2
-rw-r--r--src/mame/drivers/mystston.c2
-rw-r--r--src/mame/drivers/n8080.c6
-rw-r--r--src/mame/drivers/namcofl.c2
-rw-r--r--src/mame/drivers/namcona1.c4
-rw-r--r--src/mame/drivers/namconb1.c4
-rw-r--r--src/mame/drivers/namcond1.c2
-rw-r--r--src/mame/drivers/namcos1.c2
-rw-r--r--src/mame/drivers/namcos10.c2
-rw-r--r--src/mame/drivers/namcos11.c2
-rw-r--r--src/mame/drivers/namcos12.c2
-rw-r--r--src/mame/drivers/namcos2.c12
-rw-r--r--src/mame/drivers/namcos21.c6
-rw-r--r--src/mame/drivers/namcos22.c8
-rw-r--r--src/mame/drivers/namcos23.c4
-rw-r--r--src/mame/drivers/namcos86.c6
-rw-r--r--src/mame/drivers/naughtyb.c4
-rw-r--r--src/mame/drivers/nemesis.c18
-rw-r--r--src/mame/drivers/neogeo.c2
-rw-r--r--src/mame/drivers/news.c2
-rw-r--r--src/mame/drivers/ninjaw.c4
-rw-r--r--src/mame/drivers/nitedrvr.c2
-rw-r--r--src/mame/drivers/nmk16.c44
-rw-r--r--src/mame/drivers/nova2001.c8
-rw-r--r--src/mame/drivers/nwk-tr.c2
-rw-r--r--src/mame/drivers/nycaptor.c6
-rw-r--r--src/mame/drivers/nyny.c2
-rw-r--r--src/mame/drivers/offtwall.c2
-rw-r--r--src/mame/drivers/ohmygod.c2
-rw-r--r--src/mame/drivers/ojankohs.c8
-rw-r--r--src/mame/drivers/olibochu.c2
-rw-r--r--src/mame/drivers/omegrace.c2
-rw-r--r--src/mame/drivers/oneshot.c2
-rw-r--r--src/mame/drivers/onetwo.c2
-rw-r--r--src/mame/drivers/opwolf.c4
-rw-r--r--src/mame/drivers/orbit.c2
-rw-r--r--src/mame/drivers/othldrby.c2
-rw-r--r--src/mame/drivers/othunder.c4
-rw-r--r--src/mame/drivers/overdriv.c2
-rw-r--r--src/mame/drivers/pacland.c2
-rw-r--r--src/mame/drivers/pandoras.c2
-rw-r--r--src/mame/drivers/pangofun.c2
-rw-r--r--src/mame/drivers/panicr.c2
-rw-r--r--src/mame/drivers/paranoia.c2
-rw-r--r--src/mame/drivers/parodius.c2
-rw-r--r--src/mame/drivers/pasha2.c2
-rw-r--r--src/mame/drivers/pass.c2
-rw-r--r--src/mame/drivers/pastelg.c2
-rw-r--r--src/mame/drivers/pbaction.c2
-rw-r--r--src/mame/drivers/pcktgal.c2
-rw-r--r--src/mame/drivers/pipedrm.c4
-rw-r--r--src/mame/drivers/pipeline.c2
-rw-r--r--src/mame/drivers/pirates.c2
-rw-r--r--src/mame/drivers/pitnrun.c2
-rw-r--r--src/mame/drivers/pkscram.c2
-rw-r--r--src/mame/drivers/pktgaldx.c4
-rw-r--r--src/mame/drivers/playch10.c2
-rw-r--r--src/mame/drivers/playmark.c10
-rw-r--r--src/mame/drivers/plygonet.c2
-rw-r--r--src/mame/drivers/pokechmp.c2
-rw-r--r--src/mame/drivers/polepos.c2
-rw-r--r--src/mame/drivers/polyplay.c2
-rw-r--r--src/mame/drivers/poolshrk.c2
-rw-r--r--src/mame/drivers/pooyan.c2
-rw-r--r--src/mame/drivers/popper.c2
-rw-r--r--src/mame/drivers/portrait.c2
-rw-r--r--src/mame/drivers/powerbal.c4
-rw-r--r--src/mame/drivers/powerins.c2
-rw-r--r--src/mame/drivers/ppmast93.c2
-rw-r--r--src/mame/drivers/prehisle.c2
-rw-r--r--src/mame/drivers/progolf.c2
-rw-r--r--src/mame/drivers/psikyo.c6
-rw-r--r--src/mame/drivers/psychic5.c2
-rw-r--r--src/mame/drivers/pturn.c2
-rw-r--r--src/mame/drivers/pushman.c4
-rw-r--r--src/mame/drivers/qdrmfgp.c4
-rw-r--r--src/mame/drivers/quantum.c2
-rw-r--r--src/mame/drivers/quizo.c2
-rw-r--r--src/mame/drivers/quizpani.c2
-rw-r--r--src/mame/drivers/r2dtank.c2
-rw-r--r--src/mame/drivers/raiden.c4
-rw-r--r--src/mame/drivers/raiden2.c4
-rw-r--r--src/mame/drivers/rainbow.c4
-rw-r--r--src/mame/drivers/rallyx.c4
-rw-r--r--src/mame/drivers/rampart.c2
-rw-r--r--src/mame/drivers/rastan.c2
-rw-r--r--src/mame/drivers/rcasino.c2
-rw-r--r--src/mame/drivers/rcorsair.c2
-rw-r--r--src/mame/drivers/redalert.c4
-rw-r--r--src/mame/drivers/redclash.c4
-rw-r--r--src/mame/drivers/relief.c2
-rw-r--r--src/mame/drivers/renegade.c2
-rw-r--r--src/mame/drivers/retofinv.c2
-rw-r--r--src/mame/drivers/rockrage.c2
-rw-r--r--src/mame/drivers/rocnrope.c2
-rw-r--r--src/mame/drivers/rohga.c8
-rw-r--r--src/mame/drivers/rollerg.c2
-rw-r--r--src/mame/drivers/rollrace.c2
-rw-r--r--src/mame/drivers/rpunch.c2
-rw-r--r--src/mame/drivers/runaway.c2
-rw-r--r--src/mame/drivers/safarir.c2
-rw-r--r--src/mame/drivers/sandscrp.c2
-rw-r--r--src/mame/drivers/sangho.c4
-rw-r--r--src/mame/drivers/sbasketb.c2
-rw-r--r--src/mame/drivers/sbowling.c2
-rw-r--r--src/mame/drivers/sbrkout.c2
-rw-r--r--src/mame/drivers/sbugger.c2
-rw-r--r--src/mame/drivers/scotrsht.c2
-rw-r--r--src/mame/drivers/scramble.c2
-rw-r--r--src/mame/drivers/scregg.c4
-rw-r--r--src/mame/drivers/sderby.c4
-rw-r--r--src/mame/drivers/segag80v.c2
-rw-r--r--src/mame/drivers/segald.c2
-rw-r--r--src/mame/drivers/segas18.c6
-rw-r--r--src/mame/drivers/segas24.c2
-rw-r--r--src/mame/drivers/segas32.c4
-rw-r--r--src/mame/drivers/seibuspi.c2
-rw-r--r--src/mame/drivers/seicross.c2
-rw-r--r--src/mame/drivers/sengokmj.c2
-rw-r--r--src/mame/drivers/seta.c72
-rw-r--r--src/mame/drivers/sfkick.c2
-rw-r--r--src/mame/drivers/sg1000a.c2
-rw-r--r--src/mame/drivers/sgladiat.c2
-rw-r--r--src/mame/drivers/shadfrce.c2
-rw-r--r--src/mame/drivers/shangha3.c6
-rw-r--r--src/mame/drivers/shanghai.c6
-rw-r--r--src/mame/drivers/shangkid.c2
-rw-r--r--src/mame/drivers/shaolins.c2
-rw-r--r--src/mame/drivers/shisen.c2
-rw-r--r--src/mame/drivers/shootout.c4
-rw-r--r--src/mame/drivers/shougi.c2
-rw-r--r--src/mame/drivers/shuuz.c2
-rw-r--r--src/mame/drivers/sidearms.c6
-rw-r--r--src/mame/drivers/sidepckt.c4
-rw-r--r--src/mame/drivers/silkroad.c2
-rw-r--r--src/mame/drivers/simpsons.c2
-rw-r--r--src/mame/drivers/skullxbo.c2
-rw-r--r--src/mame/drivers/skyarmy.c2
-rw-r--r--src/mame/drivers/skydiver.c2
-rw-r--r--src/mame/drivers/skyfox.c2
-rw-r--r--src/mame/drivers/skykid.c2
-rw-r--r--src/mame/drivers/skylncr.c2
-rw-r--r--src/mame/drivers/skyraid.c2
-rw-r--r--src/mame/drivers/slapfght.c6
-rw-r--r--src/mame/drivers/slapshot.c4
-rw-r--r--src/mame/drivers/smstrv.c2
-rw-r--r--src/mame/drivers/snk.c22
-rw-r--r--src/mame/drivers/snowbros.c2
-rw-r--r--src/mame/drivers/solomon.c2
-rw-r--r--src/mame/drivers/sonson.c2
-rw-r--r--src/mame/drivers/spacefb.c2
-rw-r--r--src/mame/drivers/spaceg.c2
-rw-r--r--src/mame/drivers/spbactn.c2
-rw-r--r--src/mame/drivers/spcforce.c2
-rw-r--r--src/mame/drivers/spdodgeb.c2
-rw-r--r--src/mame/drivers/speedatk.c2
-rw-r--r--src/mame/drivers/speedbal.c2
-rw-r--r--src/mame/drivers/speedspn.c3
-rw-r--r--src/mame/drivers/spiders.c2
-rw-r--r--src/mame/drivers/splash.c6
-rw-r--r--src/mame/drivers/sprcros2.c2
-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.c2
-rw-r--r--src/mame/drivers/srmp2.c6
-rw-r--r--src/mame/drivers/srmp6.c2
-rw-r--r--src/mame/drivers/srumbler.c2
-rw-r--r--src/mame/drivers/ssfindo.c4
-rw-r--r--src/mame/drivers/sshangha.c2
-rw-r--r--src/mame/drivers/ssingles.c2
-rw-r--r--src/mame/drivers/sslam.c4
-rw-r--r--src/mame/drivers/ssozumo.c2
-rw-r--r--src/mame/drivers/sspeedr.c2
-rw-r--r--src/mame/drivers/ssrj.c2
-rw-r--r--src/mame/drivers/stactics.c2
-rw-r--r--src/mame/drivers/stadhero.c2
-rw-r--r--src/mame/drivers/starcrus.c2
-rw-r--r--src/mame/drivers/starfire.c2
-rw-r--r--src/mame/drivers/starshp1.c2
-rw-r--r--src/mame/drivers/starwars.c2
-rw-r--r--src/mame/drivers/stepstag.c2
-rw-r--r--src/mame/drivers/stfight.c2
-rw-r--r--src/mame/drivers/strnskil.c2
-rw-r--r--src/mame/drivers/stv.c2
-rw-r--r--src/mame/drivers/subs.c2
-rw-r--r--src/mame/drivers/subsino.c4
-rw-r--r--src/mame/drivers/suna16.c8
-rw-r--r--src/mame/drivers/suna8.c8
-rw-r--r--src/mame/drivers/supbtime.c4
-rw-r--r--src/mame/drivers/supdrapo.c2
-rw-r--r--src/mame/drivers/superchs.c2
-rw-r--r--src/mame/drivers/superdq.c2
-rw-r--r--src/mame/drivers/superqix.c8
-rw-r--r--src/mame/drivers/supertnk.c2
-rw-r--r--src/mame/drivers/suprgolf.c2
-rw-r--r--src/mame/drivers/suprloco.c2
-rw-r--r--src/mame/drivers/suprnova.c2
-rw-r--r--src/mame/drivers/suprridr.c2
-rw-r--r--src/mame/drivers/suprslam.c2
-rw-r--r--src/mame/drivers/surpratk.c2
-rw-r--r--src/mame/drivers/tagteam.c2
-rw-r--r--src/mame/drivers/tail2nos.c2
-rw-r--r--src/mame/drivers/taito_b.c36
-rw-r--r--src/mame/drivers/taito_f2.c7
-rw-r--r--src/mame/drivers/taito_f3.c4
-rw-r--r--src/mame/drivers/taito_h.c6
-rw-r--r--src/mame/drivers/taito_l.c4
-rw-r--r--src/mame/drivers/taito_x.c8
-rw-r--r--src/mame/drivers/taito_z.c20
-rw-r--r--src/mame/drivers/taitoair.c2
-rw-r--r--src/mame/drivers/taitojc.c2
-rw-r--r--src/mame/drivers/taitosj.c2
-rw-r--r--src/mame/drivers/taitowlf.c2
-rw-r--r--src/mame/drivers/tank8.c2
-rw-r--r--src/mame/drivers/tankbatt.c2
-rw-r--r--src/mame/drivers/tankbust.c2
-rw-r--r--src/mame/drivers/taotaido.c2
-rw-r--r--src/mame/drivers/targeth.c2
-rw-r--r--src/mame/drivers/tarzan.c2
-rw-r--r--src/mame/drivers/tatsumi.c8
-rw-r--r--src/mame/drivers/tattack.c2
-rw-r--r--src/mame/drivers/taxidrvr.c2
-rw-r--r--src/mame/drivers/tbowl.c2
-rw-r--r--src/mame/drivers/tceptor.c2
-rw-r--r--src/mame/drivers/tcl.c2
-rw-r--r--src/mame/drivers/tecmo16.c4
-rw-r--r--src/mame/drivers/tecmosys.c2
-rw-r--r--src/mame/drivers/tempest.c2
-rw-r--r--src/mame/drivers/terracre.c6
-rw-r--r--src/mame/drivers/tetrisp2.c10
-rw-r--r--src/mame/drivers/tetriunk.c2
-rw-r--r--src/mame/drivers/thayers.c2
-rw-r--r--src/mame/drivers/thedeep.c2
-rw-r--r--src/mame/drivers/thepit.c2
-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.c4
-rw-r--r--src/mame/drivers/tiamc1.c2
-rw-r--r--src/mame/drivers/tigeroad.c5
-rw-r--r--src/mame/drivers/timelimt.c2
-rw-r--r--src/mame/drivers/tmnt.c24
-rw-r--r--src/mame/drivers/tnzs.c12
-rw-r--r--src/mame/drivers/toaplan1.c16
-rw-r--r--src/mame/drivers/toaplan2.c38
-rw-r--r--src/mame/drivers/toki.c4
-rw-r--r--src/mame/drivers/toobin.c2
-rw-r--r--src/mame/drivers/topspeed.c2
-rw-r--r--src/mame/drivers/toratora.c2
-rw-r--r--src/mame/drivers/tourtabl.c2
-rw-r--r--src/mame/drivers/trackfld.c2
-rw-r--r--src/mame/drivers/travrusa.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.c2
-rw-r--r--src/mame/drivers/trvquest.c2
-rw-r--r--src/mame/drivers/tryout.c2
-rw-r--r--src/mame/drivers/tsamurai.c6
-rw-r--r--src/mame/drivers/ttchamp.c2
-rw-r--r--src/mame/drivers/tumbleb.c16
-rw-r--r--src/mame/drivers/tumblep.c2
-rw-r--r--src/mame/drivers/tunhunt.c2
-rw-r--r--src/mame/drivers/turbo.c6
-rw-r--r--src/mame/drivers/turbosub.c2
-rw-r--r--src/mame/drivers/tutankhm.c2
-rw-r--r--src/mame/drivers/twin16.c4
-rw-r--r--src/mame/drivers/twincobr.c2
-rw-r--r--src/mame/drivers/twins.c4
-rw-r--r--src/mame/drivers/tx1.c6
-rw-r--r--src/mame/drivers/uapce.c2
-rw-r--r--src/mame/drivers/ultraman.c2
-rw-r--r--src/mame/drivers/ultratnk.c2
-rw-r--r--src/mame/drivers/ultrsprt.c2
-rw-r--r--src/mame/drivers/undrfire.c4
-rw-r--r--src/mame/drivers/unico.c6
-rw-r--r--src/mame/drivers/upscope.c2
-rw-r--r--src/mame/drivers/vamphalf.c2
-rw-r--r--src/mame/drivers/vaportra.c2
-rw-r--r--src/mame/drivers/vastar.c2
-rw-r--r--src/mame/drivers/vball.c4
-rw-r--r--src/mame/drivers/vendetta.c3
-rw-r--r--src/mame/drivers/vertigo.c2
-rw-r--r--src/mame/drivers/victory.c2
-rw-r--r--src/mame/drivers/videopin.c2
-rw-r--r--src/mame/drivers/vigilant.c6
-rw-r--r--src/mame/drivers/vindictr.c2
-rw-r--r--src/mame/drivers/viper.c2
-rw-r--r--src/mame/drivers/vmetal.c2
-rw-r--r--src/mame/drivers/volfied.c2
-rw-r--r--src/mame/drivers/vroulet.c2
-rw-r--r--src/mame/drivers/vsnes.c4
-rw-r--r--src/mame/drivers/vulgus.c2
-rw-r--r--src/mame/drivers/wallc.c2
-rw-r--r--src/mame/drivers/wardner.c2
-rw-r--r--src/mame/drivers/warriorb.c4
-rw-r--r--src/mame/drivers/wc90.c2
-rw-r--r--src/mame/drivers/wc90b.c2
-rw-r--r--src/mame/drivers/wecleman.c4
-rw-r--r--src/mame/drivers/welltris.c2
-rw-r--r--src/mame/drivers/wgp.c2
-rw-r--r--src/mame/drivers/wheelfir.c2
-rw-r--r--src/mame/drivers/wink.c2
-rw-r--r--src/mame/drivers/wiping.c2
-rw-r--r--src/mame/drivers/witch.c2
-rw-r--r--src/mame/drivers/wiz.c2
-rw-r--r--src/mame/drivers/wldarrow.c2
-rw-r--r--src/mame/drivers/wolfpack.c2
-rw-r--r--src/mame/drivers/wrally.c2
-rw-r--r--src/mame/drivers/wwfsstar.c2
-rw-r--r--src/mame/drivers/wwfwfest.c2
-rw-r--r--src/mame/drivers/xain.c2
-rw-r--r--src/mame/drivers/xexex.c2
-rw-r--r--src/mame/drivers/xmen.c4
-rw-r--r--src/mame/drivers/xorworld.c2
-rw-r--r--src/mame/drivers/xtheball.c2
-rw-r--r--src/mame/drivers/xxmissio.c2
-rw-r--r--src/mame/drivers/xybots.c2
-rw-r--r--src/mame/drivers/xyonix.c2
-rw-r--r--src/mame/drivers/yiear.c2
-rw-r--r--src/mame/drivers/yumefuda.c2
-rw-r--r--src/mame/drivers/yunsun16.c4
-rw-r--r--src/mame/drivers/yunsung8.c2
-rw-r--r--src/mame/drivers/zac2650.c2
-rw-r--r--src/mame/drivers/zaccaria.c6
-rw-r--r--src/mame/drivers/zerozone.c2
-rw-r--r--src/mame/drivers/zodiack.c2
-rw-r--r--src/mame/drivers/zr107.c4
719 files changed, 1233 insertions, 1216 deletions
diff --git a/src/emu/info.c b/src/emu/info.c
index 71f499f804b..caa7fe85374 100644
--- a/src/emu/info.c
+++ b/src/emu/info.c
@@ -629,6 +629,8 @@ static void print_game_chips(FILE *out, const game_driver *game, const machine_c
{
fprintf(out, "\t\t<chip");
fprintf(out, " type=\"cpu\"");
+ if (config->cpu[chipnum].tag != NULL)
+ fprintf(out, " tag=\"%s\"", xml_normalize_string(config->cpu[chipnum].tag));
fprintf(out, " name=\"%s\"", xml_normalize_string(cputype_name(config->cpu[chipnum].type)));
fprintf(out, " clock=\"%d\"", config->cpu[chipnum].clock);
fprintf(out, "/>\n");
@@ -640,6 +642,7 @@ static void print_game_chips(FILE *out, const game_driver *game, const machine_c
{
fprintf(out, "\t\t<chip");
fprintf(out, " type=\"audio\"");
+ fprintf(out, " tag=\"%s\"", xml_normalize_string(config->sound[chipnum].tag));
fprintf(out, " name=\"%s\"", xml_normalize_string(sndtype_name(config->sound[chipnum].type)));
if (config->sound[chipnum].clock != 0)
fprintf(out, " clock=\"%d\"", config->sound[chipnum].clock);
@@ -970,6 +973,7 @@ void print_mame_xml(FILE *out, const game_driver *const games[], const char *gam
"\t\t\t<!ATTLIST sample name CDATA #REQUIRED>\n"
"\t\t<!ELEMENT chip EMPTY>\n"
"\t\t\t<!ATTLIST chip name CDATA #REQUIRED>\n"
+ "\t\t\t<!ATTLIST chip tag CDATA #IMPLIED>\n"
"\t\t\t<!ATTLIST chip type (cpu|audio) #REQUIRED>\n"
"\t\t\t<!ATTLIST chip clock CDATA #IMPLIED>\n"
"\t\t<!ELEMENT display EMPTY>\n"
diff --git a/src/emu/validity.c b/src/emu/validity.c
index 7d03c42a0e3..7dc757df7c1 100644
--- a/src/emu/validity.c
+++ b/src/emu/validity.c
@@ -628,12 +628,21 @@ static int validate_cpu(int drivnum, const machine_config *config, const UINT32
{
extern void dummy_get_info(UINT32 state, cpuinfo *info);
const cpu_config *cpu = &config->cpu[cpunum];
- int spacenum;
+ int spacenum, checknum;
/* skip empty entries */
if (cpu->type == CPU_DUMMY)
continue;
+ /* check for duplicate tags */
+ if (cpu->tag != NULL)
+ for (checknum = 0; checknum < cpunum; checknum++)
+ if (config->cpu[checknum].tag != NULL && strcmp(cpu->tag, config->cpu[checknum].tag) == 0)
+ {
+ mame_printf_error("%s: %s has multiple CPUs tagged as '%s'\n", driver->source_file, driver->name, cpu->tag);
+ error = TRUE;
+ }
+
/* checks to see if this driver is using a dummy CPU */
if (cputype_get_interface(cpu->type)->get_info == dummy_get_info)
{
@@ -1356,7 +1365,16 @@ static int validate_sound(int drivnum, const machine_config *config)
/* make sure the sounds are wired to the speakers correctly */
for (sndnum = 0; sndnum < MAX_SOUND && config->sound[sndnum].type != SOUND_DUMMY; sndnum++)
{
- int routenum;
+ int routenum, checknum;
+
+ /* check for duplicate tags */
+ if (config->sound[sndnum].tag != NULL)
+ for (checknum = 0; checknum < sndnum; checknum++)
+ if (config->sound[checknum].tag != NULL && strcmp(config->sound[sndnum].tag, config->sound[checknum].tag) == 0)
+ {
+ mame_printf_error("%s: %s has multiple sound chips tagged as '%s'\n", driver->source_file, driver->name, config->sound[sndnum].tag);
+ error = TRUE;
+ }
/* loop over all the routes */
for (routenum = 0; routenum < config->sound[sndnum].routes; routenum++)
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index d21804c4bbb..1151846a484 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -895,7 +895,7 @@ ADDRESS_MAP_END
MACHINE_DRIVER_START( mtrap_cvsd_audio )
- MDRV_CPU_ADD_TAG("audio", Z80, CVSD_Z80_CLOCK)
+ MDRV_CPU_ADD_TAG("cvsd", Z80, CVSD_Z80_CLOCK)
MDRV_CPU_PROGRAM_MAP(cvsd_map,0)
MDRV_CPU_IO_MAP(cvsd_iomap,0)
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index a0508d730e6..d33c5ea96bf 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -402,7 +402,7 @@ MACHINE_DRIVER_START( m52_sound_c_audio )
MDRV_SOUND_CONFIG(irem_ay8910_interface_1)
MDRV_SOUND_ROUTE_EX(0, "filtermix", 1.0, 0)
- MDRV_SOUND_ADD("ay8910.0", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ay8910.1", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(irem_ay8910_interface_2)
MDRV_SOUND_ROUTE_EX(0, "filtermix", 1.0, 1)
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index 789ae73c4c4..7f9b159e3a0 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -417,13 +417,13 @@ static MACHINE_DRIVER_START( triothep )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym", YM2203, XTAL_12MHz/8) /* verified on pcb */
+ MDRV_SOUND_ADD("ym1", YM2203, XTAL_12MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
MDRV_SOUND_ROUTE(2, "mono", 0.90)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD("ym", YM3812, XTAL_12MHz/4) /* verified on pcb */
+ MDRV_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index b91bbde7f4c..126bbd57fa8 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -2087,7 +2087,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( jongbou )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(kyros_map,0)
MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt,17) // must be at least 4 for the controls to be smooth
@@ -2122,7 +2122,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( alpha68k_I )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 6000000) /* 24MHz/4? */
+ MDRV_CPU_ADD_TAG("main", M68000, 6000000) /* 24MHz/4? */
MDRV_CPU_PROGRAM_MAP(alpha68k_I_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* VBL */
@@ -2203,7 +2203,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( alpha68k_II_gm )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(alpha68k_II_map, 0)
MDRV_CPU_VBLANK_INT_HACK(alpha68k_interrupt, 4)
@@ -2245,7 +2245,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( alpha68k_V )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* ? */
MDRV_CPU_PROGRAM_MAP(alpha68k_V_map,0)
MDRV_CPU_VBLANK_INT("main", irq3_line_hold)/* VBL */
@@ -2286,7 +2286,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( alpha68k_V_sb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* ? */
MDRV_CPU_PROGRAM_MAP(alpha68k_V_map,0)
MDRV_CPU_VBLANK_INT("main", irq3_line_hold)/* VBL */
@@ -2327,7 +2327,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tnexspce )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 9000000) /* Confirmed 18 MHz/2 */
+ MDRV_CPU_ADD_TAG("main", M68000, 9000000) /* Confirmed 18 MHz/2 */
MDRV_CPU_PROGRAM_MAP(tnexspce_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* VBL */
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index 256aefb2555..0292f633dba 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -183,7 +183,7 @@ static const struct AY8910interface ay8910_interface_2 =
static MACHINE_DRIVER_START( ambush )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4.00 MHz??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4.00 MHz??? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index 182b09619f3..876b914cd42 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -1016,7 +1016,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( ampoker2 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MASTER_CLOCK/2) /* 3 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/2) /* 3 MHz */
MDRV_CPU_PROGRAM_MAP(ampoker2_map, 0)
MDRV_CPU_IO_MAP(ampoker2_io_map, 0)
MDRV_CPU_PERIODIC_INT(nmi_line_pulse, 1536)
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index 4dfac7ab22e..5f9c6c9ff9f 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -255,7 +255,7 @@ static const struct YM2151interface amspdwy_ym2151_interface =
static MACHINE_DRIVER_START( amspdwy )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,3000000)
+ MDRV_CPU_ADD_TAG("main", Z80,3000000)
MDRV_CPU_PROGRAM_MAP(amspdwy_map,0)
MDRV_CPU_IO_MAP(amspdwy_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ: 60Hz, NMI: retn */
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index aa88dd7c9db..548c1d58725 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -599,7 +599,7 @@ GFXDECODE_END
*/
static MACHINE_DRIVER_START( angelkds )
- MDRV_CPU_ADD(Z80, 8000000) /* 8MHz? 6 seems too slow? */
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* 8MHz? 6 seems too slow? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index 131ee47e3a8..bebb63e1024 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -213,7 +213,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( appoooh )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
@@ -415,7 +415,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( robowres )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,18432000/6) /* ??? the main xtal is 18.432 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index 4bf12e7e94e..ffe2139d5b3 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -348,7 +348,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( aquarium )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 32000000/2)
+ MDRV_CPU_ADD_TAG("main", M68000, 32000000/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index 16ec3c4bc5a..0619c2acc22 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -352,7 +352,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( arabian )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MAIN_OSC/4)
+ MDRV_CPU_ADD_TAG("main", Z80, MAIN_OSC/4)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c
index 78512d6e4be..2988387ad5b 100644
--- a/src/mame/drivers/arcadecl.c
+++ b/src/mame/drivers/arcadecl.c
@@ -344,7 +344,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( arcadecl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, MASTER_CLOCK)
+ MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index f07cbd07bf2..e0710308ad9 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -283,7 +283,7 @@ static const struct CustomSound_interface amiga_custom_interface =
static MACHINE_DRIVER_START( arcadia )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, AMIGA_68000_NTSC_CLOCK)
+ MDRV_CPU_ADD_TAG("main", M68000, AMIGA_68000_NTSC_CLOCK)
MDRV_CPU_PROGRAM_MAP(amiga_map,0)
MDRV_MACHINE_RESET(amiga)
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index 4f9e80e5b4f..0095196f485 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -701,7 +701,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( argus )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 5000000) /* 4 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(argus_map,0)
MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
@@ -738,7 +738,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( valtric )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 5000000) /* 5 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5 MHz */
MDRV_CPU_PROGRAM_MAP(valtric_map,0)
MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
@@ -781,7 +781,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( butasan )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 5000000) /* 5 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5 MHz */
MDRV_CPU_PROGRAM_MAP(butasan_map,0)
MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
@@ -824,7 +824,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bombsa )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 5000000) /* 5 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5 MHz */
MDRV_CPU_PROGRAM_MAP(bombsa_map,0)
MDRV_CPU_VBLANK_INT_HACK(argus_interrupt,2)
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index 1966b73188d..604bf8747a2 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -755,7 +755,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( terraf )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */
MDRV_CPU_PROGRAM_MAP(terraf_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -796,7 +796,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( terrafb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */
MDRV_CPU_PROGRAM_MAP(terrafb_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -843,7 +843,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kodure )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */
MDRV_CPU_PROGRAM_MAP(kodure_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -885,7 +885,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( armedf )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */
MDRV_CPU_PROGRAM_MAP(armedf_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -927,7 +927,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cclimbr2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */
MDRV_CPU_PROGRAM_MAP(cclimbr2_map,0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -968,7 +968,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( legion )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */
MDRV_CPU_PROGRAM_MAP(legion_map,0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -1009,7 +1009,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( legiono )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */
MDRV_CPU_PROGRAM_MAP(legiono_map,0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 85d6b621f39..0114f985443 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -338,7 +338,7 @@ static DRIVER_INIT( ashnojoe )
static MACHINE_DRIVER_START( ashnojoe )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz (verified on pcb) */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz (verified on pcb) */
MDRV_CPU_PROGRAM_MAP(ashnojoe_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 4cfad52e603..86297fe10b0 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -254,7 +254,7 @@ static const struct K053260_interface k053260_interface =
static MACHINE_DRIVER_START( asterix )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", asterix_interrupt)
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index 0b35eea6714..2badb20d8ea 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -508,7 +508,7 @@ static const struct Samplesinterface astinvad_samples_interface =
static MACHINE_DRIVER_START( kamikaze )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MASTER_CLOCK)
+ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK)
MDRV_CPU_PROGRAM_MAP(kamikaze_map,0)
MDRV_CPU_IO_MAP(kamikaze_portmap,0)
@@ -548,7 +548,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( spaceint )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MASTER_CLOCK) /* a guess */
+ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK) /* a guess */
MDRV_CPU_PROGRAM_MAP(spaceint_map,0)
MDRV_CPU_IO_MAP(spaceint_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index 8ac3193c887..cc7a79c2288 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -252,7 +252,7 @@ static NVRAM_HANDLER( showhand )
static MACHINE_DRIVER_START( astrocorp )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_25_601712MHz / 2)
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_25_601712MHz / 2)
MDRV_CPU_PROGRAM_MAP(astrocorp_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index c1e4310fd32..93172c45499 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -785,7 +785,7 @@ static VIDEO_EOF( asuka )
static MACHINE_DRIVER_START( bonzeadv )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* checked on PCB */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* checked on PCB */
MDRV_CPU_PROGRAM_MAP(bonzeadv_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -823,7 +823,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( asuka )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(asuka_map,0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -864,7 +864,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cadash )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_32MHz/2) /* 68000p12 running at 16Mhz, verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_32MHz/2) /* 68000p12 running at 16Mhz, verified on pcb */
MDRV_CPU_PROGRAM_MAP(cadash_map,0)
MDRV_CPU_VBLANK_INT("main", cadash_interrupt)
@@ -901,7 +901,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mofflott )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz ??? */
MDRV_CPU_PROGRAM_MAP(asuka_map,0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -942,7 +942,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( galmedes )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz ??? */
MDRV_CPU_PROGRAM_MAP(asuka_map,0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -979,7 +979,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( eto )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz ??? */
MDRV_CPU_PROGRAM_MAP(eto_map,0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index 1399b1223e3..9c608bf6de9 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -422,7 +422,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( atarig1 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index 0c634975956..e6dc0eef326 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -517,7 +517,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( atarig42 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index cd5f1dfda95..6f5f207d5d1 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -804,7 +804,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( atarigt )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, ATARI_CLOCK_50MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68EC020, ATARI_CLOCK_50MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
MDRV_CPU_PERIODIC_INT(atarigen_scanline_int_gen, 250)
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index 6110be011b7..7d36e5c653d 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -1430,7 +1430,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( atarigx2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, ATARI_CLOCK_14MHz)
+ MDRV_CPU_ADD_TAG("main", M68EC020, ATARI_CLOCK_14MHz)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index 7ab7b276eed..fcbfb51e6ab 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -700,7 +700,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( atarisy1 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68010, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68010, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index d09955d3428..92b52b7e3f0 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -342,7 +342,7 @@ static const struct POKEYinterface pokey_interface_2 =
static MACHINE_DRIVER_START( atetris )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,MASTER_CLOCK/8)
+ MDRV_CPU_ADD_TAG("main", M6502,MASTER_CLOCK/8)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_START(atetris)
@@ -378,7 +378,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( atetrsb2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,BOOTLEG_CLOCK/8)
+ MDRV_CPU_ADD_TAG("main", M6502,BOOTLEG_CLOCK/8)
MDRV_CPU_PROGRAM_MAP(atetrsb2_map,0)
MDRV_MACHINE_START(atetris)
diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c
index 1d16b0ac3aa..17ac8882429 100644
--- a/src/mame/drivers/avalnche.c
+++ b/src/mame/drivers/avalnche.c
@@ -217,7 +217,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( avalnche )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,12096000/16) /* clock input is the "2H" signal divided by two */
+ MDRV_CPU_ADD_TAG("main", M6502,12096000/16) /* clock input is the "2H" signal divided by two */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT_HACK(avalnche_interrupt,8)
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 36a18f90d22..02afef6f7c8 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -148,7 +148,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( aztarac )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 903a8b1b57a..4cdd03baf53 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -483,7 +483,7 @@ static INTERRUPT_GEN( deco32_vbl_interrupt )
static MACHINE_DRIVER_START( backfire )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM, 28000000/4) /* Unconfirmed */
+ MDRV_CPU_ADD_TAG("main", ARM, 28000000/4) /* Unconfirmed */
MDRV_CPU_PROGRAM_MAP(backfire_map,0)
MDRV_CPU_VBLANK_INT("left", deco32_vbl_interrupt) /* or is it "right?" */
diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c
index e70531435e5..9d24c77a2c7 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -436,7 +436,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( badlands )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", vblank_int)
@@ -652,7 +652,7 @@ static MACHINE_RESET( badlandb )
static MACHINE_DRIVER_START( badlandb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 2800000/2)
+ MDRV_CPU_ADD_TAG("main", M68000, 2800000/2)
MDRV_CPU_PROGRAM_MAP(bootleg_map,0)
MDRV_CPU_VBLANK_INT("main", vblank_int)
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index c0ace85decd..a8336f884f8 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -459,7 +459,7 @@ static const struct TMS5110interface tms5110_interface =
static MACHINE_DRIVER_START( bagman )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz (?) */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -495,7 +495,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pickin )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz (?) */
MDRV_CPU_PROGRAM_MAP(pickin_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -550,7 +550,7 @@ z80
static MACHINE_DRIVER_START( botanic )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz (?) */
MDRV_CPU_PROGRAM_MAP(pickin_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index dcbb6936f8a..bcf23abf86a 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -1174,7 +1174,7 @@ static const struct cem3394_interface cem_interface =
static MACHINE_DRIVER_START( balsente )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 5000000/4)
+ MDRV_CPU_ADD_TAG("main", M6809, 5000000/4)
MDRV_CPU_PROGRAM_MAP(cpu1_map,0)
MDRV_CPU_VBLANK_INT("main", balsente_update_analog_inputs)
@@ -1233,7 +1233,7 @@ static MACHINE_DRIVER_START( shrike )
/* basic machine hardware */
MDRV_IMPORT_FROM(balsente)
- MDRV_CPU_ADD(M68000, 8000000)
+ MDRV_CPU_ADD_TAG("68k", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(shrike68k_map,0)
MDRV_INTERLEAVE(100)
diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c
index b947b67fb1b..f34b5df3863 100644
--- a/src/mame/drivers/bankp.c
+++ b/src/mame/drivers/bankp.c
@@ -257,7 +257,7 @@ static MACHINE_DRIVER_START( bankp )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, BANKP_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", Z80, BANKP_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(bankp_map, 0)
MDRV_CPU_IO_MAP(bankp_io_map, 0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index 27e64bbe59c..6def226e30e 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -393,7 +393,7 @@ static const struct namco_interface namco_interface =
static MACHINE_DRIVER_START( baraduke )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809,49152000/32)
+ MDRV_CPU_ADD_TAG("main", M6809,49152000/32)
MDRV_CPU_PROGRAM_MAP(baraduke_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c
index 9c8817bc7b3..d126da1be89 100644
--- a/src/mame/drivers/batman.c
+++ b/src/mame/drivers/batman.c
@@ -242,7 +242,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( batman )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_RESET(batman)
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index 6e1a34e0889..19a961c4a35 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -255,7 +255,7 @@ static const struct YM3526interface ym3526_interface =
static MACHINE_DRIVER_START( battlane )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1250000) /* 1.25 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M6809, 1250000) /* 1.25 MHz ? */
MDRV_CPU_PROGRAM_MAP(battlane_map, 0)
MDRV_CPU_VBLANK_INT("main", battlane_cpu1_interrupt)
diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c
index 3fe5877f0f5..ccb2ea72c95 100644
--- a/src/mame/drivers/battlera.c
+++ b/src/mame/drivers/battlera.c
@@ -245,7 +245,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( battlera )
/* basic machine hardware */
- MDRV_CPU_ADD(H6280,21477200/3)
+ MDRV_CPU_ADD_TAG("main", H6280,21477200/3)
MDRV_CPU_PROGRAM_MAP(battlera_map,0)
MDRV_CPU_IO_MAP(battlera_portmap,0)
MDRV_CPU_VBLANK_INT_HACK(battlera_interrupt,256) /* 8 prelines, 232 lines, 16 vblank? */
diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c
index ea28524efbc..c3ef37588e4 100644
--- a/src/mame/drivers/battlex.c
+++ b/src/mame/drivers/battlex.c
@@ -208,7 +208,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( battlex )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,10000000/2 ) /* 10 MHz, divided ? (Z80A CPU) */
+ MDRV_CPU_ADD_TAG("main", Z80,10000000/2 ) /* 10 MHz, divided ? (Z80A CPU) */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,8) /* controls game speed? */
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index 9c3a573a492..ee0ba070299 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -261,7 +261,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( battlnts )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309, 3000000*4) /* ? */
+ MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* ? */
MDRV_CPU_PROGRAM_MAP(battlnts_readmem,battlnts_writemem)
MDRV_CPU_VBLANK_INT("main", battlnts_interrupt)
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index 7b044d661eb..4fda66754e8 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -727,7 +727,7 @@ static VIDEO_EOF( mechatt )
static MACHINE_DRIVER_START( bbusters )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(bbuster_readmem,bbuster_writemem)
MDRV_CPU_VBLANK_INT_HACK(bbuster,4)
@@ -771,7 +771,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mechatt )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(mechatt_readmem,mechatt_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c
index 8daea8ec614..0a94d5edd50 100644
--- a/src/mame/drivers/beaminv.c
+++ b/src/mame/drivers/beaminv.c
@@ -316,7 +316,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( beaminv )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 2000000) /* 2 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 2000000) /* 2 MHz ? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_io_map,0)
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index 3c1f97da036..7714f98e5e3 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -409,7 +409,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( beathead )
/* basic machine hardware */
- MDRV_CPU_ADD(ASAP, ATARI_CLOCK_14MHz)
+ MDRV_CPU_ADD_TAG("main", ASAP, ATARI_CLOCK_14MHz)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_RESET(beathead)
diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c
index 358aee13aa0..5bfacf6fef2 100644
--- a/src/mame/drivers/beezer.c
+++ b/src/mame/drivers/beezer.c
@@ -89,7 +89,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( beezer )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1000000) /* 1 MHz */
+ MDRV_CPU_ADD_TAG("main", M6809, 1000000) /* 1 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(beezer_interrupt,128)
diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c
index 7e550febcd8..58450e57085 100644
--- a/src/mame/drivers/bestleag.c
+++ b/src/mame/drivers/bestleag.c
@@ -313,7 +313,7 @@ static GFXDECODE_START( bestleag )
GFXDECODE_END
static MACHINE_DRIVER_START( bestleag )
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(bestleag_map,0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index 229ba143b35..adc937ad0f8 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -1719,7 +1719,7 @@ static INTERRUPT_GEN( vblank_gen )
}
static MACHINE_DRIVER_START( bfcobra )
- MDRV_CPU_ADD(Z80, Z80_XTAL)
+ MDRV_CPU_ADD_TAG("main", Z80, Z80_XTAL)
MDRV_CPU_PROGRAM_MAP(z80_prog_map, 0)
MDRV_CPU_IO_MAP(z80_io_map, 0)
MDRV_CPU_VBLANK_INT("main", vblank_gen)
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index fbd9abbb28b..577f1d49898 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -476,7 +476,7 @@ static const struct MSM5232interface msm5232_interface =
static MACHINE_DRIVER_START( bigevglf )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,10000000/2) /* 5 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80,10000000/2) /* 5 MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(bigevglf_readport,bigevglf_writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* vblank */
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index d86fbac78fc..507d51b5195 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -418,7 +418,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bigfghtr )
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */
MDRV_CPU_PROGRAM_MAP(mainmem,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c
index 4b487b2aec1..8760e66a639 100644
--- a/src/mame/drivers/bigstrkb.c
+++ b/src/mame/drivers/bigstrkb.c
@@ -222,7 +222,7 @@ GFXDECODE_END
/* Machine Driver */
static MACHINE_DRIVER_START( bigstrkb )
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(bigstrkb_readmem,bigstrkb_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index 64852a2d923..57e6c3e8f43 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -346,7 +346,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bionicc )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, MASTER_CLOCK / 2) /* 12 MHz - verified in schematics */
+ MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK / 2) /* 12 MHz - verified in schematics */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(bionicc_interrupt,8)
diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c
index 94dd9bef2b1..03ff83071e2 100644
--- a/src/mame/drivers/bishjan.c
+++ b/src/mame/drivers/bishjan.c
@@ -441,7 +441,7 @@ static INTERRUPT_GEN( bishjan_interrupt )
}
static MACHINE_DRIVER_START( bishjan )
- MDRV_CPU_ADD(H83044, 44100000/3)
+ MDRV_CPU_ADD_TAG("main", H83044, 44100000/3)
MDRV_CPU_PROGRAM_MAP( bishjan_map, 0 )
MDRV_CPU_VBLANK_INT_HACK(bishjan_interrupt,2)
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index 1eb925630cd..ec3ea69f444 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -338,7 +338,7 @@ static const struct upd7759_interface upd7759_interface =
static MACHINE_DRIVER_START( bladestl )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309, 24000000/2) /* 24MHz/2 (?) */
+ MDRV_CPU_ADD_TAG("main", HD6309, 24000000/2) /* 24MHz/2 (?) */
MDRV_CPU_PROGRAM_MAP(bladestl_readmem,bladestl_writemem)
MDRV_CPU_VBLANK_INT_HACK(bladestl_interrupt,2) /* (1 IRQ + 1 NMI) */
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index 4ea1b1e0ba3..8c5e843cea5 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -252,7 +252,7 @@ static MACHINE_START( blktiger )
static MACHINE_DRIVER_START( blktiger )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_24MHz/4) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_24MHz/4) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(mem_map, 0)
MDRV_CPU_IO_MAP(port_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index f57e9b7144d..65acbc1f5b7 100644
--- a/src/mame/drivers/blmbycar.c
+++ b/src/mame/drivers/blmbycar.c
@@ -383,7 +383,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( blmbycar )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* ? */
MDRV_CPU_PROGRAM_MAP(blmbycar_readmem,blmbycar_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -413,7 +413,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( watrball )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* ? */
MDRV_CPU_PROGRAM_MAP(watrball_readmem,watrball_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c
index 98ff2ab6729..4beb78ae84b 100644
--- a/src/mame/drivers/blockade.c
+++ b/src/mame/drivers/blockade.c
@@ -455,7 +455,7 @@ static PALETTE_INIT( bw )
static MACHINE_DRIVER_START( blockade )
/* basic machine hardware */
- MDRV_CPU_ADD(8080, 2079000)
+ MDRV_CPU_ADD_TAG("main", 8080, 2079000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", blockade_interrupt)
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index 1a0c8b386cf..66ecc9308c8 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -208,7 +208,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( blockhl )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI,3000000) /* Konami custom 052526 */
+ MDRV_CPU_ADD_TAG("main", KONAMI,3000000) /* Konami custom 052526 */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", blockhl_interrupt)
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index a075e585f68..b6cf8c9df7c 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -200,7 +200,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( blockout )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* MRH - 8.76 makes gfx/adpcm samples sync better -- but 10 is correct speed*/
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* MRH - 8.76 makes gfx/adpcm samples sync better -- but 10 is correct speed*/
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(blockout_interrupt,2)
diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c
index d2a127488c3..7ffbffbfc3e 100644
--- a/src/mame/drivers/blstroid.c
+++ b/src/mame/drivers/blstroid.c
@@ -202,7 +202,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( blstroid )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index d423885a4e1..420e5880180 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -272,7 +272,7 @@ static const struct AY8910interface ay8910_interface_2 =
static MACHINE_DRIVER_START( blueprnt )
// basic machine hardware
- MDRV_CPU_ADD(Z80, 7000000/2) // 3.5 MHz
+ MDRV_CPU_ADD_TAG("main", Z80, 7000000/2) // 3.5 MHz
MDRV_CPU_PROGRAM_MAP(blueprnt_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index 6f545989c1a..19ee84cbb58 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -1336,7 +1336,7 @@ static MACHINE_RESET( ms32 )
static MACHINE_DRIVER_START( bnstars )
/* basic machine hardware */
- MDRV_CPU_ADD(V70, 20000000) // 20MHz
+ MDRV_CPU_ADD_TAG("main", V70, 20000000) // 20MHz
MDRV_CPU_PROGRAM_MAP(bnstars_map,0)
MDRV_CPU_VBLANK_INT_HACK(ms32_interrupt,32)
diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c
index ea98f7fdcc2..fc448bb8e5c 100644
--- a/src/mame/drivers/bogeyman.c
+++ b/src/mame/drivers/bogeyman.c
@@ -226,7 +226,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bogeyman )
// basic machine hardware
- MDRV_CPU_ADD(M6502, 2000000) // 12 MHz clock on board
+ MDRV_CPU_ADD_TAG("main", M6502, 2000000) // 12 MHz clock on board
MDRV_CPU_PROGRAM_MAP(bogeyman_map, 0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 16) // Controls sound
diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c
index 7f559b46378..04cdd9bbace 100644
--- a/src/mame/drivers/bombjack.c
+++ b/src/mame/drivers/bombjack.c
@@ -331,7 +331,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bombjack )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index 6be5f7f9629..67be21f9e01 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -301,7 +301,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( boogwing )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000) /* DE102 */
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000) /* DE102 */
MDRV_CPU_PROGRAM_MAP(boogwing_map,0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index 560884c737c..fcacd3d7d6d 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -401,7 +401,7 @@ static const struct K007232_interface k007232_interface_2 =
static MACHINE_DRIVER_START( bottom9 )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 2000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6809, 2000000) /* ? */
MDRV_CPU_PROGRAM_MAP(bottom9_readmem,bottom9_writemem)
MDRV_CPU_VBLANK_INT("main", bottom9_interrupt)
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index f539417eeaf..93b6e7ffe50 100644
--- a/src/mame/drivers/boxer.c
+++ b/src/mame/drivers/boxer.c
@@ -289,7 +289,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START(boxer)
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 12096000 / 16)
+ MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16)
MDRV_CPU_PROGRAM_MAP(boxer_map, 0)
/* video hardware */
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index 1230d75547b..aa706ca7506 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -388,7 +388,7 @@ static const struct YM3526interface ym3526_interface =
static MACHINE_DRIVER_START( brkthru )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
MDRV_CPU_PROGRAM_MAP(brkthru_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
@@ -426,7 +426,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( darwin )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK/8) /* 1.5 MHz ? */
MDRV_CPU_PROGRAM_MAP(darwin_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c
index b3c7a40f919..5f0447da279 100644
--- a/src/mame/drivers/bsktball.c
+++ b/src/mame/drivers/bsktball.c
@@ -209,7 +209,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bsktball )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,750000)
+ MDRV_CPU_ADD_TAG("main", M6502,750000)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT_HACK(bsktball_interrupt,8)
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index ca9cc17c474..b2a43e619eb 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -337,7 +337,7 @@ static const tms34010_config tms_config =
static MACHINE_DRIVER_START( btoads )
- MDRV_CPU_ADD(TMS34020, CPU_CLOCK/2)
+ MDRV_CPU_ADD_TAG("main", TMS34020, CPU_CLOCK/2)
MDRV_CPU_CONFIG(tms_config)
MDRV_CPU_PROGRAM_MAP(main_map,0)
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index b3af20dbe00..cc4f019b8bb 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -688,7 +688,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( tokio )
// basic machine hardware
- MDRV_CPU_ADD(Z80, MAIN_XTAL/4) // 6 MHz
+ MDRV_CPU_ADD_TAG("main", Z80, MAIN_XTAL/4) // 6 MHz
MDRV_CPU_PROGRAM_MAP(tokio_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index 6eae773f233..56b5cdd3651 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -403,7 +403,7 @@ static const struct MSM5232interface msm5232_interface =
static MACHINE_DRIVER_START( buggychl )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index d9eea33580e..5055a492277 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -389,7 +389,7 @@ static MACHINE_RESET( bwing )
static MACHINE_DRIVER_START( bwing )
// basic machine hardware
- MDRV_CPU_ADD(M6809, 2000000)
+ MDRV_CPU_ADD_TAG("main", M6809, 2000000)
MDRV_CPU_PROGRAM_MAP(bwp1_readmem, bwp1_writemem)
MDRV_CPU_VBLANK_INT_HACK(bwp1_interrupt, 3)
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index e6725332db7..65784c1c88f 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -501,7 +501,7 @@ static const struct MSM5205interface msm5205_interface_2 =
static MACHINE_DRIVER_START( cabal )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_20MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_20MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -546,7 +546,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cabalbl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_20MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_20MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(cabalbl_main_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index f0c5f6db38c..01e9e4e8414 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -360,7 +360,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( calorie )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,4000000) /* 4 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,4000000) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(calorie_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c
index 7cce841cc19..20cae3493ab 100644
--- a/src/mame/drivers/canyon.c
+++ b/src/mame/drivers/canyon.c
@@ -235,7 +235,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( canyon )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 12096000 / 16)
+ MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
MDRV_WATCHDOG_VBLANK_INIT(8)
diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c
index 9453c7b382f..cc6f7dfad1c 100644
--- a/src/mame/drivers/cardline.c
+++ b/src/mame/drivers/cardline.c
@@ -194,7 +194,7 @@ static PALETTE_INIT(cardline)
static MACHINE_DRIVER_START( cardline )
/* basic machine hardware */
- MDRV_CPU_ADD(I8051,12000000)
+ MDRV_CPU_ADD_TAG("main", I8051,12000000)
MDRV_CPU_PROGRAM_MAP(mem_prg,0)
MDRV_CPU_DATA_MAP(mem_data,0)
MDRV_CPU_IO_MAP(mem_io,0)
diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c
index f6d380226bb..d1129ed03c0 100644
--- a/src/mame/drivers/carjmbre.c
+++ b/src/mame/drivers/carjmbre.c
@@ -184,7 +184,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( carjmbre )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,18432000/6)
+ MDRV_CPU_ADD_TAG("main", Z80,18432000/6)
MDRV_CPU_PROGRAM_MAP(carjmbre_readmem,carjmbre_writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c
index 73217f68c0a..9bbe9026278 100644
--- a/src/mame/drivers/carpolo.c
+++ b/src/mame/drivers/carpolo.c
@@ -236,7 +236,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( carpolo )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,11289000/12) /* 940.75 kHz */
+ MDRV_CPU_ADD_TAG("main", M6502,11289000/12) /* 940.75 kHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", carpolo_timer_interrupt) /* this not strictly VBLANK,
but it's supposed to happen 60
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 237adc4cdfc..ea75ace30aa 100644
--- a/src/mame/drivers/carrera.c
+++ b/src/mame/drivers/carrera.c
@@ -290,7 +290,7 @@ static PALETTE_INIT(carrera)
static MACHINE_DRIVER_START( carrera )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,MASTER_CLOCK/6)
+ MDRV_CPU_ADD_TAG("main", Z80,MASTER_CLOCK/6)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 73a43fc2d06..4046b0c4da6 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -2000,7 +2000,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( dfeveron )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(dfeveron_readmem,dfeveron_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
@@ -2039,7 +2039,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ddonpach )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(ddonpach_readmem,ddonpach_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
@@ -2078,7 +2078,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( donpachi )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(donpachi_readmem,donpachi_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
@@ -2122,7 +2122,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( esprade )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(esprade_readmem,esprade_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
@@ -2161,7 +2161,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gaia )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(gaia_readmem,gaia_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
@@ -2199,7 +2199,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( guwange )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(guwange_readmem,guwange_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
@@ -2237,7 +2237,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hotdogst )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(hotdogst_readmem,hotdogst_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
@@ -2292,7 +2292,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( korokoro )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(korokoro_readmem,korokoro_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
@@ -2331,7 +2331,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mazinger )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(mazinger_readmem,mazinger_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
@@ -2388,7 +2388,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( metmqstr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,32000000 / 2)
+ MDRV_CPU_ADD_TAG("main", M68000,32000000 / 2)
MDRV_CPU_PROGRAM_MAP(metmqstr_readmem,metmqstr_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
@@ -2446,7 +2446,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pwrinst2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(pwrinst2_readmem,pwrinst2_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
@@ -2506,7 +2506,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sailormn )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(sailormn_readmem,sailormn_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
@@ -2561,7 +2561,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( uopoko )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(uopoko_readmem,uopoko_writemem)
MDRV_CPU_VBLANK_INT("main", cave_interrupt)
diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c
index b38da32b16c..63c1828d97a 100644
--- a/src/mame/drivers/cball.c
+++ b/src/mame/drivers/cball.c
@@ -200,7 +200,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( cball )
/* basic machine hardware */
- MDRV_CPU_ADD(M6800, 12096000 / 16) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6800, 12096000 / 16) /* ? */
MDRV_CPU_PROGRAM_MAP(cpu_map, 0)
MDRV_MACHINE_RESET(cball)
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index 23db718c19e..373bce14edc 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -240,7 +240,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( cbasebal )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000) /* ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* ??? */
MDRV_CPU_PROGRAM_MAP(cbasebal_map,0)
MDRV_CPU_IO_MAP(cbasebal_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* ??? */
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index 3bfa38b374b..6d61407bbc5 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -343,7 +343,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( twocrude )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* Custom chip 59 */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* Custom chip 59 */
MDRV_CPU_PROGRAM_MAP(twocrude_readmem,twocrude_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */
diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c
index e41d79c1d46..5401c5cc34e 100644
--- a/src/mame/drivers/ccastles.c
+++ b/src/mame/drivers/ccastles.c
@@ -467,7 +467,7 @@ static const struct POKEYinterface pokey_interface =
static MACHINE_DRIVER_START( ccastles )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, MASTER_CLOCK/8)
+ MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/8)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_START(ccastles)
diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c
index 7e999c8122d..683c3744448 100644
--- a/src/mame/drivers/cchasm.c
+++ b/src/mame/drivers/cchasm.c
@@ -152,7 +152,7 @@ static MACHINE_DRIVER_START( cchasm )
MDRV_MACHINE_START(cchasm)
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,CCHASM_68K_CLOCK) /* 8 MHz (from schematics) */
+ MDRV_CPU_ADD_TAG("main", M68000,CCHASM_68K_CLOCK) /* 8 MHz (from schematics) */
MDRV_CPU_PROGRAM_MAP(memmap,0)
MDRV_CPU_ADD(Z80,3584229) /* 3.58 MHz (from schematics) */
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index c215dcbabf4..735ae34c798 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -1170,7 +1170,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( swimmer )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(swimmer_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index bb392bff6f3..5621cd76f1c 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -1753,7 +1753,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bullsdrt )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650, 12096000/8)
+ MDRV_CPU_ADD_TAG("main", S2650, 12096000/8)
MDRV_CPU_PROGRAM_MAP(bullsdrt_map,0)
MDRV_CPU_IO_MAP(bullsdrt_port_map,0)
diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c
index 6e06661a279..a5f2ae006ed 100644
--- a/src/mame/drivers/chaknpop.c
+++ b/src/mame/drivers/chaknpop.c
@@ -262,9 +262,9 @@ static MACHINE_DRIVER_START( chaknpop )
/* basic machine hardware */
/* the real board is 3.072MHz, but it is faster for MAME */
- //MDRV_CPU_ADD(Z80, 18432000 / 6) /* 3.072 MHz */
- MDRV_CPU_ADD(Z80, 2350000)
- //MDRV_CPU_ADD(Z80, 2760000)
+ //MDRV_CPU_ADD_TAG("main", Z80, 18432000 / 6) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 2350000)
+ //MDRV_CPU_ADD_TAG("main", Z80, 2760000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index 22b8e116017..3dc06893807 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -611,7 +611,7 @@ static MACHINE_DRIVER_START( talbot )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_18_432MHz/6)
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_18_432MHz/6)
MDRV_CPU_PROGRAM_MAP(talbot_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
@@ -645,7 +645,7 @@ static MACHINE_DRIVER_START( champbas )
/* basic machine hardware */
/* main cpu */
- MDRV_CPU_ADD(Z80, XTAL_18_432MHz/6)
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_18_432MHz/6)
MDRV_CPU_PROGRAM_MAP(champbas_main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
@@ -695,7 +695,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( exctsccr )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4.0 MHz (?) */
MDRV_CPU_PROGRAM_MAP(exctsccr_main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
@@ -751,7 +751,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( exctsccb )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_18_432MHz/6)
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_18_432MHz/6)
MDRV_CPU_PROGRAM_MAP(exctsccb_main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c
index f7c716ad553..16b089e8527 100644
--- a/src/mame/drivers/champbwl.c
+++ b/src/mame/drivers/champbwl.c
@@ -331,7 +331,7 @@ static const struct x1_010_interface champbwl_sound_intf =
static MACHINE_DRIVER_START( champbwl )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 16000000/4) /* 4MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 16000000/4) /* 4MHz */
MDRV_CPU_PROGRAM_MAP(champbwl_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index 98c2a892fdc..151bcd9c34e 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -496,7 +496,7 @@ static INTERRUPT_GEN( chl_interrupt )
static MACHINE_DRIVER_START( changela )
- MDRV_CPU_ADD(Z80,5000000)
+ MDRV_CPU_ADD_TAG("main", Z80,5000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(chl_interrupt,4)
diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c
index bdbc3ef6e9b..85def072405 100644
--- a/src/mame/drivers/cheekyms.c
+++ b/src/mame/drivers/cheekyms.c
@@ -120,7 +120,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( cheekyms )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,5000000/2) /* 2.5 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,5000000/2) /* 2.5 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/cherrym.c b/src/mame/drivers/cherrym.c
index 510208c4df4..a8b6f4fbef6 100644
--- a/src/mame/drivers/cherrym.c
+++ b/src/mame/drivers/cherrym.c
@@ -373,7 +373,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( cmv801 )
// basic machine hardware
- MDRV_CPU_ADD(Z80, 8000000/2) // ???
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000/2) // ???
MDRV_CPU_PROGRAM_MAP(cm_map, 0)
MDRV_CPU_IO_MAP(cm_io_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/cherrym2.c b/src/mame/drivers/cherrym2.c
index de1758da619..a251885e2af 100644
--- a/src/mame/drivers/cherrym2.c
+++ b/src/mame/drivers/cherrym2.c
@@ -353,7 +353,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( cm2v841 )
// basic machine hardware
- MDRV_CPU_ADD(Z80, 8000000/2) // ???
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000/2) // ???
MDRV_CPU_PROGRAM_MAP(cm_map, 0)
MDRV_CPU_IO_MAP(cm_io_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index 471f49f428f..6e9c9c41697 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -494,7 +494,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( chinagat )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309,12000000/2) /* 1.5 MHz (12MHz oscillator ???) */
+ MDRV_CPU_ADD_TAG("main", HD6309,12000000/2) /* 1.5 MHz (12MHz oscillator ???) */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", chinagat_interrupt)
@@ -538,7 +538,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( saiyugb1 )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809,12000000/8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
+ MDRV_CPU_ADD_TAG("main", M6809,12000000/8) /* 68B09EP 1.5 MHz (12MHz oscillator) */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", chinagat_interrupt)
@@ -586,7 +586,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( saiyugb2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809,12000000/8) /* 1.5 MHz (12MHz oscillator) */
+ MDRV_CPU_ADD_TAG("main", M6809,12000000/8) /* 1.5 MHz (12MHz oscillator) */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", chinagat_interrupt)
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index f90bebe5271..f7654544c15 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -461,7 +461,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( chinsan )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,10000000/2) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,10000000/2) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(chinsan_map,0)
MDRV_CPU_IO_MAP(chinsan_io,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index 48b85a13376..11a1ecccf87 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -360,7 +360,7 @@ static const struct K007232_interface k007232_interface_2 =
static MACHINE_DRIVER_START( chqflag )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI,XTAL_24MHz/8) /* 052001 (verified on pcb) */
+ MDRV_CPU_ADD_TAG("main", KONAMI,XTAL_24MHz/8) /* 052001 (verified on pcb) */
MDRV_CPU_PROGRAM_MAP(chqflag_readmem,chqflag_writemem)
MDRV_CPU_VBLANK_INT_HACK(chqflag_interrupt,16) /* ? */
diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c
index 4c0463b365a..d5b3d2e2fe1 100644
--- a/src/mame/drivers/cidelsa.c
+++ b/src/mame/drivers/cidelsa.c
@@ -589,7 +589,7 @@ static MACHINE_DRIVER_START( destryer )
// basic system hardware
- MDRV_CPU_ADD(CDP1802, DESTRYER_CHR1)
+ MDRV_CPU_ADD_TAG("main", CDP1802, DESTRYER_CHR1)
MDRV_CPU_PROGRAM_MAP(destryer_map, 0)
MDRV_CPU_IO_MAP(destryer_io_map, 0)
MDRV_CPU_CONFIG(cidelsa_cdp1802_config)
@@ -615,7 +615,7 @@ static MACHINE_DRIVER_START( destryea )
// basic system hardware
- MDRV_CPU_ADD(CDP1802, DESTRYER_CHR1)
+ MDRV_CPU_ADD_TAG("main", CDP1802, DESTRYER_CHR1)
MDRV_CPU_PROGRAM_MAP(destryea_map, 0)
MDRV_CPU_IO_MAP(destryer_io_map, 0)
MDRV_CPU_CONFIG(cidelsa_cdp1802_config)
@@ -641,7 +641,7 @@ static MACHINE_DRIVER_START( altair )
// basic system hardware
- MDRV_CPU_ADD(CDP1802, ALTAIR_CHR1)
+ MDRV_CPU_ADD_TAG("main", CDP1802, ALTAIR_CHR1)
MDRV_CPU_PROGRAM_MAP(altair_map, 0)
MDRV_CPU_IO_MAP(altair_io_map, 0)
MDRV_CPU_CONFIG(cidelsa_cdp1802_config)
@@ -680,7 +680,7 @@ static MACHINE_DRIVER_START( draco )
// basic system hardware
- MDRV_CPU_ADD(CDP1802, DRACO_CHR1)
+ MDRV_CPU_ADD_TAG("main", CDP1802, DRACO_CHR1)
MDRV_CPU_PROGRAM_MAP(draco_map, 0)
MDRV_CPU_IO_MAP(draco_io_map, 0)
MDRV_CPU_CONFIG(cidelsa_cdp1802_config)
diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c
index 9ab5531e5ab..070c94a9045 100644
--- a/src/mame/drivers/circus.c
+++ b/src/mame/drivers/circus.c
@@ -271,7 +271,7 @@ static INTERRUPT_GEN( ripcord_interrupt )
static MACHINE_DRIVER_START( circus )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,11289000/16) /* 705.562kHz */
+ MDRV_CPU_ADD_TAG("main", M6502,11289000/16) /* 705.562kHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -306,7 +306,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( robotbwl )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,11289000/16) /* 705.562kHz */
+ MDRV_CPU_ADD_TAG("main", M6502,11289000/16) /* 705.562kHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -340,7 +340,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( crash )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,11289000/16) /* 705.562kHz */
+ MDRV_CPU_ADD_TAG("main", M6502,11289000/16) /* 705.562kHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
@@ -374,7 +374,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ripcord )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 705562) /* 11.289MHz / 16 */
+ MDRV_CPU_ADD_TAG("main", M6502, 705562) /* 11.289MHz / 16 */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
//MDRV_CPU_VBLANK_INT("main", ripcord_interrupt) //AT
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index 85bd809904b..5f983439b7a 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -320,7 +320,7 @@ DISCRETE_SOUND_END
static MACHINE_DRIVER_START( circusc )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 2048000) /* 2 MHz */
+ MDRV_CPU_ADD_TAG("main", M6809, 2048000) /* 2 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
MDRV_WATCHDOG_VBLANK_INIT(8)
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index d545a228b2a..ad624fb7b53 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -214,7 +214,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( citycon )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 2048000) /* 2.048 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M6809, 2048000) /* 2.048 MHz ??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c
index 9359f29ff61..0541551a096 100644
--- a/src/mame/drivers/clayshoo.c
+++ b/src/mame/drivers/clayshoo.c
@@ -303,7 +303,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( clayshoo )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,5068000/4) /* 5.068/4 Mhz (divider is a guess) */
+ MDRV_CPU_ADD_TAG("main", Z80,5068000/4) /* 5.068/4 Mhz (divider is a guess) */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index 89759813fd6..5b0b326c521 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -736,7 +736,7 @@ extern const discrete_sound_block cliffhgr_discrete_interface[];
static MACHINE_DRIVER_START( cliffhgr )
- MDRV_CPU_ADD(Z80, 4000000) /* 4MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4MHz */
MDRV_CPU_PROGRAM_MAP(mainmem,0)
MDRV_CPU_IO_MAP(mainport,0)
MDRV_CPU_VBLANK_INT("main", cliff_vsync)
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index f861204b48e..1149a5c944b 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -325,7 +325,7 @@ static const struct POKEYinterface pokey_interface_2 =
static MACHINE_DRIVER_START( cloak )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,1000000) /* 1 MHz ???? */
+ MDRV_CPU_ADD_TAG("main", M6502,1000000) /* 1 MHz ???? */
MDRV_CPU_PROGRAM_MAP(master_map,0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,4)
diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c
index 6076bc564f6..1e85a27edfc 100644
--- a/src/mame/drivers/clshroad.c
+++ b/src/mame/drivers/clshroad.c
@@ -282,7 +282,7 @@ static const struct CustomSound_interface custom_interface =
static MACHINE_DRIVER_START( firebatl )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 3000000) /* ? */
MDRV_CPU_PROGRAM_MAP(clshroad_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ, no NMI */
@@ -319,7 +319,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( clshroad )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/4) /* ? real speed unknown. 3MHz is too low and causes problems */
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/4) /* ? real speed unknown. 3MHz is too low and causes problems */
MDRV_CPU_PROGRAM_MAP(clshroad_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ, no NMI */
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index c075908ee5b..7e090111224 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -779,7 +779,7 @@ static const struct YM2151interface ym2151_interface2 =
static MACHINE_DRIVER_START( cninja )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(cninja_readmem,cninja_writemem)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -828,7 +828,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( stoneage )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(cninja_readmem,cninja_writemem)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -874,7 +874,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( edrandy )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(edrandy_readmem,edrandy_writemem)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -923,7 +923,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( robocop2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(robocop2_readmem,robocop2_writemem)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -952,11 +952,11 @@ static MACHINE_DRIVER_START( robocop2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD("ym", YM2203, 32220000/8)
+ MDRV_SOUND_ADD("ym1", YM2203, 32220000/8)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.60)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.60)
- MDRV_SOUND_ADD("ym", YM2151, 32220000/9)
+ MDRV_SOUND_ADD("ym2", YM2151, 32220000/9)
MDRV_SOUND_CONFIG(ym2151_interface)
MDRV_SOUND_ROUTE(0, "left", 0.45)
MDRV_SOUND_ROUTE(1, "right", 0.45)
@@ -975,7 +975,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mutantf )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(mutantf_readmem,mutantf_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index 655963ad1ee..7307fe29b2e 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -716,7 +716,7 @@ static MACHINE_RESET( zerotrgt )
static MACHINE_DRIVER_START( cntsteer )
- MDRV_CPU_ADD(M6809, 2000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6809, 2000000) /* ? */
MDRV_CPU_PROGRAM_MAP(gekitsui_cpu1_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* ? */
@@ -751,7 +751,7 @@ static MACHINE_DRIVER_START( cntsteer )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( zerotrgt )
- MDRV_CPU_ADD(M6809, 2000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6809, 2000000) /* ? */
MDRV_CPU_PROGRAM_MAP(gekitsui_cpu1_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* ? */
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index d2b69a84357..48580fe58e7 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -668,7 +668,7 @@ static const struct upd7759_interface upd7759_interface =
static MACHINE_DRIVER_START( combasc )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309, 3000000*4) /* 3 MHz? */
+ MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* 3 MHz? */
MDRV_CPU_PROGRAM_MAP(combasc_readmem,combasc_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -711,7 +711,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( combascb )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309, 3000000*4) /* 3 MHz? */
+ MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* 3 MHz? */
MDRV_CPU_PROGRAM_MAP(combascb_readmem,combascb_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/comebaby.c b/src/mame/drivers/comebaby.c
index 935fa790ec1..e2ba266dc83 100644
--- a/src/mame/drivers/comebaby.c
+++ b/src/mame/drivers/comebaby.c
@@ -77,7 +77,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( comebaby )
/* basic machine hardware */
- MDRV_CPU_ADD(PENTIUM, 2000000000) /* Probably a Pentium .. ?? Mhz*/
+ MDRV_CPU_ADD_TAG("main", PENTIUM, 2000000000) /* Probably a Pentium .. ?? Mhz*/
MDRV_CPU_PROGRAM_MAP(comebaby_map, 0)
/* video hardware */
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index af72e1e6f89..646b28b3a26 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -239,7 +239,7 @@ static INTERRUPT_GEN( commando_interrupt )
static MACHINE_DRIVER_START( commando )
// basic machine hardware
- MDRV_CPU_ADD(Z80, PHI_MAIN) // ???
+ MDRV_CPU_ADD_TAG("main", Z80, PHI_MAIN) // ???
MDRV_CPU_PROGRAM_MAP(commando_map, 0)
MDRV_CPU_VBLANK_INT("main", commando_interrupt)
diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c
index 470ffb40a80..859781e8c67 100644
--- a/src/mame/drivers/compgolf.c
+++ b/src/mame/drivers/compgolf.c
@@ -212,7 +212,7 @@ static const struct YM2203interface ym2203_interface =
};
static MACHINE_DRIVER_START( compgolf )
- MDRV_CPU_ADD(M6809, 2000000)
+ MDRV_CPU_ADD_TAG("main", M6809, 2000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index c5b01918bb5..97420298e56 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -246,7 +246,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( contra )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1500000)
+ MDRV_CPU_ADD_TAG("main", M6809, 1500000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index d51f69f92aa..de70a78445a 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -684,7 +684,7 @@ static const tms34010_config tms_config_coolpool =
static MACHINE_DRIVER_START( amerdart )
/* basic machine hardware */
- MDRV_CPU_ADD(TMS34010, 40000000)
+ MDRV_CPU_ADD_TAG("main", TMS34010, 40000000)
MDRV_CPU_CONFIG(tms_config_amerdart)
MDRV_CPU_PROGRAM_MAP(amerdart_map,0)
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index db79145e626..7a4a45436ae 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -414,7 +414,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( cop01 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* ???? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* ???? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -455,7 +455,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mightguy )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* ???? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* ???? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(mightguy_readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c
index 415cee52b56..c83e8cdf480 100644
--- a/src/mame/drivers/copsnrob.c
+++ b/src/mame/drivers/copsnrob.c
@@ -257,7 +257,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( copsnrob )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,14318180/16) /* 894886.25 kHz */
+ MDRV_CPU_ADD_TAG("main", M6502,14318180/16) /* 894886.25 kHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
/* video hardware */
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index cf8ebf57bb7..71834cccef9 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -1047,7 +1047,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cosmicg )
/* basic machine hardware */
- MDRV_CPU_ADD(TMS9980, 1228500)
+ MDRV_CPU_ADD_TAG("main", TMS9980, 1228500)
/* 9.828 MHz Crystal */
/* R Nabet : huh ? This would imply the crystal frequency is somehow divided by 2 before being
fed to the tms9904 or tms9980. Also, I have never heard of a tms9900/9980 operating under
diff --git a/src/mame/drivers/couple.c b/src/mame/drivers/couple.c
index 2038d3e4cbd..9af57fde869 100644
--- a/src/mame/drivers/couple.c
+++ b/src/mame/drivers/couple.c
@@ -434,7 +434,7 @@ static GFXDECODE_START( couple )
GFXDECODE_END
static MACHINE_DRIVER_START( couple )
- MDRV_CPU_ADD(Z80,18432000/6) /* ?? */
+ MDRV_CPU_ADD_TAG("main", Z80,18432000/6) /* ?? */
MDRV_CPU_PROGRAM_MAP(merit_mem,0)
MDRV_CPU_IO_MAP(merit_io,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c
index b03b8c722b2..90362893350 100644
--- a/src/mame/drivers/cowrace.c
+++ b/src/mame/drivers/cowrace.c
@@ -164,7 +164,7 @@ static const struct YM2203interface ym2203_interface_1 =
static MACHINE_DRIVER_START( cowrace )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(mem_map_cowrace,0)
MDRV_CPU_IO_MAP(io_map_cowrace,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 145c53188c4..d12246ff04b 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -1235,7 +1235,7 @@ static const struct m68k_encryption_interface cps2_encryption =
static MACHINE_DRIVER_START( cps2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_CONFIG(cps2_encryption)
MDRV_CPU_PROGRAM_MAP(cps2_readmem,cps2_writemem)
MDRV_CPU_VBLANK_INT_HACK(cps2_interrupt,262) // 262 /* ??? interrupts per frame */
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index a88c111258f..c5038157d10 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -360,7 +360,7 @@ static MACHINE_RESET( crballoon )
static MACHINE_DRIVER_START( crbaloon )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, CRBALOON_MASTER_XTAL / 3)
+ MDRV_CPU_ADD_TAG("main", Z80, CRBALOON_MASTER_XTAL / 3)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index fc124c0971c..3976fbc1937 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -363,7 +363,7 @@ static const struct MSM5205interface msm5205_intf =
static MACHINE_DRIVER_START( crgolf )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,MASTER_CLOCK/3/2)
+ MDRV_CPU_ADD_TAG("main", Z80,MASTER_CLOCK/3/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index 61a2eb702fe..00fa2f1fb67 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -365,7 +365,7 @@ static const struct K007232_interface k007232_interface =
static MACHINE_DRIVER_START( crimfght )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI, 3000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* ? */
MDRV_CPU_PROGRAM_MAP(crimfght_readmem,crimfght_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index cafc897de95..34a0cc7cf60 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -403,7 +403,7 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( crospang )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14318180/2)
+ MDRV_CPU_ADD_TAG("main", M68000, 14318180/2)
MDRV_CPU_PROGRAM_MAP(crospang_readmem,crospang_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -441,7 +441,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bestri )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14318180/2)
+ MDRV_CPU_ADD_TAG("main", M68000, 14318180/2)
MDRV_CPU_PROGRAM_MAP(bestri_readmem,bestri_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index 902ead98c1a..f416cf42e4e 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -622,7 +622,7 @@ static const struct YM2610interface ym2610_interface =
static MACHINE_DRIVER_START( crshrace )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,16000000) /* 16 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000,16000000) /* 16 MHz ??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index ab7c876fc6e..3cfb3a0fbbf 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -804,7 +804,7 @@ static const struct VR0Interface vr0_interface =
static MACHINE_DRIVER_START( crystal )
- MDRV_CPU_ADD(SE3208, 43000000)
+ MDRV_CPU_ADD_TAG("main", SE3208, 43000000)
MDRV_CPU_PROGRAM_MAP(crystal_mem,0)
MDRV_CPU_VBLANK_INT("main", crystal_interrupt)
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index 6ba057d82c2..eeb412d56f1 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -469,7 +469,7 @@ static GFXDECODE_START( cshooter )
GFXDECODE_END
static MACHINE_DRIVER_START( cshooter )
- MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80,XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT_HACK(cshooter_interrupt,2)
@@ -500,7 +500,7 @@ static MACHINE_DRIVER_START( cshooter )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( airraid )
- MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80,XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(arreadmem,arwritemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT_HACK(cshooter_interrupt,2)
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index c51c95a26a8..4ecc8bdc83f 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -227,7 +227,7 @@ static const struct CustomSound_interface amiga_custom_interface =
static MACHINE_DRIVER_START( cd32 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, AMIGA_68EC020_PAL_CLOCK) /* 14.3 Mhz */
+ MDRV_CPU_ADD_TAG("main", M68EC020, AMIGA_68EC020_PAL_CLOCK) /* 14.3 Mhz */
MDRV_CPU_PROGRAM_MAP(cd32_map,0)
MDRV_MACHINE_RESET(amiga)
diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c
index 0989d42ef94..b9f2b43dc7a 100644
--- a/src/mame/drivers/cultures.c
+++ b/src/mame/drivers/cultures.c
@@ -357,7 +357,7 @@ static INTERRUPT_GEN( cultures_interrupt )
static MACHINE_DRIVER_START( cultures )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MCLK/2) /* 8.000 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, MCLK/2) /* 8.000 MHz */
MDRV_CPU_PROGRAM_MAP(cultures_map,0)
MDRV_CPU_IO_MAP(cultures_io_map,0)
MDRV_CPU_VBLANK_INT("main", cultures_interrupt)
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index a5f1dc89ef3..255f3f802bf 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -1012,7 +1012,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( cvs )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650, 894886.25)
+ MDRV_CPU_ADD_TAG("main", S2650, 894886.25)
MDRV_CPU_PROGRAM_MAP(cvs_main_cpu_map,0)
MDRV_CPU_IO_MAP(cvs_main_cpu_io_map,0)
MDRV_CPU_VBLANK_INT("main", cvs_main_cpu_interrupt)
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index e9577c78c6c..489787db1d8 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -433,7 +433,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( cyberbal )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_ADD(M6502, ATARI_CLOCK_14MHz/8)
@@ -492,7 +492,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cyberb2p )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(cyberb2p_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index 8507ef98433..c9e7a9bfd20 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -563,7 +563,7 @@ static const struct Y8950interface y8950_interface = {
};
static MACHINE_DRIVER_START( cybertnk )
- MDRV_CPU_ADD(M68000,20000000/2)
+ MDRV_CPU_ADD_TAG("main", M68000,20000000/2)
MDRV_CPU_PROGRAM_MAP(master_mem,0)
MDRV_CPU_VBLANK_INT_HACK(master_irq,2)
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index 96013646825..deda89b6530 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -401,7 +401,7 @@ static struct MSM5205interface msm_interface =
static MACHINE_DRIVER_START( dacholer )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* ? */
MDRV_CPU_PROGRAM_MAP(main_map, 0)
MDRV_CPU_IO_MAP(main_io_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 8c38b185490..a6fc387b60c 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -836,7 +836,7 @@ static const struct YM2203interface ym2203_interface_2 =
static MACHINE_DRIVER_START( darius )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,16000000/2) /* 8 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M68000,16000000/2) /* 8 MHz ? */
MDRV_CPU_PROGRAM_MAP(darius_readmem,darius_writemem)
MDRV_CPU_VBLANK_INT("left", irq4_line_hold)
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 6c15ae0bcb0..66ec8a5409f 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -593,7 +593,7 @@ static INTERRUPT_GEN( darkhors )
}
static MACHINE_DRIVER_START( darkhors )
- MDRV_CPU_ADD(M68EC020, 12000000) // 36MHz/3 ??
+ MDRV_CPU_ADD_TAG("main", M68EC020, 12000000) // 36MHz/3 ??
MDRV_CPU_PROGRAM_MAP(darkhors_readmem,darkhors_writemem)
MDRV_CPU_VBLANK_INT_HACK(darkhors,3)
diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c
index 13b497f7481..2bd3cfb66f2 100644
--- a/src/mame/drivers/darkmist.c
+++ b/src/mame/drivers/darkmist.c
@@ -247,7 +247,7 @@ static INTERRUPT_GEN( darkmist_interrupt )
static MACHINE_DRIVER_START( darkmist )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,4000000) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,4000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(memmap, 0)
MDRV_CPU_VBLANK_INT_HACK(darkmist_interrupt,2)
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index 2f241b03200..906cf1961ec 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -286,7 +286,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( darkseal )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,12000000) /* Custom chip 59 */
+ MDRV_CPU_ADD_TAG("main", M68000,12000000) /* Custom chip 59 */
MDRV_CPU_PROGRAM_MAP(darkseal_readmem,darkseal_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index b8d7164c884..b85d7f38ebb 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -553,7 +553,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( dassault )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000) /* Accurate */
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000) /* Accurate */
MDRV_CPU_PROGRAM_MAP(dassault_readmem,dassault_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index d470c62b284..e229d38485e 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -538,7 +538,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( dblewing )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000) /* DE102 */
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000) /* DE102 */
MDRV_CPU_PROGRAM_MAP(dblewing_map,0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 1ea7a9dcbec..90c02100bb0 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -437,7 +437,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( dbz )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(dbz_readmem,dbz_writemem)
MDRV_CPU_VBLANK_INT_HACK(dbz_interrupt,2)
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index 46e921115ee..703ffaae7ea 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -396,7 +396,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( dcheese )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, MAIN_OSC)
+ MDRV_CPU_ADD_TAG("main", M68000, MAIN_OSC)
MDRV_CPU_PROGRAM_MAP(main_cpu_map,0)
MDRV_CPU_VBLANK_INT("main", dcheese_vblank)
diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c
index ca9446f7a7d..d20695c40e3 100644
--- a/src/mame/drivers/dcon.c
+++ b/src/mame/drivers/dcon.c
@@ -275,7 +275,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( dcon )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -304,7 +304,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sdgndmps )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c
index 30da11307f5..62ef45d330f 100644
--- a/src/mame/drivers/dday.c
+++ b/src/mame/drivers/dday.c
@@ -258,7 +258,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( dday )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 2000000) /* 2 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 2000000) /* 2 MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
/* video hardware */
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index cb331ab3038..45ccb974eb4 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -401,7 +401,7 @@ static INTERRUPT_GEN( ddayjlc_snd_interrupt )
}
static MACHINE_DRIVER_START( ddayjlc )
- MDRV_CPU_ADD(Z80,12000000/3)
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/3)
MDRV_CPU_PROGRAM_MAP(main_cpu,0)
MDRV_CPU_VBLANK_INT("main", ddayjlc_interrupt)
diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c
index 4cbe233b0f0..5e9c1a2d75a 100644
--- a/src/mame/drivers/ddrible.c
+++ b/src/mame/drivers/ddrible.c
@@ -347,7 +347,7 @@ static const struct VLM5030interface vlm5030_interface =
static MACHINE_DRIVER_START( ddribble )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M6809, XTAL_18_432MHz/12) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem_cpu0,writemem_cpu0)
MDRV_CPU_VBLANK_INT("main", ddrible_interrupt_0)
diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c
index cb8fe8b50a8..fa24da779b3 100644
--- a/src/mame/drivers/ddz.c
+++ b/src/mame/drivers/ddz.c
@@ -52,7 +52,7 @@ static const struct VR0Interface vr0_interface =
static MACHINE_DRIVER_START( ddz )
- MDRV_CPU_ADD(SE3208, 43000000)
+ MDRV_CPU_ADD_TAG("main", SE3208, 43000000)
MDRV_CPU_PROGRAM_MAP(ddz_mem,0)
MDRV_CPU_VBLANK_INT("main", ddz_interrupt)
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index 2897bfb558b..b42839ecd0f 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -279,7 +279,7 @@ static INTERRUPT_GEN( deadang_interrupt )
static MACHINE_DRIVER_START( deadang )
/* basic machine hardware */
- MDRV_CPU_ADD(V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
+ MDRV_CPU_ADD_TAG("main", V30,XTAL_16MHz/2) /* Sony 8623h9 CXQ70116D-8 (V30 compatible) */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT_HACK(deadang_interrupt,2)
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 696643f0312..9c174c87090 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -927,7 +927,7 @@ static const struct YM3812interface ym3812b_interface =
static MACHINE_DRIVER_START( hbarrel )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */
@@ -970,7 +970,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( baddudes )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */
@@ -1013,7 +1013,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( birdtry )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL, level 5 interrupts from i8751 */
@@ -1056,7 +1056,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( robocop )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */
@@ -1104,7 +1104,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( robocopb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */
@@ -1147,7 +1147,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hippodrm )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(dec0_readmem,dec0_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */
@@ -1195,7 +1195,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( slyspy )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
MDRV_CPU_PROGRAM_MAP(slyspy_readmem,slyspy_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */
@@ -1238,7 +1238,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( midres )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */
MDRV_CPU_PROGRAM_MAP(midres_readmem,midres_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index b9f12718f50..e51fcf5fd84 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -2084,7 +2084,7 @@ static INTERRUPT_GEN( oscar_interrupt )
static MACHINE_DRIVER_START( cobracom )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 2000000)
+ MDRV_CPU_ADD_TAG("main", M6809, 2000000)
MDRV_CPU_PROGRAM_MAP(cobra_readmem,cobra_writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
@@ -2126,7 +2126,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ghostb )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309, 3000000*4)
+ MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4)
MDRV_CPU_PROGRAM_MAP(ghostb_readmem,ghostb_writemem)
MDRV_CPU_VBLANK_INT("main", ghostb_interrupt)
@@ -2170,7 +2170,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( srdarwin )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809,2000000) /* MC68A09EP */
+ MDRV_CPU_ADD_TAG("main", M6809,2000000) /* MC68A09EP */
MDRV_CPU_PROGRAM_MAP(srdarwin_readmem,srdarwin_writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
@@ -2212,7 +2212,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gondo )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309,3000000*4) /* HD63C09EP */
+ MDRV_CPU_ADD_TAG("main", HD6309,3000000*4) /* HD63C09EP */
MDRV_CPU_PROGRAM_MAP(gondo_readmem,gondo_writemem)
MDRV_CPU_VBLANK_INT("main", gondo_interrupt)
@@ -2255,7 +2255,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( oscar )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309, XTAL_12MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", HD6309, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(oscar_readmem,oscar_writemem)
MDRV_CPU_VBLANK_INT("main", oscar_interrupt)
@@ -2301,7 +2301,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( lastmiss )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 2000000)
+ MDRV_CPU_ADD_TAG("main", M6809, 2000000)
MDRV_CPU_PROGRAM_MAP(lastmiss_readmem,lastmiss_writemem)
MDRV_CPU_ADD(M6809, 2000000)
@@ -2346,7 +2346,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( shackled )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 2000000)
+ MDRV_CPU_ADD_TAG("main", M6809, 2000000)
MDRV_CPU_PROGRAM_MAP(shackled_readmem,shackled_writemem)
MDRV_CPU_ADD(M6809, 2000000)
@@ -2391,7 +2391,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( csilver )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, XTAL_12MHz/8) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M6809, XTAL_12MHz/8) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(csilver_readmem,csilver_writemem)
MDRV_CPU_ADD(M6809, XTAL_12MHz/8) /* verified on pcb */
@@ -2441,7 +2441,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( garyoret )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309,3000000*4) /* HD63C09EP */
+ MDRV_CPU_ADD_TAG("main", HD6309,3000000*4) /* HD63C09EP */
MDRV_CPU_PROGRAM_MAP(garyoret_readmem,garyoret_writemem)
MDRV_CPU_VBLANK_INT("main", gondo_interrupt)
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 7d1fcfce429..28e395bc489 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -421,7 +421,7 @@ static INTERRUPT_GEN( deco32_vbl_interrupt )
static MACHINE_DRIVER_START( hvysmsh )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM, 28000000) /* Unconfirmed */
+ MDRV_CPU_ADD_TAG("main", ARM, 28000000) /* Unconfirmed */
MDRV_CPU_PROGRAM_MAP(hvysmsh_map,0)
MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt)
@@ -460,7 +460,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( wcvol95 )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM, 28000000) /* Unconfirmed */
+ MDRV_CPU_ADD_TAG("main", ARM, 28000000) /* Unconfirmed */
MDRV_CPU_PROGRAM_MAP(wcvol95_map,0)
MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt)
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 7b5dda18187..caace6ff2d0 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -1872,7 +1872,7 @@ static INTERRUPT_GEN( tattass_snd_interrupt )
static MACHINE_DRIVER_START( captaven )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM, 28000000/4)
+ MDRV_CPU_ADD_TAG("main", ARM, 28000000/4)
MDRV_CPU_PROGRAM_MAP(captaven_readmem,captaven_writemem)
MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt)
@@ -1920,7 +1920,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fghthist )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM, 28000000/4)
+ MDRV_CPU_ADD_TAG("main", ARM, 28000000/4)
MDRV_CPU_PROGRAM_MAP(fghthist_readmem,fghthist_writemem)
MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt)
@@ -1967,7 +1967,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fghthsta )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM, 28000000/4)
+ MDRV_CPU_ADD_TAG("main", ARM, 28000000/4)
MDRV_CPU_PROGRAM_MAP(fghthsta_memmap,0)
MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt)
@@ -2013,7 +2013,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( dragngun )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM, 28000000/4)
+ MDRV_CPU_ADD_TAG("main", ARM, 28000000/4)
MDRV_CPU_PROGRAM_MAP(dragngun_readmem,dragngun_writemem)
MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt)
@@ -2067,7 +2067,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( lockload )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM, 28000000/4)
+ MDRV_CPU_ADD_TAG("main", ARM, 28000000/4)
MDRV_CPU_PROGRAM_MAP(lockload_readmem,lockload_writemem)
MDRV_CPU_VBLANK_INT_HACK(deco32_vbl_interrupt,2) // From 2
@@ -2121,7 +2121,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tattass )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM, 28000000/4) /* Unconfirmed */
+ MDRV_CPU_ADD_TAG("main", ARM, 28000000/4) /* Unconfirmed */
MDRV_CPU_PROGRAM_MAP(tattass_readmem,tattass_writemem)
MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt)
@@ -2159,7 +2159,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( nslasher )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM, 28322000/4)
+ MDRV_CPU_ADD_TAG("main", ARM, 28322000/4)
MDRV_CPU_PROGRAM_MAP(nslasher_readmem,nslasher_writemem)
MDRV_CPU_VBLANK_INT("main", deco32_vbl_interrupt)
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index e542b719ada..41f1ee502ce 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -432,7 +432,7 @@ static const struct YMZ280Binterface ymz280b_intf =
static MACHINE_DRIVER_START( avengrgs )
/* basic machine hardware */
- MDRV_CPU_ADD(SH2,42000000/2) /* 21 MHz clock confirmed on real board */
+ MDRV_CPU_ADD_TAG("main", SH2,42000000/2) /* 21 MHz clock confirmed on real board */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_MACHINE_RESET(mlc)
@@ -464,7 +464,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mlc )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */
+ MDRV_CPU_ADD_TAG("main", ARM,42000000/6) /* 42 MHz -> 7MHz clock confirmed on real board */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_MACHINE_RESET(mlc)
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index 967743bc5be..39594b0f8a5 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -383,7 +383,7 @@ static PALETTE_INIT( decocass )
static MACHINE_DRIVER_START( decocass )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,750000)
+ MDRV_CPU_ADD_TAG("main", M6502,750000)
MDRV_CPU_PROGRAM_MAP(decocass_map,0)
MDRV_CPU_ADD(M6502,500000) /* 500 kHz */
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index 44e25169550..327556b2e80 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -321,7 +321,7 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( deniam16b )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,25000000/2) /* ??? */
+ MDRV_CPU_ADD_TAG("main", M68000,25000000/2) /* ??? */
MDRV_CPU_PROGRAM_MAP(deniam16b_readmem,deniam16b_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -360,7 +360,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( deniam16c )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,25000000/2) /* ??? */
+ MDRV_CPU_ADD_TAG("main", M68000,25000000/2) /* ??? */
MDRV_CPU_PROGRAM_MAP(deniam16c_readmem,deniam16c_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index d62c237973e..9c0056a14e1 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -339,7 +339,7 @@ static PALETTE_INIT( destroyr )
static MACHINE_DRIVER_START( destroyr )
/* basic machine hardware */
- MDRV_CPU_ADD(M6800, 12096000 / 16)
+ MDRV_CPU_ADD_TAG("main", M6800, 12096000 / 16)
MDRV_CPU_PROGRAM_MAP(destroyr_map, 0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_assert, 4)
diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c
index 201c6e4998e..1838bc923f4 100644
--- a/src/mame/drivers/dgpix.c
+++ b/src/mame/drivers/dgpix.c
@@ -296,7 +296,7 @@ static VIDEO_UPDATE( dgpix )
}
static MACHINE_DRIVER_START( dgpix )
- MDRV_CPU_ADD(E132XT, 20000000*4) /* 4x internal multiplier */
+ MDRV_CPU_ADD_TAG("main", E132XT, 20000000*4) /* 4x internal multiplier */
MDRV_CPU_PROGRAM_MAP(cpu_map,0)
MDRV_CPU_IO_MAP(io_map,0)
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index d13375b2d1c..731114950db 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -194,7 +194,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( dietgo )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_28MHz/2) /* DE102 (verified on pcb) */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_28MHz/2) /* DE102 (verified on pcb) */
MDRV_CPU_PROGRAM_MAP(dietgo_map,0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index bc433eb77fd..8abaaba05de 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -474,7 +474,7 @@ static const struct MSM5205interface discoboy_msm5205_interface =
static MACHINE_DRIVER_START( discoboy )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz? */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index dc1bb68195a..04c8ac79f7f 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -192,7 +192,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( diverboy )
- MDRV_CPU_ADD(M68000, 12000000) /* guess */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* guess */
MDRV_CPU_PROGRAM_MAP(diverboy_readmem,diverboy_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index 6cdb3232917..9071e2bd957 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -826,7 +826,7 @@ static INTERRUPT_GEN( djboy_interrupt )
}
static MACHINE_DRIVER_START( djboy )
- MDRV_CPU_ADD(Z80,6000000)
+ MDRV_CPU_ADD_TAG("main", Z80,6000000)
MDRV_CPU_PROGRAM_MAP(cpu0_am,0)
MDRV_CPU_IO_MAP(cpu0_port_am,0)
MDRV_CPU_VBLANK_INT_HACK(djboy_interrupt,2)
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index dc5a46f20f1..b2f7bd6aedb 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -1226,8 +1226,8 @@ static MACHINE_DRIVER_START( djmain )
/* basic machine hardware */
// popn3 works 9.6 MHz or slower in some songs */
- //MDRV_CPU_ADD(M68EC020, 18432000/2) /* 9.216 MHz!? */
- MDRV_CPU_ADD(M68EC020, 32000000/4) /* 8.000 MHz!? */
+ //MDRV_CPU_ADD_TAG("main", M68EC020, 18432000/2) /* 9.216 MHz!? */
+ MDRV_CPU_ADD_TAG("main", M68EC020, 32000000/4) /* 8.000 MHz!? */
MDRV_CPU_PROGRAM_MAP(memory_map, 0)
MDRV_CPU_VBLANK_INT("main", vb_interrupt)
diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c
index a816edc60f8..84b6e2e61fb 100644
--- a/src/mame/drivers/dmndrby.c
+++ b/src/mame/drivers/dmndrby.c
@@ -175,7 +175,7 @@ static INTERRUPT_GEN( dderby_interrupt )
static MACHINE_DRIVER_START( dderby )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(memmap,0)
MDRV_CPU_VBLANK_INT("main", dderby_interrupt)
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 6957be1d78c..c613e427117 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -241,7 +241,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( dogfgt )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 1500000) /* 1.5 MHz ???? */
+ MDRV_CPU_ADD_TAG("main", M6502, 1500000) /* 1.5 MHz ???? */
MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,16) /* ? controls music tempo */
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index 7dafa63e3af..3e1fb0ba7ee 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -255,7 +255,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( dominob )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000/2)
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2)
MDRV_CPU_PROGRAM_MAP(memmap, 0)
MDRV_CPU_IO_MAP(portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index 1647bdcec53..ebb0924d8a4 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -981,7 +981,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( lastday )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 8000000) /* ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ??? */
MDRV_CPU_PROGRAM_MAP(lastday_readmem,lastday_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1015,7 +1015,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gulfstrm )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 8000000) /* ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ??? */
MDRV_CPU_PROGRAM_MAP(gulfstrm_readmem,pollux_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1049,7 +1049,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pollux )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 8000000) /* ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ??? */
MDRV_CPU_PROGRAM_MAP(pollux_readmem,pollux_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1083,7 +1083,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bluehawk )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 8000000) /* ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ??? */
MDRV_CPU_PROGRAM_MAP(bluehawk_readmem,bluehawk_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1117,7 +1117,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( flytiger )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 8000000) /* ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ??? */
MDRV_CPU_PROGRAM_MAP(flytiger_readmem,flytiger_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1151,7 +1151,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( primella )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 8000000) /* ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* ??? */
MDRV_CPU_PROGRAM_MAP(primella_readmem,primella_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1191,7 +1191,7 @@ static INTERRUPT_GEN( rshark_interrupt )
static MACHINE_DRIVER_START( rshark )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* measured on super-x */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* measured on super-x */
MDRV_CPU_PROGRAM_MAP(rshark_readmem,rshark_writemem)
MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */
@@ -1223,7 +1223,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( superx ) // dif mem map
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* measured on super-x */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* measured on super-x */
MDRV_CPU_PROGRAM_MAP(superx_readmem,superx_writemem)
MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */
@@ -1255,7 +1255,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( popbingo )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(popbingo_readmem,popbingo_writemem)
MDRV_CPU_VBLANK_INT_HACK(rshark_interrupt,2) /* 5 and 6 */
diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c
index e6d8f85550b..bb8e38c76d0 100644
--- a/src/mame/drivers/dorachan.c
+++ b/src/mame/drivers/dorachan.c
@@ -211,7 +211,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( dorachan )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 2000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 2000000)
MDRV_CPU_PROGRAM_MAP(dorachan_map,0)
MDRV_CPU_IO_MAP(dorachan_io_map,0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c
index 7299d65c337..2bff3b09e0c 100644
--- a/src/mame/drivers/dotrikun.c
+++ b/src/mame/drivers/dotrikun.c
@@ -65,7 +65,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( dotrikun )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c
index 4ec96791b2e..514835f48a0 100644
--- a/src/mame/drivers/dragrace.c
+++ b/src/mame/drivers/dragrace.c
@@ -328,7 +328,7 @@ static PALETTE_INIT( dragrace )
static MACHINE_DRIVER_START( dragrace )
/* basic machine hardware */
- MDRV_CPU_ADD(M6800, 12096000 / 12)
+ MDRV_CPU_ADD_TAG("main", M6800, 12096000 / 12)
MDRV_CPU_PROGRAM_MAP(dragrace_readmem, dragrace_writemem)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
MDRV_WATCHDOG_VBLANK_INIT(8)
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index 07a8225af44..efba57e13f4 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -445,7 +445,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( dreamwld )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, MASTER_CLOCK/2)
+ MDRV_CPU_ADD_TAG("main", M68EC020, MASTER_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(dreamwld_map, 0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold) // 4, 5, or 6, all point to the same place
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index 91127495f5b..a08b93ef026 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -358,7 +358,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( drgnmst )
- MDRV_CPU_ADD(M68000, 12000000) /* Confirmed */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* Confirmed */
MDRV_CPU_PROGRAM_MAP(drgnmst_main_map, 0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c
index 34e5094d280..0f8941ed69e 100644
--- a/src/mame/drivers/dribling.c
+++ b/src/mame/drivers/dribling.c
@@ -301,7 +301,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( dribling )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 5000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 5000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", dribling_irq_gen)
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index 6efda2c145a..7f370fcf7ea 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -229,7 +229,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( drmicro )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,MCLK/6) /* 3.072MHz? */
+ MDRV_CPU_ADD_TAG("main", Z80,MCLK/6) /* 3.072MHz? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", drmicro_interrupt)
diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c
index e60871cb2aa..8e53bedd6d9 100644
--- a/src/mame/drivers/drtomy.c
+++ b/src/mame/drivers/drtomy.c
@@ -250,7 +250,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( drtomy )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(drtomy_map,0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index f7ef2419de6..40c0b54596f 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -674,7 +674,7 @@ static const struct AY8910interface dunhuang_ay8910_interface =
static MACHINE_DRIVER_START( dunhuang )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2)
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2)
MDRV_CPU_PROGRAM_MAP(dunhuang_map,0)
MDRV_CPU_IO_MAP(dunhuang_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index 22dd18cfc48..e82b64e367f 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -689,7 +689,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( dwarfd )
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
- MDRV_CPU_ADD(8085A, 10595000/3*2) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", 8085A, 10595000/3*2) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(mem_map, 0)
MDRV_CPU_IO_MAP(io_map, 0)
diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c
index d6753b94863..c423cc26299 100644
--- a/src/mame/drivers/dynadice.c
+++ b/src/mame/drivers/dynadice.c
@@ -196,7 +196,7 @@ static PALETTE_INIT( dynadice )
}
static MACHINE_DRIVER_START( dynadice )
- MDRV_CPU_ADD(8080,18432000/8)
+ MDRV_CPU_ADD_TAG("main", 8080,18432000/8)
MDRV_CPU_PROGRAM_MAP(dynadice_map,0)
MDRV_CPU_IO_MAP(dynadice_io_map,0)
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 31e3423aae5..1b7dc5685f2 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -3741,7 +3741,7 @@ static const struct YM2203interface sprtmtch_ym2203_interface =
static MACHINE_DRIVER_START( sprtmtch )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,22000000 / 4) /* 5.5MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,22000000 / 4) /* 5.5MHz */
MDRV_CPU_PROGRAM_MAP(sprtmtch_mem_map,0)
MDRV_CPU_IO_MAP(sprtmtch_io_map,0)
MDRV_CPU_VBLANK_INT("main", sprtmtch_vblank_interrupt) /* IM 0 needs an opcode on the data bus */
diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c
index 285c3192513..dfe7906daa9 100644
--- a/src/mame/drivers/dynduke.c
+++ b/src/mame/drivers/dynduke.c
@@ -272,7 +272,7 @@ static MACHINE_DRIVER_START( dynduke )
MDRV_CPU_PROGRAM_MAP(master_map, 0)
MDRV_CPU_VBLANK_INT("main", dynduke_interrupt)
- MDRV_CPU_ADD(V30, 16000000/2) // NEC V30-8 CPU
+ MDRV_CPU_ADD_TAG("slave", V30, 16000000/2) // NEC V30-8 CPU
MDRV_CPU_PROGRAM_MAP(slave_map, 0)
MDRV_CPU_VBLANK_INT("main", dynduke_interrupt)
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index 95c8b5dd267..d55bd7275cf 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -385,7 +385,7 @@ static MACHINE_RESET( egghunt )
static MACHINE_DRIVER_START( egghunt )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz ?*/
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz ?*/
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) // or 2 like mitchell.c?
diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c
index e337ec16917..5c3506f9e55 100644
--- a/src/mame/drivers/embargo.c
+++ b/src/mame/drivers/embargo.c
@@ -230,7 +230,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( embargo )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650, 625000)
+ MDRV_CPU_ADD_TAG("main", S2650, 625000)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_io_map,0)
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index 830982a0b21..695aa52c91d 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -164,7 +164,7 @@ static PALETTE_INIT( eolith16 )
static MACHINE_DRIVER_START( eolith16 )
- MDRV_CPU_ADD(E116T, 60000000) /* no internal multiplier */
+ MDRV_CPU_ADD_TAG("main", E116T, 60000000) /* no internal multiplier */
MDRV_CPU_PROGRAM_MAP(eolith16_map,0)
MDRV_CPU_VBLANK_INT_HACK(eolith_speedup,262)
diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c
index 319b6cb6068..146b30f542d 100644
--- a/src/mame/drivers/epos.c
+++ b/src/mame/drivers/epos.c
@@ -358,7 +358,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( epos )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 11000000/4) /* 2.75 MHz (see notes) */
+ MDRV_CPU_ADD_TAG("main", Z80, 11000000/4) /* 2.75 MHz (see notes) */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -382,7 +382,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( dealer )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 11000000/4) /* 2.75 MHz (see notes) */
+ MDRV_CPU_ADD_TAG("main", Z80, 11000000/4) /* 2.75 MHz (see notes) */
MDRV_CPU_PROGRAM_MAP(dealer_readmem,dealer_writemem)
MDRV_CPU_IO_MAP(dealer_readport,dealer_writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index a159f70a843..9f36b17bc43 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -413,7 +413,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( eprom )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
@@ -447,7 +447,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( klaxp )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index 7e71c1841a3..3a00ff77ca7 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -1153,7 +1153,7 @@ static const struct Samplesinterface alphamc07_samples_interface =
// the sound board is the same in all games
static MACHINE_DRIVER_START( common_sound )
- MDRV_CPU_ADD(8085A, XTAL_6_144MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("audio", 8085A, XTAL_6_144MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_CPU_IO_MAP(sound_portmap,0)
@@ -1196,7 +1196,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( equites )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_12MHz/4) /* 68000P8 running at 3mhz! verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz/4) /* 68000P8 running at 3mhz! verified on pcb */
MDRV_CPU_PROGRAM_MAP(equites_map,0)
MDRV_CPU_VBLANK_INT_HACK(equites_interrupt, 2)
@@ -1234,7 +1234,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( splndrbt )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_24MHz/4) /* 68000P8 running at 6mhz, verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/4) /* 68000P8 running at 6mhz, verified on pcb */
MDRV_CPU_PROGRAM_MAP(splndrbt_map, 0)
MDRV_CPU_VBLANK_INT_HACK(equites_interrupt, 2)
diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c
index ddb37bd8a59..f6e9215defe 100644
--- a/src/mame/drivers/ertictac.c
+++ b/src/mame/drivers/ertictac.c
@@ -381,7 +381,7 @@ static VIDEO_UPDATE( ertictac )
static MACHINE_DRIVER_START( ertictac )
- MDRV_CPU_ADD(ARM, 16000000) /* guess */
+ MDRV_CPU_ADD_TAG("main", ARM, 16000000) /* guess */
MDRV_CPU_PROGRAM_MAP(ertictac_map,0)
MDRV_CPU_VBLANK_INT("main", ertictac_interrupt)
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index 383e27f5720..b61ddc54079 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -282,7 +282,7 @@ static INTERRUPT_GEN( vblank_callback_esh )
/* DRIVER */
static MACHINE_DRIVER_START( esh )
/* main cpu */
- MDRV_CPU_ADD(Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */
+ MDRV_CPU_ADD_TAG("main", Z80, PCB_CLOCK/6) /* The denominator is a Daphne guess based on PacMan's hardware */
MDRV_CPU_PROGRAM_MAP(z80_0_mem,0)
MDRV_CPU_IO_MAP(z80_0_io,0)
MDRV_CPU_VBLANK_INT("main", vblank_callback_esh)
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index 4ec04b8ce97..4a4e5219b85 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -237,7 +237,7 @@ static INTERRUPT_GEN( ettrivia_interrupt )
}
static MACHINE_DRIVER_START( ettrivia )
- MDRV_CPU_ADD(Z80,12000000/4-48000) //should be ok, it gives the 300 interrupts expected
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/4-48000) //should be ok, it gives the 300 interrupts expected
MDRV_CPU_PROGRAM_MAP(cpu_map,0)
MDRV_CPU_IO_MAP(io_map,0)
MDRV_CPU_VBLANK_INT("main", ettrivia_interrupt)
diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c
index 4cf90c22fce..8c32d3971e0 100644
--- a/src/mame/drivers/exedexes.c
+++ b/src/mame/drivers/exedexes.c
@@ -223,7 +223,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( exedexes )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(exedexes_interrupt,2)
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index 9395c2458ff..ff3a7520c48 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -278,7 +278,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( exerion )
- MDRV_CPU_ADD(Z80, EXERION_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", Z80, EXERION_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_ADD(Z80, EXERION_CPU_CLOCK)
diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c
index 194232051e9..d9d89676224 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -998,7 +998,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( exidy440 )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, MAIN_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", M6809, MAIN_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(exidy440_map,0)
MDRV_CPU_VBLANK_INT("main", exidy440_vblank_interrupt)
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index 5bdeee1f82d..e3971c06460 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -302,7 +302,7 @@ static INTERRUPT_GEN( exprraid_interrupt )
static MACHINE_DRIVER_START( exprraid )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 4000000) /* 4 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M6502, 4000000) /* 4 MHz ??? */
MDRV_CPU_PROGRAM_MAP(master_map, 0)
MDRV_CPU_VBLANK_INT("main", exprraid_interrupt)
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index 4af0052e481..e3c4d442c62 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -475,7 +475,7 @@ static const tms34010_config slave_config =
static MACHINE_DRIVER_START( exterm )
/* basic machine hardware */
- MDRV_CPU_ADD(TMS34010, 40000000)
+ MDRV_CPU_ADD_TAG("main", TMS34010, 40000000)
MDRV_CPU_CONFIG(master_config)
MDRV_CPU_PROGRAM_MAP(master_map,0)
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index 9e83bcbfb4f..b3aff04d44a 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -325,7 +325,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( exzisus )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 MHz ??? */
MDRV_CPU_PROGRAM_MAP(cpua_readmem,cpua_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index 543a11a3a08..b9c412c43d9 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -808,7 +808,7 @@ static INTERRUPT_GEN( fantland_sound_irq )
static MACHINE_DRIVER_START( fantland )
/* basic machine hardware */
- MDRV_CPU_ADD(I8086, 8000000) // ?
+ MDRV_CPU_ADD_TAG("main", I8086, 8000000) // ?
MDRV_CPU_PROGRAM_MAP(fantland_map, 0)
MDRV_CPU_VBLANK_INT("main", fantland_irq)
@@ -860,7 +860,7 @@ static const struct YM2151interface galaxygn_ym2151_interface =
static MACHINE_DRIVER_START( galaxygn )
/* basic machine hardware */
- MDRV_CPU_ADD(I8088, 8000000) // ?
+ MDRV_CPU_ADD_TAG("main", I8088, 8000000) // ?
MDRV_CPU_PROGRAM_MAP(galaxygn_map, 0)
MDRV_CPU_VBLANK_INT("main", fantland_irq)
@@ -914,7 +914,7 @@ static MACHINE_RESET( borntofi )
static MACHINE_DRIVER_START( borntofi )
/* basic machine hardware */
- MDRV_CPU_ADD(V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2]
+ MDRV_CPU_ADD_TAG("main", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2]
MDRV_CPU_PROGRAM_MAP(borntofi_map, 0)
MDRV_CPU_VBLANK_INT("main", fantland_irq)
@@ -960,7 +960,7 @@ static const struct YM3526interface wheelrun_ym3526_interface =
static MACHINE_DRIVER_START( wheelrun )
/* basic machine hardware */
- MDRV_CPU_ADD(V20, XTAL_18MHz/2) // D701080C-8 (V20)
+ MDRV_CPU_ADD_TAG("main", V20, XTAL_18MHz/2) // D701080C-8 (V20)
MDRV_CPU_PROGRAM_MAP(wheelrun_map, 0)
MDRV_CPU_VBLANK_INT("main", fantland_irq)
diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c
index 2d45b6feeb7..b1428ba399f 100644
--- a/src/mame/drivers/fastlane.c
+++ b/src/mame/drivers/fastlane.c
@@ -277,7 +277,7 @@ static const struct K007232_interface k007232_interface_2 =
static MACHINE_DRIVER_START( fastlane )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309, 3000000*4) /* 24MHz/8? */
+ MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* 24MHz/8? */
MDRV_CPU_PROGRAM_MAP(fastlane_readmem,fastlane_writemem)
MDRV_CPU_VBLANK_INT_HACK(fastlane_interrupt,16) /* 1 IRQ + ??? NMI (generated by the 007121) */
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index 6be3071fd67..f730ce85d32 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -282,7 +282,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( fcombat )
- MDRV_CPU_ADD(Z80, 10000000/3)
+ MDRV_CPU_ADD_TAG("main", Z80, 10000000/3)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_ADD(Z80, 10000000/3)
diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c
index 916951f7194..2e85e40bff8 100644
--- a/src/mame/drivers/fgoal.c
+++ b/src/mame/drivers/fgoal.c
@@ -355,7 +355,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( fgoal )
/* basic machine hardware */
- MDRV_CPU_ADD(M6800, 10065000 / 10) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6800, 10065000 / 10) /* ? */
MDRV_CPU_PROGRAM_MAP(cpu_map, 0)
MDRV_MACHINE_RESET(fgoal)
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index 9b1c425c77c..d9daf108616 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -404,7 +404,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( finalizr )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809,18432000/6) /* ??? */
+ MDRV_CPU_ADD_TAG("main", M6809,18432000/6) /* ??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(finalizr_interrupt,16) /* 1 IRQ + 8 NMI (generated by a custom IC) */
diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c
index 2216c901d96..486d7a8ea87 100644
--- a/src/mame/drivers/findout.c
+++ b/src/mame/drivers/findout.c
@@ -451,7 +451,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( findout )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,4000000) /* 4 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,4000000) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index 5dc99eda41c..88a38446a23 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -2018,7 +2018,7 @@ static MACHINE_RESET( firebeat )
static MACHINE_DRIVER_START(firebeat)
/* basic machine hardware */
- MDRV_CPU_ADD(PPC403GCX, 66000000)
+ MDRV_CPU_ADD_TAG("main", PPC403GCX, 66000000)
MDRV_CPU_PROGRAM_MAP(firebeat_map, 0)
MDRV_CPU_VBLANK_INT("main", firebeat_interrupt)
@@ -2057,7 +2057,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START(firebeat2)
/* basic machine hardware */
- MDRV_CPU_ADD(PPC403GCX, 66000000)
+ MDRV_CPU_ADD_TAG("main", PPC403GCX, 66000000)
MDRV_CPU_PROGRAM_MAP(firebeat_map, 0)
MDRV_CPU_VBLANK_INT("left", firebeat_interrupt)
@@ -2102,7 +2102,7 @@ static MACHINE_DRIVER_START(firebeat_spu)
MDRV_IMPORT_FROM(firebeat)
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("audio", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(spu_map, 0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index 9238ed22ff9..396f5f6df24 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -576,7 +576,7 @@ static INTERRUPT_GEN( bootleg )
static MACHINE_DRIVER_START( firetrap )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(firetrap,2)
@@ -616,7 +616,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( firetpbl )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 MHz */
MDRV_CPU_PROGRAM_MAP(readmem_bootleg,writemem_bootleg)
MDRV_CPU_VBLANK_INT("main", bootleg)
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 8d4e7de56b3..9328b43722f 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -284,7 +284,7 @@ static const struct K007232_interface k007232_interface =
static MACHINE_DRIVER_START( flkatck )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309,3000000*4) /* HD63C09EP, 24/8 MHz */
+ MDRV_CPU_ADD_TAG("main", HD6309,3000000*4) /* HD63C09EP, 24/8 MHz */
MDRV_CPU_PROGRAM_MAP(flkatck_readmem,flkatck_writemem)
MDRV_CPU_VBLANK_INT("main", flkatck_interrupt)
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index eb72a925aa1..b3e032344e0 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -233,7 +233,7 @@ static const struct CustomSound_interface custom_interface =
static MACHINE_DRIVER_START( flower )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000)
+ MDRV_CPU_ADD_TAG("main", Z80,8000000)
MDRV_CPU_PROGRAM_MAP(flower_cpu1,0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,10)
// MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) //nmis stuff up the writes to shared ram
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index 7be59ae5e69..ea407db4306 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -652,7 +652,7 @@ static const struct MSM5232interface msm5232_interface =
static MACHINE_DRIVER_START( flstory )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,XTAL_10_733MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80,XTAL_10_733MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(flstory_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -711,7 +711,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( onna34ro )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,10733000/2) /* ??? */
+ MDRV_CPU_ADD_TAG("main", Z80,10733000/2) /* ??? */
MDRV_CPU_PROGRAM_MAP(onna34ro_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -769,7 +769,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( victnine )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(victnine_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c
index 3c993674aa9..893b71d1ace 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -255,7 +255,7 @@ static PALETTE_INIT( flyball )
static MACHINE_DRIVER_START( flyball )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 12096000 / 16)
+ MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16)
MDRV_CPU_PROGRAM_MAP(flyball_map, 0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c
index dca12d4b17b..0a6e2987525 100644
--- a/src/mame/drivers/foodf.c
+++ b/src/mame/drivers/foodf.c
@@ -374,7 +374,7 @@ static const struct POKEYinterface pokey_interface =
static MACHINE_DRIVER_START( foodf )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, MASTER_CLOCK/2)
+ MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c
index 3f7dc1641e6..311534745b6 100644
--- a/src/mame/drivers/fortecar.c
+++ b/src/mame/drivers/fortecar.c
@@ -142,7 +142,7 @@ static VIDEO_UPDATE(fortecar)
static MACHINE_DRIVER_START( fortecar )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(fortecar_map,0)
MDRV_CPU_IO_MAP(fortecar_ports,0)
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index 969150dc1f0..ac34a1bd37a 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -702,7 +702,7 @@ static const struct YM2610interface ym2610_interface =
static MACHINE_DRIVER_START( fromanc2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,32000000/2) /* 16.00 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16.00 MHz */
MDRV_CPU_PROGRAM_MAP(fromanc2_readmem_main,fromanc2_writemem_main)
MDRV_CPU_VBLANK_INT("left", fromanc2_interrupt)
@@ -755,7 +755,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fromancr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,32000000/2) /* 16.00 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16.00 MHz */
MDRV_CPU_PROGRAM_MAP(fromancr_readmem_main,fromancr_writemem_main)
MDRV_CPU_VBLANK_INT("left", fromanc2_interrupt)
@@ -807,7 +807,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fromanc4 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,32000000/2) /* 16.00 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16.00 MHz */
MDRV_CPU_PROGRAM_MAP(fromanc4_readmem_main,fromanc4_writemem_main)
MDRV_CPU_VBLANK_INT("left", fromanc2_interrupt)
diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c
index efa52ea252a..f7bc95fc1b7 100644
--- a/src/mame/drivers/fromance.c
+++ b/src/mame/drivers/fromance.c
@@ -1057,7 +1057,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( nekkyoku )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 Mhz ? */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6.00 Mhz ? */
MDRV_CPU_PROGRAM_MAP(nekkyoku_readmem_main,nekkyoku_writemem_main)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1095,7 +1095,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( idolmj )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 Mhz ? */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6.00 Mhz ? */
MDRV_CPU_PROGRAM_MAP(fromance_readmem_main,fromance_writemem_main)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1133,7 +1133,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fromance )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 Mhz ? */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6.00 Mhz ? */
MDRV_CPU_PROGRAM_MAP(fromance_readmem_main,fromance_writemem_main)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index 7e11ab209b5..0a1e60b04a3 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -303,7 +303,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( funkybee )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index 410de7a63ca..fd660e3e21d 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -365,7 +365,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( funkyjet )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000) /* 28 MHz crystal */
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000) /* 28 MHz crystal */
MDRV_CPU_PROGRAM_MAP(funkyjet_readmem,funkyjet_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c
index 974d1587681..e2119555880 100644
--- a/src/mame/drivers/funybubl.c
+++ b/src/mame/drivers/funybubl.c
@@ -244,7 +244,7 @@ static DRIVER_INIT( funybubl )
static MACHINE_DRIVER_START( funybubl )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz?? */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz?? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index 394b72757b3..4bd0e268658 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -562,7 +562,7 @@ static MACHINE_RESET( fuuki16 )
static MACHINE_DRIVER_START( fuuki16 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(fuuki16_readmem,fuuki16_writemem)
MDRV_CPU_ADD(Z80, 3000000)
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index e30f803674f..ba56485397f 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -604,7 +604,7 @@ static const struct YMF262interface ymf262_interface =
static MACHINE_DRIVER_START( fuuki32 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, CPU_CLOCK) /* 20MHz verified */
+ MDRV_CPU_ADD_TAG("main", M68EC020, CPU_CLOCK) /* 20MHz verified */
MDRV_CPU_PROGRAM_MAP(fuuki32_readmem,fuuki32_writemem)
MDRV_CPU_ADD_TAG("sound", Z80, SOUND_CPU_CLOCK) /* 6MHz verified */
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 36921db5468..9220a280005 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -217,7 +217,7 @@ GFXDECODEINFO(0x100000,64)
static MACHINE_DRIVER_START( bigkarnk )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* MC68000P10, 10 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* MC68000P10, 10 MHz */
MDRV_CPU_PROGRAM_MAP(bigkarnk_readmem,bigkarnk_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -472,7 +472,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( maniacsq )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(maniacsq_readmem,maniacsq_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -725,7 +725,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( squash )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* MC68000P12, 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* MC68000P12, 12 MHz */
MDRV_CPU_PROGRAM_MAP(squash_readmem,squash_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -893,7 +893,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( thoop )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* MC68000P12, 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* MC68000P12, 12 MHz */
MDRV_CPU_PROGRAM_MAP(squash_readmem,thoop_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c
index eeab0cf5f7c..1420c0a0b69 100644
--- a/src/mame/drivers/gaelco2.c
+++ b/src/mame/drivers/gaelco2.c
@@ -165,7 +165,7 @@ static const struct gaelcosnd_interface maniacsq_snd_interface =
static MACHINE_DRIVER_START( maniacsq )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 26000000/2) /* 13 MHz? */
+ MDRV_CPU_ADD_TAG("main", M68000, 26000000/2) /* 13 MHz? */
MDRV_CPU_PROGRAM_MAP(maniacsq_readmem, maniacsq_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -292,7 +292,7 @@ static const struct gaelcosnd_interface bang_snd_interface =
static MACHINE_DRIVER_START( bang )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 30000000/2) /* 15 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 30000000/2) /* 15 MHz */
MDRV_CPU_PROGRAM_MAP(bang_readmem, bang_writemem)
MDRV_CPU_VBLANK_INT_HACK(bang_interrupt, 6)
@@ -497,7 +497,7 @@ static const struct gaelcosnd_interface alighunt_snd_interface =
static MACHINE_DRIVER_START( alighunt )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 24000000/2) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 24000000/2) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(alighunt_readmem, alighunt_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -750,7 +750,7 @@ static const struct gaelcosnd_interface touchgo_snd_interface =
static MACHINE_DRIVER_START( touchgo )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 32000000/2) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(touchgo_readmem, touchgo_writemem)
MDRV_CPU_VBLANK_INT("left", irq6_line_hold)
@@ -953,7 +953,7 @@ static const struct gaelcosnd_interface snowboar_snd_interface =
static MACHINE_DRIVER_START( snowboar )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 30000000/2) /* 15 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 30000000/2) /* 15 MHz */
MDRV_CPU_PROGRAM_MAP(snowboar_readmem, snowboar_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -1205,7 +1205,7 @@ static const struct gaelcosnd_interface wrally2_snd_interface =
static MACHINE_DRIVER_START( wrally2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 26000000/2) /* 13 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 26000000/2) /* 13 MHz */
MDRV_CPU_PROGRAM_MAP(wrally2_readmem, wrally2_writemem)
MDRV_CPU_VBLANK_INT("left", irq6_line_hold)
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 4e978dc8b51..f32d48eb4b5 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -974,7 +974,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( shadoww )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 18432000/2) /* 9.216 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 18432000/2) /* 9.216 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -1034,7 +1034,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( drgnbowl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 20000000/2) /* 10 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 20000000/2) /* 10 MHz */
MDRV_CPU_PROGRAM_MAP(drgnbowl_map,0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index 3189d02b04d..116fd732fe0 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -1646,7 +1646,7 @@ static const struct Samplesinterface battles_samples_interface =
static MACHINE_DRIVER_START( bosco )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(bosco_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
@@ -1715,7 +1715,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( galaga )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(galaga_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
@@ -1784,7 +1784,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( xevious )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(xevious_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
@@ -1868,7 +1868,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( digdug )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(digdug_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c
index e311f75e396..b43032af9da 100644
--- a/src/mame/drivers/galastrm.c
+++ b/src/mame/drivers/galastrm.c
@@ -351,7 +351,7 @@ static NVRAM_HANDLER( galastrm )
static MACHINE_DRIVER_START( galastrm )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(galastrm_readmem,galastrm_writemem)
MDRV_CPU_VBLANK_INT("main", galastrm_interrupt) /* VBL */
diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c
index 3e5d831bdbd..c88ae0ca0bf 100644
--- a/src/mame/drivers/galaxia.c
+++ b/src/mame/drivers/galaxia.c
@@ -143,7 +143,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( galaxia )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650,2000000) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", S2650,2000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index 17952ac3796..6f19860e7dd 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -2468,7 +2468,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( drivfrcg )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650, 18432000/6)
+ MDRV_CPU_ADD_TAG("main", S2650, 18432000/6)
MDRV_CPU_PROGRAM_MAP(drivfrcg,0)
MDRV_CPU_IO_MAP(drivfrcg_io,0)
MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt)
@@ -2514,7 +2514,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hunchbkg )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650, PIXEL_CLOCK/2)
+ MDRV_CPU_ADD_TAG("main", S2650, PIXEL_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(hunchbkg,0)
MDRV_CPU_IO_MAP(hunchbkg_io,0)
MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt)
@@ -2577,7 +2577,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( racknrol )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650, PIXEL_CLOCK/2)
+ MDRV_CPU_ADD_TAG("main", S2650, PIXEL_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(racknrol,0)
MDRV_CPU_IO_MAP(racknrol_io,0)
MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt)
@@ -2635,7 +2635,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hexpoola )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650, PIXEL_CLOCK/2)
+ MDRV_CPU_ADD_TAG("main", S2650, PIXEL_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(racknrol,0)
MDRV_CPU_IO_MAP(hexpoola_io,0)
MDRV_CPU_VBLANK_INT("main", hunchbks_vh_interrupt)
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index d1e15210717..92c9a54edf4 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -556,7 +556,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( galivan )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz? */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -600,7 +600,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ninjemak )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz? */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz? */
MDRV_CPU_PROGRAM_MAP(readmem,ninjemak_writemem)
MDRV_CPU_IO_MAP(ninjemak_readport,ninjemak_writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index 79449869d4f..835ef2afa8e 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -460,7 +460,7 @@ static INTERRUPT_GEN( galpani2_interrupt2 )
static MACHINE_DRIVER_START( galpani2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16MHz */
MDRV_CPU_PROGRAM_MAP(galpani2_mem1, 0)
MDRV_CPU_VBLANK_INT_HACK(galpani2_interrupt,GALPANI2_INTERRUPTS_NUM)
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index 4c88571d95f..09142ca4c0f 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -278,7 +278,7 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( galspnbl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ??? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq3_line_hold)/* also has vector for 6, but it does nothing */
diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index cfd51c076a2..b0149986fcb 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -633,7 +633,7 @@ static const struct pit8253_config gamecstl_pit8254_config =
static MACHINE_DRIVER_START(gamecstl)
/* basic machine hardware */
- MDRV_CPU_ADD(PENTIUM, 200000000)
+ MDRV_CPU_ADD_TAG("main", PENTIUM, 200000000)
MDRV_CPU_PROGRAM_MAP(gamecstl_map, 0)
MDRV_CPU_IO_MAP(gamecstl_io, 0)
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index 0f30634c055..804f5315715 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -1172,7 +1172,7 @@ static MACHINE_DRIVER_START( gameplan )
MDRV_DRIVER_DATA(gameplan_state)
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, GAMEPLAN_MAIN_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", M6502, GAMEPLAN_MAIN_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(gameplan_main_map,0)
MDRV_CPU_ADD_TAG("audio", M6502, GAMEPLAN_AUDIO_CPU_CLOCK)
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index e549b522a00..3526c826bca 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -540,7 +540,7 @@ static const struct Samplesinterface samples_interface =
static MACHINE_DRIVER_START( gaplus )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 24576000/16) /* 1.536 MHz */
+ MDRV_CPU_ADD_TAG("main", M6809, 24576000/16) /* 1.536 MHz */
MDRV_CPU_PROGRAM_MAP(readmem_cpu1,writemem_cpu1)
MDRV_CPU_VBLANK_INT("main", gaplus_interrupt_1)
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index 72e605a3c4f..cb9f1872285 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -527,7 +527,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( gauntlet )
/* basic machine hardware */
- MDRV_CPU_ADD(M68010, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68010, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index 53b83005a9a..3ec8d746928 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -299,7 +299,7 @@ static const struct K007232_interface k007232_interface =
static MACHINE_DRIVER_START( gbusters )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI, 3000000) /* Konami custom 052526 */
+ MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* Konami custom 052526 */
MDRV_CPU_PROGRAM_MAP(gbusters_readmem,gbusters_writemem)
MDRV_CPU_VBLANK_INT("main", gbusters_interrupt)
diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c
index aee54684be4..9028bc94cfb 100644
--- a/src/mame/drivers/ghosteo.c
+++ b/src/mame/drivers/ghosteo.c
@@ -482,7 +482,7 @@ static INTERRUPT_GEN( bballoon_interrupt )
static MACHINE_DRIVER_START( bballoon )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM7, 24000000)
+ MDRV_CPU_ADD_TAG("main", ARM7, 24000000)
MDRV_CPU_PROGRAM_MAP(bballoon_map,0)
MDRV_CPU_VBLANK_INT("main", bballoon_interrupt)
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index a630dc4527c..e1fded78e21 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -341,7 +341,7 @@ static const struct K054539interface k054539_interface =
static MACHINE_DRIVER_START( gijoe )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* Confirmed */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* Confirmed */
MDRV_CPU_PROGRAM_MAP(readmem, writemem)
MDRV_CPU_VBLANK_INT("main", gijoe_interrupt)
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index 9c5ed2c581f..a6fcb27c98e 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -349,7 +349,7 @@ static const struct Y8950interface y8950_interface =
static MACHINE_DRIVER_START( ginganin )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 6000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 6000000) /* ? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* ? (vectors 1-7 cointain the same address) */
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index 7c049408ef4..72fff7da529 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -684,7 +684,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( ppking )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(ppking_cpu1_map,0)
MDRV_CPU_IO_MAP(ppking_cpu1_io,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -734,7 +734,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gladiatr )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(gladiatr_cpu1_map,0)
MDRV_CPU_IO_MAP(gladiatr_cpu1_io,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 212aec0aa8a..d9828766f61 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -201,7 +201,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( glass )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz (M680000 P12) */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz (M680000 P12) */
MDRV_CPU_PROGRAM_MAP(glass_readmem,glass_writemem)
MDRV_CPU_VBLANK_INT("main", glass_interrupt)
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index b2250606867..1e99bb5350f 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -340,7 +340,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( gng )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1500000) /* 1.5 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M6809, 1500000) /* 1.5 MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index 9913d0015a5..1de75ff9082 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -314,7 +314,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( goal92 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,12000000)
+ MDRV_CPU_ADD_TAG("main", M68000,12000000)
MDRV_CPU_PROGRAM_MAP(goal92_readmem,goal92_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold) /* VBL */
diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c
index 9b3bf7bdc09..4dbd798002e 100644
--- a/src/mame/drivers/goindol.c
+++ b/src/mame/drivers/goindol.c
@@ -271,7 +271,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( goindol )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 MHz (?) */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 7f6dbf35b70..7ce7c0cd900 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -286,7 +286,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( goldstar )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3579545)//(4000000?)
+ MDRV_CPU_ADD_TAG("main", Z80, 3579545)//(4000000?)
MDRV_CPU_PROGRAM_MAP(map,0)
MDRV_CPU_IO_MAP(readport,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -322,7 +322,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( goldstbl )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3579545)//(4000000?)
+ MDRV_CPU_ADD_TAG("main", Z80, 3579545)//(4000000?)
MDRV_CPU_PROGRAM_MAP(map,0)
MDRV_CPU_IO_MAP(readport,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -357,7 +357,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( moonlght )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3579545)//(4000000?)
+ MDRV_CPU_ADD_TAG("main", Z80, 3579545)//(4000000?)
MDRV_CPU_PROGRAM_MAP(map,0)
MDRV_CPU_IO_MAP(readport,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c
index 4fc116f01c9..2f469a23d0e 100644
--- a/src/mame/drivers/gomoku.c
+++ b/src/mame/drivers/gomoku.c
@@ -168,7 +168,7 @@ static const struct CustomSound_interface custom_interface =
static MACHINE_DRIVER_START( gomoku )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/12) /* 1.536 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/12) /* 1.536 MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem_gomoku, writemem_gomoku)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c
index 6a089fe588d..36979c3e056 100644
--- a/src/mame/drivers/goodejan.c
+++ b/src/mame/drivers/goodejan.c
@@ -275,7 +275,7 @@ static INTERRUPT_GEN( goodejan_interrupt )
static MACHINE_DRIVER_START( goodejan )
/* basic machine hardware */
- MDRV_CPU_ADD(V30, GOODEJAN_MHZ2/2)
+ MDRV_CPU_ADD_TAG("main", V30, GOODEJAN_MHZ2/2)
MDRV_CPU_PROGRAM_MAP(goodejan_map,0)
MDRV_CPU_IO_MAP(goodejan_io_map,0)
MDRV_CPU_VBLANK_INT_HACK(goodejan_interrupt,2)
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index 7ab1a3b5b1a..d9a2d77b65a 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -274,7 +274,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( gotcha )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,14318180) /* 14.31818 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,14318180) /* 14.31818 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c
index de5eaa152a8..47dd02302f9 100644
--- a/src/mame/drivers/gotya.c
+++ b/src/mame/drivers/gotya.c
@@ -198,7 +198,7 @@ static const struct Samplesinterface samples_interface =
static MACHINE_DRIVER_START( gotya )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,18432000/6) /* 3.072 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", Z80,18432000/6) /* 3.072 MHz ??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index fc15aedac01..daf7de896e1 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -430,7 +430,7 @@ GFXDECODE_END
/* DRIVER */
static MACHINE_DRIVER_START( gpworld )
/* main cpu */
- MDRV_CPU_ADD(Z80, GUESSED_CLOCK)
+ MDRV_CPU_ADD_TAG("main", Z80, GUESSED_CLOCK)
MDRV_CPU_PROGRAM_MAP(mainmem,0)
MDRV_CPU_IO_MAP(mainport,0)
MDRV_CPU_VBLANK_INT("main", vblank_callback_gpworld)
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index 8b07973c3ba..f03701bda29 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -338,7 +338,7 @@ static const struct K007232_interface k007232_interface =
static MACHINE_DRIVER_START( gradius3 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz */
MDRV_CPU_PROGRAM_MAP(gradius3_map,0)
MDRV_CPU_VBLANK_INT("main", cpuA_interrupt)
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index aa57d230bac..a465f22f71a 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -674,7 +674,7 @@ static MACHINE_DRIVER_START( grchamp )
/* basic machine hardware */
/* CPU BOARD */
- MDRV_CPU_ADD(Z80, PIXEL_CLOCK/2)
+ MDRV_CPU_ADD_TAG("main", Z80, PIXEL_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", grchamp_cpu0_interrupt)
diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c
index 705819729f8..0531241fdea 100644
--- a/src/mame/drivers/gridlee.c
+++ b/src/mame/drivers/gridlee.c
@@ -434,7 +434,7 @@ static const struct Samplesinterface samples_interface =
static MACHINE_DRIVER_START( gridlee )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, BALSENTE_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", M6809, BALSENTE_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(readmem_cpu1,writemem_cpu1)
MDRV_MACHINE_RESET(gridlee)
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index be625179f49..b199f2bcd03 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -406,7 +406,7 @@ static INTERRUPT_GEN( groundfx_interrupt )
static MACHINE_DRIVER_START( groundfx )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(groundfx_readmem,groundfx_writemem)
MDRV_CPU_VBLANK_INT("main", groundfx_interrupt)
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index ff403b62a23..8caa7ce025f 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -574,7 +574,7 @@ INPUT_PORTS_END
/*** MACHINE DRIVER **********************************************************/
static MACHINE_DRIVER_START( gstriker )
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -615,7 +615,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( vgoal )
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(vgoal_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index 5268bd20b86..6e501aec268 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -694,7 +694,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( gsword )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_18MHz/6) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_18MHz/6) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(cpu1_map,0)
MDRV_CPU_IO_MAP(cpu1_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -750,7 +750,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( josvolly )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18000000/6) /* ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 18000000/6) /* ? */
MDRV_CPU_PROGRAM_MAP(cpu1_map,0)
MDRV_CPU_IO_MAP(josvolly_cpu1_io_map,0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index e555a0268d3..2e3196b58bd 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -905,7 +905,7 @@ static MACHINE_RESET( gticlub )
static MACHINE_DRIVER_START( gticlub )
/* basic machine hardware */
- MDRV_CPU_ADD(PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
+ MDRV_CPU_ADD_TAG("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
MDRV_CPU_PROGRAM_MAP(gticlub_map, 0)
MDRV_CPU_VBLANK_INT("main", gticlub_vblank)
@@ -951,7 +951,7 @@ static MACHINE_RESET( hangplt )
static MACHINE_DRIVER_START( hangplt )
/* basic machine hardware */
- MDRV_CPU_ADD(PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
+ MDRV_CPU_ADD_TAG("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
MDRV_CPU_PROGRAM_MAP(gticlub_map, 0)
MDRV_CPU_ADD(M68000, 64000000/4) /* 16MHz */
diff --git a/src/mame/drivers/gtipoker.c b/src/mame/drivers/gtipoker.c
index 678c434be4e..ca14094d662 100644
--- a/src/mame/drivers/gtipoker.c
+++ b/src/mame/drivers/gtipoker.c
@@ -54,7 +54,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( gtipoker )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,4000000) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,4000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(gtipoker_memmap,0)
MDRV_CPU_IO_MAP(gtipoker_iomap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index 824868ebb3e..73b603cd3c6 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -373,7 +373,7 @@ static NVRAM_HANDLER( gunbustr )
static MACHINE_DRIVER_START( gunbustr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(gunbustr_readmem,gunbustr_writemem)
MDRV_CPU_VBLANK_INT("main", gunbustr_interrupt) /* VBL */
diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c
index bd9cc8423b7..27b5a41e014 100644
--- a/src/mame/drivers/gundealr.c
+++ b/src/mame/drivers/gundealr.c
@@ -462,7 +462,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( gundealr )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 8000000) /* 8 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* 8 MHz ??? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT_HACK(yamyam_interrupt,4) /* ? */
diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c
index ebb7bdfc3d9..81f2509beed 100644
--- a/src/mame/drivers/gunpey.c
+++ b/src/mame/drivers/gunpey.c
@@ -120,7 +120,7 @@ static INTERRUPT_GEN( gunpey_interrupt )
static MACHINE_DRIVER_START( gunpey )
/* basic machine hardware */
- MDRV_CPU_ADD(V30, 57242400 / 4)
+ MDRV_CPU_ADD_TAG("main", V30, 57242400 / 4)
MDRV_CPU_PROGRAM_MAP(mem_map,0)
MDRV_CPU_IO_MAP(io_map,0)
MDRV_CPU_VBLANK_INT("main", gunpey_interrupt)
diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c
index 5765111ec2a..03f208fe4f4 100644
--- a/src/mame/drivers/gunsmoke.c
+++ b/src/mame/drivers/gunsmoke.c
@@ -286,7 +286,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( gunsmoke )
// basic machine hardware
- MDRV_CPU_ADD(Z80, 4000000) // 4 MHz
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) // 4 MHz
MDRV_CPU_PROGRAM_MAP(gunsmoke_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -314,13 +314,13 @@ static MACHINE_DRIVER_START( gunsmoke )
// sound hardware
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym", YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.22)
MDRV_SOUND_ROUTE(1, "mono", 0.22)
MDRV_SOUND_ROUTE(2, "mono", 0.22)
MDRV_SOUND_ROUTE(3, "mono", 0.14)
- MDRV_SOUND_ADD("ym", YM2203, 1500000)
+ MDRV_SOUND_ADD("ym2", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.22)
MDRV_SOUND_ROUTE(1, "mono", 0.22)
MDRV_SOUND_ROUTE(2, "mono", 0.22)
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index eb09bad93ae..eeed597cf62 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -517,7 +517,7 @@ DISCRETE_SOUND_END
static MACHINE_DRIVER_START( gyruss )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz (?) */
MDRV_CPU_PROGRAM_MAP(main_cpu1_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/hal21.c b/src/mame/drivers/hal21.c
index 98363b1afd7..b4a9086cf5b 100644
--- a/src/mame/drivers/hal21.c
+++ b/src/mame/drivers/hal21.c
@@ -697,7 +697,7 @@ static MACHINE_RESET( aso )
static MACHINE_DRIVER_START( aso )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(aso_cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -741,7 +741,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hal21 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(hal21_cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index 36c1263ac58..81ba40ab991 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -207,7 +207,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( hanaawas )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,18432000/6) /* 3.072 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", Z80,18432000/6) /* 3.072 MHz ??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c
index 0e8467a6d0b..c39b6ddaf41 100644
--- a/src/mame/drivers/hanaroku.c
+++ b/src/mame/drivers/hanaroku.c
@@ -240,7 +240,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( hanaroku )
- MDRV_CPU_ADD(Z80,6000000) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,6000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index eae24902b46..5dd6f2f2227 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -266,7 +266,7 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( hcastle )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI, 3000000) /* Derived from 24 MHz clock */
+ MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* Derived from 24 MHz clock */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c
index b5e62eb1422..54a94d61861 100644
--- a/src/mame/drivers/hexa.c
+++ b/src/mame/drivers/hexa.c
@@ -136,7 +136,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( hexa )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??????? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ??????? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index 2753c9bb9c3..0ba699cf73f 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -282,7 +282,7 @@ static INTERRUPT_GEN( hexion_interrupt )
static MACHINE_DRIVER_START( hexion )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,24000000/4) /* Z80B 6 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,24000000/4) /* Z80B 6 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(hexion_interrupt,3) /* both IRQ and NMI are used */
diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c
index d7ffc86daa3..394652309c5 100644
--- a/src/mame/drivers/higemaru.c
+++ b/src/mame/drivers/higemaru.c
@@ -173,7 +173,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( higemaru )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ? Main xtal is 12MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ? Main xtal is 12MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(higemaru_interrupt,2)
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c
index 0aae90af944..c6890f08436 100644
--- a/src/mame/drivers/hitme.c
+++ b/src/mame/drivers/hitme.c
@@ -300,7 +300,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( hitme )
/* basic machine hardware */
- MDRV_CPU_ADD(8080, 8945000/16)
+ MDRV_CPU_ADD_TAG("main", 8080, 8945000/16)
MDRV_CPU_PROGRAM_MAP(hitme_map,0)
MDRV_CPU_IO_MAP(hitme_portmap,0)
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index 3c5bca020c5..e49661187a9 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -1516,7 +1516,7 @@ static MACHINE_RESET(hyperneo)
static MACHINE_DRIVER_START( hng64 )
/* basic machine hardware */
- MDRV_CPU_ADD(R4600BE, MASTER_CLOCK) // actually R4300
+ MDRV_CPU_ADD_TAG("main", R4600BE, MASTER_CLOCK) // actually R4300
MDRV_CPU_CONFIG(config)
MDRV_CPU_PROGRAM_MAP(hng_map, 0)
MDRV_CPU_VBLANK_INT_HACK(irq_start,3)
diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c
index c34e34e25c9..f02547b20ec 100644
--- a/src/mame/drivers/holeland.c
+++ b/src/mame/drivers/holeland.c
@@ -305,7 +305,7 @@ static const struct AY8910interface ay8910_interface_2 =
static MACHINE_DRIVER_START( holeland )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -374,7 +374,7 @@ Notes:
static MACHINE_DRIVER_START( crzrally )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 20000000/4) /* 5 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 20000000/4) /* 5 MHz */
MDRV_CPU_PROGRAM_MAP(crzrally_readmem,crzrally_writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index d4d702555ae..403a928dcbb 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -1225,7 +1225,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mrokumei )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 16000000/4) /* 4MHz ? */
+ MDRV_CPU_ADD_TAG("main", M6809, 16000000/4) /* 4MHz ? */
MDRV_CPU_PROGRAM_MAP(mrokumei_readmem,mrokumei_writemem)
MDRV_CPU_VBLANK_INT("main", homedata_irq) /* also triggered by the blitter */
@@ -1289,7 +1289,7 @@ static const UPD7810_CONFIG upd_config =
static MACHINE_DRIVER_START( reikaids )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 16000000/4) /* 4MHz ? */
+ MDRV_CPU_ADD_TAG("main", M6809, 16000000/4) /* 4MHz ? */
MDRV_CPU_PROGRAM_MAP(reikaids_readmem,reikaids_writemem)
MDRV_CPU_VBLANK_INT("main", homedata_irq) /* also triggered by the blitter */
@@ -1339,7 +1339,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pteacher )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 16000000/4) /* 4MHz ? */
+ MDRV_CPU_ADD_TAG("main", M6809, 16000000/4) /* 4MHz ? */
MDRV_CPU_PROGRAM_MAP(pteacher_readmem,pteacher_writemem)
MDRV_CPU_VBLANK_INT("main", homedata_irq) /* also triggered by the blitter */
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index e13e9829976..4188465e98e 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -186,7 +186,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( homerun )
- MDRV_CPU_ADD(Z80, 5000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 5000000)
MDRV_CPU_PROGRAM_MAP(homerun_memmap, 0)
MDRV_CPU_IO_MAP(homerun_iomap, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index 2cd6368eda4..a356a21dabc 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -189,7 +189,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( hotblock )
/* basic machine hardware */
- MDRV_CPU_ADD(I8088, 10000000)
+ MDRV_CPU_ADD_TAG("main", I8088, 10000000)
MDRV_CPU_PROGRAM_MAP(hotblock_map, 0)
MDRV_CPU_IO_MAP(hotblock_io,0)
MDRV_CPU_VBLANK_INT("main", hotblocks_irq)
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index cda2fefcfcd..7d21d67666a 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -269,7 +269,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( hyhoo )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 5000000/1) /* 5.00 MHz ?? */
+ MDRV_CPU_ADD_TAG("main", Z80, 5000000/1) /* 5.00 MHz ?? */
MDRV_CPU_PROGRAM_MAP(readmem_hyhoo, writemem_hyhoo)
MDRV_CPU_IO_MAP(readport_hyhoo, writeport_hyhoo)
MDRV_CPU_VBLANK_INT("main", nb1413m3_interrupt)
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index 91a8220d0af..4daf6ff3ab0 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -719,7 +719,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( hyprduel )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,20000000/2) /* 10MHz */
MDRV_CPU_PROGRAM_MAP(hyprduel_readmem,hyprduel_writemem)
MDRV_CPU_VBLANK_INT_HACK(hyprduel_interrupt,RASTER_LINES)
@@ -760,7 +760,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( magerror )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,20000000/2) /* 10MHz */
MDRV_CPU_PROGRAM_MAP(magerror_readmem,magerror_writemem)
MDRV_CPU_VBLANK_INT_HACK(hyprduel_interrupt,RASTER_LINES)
diff --git a/src/mame/drivers/igs_180.c b/src/mame/drivers/igs_180.c
index 3d5ce2c33a7..4ba6b362c7b 100644
--- a/src/mame/drivers/igs_180.c
+++ b/src/mame/drivers/igs_180.c
@@ -686,7 +686,7 @@ static MACHINE_RESET( igs_180 )
static MACHINE_DRIVER_START( igs_180 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z180, XTAL_16MHz / 2)
+ MDRV_CPU_ADD_TAG("main", Z180, XTAL_16MHz / 2)
MDRV_CPU_PROGRAM_MAP(igs_180_map,0)
MDRV_CPU_IO_MAP(igs_180_portmap,0)
MDRV_CPU_VBLANK_INT_HACK(igs_180_interrupt,2)
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index c1550955ad3..857729ae8db 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -193,7 +193,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( ikki )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000/2) /* 4.000MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* 4.000MHz */
MDRV_CPU_PROGRAM_MAP(ikki_cpu1,0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c
index 6334a175fc9..b2885f84327 100644
--- a/src/mame/drivers/imolagp.c
+++ b/src/mame/drivers/imolagp.c
@@ -405,7 +405,7 @@ static const ppi8255_interface ppi8255_intf =
static MACHINE_DRIVER_START( imolagp )
- MDRV_CPU_ADD(Z80,8000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000) /* ? */
MDRV_CPU_PROGRAM_MAP(imolagp_master,0)
MDRV_CPU_IO_MAP(readport_master,0)
MDRV_CPU_VBLANK_INT_HACK(master_interrupt,4)
diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c
index b80008c3262..a2dc44dd9e4 100644
--- a/src/mame/drivers/intrscti.c
+++ b/src/mame/drivers/intrscti.c
@@ -88,7 +88,7 @@ static VIDEO_UPDATE(intrscti)
static MACHINE_DRIVER_START( intrscti )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,4000000) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,4000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index c253005aeeb..6b353d3b75d 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -398,7 +398,7 @@ static const struct YM2610interface ym2610_interface =
static MACHINE_DRIVER_START( inufuku )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 32000000/2) /* 16.00 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) /* 16.00 MHz */
MDRV_CPU_PROGRAM_MAP(inufuku_readmem, inufuku_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index f5a031a1208..0cd4771261e 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -296,7 +296,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( iqblock )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT_HACK(iqblock_interrupt,16)
@@ -328,7 +328,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cabaret )
/* basic machine hardware */
- MDRV_CPU_ADD(Z180,12000000/2) /* 6 MHz , appears to use Z180 instructions */
+ MDRV_CPU_ADD_TAG("main", Z180,12000000/2) /* 6 MHz , appears to use Z180 instructions */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT_HACK(iqblock_interrupt,16)
@@ -360,7 +360,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pokerigs )
/* basic machine hardware */
- MDRV_CPU_ADD(Z180,12000000/2) /* 6 MHz */
+ MDRV_CPU_ADD_TAG("main", Z180,12000000/2) /* 6 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(pokerigs_portmap,0)
MDRV_CPU_VBLANK_INT_HACK(iqblock_interrupt,16)
diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c
index e37052722fc..9a1afaa1c4f 100644
--- a/src/mame/drivers/irobot.c
+++ b/src/mame/drivers/irobot.c
@@ -296,7 +296,7 @@ static const struct POKEYinterface pokey_interface =
static MACHINE_DRIVER_START( irobot )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809,1500000)
+ MDRV_CPU_ADD_TAG("main", M6809,1500000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_MACHINE_RESET(irobot)
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index daf59751a69..566190dcde1 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -442,7 +442,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( ironhors )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809,18432000/6) /* 3.072 MHz??? mod by Shingo Suzuki 1999/10/15 */
+ MDRV_CPU_ADD_TAG("main", M6809,18432000/6) /* 3.072 MHz??? mod by Shingo Suzuki 1999/10/15 */
MDRV_CPU_PROGRAM_MAP(master_map, 0)
MDRV_CPU_VBLANK_INT_HACK(ironhors_interrupt,8)
diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c
index fac6a1afd64..ea2f8b33ac3 100644
--- a/src/mame/drivers/istellar.c
+++ b/src/mame/drivers/istellar.c
@@ -328,7 +328,7 @@ static INTERRUPT_GEN( vblank_callback_istellar )
/* DRIVER */
static MACHINE_DRIVER_START( istellar )
/* main cpu */
- MDRV_CPU_ADD(Z80, GUESSED_CLOCK)
+ MDRV_CPU_ADD_TAG("main", Z80, GUESSED_CLOCK)
MDRV_CPU_PROGRAM_MAP(z80_0_mem,0)
MDRV_CPU_IO_MAP(z80_0_io,0)
MDRV_CPU_VBLANK_INT("main", vblank_callback_istellar)
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index 3f54a11f647..b5ba42b2c5a 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -301,7 +301,7 @@ static INTERRUPT_GEN( jackal_interrupt )
static MACHINE_DRIVER_START( jackal )
// basic machine hardware
- MDRV_CPU_ADD(M6809, MASTER_CLOCK/12) // verified on pcb
+ MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK/12) // verified on pcb
MDRV_CPU_PROGRAM_MAP(master_map, 0)
MDRV_CPU_VBLANK_INT("main", jackal_interrupt)
diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c
index 84d2d85ac24..e8db791ccf2 100644
--- a/src/mame/drivers/jackpool.c
+++ b/src/mame/drivers/jackpool.c
@@ -173,7 +173,7 @@ static INTERRUPT_GEN( jackpool_interrupt )
static MACHINE_DRIVER_START( jackpool )
- MDRV_CPU_ADD(M68000, 12000000) // ?
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) // ?
MDRV_CPU_PROGRAM_MAP(jackpool_readmem,jackpool_writemem)
MDRV_CPU_VBLANK_INT_HACK(jackpool_interrupt,3) // ?
diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c
index 83ad7df23d7..eb89c4a1e1e 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -240,7 +240,7 @@ static MACHINE_START( jailbrek )
static MACHINE_DRIVER_START( jailbrek )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, MASTER_CLOCK/12)
+ MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK/12)
MDRV_CPU_PROGRAM_MAP(jailbrek_map, 0)
MDRV_CPU_VBLANK_INT("main", jb_interrupt)
MDRV_CPU_PERIODIC_INT(jb_interrupt_nmi, 500) /* ? */
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 1900abc3906..de3be3560fb 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -746,7 +746,7 @@ static const struct YMZ280Binterface ymz280b_intf =
static MACHINE_DRIVER_START( jchan )
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(jchan_main,0)
MDRV_CPU_VBLANK_INT_HACK(jchan_vblank, 2)
diff --git a/src/mame/drivers/jcross.c b/src/mame/drivers/jcross.c
index a0cb1c39644..76fc97455ce 100644
--- a/src/mame/drivers/jcross.c
+++ b/src/mame/drivers/jcross.c
@@ -256,7 +256,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( jcross )
- MDRV_CPU_ADD(Z80, 3360000)
+ MDRV_CPU_ADD_TAG("main", Z80, 3360000)
MDRV_CPU_PROGRAM_MAP(cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c
index e0beb6d5011..ab2f7d22977 100644
--- a/src/mame/drivers/jedi.c
+++ b/src/mame/drivers/jedi.c
@@ -346,7 +346,7 @@ static MACHINE_DRIVER_START( jedi )
MDRV_DRIVER_DATA(jedi_state)
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, JEDI_MAIN_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", M6502, JEDI_MAIN_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_INTERLEAVE(4)
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index 28dffda99bf..177bc2a2ba2 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -398,7 +398,7 @@ static INTERRUPT_GEN( jollyjgr_interrupt )
}
static MACHINE_DRIVER_START( jollyjgr )
- MDRV_CPU_ADD(Z80, 3579545) /* 3,579545 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 3579545) /* 3,579545 MHz */
MDRV_CPU_PROGRAM_MAP(jollyjgr_map,0)
MDRV_CPU_VBLANK_INT("main", jollyjgr_interrupt)
diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c
index 8aecb6ba16f..76e7a01a4d9 100644
--- a/src/mame/drivers/jongkyo.c
+++ b/src/mame/drivers/jongkyo.c
@@ -591,7 +591,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( jongkyo )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,JONGKYO_CLOCK/4)
+ MDRV_CPU_ADD_TAG("main", Z80,JONGKYO_CLOCK/4)
MDRV_CPU_PROGRAM_MAP(jongkyo_memmap,0)
MDRV_CPU_IO_MAP(jongkyo_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index 6c82b5ca6dd..1694d7c8b52 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -860,7 +860,7 @@ static const tms34010_config tms_config =
*************************************/
static MACHINE_DRIVER_START( jpmimpct )
- MDRV_CPU_ADD(M68000, 8000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(m68k_program_map, 0)
MDRV_CPU_ADD(TMS34010, 40000000)
diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c
index 45287d5363f..09773221eb3 100644
--- a/src/mame/drivers/jrpacman.c
+++ b/src/mame/drivers/jrpacman.c
@@ -265,7 +265,7 @@ static const struct namco_interface namco_interface =
static MACHINE_DRIVER_START( jrpacman )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(port_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index 8f8cbc812e6..27bc7526290 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -335,7 +335,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( junofrst )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1500000) /* 1.5 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M6809, 1500000) /* 1.5 MHz ??? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 891e1d3d8bb..76d388f6225 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -1692,7 +1692,7 @@ static const struct AY8910interface ay8910_intf_eeprom =
static MACHINE_DRIVER_START( berlwall )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* MC68000P12 */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* MC68000P12 */
MDRV_CPU_PROGRAM_MAP(berlwall,0)
MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
@@ -1739,7 +1739,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bakubrkr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_12MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(bakubrkr,0)
MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
@@ -1795,7 +1795,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( blazeon )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,12000000) /* TMP68HC000-12 */
+ MDRV_CPU_ADD_TAG("main", M68000,12000000) /* TMP68HC000-12 */
MDRV_CPU_PROGRAM_MAP(blazeon,0)
MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
@@ -1940,7 +1940,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mgcrystl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_12MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(mgcrystl,0)
MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM)
@@ -2010,7 +2010,7 @@ static INTERRUPT_GEN( shogwarr_interrupt )
static MACHINE_DRIVER_START( shogwarr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(shogwarr,0)
MDRV_CPU_VBLANK_INT_HACK(shogwarr_interrupt,SHOGWARR_INTERRUPTS_NUM)
diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c
index 8e9ae98a979..666746e1694 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -370,7 +370,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( nomcu )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MASTER_CLOCK/4)
+ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/4)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 18a75b6ec6c..a9dd83d715e 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -687,7 +687,7 @@ static MACHINE_RESET( karnov )
static MACHINE_DRIVER_START( karnov )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz */
MDRV_CPU_PROGRAM_MAP(karnov_readmem,karnov_writemem)
MDRV_CPU_VBLANK_INT("main", karnov_interrupt)
@@ -729,7 +729,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( wndrplnt )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz */
MDRV_CPU_PROGRAM_MAP(karnov_readmem,karnov_writemem)
MDRV_CPU_VBLANK_INT("main", karnov_interrupt)
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index ead1faf823d..df122115434 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -440,7 +440,7 @@ static INTERRUPT_GEN( sound_int ) {
static MACHINE_DRIVER_START( kchampvs )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", kc_interrupt)
@@ -488,7 +488,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kchamp )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */
MDRV_CPU_PROGRAM_MAP(kc_readmem,kc_writemem)
MDRV_CPU_IO_MAP(kc_readport,kc_writeport)
MDRV_CPU_VBLANK_INT("main", kc_interrupt)
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index c050764f193..a877df52fef 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -665,7 +665,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( kickgoal )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(kickgoal_program_map, 0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
MDRV_CPU_PERIODIC_INT(kickgoal_interrupt, 240)
@@ -701,7 +701,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( actionhw )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_12MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(kickgoal_program_map, 0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index eb7ab4206cf..8257d22f327 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -552,7 +552,7 @@ static INTERRUPT_GEN( kingofb_interrupt ) {
static MACHINE_DRIVER_START( kingofb )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4.0 MHz */
MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem)
MDRV_CPU_VBLANK_INT("main", kingofb_interrupt)
@@ -603,7 +603,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ringking )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4.0 MHz */
MDRV_CPU_PROGRAM_MAP(rk_main_readmem,rk_main_writemem)
MDRV_CPU_VBLANK_INT("main", kingofb_interrupt)
diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c
index 50d08fe399f..bba57d468a5 100644
--- a/src/mame/drivers/kingpin.c
+++ b/src/mame/drivers/kingpin.c
@@ -145,7 +145,7 @@ static const TMS9928a_interface tms9928a_interface =
static MACHINE_DRIVER_START( kingpin )
/* MAIN CPU */
- MDRV_CPU_ADD(Z80, 3579545)
+ MDRV_CPU_ADD_TAG("main", Z80, 3579545)
MDRV_CPU_PROGRAM_MAP(kingpin_program_map,0)
MDRV_CPU_IO_MAP(kingpin_readport,kingpin_writeport)
MDRV_CPU_VBLANK_INT("main", kingpin_video_interrupt)
diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c
index a2f843f6b3f..697affe1c2f 100644
--- a/src/mame/drivers/kinst.c
+++ b/src/mame/drivers/kinst.c
@@ -643,7 +643,7 @@ static const mips3_config config =
static MACHINE_DRIVER_START( kinst )
/* basic machine hardware */
- MDRV_CPU_ADD(R4600LE, MASTER_CLOCK*2)
+ MDRV_CPU_ADD_TAG("main", R4600LE, MASTER_CLOCK*2)
MDRV_CPU_CONFIG(config)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_start)
diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c
index 71b7b7ed12d..f7325d8dde0 100644
--- a/src/mame/drivers/klax.c
+++ b/src/mame/drivers/klax.c
@@ -196,7 +196,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( klax )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index a9d79897a94..39934522b81 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -263,7 +263,7 @@ static MACHINE_DRIVER_START( kncljoe )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_6MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_6MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c
index 3c46f34d8f0..7e4de169a42 100644
--- a/src/mame/drivers/koikoi.c
+++ b/src/mame/drivers/koikoi.c
@@ -258,7 +258,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( koikoi )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,KOIKOI_CRYSTAL/4) /* ?? */
+ MDRV_CPU_ADD_TAG("main", Z80,KOIKOI_CRYSTAL/4) /* ?? */
MDRV_CPU_PROGRAM_MAP(readmem, 0)
MDRV_CPU_IO_MAP(readport, 0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index 54e17110523..e9d75b96e42 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -368,7 +368,7 @@ static MACHINE_RESET( konamigq )
static MACHINE_DRIVER_START( konamigq )
/* basic machine hardware */
- MDRV_CPU_ADD( PSXCPU, XTAL_67_7376MHz )
+ MDRV_CPU_ADD_TAG("main", PSXCPU, XTAL_67_7376MHz )
MDRV_CPU_PROGRAM_MAP( konamigq_map, 0 )
MDRV_CPU_VBLANK_INT("main", psx_vblank)
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index 36e6fc52f2c..583a87af0cf 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -342,7 +342,7 @@ static const struct PSXSPUinterface konamigv_psxspu_interface =
static MACHINE_DRIVER_START( konamigv )
/* basic machine hardware */
- MDRV_CPU_ADD( PSXCPU, XTAL_67_7376MHz )
+ MDRV_CPU_ADD_TAG("main", PSXCPU, XTAL_67_7376MHz )
MDRV_CPU_PROGRAM_MAP( konamigv_map, 0 )
MDRV_CPU_VBLANK_INT("main", psx_vblank)
diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c
index bd16b65bfae..95dba4cc463 100644
--- a/src/mame/drivers/konamim2.c
+++ b/src/mame/drivers/konamim2.c
@@ -1133,7 +1133,7 @@ static INTERRUPT_GEN(m2)
static MACHINE_DRIVER_START( m2 )
/* basic machine hardware */
- MDRV_CPU_ADD(PPC602, 33000000) /* actually PPC602, 66MHz */
+ MDRV_CPU_ADD_TAG("main", PPC602, 33000000) /* actually PPC602, 66MHz */
MDRV_CPU_CONFIG(ppc602_config)
MDRV_CPU_PROGRAM_MAP(m2_main, 0)
MDRV_CPU_VBLANK_INT("main", m2)
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index 0677b09944d..a61de790d82 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -165,7 +165,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( kopunch )
/* basic machine hardware */
- MDRV_CPU_ADD(8080, 4000000) /* 4 MHz ???? appears to use 8080 instructions, not z80 */
+ MDRV_CPU_ADD_TAG("main", 8080, 4000000) /* 4 MHz ???? appears to use 8080 instructions, not z80 */
MDRV_CPU_PROGRAM_MAP(kopunch_map,0)
MDRV_CPU_IO_MAP(kopunch_io_map,0)
MDRV_CPU_VBLANK_INT_HACK(kopunch_interrupt,4) /* ??? */
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index c899c912ac1..1c2cce91f88 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -243,7 +243,7 @@ static GFXDECODE_START( ksayakyu )
GFXDECODE_END
static MACHINE_DRIVER_START( ksayakyu )
- MDRV_CPU_ADD(Z80,8000000/2)
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2)
MDRV_CPU_PROGRAM_MAP(maincpu_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index 4d927e59bc1..5001a21c79d 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -2722,7 +2722,7 @@ static DRIVER_INIT( salarymc )
static MACHINE_DRIVER_START( konami573 )
/* basic machine hardware */
- MDRV_CPU_ADD( PSXCPU, XTAL_67_7376MHz )
+ MDRV_CPU_ADD_TAG("main", PSXCPU, XTAL_67_7376MHz )
MDRV_CPU_PROGRAM_MAP( konami573_map, 0 )
MDRV_CPU_VBLANK_INT("main", sys573_vblank)
diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c
index efd7f969826..dd14da2d3fb 100644
--- a/src/mame/drivers/labyrunr.c
+++ b/src/mame/drivers/labyrunr.c
@@ -253,7 +253,7 @@ static const struct YM2203interface ym2203_interface_2 =
static MACHINE_DRIVER_START( labyrunr )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309, 3000000*4) /* 24MHz/8? */
+ MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* 24MHz/8? */
MDRV_CPU_PROGRAM_MAP(labyrunr_readmem,labyrunr_writemem)
MDRV_CPU_VBLANK_INT_HACK(labyrunr_interrupt,8) /* 1 IRQ + 4 NMI (generated by 007121) */
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index f667ce54ba4..36b8640da98 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -669,7 +669,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( ladybug )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(ladybug_map,0)
/* video hardware */
@@ -701,7 +701,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sraider )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(sraider_cpu1_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index 1ebc99d79a1..3f92928f514 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -281,7 +281,7 @@ static GFXDECODE_START( ladyfrog )
GFXDECODE_END
static MACHINE_DRIVER_START( ladyfrog )
- MDRV_CPU_ADD(Z80,8000000/2)
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c
index bd6111e60fe..e73f34877aa 100644
--- a/src/mame/drivers/laserbas.c
+++ b/src/mame/drivers/laserbas.c
@@ -128,7 +128,7 @@ static INTERRUPT_GEN( laserbas_interrupt )
}
static MACHINE_DRIVER_START( laserbas )
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(laserbas_memory,0)
MDRV_CPU_IO_MAP(laserbas_io,0)
MDRV_CPU_VBLANK_INT_HACK(laserbas_interrupt,2)
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index 847cf09ca0f..f68044ad10b 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -695,7 +695,7 @@ static INTERRUPT_GEN( zaccaria_cb1_toggle )
static MACHINE_DRIVER_START( laserbat )
- MDRV_CPU_ADD(S2650, 14318180/4) // ???
+ MDRV_CPU_ADD_TAG("main", S2650, 14318180/4) // ???
MDRV_CPU_PROGRAM_MAP(laserbat_map,0)
MDRV_CPU_IO_MAP(laserbat_io_map,0)
MDRV_CPU_VBLANK_INT("main", laserbat_interrupt)
@@ -729,7 +729,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( catnmous )
- MDRV_CPU_ADD(S2650, 14318000/4) /* ? */
+ MDRV_CPU_ADD_TAG("main", S2650, 14318000/4) /* ? */
MDRV_CPU_PROGRAM_MAP(laserbat_map,0)
MDRV_CPU_IO_MAP(catnmous_io_map,0)
MDRV_CPU_VBLANK_INT("main", laserbat_interrupt)
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index 7d82dae2b82..e6af5214388 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -266,7 +266,7 @@ static INTERRUPT_GEN( madgear_interrupt )
static MACHINE_DRIVER_START( lastduel )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* Could be 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* Could be 8 MHz */
MDRV_CPU_PROGRAM_MAP(lastduel_readmem,lastduel_writemem)
MDRV_CPU_VBLANK_INT_HACK(lastduel_interrupt,3) /* 1 for vbl, 2 for control reads?? */
@@ -306,7 +306,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( madgear )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* Accurate */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* Accurate */
MDRV_CPU_PROGRAM_MAP(madgear_readmem,madgear_writemem)
MDRV_CPU_VBLANK_INT_HACK(madgear_interrupt,3) /* 1 for vbl, 2 for control reads?? */
diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c
index fd0606e4ba4..16d6f05137a 100644
--- a/src/mame/drivers/lastfght.c
+++ b/src/mame/drivers/lastfght.c
@@ -461,7 +461,7 @@ static INTERRUPT_GEN( unknown_interrupt )
}
static MACHINE_DRIVER_START( lastfght )
- MDRV_CPU_ADD(H83044, 32000000/2)
+ MDRV_CPU_ADD_TAG("main", H83044, 32000000/2)
MDRV_CPU_PROGRAM_MAP( lastfght_map, 0 )
MDRV_CPU_VBLANK_INT_HACK(unknown_interrupt,2)
diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c
index 47cfe004d44..353c65e5756 100644
--- a/src/mame/drivers/lazercmd.c
+++ b/src/mame/drivers/lazercmd.c
@@ -614,7 +614,7 @@ static PALETTE_INIT( lazercmd )
static MACHINE_DRIVER_START( lazercmd )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650,8064000/12) /* 672 kHz? */
+ MDRV_CPU_ADD_TAG("main", S2650,8064000/12) /* 672 kHz? */
/* Main Clock is 8MHz divided by 12
but memory and IO access is only possible
within the line and frame blanking period
@@ -649,7 +649,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( medlanes )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650,8064000/12) /* 672 kHz? */
+ MDRV_CPU_ADD_TAG("main", S2650,8064000/12) /* 672 kHz? */
/* Main Clock is 8MHz divided by 12
but memory and IO access is only possible
within the line and frame blanking period
@@ -684,7 +684,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bbonk )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650,8064000/12) /* 672 kHz? */
+ MDRV_CPU_ADD_TAG("main", S2650,8064000/12) /* 672 kHz? */
/* Main Clock is 8MHz divided by 12
but memory and IO access is only possible
within the line and frame blanking period
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index 326cc03ebc4..7b54c7d6768 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -1037,7 +1037,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( legionna )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* ??? */
+ MDRV_CPU_ADD_TAG("main", M68000,20000000/2) /* ??? */
MDRV_CPU_PROGRAM_MAP(legionna_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */
@@ -1069,7 +1069,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( heatbrl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* ??? */
+ MDRV_CPU_ADD_TAG("main", M68000,20000000/2) /* ??? */
MDRV_CPU_PROGRAM_MAP(heatbrl_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */
@@ -1100,7 +1100,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( godzilla )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 20000000/2)
+ MDRV_CPU_ADD_TAG("main", M68000, 20000000/2)
MDRV_CPU_PROGRAM_MAP(godzilla_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -1131,7 +1131,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( denjinmk )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 20000000/2)
+ MDRV_CPU_ADD_TAG("main", M68000, 20000000/2)
MDRV_CPU_PROGRAM_MAP(denjinmk_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -1162,7 +1162,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sdgndmrb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 20000000/2)
+ MDRV_CPU_ADD_TAG("main", M68000, 20000000/2)
MDRV_CPU_PROGRAM_MAP(sdgndmrb_map, 0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -1194,7 +1194,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cupsoc )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2)
+ MDRV_CPU_ADD_TAG("main", M68000,20000000/2)
MDRV_CPU_PROGRAM_MAP(cupsoc_mem,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)/* VBL */
@@ -1226,7 +1226,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cupsocbl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,12000000)
+ MDRV_CPU_ADD_TAG("main", M68000,12000000)
MDRV_CPU_PROGRAM_MAP(cupsocbl_mem,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold) /* VBL */
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index 926049cd43f..5767850ed2c 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -272,7 +272,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( lemmings )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(lemmings_readmem,lemmings_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c
index 9f4e260e282..2272cfb831c 100644
--- a/src/mame/drivers/lgp.c
+++ b/src/mame/drivers/lgp.c
@@ -341,7 +341,7 @@ static INTERRUPT_GEN( vblank_callback_lgp )
/* DRIVER */
static MACHINE_DRIVER_START( lgp )
/* main cpu */
- MDRV_CPU_ADD(Z80, CPU_PCB_CLOCK)
+ MDRV_CPU_ADD_TAG("main", Z80, CPU_PCB_CLOCK)
MDRV_CPU_PROGRAM_MAP(main_program_map,0)
MDRV_CPU_IO_MAP(main_io_map,0)
MDRV_CPU_VBLANK_INT("main", vblank_callback_lgp)
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index f4438173c96..7dc94d7fe69 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -560,7 +560,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( liberatb )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 2000000)
+ MDRV_CPU_ADD_TAG("main", M6502, 2000000)
MDRV_CPU_PROGRAM_MAP(liberatb_readmem,liberatb_writemem)
MDRV_CPU_VBLANK_INT("main", deco16_interrupt)
@@ -578,7 +578,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( prosoccr )
/* basic machine hardware */
- MDRV_CPU_ADD(DECO16, 3000000)
+ MDRV_CPU_ADD_TAG("main", DECO16, 3000000)
MDRV_CPU_PROGRAM_MAP(liberate_readmem,liberate_writemem)
MDRV_CPU_IO_MAP(deco16_readport,deco16_writeport)
@@ -592,7 +592,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( prosport )
/* basic machine hardware */
- MDRV_CPU_ADD(DECO16, 2000000)
+ MDRV_CPU_ADD_TAG("main", DECO16, 2000000)
MDRV_CPU_PROGRAM_MAP(prosport_readmem,prosport_writemem)
MDRV_CPU_IO_MAP(deco16_readport,deco16_writeport)
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index 15ac07fb89f..b0cc9c56a43 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -475,7 +475,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( limenko )
- MDRV_CPU_ADD(E132XN, 20000000*4) /* 4x internal multiplier */
+ MDRV_CPU_ADD_TAG("main", E132XN, 20000000*4) /* 4x internal multiplier */
MDRV_CPU_PROGRAM_MAP(limenko_map,0)
MDRV_CPU_IO_MAP(limenko_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -500,7 +500,7 @@ static MACHINE_DRIVER_START( limenko )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( spotty )
- MDRV_CPU_ADD(GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */
+ MDRV_CPU_ADD_TAG("main", GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */
MDRV_CPU_PROGRAM_MAP(spotty_map,0)
MDRV_CPU_IO_MAP(spotty_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index 6090f3dcf0c..67caf3bfe37 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -359,7 +359,7 @@ static VIDEO_UPDATE(littlerb)
}
static MACHINE_DRIVER_START( littlerb )
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(littlerb_main, 0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index f676383c2e3..a8dfb685ced 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -307,7 +307,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( lkage )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,6000000)
+ MDRV_CPU_ADD_TAG("main", Z80,6000000)
MDRV_CPU_PROGRAM_MAP(lkage,0)
MDRV_CPU_IO_MAP(readport,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -352,7 +352,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( lkageb )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,6000000)
+ MDRV_CPU_ADD_TAG("main", Z80,6000000)
MDRV_CPU_PROGRAM_MAP(lkage,0)
MDRV_CPU_IO_MAP(readport,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index 2737900ac8e..0becb6499b3 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -476,7 +476,7 @@ static const struct YM2203interface ym2203_interface =
*************************************/
static MACHINE_DRIVER_START( lockon )
- MDRV_CPU_ADD(V30, XTAL_16MHz / 2)
+ MDRV_CPU_ADD_TAG("main", V30, XTAL_16MHz / 2)
MDRV_CPU_PROGRAM_MAP(main_v30, 0)
MDRV_CPU_ADD(V30, XTAL_16MHz / 2)
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index fc65440f4dc..f17357161fa 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -589,7 +589,7 @@ static MACHINE_DRIVER_START( looping )
MDRV_DRIVER_DATA(looping_state)
/* basic machine hardware */
- MDRV_CPU_ADD(TMS9995, MAIN_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", TMS9995, MAIN_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(looping_map,0)
MDRV_CPU_IO_MAP(looping_io_map,0)
MDRV_CPU_VBLANK_INT("main", looping_interrupt)
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index 035fc44674b..215c9b29082 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -492,7 +492,7 @@ static MACHINE_DRIVER_START( hfh )
MDRV_CPU_IO_MAP(hfh_soundio_map,0)
// sound hardware
- MDRV_SOUND_ADD("oki", OKIM6295, 1000000) // 5MHz can't be right!
+ MDRV_SOUND_ADD("oki2", OKIM6295, 1000000) // 5MHz can't be right!
MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index f508a770be0..447e3a5a2cc 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -559,7 +559,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( lsasquad )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz? */
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 MHz? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -605,7 +605,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( daikaiju )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000)
MDRV_CPU_PROGRAM_MAP(mem_daikaiju, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c
index 2918d07d3c5..4a0a42d77bf 100644
--- a/src/mame/drivers/ltcasino.c
+++ b/src/mame/drivers/ltcasino.c
@@ -647,7 +647,7 @@ static VIDEO_UPDATE(ltcasino)
static MACHINE_DRIVER_START( ltcasino )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,2000000) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", M6502,2000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/lucky8.c b/src/mame/drivers/lucky8.c
index 18c63292d0c..66de01305c0 100644
--- a/src/mame/drivers/lucky8.c
+++ b/src/mame/drivers/lucky8.c
@@ -356,7 +356,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( lucky8 )
// basic machine hardware
- MDRV_CPU_ADD(Z80, 12000000/4) // ??? Runs far too fast
+ MDRV_CPU_ADD_TAG("main", Z80, 12000000/4) // ??? Runs far too fast
MDRV_CPU_PROGRAM_MAP(lucky8_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c
index 682bad65096..c450208cb13 100644
--- a/src/mame/drivers/m57.c
+++ b/src/mame/drivers/m57.c
@@ -225,7 +225,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( m57 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_18_432MHz/6) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_18_432MHz/6) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c
index 6ec119bfaf0..1ff4ac13e7e 100644
--- a/src/mame/drivers/m58.c
+++ b/src/mame/drivers/m58.c
@@ -190,7 +190,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( yard )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MASTER_CLOCK/3/2)
+ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/3/2)
MDRV_CPU_PROGRAM_MAP(yard_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index 8acf6fab436..d47fe7f736f 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -670,7 +670,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fghtbskt )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_12MHz/4) /* 3 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/4) /* 3 MHz */
MDRV_CPU_PROGRAM_MAP(fghtbskt_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c
index f047d9574fd..d9ba9c8ecd3 100644
--- a/src/mame/drivers/m79amb.c
+++ b/src/mame/drivers/m79amb.c
@@ -192,7 +192,7 @@ static DRIVER_INIT( m79amb )
static MACHINE_DRIVER_START( m79amb )
/* basic machine hardware */
- MDRV_CPU_ADD(8080, 1996800)
+ MDRV_CPU_ADD_TAG("main", 8080, 1996800)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", m79amb_interrupt)
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index a75a7bd95e2..349f2165978 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -531,7 +531,7 @@ static const struct ES5506interface es5506_interface =
static MACHINE_DRIVER_START( macrossp )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 50000000/2) /* 25 MHz */
+ MDRV_CPU_ADD_TAG("main", M68EC020, 50000000/2) /* 25 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq3_line_hold) // there are others ...
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index 4e13152a938..94fceff0425 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -175,7 +175,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( madalien )
/* main CPU */
- MDRV_CPU_ADD(M6502, MADALIEN_MAIN_CLOCK / 8) /* 1324kHz */
+ MDRV_CPU_ADD_TAG("main", M6502, MADALIEN_MAIN_CLOCK / 8) /* 1324kHz */
MDRV_CPU_PROGRAM_MAP(main_map, 0)
/* audio CPU */
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 4cfeb5d429f..3db8d423695 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -284,7 +284,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( madmotor )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* Custom chip 59, 24 MHz crystal */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* Custom chip 59, 24 MHz crystal */
MDRV_CPU_PROGRAM_MAP(madmotor_readmem,madmotor_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL */
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index 13a13bc8c52..ca9bcd84527 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -364,7 +364,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( magmax )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(magmax_readmem,magmax_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index 10627a9e6a9..89c838d3549 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -707,7 +707,7 @@ static const struct upd7759_interface upd7759_interface =
static MACHINE_DRIVER_START( mainevt )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309, 3000000*4) /* ?? */
+ MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* ?? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", mainevt_interrupt)
@@ -748,7 +748,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( devstors )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309, 3000000*4) /* ?? */
+ MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* ?? */
MDRV_CPU_PROGRAM_MAP(dv_readmem,dv_writemem)
MDRV_CPU_VBLANK_INT("main", dv_interrupt)
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index 1940a62e1f9..4c7f39fbb3f 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -371,7 +371,7 @@ static GFXDECODE_START( mainsnk )
GFXDECODE_END
static MACHINE_DRIVER_START( mainsnk )
- MDRV_CPU_ADD(Z80, 3360000)
+ MDRV_CPU_ADD_TAG("main", Z80, 3360000)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 7c0386fb18b..ec31db98dc8 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -1570,7 +1570,7 @@ static const struct namco_interface namco_interface =
static MACHINE_DRIVER_START( superpac )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
+ MDRV_CPU_ADD_TAG("main", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
MDRV_CPU_PROGRAM_MAP(superpac_cpu1_map,0)
MDRV_CPU_VBLANK_INT("main", mappy_interrupt_1) // also update the custom I/O chips
@@ -1617,7 +1617,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( phozon )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* MAIN CPU */
+ MDRV_CPU_ADD_TAG("main", M6809, PIXEL_CLOCK/4) /* MAIN CPU */
MDRV_CPU_PROGRAM_MAP(phozon_cpu1_map,0)
MDRV_CPU_VBLANK_INT("main", mappy_interrupt_1) // also update the custom I/O chips
@@ -1658,7 +1658,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mappy )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
+ MDRV_CPU_ADD_TAG("main", M6809, PIXEL_CLOCK/4) /* 1.536 MHz */
MDRV_CPU_PROGRAM_MAP(mappy_cpu1_map,0)
MDRV_CPU_VBLANK_INT("main", mappy_interrupt_1) // also update the custom I/O chips
diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c
index cb02ede11ef..55c89a95bd7 100644
--- a/src/mame/drivers/marinedt.c
+++ b/src/mame/drivers/marinedt.c
@@ -584,7 +584,7 @@ static VIDEO_UPDATE( marinedt )
static MACHINE_DRIVER_START( marinedt )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,10000000/4)
+ MDRV_CPU_ADD_TAG("main", Z80,10000000/4)
MDRV_CPU_PROGRAM_MAP(marinedt_readmem,marinedt_writemem)
MDRV_CPU_IO_MAP(marinedt_readport,marinedt_writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c
index cb5fc3f4ebd..2cc6f400bf8 100644
--- a/src/mame/drivers/markham.c
+++ b/src/mame/drivers/markham.c
@@ -198,7 +198,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( markham )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000/2) /* 4.000MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* 4.000MHz */
MDRV_CPU_PROGRAM_MAP(readmem1,writemem1)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/marvins.c b/src/mame/drivers/marvins.c
index 2159837b00a..35d56655fcd 100644
--- a/src/mame/drivers/marvins.c
+++ b/src/mame/drivers/marvins.c
@@ -510,7 +510,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( marvins )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3360000) /* 3.36 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 3360000) /* 3.36 MHz */
MDRV_CPU_PROGRAM_MAP(marvins_cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -568,8 +568,7 @@ static MACHINE_DRIVER_START( vangrd2 )
MDRV_CPU_PROGRAM_MAP(madcrash_cpuB_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
- MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz */
- /* audio CPU */
+ MDRV_CPU_ADD_TAG("audio", Z80, 4000000) /* 4.0 MHz */
MDRV_CPU_PROGRAM_MAP(sound_map,0)
MDRV_CPU_IO_MAP(sound_portmap,0)
MDRV_CPU_PERIODIC_INT(nmi_line_assert, 244)
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index 2316aca7208..fe2b7800b70 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -321,7 +321,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( matmania )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 1500000) /* 1.5 MHz ???? */
+ MDRV_CPU_ADD_TAG("main", M6502, 1500000) /* 1.5 MHz ???? */
MDRV_CPU_PROGRAM_MAP(matmania_readmem,matmania_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -377,7 +377,7 @@ static const struct YM3526interface ym3526_interface =
static MACHINE_DRIVER_START( maniach )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 1500000) /* 1.5 MHz ???? */
+ MDRV_CPU_ADD_TAG("main", M6502, 1500000) /* 1.5 MHz ???? */
MDRV_CPU_PROGRAM_MAP(maniach_readmem,maniach_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index b8559b9df4b..35103eaa16e 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -282,7 +282,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( mayumi )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MCLK/2) /* 5.000 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, MCLK/2) /* 5.000 MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", mayumi_interrupt)
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index 76e73105dca..43cf8df97bb 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -1493,7 +1493,7 @@ static const struct AY8910interface ay8912_interface_2 =
static MACHINE_DRIVER_START( mazerbla )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
@@ -1536,7 +1536,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( greatgun )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz, no NMI, IM2 - vectors at 0xf8, 0xfa, 0xfc */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(gg_readport,gg_writeport)
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 291253b2a9a..55d64113bfd 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -492,7 +492,7 @@ static const struct YM2610interface mcatadv_ym2610_interface =
static MACHINE_DRIVER_START( mcatadv )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_16MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(mcatadv_readmem,mcatadv_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index d430bb61668..3a758aa1b8a 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -880,7 +880,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( zwackery )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 7652400) /* should be XTAL_16MHz/2 */
+ MDRV_CPU_ADD_TAG("main", M68000, 7652400) /* should be XTAL_16MHz/2 */
MDRV_CPU_PROGRAM_MAP(zwackery_map,0)
MDRV_CPU_VBLANK_INT("main", mcr68_interrupt)
diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c
index b57efbb2198..cbec956765e 100644
--- a/src/mame/drivers/meadows.c
+++ b/src/mame/drivers/meadows.c
@@ -587,7 +587,7 @@ static const struct Samplesinterface bowl3d_samples_interface =
static MACHINE_DRIVER_START( meadows )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650, 5000000/8) /* 5MHz / 8 = 625 kHz */
+ MDRV_CPU_ADD_TAG("main", S2650, 5000000/8) /* 5MHz / 8 = 625 kHz */
MDRV_CPU_PROGRAM_MAP(meadows_main_map,0)
MDRV_CPU_VBLANK_INT("main", meadows_interrupt) /* one interrupt per frame!? */
@@ -627,7 +627,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( minferno )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650, 5000000/8/3) /* 5MHz / 8 = 625 kHz */
+ MDRV_CPU_ADD_TAG("main", S2650, 5000000/8/3) /* 5MHz / 8 = 625 kHz */
MDRV_CPU_PROGRAM_MAP(minferno_main_map,0)
MDRV_CPU_IO_MAP(minferno_io_map,0)
MDRV_CPU_VBLANK_INT("main", minferno_interrupt)
@@ -655,7 +655,7 @@ static MACHINE_DRIVER_START( bowl3d )
MDRV_IMPORT_FROM(meadows)
/* audio hardware */
- MDRV_SOUND_ADD("samples", SAMPLES, 0)
+ MDRV_SOUND_ADD("samples2", SAMPLES, 0)
MDRV_SOUND_CONFIG(bowl3d_samples_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 9e85cdee0bc..bda69a9a712 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -1032,7 +1032,7 @@ static const struct pit8253_config mediagx_pit8254_config =
static MACHINE_DRIVER_START(mediagx)
/* basic machine hardware */
- MDRV_CPU_ADD(MEDIAGX, 166000000)
+ MDRV_CPU_ADD_TAG("main", MEDIAGX, 166000000)
MDRV_CPU_PROGRAM_MAP(mediagx_map, 0)
MDRV_CPU_IO_MAP(mediagx_io, 0)
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index 0dae0b87187..68a9b79da34 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -771,7 +771,7 @@ static MACHINE_DRIVER_START( mpnew )
MDRV_INTERLEAVE(100)
- MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/15)
+ MDRV_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.25) /* 3.58 MHz */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right",0.25) /* 3.58 MHz */
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 9c1f642a4a0..f51e52371cf 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -726,7 +726,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( system_D )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, SYS_D_CPU_CLOCK) /* 8MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, SYS_D_CPU_CLOCK) /* 8MHz */
MDRV_CPU_PROGRAM_MAP(readmem_D,writemem_D)
MDRV_CPU_VBLANK_INT("main", interrupt_D)
@@ -788,7 +788,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( system_Z )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, SYS_A_CPU_CLOCK) /* 6MHz (12MHz / 2) */
+ MDRV_CPU_ADD_TAG("main", M68000, SYS_A_CPU_CLOCK) /* 6MHz (12MHz / 2) */
MDRV_CPU_PROGRAM_MAP(readmem_A,writemem_A)
MDRV_CPU_VBLANK_INT_HACK(interrupt_A,INTERRUPT_NUM_A)
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index f3c0f2be9b4..b54c37dca4d 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -632,7 +632,7 @@ static MACHINE_DRIVER_START( megatech )
MDRV_SCREEN_VISIBLE_AREA(0, 256-1, 0, 224-1)
/* sound hardware */
- MDRV_SOUND_ADD("sn", SN76496, MASTER_CLOCK/15)
+ MDRV_SOUND_ADD("sn2", SN76496, MASTER_CLOCK/15)
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index 96b7039ea64..361ccf14080 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -314,7 +314,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( megazone )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 18432000/9) /* 2 MHz */
+ MDRV_CPU_ADD_TAG("main", M6809, 18432000/9) /* 2 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index 4a52138cc0d..ac5518fe693 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -253,7 +253,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mermaid )
// basic machine hardware
- MDRV_CPU_ADD(Z80, 4000000) // ???
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) // ???
MDRV_CPU_PROGRAM_MAP(mermaid_map, 0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index 43d871f7f2d..68b7b4a4e12 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -314,7 +314,7 @@ static MACHINE_RESET( metlclsh )
static MACHINE_DRIVER_START( metlclsh )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1500000) // ?
+ MDRV_CPU_ADD_TAG("main", M6809, 1500000) // ?
MDRV_CPU_PROGRAM_MAP(metlclsh_readmem, metlclsh_writemem)
// IRQ by YM3526, NMI by cpu #2
@@ -342,13 +342,13 @@ static MACHINE_DRIVER_START( metlclsh )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("ym", YM2203, 1500000)
+ MDRV_SOUND_ADD("ym1", YM2203, 1500000)
MDRV_SOUND_ROUTE(0, "mono", 0.10)
MDRV_SOUND_ROUTE(1, "mono", 0.10)
MDRV_SOUND_ROUTE(2, "mono", 0.10)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD("ym", YM3526, 3000000)
+ MDRV_SOUND_ADD("ym2", YM3526, 3000000)
MDRV_SOUND_CONFIG(ym3526_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 3d2eb1c8141..0d6e7bdea71 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -3763,7 +3763,7 @@ static const UPD7810_CONFIG metro_cpu_config =
static MACHINE_DRIVER_START( balcube )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(balcube_readmem,balcube_writemem)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
@@ -3829,7 +3829,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( batlbubl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(batlbubl_readmem,batlbubl_writemem)
MDRV_CPU_VBLANK_INT("main", bangball_interrupt)
@@ -3861,7 +3861,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( daitorid )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(daitorid_readmem,daitorid_writemem)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
@@ -3905,7 +3905,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( dharma )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(dharma_readmem,dharma_writemem)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
@@ -3948,7 +3948,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( karatour )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(karatour_readmem,karatour_writemem)
MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
@@ -3991,7 +3991,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( 3kokushi )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(kokushi_readmem,kokushi_writemem)
MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
@@ -4034,7 +4034,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( lastfort )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(lastfort_readmem,lastfort_writemem)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
@@ -4076,7 +4076,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( lastforg )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(lastforg_readmem,lastforg_writemem)
MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
@@ -4118,7 +4118,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( dokyusei )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(dokyusei_readmem,dokyusei_writemem)
MDRV_CPU_VBLANK_INT_HACK(dokyusei_interrupt,2) /* ? */
@@ -4168,7 +4168,7 @@ static NVRAM_HANDLER( dokyusp )
static MACHINE_DRIVER_START( dokyusp )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(dokyusp_readmem,dokyusp_writemem)
MDRV_CPU_VBLANK_INT("main", gakusai_interrupt)
@@ -4206,7 +4206,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gakusai )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(gakusai_readmem,gakusai_writemem)
MDRV_CPU_VBLANK_INT("main", gakusai_interrupt)
@@ -4244,7 +4244,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gakusai2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(gakusai2_readmem,gakusai2_writemem)
MDRV_CPU_VBLANK_INT("main", gakusai_interrupt)
@@ -4282,7 +4282,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pangpoms )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(pangpoms_readmem,pangpoms_writemem)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
@@ -4325,7 +4325,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( poitto )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(poitto_readmem,poitto_writemem)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
@@ -4368,7 +4368,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pururun )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(pururun_readmem,pururun_writemem)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
@@ -4412,7 +4412,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( skyalert )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(skyalert_readmem,skyalert_writemem)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
@@ -4455,7 +4455,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( toride2g )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(toride2g_readmem,toride2g_writemem)
MDRV_CPU_VBLANK_INT_HACK(metro_interrupt,10) /* ? */
@@ -4498,7 +4498,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mouja )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* ??? */
MDRV_CPU_PROGRAM_MAP(mouja_readmem,mouja_writemem)
MDRV_CPU_VBLANK_INT("main", mouja_interrupt)
@@ -4534,7 +4534,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( blzntrnd )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(blzntrnd_readmem,blzntrnd_writemem)
MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
@@ -4574,7 +4574,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gstrik2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(blzntrnd_readmem,blzntrnd_writemem)
MDRV_CPU_VBLANK_INT_HACK(karatour_interrupt,10) /* ? */
@@ -4644,7 +4644,7 @@ static INTERRUPT_GEN( puzzlet_interrupt )
static MACHINE_DRIVER_START( puzzlet )
/* basic machine hardware */
- MDRV_CPU_ADD(H83007, XTAL_20MHz) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz
+ MDRV_CPU_ADD_TAG("main", H83007, XTAL_20MHz) // H8/3007 - Hitachi HD6413007F20 CPU. Clock 20MHz
MDRV_CPU_PROGRAM_MAP(puzzlet_map,0)
MDRV_CPU_IO_MAP(puzzlet_io_map,0)
diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c
index 776777f1192..eb37295e4e8 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -291,7 +291,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mgolf )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 12096000 / 16) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16) /* ? */
MDRV_CPU_PROGRAM_MAP(cpu_map, 0)
MDRV_MACHINE_RESET(mgolf)
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index effbaf862b6..2e41ef0b2db 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -859,7 +859,7 @@ static const tms34010_config vgb_config =
static MACHINE_DRIVER_START( micro3d )
- MDRV_CPU_ADD(M68000, 12000000 )
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000 )
MDRV_CPU_PROGRAM_MAP(hostmem,0)
MDRV_CPU_VBLANK_INT("main", micro3d_vblank)
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index 6e11678e147..0396702885c 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -440,7 +440,7 @@ static const struct YMZ280Binterface ymz280b_interface =
static MACHINE_DRIVER_START( livequiz )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 24000000 / 2)
+ MDRV_CPU_ADD_TAG("main", M68000, 24000000 / 2)
MDRV_CPU_PROGRAM_MAP(mem_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/midwunit.c b/src/mame/drivers/midwunit.c
index 73fbdd22848..1927cb14acc 100644
--- a/src/mame/drivers/midwunit.c
+++ b/src/mame/drivers/midwunit.c
@@ -633,7 +633,7 @@ static const tms34010_config tms_config =
static MACHINE_DRIVER_START( wunit )
- MDRV_CPU_ADD(TMS34010, 50000000)
+ MDRV_CPU_ADD_TAG("main", TMS34010, 50000000)
MDRV_CPU_CONFIG(tms_config)
MDRV_CPU_PROGRAM_MAP(main_map,0)
diff --git a/src/mame/drivers/midxunit.c b/src/mame/drivers/midxunit.c
index bfd177fb9d8..3b51e0e3343 100644
--- a/src/mame/drivers/midxunit.c
+++ b/src/mame/drivers/midxunit.c
@@ -192,7 +192,7 @@ static const tms34010_config tms_config =
static MACHINE_DRIVER_START( midxunit )
/* basic machine hardware */
- MDRV_CPU_ADD(TMS34020, 40000000)
+ MDRV_CPU_ADD_TAG("main", TMS34020, 40000000)
MDRV_CPU_CONFIG(tms_config)
MDRV_CPU_PROGRAM_MAP(main_map,0)
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index f0e0d285eb9..6cfcab1a345 100644
--- a/src/mame/drivers/midyunit.c
+++ b/src/mame/drivers/midyunit.c
@@ -1016,7 +1016,7 @@ static const tms34010_config yunit_tms_config =
static MACHINE_DRIVER_START( zunit )
/* basic machine hardware */
- MDRV_CPU_ADD(TMS34010, FAST_MASTER_CLOCK)
+ MDRV_CPU_ADD_TAG("main", TMS34010, FAST_MASTER_CLOCK)
MDRV_CPU_CONFIG(zunit_tms_config)
MDRV_CPU_PROGRAM_MAP(main_map,0)
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index fa55753f537..36d92653401 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -244,7 +244,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mikie )
// basic machine hardware
- MDRV_CPU_ADD(M6809, 1250000) // ??? MC68A09E
+ MDRV_CPU_ADD_TAG("main", M6809, 1250000) // ??? MC68A09E
MDRV_CPU_PROGRAM_MAP(mikie_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c
index f652b825d90..cec4be9224c 100644
--- a/src/mame/drivers/minivadr.c
+++ b/src/mame/drivers/minivadr.c
@@ -70,7 +70,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( minivadr )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,24000000 / 6) /* 4 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80,24000000 / 6) /* 4 MHz ? */
MDRV_CPU_PROGRAM_MAP(minivadr_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index dd9e78c37f1..9c29bfb3f5d 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -346,7 +346,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mirage )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 28000000/2)
+ MDRV_CPU_ADD_TAG("main", M68000, 28000000/2)
MDRV_CPU_PROGRAM_MAP(mirage_readmem,mirage_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c
index 4a0ee662c3f..fe516fcbfc5 100644
--- a/src/mame/drivers/mirax.c
+++ b/src/mame/drivers/mirax.c
@@ -177,7 +177,7 @@ static INPUT_PORTS_START( mirax )
INPUT_PORTS_END
static MACHINE_DRIVER_START( mirax )
- MDRV_CPU_ADD(Z80, 12000000) // audio cpu ?
+ MDRV_CPU_ADD_TAG("main", Z80, 12000000) // audio cpu ?
MDRV_CPU_PROGRAM_MAP(memory_map,0)
MDRV_CPU_IO_MAP(io_map,0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 2)
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 0c96221a053..347f1481a17 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -355,7 +355,7 @@ static INTERRUPT_GEN( missb2_interrupt )
static MACHINE_DRIVER_START( missb2 )
// basic machine hardware
- MDRV_CPU_ADD(Z80, MAIN_XTAL/4) // 6 MHz
+ MDRV_CPU_ADD_TAG("main", Z80, MAIN_XTAL/4) // 6 MHz
MDRV_CPU_PROGRAM_MAP(master_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index 75096a3f12e..4e30c1f66ce 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -887,7 +887,7 @@ static const struct POKEYinterface pokey_interface =
static MACHINE_DRIVER_START( missile )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, MASTER_CLOCK/8)
+ MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK/8)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_START(missile)
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index e6cd25cbd13..94bff4e0554 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -1131,7 +1131,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mgakuen )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000) /* ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* ??? */
MDRV_CPU_PROGRAM_MAP(mgakuen_readmem,mgakuen_writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
@@ -1263,7 +1263,7 @@ static MACHINE_DRIVER_START( mstworld )
/* it doesn't glitch with the clock speed set to 4x normal, however this is incorrect..
the interrupt handling (and probably various irq flags / vbl flags handling etc.) is
more likely wrong.. the game appears to run too fast anyway .. */
- MDRV_CPU_ADD(Z80, 6000000*4)
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000*4)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(mstworld_readport,mstworld_writeport)
@@ -1299,7 +1299,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( marukin )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 8000000) /* Super Pang says 8MHZ ORIGINAL BOARD */
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* Super Pang says 8MHZ ORIGINAL BOARD */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ??? one extra irq seems to be needed for music (see input5_r) */
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index 667882a182a..a91452bf99a 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -355,7 +355,7 @@ static const struct CustomSound_interface adpcm_interface =
static MACHINE_DRIVER_START( mjkjidai )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,10000000/2) /* 5 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", Z80,10000000/2) /* 5 MHz ??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c
index 892ada43fff..701072746ec 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -311,7 +311,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( mjsister )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MCLK/2) /* 6.000 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, MCLK/2) /* 6.000 MHz */
MDRV_CPU_PROGRAM_MAP(mjsister_readmem,mjsister_writemem)
MDRV_CPU_IO_MAP(mjsister_readport,mjsister_writeport)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
diff --git a/src/mame/drivers/mjsiyoub.c b/src/mame/drivers/mjsiyoub.c
index 0c30b32d3b9..1c511549a18 100644
--- a/src/mame/drivers/mjsiyoub.c
+++ b/src/mame/drivers/mjsiyoub.c
@@ -84,7 +84,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( mjsiyoub )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,18432000/4)
+ MDRV_CPU_ADD_TAG("main", Z80,18432000/4)
MDRV_CPU_PROGRAM_MAP(readmem1,writemem1)
// MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index 2e727c3c9b1..df4a19d8fc3 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -361,7 +361,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( mlanding )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000 ) /* 12 MHz ??? (guess) */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000 ) /* 12 MHz ??? (guess) */
MDRV_CPU_PROGRAM_MAP(mlanding_mem, 0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 2a0f1ca3a89..0f4aa2ea78d 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -1506,7 +1506,7 @@ ROM_START( wingwara )
ROM_END
static MACHINE_DRIVER_START( model1 )
- MDRV_CPU_ADD(V60, 16000000)
+ MDRV_CPU_ADD_TAG("main", V60, 16000000)
MDRV_CPU_PROGRAM_MAP(model1_mem, 0)
MDRV_CPU_IO_MAP(model1_io, 0)
MDRV_CPU_VBLANK_INT_HACK(model1_interrupt, 2)
@@ -1550,7 +1550,7 @@ static MACHINE_DRIVER_START( model1 )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( model1_vr )
- MDRV_CPU_ADD(V60, 16000000)
+ MDRV_CPU_ADD_TAG("main", V60, 16000000)
MDRV_CPU_PROGRAM_MAP(model1_vr_mem, 0)
MDRV_CPU_IO_MAP(model1_vr_io, 0)
MDRV_CPU_VBLANK_INT_HACK(model1_interrupt, 2)
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index d8d4374c5ce..74f53db3abc 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -1788,7 +1788,7 @@ static const struct mb86233_config tgp_config =
/* original Model 2 */
static MACHINE_DRIVER_START( model2o )
- MDRV_CPU_ADD(I960, 25000000)
+ MDRV_CPU_ADD_TAG("main", I960, 25000000)
MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2o_mem)
MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2)
@@ -1835,7 +1835,7 @@ MACHINE_DRIVER_END
/* 2A-CRX */
static MACHINE_DRIVER_START( model2a )
- MDRV_CPU_ADD(I960, 25000000)
+ MDRV_CPU_ADD_TAG("main", I960, 25000000)
MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2a_crx_mem)
MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2)
@@ -1879,7 +1879,7 @@ static const sharc_config sharc_cfg =
/* 2B-CRX */
static MACHINE_DRIVER_START( model2b )
- MDRV_CPU_ADD(I960, 25000000)
+ MDRV_CPU_ADD_TAG("main", I960, 25000000)
MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2b_crx_mem)
MDRV_CPU_VBLANK_INT_HACK(model2_interrupt,2)
@@ -1923,7 +1923,7 @@ MACHINE_DRIVER_END
/* 2C-CRX */
static MACHINE_DRIVER_START( model2c )
- MDRV_CPU_ADD(I960, 25000000)
+ MDRV_CPU_ADD_TAG("main", I960, 25000000)
MDRV_CPU_PROGRAM_MAP(model2_base_mem, model2c_crx_mem)
MDRV_CPU_VBLANK_INT_HACK(model2c_interrupt,3)
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 24f42e21c0a..81cc633026d 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -4237,7 +4237,7 @@ static const powerpc_config model3_2x =
};
static MACHINE_DRIVER_START( model3_10 )
- MDRV_CPU_ADD(PPC603E, 66000000)
+ MDRV_CPU_ADD_TAG("main", PPC603E, 66000000)
MDRV_CPU_CONFIG(model3_10)
MDRV_CPU_PROGRAM_MAP(model3_mem, 0)
MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2)
@@ -4276,7 +4276,7 @@ static MACHINE_DRIVER_START( model3_10 )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( model3_15 )
- MDRV_CPU_ADD(PPC603E, 100000000)
+ MDRV_CPU_ADD_TAG("main", PPC603E, 100000000)
MDRV_CPU_CONFIG(model3_15)
MDRV_CPU_PROGRAM_MAP(model3_mem, 0)
MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2)
@@ -4313,7 +4313,7 @@ static MACHINE_DRIVER_START( model3_15 )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( model3_20 )
- MDRV_CPU_ADD(PPC603R, 166000000)
+ MDRV_CPU_ADD_TAG("main", PPC603R, 166000000)
MDRV_CPU_CONFIG(model3_2x)
MDRV_CPU_PROGRAM_MAP(model3_mem, 0)
MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2)
@@ -4350,7 +4350,7 @@ static MACHINE_DRIVER_START( model3_20 )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( model3_21 )
- MDRV_CPU_ADD(PPC603R, 166000000)
+ MDRV_CPU_ADD_TAG("main", PPC603R, 166000000)
MDRV_CPU_CONFIG(model3_2x)
MDRV_CPU_PROGRAM_MAP(model3_mem, 0)
MDRV_CPU_VBLANK_INT_HACK(model3_interrupt,2)
diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c
index 41012408a93..2d91c651bd0 100644
--- a/src/mame/drivers/mogura.c
+++ b/src/mame/drivers/mogura.c
@@ -212,7 +212,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mogura )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,3000000) /* 3 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,3000000) /* 3 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c
index a9af5cdec81..97589a0b1cd 100644
--- a/src/mame/drivers/mole.c
+++ b/src/mame/drivers/mole.c
@@ -195,7 +195,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mole )
// basic machine hardware
- MDRV_CPU_ADD(M6502, 4000000) // ???
+ MDRV_CPU_ADD_TAG("main", M6502, 4000000) // ???
MDRV_CPU_PROGRAM_MAP(mole_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index a24e2d28e2e..90e0dcb5db4 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -259,7 +259,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( momoko )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 5000000) /* 5.0MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5.0MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index 5a144e9bdf8..2d0a1ca9c23 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -200,7 +200,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mouser )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", mouser_nmi_interrupt) /* NMI is masked externally */
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index ca7dcf60424..2d93cde6278 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -351,7 +351,7 @@ static MACHINE_RESET(mquake)
static MACHINE_DRIVER_START( mquake )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, AMIGA_68000_NTSC_CLOCK)
+ MDRV_CPU_ADD_TAG("main", M68000, AMIGA_68000_NTSC_CLOCK)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_RESET(mquake)
diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c
index 49c21904826..4d18c4fc206 100644
--- a/src/mame/drivers/mrdo.c
+++ b/src/mame/drivers/mrdo.c
@@ -176,7 +176,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mrdo )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000/2) /* 4 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index 91d0ca76c04..8fafd79a44b 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -279,7 +279,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( mrflea )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* NMI resets the game */
diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c
index a4f29031cbb..91afe07b39d 100644
--- a/src/mame/drivers/mrjong.c
+++ b/src/mame/drivers/mrjong.c
@@ -179,7 +179,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( mrjong )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,15468000/6) /* 2.578 MHz?? */
+ MDRV_CPU_ADD_TAG("main", Z80,15468000/6) /* 2.578 MHz?? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index 69003357b1b..3b9a6d6e998 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -1399,7 +1399,7 @@ static MACHINE_RESET( ms32 )
static MACHINE_DRIVER_START( ms32 )
/* basic machine hardware */
- MDRV_CPU_ADD(V70, 20000000) // 20MHz
+ MDRV_CPU_ADD_TAG("main", V70, 20000000) // 20MHz
MDRV_CPU_PROGRAM_MAP(ms32_readmem,ms32_writemem)
MDRV_CPU_VBLANK_INT_HACK(ms32_interrupt,32)
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index 6d782d7da03..74f8ac24836 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -518,7 +518,7 @@ static const struct MSM5232interface msm5232_interface =
static MACHINE_DRIVER_START( msisaac )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index e13db267f2e..db299b42715 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -427,7 +427,7 @@ static const struct YM2151interface ym2151_interface =
};
static MACHINE_DRIVER_START( mugsmash )
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(mugsmash_readmem,mugsmash_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index 58e9cc1b8a7..0788c970057 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -281,7 +281,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( munchmo )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3750000) /* ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 3750000) /* ? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(mnchmobl_interrupt,2)
diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c
index f15ef4ffab0..f17ed34f1bc 100644
--- a/src/mame/drivers/murogem.c
+++ b/src/mame/drivers/murogem.c
@@ -194,7 +194,7 @@ static VIDEO_UPDATE(murogem)
static MACHINE_DRIVER_START( murogem )
/* basic machine hardware */
- MDRV_CPU_ADD(M6802,8000000) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", M6802,8000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(murogem_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c
index 162a499cb39..94518344ba1 100644
--- a/src/mame/drivers/mustache.c
+++ b/src/mame/drivers/mustache.c
@@ -204,7 +204,7 @@ static INTERRUPT_GEN( assert_irq )
static MACHINE_DRIVER_START( mustache )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", Z80, CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(memmap, 0)
MDRV_CPU_VBLANK_INT("main", assert_irq)
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index fb4d57d694b..5159b21a1ba 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -450,7 +450,7 @@ static VIDEO_UPDATE( mwarr )
}
static MACHINE_DRIVER_START( mwarr )
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(mwarr_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c
index 75c861b0779..b48f8b26edd 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -211,7 +211,7 @@ static MACHINE_DRIVER_START( mystston )
MDRV_DRIVER_DATA(mystston_state)
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", M6502, CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(main_map,0)
/* video hardware */
diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c
index d179de2445f..644fe3b71a6 100644
--- a/src/mame/drivers/n8080.c
+++ b/src/mame/drivers/n8080.c
@@ -76,7 +76,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( spacefev )
/* basic machine hardware */
- MDRV_CPU_ADD(8080, 20160000 / 10)
+ MDRV_CPU_ADD_TAG("main", 8080, 20160000 / 10)
MDRV_CPU_PROGRAM_MAP(main_cpu_map, 0)
MDRV_CPU_IO_MAP(main_io_map, 0)
MDRV_CPU_VBLANK_INT_HACK(interrupt, 2)
@@ -101,7 +101,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sheriff )
/* basic machine hardware */
- MDRV_CPU_ADD(8080, 20160000 / 10)
+ MDRV_CPU_ADD_TAG("main", 8080, 20160000 / 10)
MDRV_CPU_PROGRAM_MAP(main_cpu_map, 0)
MDRV_CPU_IO_MAP(main_io_map, 0)
MDRV_CPU_VBLANK_INT_HACK(interrupt, 2)
@@ -126,7 +126,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( helifire )
/* basic machine hardware */
- MDRV_CPU_ADD(8080, 20160000 / 10)
+ MDRV_CPU_ADD_TAG("main", 8080, 20160000 / 10)
MDRV_CPU_PROGRAM_MAP(helifire_main_cpu_map, 0)
MDRV_CPU_IO_MAP(main_io_map, 0)
MDRV_CPU_VBLANK_INT_HACK(interrupt, 2)
diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c
index d04de5f19b2..6de27c191e7 100644
--- a/src/mame/drivers/namcofl.c
+++ b/src/mame/drivers/namcofl.c
@@ -351,7 +351,7 @@ static MACHINE_RESET( namcofl )
NAMCO_C7X_HARDWARE
static MACHINE_DRIVER_START( namcofl )
- MDRV_CPU_ADD(I960, 20000000) // i80960KA-20 == 20 MHz part
+ MDRV_CPU_ADD_TAG("main", I960, 20000000) // i80960KA-20 == 20 MHz part
MDRV_CPU_PROGRAM_MAP(namcofl_mem, 0)
NAMCO_C7X_MCU_SHARED( 16384000 )
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index 6254d55b00a..21bdd458f37 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -1281,7 +1281,7 @@ static const struct C140interface C140_interface_typeA =
/* cropped at sides */
static MACHINE_DRIVER_START( namcona1 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 50113000/4)
+ MDRV_CPU_ADD_TAG("main", M68000, 50113000/4)
MDRV_CPU_PROGRAM_MAP(namcona1_main_map,0)
MDRV_CPU_VBLANK_INT_HACK(namcona1_interrupt,5)
@@ -1375,7 +1375,7 @@ static struct NAMCONAinterface NAMCONA_interface =
static MACHINE_DRIVER_START( namcona2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 50113000/4)
+ MDRV_CPU_ADD_TAG("main", M68000, 50113000/4)
MDRV_CPU_PROGRAM_MAP(namcona2_readmem,namcona2_writemem)
MDRV_CPU_VBLANK_INT_HACK(namcona1_interrupt,5)
diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c
index fa2cd7c0b38..b1ca65d2fa1 100644
--- a/src/mame/drivers/namconb1.c
+++ b/src/mame/drivers/namconb1.c
@@ -748,7 +748,7 @@ ADDRESS_MAP_END /* namconb2_readmem */
NAMCO_C7X_HARDWARE
static MACHINE_DRIVER_START( namconb1 )
- MDRV_CPU_ADD(M68EC020,MASTER_CLOCK_HZ/2)
+ MDRV_CPU_ADD_TAG("main", M68EC020,MASTER_CLOCK_HZ/2)
MDRV_CPU_PROGRAM_MAP(namconb1_am,0)
MDRV_CPU_VBLANK_INT("main", namconb1_interrupt)
@@ -772,7 +772,7 @@ static MACHINE_DRIVER_START( namconb1 )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( namconb2 )
- MDRV_CPU_ADD(M68EC020,MASTER_CLOCK_HZ/2)
+ MDRV_CPU_ADD_TAG("main", M68EC020,MASTER_CLOCK_HZ/2)
MDRV_CPU_PROGRAM_MAP(namconb2_am,0)
MDRV_CPU_VBLANK_INT("main", namconb2_interrupt)
diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c
index 255463637c4..aaa53d220f0 100644
--- a/src/mame/drivers/namcond1.c
+++ b/src/mame/drivers/namcond1.c
@@ -293,7 +293,7 @@ static DRIVER_INIT( namcond1 )
static MACHINE_DRIVER_START( namcond1 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12288000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12288000)
MDRV_CPU_PROGRAM_MAP(namcond1_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
MDRV_CPU_PERIODIC_INT(ygv608_timed_interrupt, 1000)
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index f771078c64b..244cb4a9b13 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -973,7 +973,7 @@ static const struct namco_interface namco_interface =
static MACHINE_DRIVER_START( ns1 )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809,49152000/32)
+ MDRV_CPU_ADD_TAG("main", M6809,49152000/32)
MDRV_CPU_PROGRAM_MAP(main_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c
index 513b887af07..4c88a5a7eaa 100644
--- a/src/mame/drivers/namcos10.c
+++ b/src/mame/drivers/namcos10.c
@@ -377,7 +377,7 @@ static MACHINE_RESET( namcos10 )
static MACHINE_DRIVER_START( namcos10 )
/* basic machine hardware */
- MDRV_CPU_ADD( PSXCPU, XTAL_101_4912MHz )
+ MDRV_CPU_ADD_TAG("main", PSXCPU, XTAL_101_4912MHz )
MDRV_CPU_PROGRAM_MAP( namcos10_map, 0 )
MDRV_CPU_VBLANK_INT("main", psx_vblank)
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 4f1216d9a12..a8a67cf7379 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -876,7 +876,7 @@ NAMCO_C7X_HARDWARE
static MACHINE_DRIVER_START( coh100 )
/* basic machine hardware */
- MDRV_CPU_ADD( PSXCPU, XTAL_67_7376MHz )
+ MDRV_CPU_ADD_TAG("main", PSXCPU, XTAL_67_7376MHz )
MDRV_CPU_PROGRAM_MAP( namcos11_map, 0 )
MDRV_CPU_VBLANK_INT("main", namcos11_vblank)
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index ef4a11a6dc4..a32461f35f2 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1472,7 +1472,7 @@ static DRIVER_INIT( ghlpanic )
static MACHINE_DRIVER_START( coh700 )
/* basic machine hardware */
- MDRV_CPU_ADD( CXD8661R, XTAL_100MHz )
+ MDRV_CPU_ADD_TAG("main", CXD8661R, XTAL_100MHz )
MDRV_CPU_PROGRAM_MAP( namcos12_map, 0 )
MDRV_CPU_VBLANK_INT("main", psx_vblank)
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index 2a6a0711d3e..6180cc2458c 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -1576,7 +1576,7 @@ via software as INT1
/*************************************************************/
static MACHINE_DRIVER_START( default )
- MDRV_CPU_ADD(M68000, 12288000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12288000)
MDRV_CPU_PROGRAM_MAP(master_default_am,common_default_am)
MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank)
@@ -1650,7 +1650,7 @@ static MACHINE_DRIVER_START( default3 )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gollygho )
- MDRV_CPU_ADD(M68000, 12288000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12288000)
MDRV_CPU_PROGRAM_MAP(master_default_am,common_default_am)
MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank)
@@ -1700,7 +1700,7 @@ static MACHINE_DRIVER_START( gollygho )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( finallap )
- MDRV_CPU_ADD(M68000, 12288000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12288000)
MDRV_CPU_PROGRAM_MAP(master_finallap_am,common_finallap_am)
MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank)
@@ -1750,7 +1750,7 @@ static MACHINE_DRIVER_START( finallap )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sgunner )
- MDRV_CPU_ADD(M68000, 12288000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12288000)
MDRV_CPU_PROGRAM_MAP(master_sgunner_am,common_sgunner_am)
MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank)
@@ -1800,7 +1800,7 @@ static MACHINE_DRIVER_START( sgunner )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( luckywld )
- MDRV_CPU_ADD(M68000, 12288000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12288000)
MDRV_CPU_PROGRAM_MAP(master_luckywld_am,common_luckywld_am)
MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank)
@@ -1850,7 +1850,7 @@ static MACHINE_DRIVER_START( luckywld )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( metlhawk )
- MDRV_CPU_ADD(M68000, 12288000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12288000)
MDRV_CPU_PROGRAM_MAP(master_metlhawk_am,common_metlhawk_am)
MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank)
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index 4d1dc673b6a..7f633b8c1be 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -1535,7 +1535,7 @@ static const struct C140interface C140_interface_typeB =
};
static MACHINE_DRIVER_START( s21base )
- MDRV_CPU_ADD(M68000,12288000) /* Master */
+ MDRV_CPU_ADD_TAG("main", M68000,12288000) /* Master */
MDRV_CPU_PROGRAM_MAP(namcos21_68k_master, namcos21_68k_common)
MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank)
@@ -1614,7 +1614,7 @@ static MACHINE_DRIVER_START( poly_c140_typeB )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( driveyes )
- MDRV_CPU_ADD(M68000,12288000) /* Master */
+ MDRV_CPU_ADD_TAG("main", M68000,12288000) /* Master */
MDRV_CPU_PROGRAM_MAP(driveyes_68k_master, driveyes_68k_common)
MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank)
@@ -1669,7 +1669,7 @@ static MACHINE_DRIVER_START( driveyes )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( winrun_c140_typeB )
- MDRV_CPU_ADD(M68000,12288000) /* Master */
+ MDRV_CPU_ADD_TAG("main", M68000,12288000) /* Master */
MDRV_CPU_PROGRAM_MAP(am_master_winrun,0)
MDRV_CPU_VBLANK_INT("main", namcos2_68k_master_vblank)
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index e69833f7fd0..c709c05b6a8 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -2664,18 +2664,18 @@ static MACHINE_DRIVER_START( namcos22s )
MDRV_CPU_PROGRAM_MAP(namcos22s_am,0)
MDRV_CPU_VBLANK_INT_HACK(namcos22s_interrupt,2)
- MDRV_CPU_ADD(TMS32025,SS22_MASTER_CLOCK)
+ MDRV_CPU_ADD_TAG("master", TMS32025,SS22_MASTER_CLOCK)
MDRV_CPU_PROGRAM_MAP(master_dsp_program,0)
MDRV_CPU_DATA_MAP(master_dsp_data,0)
MDRV_CPU_IO_MAP(master_dsp_io,0)
MDRV_CPU_VBLANK_INT_HACK(dsp_serial_pulse1,SERIAL_IO_PERIOD)
- MDRV_CPU_ADD(TMS32025,SS22_MASTER_CLOCK)
+ MDRV_CPU_ADD_TAG("slave", TMS32025,SS22_MASTER_CLOCK)
MDRV_CPU_PROGRAM_MAP(slave_dsp_program,0)
MDRV_CPU_DATA_MAP(slave_dsp_data,0)
MDRV_CPU_IO_MAP(slave_dsp_io,0)
- MDRV_CPU_ADD(M37710, SS22_MASTER_CLOCK/3)
+ MDRV_CPU_ADD_TAG("mcu", M37710, SS22_MASTER_CLOCK/3)
MDRV_CPU_PROGRAM_MAP(mcu_program, 0)
MDRV_CPU_IO_MAP( mcu_io, 0 )
MDRV_CPU_VBLANK_INT_HACK(mcu_interrupt, 3)
@@ -3075,7 +3075,7 @@ static MACHINE_RESET(namcos22)
}
static MACHINE_DRIVER_START( namcos22 )
- MDRV_CPU_ADD(M68020,SS22_MASTER_CLOCK/2) /* 25 MHz? */
+ MDRV_CPU_ADD_TAG("main", M68020,SS22_MASTER_CLOCK/2) /* 25 MHz? */
MDRV_CPU_PROGRAM_MAP(namcos22_am,0)
MDRV_CPU_VBLANK_INT_HACK(namcos22_interrupt,2)
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index 807ae6bf1ce..5354c9cd957 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -1027,7 +1027,7 @@ static const struct C352interface c352_interface =
static MACHINE_DRIVER_START( s23 )
/* basic machine hardware */
- MDRV_CPU_ADD(R4650BE, 166000000)
+ MDRV_CPU_ADD_TAG("main", R4650BE, 166000000)
MDRV_CPU_CONFIG(config)
MDRV_CPU_PROGRAM_MAP(ss23_map, 0)
@@ -1065,7 +1065,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ss23 )
/* basic machine hardware */
- MDRV_CPU_ADD(R4650BE, 166000000)
+ MDRV_CPU_ADD_TAG("main", R4650BE, 166000000)
MDRV_CPU_CONFIG(config)
MDRV_CPU_PROGRAM_MAP(ss23_map, 0)
MDRV_CPU_VBLANK_INT("main", namcos23_interrupt)
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index 76db5a754a1..8fb8439edfa 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -1144,7 +1144,7 @@ static MACHINE_DRIVER_START( genpeitd )
MDRV_CPU_PROGRAM_MAP(genpeitd_mcu_map,0)
/* sound hardware */
- MDRV_SOUND_ADD("namco", NAMCO_63701X, 6000000)
+ MDRV_SOUND_ADD("namco2", NAMCO_63701X, 6000000)
MDRV_SOUND_CONFIG(namco_63701x_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1161,7 +1161,7 @@ static MACHINE_DRIVER_START( rthunder )
MDRV_CPU_PROGRAM_MAP(rthunder_mcu_map,0)
/* sound hardware */
- MDRV_SOUND_ADD("namco", NAMCO_63701X, 6000000)
+ MDRV_SOUND_ADD("namco2", NAMCO_63701X, 6000000)
MDRV_SOUND_CONFIG(namco_63701x_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
@@ -1178,7 +1178,7 @@ static MACHINE_DRIVER_START( wndrmomo )
MDRV_CPU_PROGRAM_MAP(wndrmomo_mcu_map,0)
/* sound hardware */
- MDRV_SOUND_ADD("namco", NAMCO_63701X, 6000000)
+ MDRV_SOUND_ADD("namco2", NAMCO_63701X, 6000000)
MDRV_SOUND_CONFIG(namco_63701x_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index 7db5a5ba7e6..dbd777fb969 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -379,7 +379,7 @@ static const struct TMS36XXinterface tms3615_interface =
static MACHINE_DRIVER_START( naughtyb )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
+ MDRV_CPU_ADD_TAG("main", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", naughtyb_interrupt)
@@ -416,7 +416,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( popflame )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
+ MDRV_CPU_ADD_TAG("main", Z80, CLOCK_XTAL / 4) /* 12 MHz clock, divided by 4. CPU is a Z80A */
MDRV_CPU_PROGRAM_MAP(readmem,popflame_writemem)
MDRV_CPU_VBLANK_INT("main", naughtyb_interrupt)
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index 49216365c10..e99af1db617 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -2149,7 +2149,7 @@ static const struct K007232_interface k007232_interface =
static MACHINE_DRIVER_START( nemesis )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,18432000/2) /* 9.216 MHz? */
+ MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216 MHz? */
// 14318180/2, /* From schematics, should be accurate */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", nemesis_interrupt)
@@ -2198,7 +2198,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( konamigt )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,18432000/2) /* 9.216 MHz? */
+ MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216 MHz? */
MDRV_CPU_PROGRAM_MAP(konamigt_readmem,konamigt_writemem)
MDRV_CPU_VBLANK_INT_HACK(konamigt_interrupt,2)
@@ -2242,7 +2242,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( salamand )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,18432000/2) /* 9.216MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216MHz */
MDRV_CPU_PROGRAM_MAP(salamand_readmem,salamand_writemem)
MDRV_CPU_VBLANK_INT("main", salamand_interrupt)
@@ -2293,7 +2293,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( blkpnthr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,18432000/2) /* 9.216 MHz? */
+ MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216 MHz? */
MDRV_CPU_PROGRAM_MAP(blkpnthr_readmem,blkpnthr_writemem)
MDRV_CPU_VBLANK_INT("main", blkpnthr_interrupt)
@@ -2339,7 +2339,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( citybomb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,18432000/2) /* 9.216 MHz? */
+ MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216 MHz? */
MDRV_CPU_PROGRAM_MAP(citybomb_readmem,citybomb_writemem)
MDRV_CPU_VBLANK_INT("main", salamand_interrupt)
@@ -2389,7 +2389,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( nyanpani )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,18432000/2) /* 9.216 MHz? */
+ MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216 MHz? */
MDRV_CPU_PROGRAM_MAP(nyanpani_readmem,nyanpani_writemem)
MDRV_CPU_VBLANK_INT("main", salamand_interrupt)
@@ -2439,7 +2439,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gx400 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,18432000/2) /* 9.216MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216MHz */
MDRV_CPU_PROGRAM_MAP(gx400_readmem,gx400_writemem)
MDRV_CPU_VBLANK_INT_HACK(gx400_interrupt,3)
@@ -2487,7 +2487,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( rf2_gx400 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,18432000/2) /* 9.216MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,18432000/2) /* 9.216MHz */
MDRV_CPU_PROGRAM_MAP(rf2_gx400_readmem,rf2_gx400_writemem)
MDRV_CPU_VBLANK_INT_HACK(gx400_interrupt,3)
@@ -2535,7 +2535,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hcrash )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,18432000/3) /* 6.144MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,18432000/3) /* 6.144MHz */
MDRV_CPU_PROGRAM_MAP(hcrash_map,0)
MDRV_CPU_VBLANK_INT_HACK(konamigt_interrupt,2)
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 28e7f5c0791..e177fd873a9 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -1237,7 +1237,7 @@ static MACHINE_DRIVER_START( neogeo )
MDRV_CPU_ADD_TAG("main", M68000, NEOGEO_MAIN_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_ADD(Z80, NEOGEO_AUDIO_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("audio", Z80, NEOGEO_AUDIO_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(audio_map,0)
MDRV_CPU_IO_MAP(auido_io_map,0)
diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c
index 0f1253bc983..3aab66001f8 100644
--- a/src/mame/drivers/news.c
+++ b/src/mame/drivers/news.c
@@ -121,7 +121,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( news )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index 2e59d3e3337..9fcd841525c 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -622,7 +622,7 @@ Darius2: arbitrary interleaving of 10 to keep cpus synced.
static MACHINE_DRIVER_START( ninjaw )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,16000000/2) /* 8 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M68000,16000000/2) /* 8 MHz ? */
MDRV_CPU_PROGRAM_MAP(ninjaw_readmem,ninjaw_writemem)
MDRV_CPU_VBLANK_INT("left", irq4_line_hold)
@@ -696,7 +696,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( darius2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,16000000/2) /* 8 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M68000,16000000/2) /* 8 MHz ? */
MDRV_CPU_PROGRAM_MAP(darius2_readmem,darius2_writemem)
MDRV_CPU_VBLANK_INT("left", irq4_line_hold)
diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c
index d7be28ee8c3..9442012da30 100644
--- a/src/mame/drivers/nitedrvr.c
+++ b/src/mame/drivers/nitedrvr.c
@@ -146,7 +146,7 @@ static MACHINE_RESET( nitedrvr )
static MACHINE_DRIVER_START( nitedrvr )
// basic machine hardware
- MDRV_CPU_ADD(M6502, 12096000/12) // 1 MHz
+ MDRV_CPU_ADD_TAG("main", M6502, 12096000/12) // 1 MHz
MDRV_CPU_PROGRAM_MAP(nitedrvr_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
MDRV_WATCHDOG_VBLANK_INIT(3)
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 4990b880c42..42ac188ce81 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -3516,7 +3516,7 @@ static INTERRUPT_GEN( nmk_interrupt )
static MACHINE_DRIVER_START( tharrier )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz */
MDRV_CPU_PROGRAM_MAP(tharrier_readmem,tharrier_writemem)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3566,7 +3566,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( manybloc )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10? MHz - check */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10? MHz - check */
MDRV_CPU_PROGRAM_MAP(manybloc_readmem,manybloc_writemem)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,56)/* this needs to equal the framerate on this, rather than being double it .. */
@@ -3613,7 +3613,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mustang )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ? */
MDRV_CPU_PROGRAM_MAP(mustang_map,0)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3658,7 +3658,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mustangb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ? */
MDRV_CPU_PROGRAM_MAP(mustangb_map,0)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3740,7 +3740,7 @@ Notes:
static MACHINE_DRIVER_START( bioship )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, BIOSHIP_CRYSTAL1 ) /* 10.0 MHz (verified) */
+ MDRV_CPU_ADD_TAG("main", M68000, BIOSHIP_CRYSTAL1 ) /* 10.0 MHz (verified) */
MDRV_CPU_PROGRAM_MAP(bioship_readmem,bioship_writemem)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3784,7 +3784,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( vandyke )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_10MHz) /* 68000p12 running at 10Mhz, verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_10MHz) /* 68000p12 running at 10Mhz, verified on pcb */
MDRV_CPU_PROGRAM_MAP(vandyke_readmem,vandyke_writemem)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3828,7 +3828,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( vandykeb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ? */
MDRV_CPU_PROGRAM_MAP(vandyke_readmem,vandyke_writemem)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3864,7 +3864,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( acrobatm )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz (verified on pcb) */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz (verified on pcb) */
MDRV_CPU_PROGRAM_MAP(acrobatm_readmem,acrobatm_writemem)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3910,7 +3910,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tdragonb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(tdragon_readmem,tdragonb_writemem)
//MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
@@ -3942,7 +3942,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tdragon )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_8MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_8MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(tdragon_readmem,tdragon_writemem)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
//MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -3987,7 +3987,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ssmissin )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 Mhz */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 Mhz */
MDRV_CPU_PROGRAM_MAP(ssmissin_readmem,ssmissin_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112) /* input related */
@@ -4024,7 +4024,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( strahl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ? */
MDRV_CPU_PROGRAM_MAP(strahl_readmem,strahl_writemem)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -4069,7 +4069,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hachamf )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ? */
MDRV_CPU_PROGRAM_MAP(hachamf_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -4114,7 +4114,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( macross )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ? */
MDRV_CPU_PROGRAM_MAP(macross_readmem,macross_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -4159,7 +4159,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gunnail )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz? */
MDRV_CPU_PROGRAM_MAP(gunnail_map, 0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)
@@ -4204,7 +4204,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( macross2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz ? */
MDRV_CPU_PROGRAM_MAP(macross2_readmem,macross2_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -4250,7 +4250,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tdragon2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz */
MDRV_CPU_PROGRAM_MAP(macross2_readmem,macross2_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -4296,7 +4296,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( raphero )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000) /* 14 MHz measured */
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000) /* 14 MHz measured */
MDRV_CPU_PROGRAM_MAP(macross2_readmem,raphero_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -4340,7 +4340,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bjtwin )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(bjtwin_readmem,bjtwin_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ?? drives music */
@@ -4853,7 +4853,7 @@ static const struct YM2151interface afega_ym2151_intf =
static MACHINE_DRIVER_START( stagger1 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,XTAL_12MHz) /* 68000p10 running at 12mhz, verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000,XTAL_12MHz) /* 68000p10 running at 12mhz, verified on pcb */
MDRV_CPU_PROGRAM_MAP(afega,0)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
@@ -4920,7 +4920,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( firehawk )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,12000000)
+ MDRV_CPU_ADD_TAG("main", M68000,12000000)
MDRV_CPU_PROGRAM_MAP(afega,0)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
@@ -4960,7 +4960,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( twinactn )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,12000000)
+ MDRV_CPU_ADD_TAG("main", M68000,12000000)
MDRV_CPU_PROGRAM_MAP(twinactn_map,0)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index 187e5caf86b..2944362cc33 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -702,7 +702,7 @@ static const struct AY8910interface pkunwar_ay8910_interface_2 =
static MACHINE_DRIVER_START( nova2001 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MAIN_CLOCK/4) // 3 MHz verified on schematics
+ MDRV_CPU_ADD_TAG("main", Z80, MAIN_CLOCK/4) // 3 MHz verified on schematics
MDRV_CPU_PROGRAM_MAP(nova2001_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -735,7 +735,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ninjakun )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MAIN_CLOCK/4) // 3 MHz
+ MDRV_CPU_ADD_TAG("main", Z80, MAIN_CLOCK/4) // 3 MHz
MDRV_CPU_PROGRAM_MAP(ninjakun_cpu1_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -776,7 +776,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pkunwar )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MAIN_CLOCK/4) // 3 MHz
+ MDRV_CPU_ADD_TAG("main", Z80, MAIN_CLOCK/4) // 3 MHz
MDRV_CPU_PROGRAM_MAP(pkunwar_map,0)
MDRV_CPU_IO_MAP(pkunwar_io,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -810,7 +810,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( raiders5 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MAIN_CLOCK/4) // 3 MHz
+ MDRV_CPU_ADD_TAG("main", Z80, MAIN_CLOCK/4) // 3 MHz
MDRV_CPU_PROGRAM_MAP(raiders5_cpu1_map,0)
MDRV_CPU_IO_MAP(raiders5_io,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index a3248caa330..4c3cfdd782a 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -1089,7 +1089,7 @@ static MACHINE_RESET( nwktr )
static MACHINE_DRIVER_START( nwktr )
/* basic machine hardware */
- MDRV_CPU_ADD(PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
+ MDRV_CPU_ADD_TAG("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
MDRV_CPU_PROGRAM_MAP(nwktr_map, 0)
MDRV_CPU_ADD(M68000, 64000000/4) /* 16MHz */
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index 8c90571a1c1..e393ba29803 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -769,7 +769,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( nycaptor )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000/2) /* ??? */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* ??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -831,7 +831,7 @@ static MACHINE_DRIVER_START( nycaptor )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cyclshtg )
- MDRV_CPU_ADD(Z80,8000000/2)
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2)
MDRV_CPU_PROGRAM_MAP(cyclshtg_readmem,cyclshtg_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -893,7 +893,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bronx )
- MDRV_CPU_ADD(Z80,8000000/2)
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2)
MDRV_CPU_PROGRAM_MAP(bronx_readmem, bronx_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index 8da9c738a7b..d3d21ec9db8 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -665,7 +665,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( nyny )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1400000) /* 1.40 MHz? The clock signal is generated by analog chips */
+ MDRV_CPU_ADD_TAG("main", M6809, 1400000) /* 1.40 MHz? The clock signal is generated by analog chips */
MDRV_CPU_PROGRAM_MAP(nyny_main_map,0)
MDRV_CPU_PERIODIC_INT(update_pia_1, 25)
diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c
index fd418727ac6..9fe8a172e5b 100644
--- a/src/mame/drivers/offtwall.c
+++ b/src/mame/drivers/offtwall.c
@@ -405,7 +405,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( offtwall )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_RESET(offtwall)
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index 10b1395414d..78fc4e1f2a6 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -330,7 +330,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( ohmygod )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index c5fc5aec6f1..d847287f8a0 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -875,7 +875,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( ojankohs )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6.00 MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem_ojankohs,writemem_ojankohs)
MDRV_CPU_IO_MAP(readport_ojankohs,writeport_ojankohs)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -912,7 +912,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ojankoy )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6.00 MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem_ojankoy,writemem_ojankoy)
MDRV_CPU_IO_MAP(readport_ojankohs,writeport_ojankoy)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -950,7 +950,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ccasino )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6.00 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6.00 MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem_ojankoy,writemem_ojankoy)
MDRV_CPU_IO_MAP(readport_ccasino,writeport_ccasino)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -987,7 +987,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ojankoc )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000/2) /* 4.00 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* 4.00 MHz */
MDRV_CPU_PROGRAM_MAP(readmem_ojankoc,writemem_ojankoc)
MDRV_CPU_IO_MAP(readport_ojankoc,writeport_ojankoc)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index b0fcd7b064a..c0e4f598074 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -366,7 +366,7 @@ static INTERRUPT_GEN( olibochu_interrupt )
static MACHINE_DRIVER_START( olibochu )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ?? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ?? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(olibochu_interrupt,2)
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index 80c3b8e5eed..ae0fcbf59be 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -479,7 +479,7 @@ static MACHINE_DRIVER_START( omegrace )
/* main CPU */
/* XTAL101 Crystal @ 12mhz */
/* through 74LS161, Pin 13 = divide by 4 */
- MDRV_CPU_ADD(Z80,12000000/4)
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/4)
MDRV_CPU_PROGRAM_MAP(main_map, 0)
MDRV_CPU_IO_MAP(port_map, 0)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,250)
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index 5f4360b8560..ec48143c9eb 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -369,7 +369,7 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( oneshot )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(oneshot_readmem,oneshot_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index abe6a259d18..2fce4784d40 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -275,7 +275,7 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( onetwo )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,4000000) /* 4 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,4000000) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(main_cpu,0)
MDRV_CPU_IO_MAP(main_cpu_io,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index 0e1fe9b62b7..d4b077712cd 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -558,7 +558,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( opwolf )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000 ) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000 ) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(opwolf_readmem,opwolf_writemem)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -607,7 +607,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( opwolfb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */
MDRV_CPU_PROGRAM_MAP(opwolfb_readmem,opwolfb_writemem)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index ca2c8901009..5fbf8d4c00b 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -291,7 +291,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( orbit )
/* basic machine hardware */
- MDRV_CPU_ADD(M6800, MASTER_CLOCK / 16)
+ MDRV_CPU_ADD_TAG("main", M6800, MASTER_CLOCK / 16)
MDRV_CPU_PROGRAM_MAP(orbit_map, 0)
MDRV_CPU_VBLANK_INT("main", orbit_interrupt)
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index aa54ab8f24d..a791020855b 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -240,7 +240,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( othldrby )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 898c542df5d..e8dc7b0b2fa 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -705,8 +705,8 @@ static const struct YM2610interface ym2610_interface =
static MACHINE_DRIVER_START( othunder )
/* basic machine hardware */
-// MDRV_CPU_ADD(M68000, 24000000/2 ) /* 12 MHz */
- MDRV_CPU_ADD(M68000, 13000000 ) /* fixes garbage graphics on startup */
+// MDRV_CPU_ADD_TAG("main", M68000, 24000000/2 ) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 13000000 ) /* fixes garbage graphics on startup */
MDRV_CPU_PROGRAM_MAP(othunder_map,0)
MDRV_CPU_VBLANK_INT("main", vblank_interrupt)
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 86fead70513..14f230b79e0 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -398,7 +398,7 @@ static const struct K053260_interface k053260_interface =
static MACHINE_DRIVER_START( overdriv )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(overdriv_readmem,overdriv_writemem)
MDRV_CPU_VBLANK_INT_HACK(cpuA_interrupt,4) /* ??? IRQ 4 is vblank, IRQ 5 of unknown origin */
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index d33f17ae517..71a440da168 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -414,7 +414,7 @@ static const struct namco_interface namco_interface =
static MACHINE_DRIVER_START( pacland )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 49152000/32) /* 1.536 MHz */
+ MDRV_CPU_ADD_TAG("main", M6809, 49152000/32) /* 1.536 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index 773637e138a..0e1c168147d 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -380,7 +380,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( pandoras )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809,18432000/6) /* CPU A */
+ MDRV_CPU_ADD_TAG("main", M6809,18432000/6) /* CPU A */
MDRV_CPU_PROGRAM_MAP(pandoras_readmem_a,pandoras_writemem_a)
MDRV_CPU_VBLANK_INT("main", pandoras_interrupt_a)
diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c
index 6ecd90bd087..47a63d86750 100644
--- a/src/mame/drivers/pangofun.c
+++ b/src/mame/drivers/pangofun.c
@@ -111,7 +111,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( pangofun )
/* basic machine hardware */
- MDRV_CPU_ADD(I486, 14318180*2) /* I486 ?? Mhz */
+ MDRV_CPU_ADD_TAG("main", I486, 14318180*2) /* I486 ?? Mhz */
MDRV_CPU_PROGRAM_MAP(pangofun_map, 0)
/* video hardware */
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index 93711c824e4..75bde0c7029 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -356,7 +356,7 @@ static GFXDECODE_START( panicr )
GFXDECODE_END
static MACHINE_DRIVER_START( panicr )
- MDRV_CPU_ADD(V20,16000000/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */
+ MDRV_CPU_ADD_TAG("main", V20,16000000/2) /* Sony 8623h9 CXQ70116D-8 (V20 compatible) */
MDRV_CPU_PROGRAM_MAP(panicr_map,0)
MDRV_CPU_VBLANK_INT_HACK(panicr_interrupt,2)
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index d32520795a7..612a5a51620 100644
--- a/src/mame/drivers/paranoia.c
+++ b/src/mame/drivers/paranoia.c
@@ -130,7 +130,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( paranoia )
/* basic machine hardware */
- MDRV_CPU_ADD(H6280, PCE_MAIN_CLOCK/3)
+ MDRV_CPU_ADD_TAG("main", H6280, PCE_MAIN_CLOCK/3)
MDRV_CPU_PROGRAM_MAP(pce_mem, 0)
MDRV_CPU_IO_MAP(pce_io, 0)
MDRV_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF)
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index 7ce1efcb110..c625485a4f9 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -297,7 +297,7 @@ static const struct K053260_interface k053260_interface =
static MACHINE_DRIVER_START( parodius )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI, 3000000) /* 053248 */
+ MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* 053248 */
MDRV_CPU_PROGRAM_MAP(parodius_readmem,parodius_writemem)
MDRV_CPU_VBLANK_INT("main", parodius_interrupt)
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index e4d4d0e4983..c0f0bbd57ac 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -387,7 +387,7 @@ static VIDEO_UPDATE( pasha2 )
}
static MACHINE_DRIVER_START( pasha2 )
- MDRV_CPU_ADD(E116XT, 20000000*4) /* 4x internal multiplier */
+ MDRV_CPU_ADD_TAG("main", E116XT, 20000000*4) /* 4x internal multiplier */
MDRV_CPU_PROGRAM_MAP(pasha2_map,0)
MDRV_CPU_IO_MAP(pasha2_io,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index 23045459ba6..219771d9cbe 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -271,7 +271,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( pass )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14318180/2 )
+ MDRV_CPU_ADD_TAG("main", M68000, 14318180/2 )
MDRV_CPU_PROGRAM_MAP(pass_readmem,pass_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* all the same */
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index 8bb64422cb3..d5909b82144 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -195,7 +195,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( pastelg )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 19968000/8) /* 2.496 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 19968000/8) /* 2.496 MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem_pastelg, writemem_pastelg)
MDRV_CPU_IO_MAP(readport_pastelg, writeport_pastelg)
// MDRV_CPU_VBLANK_INT_HACK(nb1413m3_interrupt,96) // nmiclock not written, chip is 1411M1 instead of 1413M3
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index 5cbf6186c46..bea7c69dc08 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -265,7 +265,7 @@ static INTERRUPT_GEN( pbaction_interrupt )
static MACHINE_DRIVER_START( pbaction )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index b62b34c5662..9caaebea2a4 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -236,7 +236,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( pcktgal )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 2000000)
+ MDRV_CPU_ADD_TAG("main", M6502, 2000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index 51d9a7c94d3..bffc2951851 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -560,7 +560,7 @@ static const struct YM2610interface ym2610_interface =
static MACHINE_DRIVER_START( pipedrm )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2)
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -600,7 +600,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hatris )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2)
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c
index 123009df77c..3eacabbc6b4 100644
--- a/src/mame/drivers/pipeline.c
+++ b/src/mame/drivers/pipeline.c
@@ -372,7 +372,7 @@ static MACHINE_RESET( pipeline )
static MACHINE_DRIVER_START( pipeline )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 7372800/2)
+ MDRV_CPU_ADD_TAG("main", Z80, 7372800/2)
MDRV_CPU_PROGRAM_MAP(cpu0_mem, 0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 7cadc20c6de..a773890353f 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -285,7 +285,7 @@ GFXDECODE_END
/* Machine Driver + Related bits */
static MACHINE_DRIVER_START( pirates )
- MDRV_CPU_ADD(M68000, 16000000) /* 16mhz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16mhz */
MDRV_CPU_PROGRAM_MAP(pirates_readmem,pirates_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index 45871f80bcd..bd655992d9f 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -259,7 +259,7 @@ static GFXDECODE_START( pitnrun )
GFXDECODE_END
static MACHINE_DRIVER_START( pitnrun )
- MDRV_CPU_ADD(Z80,XTAL_18_432MHz/6) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80,XTAL_18_432MHz/6) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", pitnrun_nmi_source)
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index 6381d9883a8..6abb7381754 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -286,7 +286,7 @@ static MACHINE_RESET( pkscramble)
static MACHINE_DRIVER_START( pkscramble )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000 )
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000 )
MDRV_CPU_PROGRAM_MAP(pkscramble_map,0)
//MDRV_CPU_VBLANK_INT("main", irq1_line_hold) /* only valid irq */
diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c
index 4cf496c28a0..40281f19126 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -342,7 +342,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( pktgaldx )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(pktgaldx_map,0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -377,7 +377,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pktgaldb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(pktgaldb_readmem,pktgaldb_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index a7e7ce09354..5a7e2b8609b 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -685,7 +685,7 @@ static const struct NESinterface nes_interface =
static MACHINE_DRIVER_START( playch10 )
// basic machine hardware
- MDRV_CPU_ADD(Z80, 8000000/2) // 4 MHz
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000/2) // 4 MHz
MDRV_CPU_PROGRAM_MAP(bios_map, 0)
MDRV_CPU_IO_MAP(bios_io_map, 0)
MDRV_CPU_VBLANK_INT("top", playch10_interrupt)
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index fa708374518..e0f74d4c335 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -965,7 +965,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bigtwin )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(bigtwin_main_map, 0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -999,7 +999,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( wbeachvl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(wbeachvl_main_map, 0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -1034,7 +1034,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( excelsr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(excelsr_main_map, 0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -1067,7 +1067,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hotmind )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_24MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(hotmind_main_map, 0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -1102,7 +1102,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hrdtimes )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_24MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(hrdtimes_main_map, 0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 8df53fdb412..c7d99a3a667 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -685,7 +685,7 @@ static GFXDECODE_START( plygonet )
GFXDECODE_END
static MACHINE_DRIVER_START( plygonet )
- MDRV_CPU_ADD(M68EC020, 16000000) /* 16 MHz (xtal is 32.0 MHz) */
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz (xtal is 32.0 MHz) */
MDRV_CPU_PROGRAM_MAP(polygonet_map, 0)
MDRV_CPU_VBLANK_INT_HACK(polygonet_interrupt, 2)
diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c
index e82005c8484..32027d274bd 100644
--- a/src/mame/drivers/pokechmp.c
+++ b/src/mame/drivers/pokechmp.c
@@ -246,7 +246,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( pokechmp )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 4000000)
+ MDRV_CPU_ADD_TAG("main", M6502, 4000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 15044a09f47..53631ecc0df 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -840,7 +840,7 @@ static const struct CustomSound_interface custom_interface =
static MACHINE_DRIVER_START( polepos )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 24576000/8) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 24576000/8) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(z80_map,0)
MDRV_CPU_IO_MAP(z80_io,0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_assert,2) /* 64V */
diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c
index 3ee845b37af..118ba015d20 100644
--- a/src/mame/drivers/polyplay.c
+++ b/src/mame/drivers/polyplay.c
@@ -289,7 +289,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( polyplay )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 9830400/4)
+ MDRV_CPU_ADD_TAG("main", Z80, 9830400/4)
MDRV_CPU_PROGRAM_MAP(polyplay_map,0)
MDRV_CPU_IO_MAP(polyplay_io_map,0)
MDRV_CPU_PERIODIC_INT(periodic_interrupt,75)
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index 776e87057a3..f8ba9ddc4e9 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -214,7 +214,7 @@ static PALETTE_INIT( poolshrk )
static MACHINE_DRIVER_START( poolshrk )
/* basic machine hardware */
- MDRV_CPU_ADD(M6800, 11055000 / 8) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6800, 11055000 / 8) /* ? */
MDRV_CPU_PROGRAM_MAP(poolshrk_cpu_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c
index df5d4f95395..a6a08b1ae59 100644
--- a/src/mame/drivers/pooyan.c
+++ b/src/mame/drivers/pooyan.c
@@ -213,7 +213,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( pooyan )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MASTER_CLOCK/3/2)
+ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/3/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", pooyan_interrupt)
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index e4a0c177324..9fe0540f002 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -310,7 +310,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( popper )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,18432000/6)
+ MDRV_CPU_ADD_TAG("main", Z80,18432000/6)
MDRV_CPU_PROGRAM_MAP(popper_readmem,popper_writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c
index aebbed5888a..c97d124b5b3 100644
--- a/src/mame/drivers/portrait.c
+++ b/src/mame/drivers/portrait.c
@@ -248,7 +248,7 @@ static GFXDECODE_START( portrait )
GFXDECODE_END
static MACHINE_DRIVER_START( portrait )
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ? */
MDRV_CPU_PROGRAM_MAP(portrait_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 5aaa9f2fd33..d6c4443fd76 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -411,7 +411,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( powerbal )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(powerbal_main_map, 0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -439,7 +439,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( magicstk )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(magicstk_main_map, 0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index 272b0ec3d68..abce318896a 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -350,7 +350,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( powerins )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12MHz */
MDRV_CPU_PROGRAM_MAP(powerins_readmem,powerins_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c
index 4dbd169a8e3..2ce67871e1f 100644
--- a/src/mame/drivers/ppmast93.c
+++ b/src/mame/drivers/ppmast93.c
@@ -344,7 +344,7 @@ static VIDEO_UPDATE( ppmast93 )
static MACHINE_DRIVER_START( ppmast93 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,5000000) /* 5 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,5000000) /* 5 MHz */
MDRV_CPU_PROGRAM_MAP(ppmast93_cpu1_map,0)
MDRV_CPU_IO_MAP(ppmast93_cpu1_io,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index a16a52454ba..99464298438 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -234,7 +234,7 @@ static const struct upd7759_interface upd7759_interface =
static MACHINE_DRIVER_START( prehisle )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_18MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_18MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(prehisle_readmem,prehisle_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index 2d9aa905231..2058b598008 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -189,7 +189,7 @@ static INTERRUPT_GEN( progolf_interrupt )
static MACHINE_DRIVER_START( progolf )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 2000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* ? */
MDRV_CPU_PROGRAM_MAP(main_cpu,0)
// MDRV_CPU_VBLANK_INT("main", progolf_interrupt)
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index ea5680a9aa9..4087a17d20d 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -1562,7 +1562,7 @@ static const struct YM2610interface sngkace_ym2610_interface =
static MACHINE_DRIVER_START( sngkace )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000)
MDRV_CPU_PROGRAM_MAP(psikyo_readmem,psikyo_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -1616,7 +1616,7 @@ static const struct YM2610interface gunbird_ym2610_interface =
static MACHINE_DRIVER_START( gunbird )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000)
MDRV_CPU_PROGRAM_MAP(psikyo_readmem,psikyo_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -1678,7 +1678,7 @@ static const struct YMF278B_interface ymf278b_interface =
static MACHINE_DRIVER_START( s1945 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000)
MDRV_CPU_PROGRAM_MAP(psikyo_readmem,psikyo_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index d182121e199..19c49014d72 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -553,7 +553,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( psychic5 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(psychic5_interrupt,2)
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index 4e2466a2753..e3c8a2672f3 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -445,7 +445,7 @@ static MACHINE_RESET( pturn )
}
static MACHINE_DRIVER_START( pturn )
- MDRV_CPU_ADD(Z80, 12000000/3)
+ MDRV_CPU_ADD_TAG("main", Z80, 12000000/3)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", pturn_main_intgen)
MDRV_MACHINE_RESET(pturn)
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index 92a8bad865c..8f541bf21c3 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -451,7 +451,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( pushman )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -494,7 +494,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bballs )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(bballs_readmem,bballs_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index 9a69a155115..fdbd12782c7 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -656,7 +656,7 @@ static MACHINE_RESET( qdrmfgp2 )
static MACHINE_DRIVER_START( qdrmfgp )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 32000000/2) /* 16.000 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) /* 16.000 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(qdrmfgp_interrupt, 2)
@@ -691,7 +691,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( qdrmfgp2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 32000000/2) /* 16.000 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 32000000/2) /* 16.000 MHz */
MDRV_CPU_PROGRAM_MAP(gp2_readmem,gp2_writemem)
MDRV_CPU_VBLANK_INT("main", qdrmfgp2_interrupt)
diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c
index 43333e899e8..70c3c59e399 100644
--- a/src/mame/drivers/quantum.c
+++ b/src/mame/drivers/quantum.c
@@ -237,7 +237,7 @@ static const struct POKEYinterface pokey_interface_2 =
static MACHINE_DRIVER_START( quantum )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, MASTER_CLOCK / 2)
+ MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK / 2)
MDRV_CPU_PROGRAM_MAP(main_map, 0)
MDRV_CPU_PERIODIC_INT(irq1_line_hold, (double)MASTER_CLOCK / 4096 / 12)
diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c
index b6857ab237b..82a82cbe929 100644
--- a/src/mame/drivers/quizo.c
+++ b/src/mame/drivers/quizo.c
@@ -186,7 +186,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( quizo )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,XTAL1/2)
+ MDRV_CPU_ADD_TAG("main", Z80,XTAL1/2)
MDRV_CPU_PROGRAM_MAP(memmap, 0)
MDRV_CPU_IO_MAP(portmap, 0)
diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c
index a7956ef78ec..b6dbb86fe44 100644
--- a/src/mame/drivers/quizpani.c
+++ b/src/mame/drivers/quizpani.c
@@ -247,7 +247,7 @@ static MACHINE_RESET( quizpani )
}
static MACHINE_DRIVER_START( quizpani )
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(quizpani_readmem,quizpani_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,164) // music tempo
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index 9724f416470..f665c0f5db6 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -536,7 +536,7 @@ INPUT_PORTS_END
*************************************/
static MACHINE_DRIVER_START( r2dtank )
- MDRV_CPU_ADD(M6809,3000000) /* ?? too fast ? */
+ MDRV_CPU_ADD_TAG("main", M6809,3000000) /* ?? too fast ? */
MDRV_CPU_PROGRAM_MAP(r2dtank_main_map,0)
/* audio CPU */
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 981a2f56e68..08e7c9b0576 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -235,7 +235,7 @@ static VIDEO_EOF( raiden )
static MACHINE_DRIVER_START( raiden )
/* basic machine hardware */
- MDRV_CPU_ADD(V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
+ MDRV_CPU_ADD_TAG("main", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", raiden_interrupt)
@@ -274,7 +274,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( raidena )
/* basic machine hardware */
- MDRV_CPU_ADD(V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
+ MDRV_CPU_ADD_TAG("main", V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */
MDRV_CPU_PROGRAM_MAP(alt_map,0)
MDRV_CPU_VBLANK_INT("main", raiden_interrupt)
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 794d180cc2f..66ee00a0939 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -987,7 +987,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( raiden2 )
/* basic machine hardware */
- MDRV_CPU_ADD(V30,XTAL_32MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", V30,XTAL_32MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(raiden2_mem, 0)
MDRV_CPU_VBLANK_INT("main", raiden2_interrupt)
@@ -2126,7 +2126,7 @@ static INTERRUPT_GEN( rdx_v33_interrupt )
static MACHINE_DRIVER_START( rdx_v33 )
/* basic machine hardware */
- MDRV_CPU_ADD(V33, 32000000/2 ) // ?
+ MDRV_CPU_ADD_TAG("main", V33, 32000000/2 ) // ?
MDRV_CPU_PROGRAM_MAP(rdx_v33_map, 0)
MDRV_CPU_VBLANK_INT("main", rdx_v33_interrupt)
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index d52ef4a900d..ada8cc52de7 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -609,7 +609,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( rainbow )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(rainbow_readmem,rainbow_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -646,7 +646,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( jumping )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_24MHz/3) /* not verified but matches original */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/3) /* not verified but matches original */
MDRV_CPU_PROGRAM_MAP(jumping_readmem,jumping_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index a910095d86d..87cd08d7579 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -839,7 +839,7 @@ static const struct Samplesinterface samples_interface =
static MACHINE_DRIVER_START( rallyx )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(rallyx_map,0)
MDRV_CPU_IO_MAP(0,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
@@ -877,7 +877,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( jungler )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(jungler_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index 5667451693c..3034bf5bdd2 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -382,7 +382,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( rampart )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, MASTER_CLOCK/2)
+ MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(main_map, 0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 779c5be4d5e..2c2673443f3 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -378,7 +378,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( rastan )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(rastan_map,0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
diff --git a/src/mame/drivers/rcasino.c b/src/mame/drivers/rcasino.c
index 013ee9332aa..f9b0fe79084 100644
--- a/src/mame/drivers/rcasino.c
+++ b/src/mame/drivers/rcasino.c
@@ -295,7 +295,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( rcasino )
// basic machine hardware
- MDRV_CPU_ADD(Z80, 8000000/2) // ???
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000/2) // ???
MDRV_CPU_PROGRAM_MAP(rcasino_map, 0)
MDRV_CPU_IO_MAP(rcasino_io_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c
index be46b96838e..ca68e52a01e 100644
--- a/src/mame/drivers/rcorsair.c
+++ b/src/mame/drivers/rcorsair.c
@@ -119,7 +119,7 @@ static MACHINE_DRIVER_START( rcorsair )
/* Main CPU is probably inside Custom Block with
program code, unknown type */
- MDRV_CPU_ADD(8085A,8000000) /* Sound CPU? */
+ MDRV_CPU_ADD_TAG("main", 8085A,8000000) /* Sound CPU? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
// MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c
index 0d8e7e3d0f7..3381d606ffa 100644
--- a/src/mame/drivers/redalert.c
+++ b/src/mame/drivers/redalert.c
@@ -272,7 +272,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( redalert )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, MAIN_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", M6502, MAIN_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(redalert_main_map,0)
MDRV_CPU_VBLANK_INT("main", redalert_vblank_interrupt)
@@ -287,7 +287,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( demoneye )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, MAIN_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", M6502, MAIN_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(demoneye_main_map,0)
MDRV_CPU_VBLANK_INT("main", redalert_vblank_interrupt)
diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c
index 97d5b72da27..98b0b32a3d4 100644
--- a/src/mame/drivers/redclash.c
+++ b/src/mame/drivers/redclash.c
@@ -348,7 +348,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( zerohour )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(zero_readmem,zero_writemem)
MDRV_CPU_VBLANK_INT("main", redclash_interrupt)
@@ -375,7 +375,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( redclash )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", redclash_interrupt)
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index c363c1632c0..1297d3b4e4c 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -342,7 +342,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( relief )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_RESET(relief)
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index ef73fc7d62d..10c5613612a 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -791,7 +791,7 @@ static MACHINE_RESET( renegade )
static MACHINE_DRIVER_START( renegade )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 12000000/8) /* 1.5 MHz (measured) */
+ MDRV_CPU_ADD_TAG("main", M6502, 12000000/8) /* 1.5 MHz (measured) */
MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem)
MDRV_CPU_VBLANK_INT_HACK(renegade_interrupt,2)
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index badd6fa3a48..fae092e4821 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -338,7 +338,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( retofinv )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz? */
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index dabfb972a42..a3540c9f234 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -292,7 +292,7 @@ static const struct VLM5030interface vlm5030_interface =
static MACHINE_DRIVER_START( rockrage )
/* basic machine hardware */
- MDRV_CPU_ADD(HD6309, 3000000*4) /* 24MHz/8 */
+ MDRV_CPU_ADD_TAG("main", HD6309, 3000000*4) /* 24MHz/8 */
MDRV_CPU_PROGRAM_MAP(rockrage_readmem,rockrage_writemem)
MDRV_CPU_VBLANK_INT("main", rockrage_interrupt)
diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c
index 4d616c6c66d..ac3c65bfda8 100644
--- a/src/mame/drivers/rocnrope.c
+++ b/src/mame/drivers/rocnrope.c
@@ -220,7 +220,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( rocnrope )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1600000) /* 1.6 MHz??? Attract mode depends on this to work correctly */
+ MDRV_CPU_ADD_TAG("main", M6809, 1600000) /* 1.6 MHz??? Attract mode depends on this to work correctly */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index 0fa467c518e..3e31065e6d6 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -814,7 +814,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( rohga )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(rohga_readmem,rohga_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -859,7 +859,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( wizdfire )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(wizdfire_readmem,wizdfire_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -904,7 +904,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( nitrobal )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(nitrobal_readmem,nitrobal_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -949,7 +949,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( schmeisr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(schmeisr_readmem,schmeisr_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index 79a7101631b..fbb5975340f 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -245,7 +245,7 @@ static const struct K053260_interface k053260_interface =
static MACHINE_DRIVER_START( rollerg )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI, 3000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* ? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c
index ba684315252..83024b0789d 100644
--- a/src/mame/drivers/rollrace.c
+++ b/src/mame/drivers/rollrace.c
@@ -237,7 +237,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( rollrace )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,XTAL_24MHz/8) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80,XTAL_24MHz/8) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index 53e549afc83..3908454d577 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -504,7 +504,7 @@ static const struct upd7759_interface upd7759_interface =
static MACHINE_DRIVER_START( rpunch )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, MASTER_CLOCK/2)
+ MDRV_CPU_ADD_TAG("main", M68000, MASTER_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_ADD(Z80, MASTER_CLOCK/4)
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index 77ac04289b9..8db8d2ebc4c 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -352,7 +352,7 @@ static const struct POKEYinterface pokey_interface_2 =
static MACHINE_DRIVER_START( runaway )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 12096000 / 8) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 8) /* ? */
MDRV_CPU_PROGRAM_MAP(readmem, writemem)
MDRV_MACHINE_RESET(runaway)
diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c
index bddf91cf7ed..b4b46f6b68a 100644
--- a/src/mame/drivers/safarir.c
+++ b/src/mame/drivers/safarir.c
@@ -262,7 +262,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( safarir )
/* basic machine hardware */
- MDRV_CPU_ADD(8080, 3072000) /* 3 MHz ? */
+ MDRV_CPU_ADD_TAG("main", 8080, 3072000) /* 3 MHz ? */
MDRV_CPU_PROGRAM_MAP(main_map, 0)
MDRV_MACHINE_START(safarir)
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index c823190029a..cbe6f2e503c 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -436,7 +436,7 @@ static const struct YM2203interface ym2203_intf_sandscrp =
static MACHINE_DRIVER_START( sandscrp )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,12000000) /* TMP68HC000N-12 */
+ MDRV_CPU_ADD_TAG("main", M68000,12000000) /* TMP68HC000N-12 */
MDRV_CPU_PROGRAM_MAP(sandscrp,0)
MDRV_CPU_VBLANK_INT("main", sandscrp_interrupt)
diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c
index 85bcdb48976..e1dbdcb81e0 100644
--- a/src/mame/drivers/sangho.c
+++ b/src/mame/drivers/sangho.c
@@ -233,7 +233,7 @@ static VIDEO_START( sangho )
static MACHINE_DRIVER_START(pzlestar)
- MDRV_CPU_ADD(Z80,8000000) // ?
+ MDRV_CPU_ADD_TAG("main", Z80,8000000) // ?
MDRV_CPU_PROGRAM_MAP(readmem, 0)
MDRV_CPU_IO_MAP(readport_pzlestar,writeport_pzlestar)
MDRV_CPU_VBLANK_INT_HACK(sangho_interrupt,262)
@@ -266,7 +266,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START(sexyboom )
- MDRV_CPU_ADD(Z80,8000000) // ?
+ MDRV_CPU_ADD_TAG("main", Z80,8000000) // ?
MDRV_CPU_PROGRAM_MAP(readmem, 0)
MDRV_CPU_IO_MAP(readport_sexyboom,writeport_sexyboom)
MDRV_CPU_VBLANK_INT_HACK(sangho_interrupt,262)
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index 8548f0309b6..618a3414f2c 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -236,7 +236,7 @@ static const struct VLM5030interface sbasketb_vlm5030_interface =
static MACHINE_DRIVER_START( sbasketb )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1400000) /* 1.400 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M6809, 1400000) /* 1.400 MHz ??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index 49474872d67..f1e5f45f010 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -328,7 +328,7 @@ static PALETTE_INIT( sbowling )
static MACHINE_DRIVER_START( sbowling )
- MDRV_CPU_ADD(8080, 19968000/10 )
+ MDRV_CPU_ADD_TAG("main", 8080, 19968000/10 )
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(port_map,0)
MDRV_CPU_VBLANK_INT_HACK(sbw_interrupt, 2)
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index 9578f548bb1..aba4504c123 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -477,7 +477,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( sbrkout )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,MAIN_CLOCK/16) /* 375 KHz? Should be 750KHz? */
+ MDRV_CPU_ADD_TAG("main", M6502,MAIN_CLOCK/16) /* 375 KHz? Should be 750KHz? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_START(sbrkout)
diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c
index feedc79259d..bcfc8736f5a 100644
--- a/src/mame/drivers/sbugger.c
+++ b/src/mame/drivers/sbugger.c
@@ -227,7 +227,7 @@ INPUT_PORTS_END
/* machine driver */
static MACHINE_DRIVER_START( sbugger )
- MDRV_CPU_ADD(8085A, 6000000) /* 3.00 MHz??? */
+ MDRV_CPU_ADD_TAG("main", 8085A, 6000000) /* 3.00 MHz??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,0)
MDRV_CPU_VBLANK_INT_HACK(irq3_line_hold,NUM_INTS_FRAME)
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index 07f57abd680..ef22b6de22d 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -223,7 +223,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( scotrsht )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 18432000/6) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", M6809, 18432000/6) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(scotrsht_map,0)
MDRV_CPU_VBLANK_INT("main", scotrsht_interrupt)
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index e262f121bde..33c016622bb 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -2209,7 +2209,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ad2083 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(ad2083_map,0)
MDRV_MACHINE_RESET(galaxold)
diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c
index 6b1087e541a..c380984ccd0 100644
--- a/src/mame/drivers/scregg.c
+++ b/src/mame/drivers/scregg.c
@@ -231,7 +231,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( dommy )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 1500000)
+ MDRV_CPU_ADD_TAG("main", M6502, 1500000)
MDRV_CPU_PROGRAM_MAP(dommy_readmem,dommy_writemem)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,16)
@@ -264,7 +264,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( scregg )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 1500000)
+ MDRV_CPU_ADD_TAG("main", M6502, 1500000)
MDRV_CPU_PROGRAM_MAP(eggs_readmem,eggs_writemem)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,16)
diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c
index 60e17bdceba..26dbd1e2c11 100644
--- a/src/mame/drivers/sderby.c
+++ b/src/mame/drivers/sderby.c
@@ -251,7 +251,7 @@ static GFXDECODE_START( sderby )
GFXDECODE_END
static MACHINE_DRIVER_START( sderby )
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(sderby_readmem,sderby_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -279,7 +279,7 @@ static MACHINE_DRIVER_START( sderby )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pmroulet )
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(roulette_map,0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index a9dab0ced13..6eac167ffae 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -920,7 +920,7 @@ static const struct Samplesinterface zektor_samples_interface =
static MACHINE_DRIVER_START( g80v_base )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, CPU_CLOCK/2)
+ MDRV_CPU_ADD_TAG("main", Z80, CPU_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c
index 7de4fb270f6..19aa8dcd262 100644
--- a/src/mame/drivers/segald.c
+++ b/src/mame/drivers/segald.c
@@ -342,7 +342,7 @@ GFXDECODE_END
/* DRIVER */
static MACHINE_DRIVER_START( astron )
/* main cpu */
- MDRV_CPU_ADD(Z80, SCHEMATIC_CLOCK/4)
+ MDRV_CPU_ADD_TAG("main", Z80, SCHEMATIC_CLOCK/4)
MDRV_CPU_PROGRAM_MAP(mainmem,0)
MDRV_CPU_IO_MAP(mainport,0)
MDRV_CPU_VBLANK_INT("main", vblank_callback_astron)
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index f728618c14b..0346deb074d 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -1294,13 +1294,13 @@ static MACHINE_DRIVER_START( system18 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD("3438", YM3438, 8000000)
+ MDRV_SOUND_ADD("ym1", YM3438, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("3438", YM3438, 8000000)
+ MDRV_SOUND_ADD("ym2", YM3438, 8000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
- MDRV_SOUND_ADD("5c68", RF5C68, 10000000)
+ MDRV_SOUND_ADD("rf", RF5C68, 10000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index 2d76013cc77..86316d231fa 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -1897,7 +1897,7 @@ static const struct YM2151interface ym2151_interface =
*************************************/
static MACHINE_DRIVER_START( system24 )
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(system24_cpu1_map, 0)
MDRV_CPU_VBLANK_INT_HACK(irq_vbl, 2)
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 5f3d764cbe2..d19697749df 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -2160,7 +2160,7 @@ static READ16_HANDLER( dual_pcb_masterslave )
static MACHINE_DRIVER_START( system32 )
/* basic machine hardware */
- MDRV_CPU_ADD(V60, MASTER_CLOCK/2)
+ MDRV_CPU_ADD_TAG("main", V60, MASTER_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(system32_map,0)
MDRV_CPU_VBLANK_INT("main", start_of_vblank_int)
@@ -2214,7 +2214,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( multi32 )
/* basic machine hardware */
- MDRV_CPU_ADD(V70, MULTI32_CLOCK/2)
+ MDRV_CPU_ADD_TAG("main", V70, MULTI32_CLOCK/2)
MDRV_CPU_PROGRAM_MAP(multi32_map,0)
MDRV_CPU_VBLANK_INT("left", start_of_vblank_int)
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index cc4a5332f29..54841f06971 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -2088,7 +2088,7 @@ static MACHINE_RESET( seibu386 )
static MACHINE_DRIVER_START( seibu386 )
/* basic machine hardware */
- MDRV_CPU_ADD(I386, 40000000) /* AMD 386DX, 40MHz */
+ MDRV_CPU_ADD_TAG("main", I386, 40000000) /* AMD 386DX, 40MHz */
MDRV_CPU_PROGRAM_MAP(seibu386_map, 0)
MDRV_CPU_VBLANK_INT("main", spi_interrupt)
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index 41cd9d8743f..100da372324 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -402,7 +402,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( nvram )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz? */
+ MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index 96e9d656e6b..e267b70f61e 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -285,7 +285,7 @@ static INTERRUPT_GEN( sengokmj_interrupt )
static MACHINE_DRIVER_START( sengokmj )
/* basic machine hardware */
- MDRV_CPU_ADD(V30, 16000000/2) /* V30-8 */
+ MDRV_CPU_ADD_TAG("main", V30, 16000000/2) /* V30-8 */
MDRV_CPU_PROGRAM_MAP(sengokmj_map,0)
MDRV_CPU_IO_MAP(sengokmj_io_map,0)
MDRV_CPU_VBLANK_INT("main", sengokmj_interrupt)
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index d38f525a16d..78b1b4802e0 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -6715,7 +6715,7 @@ static INTERRUPT_GEN( tndrcade_sub_interrupt )
static MACHINE_DRIVER_START( tndrcade )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */
MDRV_CPU_PROGRAM_MAP(tndrcade_readmem,tndrcade_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -6765,7 +6765,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( twineagl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */
MDRV_CPU_PROGRAM_MAP(downtown_readmem,downtown_writemem)
MDRV_CPU_VBLANK_INT("main", irq3_line_hold)
@@ -6807,7 +6807,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( downtown )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(downtown_readmem,downtown_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -6867,7 +6867,7 @@ static INTERRUPT_GEN( calibr50_interrupt )
static MACHINE_DRIVER_START( usclssic )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */
MDRV_CPU_PROGRAM_MAP(usclssic_readmem,usclssic_writemem)
MDRV_CPU_VBLANK_INT_HACK(calibr50_interrupt,calibr50_INTERRUPTS_NUM)
@@ -6914,7 +6914,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( calibr50 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */
MDRV_CPU_PROGRAM_MAP(calibr50_readmem,calibr50_writemem)
MDRV_CPU_VBLANK_INT_HACK(calibr50_interrupt,calibr50_INTERRUPTS_NUM)
@@ -6958,7 +6958,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( metafox )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */
MDRV_CPU_PROGRAM_MAP(downtown_readmem,downtown_writemem)
MDRV_CPU_VBLANK_INT("main", irq3_line_hold)
@@ -7001,7 +7001,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( atehate )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(atehate_readmem,atehate_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7042,7 +7042,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( blandia )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(blandia_readmem,blandia_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
@@ -7075,7 +7075,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( blandiap )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(blandiap_readmem,blandiap_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_2_and_4,SETA_INTERRUPTS_NUM)
@@ -7112,7 +7112,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( blockcar )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */
MDRV_CPU_PROGRAM_MAP(blockcar_readmem,blockcar_writemem)
MDRV_CPU_VBLANK_INT("main", irq3_line_hold)
@@ -7147,7 +7147,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( daioh )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(daioh_readmem,daioh_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7187,7 +7187,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( drgnunit )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */
MDRV_CPU_PROGRAM_MAP(drgnunit_readmem,drgnunit_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7221,7 +7221,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( qzkklgy2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(drgnunit_readmem,drgnunit_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7257,7 +7257,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( eightfrc )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7297,7 +7297,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( extdwnhl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(extdwnhl_readmem,extdwnhl_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7349,7 +7349,7 @@ static MACHINE_RESET( wrofaero ) { uPD71054_timer_init(); }
static MACHINE_DRIVER_START( gundhara )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem)
#if __uPD71054_TIMER
// MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt)
@@ -7398,7 +7398,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( jjsquawk )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7434,7 +7434,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kamenrid )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(kamenrid_readmem,kamenrid_writemem)
MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt)
@@ -7474,7 +7474,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( orbs )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14318180/2) /* 7.143 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 14318180/2) /* 7.143 MHz */
MDRV_CPU_PROGRAM_MAP(orbs_readmem,orbs_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7509,7 +7509,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( krzybowl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(krzybowl_readmem,krzybowl_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7545,7 +7545,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( madshark )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(madshark_readmem,madshark_writemem)
MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt)
@@ -7587,7 +7587,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( msgundam )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(msgundam_readmem,msgundam_writemem)
#if __uPD71054_TIMER
MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt)
@@ -7632,7 +7632,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( oisipuzl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(oisipuzl_readmem,oisipuzl_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7668,7 +7668,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( triplfun )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(triplfun_readmem,triplfun_writemem)
MDRV_CPU_VBLANK_INT("main", irq3_line_hold)
@@ -7702,7 +7702,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kiwame )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(kiwame_readmem,kiwame_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* lev 1-7 are the same. WARNING:
the interrupt table is written to. */
@@ -7741,7 +7741,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( rezon )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7779,7 +7779,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( thunderl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */
MDRV_CPU_PROGRAM_MAP(thunderl_readmem,thunderl_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -7810,7 +7810,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( wiggie )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */
MDRV_CPU_PROGRAM_MAP(thunderl_readmem,thunderl_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -7843,7 +7843,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( wits )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */
MDRV_CPU_PROGRAM_MAP(thunderl_readmem,thunderl_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -7879,7 +7879,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( umanclub )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(umanclub_readmem,umanclub_writemem)
MDRV_CPU_VBLANK_INT("main", irq3_line_hold)
@@ -7914,7 +7914,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( utoukond )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(utoukond_readmem,utoukond_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -7959,7 +7959,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( wrofaero )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem)
#if __uPD71054_TIMER
MDRV_CPU_VBLANK_INT("main", wrofaero_interrupt)
@@ -8009,7 +8009,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( zingzip )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(wrofaero_readmem,wrofaero_writemem)
MDRV_CPU_VBLANK_INT("main", irq3_line_hold)
@@ -8044,7 +8044,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pairlove )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000/2) /* 8 MHz */
MDRV_CPU_PROGRAM_MAP(pairlove_readmem,pairlove_writemem)
MDRV_CPU_VBLANK_INT_HACK(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
@@ -8088,7 +8088,7 @@ static INTERRUPT_GEN( crazyfgt_interrupt )
static MACHINE_DRIVER_START( crazyfgt )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(crazyfgt_map,0)
MDRV_CPU_VBLANK_INT_HACK(crazyfgt_interrupt,1+5)
@@ -8147,7 +8147,7 @@ static INTERRUPT_GEN( inttoote_interrupt )
static MACHINE_DRIVER_START( inttoote )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(inttoote_map,0)
MDRV_CPU_VBLANK_INT_HACK(inttoote_interrupt,8+1+1+1)
diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c
index 771b00a3255..2d13ffbc7a9 100644
--- a/src/mame/drivers/sfkick.c
+++ b/src/mame/drivers/sfkick.c
@@ -80,7 +80,7 @@ static VIDEO_UPDATE( sfkick )
static MACHINE_DRIVER_START( sfkick )
- MDRV_CPU_ADD(Z80,8000000) // ?
+ MDRV_CPU_ADD_TAG("main", Z80,8000000) // ?
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
// MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index 28490ef3cb1..4473aa5c185 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -266,7 +266,7 @@ static const TMS9928a_interface tms9928a_interface =
*************************************/
static MACHINE_DRIVER_START( sg1000a )
- MDRV_CPU_ADD(Z80, 3579545) /* 3.579545 Mhz */
+ MDRV_CPU_ADD_TAG("main", Z80, 3579545) /* 3.579545 Mhz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", sg100a_interrupt)
diff --git a/src/mame/drivers/sgladiat.c b/src/mame/drivers/sgladiat.c
index 5566d0e4ab8..610cb2df9eb 100644
--- a/src/mame/drivers/sgladiat.c
+++ b/src/mame/drivers/sgladiat.c
@@ -144,7 +144,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( sgladiat )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(sgladiat_cpuA_map,0)
// MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 063b246d909..3341ff254a5 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -551,7 +551,7 @@ static INTERRUPT_GEN( shadfrce_interrupt ) {
static MACHINE_DRIVER_START( shadfrce )
- MDRV_CPU_ADD(M68000, 28000000/2) /* ? Guess - CPU is rated for 16MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 28000000/2) /* ? Guess - CPU is rated for 16MHz */
MDRV_CPU_PROGRAM_MAP(shadfrce_readmem,shadfrce_writemem)
MDRV_CPU_VBLANK_INT_HACK(shadfrce_interrupt,2)
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index 8656025de7b..8f67ad7cdce 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -500,7 +500,7 @@ static const struct YM3438interface ym3438_interface =
static MACHINE_DRIVER_START( shangha3 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(shangha3_readmem,shangha3_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -536,7 +536,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( heberpop )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(heberpop_readmem,heberpop_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -578,7 +578,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( blocken )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(blocken_readmem,blocken_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index e2e7a1380d4..7dacfc198a8 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -987,7 +987,7 @@ static const struct YM2203interface sh_ym2203_interface =
static MACHINE_DRIVER_START( shanghai )
/* basic machine hardware */
- MDRV_CPU_ADD(V30,16000000/2) /* ? */
+ MDRV_CPU_ADD_TAG("main", V30,16000000/2) /* ? */
MDRV_CPU_PROGRAM_MAP(shanghai_map,0)
MDRV_CPU_IO_MAP(shanghai_portmap,0)
MDRV_CPU_VBLANK_INT("main", shanghai_interrupt)
@@ -1020,7 +1020,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( shangha2 )
/* basic machine hardware */
- MDRV_CPU_ADD(V30,16000000/2) /* ? */
+ MDRV_CPU_ADD_TAG("main", V30,16000000/2) /* ? */
MDRV_CPU_PROGRAM_MAP(shangha2_map,0)
MDRV_CPU_IO_MAP(shangha2_portmap,0)
MDRV_CPU_VBLANK_INT("main", shanghai_interrupt)
@@ -1052,7 +1052,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kothello )
/* basic machine hardware */
- MDRV_CPU_ADD(V30,16000000/2) /* ? */
+ MDRV_CPU_ADD_TAG("main", V30,16000000/2) /* ? */
MDRV_CPU_PROGRAM_MAP(kothello_map, 0)
MDRV_CPU_VBLANK_INT("main", shanghai_interrupt)
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index ccd432c37b3..33a55d2f3cd 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -474,7 +474,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( dynamski )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 3000000) /* ? */
MDRV_CPU_PROGRAM_MAP(dynamski_map,0)
MDRV_CPU_IO_MAP(dynamski_portmap,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c
index b1e6255b797..b0537f0e2db 100644
--- a/src/mame/drivers/shaolins.c
+++ b/src/mame/drivers/shaolins.c
@@ -218,7 +218,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( shaolins )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M6809, XTAL_18_432MHz/12) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(shaolins_interrupt,16) /* 1 IRQ + 8 NMI */
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index 9432eb2792c..27455210e9b 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -241,7 +241,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( shisen )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000) /* 6 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index 3fc8d684f65..949df465bc0 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -311,7 +311,7 @@ static INTERRUPT_GEN( shootout_interrupt )
static MACHINE_DRIVER_START( shootout )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 2000000) /* 2 MHz? */
+ MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* 2 MHz? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", shootout_interrupt) /* nmi's are triggered at coin up */
@@ -346,7 +346,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( shootouj )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 2000000) /* 2 MHz? */
+ MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* 2 MHz? */
MDRV_CPU_PROGRAM_MAP(readmem_alt,writemem_alt)
MDRV_CPU_VBLANK_INT("main", shootout_interrupt) /* nmi's are triggered at coin up */
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index fa4297da24f..b4e955573ff 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -374,7 +374,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( shougi )
- MDRV_CPU_ADD(Z80,10000000/4)
+ MDRV_CPU_ADD_TAG("main", Z80,10000000/4)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", shougi_vblank_nmi)
diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c
index 35fbf5c2fcb..331fdf8f19f 100644
--- a/src/mame/drivers/shuuz.c
+++ b/src/mame/drivers/shuuz.c
@@ -280,7 +280,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( shuuz )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_RESET(shuuz)
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index 21a56226cf4..5f35e5b83d7 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -719,7 +719,7 @@ static const struct YM2151interface whizz_ym2151_interface =
static MACHINE_DRIVER_START( sidearms )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -765,7 +765,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( turtship )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */
MDRV_CPU_PROGRAM_MAP(turtship_readmem,turtship_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -810,7 +810,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( whizz )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */
MDRV_CPU_PROGRAM_MAP(whizz_readmem,whizz_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index 61e1e9843d8..1109255791c 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -292,7 +292,7 @@ static const struct YM3526interface ym3526_interface =
static MACHINE_DRIVER_START( sidepckt )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 2000000) /* 2 MHz */
+ MDRV_CPU_ADD_TAG("main", M6809, 2000000) /* 2 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
@@ -331,7 +331,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sidepctj )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 2000000) /* 2 MHz */
+ MDRV_CPU_ADD_TAG("main", M6809, 2000000) /* 2 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,j_writemem)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index 4cebf3f38e4..9ac93bfc01f 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -370,7 +370,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( silkroad )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index 808ad1ba187..19202c5a3f3 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -262,7 +262,7 @@ static INTERRUPT_GEN( simpsons_irq )
static MACHINE_DRIVER_START( simpsons )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI, XTAL_24MHz/2/4) /* pin 18 of konami cpu is 12Mhz, while pin 17 is 3mhz. Clock probably divided internally by 4 */
+ MDRV_CPU_ADD_TAG("main", KONAMI, XTAL_24MHz/2/4) /* pin 18 of konami cpu is 12Mhz, while pin 17 is 3mhz. Clock probably divided internally by 4 */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", simpsons_irq) /* IRQ triggered by the 052109, FIRQ by the sprite hardware */
diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c
index 13741551c23..36a756f1163 100644
--- a/src/mame/drivers/skullxbo.c
+++ b/src/mame/drivers/skullxbo.c
@@ -255,7 +255,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( skullxbo )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index fae58097de8..92973d4488e 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -261,7 +261,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_END
static MACHINE_DRIVER_START( skyarmy )
- MDRV_CPU_ADD(Z80,4000000)
+ MDRV_CPU_ADD_TAG("main", Z80,4000000)
MDRV_CPU_PROGRAM_MAP(skyarmy_readmem,skyarmy_writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index 00fc2cc29ec..6a112be88a6 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -369,7 +369,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( skydiver )
/* basic machine hardware */
- MDRV_CPU_ADD(M6800,3000000/4) /* ???? */
+ MDRV_CPU_ADD_TAG("main", M6800,3000000/4) /* ???? */
MDRV_CPU_PROGRAM_MAP(skydiver_map, 0)
MDRV_CPU_VBLANK_INT_HACK(skydiver_interrupt, 5)
MDRV_WATCHDOG_VBLANK_INIT(8) // 128V clocks the same as VBLANK
diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c
index e5281d3af2e..80cb77ba168 100644
--- a/src/mame/drivers/skyfox.c
+++ b/src/mame/drivers/skyfox.c
@@ -254,7 +254,7 @@ static INTERRUPT_GEN( skyfox_interrupt )
static MACHINE_DRIVER_START( skyfox )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(skyfox_readmem,skyfox_writemem)
MDRV_CPU_VBLANK_INT("main", skyfox_interrupt) /* NMI caused by coin insertion */
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index e1a9337b9ca..0ccb3b056f8 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -451,7 +451,7 @@ static const struct namco_interface namco_interface =
static MACHINE_DRIVER_START( skykid )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809,49152000/32)
+ MDRV_CPU_ADD_TAG("main", M6809,49152000/32)
MDRV_CPU_PROGRAM_MAP(skykid_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index 7f77aa6329b..f144b39c1e5 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -429,7 +429,7 @@ static INTERRUPT_GEN( skylncr_vblank_interrupt )
static MACHINE_DRIVER_START( skylncr )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 12000000/4)
+ MDRV_CPU_ADD_TAG("main", Z80, 12000000/4)
MDRV_CPU_PROGRAM_MAP(mem_map_skylncr,0)
MDRV_CPU_IO_MAP(io_map_skylncr,0)
MDRV_CPU_VBLANK_INT("main", skylncr_vblank_interrupt)
diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c
index 109ed002605..36752cdf60c 100644
--- a/src/mame/drivers/skyraid.c
+++ b/src/mame/drivers/skyraid.c
@@ -261,7 +261,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( skyraid )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 12096000 / 12)
+ MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 12)
MDRV_CPU_PROGRAM_MAP(skyraid_readmem, skyraid_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index 4d185655287..f051f20fa51 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -831,7 +831,7 @@ static VIDEO_EOF( perfrman )
static MACHINE_DRIVER_START( perfrman )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,16000000/4) /* 4MHz ???, 16MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", Z80,16000000/4) /* 4MHz ???, 16MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(perfrman_readmem,perfrman_writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -878,7 +878,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tigerhb )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000)
MDRV_CPU_PROGRAM_MAP(tigerh_readmem,writemem)
MDRV_CPU_IO_MAP(readport,tigerh_writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -924,7 +924,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tigerh )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_36MHz/6) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_36MHz/6) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(tigerh_readmem,writemem)
MDRV_CPU_IO_MAP(tigerh_readport,tigerh_writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index 88a07748346..cdb579465e2 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -554,7 +554,7 @@ static const struct YM2610interface ym2610_interface =
static MACHINE_DRIVER_START( slapshot )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14346000) /* 28.6860 MHz / 2 ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
MDRV_CPU_PROGRAM_MAP(slapshot_readmem,slapshot_writemem)
MDRV_CPU_VBLANK_INT("main", slapshot_interrupt)
@@ -596,7 +596,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( opwolf3 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14346000) /* 28.6860 MHz / 2 ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 14346000) /* 28.6860 MHz / 2 ??? */
MDRV_CPU_PROGRAM_MAP(opwolf3_readmem,opwolf3_writemem)
MDRV_CPU_VBLANK_INT("main", slapshot_interrupt)
diff --git a/src/mame/drivers/smstrv.c b/src/mame/drivers/smstrv.c
index af3efca1b33..13d1a736b95 100644
--- a/src/mame/drivers/smstrv.c
+++ b/src/mame/drivers/smstrv.c
@@ -226,7 +226,7 @@ static const ppi8255_interface ppi8255_intf[2] =
static MACHINE_DRIVER_START( smstrv )
- MDRV_CPU_ADD(I8088,24000000/2)
+ MDRV_CPU_ADD_TAG("main", I8088,24000000/2)
MDRV_CPU_PROGRAM_MAP(smstrv_map,0)
// MDRV_CPU_IO_MAP(io_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index afe5644b4f2..2138587ad0c 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -815,7 +815,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( tnk3 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_13_4MHz/4) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(tnk3_cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -859,7 +859,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( athena )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(tnk3_cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -907,7 +907,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ikari )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_13_4MHz/4) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -955,7 +955,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( victroad )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_13_4MHz/4) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1003,7 +1003,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gwar )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_8MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1049,7 +1049,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bermudat )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1096,7 +1096,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( psychos )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1142,7 +1142,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( chopper1 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1188,7 +1188,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tdfever )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", snk_irq_AB)
@@ -1236,7 +1236,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tdfever2 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", snk_irq_AB)
@@ -1284,7 +1284,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fsoccer )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_8MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(cpuA_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index f24aa73ca29..4e6a7315388 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -1772,7 +1772,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( snowbro3 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16mhz or 12mhz ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16mhz or 12mhz ? */
MDRV_CPU_PROGRAM_MAP(readmem3,writemem3)
MDRV_CPU_VBLANK_INT_HACK(snowbro3_interrupt,3)
diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c
index b9b8604cb04..87147a3d7c0 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -204,7 +204,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( solomon )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4.0 MHz (?????) */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4.0 MHz (?????) */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index 7a2e451fc57..e5b5f3a2550 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -228,7 +228,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( sonson )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809,12000000/6) /* 2 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M6809,12000000/6) /* 2 MHz ??? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index a560b31d8d9..6b2c2a4097a 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -357,7 +357,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( spacefb )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, SPACEFB_MAIN_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", Z80, SPACEFB_MAIN_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(spacefb_main_map,0)
MDRV_CPU_IO_MAP(spacefb_main_io_map,0)
diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c
index 16027cd60d3..286a8a5e7c4 100644
--- a/src/mame/drivers/spaceg.c
+++ b/src/mame/drivers/spaceg.c
@@ -364,7 +364,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( spaceg )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,2500000) /* 2.5 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,2500000) /* 2.5 MHz */
MDRV_CPU_PROGRAM_MAP(readwritemem,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) /* 60 Hz NMIs (verified) */
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index be0500b685a..cea1b7933aa 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -353,7 +353,7 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( spbactn )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(spbactn_readmem,spbactn_writemem)
MDRV_CPU_VBLANK_INT("main", irq3_line_hold)
diff --git a/src/mame/drivers/spcforce.c b/src/mame/drivers/spcforce.c
index b24decfe6d0..6d20c459459 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -258,7 +258,7 @@ static MACHINE_DRIVER_START( spcforce )
/* basic machine hardware */
/* FIXME: The 8085A had a max clock of 6MHz, internally divided by 2! */
- MDRV_CPU_ADD(8085A, 8000000 * 2) /* 4.00 MHz??? */
+ MDRV_CPU_ADD_TAG("main", 8085A, 8000000 * 2) /* 4.00 MHz??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq3_line_hold)
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index f227582b1df..c78a1fb0241 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -433,7 +433,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( spdodgeb )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,12000000/6) /* 2MHz ? */
+ MDRV_CPU_ADD_TAG("main", M6502,12000000/6) /* 2MHz ? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(spdodgeb_interrupt,33) /* 1 IRQ every 8 visible scanlines, plus NMI for vblank */
diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c
index 64470de75f3..528741be4d1 100644
--- a/src/mame/drivers/speedatk.c
+++ b/src/mame/drivers/speedatk.c
@@ -267,7 +267,7 @@ static GFXDECODE_START( speedatk )
GFXDECODE_END
static MACHINE_DRIVER_START( speedatk )
- MDRV_CPU_ADD(Z80,12000000/2)
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index e61be68c364..2dbc991e93d 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -228,7 +228,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( speedbal )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ??? */
MDRV_CPU_PROGRAM_MAP(main_cpu_map,0)
MDRV_CPU_IO_MAP(main_cpu_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index 1f4de026dd1..e32b7172dd7 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -307,8 +307,7 @@ static MACHINE_DRIVER_START( speedspn )
MDRV_CPU_IO_MAP(readport, writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
- MDRV_CPU_ADD(Z80,6000000) /* 6 MHz */
- /* audio CPU */
+ MDRV_CPU_ADD_TAG("audio", Z80,6000000) /* 6 MHz */
MDRV_CPU_PROGRAM_MAP(readmem2,writemem2)
/* video hardware */
diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c
index 9724f78d45c..06603332e18 100644
--- a/src/mame/drivers/spiders.c
+++ b/src/mame/drivers/spiders.c
@@ -689,7 +689,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( spiders )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 2800000)
+ MDRV_CPU_ADD_TAG("main", M6809, 2800000)
MDRV_CPU_PROGRAM_MAP(spiders_main_map,0)
MDRV_CPU_PERIODIC_INT(update_pia_1, 25)
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index b9e98f29ad7..b064360e1ad 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -433,7 +433,7 @@ static const struct MSM5205interface splash_msm5205_interface =
static MACHINE_DRIVER_START( splash )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz (24/2) */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz (24/2) */
MDRV_CPU_PROGRAM_MAP(splash_readmem,splash_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -485,7 +485,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( roldfrog )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz - verified */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz - verified */
MDRV_CPU_PROGRAM_MAP(roldfrog_readmem,roldfrog_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -524,7 +524,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( funystrp )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz (24/2) */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz (24/2) */
MDRV_CPU_PROGRAM_MAP(funystrp_readmem,funystrp_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c
index ca0c83dca33..4423a077cf8 100644
--- a/src/mame/drivers/sprcros2.c
+++ b/src/mame/drivers/sprcros2.c
@@ -301,7 +301,7 @@ static MACHINE_START( sprcros2 )
static MACHINE_DRIVER_START( sprcros2 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,10000000/2)
+ MDRV_CPU_ADD_TAG("main", Z80,10000000/2)
MDRV_CPU_PROGRAM_MAP(sprcros2_m_readmem,sprcros2_m_writemem)
MDRV_CPU_IO_MAP(sprcros2_m_readport,sprcros2_m_writeport)
MDRV_CPU_VBLANK_INT_HACK(sprcros2_m_interrupt,2) //1 nmi + 1 irq
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index 281e9785d64..dd5ae95bf1a 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -501,7 +501,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( sprint2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 12096000 / 16)
+ MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16)
MDRV_CPU_PROGRAM_MAP(readmem, writemem)
MDRV_CPU_VBLANK_INT("main", sprint2)
MDRV_WATCHDOG_VBLANK_INIT(8)
diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c
index 4a53aa824e3..f573a7360be 100644
--- a/src/mame/drivers/sprint4.c
+++ b/src/mame/drivers/sprint4.c
@@ -404,7 +404,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( sprint4 )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, PIXEL_CLOCK / 8)
+ MDRV_CPU_ADD_TAG("main", M6502, PIXEL_CLOCK / 8)
MDRV_CPU_PROGRAM_MAP(sprint4_cpu_map, 0)
MDRV_WATCHDOG_VBLANK_INIT(8)
diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c
index bc97520d7cd..bf1e9adb34a 100644
--- a/src/mame/drivers/sprint8.c
+++ b/src/mame/drivers/sprint8.c
@@ -465,7 +465,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( sprint8 )
/* basic machine hardware */
- MDRV_CPU_ADD(M6800, 11055000 / 11) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6800, 11055000 / 11) /* ? */
MDRV_CPU_PROGRAM_MAP(readmem, writemem)
MDRV_MACHINE_RESET(sprint8)
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index 2a8c83c704e..aa041f05038 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -536,7 +536,7 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( spy )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 3000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6809, 3000000) /* ? */
MDRV_CPU_PROGRAM_MAP(spy_readmem,spy_writemem)
MDRV_CPU_VBLANK_INT("main", spy_interrupt)
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index b66547be804..3fd59b2c64c 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -1066,7 +1066,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( srmp2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,16000000/2) /* 8.00 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,16000000/2) /* 8.00 MHz */
MDRV_CPU_PROGRAM_MAP(srmp2_readmem,srmp2_writemem)
MDRV_CPU_VBLANK_INT_HACK(srmp2_interrupt,16) /* Interrupt times is not understood */
@@ -1104,7 +1104,7 @@ static MACHINE_DRIVER_START( srmp3 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3500000) /* 3.50 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 3500000) /* 3.50 MHz ? */
// 4000000, /* 4.00 MHz ? */
MDRV_CPU_PROGRAM_MAP(srmp3_readmem,srmp3_writemem)
MDRV_CPU_IO_MAP(srmp3_readport,srmp3_writeport)
@@ -1143,7 +1143,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mjyuugi )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,16000000/2) /* 8.00 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,16000000/2) /* 8.00 MHz */
MDRV_CPU_PROGRAM_MAP(mjyuugi_readmem,mjyuugi_writemem)
MDRV_CPU_VBLANK_INT_HACK(srmp2_interrupt,16) /* Interrupt times is not understood */
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index a8e2efb6a53..02e6f281384 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -682,7 +682,7 @@ static const struct NiLe_interface nile_interface =
};
static MACHINE_DRIVER_START( srmp6 )
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(srmp6,0)
MDRV_CPU_VBLANK_INT_HACK(srmp6_interrupt,2)
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 3f4dde82cf4..fee2710676f 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -256,7 +256,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( srumbler )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1500000) /* 1.5 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", M6809, 1500000) /* 1.5 MHz (?) */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(srumbler_interrupt,2)
diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c
index 750223f33bc..27282bae900 100644
--- a/src/mame/drivers/ssfindo.c
+++ b/src/mame/drivers/ssfindo.c
@@ -598,7 +598,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( ssfindo )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM7, 54000000) // guess...
+ MDRV_CPU_ADD_TAG("main", ARM7, 54000000) // guess...
MDRV_CPU_PROGRAM_MAP(ssfindo_map,0)
MDRV_CPU_VBLANK_INT("main", ssfindo_interrupt)
@@ -621,7 +621,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ppcar )
/* basic machine hardware */
- MDRV_CPU_ADD(ARM7, 54000000) // guess...
+ MDRV_CPU_ADD_TAG("main", ARM7, 54000000) // guess...
MDRV_CPU_PROGRAM_MAP(ppcar_map,0)
MDRV_CPU_VBLANK_INT("main", ssfindo_interrupt)
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index 830568adc9a..dfb2bd10c8a 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -344,7 +344,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( sshangha )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 28000000/2)
+ MDRV_CPU_ADD_TAG("main", M68000, 28000000/2)
MDRV_CPU_PROGRAM_MAP(sshangha_readmem,sshangha_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c
index e271d29a2e2..909938b20ee 100644
--- a/src/mame/drivers/ssingles.c
+++ b/src/mame/drivers/ssingles.c
@@ -255,7 +255,7 @@ static INPUT_PORTS_START( ssingles )
INPUT_PORTS_END
static MACHINE_DRIVER_START( ssingles )
- MDRV_CPU_ADD(Z80,4000000) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,4000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(ssingles_map,0)
MDRV_CPU_IO_MAP(ssingles_io_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/sslam.c b/src/mame/drivers/sslam.c
index 7334c8f5b3c..f3f6c53fc4a 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -728,7 +728,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( sslam )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(sslam_program_map, 0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -762,7 +762,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( powerbls )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(powerbls_map, 0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c
index 63e60563f27..ec16310e5a9 100644
--- a/src/mame/drivers/ssozumo.c
+++ b/src/mame/drivers/ssozumo.c
@@ -233,7 +233,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( ssozumo )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 1200000) /* 1.2 MHz ???? */
+ MDRV_CPU_ADD_TAG("main", M6502, 1200000) /* 1.2 MHz ???? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", ssozumo_interrupt)
diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c
index 16dbbe166df..36d2851c6a3 100644
--- a/src/mame/drivers/sspeedr.c
+++ b/src/mame/drivers/sspeedr.c
@@ -219,7 +219,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( sspeedr )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 19968000 / 8)
+ MDRV_CPU_ADD_TAG("main", Z80, 19968000 / 8)
MDRV_CPU_PROGRAM_MAP(readmem, writemem)
MDRV_CPU_IO_MAP(readport, writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert)
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index fb29517fe5f..82c68c7b2a6 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -164,7 +164,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( ssrj )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000/2)
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c
index 2fc45db81be..e4a667a46d8 100644
--- a/src/mame/drivers/stactics.c
+++ b/src/mame/drivers/stactics.c
@@ -306,7 +306,7 @@ static MACHINE_DRIVER_START( stactics )
MDRV_DRIVER_DATA(stactics_state)
/* basic machine hardware */
- MDRV_CPU_ADD(8080, 1933560)
+ MDRV_CPU_ADD_TAG("main", 8080, 1933560)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", stactics_interrupt)
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index 2d32213be50..5d224fea8a0 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -245,7 +245,7 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( stadhero )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)/* VBL */
diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c
index 826758a2256..90ed1957c79 100644
--- a/src/mame/drivers/starcrus.c
+++ b/src/mame/drivers/starcrus.c
@@ -170,7 +170,7 @@ static const struct Samplesinterface samples_interface =
static MACHINE_DRIVER_START( starcrus )
/* basic machine hardware */
- MDRV_CPU_ADD(8080,9750000/9) /* 8224 chip is a divide by 9 */
+ MDRV_CPU_ADD_TAG("main", 8080,9750000/9) /* 8224 chip is a divide by 9 */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c
index 84f523b6c4c..ceb4dc0475f 100644
--- a/src/mame/drivers/starfire.c
+++ b/src/mame/drivers/starfire.c
@@ -263,7 +263,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( starfire )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, STARFIRE_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", Z80, STARFIRE_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c
index 7c2e3f218c4..2ffa607cd00 100644
--- a/src/mame/drivers/starshp1.c
+++ b/src/mame/drivers/starshp1.c
@@ -300,7 +300,7 @@ static MACHINE_DRIVER_START( starshp1 )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, STARSHP1_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", M6502, STARSHP1_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(readmem, writemem)
MDRV_CPU_VBLANK_INT("main", starshp1_interrupt)
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index dcbd934d6ca..b1042561a1a 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -375,7 +375,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( starwars )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, MASTER_CLOCK / 8)
+ MDRV_CPU_ADD_TAG("main", M6809, MASTER_CLOCK / 8)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_HZ(CLOCK_3KHZ / 128))
diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c
index e9352332be8..eac5b991ea1 100644
--- a/src/mame/drivers/stepstag.c
+++ b/src/mame/drivers/stepstag.c
@@ -120,7 +120,7 @@ static VIDEO_UPDATE(stepstag)
static MACHINE_DRIVER_START( stepstag )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000 ) //??
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000 ) //??
MDRV_CPU_PROGRAM_MAP(stepstag_readmem,stepstag_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold) // 4 & 6 valid
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index 1666b2b103c..2aa785cb2cc 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -454,7 +454,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( stfight )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3000000) /* 3 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 3000000) /* 3 MHz */
MDRV_CPU_PROGRAM_MAP(readmem_cpu1,writemem_cpu1)
MDRV_CPU_VBLANK_INT("main", stfight_vb_interrupt)
diff --git a/src/mame/drivers/strnskil.c b/src/mame/drivers/strnskil.c
index 8b8b53880b7..7ecea43a3e6 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -335,7 +335,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( strnskil )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000/2) /* 4.000MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* 4.000MHz */
MDRV_CPU_PROGRAM_MAP(strnskil_readmem1,strnskil_writemem1)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2)
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 3b19abf3acb..5c956873fe7 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -2576,7 +2576,7 @@ static MACHINE_RESET( stv )
static MACHINE_DRIVER_START( stv )
/* basic machine hardware */
- MDRV_CPU_ADD(SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
+ MDRV_CPU_ADD_TAG("main", SH2, MASTER_CLOCK_352/2) // 28.6364 MHz
MDRV_CPU_PROGRAM_MAP(stv_mem, 0)
MDRV_CPU_VBLANK_INT_HACK(stv_interrupt,264)/*264 lines,224 display lines*/
MDRV_CPU_CONFIG(sh2_conf_master)
diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c
index 4785bedc010..b307b88e6a6 100644
--- a/src/mame/drivers/subs.c
+++ b/src/mame/drivers/subs.c
@@ -184,7 +184,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( subs )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,12096000/16) /* clock input is the "4H" signal */
+ MDRV_CPU_ADD_TAG("main", M6502,12096000/16) /* clock input is the "4H" signal */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(subs_interrupt,4)
diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c
index 82e6729cbaf..197998fa734 100644
--- a/src/mame/drivers/subsino.c
+++ b/src/mame/drivers/subsino.c
@@ -263,7 +263,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( victor5 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z180, XTAL_12MHz / 3) // 4 MHz?
+ MDRV_CPU_ADD_TAG("main", Z180, XTAL_12MHz / 3) // 4 MHz?
MDRV_CPU_PROGRAM_MAP(victor5_map,0)
MDRV_CPU_IO_MAP(subsino_iomap,0)
@@ -303,7 +303,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( srider )
/* basic machine hardware */
- MDRV_CPU_ADD(Z180, XTAL_12MHz / 3) // 4 MHz?
+ MDRV_CPU_ADD_TAG("main", Z180, XTAL_12MHz / 3) // 4 MHz?
MDRV_CPU_PROGRAM_MAP(srider_map,0)
MDRV_CPU_IO_MAP(subsino_iomap,0)
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 1aa5e5ba0c0..964daf366d0 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -852,7 +852,7 @@ static INTERRUPT_GEN( bssoccer_interrupt )
static MACHINE_DRIVER_START( bssoccer )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* ? */
MDRV_CPU_PROGRAM_MAP(bssoccer_readmem,bssoccer_writemem)
MDRV_CPU_VBLANK_INT_HACK(bssoccer_interrupt,2)
@@ -915,7 +915,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( uballoon )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(uballoon_readmem,uballoon_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -968,7 +968,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sunaq )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 24000000/4)
+ MDRV_CPU_ADD_TAG("main", M68000, 24000000/4)
MDRV_CPU_PROGRAM_MAP(sunaq_readmem,sunaq_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -1043,7 +1043,7 @@ static const struct AY8910interface bestbest_ay8910_interface =
static MACHINE_DRIVER_START( bestbest )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 24000000/4)
+ MDRV_CPU_ADD_TAG("main", M68000, 24000000/4)
MDRV_CPU_PROGRAM_MAP(bestbest_map,0)
MDRV_CPU_VBLANK_INT_HACK(bssoccer_interrupt,2)
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index d78c50fe7ea..a572d070c16 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -1552,7 +1552,7 @@ static const struct Samplesinterface suna8_samples_interface =
static MACHINE_DRIVER_START( hardhead )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 24000000 / 4) /* ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 24000000 / 4) /* ? */
MDRV_CPU_PROGRAM_MAP(hardhead_readmem,hardhead_writemem)
MDRV_CPU_IO_MAP(hardhead_readport,hardhead_writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* No NMI */
@@ -1607,7 +1607,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( rranger )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 24000000 / 4) /* ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 24000000 / 4) /* ? */
MDRV_CPU_PROGRAM_MAP(rranger_readmem,rranger_writemem)
MDRV_CPU_IO_MAP(rranger_readport,rranger_writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* IRQ & NMI ! */
@@ -1770,7 +1770,7 @@ static const struct AY8910interface starfigh_ay8910_interface =
static MACHINE_DRIVER_START( starfigh )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 24000000 / 4) /* ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 24000000 / 4) /* ? */
MDRV_CPU_PROGRAM_MAP(starfigh_readmem,starfigh_writemem)
MDRV_CPU_IO_MAP(starfigh_readport,starfigh_writeport)
MDRV_CPU_VBLANK_INT_HACK(brickzn_interrupt,2) /* IRQ & NMI */
@@ -1831,7 +1831,7 @@ static INTERRUPT_GEN( sparkman_interrupt )
static MACHINE_DRIVER_START( sparkman )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 24000000 / 4) /* ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 24000000 / 4) /* ? */
MDRV_CPU_PROGRAM_MAP(sparkman_readmem,sparkman_writemem)
MDRV_CPU_VBLANK_INT_HACK(sparkman_interrupt,2) /* IRQ & NMI */
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index 10b619f5341..5fcd1b3a179 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -373,7 +373,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( supbtime )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(supbtime_readmem,supbtime_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -414,7 +414,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( chinatwn )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(chinatwn_readmem,chinatwn_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c
index 3d80ccdc5b9..76e5d5d47de 100644
--- a/src/mame/drivers/supdrapo.c
+++ b/src/mame/drivers/supdrapo.c
@@ -262,7 +262,7 @@ static VIDEO_UPDATE( supdrapo )
}
static MACHINE_DRIVER_START( supdrapo )
- MDRV_CPU_ADD(Z80,8000000/2) /* ??? */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000/2) /* ??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index 20271ed6488..acc90a12c25 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -414,7 +414,7 @@ static NVRAM_HANDLER( superchs )
static MACHINE_DRIVER_START( superchs )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(superchs_readmem,superchs_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)/* VBL */
diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c
index 02f54a85676..2b4fd18e685 100644
--- a/src/mame/drivers/superdq.c
+++ b/src/mame/drivers/superdq.c
@@ -332,7 +332,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( superdq )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MASTER_CLOCK/8)
+ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/8)
MDRV_CPU_PROGRAM_MAP(superdq_map,0)
MDRV_CPU_IO_MAP(superdq_io,0)
MDRV_CPU_VBLANK_INT("main", superdq_vblank)
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index 66a45336a93..0cbc35a5f98 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -982,7 +982,7 @@ static INTERRUPT_GEN( bootleg_interrupt )
static MACHINE_DRIVER_START( pbillian )
- MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(pbillian_port_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
@@ -1015,7 +1015,7 @@ static MACHINE_DRIVER_START( pbillian )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hotsmash )
- MDRV_CPU_ADD(Z80,12000000/2) /* 6 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/2) /* 6 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(hotsmash_port_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
@@ -1053,7 +1053,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sqix )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 12000000/2) /* 6 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 12000000/2) /* 6 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(sqix_port_map,0)
MDRV_CPU_VBLANK_INT_HACK(sqix_interrupt,6) /* ??? */
@@ -1096,7 +1096,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sqixbl )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 12000000/2) /* 6 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 12000000/2) /* 6 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(bootleg_port_map,0)
MDRV_CPU_VBLANK_INT_HACK(bootleg_interrupt,6) /* ??? */
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index b32a3f17a0f..47778c9363a 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -410,7 +410,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( supertnk )
/* basic machine hardware */
- MDRV_CPU_ADD(TMS9980, 2598750) /* ? to which frequency is the 20.79 Mhz crystal mapped down? */
+ MDRV_CPU_ADD_TAG("main", TMS9980, 2598750) /* ? to which frequency is the 20.79 Mhz crystal mapped down? */
MDRV_CPU_PROGRAM_MAP(supertnk_map,0)
MDRV_CPU_IO_MAP(supertnk_io_map,0)
MDRV_CPU_VBLANK_INT("main", supertnk_interrupt)
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index 9c25610fc84..19dce71546c 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -291,7 +291,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( suprgolf )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,4000000)
+ MDRV_CPU_ADD_TAG("main", Z80,4000000)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c
index 9a7b05d4b07..f5a5f2c2b2c 100644
--- a/src/mame/drivers/suprloco.c
+++ b/src/mame/drivers/suprloco.c
@@ -168,7 +168,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( suprloco )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index 75abcb27749..64b56ec2c5d 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -950,7 +950,7 @@ static const struct YMZ280Binterface ymz280b_intf =
};
static MACHINE_DRIVER_START(skns)
- MDRV_CPU_ADD(SH2,28638000)
+ MDRV_CPU_ADD_TAG("main", SH2,28638000)
MDRV_CPU_PROGRAM_MAP(skns_readmem,skns_writemem)
MDRV_CPU_VBLANK_INT_HACK(skns_interrupt,2)
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index 092155c8c4b..1e10f1b4ed6 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -356,7 +356,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( suprridr )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_49_152MHz/16) /* 3 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_49_152MHz/16) /* 3 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_portmap,0)
MDRV_CPU_VBLANK_INT("main", main_nmi_gen)
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index c20d630fb14..2f1574fc71d 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -326,7 +326,7 @@ static const struct YM2610interface ym2610_interface =
/*** MACHINE DRIVER **********************************************************/
static MACHINE_DRIVER_START( suprslam )
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(suprslam_readmem,suprslam_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index 67308189a3d..cabdefb8b46 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -237,7 +237,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( surpratk )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI, 3000000) /* 053248 */
+ MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* 053248 */
MDRV_CPU_PROGRAM_MAP(surpratk_readmem,surpratk_writemem)
MDRV_CPU_VBLANK_INT("main", surpratk_interrupt)
diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c
index fec541d7da6..d6bb753c007 100644
--- a/src/mame/drivers/tagteam.c
+++ b/src/mame/drivers/tagteam.c
@@ -254,7 +254,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( tagteam )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 1500000) /* 1.5 MHz ?? */
+ MDRV_CPU_ADD_TAG("main", M6502, 1500000) /* 1.5 MHz ?? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", tagteam_interrupt)
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index f02344989b2..d8ccb75bce0 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -240,7 +240,7 @@ static const struct YM2608interface ym2608_interface =
static MACHINE_DRIVER_START( tail2nos )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,XTAL_20MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000,XTAL_20MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index cc7790d7eb0..3d1629f6f6c 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -2454,7 +2454,7 @@ static MACHINE_RESET( mb87078 )
static MACHINE_DRIVER_START( rastsag2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(rastsag2_readmem,rastsag2_writemem)
MDRV_CPU_VBLANK_INT("main", rastansaga2_interrupt)
@@ -2492,7 +2492,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ashura )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(rastsag2_readmem,rastsag2_writemem)
MDRV_CPU_VBLANK_INT("main", rastansaga2_interrupt)
@@ -2530,7 +2530,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( crimec )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(crimec_readmem,crimec_writemem)
MDRV_CPU_VBLANK_INT("main", crimec_interrupt)
@@ -2568,7 +2568,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tetrist )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ???*/
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ???*/
MDRV_CPU_PROGRAM_MAP(tetrist_readmem,tetrist_writemem)
MDRV_CPU_VBLANK_INT("main", rastansaga2_interrupt)
@@ -2605,7 +2605,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tetrista )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(tetrista_readmem,tetrista_writemem)
MDRV_CPU_VBLANK_INT("main", masterw_interrupt)
@@ -2643,7 +2643,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hitice )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(hitice_readmem, hitice_writemem)
MDRV_CPU_VBLANK_INT("main", hitice_interrupt)
@@ -2687,7 +2687,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( rambo3 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_24MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(rambo3_readmem,rambo3_writemem)
MDRV_CPU_VBLANK_INT("main", rambo3_interrupt)
@@ -2725,7 +2725,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( rambo3a )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_24MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(rambo3_readmem,rambo3_writemem)
MDRV_CPU_VBLANK_INT("main", rambo3_interrupt)
@@ -2763,7 +2763,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pbobble )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(pbobble_readmem,pbobble_writemem)
MDRV_CPU_VBLANK_INT("main", pbobble_interrupt)
@@ -2804,7 +2804,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( spacedx )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(spacedx_readmem,spacedx_writemem)
MDRV_CPU_VBLANK_INT("main", pbobble_interrupt)
@@ -2845,7 +2845,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( spacedxo )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(spacedxo_readmem,spacedxo_writemem)
MDRV_CPU_VBLANK_INT("main", selfeena_interrupt)
@@ -2883,7 +2883,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( qzshowby )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz according to the readme*/
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz according to the readme*/
MDRV_CPU_PROGRAM_MAP(qzshowby_readmem,qzshowby_writemem)
MDRV_CPU_VBLANK_INT("main", pbobble_interrupt)
@@ -2924,7 +2924,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( viofight )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(viofight_readmem,viofight_writemem)
MDRV_CPU_VBLANK_INT("main", viofight_interrupt)
@@ -2966,7 +2966,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( masterw )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(masterw_readmem,masterw_writemem)
MDRV_CPU_VBLANK_INT("main", masterw_interrupt)
@@ -3005,7 +3005,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( silentd )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz ??? */
MDRV_CPU_PROGRAM_MAP(silentd_readmem,silentd_writemem)
MDRV_CPU_VBLANK_INT("main", silentd_interrupt)
@@ -3043,7 +3043,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( selfeena )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(selfeena_readmem,selfeena_writemem)
MDRV_CPU_VBLANK_INT("main", selfeena_interrupt)
@@ -3090,7 +3090,7 @@ static void ryujin_patch(void)
static MACHINE_DRIVER_START( ryujin )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(selfeena_readmem,selfeena_writemem)
MDRV_CPU_VBLANK_INT("main", selfeena_interrupt)
@@ -3135,7 +3135,7 @@ static void sbm_patch(void)
static MACHINE_DRIVER_START( sbm )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(sbm_readmem,sbm_writemem)
MDRV_CPU_VBLANK_INT("main", sbm_interrupt)
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index c18ce4feaaa..a1efa88bb92 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -3739,8 +3739,7 @@ static MACHINE_DRIVER_START( taito_f2 )
MDRV_CPU_ADD_TAG("main", M68000, 24000000/2) /* 12 MHz */
MDRV_CPU_VBLANK_INT("main", taitof2_interrupt)
- MDRV_CPU_ADD(Z80, 24000000/6) /* 4 MHz */
- /* audio CPU */
+ MDRV_CPU_ADD_TAG("audio", Z80, 24000000/6) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
MDRV_MACHINE_START(f2)
@@ -4189,7 +4188,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( camltrya )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(cameltry_readmem,cameltry_writemem)
MDRV_CPU_VBLANK_INT("main", taitof2_interrupt)
@@ -4231,7 +4230,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( driveout )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(driveout_readmem,driveout_writemem)
MDRV_CPU_VBLANK_INT("main", taitof2_interrupt)
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index 9b18b1ce6d9..63035cf94ca 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -407,7 +407,7 @@ static MACHINE_START(f3)
static MACHINE_DRIVER_START( f3 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000)
MDRV_CPU_PROGRAM_MAP(f3_readmem,f3_writemem)
MDRV_CPU_VBLANK_INT("main", f3_interrupt2)
@@ -492,7 +492,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( bubsympb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000)
MDRV_CPU_PROGRAM_MAP(f3_readmem,f3_writemem)
MDRV_CPU_VBLANK_INT("main", f3_interrupt2)
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index b724ea821c6..7d85a170110 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -580,7 +580,7 @@ static MACHINE_START( taitoh )
static MACHINE_DRIVER_START( syvalion )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000 / 2) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000 / 2) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(syvalion_readmem,syvalion_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -619,7 +619,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( recordbr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000 / 2) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000 / 2) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(recordbr_readmem,recordbr_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -658,7 +658,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( dleague )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000 / 2) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000 / 2) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(dleague_readmem,dleague_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index 8f4f6b5014d..f0b14176ce1 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -2270,7 +2270,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kurikint )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */
+ MDRV_CPU_ADD_TAG("main", Z80, 13330560/2) /* verified freq on pin122 of TC0090LVC cpu */
MDRV_CPU_PROGRAM_MAP(kurikint_readmem,kurikint_writemem)
MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
@@ -2410,7 +2410,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( evilston )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 13330560/2) /* not verfied */
+ MDRV_CPU_ADD_TAG("main", Z80, 13330560/2) /* not verfied */
MDRV_CPU_PROGRAM_MAP(evilston_readmem,evilston_writemem)
MDRV_CPU_VBLANK_INT_HACK(vbl_interrupt,3)
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 6b07f33b110..25e1e43b0e8 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -1004,7 +1004,7 @@ static MACHINE_START( taitox )
static MACHINE_DRIVER_START( superman )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(superman_readmem,superman_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -1044,7 +1044,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( daisenpu )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(daisenpu_readmem,daisenpu_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -1081,7 +1081,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( gigandes )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz? */
MDRV_CPU_PROGRAM_MAP(gigandes_readmem,gigandes_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -1120,7 +1120,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ballbros )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz? */
MDRV_CPU_PROGRAM_MAP(ballbros_readmem,ballbros_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index 2b8850ea418..a3026d2c1b4 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -3041,7 +3041,7 @@ Contcirc road glitchiness in attract?
static MACHINE_DRIVER_START( contcirc )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */
MDRV_CPU_PROGRAM_MAP(contcirc_readmem,contcirc_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -3098,7 +3098,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( chasehq )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */
MDRV_CPU_PROGRAM_MAP(chasehq_readmem,chasehq_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -3153,7 +3153,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( enforce )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */
MDRV_CPU_PROGRAM_MAP(enforce_readmem,enforce_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -3211,7 +3211,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bshark )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */
MDRV_CPU_PROGRAM_MAP(bshark_readmem,bshark_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -3263,7 +3263,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sci )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */
MDRV_CPU_PROGRAM_MAP(sci_readmem,sci_writemem)
MDRV_CPU_VBLANK_INT("main", sci_interrupt)
@@ -3319,7 +3319,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( nightstr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */
MDRV_CPU_PROGRAM_MAP(nightstr_readmem,nightstr_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -3376,7 +3376,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( aquajack )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */
MDRV_CPU_PROGRAM_MAP(aquajack_readmem,aquajack_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -3432,7 +3432,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( spacegun )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz ??? */
MDRV_CPU_PROGRAM_MAP(spacegun_readmem,spacegun_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -3484,7 +3484,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( dblaxle )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz ??? */
MDRV_CPU_PROGRAM_MAP(dblaxle_readmem,dblaxle_writemem)
MDRV_CPU_VBLANK_INT("main", dblaxle_interrupt)
@@ -3540,7 +3540,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( racingb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz ??? */
MDRV_CPU_PROGRAM_MAP(racingb_readmem,racingb_writemem)
MDRV_CPU_VBLANK_INT("main", dblaxle_interrupt)
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index 21b0e6c988a..55f51138c98 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -594,7 +594,7 @@ static const struct YM2610interface airsys_ym2610_interface =
static MACHINE_DRIVER_START( airsys )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000 / 2) /* 12 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000 / 2) /* 12 MHz ??? */
MDRV_CPU_PROGRAM_MAP(airsys_map, 0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index dba21588e41..b390626f130 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -1268,7 +1268,7 @@ static INTERRUPT_GEN( taitojc_int6 )
}
static MACHINE_DRIVER_START( taitojc )
- MDRV_CPU_ADD(M68040, 25000000)
+ MDRV_CPU_ADD_TAG("main", M68040, 25000000)
MDRV_CPU_PROGRAM_MAP(taitojc_map, 0)
MDRV_CPU_VBLANK_INT("main", taitojc_vblank)
MDRV_CPU_PERIODIC_INT(taitojc_int6, 1000)
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index e66f69d6325..276e7ac4d56 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -1825,7 +1825,7 @@ static MACHINE_DRIVER_START( nomcu )
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
/* audio CPU */ /* 3 MHz */
- MDRV_CPU_ADD(Z80,6000000/2)
+ MDRV_CPU_ADD_TAG("audio", Z80,6000000/2)
MDRV_CPU_PROGRAM_MAP(taitosj_audio_map,0)
/* interrupts: */
/* - no interrupts synced with vblank */
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index ed46948d5a1..744459e2c5d 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -599,7 +599,7 @@ static const struct pit8253_config taitowlf_pit8254_config =
static MACHINE_DRIVER_START(taitowlf)
/* basic machine hardware */
- MDRV_CPU_ADD(PENTIUM, 200000000)
+ MDRV_CPU_ADD_TAG("main", PENTIUM, 200000000)
MDRV_CPU_PROGRAM_MAP(taitowlf_map, 0)
MDRV_CPU_IO_MAP(taitowlf_io, 0)
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index 3369ab2de32..6422e4ddeed 100644
--- a/src/mame/drivers/tank8.c
+++ b/src/mame/drivers/tank8.c
@@ -329,7 +329,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( tank8 )
/* basic machine hardware */
- MDRV_CPU_ADD(M6800, 11055000 / 10) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6800, 11055000 / 10) /* ? */
MDRV_CPU_PROGRAM_MAP(tank8_cpu_map, 0)
MDRV_MACHINE_RESET(tank8)
diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c
index c991a65e241..60040b4311d 100644
--- a/src/mame/drivers/tankbatt.c
+++ b/src/mame/drivers/tankbatt.c
@@ -275,7 +275,7 @@ static const struct Samplesinterface samples_interface =
static MACHINE_DRIVER_START( tankbatt )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 1000000) /* 1 MHz ???? */
+ MDRV_CPU_ADD_TAG("main", M6502, 1000000) /* 1 MHz ???? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", tankbatt_interrupt)
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index 86e44572d64..d7ec009e8b0 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -336,7 +336,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( tankbust )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz ? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index da5d02f4ba1..467247f4c15 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -331,7 +331,7 @@ static const struct YM2610interface ym2610_interface =
};
static MACHINE_DRIVER_START( taotaido )
- MDRV_CPU_ADD(M68000, 32000000/2)
+ MDRV_CPU_ADD_TAG("main", M68000, 32000000/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c
index c1fe73a6299..e984cbd8c73 100644
--- a/src/mame/drivers/targeth.c
+++ b/src/mame/drivers/targeth.c
@@ -179,7 +179,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( targeth )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT_HACK(targeth_interrupt,3)
diff --git a/src/mame/drivers/tarzan.c b/src/mame/drivers/tarzan.c
index d2d2b6917dd..12a336e5b44 100644
--- a/src/mame/drivers/tarzan.c
+++ b/src/mame/drivers/tarzan.c
@@ -90,7 +90,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( tarzan )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000) /* ? */
MDRV_CPU_PROGRAM_MAP(tarzan_map,0)
/* video hardware */
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index 0ffb01de4e8..63c2d361b63 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -833,7 +833,7 @@ static INTERRUPT_GEN( roundup5_interrupt )
static MACHINE_DRIVER_START( apache3 )
/* basic machine hardware */
- MDRV_CPU_ADD(V30,20000000 / 2) /* NEC V30 CPU, 20MHz / 2 */
+ MDRV_CPU_ADD_TAG("main", V30,20000000 / 2) /* NEC V30 CPU, 20MHz / 2 */
MDRV_CPU_PROGRAM_MAP(apache3_v30_map,0)
MDRV_CPU_VBLANK_INT("main", roundup5_interrupt)
@@ -879,7 +879,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( roundup5 )
/* basic machine hardware */
- MDRV_CPU_ADD(V30,20000000 / 2) /* NEC V30 CPU, 20MHz / 2 */
+ MDRV_CPU_ADD_TAG("main", V30,20000000 / 2) /* NEC V30 CPU, 20MHz / 2 */
MDRV_CPU_PROGRAM_MAP(roundup5_v30_map,0)
MDRV_CPU_VBLANK_INT("main", roundup5_interrupt)
@@ -922,7 +922,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cyclwarr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 50000000 / 4) /* Confirmed */
+ MDRV_CPU_ADD_TAG("main", M68000, 50000000 / 4) /* Confirmed */
MDRV_CPU_PROGRAM_MAP(cyclwarr_68000a_map,0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -966,7 +966,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bigfight )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 50000000 / 4) /* Confirmed */
+ MDRV_CPU_ADD_TAG("main", M68000, 50000000 / 4) /* Confirmed */
MDRV_CPU_PROGRAM_MAP(bigfight_68000a_map,0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c
index 8b7e3e54c88..192b1d1b780 100644
--- a/src/mame/drivers/tattack.c
+++ b/src/mame/drivers/tattack.c
@@ -181,7 +181,7 @@ static PALETTE_INIT( tattack )
static MACHINE_DRIVER_START( tattack )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 8000000 / 2) /* 4 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000 / 2) /* 4 MHz ? */
MDRV_CPU_PROGRAM_MAP(mem, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c
index 2af05dcf08a..a81fe960fc7 100644
--- a/src/mame/drivers/taxidrvr.c
+++ b/src/mame/drivers/taxidrvr.c
@@ -360,7 +360,7 @@ static const struct AY8910interface ay8910_interface_2 =
static MACHINE_DRIVER_START( taxidrvr )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,4000000) /* 4 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", Z80,4000000) /* 4 MHz ??? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index eb0931a3d07..259efe494b8 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -586,7 +586,7 @@ The game is displayed on 2 monitors
static MACHINE_DRIVER_START( tbowl )
/* CPU on Board '6206B' */
- MDRV_CPU_ADD(Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* NEC D70008AC-8 (Z80 Clone) */
MDRV_CPU_PROGRAM_MAP(readmem_6206B,writemem_6206B)
MDRV_CPU_VBLANK_INT("left", irq0_line_hold)
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 1d0fd217af6..369f047d87d 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -382,7 +382,7 @@ static MACHINE_RESET( tceptor )
static MACHINE_DRIVER_START( tceptor )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 49152000/32)
+ MDRV_CPU_ADD_TAG("main", M6809, 49152000/32)
MDRV_CPU_PROGRAM_MAP(m6809_map,0)
MDRV_CPU_VBLANK_INT("2D", m6809_vb_interrupt)
diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c
index fd7b98d0c57..49cdbf865dc 100644
--- a/src/mame/drivers/tcl.c
+++ b/src/mame/drivers/tcl.c
@@ -110,7 +110,7 @@ static const ppi8255_interface ppi8255_intf[2] =
static MACHINE_DRIVER_START( tcl )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/4)
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/4)
MDRV_CPU_PROGRAM_MAP(tcl_map,0)
/* video hardware */
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index 370b1ea673f..5f43c1eb1d1 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -440,7 +440,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( fstarfrc )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* 12MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12MHz */
MDRV_CPU_PROGRAM_MAP(fstarfrc_readmem,fstarfrc_writemem)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -481,7 +481,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ginkun )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* 12MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12MHz */
MDRV_CPU_PROGRAM_MAP(ginkun_readmem,ginkun_writemem)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index cdb40c1ae9b..789ddcb3790 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -918,7 +918,7 @@ static const struct YMZ280Binterface ymz280b_interface =
static MACHINE_DRIVER_START( deroon )
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
MDRV_WATCHDOG_VBLANK_INIT(400) // guess
diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c
index c6ee6cdbe8f..70fcda49da4 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -581,7 +581,7 @@ static const struct POKEYinterface pokey_interface_2 =
static MACHINE_DRIVER_START( tempest )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, MASTER_CLOCK / 8)
+ MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK / 8)
MDRV_CPU_PROGRAM_MAP(main_map, 0)
MDRV_CPU_PERIODIC_INT(irq0_line_assert, (double)MASTER_CLOCK / 4096 / 12)
MDRV_WATCHDOG_TIME_INIT(UINT64_ATTOTIME_IN_HZ(CLOCK_3KHZ / 256))
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index 919abd86255..11d51244fb8 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -562,7 +562,7 @@ static GFXDECODE_START( terracre )
GFXDECODE_END
static MACHINE_DRIVER_START( amazon )
- MDRV_CPU_ADD(M68000, 8000000 )
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000 )
MDRV_CPU_PROGRAM_MAP(amazon_readmem,amazon_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -602,7 +602,7 @@ static MACHINE_DRIVER_START( amazon )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ym3526 )
- MDRV_CPU_ADD(M68000, 8000000 )
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000 )
MDRV_CPU_PROGRAM_MAP(terracre_readmem,terracre_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
@@ -640,7 +640,7 @@ static MACHINE_DRIVER_START( ym3526 )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ym2203 )
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz?? */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz?? */
MDRV_CPU_PROGRAM_MAP(terracre_readmem,terracre_writemem)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 4c2bf7ea9f8..4e56ebe6a32 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -1250,7 +1250,7 @@ static DRIVER_INIT( rockn3 )
static MACHINE_DRIVER_START( tetrisp2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(tetrisp2_readmem,tetrisp2_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -1283,7 +1283,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( nndmseal )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_12MHz)
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz)
MDRV_CPU_PROGRAM_MAP(nndmseal_map,0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -1315,7 +1315,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( rockn )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(rockn1_readmem,rockn1_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -1348,7 +1348,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( rockn2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(rockn2_readmem,rockn2_writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -1381,7 +1381,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( rocknms )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(rocknms_main_readmem,rocknms_main_writemem)
MDRV_CPU_VBLANK_INT("left", irq2_line_hold)
diff --git a/src/mame/drivers/tetriunk.c b/src/mame/drivers/tetriunk.c
index d21eb5d178c..46f8d3f0dc8 100644
--- a/src/mame/drivers/tetriunk.c
+++ b/src/mame/drivers/tetriunk.c
@@ -176,7 +176,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( tetriunk )
/* basic machine hardware */
- MDRV_CPU_ADD(I8088, 8000000)
+ MDRV_CPU_ADD_TAG("main", I8088, 8000000)
MDRV_CPU_PROGRAM_MAP(tetriunk_mem, 0)
MDRV_CPU_IO_MAP(tetriunk_io, 0)
diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c
index ff218df0bad..36b8b98bbd6 100644
--- a/src/mame/drivers/thayers.c
+++ b/src/mame/drivers/thayers.c
@@ -768,7 +768,7 @@ static COP400_INTERFACE( thayers_cop_intf )
static MACHINE_DRIVER_START( thayers )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_4MHz)
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_4MHz)
MDRV_CPU_PROGRAM_MAP(thayers_map, 0)
MDRV_CPU_IO_MAP(thayers_io_map, 0)
MDRV_CPU_VBLANK_INT("main", vblank_callback_thayers)
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index fa5aae549f9..54a6d2fc859 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -369,7 +369,7 @@ static INTERRUPT_GEN( thedeep_interrupt )
static MACHINE_DRIVER_START( thedeep )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000) /* 6MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6MHz */
MDRV_CPU_PROGRAM_MAP(thedeep_readmem,thedeep_writemem)
MDRV_CPU_VBLANK_INT_HACK(thedeep_interrupt,2) /* IRQ by MCU, NMI by vblank (maskable) */
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index 57536fd0b06..f3c4a379bdc 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -651,7 +651,7 @@ static MACHINE_DRIVER_START( thepit )
MDRV_CPU_PROGRAM_MAP(thepit_main_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
- MDRV_CPU_ADD(Z80, SOUND_CLOCK/4) /* 2.5 MHz */
+ MDRV_CPU_ADD_TAG("audio", Z80, SOUND_CLOCK/4) /* 2.5 MHz */
MDRV_CPU_PROGRAM_MAP(audio_map,0)
MDRV_CPU_IO_MAP(audio_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c
index b13c3c31ab0..80014e6a987 100644
--- a/src/mame/drivers/thief.c
+++ b/src/mame/drivers/thief.c
@@ -461,7 +461,7 @@ static const struct Samplesinterface natodef_samples_interface =
static MACHINE_DRIVER_START( sharkatt )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz? */
MDRV_CPU_PROGRAM_MAP(sharkatt_readmem,sharkatt_writemem)
MDRV_CPU_IO_MAP(io_map,0)
MDRV_CPU_VBLANK_INT("main", thief_interrupt)
@@ -497,7 +497,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( thief )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz? */
MDRV_CPU_PROGRAM_MAP(thief_readmem,thief_writemem)
MDRV_CPU_IO_MAP(io_map,0)
MDRV_CPU_VBLANK_INT("main", thief_interrupt)
@@ -533,7 +533,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( natodef )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz? */
MDRV_CPU_PROGRAM_MAP(thief_readmem,thief_writemem)
MDRV_CPU_IO_MAP(io_map,0)
MDRV_CPU_VBLANK_INT("main", thief_interrupt)
diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c
index 163074611a7..4987a06e238 100644
--- a/src/mame/drivers/thoop2.c
+++ b/src/mame/drivers/thoop2.c
@@ -196,7 +196,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( thoop2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(thoop2_readmem,thoop2_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c
index 6e8159b38a3..83330f3b5d6 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.c
@@ -332,10 +332,10 @@ GFXDECODE_END
static MACHINE_DRIVER_START( thunderj )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("extra", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(extra_map,0)
MDRV_MACHINE_RESET(thunderj)
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index 85603871067..9b9205d9fc2 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -697,7 +697,7 @@ static const struct K007232_interface k007232_interface =
static MACHINE_DRIVER_START( scontra )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI, 3000000) /* 052001 */
+ MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* 052001 */
MDRV_CPU_PROGRAM_MAP(scontra_readmem,scontra_writemem)
MDRV_CPU_VBLANK_INT("main", scontra_interrupt)
@@ -739,7 +739,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( thunderx )
/* basic machine hardware */
- MDRV_CPU_ADD(KONAMI, 3000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", KONAMI, 3000000) /* ? */
MDRV_CPU_PROGRAM_MAP(thunderx_readmem,thunderx_writemem)
MDRV_CPU_VBLANK_INT("main", scontra_interrupt)
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index dbe4e3ff789..5fe7286b843 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -275,7 +275,7 @@ static const struct CustomSound_interface tiamc1_custom_interface =
static MACHINE_DRIVER_START( tiamc1 )
/* basic machine hardware */
- MDRV_CPU_ADD(8080,16000000/9) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", 8080,16000000/9) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(tiamc1_readmem,tiamc1_writemem)
MDRV_CPU_IO_MAP(tiamc1_readport,tiamc1_writeport)
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 1f29abbf91f..c6cb6b8c84c 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -551,7 +551,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( tigeroad )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_10MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_10MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -595,8 +595,7 @@ static MACHINE_DRIVER_START( toramich )
/* basic machine hardware */
MDRV_IMPORT_FROM(tigeroad)
- MDRV_CPU_ADD(Z80, 3579545)
- /* audio CPU */ /* ? */
+ MDRV_CPU_ADD_TAG("audio", Z80, 3579545) /* ? */
MDRV_CPU_PROGRAM_MAP(sample_readmem,sample_writemem)
MDRV_CPU_IO_MAP(sample_readport,sample_writeport)
MDRV_CPU_PERIODIC_INT(irq0_line_hold,4000) /* ? */
diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c
index cf360a9fe8f..00211ffffa7 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -263,7 +263,7 @@ static INTERRUPT_GEN( timelimt_irq ) {
static MACHINE_DRIVER_START( timelimt )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 5000000) /* 5.000 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 5000000) /* 5.000 MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(readport,0)
MDRV_CPU_VBLANK_INT("main", timelimt_irq)
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index 44ef6dbba80..726424a2ed9 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -2342,7 +2342,7 @@ static const struct K053260_interface k053260_interface =
static MACHINE_DRIVER_START( cuebrick )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8 MHz */
MDRV_CPU_PROGRAM_MAP(cuebrick_main_map,0)
MDRV_CPU_VBLANK_INT_HACK(cuebrick_interrupt,10)
@@ -2375,7 +2375,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mia )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_24MHz/3)
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/3)
MDRV_CPU_PROGRAM_MAP(mia_main_map,0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -2421,7 +2421,7 @@ static MACHINE_RESET( tmnt )
static MACHINE_DRIVER_START( tmnt )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_24MHz/3)
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/3)
MDRV_CPU_PROGRAM_MAP(tmnt_main_map,0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
@@ -2470,7 +2470,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( punkshot )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_24MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/2)
MDRV_CPU_PROGRAM_MAP(punkshot_main_map,0)
MDRV_CPU_VBLANK_INT("main", punkshot_interrupt)
@@ -2509,7 +2509,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( lgtnfght )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_24MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_24MHz/2)
MDRV_CPU_PROGRAM_MAP(lgtnfght_main_map,0)
MDRV_CPU_VBLANK_INT("main", lgtnfght_interrupt)
@@ -2548,7 +2548,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( blswhstl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(blswhstl_main_map,0)
MDRV_CPU_VBLANK_INT("main", punkshot_interrupt)
@@ -2608,7 +2608,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( glfgreat )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* ? */
MDRV_CPU_PROGRAM_MAP(glfgreat_main_map,0)
MDRV_CPU_VBLANK_INT("main", lgtnfght_interrupt)
@@ -2657,7 +2657,7 @@ static const struct K054539interface k054539_interface =
static MACHINE_DRIVER_START( prmrsocr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* ? */
MDRV_CPU_PROGRAM_MAP(prmrsocr_main_map,0)
MDRV_CPU_VBLANK_INT("main", lgtnfght_interrupt)
@@ -2697,7 +2697,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tmnt2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_32MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_32MHz/2)
MDRV_CPU_PROGRAM_MAP(tmnt2_main_map,0)
MDRV_CPU_VBLANK_INT("main", punkshot_interrupt)
@@ -2744,7 +2744,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ssriders )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_32MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_32MHz/2)
MDRV_CPU_PROGRAM_MAP(ssriders_main_map,0)
MDRV_CPU_VBLANK_INT("main", punkshot_interrupt)
@@ -2787,7 +2787,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sunsetbl )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(sunsetbl_main_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
@@ -2820,7 +2820,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( thndrx2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz */
MDRV_CPU_PROGRAM_MAP(thndrx2_main_map,0)
MDRV_CPU_VBLANK_INT("main", punkshot_interrupt)
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index b12b20b6857..de209fa81a7 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -1380,7 +1380,7 @@ static const struct Samplesinterface samples_interface =
static MACHINE_DRIVER_START( arknoid2 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", arknoid2_interrupt)
@@ -1419,7 +1419,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( drtoppel )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", arknoid2_interrupt)
@@ -1461,7 +1461,7 @@ static const i8x41_config i8042_config = { TYPE_I8X42 };
static MACHINE_DRIVER_START( tnzs )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1504,7 +1504,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( insectx )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1542,7 +1542,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kageki )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1655,7 +1655,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( jpopnics )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* Not verified - Main board Crystal is 12MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,XTAL_12MHz/2) /* Not verified - Main board Crystal is 12MHz */
MDRV_CPU_PROGRAM_MAP(jpopnics_main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index 51f9c5883dc..fcc039c4d90 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -1237,7 +1237,7 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( rallybik )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(rallybik_main_map, 0)
MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt)
@@ -1277,7 +1277,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( truxton )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(truxton_main_map, 0)
MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt)
@@ -1317,7 +1317,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hellfire )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(hellfire_main_map, 0)
MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt)
@@ -1357,7 +1357,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( zerowing )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(zerowing_main_map, 0)
MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt)
@@ -1397,7 +1397,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( demonwld )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(demonwld_main_map, 0)
MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt)
@@ -1441,7 +1441,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( samesame )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(samesame_main_map, 0)
MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt)
@@ -1475,7 +1475,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( outzone )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(outzone_main_map, 0)
MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt)
@@ -1515,7 +1515,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( vimana )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_10MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_10MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(vimana_main_map, 0)
MDRV_CPU_VBLANK_INT("main", toaplan1_interrupt)
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 83ab43e9ccb..d66889d462f 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -3427,7 +3427,7 @@ static const struct YMZ280Binterface ymz280b_interface =
static MACHINE_DRIVER_START( tekipaki )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(tekipaki_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -3466,7 +3466,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ghox )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_10MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_10MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(ghox_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -3504,7 +3504,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( dogyuun )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_25MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_25MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(dogyuun_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -3547,7 +3547,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kbash )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(kbash_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -3590,7 +3590,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kbash2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(kbash2_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -3628,7 +3628,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( truxton2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_16MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(truxton2_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq2)
@@ -3665,7 +3665,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pipibibs )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_10MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_10MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(pipibibs_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -3704,7 +3704,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( whoopee )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(tekipaki_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -3744,7 +3744,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pipibibi )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(pipibibi_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -3783,7 +3783,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fixeight )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, XTAL_16MHz) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000, XTAL_16MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(fixeight_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -3826,7 +3826,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fixeighb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(fixeighb_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq2)
@@ -3860,7 +3860,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( vfive )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(vfive_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -3916,7 +3916,7 @@ static const struct YM2151interface batsugun_ym2151_interface =
static MACHINE_DRIVER_START( batsugun )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,32000000/2) /* 16MHz , 32MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(batsugun_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -3960,7 +3960,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( snowbro2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(snowbro2_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -3997,7 +3997,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( mahoudai )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,32000000/2) /* 16MHz , 32MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(mahoudai_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -4039,7 +4039,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( shippumd )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,32000000/2) /* 16MHz , 32MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(shippumd_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -4081,7 +4081,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bgaregga )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,32000000/2) /* 16MHz , 32MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(bgaregga_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq4)
@@ -4123,7 +4123,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( batrider )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,32000000/2) /* 16MHz , 32MHz Oscillator */
+ MDRV_CPU_ADD_TAG("main", M68000,32000000/2) /* 16MHz , 32MHz Oscillator */
MDRV_CPU_PROGRAM_MAP(batrider_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq2)
@@ -4168,7 +4168,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( bbakraid )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,32000000/2)
+ MDRV_CPU_ADD_TAG("main", M68000,32000000/2)
MDRV_CPU_PROGRAM_MAP(bbakraid_68k_mem, 0)
MDRV_CPU_VBLANK_INT("main", toaplan2_vblank_irq1)
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index 14b6d1527d9..69c5e402ea0 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -435,7 +435,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( toki ) /* KOYO 20.000MHz near the cpu */
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,XTAL_20MHz /2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000,XTAL_20MHz /2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(toki_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)/* VBL */
@@ -467,7 +467,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tokib )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 10MHz causes bad slowdowns with monkey machine rd1 */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 10MHz causes bad slowdowns with monkey machine rd1 */
MDRV_CPU_PROGRAM_MAP(tokib_map,0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)/* VBL (could be level1, same vector) */
diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c
index cfcf09b509f..e8f30a3999c 100644
--- a/src/mame/drivers/toobin.c
+++ b/src/mame/drivers/toobin.c
@@ -237,7 +237,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( toobin )
/* basic machine hardware */
- MDRV_CPU_ADD(M68010, ATARI_CLOCK_32MHz/4)
+ MDRV_CPU_ADD_TAG("main", M68010, ATARI_CLOCK_32MHz/4)
MDRV_CPU_PROGRAM_MAP(main_readmem,main_writemem)
MDRV_MACHINE_RESET(toobin)
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index 60c74668e4a..61a53e9683b 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -695,7 +695,7 @@ static MACHINE_START( topspeed )
static MACHINE_DRIVER_START( topspeed )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */
MDRV_CPU_PROGRAM_MAP(topspeed_readmem,topspeed_writemem)
MDRV_CPU_VBLANK_INT("main", topspeed_interrupt)
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index 1252c96fb6b..02dcebacc09 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -399,7 +399,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( toratora )
/* basic machine hardware */
- MDRV_CPU_ADD(M6800,500000) /* ?????? game speed is entirely controlled by this */
+ MDRV_CPU_ADD_TAG("main", M6800,500000) /* ?????? game speed is entirely controlled by this */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_PERIODIC_INT(toratora_timer,16) /* timer counting at 16 Hz */
diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c
index 63e63499baf..9fbe6b43981 100644
--- a/src/mame/drivers/tourtabl.c
+++ b/src/mame/drivers/tourtabl.c
@@ -207,7 +207,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( tourtabl )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, MASTER_CLOCK / 3) /* actually M6507 */
+ MDRV_CPU_ADD_TAG("main", M6502, MASTER_CLOCK / 3) /* actually M6507 */
MDRV_CPU_PROGRAM_MAP(readmem, writemem)
MDRV_MACHINE_START(tourtabl)
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index d65a3767a15..c1b286cf30f 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -844,7 +844,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hyprolyb )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 2048000) /* 1.400 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M6809, 2048000) /* 1.400 MHz ??? */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c
index 5c63e9c7d0d..4d341e3cd9f 100644
--- a/src/mame/drivers/travrusa.c
+++ b/src/mame/drivers/travrusa.c
@@ -306,7 +306,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( travrusa )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c
index d572a27e3c8..10e8ab3158b 100644
--- a/src/mame/drivers/triplhnt.c
+++ b/src/mame/drivers/triplhnt.c
@@ -316,7 +316,7 @@ static PALETTE_INIT( triplhnt )
static MACHINE_DRIVER_START( triplhnt )
/* basic machine hardware */
- MDRV_CPU_ADD(M6800, 800000)
+ MDRV_CPU_ADD_TAG("main", M6800, 800000)
MDRV_CPU_PROGRAM_MAP(triplhnt_readmem, triplhnt_writemem)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c
index d7098f90f01..5fd6bb7fe5b 100644
--- a/src/mame/drivers/truco.c
+++ b/src/mame/drivers/truco.c
@@ -138,7 +138,7 @@ static INTERRUPT_GEN( truco_interrupt )
static MACHINE_DRIVER_START( truco )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 750000) /* ?? guess */
+ MDRV_CPU_ADD_TAG("main", M6809, 750000) /* ?? guess */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", truco_interrupt)
diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c
index 52501163824..b56a4144c63 100644
--- a/src/mame/drivers/trucocl.c
+++ b/src/mame/drivers/trucocl.c
@@ -135,7 +135,7 @@ static INTERRUPT_GEN( trucocl_interrupt )
static MACHINE_DRIVER_START( trucocl )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/6)
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/6)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", trucocl_interrupt)
diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c
index 264c8676a09..0372c39757d 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -278,7 +278,7 @@ static VIDEO_UPDATE( trvmadns )
}
static MACHINE_DRIVER_START( trvmadns )
- MDRV_CPU_ADD(Z80,10000000/2) // ?
+ MDRV_CPU_ADD_TAG("main", Z80,10000000/2) // ?
MDRV_CPU_PROGRAM_MAP(cpu_map,0)
MDRV_CPU_IO_MAP(io_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index e6d8c44a180..0277e7a92e6 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -203,7 +203,7 @@ static MACHINE_DRIVER_START( trvquest )
MDRV_DRIVER_DATA(gameplan_state)
- MDRV_CPU_ADD(M6809,6000000)
+ MDRV_CPU_ADD_TAG("main", M6809,6000000)
MDRV_CPU_PROGRAM_MAP(cpu_map,0)
MDRV_CPU_VBLANK_INT("main", trvquest_interrupt)
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index 30454ee4614..03ed16c87d6 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -189,7 +189,7 @@ static INTERRUPT_GEN( tryout_interrupt )
static MACHINE_DRIVER_START( tryout )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 2000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* ? */
MDRV_CPU_PROGRAM_MAP(main_cpu,0)
MDRV_CPU_VBLANK_INT("main", tryout_interrupt)
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index 9c37581d13f..9f9e9a70f17 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -751,7 +751,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( tsamurai )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_IO_MAP(z80_readport,z80_writeport)
MDRV_CPU_VBLANK_INT("main", samurai_interrupt)
@@ -796,7 +796,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( m660 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(readmem_m660,writemem_m660)
MDRV_CPU_IO_MAP(z80_readport,z80_writeport_m660)
MDRV_CPU_VBLANK_INT("main", samurai_interrupt)
@@ -847,7 +847,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( vsgongf )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000)
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000)
MDRV_CPU_PROGRAM_MAP(readmem_vsgongf,writemem_vsgongf)
MDRV_CPU_VBLANK_INT("main", samurai_interrupt)
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index c5ddba7f276..7127feda567 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -223,7 +223,7 @@ static INTERRUPT_GEN( ttchamp_irq ) /* right? */
static MACHINE_DRIVER_START( ttchamp )
/* basic machine hardware */
- MDRV_CPU_ADD(V30, 8000000)
+ MDRV_CPU_ADD_TAG("main", V30, 8000000)
MDRV_CPU_PROGRAM_MAP(ttchamp_map, 0)
MDRV_CPU_IO_MAP(ttchamp_io,0)
MDRV_CPU_VBLANK_INT("main", ttchamp_irq)
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index f8b7ae2c49c..cc3328fbc1a 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -2144,7 +2144,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( tumblepb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(tumblepopb_readmem,tumblepopb_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -2174,7 +2174,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tumbleb2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(tumblepopb_readmem,tumblepopb_writemem)
MDRV_CPU_VBLANK_INT("main", tumbleb2_interrupt)
@@ -2203,7 +2203,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( jumpkids )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(jumpkids_readmem,jumpkids_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -2235,7 +2235,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fncywld )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000)
MDRV_CPU_PROGRAM_MAP(fncywld_readmem,fncywld_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -2293,7 +2293,7 @@ static MACHINE_RESET (htchctch)
static MACHINE_DRIVER_START( htchctch )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 15000000) /* verified */
+ MDRV_CPU_ADD_TAG("main", M68000, 15000000) /* verified */
MDRV_CPU_PROGRAM_MAP(htchctch_readmem,htchctch_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -2370,7 +2370,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( jumppop )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(jumppop_readmem,jumppop_writemem)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -2409,7 +2409,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( suprtrio )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000) /* 14mhz should be correct, but lots of sprite flicker later in game */
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000) /* 14mhz should be correct, but lots of sprite flicker later in game */
MDRV_CPU_PROGRAM_MAP(suprtrio_main_cpu,0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
@@ -2443,7 +2443,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( pangpang )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(pangpang_readmem,pangpang_writemem)
MDRV_CPU_VBLANK_INT("main", tumbleb2_interrupt)
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index b0eae66e501..635a3217871 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -301,7 +301,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( tumblep )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 14000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 14000000)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/tunhunt.c b/src/mame/drivers/tunhunt.c
index 7513cef6ed7..f6c9b2b734e 100644
--- a/src/mame/drivers/tunhunt.c
+++ b/src/mame/drivers/tunhunt.c
@@ -310,7 +310,7 @@ static const struct POKEYinterface pokey_interface_2 =
static MACHINE_DRIVER_START( tunhunt )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502,2000000) /* ??? */
+ MDRV_CPU_ADD_TAG("main", M6502,2000000) /* ??? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold,2) /* ? probably wrong */
diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c
index c9373546841..8ff50aeab38 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -1077,7 +1077,7 @@ static MACHINE_DRIVER_START( turbo )
MDRV_DRIVER_DATA(turbo_state)
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MASTER_CLOCK/4)
+ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/4)
MDRV_CPU_PROGRAM_MAP(turbo_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1115,7 +1115,7 @@ static MACHINE_DRIVER_START( subroc3d )
MDRV_DRIVER_DATA(turbo_state)
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MASTER_CLOCK/4)
+ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/4)
MDRV_CPU_PROGRAM_MAP(subroc3d_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -1146,7 +1146,7 @@ static MACHINE_DRIVER_START( buckrog )
MDRV_DRIVER_DATA(turbo_state)
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, MASTER_CLOCK/4)
+ MDRV_CPU_ADD_TAG("main", Z80, MASTER_CLOCK/4)
MDRV_CPU_PROGRAM_MAP(buckrog_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/turbosub.c b/src/mame/drivers/turbosub.c
index 95103e87ea9..8e4beeadb7f 100644
--- a/src/mame/drivers/turbosub.c
+++ b/src/mame/drivers/turbosub.c
@@ -330,7 +330,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( turbosub )
- MDRV_CPU_ADD(M6809E,4000000)
+ MDRV_CPU_ADD_TAG("main", M6809E,4000000)
MDRV_CPU_PROGRAM_MAP(game_cpu_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_assert) /* Unverified */
diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c
index 6c48d62cb41..5eddef1a9ea 100644
--- a/src/mame/drivers/tutankhm.c
+++ b/src/mame/drivers/tutankhm.c
@@ -229,7 +229,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( tutankhm )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1500000) /* 1.5 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M6809, 1500000) /* 1.5 MHz ??? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", tutankhm_interrupt)
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index 53ff4e87aec..52fe4fde24e 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -913,7 +913,7 @@ static INTERRUPT_GEN( CPUB_interrupt )
static MACHINE_DRIVER_START( twin16 )
// basic machine hardware
- MDRV_CPU_ADD(Z80, 3579545)
+ MDRV_CPU_ADD_TAG("main", Z80, 3579545)
/* audio CPU */
MDRV_CPU_PROGRAM_MAP(sound_map,0)
@@ -971,7 +971,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( fround )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3579545)
+ MDRV_CPU_ADD_TAG("main", Z80, 3579545)
/* audio CPU */
MDRV_CPU_PROGRAM_MAP(sound_map,0)
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index 23b2ae744cb..cebde4505dc 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -648,7 +648,7 @@ static const struct YM3812interface ym3812_interface =
static MACHINE_DRIVER_START( twincobr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,28000000/4) /* 7.0MHz - Main board Crystal is 28MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,28000000/4) /* 7.0MHz - Main board Crystal is 28MHz */
MDRV_CPU_PROGRAM_MAP(main_program_map, 0)
MDRV_CPU_VBLANK_INT("main", twincobr_interrupt)
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 99153a7c423..12e0505463c 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -167,7 +167,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( twins )
/* basic machine hardware */
- MDRV_CPU_ADD(V30, 8000000)
+ MDRV_CPU_ADD_TAG("main", V30, 8000000)
MDRV_CPU_PROGRAM_MAP(twins_map, 0)
MDRV_CPU_IO_MAP(twins_io,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
@@ -255,7 +255,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( twinsa )
/* basic machine hardware */
- MDRV_CPU_ADD(V30, XTAL_16MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", V30, XTAL_16MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(twins_map, 0)
MDRV_CPU_IO_MAP(twinsa_io,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index 0a9a99024cb..545a8dbe26f 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -698,7 +698,7 @@ static const struct CustomSound_interface bb_custom_interface =
*************************************/
static MACHINE_DRIVER_START( tx1 )
- MDRV_CPU_ADD(I8086, 5000000)
+ MDRV_CPU_ADD_TAG("main", I8086, 5000000)
MDRV_CPU_PROGRAM_MAP(tx1_main, 0)
// MDRV_WATCHDOG_TIME_INIT(5)
@@ -756,7 +756,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( buggyboy )
- MDRV_CPU_ADD(BUGGYBOY_CPU_TYPE, 5000000)
+ MDRV_CPU_ADD_TAG("main", I8086, 5000000)
MDRV_CPU_PROGRAM_MAP(buggyboy_main, 0)
// MDRV_WATCHDOG_TIME_INIT(5)
@@ -814,7 +814,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( buggybjr )
- MDRV_CPU_ADD(BUGGYBOY_CPU_TYPE, 5000000)
+ MDRV_CPU_ADD_TAG("main", I8086, 5000000)
MDRV_CPU_PROGRAM_MAP(buggybjr_main, 0)
// MDRV_WATCHDOG_TIME_INIT(5)
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index d1cf18e4552..f04629b6adf 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -179,7 +179,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( uapce )
/* basic machine hardware */
- MDRV_CPU_ADD(H6280, PCE_MAIN_CLOCK/3)
+ MDRV_CPU_ADD_TAG("main", H6280, PCE_MAIN_CLOCK/3)
MDRV_CPU_PROGRAM_MAP(pce_mem, 0)
MDRV_CPU_IO_MAP(pce_io, 0)
MDRV_CPU_VBLANK_INT_HACK(pce_interrupt, VDC_LPF)
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index 36192b6e51d..49a113a74f6 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -246,7 +246,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( ultraman )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz? */
+ MDRV_CPU_ADD_TAG("main", M68000,24000000/2) /* 12 MHz? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/ultratnk.c b/src/mame/drivers/ultratnk.c
index 5d33736d6d0..18be3b8ecb0 100644
--- a/src/mame/drivers/ultratnk.c
+++ b/src/mame/drivers/ultratnk.c
@@ -290,7 +290,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( ultratnk )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, PIXEL_CLOCK / 8)
+ MDRV_CPU_ADD_TAG("main", M6502, PIXEL_CLOCK / 8)
MDRV_CPU_PROGRAM_MAP(ultratnk_cpu_map, 0)
MDRV_WATCHDOG_VBLANK_INIT(8)
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index 70a1c063db2..de707f62d22 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -239,7 +239,7 @@ static INTERRUPT_GEN( ultrsprt_vblank )
static MACHINE_DRIVER_START( ultrsprt )
/* basic machine hardware */
- MDRV_CPU_ADD(PPC403GA, 25000000) /* PowerPC 403GA 25MHz */
+ MDRV_CPU_ADD_TAG("main", PPC403GA, 25000000) /* PowerPC 403GA 25MHz */
MDRV_CPU_PROGRAM_MAP(ultrsprt_map, 0)
MDRV_CPU_VBLANK_INT("main", ultrsprt_vblank)
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index f6c1d54aa61..8cbb26ecf64 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -730,7 +730,7 @@ static INTERRUPT_GEN( undrfire_interrupt )
static MACHINE_DRIVER_START( undrfire )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(undrfire_map,0)
MDRV_CPU_VBLANK_INT("main", undrfire_interrupt)
@@ -761,7 +761,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( cbombers )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000) /* 16 MHz */
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000) /* 16 MHz */
MDRV_CPU_PROGRAM_MAP(cbombers_cpua_map, 0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index ff3031a1972..9a94ffd88c4 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -674,7 +674,7 @@ static NVRAM_HANDLER( zeropnt2 )
static MACHINE_DRIVER_START( burglarx )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(readmem_burglarx,writemem_burglarx)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -721,7 +721,7 @@ static MACHINE_RESET( zeropt )
static MACHINE_DRIVER_START( zeropnt )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(readmem_zeropnt,writemem_zeropnt)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -763,7 +763,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( zeropnt2 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68EC020, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68EC020, 16000000)
MDRV_CPU_PROGRAM_MAP(readmem_zeropnt2,writemem_zeropnt2)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index fc7cd0aef0b..990324ada5d 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -289,7 +289,7 @@ static const struct CustomSound_interface amiga_custom_interface =
static MACHINE_DRIVER_START( upscope )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, AMIGA_68000_NTSC_CLOCK)
+ MDRV_CPU_ADD_TAG("main", M68000, AMIGA_68000_NTSC_CLOCK)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_RESET(amiga)
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index ce6817f00c1..76d7b9750d0 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -615,7 +615,7 @@ static MACHINE_DRIVER_START( sound_ym_oki )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( sound_qs1000 )
- MDRV_CPU_ADD(I8052, 24000000/4) /* 6 MHz? */
+ MDRV_CPU_ADD_TAG("audio", I8052, 24000000/4) /* 6 MHz? */
MDRV_CPU_PROGRAM_MAP(qs1000_prg_map, 0)
MDRV_CPU_DATA_MAP( qs1000_data_map, 0 )
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index e56ac8bb838..0dbb8a15609 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -245,7 +245,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( vaportra )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,12000000) /* Custom chip 59 */
+ MDRV_CPU_ADD_TAG("main", M68000,12000000) /* Custom chip 59 */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index 357534c817e..25f578b470c 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -307,7 +307,7 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( vastar )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3072000) /* 3.072 MHz ???? */
+ MDRV_CPU_ADD_TAG("main", Z80, 3072000) /* 3.072 MHz ???? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_port_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index 9ad637c8894..dea33cb0ed5 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -400,7 +400,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( vball )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 2000000) /* 2 MHz - measured by guru but it makes the game far far too slow ?! */
+ MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* 2 MHz - measured by guru but it makes the game far far too slow ?! */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(vball_interrupt,32) /* ??1 IRQ every 8 visible scanlines, plus NMI for vblank?? */
@@ -439,7 +439,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( vball2pj )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 2000000) /* 2.0 MHz */
+ MDRV_CPU_ADD_TAG("main", M6502, 2000000) /* 2.0 MHz */
MDRV_CPU_PROGRAM_MAP(vball2pj_readmem,writemem)
MDRV_CPU_VBLANK_INT_HACK(vball_interrupt,32) /* ??1 IRQ every 8 visible scanlines, plus NMI for vblank?? */
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index c4ce86510e9..80e0f5c870b 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -583,8 +583,7 @@ static MACHINE_DRIVER_START( vendetta )
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", vendetta_irq)
- MDRV_CPU_ADD(Z80, 3579545) /* verified with PCB */
- /* audio CPU */
+ MDRV_CPU_ADD_TAG("audio", Z80, 3579545) /* verified with PCB */
MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound)
/* interrupts are triggered by the main CPU */
diff --git a/src/mame/drivers/vertigo.c b/src/mame/drivers/vertigo.c
index 0c39b55a674..9f4cd6542f2 100644
--- a/src/mame/drivers/vertigo.c
+++ b/src/mame/drivers/vertigo.c
@@ -105,7 +105,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( vertigo )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000)
MDRV_CPU_PROGRAM_MAP(vertigo_map,0)
MDRV_CPU_PERIODIC_INT(vertigo_interrupt,60)
diff --git a/src/mame/drivers/victory.c b/src/mame/drivers/victory.c
index 62e1d5cd54a..047f96b9243 100644
--- a/src/mame/drivers/victory.c
+++ b/src/mame/drivers/victory.c
@@ -209,7 +209,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( victory )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, VICTORY_MAIN_CPU_CLOCK)
+ MDRV_CPU_ADD_TAG("main", Z80, VICTORY_MAIN_CPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(main_io_map,0)
MDRV_CPU_VBLANK_INT("main", victory_vblank_interrupt)
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index 67e08e17ff6..9823640f9d6 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -321,7 +321,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( videopin )
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 12096000 / 16)
+ MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_RESET(videopin)
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index dacd2e967fc..6c3b5bd2096 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -528,7 +528,7 @@ static const struct YM2203interface ym2203_interface =
static MACHINE_DRIVER_START( vigilant )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3579645) /* 3.579645 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 3579645) /* 3.579645 MHz */
MDRV_CPU_PROGRAM_MAP(vigilant_map,0)
MDRV_CPU_IO_MAP(vigilant_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -571,7 +571,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( buccanrs )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 5688800) /* 5.688800 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 5688800) /* 5.688800 MHz */
MDRV_CPU_PROGRAM_MAP(vigilant_map,0)
MDRV_CPU_IO_MAP(vigilant_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
@@ -630,7 +630,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kikcubic )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 3579645) /* 3.579645 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80, 3579645) /* 3.579645 MHz */
MDRV_CPU_PROGRAM_MAP(kikcubic_map,0)
MDRV_CPU_IO_MAP(kikcubic_io_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c
index e7ec2af5003..fe32ffa31ca 100644
--- a/src/mame/drivers/vindictr.c
+++ b/src/mame/drivers/vindictr.c
@@ -195,7 +195,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( vindictr )
/* basic machine hardware */
- MDRV_CPU_ADD(M68010, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68010, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_MACHINE_RESET(vindictr)
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index c21a81ec2d8..6c1d1c6f3fb 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -623,7 +623,7 @@ static MACHINE_RESET(viper)
static MACHINE_DRIVER_START(viper)
/* basic machine hardware */
- MDRV_CPU_ADD(MPC8240, 200000000)
+ MDRV_CPU_ADD_TAG("main", MPC8240, 200000000)
MDRV_CPU_CONFIG(viper_ppc_cfg)
MDRV_CPU_PROGRAM_MAP(viper_map, 0)
MDRV_CPU_VBLANK_INT("main", viper_vblank)
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index cd4eb6db482..b16ac8c1b78 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -424,7 +424,7 @@ static VIDEO_UPDATE(varia)
}
static MACHINE_DRIVER_START( varia )
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(varia_program_map, 0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold) // also level 3
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index e7ae18528d3..3e56b8422ed 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -239,7 +239,7 @@ static DRIVER_INIT( volfied )
static MACHINE_DRIVER_START( volfied )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 8000000) /* 8MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index 96be9b6a55c..010172e4520 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -258,7 +258,7 @@ static const ppi8255_interface ppi8255_intf[2] =
static MACHINE_DRIVER_START( vroulet )
// basic machine hardware
- MDRV_CPU_ADD(Z80, 4000000) //???
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) //???
MDRV_CPU_PROGRAM_MAP(vroulet_map, 0)
MDRV_CPU_IO_MAP(vroulet_io_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index 14d0e0f466b..b12279ed7e1 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -2034,7 +2034,7 @@ static const struct NESinterface nes_interface_2 =
static MACHINE_DRIVER_START( vsnes )
/* basic machine hardware */
- MDRV_CPU_ADD(N2A03,N2A03_DEFAULTCLOCK)
+ MDRV_CPU_ADD_TAG("main", N2A03,N2A03_DEFAULTCLOCK)
MDRV_CPU_PROGRAM_MAP(vsnes_cpu1_map,0)
/* some carts also trigger IRQs */
MDRV_MACHINE_RESET(vsnes)
@@ -2067,7 +2067,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( vsdual )
/* basic machine hardware */
- MDRV_CPU_ADD(N2A03,N2A03_DEFAULTCLOCK)
+ MDRV_CPU_ADD_TAG("main", N2A03,N2A03_DEFAULTCLOCK)
MDRV_CPU_PROGRAM_MAP(vsnes_cpu1_map,0)
/* some carts also trigger IRQs */
MDRV_CPU_ADD(N2A03,N2A03_DEFAULTCLOCK)
diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c
index e6832c3b548..d9f62de38a6 100644
--- a/src/mame/drivers/vulgus.c
+++ b/src/mame/drivers/vulgus.c
@@ -234,7 +234,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( vulgus )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz (?) */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4 MHz (?) */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT_HACK(vulgus_interrupt,2)
diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c
index 2836c3d6288..98dc4d129ec 100644
--- a/src/mame/drivers/wallc.c
+++ b/src/mame/drivers/wallc.c
@@ -276,7 +276,7 @@ static DRIVER_INIT( wallca )
static MACHINE_DRIVER_START( wallc )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 12288000 / 4) /* 3.072 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80, 12288000 / 4) /* 3.072 MHz ? */
MDRV_CPU_PROGRAM_MAP(wallc_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 878a99dbd60..56dc62ee94a 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -464,7 +464,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( wardner )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,24000000/4) /* 6MHz ??? - Real board crystal is 24MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,24000000/4) /* 6MHz ??? - Real board crystal is 24MHz */
MDRV_CPU_PROGRAM_MAP(main_program_map, 0)
MDRV_CPU_IO_MAP(main_io_map, 0)
MDRV_CPU_VBLANK_INT("main", wardner_interrupt)
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index 4ae95b07baf..1d99f1a18ff 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -445,7 +445,7 @@ static const struct CustomSound_interface subwoofer_interface =
static MACHINE_DRIVER_START( darius2d )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? (Might well be 16!) */
MDRV_CPU_PROGRAM_MAP(darius2d_map,0)
MDRV_CPU_VBLANK_INT("left", irq4_line_hold)
@@ -504,7 +504,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( warriorb )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* 16 MHz ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* 16 MHz ? */
MDRV_CPU_PROGRAM_MAP(warriorb_map,0)
MDRV_CPU_VBLANK_INT("left", irq4_line_hold)
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index a9b8f1db2da..85110956735 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -320,7 +320,7 @@ static const struct YM2608interface ym2608_interface =
static MACHINE_DRIVER_START( wc90 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 6000000) /* 6.0 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6.0 MHz ??? */
MDRV_CPU_PROGRAM_MAP(wc90_map_1,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index 203a78ad4aa..0d099b8ef61 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -384,7 +384,7 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( wc90b )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, XTAL_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_14MHz/2)
MDRV_CPU_PROGRAM_MAP(wc90b_map1,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index ea01ff3e20c..3bb1599516d 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -1098,7 +1098,7 @@ static MACHINE_RESET( wecleman )
static MACHINE_DRIVER_START( wecleman )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* Schems show 10MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* Schems show 10MHz */
MDRV_CPU_PROGRAM_MAP(wecleman_map,0)
MDRV_CPU_VBLANK_INT_HACK(wecleman_interrupt,5 + 1) /* in order to read the inputs once per frame */
@@ -1155,7 +1155,7 @@ static INTERRUPT_GEN( hotchase_sound_timer )
static MACHINE_DRIVER_START( hotchase )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz - PCB is drawn in one set's readme */
MDRV_CPU_PROGRAM_MAP(hotchase_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index ea675fe0e2d..4d8702b2a70 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -721,7 +721,7 @@ static DRIVER_INIT( quiz18k )
static MACHINE_DRIVER_START( welltris )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,20000000/2) /* 10 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000,20000000/2) /* 10 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index e8593ca5abe..346b559d605 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -950,7 +950,7 @@ static MACHINE_START( wgp )
static MACHINE_DRIVER_START( wgp )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", M68000, 12000000) /* 12 MHz ??? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c
index c26088d5bb8..62781f0ec9e 100644
--- a/src/mame/drivers/wheelfir.c
+++ b/src/mame/drivers/wheelfir.c
@@ -636,7 +636,7 @@ static MACHINE_DRIVER_START( wheelfir )
MDRV_CPU_PROGRAM_MAP(wheelfir_main, 0)
MDRV_CPU_VBLANK_INT_HACK(wheelfir_irq,256) // 1,3,5 valid
- MDRV_CPU_ADD_TAG("main", M68000, 32000000/2)
+ MDRV_CPU_ADD_TAG("sub", M68000, 32000000/2)
MDRV_CPU_PROGRAM_MAP(wheelfir_sub, 0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold) // 1 valid
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index 8470d1e0930..95f5aae9f9e 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -321,7 +321,7 @@ static MACHINE_RESET( wink )
static MACHINE_DRIVER_START( wink )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 12000000 / 4)
+ MDRV_CPU_ADD_TAG("main", Z80, 12000000 / 4)
MDRV_CPU_PROGRAM_MAP(wink_map,0)
MDRV_CPU_IO_MAP(wink_io,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c
index 60e28ae1169..19d76fc39d3 100644
--- a/src/mame/drivers/wiping.c
+++ b/src/mame/drivers/wiping.c
@@ -289,7 +289,7 @@ static const struct CustomSound_interface custom_interface =
static MACHINE_DRIVER_START( wiping )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,18432000/6) /* 3.072 MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,18432000/6) /* 3.072 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index 3e30b1f02ff..d3c4445cc3a 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -777,7 +777,7 @@ static INTERRUPT_GEN( witch_sub_interrupt )
static MACHINE_DRIVER_START( witch )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,8000000) /* ? MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,8000000) /* ? MHz */
MDRV_CPU_PROGRAM_MAP(map_main, 0)
MDRV_CPU_VBLANK_INT("main", witch_main_interrupt)
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index 2fee4cb0fa6..d7c4092b026 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -692,7 +692,7 @@ DISCRETE_SOUND_END
static MACHINE_DRIVER_START( wiz )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 18432000/6) /* 3.072 MHz ??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 18432000/6) /* 3.072 MHz ??? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c
index 748545b089d..84901cfe4e0 100644
--- a/src/mame/drivers/wldarrow.c
+++ b/src/mame/drivers/wldarrow.c
@@ -344,7 +344,7 @@ INPUT_PORTS_END
static MACHINE_DRIVER_START( wldarrow )
/* basic machine hardware */
- MDRV_CPU_ADD(8080, 2000000)
+ MDRV_CPU_ADD_TAG("main", 8080, 2000000)
MDRV_CPU_PROGRAM_MAP(wldarrow_map,0)
MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c
index a7bf1473104..6c9d98e6669 100644
--- a/src/mame/drivers/wolfpack.c
+++ b/src/mame/drivers/wolfpack.c
@@ -323,7 +323,7 @@ static MACHINE_DRIVER_START(wolfpack)
MDRV_SPEAKER_STANDARD_MONO("mono")
/* basic machine hardware */
- MDRV_CPU_ADD(M6502, 12096000 / 16)
+ MDRV_CPU_ADD_TAG("main", M6502, 12096000 / 16)
MDRV_CPU_PROGRAM_MAP(main_map,0)
/* video hardware */
diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c
index 446844eda84..4f38a3417aa 100644
--- a/src/mame/drivers/wrally.c
+++ b/src/mame/drivers/wrally.c
@@ -247,7 +247,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( wrally )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,XTAL_24MHz/2) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", M68000,XTAL_24MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(wrally_readmem, 0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index fb786919d59..c4d6f4644b3 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -345,7 +345,7 @@ static const struct YM2151interface ym2151_interface =
static MACHINE_DRIVER_START( wwfsstar )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT_HACK(wwfsstars_interrupt,272)
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index dc694759c55..48d499624a0 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -386,7 +386,7 @@ static VIDEO_EOF( wwfwfest )
static MACHINE_DRIVER_START( wwfwfest )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 24000000/2) /* 24 crystal, 12 rated chip */
+ MDRV_CPU_ADD_TAG("main", M68000, 24000000/2) /* 24 crystal, 12 rated chip */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT_HACK(wwfwfest_interrupt,2)
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index cf9119383d6..b335cc29bea 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -459,7 +459,7 @@ static MACHINE_START( xsleena )
static MACHINE_DRIVER_START( xsleena )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1500000) /* Confirmed 1.5MHz */
+ MDRV_CPU_ADD_TAG("main", M6809, 1500000) /* Confirmed 1.5MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT_HACK(xain_interrupt,256)
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 049c68d1530..ed94b0d3fab 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -455,7 +455,7 @@ static const struct K054539interface k054539_interface =
static MACHINE_DRIVER_START( xexex )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) // 16MHz (32MHz xtal)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) // 16MHz (32MHz xtal)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT_HACK(xexex_interrupt,2)
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 8d1e30a98a3..4b74ec4d10b 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -474,7 +474,7 @@ static MACHINE_START( xmen )
static MACHINE_DRIVER_START( xmen )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* ? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT_HACK(xmen_interrupt,2)
@@ -541,7 +541,7 @@ static INTERRUPT_GEN( xmen6p_interrupt )
static MACHINE_DRIVER_START( xmen6p )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000) /* ? */
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000) /* ? */
MDRV_CPU_PROGRAM_MAP(6p_main_map,0)
MDRV_CPU_VBLANK_INT_HACK(xmen6p_interrupt,2)
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index ff5b464fc5d..25faf6317f5 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -207,7 +207,7 @@ static INTERRUPT_GEN( xorworld_interrupt )
static MACHINE_DRIVER_START( xorworld )
// basic machine hardware
- MDRV_CPU_ADD(M68000, 10000000) // 10 MHz
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) // 10 MHz
MDRV_CPU_PROGRAM_MAP(xorworld_map, 0)
MDRV_CPU_VBLANK_INT_HACK(xorworld_interrupt, 4) // 1 IRQ2 + 1 IRQ4 + 1 IRQ6
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index e50b5e30500..aecc4086a2a 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -356,7 +356,7 @@ static const tms34010_config tms_config =
static MACHINE_DRIVER_START( xtheball )
- MDRV_CPU_ADD(TMS34010, 40000000)
+ MDRV_CPU_ADD_TAG("main", TMS34010, 40000000)
MDRV_CPU_CONFIG(tms_config)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,15000)
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index 6c3b0f3d598..399b9b81883 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -302,7 +302,7 @@ static const struct YM2203interface ym2203_interface_2 =
static MACHINE_DRIVER_START( xxmissio )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/4) /* 3.0MHz */
+ MDRV_CPU_ADD_TAG("main", Z80,12000000/4) /* 3.0MHz */
MDRV_CPU_PROGRAM_MAP(map1,0)
MDRV_CPU_VBLANK_INT("main", xxmissio_interrupt_m)
diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c
index 18437a6b51b..6fd2c85a60a 100644
--- a/src/mame/drivers/xybots.c
+++ b/src/mame/drivers/xybots.c
@@ -190,7 +190,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( xybots )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, ATARI_CLOCK_14MHz/2)
+ MDRV_CPU_ADD_TAG("main", M68000, ATARI_CLOCK_14MHz/2)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", atarigen_video_int_gen)
diff --git a/src/mame/drivers/xyonix.c b/src/mame/drivers/xyonix.c
index c6e9371f830..da0ad9782b3 100644
--- a/src/mame/drivers/xyonix.c
+++ b/src/mame/drivers/xyonix.c
@@ -231,7 +231,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( xyonix )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,16000000 / 4) /* 4 MHz ? */
+ MDRV_CPU_ADD_TAG("main", Z80,16000000 / 4) /* 4 MHz ? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(port_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c
index b95e18d3550..4476e5f146b 100644
--- a/src/mame/drivers/yiear.c
+++ b/src/mame/drivers/yiear.c
@@ -254,7 +254,7 @@ static const struct VLM5030interface vlm5030_interface =
static MACHINE_DRIVER_START( yiear )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809,18432000/16) /* ???? */
+ MDRV_CPU_ADD_TAG("main", M6809,18432000/16) /* ???? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
MDRV_CPU_PERIODIC_INT(yiear_nmi_interrupt,500) /* music tempo (correct frequency unknown) */
diff --git a/src/mame/drivers/yumefuda.c b/src/mame/drivers/yumefuda.c
index 6c1057dcfd3..1924e002508 100644
--- a/src/mame/drivers/yumefuda.c
+++ b/src/mame/drivers/yumefuda.c
@@ -223,7 +223,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( yumefuda )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80 , 6000000) /*???*/
+ MDRV_CPU_ADD_TAG("main", Z80 , 6000000) /*???*/
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(port_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index df15bf0a731..5758ba76bd8 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -583,7 +583,7 @@ static const struct YM3812interface magicbub_ym3812_intf =
static MACHINE_DRIVER_START( magicbub )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
@@ -628,7 +628,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( shocking )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000)
+ MDRV_CPU_ADD_TAG("main", M68000, 16000000)
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c
index 1b543408226..54275742a88 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -506,7 +506,7 @@ static const struct MSM5205interface yunsung8_msm5205_interface =
static MACHINE_DRIVER_START( yunsung8 )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 8000000) /* Z80B */
+ MDRV_CPU_ADD_TAG("main", Z80, 8000000) /* Z80B */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_IO_MAP(port_map,0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold) /* No nmi routine */
diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c
index 8a596c1315a..3cdbbe4f5e2 100644
--- a/src/mame/drivers/zac2650.c
+++ b/src/mame/drivers/zac2650.c
@@ -308,7 +308,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( tinvader )
/* basic machine hardware */
- MDRV_CPU_ADD(S2650, 3800000/4)
+ MDRV_CPU_ADD_TAG("main", S2650, 3800000/4)
MDRV_CPU_PROGRAM_MAP(main_map, 0)
MDRV_CPU_IO_MAP(port_map,0)
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index 0ca853a51f1..d692225ff01 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -637,7 +637,7 @@ static const struct TMS5220interface tms5220_interface =
static MACHINE_DRIVER_START( zaccaria )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,XTAL_18_432MHz/6) /* verified on pcb */
+ MDRV_CPU_ADD_TAG("main", Z80,XTAL_18_432MHz/6) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", nmi_line_pulse)
@@ -679,10 +679,10 @@ static MACHINE_DRIVER_START( zaccaria )
MDRV_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/2) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
- MDRV_SOUND_ADD("dac", DAC, 0)
+ MDRV_SOUND_ADD("dac1", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.0) /* first DAC sounds awful */
- MDRV_SOUND_ADD("dac", DAC, 0)
+ MDRV_SOUND_ADD("dac2", DAC, 0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
/* There is no xtal, the clock is obtained from a RC oscillator as shown in the TMS5220 datasheet (R=100kOhm C=22pF) */
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index ea5c3f31875..45fcb6f92e8 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -176,7 +176,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( zerozone )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz */
+ MDRV_CPU_ADD_TAG("main", M68000, 10000000) /* 10 MHz */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT("main", irq1_line_hold)
diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c
index 8caec0194f4..b218801509f 100644
--- a/src/mame/drivers/zodiack.c
+++ b/src/mame/drivers/zodiack.c
@@ -457,7 +457,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( zodiack )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 4000000) /* 4.00 MHz??? */
+ MDRV_CPU_ADD_TAG("main", Z80, 4000000) /* 4.00 MHz??? */
MDRV_CPU_PROGRAM_MAP(main_map,0)
MDRV_CPU_VBLANK_INT_HACK(zodiac_master_interrupt,2)
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index 39e328cf9dd..b887be98ba0 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -737,7 +737,7 @@ static MACHINE_RESET( zr107 )
static MACHINE_DRIVER_START( zr107 )
/* basic machine hardware */
- MDRV_CPU_ADD(PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
+ MDRV_CPU_ADD_TAG("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
MDRV_CPU_PROGRAM_MAP(zr107_map, 0)
MDRV_CPU_VBLANK_INT("main", zr107_vblank)
@@ -782,7 +782,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( jetwave )
/* basic machine hardware */
- MDRV_CPU_ADD(PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
+ MDRV_CPU_ADD_TAG("main", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */
MDRV_CPU_PROGRAM_MAP(jetwave_map, 0)
MDRV_CPU_VBLANK_INT("main", zr107_vblank)