From 5db7b9e8a332fd90537f9b45ec7539e1b4031e98 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Sat, 1 Jan 2011 00:41:25 +0000 Subject: [PATCH] Ok, last major rename for this round: memory_region() == machine->region()->base() memory_region_length() == machine->region()->bytes() region_info -> memory_region Regex searches: S: memory_region( *)\(( *)([^,&]+), *([^)]+)\) R: \3->region\1\(\2\4\)->base\(\) S: memory_region_length( *)\(( *)([^,&]+), *([^)]+)\) R: \3->region\1\(\2\4\)->bytes\(\) --- src/emu/cpu/cubeqcpu/cubeqcpu.c | 2 +- src/emu/cpu/esrip/esrip.c | 2 +- src/emu/cpu/mb86233/mb86233.c | 2 +- src/emu/debug/debugcpu.c | 6 +- src/emu/debug/dvmemory.c | 4 +- src/emu/debug/dvmemory.h | 2 +- src/emu/devintrf.c | 2 +- src/emu/devintrf.h | 8 +- src/emu/diimage.c | 4 +- src/emu/drawgfx.c | 2 +- src/emu/machine.c | 16 ++-- src/emu/machine.h | 36 +++----- src/emu/memory.c | 8 +- src/emu/romload.c | 8 +- src/emu/sound/2610intf.c | 4 +- src/emu/sound/digitalk.c | 2 +- src/emu/sound/es5506.c | 8 +- src/emu/sound/fm.c | 8 +- src/emu/sound/gaelco.c | 2 +- src/emu/sound/k053260.c | 2 +- src/emu/sound/k054539.c | 2 +- src/emu/sound/tms5110.c | 2 +- src/emu/sound/zsg2.c | 2 +- src/emu/video/pc_vga.h | 2 +- src/emu/video/tms9927.c | 2 +- src/mame/audio/atarijsa.c | 6 +- src/mame/audio/cage.c | 4 +- src/mame/audio/cclimber.c | 8 +- src/mame/audio/cinemat.c | 2 +- src/mame/audio/circus.c | 2 +- src/mame/audio/cyberbal.c | 2 +- src/mame/audio/dcs.c | 8 +- src/mame/audio/dkong.c | 2 +- src/mame/audio/exidy440.c | 4 +- src/mame/audio/flower.c | 4 +- src/mame/audio/gomoku.c | 2 +- src/mame/audio/harddriv.c | 4 +- src/mame/audio/leland.c | 2 +- src/mame/audio/m72.c | 4 +- src/mame/audio/mario.c | 10 +-- src/mame/audio/mcr.c | 2 +- src/mame/audio/namcoc7x.c | 2 +- src/mame/audio/polepos.c | 2 +- src/mame/audio/segag80r.c | 10 +-- src/mame/audio/segasnd.c | 2 +- src/mame/audio/seibu.c | 12 +-- src/mame/audio/snes_snd.c | 4 +- src/mame/audio/snk6502.c | 2 +- src/mame/audio/suna8.c | 4 +- src/mame/audio/taito_en.c | 6 +- src/mame/audio/targ.c | 2 +- src/mame/audio/williams.c | 10 +-- src/mame/audio/wiping.c | 4 +- src/mame/drivers/1942.c | 2 +- src/mame/drivers/1943.c | 2 +- src/mame/drivers/20pacgal.c | 2 +- src/mame/drivers/2mindril.c | 6 +- src/mame/drivers/39in1.c | 2 +- src/mame/drivers/40love.c | 6 +- src/mame/drivers/5clown.c | 8 +- src/mame/drivers/8080bw.c | 4 +- src/mame/drivers/88games.c | 4 +- src/mame/drivers/acefruit.c | 2 +- src/mame/drivers/adp.c | 2 +- src/mame/drivers/aeroboto.c | 4 +- src/mame/drivers/aerofgt.c | 4 +- src/mame/drivers/airbustr.c | 6 +- src/mame/drivers/albazg.c | 2 +- src/mame/drivers/aleck64.c | 2 +- src/mame/drivers/alg.c | 16 ++-- src/mame/drivers/aliens.c | 2 +- src/mame/drivers/alpha68k.c | 14 +-- src/mame/drivers/ampoker2.c | 6 +- src/mame/drivers/amspdwy.c | 2 +- src/mame/drivers/angelkds.c | 4 +- src/mame/drivers/appoooh.c | 4 +- src/mame/drivers/aquarium.c | 12 +-- src/mame/drivers/arcadecl.c | 2 +- src/mame/drivers/arcadia.c | 10 +-- src/mame/drivers/argus.c | 2 +- src/mame/drivers/aristmk4.c | 2 +- src/mame/drivers/aristmk5.c | 6 +- src/mame/drivers/arkanoid.c | 6 +- src/mame/drivers/armedf.c | 4 +- src/mame/drivers/ashnojoe.c | 2 +- src/mame/drivers/asterix.c | 4 +- src/mame/drivers/astinvad.c | 4 +- src/mame/drivers/astrocde.c | 6 +- src/mame/drivers/astrocorp.c | 4 +- src/mame/drivers/astrof.c | 12 +-- src/mame/drivers/asuka.c | 6 +- src/mame/drivers/atarig42.c | 2 +- src/mame/drivers/atarisy2.c | 8 +- src/mame/drivers/atarisy4.c | 12 +-- src/mame/drivers/atetris.c | 2 +- src/mame/drivers/backfire.c | 2 +- src/mame/drivers/badlands.c | 4 +- src/mame/drivers/balsente.c | 6 +- src/mame/drivers/baraduke.c | 2 +- src/mame/drivers/battlex.c | 6 +- src/mame/drivers/battlnts.c | 4 +- src/mame/drivers/bfcobra.c | 12 +-- src/mame/drivers/bfm_sc1.c | 6 +- src/mame/drivers/bfm_sc2.c | 8 +- src/mame/drivers/bigevglf.c | 2 +- src/mame/drivers/bingoc.c | 2 +- src/mame/drivers/bishjan.c | 4 +- src/mame/drivers/bking.c | 2 +- src/mame/drivers/bladestl.c | 2 +- src/mame/drivers/blitz68k.c | 24 +++--- src/mame/drivers/blktiger.c | 4 +- src/mame/drivers/blmbycar.c | 6 +- src/mame/drivers/blockhl.c | 2 +- src/mame/drivers/bnstars.c | 2 +- src/mame/drivers/boogwing.c | 4 +- src/mame/drivers/bottom9.c | 2 +- src/mame/drivers/boxer.c | 2 +- src/mame/drivers/brkthru.c | 2 +- src/mame/drivers/btime.c | 18 ++-- src/mame/drivers/bublbobl.c | 4 +- src/mame/drivers/buggychl.c | 2 +- src/mame/drivers/buster.c | 2 +- src/mame/drivers/bwing.c | 6 +- src/mame/drivers/cabal.c | 2 +- src/mame/drivers/cabaret.c | 2 +- src/mame/drivers/calchase.c | 4 +- src/mame/drivers/calomega.c | 10 +-- src/mame/drivers/calorie.c | 4 +- src/mame/drivers/capbowl.c | 2 +- src/mame/drivers/carpolo.c | 4 +- src/mame/drivers/cave.c | 56 ++++++------ src/mame/drivers/cb2001.c | 4 +- src/mame/drivers/cbasebal.c | 2 +- src/mame/drivers/cbuster.c | 6 +- src/mame/drivers/ccastles.c | 4 +- src/mame/drivers/cdi.c | 2 +- src/mame/drivers/chaknpop.c | 2 +- src/mame/drivers/cham24.c | 12 +-- src/mame/drivers/champbas.c | 10 +-- src/mame/drivers/champbwl.c | 2 +- src/mame/drivers/chanbara.c | 6 +- src/mame/drivers/chinagat.c | 8 +- src/mame/drivers/chinsan.c | 6 +- src/mame/drivers/chqflag.c | 4 +- src/mame/drivers/chsuper.c | 10 +-- src/mame/drivers/cidelsa.c | 2 +- src/mame/drivers/cischeat.c | 22 ++--- src/mame/drivers/citycon.c | 2 +- src/mame/drivers/cloud9.c | 2 +- src/mame/drivers/clshroad.c | 2 +- src/mame/drivers/cmmb.c | 8 +- src/mame/drivers/cninja.c | 6 +- src/mame/drivers/cntsteer.c | 6 +- src/mame/drivers/coinmstr.c | 6 +- src/mame/drivers/coinmvga.c | 4 +- src/mame/drivers/cojag.c | 6 +- src/mame/drivers/combatsc.c | 4 +- src/mame/drivers/commando.c | 4 +- src/mame/drivers/compgolf.c | 6 +- src/mame/drivers/contra.c | 2 +- src/mame/drivers/coolpool.c | 12 +-- src/mame/drivers/coolridr.c | 2 +- src/mame/drivers/cop01.c | 2 +- src/mame/drivers/cosmic.c | 4 +- src/mame/drivers/cps1.c | 14 +-- src/mame/drivers/cps2.c | 6 +- src/mame/drivers/cps3.c | 20 ++--- src/mame/drivers/crgolf.c | 4 +- src/mame/drivers/crimfght.c | 2 +- src/mame/drivers/crospang.c | 4 +- src/mame/drivers/crshrace.c | 8 +- src/mame/drivers/crystal.c | 20 ++--- src/mame/drivers/cshooter.c | 10 +-- src/mame/drivers/csplayh5.c | 6 +- src/mame/drivers/cubocd32.c | 2 +- src/mame/drivers/cultures.c | 10 +-- src/mame/drivers/cvs.c | 14 +-- src/mame/drivers/cybertnk.c | 6 +- src/mame/drivers/cyclemb.c | 2 +- src/mame/drivers/d9final.c | 4 +- src/mame/drivers/dambustr.c | 6 +- src/mame/drivers/darius.c | 6 +- src/mame/drivers/darkhors.c | 4 +- src/mame/drivers/darkmist.c | 34 ++++---- src/mame/drivers/darkseal.c | 2 +- src/mame/drivers/dassault.c | 8 +- src/mame/drivers/dbz.c | 2 +- src/mame/drivers/dcon.c | 2 +- src/mame/drivers/ddayjlc.c | 6 +- src/mame/drivers/ddenlovr.c | 38 ++++---- src/mame/drivers/ddragon.c | 24 +++--- src/mame/drivers/ddribble.c | 4 +- src/mame/drivers/dec0.c | 2 +- src/mame/drivers/dec8.c | 28 +++--- src/mame/drivers/deco156.c | 4 +- src/mame/drivers/deco32.c | 18 ++-- src/mame/drivers/deco_mlc.c | 4 +- src/mame/drivers/decocass.c | 8 +- src/mame/drivers/deshoros.c | 2 +- src/mame/drivers/dgpix.c | 14 +-- src/mame/drivers/discoboy.c | 4 +- src/mame/drivers/djboy.c | 6 +- src/mame/drivers/djmain.c | 6 +- src/mame/drivers/dkong.c | 12 +-- src/mame/drivers/dmndrby.c | 4 +- src/mame/drivers/docastle.c | 4 +- src/mame/drivers/dooyong.c | 2 +- src/mame/drivers/dorachan.c | 2 +- src/mame/drivers/dreamwld.c | 8 +- src/mame/drivers/drgnmst.c | 6 +- src/mame/drivers/drmicro.c | 2 +- src/mame/drivers/drw80pkr.c | 2 +- src/mame/drivers/dunhuang.c | 4 +- src/mame/drivers/dwarfd.c | 16 ++-- src/mame/drivers/dynadice.c | 8 +- src/mame/drivers/dynax.c | 36 ++++---- src/mame/drivers/enigma2.c | 4 +- src/mame/drivers/eolith.c | 4 +- src/mame/drivers/epos.c | 4 +- src/mame/drivers/equites.c | 2 +- src/mame/drivers/esd16.c | 2 +- src/mame/drivers/esripsys.c | 6 +- src/mame/drivers/ettrivia.c | 2 +- src/mame/drivers/exerion.c | 14 +-- src/mame/drivers/exidy.c | 4 +- src/mame/drivers/exidy440.c | 6 +- src/mame/drivers/expro02.c | 6 +- src/mame/drivers/exprraid.c | 4 +- src/mame/drivers/exzisus.c | 6 +- src/mame/drivers/f1gp.c | 10 +-- src/mame/drivers/fantland.c | 4 +- src/mame/drivers/fastfred.c | 2 +- src/mame/drivers/fastlane.c | 2 +- src/mame/drivers/fcombat.c | 22 ++--- src/mame/drivers/fcrash.c | 2 +- src/mame/drivers/feversoc.c | 2 +- src/mame/drivers/firebeat.c | 4 +- src/mame/drivers/firefox.c | 2 +- src/mame/drivers/firetrap.c | 4 +- src/mame/drivers/fitfight.c | 4 +- src/mame/drivers/flkatck.c | 2 +- src/mame/drivers/flyball.c | 2 +- src/mame/drivers/forte2.c | 4 +- src/mame/drivers/freekick.c | 6 +- src/mame/drivers/fromanc2.c | 6 +- src/mame/drivers/fromance.c | 2 +- src/mame/drivers/funworld.c | 32 +++---- src/mame/drivers/funybubl.c | 2 +- src/mame/drivers/fuukifg2.c | 2 +- src/mame/drivers/fuukifg3.c | 2 +- src/mame/drivers/gaelco.c | 2 +- src/mame/drivers/gaelco3d.c | 12 +-- src/mame/drivers/gaiden.c | 12 +-- src/mame/drivers/galaga.c | 14 +-- src/mame/drivers/galaxian.c | 60 ++++++------- src/mame/drivers/galivan.c | 8 +- src/mame/drivers/galpani2.c | 6 +- src/mame/drivers/galpani3.c | 8 +- src/mame/drivers/galpanic.c | 4 +- src/mame/drivers/gamecstl.c | 4 +- src/mame/drivers/gaplus.c | 4 +- src/mame/drivers/gauntlet.c | 4 +- src/mame/drivers/gberet.c | 2 +- src/mame/drivers/gbusters.c | 4 +- src/mame/drivers/gcpinbal.c | 2 +- src/mame/drivers/gei.c | 48 +++++------ src/mame/drivers/ghosteo.c | 4 +- src/mame/drivers/ginganin.c | 4 +- src/mame/drivers/gladiatr.c | 16 ++-- src/mame/drivers/glass.c | 6 +- src/mame/drivers/gng.c | 2 +- src/mame/drivers/go2000.c | 2 +- src/mame/drivers/goal92.c | 2 +- src/mame/drivers/goindol.c | 4 +- src/mame/drivers/goldnpkr.c | 6 +- src/mame/drivers/goldstar.c | 66 +++++++------- src/mame/drivers/gpworld.c | 2 +- src/mame/drivers/groundfx.c | 4 +- src/mame/drivers/gstriker.c | 2 +- src/mame/drivers/gsword.c | 4 +- src/mame/drivers/gticlub.c | 6 +- src/mame/drivers/guab.c | 2 +- src/mame/drivers/gundealr.c | 2 +- src/mame/drivers/gunpey.c | 6 +- src/mame/drivers/gunsmoke.c | 2 +- src/mame/drivers/halleys.c | 6 +- src/mame/drivers/harddriv.c | 4 +- src/mame/drivers/hcastle.c | 2 +- src/mame/drivers/highvdeo.c | 6 +- src/mame/drivers/himesiki.c | 2 +- src/mame/drivers/hitpoker.c | 10 +-- src/mame/drivers/hnayayoi.c | 4 +- src/mame/drivers/hng64.c | 8 +- src/mame/drivers/homedata.c | 12 +-- src/mame/drivers/homerun.c | 2 +- src/mame/drivers/hornet.c | 20 ++--- src/mame/drivers/hshavoc.c | 2 +- src/mame/drivers/hvyunit.c | 6 +- src/mame/drivers/hyprduel.c | 8 +- src/mame/drivers/igs009.c | 4 +- src/mame/drivers/igs011.c | 68 +++++++-------- src/mame/drivers/igs017.c | 44 +++++----- src/mame/drivers/igs_m027.c | 4 +- src/mame/drivers/igspoker.c | 28 +++--- src/mame/drivers/intrscti.c | 2 +- src/mame/drivers/inufuku.c | 2 +- src/mame/drivers/iqblock.c | 6 +- src/mame/drivers/itech32.c | 2 +- src/mame/drivers/itech8.c | 6 +- src/mame/drivers/itgambl2.c | 2 +- src/mame/drivers/itgambl3.c | 2 +- src/mame/drivers/jack.c | 8 +- src/mame/drivers/jackal.c | 6 +- src/mame/drivers/jackie.c | 4 +- src/mame/drivers/jackpool.c | 2 +- src/mame/drivers/jailbrek.c | 4 +- src/mame/drivers/jalmah.c | 6 +- src/mame/drivers/jangou.c | 4 +- src/mame/drivers/jantotsu.c | 2 +- src/mame/drivers/jchan.c | 4 +- src/mame/drivers/jedi.c | 2 +- src/mame/drivers/jokrwild.c | 2 +- src/mame/drivers/jongkyo.c | 4 +- src/mame/drivers/jpmsys5.c | 4 +- src/mame/drivers/jrpacman.c | 2 +- src/mame/drivers/junofrst.c | 4 +- src/mame/drivers/kaneko16.c | 12 +-- src/mame/drivers/kangaroo.c | 2 +- src/mame/drivers/karnov.c | 6 +- src/mame/drivers/kchamp.c | 4 +- src/mame/drivers/kickgoal.c | 2 +- src/mame/drivers/kingdrby.c | 4 +- src/mame/drivers/kingobox.c | 6 +- src/mame/drivers/kingpin.c | 2 +- src/mame/drivers/konamigq.c | 2 +- src/mame/drivers/konamigx.c | 6 +- src/mame/drivers/ksayakyu.c | 2 +- src/mame/drivers/ksys573.c | 6 +- src/mame/drivers/kungfur.c | 4 +- src/mame/drivers/labyrunr.c | 2 +- src/mame/drivers/ladybug.c | 4 +- src/mame/drivers/lastduel.c | 2 +- src/mame/drivers/lastfght.c | 8 +- src/mame/drivers/lazercmd.c | 6 +- src/mame/drivers/legionna.c | 6 +- src/mame/drivers/leland.c | 6 +- src/mame/drivers/lethal.c | 4 +- src/mame/drivers/liberate.c | 18 ++-- src/mame/drivers/limenko.c | 8 +- src/mame/drivers/lkage.c | 2 +- src/mame/drivers/looping.c | 4 +- src/mame/drivers/lordgun.c | 6 +- src/mame/drivers/lsasquad.c | 2 +- src/mame/drivers/ltcasino.c | 2 +- src/mame/drivers/luckgrln.c | 2 +- src/mame/drivers/lucky74.c | 2 +- src/mame/drivers/lwings.c | 2 +- src/mame/drivers/m107.c | 14 +-- src/mame/drivers/m58.c | 2 +- src/mame/drivers/m62.c | 18 ++-- src/mame/drivers/m63.c | 6 +- src/mame/drivers/m72.c | 8 +- src/mame/drivers/m79amb.c | 2 +- src/mame/drivers/m90.c | 4 +- src/mame/drivers/m92.c | 14 +-- src/mame/drivers/macs.c | 16 ++-- src/mame/drivers/madalien.c | 2 +- src/mame/drivers/madmotor.c | 2 +- src/mame/drivers/magicard.c | 2 +- src/mame/drivers/magtouch.c | 2 +- src/mame/drivers/mainevt.c | 2 +- src/mame/drivers/malzak.c | 2 +- src/mame/drivers/marinedt.c | 2 +- src/mame/drivers/mastboy.c | 6 +- src/mame/drivers/maxaflex.c | 2 +- src/mame/drivers/mayumi.c | 2 +- src/mame/drivers/mazerbla.c | 10 +-- src/mame/drivers/mcatadv.c | 2 +- src/mame/drivers/meadows.c | 16 ++-- src/mame/drivers/mediagx.c | 2 +- src/mame/drivers/megadriv.c | 22 ++--- src/mame/drivers/megadrvb.c | 8 +- src/mame/drivers/megaplay.c | 10 +-- src/mame/drivers/megasys1.c | 38 ++++---- src/mame/drivers/megatech.c | 22 ++--- src/mame/drivers/merit.c | 16 ++-- src/mame/drivers/meritm.c | 10 +-- src/mame/drivers/mermaid.c | 2 +- src/mame/drivers/metalmx.c | 2 +- src/mame/drivers/metro.c | 20 ++--- src/mame/drivers/mexico86.c | 2 +- src/mame/drivers/midas.c | 2 +- src/mame/drivers/midvunit.c | 4 +- src/mame/drivers/midzeus.c | 6 +- src/mame/drivers/mirax.c | 4 +- src/mame/drivers/missb2.c | 6 +- src/mame/drivers/missile.c | 6 +- src/mame/drivers/mitchell.c | 22 ++--- src/mame/drivers/mjkjidai.c | 2 +- src/mame/drivers/mjsister.c | 4 +- src/mame/drivers/mlanding.c | 6 +- src/mame/drivers/model1.c | 6 +- src/mame/drivers/model2.c | 20 ++--- src/mame/drivers/model3.c | 74 ++++++++-------- src/mame/drivers/momoko.c | 2 +- src/mame/drivers/moo.c | 2 +- src/mame/drivers/mouser.c | 4 +- src/mame/drivers/mpu4.c | 2 +- src/mame/drivers/mpu4drvr.c | 2 +- src/mame/drivers/mquake.c | 6 +- src/mame/drivers/mrdo.c | 2 +- src/mame/drivers/ms32.c | 20 ++--- src/mame/drivers/multfish.c | 8 +- src/mame/drivers/multigam.c | 54 ++++++------ src/mame/drivers/mustache.c | 8 +- src/mame/drivers/mystwarr.c | 2 +- src/mame/drivers/namcofl.c | 8 +- src/mame/drivers/namcoic.c | 4 +- src/mame/drivers/namcona1.c | 2 +- src/mame/drivers/namconb1.c | 2 +- src/mame/drivers/namcos10.c | 8 +- src/mame/drivers/namcos11.c | 4 +- src/mame/drivers/namcos12.c | 10 +-- src/mame/drivers/namcos2.c | 4 +- src/mame/drivers/namcos21.c | 22 ++--- src/mame/drivers/namcos22.c | 10 +-- src/mame/drivers/namcos23.c | 14 +-- src/mame/drivers/namcos86.c | 20 ++--- src/mame/drivers/naomi.c | 8 +- src/mame/drivers/naughtyb.c | 2 +- src/mame/drivers/nbmj8688.c | 16 ++-- src/mame/drivers/nbmj8891.c | 26 +++--- src/mame/drivers/nbmj8900.c | 8 +- src/mame/drivers/nbmj8991.c | 10 +-- src/mame/drivers/nbmj9195.c | 4 +- src/mame/drivers/neodrvr.c | 10 +-- src/mame/drivers/neogeo.c | 24 +++--- src/mame/drivers/neoprint.c | 4 +- src/mame/drivers/nightgal.c | 6 +- src/mame/drivers/ninjakd2.c | 20 ++--- src/mame/drivers/ninjaw.c | 2 +- src/mame/drivers/niyanpai.c | 4 +- src/mame/drivers/nmk16.c | 50 +++++------ src/mame/drivers/norautp.c | 20 ++--- src/mame/drivers/nova2001.c | 4 +- src/mame/drivers/nss.c | 8 +- src/mame/drivers/nwk-tr.c | 2 +- src/mame/drivers/nycaptor.c | 8 +- src/mame/drivers/ohmygod.c | 4 +- src/mame/drivers/ojankohs.c | 6 +- src/mame/drivers/omegrace.c | 4 +- src/mame/drivers/onetwo.c | 2 +- src/mame/drivers/opwolf.c | 10 +-- src/mame/drivers/othello.c | 4 +- src/mame/drivers/othunder.c | 2 +- src/mame/drivers/pachifev.c | 2 +- src/mame/drivers/pacman.c | 56 ++++++------ src/mame/drivers/panicr.c | 24 +++--- src/mame/drivers/paradise.c | 6 +- src/mame/drivers/parodius.c | 2 +- src/mame/drivers/pasha2.c | 4 +- src/mame/drivers/pastelg.c | 2 +- src/mame/drivers/pbaction.c | 2 +- src/mame/drivers/pcat_nit.c | 2 +- src/mame/drivers/pcktgal.c | 12 +-- src/mame/drivers/pcxt.c | 8 +- src/mame/drivers/pengadvb.c | 18 ++-- src/mame/drivers/pengo.c | 2 +- src/mame/drivers/peplus.c | 2 +- src/mame/drivers/pgm.c | 78 ++++++++--------- src/mame/drivers/phoenix.c | 2 +- src/mame/drivers/photon.c | 6 +- src/mame/drivers/photon2.c | 4 +- src/mame/drivers/pingpong.c | 24 +++--- src/mame/drivers/pipedrm.c | 4 +- src/mame/drivers/pipeline.c | 4 +- src/mame/drivers/pirates.c | 18 ++-- src/mame/drivers/playmark.c | 6 +- src/mame/drivers/plygonet.c | 6 +- src/mame/drivers/pntnpuzl.c | 2 +- src/mame/drivers/pokechmp.c | 4 +- src/mame/drivers/poker72.c | 6 +- src/mame/drivers/polepos.c | 4 +- src/mame/drivers/policetr.c | 2 +- src/mame/drivers/poolshrk.c | 4 +- src/mame/drivers/popeye.c | 4 +- src/mame/drivers/powerbal.c | 2 +- src/mame/drivers/powerins.c | 2 +- src/mame/drivers/ppmast93.c | 2 +- src/mame/drivers/progolf.c | 6 +- src/mame/drivers/psikyo.c | 22 ++--- src/mame/drivers/psikyo4.c | 16 ++-- src/mame/drivers/psikyosh.c | 10 +-- src/mame/drivers/psychic5.c | 4 +- src/mame/drivers/pturn.c | 2 +- src/mame/drivers/puckpkmn.c | 4 +- src/mame/drivers/qdrmfgp.c | 4 +- src/mame/drivers/qix.c | 12 +-- src/mame/drivers/quizdna.c | 4 +- src/mame/drivers/quizo.c | 2 +- src/mame/drivers/quizpun2.c | 6 +- src/mame/drivers/r2dx_v33.c | 6 +- src/mame/drivers/rabbit.c | 4 +- src/mame/drivers/raiden.c | 4 +- src/mame/drivers/raiden2.c | 4 +- src/mame/drivers/rainbow.c | 8 +- src/mame/drivers/rampart.c | 2 +- src/mame/drivers/rastan.c | 4 +- src/mame/drivers/redclash.c | 6 +- src/mame/drivers/relief.c | 2 +- src/mame/drivers/renegade.c | 4 +- src/mame/drivers/rmhaihai.c | 8 +- src/mame/drivers/rockrage.c | 2 +- src/mame/drivers/rocnrope.c | 2 +- src/mame/drivers/rohga.c | 4 +- src/mame/drivers/rollerg.c | 2 +- src/mame/drivers/route16.c | 4 +- src/mame/drivers/royalmah.c | 38 ++++---- src/mame/drivers/rpunch.c | 4 +- src/mame/drivers/rungun.c | 2 +- src/mame/drivers/sandscrp.c | 2 +- src/mame/drivers/sangho.c | 14 +-- src/mame/drivers/sauro.c | 2 +- src/mame/drivers/sbowling.c | 2 +- src/mame/drivers/scregg.c | 2 +- src/mame/drivers/segac2.c | 6 +- src/mame/drivers/segae.c | 4 +- src/mame/drivers/segag80r.c | 2 +- src/mame/drivers/segahang.c | 4 +- src/mame/drivers/segald.c | 2 +- src/mame/drivers/segamsys.c | 14 +-- src/mame/drivers/segaorun.c | 16 ++-- src/mame/drivers/segas16a.c | 10 +-- src/mame/drivers/segas16b.c | 34 ++++---- src/mame/drivers/segas18.c | 4 +- src/mame/drivers/segas24.c | 12 +-- src/mame/drivers/segas32.c | 6 +- src/mame/drivers/seibuspi.c | 32 +++---- src/mame/drivers/seta.c | 20 ++--- src/mame/drivers/seta2.c | 14 +-- src/mame/drivers/sf.c | 2 +- src/mame/drivers/sfbonus.c | 20 ++--- src/mame/drivers/sfkick.c | 24 +++--- src/mame/drivers/shangha3.c | 2 +- src/mame/drivers/shangkid.c | 4 +- src/mame/drivers/shootout.c | 8 +- src/mame/drivers/sidearms.c | 4 +- src/mame/drivers/sigmab52.c | 10 +-- src/mame/drivers/sigmab98.c | 2 +- src/mame/drivers/silkroad.c | 2 +- src/mame/drivers/simpl156.c | 4 +- src/mame/drivers/skimaxx.c | 4 +- src/mame/drivers/skullxbo.c | 2 +- src/mame/drivers/skyfox.c | 4 +- src/mame/drivers/skykid.c | 4 +- src/mame/drivers/slapfght.c | 2 +- src/mame/drivers/slapshot.c | 6 +- src/mame/drivers/sliver.c | 6 +- src/mame/drivers/slotcarn.c | 6 +- src/mame/drivers/sms.c | 2 +- src/mame/drivers/snesb.c | 14 +-- src/mame/drivers/snk.c | 2 +- src/mame/drivers/snk68.c | 2 +- src/mame/drivers/snowbros.c | 28 +++--- src/mame/drivers/sothello.c | 2 +- src/mame/drivers/spdodgeb.c | 2 +- src/mame/drivers/speedspn.c | 2 +- src/mame/drivers/spiders.c | 2 +- src/mame/drivers/splash.c | 4 +- src/mame/drivers/spoker.c | 2 +- src/mame/drivers/spool99.c | 6 +- src/mame/drivers/sprcros2.c | 4 +- src/mame/drivers/spy.c | 2 +- src/mame/drivers/srmp2.c | 12 +-- src/mame/drivers/srmp5.c | 2 +- src/mame/drivers/srmp6.c | 4 +- src/mame/drivers/srumbler.c | 6 +- src/mame/drivers/ssfindo.c | 2 +- src/mame/drivers/sshangha.c | 2 +- src/mame/drivers/ssingles.c | 2 +- src/mame/drivers/ssrj.c | 2 +- src/mame/drivers/sstrangr.c | 2 +- src/mame/drivers/ssv.c | 12 +-- src/mame/drivers/st0016.c | 6 +- src/mame/drivers/starwars.c | 4 +- src/mame/drivers/statriv2.c | 8 +- src/mame/drivers/stv.c | 4 +- src/mame/drivers/sub.c | 2 +- src/mame/drivers/subsino.c | 12 +-- src/mame/drivers/suna16.c | 8 +- src/mame/drivers/suna8.c | 40 ++++----- src/mame/drivers/superqix.c | 24 +++--- src/mame/drivers/supertnk.c | 10 +-- src/mame/drivers/suprgolf.c | 6 +- src/mame/drivers/suprloco.c | 4 +- src/mame/drivers/suprnova.c | 4 +- src/mame/drivers/suprslam.c | 2 +- src/mame/drivers/surpratk.c | 2 +- src/mame/drivers/system1.c | 26 +++--- src/mame/drivers/system16.c | 28 +++--- src/mame/drivers/tail2nos.c | 6 +- src/mame/drivers/taito_b.c | 6 +- src/mame/drivers/taito_f2.c | 8 +- src/mame/drivers/taito_f3.c | 20 ++--- src/mame/drivers/taito_h.c | 2 +- src/mame/drivers/taito_l.c | 16 ++-- src/mame/drivers/taito_x.c | 2 +- src/mame/drivers/taito_z.c | 4 +- src/mame/drivers/taitoair.c | 2 +- src/mame/drivers/taitojc.c | 2 +- src/mame/drivers/taitowlf.c | 4 +- src/mame/drivers/tank8.c | 6 +- src/mame/drivers/tankbust.c | 4 +- src/mame/drivers/taotaido.c | 2 +- src/mame/drivers/targeth.c | 2 +- src/mame/drivers/tatsumi.c | 50 +++++------ src/mame/drivers/tattack.c | 2 +- src/mame/drivers/tbowl.c | 8 +- src/mame/drivers/tcl.c | 4 +- src/mame/drivers/tecmo.c | 6 +- src/mame/drivers/tecmosys.c | 10 +-- src/mame/drivers/tehkanwc.c | 4 +- src/mame/drivers/tetrisp2.c | 10 +-- src/mame/drivers/thedeep.c | 6 +- src/mame/drivers/thepit.c | 2 +- src/mame/drivers/thief.c | 4 +- src/mame/drivers/thoop2.c | 2 +- src/mame/drivers/thunderx.c | 4 +- src/mame/drivers/tmaster.c | 36 ++++---- src/mame/drivers/tmmjprd.c | 4 +- src/mame/drivers/tmnt.c | 24 +++--- src/mame/drivers/tnzs.c | 2 +- src/mame/drivers/toaplan2.c | 10 +-- src/mame/drivers/toki.c | 22 ++--- src/mame/drivers/topspeed.c | 4 +- src/mame/drivers/trackfld.c | 8 +- src/mame/drivers/travrusa.c | 4 +- src/mame/drivers/trucocl.c | 2 +- src/mame/drivers/trvmadns.c | 4 +- src/mame/drivers/trvquest.c | 2 +- src/mame/drivers/tryout.c | 2 +- src/mame/drivers/ttchamp.c | 4 +- src/mame/drivers/tumbleb.c | 32 +++---- src/mame/drivers/tumblep.c | 2 +- src/mame/drivers/turbo.c | 2 +- src/mame/drivers/tutankhm.c | 2 +- src/mame/drivers/twin16.c | 4 +- src/mame/drivers/twinkle.c | 4 +- src/mame/drivers/undrfire.c | 8 +- src/mame/drivers/unico.c | 4 +- src/mame/drivers/upscope.c | 2 +- src/mame/drivers/usgames.c | 2 +- src/mame/drivers/vaportra.c | 2 +- src/mame/drivers/vball.c | 2 +- src/mame/drivers/vcombat.c | 2 +- src/mame/drivers/vega.c | 2 +- src/mame/drivers/vendetta.c | 2 +- src/mame/drivers/vigilant.c | 2 +- src/mame/drivers/vmetal.c | 2 +- src/mame/drivers/wallc.c | 4 +- src/mame/drivers/wardner.c | 2 +- src/mame/drivers/warriorb.c | 2 +- src/mame/drivers/wc90.c | 4 +- src/mame/drivers/wc90b.c | 6 +- src/mame/drivers/wecleman.c | 26 +++--- src/mame/drivers/welltris.c | 4 +- src/mame/drivers/wgp.c | 6 +- src/mame/drivers/wheelfir.c | 6 +- src/mame/drivers/williams.c | 2 +- src/mame/drivers/wink.c | 2 +- src/mame/drivers/witch.c | 6 +- src/mame/drivers/wiz.c | 4 +- src/mame/drivers/wldarrow.c | 2 +- src/mame/drivers/xain.c | 4 +- src/mame/drivers/xexex.c | 6 +- src/mame/drivers/xmen.c | 2 +- src/mame/drivers/xorworld.c | 2 +- src/mame/drivers/xxmissio.c | 2 +- src/mame/drivers/yunsun16.c | 2 +- src/mame/drivers/yunsung8.c | 4 +- src/mame/drivers/zaxxon.c | 4 +- src/mame/drivers/zn.c | 54 ++++++------ src/mame/drivers/zr107.c | 2 +- src/mame/machine/acitya.c | 10 +-- src/mame/machine/ajax.c | 4 +- src/mame/machine/archimds.c | 4 +- src/mame/machine/atari.c | 2 +- src/mame/machine/balsente.c | 8 +- src/mame/machine/beezer.c | 2 +- src/mame/machine/btime.c | 4 +- src/mame/machine/cclimber.c | 8 +- src/mame/machine/cps2crpt.c | 4 +- src/mame/machine/dec0.c | 8 +- src/mame/machine/deco102.c | 4 +- src/mame/machine/deco156.c | 4 +- src/mame/machine/decocass.c | 18 ++-- src/mame/machine/decocrpt.c | 4 +- src/mame/machine/fd1089.c | 8 +- src/mame/machine/fddebug.c | 10 +-- src/mame/machine/gaelco2.c | 4 +- src/mame/machine/galaxold.c | 18 ++-- src/mame/machine/harddriv.c | 4 +- src/mame/machine/irobot.c | 8 +- src/mame/machine/jumpshot.c | 2 +- src/mame/machine/kabuki.c | 8 +- src/mame/machine/kaneko16.c | 10 +-- src/mame/machine/konami1.c | 4 +- src/mame/machine/leland.c | 24 +++--- src/mame/machine/mc8123.c | 4 +- src/mame/machine/mhavoc.c | 2 +- src/mame/machine/micro3d.c | 6 +- src/mame/machine/midtunit.c | 2 +- src/mame/machine/midwunit.c | 8 +- src/mame/machine/midyunit.c | 4 +- src/mame/machine/model1.c | 6 +- src/mame/machine/n64.c | 4 +- src/mame/machine/namcond1.c | 2 +- src/mame/machine/namcos1.c | 8 +- src/mame/machine/namcos2.c | 6 +- src/mame/machine/naomi.c | 6 +- src/mame/machine/naomibd.c | 14 +-- src/mame/machine/nb1413m3.c | 6 +- src/mame/machine/neoboot.c | 112 ++++++++++++------------ src/mame/machine/neocrypt.c | 96 ++++++++++----------- src/mame/machine/neoprot.c | 4 +- src/mame/machine/nmk004.c | 4 +- src/mame/machine/nmk112.c | 8 +- src/mame/machine/opwolf.c | 2 +- src/mame/machine/pacplus.c | 2 +- src/mame/machine/pgmcrypt.c | 44 +++++----- src/mame/machine/playch10.c | 40 ++++----- src/mame/machine/r2crypt.c | 2 +- src/mame/machine/s16fd.c | 8 +- src/mame/machine/s24fd.c | 2 +- src/mame/machine/scramble.c | 46 +++++----- src/mame/machine/segacrp2.c | 2 +- src/mame/machine/segacrpt.c | 14 +-- src/mame/machine/segas32.c | 6 +- src/mame/machine/simpsons.c | 6 +- src/mame/machine/slapfght.c | 4 +- src/mame/machine/snes.c | 8 +- src/mame/machine/snes7110.c | 8 +- src/mame/machine/snesbsx.c | 4 +- src/mame/machine/snesdsp1.c | 2 +- src/mame/machine/snesdsp3.c | 2 +- src/mame/machine/snessdd1.c | 2 +- src/mame/machine/starwars.c | 2 +- src/mame/machine/stfight.c | 6 +- src/mame/machine/stvprot.c | 16 ++-- src/mame/machine/taitosj.c | 4 +- src/mame/machine/tatsumi.c | 4 +- src/mame/machine/theglobp.c | 10 +-- src/mame/machine/tnzs.c | 10 +-- src/mame/machine/tx1.c | 16 ++-- src/mame/machine/vsnes.c | 40 ++++----- src/mame/machine/williams.c | 10 +-- src/mame/machine/wrally.c | 2 +- src/mame/video/1943.c | 4 +- src/mame/video/20pacgal.c | 2 +- src/mame/video/8080bw.c | 12 +-- src/mame/video/aerofgt.c | 4 +- src/mame/video/alpha68k.c | 4 +- src/mame/video/appoooh.c | 2 +- src/mame/video/arabian.c | 2 +- src/mame/video/archimds.c | 2 +- src/mame/video/argus.c | 4 +- src/mame/video/armedf.c | 2 +- src/mame/video/artmagic.c | 4 +- src/mame/video/atarirle.c | 4 +- src/mame/video/atarisy1.c | 2 +- src/mame/video/avgdvg.c | 4 +- src/mame/video/balsente.c | 8 +- src/mame/video/bbusters.c | 2 +- src/mame/video/bfm_adr2.c | 4 +- src/mame/video/bking.c | 2 +- src/mame/video/bombjack.c | 2 +- src/mame/video/btime.c | 2 +- src/mame/video/bublbobl.c | 2 +- src/mame/video/buggychl.c | 2 +- src/mame/video/bwing.c | 4 +- src/mame/video/capbowl.c | 2 +- src/mame/video/carpolo.c | 2 +- src/mame/video/cave.c | 8 +- src/mame/video/ccastles.c | 6 +- src/mame/video/cclimber.c | 2 +- src/mame/video/centiped.c | 2 +- src/mame/video/chaknpop.c | 2 +- src/mame/video/changela.c | 18 ++-- src/mame/video/citycon.c | 2 +- src/mame/video/cloud9.c | 6 +- src/mame/video/cosmic.c | 16 ++-- src/mame/video/cps1.c | 18 ++-- src/mame/video/crbaloon.c | 2 +- src/mame/video/crgolf.c | 2 +- src/mame/video/darkmist.c | 8 +- src/mame/video/dcheese.c | 6 +- src/mame/video/dday.c | 2 +- src/mame/video/deadang.c | 4 +- src/mame/video/deco_mlc.c | 4 +- src/mame/video/deniam.c | 2 +- src/mame/video/digdug.c | 2 +- src/mame/video/dkong.c | 14 +-- src/mame/video/dooyong.c | 44 +++++----- src/mame/video/dribling.c | 6 +- src/mame/video/dynax.c | 8 +- src/mame/video/epos.c | 4 +- src/mame/video/equites.c | 4 +- src/mame/video/esripsys.c | 10 +-- src/mame/video/exedexes.c | 8 +- src/mame/video/exerion.c | 4 +- src/mame/video/exprraid.c | 2 +- src/mame/video/f1gp.c | 8 +- src/mame/video/fcombat.c | 4 +- src/mame/video/galastrm.c | 2 +- src/mame/video/galaxian.c | 4 +- src/mame/video/galaxold.c | 16 ++-- src/mame/video/galivan.c | 6 +- src/mame/video/ginganin.c | 2 +- src/mame/video/glass.c | 2 +- src/mame/video/goldstar.c | 2 +- src/mame/video/gomoku.c | 12 +-- src/mame/video/gradius3.c | 2 +- src/mame/video/grchamp.c | 8 +- src/mame/video/gridlee.c | 2 +- src/mame/video/groundfx.c | 2 +- src/mame/video/gticlub.c | 6 +- src/mame/video/gunbustr.c | 2 +- src/mame/video/gunsmoke.c | 2 +- src/mame/video/hexion.c | 6 +- src/mame/video/hnayayoi.c | 4 +- src/mame/video/hng64.c | 6 +- src/mame/video/homedata.c | 8 +- src/mame/video/hyhoo.c | 6 +- src/mame/video/hyprduel.c | 4 +- src/mame/video/ikki.c | 2 +- src/mame/video/itech32.c | 4 +- src/mame/video/itech8.c | 4 +- src/mame/video/jackal.c | 6 +- src/mame/video/jedi.c | 10 +-- src/mame/video/kaneko16.c | 2 +- src/mame/video/kangaroo.c | 4 +- src/mame/video/kncljoe.c | 2 +- src/mame/video/konamigx.c | 4 +- src/mame/video/konamiic.c | 142 +++++++++++++++--------------- src/mame/video/konicdev.c | 148 ++++++++++++++++---------------- src/mame/video/ksayakyu.c | 6 +- src/mame/video/kyugo.c | 2 +- src/mame/video/lasso.c | 2 +- src/mame/video/leland.c | 10 +-- src/mame/video/lethalj.c | 4 +- src/mame/video/liberate.c | 2 +- src/mame/video/liberatr.c | 8 +- src/mame/video/lockon.c | 14 +-- src/mame/video/lwings.c | 4 +- src/mame/video/m107.c | 2 +- src/mame/video/madalien.c | 4 +- src/mame/video/magmax.c | 4 +- src/mame/video/mcatadv.c | 2 +- src/mame/video/mcr68.c | 2 +- src/mame/video/metro.c | 4 +- src/mame/video/mjkjidai.c | 2 +- src/mame/video/model1.c | 2 +- src/mame/video/model2.c | 4 +- src/mame/video/momoko.c | 10 +-- src/mame/video/munchmo.c | 2 +- src/mame/video/mw8080bw.c | 2 +- src/mame/video/mystston.c | 2 +- src/mame/video/mystwarr.c | 22 ++--- src/mame/video/n64.h | 4 +- src/mame/video/n8080.c | 4 +- src/mame/video/namcofl.c | 2 +- src/mame/video/namconb1.c | 4 +- src/mame/video/namcos1.c | 2 +- src/mame/video/namcos2.c | 10 +-- src/mame/video/namcos22.c | 8 +- src/mame/video/nbmj8688.c | 12 +-- src/mame/video/nbmj8891.c | 8 +- src/mame/video/nbmj8900.c | 10 +-- src/mame/video/nbmj8991.c | 6 +- src/mame/video/nbmj9195.c | 6 +- src/mame/video/neogeo.c | 10 +-- src/mame/video/niyanpai.c | 6 +- src/mame/video/nmk16.c | 2 +- src/mame/video/othunder.c | 2 +- src/mame/video/pacland.c | 2 +- src/mame/video/pastelg.c | 8 +- src/mame/video/pgm.c | 4 +- src/mame/video/phoenix.c | 2 +- src/mame/video/pitnrun.c | 8 +- src/mame/video/playch10.c | 4 +- src/mame/video/plygonet.c | 2 +- src/mame/video/polepos.c | 4 +- src/mame/video/policetr.c | 4 +- src/mame/video/popeye.c | 2 +- src/mame/video/portrait.c | 2 +- src/mame/video/ppu2c0x.c | 2 +- src/mame/video/prehisle.c | 2 +- src/mame/video/psikyo.c | 8 +- src/mame/video/punchout.c | 4 +- src/mame/video/pushman.c | 2 +- src/mame/video/quizdna.c | 6 +- src/mame/video/redalert.c | 4 +- src/mame/video/rollrace.c | 2 +- src/mame/video/route16.c | 8 +- src/mame/video/rungun.c | 2 +- src/mame/video/sega16sp.c | 44 +++++----- src/mame/video/segag80r.c | 8 +- src/mame/video/segag80v.c | 2 +- src/mame/video/segaic16.c | 8 +- src/mame/video/segas32.c | 4 +- src/mame/video/seibuspi.c | 2 +- src/mame/video/seta.c | 4 +- src/mame/video/sf.c | 4 +- src/mame/video/shangkid.c | 2 +- src/mame/video/shisen.c | 2 +- src/mame/video/sidearms.c | 4 +- src/mame/video/skyfox.c | 2 +- src/mame/video/skyraid.c | 4 +- src/mame/video/spacefb.c | 6 +- src/mame/video/spdodgeb.c | 2 +- src/mame/video/sspeedr.c | 2 +- src/mame/video/st0016.c | 4 +- src/mame/video/stactics.c | 2 +- src/mame/video/stfight.c | 4 +- src/mame/video/strnskil.c | 2 +- src/mame/video/stvvdp2.c | 2 +- src/mame/video/suna8.c | 4 +- src/mame/video/superchs.c | 2 +- src/mame/video/suprloco.c | 2 +- src/mame/video/suprnova.c | 2 +- src/mame/video/system1.c | 8 +- src/mame/video/tail2nos.c | 2 +- src/mame/video/taito_z.c | 12 +-- src/mame/video/taitoic.c | 2 +- src/mame/video/taitosj.c | 4 +- src/mame/video/tatsumi.c | 4 +- src/mame/video/tceptor.c | 12 +-- src/mame/video/terracre.c | 2 +- src/mame/video/thief.c | 4 +- src/mame/video/tigeroad.c | 2 +- src/mame/video/tmnt.c | 14 +-- src/mame/video/tubep.c | 10 +-- src/mame/video/tunhunt.c | 2 +- src/mame/video/turbo.c | 22 ++--- src/mame/video/tx1.c | 40 ++++----- src/mame/video/undrfire.c | 6 +- src/mame/video/vball.c | 4 +- src/mame/video/vertigo.c | 4 +- src/mame/video/vicdual.c | 2 +- src/mame/video/wecleman.c | 4 +- src/mame/video/williams.c | 2 +- src/mame/video/xevious.c | 2 +- src/mame/video/zaxxon.c | 4 +- 953 files changed, 3559 insertions(+), 3571 deletions(-) diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/emu/cpu/cubeqcpu/cubeqcpu.c index 2bb19b32160..db01be30ffe 100644 --- a/src/emu/cpu/cubeqcpu/cubeqcpu.c +++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c @@ -286,7 +286,7 @@ static CPU_INIT( cquestsnd ) memset(cpustate, 0, sizeof(*cpustate)); cpustate->dac_w = _config->dac_w; - cpustate->sound_data = (UINT16*)memory_region(device->machine, _config->sound_data_region); + cpustate->sound_data = (UINT16*)device->machine->region(_config->sound_data_region)->base(); cpustate->device = device; cpustate->program = device->space(AS_PROGRAM); diff --git a/src/emu/cpu/esrip/esrip.c b/src/emu/cpu/esrip/esrip.c index 3fca88e4115..9ea8e4314bc 100644 --- a/src/emu/cpu/esrip/esrip.c +++ b/src/emu/cpu/esrip/esrip.c @@ -256,7 +256,7 @@ static CPU_INIT( esrip ) /* Register configuration structure callbacks */ cpustate->fdt_r = _config->fdt_r; cpustate->fdt_w = _config->fdt_w; - cpustate->lbrm = (UINT8*)memory_region(device->machine, _config->lbrm_prom); + cpustate->lbrm = (UINT8*)device->machine->region(_config->lbrm_prom)->base(); cpustate->status_in = _config->status_in; cpustate->draw = _config->draw; diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/emu/cpu/mb86233/mb86233.c index 163c22f1a01..f02ad292a90 100644 --- a/src/emu/cpu/mb86233/mb86233.c +++ b/src/emu/cpu/mb86233/mb86233.c @@ -125,7 +125,7 @@ static CPU_INIT( mb86233 ) memset( cpustate->RAM, 0, 2 * 0x200 * sizeof(UINT32) ); cpustate->ARAM = &cpustate->RAM[0]; cpustate->BRAM = &cpustate->RAM[0x200]; - cpustate->Tables = (UINT32*) memory_region(device->machine, _config->tablergn); + cpustate->Tables = (UINT32*) device->machine->region(_config->tablergn)->base(); state_save_register_global_pointer(device->machine, cpustate->RAM,2 * 0x200 * sizeof(UINT32)); } diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index b39f0de594e..db2fac0d4cf 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -1291,7 +1291,7 @@ static UINT64 expression_read_program_direct(address_space *_space, int opcode, static UINT64 expression_read_memory_region(running_machine *machine, const char *rgntag, offs_t address, int size) { - const region_info *region = machine->region(rgntag); + const memory_region *region = machine->region(rgntag); UINT64 result = ~(UINT64)0 >> (64 - 8*size); /* make sure we get a valid base before proceeding */ @@ -1465,7 +1465,7 @@ static void expression_write_program_direct(address_space *_space, int opcode, o static void expression_write_memory_region(running_machine *machine, const char *rgntag, offs_t address, int size, UINT64 data) { debugcpu_private *global = machine->debugcpu_data; - const region_info *region = machine->region(rgntag); + const memory_region *region = machine->region(rgntag); /* make sure we get a valid base before proceeding */ if (region != NULL) @@ -1574,7 +1574,7 @@ static expression_error::error_code expression_validate(void *param, const char case EXPSPACE_REGION: if (name == NULL) return expression_error::MISSING_MEMORY_NAME; - if (memory_region(machine, name) == NULL) + if (machine->region(name)->base() == NULL) return expression_error::INVALID_MEMORY_NAME; break; } diff --git a/src/emu/debug/dvmemory.c b/src/emu/debug/dvmemory.c index c02ad5766b9..dda57369e86 100644 --- a/src/emu/debug/dvmemory.c +++ b/src/emu/debug/dvmemory.c @@ -84,7 +84,7 @@ debug_view_memory_source::debug_view_memory_source(const char *name, address_spa { } -debug_view_memory_source::debug_view_memory_source(const char *name, const region_info ®ion) +debug_view_memory_source::debug_view_memory_source(const char *name, const memory_region ®ion) : debug_view_source(name), m_space(NULL), m_memintf(NULL), @@ -165,7 +165,7 @@ void debug_view_memory::enumerate_sources() } // then add all the memory regions - for (const region_info *region = m_machine.m_regionlist.first(); region != NULL; region = region->next()) + for (const memory_region *region = m_machine.m_regionlist.first(); region != NULL; region = region->next()) { name.printf("Region '%s'", region->name()); m_source_list.append(*auto_alloc(&m_machine, debug_view_memory_source(name, *region))); diff --git a/src/emu/debug/dvmemory.h b/src/emu/debug/dvmemory.h index dc27de2bd87..147b63a0fa7 100644 --- a/src/emu/debug/dvmemory.h +++ b/src/emu/debug/dvmemory.h @@ -53,7 +53,7 @@ class debug_view_memory_source : public debug_view_source friend class debug_view_memory; debug_view_memory_source(const char *name, address_space &space); - debug_view_memory_source(const char *name, const region_info ®ion); + debug_view_memory_source(const char *name, const memory_region ®ion); debug_view_memory_source(const char *name, void *base, int element_size, int num_elements); public: diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c index 467ecddc6e5..77ab7b12a8c 100644 --- a/src/emu/devintrf.c +++ b/src/emu/devintrf.c @@ -569,7 +569,7 @@ device_t::~device_t() // info for a given region //------------------------------------------------- -const region_info *device_t::subregion(const char *_tag) const +const memory_region *device_t::subregion(const char *_tag) const { // safety first if (this == NULL) diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h index 6179d23872a..986bbc8b2bf 100644 --- a/src/emu/devintrf.h +++ b/src/emu/devintrf.h @@ -115,7 +115,7 @@ device_t *_ConfigClass::alloc_device(running_machine &machine) const \ //************************************************************************** // forward references -class region_info; +class memory_region; class device_debug; class device_config; class device_config_interface; @@ -408,7 +408,7 @@ public: // owned object helpers astring &subtag(astring &dest, const char *tag) const { return m_baseconfig.subtag(dest, tag); } astring &siblingtag(astring &dest, const char *tag) const { return m_baseconfig.siblingtag(dest, tag); } - const region_info *subregion(const char *tag) const; + const memory_region *subregion(const char *tag) const; device_t *subdevice(const char *tag) const; device_t *siblingdevice(const char *tag) const; template inline T *subdevice(const char *tag) { return downcast(subdevice(tag)); } @@ -416,7 +416,7 @@ public: // configuration helpers const device_config &baseconfig() const { return m_baseconfig; } - const region_info *region() const { return m_region; } + const memory_region *region() const { return m_region; } // state helpers bool started() const { return m_started; } @@ -484,7 +484,7 @@ protected: bool m_started; // true if the start function has succeeded UINT32 m_clock; // device clock - const region_info * m_region; // our device-local region + const memory_region * m_region; // our device-local region const device_config & m_baseconfig; // reference to our device_config UINT32 m_unscaled_clock; // unscaled clock diff --git a/src/emu/diimage.c b/src/emu/diimage.c index 295265c59f4..7d126aa06bd 100644 --- a/src/emu/diimage.c +++ b/src/emu/diimage.c @@ -432,7 +432,7 @@ UINT8 *device_image_interface::get_software_region(const char *tag) return NULL; sprintf( full_tag, "%s:%s", device().tag(), tag ); - return memory_region( device().machine, full_tag ); + return device().machine->region( full_tag )->base(); } @@ -445,7 +445,7 @@ UINT32 device_image_interface::get_software_region_length(const char *tag) char full_tag[256]; sprintf( full_tag, "%s:%s", device().tag(), tag ); - return memory_region_length( device().machine, full_tag ); + return device().machine->region( full_tag )->bytes(); } diff --git a/src/emu/drawgfx.c b/src/emu/drawgfx.c index 3b9503cc2ff..3132039aa11 100644 --- a/src/emu/drawgfx.c +++ b/src/emu/drawgfx.c @@ -92,7 +92,7 @@ void gfx_init(running_machine *machine) for (curgfx = 0; curgfx < MAX_GFX_ELEMENTS && gfxdecodeinfo[curgfx].gfxlayout != NULL; curgfx++) { const gfx_decode_entry *gfxdecode = &gfxdecodeinfo[curgfx]; - const region_info *region = (gfxdecode->memory_region != NULL) ? machine->region(gfxdecode->memory_region) : NULL; + const memory_region *region = (gfxdecode->memory_region != NULL) ? machine->region(gfxdecode->memory_region) : NULL; UINT32 region_length = (region != NULL) ? (8 * region->bytes()) : 0; const UINT8 *region_base = (region != NULL) ? region->base() : NULL; UINT32 xscale = (gfxdecode->xscale == 0) ? 1 : gfxdecode->xscale; diff --git a/src/emu/machine.c b/src/emu/machine.c index d9617e5320a..e644d1e53ba 100644 --- a/src/emu/machine.c +++ b/src/emu/machine.c @@ -616,15 +616,15 @@ void running_machine::resume() // region_alloc - allocates memory for a region //------------------------------------------------- -region_info *running_machine::region_alloc(const char *name, UINT32 length, UINT32 flags) +memory_region *running_machine::region_alloc(const char *name, UINT32 length, UINT32 flags) { // make sure we don't have a region of the same name; also find the end of the list - region_info *info = m_regionlist.find(name); + memory_region *info = m_regionlist.find(name); if (info != NULL) fatalerror("region_alloc called with duplicate region name \"%s\"\n", name); // allocate the region - return m_regionlist.append(name, auto_alloc(this, region_info(*this, name, length, flags))); + return m_regionlist.append(name, auto_alloc(this, memory_region(*this, name, length, flags))); } @@ -898,10 +898,10 @@ void running_machine::logfile_callback(running_machine &machine, const char *buf ***************************************************************************/ //------------------------------------------------- -// region_info - constructor +// memory_region - constructor //------------------------------------------------- -region_info::region_info(running_machine &machine, const char *name, UINT32 length, UINT32 flags) +memory_region::memory_region(running_machine &machine, const char *name, UINT32 length, UINT32 flags) : m_machine(machine), m_next(NULL), m_name(name), @@ -913,10 +913,10 @@ region_info::region_info(running_machine &machine, const char *name, UINT32 leng //------------------------------------------------- -// ~region_info - destructor +// ~memory_region - destructor //------------------------------------------------- -region_info::~region_info() +memory_region::~memory_region() { auto_free(&m_machine, m_base.v); } @@ -1188,7 +1188,7 @@ void driver_device::device_start() // call palette_init if present if (m_config.m_palette_init != NULL) - (*m_config.m_palette_init)(&m_machine, memory_region(machine, "proms")); + (*m_config.m_palette_init)(&m_machine, machine->region("proms")->base()); // start the various pieces driver_start(); diff --git a/src/emu/machine.h b/src/emu/machine.h index 84add63ca81..21af663a7e0 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -208,7 +208,7 @@ typedef struct _generic_audio_private generic_audio_private; // template specializations -typedef tagged_list region_list; +typedef tagged_list region_list; // legacy callback functions @@ -218,24 +218,24 @@ typedef UINT32 (*video_update_func)(screen_device *screen, bitmap_t *bitmap, con -// ======================> region_info +// ======================> memory_region // memory region object; should eventually be renamed memory_region -class region_info +class memory_region { - DISABLE_COPYING(region_info); + DISABLE_COPYING(memory_region); friend class running_machine; template friend class tagged_list; - friend resource_pool_object::~resource_pool_object(); + friend resource_pool_object::~resource_pool_object(); // construction/destruction - region_info(running_machine &machine, const char *name, UINT32 length, UINT32 flags); - ~region_info(); + memory_region(running_machine &machine, const char *name, UINT32 length, UINT32 flags); + ~memory_region(); public: // getters - region_info *next() const { return m_next; } + memory_region *next() const { return m_next; } UINT8 *base() const { return (this != NULL) ? m_base.u8 : NULL; } UINT8 *end() const { return (this != NULL) ? m_base.u8 + m_length : NULL; } UINT32 bytes() const { return (this != NULL) ? m_length : 0; } @@ -267,7 +267,7 @@ public: private: // internal data running_machine & m_machine; - region_info * m_next; + memory_region * m_next; astring m_name; generic_ptr m_base; UINT32 m_length; @@ -346,7 +346,7 @@ public: inline device_t *device(const char *tag); template inline T *device(const char *tag) { return downcast(device(tag)); } inline const input_port_config *port(const char *tag); - inline const region_info *region(const char *tag); + inline const memory_region *region(const char *tag); // configuration helpers UINT32 total_colors() const { return m_config.m_total_colors; } @@ -386,7 +386,7 @@ public: void current_datetime(system_time &systime); // regions - region_info *region_alloc(const char *name, UINT32 length, UINT32 flags); + memory_region *region_alloc(const char *name, UINT32 length, UINT32 flags); void region_free(const char *name); // managers @@ -663,22 +663,10 @@ inline const input_port_config *running_machine::port(const char *tag) return m_portlist.find(tag); } -inline const region_info *running_machine::region(const char *tag) +inline const memory_region *running_machine::region(const char *tag) { return m_regionlist.find(tag); } -inline UINT8 *memory_region(running_machine *machine, const char *name) -{ - const region_info *region = machine->region(name); - return (region != NULL) ? region->base() : NULL; -} - -inline UINT32 memory_region_length(running_machine *machine, const char *name) -{ - const region_info *region = machine->region(name); - return (region != NULL) ? region->bytes() : 0; -} - #endif /* __MACHINE_H__ */ diff --git a/src/emu/memory.c b/src/emu/memory.c index c2b8d0a903b..6f0a840d48c 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -1935,7 +1935,7 @@ inline void address_space::adjust_addresses(offs_t &start, offs_t &end, offs_t & void address_space::prepare_map() { - const region_info *devregion = (m_spacenum == ADDRESS_SPACE_0) ? m_machine.region(m_device.tag()) : NULL; + const memory_region *devregion = (m_spacenum == ADDRESS_SPACE_0) ? m_machine.region(m_device.tag()) : NULL; UINT32 devregionsize = (devregion != NULL) ? devregion->bytes() : 0; // allocate the address map @@ -1981,7 +1981,7 @@ void address_space::prepare_map() // validate adjusted addresses against implicit regions if (entry->m_region != NULL && entry->m_share == NULL && entry->m_baseptr == NULL) { - const region_info *region = m_machine.region(entry->m_region); + const memory_region *region = m_machine.region(entry->m_region); if (region == NULL) fatalerror("Error: device '%s' %s space memory map entry %X-%X references non-existant region \"%s\"", m_device.tag(), m_name, entry->m_addrstart, entry->m_addrend, entry->m_region); @@ -3020,7 +3020,7 @@ bool address_space::needs_backing_store(const address_map_entry *entry) return true; // if we're reading from RAM or from ROM outside of address space 0 or its region, then yes, we do need backing - const region_info *region = m_machine.region(m_device.tag()); + const memory_region *region = m_machine.region(m_device.tag()); if (entry->m_read.m_type == AMH_RAM || (entry->m_read.m_type == AMH_ROM && (m_spacenum != ADDRESS_SPACE_0 || region == NULL || entry->m_addrstart >= region->bytes()))) return true; @@ -4078,7 +4078,7 @@ memory_block::memory_block(address_space &space, offs_t bytestart, offs_t byteen } // register for saving, but only if we're not part of a memory region - const region_info *region; + const memory_region *region; for (region = space.m_machine.m_regionlist.first(); region != NULL; region = region->next()) if (m_data >= region->base() && (m_data + (byteend - bytestart + 1)) < region->end()) { diff --git a/src/emu/romload.c b/src/emu/romload.c index f6c40756275..1ec17b0746b 100644 --- a/src/emu/romload.c +++ b/src/emu/romload.c @@ -64,7 +64,7 @@ struct _romload_private open_chd * chd_list; /* disks */ open_chd ** chd_list_tailptr; - region_info * region; /* info about current region */ + memory_region * region; /* info about current region */ astring errorstring; /* error string */ }; @@ -562,7 +562,7 @@ static void display_rom_load_results(rom_load_data *romdata) static void region_post_process(rom_load_data *romdata, const char *rgntag) { - const region_info *region = romdata->machine->region(rgntag); + const memory_region *region = romdata->machine->region(rgntag); UINT8 *base; int i, j; @@ -832,7 +832,7 @@ static void copy_rom_data(rom_load_data *romdata, const rom_entry *romp) fatalerror("Error in RomModule definition: COPY has an invalid length\n"); /* make sure the source was valid */ - const region_info *region = romdata->machine->region(srcrgntag); + const memory_region *region = romdata->machine->region(srcrgntag); if (region == NULL) fatalerror("Error in RomModule definition: COPY from an invalid region\n"); @@ -1251,7 +1251,7 @@ void load_software_part_region(device_t *device, char *swlist, char *swname, rom assert(ROMENTRY_ISREGION(region)); /* if this is a device region, override with the device width and endianness */ - const region_info *memregion = romdata->machine->region(regiontag); + const memory_region *memregion = romdata->machine->region(regiontag); if (memregion != NULL) { if (romdata->machine->device(regiontag) != NULL) diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c index 6c2ab955c7d..f20fc7e574e 100644 --- a/src/emu/sound/2610intf.c +++ b/src/emu/sound/2610intf.c @@ -166,8 +166,8 @@ static DEVICE_START( ym2610 ) pcmbufa = *device->region(); pcmsizea = device->region()->bytes(); name.printf("%s.deltat", device->tag()); - pcmbufb = (void *)(memory_region(device->machine, name)); - pcmsizeb = memory_region_length(device->machine, name); + pcmbufb = (void *)(device->machine->region(name)->base()); + pcmsizeb = device->machine->region(name)->bytes(); if (pcmbufb == NULL || pcmsizeb == 0) { pcmbufb = pcmbufa; diff --git a/src/emu/sound/digitalk.c b/src/emu/sound/digitalk.c index 9524a8541c3..c3d67b1bf41 100644 --- a/src/emu/sound/digitalk.c +++ b/src/emu/sound/digitalk.c @@ -649,7 +649,7 @@ static DEVICE_START(digitalker) { digitalker *dg = get_safe_token(device); dg->device = device; - dg->rom = memory_region(device->machine, device->tag()); + dg->rom = device->machine->region(device->tag())->base(); dg->stream = stream_create(device, 0, 1, device->clock()/4, dg, digitalker_update); dg->dac_index = 128; dg->data = 0xff; diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c index 873034cf54a..b642b206ee5 100644 --- a/src/emu/sound/es5506.c +++ b/src/emu/sound/es5506.c @@ -914,10 +914,10 @@ static void es5506_start_common(device_t *device, const void *config, device_typ chip->stream = stream_create(device, 0, 2, device->clock() / (16*32), chip, es5506_update); /* initialize the regions */ - chip->region_base[0] = intf->region0 ? (UINT16 *)memory_region(device->machine, intf->region0) : NULL; - chip->region_base[1] = intf->region1 ? (UINT16 *)memory_region(device->machine, intf->region1) : NULL; - chip->region_base[2] = intf->region2 ? (UINT16 *)memory_region(device->machine, intf->region2) : NULL; - chip->region_base[3] = intf->region3 ? (UINT16 *)memory_region(device->machine, intf->region3) : NULL; + chip->region_base[0] = intf->region0 ? (UINT16 *)device->machine->region(intf->region0)->base() : NULL; + chip->region_base[1] = intf->region1 ? (UINT16 *)device->machine->region(intf->region1)->base() : NULL; + chip->region_base[2] = intf->region2 ? (UINT16 *)device->machine->region(intf->region2)->base() : NULL; + chip->region_base[3] = intf->region3 ? (UINT16 *)device->machine->region(intf->region3)->base() : NULL; /* initialize the rest of the structure */ chip->device = device; diff --git a/src/emu/sound/fm.c b/src/emu/sound/fm.c index 7d767c15fd7..72ed69e229f 100644 --- a/src/emu/sound/fm.c +++ b/src/emu/sound/fm.c @@ -4231,17 +4231,17 @@ void ym2610_reset_chip(void *chip) /* setup PCM buffers again */ name.printf("%s",dev->tag()); - F2610->pcmbuf = (const UINT8 *)memory_region(dev->machine,name); - F2610->pcm_size = memory_region_length(dev->machine,name); + F2610->pcmbuf = (const UINT8 *)dev->machine->region(name)->base(); + F2610->pcm_size = dev->machine->region(name)->bytes(); name.printf("%s.deltat",dev->tag()); - F2610->deltaT.memory = (UINT8 *)memory_region(dev->machine,name); + F2610->deltaT.memory = (UINT8 *)dev->machine->region(name)->base(); if(F2610->deltaT.memory == NULL) { F2610->deltaT.memory = (UINT8*)F2610->pcmbuf; F2610->deltaT.memory_size = F2610->pcm_size; } else - F2610->deltaT.memory_size = memory_region_length(dev->machine,name); + F2610->deltaT.memory_size = dev->machine->region(name)->bytes(); /* Reset Prescaler */ OPNSetPres( OPN, 6*24, 6*24, 4*2); /* OPN 1/6 , SSG 1/4 */ diff --git a/src/emu/sound/gaelco.c b/src/emu/sound/gaelco.c index a0bc5ead80b..2f37da528d7 100644 --- a/src/emu/sound/gaelco.c +++ b/src/emu/sound/gaelco.c @@ -261,7 +261,7 @@ static DEVICE_START( gaelco ) info->banks[j] = intf->banks[j]; } info->stream = stream_create(device, 0, 2, 8000, info, gaelco_update); - info->snd_data = (UINT8 *)memory_region(device->machine, intf->gfxregion); + info->snd_data = (UINT8 *)device->machine->region(intf->gfxregion)->base(); if (info->snd_data == NULL) info->snd_data = *device->region(); diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c index b65fede549a..f25c2f47105 100644 --- a/src/emu/sound/k053260.c +++ b/src/emu/sound/k053260.c @@ -222,7 +222,7 @@ static DEVICE_START( k053260 ) ic->mode = 0; - const region_info *region = (ic->intf->rgnoverride != NULL) ? device->machine->region(ic->intf->rgnoverride) : device->region(); + const memory_region *region = (ic->intf->rgnoverride != NULL) ? device->machine->region(ic->intf->rgnoverride) : device->region(); ic->rom = *region; ic->rom_size = region->bytes(); diff --git a/src/emu/sound/k054539.c b/src/emu/sound/k054539.c index 91839266115..9b4ab78e513 100644 --- a/src/emu/sound/k054539.c +++ b/src/emu/sound/k054539.c @@ -457,7 +457,7 @@ static void k054539_init_chip(device_t *device, k054539_state *info) info->cur_ptr = 0; memset(info->ram, 0, 0x4000*2+device->clock()/50*2); - const region_info *region = (info->intf->rgnoverride != NULL) ? device->machine->region(info->intf->rgnoverride) : device->region(); + const memory_region *region = (info->intf->rgnoverride != NULL) ? device->machine->region(info->intf->rgnoverride) : device->region(); info->rom = *region; info->rom_size = region->bytes(); info->rom_mask = 0xffffffffU; diff --git a/src/emu/sound/tms5110.c b/src/emu/sound/tms5110.c index 558e8c680f6..e05c226e2ba 100644 --- a/src/emu/sound/tms5110.c +++ b/src/emu/sound/tms5110.c @@ -1416,7 +1416,7 @@ static DEVICE_START( tmsprom ) tms->rom = *device->region(); assert_always(tms->rom != NULL, "Error creating TMSPROM chip: No rom region found"); - tms->prom = memory_region(device->machine, tms->intf->prom_region); + tms->prom = device->machine->region(tms->intf->prom_region)->base(); assert_always(tms->rom != NULL, "Error creating TMSPROM chip: No prom region found"); tms->device = device; diff --git a/src/emu/sound/zsg2.c b/src/emu/sound/zsg2.c index 6cc76c5bb98..f658b9ff235 100644 --- a/src/emu/sound/zsg2.c +++ b/src/emu/sound/zsg2.c @@ -229,7 +229,7 @@ static DEVICE_START( zsg2 ) info->stream = stream_create(device, 0, 2, info->sample_rate, info, update_stereo); - info->bank_samples = memory_region(device->machine, intf->samplergn); + info->bank_samples = device->machine->region(intf->samplergn)->base(); } /************************************************************************** diff --git a/src/emu/video/pc_vga.h b/src/emu/video/pc_vga.h index f7f2b2411f6..baee18b53b1 100644 --- a/src/emu/video/pc_vga.h +++ b/src/emu/video/pc_vga.h @@ -103,7 +103,7 @@ WRITE16_HANDLER( vga_port16le_03d0_w ); */ #if 0 int i; - UINT8 *memory=memory_region(machine, "maincpu")+0xc0000; + UINT8 *memory=machine->region("maincpu")->base()+0xc0000; UINT8 chksum; /* oak vga */ diff --git a/src/emu/video/tms9927.c b/src/emu/video/tms9927.c index 1dd40b516e5..86aae4e193c 100644 --- a/src/emu/video/tms9927.c +++ b/src/emu/video/tms9927.c @@ -277,7 +277,7 @@ static DEVICE_START( tms9927 ) /* get the self-load PROM */ if (tms->intf->selfload_region != NULL) { - tms->selfload = memory_region(device->machine, tms->intf->selfload_region); + tms->selfload = device->machine->region(tms->intf->selfload_region)->base(); assert(tms->selfload != NULL); } } diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c index 7d3cbbc7daf..443eefd939d 100644 --- a/src/mame/audio/atarijsa.c +++ b/src/mame/audio/atarijsa.c @@ -133,7 +133,7 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask) test_mask = testmask; /* predetermine the bank base */ - rgn = memory_region(machine, "jsa"); + rgn = machine->region("jsa")->base(); bank_base = &rgn[0x03000]; bank_source_data = &rgn[0x10000]; @@ -161,8 +161,8 @@ void atarijsa_init(running_machine *machine, const char *testport, int testmask) /* the upper 128k is fixed, the lower 128k is bankswitched */ for (rgn = 0; rgn < ARRAY_LENGTH(regions); rgn++) { - UINT8 *base = memory_region(machine, regions[rgn]); - if (base != NULL && memory_region_length(machine, regions[rgn]) >= 0x80000) + UINT8 *base = machine->region(regions[rgn])->base(); + if (base != NULL && machine->region(regions[rgn])->bytes() >= 0x80000) { const char *bank = (rgn != 2) ? "bank12" : "bank14"; const char *bank_plus_1 = (rgn != 2) ? "bank13" : "bank15"; diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c index 5dd6c45b311..5513d8675f8 100644 --- a/src/mame/audio/cage.c +++ b/src/mame/audio/cage.c @@ -160,8 +160,8 @@ void cage_init(running_machine *machine, offs_t speedup) cage_irqhandler = NULL; - memory_set_bankptr(machine, "bank10", memory_region(machine, "cageboot")); - memory_set_bankptr(machine, "bank11", memory_region(machine, "cage")); + memory_set_bankptr(machine, "bank10", machine->region("cageboot")->base()); + memory_set_bankptr(machine, "bank11", machine->region("cage")->base()); cage_cpu = machine->device("cage"); cage_cpu_clock_period = ATTOTIME_IN_HZ(cage_cpu->clock()); diff --git a/src/mame/audio/cclimber.c b/src/mame/audio/cclimber.c index e6ae8941397..9e2bd74555b 100644 --- a/src/mame/audio/cclimber.c +++ b/src/mame/audio/cclimber.c @@ -17,16 +17,16 @@ static SAMPLES_START( cclimber_sh_start ) { running_machine *machine = device->machine; samplebuf = 0; - if (memory_region(machine, "samples")) - samplebuf = auto_alloc_array(machine, INT16, 2 * memory_region_length(machine, "samples")); + if (machine->region("samples")->base()) + samplebuf = auto_alloc_array(machine, INT16, 2 * machine->region("samples")->bytes()); } static void cclimber_play_sample(running_machine *machine, int start,int freq,int volume) { int len; - int romlen = memory_region_length(machine, "samples"); - const UINT8 *rom = memory_region(machine, "samples"); + int romlen = machine->region("samples")->bytes(); + const UINT8 *rom = machine->region("samples")->base(); device_t *samples = machine->device("samples"); diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c index 110fd4309c6..47ddc89190b 100644 --- a/src/mame/audio/cinemat.c +++ b/src/mame/audio/cinemat.c @@ -1635,7 +1635,7 @@ static MACHINE_RESET( qb3_sound ) /* this patch prevents the sound ROM from eating itself when command $0A is sent */ /* on a cube rotate */ - memory_region(machine, "audiocpu")[0x11dc] = 0x09; + machine->region("audiocpu")->base()[0x11dc] = 0x09; } diff --git a/src/mame/audio/circus.c b/src/mame/audio/circus.c index 6326ff99eb6..afe44f94d77 100644 --- a/src/mame/audio/circus.c +++ b/src/mame/audio/circus.c @@ -175,7 +175,7 @@ WRITE8_HANDLER( circus_clown_z_w ) circus_state *state = space->machine->driver_data(); state->clown_z = (data & 0x0f); - *(memory_region(space->machine, "maincpu") + 0x8000) = data; logerror("Z:%02x\n",data); //DEBUG + *(space->machine->region("maincpu")->base() + 0x8000) = data; logerror("Z:%02x\n",data); //DEBUG /* Bits 4-6 enable/disable trigger different events */ switch (state->game_id) diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c index 34f3fece438..0c0f5a8ade6 100644 --- a/src/mame/audio/cyberbal.c +++ b/src/mame/audio/cyberbal.c @@ -20,7 +20,7 @@ void cyberbal_sound_reset(running_machine *machine) cyberbal_state *state = machine->driver_data(); /* reset the sound system */ - state->bank_base = &memory_region(machine, "audiocpu")[0x10000]; + state->bank_base = &machine->region("audiocpu")->base()[0x10000]; memory_set_bankptr(machine, "soundbank", &state->bank_base[0x0000]); state->fast_68k_int = state->io_68k_int = 0; state->sound_data_from_68k = state->sound_data_from_6502 = 0; diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c index 34cf58260d8..cd52fa35b32 100644 --- a/src/mame/audio/dcs.c +++ b/src/mame/audio/dcs.c @@ -946,8 +946,8 @@ void dcs_init(running_machine *machine) dcs.dmadac[0] = machine->device("dac"); /* configure boot and sound ROMs */ - dcs.bootrom = (UINT16 *)memory_region(machine, "dcs"); - dcs.bootrom_words = memory_region_length(machine, "dcs") / 2; + dcs.bootrom = (UINT16 *)machine->region("dcs")->base(); + dcs.bootrom_words = machine->region("dcs")->bytes() / 2; dcs.sounddata = dcs.bootrom; dcs.sounddata_words = dcs.bootrom_words; dcs.sounddata_banks = dcs.sounddata_words / 0x1000; @@ -997,8 +997,8 @@ void dcs2_init(running_machine *machine, int dram_in_mb, offs_t polling_offset) dcs.dmadac[1] = machine->device("dac2"); /* always boot from the base of "dcs" */ - dcs.bootrom = (UINT16 *)memory_region(machine, "dcs"); - dcs.bootrom_words = memory_region_length(machine, "dcs") / 2; + dcs.bootrom = (UINT16 *)machine->region("dcs")->base(); + dcs.bootrom_words = machine->region("dcs")->bytes() / 2; /* supports both RAM and ROM variants */ if (dram_in_mb != 0) diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c index 47ef6cdaa72..c6e1ddc7e9b 100644 --- a/src/mame/audio/dkong.c +++ b/src/mame/audio/dkong.c @@ -1124,7 +1124,7 @@ static SOUND_START( dkong) { dkong_state *state = machine->driver_data(); - state->snd_rom = memory_region(machine, "soundcpu"); + state->snd_rom = machine->region("soundcpu")->base(); } diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c index 3452def8187..e984d38582f 100644 --- a/src/mame/audio/exidy440.c +++ b/src/mame/audio/exidy440.c @@ -165,7 +165,7 @@ static DEVICE_START( exidy440_sound ) stream = stream_create(device, 0, 2, device->clock(), NULL, channel_update); /* allocate the sample cache */ - length = memory_region_length(machine, "cvsd") * 16 + MAX_CACHE_ENTRIES * sizeof(sound_cache_entry); + length = machine->region("cvsd")->bytes() * 16 + MAX_CACHE_ENTRIES * sizeof(sound_cache_entry); sound_cache = (sound_cache_entry *)auto_alloc_array(machine, UINT8, length); /* determine the hard end of the cache and reset */ @@ -652,7 +652,7 @@ static INT16 *find_or_add_to_sound_cache(running_machine *machine, int address, if (current->address == address && current->length == length && current->bits == bits && current->frequency == frequency) return current->data; - return add_to_sound_cache(&memory_region(machine, "cvsd")[address], address, length, bits, frequency); + return add_to_sound_cache(&machine->region("cvsd")->base()[address], address, length, bits, frequency); } diff --git a/src/mame/audio/flower.c b/src/mame/audio/flower.c index 8e31a3bf89d..f973f44d8a7 100644 --- a/src/mame/audio/flower.c +++ b/src/mame/audio/flower.c @@ -185,8 +185,8 @@ static DEVICE_START( flower_sound ) state->num_voices = 8; state->last_channel = state->channel_list + state->num_voices; - state->sound_rom1 = memory_region(machine, "sound1"); - state->sound_rom2 = memory_region(machine, "sound2"); + state->sound_rom1 = machine->region("sound1")->base(); + state->sound_rom2 = machine->region("sound2")->base(); /* start with sound enabled, many games don't have a sound enable register */ state->sound_enable = 1; diff --git a/src/mame/audio/gomoku.c b/src/mame/audio/gomoku.c index ff3dd7de7a0..9576a67a6a3 100644 --- a/src/mame/audio/gomoku.c +++ b/src/mame/audio/gomoku.c @@ -193,7 +193,7 @@ static DEVICE_START( gomoku_sound ) state->num_voices = MAX_VOICES; state->last_channel = state->channel_list + state->num_voices; - state->sound_rom = memory_region(machine, "gomoku"); + state->sound_rom = machine->region("gomoku")->base(); /* start with sound enabled, many games don't have a sound enable register */ state->sound_enable = 1; diff --git a/src/mame/audio/harddriv.c b/src/mame/audio/harddriv.c index 0e4e81e7166..1ad2290fa3f 100644 --- a/src/mame/audio/harddriv.c +++ b/src/mame/audio/harddriv.c @@ -24,8 +24,8 @@ void hdsnd_init(running_machine *machine) { harddriv_state *state = machine->driver_data(); - state->rombase = (UINT8 *)memory_region(machine, "serialroms"); - state->romsize = memory_region_length(machine, "serialroms"); + state->rombase = (UINT8 *)machine->region("serialroms")->base(); + state->romsize = machine->region("serialroms")->bytes(); } diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c index c414d30f99c..4271c3c616b 100644 --- a/src/mame/audio/leland.c +++ b/src/mame/audio/leland.c @@ -552,7 +552,7 @@ static DEVICE_START( common_sh_start ) /* if we have a 2151, install an externally driven DAC stream */ if (state->has_ym2151) { - state->ext_base = memory_region(machine, "dac"); + state->ext_base = machine->region("dac")->base(); state->extern_stream = stream_create(device, 0, 1, OUTPUT_RATE, NULL, leland_80186_extern_update); } diff --git a/src/mame/audio/m72.c b/src/mame/audio/m72.c index f24624bc3e8..578cc957467 100644 --- a/src/mame/audio/m72.c +++ b/src/mame/audio/m72.c @@ -200,11 +200,11 @@ WRITE8_HANDLER( poundfor_sample_addr_w ) READ8_HANDLER( m72_sample_r ) { - return memory_region(space->machine, "samples")[sample_addr]; + return space->machine->region("samples")->base()[sample_addr]; } WRITE8_DEVICE_HANDLER( m72_sample_w ) { dac_signed_data_w(device, data); - sample_addr = (sample_addr + 1) & (memory_region_length(device->machine, "samples") - 1); + sample_addr = (sample_addr + 1) & (device->machine->region("samples")->bytes() - 1); } diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index 6ebb2cb565f..84580002a77 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -416,7 +416,7 @@ static SOUND_START( mario ) mario_state *state = machine->driver_data(); device_t *audiocpu = machine->device("audiocpu"); #if USE_8039 - UINT8 *SND = memory_region(machine, "audiocpu"); + UINT8 *SND = machine->region("audiocpu")->base(); SND[0x1001] = 0x01; #endif @@ -426,8 +426,8 @@ static SOUND_START( mario ) { state->eabank = "bank1"; memory_install_read_bank(cpu_get_address_space(audiocpu, ADDRESS_SPACE_PROGRAM), 0x000, 0x7ff, 0, 0, "bank1"); - memory_configure_bank(machine, "bank1", 0, 1, memory_region(machine, "audiocpu"), 0); - memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "audiocpu") + 0x1000, 0x800); + memory_configure_bank(machine, "bank1", 0, 1, machine->region("audiocpu")->base(), 0); + memory_configure_bank(machine, "bank1", 1, 1, machine->region("audiocpu")->base() + 0x1000, 0x800); } state_save_register_global(machine, state->last); @@ -482,8 +482,8 @@ static READ8_HANDLER( mario_sh_t1_r ) static READ8_HANDLER( mario_sh_tune_r ) { - UINT8 *SND = memory_region(space->machine, "audiocpu"); - UINT16 mask = memory_region_length(space->machine, "audiocpu")-1; + UINT8 *SND = space->machine->region("audiocpu")->base(); + UINT16 mask = space->machine->region("audiocpu")->bytes()-1; UINT8 p2 = I8035_P2_R(space); if ((p2 >> 7) & 1) diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c index 9ebd895230a..b8f3e250225 100644 --- a/src/mame/audio/mcr.c +++ b/src/mame/audio/mcr.c @@ -242,7 +242,7 @@ void mcr_sound_reset(running_machine *machine) */ static void ssio_compute_ay8910_modulation(running_machine *machine) { - UINT8 *prom = memory_region(machine, "proms"); + UINT8 *prom = machine->region("proms")->base(); int volval; /* loop over all possible values of the duty cycle */ diff --git a/src/mame/audio/namcoc7x.c b/src/mame/audio/namcoc7x.c index 0bb17b29f5f..d65b01635b5 100644 --- a/src/mame/audio/namcoc7x.c +++ b/src/mame/audio/namcoc7x.c @@ -79,7 +79,7 @@ void namcoc7x_sound_write16(UINT16 command, UINT32 offset) void namcoc7x_on_driver_init(running_machine *machine) { - UINT8 *pROM = (UINT8 *)memory_region(machine, "c7x"); + UINT8 *pROM = (UINT8 *)machine->region("c7x")->base(); device_t *cpu; // clear the two 16-bits magic values at the start of the rom diff --git a/src/mame/audio/polepos.c b/src/mame/audio/polepos.c index 7527da752f2..51e1d70d39d 100644 --- a/src/mame/audio/polepos.c +++ b/src/mame/audio/polepos.c @@ -81,7 +81,7 @@ static STREAM_UPDATE( engine_sound_update ) /* determine the volume */ slot = (state->sample_msb >> 3) & 7; volume = volume_table[slot]; - base = &memory_region(device->machine, "engine")[slot * 0x800]; + base = &device->machine->region("engine")->base()[slot * 0x800]; /* fill in the sample */ while (samples--) diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c index 26b73dae9ba..2d885a1b393 100644 --- a/src/mame/audio/segag80r.c +++ b/src/mame/audio/segag80r.c @@ -509,7 +509,7 @@ static WRITE8_DEVICE_HANDLER( sega005_sound_a_w ) INLINE void sega005_update_sound_data(running_machine *machine) { - UINT8 newval = memory_region(machine, "005")[sound_addr]; + UINT8 newval = machine->region("005")->base()[sound_addr]; UINT8 diff = newval ^ sound_data; //mame_printf_debug(" [%03X] = %02X\n", sound_addr, newval); @@ -607,7 +607,7 @@ DEVICE_GET_INFO( sega005_sound ) static STREAM_UPDATE( sega005_stream_update ) { - const UINT8 *sound_prom = memory_region(device->machine, "proms"); + const UINT8 *sound_prom = device->machine->region("proms")->base(); int i; /* no implementation yet */ @@ -898,7 +898,7 @@ static WRITE8_DEVICE_HANDLER( monsterb_sound_a_w ) tms36xx_note_w(tms, 0, data & 15); /* Top four data lines address an 82S123 ROM that enables/disables voices */ - enable_val = memory_region(device->machine, "prom")[(data & 0xF0) >> 4]; + enable_val = device->machine->region("prom")->base()[(data & 0xF0) >> 4]; tms3617_enable_w(tms, enable_val >> 2); } @@ -976,7 +976,7 @@ static WRITE8_DEVICE_HANDLER( n7751_rom_control_w ) case 3: sound_addr &= 0xfff; { - int numroms = memory_region_length(device->machine, "n7751") / 0x1000; + int numroms = device->machine->region("n7751")->bytes() / 0x1000; if (!(data & 0x01) && numroms >= 1) sound_addr |= 0x0000; if (!(data & 0x02) && numroms >= 2) sound_addr |= 0x1000; if (!(data & 0x04) && numroms >= 3) sound_addr |= 0x2000; @@ -990,7 +990,7 @@ static WRITE8_DEVICE_HANDLER( n7751_rom_control_w ) static READ8_HANDLER( n7751_rom_r ) { /* read from BUS */ - return memory_region(space->machine, "n7751")[sound_addr]; + return space->machine->region("n7751")->base()[sound_addr]; } diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c index 38ac41b1acd..ae2c6308c73 100644 --- a/src/mame/audio/segasnd.c +++ b/src/mame/audio/segasnd.c @@ -169,7 +169,7 @@ static READ8_HANDLER( speech_p1_r ) static READ8_HANDLER( speech_rom_r ) { - return memory_region(space->machine, "speech")[0x100 * (speech_p2 & 0x3f) + offset]; + return space->machine->region("speech")->base()[0x100 * (speech_p2 & 0x3f) + offset]; } static WRITE8_HANDLER( speech_p1_w ) diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c index fc7be57e920..07ecf529191 100644 --- a/src/mame/audio/seibu.c +++ b/src/mame/audio/seibu.c @@ -106,7 +106,7 @@ void seibu_sound_decrypt(running_machine *machine,const char *cpu,int length) { address_space *space = cputag_get_address_space(machine, cpu, ADDRESS_SPACE_PROGRAM); UINT8 *decrypt = auto_alloc_array(machine, UINT8, length); - UINT8 *rom = memory_region(machine, cpu); + UINT8 *rom = machine->region(cpu)->base(); int i; space->set_decrypted_region(0x0000, (length < 0x10000) ? (length - 1) : 0x1fff, decrypt); @@ -176,7 +176,7 @@ static DEVICE_START( seibu_adpcm ) state->playing = 0; state->stream = stream_create(device, 0, 1, device->clock(), state, seibu_adpcm_callback); - state->base = memory_region(machine, "adpcm"); + state->base = machine->region("adpcm")->base(); state->adpcm.reset(); } @@ -203,8 +203,8 @@ DEVICE_GET_INFO( seibu_adpcm ) void seibu_adpcm_decrypt(running_machine *machine, const char *region) { - UINT8 *ROM = memory_region(machine, region); - int len = memory_region_length(machine, region); + UINT8 *ROM = machine->region(region)->base(); + int len = machine->region(region)->bytes(); int i; for (i = 0; i < len; i++) @@ -332,8 +332,8 @@ void seibu_ym2203_irqhandler(device_t *device, int linestate) MACHINE_RESET( seibu_sound ) { - int romlength = memory_region_length(machine, "audiocpu"); - UINT8 *rom = memory_region(machine, "audiocpu"); + int romlength = machine->region("audiocpu")->bytes(); + UINT8 *rom = machine->region("audiocpu")->base(); sound_cpu = machine->device("audiocpu"); update_irq_lines(machine, VECTOR_INIT); diff --git a/src/mame/audio/snes_snd.c b/src/mame/audio/snes_snd.c index 6117c3c85e1..12d539cdc3a 100644 --- a/src/mame/audio/snes_snd.c +++ b/src/mame/audio/snes_snd.c @@ -1170,7 +1170,7 @@ WRITE8_DEVICE_HANDLER( spc_io_w ) if ((data & 0x80) != (spc700->ram[0xf1] & 0x80)) { if (data & 0x80) - memcpy(spc700->ipl_region, memory_region(device->machine, "user5"), 64); + memcpy(spc700->ipl_region, device->machine->region("user5")->base(), 64); else memcpy(spc700->ipl_region, &spc700->ram[0xffc0], 64); } @@ -1318,7 +1318,7 @@ static DEVICE_START( snes_sound ) spc700->ram[0xf1] = 0x80; /* put IPL image at the top of RAM */ - memcpy(spc700->ipl_region, memory_region(machine, "user5"), 64); + memcpy(spc700->ipl_region, machine->region("user5")->base(), 64); /* Initialize the timers */ spc700->timer[0] = timer_alloc(machine, snes_spc_timer, spc700); diff --git a/src/mame/audio/snk6502.c b/src/mame/audio/snk6502.c index c5324351dc8..65247b2f81b 100644 --- a/src/mame/audio/snk6502.c +++ b/src/mame/audio/snk6502.c @@ -655,7 +655,7 @@ static DEVICE_START( snk6502_sound ) snk6502_sound_state *state = get_safe_token(device); state->samples = device->machine->device("samples"); - state->ROM = memory_region(device->machine, "snk6502"); + state->ROM = device->machine->region("snk6502")->base(); // adjusted snk6502_set_music_freq(device->machine, 43000); diff --git a/src/mame/audio/suna8.c b/src/mame/audio/suna8.c index 0b377ad254e..4684ddc1826 100644 --- a/src/mame/audio/suna8.c +++ b/src/mame/audio/suna8.c @@ -48,8 +48,8 @@ WRITE8_DEVICE_HANDLER( suna8_samples_number_w ) SAMPLES_START( suna8_sh_start ) { running_machine *machine = device->machine; - int i, len = memory_region_length(machine, "samples"); - UINT8 *ROM = memory_region(machine, "samples"); + int i, len = machine->region("samples")->bytes(); + UINT8 *ROM = machine->region("samples")->base(); samplebuf = auto_alloc_array(machine, INT16, len); diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c index 83d58519cc1..3c1c09eb892 100644 --- a/src/mame/audio/taito_en.c +++ b/src/mame/audio/taito_en.c @@ -36,7 +36,7 @@ static WRITE16_HANDLER(f3_68000_share_w) static WRITE16_HANDLER( f3_es5505_bank_w ) { - UINT32 max_banks_this_game=(memory_region_length(space->machine, "ensoniq.0")/0x200000)-1; + UINT32 max_banks_this_game=(space->machine->region("ensoniq.0")->bytes()/0x200000)-1; #if 0 { @@ -191,7 +191,7 @@ static READ16_HANDLER(es5510_dsp_r) static WRITE16_HANDLER(es5510_dsp_w) { - UINT8 *snd_mem = (UINT8 *)memory_region(space->machine, "ensoniq.0"); + UINT8 *snd_mem = (UINT8 *)space->machine->region("ensoniq.0")->base(); // if (offset>4 && offset!=0x80 && offset!=0xa0 && offset!=0xc0 && offset!=0xe0) // logerror("%06x: DSP write offset %04x %04x\n",cpu_get_pc(space->cpu),offset,data); @@ -249,7 +249,7 @@ ADDRESS_MAP_END SOUND_RESET( taito_f3_soundsystem_reset ) { /* Sound cpu program loads to 0xc00000 so we use a bank */ - UINT16 *ROM = (UINT16 *)memory_region(machine, "audiocpu"); + UINT16 *ROM = (UINT16 *)machine->region("audiocpu")->base(); memory_set_bankptr(machine, "bank1",&ROM[0x80000]); memory_set_bankptr(machine, "bank2",&ROM[0x90000]); memory_set_bankptr(machine, "bank3",&ROM[0xa0000]); diff --git a/src/mame/audio/targ.c b/src/mame/audio/targ.c index a6dc89650c5..49be8db1ef6 100644 --- a/src/mame/audio/targ.c +++ b/src/mame/audio/targ.c @@ -115,7 +115,7 @@ WRITE8_HANDLER( targ_audio_2_w ) if ((data & 0x01) && !(port_2_last & 0x01)) { device_t *samples = space->machine->device("samples"); - UINT8 *prom = memory_region(space->machine, "targ"); + UINT8 *prom = space->machine->region("targ")->base(); tone_pointer = (tone_pointer + 1) & 0x0f; diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c index 4dc9fbca2cb..952759ad0ab 100644 --- a/src/mame/audio/williams.c +++ b/src/mame/audio/williams.c @@ -274,7 +274,7 @@ void williams_cvsd_init(running_machine *machine) soundalt_cpu = NULL; /* configure master CPU banks */ - ROM = memory_region(machine, "cvsdcpu"); + ROM = machine->region("cvsdcpu")->base(); for (bank = 0; bank < 16; bank++) { /* @@ -306,7 +306,7 @@ void williams_narc_init(running_machine *machine) soundalt_cpu = machine->device("narc2cpu"); /* configure master CPU banks */ - ROM = memory_region(machine, "narc1cpu"); + ROM = machine->region("narc1cpu")->base(); for (bank = 0; bank < 16; bank++) { /* @@ -320,7 +320,7 @@ void williams_narc_init(running_machine *machine) memory_set_bankptr(machine, "bank6", &ROM[0x10000 + 0x4000 + 0x8000 + 0x10000 + 0x20000 * 3]); /* configure slave CPU banks */ - ROM = memory_region(machine, "narc2cpu"); + ROM = machine->region("narc2cpu")->base(); for (bank = 0; bank < 16; bank++) { /* @@ -349,13 +349,13 @@ void williams_adpcm_init(running_machine *machine) soundalt_cpu = NULL; /* configure banks */ - ROM = memory_region(machine, "adpcm"); + ROM = machine->region("adpcm")->base(); memory_configure_bank(machine, "bank5", 0, 8, &ROM[0x10000], 0x8000); memory_set_bankptr(machine, "bank6", &ROM[0x10000 + 0x4000 + 7 * 0x8000]); /* expand ADPCM data */ /* it is assumed that U12 is loaded @ 0x00000 and U13 is loaded @ 0x40000 */ - ROM = memory_region(machine, "oki"); + ROM = machine->region("oki")->base(); memcpy(ROM + 0x1c0000, ROM + 0x080000, 0x20000); /* expand individual banks */ memcpy(ROM + 0x180000, ROM + 0x0a0000, 0x20000); memcpy(ROM + 0x140000, ROM + 0x0c0000, 0x20000); diff --git a/src/mame/audio/wiping.c b/src/mame/audio/wiping.c index 40cf776757b..2e02e30541d 100644 --- a/src/mame/audio/wiping.c +++ b/src/mame/audio/wiping.c @@ -193,8 +193,8 @@ static DEVICE_START( wiping_sound ) state->num_voices = 8; state->last_channel = state->channel_list + state->num_voices; - state->sound_rom = memory_region(machine, "samples"); - state->sound_prom = memory_region(machine, "soundproms"); + state->sound_rom = machine->region("samples")->base(); + state->sound_prom = machine->region("soundproms")->base(); /* start with sound enabled, many games don't have a sound enable register */ state->sound_enable = 1; diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c index 831804e8e3a..9b75a3912e4 100644 --- a/src/mame/drivers/1942.c +++ b/src/mame/drivers/1942.c @@ -506,7 +506,7 @@ ROM_END static DRIVER_INIT( 1942 ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 3, &ROM[0x10000], 0x4000); } diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c index e04a741de7b..26fe2213df3 100644 --- a/src/mame/drivers/1943.c +++ b/src/mame/drivers/1943.c @@ -535,7 +535,7 @@ ROM_END static DRIVER_INIT( 1943 ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 29, &ROM[0x10000], 0x1000); memory_configure_bank(machine, "bank2", 0, 29, &ROM[0x11000], 0x1000); memory_configure_bank(machine, "bank3", 0, 29, &ROM[0x12000], 0x1000); diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c index 9d49c9a83ba..cbd5d5a633e 100644 --- a/src/mame/drivers/20pacgal.c +++ b/src/mame/drivers/20pacgal.c @@ -147,7 +147,7 @@ static void set_bankptr(running_machine *machine) _20pacgal_state *state = machine->driver_data<_20pacgal_state>(); if (state->game_selected == 0) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", rom + 0x08000); } else diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index bd33a4de925..9820cd3dd5d 100644 --- a/src/mame/drivers/2mindril.c +++ b/src/mame/drivers/2mindril.c @@ -493,9 +493,9 @@ ROM_END static DRIVER_INIT( drill ) { // rearrange gfx roms to something we can decode, two of the roms form 4bpp of the graphics, the third forms another 2bpp but is in a different format - UINT32 *src = (UINT32*)memory_region( machine, "gfx2" ); - UINT32 *dst = (UINT32*)memory_region( machine, "gfx1" );// + 0x400000; -// UINT8 *rom = memory_region( machine, "maincpu" ); + UINT32 *src = (UINT32*)machine->region( "gfx2" )->base(); + UINT32 *dst = (UINT32*)machine->region( "gfx1" )->base();// + 0x400000; +// UINT8 *rom = machine->region( "maincpu" )->base(); int i; for (i = 0; i < 0x400000 / 4; i++) diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c index 3968688a22f..06b93a3fb40 100644 --- a/src/mame/drivers/39in1.c +++ b/src/mame/drivers/39in1.c @@ -1565,7 +1565,7 @@ static void pxa255_start(running_machine* machine) static MACHINE_START(39in1) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); int i; for (i = 0; i < 0x80000; i += 2) diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c index 81ea89ff02b..3dd90957b69 100644 --- a/src/mame/drivers/40love.c +++ b/src/mame/drivers/40love.c @@ -574,7 +574,7 @@ static READ8_HANDLER( undoukai_mcu_status_r ) static DRIVER_INIT( undoukai ) { fortyl_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x2000); state->pix_color[0] = 0x000; @@ -586,14 +586,14 @@ static DRIVER_INIT( undoukai ) static DRIVER_INIT( 40love ) { fortyl_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x2000); #if 0 /* character ROM hack to show a white line on the opponent side */ - UINT8 *ROM = memory_region(machine, "gfx2"); + UINT8 *ROM = machine->region("gfx2")->base(); int adr = 0x10 * 0x022b; ROM[adr + 0x000a] = 0x00; ROM[adr + 0x000b] = 0x00; diff --git a/src/mame/drivers/5clown.c b/src/mame/drivers/5clown.c index 52e17508543..d605887fa01 100644 --- a/src/mame/drivers/5clown.c +++ b/src/mame/drivers/5clown.c @@ -1180,7 +1180,7 @@ static DRIVER_INIT( fclown ) /* Decrypting main program */ int x; - UINT8 *src = memory_region( machine, "maincpu" ); + UINT8 *src = machine->region( "maincpu" )->base(); for (x = 0x0000; x < 0x10000; x++) { @@ -1190,8 +1190,8 @@ static DRIVER_INIT( fclown ) /* Decrypting GFX by segments */ - UINT8 *gfx1_src = memory_region( machine, "gfx1" ); - UINT8 *gfx2_src = memory_region( machine, "gfx2" ); + UINT8 *gfx1_src = machine->region( "gfx1" )->base(); + UINT8 *gfx2_src = machine->region( "gfx2" )->base(); for (x = 0x2000; x < 0x3000; x++) { @@ -1211,7 +1211,7 @@ static DRIVER_INIT( fclown ) /* Decrypting sound samples */ - UINT8 *samples_src = memory_region( machine, "oki6295" ); + UINT8 *samples_src = machine->region( "oki6295" )->base(); for (x = 0x0000; x < 0x10000; x++) { diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c index 26af6906191..683e6e983a7 100644 --- a/src/mame/drivers/8080bw.c +++ b/src/mame/drivers/8080bw.c @@ -2163,8 +2163,8 @@ MACHINE_CONFIG_END /* decrypt function for vortex */ static DRIVER_INIT( vortex ) { - UINT8 *rom = memory_region(machine, "maincpu"); - int length = memory_region_length(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); + int length = machine->region("maincpu")->bytes(); UINT8 *buf1 = auto_alloc_array(machine, UINT8, length); UINT32 x; for (x = 0; x < length; x++) diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c index 0ad1b1adb04..163556849f5 100644 --- a/src/mame/drivers/88games.c +++ b/src/mame/drivers/88games.c @@ -275,7 +275,7 @@ INPUT_PORTS_END static KONAMI_SETLINES_CALLBACK( k88games_banking ) { _88games_state *state = device->machine->driver_data<_88games_state>(); - UINT8 *RAM = memory_region(device->machine, "maincpu"); + UINT8 *RAM = device->machine->region("maincpu")->base(); int offs; logerror("%04x: bank select %02x\n", cpu_get_pc(device), lines); @@ -339,7 +339,7 @@ static MACHINE_RESET( 88games ) _88games_state *state = machine->driver_data<_88games_state>(); konami_configure_set_lines(machine->device("maincpu"), k88games_banking); - machine->generic.paletteram.u8 = &memory_region(machine, "maincpu")[0x20000]; + machine->generic.paletteram.u8 = &machine->region("maincpu")->base()[0x20000]; state->videobank = 0; state->zoomreadroms = 0; diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c index c9f7e9979a9..accdb59d815 100644 --- a/src/mame/drivers/acefruit.c +++ b/src/mame/drivers/acefruit.c @@ -577,7 +577,7 @@ MACHINE_CONFIG_END static DRIVER_INIT( sidewndr ) { - UINT8 *ROM = memory_region( machine, "maincpu" ); + UINT8 *ROM = machine->region( "maincpu" )->base(); /* replace "ret nc" ( 0xd0 ) with "di" */ ROM[ 0 ] = 0xf3; /* this is either a bad dump or the cpu core should set the carry flag on reset */ diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c index 053663bc851..264e4a6da1d 100644 --- a/src/mame/drivers/adp.c +++ b/src/mame/drivers/adp.c @@ -223,7 +223,7 @@ static MACHINE_START( skattv ) // hack to handle acrt rom { - UINT16 *rom = (UINT16*)memory_region(machine, "gfx1"); + UINT16 *rom = (UINT16*)machine->region("gfx1")->base(); int i; device_t *hd63484 = machine->device("hd63484"); diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c index 86ae9443862..2698bf59e2d 100644 --- a/src/mame/drivers/aeroboto.c +++ b/src/mame/drivers/aeroboto.c @@ -230,8 +230,8 @@ static MACHINE_START( formatz ) { aeroboto_state *state = machine->driver_data(); - state->stars_rom = memory_region(machine, "gfx2"); - state->stars_length = memory_region_length(machine, "gfx2"); + state->stars_rom = machine->region("gfx2")->base(); + state->stars_length = machine->region("gfx2")->bytes(); state_save_register_global(machine, state->disable_irq); state_save_register_global(machine, state->count); diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 2dc5fc4cf83..2ebdf6e4e7f 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -134,7 +134,7 @@ static WRITE16_DEVICE_HANDLER( aerfboo2_okim6295_banking_w ) static WRITE8_HANDLER( aerfboot_okim6295_banking_w ) { - UINT8 *oki = memory_region(space->machine, "oki"); + UINT8 *oki = space->machine->region("oki")->base(); /*bit 2 (0x4) setted too?*/ if (data & 0x4) memcpy(&oki[0x20000], &oki[((data & 0x3) * 0x20000) + 0x40000], 0x20000); @@ -1307,7 +1307,7 @@ static MACHINE_START( common ) static MACHINE_START( aerofgt ) { - UINT8 *rom = memory_region(machine, "audiocpu"); + UINT8 *rom = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &rom[0x10000], 0x8000); diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c index 1253815de9d..42e30d6e05d 100644 --- a/src/mame/drivers/airbustr.c +++ b/src/mame/drivers/airbustr.c @@ -576,9 +576,9 @@ static INTERRUPT_GEN( slave_interrupt ) static MACHINE_START( airbustr ) { airbustr_state *state = machine->driver_data(); - UINT8 *MASTER = memory_region(machine, "master"); - UINT8 *SLAVE = memory_region(machine, "slave"); - UINT8 *AUDIO = memory_region(machine, "audiocpu"); + UINT8 *MASTER = machine->region("master")->base(); + UINT8 *SLAVE = machine->region("slave")->base(); + UINT8 *AUDIO = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 3, &MASTER[0x00000], 0x4000); memory_configure_bank(machine, "bank1", 3, 5, &MASTER[0x10000], 0x4000); diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index a6078434aff..50635335583 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -376,7 +376,7 @@ INPUT_PORTS_END static MACHINE_START( yumefuda ) { albazg_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c index f663dae5443..5c9b72193fd 100644 --- a/src/mame/drivers/aleck64.c +++ b/src/mame/drivers/aleck64.c @@ -603,7 +603,7 @@ MACHINE_CONFIG_END static DRIVER_INIT( aleck64 ) { - UINT8 *rom = memory_region(machine, "user2"); + UINT8 *rom = machine->region("user2")->base(); rom[0x67c] = 0; rom[0x67d] = 0; diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c index 3f7df301e13..28e66ec7439 100644 --- a/src/mame/drivers/alg.c +++ b/src/mame/drivers/alg.c @@ -696,7 +696,7 @@ static void alg_init(running_machine *machine) /* set up memory */ memory_configure_bank(machine, "bank1", 0, 1, state->chip_ram, 0); - memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user1"), 0); + memory_configure_bank(machine, "bank1", 1, 1, machine->region("user1")->base(), 0); } @@ -709,8 +709,8 @@ static void alg_init(running_machine *machine) static DRIVER_INIT( palr1 ) { - UINT32 length = memory_region_length(machine, "user2"); - UINT8 *rom = memory_region(machine, "user2"); + UINT32 length = machine->region("user2")->bytes(); + UINT8 *rom = machine->region("user2")->base(); UINT8 *original = auto_alloc_array(machine, UINT8, length); UINT32 srcaddr; @@ -729,8 +729,8 @@ static DRIVER_INIT( palr1 ) static DRIVER_INIT( palr3 ) { - UINT32 length = memory_region_length(machine, "user2"); - UINT8 *rom = memory_region(machine, "user2"); + UINT32 length = machine->region("user2")->bytes(); + UINT8 *rom = machine->region("user2")->base(); UINT8 *original = auto_alloc_array(machine, UINT8, length); UINT32 srcaddr; @@ -748,8 +748,8 @@ static DRIVER_INIT( palr3 ) static DRIVER_INIT( palr6 ) { - UINT32 length = memory_region_length(machine, "user2"); - UINT8 *rom = memory_region(machine, "user2"); + UINT32 length = machine->region("user2")->bytes(); + UINT8 *rom = machine->region("user2")->base(); UINT8 *original = auto_alloc_array(machine, UINT8, length); UINT32 srcaddr; @@ -770,7 +770,7 @@ static DRIVER_INIT( palr6 ) static DRIVER_INIT( aplatoon ) { /* NOT DONE TODO FIGURE OUT THE RIGHT ORDER!!!! */ - UINT8 *rom = memory_region(machine, "user2"); + UINT8 *rom = machine->region("user2")->base(); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x40000); int i; diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c index 3da802df42a..7c41144c399 100644 --- a/src/mame/drivers/aliens.c +++ b/src/mame/drivers/aliens.c @@ -238,7 +238,7 @@ static const k051960_interface aliens_k051960_intf = static MACHINE_START( aliens ) { aliens_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 20, &ROM[0x10000], 0x2000); memory_set_bank(machine, "bank1", 0); diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index ecd7d4bb1e1..d94a4b315e5 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -1895,7 +1895,7 @@ static MACHINE_RESET( common ) static MACHINE_START( alpha68k_V ) { alpha68k_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank7", 0, 32, &ROM[0x10000], 0x4000); @@ -1931,7 +1931,7 @@ static MACHINE_RESET( alpha68k_II ) static MACHINE_START( alpha68k_II ) { alpha68k_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank7", 0, 28, &ROM[0x10000], 0x4000); @@ -3152,7 +3152,7 @@ static DRIVER_INIT( btlfieldb ) static DRIVER_INIT( skysoldr ) { alpha68k_state *state = machine->driver_data(); - memory_set_bankptr(machine, "bank8", (memory_region(machine, "user1")) + 0x40000); + memory_set_bankptr(machine, "bank8", (machine->region("user1")->base()) + 0x40000); state->invert_controls = 0; state->microcontroller_id = 0; state->coin_id = 0x22 | (0x22 << 8); @@ -3171,7 +3171,7 @@ static DRIVER_INIT( goldmedl ) static DRIVER_INIT( goldmedla ) { alpha68k_state *state = machine->driver_data(); - memory_set_bankptr(machine, "bank8", memory_region(machine, "maincpu") + 0x20000); + memory_set_bankptr(machine, "bank8", machine->region("maincpu")->base() + 0x20000); state->invert_controls = 0; state->microcontroller_id = 0x8803; //Guess - routine to handle coinage is the same as in 'goldmedl' state->coin_id = 0x23 | (0x24 << 8); @@ -3199,7 +3199,7 @@ static DRIVER_INIT( skyadvntu ) static DRIVER_INIT( gangwarsu ) { alpha68k_state *state = machine->driver_data(); - memory_set_bankptr(machine, "bank8", memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank8", machine->region("user1")->base()); state->invert_controls = 0; state->microcontroller_id = 0x8512; state->coin_id = 0x23 | (0x24 << 8); @@ -3209,7 +3209,7 @@ static DRIVER_INIT( gangwarsu ) static DRIVER_INIT( gangwars ) { alpha68k_state *state = machine->driver_data(); - memory_set_bankptr(machine, "bank8", memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank8", machine->region("user1")->base()); state->invert_controls = 0; state->microcontroller_id = 0x8512; state->coin_id = 0x23 | (0x24 << 8); @@ -3219,7 +3219,7 @@ static DRIVER_INIT( gangwars ) static DRIVER_INIT( sbasebal ) { alpha68k_state *state = machine->driver_data(); - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); /* Patch protection check, it does a divide by zero because the MCU is trying to calculate the ball speed when a strike is scored, notice that current emulation diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c index a65f5b97519..db5230766b7 100644 --- a/src/mame/drivers/ampoker2.c +++ b/src/mame/drivers/ampoker2.c @@ -1406,8 +1406,8 @@ ROM_END static DRIVER_INIT( rabbitpk ) { - UINT8 *rom = memory_region(machine, "maincpu"); - int size = memory_region_length(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); + int size = machine->region("maincpu")->bytes(); int start = 0; int i; @@ -1458,7 +1458,7 @@ static DRIVER_INIT( piccolop ) */ - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* NOP'ing the mortal jump... */ rom[0x154b] = 0x00; diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c index bba77be6e2f..ee28068f2d7 100644 --- a/src/mame/drivers/amspdwy.c +++ b/src/mame/drivers/amspdwy.c @@ -94,7 +94,7 @@ ADDRESS_MAP_END static READ8_HANDLER( amspdwy_port_r ) { - UINT8 *tracks = memory_region(space->machine, "maincpu") + 0x10000; + UINT8 *tracks = space->machine->region("maincpu")->base() + 0x10000; return tracks[offset]; } diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c index 04099149957..9e086b9fe47 100644 --- a/src/mame/drivers/angelkds.c +++ b/src/mame/drivers/angelkds.c @@ -749,13 +749,13 @@ ROM_END static DRIVER_INIT( angelkds ) { - UINT8 *RAM = memory_region(machine, "user1"); + UINT8 *RAM = machine->region("user1")->base(); memory_configure_bank(machine, "bank1", 0, 8, &RAM[0x0000], 0x4000); } static DRIVER_INIT( spcpostn ) { - UINT8 *RAM = memory_region(machine, "user1"); + UINT8 *RAM = machine->region("user1")->base(); sega_317_0005_decode(machine, "maincpu"); memory_configure_bank(machine, "bank1", 0, 10, &RAM[0x0000], 0x4000); diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c index b17e43aadfd..a3bee5aeee0 100644 --- a/src/mame/drivers/appoooh.c +++ b/src/mame/drivers/appoooh.c @@ -177,7 +177,7 @@ static void appoooh_adpcm_int(device_t *device) { if (state->adpcm_data == 0xffffffff) { - UINT8 *RAM = memory_region(device->machine, "adpcm"); + UINT8 *RAM = device->machine->region("adpcm")->base(); state->adpcm_data = RAM[state->adpcm_address++]; msm5205_data_w(device, state->adpcm_data >> 4); @@ -597,7 +597,7 @@ static DRIVER_INIT(robowres) static DRIVER_INIT(robowresb) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - space->set_decrypted_region(0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x1c000); + space->set_decrypted_region(0x0000, 0x7fff, machine->region("maincpu")->base() + 0x1c000); } diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c index 67a9e5741dd..39ee57847b7 100644 --- a/src/mame/drivers/aquarium.c +++ b/src/mame/drivers/aquarium.c @@ -62,7 +62,7 @@ Stephh's notes (based on the game M68000 code and some tests) : #if AQUARIUS_HACK static MACHINE_RESET( aquarium_hack ) { - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); int data = input_port_read(machine, "FAKE"); /* Language : 0x0000 = Japanese - Other value = English */ @@ -279,13 +279,13 @@ static const gfx_layout tilelayout = static DRIVER_INIT( aquarium ) { - UINT8 *Z80 = memory_region(machine, "audiocpu"); + UINT8 *Z80 = machine->region("audiocpu")->base(); /* The BG tiles are 5bpp, this rearranges the data from the roms containing the 1bpp data so we can decode it correctly */ - UINT8 *DAT2 = memory_region(machine, "gfx1") + 0x080000; - UINT8 *DAT = memory_region(machine, "user1"); + UINT8 *DAT2 = machine->region("gfx1")->base() + 0x080000; + UINT8 *DAT = machine->region("user1")->base(); int len = 0x0200000; for (len = 0; len < 0x020000; len++) @@ -300,8 +300,8 @@ static DRIVER_INIT( aquarium ) DAT2[len * 4 + 2] |= (DAT[len] & 0x01) << 3; } - DAT2 = memory_region(machine, "gfx4") + 0x080000; - DAT = memory_region(machine, "user2"); + DAT2 = machine->region("gfx4")->base() + 0x080000; + DAT = machine->region("user2")->base(); for (len = 0; len < 0x020000; len++) { diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c index b01ccd819ba..894263e8c43 100644 --- a/src/mame/drivers/arcadecl.c +++ b/src/mame/drivers/arcadecl.c @@ -398,7 +398,7 @@ ROM_END static DRIVER_INIT( sparkz ) { - memset(memory_region(machine, "gfx1"), 0, memory_region_length(machine, "gfx1")); + memset(machine->region("gfx1")->base(), 0, machine->region("gfx1")->bytes()); } diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c index 9acfb7cf1b1..1978baf841d 100644 --- a/src/mame/drivers/arcadia.c +++ b/src/mame/drivers/arcadia.c @@ -727,7 +727,7 @@ ROM_END INLINE void generic_decode(running_machine *machine, const char *tag, int bit7, int bit6, int bit5, int bit4, int bit3, int bit2, int bit1, int bit0) { - UINT16 *rom = (UINT16 *)memory_region(machine, tag); + UINT16 *rom = (UINT16 *)machine->region(tag)->base(); int i; /* only the low byte of ROMs are encrypted in these games */ @@ -736,8 +736,8 @@ INLINE void generic_decode(running_machine *machine, const char *tag, int bit7, #if 0 { - UINT8 *ROM = memory_region(machine, tag); - int size = memory_region_length(machine, tag); + UINT8 *ROM = machine->region(tag)->base(); + int size = machine->region(tag)->bytes(); FILE *fp; char filename[256]; @@ -779,10 +779,10 @@ static void arcadia_init(running_machine *machine) /* set up memory */ memory_configure_bank(machine, "bank1", 0, 1, state->chip_ram, 0); - memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user1"), 0); + memory_configure_bank(machine, "bank1", 1, 1, machine->region("user1")->base(), 0); /* OnePlay bios is encrypted, TenPlay is not */ - biosrom = (UINT16 *)memory_region(machine, "user2"); + biosrom = (UINT16 *)machine->region("user2")->base(); if (biosrom[0] != 0x4afc) generic_decode(machine, "user2", 6, 1, 0, 2, 3, 4, 5, 7); } diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c index 2bb408d89af..99282edda45 100644 --- a/src/mame/drivers/argus.c +++ b/src/mame/drivers/argus.c @@ -165,7 +165,7 @@ static const ym2203_interface ym2203_config = static WRITE8_HANDLER( argus_bankselect_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); int bankaddress; bankaddress = 0x10000 + ((data & 7) * 0x4000); diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c index b23e03f9618..97e3671858b 100644 --- a/src/mame/drivers/aristmk4.c +++ b/src/mame/drivers/aristmk4.c @@ -1168,7 +1168,7 @@ static PALETTE_INIT( aristmk4 ) static DRIVER_INIT( aristmk4 ) { - shapeRomPtr = (UINT8 *)memory_region(machine, "tile_gfx"); + shapeRomPtr = (UINT8 *)machine->region("tile_gfx")->base(); memcpy(shapeRom,shapeRomPtr,sizeof(shapeRom)); // back up } diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c index dd1479ebb90..d1b8fd17a7b 100644 --- a/src/mame/drivers/aristmk5.c +++ b/src/mame/drivers/aristmk5.c @@ -211,7 +211,7 @@ INPUT_PORTS_END static DRIVER_INIT( aristmk5 ) { - UINT8 *SRAM = memory_region(machine, "sram"); + UINT8 *SRAM = machine->region("sram")->base(); archimedes_driver_init(machine); memory_configure_bank(machine, "sram_bank", 0, 4, &SRAM[0], 0x8000); @@ -243,8 +243,8 @@ static MACHINE_RESET( aristmk5 ) /* load the roms according to what the operator wants */ { - UINT8 *ROM = memory_region(machine,"maincpu"); - UINT8 *PRG = memory_region(machine,"prg_code"); + UINT8 *ROM = machine->region("maincpu")->base(); + UINT8 *PRG = machine->region("prg_code")->base(); int i; UINT8 op_mode; diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c index 7c87cc6b1d1..e87d64484b6 100644 --- a/src/mame/drivers/arkanoid.c +++ b/src/mame/drivers/arkanoid.c @@ -1470,7 +1470,7 @@ static DRIVER_INIT( block2 ) arkanoid_state *state = machine->driver_data(); // the graphics on this bootleg have the data scrambled int tile; - UINT8* srcgfx = memory_region(machine,"gfx1"); + UINT8* srcgfx = machine->region("gfx1")->base(); UINT8* buffer = auto_alloc_array(machine, UINT8, 0x18000); for (tile = 0; tile < 0x3000; tile++) @@ -1532,7 +1532,7 @@ static DRIVER_INIT( paddle2 ) static DRIVER_INIT( tetrsark ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); int x; for (x = 0; x < 0x8000; x++) @@ -1546,7 +1546,7 @@ static DRIVER_INIT( tetrsark ) static DRIVER_INIT( hexa ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); #if 0 diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c index 6974bce66a6..e18bf90e23e 100644 --- a/src/mame/drivers/armedf.c +++ b/src/mame/drivers/armedf.c @@ -1530,7 +1530,7 @@ static DRIVER_INIT( legion ) #if LEGION_HACK /* This is a hack to allow you to use the extra features of 3 of the "Unused" Dip Switches (see notes above). */ - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); RAM[0x0001d6 / 2] = 0x0001; /* To avoid checksum error */ RAM[0x000488 / 2] = 0x4e71; @@ -1545,7 +1545,7 @@ static DRIVER_INIT( legiono ) #if LEGION_HACK /* This is a hack to allow you to use the extra features of 3 of the "Unused" Dip Switches (see notes above). */ - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); RAM[0x0001d6/2] = 0x0001; /* No need to patch the checksum routine (see notes) ! */ #endif diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index bb556f6177a..82659f65b2e 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -467,7 +467,7 @@ ROM_END static DRIVER_INIT( ashnojoe ) { - UINT8 *ROM = memory_region(machine, "adpcm"); + UINT8 *ROM = machine->region("adpcm")->base(); memory_configure_bank(machine, "bank4", 0, 16, &ROM[0x00000], 0x8000); memory_set_bank(machine, "bank4", 0); diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c index 81822c4d092..20bcd9620f2 100644 --- a/src/mame/drivers/asterix.c +++ b/src/mame/drivers/asterix.c @@ -468,8 +468,8 @@ ROM_END static DRIVER_INIT( asterix ) { #if 0 - *(UINT16 *)(memory_region(machine, "maincpu") + 0x07f34) = 0x602a; - *(UINT16 *)(memory_region(machine, "maincpu") + 0x00008) = 0x0400; + *(UINT16 *)(machine->region("maincpu")->base() + 0x07f34) = 0x602a; + *(UINT16 *)(machine->region("maincpu")->base() + 0x00008) = 0x0400; #endif } diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index fff375ac758..40ffbf04e72 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -154,7 +154,7 @@ static void plot_byte( running_machine *machine, bitmap_t *bitmap, UINT8 y, UINT static VIDEO_UPDATE( astinvad ) { astinvad_state *state = screen->machine->driver_data(); - const UINT8 *color_prom = memory_region(screen->machine, "proms"); + const UINT8 *color_prom = screen->machine->region("proms")->base(); UINT8 yoffs = state->flip_yoffs & state->screen_flip; int x, y; @@ -174,7 +174,7 @@ static VIDEO_UPDATE( astinvad ) static VIDEO_UPDATE( spaceint ) { astinvad_state *state = screen->machine->driver_data(); - const UINT8 *color_prom = memory_region(screen->machine, "proms"); + const UINT8 *color_prom = screen->machine->region("proms")->base(); int offs; for (offs = 0; offs < state->videoram_size; offs++) diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c index b0763b27386..328a5a8a5e9 100644 --- a/src/mame/drivers/astrocde.c +++ b/src/mame/drivers/astrocde.c @@ -430,14 +430,14 @@ static WRITE8_HANDLER( profpac_banksw_w ) /* set the main banking */ memory_install_read_bank(space, 0x4000, 0xbfff, 0, 0, "bank1"); - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "user1") + 0x8000 * bank); + memory_set_bankptr(space->machine, "bank1", space->machine->region("user1")->base() + 0x8000 * bank); /* bank 0 reads video RAM in the 4000-7FFF range */ if (bank == 0) memory_install_read8_handler(space, 0x4000, 0x7fff, 0, 0, profpac_videoram_r); /* if we have a 640k EPROM board, map that on top of the 4000-7FFF range if specified */ - if ((data & 0x80) && memory_region(space->machine, "user2") != NULL) + if ((data & 0x80) && space->machine->region("user2")->base() != NULL) { /* Note: There is a jumper which could change the base offset to 0xa8 instead */ bank = data - 0x80; @@ -446,7 +446,7 @@ static WRITE8_HANDLER( profpac_banksw_w ) if (bank < 0x28) { memory_install_read_bank(space, 0x4000, 0x7fff, 0, 0, "bank2"); - memory_set_bankptr(space->machine, "bank2", memory_region(space->machine, "user2") + 0x4000 * bank); + memory_set_bankptr(space->machine, "bank2", space->machine->region("user2")->base() + 0x4000 * bank); } else memory_unmap_read(space, 0x4000, 0x7fff, 0, 0); diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c index ccf2b07e8bb..bcd14456ade 100644 --- a/src/mame/drivers/astrocorp.c +++ b/src/mame/drivers/astrocorp.c @@ -963,7 +963,7 @@ ROM_END static DRIVER_INIT( showhand ) { #if 0 - UINT16 *rom = (UINT16*)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16*)machine->region("maincpu")->base(); rom[0x0a1a/2] = 0x6000; // hopper jam @@ -979,7 +979,7 @@ static DRIVER_INIT( showhand ) static DRIVER_INIT( showhanc ) { #if 0 - UINT16 *rom = (UINT16*)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16*)machine->region("maincpu")->base(); rom[0x14d4/2] = 0x4e71; // enable full test mode rom[0x14d6/2] = 0x4e71; // "" diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c index 7cdccd7ff5c..5fbc383c2e8 100644 --- a/src/mame/drivers/astrof.c +++ b/src/mame/drivers/astrof.c @@ -209,7 +209,7 @@ static void astrof_get_pens( running_machine *machine, pen_t *pens ) offs_t i; UINT8 bank = (state->astrof_palette_bank ? 0x10 : 0x00); UINT8 config = input_port_read_safe(machine, "FAKE", 0x00); - UINT8 *prom = memory_region(machine, "proms"); + UINT8 *prom = machine->region("proms")->base(); /* a common wire hack to the pcb causes the prom halves to be inverted */ /* this results in e.g. astrof background being black */ @@ -243,7 +243,7 @@ static void astrof_get_pens( running_machine *machine, pen_t *pens ) static void tomahawk_get_pens( running_machine *machine, pen_t *pens ) { offs_t i; - UINT8 *prom = memory_region(machine, "proms"); + UINT8 *prom = machine->region("proms")->base(); UINT8 config = input_port_read_safe(machine, "FAKE", 0x00); for (i = 0; i < TOMAHAWK_NUM_PENS; i++) @@ -1297,8 +1297,8 @@ ROM_END static DRIVER_INIT( abattle ) { /* use the protection PROM to decrypt the ROMs */ - UINT8 *rom = memory_region(machine, "maincpu"); - UINT8 *prom = memory_region(machine, "user1"); + UINT8 *rom = machine->region("maincpu")->base(); + UINT8 *prom = machine->region("user1")->base(); int i; for(i = 0xd000; i < 0x10000; i++) @@ -1312,7 +1312,7 @@ static DRIVER_INIT( abattle ) static DRIVER_INIT( afire ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int i; for(i = 0xd000; i < 0x10000; i++) @@ -1326,7 +1326,7 @@ static DRIVER_INIT( afire ) static DRIVER_INIT( sstarbtl ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int i; for(i = 0xd000; i < 0x10000; i++) diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index 0e80cd77d58..1a3bef172c9 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -270,7 +270,7 @@ static void asuka_msm5205_vck( device_t *device ) } else { - state->adpcm_data = memory_region(device->machine, "ymsnd")[state->adpcm_pos]; + state->adpcm_data = device->machine->region("ymsnd")->base()[state->adpcm_pos]; state->adpcm_pos = (state->adpcm_pos + 1) & 0xffff; msm5205_data_w(device, state->adpcm_data >> 4); } @@ -843,8 +843,8 @@ static MACHINE_START( asuka ) state->tc0100scn = machine->device("tc0100scn"); /* configure the banks */ - memory_configure_bank(machine, "bank1", 0, 1, memory_region(machine, "audiocpu"), 0); - memory_configure_bank(machine, "bank1", 1, 3, memory_region(machine, "audiocpu") + 0x10000, 0x04000); + memory_configure_bank(machine, "bank1", 0, 1, machine->region("audiocpu")->base(), 0); + memory_configure_bank(machine, "bank1", 1, 3, machine->region("audiocpu")->base() + 0x10000, 0x04000); state_save_register_global(machine, state->adpcm_pos); state_save_register_global(machine, state->adpcm_data); diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c index c6171d43358..2e20d2eee8f 100644 --- a/src/mame/drivers/atarig42.c +++ b/src/mame/drivers/atarig42.c @@ -727,7 +727,7 @@ static DRIVER_INIT( guardian ) /* it looks like they jsr to $80000 as some kind of protection */ /* put an RTS there so we don't die */ - *(UINT16 *)&memory_region(machine, "maincpu")[0x80000] = 0x4E75; + *(UINT16 *)&machine->region("maincpu")->base()[0x80000] = 0x4E75; address_space *main = machine->device("maincpu")->space(AS_PROGRAM); state->sloop_base = memory_install_readwrite16_handler(main, 0x000000, 0x07ffff, 0, 0, guardians_sloop_data_r, guardians_sloop_data_w); diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index ec2ca776b96..a4b614b40ba 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -339,7 +339,7 @@ static WRITE16_HANDLER( bankselect_w ) COMBINE_DATA(&newword); state->bankselect[offset] = newword; - base = &memory_region(space->machine, "maincpu")[bankoffset[(newword >> 10) & 0x3f]]; + base = &space->machine->region("maincpu")->base()[bankoffset[(newword >> 10) & 0x3f]]; memcpy(offset ? state->rombank2 : state->rombank1, base, 0x2000); } @@ -3080,7 +3080,7 @@ static DRIVER_INIT( paperboy ) { int i; atarisy2_state *state = machine->driver_data(); - UINT8 *cpu1 = memory_region(machine, "maincpu"); + UINT8 *cpu1 = machine->region("maincpu")->base(); slapstic_init(machine, 105); @@ -3116,7 +3116,7 @@ static DRIVER_INIT( ssprint ) { atarisy2_state *state = machine->driver_data(); int i; - UINT8 *cpu1 = memory_region(machine, "maincpu"); + UINT8 *cpu1 = machine->region("maincpu")->base(); slapstic_init(machine, 108); @@ -3133,7 +3133,7 @@ static DRIVER_INIT( csprint ) { int i; atarisy2_state *state = machine->driver_data(); - UINT8 *cpu1 = memory_region(machine, "maincpu"); + UINT8 *cpu1 = machine->region("maincpu")->base(); slapstic_init(machine, 109); diff --git a/src/mame/drivers/atarisy4.c b/src/mame/drivers/atarisy4.c index d30bf7efe27..fbed06fea6b 100644 --- a/src/mame/drivers/atarisy4.c +++ b/src/mame/drivers/atarisy4.c @@ -940,13 +940,13 @@ static DRIVER_INIT( laststar ) shared_ram[0] = auto_alloc_array_clear(machine, UINT16, 0x2000); /* Populate the 68000 address space with data from the HEX files */ - load_hexfile(main, memory_region(machine, "code")); - load_hexfile(main, memory_region(machine, "data")); + load_hexfile(main, machine->region("code")->base()); + load_hexfile(main, machine->region("data")->base()); /* Set up the DSP */ memory_set_bankptr(machine, "dsp0_bank0", shared_ram[0]); memory_set_bankptr(machine, "dsp0_bank1", &shared_ram[0][0x800]); - load_ldafile(cputag_get_address_space(machine, "dsp0", ADDRESS_SPACE_PROGRAM), memory_region(machine, "dsp")); + load_ldafile(cputag_get_address_space(machine, "dsp0", ADDRESS_SPACE_PROGRAM), machine->region("dsp")->base()); } static DRIVER_INIT( airrace ) @@ -956,17 +956,17 @@ static DRIVER_INIT( airrace ) shared_ram[1] = auto_alloc_array_clear(machine, UINT16, 0x4000); /* Populate RAM with data from the HEX files */ - load_hexfile(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), memory_region(machine, "code")); + load_hexfile(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), machine->region("code")->base()); /* Set up the first DSP */ memory_set_bankptr(machine, "dsp0_bank0", shared_ram[0]); memory_set_bankptr(machine, "dsp0_bank1", &shared_ram[0][0x800]); - load_ldafile(cputag_get_address_space(machine, "dsp0", ADDRESS_SPACE_PROGRAM), memory_region(machine, "dsp")); + load_ldafile(cputag_get_address_space(machine, "dsp0", ADDRESS_SPACE_PROGRAM), machine->region("dsp")->base()); /* Set up the second DSP */ memory_set_bankptr(machine, "dsp1_bank0", shared_ram[1]); memory_set_bankptr(machine, "dsp1_bank1", &shared_ram[1][0x800]); - load_ldafile(cputag_get_address_space(machine, "dsp1", ADDRESS_SPACE_PROGRAM), memory_region(machine, "dsp")); + load_ldafile(cputag_get_address_space(machine, "dsp1", ADDRESS_SPACE_PROGRAM), machine->region("dsp")->base()); } static MACHINE_RESET( atarisy4 ) diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c index a0bf900dd03..2beffb47f8f 100644 --- a/src/mame/drivers/atetris.c +++ b/src/mame/drivers/atetris.c @@ -494,7 +494,7 @@ ROM_END static DRIVER_INIT( atetris ) { - UINT8 *rgn = memory_region(machine, "maincpu"); + UINT8 *rgn = machine->region("maincpu")->base(); slapstic_init(machine, 101); slapstic_source = &rgn[0x10000]; slapstic_base = &rgn[0x04000]; diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index 1751f20f145..e1090e6ff13 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -645,7 +645,7 @@ ROM_END static void descramble_sound( running_machine *machine ) { - UINT8 *rom = memory_region(machine, "ymz"); + UINT8 *rom = machine->region("ymz")->base(); int length = 0x200000; // only the first rom is swapped on backfire! UINT8 *buf1 = auto_alloc_array(machine, UINT8, length); UINT32 x; diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c index 3737ef2f54b..7a29f7b1580 100644 --- a/src/mame/drivers/badlands.c +++ b/src/mame/drivers/badlands.c @@ -591,8 +591,8 @@ static DRIVER_INIT( badlands ) badlands_state *state = machine->driver_data(); /* initialize the audio system */ - state->bank_base = &memory_region(machine, "audiocpu")[0x03000]; - state->bank_source_data = &memory_region(machine, "audiocpu")[0x10000]; + state->bank_base = &machine->region("audiocpu")->base()[0x03000]; + state->bank_source_data = &machine->region("audiocpu")->base()[0x10000]; } diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c index 4b7e1028478..e6c671d8b19 100644 --- a/src/mame/drivers/balsente.c +++ b/src/mame/drivers/balsente.c @@ -2046,8 +2046,8 @@ static void expand_roms(running_machine *machine, UINT8 cd_rom_mask) UINT8 *temp = auto_alloc_array(machine, UINT8, 0x20000); { - UINT8 *rom = memory_region(machine, "maincpu"); - UINT32 len = memory_region_length(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); + UINT32 len = machine->region("maincpu")->bytes(); UINT32 base; for (base = 0x10000; base < len; base += 0x30000) @@ -2121,7 +2121,7 @@ static DRIVER_INIT( stocker ) { expand_roms(machine, EXPAND_ALL); config_shoot static DRIVER_INIT( triviag1 ) { expand_roms(machine, EXPAND_ALL); config_shooter_adc(machine, FALSE, 0 /* noanalog */); } static DRIVER_INIT( triviag2 ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); memcpy(&rom[0x20000], &rom[0x28000], 0x4000); memcpy(&rom[0x24000], &rom[0x28000], 0x4000); expand_roms(machine, EXPAND_NONE); config_shooter_adc(machine, FALSE, 0 /* noanalog */); diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c index 801b9852c61..983ce5b4e50 100644 --- a/src/mame/drivers/baraduke.c +++ b/src/mame/drivers/baraduke.c @@ -537,7 +537,7 @@ static DRIVER_INIT( baraduke ) int i; /* unpack the third tile ROM */ - rom = memory_region(machine, "gfx2") + 0x8000; + rom = machine->region("gfx2")->base() + 0x8000; for (i = 0x2000;i < 0x4000;i++) { rom[i + 0x2000] = rom[i]; diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c index 03b52738eff..2a7acf4106f 100644 --- a/src/mame/drivers/battlex.c +++ b/src/mame/drivers/battlex.c @@ -281,9 +281,9 @@ ROM_END static DRIVER_INIT( battlex ) { - UINT8 *cold = memory_region(machine, "user1"); - UINT8 *mskd = memory_region(machine, "user2"); - UINT8 *dest = memory_region(machine, "gfx1"); + UINT8 *cold = machine->region("user1")->base(); + UINT8 *mskd = machine->region("user2")->base(); + UINT8 *dest = machine->region("gfx1")->base(); int outcount; diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c index 26717741fa6..c122b588b3a 100644 --- a/src/mame/drivers/battlnts.c +++ b/src/mame/drivers/battlnts.c @@ -221,7 +221,7 @@ static const k007420_interface bladestl_k007420_intf = static MACHINE_START( battlnts ) { battlnts_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); @@ -402,7 +402,7 @@ static void shuffle( UINT8 *buf, int len ) static DRIVER_INIT( rackemup ) { /* rearrange char ROM */ - shuffle(memory_region(machine, "gfx1"), memory_region_length(machine, "gfx1")); + shuffle(machine->region("gfx1")->base(), machine->region("gfx1")->bytes()); } diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c index d743b8964c1..572e4704d15 100644 --- a/src/mame/drivers/bfcobra.c +++ b/src/mame/drivers/bfcobra.c @@ -385,14 +385,14 @@ INLINE UINT8* blitter_get_addr(running_machine *machine, UINT32 addr) if (addr < 0x10000) { /* Is this region fixed? */ - return (UINT8*)(memory_region(machine, "user1") + addr); + return (UINT8*)(machine->region("user1")->base() + addr); } else if(addr < 0x20000) { addr &= 0xffff; addr += (bank_data[0] & 1) ? 0x10000 : 0; - return (UINT8*)(memory_region(machine, "user1") + addr + ((bank_data[0] >> 1) * 0x20000)); + return (UINT8*)(machine->region("user1")->base() + addr + ((bank_data[0] >> 1) * 0x20000)); } else if (addr >= 0x20000 && addr < 0x40000) { @@ -971,7 +971,7 @@ INLINE void z80_bank(running_machine *machine, int num, int data) { UINT32 offset = ((bank_data[0] >> 1) * 0x20000) + ((0x4000 * data) ^ ((bank_data[0] & 1) ? 0 : 0x10000)); - memory_set_bankptr(machine, bank_names[num - 1], memory_region(machine, "user1") + offset); + memory_set_bankptr(machine, bank_names[num - 1], machine->region("user1")->base() + offset); } else if (data < 0x10) { @@ -1109,7 +1109,7 @@ static READ8_HANDLER( fddata_r ) } fdc.offset = (BPT * fdc.track*2) + (fdc.side ? BPT : 0) + (BPS * (fdc.sector-1)) + fdc.byte_pos++; - val = *(memory_region(space->machine, "user2") + fdc.offset); + val = *(space->machine->region("user2")->base() + fdc.offset); /* Move on to next sector? */ if (fdc.byte_pos == 1024) @@ -1667,7 +1667,7 @@ static DRIVER_INIT( bfcobra ) UINT8 *tmp; tmp = auto_alloc_array(machine, UINT8, 0x8000); - rom = memory_region(machine, "audiocpu") + 0x8000; + rom = machine->region("audiocpu")->base() + 0x8000; memcpy(tmp, rom, 0x8000); for (i = 0; i < 0x8000; i++) @@ -1696,7 +1696,7 @@ static DRIVER_INIT( bfcobra ) bank_data[3] = 0; /* Fixed 16kB ROM region */ - memory_set_bankptr(machine, "bank4", memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank4", machine->region("user1")->base()); /* TODO: Properly sort out the data ACIA */ data_r = 1; diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c index 29c1688795b..e749d8ea50b 100644 --- a/src/mame/drivers/bfm_sc1.c +++ b/src/mame/drivers/bfm_sc1.c @@ -661,7 +661,7 @@ static void decode_sc1(running_machine *machine,const char *rom_region) { UINT8 *tmp, *rom; - rom = memory_region(machine,rom_region); + rom = machine->region(rom_region)->base(); tmp = auto_alloc_array(machine, UINT8, 0x10000); @@ -751,7 +751,7 @@ static MACHINE_RESET( bfm_sc1 ) // init rom bank //////////////////////////////////////////////////////////////////// { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); memory_configure_bank(machine,"bank1", 0, 1, &rom[0x10000], 0); memory_configure_bank(machine,"bank1", 1, 3, &rom[0x02000], 0x02000); @@ -1338,7 +1338,7 @@ static void sc1_common_init(running_machine *machine, int reels, int decrypt) { UINT8 *rom, i; - rom = memory_region(machine, "maincpu"); + rom = machine->region("maincpu")->base(); if ( rom ) { memcpy(&rom[0x10000], &rom[0x00000], 0x2000); diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index 99f157dcdb1..56dba08505a 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -368,7 +368,7 @@ send data to them, although obviously there's no response. */ // init rom bank //////////////////////////////////////////////////////// { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 1, &rom[0x10000], 0); memory_configure_bank(machine, "bank1", 1, 3, &rom[0x02000], 0x02000); @@ -1430,7 +1430,7 @@ static void decode_mainrom(running_machine *machine, const char *rom_region) { UINT8 *tmp, *rom; - rom = memory_region(machine, rom_region); + rom = machine->region(rom_region)->base(); tmp = auto_alloc_array(machine, UINT8, 0x10000); { @@ -2257,7 +2257,7 @@ static void sc2_common_init(running_machine *machine, int decrypt) if (decrypt) decode_mainrom(machine, "maincpu"); // decode main rom - rom = memory_region(machine, "maincpu"); + rom = machine->region("maincpu")->base(); if ( rom ) { memcpy(&rom[0x10000], &rom[0x00000], 0x2000); @@ -2270,7 +2270,7 @@ static void adder2_common_init(running_machine *machine) { UINT8 *pal; - pal = memory_region(machine, "proms"); + pal = machine->region("proms")->base(); if ( pal ) { memcpy(key, pal, 8); diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c index 90c72309f78..9d19def0f80 100644 --- a/src/mame/drivers/bigevglf.c +++ b/src/mame/drivers/bigevglf.c @@ -633,7 +633,7 @@ ROM_END static DRIVER_INIT( bigevglf ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 0xff, &ROM[0x10000], 0x800); } diff --git a/src/mame/drivers/bingoc.c b/src/mame/drivers/bingoc.c index 7d4931b97e7..26c34f68ef4 100644 --- a/src/mame/drivers/bingoc.c +++ b/src/mame/drivers/bingoc.c @@ -87,7 +87,7 @@ static WRITE8_DEVICE_HANDLER( bingoc_play_w ) ---- --x- sound rom banking ---- ---x start-stop sample */ - UINT8 *upd = memory_region(device->machine, "upd"); + UINT8 *upd = device->machine->region("upd")->base(); memcpy(&upd[0x00000], &upd[0x20000 + (((data & 2)>>1) * 0x20000)], 0x20000); upd7759_start_w(device, data & 1); // printf("%02x\n",data); diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c index 5e3f994b2cb..ec200f1ca27 100644 --- a/src/mame/drivers/bishjan.c +++ b/src/mame/drivers/bishjan.c @@ -956,7 +956,7 @@ ROM_END static DRIVER_INIT(bishjan) { - UINT16 *rom = (UINT16*)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16*)machine->region("maincpu")->base(); // check rom[0x042EA/2] = 0x4008; @@ -1014,7 +1014,7 @@ ROM_END static DRIVER_INIT(saklove) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); // patch protection test (it always enters test mode on boot otherwise) rom[0x0e029] = 0xeb; diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c index 1a53e33a663..ea9c04d9355 100644 --- a/src/mame/drivers/bking.c +++ b/src/mame/drivers/bking.c @@ -65,7 +65,7 @@ static WRITE8_HANDLER( bking3_addr_h_w ) static READ8_HANDLER( bking3_extrarom_r ) { bking_state *state = space->machine->driver_data(); - UINT8 *rom = memory_region(space->machine, "user2"); + UINT8 *rom = space->machine->region("user2")->base(); return rom[state->addr_h * 256 + state->addr_l]; } diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c index 2aa4c6b5295..fed7c2cc518 100644 --- a/src/mame/drivers/bladestl.c +++ b/src/mame/drivers/bladestl.c @@ -307,7 +307,7 @@ static const k007420_interface bladestl_k007420_intf = static MACHINE_START( bladestl ) { bladestl_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/blitz68k.c b/src/mame/drivers/blitz68k.c index 6161094f17d..1271c6e6c1b 100644 --- a/src/mame/drivers/blitz68k.c +++ b/src/mame/drivers/blitz68k.c @@ -256,7 +256,7 @@ static UINT16 *blit_romaddr,*blit_attr1_ram,*blit_dst_ram_loword,*blit_attr2_ram static WRITE16_HANDLER( blit_copy_w ) { - UINT8 *blit_rom = memory_region(space->machine, "blitter"); + UINT8 *blit_rom = space->machine->region("blitter")->base(); UINT32 blit_dst_xpos; UINT32 blit_dst_ypos; int x,y,x_size,y_size; @@ -444,8 +444,8 @@ static WRITE8_HANDLER( blit_flags_w ) static WRITE8_HANDLER( blit_draw_w ) { - UINT8 *blit_rom = memory_region(space->machine, "blitter"); - int blit_romsize = memory_region_length(space->machine, "blitter"); + UINT8 *blit_rom = space->machine->region("blitter")->base(); + int blit_romsize = space->machine->region("blitter")->bytes(); UINT32 blit_dst_xpos; UINT32 blit_dst_ypos; int x, y, x_size, y_size; @@ -2668,7 +2668,7 @@ ROM_END static DRIVER_INIT( bankrob ) { - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); // WRONG C8 #1 ROM[0xb5e0/2] = 0x6028; @@ -2683,7 +2683,7 @@ static DRIVER_INIT( bankrob ) static DRIVER_INIT( bankroba ) { - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); // WRONG C8 #1 ROM[0x11e4e/2] = 0x6028; @@ -2698,7 +2698,7 @@ static DRIVER_INIT( bankroba ) static DRIVER_INIT( cjffruit ) { - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); // WRONG C8 #1 ROM[0xf564/2] = 0x6028; @@ -2709,7 +2709,7 @@ static DRIVER_INIT( cjffruit ) static DRIVER_INIT( deucesw2 ) { - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); // WRONG C8 #1 ROM[0x8fe4/2] = 0x6020; @@ -2720,7 +2720,7 @@ static DRIVER_INIT( deucesw2 ) static DRIVER_INIT( dualgame ) { - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); // WRONG C8 #1 ROM[0xa518/2] = 0x6024; @@ -2731,7 +2731,7 @@ static DRIVER_INIT( dualgame ) static DRIVER_INIT( hermit ) { - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); // WRONG C8 #1 ROM[0xdeba/2] = 0x602e; @@ -2748,7 +2748,7 @@ static DRIVER_INIT( hermit ) static DRIVER_INIT( maxidbl ) { - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); // WRONG C8 #1 ROM[0xb384/2] = 0x6036; @@ -2759,7 +2759,7 @@ static DRIVER_INIT( maxidbl ) static DRIVER_INIT( megadblj ) { - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); // WRONG C8 #1 ROM[0xe21c/2] = 0x6040; @@ -2770,7 +2770,7 @@ static DRIVER_INIT( megadblj ) static DRIVER_INIT( megadble ) { - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); // WRONG C8 #1 ROM[0xcfc2/2] = 0x4e71; diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c index 129968d2db9..2694fb42b6d 100644 --- a/src/mame/drivers/blktiger.c +++ b/src/mame/drivers/blktiger.c @@ -287,7 +287,7 @@ static MACHINE_START( blktiger ) state->mcu = machine->device("mcu"); /* configure bankswitching */ - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); state_save_register_global(machine, state->scroll_bank); state_save_register_global(machine, state->screen_layout); @@ -305,7 +305,7 @@ static MACHINE_RESET( blktiger ) blktiger_state *state = machine->driver_data(); /* configure bankswitching */ - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); state->scroll_x[0] = 0; state->scroll_x[1] = 0; diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c index a4bad589b0e..39f351736a0 100644 --- a/src/mame/drivers/blmbycar.c +++ b/src/mame/drivers/blmbycar.c @@ -43,7 +43,7 @@ static WRITE16_HANDLER( blmbycar_okibank_w ) { if (ACCESSING_BITS_0_7) { - UINT8 *RAM = memory_region(space->machine, "oki"); + UINT8 *RAM = space->machine->region("oki")->base(); memcpy(&RAM[0x30000], &RAM[0x40000 + 0x10000 * (data & 0xf)], 0x10000); } } @@ -527,8 +527,8 @@ ROM_END static DRIVER_INIT( blmbycar ) { - UINT16 *RAM = (UINT16 *) memory_region(machine, "maincpu"); - size_t size = memory_region_length(machine, "maincpu") / 2; + UINT16 *RAM = (UINT16 *) machine->region("maincpu")->base(); + size_t size = machine->region("maincpu")->bytes() / 2; int i; for (i = 0; i < size; i++) diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c index 68bd0c4f294..79a8846c53f 100644 --- a/src/mame/drivers/blockhl.c +++ b/src/mame/drivers/blockhl.c @@ -194,7 +194,7 @@ static const k051960_interface blockhl_k051960_intf = static MACHINE_START( blockhl ) { blockhl_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c index 36f4a128585..629a13e0097 100644 --- a/src/mame/drivers/bnstars.c +++ b/src/mame/drivers/bnstars.c @@ -1441,7 +1441,7 @@ static DRIVER_INIT (bnstars) decrypt_ms32_tx(machine, 0x00020,0x7e, "gfx7"); decrypt_ms32_bg(machine, 0x00001,0x9b, "gfx6"); - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu")); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base()); } GAME( 1997, bnstars1, 0, bnstars, bnstars, bnstars, ROT0, "Jaleco", "Vs. Janshi Brandnew Stars", GAME_NO_SOUND ) diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index e46135454c3..18400582fe0 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -546,8 +546,8 @@ ROM_END static DRIVER_INIT( boogwing ) { - const UINT8* src = memory_region(machine, "gfx6"); - UINT8* dst = memory_region(machine, "tiles2") + 0x200000; + const UINT8* src = machine->region("gfx6")->base(); + UINT8* dst = machine->region("tiles2")->base() + 0x200000; deco56_decrypt_gfx(machine, "tiles1"); deco56_decrypt_gfx(machine, "tiles2"); diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c index 43eb7c43204..5bc0518297a 100644 --- a/src/mame/drivers/bottom9.c +++ b/src/mame/drivers/bottom9.c @@ -333,7 +333,7 @@ static const k051316_interface bottom9_k051316_intf = static MACHINE_START( bottom9 ) { bottom9_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 12, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index 23ce7d3c2ec..95de761281a 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -116,7 +116,7 @@ static void draw_boxer( running_machine *machine, bitmap_t* bitmap, const rectan for (n = 0; n < 2; n++) { - const UINT8* p = memory_region(machine, n == 0 ? "user1" : "user2"); + const UINT8* p = machine->region(n == 0 ? "user1" : "user2")->base(); int i, j; diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c index e0dbbd2ea7e..9bfaa63a8d4 100644 --- a/src/mame/drivers/brkthru.c +++ b/src/mame/drivers/brkthru.c @@ -654,7 +654,7 @@ ROM_END static DRIVER_INIT( brkthru ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x2000); } diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index 22cb59545a4..5db4332e104 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -224,12 +224,12 @@ static void btime_decrypt( address_space *space ) /* however if the previous instruction was JSR (which caused a write to */ /* the stack), fetch the address of the next instruction. */ addr1 = cpu_get_previouspc(space->cpu); - src1 = (addr1 < 0x9000) ? state->rambase : memory_region(space->machine, "maincpu"); + src1 = (addr1 < 0x9000) ? state->rambase : space->machine->region("maincpu")->base(); if (decrypted[addr1] == 0x20) /* JSR $xxxx */ addr = src1[addr1 + 1] + 256 * src1[addr1 + 2]; /* If the address of the next instruction is xxxx xxx1 xxxx x1xx, decode it. */ - src = (addr < 0x9000) ? state->rambase : memory_region(space->machine, "maincpu"); + src = (addr < 0x9000) ? state->rambase : space->machine->region("maincpu")->base(); if ((addr & 0x0104) == 0x0104) { /* 76543210 -> 65342710 bit rotation */ @@ -2067,7 +2067,7 @@ static void decrypt_C10707_cpu(running_machine *machine, const char *cputag) { address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM); UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x10000); - UINT8 *rom = memory_region(machine, cputag); + UINT8 *rom = machine->region(cputag)->base(); offs_t addr; space->set_decrypted_region(0x0000, 0xffff, decrypt); @@ -2082,7 +2082,7 @@ static void decrypt_C10707_cpu(running_machine *machine, const char *cputag) static READ8_HANDLER( wtennis_reset_hack_r ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); /* Otherwise the game goes into test mode and there is no way out that I can see. I'm not sure how it can work, it probably somehow has to do @@ -2096,7 +2096,7 @@ static READ8_HANDLER( wtennis_reset_hack_r ) static void init_rom1(running_machine *machine) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); decrypted = auto_alloc_array(machine, UINT8, 0x10000); space->set_decrypted_region(0x0000, 0xffff, decrypted); @@ -2117,7 +2117,7 @@ static DRIVER_INIT( btime ) static DRIVER_INIT( zoar ) { btime_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* At location 0xD50A is what looks like an undocumented opcode. I tried implementing it given what opcode 0x23 should do, but it still didn't @@ -2132,7 +2132,7 @@ static DRIVER_INIT( zoar ) static DRIVER_INIT( tisland ) { btime_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* At location 0xa2b6 there's a strange RLA followed by a BPL that reads from an unmapped area that causes the game to fail in several circumstances.On the Cassette @@ -2171,7 +2171,7 @@ static DRIVER_INIT( cookrace ) decrypt_C10707_cpu(machine, "maincpu"); memory_install_read_bank(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10"); - memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + 0xe200); + memory_set_bankptr(machine, "bank10", machine->region("audiocpu")->base() + 0xe200); state->audio_nmi_enable_type = AUDIO_ENABLE_DIRECT; } @@ -2190,7 +2190,7 @@ static DRIVER_INIT( wtennis ) memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc15f, 0xc15f, 0, 0, wtennis_reset_hack_r); memory_install_read_bank(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0200, 0x0fff, 0, 0, "bank10"); - memory_set_bankptr(machine, "bank10", memory_region(machine, "audiocpu") + 0xe200); + memory_set_bankptr(machine, "bank10", machine->region("audiocpu")->base() + 0xe200); state->audio_nmi_enable_type = AUDIO_ENABLE_AY8910; } diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c index a93763eb12e..3f7187d5d0d 100644 --- a/src/mame/drivers/bublbobl.c +++ b/src/mame/drivers/bublbobl.c @@ -1529,7 +1529,7 @@ ROM_END static void configure_banks( running_machine* machine ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); } @@ -1564,7 +1564,7 @@ static DRIVER_INIT( dland ) { // rearrange gfx to original format int i; - UINT8* src = memory_region(machine,"gfx1"); + UINT8* src = machine->region("gfx1")->base(); for (i = 0; i < 0x40000; i++) src[i] = BITSWAP8(src[i],7,6,5,4,0,1,2,3); diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index e8c7efe643f..687180c62b9 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -362,7 +362,7 @@ static const msm5232_interface msm5232_config = static MACHINE_START( buggychl ) { buggychl_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 6, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c index fbb16190484..6d934de1c59 100644 --- a/src/mame/drivers/buster.c +++ b/src/mame/drivers/buster.c @@ -113,7 +113,7 @@ ROM_END static DRIVER_INIT( buster ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); // vram = auto_alloc_array(machine, UINT8, 0x2000); memcpy(buster_rom, ROM, 0x4000); } diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c index c88d4ef759d..b0ea2243119 100644 --- a/src/mame/drivers/bwing.c +++ b/src/mame/drivers/bwing.c @@ -644,9 +644,9 @@ static DRIVER_INIT( bwing ) { bwing_state *state = machine->driver_data(); - state->bwp123_membase[0] = memory_region(machine, "maincpu"); - state->bwp123_membase[1] = memory_region(machine, "sub"); - state->bwp123_membase[2] = memory_region(machine, "audiocpu"); + state->bwp123_membase[0] = machine->region("maincpu")->base(); + state->bwp123_membase[1] = machine->region("sub")->base(); + state->bwp123_membase[2] = machine->region("audiocpu")->base(); fix_bwp3(machine); } diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index ae8eb136228..3d9e1150aac 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -839,7 +839,7 @@ static void seibu_sound_bootleg(running_machine *machine,const char *cpu,int len { address_space *space = cputag_get_address_space(machine, cpu, ADDRESS_SPACE_PROGRAM); UINT8 *decrypt = auto_alloc_array(machine, UINT8, length); - UINT8 *rom = memory_region(machine, cpu); + UINT8 *rom = machine->region(cpu)->base(); space->set_decrypted_region(0x0000, (length < 0x10000) ? (length - 1) : 0x1fff, decrypt); diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c index 4dc7ec99c1f..b58b194a42b 100644 --- a/src/mame/drivers/cabaret.c +++ b/src/mame/drivers/cabaret.c @@ -335,7 +335,7 @@ MACHINE_CONFIG_END static DRIVER_INIT( cabaret ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int i; /* decrypt the program ROM */ diff --git a/src/mame/drivers/calchase.c b/src/mame/drivers/calchase.c index 819d30dd1bd..d41913de867 100644 --- a/src/mame/drivers/calchase.c +++ b/src/mame/drivers/calchase.c @@ -328,7 +328,7 @@ static void mxtc_config_w(device_t *busdevice, device_t *device, int function, i } else // disable RAM access (reads go to BIOS ROM) { - memory_set_bankptr(busdevice->machine, "bank1", memory_region(busdevice->machine, "bios") + 0x10000); + memory_set_bankptr(busdevice->machine, "bank1", busdevice->machine->region("bios")->base() + 0x10000); } break; } @@ -616,7 +616,7 @@ static const struct pit8253_config calchase_pit8254_config = static MACHINE_RESET(calchase) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "bios") + 0x10000); + memory_set_bankptr(machine, "bank1", machine->region("bios")->base() + 0x10000); } static void set_gate_a20(running_machine *machine, int a20) diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c index 076f42202e8..a5f9a2bcd26 100644 --- a/src/mame/drivers/calomega.c +++ b/src/mame/drivers/calomega.c @@ -3917,7 +3917,7 @@ static DRIVER_INIT( standard ) { /* background color is adjusted through RGB pots */ int x; - UINT8 *BPR = memory_region( machine, "proms" ); + UINT8 *BPR = machine->region( "proms" )->base(); for (x = 0x0000; x < 0x0400; x++) { @@ -3929,7 +3929,7 @@ static DRIVER_INIT( standard ) static DRIVER_INIT( elgrande ) { int x; - UINT8 *BPR = memory_region( machine, "proms" ); + UINT8 *BPR = machine->region( "proms" )->base(); /* background color is adjusted through RGB pots */ for (x = 0x0000; x < 0x0400; x++) @@ -3943,7 +3943,7 @@ static DRIVER_INIT( jjpoker ) { /* background color is adjusted through RGB pots */ int x; - UINT8 *BPR = memory_region( machine, "proms" ); + UINT8 *BPR = machine->region( "proms" )->base(); for (x = 0x0000; x < 0x0400; x++) { @@ -3956,7 +3956,7 @@ static DRIVER_INIT( comg080 ) { /* background color is adjusted through RGB pots */ int x; - UINT8 *BPR = memory_region( machine, "proms" ); + UINT8 *BPR = machine->region( "proms" )->base(); for (x = 0x0000; x < 0x0400; x++) { @@ -3968,7 +3968,7 @@ static DRIVER_INIT( comg080 ) Start = $2042; NMI = $26f8; Also a fake vector at $3ff8-$3ff9. The code checks these values to continue. */ - UINT8 *PRGROM = memory_region( machine, "maincpu" ); + UINT8 *PRGROM = machine->region( "maincpu" )->base(); PRGROM[0x3ff8] = 0x8e; /* checked by code */ PRGROM[0x3ff9] = 0x97; /* checked by code */ diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 007048df775..8faf6e8cf6e 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -109,7 +109,7 @@ public: static TILE_GET_INFO( get_bg_tile_info ) { calorie_state *state = machine->driver_data(); - UINT8 *src = memory_region(machine, "user1"); + UINT8 *src = machine->region("user1")->base(); int bg_base = (state->bg_bank & 0x0f) * 0x200; int code = src[bg_base + tile_index] | (((src[bg_base + tile_index + 0x100]) & 0x10) << 4); int color = src[bg_base + tile_index + 0x100] & 0x0f; @@ -551,7 +551,7 @@ static DRIVER_INIT( calorie ) static DRIVER_INIT( calorieb ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - space->set_decrypted_region(0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x10000); + space->set_decrypted_region(0x0000, 0x7fff, machine->region("maincpu")->base() + 0x10000); } diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c index 8746b6d8774..187ee4016b8 100644 --- a/src/mame/drivers/capbowl.c +++ b/src/mame/drivers/capbowl.c @@ -504,7 +504,7 @@ ROM_END static DRIVER_INIT( capbowl ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); /* configure ROM banks in 0x0000-0x3fff */ memory_configure_bank(machine, "bank1", 0, 6, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c index 260d66a24a2..4b0e0749d3c 100644 --- a/src/mame/drivers/carpolo.c +++ b/src/mame/drivers/carpolo.c @@ -332,8 +332,8 @@ static DRIVER_INIT( carpolo ) /* invert gfx PROM since the bits are active LO */ - ROM = memory_region(machine, "gfx2"); - len = memory_region_length(machine, "gfx2"); + ROM = machine->region("gfx2")->base(); + len = machine->region("gfx2")->bytes(); for (i = 0;i < len; i++) ROM[i] ^= 0x0f; } diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index 7874c438e56..bacf639a2e5 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -1048,7 +1048,7 @@ static WRITE8_HANDLER( hotdogst_rombank_w ) static WRITE8_HANDLER( hotdogst_okibank_w ) { - UINT8 *RAM = memory_region(space->machine, "oki"); + UINT8 *RAM = space->machine->region("oki")->base(); int bank1 = (data >> 0) & 0x3; int bank2 = (data >> 4) & 0x3; memcpy(RAM + 0x20000 * 0, RAM + 0x40000 + 0x20000 * bank1, 0x20000); @@ -1117,7 +1117,7 @@ static WRITE8_HANDLER( metmqstr_rombank_w ) static WRITE8_HANDLER( metmqstr_okibank0_w ) { - UINT8 *ROM = memory_region(space->machine, "oki1"); + UINT8 *ROM = space->machine->region("oki1")->base(); int bank1 = (data >> 0) & 0x7; int bank2 = (data >> 4) & 0x7; memcpy(ROM + 0x20000 * 0, ROM + 0x40000 + 0x20000 * bank1, 0x20000); @@ -1126,7 +1126,7 @@ static WRITE8_HANDLER( metmqstr_okibank0_w ) static WRITE8_HANDLER( metmqstr_okibank1_w ) { - UINT8 *ROM = memory_region(space->machine, "oki2"); + UINT8 *ROM = space->machine->region("oki2")->base(); int bank1 = (data >> 0) & 0x7; int bank2 = (data >> 4) & 0x7; memcpy(ROM + 0x20000 * 0, ROM + 0x40000 + 0x20000 * bank1, 0x20000); @@ -1211,7 +1211,7 @@ static WRITE8_HANDLER( sailormn_rombank_w ) static WRITE8_HANDLER( sailormn_okibank0_w ) { - UINT8 *RAM = memory_region(space->machine, "oki1"); + UINT8 *RAM = space->machine->region("oki1")->base(); int bank1 = (data >> 0) & 0xf; int bank2 = (data >> 4) & 0xf; memcpy(RAM + 0x20000 * 0, RAM + 0x40000 + 0x20000 * bank1, 0x20000); @@ -1220,7 +1220,7 @@ static WRITE8_HANDLER( sailormn_okibank0_w ) static WRITE8_HANDLER( sailormn_okibank1_w ) { - UINT8 *RAM = memory_region(space->machine, "oki2"); + UINT8 *RAM = space->machine->region("oki2")->base(); int bank1 = (data >> 0) & 0xf; int bank2 = (data >> 4) & 0xf; memcpy(RAM + 0x20000 * 0, RAM + 0x40000 + 0x20000 * bank1, 0x20000); @@ -2568,8 +2568,8 @@ MACHINE_CONFIG_END /* 4 bits -> 8 bits. Even and odd pixels are swapped */ static void unpack_sprites(running_machine *machine) { - const UINT32 len = memory_region_length(machine, "sprites"); - UINT8 *rgn = memory_region (machine, "sprites"); + const UINT32 len = machine->region("sprites")->bytes(); + UINT8 *rgn = machine->region ("sprites")->base(); UINT8 *src = rgn + len / 2 - 1; UINT8 *dst = rgn + len - 1; @@ -2585,8 +2585,8 @@ static void unpack_sprites(running_machine *machine) /* 4 bits -> 8 bits. Even and odd pixels and even and odd words, are swapped */ static void ddonpach_unpack_sprites(running_machine *machine) { - const UINT32 len = memory_region_length(machine, "sprites"); - UINT8 *rgn = memory_region (machine, "sprites"); + const UINT32 len = machine->region("sprites")->bytes(); + UINT8 *rgn = machine->region ("sprites")->base(); UINT8 *src = rgn + len / 2 - 1; UINT8 *dst = rgn + len - 1; @@ -2609,8 +2609,8 @@ static void ddonpach_unpack_sprites(running_machine *machine) /* 2 pages of 4 bits -> 8 bits */ static void esprade_unpack_sprites(running_machine *machine) { - UINT8 *src = memory_region(machine, "sprites"); - UINT8 *dst = src + memory_region_length(machine, "sprites"); + UINT8 *src = machine->region("sprites")->base(); + UINT8 *dst = src + machine->region("sprites")->bytes(); while(src < dst) { @@ -4330,8 +4330,8 @@ ROM_END Expand the 2 bit part into a 4 bit layout, so we can decode it */ static void sailormn_unpack_tiles( running_machine *machine, const char *region ) { - const UINT32 len = memory_region_length(machine, region); - UINT8 *rgn = memory_region(machine, region); + const UINT32 len = machine->region(region)->bytes(); + UINT8 *rgn = machine->region(region)->base(); UINT8 *src = rgn + (len/4)*3 - 1; UINT8 *dst = rgn + (len/4)*4 - 2; @@ -4361,7 +4361,7 @@ static void init_cave(running_machine *machine) static DRIVER_INIT( agallet ) { - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); init_cave(machine); memory_configure_bank(machine, "bank1", 0, 0x02, &ROM[0x00000], 0x4000); @@ -4421,7 +4421,7 @@ static DRIVER_INIT( esprade ) #if 0 //ROM PATCH { - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); rom[0x118A/2] = 0x4e71; //palette fix 118A: 5548 SUBQ.W #2,A0 --> NOP } #endif @@ -4451,7 +4451,7 @@ static DRIVER_INIT( guwange ) static DRIVER_INIT( hotdogst ) { cave_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); init_cave(machine); @@ -4466,10 +4466,10 @@ static DRIVER_INIT( hotdogst ) static DRIVER_INIT( mazinger ) { cave_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); UINT8 *buffer; - UINT8 *src = memory_region(machine, "sprites"); - int len = memory_region_length(machine, "sprites"); + UINT8 *src = machine->region("sprites")->base(); + int len = machine->region("sprites")->bytes(); init_cave(machine); @@ -4492,14 +4492,14 @@ static DRIVER_INIT( mazinger ) state->time_vblank_irq = 2100; /* setup extra ROM */ - memory_set_bankptr(machine, "bank1",memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank1",machine->region("user1")->base()); } static DRIVER_INIT( metmqstr ) { cave_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); init_cave(machine); @@ -4516,10 +4516,10 @@ static DRIVER_INIT( metmqstr ) static DRIVER_INIT( pwrinst2j ) { cave_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); UINT8 *buffer; - UINT8 *src = memory_region(machine, "sprites"); - int len = memory_region_length(machine, "sprites"); + UINT8 *src = machine->region("sprites")->base(); + int len = machine->region("sprites")->bytes(); int i, j; init_cave(machine); @@ -4555,7 +4555,7 @@ static DRIVER_INIT( pwrinst2 ) #if 1 //ROM PATCH { - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); rom[0xd46c / 2] = 0xd482; // kurara dash fix 0xd400 -> 0xd482 } #endif @@ -4565,10 +4565,10 @@ static DRIVER_INIT( pwrinst2 ) static DRIVER_INIT( sailormn ) { cave_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); UINT8 *buffer; - UINT8 *src = memory_region(machine, "sprites"); - int len = memory_region_length(machine, "sprites"); + UINT8 *src = machine->region("sprites")->base(); + int len = machine->region("sprites")->bytes(); init_cave(machine); diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c index c5b05c25a69..ce50471e40f 100644 --- a/src/mame/drivers/cb2001.c +++ b/src/mame/drivers/cb2001.c @@ -738,8 +738,8 @@ static PALETTE_INIT(cb2001) { int r,g,b; - UINT8*proms = memory_region(machine, "proms"); - int length = memory_region_length(machine, "proms"); + UINT8*proms = machine->region("proms")->base(); + int length = machine->region("proms")->bytes(); UINT16 dat; dat = (proms[0x000+i] << 8) | proms[0x200+i]; diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c index c8209556394..14d6ca6d4d5 100644 --- a/src/mame/drivers/cbasebal.c +++ b/src/mame/drivers/cbasebal.c @@ -246,7 +246,7 @@ static MACHINE_START( cbasebal ) { cbasebal_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank1", 0, 32, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 32, machine->region("maincpu")->base() + 0x10000, 0x4000); state_save_register_global(machine, state->rambank); state_save_register_global(machine, state->tilebank); diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index 263044bba8b..afdb59d6606 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -519,7 +519,7 @@ ROM_END static DRIVER_INIT( twocrude ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); UINT8 *PTR; int i, j; @@ -536,8 +536,8 @@ static DRIVER_INIT( twocrude ) } /* Rearrange the 'extra' sprite bank to be in the same format as main sprites */ - RAM = memory_region(machine, "gfx3") + 0x080000; - PTR = memory_region(machine, "gfx3") + 0x140000; + RAM = machine->region("gfx3")->base() + 0x080000; + PTR = machine->region("gfx3")->base() + 0x140000; for (i = 0; i < 0x20000; i += 64) { for (j = 0; j < 16; j += 1) diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c index 9289c6a5f55..4ec96db5e44 100644 --- a/src/mame/drivers/ccastles.c +++ b/src/mame/drivers/ccastles.c @@ -192,7 +192,7 @@ static MACHINE_START( ccastles ) rectangle visarea; /* initialize globals */ - state->syncprom = memory_region(machine, "proms") + 0x000; + state->syncprom = machine->region("proms")->base() + 0x000; /* find the start of VBLANK in the SYNC PROM */ for (state->vblank_start = 0; state->vblank_start < 256; state->vblank_start++) @@ -217,7 +217,7 @@ static MACHINE_START( ccastles ) machine->primary_screen->configure(320, 256, visarea, HZ_TO_ATTOSECONDS(PIXEL_CLOCK) * VTOTAL * HTOTAL); /* configure the ROM banking */ - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0xa000, 0x6000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0xa000, 0x6000); /* create a timer for IRQs and set up the first callback */ state->irq_timer = timer_alloc(machine, clock_irq, NULL); diff --git a/src/mame/drivers/cdi.c b/src/mame/drivers/cdi.c index 90c2cb45760..b08779e3368 100644 --- a/src/mame/drivers/cdi.c +++ b/src/mame/drivers/cdi.c @@ -194,7 +194,7 @@ static MACHINE_START( cdi ) static MACHINE_RESET( cdi ) { cdi_state *state = machine->driver_data(); - UINT16 *src = (UINT16*)memory_region(machine, "maincpu"); + UINT16 *src = (UINT16*)machine->region("maincpu")->base(); UINT16 *dst = state->planea; //device_t *cdrom_dev = machine->device("cdrom"); memcpy(dst, src, 0x8); diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c index 8a817156056..fbcab1e2393 100644 --- a/src/mame/drivers/chaknpop.c +++ b/src/mame/drivers/chaknpop.c @@ -244,7 +244,7 @@ GFXDECODE_END static MACHINE_START( chaknpop ) { chaknpop_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c index 834a4f69ced..60ff2866d0f 100644 --- a/src/mame/drivers/cham24.c +++ b/src/mame/drivers/cham24.c @@ -172,11 +172,11 @@ static WRITE8_HANDLER( cham24_mapper_w ) UINT32 prg_bank_page_size = (offset >> 12) & 0x01; UINT32 gfx_mirroring = (offset >> 13) & 0x01; - UINT8* dst = memory_region(space->machine, "maincpu"); - UINT8* src = memory_region(space->machine, "user1"); + UINT8* dst = space->machine->region("maincpu")->base(); + UINT8* src = space->machine->region("user1")->base(); // switch PPU VROM bank - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "gfx1") + (0x2000 * gfx_bank)); + memory_set_bankptr(space->machine, "bank1", space->machine->region("gfx1")->base() + (0x2000 * gfx_bank)); // set gfx mirroring cham24_set_mirroring(gfx_mirroring != 0 ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); @@ -280,15 +280,15 @@ static VIDEO_UPDATE( cham24 ) static MACHINE_START( cham24 ) { /* switch PRG rom */ - UINT8* dst = memory_region(machine, "maincpu"); - UINT8* src = memory_region(machine, "user1"); + UINT8* dst = machine->region("maincpu")->base(); + UINT8* src = machine->region("user1")->base(); memcpy(&dst[0x8000], &src[0x0f8000], 0x4000); memcpy(&dst[0xc000], &src[0x0f8000], 0x4000); /* uses 8K swapping, all ROM!*/ memory_install_read_bank(cpu_get_address_space(machine->device("ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1"); - memory_set_bankptr(machine, "bank1", memory_region(machine, "gfx1")); + memory_set_bankptr(machine, "bank1", machine->region("gfx1")->base()); /* need nametable ram, though. I doubt this uses more than 2k, but it starts up configured for 4 */ nt_ram = auto_alloc_array(machine, UINT8, 0x1000); diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c index 4821df65b5f..f3d308e2dcb 100644 --- a/src/mame/drivers/champbas.c +++ b/src/mame/drivers/champbas.c @@ -1173,9 +1173,9 @@ ROM_END static DRIVER_INIT(champbas) { // chars and sprites are mixed in the same ROMs, so rearrange them for easier decoding - UINT8 *rom1 = memory_region(machine, "gfx1"); - UINT8 *rom2 = memory_region(machine, "gfx2"); - int len = memory_region_length(machine, "gfx1"); + UINT8 *rom1 = machine->region("gfx1")->base(); + UINT8 *rom2 = machine->region("gfx2")->base(); + int len = machine->region("gfx1")->bytes(); int i; for (i = 0; i < len/2; ++i) @@ -1190,8 +1190,8 @@ static DRIVER_INIT(champbas) static DRIVER_INIT( exctsccr ) { // chars and sprites are mixed in the same ROMs, so rearrange them for easier decoding - UINT8 *rom1 = memory_region(machine, "gfx1"); - UINT8 *rom2 = memory_region(machine, "gfx2"); + UINT8 *rom1 = machine->region("gfx1")->base(); + UINT8 *rom2 = machine->region("gfx2")->base(); int i; // planes 0,1 diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c index e0725c62f6c..1171ea61380 100644 --- a/src/mame/drivers/champbwl.c +++ b/src/mame/drivers/champbwl.c @@ -334,7 +334,7 @@ static const x1_010_interface champbwl_sound_intf = static MACHINE_START( champbwl ) { tnzs_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); state->mcu = NULL; diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index f908a5d68bb..629abb30e44 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -453,9 +453,9 @@ ROM_END static DRIVER_INIT(chanbara ) { - UINT8 *src = memory_region(machine, "gfx4"); - UINT8 *dst = memory_region(machine, "gfx3") + 0x4000; - UINT8 *bg = memory_region(machine, "user1"); + UINT8 *src = machine->region("gfx4")->base(); + UINT8 *dst = machine->region("gfx3")->base() + 0x4000; + UINT8 *bg = machine->region("user1")->base(); int i; for (i = 0; i < 0x1000; i++) diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c index eeec0c81dbd..7358eb6c498 100644 --- a/src/mame/drivers/chinagat.c +++ b/src/mame/drivers/chinagat.c @@ -224,7 +224,7 @@ static WRITE8_DEVICE_HANDLER( saiyugoub1_adpcm_control_w ) ddragon_state *state = device->machine->driver_data(); /* i8748 Port 2 write */ - UINT8 *saiyugoub1_adpcm_rom = memory_region(device->machine, "adpcm"); + UINT8 *saiyugoub1_adpcm_rom = device->machine->region("adpcm")->base(); if (data & 0x80) /* Reset m5205 and disable ADPCM ROM outputs */ { @@ -531,7 +531,7 @@ static MACHINE_START( chinagat ) state->snd_cpu = machine->device("audiocpu"); /* configure banks */ - memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, machine->region("maincpu")->base() + 0x10000, 0x4000); /* register for save states */ state_save_register_global(machine, state->scrollx_hi); @@ -915,8 +915,8 @@ ROM_END static DRIVER_INIT( chinagat ) { ddragon_state *state = machine->driver_data(); - UINT8 *MAIN = memory_region(machine, "maincpu"); - UINT8 *SUB = memory_region(machine, "sub"); + UINT8 *MAIN = machine->region("maincpu")->base(); + UINT8 *SUB = machine->region("sub")->base(); state->technos_video_hw = 1; state->sprite_irq = M6809_IRQ_LINE; diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index 9cc890ee242..23d54cabae9 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -72,7 +72,7 @@ public: static PALETTE_INIT( chinsan ) { - UINT8 *src = memory_region( machine, "color_proms" ); + UINT8 *src = machine->region( "color_proms" )->base(); int i; for (i = 0; i < 0x100; i++) @@ -538,7 +538,7 @@ static void chin_adpcm_int( device_t *device ) } else { - UINT8 *ROM = memory_region(device->machine, "adpcm"); + UINT8 *ROM = device->machine->region("adpcm")->base(); state->adpcm_data = ((state->trigger ? (ROM[state->adpcm_pos] & 0x0f) : (ROM[state->adpcm_pos] & 0xf0) >> 4)); msm5205_data_w(device, state->adpcm_data & 0xf); @@ -568,7 +568,7 @@ static MACHINE_START( chinsan ) { chinsan_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("maincpu")->base() + 0x10000, 0x4000); state_save_register_global(machine, state->adpcm_idle); state_save_register_global(machine, state->port_select); diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index 561f6f736d5..08b9305bd0f 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -46,7 +46,7 @@ static WRITE8_HANDLER( chqflag_bankswitch_w ) { chqflag_state *state = space->machine->driver_data(); int bankaddress; - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); /* bits 0-4 = ROM bank # (0x00-0x11) */ bankaddress = 0x10000 + (data & 0x1f) * 0x4000; @@ -355,7 +355,7 @@ static const k051316_interface chqflag_k051316_intf_2 = static MACHINE_START( chqflag ) { chqflag_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c index fc3efc2c082..429b160966e 100644 --- a/src/mame/drivers/chsuper.c +++ b/src/mame/drivers/chsuper.c @@ -24,7 +24,7 @@ static VIDEO_START(chsuper) static VIDEO_UPDATE(chsuper) { const gfx_element *gfx = screen->machine->gfx[0]; - UINT8 *vram = memory_region(screen->machine, "vram"); + UINT8 *vram = screen->machine->region("vram")->base(); int count = 0x0000; int y,x; @@ -86,7 +86,7 @@ static READ8_HANDLER( ff_r ) static WRITE8_HANDLER( chsuper_vram_w ) { - UINT8 *vram = memory_region(space->machine, "vram"); + UINT8 *vram = space->machine->region("vram")->base(); vram[offset] = data; } @@ -270,7 +270,7 @@ ROM_END static DRIVER_INIT( chsuper2 ) { UINT8 *buffer; - UINT8 *rom = memory_region(machine,"gfx1"); + UINT8 *rom = machine->region("gfx1")->base(); int i; chsuper_tilexor = 0x7f00; @@ -294,7 +294,7 @@ static DRIVER_INIT( chsuper2 ) static DRIVER_INIT( chsuper3 ) { UINT8 *buffer; - UINT8 *rom = memory_region(machine,"gfx1"); + UINT8 *rom = machine->region("gfx1")->base(); int i; chsuper_tilexor = 0x0e00; @@ -318,7 +318,7 @@ static DRIVER_INIT( chsuper3 ) static DRIVER_INIT( chmpnum ) { UINT8 *buffer; - UINT8 *rom = memory_region(machine,"gfx1"); + UINT8 *rom = machine->region("gfx1")->base(); int i; chsuper_tilexor = 0x1800; diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c index 7302b5cfaf1..6b8f69bcc0a 100644 --- a/src/mame/drivers/cidelsa.c +++ b/src/mame/drivers/cidelsa.c @@ -457,7 +457,7 @@ static MACHINE_START( draco ) MACHINE_START_CALL( cidelsa ); /* setup COP402 memory banking */ - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, COP402N_TAG), 0x400); + memory_configure_bank(machine, "bank1", 0, 2, machine->region(COP402N_TAG)->base(), 0x400); memory_set_bank(machine, "bank1", 0); /* register for state saving */ diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c index 151f2f50037..5ec830ff6c9 100644 --- a/src/mame/drivers/cischeat.c +++ b/src/mame/drivers/cischeat.c @@ -1792,8 +1792,8 @@ MACHINE_CONFIG_END */ static void cischeat_untangle_sprites(running_machine *machine, const char *region) { - UINT8 *src = memory_region(machine, region); - const UINT8 *end = src + memory_region_length(machine, region); + UINT8 *src = machine->region(region)->base(); + const UINT8 *end = src + machine->region(region)->bytes(); while (src < end) { @@ -1946,7 +1946,7 @@ ROM_END static DRIVER_INIT( bigrun ) { /* Split ROMs */ - rom_1 = (UINT16 *) memory_region(machine, "user1"); + rom_1 = (UINT16 *) machine->region("user1")->base(); cischeat_untangle_sprites(machine, "gfx4"); // Untangle sprites phantasm_rom_decode(machine, "soundcpu"); // Decrypt sound cpu code @@ -2068,17 +2068,17 @@ ROM_END static DRIVER_INIT( cischeat ) { /* Split ROMs */ - rom_1 = (UINT16 *) (memory_region(machine, "user1") + 0x00000); - rom_2 = (UINT16 *) (memory_region(machine, "cpu2") + 0x40000); - rom_3 = (UINT16 *) (memory_region(machine, "cpu3") + 0x40000); + rom_1 = (UINT16 *) (machine->region("user1")->base() + 0x00000); + rom_2 = (UINT16 *) (machine->region("cpu2")->base() + 0x40000); + rom_3 = (UINT16 *) (machine->region("cpu3")->base() + 0x40000); - memcpy(memory_region(machine, "user1") + 0x80000, rom_2, 0x40000); + memcpy(machine->region("user1")->base() + 0x80000, rom_2, 0x40000); memset(rom_2, 0, 0x40000); - rom_2 = (UINT16 *) (memory_region(machine, "user1") + 0x80000); + rom_2 = (UINT16 *) (machine->region("user1")->base() + 0x80000); - memcpy(memory_region(machine, "user1") + 0xc0000, rom_3, 0x40000); + memcpy(machine->region("user1")->base() + 0xc0000, rom_3, 0x40000); memset(rom_3, 0, 0x40000); - rom_3 = (UINT16 *) (memory_region(machine, "user1") + 0xc0000); + rom_3 = (UINT16 *) (machine->region("user1")->base() + 0xc0000); cischeat_untangle_sprites(machine, "gfx4"); // Untangle sprites astyanax_rom_decode(machine, "soundcpu"); // Decrypt sound cpu code @@ -2295,7 +2295,7 @@ ROM_END static DRIVER_INIT( f1gpstar ) { /* Split ROMs */ - rom_1 = (UINT16 *) memory_region(machine, "user1"); + rom_1 = (UINT16 *) machine->region("user1")->base(); cischeat_untangle_sprites(machine, "gfx4"); } diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c index ef9cba91d55..270e38d29a1 100644 --- a/src/mame/drivers/citycon.c +++ b/src/mame/drivers/citycon.c @@ -340,7 +340,7 @@ ROM_END static DRIVER_INIT( citycon ) { - UINT8 *rom = memory_region(machine, "gfx1"); + UINT8 *rom = machine->region("gfx1")->base(); int i; /* diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c index 5e3f4fff391..3123037029e 100644 --- a/src/mame/drivers/cloud9.c +++ b/src/mame/drivers/cloud9.c @@ -161,7 +161,7 @@ static MACHINE_START( cloud9 ) rectangle visarea; /* initialize globals */ - state->syncprom = memory_region(machine, "proms") + 0x000; + state->syncprom = machine->region("proms")->base() + 0x000; /* find the start of VBLANK in the SYNC PROM */ for (state->vblank_start = 0; state->vblank_start < 256; state->vblank_start++) diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c index 2800f7f0de7..48a09878aba 100644 --- a/src/mame/drivers/clshroad.c +++ b/src/mame/drivers/clshroad.c @@ -473,7 +473,7 @@ without this the death sequence never ends so the game is unplayable after you die once, it would be nice to avoid the hack however */ - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0x05C6] = 0xc3; ROM[0x05C7] = 0x8d; diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c index bea2cd79942..f5aaa7fad68 100644 --- a/src/mame/drivers/cmmb.c +++ b/src/mame/drivers/cmmb.c @@ -73,14 +73,14 @@ static VIDEO_UPDATE( cmmb ) static READ8_HANDLER( cmmb_charram_r ) { - UINT8 *GFX = memory_region(space->machine, "gfx"); + UINT8 *GFX = space->machine->region("gfx")->base(); return GFX[offset]; } static WRITE8_HANDLER( cmmb_charram_w ) { - UINT8 *GFX = memory_region(space->machine, "gfx"); + UINT8 *GFX = space->machine->region("gfx")->base(); GFX[offset] = data; @@ -116,7 +116,7 @@ static UINT8 irq_mask; /* { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); UINT32 bankaddress; bankaddress = 0x10000 + (0x10000 * (data & 0x03)); @@ -131,7 +131,7 @@ static WRITE8_HANDLER( cmmb_output_w ) { case 0x01: { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); UINT32 bankaddress; bankaddress = 0x1c000 + (0x10000 * (data & 0x03)); diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index 23c7b72efc4..e9a4ecb80a0 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -1895,7 +1895,7 @@ ROM_END static void cninja_patch( running_machine *machine ) { - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); int i; for (i = 0; i < 0x80000 / 2; i++) @@ -1934,8 +1934,8 @@ static DRIVER_INIT( stoneage ) static DRIVER_INIT( mutantf ) { - const UINT8 *src = memory_region(machine, "gfx2"); - UINT8 *dst = memory_region(machine, "gfx1"); + const UINT8 *src = machine->region("gfx2")->base(); + UINT8 *dst = machine->region("gfx1")->base(); /* The 16x16 graphic has some 8x8 chars in it - decode them in GFX1 */ memcpy(dst + 0x50000, dst + 0x10000, 0x10000); diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index d3369ac4d62..f607f5340d7 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -1076,8 +1076,8 @@ ROM_END static void zerotrgt_rearrange_gfx( running_machine *machine, int romsize, int romarea ) { - UINT8 *src = memory_region(machine, "gfx4"); - UINT8 *dst = memory_region(machine, "gfx3"); + UINT8 *src = machine->region("gfx4")->base(); + UINT8 *dst = machine->region("gfx3")->base(); int rm; int cnt1; @@ -1096,7 +1096,7 @@ static void zerotrgt_rearrange_gfx( running_machine *machine, int romsize, int r #if 0 static DRIVER_INIT( cntsteer ) { - UINT8 *RAM = memory_region(machine, "subcpu"); + UINT8 *RAM = machine->region("subcpu")->base(); RAM[0xc2cf] = 0x43; /* Patch out Cpu 1 ram test - it never ends..?! */ RAM[0xc2d0] = 0x43; diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index c5030a58daf..587eb991178 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -132,7 +132,7 @@ static WRITE8_HANDLER( quizmstr_attr3_w ) static READ8_HANDLER( question_r ) { int address; - UINT8 *questions = memory_region(space->machine, "user1"); + UINT8 *questions = space->machine->region("user1")->base(); switch(question_adr[2]) { @@ -1205,8 +1205,8 @@ ROM_END static DRIVER_INIT( coinmstr ) { - UINT8 *rom = memory_region(machine, "user1"); - int length = memory_region_length(machine, "user1"); + UINT8 *rom = machine->region("user1")->base(); + int length = machine->region("user1")->bytes(); UINT8 *buf = auto_alloc_array(machine, UINT8, length); int i; diff --git a/src/mame/drivers/coinmvga.c b/src/mame/drivers/coinmvga.c index 586100b425e..3b7a268f816 100644 --- a/src/mame/drivers/coinmvga.c +++ b/src/mame/drivers/coinmvga.c @@ -863,7 +863,7 @@ ROM_END static DRIVER_INIT( colorama ) { UINT16 *ROM; - ROM = (UINT16 *)memory_region(machine, "maincpu"); + ROM = (UINT16 *)machine->region("maincpu")->base(); // rte in non-irq routines? wtf? patch them to rts... ROM[0x02B476/2] = 0x5470; @@ -880,7 +880,7 @@ static DRIVER_INIT( colorama ) static DRIVER_INIT( cmrltv75 ) { UINT16 *ROM; - ROM = (UINT16 *)memory_region(machine, "maincpu"); + ROM = (UINT16 *)machine->region("maincpu")->base(); // rte in non-irq routines? wtf? patch them to rts... ROM[0x056fd6/2] = 0x5470; diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c index 913ca06cb07..ab633995840 100644 --- a/src/mame/drivers/cojag.c +++ b/src/mame/drivers/cojag.c @@ -353,7 +353,7 @@ static UINT32 *rom_base; static MACHINE_RESET( cojag ) { - UINT8 *rom = memory_region(machine, "user2"); + UINT8 *rom = machine->region("user2")->base(); /* 68020 only: copy the interrupt vectors into RAM */ if (!cojag_is_r3000) @@ -435,7 +435,7 @@ static WRITE32_HANDLER( misc_control_w ) } /* adjust banking */ - if (memory_region(space->machine, "user2")) + if (space->machine->region("user2")->base()) { memory_set_bank(space->machine, "bank2", (data >> 1) & 7); memory_set_bank(space->machine, "bank9", (data >> 1) & 7); @@ -501,7 +501,7 @@ static WRITE32_HANDLER( latch_w ) logerror("%08X:latch_w(%X)\n", cpu_get_previouspc(space->cpu), data); /* adjust banking */ - if (memory_region(space->machine, "user2")) + if (space->machine->region("user2")->base()) { if (cojag_is_r3000) memory_set_bank(space->machine, "bank1", data & 1); diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c index f6d336b76cf..554d3d48e73 100644 --- a/src/mame/drivers/combatsc.c +++ b/src/mame/drivers/combatsc.c @@ -683,7 +683,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( combatsc ) { combatsc_state *state = machine->driver_data(); - UINT8 *MEM = memory_region(machine, "maincpu") + 0x38000; + UINT8 *MEM = machine->region("maincpu")->base() + 0x38000; state->io_ram = MEM + 0x0000; state->page[0] = MEM + 0x4000; @@ -695,7 +695,7 @@ static MACHINE_START( combatsc ) state->k007121_1 = machine->device("k007121_1"); state->k007121_2 = machine->device("k007121_2"); - memory_configure_bank(machine, "bank1", 0, 10, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 10, machine->region("maincpu")->base() + 0x10000, 0x4000); state_save_register_global(machine, state->priority); state_save_register_global(machine, state->vreg); diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c index ed49c1c6c48..c6a147f006b 100644 --- a/src/mame/drivers/commando.c +++ b/src/mame/drivers/commando.c @@ -519,7 +519,7 @@ ROM_END static DRIVER_INIT( commando ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0xc000); int A; @@ -539,7 +539,7 @@ static DRIVER_INIT( commando ) static DRIVER_INIT( spaceinv ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0xc000); int A; diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c index 4bbbca77054..4ad0ff6fa19 100644 --- a/src/mame/drivers/compgolf.c +++ b/src/mame/drivers/compgolf.c @@ -348,8 +348,8 @@ ROM_END static void compgolf_expand_bg(running_machine *machine) { - UINT8 *GFXDST = memory_region(machine, "gfx2"); - UINT8 *GFXSRC = memory_region(machine, "gfx4"); + UINT8 *GFXDST = machine->region("gfx2")->base(); + UINT8 *GFXSRC = machine->region("gfx4")->base(); int x; @@ -362,7 +362,7 @@ static void compgolf_expand_bg(running_machine *machine) static DRIVER_INIT( compgolf ) { - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "user1"), 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("user1")->base(), 0x4000); compgolf_expand_bg(machine); } diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c index a48f5fb02bd..941e9b74c5d 100644 --- a/src/mame/drivers/contra.c +++ b/src/mame/drivers/contra.c @@ -172,7 +172,7 @@ GFXDECODE_END static MACHINE_START( contra ) { contra_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 12, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c index bdeea80f106..d254b75a549 100644 --- a/src/mame/drivers/coolpool.c +++ b/src/mame/drivers/coolpool.c @@ -551,9 +551,9 @@ static READ16_HANDLER( dsp_hold_line_r ) static READ16_HANDLER( dsp_rom_r ) { coolpool_state *state = space->machine->driver_data(); - UINT8 *rom = memory_region(space->machine, "user2"); + UINT8 *rom = space->machine->region("user2")->base(); - return rom[state->iop_romaddr & (memory_region_length(space->machine, "user2") - 1)]; + return rom[state->iop_romaddr & (space->machine->region("user2")->bytes() - 1)]; } @@ -1218,8 +1218,8 @@ static DRIVER_INIT( 9ballsht ) UINT16 *rom; /* decrypt the main program ROMs */ - rom = (UINT16 *)memory_region(machine, "user1"); - len = memory_region_length(machine, "user1"); + rom = (UINT16 *)machine->region("user1")->base(); + len = machine->region("user1")->bytes(); for (a = 0;a < len/2;a++) { int hi,lo,nhi,nlo; @@ -1242,8 +1242,8 @@ static DRIVER_INIT( 9ballsht ) } /* decrypt the sub data ROMs */ - rom = (UINT16 *)memory_region(machine, "user2"); - len = memory_region_length(machine, "user2"); + rom = (UINT16 *)machine->region("user2")->base(); + len = machine->region("user2")->bytes(); for (a = 1;a < len/2;a+=4) { /* just swap bits 1 and 2 of the address */ diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c index 514ac6a7861..d643498c23a 100644 --- a/src/mame/drivers/coolridr.c +++ b/src/mame/drivers/coolridr.c @@ -587,7 +587,7 @@ static WRITE32_HANDLER( sysh1_char_w ) COMBINE_DATA(&h1_charram[offset]); { - UINT8 *gfx = memory_region(space->machine, "ram_gfx"); + UINT8 *gfx = space->machine->region("ram_gfx")->base(); gfx[offset*4+0] = (h1_charram[offset] & 0xff000000) >> 24; gfx[offset*4+1] = (h1_charram[offset] & 0x00ff0000) >> 16; diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c index a0927ca0235..f2f3c170f7f 100644 --- a/src/mame/drivers/cop01.c +++ b/src/mame/drivers/cop01.c @@ -641,7 +641,7 @@ static DRIVER_INIT( mightguy ) #if MIGHTGUY_HACK /* This is a hack to fix the game code to get a fully working "Starting Area" fake Dip Switch */ - UINT8 *RAM = (UINT8 *)memory_region(machine, "maincpu"); + UINT8 *RAM = (UINT8 *)machine->region("maincpu")->base(); RAM[0x00e4] = 0x07; // rlca RAM[0x00e5] = 0x07; // rlca RAM[0x00e6] = 0x07; // rlca diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c index a7da08ac6ce..28280e89e87 100644 --- a/src/mame/drivers/cosmic.c +++ b/src/mame/drivers/cosmic.c @@ -1571,8 +1571,8 @@ static DRIVER_INIT( cosmicg ) cosmic_state *state = machine->driver_data(); offs_t offs, len; UINT8 *rom; - len = memory_region_length(machine, "maincpu"); - rom = memory_region(machine, "maincpu"); + len = machine->region("maincpu")->bytes(); + rom = machine->region("maincpu")->base(); for (offs = 0; offs < len; offs++) { UINT8 scrambled = rom[offs]; diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index 201aa7c4548..da7e990ad63 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -352,7 +352,7 @@ static INTERRUPT_GEN( cps1_qsound_interrupt ) static READ16_HANDLER( qsound_rom_r ) { - UINT8 *rom = memory_region(space->machine, "user1"); + UINT8 *rom = space->machine->region("user1")->base(); if (rom) return rom[offset] | 0xff00; @@ -395,7 +395,7 @@ static WRITE8_HANDLER( qsound_banksw_w ) { /* Z80 bank register for music note data. It's odd that it isn't encrypted though. */ int bank = data & 0x0f; - if ((0x10000 + (bank * 0x4000)) >= memory_region_length(space->machine, "audiocpu")) + if ((0x10000 + (bank * 0x4000)) >= space->machine->region("audiocpu")->bytes()) { logerror("WARNING: Q sound bank overflow (%02x)\n", data); bank = 0; @@ -2953,13 +2953,13 @@ static MACHINE_START( common ) static MACHINE_START( cps1 ) { MACHINE_START_CALL(common); - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("audiocpu")->base() + 0x10000, 0x4000); } static MACHINE_START( qsound ) { MACHINE_START_CALL(common); - memory_configure_bank(machine, "bank1", 0, 6, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 6, machine->region("audiocpu")->base() + 0x10000, 0x4000); } static MACHINE_CONFIG_START( cps1_10MHz, cps_state ) @@ -9939,7 +9939,7 @@ static DRIVER_INIT( pang3n ) static DRIVER_INIT( pang3 ) { - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); int A, src, dst; for (A = 0x80000; A < 0x100000; A += 2) @@ -9970,8 +9970,8 @@ static READ16_HANDLER( sf2mdt_r ) static DRIVER_INIT( sf2mdt ) { int i; - UINT32 gfx_size = memory_region_length( machine, "gfx" ); - UINT8 *rom = memory_region( machine, "gfx" ); + UINT32 gfx_size = machine->region( "gfx" )->bytes(); + UINT8 *rom = machine->region( "gfx" )->base(); UINT8 tmp; for( i = 0; i < gfx_size; i += 8 ) diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index 148397ac447..7c6caa411b6 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -1209,7 +1209,7 @@ static MACHINE_START( cps2 ) state_save_register_global(machine, state->scancount); if (state->audiocpu != NULL) // gigamn2 has no audiocpu - memory_configure_bank(machine, "bank1", 0, (QSOUND_SIZE - 0x10000) / 0x4000, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, (QSOUND_SIZE - 0x10000) / 0x4000, machine->region("audiocpu")->base() + 0x10000, 0x4000); } @@ -7938,8 +7938,8 @@ static DRIVER_INIT( gigamn2 ) { cps_state *state = machine->driver_data(); address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); - int length = memory_region_length(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); + int length = machine->region("maincpu")->bytes(); DRIVER_INIT_CALL(cps2); diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index a3f2889246b..6d0dd97711a 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -658,9 +658,9 @@ static UINT32 cps3_mask(UINT32 address, UINT32 key1, UINT32 key2) static void cps3_decrypt_bios(running_machine *machine) { int i; - UINT32 *coderegion = (UINT32*)memory_region(machine, "user1"); + UINT32 *coderegion = (UINT32*)machine->region("user1")->base(); - decrypted_bios = (UINT32*)memory_region(machine, "user1"); + decrypted_bios = (UINT32*)machine->region("user1")->base(); for (i=0;i<0x80000;i+=4) { @@ -690,8 +690,8 @@ static void cps3_decrypt_bios(running_machine *machine) static DRIVER_INIT( cps3 ) { // cache pointers to regions - cps3_user4region = memory_region(machine,"user4"); - cps3_user5region = memory_region(machine,"user5"); + cps3_user4region = machine->region("user4")->base(); + cps3_user5region = machine->region("user5")->base(); if (!cps3_user4region) cps3_user4region = auto_alloc_array(machine, UINT8, USER4REGION_LENGTH); if (!cps3_user5region) cps3_user5region = auto_alloc_array(machine, UINT8, USER5REGION_LENGTH); @@ -3361,7 +3361,7 @@ ROM_END DEVELOPMENT VERSION add 0x70 mask! - UINT32 *rom = (UINT32*)memory_region ( machine, "user1" ); + UINT32 *rom = (UINT32*)machine->region ( "user1" )->base(); rom[0x1fec8/4]^=0x00000001; // region hack (clear jpn) rom[0x1fec8/4]^=0x00000004; // region @@ -3386,7 +3386,7 @@ ROM_END DEVELOPMENT VERSION add 0x70 mask! - UINT32 *rom = (UINT32*)memory_region ( machine, "user1" ); + UINT32 *rom = (UINT32*)machine->region ( "user1" )->base(); rom[0x1fec8/4]^=0x00000001; // region (clear jpn) rom[0x1fec8/4]^=0x00000002; // region rom[0x1fec8/4]^=0x00000070; // DEV mode @@ -3407,7 +3407,7 @@ ROM_END OCEANIA 7 ASIA NCD 8 - UINT32 *rom = (UINT32*)memory_region ( machine, "user1" ); + UINT32 *rom = (UINT32*)machine->region ( "user1" )->base(); rom[0x1fed8/4]^=0x00000001; // clear region to 0 (invalid) rom[0x1fed8/4]^=0x00000008; // region 8 - ASIA NO CD - doesn't actually skip the CD // test on startup, only during game, must be another flag @@ -3432,7 +3432,7 @@ ROM_END // bios rom also lists korea, but game rom does not. - UINT32 *rom = (UINT32*)memory_region ( machine, "user1" ); + UINT32 *rom = (UINT32*)machine->region ( "user1" )->base(); rom[0x1fec8/4]^=0x00000001; // region (clear region) rom[0x1fec8/4]^=0x00000008; // region rom[0x1fecc/4]^=0x01000000; // nocd - this ONLY skips the cd check in the bios test @@ -3454,7 +3454,7 @@ ROM_END OCEANIA 7 ASIA 8 - UINT32 *rom = (UINT32*)memory_region ( machine, "user1" ); + UINT32 *rom = (UINT32*)machine->region ( "user1" )->base(); rom[0x1fec8/4]^=0x00000001; // region (clear region) rom[0x1fec8/4]^=0x00000008; // region rom[0x1fecc/4]^=0x01000000; // nocd - this ONLY skips the cd check in the bios test @@ -3476,7 +3476,7 @@ ROM_END BRAZIL 6 OCEANIA 7 - UINT32 *rom = (UINT32*)memory_region ( machine, "user1" ); + UINT32 *rom = (UINT32*)machine->region ( "user1" )->base(); rom[0x1fec8/4]^=0x00000004; // region (clear region) rom[0x1fec8/4]^=0x00000001; // region rom[0x1fecc/4]^=0x01000000; // nocd diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c index 6498833720e..4b450a0b418 100644 --- a/src/mame/drivers/crgolf.c +++ b/src/mame/drivers/crgolf.c @@ -56,7 +56,7 @@ static MACHINE_START( crgolf ) state->audiocpu = machine->device("audiocpu"); /* configure the banking */ - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x2000); memory_set_bank(machine, "bank1", 0); /* register for save states */ @@ -197,7 +197,7 @@ static void vck_callback( device_t *device ) /* only play back if we have data remaining */ if (state->sample_count != 0xff) { - UINT8 data = memory_region(device->machine, "adpcm")[state->sample_offset >> 1]; + UINT8 data = device->machine->region("adpcm")->base()[state->sample_offset >> 1]; /* write the next nibble and advance */ msm5205_data_w(device, (data >> (4 * (~state->sample_offset & 1))) & 0x0f); diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index 2bd68c7663b..eb1d50046ab 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -258,7 +258,7 @@ static const k051960_interface crimfght_k051960_intf = static MACHINE_START( crimfght ) { crimfght_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank2", 0, 12, &ROM[0x10000], 0x2000); memory_set_bank(machine, "bank2", 0); diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c index 23b41d46b71..683bfddee8c 100644 --- a/src/mame/drivers/crospang.c +++ b/src/mame/drivers/crospang.c @@ -588,8 +588,8 @@ ROM_END static void tumblepb_gfx1_rearrange(running_machine *machine) { - UINT8 *rom = memory_region(machine, "gfx1"); - int len = memory_region_length(machine, "gfx1"); + UINT8 *rom = machine->region("gfx1")->base(); + int len = machine->region("gfx1")->bytes(); int i; /* gfx data is in the wrong order */ diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index 30f6d8ba093..87b25dd6e0d 100644 --- a/src/mame/drivers/crshrace.c +++ b/src/mame/drivers/crshrace.c @@ -139,7 +139,7 @@ Dip locations verified with Service Mode. static READ16_HANDLER( extrarom1_r ) { - UINT8 *rom = memory_region(space->machine, "user1"); + UINT8 *rom = space->machine->region("user1")->base(); offset *= 2; @@ -148,7 +148,7 @@ static READ16_HANDLER( extrarom1_r ) static READ16_HANDLER( extrarom2_r ) { - UINT8 *rom = memory_region(space->machine, "user2"); + UINT8 *rom = space->machine->region("user2")->base(); offset *= 2; @@ -446,7 +446,7 @@ static MACHINE_START( crshrace ) { crshrace_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x8000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("audiocpu")->base() + 0x10000, 0x8000); state->audiocpu = machine->device("audiocpu"); state->k053936 = machine->device("k053936"); @@ -584,7 +584,7 @@ ROM_END void crshrace_patch_code( UINT16 offset ) { /* A hack which shows 3 player mode in code which is disabled */ - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); RAM[(offset + 0)/2] = 0x4e71; RAM[(offset + 2)/2] = 0x4e71; RAM[(offset + 4)/2] = 0x4e71; diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c index 62260c64bd2..326873c17af 100644 --- a/src/mame/drivers/crystal.c +++ b/src/mame/drivers/crystal.c @@ -262,9 +262,9 @@ static WRITE32_HANDLER( Banksw_w ) state->Bank = (data >> 1) & 7; if (state->Bank <= 2) - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "user1") + state->Bank * 0x1000000); + memory_set_bankptr(space->machine, "bank1", space->machine->region("user1")->base() + state->Bank * 0x1000000); else - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "user2")); + memory_set_bankptr(space->machine, "bank1", space->machine->region("user2")->base()); } static TIMER_CALLBACK( Timercb ) @@ -349,7 +349,7 @@ static READ32_HANDLER( FlashCmd_r ) { if (state->Bank <= 2) { - UINT32 *ptr = (UINT32*)(memory_region(space->machine, "user1") + state->Bank * 0x1000000); + UINT32 *ptr = (UINT32*)(space->machine->region("user1")->base() + state->Bank * 0x1000000); return ptr[0]; } else @@ -553,9 +553,9 @@ static STATE_POSTLOAD( crystal_banksw_postload ) crystal_state *state = machine->driver_data(); if (state->Bank <= 2) - memory_set_bankptr(machine, "bank1", memory_region(machine, "user1") + state->Bank * 0x1000000); + memory_set_bankptr(machine, "bank1", machine->region("user1")->base() + state->Bank * 0x1000000); else - memory_set_bankptr(machine, "bank1", memory_region(machine, "user2")); + memory_set_bankptr(machine, "bank1", machine->region("user2")->base()); } static MACHINE_START( crystal ) @@ -599,7 +599,7 @@ static MACHINE_RESET( crystal ) state->IntHigh = 0; cpu_set_irq_callback(machine->device("maincpu"), icallback); state->Bank = 0; - memory_set_bankptr(machine, "bank1", memory_region(machine, "user1") + 0); + memory_set_bankptr(machine, "bank1", machine->region("user1")->base() + 0); state->FlashCmd = 0xff; state->OldPort4 = 0; @@ -928,7 +928,7 @@ ROM_END static DRIVER_INIT(crysking) { - UINT16 *Rom = (UINT16*) memory_region(machine, "user1"); + UINT16 *Rom = (UINT16*) machine->region("user1")->base(); //patch the data feed by the protection @@ -947,7 +947,7 @@ static DRIVER_INIT(crysking) static DRIVER_INIT(evosocc) { - UINT16 *Rom = (UINT16*) memory_region(machine, "user1"); + UINT16 *Rom = (UINT16*) machine->region("user1")->base(); Rom += 0x1000000 * 2 / 2; Rom[WORD_XOR_LE(0x97388E/2)] = 0x90FC; //PUSH R2..R7 @@ -965,7 +965,7 @@ static DRIVER_INIT(evosocc) static DRIVER_INIT(topbladv) { - UINT16 *Rom = (UINT16*) memory_region(machine, "user1"); + UINT16 *Rom = (UINT16*) machine->region("user1")->base(); Rom[WORD_XOR_LE(0x12d7a/2)] = 0x90FC; //PUSH R7-R6-R5-R4-R3-R2 Rom[WORD_XOR_LE(0x12d7c/2)] = 0x9001; //PUSH R0 @@ -983,7 +983,7 @@ static DRIVER_INIT(topbladv) static DRIVER_INIT(officeye) { - UINT16 *Rom = (UINT16*) memory_region(machine, "user1"); + UINT16 *Rom = (UINT16*) machine->region("user1")->base(); Rom[WORD_XOR_LE(0x9c9e/2)] = 0x901C; //PUSH R4-R3-R2 Rom[WORD_XOR_LE(0x9ca0/2)] = 0x9001; //PUSH R0 diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c index 0c20f14c981..a147711c8c0 100644 --- a/src/mame/drivers/cshooter.c +++ b/src/mame/drivers/cshooter.c @@ -232,7 +232,7 @@ static WRITE8_HANDLER ( cshooter_c700_w ) static WRITE8_HANDLER ( bank_w ) { - memory_set_bankptr(space->machine, "bank1",&memory_region(space->machine, "user1")[0x4000*((data>>4)&3)]); + memory_set_bankptr(space->machine, "bank1",&space->machine->region("user1")->base()[0x4000*((data>>4)&3)]); } @@ -651,19 +651,19 @@ ROM_END static DRIVER_INIT( cshooter ) { /* temp so it boots */ - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); rom[0xa2] = 0x00; rom[0xa3] = 0x00; rom[0xa4] = 0x00; - memory_set_bankptr(machine, "bank1",&memory_region(machine, "user1")[0]); + memory_set_bankptr(machine, "bank1",&machine->region("user1")->base()[0]); } static DRIVER_INIT( cshootere ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); int A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x8000); space->set_decrypted_region(0x0000, 0x7fff, decrypt); @@ -693,7 +693,7 @@ static DRIVER_INIT( cshootere ) rom[A] = BITSWAP8(rom[A],7,6,1,4,3,2,5,0); } - memory_set_bankptr(machine, "bank1",&memory_region(machine, "user1")[0]); + memory_set_bankptr(machine, "bank1",&machine->region("user1")->base()[0]); seibu_sound_decrypt(machine,"audiocpu",0x2000); } diff --git a/src/mame/drivers/csplayh5.c b/src/mame/drivers/csplayh5.c index 021071d4177..79a6f23cb25 100644 --- a/src/mame/drivers/csplayh5.c +++ b/src/mame/drivers/csplayh5.c @@ -144,7 +144,7 @@ static UINT8 pio_dir[5], pio_latch[5]; static void csplayh5_soundbank_w(running_machine *machine, int data) { - UINT8 *SNDROM = memory_region(machine, "audiocpu"); + UINT8 *SNDROM = machine->region("audiocpu")->base(); memory_set_bankptr(machine, "bank1", &SNDROM[0x08000 + (0x8000 * (data & 0x03))]); } @@ -559,8 +559,8 @@ MACHINE_CONFIG_END static DRIVER_INIT( csplayh5 ) { - UINT16 *MAINROM = (UINT16 *)memory_region(machine, "maincpu"); - UINT8 *SNDROM = memory_region(machine, "audiocpu"); + UINT16 *MAINROM = (UINT16 *)machine->region("maincpu")->base(); + UINT8 *SNDROM = machine->region("audiocpu")->base(); // initialize sound rom bank csplayh5_soundbank_w(machine, 0); diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c index 7f7f0b69391..113347fcefd 100644 --- a/src/mame/drivers/cubocd32.c +++ b/src/mame/drivers/cubocd32.c @@ -1179,7 +1179,7 @@ static DRIVER_INIT( cd32 ) /* set up memory */ memory_configure_bank(machine, "bank1", 0, 1, state->chip_ram, 0); - memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user1"), 0); + memory_configure_bank(machine, "bank1", 1, 1, machine->region("user1")->base(), 0); /* input hack */ state->input_hack = NULL; diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index 9445015687a..ca931c217fe 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -43,7 +43,7 @@ public: static TILE_GET_INFO( get_bg1_tile_info ) { cultures_state *state = machine->driver_data(); - UINT8 *region = memory_region(machine, "gfx3") + 0x200000 + 0x80000 * state->bg1_bank; + UINT8 *region = machine->region("gfx3")->base() + 0x200000 + 0x80000 * state->bg1_bank; int code = region[tile_index * 2] + (region[tile_index * 2 + 1] << 8); SET_TILE_INFO(2, code, code >> 12, 0); } @@ -51,7 +51,7 @@ static TILE_GET_INFO( get_bg1_tile_info ) static TILE_GET_INFO( get_bg2_tile_info ) { cultures_state *state = machine->driver_data(); - UINT8 *region = memory_region(machine, "gfx2") + 0x200000 + 0x80000 * state->bg2_bank; + UINT8 *region = machine->region("gfx2")->base() + 0x200000 + 0x80000 * state->bg2_bank; int code = region[tile_index * 2] + (region[tile_index * 2 + 1] << 8); SET_TILE_INFO(1, code, code >> 12, 0); } @@ -150,8 +150,8 @@ static WRITE8_HANDLER( misc_w ) if (state->old_bank != new_bank) { // oki banking - UINT8 *src = memory_region(space->machine, "oki") + 0x40000 + 0x20000 * new_bank; - UINT8 *dst = memory_region(space->machine, "oki") + 0x20000; + UINT8 *src = space->machine->region("oki")->base() + 0x40000 + 0x20000 * new_bank; + UINT8 *dst = space->machine->region("oki")->base() + 0x20000; memcpy(dst, src, 0x20000); state->old_bank = new_bank; @@ -360,7 +360,7 @@ static INTERRUPT_GEN( cultures_interrupt ) static MACHINE_START( cultures ) { cultures_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 16, &ROM[0x0000], 0x4000); diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c index 3bef86b05c3..75a0f354db1 100644 --- a/src/mame/drivers/cvs.c +++ b/src/mame/drivers/cvs.c @@ -441,11 +441,11 @@ static int speech_rom_read_bit( device_t *device ) { cvs_state *state = device->machine->driver_data(); running_machine *machine = device->machine; - UINT8 *ROM = memory_region(machine, "speechdata"); + UINT8 *ROM = machine->region("speechdata")->base(); int bit; /* before reading the bit, clamp the address to the region length */ - state->speech_rom_bit_address = state->speech_rom_bit_address & ((memory_region_length(machine, "speechdata") * 8) - 1); + state->speech_rom_bit_address = state->speech_rom_bit_address & ((machine->region("speechdata")->bytes() * 8) - 1); bit = (ROM[state->speech_rom_bit_address >> 3] >> (state->speech_rom_bit_address & 0x07)) & 0x01; /* prepare for next bit */ @@ -1598,7 +1598,7 @@ ROM_END static DRIVER_INIT( huncholy ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); /* patch out protection */ ROM[0x0082] = 0xc0; @@ -1618,7 +1618,7 @@ static DRIVER_INIT( huncholy ) static DRIVER_INIT( hunchbaka ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); offs_t offs; @@ -1630,7 +1630,7 @@ static DRIVER_INIT( hunchbaka ) static DRIVER_INIT( superbik ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); /* patch out protection */ ROM[0x0079] = 0xc0; @@ -1658,7 +1658,7 @@ static DRIVER_INIT( superbik ) static DRIVER_INIT( hero ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); /* patch out protection */ ROM[0x0087] = 0xc0; @@ -1680,7 +1680,7 @@ static DRIVER_INIT( hero ) static DRIVER_INIT( raiders ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); offs_t offs; diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c index 66187f02080..653c5205b83 100644 --- a/src/mame/drivers/cybertnk.c +++ b/src/mame/drivers/cybertnk.c @@ -282,7 +282,7 @@ static VIDEO_UPDATE( cybertnk ) /* non-tile based spriteram (BARE-BONES, looks pretty complex) */ if(1) { - const UINT8 *blit_ram = memory_region(screen->machine,"spr_gfx"); + const UINT8 *blit_ram = screen->machine->region("spr_gfx")->base(); int offs,x,y,z,xsize,ysize,yi,xi,col_bank,fx,zoom; UINT32 spr_offs,spr_offs_helper; int xf,yf,xz,yz; @@ -415,7 +415,7 @@ static VIDEO_UPDATE( cybertnk ) { int x,y,count; static int test_x, test_y, start_offs,color_pen; - const UINT8 *blit_ram = memory_region(screen->machine,"spr_gfx"); + const UINT8 *blit_ram = screen->machine->region("spr_gfx")->base(); if(input_code_pressed(screen->machine, KEYCODE_Z)) test_x++; @@ -980,7 +980,7 @@ DRIVER_INIT( cybertnk ) UINT8* road_data; int i; - road_data = memory_region(machine, "road_data"); + road_data = machine->region("road_data")->base(); for (i=0;i < 0x40000;i++) { road_data[i] = BITSWAP8(road_data[i],3,2,1,0,7,6,5,4); diff --git a/src/mame/drivers/cyclemb.c b/src/mame/drivers/cyclemb.c index 21bb67ce00d..43508f5aa25 100644 --- a/src/mame/drivers/cyclemb.c +++ b/src/mame/drivers/cyclemb.c @@ -589,7 +589,7 @@ ROM_END static DRIVER_INIT( cyclemb ) { - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x10000, 0x1000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("maincpu")->base() + 0x10000, 0x1000); } GAME( 1984, cyclemb, 0, cyclemb, cyclemb, cyclemb, ROT0, "Taito Corporation", "Cycle Mahbou (Japan)", GAME_NOT_WORKING ) diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c index b8ed0aa1bc3..62449cd66f4 100644 --- a/src/mame/drivers/d9final.c +++ b/src/mame/drivers/d9final.c @@ -69,7 +69,7 @@ static WRITE8_HANDLER( sc0_cram ) static WRITE8_HANDLER( d9final_bank_w ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); UINT32 bankaddress; bankaddress = 0x10000+(0x4000 * (data & 0x7)); @@ -250,7 +250,7 @@ GFXDECODE_END static MACHINE_RESET( d9final ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &ROM[0x10000]); } diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c index 83d941337a5..30a2cb64689 100644 --- a/src/mame/drivers/dambustr.c +++ b/src/mame/drivers/dambustr.c @@ -194,9 +194,9 @@ static DRIVER_INIT(dambustr) { int i, j, tmp; int tmpram[16]; - UINT8 *rom = memory_region(machine, "maincpu"); - UINT8 *usr = memory_region(machine, "user1"); - UINT8 *gfx = memory_region(machine, "gfx1"); + UINT8 *rom = machine->region("maincpu")->base(); + UINT8 *usr = machine->region("user1")->base(); + UINT8 *gfx = machine->region("gfx1")->base(); // Bit swap addresses for(i=0; i<4096*4; i++) { diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c index e634e7f5ad7..5f6bbbbd421 100644 --- a/src/mame/drivers/darius.c +++ b/src/mame/drivers/darius.c @@ -855,8 +855,8 @@ static MACHINE_START( darius ) { darius_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x8000); - memory_configure_bank(machine, "bank1", 4, 1, memory_region(machine, "audiocpu"), 0x8000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("audiocpu")->base() + 0x10000, 0x8000); + memory_configure_bank(machine, "bank1", 4, 1, machine->region("audiocpu")->base(), 0x8000); memory_set_bank(machine, "bank1", 4); state->maincpu = machine->device("maincpu"); @@ -1289,7 +1289,7 @@ ROM_END static DRIVER_INIT( darius ) { /**** setup sound bank image ****/ - UINT8 *RAM = memory_region(machine, "audiocpu"); + UINT8 *RAM = machine->region("audiocpu")->base(); int i; for (i = 3; i >= 0; i--) diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c index 5629854e78a..fced7219495 100644 --- a/src/mame/drivers/darkhors.c +++ b/src/mame/drivers/darkhors.c @@ -920,8 +920,8 @@ ROM_END static DRIVER_INIT( darkhors ) { - UINT32 *rom = (UINT32 *) memory_region(machine, "maincpu"); - UINT8 *eeprom = (UINT8 *) memory_region(machine, "eeprom"); + UINT32 *rom = (UINT32 *) machine->region("maincpu")->base(); + UINT8 *eeprom = (UINT8 *) machine->region("eeprom")->base(); int i; #if 1 diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c index 511318748ff..4bc00fe69db 100644 --- a/src/mame/drivers/darkmist.c +++ b/src/mame/drivers/darkmist.c @@ -38,7 +38,7 @@ int darkmist_hw; static WRITE8_HANDLER(darkmist_hw_w) { darkmist_hw=data; - memory_set_bankptr(space->machine, "bank1",&memory_region(space->machine, "maincpu")[0x010000+((data&0x80)?0x4000:0)]); + memory_set_bankptr(space->machine, "bank1",&space->machine->region("maincpu")->base()[0x010000+((data&0x80)?0x4000:0)]); } static READ8_HANDLER(t5182shared_r) @@ -335,8 +335,8 @@ static void decrypt_gfx(running_machine *machine) int size; int i; - rom = memory_region(machine, "gfx1"); - size = memory_region_length(machine, "gfx1"); + rom = machine->region("gfx1")->base(); + size = machine->region("gfx1")->bytes(); /* data lines */ for (i = 0;i < size/2;i++) @@ -358,8 +358,8 @@ static void decrypt_gfx(running_machine *machine) } - rom = memory_region(machine, "gfx2"); - size = memory_region_length(machine, "gfx2"); + rom = machine->region("gfx2")->base(); + size = machine->region("gfx2")->bytes(); /* data lines */ for (i = 0;i < size/2;i++) @@ -381,8 +381,8 @@ static void decrypt_gfx(running_machine *machine) } - rom = memory_region(machine, "gfx3"); - size = memory_region_length(machine, "gfx3"); + rom = machine->region("gfx3")->base(); + size = machine->region("gfx3")->bytes(); /* data lines */ for (i = 0;i < size/2;i++) @@ -409,7 +409,7 @@ static void decrypt_gfx(running_machine *machine) static void decrypt_snd(running_machine *machine) { int i; - UINT8 *ROM = memory_region(machine, "t5182"); + UINT8 *ROM = machine->region("t5182")->base(); for(i=0x8000;i<0x10000;i++) ROM[i] = BITSWAP8(ROM[i], 7,1,2,3,4,5,6,0); @@ -419,7 +419,7 @@ static DRIVER_INIT(darkmist) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); int i, len; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); UINT8 *buffer = auto_alloc_array(machine, UINT8, 0x10000); UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x8000); @@ -455,8 +455,8 @@ static DRIVER_INIT(darkmist) memory_set_bankptr(space->machine, "bank1",&ROM[0x010000]); /* adr line swaps */ - ROM = memory_region(machine, "user1"); - len = memory_region_length(machine, "user1"); + ROM = machine->region("user1")->base(); + len = machine->region("user1")->bytes(); memcpy( buffer, ROM, len ); for(i=0;iregion("user2")->base(); + len = machine->region("user2")->bytes(); memcpy( buffer, ROM, len ); for(i=0;iregion("user3")->base(); + len = machine->region("user3")->bytes(); memcpy( buffer, ROM, len ); for(i=0;iregion("user4")->base(); + len = machine->region("user4")->bytes(); memcpy( buffer, ROM, len ); for(i=0;iregion("maincpu")->base(); int i; for (i=0x00000; i<0x80000; i++) diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index e211c08dea3..6568f91e669 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -831,8 +831,8 @@ static READ16_HANDLER( thndzone_main_skip ) static DRIVER_INIT( dassault ) { - const UINT8 *src = memory_region(machine, "gfx1"); - UINT8 *dst = memory_region(machine, "gfx2"); + const UINT8 *src = machine->region("gfx1")->base(); + UINT8 *dst = machine->region("gfx2")->base(); UINT8 *tmp = auto_alloc_array(machine, UINT8, 0x80000); /* Playfield 4 also has access to the char graphics, make things easier @@ -851,8 +851,8 @@ static DRIVER_INIT( dassault ) static DRIVER_INIT( thndzone ) { - const UINT8 *src = memory_region(machine, "gfx1"); - UINT8 *dst = memory_region(machine, "gfx2"); + const UINT8 *src = machine->region("gfx1")->base(); + UINT8 *dst = machine->region("gfx2")->base(); UINT8 *tmp = auto_alloc_array(machine, UINT8, 0x80000); /* Playfield 4 also has access to the char graphics, make things easier diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c index 1b33549229c..fe0fe75e645 100644 --- a/src/mame/drivers/dbz.c +++ b/src/mame/drivers/dbz.c @@ -500,7 +500,7 @@ static DRIVER_INIT( dbz ) { UINT16 *ROM; - ROM = (UINT16 *)memory_region(machine, "maincpu"); + ROM = (UINT16 *)machine->region("maincpu")->base(); // nop out dbz1's mask rom test // tile ROM test diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c index 179b1d30f43..7f525464f14 100644 --- a/src/mame/drivers/dcon.c +++ b/src/mame/drivers/dcon.c @@ -377,7 +377,7 @@ ROM_END /***************************************************************************/ static DRIVER_INIT( sdgndmps ) { - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); RAM[0x1356/2] = 0x4e71; /* beq -> nop */ RAM[0x1358/2] = 0x4e71; diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index 6b31751bd62..36a05927449 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -671,8 +671,8 @@ static DRIVER_INIT( ddayjlc ) UINT8 *src, *dst, *temp; temp = auto_alloc_array(machine, UINT8, 0x10000); src = temp; - dst = memory_region(machine, "gfx1"); - length = memory_region_length(machine, "gfx1"); + dst = machine->region("gfx1")->base(); + length = machine->region("gfx1")->bytes(); memcpy(src, dst, length); newadr = 0; oldaddr = 0; @@ -686,7 +686,7 @@ static DRIVER_INIT( ddayjlc ) auto_free(machine, temp); } - memory_configure_bank(machine, "bank1", 0, 3, memory_region(machine, "user1"), 0x4000); + memory_configure_bank(machine, "bank1", 0, 3, machine->region("user1")->base(), 0x4000); memory_set_bank(machine, "bank1", 0); } diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index e621bb30e11..72d6fc9072c 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -436,8 +436,8 @@ INLINE void log_draw_error( int src, int cmd ) static int blit_draw( running_machine *machine, int src, int sx ) { dynax_state *state = machine->driver_data(); - UINT8 *src_data = memory_region(machine, "blitter"); - int src_len = memory_region_length(machine, "blitter"); + UINT8 *src_data = machine->region("blitter")->base(); + int src_len = machine->region("blitter")->bytes(); int bit_addr = (src & 0xffffff) * state->ddenlovr_blit_rom_bits; /* convert to bit address */ int pen_size, arg_size, cmd; int x; @@ -1245,8 +1245,8 @@ static WRITE16_HANDLER( ddenlovr_blitter_irq_ack_w ) static READ8_HANDLER( rongrong_gfxrom_r ) { dynax_state *state = space->machine->driver_data(); - UINT8 *rom = memory_region(space->machine, "blitter"); - size_t size = memory_region_length(space->machine, "blitter"); + UINT8 *rom = space->machine->region("blitter")->base(); + size_t size = space->machine->region("blitter")->bytes(); int address = state->ddenlovr_blit_address; if (address >= size) @@ -1319,7 +1319,7 @@ VIDEO_UPDATE(ddenlovr) #if 0 static int base = 0x0; - const UINT8 *gfx = memory_region(screen->machine, "blitter"); + const UINT8 *gfx = screen->machine->region("blitter")->base(); int next; memset(state->ddenlovr_pixmap[0], 0, 512 * 512); memset(state->ddenlovr_pixmap[1], 0, 512 * 512); @@ -2465,8 +2465,8 @@ static READ8_HANDLER( hanakanz_busy_r ) static READ8_HANDLER( hanakanz_gfxrom_r ) { dynax_state *state = space->machine->driver_data(); - UINT8 *rom = memory_region(space->machine, "blitter"); - size_t size = memory_region_length(space->machine, "blitter"); + UINT8 *rom = space->machine->region("blitter")->base(); + size_t size = space->machine->region("blitter")->bytes(); int address = (state->ddenlovr_blit_address & 0xffffff) * 2; if (address >= size) @@ -2647,8 +2647,8 @@ static WRITE8_HANDLER( mjchuuka_blitter_w ) static void mjchuuka_get_romdata(running_machine *machine) { dynax_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "blitter"); - size_t size = memory_region_length(machine, "blitter"); + UINT8 *rom = machine->region("blitter")->base(); + size_t size = machine->region("blitter")->bytes(); int address = (state->ddenlovr_blit_address & 0xffffff) * 2; if (address >= size) @@ -2892,7 +2892,7 @@ static WRITE8_HANDLER( hginga_rombank_w ) static READ8_HANDLER( hginga_protection_r ) { dynax_state *state = space->machine->driver_data(); - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); if (state->hginga_rombank & 0x10) return hanakanz_rand_r(space, 0); @@ -3126,7 +3126,7 @@ static WRITE8_HANDLER( hgokou_input_w ) static READ8_HANDLER( hgokou_protection_r ) { dynax_state *state = space->machine->driver_data(); - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); if (state->hginga_rombank == 0) return hanakanz_rand_r(space, 0); @@ -7637,7 +7637,7 @@ static MACHINE_RESET( ddenlovr ) static MACHINE_START( rongrong ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 0x20, &ROM[0x010000], 0x8000); memory_configure_bank(machine, "bank2", 0, 8, &ROM[0x110000], 0x1000); @@ -7646,7 +7646,7 @@ static MACHINE_START( rongrong ) static MACHINE_START( mmpanic ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x8000); MACHINE_START_CALL(ddenlovr); @@ -7654,7 +7654,7 @@ static MACHINE_START( mmpanic ) static MACHINE_START( funkyfig ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 0x10, &ROM[0x10000], 0x8000); memory_configure_bank(machine, "bank2", 0, 8, &ROM[0x90000], 0x1000); @@ -7663,7 +7663,7 @@ static MACHINE_START( funkyfig ) static MACHINE_START( hanakanz ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 0x10, &ROM[0x10000], 0x8000); memory_configure_bank(machine, "bank2", 0, 0x10, &ROM[0x90000], 0x1000); @@ -7672,7 +7672,7 @@ static MACHINE_START( hanakanz ) static MACHINE_START( mjmyster ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x8000); memory_configure_bank(machine, "bank2", 0, 8, &ROM[0x90000], 0x1000); @@ -7681,7 +7681,7 @@ static MACHINE_START( mjmyster ) static MACHINE_START( hparadis ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x8000); memory_configure_bank(machine, "bank2", 0, 8, &ROM[0x50000], 0x1000); @@ -7690,7 +7690,7 @@ static MACHINE_START( hparadis ) static MACHINE_START( mjflove ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 0x10, &ROM[0x10000], 0x8000); memory_configure_bank(machine, "bank2", 0, 8, &ROM[0x90000], 0x1000); @@ -7699,7 +7699,7 @@ static MACHINE_START( mjflove ) static MACHINE_START( sryudens ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 0x10, &ROM[0x10000], 0x8000); memory_configure_bank(machine, "bank2", 0, 0x10, &ROM[0x90000], 0x1000); diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c index 62fe73a5ce9..1ed13daba6e 100644 --- a/src/mame/drivers/ddragon.c +++ b/src/mame/drivers/ddragon.c @@ -150,7 +150,7 @@ static MACHINE_START( ddragon ) ddragon_state *state = machine->driver_data(); /* configure banks */ - memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, machine->region("maincpu")->base() + 0x10000, 0x4000); state->maincpu = machine->device("maincpu"); state->sub_cpu = machine->device("sub"); @@ -479,7 +479,7 @@ static void dd_adpcm_int( device_t *device ) } else { - UINT8 *ROM = memory_region(device->machine, "adpcm") + 0x10000 * chip; + UINT8 *ROM = device->machine->region("adpcm")->base() + 0x10000 * chip; state->adpcm_data[chip] = ROM[state->adpcm_pos[chip]++]; msm5205_data_w(device, state->adpcm_data[chip] >> 4); @@ -2037,26 +2037,26 @@ static DRIVER_INIT( toffy ) memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x3808, 0x3808, 0, 0, toffy_bankswitch_w); /* the program rom has a simple bitswap encryption */ - rom = memory_region(machine, "maincpu"); - length = memory_region_length(machine, "maincpu"); + rom = machine->region("maincpu")->base(); + length = machine->region("maincpu")->bytes(); for (i = 0; i < length; i++) rom[i] = BITSWAP8(rom[i], 6,7,5,4,3,2,1,0); /* and the fg gfx ... */ - rom = memory_region(machine, "gfx1"); - length = memory_region_length(machine, "gfx1"); + rom = machine->region("gfx1")->base(); + length = machine->region("gfx1")->bytes(); for (i = 0; i < length; i++) rom[i] = BITSWAP8(rom[i], 7,6,5,3,4,2,1,0); /* and the sprites gfx */ - rom = memory_region(machine, "gfx2"); - length = memory_region_length(machine, "gfx2"); + rom = machine->region("gfx2")->base(); + length = machine->region("gfx2")->bytes(); for (i = 0; i < length; i++) rom[i] = BITSWAP8(rom[i], 7,6,5,4,3,2,0,1); /* and the bg gfx */ - rom = memory_region(machine, "gfx3"); - length = memory_region_length(machine, "gfx3"); + rom = machine->region("gfx3")->base(); + length = machine->region("gfx3")->bytes(); for (i = 0; i < length / 2; i++) { rom[i + 0*length/2] = BITSWAP8(rom[i + 0*length/2], 7,6,1,4,3,2,5,0); @@ -2072,8 +2072,8 @@ static DRIVER_INIT( ddragon6809 ) int i; UINT8 *dst,*src; - src = memory_region(machine, "chars"); - dst = memory_region(machine, "gfx1"); + src = machine->region("chars")->base(); + dst = machine->region("gfx1")->base(); for (i = 0; i < 0x8000; i++) { diff --git a/src/mame/drivers/ddribble.c b/src/mame/drivers/ddribble.c index d43aa9c730b..587e737383e 100644 --- a/src/mame/drivers/ddribble.c +++ b/src/mame/drivers/ddribble.c @@ -86,7 +86,7 @@ static READ8_DEVICE_HANDLER( ddribble_vlm5030_busy_r ) static WRITE8_DEVICE_HANDLER( ddribble_vlm5030_ctrl_w ) { ddribble_state *state = device->machine->driver_data(); - UINT8 *SPEECH_ROM = memory_region(device->machine, "vlm"); + UINT8 *SPEECH_ROM = device->machine->region("vlm")->base(); /* b7 : vlm data bus OE */ @@ -251,7 +251,7 @@ static const vlm5030_interface vlm5030_config = static MACHINE_START( ddribble ) { ddribble_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 5, &ROM[0x10000], 0x2000); state->filter1 = machine->device("filter1"); diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index 137de502ff1..51afdd30337 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -2886,7 +2886,7 @@ static void dump_to_file(running_machine* machine, UINT8* ROM, int offset, int s static DRIVER_INIT( convert_robocop_gfx4_to_automat ) { - UINT8* R = memory_region(machine,"gfx4"); + UINT8* R = machine->region("gfx4")->base(); int i; for (i=0;i<0x80000;i++) diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index 0faee4eba55..23c9f415273 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -3423,7 +3423,7 @@ static DRIVER_INIT( deco222 ) UINT8 *rom; /* bits 5 and 6 of the opcodes are swapped */ - rom = memory_region(machine, "audiocpu"); + rom = machine->region("audiocpu")->base(); decrypt = auto_alloc_array(machine, UINT8, 0x8000); space->set_decrypted_region(0x8000, 0xffff, decrypt); @@ -3437,8 +3437,8 @@ static DRIVER_INIT( deco222 ) /* Below, I set up the correct number of banks depending on the "maincpu" region size */ static DRIVER_INIT( ghostb ) { - UINT8 *ROM = memory_region(machine, "maincpu"); - UINT8 *RAM = memory_region(machine, "proms"); + UINT8 *ROM = machine->region("maincpu")->base(); + UINT8 *RAM = machine->region("proms")->base(); /* Blank out unused garbage in colour prom to avoid colour overflow */ memset(RAM + 0x20, 0, 0xe0); @@ -3449,8 +3449,8 @@ static DRIVER_INIT( ghostb ) static DRIVER_INIT( meikyuh ) { - UINT8 *ROM = memory_region(machine, "maincpu"); - UINT8 *RAM = memory_region(machine, "proms"); + UINT8 *ROM = machine->region("maincpu")->base(); + UINT8 *RAM = machine->region("proms")->base(); /* Blank out unused garbage in colour prom to avoid colour overflow */ memset(RAM + 0x20, 0, 0xe0); @@ -3461,36 +3461,36 @@ static DRIVER_INIT( meikyuh ) static DRIVER_INIT( cobracom ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( dec8 ); } static DRIVER_INIT( oscar ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( deco222 ); } static DRIVER_INIT( gondo ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 12, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( dec8 ); } static DRIVER_INIT( garyoret ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 16, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( dec8 ); } static DRIVER_INIT( csilver ) { - UINT8 *ROM = memory_region(machine, "maincpu"); - UINT8 *RAM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("maincpu")->base(); + UINT8 *RAM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 14, &ROM[0x10000], 0x4000); memory_configure_bank(machine, "bank3", 0, 2, &RAM[0x10000], 0x4000); @@ -3499,21 +3499,21 @@ static DRIVER_INIT( csilver ) static DRIVER_INIT( shackled ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 14, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( dec8 ); } static DRIVER_INIT( lastmisn ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( dec8 ); } static DRIVER_INIT( srdarwin ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 6, &ROM[0x10000], 0x4000); DRIVER_INIT_CALL( deco222 ); } diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index 158c5e01ea4..e058d6f4a02 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -671,8 +671,8 @@ ROM_END static void descramble_sound( running_machine *machine, const char *tag ) { - UINT8 *rom = memory_region(machine, tag); - int length = memory_region_length(machine, tag); + UINT8 *rom = machine->region(tag)->base(); + int length = machine->region(tag)->bytes(); UINT8 *buf1 = auto_alloc_array(machine, UINT8, length); UINT32 x; diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index f0f37a1f413..aaa326964cd 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -2974,9 +2974,9 @@ static DRIVER_INIT( captaven ) static DRIVER_INIT( dragngun ) { - UINT32 *ROM = (UINT32 *)memory_region(machine, "maincpu"); - const UINT8 *SRC_RAM = memory_region(machine, "gfx1"); - UINT8 *DST_RAM = memory_region(machine, "gfx2"); + UINT32 *ROM = (UINT32 *)machine->region("maincpu")->base(); + const UINT8 *SRC_RAM = machine->region("gfx1")->base(); + UINT8 *DST_RAM = machine->region("gfx2")->base(); deco74_decrypt_gfx(machine, "gfx1"); deco74_decrypt_gfx(machine, "gfx2"); @@ -2998,8 +2998,8 @@ static DRIVER_INIT( fghthist ) static DRIVER_INIT( lockload ) { - UINT8 *RAM = memory_region(machine, "maincpu"); -// UINT32 *ROM = (UINT32 *)memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); +// UINT32 *ROM = (UINT32 *)machine->region("maincpu")->base(); deco74_decrypt_gfx(machine, "gfx1"); deco74_decrypt_gfx(machine, "gfx2"); @@ -3015,7 +3015,7 @@ static DRIVER_INIT( lockload ) static DRIVER_INIT( tattass ) { - UINT8 *RAM = memory_region(machine, "gfx1"); + UINT8 *RAM = machine->region("gfx1")->base(); UINT8 *tmp = auto_alloc_array(machine, UINT8, 0x80000); /* Reorder bitplanes to make decoding easier */ @@ -3023,7 +3023,7 @@ static DRIVER_INIT( tattass ) memcpy(RAM+0x80000,RAM+0x100000,0x80000); memcpy(RAM+0x100000,tmp,0x80000); - RAM = memory_region(machine, "gfx2"); + RAM = machine->region("gfx2")->base(); memcpy(tmp,RAM+0x80000,0x80000); memcpy(RAM+0x80000,RAM+0x100000,0x80000); memcpy(RAM+0x100000,tmp,0x80000); @@ -3036,7 +3036,7 @@ static DRIVER_INIT( tattass ) static DRIVER_INIT( nslasher ) { - UINT8 *RAM = memory_region(machine, "gfx1"); + UINT8 *RAM = machine->region("gfx1")->base(); UINT8 *tmp = auto_alloc_array(machine, UINT8, 0x80000); /* Reorder bitplanes to make decoding easier */ @@ -3044,7 +3044,7 @@ static DRIVER_INIT( nslasher ) memcpy(RAM+0x80000,RAM+0x100000,0x80000); memcpy(RAM+0x100000,tmp,0x80000); - RAM = memory_region(machine, "gfx2"); + RAM = machine->region("gfx2")->base(); memcpy(tmp,RAM+0x80000,0x80000); memcpy(RAM+0x80000,RAM+0x100000,0x80000); memcpy(RAM+0x100000,tmp,0x80000); diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c index 5d5551efeb0..d0c28a2bdbb 100644 --- a/src/mame/drivers/deco_mlc.c +++ b/src/mame/drivers/deco_mlc.c @@ -698,8 +698,8 @@ ROM_END static void descramble_sound( running_machine *machine ) { /* the same as simpl156 / heavy smash? */ - UINT8 *rom = memory_region(machine, "ymz"); - int length = memory_region_length(machine, "ymz"); + UINT8 *rom = machine->region("ymz")->base(); + int length = machine->region("ymz")->bytes(); UINT8 *buf1 = auto_alloc_array(machine, UINT8, length); UINT32 x; diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c index d6a4ac9710f..35d1021796b 100644 --- a/src/mame/drivers/decocass.c +++ b/src/mame/drivers/decocass.c @@ -1325,7 +1325,7 @@ static DRIVER_INIT( decocass ) { decocass_state *state = machine->driver_data(); address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int A; /* allocate memory and mark all RAM regions with their decrypted pointers */ @@ -1349,8 +1349,8 @@ static DRIVER_INIT( decocass ) static DRIVER_INIT( decocrom ) { decocass_state *state = machine->driver_data(); - int romlength = memory_region_length(machine, "user3"); - UINT8 *rom = memory_region(machine, "user3"); + int romlength = machine->region("user3")->bytes(); + UINT8 *rom = machine->region("user3")->base(); int i; state->decrypted2 = auto_alloc_array(machine, UINT8, romlength); @@ -1366,7 +1366,7 @@ static DRIVER_INIT( decocrom ) memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0xafff, 0, 0, "bank1"); memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0xafff, 0, 0, decocass_de0091_w); memory_configure_bank(machine, "bank1", 0, 1, state->charram, 0); - memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user3"), 0); + memory_configure_bank(machine, "bank1", 1, 1, machine->region("user3")->base(), 0); memory_configure_bank_decrypted(machine, "bank1", 0, 1, &state->decrypted[0x6000], 0); memory_configure_bank_decrypted(machine, "bank1", 1, 1, state->decrypted2, 0); memory_set_bank(machine, "bank1", 0); diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c index 43d622fae27..23c4013e1fb 100644 --- a/src/mame/drivers/deshoros.c +++ b/src/mame/drivers/deshoros.c @@ -50,7 +50,7 @@ static void answer_bankswitch(running_machine *machine,UINT8 new_bank) { if(bank!=new_bank) { - UINT8 *ROM = memory_region(machine, "data"); + UINT8 *ROM = machine->region("data")->base(); UINT32 bankaddress; bank = new_bank; diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c index 6d63bfa2435..fc7ccbbd61a 100644 --- a/src/mame/drivers/dgpix.c +++ b/src/mame/drivers/dgpix.c @@ -62,7 +62,7 @@ static INT32 first_offset; static READ32_HANDLER( flash_r ) { - UINT32 *ROM = (UINT32 *)memory_region(space->machine, "user1"); + UINT32 *ROM = (UINT32 *)space->machine->region("user1")->base(); if(offset >= (0x2000000 - flash_roms * 0x400000) / 4) { @@ -99,7 +99,7 @@ static WRITE32_HANDLER( flash_w ) if(data == 0xd0d00000) { // point to game settings - UINT8 *rom = (UINT8 *)memory_region(space->machine, "user1") + offset*4; + UINT8 *rom = (UINT8 *)space->machine->region("user1")->base() + offset*4; // erase one block memset(rom, 0xff, 0x10000); @@ -117,7 +117,7 @@ static WRITE32_HANDLER( flash_w ) } else { - UINT16 *rom = (UINT16 *)memory_region(space->machine, "user1"); + UINT16 *rom = (UINT16 *)space->machine->region("user1")->base(); // write game settings @@ -208,7 +208,7 @@ static NVRAM_HANDLER( flashroms ) if (read_or_write) { // point to game settings - UINT8 *rom = (UINT8 *)memory_region(machine, "user1") + 0x1c00000 + 0x360000; + UINT8 *rom = (UINT8 *)machine->region("user1")->base() + 0x1c00000 + 0x360000; UINT8 tmp[0x40000]; int i; @@ -221,7 +221,7 @@ static NVRAM_HANDLER( flashroms ) else if (file) { // point to game settings - UINT8 *rom = (UINT8 *)memory_region(machine, "user1") + 0x1c00000 + 0x360000; + UINT8 *rom = (UINT8 *)machine->region("user1")->base() + 0x1c00000 + 0x360000; UINT8 tmp[0x40000]; int i; @@ -556,7 +556,7 @@ ROM_END static DRIVER_INIT( xfiles ) { - UINT8 *rom = (UINT8 *)memory_region(machine, "user1") + 0x1c00000; + UINT8 *rom = (UINT8 *)machine->region("user1")->base() + 0x1c00000; rom[BYTE4_XOR_BE(0x3aa92e)] = 3; rom[BYTE4_XOR_BE(0x3aa92f)] = 0; @@ -573,7 +573,7 @@ static DRIVER_INIT( xfiles ) static DRIVER_INIT( kdynastg ) { - UINT8 *rom = (UINT8 *)memory_region(machine, "user1") + 0x1c00000; + UINT8 *rom = (UINT8 *)machine->region("user1")->base() + 0x1c00000; rom[BYTE4_XOR_BE(0x3aaa10)] = 3; // 129f0 - nopped call rom[BYTE4_XOR_BE(0x3aaa11)] = 0; diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 8f4de52ee03..d820f1480f1 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -182,7 +182,7 @@ static VIDEO_UPDATE( discoboy ) #ifdef UNUSED_FUNCTION void discoboy_setrombank( running_machine *machine, UINT8 data ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); data &= 0x2f; memory_set_bankptr(space->machine, "bank1", &ROM[0x6000 + (data * 0x1000)] ); } @@ -536,7 +536,7 @@ ROM_END static DRIVER_INIT( discoboy ) { discoboy_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); state->ram_1 = auto_alloc_array(machine, UINT8, 0x800); state->ram_2 = auto_alloc_array(machine, UINT8, 0x800); diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c index 2a6d1b85d13..d2723b6602b 100644 --- a/src/mame/drivers/djboy.c +++ b/src/mame/drivers/djboy.c @@ -536,9 +536,9 @@ static const kaneko_pandora_interface djboy_pandora_config = static MACHINE_START( djboy ) { djboy_state *state = machine->driver_data(); - UINT8 *MAIN = memory_region(machine, "maincpu"); - UINT8 *CPU1 = memory_region(machine, "cpu1"); - UINT8 *CPU2 = memory_region(machine, "cpu2"); + UINT8 *MAIN = machine->region("maincpu")->base(); + UINT8 *CPU1 = machine->region("cpu1")->base(); + UINT8 *CPU2 = machine->region("cpu2")->base(); memory_configure_bank(machine, "bank1", 0, 4, &MAIN[0x00000], 0x2000); memory_configure_bank(machine, "bank1", 4, 28, &MAIN[0x10000], 0x2000); diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c index 3e5139ce874..3e3a9bf49af 100644 --- a/src/mame/drivers/djmain.c +++ b/src/mame/drivers/djmain.c @@ -114,7 +114,7 @@ static WRITE32_HANDLER( paletteram32_w ) static void sndram_set_bank(running_machine *machine) { - sndram = memory_region(machine, "shared") + 0x80000 * sndram_bank; + sndram = machine->region("shared")->base() + 0x80000 * sndram_bank; } static WRITE32_HANDLER( sndram_bank_w ) @@ -203,7 +203,7 @@ static WRITE32_HANDLER( obj_ctrl_w ) static READ32_HANDLER( obj_rom_r ) { - UINT8 *mem8 = memory_region(space->machine, "gfx1"); + UINT8 *mem8 = space->machine->region("gfx1")->base(); int bank = obj_regs[0x28/4] >> 16; offset += bank * 0x200; @@ -240,7 +240,7 @@ static WRITE32_HANDLER( v_ctrl_w ) static READ32_HANDLER( v_rom_r ) { device_t *k056832 = space->machine->device("k056832"); - UINT8 *mem8 = memory_region(space->machine, "gfx2"); + UINT8 *mem8 = space->machine->region("gfx2")->base(); int bank = k056832_word_r(k056832, 0x34/2, 0xffff); offset *= 2; diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index 5003ae26de0..e58ba130e48 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -424,7 +424,7 @@ static MACHINE_START( dkong2b ) static MACHINE_START( s2650 ) { dkong_state *state = machine->driver_data(); - UINT8 *p = memory_region(machine, "user1"); + UINT8 *p = machine->region("user1")->base(); const char *game_name = machine->gamedrv->name; int i; @@ -487,7 +487,7 @@ static MACHINE_RESET( dkong ) static MACHINE_RESET( strtheat ) { dkong_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); MACHINE_RESET_CALL(dkong); @@ -500,7 +500,7 @@ static MACHINE_RESET( strtheat ) static MACHINE_RESET( drakton ) { dkong_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); MACHINE_RESET_CALL(dkong); @@ -1639,7 +1639,7 @@ static void braze_decrypt_rom(running_machine *machine, UINT8 *dest) UINT32 mem; UINT32 newmem; - ROM = memory_region(machine, "braze"); + ROM = machine->region("braze")->base(); for (mem=0;mem<0x10000;mem++) { @@ -2987,7 +2987,7 @@ static void drakton_decrypt_rom(running_machine *machine, UINT8 mod, int offs, i UINT8 *ROM; int mem; - ROM = memory_region(machine, "maincpu"); + ROM = machine->region("maincpu")->base(); for (mem=0;mem<0x4000;mem++) { @@ -3013,7 +3013,7 @@ static void drakton_decrypt_rom(running_machine *machine, UINT8 mod, int offs, i static DRIVER_INIT( herodk ) { int A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* swap data lines D3 and D4 */ for (A = 0;A < 0x8000;A++) diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c index 86331a960dd..1b512916e71 100644 --- a/src/mame/drivers/dmndrby.c +++ b/src/mame/drivers/dmndrby.c @@ -319,7 +319,7 @@ static TILE_GET_INFO( get_dmndrby_tile_info ) static VIDEO_START(dderby) { - racetrack_tilemap_rom = memory_region(machine,"user1"); + racetrack_tilemap_rom = machine->region("user1")->base(); racetrack_tilemap = tilemap_create(machine,get_dmndrby_tile_info,tilemap_scan_rows,16,16, 16, 512); tilemap_mark_all_tiles_dirty(racetrack_tilemap); @@ -466,7 +466,7 @@ static PALETTE_INIT( dmnderby ) } /* color_prom now points to the beginning of the lookup table */ - color_prom = memory_region(machine,"proms2"); + color_prom = machine->region("proms2")->base(); /* normal tiles use colors 0-15 */ for (i = 0x000; i < 0x300; i++) diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c index f846a90e4db..ebc001609cc 100644 --- a/src/mame/drivers/docastle.c +++ b/src/mame/drivers/docastle.c @@ -165,7 +165,7 @@ static void idsoccer_adpcm_int( device_t *device ) { docastle_state *state = device->machine->driver_data(); - if (state->adpcm_pos >= memory_region_length(device->machine, "adpcm")) + if (state->adpcm_pos >= device->machine->region("adpcm")->bytes()) { state->adpcm_idle = 1; msm5205_reset_w(device, 1); @@ -177,7 +177,7 @@ static void idsoccer_adpcm_int( device_t *device ) } else { - state->adpcm_data = memory_region(device->machine, "adpcm")[state->adpcm_pos++]; + state->adpcm_data = device->machine->region("adpcm")->base()[state->adpcm_pos++]; msm5205_data_w(device, state->adpcm_data >> 4); } } diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c index 85a8499fe27..2b92b4877dd 100644 --- a/src/mame/drivers/dooyong.c +++ b/src/mame/drivers/dooyong.c @@ -67,7 +67,7 @@ static WRITE8_HANDLER( lastday_bankswitch_w ) static MACHINE_START( lastday ) { - memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, machine->region("maincpu")->base() + 0x10000, 0x4000); } static WRITE8_HANDLER( flip_screen_w ) diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c index 1e515c3c595..492bfeb55a1 100644 --- a/src/mame/drivers/dorachan.c +++ b/src/mame/drivers/dorachan.c @@ -87,7 +87,7 @@ static VIDEO_UPDATE( dorachan ) get_pens(pens); - color_map_base = memory_region(screen->machine, "proms"); + color_map_base = screen->machine->region("proms")->base(); for (offs = 0; offs < state->videoram_size; offs++) { diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index 281f978c9a2..861705c7c1a 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -119,7 +119,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect const gfx_element *gfx = machine->gfx[0]; UINT32 *source = state->spriteram; UINT32 *finish = state->spriteram + 0x1000 / 4; - UINT16 *redirect = (UINT16 *)memory_region(machine, "gfx3"); + UINT16 *redirect = (UINT16 *)machine->region("gfx3")->base(); while (source < finish) { @@ -252,8 +252,8 @@ static READ32_HANDLER( dreamwld_protdata_r ) { dreamwld_state *state = space->machine->driver_data(); - UINT8 *protdata = memory_region(space->machine, "user1"); - size_t protsize = memory_region_length(space->machine, "user1"); + UINT8 *protdata = space->machine->region("user1")->base(); + size_t protsize = space->machine->region("user1")->bytes(); UINT8 dat = protdata[(state->protindex++) % protsize]; return dat << 24; } @@ -279,7 +279,7 @@ static void dreamwld_oki_setbank( running_machine *machine, UINT8 chip, UINT8 ba { /* 0x30000-0x3ffff is banked. banks are at 0x30000,0x40000,0x50000 and 0x60000 in rom */ - UINT8 *sound = memory_region(machine, chip ? "oki1" : "oki2"); + UINT8 *sound = machine->region(chip ? "oki1" : "oki2")->base(); logerror("OKI%d: set bank %02x\n", chip, bank); memcpy(sound + 0x30000, sound + 0xb0000 + 0x10000 * bank, 0x10000); } diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c index 6d25ec76787..f74628457f4 100644 --- a/src/mame/drivers/drgnmst.c +++ b/src/mame/drivers/drgnmst.c @@ -495,9 +495,9 @@ static UINT8 drgnmst_asciitohex( UINT8 data ) static DRIVER_INIT( drgnmst ) { - UINT8 *drgnmst_PICROM_HEX = memory_region(machine, "user1"); - UINT16 *drgnmst_PICROM = (UINT16 *)memory_region(machine, "audiocpu"); - UINT8 *drgnmst_PCM = memory_region(machine, "oki1"); + UINT8 *drgnmst_PICROM_HEX = machine->region("user1")->base(); + UINT16 *drgnmst_PICROM = (UINT16 *)machine->region("audiocpu")->base(); + UINT8 *drgnmst_PCM = machine->region("oki1")->base(); INT32 offs, data; UINT16 src_pos = 0; UINT16 dst_pos = 0; diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c index e81c39442bb..6ee8d85df02 100644 --- a/src/mame/drivers/drmicro.c +++ b/src/mame/drivers/drmicro.c @@ -46,7 +46,7 @@ static WRITE8_HANDLER( nmi_enable_w ) static void pcm_w(device_t *device) { drmicro_state *state = device->machine->driver_data(); - UINT8 *PCM = memory_region(device->machine, "adpcm"); + UINT8 *PCM = device->machine->region("adpcm")->base(); int data = PCM[state->pcm_adr / 2]; diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c index 5276c4c0a79..5fc87535509 100644 --- a/src/mame/drivers/drw80pkr.c +++ b/src/mame/drivers/drw80pkr.c @@ -371,7 +371,7 @@ GFXDECODE_END static DRIVER_INIT( drw80pkr ) { - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu"), 0x1000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base(), 0x1000); } diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index 3df83042dbd..cc094d0e27a 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -338,7 +338,7 @@ static WRITE8_HANDLER( dunhuang_block_h_w ) state->block_h = data; - tile_addr = memory_region(space->machine, "gfx2") + ((state->block_addr_hi << 8) + state->block_addr_lo) * 4; + tile_addr = space->machine->region("gfx2")->base() + ((state->block_addr_hi << 8) + state->block_addr_lo) * 4; switch (state->block_dest) { @@ -765,7 +765,7 @@ static const ay8910_interface dunhuang_ay8910_interface = static MACHINE_START( dunhuang ) { dunhuang_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x8000); diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index b12e8c3d8e6..c43988728fa 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -1141,8 +1141,8 @@ static DRIVER_INIT(dwarfd) UINT8 *src, *dst; /* expand gfx roms */ - src = memory_region(machine, "gfx1"); - dst = memory_region(machine, "gfx2"); + src = machine->region("gfx1")->base(); + dst = machine->region("gfx2")->base(); for (i = 0; i < 0x4000; i++) { @@ -1155,7 +1155,7 @@ static DRIVER_INIT(dwarfd) } /* use low bit as 'interpolation' bit */ - src = memory_region(machine, "gfx2"); + src = machine->region("gfx2")->base(); for (i = 0; i < 0x8000; i++) { if (src[i] & 0x10) @@ -1189,12 +1189,12 @@ static DRIVER_INIT(qc) DRIVER_INIT_CALL(dwarfd); // hacks for program to proceed - memory_region(machine, "maincpu")[0x6564] = 0x00; - memory_region(machine, "maincpu")[0x6565] = 0x00; + machine->region("maincpu")->base()[0x6564] = 0x00; + machine->region("maincpu")->base()[0x6565] = 0x00; - memory_region(machine, "maincpu")[0x59b2] = 0x00; - memory_region(machine, "maincpu")[0x59b3] = 0x00; - memory_region(machine, "maincpu")[0x59b4] = 0x00; + machine->region("maincpu")->base()[0x59b2] = 0x00; + machine->region("maincpu")->base()[0x59b3] = 0x00; + machine->region("maincpu")->base()[0x59b4] = 0x00; } diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index 9c2c231b6a8..4758ee53142 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -293,10 +293,10 @@ ROM_END static DRIVER_INIT( dynadice ) { int i, j; - UINT8 *usr1 = memory_region(machine, "user1"); - UINT8 *cpu2 = memory_region(machine, "audiocpu"); - UINT8 *gfx1 = memory_region(machine, "gfx1"); - UINT8 *gfx2 = memory_region(machine, "gfx2"); + UINT8 *usr1 = machine->region("user1")->base(); + UINT8 *cpu2 = machine->region("audiocpu")->base(); + UINT8 *gfx1 = machine->region("gfx1")->base(); + UINT8 *gfx2 = machine->region("gfx2")->base(); cpu2[0x0b] = 0x23; /* bug in game code Dec HL -> Inc HL*/ diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index 4ca6b88ac8f..9d5a5af134d 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -288,7 +288,7 @@ static WRITE8_HANDLER( jantouki_sound_rombank_w ) static WRITE8_HANDLER( hnoridur_rombank_w ) { dynax_state *state = space->machine->driver_data(); - int bank_n = (memory_region_length(space->machine, "maincpu") - 0x10000) / 0x8000; + int bank_n = (space->machine->region("maincpu")->bytes() - 0x10000) / 0x8000; //logerror("%04x: rom bank = %02x\n", cpu_get_pc(space->cpu), data); if (data < bank_n) @@ -327,7 +327,7 @@ static WRITE8_HANDLER( hnoridur_palette_w ) // hnoridur: R/W RAM case 0x18: { - UINT8 *RAM = memory_region(space->machine, "maincpu") + 0x10000 + state->hnoridur_bank * 0x8000; + UINT8 *RAM = space->machine->region("maincpu")->base() + 0x10000 + state->hnoridur_bank * 0x8000; RAM[offset] = data; return; } @@ -1405,7 +1405,7 @@ static WRITE8_HANDLER( tenkai_palette_w ) static void tenkai_update_rombank( running_machine *machine ) { dynax_state *state = machine->driver_data(); - state->romptr = memory_region(machine, "maincpu") + 0x10000 + 0x8000 * state->rombank; + state->romptr = machine->region("maincpu")->base() + 0x10000 + 0x8000 * state->rombank; // logerror("rombank = %02x\n", state->rombank); } @@ -1611,7 +1611,7 @@ static void gekisha_set_rombank( running_machine *machine, UINT8 data ) { dynax_state *state = machine->driver_data(); state->rombank = data; - state->romptr = memory_region(machine, "maincpu") + 0x8000 + state->rombank * 0x8000; + state->romptr = machine->region("maincpu")->base() + 0x8000 + state->rombank * 0x8000; } static WRITE8_HANDLER( gekisha_p4_w ) @@ -4283,7 +4283,7 @@ static MACHINE_RESET( dynax ) static MACHINE_START( hanamai ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 0x10, &ROM[0x8000], 0x8000); MACHINE_START_CALL(dynax); @@ -4291,8 +4291,8 @@ static MACHINE_START( hanamai ) static MACHINE_START( hnoridur ) { - UINT8 *ROM = memory_region(machine, "maincpu"); - int bank_n = (memory_region_length(machine, "maincpu") - 0x10000) / 0x8000; + UINT8 *ROM = machine->region("maincpu")->base(); + int bank_n = (machine->region("maincpu")->bytes() - 0x10000) / 0x8000; memory_configure_bank(machine, "bank1", 0, bank_n, &ROM[0x10000], 0x8000); @@ -4301,7 +4301,7 @@ static MACHINE_START( hnoridur ) static MACHINE_START( htengoku ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x8000); @@ -4675,8 +4675,8 @@ static const msm5205_interface jantouki_msm5205_interface = static MACHINE_START( jantouki ) { dynax_state *state = machine->driver_data(); - UINT8 *MAIN = memory_region(machine, "maincpu"); - UINT8 *SOUND = memory_region(machine, "soundcpu"); + UINT8 *MAIN = machine->region("maincpu")->base(); + UINT8 *SOUND = machine->region("soundcpu")->base(); memory_configure_bank(machine, "bank1", 0, 0x10, &MAIN[0x8000], 0x8000); memory_configure_bank(machine, "bank2", 0, 12, &SOUND[0x8000], 0x8000); @@ -5385,7 +5385,7 @@ ROM_END static DRIVER_INIT( blktouch ) { // fearsome encryption ;-) - UINT8 *src = (UINT8 *)memory_region(machine, "maincpu"); + UINT8 *src = (UINT8 *)machine->region("maincpu")->base(); int i; for (i = 0; i < 0x90000; i++) @@ -5394,7 +5394,7 @@ static DRIVER_INIT( blktouch ) } - src = (UINT8 *)memory_region(machine, "gfx1"); + src = (UINT8 *)machine->region("gfx1")->base(); for (i = 0; i < 0xc0000; i++) { @@ -5407,8 +5407,8 @@ static DRIVER_INIT( maya ) { /* Address lines scrambling on 1 z80 rom */ int i; - UINT8 *gfx = (UINT8 *)memory_region(machine, "gfx1"); - UINT8 *rom = memory_region(machine, "maincpu") + 0x28000, *end = rom + 0x10000; + UINT8 *gfx = (UINT8 *)machine->region("gfx1")->base(); + UINT8 *rom = machine->region("maincpu")->base() + 0x28000, *end = rom + 0x10000; for ( ; rom < end; rom += 8) { UINT8 temp[8]; @@ -6125,8 +6125,8 @@ ROM_END static DRIVER_INIT( mjelct3 ) { int i; - UINT8 *rom = memory_region(machine, "maincpu"); - size_t size = memory_region_length(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); + size_t size = machine->region("maincpu")->bytes(); UINT8 *rom1 = auto_alloc_array(machine, UINT8, size); memcpy(rom1, rom, size); @@ -6138,8 +6138,8 @@ static DRIVER_INIT( mjelct3 ) static DRIVER_INIT( mjelct3a ) { int i, j; - UINT8 *rom = memory_region(machine, "maincpu"); - size_t size = memory_region_length(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); + size_t size = machine->region("maincpu")->bytes(); UINT8 *rom1 = auto_alloc_array(machine, UINT8, size); memcpy(rom1, rom, size); diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index 665522cd24f..0923f948ab5 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -203,7 +203,7 @@ static VIDEO_UPDATE( enigma2 ) pen_t pens[NUM_PENS]; const rectangle &visarea = screen->visible_area(); - UINT8 *prom = memory_region(screen->machine, "proms"); + UINT8 *prom = screen->machine->region("proms")->base(); UINT8 *color_map_base = state->flip_screen ? &prom[0x0400] : &prom[0x0000]; UINT8 *star_map_base = (state->blink_count & 0x08) ? &prom[0x0c00] : &prom[0x0800]; @@ -710,7 +710,7 @@ ROM_END static DRIVER_INIT(enigma2) { offs_t i; - UINT8 *rom = memory_region(machine, "audiocpu"); + UINT8 *rom = machine->region("audiocpu")->base(); for(i = 0; i < 0x2000; i++) { diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c index 3ff655a8dde..eecc9d358ca 100644 --- a/src/mame/drivers/eolith.c +++ b/src/mame/drivers/eolith.c @@ -1041,7 +1041,7 @@ static DRIVER_INIT( landbrka ) //it fails compares with memories: //$4002d338 -> $4002d348 .... $4002d33f -> $4002d34f //related with bits 0x100 - 0x200 read at startup from input(0) ? - UINT32 *rombase = (UINT32*)memory_region(machine, "maincpu"); + UINT32 *rombase = (UINT32*)machine->region("maincpu")->base(); rombase[0x14f00/4] = (rombase[0x14f00/4] & 0xffff) | 0x03000000; /* Change BR to NOP */ coin_counter_bit = 0x2000; @@ -1051,7 +1051,7 @@ static DRIVER_INIT( landbrka ) static DRIVER_INIT( hidctch2 ) { //it fails compares in memory like in landbrka - UINT32 *rombase = (UINT32*)memory_region(machine, "maincpu"); + UINT32 *rombase = (UINT32*)machine->region("maincpu")->base(); rombase[0xbcc8/4] = (rombase[0xbcc8/4] & 0xffff) | 0x03000000; /* Change BR to NOP */ init_eolith_speedup(machine); } diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c index 2932059619c..f56efbb94e1 100644 --- a/src/mame/drivers/epos.c +++ b/src/mame/drivers/epos.c @@ -382,7 +382,7 @@ static MACHINE_RESET( epos ) static MACHINE_START( dealer ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x0000], 0x10000); memory_configure_bank(machine, "bank2", 0, 2, &ROM[0x6000], 0x1000); @@ -612,7 +612,7 @@ ROM_END static DRIVER_INIT( dealer ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int A; /* Key 0 */ diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c index d1cdc28a3ec..2d8fba4ad50 100644 --- a/src/mame/drivers/equites.c +++ b/src/mame/drivers/equites.c @@ -1853,7 +1853,7 @@ ROM_END static void unpack_block( running_machine *machine, const char *region, int offset, int size ) { - UINT8 *rom = memory_region(machine, region); + UINT8 *rom = machine->region(region)->base(); int i; for (i = 0; i < size; ++i) diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 0dfea2ffb96..2e9db1c0c28 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -519,7 +519,7 @@ GFXDECODE_END static MACHINE_START( esd16 ) { esd16_state *state = machine->driver_data(); - UINT8 *AUDIO = memory_region(machine, "audiocpu"); + UINT8 *AUDIO = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 17, &AUDIO[0x0000], 0x4000); diff --git a/src/mame/drivers/esripsys.c b/src/mame/drivers/esripsys.c index eb7ad7547e9..bf60dd01126 100644 --- a/src/mame/drivers/esripsys.c +++ b/src/mame/drivers/esripsys.c @@ -140,7 +140,7 @@ static READ8_HANDLER( g_status_r ) static WRITE8_HANDLER( g_status_w ) { int bankaddress; - UINT8 *rom = memory_region(space->machine, "game_cpu"); + UINT8 *rom = space->machine->region("game_cpu")->base(); g_status = data; @@ -523,7 +523,7 @@ static WRITE8_HANDLER( s_200e_w ) static WRITE8_HANDLER( s_200f_w ) { - UINT8 *rom = memory_region(space->machine, "sound_data"); + UINT8 *rom = space->machine->region("sound_data")->base(); int rombank = data & 0x20 ? 0x2000 : 0; /* Bit 6 -> Reset latch U56A */ @@ -675,7 +675,7 @@ ADDRESS_MAP_END static DRIVER_INIT( esripsys ) { - UINT8 *rom = memory_region(machine, "sound_data"); + UINT8 *rom = machine->region("sound_data")->base(); fdt_a = auto_alloc_array(machine, UINT8, FDT_RAM_SIZE); fdt_b = auto_alloc_array(machine, UINT8, FDT_RAM_SIZE); diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c index c93c2840387..4a617f9f759 100644 --- a/src/mame/drivers/ettrivia.c +++ b/src/mame/drivers/ettrivia.c @@ -71,7 +71,7 @@ static WRITE8_HANDLER( ettrivia_control_w ) static READ8_HANDLER( ettrivia_question_r ) { - UINT8 *QUESTIONS = memory_region(space->machine, "user1"); + UINT8 *QUESTIONS = space->machine->region("user1")->base(); return QUESTIONS[offset + 0x10000 * question_bank]; } diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c index 4ffcc4b1226..cfc8ae470f2 100644 --- a/src/mame/drivers/exerion.c +++ b/src/mame/drivers/exerion.c @@ -167,7 +167,7 @@ static WRITE8_DEVICE_HANDLER( exerion_portb_w ) { exerion_state *state = device->machine->driver_data(); /* pull the expected value from the ROM */ - state->porta = memory_region(device->machine, "maincpu")[0x5f76]; + state->porta = device->machine->region("maincpu")->base()[0x5f76]; state->portb = data; logerror("Port B = %02X\n", data); @@ -178,7 +178,7 @@ static READ8_HANDLER( exerion_protection_r ) { exerion_state *state = space->machine->driver_data(); if (cpu_get_pc(space->cpu) == 0x4143) - return memory_region(space->machine, "maincpu")[0x33c0 + (state->main_ram[0xd] << 2) + offset]; + return space->machine->region("maincpu")->base()[0x33c0 + (state->main_ram[0xd] << 2) + offset]; else return state->main_ram[0x8 + offset]; } @@ -562,8 +562,8 @@ static DRIVER_INIT( exerion ) /* make a temporary copy of the character data */ src = temp; - dst = memory_region(machine, "gfx1"); - length = memory_region_length(machine, "gfx1"); + dst = machine->region("gfx1")->base(); + length = machine->region("gfx1")->bytes(); memcpy(src, dst, length); /* decode the characters */ @@ -580,8 +580,8 @@ static DRIVER_INIT( exerion ) /* make a temporary copy of the sprite data */ src = temp; - dst = memory_region(machine, "gfx2"); - length = memory_region_length(machine, "gfx2"); + dst = machine->region("gfx2")->base(); + length = machine->region("gfx2")->bytes(); memcpy(src, dst, length); /* decode the sprites */ @@ -603,7 +603,7 @@ static DRIVER_INIT( exerion ) static DRIVER_INIT( exerionb ) { - UINT8 *ram = memory_region(machine, "maincpu"); + UINT8 *ram = machine->region("maincpu")->base(); int addr; /* the program ROMs have data lines D1 and D2 swapped. Decode them. */ diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c index 478fa18aef5..ccee8863ad0 100644 --- a/src/mame/drivers/exidy.c +++ b/src/mame/drivers/exidy.c @@ -173,7 +173,7 @@ static CUSTOM_INPUT( teetert_input_r ) static WRITE8_HANDLER( fax_bank_select_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); memory_set_bankptr(space->machine, "bank1", &RAM[0x10000 + (0x2000 * (data & 0x1f))]); if ((data & 0x1f) > 0x17) @@ -1419,7 +1419,7 @@ static DRIVER_INIT( phantoma ) /* the ROM is actually mapped high */ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xf800, 0xffff, 0, 0, "bank1"); - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0xf800); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0xf800); } diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c index b5b905f89df..1811eb47031 100644 --- a/src/mame/drivers/exidy440.c +++ b/src/mame/drivers/exidy440.c @@ -296,7 +296,7 @@ void exidy440_bank_select(running_machine *machine, UINT8 bank) /* select the bank and update the bank pointer */ exidy440_bank = bank; - memory_set_bankptr(machine, "bank1", &memory_region(machine, "maincpu")[0x10000 + exidy440_bank * 0x4000]); + memory_set_bankptr(machine, "bank1", &machine->region("maincpu")->base()[0x10000 + exidy440_bank * 0x4000]); } @@ -305,7 +305,7 @@ static WRITE8_HANDLER( bankram_w ) /* EEROM lives in the upper 8k of bank 15 */ if (exidy440_bank == 15 && offset >= 0x2000) { - memory_region(space->machine, "maincpu")[0x10000 + 15 * 0x4000 + offset] = data; + space->machine->region("maincpu")->base()[0x10000 + 15 * 0x4000 + offset] = data; logerror("W EEROM[%04X] = %02X\n", offset - 0x2000, data); } @@ -435,7 +435,7 @@ static WRITE8_HANDLER( topsecex_yscroll_w ) static MACHINE_START( exidy440 ) { /* the EEROM lives in the uppermost 8k of the top bank */ - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); machine->device("nvram")->set_base(&rom[0x10000 + 15 * 0x4000 + 0x2000], 0x2000); } diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c index 7271290c2c7..5c24bb99889 100644 --- a/src/mame/drivers/expro02.c +++ b/src/mame/drivers/expro02.c @@ -296,7 +296,7 @@ static WRITE16_HANDLER( galsnew_6295_bankswitch_w ) { if (ACCESSING_BITS_8_15) { - UINT8 *rom = memory_region(space->machine, "oki"); + UINT8 *rom = space->machine->region("oki")->base(); memcpy(&rom[0x30000],&rom[0x40000 + ((data >> 8) & 0x0f) * 0x10000],0x10000); } } @@ -724,8 +724,8 @@ ROM_END static DRIVER_INIT(galsnew) { - UINT32 *src = (UINT32 *)memory_region(machine, "gfx3" ); - UINT32 *dst = (UINT32 *)memory_region(machine, "gfx2" ); + UINT32 *src = (UINT32 *)machine->region("gfx3" )->base(); + UINT32 *dst = (UINT32 *)machine->region("gfx2" )->base(); int x, offset; diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c index d1b38675740..d48a1e52cc6 100644 --- a/src/mame/drivers/exprraid.c +++ b/src/mame/drivers/exprraid.c @@ -737,7 +737,7 @@ static void exprraid_gfx_expand(running_machine *machine) { /* Expand the background rom so we can use regular decode routines */ - UINT8 *gfx = memory_region(machine, "gfx3"); + UINT8 *gfx = machine->region("gfx3")->base(); int offs = 0x10000 - 0x1000; int i; @@ -756,7 +756,7 @@ static void exprraid_gfx_expand(running_machine *machine) static DRIVER_INIT( wexpress ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* HACK: this set uses M6502 irq vectors but DECO CPU-16 opcodes??? */ rom[0xfff7] = rom[0xfffa]; diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c index 2c3b37a1e68..cea6cb82fe5 100644 --- a/src/mame/drivers/exzisus.c +++ b/src/mame/drivers/exzisus.c @@ -57,7 +57,7 @@ static UINT8 *exzisus_sharedram_ac; static WRITE8_HANDLER( exzisus_cpua_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "cpua"); + UINT8 *RAM = space->machine->region("cpua")->base(); static int exzisus_cpua_bank = 0; if ( (data & 0x0f) != exzisus_cpua_bank ) @@ -74,7 +74,7 @@ static WRITE8_HANDLER( exzisus_cpua_bankswitch_w ) static WRITE8_HANDLER( exzisus_cpub_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "cpub"); + UINT8 *RAM = space->machine->region("cpub")->base(); static int exzisus_cpub_bank = 0; if ( (data & 0x0f) != exzisus_cpub_bank ) @@ -128,7 +128,7 @@ static WRITE8_HANDLER( exzisus_cpub_reset_w ) // the RAM check to work static DRIVER_INIT( exzisus ) { - UINT8 *RAM = memory_region(machine, "cpua"); + UINT8 *RAM = machine->region("cpua")->base(); /* Fix WORK RAM error */ RAM[0x67fd] = 0x18; diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index e6c7dab0e34..f27dd057e6c 100644 --- a/src/mame/drivers/f1gp.c +++ b/src/mame/drivers/f1gp.c @@ -42,7 +42,7 @@ static WRITE16_HANDLER( sharedram_w ) static READ16_HANDLER( extrarom_r ) { - UINT8 *rom = memory_region(space->machine, "user1"); + UINT8 *rom = space->machine->region("user1")->base(); offset *= 2; @@ -51,7 +51,7 @@ static READ16_HANDLER( extrarom_r ) static READ16_HANDLER( extrarom2_r ) { - UINT8 *rom = memory_region(space->machine, "user2"); + UINT8 *rom = space->machine->region("user2")->base(); offset *= 2; @@ -168,8 +168,8 @@ static WRITE16_HANDLER( f1gpb_misc_w ) if(old_bank != new_bank && new_bank < 5) { // oki banking - UINT8 *src = memory_region(space->machine, "oki") + 0x40000 + 0x10000 * new_bank; - UINT8 *dst = memory_region(space->machine, "oki") + 0x30000; + UINT8 *src = space->machine->region("oki")->base() + 0x40000 + 0x10000 * new_bank; + UINT8 *dst = space->machine->region("oki")->base() + 0x30000; memcpy(dst, src, 0x10000); old_bank = new_bank; @@ -445,7 +445,7 @@ static MACHINE_START( f1gpb ) static MACHINE_START( f1gp ) { f1gp_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x8000); diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index 9ebdf4539ef..17e514ce3bb 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -373,8 +373,8 @@ static void borntofi_adpcm_int( device_t *device, int voice ) if (!state->adpcm_playing[voice]) return; - rom = memory_region(device->machine, "adpcm"); - len = memory_region_length(device->machine, "adpcm") * 2; + rom = device->machine->region("adpcm")->base(); + len = device->machine->region("adpcm")->bytes() * 2; start = state->adpcm_addr[0][voice] + state->adpcm_nibble[voice]; stop = state->adpcm_addr[1][voice]; diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c index 49f4655e307..636dba13637 100644 --- a/src/mame/drivers/fastfred.c +++ b/src/mame/drivers/fastfred.c @@ -142,7 +142,7 @@ static WRITE8_HANDLER( imago_sprites_bank_w ) static WRITE8_HANDLER( imago_sprites_dma_w ) { - UINT8 *rom = (UINT8 *)memory_region(space->machine, "gfx2"); + UINT8 *rom = (UINT8 *)space->machine->region("gfx2")->base(); UINT8 sprites_data; sprites_data = rom[imago_sprites_address + 0x2000*0 + imago_sprites_bank * 0x1000]; diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c index d8ac72e5021..1382f89195e 100644 --- a/src/mame/drivers/fastlane.c +++ b/src/mame/drivers/fastlane.c @@ -202,7 +202,7 @@ static const k007232_interface k007232_interface_2 = static MACHINE_START( fastlane ) { fastlane_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c index 20b4a37f9bc..d2a797e1edd 100644 --- a/src/mame/drivers/fcombat.c +++ b/src/mame/drivers/fcombat.c @@ -108,7 +108,7 @@ static READ8_HANDLER(e300_r) int wx = (state->tx + state->fcombat_sh) / 16; int wy = (state->ty * 2 + state->fcombat_sv) / 16; - return memory_region(space->machine, "user2")[wx * 32 * 16 + wy]; + return space->machine->region("user2")->base()[wx * 32 * 16 + wy]; } static WRITE8_HANDLER(ee00_w) @@ -348,8 +348,8 @@ static DRIVER_INIT( fcombat ) /* make a temporary copy of the character data */ src = temp; - dst = memory_region(machine, "gfx1"); - length = memory_region_length(machine, "gfx1"); + dst = machine->region("gfx1")->base(); + length = machine->region("gfx1")->bytes(); memcpy(src, dst, length); /* decode the characters */ @@ -366,8 +366,8 @@ static DRIVER_INIT( fcombat ) /* make a temporary copy of the sprite data */ src = temp; - dst = memory_region(machine, "gfx2"); - length = memory_region_length(machine, "gfx2"); + dst = machine->region("gfx2")->base(); + length = machine->region("gfx2")->bytes(); memcpy(src, dst, length); /* decode the sprites */ @@ -387,8 +387,8 @@ static DRIVER_INIT( fcombat ) /* make a temporary copy of the character data */ src = temp; - dst = memory_region(machine, "gfx3"); - length = memory_region_length(machine, "gfx3"); + dst = machine->region("gfx3")->base(); + length = machine->region("gfx3")->bytes(); memcpy(src, dst, length); /* decode the characters */ @@ -406,8 +406,8 @@ static DRIVER_INIT( fcombat ) } src = temp; - dst = memory_region(machine, "user1"); - length = memory_region_length(machine, "user1"); + dst = machine->region("user1")->base(); + length = machine->region("user1")->bytes(); memcpy(src, dst, length); for (oldaddr = 0; oldaddr < 32; oldaddr++) @@ -418,8 +418,8 @@ static DRIVER_INIT( fcombat ) src = temp; - dst = memory_region(machine, "user2"); - length = memory_region_length(machine, "user2"); + dst = machine->region("user2")->base(); + length = machine->region("user2")->bytes(); memcpy(src, dst, length); for (oldaddr = 0; oldaddr < 32; oldaddr++) diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c index e9f026422fc..2f266f0ceb3 100644 --- a/src/mame/drivers/fcrash.c +++ b/src/mame/drivers/fcrash.c @@ -692,7 +692,7 @@ static const msm5205_interface msm5205_interface2 = static MACHINE_START( fcrash ) { cps_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "soundcpu"); + UINT8 *ROM = machine->region("soundcpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c index 0921aceeab3..2cb776c92bd 100644 --- a/src/mame/drivers/feversoc.c +++ b/src/mame/drivers/feversoc.c @@ -282,7 +282,7 @@ ROM_END static DRIVER_INIT( feversoc ) { - seibuspi_rise11_sprite_decrypt_feversoc(memory_region(machine, "gfx1"), 0x200000); + seibuspi_rise11_sprite_decrypt_feversoc(machine->region("gfx1")->base(), 0x200000); } GAME( 2004, feversoc, 0, feversoc, feversoc, feversoc, ROT0, "Seibu Kaihatsu", "Fever Soccer", 0 ) diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c index d5ac66d7de7..26c57a80752 100644 --- a/src/mame/drivers/firebeat.c +++ b/src/mame/drivers/firebeat.c @@ -1899,7 +1899,7 @@ static MACHINE_RESET( firebeat ) { void *cd; int i; - UINT8 *sound = memory_region(machine, "ymz"); + UINT8 *sound = machine->region("ymz")->base(); for (i=0; i < 0x200000; i++) { @@ -2179,7 +2179,7 @@ static void init_lights(running_machine *machine, write32_space_func out1, write static void init_firebeat(running_machine *machine) { - UINT8 *rom = memory_region(machine, "user2"); + UINT8 *rom = machine->region("user2")->base(); atapi_init(machine); diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index c283da0dc0c..f9fbdda5044 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -429,7 +429,7 @@ static void firq_gen(device_t *device, int state) static MACHINE_START( firefox ) { - memory_configure_bank(machine, "bank1", 0, 32, memory_region(machine, "maincpu") + 0x10000, 0x1000); + memory_configure_bank(machine, "bank1", 0, 32, machine->region("maincpu")->base() + 0x10000, 0x1000); nvram_1c = machine->device("nvram_1c"); nvram_1d = machine->device("nvram_1d"); diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c index f123015edc6..cf26281d39c 100644 --- a/src/mame/drivers/firetrap.c +++ b/src/mame/drivers/firetrap.c @@ -623,8 +623,8 @@ static INTERRUPT_GEN( bootleg ) static MACHINE_START( firetrap ) { firetrap_state *state = machine->driver_data(); - UINT8 *MAIN = memory_region(machine, "maincpu"); - UINT8 *SOUND = memory_region(machine, "audiocpu"); + UINT8 *MAIN = machine->region("maincpu")->base(); + UINT8 *SOUND = machine->region("audiocpu")->base(); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c index 2512634d3a6..8ef78a64bf0 100644 --- a/src/mame/drivers/fitfight.c +++ b/src/mame/drivers/fitfight.c @@ -975,7 +975,7 @@ ROM_END static DRIVER_INIT( fitfight ) { -// UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); +// UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base(); // mem16[0x0165B2/2] = 0x4e71; // for now so it boots fitfight_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x700000, 0x700001, 0, 0, fitfight_700000_r); @@ -984,7 +984,7 @@ static DRIVER_INIT( fitfight ) static DRIVER_INIT( histryma ) { -// UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); +// UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base(); // mem16[0x017FDC/2] = 0x4e71; // for now so it boots fitfight_state *state = machine->driver_data(); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x700000, 0x700001, 0, 0, histryma_700000_r); diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index 03ba0cf61b0..80038e5dcd0 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -198,7 +198,7 @@ static const k007232_interface k007232_config = static MACHINE_START( flkatck ) { flkatck_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 3, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 3d6040d9cd7..a9a0966df52 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -380,7 +380,7 @@ static MACHINE_RESET( flyball ) int i; /* address bits 0 through 8 are inverted */ - UINT8* ROM = memory_region(machine, "maincpu") + 0x2000; + UINT8* ROM = machine->region("maincpu")->base() + 0x2000; for (i = 0; i < 0x1000; i++) state->rombase[i] = ROM[i ^ 0x1ff]; diff --git a/src/mame/drivers/forte2.c b/src/mame/drivers/forte2.c index d9792fc8b12..246d0e16d16 100644 --- a/src/mame/drivers/forte2.c +++ b/src/mame/drivers/forte2.c @@ -148,8 +148,8 @@ MACHINE_CONFIG_END static DRIVER_INIT(pesadelo) { int i; - UINT8 *mem = memory_region(machine, "maincpu"); - int memsize = memory_region_length(machine, "maincpu"); + UINT8 *mem = machine->region("maincpu")->base(); + int memsize = machine->region("maincpu")->bytes(); UINT8 *buf; // data swap diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c index f6aaf79a2a3..1ea25ff06a7 100644 --- a/src/mame/drivers/freekick.c +++ b/src/mame/drivers/freekick.c @@ -526,7 +526,7 @@ static WRITE8_DEVICE_HANDLER( snd_rom_addr_h_w ) static READ8_DEVICE_HANDLER( snd_rom_r ) { freekick_state *state = device->machine->driver_data(); - return memory_region(device->machine, "user1")[state->romaddr & 0x7fff]; + return device->machine->region("user1")->base()[state->romaddr & 0x7fff]; } static const ppi8255_interface ppi8255_intf[2] = @@ -616,7 +616,7 @@ static MACHINE_RESET( freekick ) static MACHINE_START( pbillrd ) { - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0x10000, 0x4000); MACHINE_START_CALL(freekick); } @@ -1107,7 +1107,7 @@ ROM_END static DRIVER_INIT(gigasb) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - space->set_decrypted_region(0x0000, 0xbfff, memory_region(machine, "maincpu") + 0x10000); + space->set_decrypted_region(0x0000, 0xbfff, machine->region("maincpu")->base() + 0x10000); } diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index f8907d89582..008967f3e58 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -536,9 +536,9 @@ static MACHINE_START( fromanc2 ) { fromanc2_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "sub"), 0x4000); - memory_configure_bank(machine, "bank2", 0, 1, memory_region(machine, "sub") + 0x08000, 0x4000); - memory_configure_bank(machine, "bank2", 1, 3, memory_region(machine, "sub") + 0x14000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("sub")->base(), 0x4000); + memory_configure_bank(machine, "bank2", 0, 1, machine->region("sub")->base() + 0x08000, 0x4000); + memory_configure_bank(machine, "bank2", 1, 3, machine->region("sub")->base() + 0x14000, 0x4000); MACHINE_START_CALL(fromanc4); diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c index 7187ddaab09..aa3d9a97ddc 100644 --- a/src/mame/drivers/fromance.c +++ b/src/mame/drivers/fromance.c @@ -961,7 +961,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( fromance ) { fromance_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "sub"); + UINT8 *ROM = machine->region("sub")->base(); memory_configure_bank(machine, "bank1", 0, 0x100, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index a3afbb19f42..20c9ade1a89 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -810,7 +810,7 @@ static UINT8 funquiz_question_bank = 0x80; static READ8_HANDLER( questions_r ) { - UINT8* quiz = memory_region(space->machine,"questions"); + UINT8* quiz = space->machine->region("questions")->base(); int extraoffset = ((funquiz_question_bank & 0x1f) * 0x8000); // if 0x80 is set, read the 2nd half of the question rom (contains header info) @@ -4049,7 +4049,7 @@ static DRIVER_INIT( tabblue ) *****************************************************************************************************/ int x, na, nb, nad, nbd; - UINT8 *src = memory_region( machine, "gfx1" ); + UINT8 *src = machine->region( "gfx1" )->base(); for (x=0x0000; x < 0x10000; x++) @@ -4079,7 +4079,7 @@ static DRIVER_INIT( magicd2a ) ******************************************************************/ { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0xc1c6] = 0x92; } @@ -4088,8 +4088,8 @@ static DRIVER_INIT( magicd2b ) /*** same as blue TAB PCB, with the magicd2a patch ***/ { int x, na, nb, nad, nbd; - UINT8 *src = memory_region( machine, "gfx1" ); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *src = machine->region( "gfx1" )->base(); + UINT8 *ROM = machine->region("maincpu")->base(); for (x=0x0000; x < 0x10000; x++) { @@ -4108,7 +4108,7 @@ static DRIVER_INIT( magicd2b ) static DRIVER_INIT( soccernw ) { /* temporary patch to avoid hardware errors for debug purposes */ - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0x80b2] = 0xa9; ROM[0x80b3] = 0x00; @@ -4143,16 +4143,16 @@ static DRIVER_INIT( saloon ) *************************************************/ { - UINT8 *rom = memory_region(machine, "maincpu"); - int size = memory_region_length(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); + int size = machine->region("maincpu")->bytes(); int start = 0x8000; - UINT8 *gfxrom = memory_region(machine, "gfx1"); - int sizeg = memory_region_length(machine, "gfx1"); + UINT8 *gfxrom = machine->region("gfx1")->base(); + int sizeg = machine->region("gfx1")->bytes(); int startg = 0; - UINT8 *prom = memory_region(machine, "proms"); - int sizep = memory_region_length(machine, "proms"); + UINT8 *prom = machine->region("proms")->base(); + int sizep = machine->region("proms")->bytes(); int startp = 0; UINT8 *buffer; @@ -4237,7 +4237,7 @@ static DRIVER_INIT( multiwin ) ******************************************************/ { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); int x; @@ -4256,7 +4256,7 @@ static DRIVER_INIT( multiwin ) ROM[x+0x10000] = code; } - space->set_decrypted_region(0x8000, 0xffff, memory_region(machine, "maincpu") + 0x18000); + space->set_decrypted_region(0x8000, 0xffff, machine->region("maincpu")->base() + 0x18000); } static DRIVER_INIT( royalcdc ) @@ -4270,7 +4270,7 @@ static DRIVER_INIT( royalcdc ) ******************************************************/ - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); int x; @@ -4309,7 +4309,7 @@ static DRIVER_INIT( royalcdc ) ROM[x+0x10000] = code; } - space->set_decrypted_region(0x6000, 0xffff, memory_region(machine, "maincpu") + 0x16000); + space->set_decrypted_region(0x6000, 0xffff, machine->region("maincpu")->base() + 0x16000); } diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c index a5fe8bc6c42..4fa1920721b 100644 --- a/src/mame/drivers/funybubl.c +++ b/src/mame/drivers/funybubl.c @@ -203,7 +203,7 @@ GFXDECODE_END static MACHINE_START( funybubl ) { funybubl_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); state->audiocpu = machine->device("audiocpu"); diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c index 49d5f20b717..dfbe34962b4 100644 --- a/src/mame/drivers/fuukifg2.c +++ b/src/mame/drivers/fuukifg2.c @@ -425,7 +425,7 @@ static TIMER_CALLBACK( raster_interrupt_callback ) static MACHINE_START( fuuki16 ) { fuuki16_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 3, &ROM[0x10000], 0x8000); diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index 40b40797ef0..eb3e9f0ac9c 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -511,7 +511,7 @@ static TIMER_CALLBACK( raster_interrupt_callback ) static MACHINE_START( fuuki32 ) { fuuki32_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "soundcpu"); + UINT8 *ROM = machine->region("soundcpu")->base(); memory_configure_bank(machine, "bank1", 0, 0x3e, &ROM[0x10000], 0x8000); diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index cea706bde6e..7133d850bce 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -52,7 +52,7 @@ static WRITE16_HANDLER( bigkarnk_coin_w ) static WRITE16_HANDLER( OKIM6295_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "oki"); + UINT8 *RAM = space->machine->region("oki")->base(); if (ACCESSING_BITS_0_7) { diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c index 97e4fb7a69d..eec7f08385e 100644 --- a/src/mame/drivers/gaelco3d.c +++ b/src/mame/drivers/gaelco3d.c @@ -202,7 +202,7 @@ static MACHINE_RESET( common ) framenum = 0; /* boot the ADSP chip */ - src = (UINT16 *)memory_region(machine, "user1"); + src = (UINT16 *)machine->region("user1")->base(); for (i = 0; i < (src[3] & 0xff) * 8; i++) { UINT32 opcode = ((src[i*4+0] & 0xff) << 16) | ((src[i*4+1] & 0xff) << 8) | (src[i*4+2] & 0xff); @@ -212,7 +212,7 @@ static MACHINE_RESET( common ) /* allocate a timer for feeding the autobuffer */ adsp_autobuffer_timer = machine->device("adsp_timer"); - memory_configure_bank(machine, "bank1", 0, 256, memory_region(machine, "user1"), 0x4000); + memory_configure_bank(machine, "bank1", 0, 256, machine->region("user1")->base(), 0x4000); memory_set_bank(machine, "bank1", 0); /* keep the TMS32031 halted until the code is ready to go */ @@ -1174,13 +1174,13 @@ static DRIVER_INIT( gaelco3d ) int x, y; /* allocate memory */ - gaelco3d_texture_size = memory_region_length(machine, "gfx1"); - gaelco3d_texmask_size = memory_region_length(machine, "gfx2") * 8; + gaelco3d_texture_size = machine->region("gfx1")->bytes(); + gaelco3d_texmask_size = machine->region("gfx2")->bytes() * 8; gaelco3d_texture = auto_alloc_array(machine, UINT8, gaelco3d_texture_size); gaelco3d_texmask = auto_alloc_array(machine, UINT8, gaelco3d_texmask_size); /* first expand the pixel data */ - src = memory_region(machine, "gfx1"); + src = machine->region("gfx1")->base(); dst = gaelco3d_texture; for (y = 0; y < gaelco3d_texture_size/4096; y += 2) for (x = 0; x < 4096; x += 2) @@ -1192,7 +1192,7 @@ static DRIVER_INIT( gaelco3d ) } /* then expand the mask data */ - src = memory_region(machine, "gfx2"); + src = machine->region("gfx2")->base(); dst = gaelco3d_texmask; for (y = 0; y < gaelco3d_texmask_size/4096; y++) for (x = 0; x < 4096; x++) diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c index ece0dea8f27..df6c8237559 100644 --- a/src/mame/drivers/gaiden.c +++ b/src/mame/drivers/gaiden.c @@ -1526,8 +1526,8 @@ static DRIVER_INIT( raiga ) static void descramble_drgnbowl_gfx(running_machine *machine) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); - size_t size = memory_region_length(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); + size_t size = machine->region("maincpu")->bytes(); UINT8 *buffer = auto_alloc_array(machine, UINT8, size); memcpy(buffer, ROM, size); @@ -1543,8 +1543,8 @@ static void descramble_drgnbowl_gfx(running_machine *machine) auto_free(machine, buffer); - ROM = memory_region(machine, "gfx2"); - size = memory_region_length(machine, "gfx2"); + ROM = machine->region("gfx2")->base(); + size = machine->region("gfx2")->bytes(); buffer = auto_alloc_array(machine, UINT8, size); memcpy(buffer,ROM,size); @@ -1614,8 +1614,8 @@ static void descramble_mastninj_gfx(running_machine *machine, UINT8* src) static DRIVER_INIT(mastninj) { // rearrange the graphic roms into a format that MAME can decode - descramble_mastninj_gfx(machine, memory_region(machine,"gfx2")); - descramble_mastninj_gfx(machine, memory_region(machine,"gfx3")); + descramble_mastninj_gfx(machine, machine->region("gfx2")->base()); + descramble_mastninj_gfx(machine, machine->region("gfx3")->base()); DRIVER_INIT_CALL(shadoww); } diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c index 38379ff2cc2..307557daade 100644 --- a/src/mame/drivers/galaga.c +++ b/src/mame/drivers/galaga.c @@ -814,7 +814,7 @@ static const namco_51xx_interface namco_51xx_intf = static READ8_DEVICE_HANDLER( namco_52xx_rom_r ) { - UINT32 length = memory_region_length(device->machine, "52xx"); + UINT32 length = device->machine->region("52xx")->bytes(); //printf("ROM read %04X\n", offset); if (!(offset & 0x1000)) offset = (offset & 0xfff) | 0x0000; @@ -824,7 +824,7 @@ static READ8_DEVICE_HANDLER( namco_52xx_rom_r ) offset = (offset & 0xfff) | 0x2000; else if (!(offset & 0x8000)) offset = (offset & 0xfff) | 0x3000; - return (offset < length) ? memory_region(device->machine, "52xx")[offset] : 0xff; + return (offset < length) ? device->machine->region("52xx")->base()[offset] : 0xff; } static READ8_DEVICE_HANDLER( namco_52xx_si_r ) @@ -3190,8 +3190,8 @@ ROM_END static DRIVER_INIT (galaga) { /* swap bytes for flipped character so we can decode them together with normal characters */ - UINT8 *rom = memory_region(machine, "gfx1"); - int i, len = memory_region_length(machine, "gfx1"); + UINT8 *rom = machine->region("gfx1")->base(); + int i, len = machine->region("gfx1")->bytes(); for (i = 0;i < len;i++) { @@ -3218,7 +3218,7 @@ static DRIVER_INIT( xevious ) UINT8 *rom; int i; - rom = memory_region(machine, "gfx3") + 0x5000; + rom = machine->region("gfx3")->base() + 0x5000; for (i = 0;i < 0x2000;i++) rom[i + 0x2000] = rom[i] >> 4; } @@ -3230,14 +3230,14 @@ static DRIVER_INIT( xevios ) /* convert one of the sprite ROMs to the format used by Xevious */ - rom = memory_region(machine, "gfx3"); + rom = machine->region("gfx3")->base(); for (A = 0x5000;A < 0x7000;A++) { rom[A] = BITSWAP8(rom[A],1,3,5,7,0,2,4,6); } /* convert one of tile map ROMs to the format used by Xevious */ - rom = memory_region(machine, "gfx4"); + rom = machine->region("gfx4")->base(); for (A = 0x0000;A < 0x1000;A++) { rom[A] = BITSWAP8(rom[A],3,7,5,1,2,6,4,0); diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 34cbf0d10f1..c6de6d844a6 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -2352,7 +2352,7 @@ MACHINE_CONFIG_END static void decode_mooncrst(running_machine *machine, int length, UINT8 *dest) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int offs; for (offs = 0; offs < length; offs++) @@ -2414,8 +2414,8 @@ static void decode_checkman(running_machine *machine) { 0,2,0,2 }, { 1,4,1,4 } }; - UINT8 *rombase = memory_region(machine, "maincpu"); - UINT32 romlength = memory_region_length(machine, "maincpu"); + UINT8 *rombase = machine->region("maincpu")->base(); + UINT32 romlength = machine->region("maincpu")->bytes(); UINT32 offs; for (offs = 0; offs < romlength; offs++) @@ -2431,8 +2431,8 @@ static void decode_checkman(running_machine *machine) static void decode_dingoe(running_machine *machine) { - UINT8 *rombase = memory_region(machine, "maincpu"); - UINT32 romlength = memory_region_length(machine, "maincpu"); + UINT8 *rombase = machine->region("maincpu")->base(); + UINT32 romlength = machine->region("maincpu")->bytes(); UINT32 offs; for (offs = 0; offs < romlength; offs++) @@ -2454,7 +2454,7 @@ static void decode_dingoe(running_machine *machine) static void decode_frogger_sound(running_machine *machine) { - UINT8 *rombase = memory_region(machine, "audiocpu"); + UINT8 *rombase = machine->region("audiocpu")->base(); UINT32 offs; /* the first ROM of the sound CPU has data lines D0 and D1 swapped */ @@ -2465,7 +2465,7 @@ static void decode_frogger_sound(running_machine *machine) static void decode_frogger_gfx(running_machine *machine) { - UINT8 *rombase = memory_region(machine, "gfx1"); + UINT8 *rombase = machine->region("gfx1")->base(); UINT32 offs; /* the 2nd gfx ROM has data lines D0 and D1 swapped */ @@ -2476,8 +2476,8 @@ static void decode_frogger_gfx(running_machine *machine) static void decode_anteater_gfx(running_machine *machine) { - UINT32 romlength = memory_region_length(machine, "gfx1"); - UINT8 *rombase = memory_region(machine, "gfx1"); + UINT32 romlength = machine->region("gfx1")->bytes(); + UINT8 *rombase = machine->region("gfx1")->base(); UINT8 *scratch = auto_alloc_array(machine, UINT8, romlength); UINT32 offs; @@ -2496,8 +2496,8 @@ static void decode_anteater_gfx(running_machine *machine) static void decode_losttomb_gfx(running_machine *machine) { - UINT32 romlength = memory_region_length(machine, "gfx1"); - UINT8 *rombase = memory_region(machine, "gfx1"); + UINT32 romlength = machine->region("gfx1")->bytes(); + UINT8 *rombase = machine->region("gfx1")->base(); UINT8 *scratch = auto_alloc_array(machine, UINT8, romlength); UINT32 offs; @@ -2521,7 +2521,7 @@ static void decode_superbon(running_machine *machine) /* Deryption worked out by hand by Chris Hardy. */ - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (i = 0;i < 0x1000;i++) { @@ -2627,7 +2627,7 @@ static DRIVER_INIT( gmgalax ) /* ROM is banked */ memory_install_read_bank(space, 0x0000, 0x3fff, 0, 0, "bank1"); - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0x10000, 0x4000); /* callback when the game select is toggled */ gmgalax_game_changed(machine->m_portlist.first()->fieldlist, NULL, 0, 0); @@ -2684,7 +2684,7 @@ static DRIVER_INIT( mooncrst ) common_init(machine, galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info); /* decrypt program code */ - decode_mooncrst(machine, 0x8000, memory_region(machine, "maincpu")); + decode_mooncrst(machine, 0x8000, machine->region("maincpu")->base()); } @@ -2757,15 +2757,15 @@ void tenspot_set_game_bank(running_machine* machine, int bank, int from_game) int x; sprintf(tmp,"game_%d_cpu", bank); - srcregion = memory_region(machine,tmp); - dstregion = memory_region(machine,"maincpu"); + srcregion = machine->region(tmp)->base(); + dstregion = machine->region("maincpu")->base(); memcpy(dstregion, srcregion, 0x4000); sprintf(tmp,"game_%d_temp", bank); - srcregion = memory_region(machine,tmp); - dstregion = memory_region(machine,"gfx1"); + srcregion = machine->region(tmp)->base(); + dstregion = machine->region("gfx1")->base(); memcpy(dstregion, srcregion, 0x2000); - dstregion = memory_region(machine,"gfx2"); + dstregion = machine->region("gfx2")->base(); memcpy(dstregion, srcregion, 0x2000); if (from_game) @@ -2783,8 +2783,8 @@ void tenspot_set_game_bank(running_machine* machine, int bank, int from_game) } sprintf(tmp,"game_%d_prom", bank); - srcregion = memory_region(machine,tmp); - dstregion = memory_region(machine,"proms"); + srcregion = machine->region(tmp)->base(); + dstregion = machine->region("proms")->base(); memcpy(dstregion, srcregion, 0x20); color_prom = dstregion; @@ -2838,13 +2838,13 @@ static DRIVER_INIT( zigzag ) /* make ROMs 2 & 3 swappable */ memory_install_read_bank(space, 0x2000, 0x2fff, 0, 0, "bank1"); memory_install_read_bank(space, 0x3000, 0x3fff, 0, 0, "bank2"); - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x2000, 0x1000); - memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "maincpu") + 0x2000, 0x1000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0x2000, 0x1000); + memory_configure_bank(machine, "bank2", 0, 2, machine->region("maincpu")->base() + 0x2000, 0x1000); /* also re-install the fixed ROM area as a bank in order to inform the memory system that the fixed area only extends to 0x1fff */ memory_install_read_bank(space, 0x0000, 0x1fff, 0, 0, "bank3"); - memory_set_bankptr(machine, "bank3", memory_region(machine, "maincpu") + 0x0000); + memory_set_bankptr(machine, "bank3", machine->region("maincpu")->base() + 0x0000); /* handler for doing the swaps */ memory_install_write8_handler(space, 0x7002, 0x7002, 0, 0x07f8, zigzag_bankswap_w); @@ -2954,7 +2954,7 @@ static DRIVER_INIT( skybase ) memory_install_ram(space, 0x8000, 0x87ff, 0, 0, NULL); /* extend ROM */ - memory_install_rom(space, 0x0000, 0x5fff, 0, 0, memory_region(machine, "maincpu")); + memory_install_rom(space, 0x0000, 0x5fff, 0, 0, machine->region("maincpu")->base()); } @@ -3013,7 +3013,7 @@ static DRIVER_INIT( scorpnmc ) memory_install_write8_handler(space, 0xb001, 0xb001, 0, 0x7f8, irq_enable_w); /* extra ROM */ - memory_install_rom(space, 0x5000, 0x67ff, 0, 0, memory_region(machine, "maincpu") + 0x5000); + memory_install_rom(space, 0x5000, 0x67ff, 0, 0, machine->region("maincpu")->base() + 0x5000); /* install RAM at $4000-$4800 */ memory_install_ram(space, 0x4000, 0x47ff, 0, 0, NULL); @@ -3037,7 +3037,7 @@ static DRIVER_INIT( thepitm ) memory_unmap_write(space, 0xb004, 0xb004, 0, 0x07f8); /* extend ROM */ - memory_install_rom(space, 0x0000, 0x47ff, 0, 0, memory_region(machine, "maincpu")); + memory_install_rom(space, 0x0000, 0x47ff, 0, 0, machine->region("maincpu")->base()); } /************************************* @@ -3094,7 +3094,7 @@ static DRIVER_INIT( sfx ) /* sound board has space for extra ROM */ memory_install_read_bank(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1"); - memory_set_bankptr(machine, "bank1", memory_region(machine, "audiocpu")); + memory_set_bankptr(machine, "bank1", machine->region("audiocpu")->base()); } @@ -3196,7 +3196,7 @@ static DRIVER_INIT( scorpion ) /* extra ROM */ memory_install_read_bank(space, 0x5800, 0x67ff, 0, 0, "bank1"); - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x5800); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0x5800); /* no background related */ // memory_nop_write(space, 0x6803, 0x6803, 0, 0); @@ -3204,7 +3204,7 @@ static DRIVER_INIT( scorpion ) memory_install_read8_handler(cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM), 0x3000, 0x3000, 0, 0, scorpion_digitalker_intr_r); /* { - const UINT8 *rom = memory_region(machine, "speech"); + const UINT8 *rom = machine->region("speech")->base(); int i; for (i = 0; i < 0x2c; i++) diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c index 0e004a2574b..542ba642cd0 100644 --- a/src/mame/drivers/galivan.c +++ b/src/mame/drivers/galivan.c @@ -399,7 +399,7 @@ static MACHINE_START( galivan ) galivan_state *state = machine->driver_data(); /* configure ROM banking */ - UINT8 *rombase = memory_region(machine, "maincpu"); + UINT8 *rombase = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 2, &rombase[0x10000], 0x2000); memory_set_bank(machine, "bank1", 0); @@ -416,7 +416,7 @@ static MACHINE_START( ninjemak ) galivan_state *state = machine->driver_data(); /* configure ROM banking */ - UINT8 *rombase = memory_region(machine, "maincpu"); + UINT8 *rombase = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &rombase[0x10000], 0x2000); memory_set_bank(machine, "bank1", 0); @@ -1043,10 +1043,10 @@ static DRIVER_INIT( youmab ) { memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x82, 0x82, 0, 0, youmab_extra_bank_w); // banks rom at 0x8000? writes 0xff and 0x00 before executing code there memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x7fff, 0, 0, "bank3"); - memory_set_bankptr(machine, "bank3", memory_region(machine, "maincpu")); + memory_set_bankptr(machine, "bank3", machine->region("maincpu")->base()); memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank2"); - memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "user2"), 0x4000); + memory_configure_bank(machine, "bank2", 0, 2, machine->region("user2")->base(), 0x4000); memory_set_bank(machine, "bank2", 0); memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO), 0x81, 0x81, 0, 0, youmab_81_w); // ?? often, alternating values diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c index 776da6faa45..5b60f55f5c7 100644 --- a/src/mame/drivers/galpani2.c +++ b/src/mame/drivers/galpani2.c @@ -275,7 +275,7 @@ static WRITE8_HANDLER( galpani2_coin_lockout_w ) static WRITE8_DEVICE_HANDLER( galpani2_oki1_bank_w ) { - UINT8 *ROM = memory_region(device->machine, "oki1"); + UINT8 *ROM = device->machine->region("oki1")->base(); logerror("%s : %s bank %08X\n",cpuexec_describe_context(device->machine),device->tag(),data); memcpy(ROM + 0x30000, ROM + 0x40000 + 0x10000 * (~data & 0xf), 0x10000); } @@ -350,8 +350,8 @@ static UINT16 *galpani2_rombank; static READ16_HANDLER( galpani2_bankedrom_r ) { - UINT16 *ROM = (UINT16 *) memory_region( space->machine, "user1" ); - size_t len = memory_region_length( space->machine, "user1" ) / 2; + UINT16 *ROM = (UINT16 *) space->machine->region( "user1" )->base(); + size_t len = space->machine->region( "user1" )->bytes() / 2; offset += (0x800000/2) * (*galpani2_rombank & 0x0003); diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c index 6ac5e8b151c..41b8ff11f49 100644 --- a/src/mame/drivers/galpani3.c +++ b/src/mame/drivers/galpani3.c @@ -323,7 +323,7 @@ static VIDEO_UPDATE(galpani3) bitmap_fill(sprite_bitmap_1, cliprect, 0x0000); - skns_draw_sprites(screen->machine, sprite_bitmap_1, cliprect, galpani3_spriteram32, screen->machine->generic.spriteram_size, memory_region(screen->machine,"gfx1"), memory_region_length (screen->machine, "gfx1"), galpani3_spc_regs ); + skns_draw_sprites(screen->machine, sprite_bitmap_1, cliprect, galpani3_spriteram32, screen->machine->generic.spriteram_size, screen->machine->region("gfx1")->base(), screen->machine->region ("gfx1")->bytes(), galpani3_spc_regs ); // ignoring priority bits for now.. for (y=0;y<240;y++) @@ -669,7 +669,7 @@ static WRITE16_HANDLER( galpani3_regs1_address_w ) static WRITE16_HANDLER( galpani3_regs1_go_w ) { UINT32 address = galpani3_regs1_address_regs[1]| (galpani3_regs1_address_regs[0]<<16); - UINT8* rledata = memory_region(space->machine,"gfx2"); + UINT8* rledata = space->machine->region("gfx2")->base(); printf("galpani3_regs1_go_w? %08x\n",address ); if ((data==0x2000) || (data==0x3000)) gp3_do_rle(address, galpani3_framebuffer1, rledata); @@ -685,7 +685,7 @@ static WRITE16_HANDLER( galpani3_regs2_address_w ) static WRITE16_HANDLER( galpani3_regs2_go_w ) { UINT32 address = galpani3_regs2_address_regs[1]| (galpani3_regs2_address_regs[0]<<16); - UINT8* rledata = memory_region(space->machine,"gfx2"); + UINT8* rledata = space->machine->region("gfx2")->base(); printf("galpani3_regs2_go_w? %08x\n", address ); @@ -705,7 +705,7 @@ static WRITE16_HANDLER( galpani3_regs3_address_w ) static WRITE16_HANDLER( galpani3_regs3_go_w ) { UINT32 address = galpani3_regs3_address_regs[1]| (galpani3_regs3_address_regs[0]<<16); - UINT8* rledata = memory_region(space->machine,"gfx2"); + UINT8* rledata = space->machine->region("gfx2")->base(); printf("galpani3_regs3_go_w? %08x\n",address ); diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c index 66c336e7297..b38fa97b973 100644 --- a/src/mame/drivers/galpanic.c +++ b/src/mame/drivers/galpanic.c @@ -157,7 +157,7 @@ static WRITE16_HANDLER( galpanic_6295_bankswitch_w ) if (ACCESSING_BITS_8_15) { - UINT8 *rom = memory_region(space->machine, "oki"); + UINT8 *rom = space->machine->region("oki")->base(); memcpy(&rom[0x30000],&rom[0x40000 + ((data >> 8) & 0x0f) * 0x10000],0x10000); @@ -170,7 +170,7 @@ static WRITE16_HANDLER( galpanica_6295_bankswitch_w ) { if (ACCESSING_BITS_8_15) { - UINT8 *rom = memory_region(space->machine, "oki"); + UINT8 *rom = space->machine->region("oki")->base(); memcpy(&rom[0x30000],&rom[0x40000 + ((data >> 8) & 0x0f) * 0x10000],0x10000); } diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c index 7b95372fb38..bb6438976d6 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -196,7 +196,7 @@ static void mxtc_config_w(device_t *busdevice, device_t *device, int function, i } else // disable RAM access (reads go to BIOS ROM) { - memory_set_bankptr(busdevice->machine, "bank1", memory_region(busdevice->machine, "user1") + 0x30000); + memory_set_bankptr(busdevice->machine, "bank1", busdevice->machine->region("user1")->base() + 0x30000); } break; } @@ -603,7 +603,7 @@ static MACHINE_START(gamecstl) static MACHINE_RESET(gamecstl) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "user1") + 0x30000); + memory_set_bankptr(machine, "bank1", machine->region("user1")->base() + 0x30000); cpu_set_irq_callback(machine->device("maincpu"), irq_callback); } diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c index a59d5de1986..8f1fd596631 100644 --- a/src/mame/drivers/gaplus.c +++ b/src/mame/drivers/gaplus.c @@ -838,11 +838,11 @@ static DRIVER_INIT( gaplus ) UINT8 *rom; int i; - rom = memory_region(machine, "gfx1"); + rom = machine->region("gfx1")->base(); for (i = 0;i < 0x2000;i++) rom[i + 0x2000] = rom[i] >> 4; - rom = memory_region(machine, "gfx2") + 0x6000; + rom = machine->region("gfx2")->base() + 0x6000; for (i = 0;i < 0x2000;i++) rom[i + 0x2000] = rom[i] << 4; } diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c index 7b0137e76a2..6ce6286ac11 100644 --- a/src/mame/drivers/gauntlet.c +++ b/src/mame/drivers/gauntlet.c @@ -1624,7 +1624,7 @@ ROM_END static void gauntlet_common_init(running_machine *machine, int slapstic, int vindctr2) { gauntlet_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); state->eeprom_default = NULL; atarigen_slapstic_init(machine->device("maincpu"), 0x038000, 0, slapstic); @@ -1660,7 +1660,7 @@ static DRIVER_INIT( gauntlet2 ) static DRIVER_INIT( vindctr2 ) { - UINT8 *gfx2_base = memory_region(machine, "gfx2"); + UINT8 *gfx2_base = machine->region("gfx2")->base(); UINT8 *data = auto_alloc_array(machine, UINT8, 0x8000); int i; diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c index 6a5bc3b8c10..4f0a4b68be3 100644 --- a/src/mame/drivers/gberet.c +++ b/src/mame/drivers/gberet.c @@ -548,7 +548,7 @@ ROM_END static DRIVER_INIT( mrgoemon ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x800); } diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c index f97f5f5e616..e7038c70e87 100644 --- a/src/mame/drivers/gbusters.c +++ b/src/mame/drivers/gbusters.c @@ -275,7 +275,7 @@ static const k051960_interface gbusters_k051960_intf = static MACHINE_START( gbusters ) { gbusters_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 16, &ROM[0x10000], 0x2000); memory_set_bank(machine, "bank1", 0); @@ -296,7 +296,7 @@ static MACHINE_START( gbusters ) static MACHINE_RESET( gbusters ) { gbusters_state *state = machine->driver_data(); - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); konami_configure_set_lines(machine->device("maincpu"), gbusters_banking); diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c index 6f40295ed82..19333791c97 100644 --- a/src/mame/drivers/gcpinbal.c +++ b/src/mame/drivers/gcpinbal.c @@ -216,7 +216,7 @@ static void gcp_adpcm_int( device_t *device ) } else { - UINT8 *ROM = memory_region(device->machine, "msm"); + UINT8 *ROM = device->machine->region("msm")->base(); state->adpcm_data = ((state->adpcm_trigger ? (ROM[state->adpcm_start] & 0x0f) : (ROM[state->adpcm_start] & 0xf0) >> 4)); msm5205_data_w(device, state->adpcm_data & 0xf); diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c index 8acae5ef8d4..48fa21d466d 100644 --- a/src/mame/drivers/gei.c +++ b/src/mame/drivers/gei.c @@ -209,68 +209,68 @@ static READ8_DEVICE_HANDLER( portC_r ) static WRITE8_HANDLER( banksel_main_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x8000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x8000); } static WRITE8_HANDLER( banksel_1_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x10000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x10000); } static WRITE8_HANDLER( banksel_2_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x18000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x18000); } static WRITE8_HANDLER( banksel_3_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x20000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x20000); } static WRITE8_HANDLER( banksel_4_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x28000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x28000); } static WRITE8_HANDLER( banksel_5_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x30000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x30000); } static WRITE8_HANDLER( banksel_1_1_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x10000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x10000); } static WRITE8_HANDLER( banksel_2_1_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x14000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x14000); } static WRITE8_HANDLER( banksel_3_1_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x18000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x18000); } static WRITE8_HANDLER( banksel_4_1_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x1c000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x1c000); } static WRITE8_HANDLER( banksel_5_1_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x20000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x20000); } static WRITE8_HANDLER( banksel_1_2_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x12000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x12000); } static WRITE8_HANDLER( banksel_2_2_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x16000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x16000); } static WRITE8_HANDLER( banksel_3_2_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x1a000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x1a000); } static WRITE8_HANDLER( banksel_4_2_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x1e000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x1e000); } static WRITE8_HANDLER( banksel_5_2_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x22000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x22000); } static WRITE8_HANDLER(geimulti_bank_w) @@ -298,36 +298,36 @@ static WRITE8_HANDLER(geimulti_bank_w) } if (bank != -1) - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "bank") + bank*0x8000); + memory_set_bankptr(space->machine, "bank1", space->machine->region("bank")->base() + bank*0x8000); } static READ8_HANDLER(banksel_1_r) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x10000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x10000); return 0x03; }; static READ8_HANDLER(banksel_2_r) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x18000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x18000); return 0x03; } static READ8_HANDLER(banksel_3_r) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x20000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x20000); return 0x03; } static READ8_HANDLER(banksel_4_r) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x28000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x28000); return 0x03; } static READ8_HANDLER(banksel_5_r) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "maincpu") + 0x30000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("maincpu")->base() + 0x30000); return 0x03; } @@ -1808,12 +1808,12 @@ ROM_END static DRIVER_INIT( setbank ) { - memory_set_bankptr(machine, "bank1",memory_region(machine, "maincpu") + 0x2000); + memory_set_bankptr(machine, "bank1",machine->region("maincpu")->base() + 0x2000); } static DRIVER_INIT( geimulti ) { - memory_set_bankptr(machine, "bank1",memory_region(machine, "bank") + 0x0000); + memory_set_bankptr(machine, "bank1",machine->region("bank")->base() + 0x0000); } GAME( 1982, jokpoker, 0, gselect, gselect, setbank, ROT0, "Greyhound Electronics", "Joker Poker (Version 16.03B)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c index 5049d6c1a9c..9fa49316d24 100644 --- a/src/mame/drivers/ghosteo.c +++ b/src/mame/drivers/ghosteo.c @@ -220,7 +220,7 @@ static READ8_DEVICE_HANDLER( s3c2410_nand_data_r ) break; case NAND_M_READ : { - UINT8 *flash = (UINT8 *)memory_region( device->machine, "user1"); + UINT8 *flash = (UINT8 *)device->machine->region( "user1")->base(); if (nand.byte_addr < 0x200) { data = *(flash + nand.page_addr * 0x200 + nand.byte_addr); @@ -531,7 +531,7 @@ ROM_END static DRIVER_INIT( bballoon ) { - memcpy( steppingstone, memory_region( machine, "user1"), 4 * 1024); + memcpy( steppingstone, machine->region( "user1")->base(), 4 * 1024); } GAME( 2003, bballoon, 0, bballoon, bballoon, bballoon, ROT0, "Eolith", "BnB Arcade", GAME_NO_SOUND ) diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c index b6af04bdfe1..3e590aa340c 100644 --- a/src/mame/drivers/ginganin.c +++ b/src/mame/drivers/ginganin.c @@ -459,7 +459,7 @@ static DRIVER_INIT( ginganin ) UINT16 *rom; /* main cpu patches */ - rom = (UINT16 *)memory_region(machine, "maincpu"); + rom = (UINT16 *)machine->region("maincpu")->base(); /* avoid writes to rom getting to the log */ rom[0x408 / 2] = 0x6000; rom[0x40a / 2] = 0x001c; @@ -467,7 +467,7 @@ static DRIVER_INIT( ginganin ) /* sound cpu patches */ /* let's clear the RAM: ROM starts at 0x4000 */ - memset(memory_region(machine, "audiocpu"), 0, 0x800); + memset(machine->region("audiocpu")->base(), 0, 0x800); } diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index c09778edeed..76eea263629 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -194,7 +194,7 @@ TODO: /*Rom bankswitching*/ static WRITE8_HANDLER( gladiatr_bankswitch_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu") + 0x10000; + UINT8 *rom = space->machine->region("maincpu")->base() + 0x10000; memory_set_bankptr(space->machine, "bank1", rom + 0x6000 * (data & 0x01)); } @@ -256,7 +256,7 @@ static MACHINE_RESET( gladiator ) TAITO8741_start(&gladiator_8741interface); /* 6809 bank memory set */ { - UINT8 *rom = memory_region(machine, "audiocpu") + 0x10000; + UINT8 *rom = machine->region("audiocpu")->base() + 0x10000; memory_set_bankptr(machine, "bank2",rom); machine->device("audiocpu")->reset(); } @@ -279,7 +279,7 @@ static void gladiator_ym_irq(device_t *device, int irq) /*Sound Functions*/ static WRITE8_DEVICE_HANDLER( glad_adpcm_w ) { - UINT8 *rom = memory_region(device->machine, "audiocpu") + 0x10000; + UINT8 *rom = device->machine->region("audiocpu")->base() + 0x10000; /* bit6 = bank offset */ memory_set_bankptr(device->machine, "bank2",rom + ((data & 0x40) ? 0xc000 : 0)); @@ -958,7 +958,7 @@ static DRIVER_INIT( gladiatr ) UINT8 *rom; int i,j; - rom = memory_region(machine, "gfx2"); + rom = machine->region("gfx2")->base(); // unpack 3bpp graphics for (j = 3; j >= 0; j--) { @@ -972,7 +972,7 @@ static DRIVER_INIT( gladiatr ) swap_block(rom + 0x14000, rom + 0x18000, 0x4000); - rom = memory_region(machine, "gfx3"); + rom = machine->region("gfx3")->base(); // unpack 3bpp graphics for (j = 5; j >= 0; j--) { @@ -989,7 +989,7 @@ static DRIVER_INIT( gladiatr ) swap_block(rom + 0x24000, rom + 0x28000, 0x4000); /* make sure bank is valid in cpu-reset */ - rom = memory_region(machine, "audiocpu") + 0x10000; + rom = machine->region("audiocpu")->base() + 0x10000; memory_set_bankptr(machine, "bank2",rom); } @@ -1008,14 +1008,14 @@ static DRIVER_INIT(ppking) UINT8 *rom; int i,j; - rom = memory_region(machine, "gfx2"); + rom = machine->region("gfx2")->base(); // unpack 3bpp graphics for (i = 0; i < 0x2000; i++) { rom[i+0x2000] = rom[i] >> 4; } - rom = memory_region(machine, "gfx3"); + rom = machine->region("gfx3")->base(); // unpack 3bpp graphics for (j = 1; j >= 0; j--) { diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c index d9773c997ce..9aff4c93c3d 100644 --- a/src/mame/drivers/glass.c +++ b/src/mame/drivers/glass.c @@ -55,7 +55,7 @@ GFXDECODE_END static WRITE16_HANDLER( OKIM6295_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "oki"); + UINT8 *RAM = space->machine->region("oki")->base(); if (ACCESSING_BITS_0_7) memcpy(&RAM[0x30000], &RAM[0x40000 + (data & 0x0f) * 0x10000], 0x10000); @@ -299,10 +299,10 @@ static void glass_ROM16_split_gfx( running_machine *machine, const char *src_reg int i; /* get a pointer to the source data */ - UINT8 *src = (UINT8 *)memory_region(machine, src_reg); + UINT8 *src = (UINT8 *)machine->region(src_reg)->base(); /* get a pointer to the destination data */ - UINT8 *dst = (UINT8 *)memory_region(machine, dst_reg); + UINT8 *dst = (UINT8 *)machine->region(dst_reg)->base(); /* fill destination areas with the proper data */ for (i = 0; i < length / 2; i++) diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c index 44e1e4e67bf..f8925fc7c54 100644 --- a/src/mame/drivers/gng.c +++ b/src/mame/drivers/gng.c @@ -305,7 +305,7 @@ static MACHINE_START( gng ) { gng_state *state = machine->driver_data(); - UINT8 *rombase = memory_region(machine, "maincpu"); + UINT8 *rombase = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &rombase[0x10000], 0x2000); memory_configure_bank(machine, "bank1", 4, 1, &rombase[0x4000], 0x2000); diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 2ddc82c8e9c..936c6fb293a 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -307,7 +307,7 @@ static VIDEO_UPDATE(go2000) static MACHINE_START( go2000 ) { go2000_state *state = machine->driver_data(); - UINT8 *SOUND = memory_region(machine, "soundcpu"); + UINT8 *SOUND = machine->region("soundcpu")->base(); int i; for (i = 0; i < 8; i++) diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c index 2f01846a560..60826324b9e 100644 --- a/src/mame/drivers/goal92.c +++ b/src/mame/drivers/goal92.c @@ -293,7 +293,7 @@ GFXDECODE_END static MACHINE_START( goal92 ) { goal92_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c index 0b001882cf0..6b679925fd9 100644 --- a/src/mame/drivers/goindol.c +++ b/src/mame/drivers/goindol.c @@ -227,7 +227,7 @@ GFXDECODE_END static MACHINE_START( goindol ) { goindol_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); @@ -391,7 +391,7 @@ ROM_END static DRIVER_INIT( goindol ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* I hope that's all patches to avoid protection */ diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index 5a2f45c5558..b525e1414dd 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -4186,7 +4186,7 @@ static DRIVER_INIT( royale ) { /* $60bb, NOPing the ORA #$F0 (after read the PIA1 port B */ -// UINT8 *ROM = memory_region(machine, "maincpu"); +// UINT8 *ROM = machine->region("maincpu")->base(); // ROM[0x60bb] = 0xea; // ROM[0x60bc] = 0xea; @@ -4216,8 +4216,8 @@ static DRIVER_INIT( flcnw ) /* Attempt to decrypt the MCU program (we're sooo close!) */ - UINT8 *ROM = memory_region(machine, "mcu"); - int size = memory_region_length(machine, "mcu"); + UINT8 *ROM = machine->region("mcu")->base(); + int size = machine->region("mcu")->bytes(); int start = 0x0000; int i; diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index 023ed30a5e6..3e2527601b5 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -5608,7 +5608,7 @@ static PALETTE_INIT(cm) for (i = 0; i < 0x100; i++) { UINT8 data; - UINT8*proms = memory_region(machine, "proms"); + UINT8*proms = machine->region("proms")->base(); data = proms[0x000 + i] | (proms[0x100 + i] << 4); @@ -5623,7 +5623,7 @@ static PALETTE_INIT(cmast91) { int r,g,b; - UINT8*proms = memory_region(machine, "proms"); + UINT8*proms = machine->region("proms")->base(); b = proms[0x000 + i] << 4; g = proms[0x100 + i] << 4; @@ -5641,7 +5641,7 @@ static PALETTE_INIT(lucky8) UINT8 data; UINT8 *proms; - proms = memory_region(machine, "proms"); + proms = machine->region("proms")->base(); for (i = 0; i < 0x100; i++) { @@ -5650,7 +5650,7 @@ static PALETTE_INIT(lucky8) palette_set_color_rgb(machine, i, pal3bit(data >> 0), pal3bit(data >> 3), pal2bit(data >> 6)); } - proms = memory_region(machine, "proms2"); + proms = machine->region("proms2")->base(); for (i=0; i < 0x20; i++) { data = proms[i]; @@ -5953,7 +5953,7 @@ static PALETTE_INIT(magical) { int r,g,b; - UINT8*proms = memory_region(machine, "proms"); + UINT8*proms = machine->region("proms")->base(); b = proms[0x000 + i] << 4; g = proms[0x100 + i] << 4; @@ -7484,7 +7484,7 @@ YM2203 static DRIVER_INIT(mtonic) { int A; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (A = 0;A < 0x8000;A++) { @@ -9272,7 +9272,7 @@ ROM_END static DRIVER_INIT(goldstar) { int A; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (A = 0;A < 0x10000;A++) { @@ -9357,8 +9357,8 @@ static UINT8 chry10_decrypt(UINT8 cipherText) static DRIVER_INIT( chry10 ) { - UINT8 *ROM = memory_region(machine, "maincpu"); - int size = memory_region_length(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); + int size = machine->region("maincpu")->bytes(); int start = 0; int i; @@ -9381,8 +9381,8 @@ static DRIVER_INIT( chry10 ) static DRIVER_INIT( cb3 ) { - UINT8 *ROM = memory_region(machine, "maincpu"); - int size = memory_region_length(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); + int size = machine->region("maincpu")->bytes(); int start = 0; int i; @@ -9400,7 +9400,7 @@ static DRIVER_INIT( cb3 ) static DRIVER_INIT( chrygld ) { int A; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); do_blockswaps(machine, ROM); // a data bitswap @@ -9416,7 +9416,7 @@ static DRIVER_INIT( chrygld ) static DRIVER_INIT(cm) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); /* forcing PPI mode 0 for all, and A, B & C as input. the mixed modes 2-0 are not working properly. @@ -9427,7 +9427,7 @@ static DRIVER_INIT(cm) static DRIVER_INIT(cmv4) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); /* forcing PPI mode 0 for all, and A, B & C as input. the mixed modes 2-0 are not working properly. @@ -9438,7 +9438,7 @@ static DRIVER_INIT(cmv4) static DRIVER_INIT(cmast91) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); /* forcing PPI mode 0 for all, and A, B & C as input. the mixed modes 2-0 are not working properly. @@ -9449,7 +9449,7 @@ static DRIVER_INIT(cmast91) static DRIVER_INIT(lucky8a) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0x0010] = 0x21; } @@ -9457,7 +9457,7 @@ static DRIVER_INIT(lucky8a) static DRIVER_INIT( nfb96sea ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { @@ -9490,7 +9490,7 @@ static READ8_HANDLER( fixedvala8_r ) static DRIVER_INIT( schery97 ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -9518,7 +9518,7 @@ static READ8_HANDLER( fixedval38_r ) static DRIVER_INIT( schery97a ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -9547,7 +9547,7 @@ static READ8_HANDLER( fixedvalea_r ) static DRIVER_INIT( skill98 ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -9574,7 +9574,7 @@ static READ8_HANDLER( fixedval68_r ) static DRIVER_INIT( fb36xc1 ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -9611,7 +9611,7 @@ static READ8_HANDLER( fixedvalaa_r ) static DRIVER_INIT( fbse354 ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -9643,7 +9643,7 @@ static READ8_HANDLER( fixedvalbe_r ) static DRIVER_INIT( fbse362 ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -9675,7 +9675,7 @@ static READ8_HANDLER( fixedval84_r ) static DRIVER_INIT( rp35 ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -9702,7 +9702,7 @@ static READ8_HANDLER( fixedvalb2_r ) static DRIVER_INIT( rp36 ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -9729,7 +9729,7 @@ static READ8_HANDLER( fixedval48_r ) static DRIVER_INIT( rp36c3 ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -9762,7 +9762,7 @@ static READ8_HANDLER( fixedval74_r ) static DRIVER_INIT( po33 ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -9790,7 +9790,7 @@ static READ8_HANDLER( fixedval58_r ) static DRIVER_INIT( tc132axt ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -9822,7 +9822,7 @@ static READ8_HANDLER( fixedvalc7_r ) static DRIVER_INIT( match133 ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -9845,7 +9845,7 @@ static DRIVER_INIT( match133 ) static DRIVER_INIT(cherrys) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); unsigned char rawData[256] = { 0xCC, 0xCD, 0xCE, 0xCF, 0xC8, 0xC9, 0xCA, 0xCB, 0xC4, 0xC5, 0xC6, 0xC7, @@ -9882,21 +9882,21 @@ static DRIVER_INIT(cherrys) /* todo: remove these patches! */ static DRIVER_INIT( unkch1 ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0x9d52] = 0x00; ROM[0x9d53] = 0x00; } static DRIVER_INIT( unkch3 ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0x9b86] = 0x00; ROM[0x9b87] = 0x00; } static DRIVER_INIT( unkch4 ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0x9a6e] = 0x00; ROM[0x9a6f] = 0x00; } diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c index 3fc908e5743..be89a595281 100644 --- a/src/mame/drivers/gpworld.c +++ b/src/mame/drivers/gpworld.c @@ -108,7 +108,7 @@ static void gpworld_draw_sprites(running_machine *machine, bitmap_t *bitmap, con int i; - UINT8 *GFX = memory_region(machine, "gfx2"); + UINT8 *GFX = machine->region("gfx2")->base(); /* Heisted from Daphne which heisted it from MAME */ for (i = 0; i < 0x800; i += 8) diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c index f7cbc5a5e68..a6312df6584 100644 --- a/src/mame/drivers/groundfx.c +++ b/src/mame/drivers/groundfx.c @@ -457,8 +457,8 @@ static READ32_HANDLER( irq_speedup_r_groundfx ) static DRIVER_INIT( groundfx ) { UINT32 offset,i; - UINT8 *gfx = memory_region(machine, "gfx3"); - int size=memory_region_length(machine, "gfx3"); + UINT8 *gfx = machine->region("gfx3")->base(); + int size=machine->region("gfx3")->bytes(); int data; /* Speedup handlers */ diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c index d3f164d7789..17790830a40 100644 --- a/src/mame/drivers/gstriker.c +++ b/src/mame/drivers/gstriker.c @@ -219,7 +219,7 @@ static WRITE8_HANDLER( gs_sh_pending_command_clear_w ) static WRITE8_HANDLER( gs_sh_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "audiocpu"); + UINT8 *RAM = space->machine->region("audiocpu")->base(); int bankaddress; bankaddress = 0x10000 + (data & 0x03) * 0x8000; diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c index a7a0b9224b6..6817f094bbd 100644 --- a/src/mame/drivers/gsword.c +++ b/src/mame/drivers/gsword.c @@ -924,7 +924,7 @@ ROM_END static DRIVER_INIT( gsword ) { #if 0 - UINT8 *ROM2 = memory_region(machine, "sub"); + UINT8 *ROM2 = machine->region("sub")->base(); ROM2[0x1da] = 0xc3; /* patch for rom self check */ ROM2[0x71e] = 0; /* patch for sound protection or time out function */ @@ -939,7 +939,7 @@ static DRIVER_INIT( gsword ) static DRIVER_INIT( gsword2 ) { #if 0 - UINT8 *ROM2 = memory_region(machine, "sub"); + UINT8 *ROM2 = machine->region("sub")->base(); ROM2[0x1da] = 0xc3; /* patch for rom self check */ ROM2[0x726] = 0; /* patch for sound protection or time out function */ diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index 243e6d2f825..c47c68d382a 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -1184,14 +1184,14 @@ static DRIVER_INIT(gticlub) sharc_dataram_0 = auto_alloc_array(machine, UINT32, 0x100000/4); gticlub_led_reg0 = gticlub_led_reg1 = 0x7f; - K001005_preprocess_texture_data(memory_region(machine, "gfx1"), memory_region_length(machine, "gfx1"), 1); + K001005_preprocess_texture_data(machine->region("gfx1")->base(), machine->region("gfx1")->bytes(), 1); } static DRIVER_INIT(hangplt) { init_konami_cgboard(machine, 2, CGBOARD_TYPE_HANGPLT); - set_cgboard_texture_bank(machine, 0, "bank5", memory_region(machine, "user5")); - set_cgboard_texture_bank(machine, 1, "bank6", memory_region(machine, "user5")); + set_cgboard_texture_bank(machine, 0, "bank5", machine->region("user5")->base()); + set_cgboard_texture_bank(machine, 1, "bank6", machine->region("user5")->base()); sharc_dataram_0 = auto_alloc_array(machine, UINT32, 0x100000/4); sharc_dataram_1 = auto_alloc_array(machine, UINT32, 0x100000/4); diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c index be08b4ce0d5..fcbf24bf878 100644 --- a/src/mame/drivers/guab.c +++ b/src/mame/drivers/guab.c @@ -295,7 +295,7 @@ enum wd1770_status static TIMER_CALLBACK( fdc_data_callback ) { - UINT8* disk = (UINT8*)memory_region(machine, "user1"); + UINT8* disk = (UINT8*)machine->region("user1")->base(); int more_data = 0; /* diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c index 6f7d0034195..19350afd495 100644 --- a/src/mame/drivers/gundealr.c +++ b/src/mame/drivers/gundealr.c @@ -447,7 +447,7 @@ GFXDECODE_END static MACHINE_START( gundealr ) { gundealr_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c index 96b478b044c..396cedf0016 100644 --- a/src/mame/drivers/gunpey.c +++ b/src/mame/drivers/gunpey.c @@ -116,7 +116,7 @@ static READ8_HANDLER( gunpey_inputs_r ) static WRITE8_HANDLER( gunpey_blitter_w ) { static UINT16 blit_ram[0x10]; - UINT8 *blit_rom = memory_region(space->machine, "blit_data"); + UINT8 *blit_rom = space->machine->region("blit_data")->base(); int x,y; blit_ram[offset] = data; @@ -289,7 +289,7 @@ INPUT_PORTS_END static PALETTE_INIT( gunpey ) { int i,r,g,b,val; - UINT8 *blit_rom = memory_region(machine, "blit_data"); + UINT8 *blit_rom = machine->region("blit_data")->base(); for (i = 0; i < 512; i+=2) { @@ -367,7 +367,7 @@ ROM_END static DRIVER_INIT( gunpey ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* patch SLOOOOW cycle checks ... */ rom[0x848b5] = 0x7e; diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c index c71754c6398..0c161e19572 100644 --- a/src/mame/drivers/gunsmoke.c +++ b/src/mame/drivers/gunsmoke.c @@ -275,7 +275,7 @@ GFXDECODE_END static MACHINE_START( gunsmoke ) { gunsmoke_state *state = machine->driver_data(); - UINT8 *rombase = memory_region(machine, "maincpu"); + UINT8 *rombase = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &rombase[0x10000], 0x4000); diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index 13f7558a1bb..c82d823508c 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -1123,7 +1123,7 @@ static void halleys_decode_rgb(running_machine *machine, UINT32 *r, UINT32 *g, U sram_189 = machine->generic.paletteram.u8; // each of the three 32-byte 6330 PROM is wired to an RGB component output - prom_6330 = memory_region(machine, "proms"); + prom_6330 = machine->region("proms")->base(); // latch1 holds 8 bits from the selected palette RAM address latch1_273 = sram_189[addr]; @@ -2164,7 +2164,7 @@ static void init_common(running_machine *machine) // decrypt main program ROM - rom = cpu1_base = memory_region(machine, "maincpu"); + rom = cpu1_base = machine->region("maincpu")->base(); buf = gfx1_base; for (i=0; i<0x10000; i++) @@ -2177,7 +2177,7 @@ static void init_common(running_machine *machine) // swap graphics ROM addresses and unpack each pixel - rom = memory_region(machine, "gfx1"); + rom = machine->region("gfx1")->base(); buf = gfx_plane02; for (i=0xffff; i>=0; i--) diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c index 56aba7e0193..479b04b2e03 100644 --- a/src/mame/drivers/harddriv.c +++ b/src/mame/drivers/harddriv.c @@ -3921,7 +3921,7 @@ static void init_ds3(running_machine *machine) static void init_dsk(running_machine *machine) { harddriv_state *state = machine->driver_data(); - UINT8 *usr3 = memory_region(machine, "user3"); + UINT8 *usr3 = machine->region("user3")->base(); /* install ASIC61 */ memory_install_readwrite16_handler(cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM), 0x85c000, 0x85c7ff, 0, 0, hd68k_dsk_dsp32_r, hd68k_dsk_dsp32_w); @@ -3955,7 +3955,7 @@ static void init_dsk(running_machine *machine) static void init_dsk2(running_machine *machine) { harddriv_state *state = machine->driver_data(); - UINT8 *usr3 = memory_region(machine, "user3"); + UINT8 *usr3 = machine->region("user3")->base(); /* install ASIC65 */ memory_install_write16_handler(cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM), 0x824000, 0x824003, 0, 0, asic65_data_w); diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index 5a75175cbf1..6b77717f13e 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -179,7 +179,7 @@ static const ym3812_interface ym3812_config = static MACHINE_START( hcastle ) { hcastle_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 16, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c index d7f5dd321ec..388cb7656b4 100644 --- a/src/mame/drivers/highvdeo.c +++ b/src/mame/drivers/highvdeo.c @@ -212,7 +212,7 @@ static WRITE16_HANDLER( tv_vcf_paletteram_w ) static WRITE16_HANDLER( tv_vcf_bankselect_w ) { static UINT32 bankaddress; - UINT8 *ROM = memory_region(space->machine, "user1"); + UINT8 *ROM = space->machine->region("user1")->base(); /* bits 0, 1 select the ROM bank */ bankaddress = (data & 0x03) * 0x40000; @@ -328,7 +328,7 @@ static WRITE16_HANDLER( tv_tcf_paletteram_w ) static WRITE16_HANDLER( tv_tcf_bankselect_w ) { static UINT32 bankaddress; - UINT8 *ROM = memory_region(space->machine, "user1"); + UINT8 *ROM = space->machine->region("user1")->base(); /* bits 0, 1, 2 select the ROM bank */ bankaddress = (data & 0x07) * 0x40000; @@ -446,7 +446,7 @@ static READ16_HANDLER( brasil_status_r ) static WRITE16_HANDLER( brasil_status_w ) { static UINT32 bankaddress; - UINT8 *ROM = memory_region(space->machine, "user1"); + UINT8 *ROM = space->machine->region("user1")->base(); switch(data & 3) //data & 7? { diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c index 4da10fcb212..7a223804745 100644 --- a/src/mame/drivers/himesiki.c +++ b/src/mame/drivers/himesiki.c @@ -270,7 +270,7 @@ GFXDECODE_END static MACHINE_START( himesiki ) { himesiki_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/hitpoker.c b/src/mame/drivers/hitpoker.c index 22ef7bdfa7f..07e94696ce3 100644 --- a/src/mame/drivers/hitpoker.c +++ b/src/mame/drivers/hitpoker.c @@ -90,7 +90,7 @@ static VIDEO_UPDATE(hitpoker) static READ8_HANDLER( hitpoker_vram_r ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); if(hitpoker_pic_data & 0x10) return videoram[offset]; @@ -100,7 +100,7 @@ static READ8_HANDLER( hitpoker_vram_r ) static WRITE8_HANDLER( hitpoker_vram_w ) { -// UINT8 *ROM = memory_region(space->machine, "maincpu"); +// UINT8 *ROM = space->machine->region("maincpu")->base(); // if(hitpoker_sys_regs[0x00] & 0x10) videoram[offset] = data; @@ -108,7 +108,7 @@ static WRITE8_HANDLER( hitpoker_vram_w ) static READ8_HANDLER( hitpoker_cram_r ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); if(hitpoker_pic_data & 0x10) return colorram[offset]; @@ -123,7 +123,7 @@ static WRITE8_HANDLER( hitpoker_cram_w ) static READ8_HANDLER( hitpoker_paletteram_r ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); if(hitpoker_pic_data & 0x10) return paletteram[offset]; @@ -493,7 +493,7 @@ MACHINE_CONFIG_END static DRIVER_INIT(hitpoker) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0x1220] = 0x01; //patch eeprom write? ROM[0x1221] = 0x01; diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c index b73f8ba3949..ab886b90545 100644 --- a/src/mame/drivers/hnayayoi.c +++ b/src/mame/drivers/hnayayoi.c @@ -677,8 +677,8 @@ ROM_END static DRIVER_INIT( hnfubuki ) { - UINT8 *rom = memory_region(machine, "gfx1"); - int len = memory_region_length(machine, "gfx1"); + UINT8 *rom = machine->region("gfx1")->base(); + int len = machine->region("gfx1")->bytes(); int i, j; /* interestingly, the blitter data has a slight encryption */ diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index e2e4bd02b8e..babaf4fe738 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -1540,14 +1540,14 @@ static void hng64_reorder(running_machine *machine, UINT8* gfxregion, size_t gfx static DRIVER_INIT( hng64_reorder_gfx ) { - hng64_reorder(machine, memory_region(machine,"scrtile"), memory_region_length(machine, "scrtile")); + hng64_reorder(machine, machine->region("scrtile")->base(), machine->region("scrtile")->bytes()); } #define HACK_REGION #ifdef HACK_REGION static void hng64_patch_bios_region(running_machine* machine, int region) { - UINT8 *rom = memory_region(machine, "user1"); + UINT8 *rom = machine->region("user1")->base(); if ((rom[0x4000]==0xff) && (rom[0x4001] == 0xff)) { @@ -1593,7 +1593,7 @@ static DRIVER_INIT( fatfurwa ) { hng64_state *state = machine->driver_data(); - /* FILE* fp = fopen("/tmp/test.bin", "wb"); fwrite(memory_region(machine, "verts"), 1, 0x0c00000*2, fp); fclose(fp); */ + /* FILE* fp = fopen("/tmp/test.bin", "wb"); fwrite(machine->region("verts")->base(), 1, 0x0c00000*2, fp); fclose(fp); */ DRIVER_INIT_CALL(hng64_fght); state->mcu_type = FIGHT_MCU; } @@ -1683,7 +1683,7 @@ static MACHINE_RESET(hyperneo) { hng64_state *state = machine->driver_data(); int i; - const UINT8 *rom = memory_region(machine, "user2"); + const UINT8 *rom = machine->region("user2")->base(); /* Sound CPU */ UINT8 *RAM = (UINT8*)state->soundram; diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index 79076d28e30..d702c7d1f07 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -294,7 +294,7 @@ static READ8_HANDLER( mrokumei_sound_io_r ) if (state->sndbank & 4) return(soundlatch_r(space, 0)); else - return memory_region(space->machine, "audiocpu")[0x10000 + offset + (state->sndbank & 1) * 0x10000]; + return space->machine->region("audiocpu")->base()[0x10000 + offset + (state->sndbank & 1) * 0x10000]; } static WRITE8_HANDLER( mrokumei_sound_bank_w ) @@ -529,7 +529,7 @@ static WRITE8_HANDLER( pteacher_upd7807_portc_w ) static WRITE8_HANDLER( bankswitch_w ) { - int last_bank = (memory_region_length(space->machine, "maincpu") - 0x10000) / 0x4000; + int last_bank = (space->machine->region("maincpu")->bytes() - 0x10000) / 0x4000; /* last bank is fixed and is #0 for us, other banks start from #1 (hence data+1 below)*/ if (data < last_bank) @@ -1169,10 +1169,10 @@ static MACHINE_START( homedata ) static MACHINE_START( reikaids ) { homedata_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0xc000], 0x4000); - memory_configure_bank(machine, "bank2", 0, 4, memory_region(machine, "audiocpu"), 0x10000); + memory_configure_bank(machine, "bank2", 0, 4, machine->region("audiocpu")->base(), 0x10000); MACHINE_START_CALL(homedata); @@ -1186,10 +1186,10 @@ static MACHINE_START( reikaids ) static MACHINE_START( pteacher ) { homedata_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0xc000], 0x4000); - memory_configure_bank(machine, "bank2", 0, 4, memory_region(machine, "audiocpu"), 0x10000); + memory_configure_bank(machine, "bank2", 0, 4, machine->region("audiocpu")->base(), 0x10000); MACHINE_START_CALL(homedata); diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c index a69bfd7ce6b..eab6e6398a8 100644 --- a/src/mame/drivers/homerun.c +++ b/src/mame/drivers/homerun.c @@ -193,7 +193,7 @@ GFXDECODE_END static MACHINE_START( homerun ) { homerun_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 1, &ROM[0x00000], 0x4000); memory_configure_bank(machine, "bank1", 1, 7, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index dcf40cd1177..93c1815392f 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -557,7 +557,7 @@ static WRITE32_HANDLER( comm1_w ) static WRITE32_HANDLER( comm_rombank_w ) { int bank = data >> 24; - UINT8 *usr3 = memory_region(space->machine, "user3"); + UINT8 *usr3 = space->machine->region("user3")->base(); if (usr3 != NULL) memory_set_bank(space->machine, "bank1", bank & 0x7f); } @@ -853,11 +853,11 @@ static MACHINE_START( hornet ) static MACHINE_RESET( hornet ) { - UINT8 *usr3 = memory_region(machine, "user3"); - UINT8 *usr5 = memory_region(machine, "user5"); + UINT8 *usr3 = machine->region("user3")->base(); + UINT8 *usr5 = machine->region("user5")->base(); if (usr3 != NULL) { - memory_configure_bank(machine, "bank1", 0, memory_region_length(machine, "user3") / 0x40000, usr3, 0x40000); + memory_configure_bank(machine, "bank1", 0, machine->region("user3")->bytes() / 0x40000, usr3, 0x40000); memory_set_bank(machine, "bank1", 0); } @@ -975,12 +975,12 @@ MACHINE_CONFIG_END static MACHINE_RESET( hornet_2board ) { - UINT8 *usr3 = memory_region(machine, "user3"); - UINT8 *usr5 = memory_region(machine, "user5"); + UINT8 *usr3 = machine->region("user3")->base(); + UINT8 *usr5 = machine->region("user5")->base(); if (usr3 != NULL) { - memory_configure_bank(machine, "bank1", 0, memory_region_length(machine, "user3") / 0x40000, usr3, 0x40000); + memory_configure_bank(machine, "bank1", 0, machine->region("user3")->bytes() / 0x40000, usr3, 0x40000); memory_set_bank(machine, "bank1", 0); } cputag_set_input_line(machine, "dsp", INPUT_LINE_RESET, ASSERT_LINE); @@ -1203,7 +1203,7 @@ static void jamma_jvs_cmd_exec(running_machine *machine) static DRIVER_INIT(hornet) { init_konami_cgboard(machine, 1, CGBOARD_TYPE_HORNET); - set_cgboard_texture_bank(machine, 0, "bank5", memory_region(machine, "user5")); + set_cgboard_texture_bank(machine, 0, "bank5", machine->region("user5")->base()); led_reg0 = led_reg1 = 0x7f; @@ -1213,8 +1213,8 @@ static DRIVER_INIT(hornet) static DRIVER_INIT(hornet_2board) { init_konami_cgboard(machine, 2, CGBOARD_TYPE_HORNET); - set_cgboard_texture_bank(machine, 0, "bank5", memory_region(machine, "user5")); - set_cgboard_texture_bank(machine, 1, "bank6", memory_region(machine, "user5")); + set_cgboard_texture_bank(machine, 0, "bank5", machine->region("user5")->base()); + set_cgboard_texture_bank(machine, 1, "bank6", machine->region("user5")->base()); led_reg0 = led_reg1 = 0x7f; diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c index 21ec4614eb3..fdbc0355dce 100644 --- a/src/mame/drivers/hshavoc.c +++ b/src/mame/drivers/hshavoc.c @@ -119,7 +119,7 @@ static DRIVER_INIT(hshavoc) { int x; - UINT16 *src = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *src = (UINT16 *)machine->region("maincpu")->base(); static const UINT16 typedat[16] = { 1,1,1,1, 1,1,1,1, diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index d021d9b6096..26cfd224375 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -195,7 +195,7 @@ static WRITE8_HANDLER( trigger_nmi_on_slave_cpu ) static WRITE8_HANDLER( master_bankswitch_w ) { - unsigned char *ROM = memory_region(space->machine, "master"); + unsigned char *ROM = space->machine->region("master")->base(); int bank = data & 7; ROM = &ROM[0x4000 * bank]; memory_set_bankptr(space->machine, "bank1", ROM); @@ -261,7 +261,7 @@ static WRITE8_HANDLER( slave_bankswitch_w ) { hvyunit_state *state = space->machine->driver_data(); - unsigned char *ROM = memory_region(space->machine, "slave"); + unsigned char *ROM = space->machine->region("slave")->base(); int bank = (data & 0x03); state->port0_data = data; ROM = &ROM[0x4000 * bank]; @@ -296,7 +296,7 @@ static WRITE8_HANDLER( coin_count_w ) static WRITE8_HANDLER( sound_bankswitch_w ) { - unsigned char *ROM = memory_region(space->machine, "soundcpu"); + unsigned char *ROM = space->machine->region("soundcpu")->base(); int bank = data & 0x3; ROM = &ROM[0x4000 * bank]; diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c index 640012bd6dd..2ca991d531f 100644 --- a/src/mame/drivers/hyprduel.c +++ b/src/mame/drivers/hyprduel.c @@ -210,8 +210,8 @@ static TIMER_CALLBACK( magerror_irq_callback ) static READ16_HANDLER( hyprduel_bankedrom_r ) { hyprduel_state *state = space->machine->driver_data(); - UINT8 *ROM = memory_region(space->machine, "gfx1"); - size_t len = memory_region_length(space->machine, "gfx1"); + UINT8 *ROM = space->machine->region("gfx1")->base(); + size_t len = space->machine->region("gfx1")->bytes(); offset = offset * 2 + 0x10000 * (*state->rombank); @@ -296,8 +296,8 @@ static WRITE16_HANDLER( hyprduel_blitter_w ) if (offset == 0xc / 2) { - UINT8 *src = memory_region(space->machine, "gfx1"); - size_t src_len = memory_region_length(space->machine, "gfx1"); + UINT8 *src = space->machine->region("gfx1")->base(); + size_t src_len = space->machine->region("gfx1")->bytes(); UINT32 tmap = (state->blitter_regs[0x00 / 2] << 16) + state->blitter_regs[0x02 / 2]; UINT32 src_offs = (state->blitter_regs[0x04 / 2] << 16) + state->blitter_regs[0x06 / 2]; diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c index 20f39ba958e..4bc623e8b56 100644 --- a/src/mame/drivers/igs009.c +++ b/src/mame/drivers/igs009.c @@ -738,8 +738,8 @@ ROM_END static DRIVER_INIT( jingbell ) { int i; - UINT8 *rom = (UINT8 *)memory_region(machine, "maincpu"); - size_t size = memory_region_length(machine, "maincpu"); + UINT8 *rom = (UINT8 *)machine->region("maincpu")->base(); + size_t size = machine->region("maincpu")->bytes(); for (i=0; imachine, "blitter"); - UINT8 *gfx2 = memory_region(space->machine, "blitter_hi"); - int gfx_size = memory_region_length(space->machine, "blitter"); - int gfx2_size = memory_region_length(space->machine, "blitter_hi"); + UINT8 *gfx = space->machine->region("blitter")->base(); + UINT8 *gfx2 = space->machine->region("blitter_hi")->base(); + int gfx_size = space->machine->region("blitter")->bytes(); + int gfx2_size = space->machine->region("blitter_hi")->bytes(); const rectangle &clip = space->machine->primary_screen->visible_area(); @@ -437,7 +437,7 @@ IGS_DIPS_R( 5 ) static void wlcc_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()); int rom_size = 0x80000; @@ -461,7 +461,7 @@ static void wlcc_decrypt(running_machine *machine) static void lhb_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()); int rom_size = 0x80000; @@ -486,7 +486,7 @@ static void lhb_decrypt(running_machine *machine) static void drgnwrld_type3_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()); int rom_size = 0x80000; @@ -514,7 +514,7 @@ static void drgnwrld_type3_decrypt(running_machine *machine) static void drgnwrld_type2_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()); int rom_size = 0x80000; @@ -547,7 +547,7 @@ static void drgnwrld_type2_decrypt(running_machine *machine) static void drgnwrld_type1_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()); int rom_size = 0x80000; @@ -577,7 +577,7 @@ static void lhb2_decrypt(running_machine *machine) { int i,j; int rom_size = 0x80000; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()); UINT16 *result_data = auto_alloc_array(machine, UINT16, rom_size/2); for (i=0; iregion("maincpu")->base()); UINT16 *result_data = auto_alloc_array(machine, UINT16, rom_size/2); for (i=0; iregion("maincpu")->base()); int rom_size = 0x80000; @@ -682,7 +682,7 @@ static void vbowlj_decrypt(running_machine *machine) static void dbc_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()); int rom_size = 0x80000; @@ -732,7 +732,7 @@ static void dbc_decrypt(running_machine *machine) static void ryukobou_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) memory_region(machine, "maincpu"); + UINT16 *src = (UINT16 *) machine->region("maincpu")->base(); int rom_size = 0x80000; for (i=0; iregion("blitter")->base()); UINT8 *result_data = auto_alloc_array(machine, UINT8, rom_size); for (i=0; iregion("blitter")->base()); UINT8 *result_data = auto_alloc_array(machine, UINT8, rom_size); for (i=0; imachine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); // Plug previous address range with ROM access memory_install_rom(sp, igs011_prot1_addr + 0, igs011_prot1_addr + 9, 0, 0, rom + igs011_prot1_addr); @@ -1641,7 +1641,7 @@ static READ16_HANDLER( vbowl_igs003_r ) // V0400O static DRIVER_INIT( drgnwrld ) { -// UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); drgnwrld_type1_decrypt(machine); drgnwrld_gfx_decrypt(machine); @@ -1667,7 +1667,7 @@ static DRIVER_INIT( drgnwrld ) static DRIVER_INIT( drgnwrldv30 ) { -// UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); drgnwrld_type1_decrypt(machine); drgnwrld_gfx_decrypt(machine); @@ -1692,7 +1692,7 @@ static DRIVER_INIT( drgnwrldv30 ) static DRIVER_INIT( drgnwrldv21 ) { -// UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); drgnwrld_type2_decrypt(machine); drgnwrld_gfx_decrypt(machine); @@ -1722,7 +1722,7 @@ static DRIVER_INIT( drgnwrldv21 ) static DRIVER_INIT( drgnwrldv21j ) { -// UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); drgnwrld_type3_decrypt(machine); drgnwrld_gfx_decrypt(machine); @@ -1749,7 +1749,7 @@ static DRIVER_INIT( drgnwrldv21j ) static DRIVER_INIT( drgnwrldv20j ) { -// UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); drgnwrld_type3_decrypt(machine); drgnwrld_gfx_decrypt(machine); @@ -1787,7 +1787,7 @@ static DRIVER_INIT( drgnwrldv11h ) static DRIVER_INIT( drgnwrldv10c ) { -// UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); drgnwrld_type1_decrypt(machine); drgnwrld_gfx_decrypt(machine); @@ -1813,7 +1813,7 @@ static DRIVER_INIT( drgnwrldv10c ) static DRIVER_INIT( lhb ) { -// UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); lhb_decrypt(machine); @@ -1823,7 +1823,7 @@ static DRIVER_INIT( lhb ) static DRIVER_INIT( lhbv33c ) { -// UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); lhb_decrypt(machine); @@ -1833,7 +1833,7 @@ static DRIVER_INIT( lhbv33c ) static DRIVER_INIT( dbc ) { -// UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); dbc_decrypt(machine); @@ -1862,7 +1862,7 @@ static DRIVER_INIT( dbc ) static DRIVER_INIT( ryukobou ) { -// UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); ryukobou_decrypt(machine); @@ -1875,7 +1875,7 @@ static DRIVER_INIT( ryukobou ) static DRIVER_INIT( xymg ) { -// UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); lhb_decrypt(machine); /* @@ -1909,7 +1909,7 @@ static DRIVER_INIT( xymg ) static DRIVER_INIT( wlcc ) { -// UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); wlcc_decrypt(machine); /* @@ -1933,7 +1933,7 @@ static DRIVER_INIT( wlcc ) static DRIVER_INIT( lhb2 ) { - UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); lhb2_decrypt(machine); lhb2_decrypt_gfx(machine); @@ -1955,8 +1955,8 @@ static DRIVER_INIT( lhb2 ) static DRIVER_INIT( vbowl ) { - UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); - UINT8 *gfx = (UINT8 *) memory_region(machine, "blitter"); + UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); + UINT8 *gfx = (UINT8 *) machine->region("blitter")->base(); int i; vbowlj_decrypt(machine); @@ -1980,8 +1980,8 @@ static DRIVER_INIT( vbowl ) static DRIVER_INIT( vbowlj ) { - UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); - UINT8 *gfx = (UINT8 *) memory_region(machine, "blitter"); + UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); + UINT8 *gfx = (UINT8 *) machine->region("blitter")->base(); int i; vbowlj_decrypt(machine); diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index c1ab92e056f..5c2cbeb4c94 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -144,8 +144,8 @@ static int sprites_gfx_size; // This routine expands each word into three bytes. static void expand_sprites(running_machine *machine) { - UINT8 *rom = memory_region(machine, "sprites"); - int size = memory_region_length(machine, "sprites"); + UINT8 *rom = machine->region("sprites")->base(); + int size = machine->region("sprites")->bytes(); int i; sprites_gfx_size = size / 2 * 3; @@ -341,8 +341,8 @@ static VIDEO_UPDATE( igs017 ) static void decrypt_program_rom(running_machine *machine, int mask, int a7, int a6, int a5, int a4, int a3, int a2, int a1, int a0) { - int length = memory_region_length(machine, "maincpu"); - UINT8 *rom = memory_region(machine, "maincpu"); + int length = machine->region("maincpu")->bytes(); + UINT8 *rom = machine->region("maincpu")->base(); UINT8 *tmp = auto_alloc_array(machine, UINT8, length); int i; @@ -394,7 +394,7 @@ static void decrypt_program_rom(running_machine *machine, int mask, int a7, int static void iqblocka_patch_rom(running_machine *machine) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); // rom[0x7b64] = 0xc9; @@ -435,8 +435,8 @@ static DRIVER_INIT( iqblockf ) static void tjsb_decrypt_sprites(running_machine *machine) { - int length = memory_region_length(machine, "sprites"); - UINT8 *rom = memory_region(machine, "sprites"); + int length = machine->region("sprites")->bytes(); + UINT8 *rom = machine->region("sprites")->base(); UINT8 *tmp = auto_alloc_array(machine, UINT8, length); int i; @@ -465,7 +465,7 @@ static void tjsb_decrypt_sprites(running_machine *machine) static void tjsb_patch_rom(running_machine *machine) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); rom[0x011df] = 0x18; } @@ -483,7 +483,7 @@ static DRIVER_INIT( tjsb ) static void mgcs_decrypt_program_rom(running_machine *machine) { int i; - UINT16 *src = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *src = (UINT16 *)machine->region("maincpu")->base(); int rom_size = 0x80000; @@ -532,8 +532,8 @@ static void mgcs_decrypt_program_rom(running_machine *machine) static void mgcs_decrypt_tiles(running_machine *machine) { - int length = memory_region_length(machine, "tilemaps"); - UINT8 *rom = memory_region(machine, "tilemaps"); + int length = machine->region("tilemaps")->bytes(); + UINT8 *rom = machine->region("tilemaps")->base(); UINT8 *tmp = auto_alloc_array(machine, UINT8, length); int i; @@ -549,8 +549,8 @@ static void mgcs_decrypt_tiles(running_machine *machine) static void mgcs_flip_sprites(running_machine *machine) { - int length = memory_region_length(machine, "sprites"); - UINT8 *rom = memory_region(machine, "sprites"); + int length = machine->region("sprites")->bytes(); + UINT8 *rom = machine->region("sprites")->base(); int i; for (i = 0;i < length;i+=2) @@ -570,7 +570,7 @@ static void mgcs_flip_sprites(running_machine *machine) static void mgcs_patch_rom(running_machine *machine) { - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); rom[0x4e036/2] = 0x6006; @@ -596,7 +596,7 @@ static DRIVER_INIT( mgcs ) // decryption is incomplete, the first part of code doesn't seem right. static DRIVER_INIT( tarzan ) { - UINT16 *ROM = (UINT16 *)memory_region(machine,"maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); int i; int size = 0x40000; @@ -622,7 +622,7 @@ static DRIVER_INIT( tarzan ) // by iq_132 static DRIVER_INIT( tarzana ) { - UINT8 *ROM = memory_region(machine,"maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); int i; int size = 0x80000; @@ -644,7 +644,7 @@ static DRIVER_INIT( tarzana ) // decryption is incomplete, the first part of code doesn't seem right. static DRIVER_INIT( starzan ) { - UINT8 *ROM = memory_region(machine,"maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); int i; int size = 0x040000; @@ -699,7 +699,7 @@ static DRIVER_INIT( starzan ) static DRIVER_INIT( sdmg2 ) { int i; - UINT16 *src = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *src = (UINT16 *)machine->region("maincpu")->base(); int rom_size = 0x80000; @@ -756,7 +756,7 @@ static DRIVER_INIT( sdmg2 ) static DRIVER_INIT( mgdh ) { int i; - UINT16 *src = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *src = (UINT16 *)machine->region("maincpu")->base(); int rom_size = 0x80000; @@ -793,7 +793,7 @@ static DRIVER_INIT( mgdh ) static DRIVER_INIT( lhzb2 ) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()); int rom_size = 0x80000; @@ -883,7 +883,7 @@ static DRIVER_INIT( lhzb2 ) static DRIVER_INIT( lhzb2a ) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()); int rom_size = 0x80000; @@ -945,7 +945,7 @@ static DRIVER_INIT( lhzb2a ) static DRIVER_INIT( slqz2 ) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()); int rom_size = 0x80000; diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index 33e3454b762..3d010620ef1 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -224,7 +224,7 @@ static void sdwx_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) memory_region(machine, "user1"); + UINT16 *src = (UINT16 *) machine->region("user1")->base(); int rom_size = 0x80000; @@ -269,7 +269,7 @@ static void sdwx_gfx_decrypt(running_machine *machine) { int i; unsigned rom_size = 0x80000; - UINT8 *src = (UINT8 *) (memory_region(machine, "gfx1")); + UINT8 *src = (UINT8 *) (machine->region("gfx1")->base()); UINT8 *result_data = auto_alloc_array(machine, UINT8, rom_size); for (i=0; imachine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); return rom[offset+0x10000]; } @@ -1720,7 +1720,7 @@ ROM_END static DRIVER_INIT( cpoker ) { int A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (A = 0;A < 0x10000;A++) @@ -1734,7 +1734,7 @@ static DRIVER_INIT( cpoker ) static DRIVER_INIT( cpokert ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int i; /* decrypt the program ROM */ @@ -1764,7 +1764,7 @@ static DRIVER_INIT( cpokert ) static DRIVER_INIT( cska ) { int A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (A = 0;A < 0x10000;A++) @@ -1781,7 +1781,7 @@ static DRIVER_INIT( cska ) static DRIVER_INIT( igs_ncs ) { int A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (A = 0;A < 0x10000;A++) @@ -1898,7 +1898,7 @@ Clocks static DRIVER_INIT( igs_ncs2 ) { - UINT8 *src = (UINT8 *) (memory_region(machine, "maincpu")); + UINT8 *src = (UINT8 *) (machine->region("maincpu")->base()); int i; for(i = 0; i < 0x10000; i++) @@ -1975,8 +1975,8 @@ static DRIVER_INIT( chleague ) int length; UINT8 *rom; - rom = memory_region(machine, "maincpu"); - length = memory_region_length(machine, "maincpu"); + rom = machine->region("maincpu")->base(); + length = machine->region("maincpu")->bytes(); for (A = 0;A < length;A++) { if ((A & 0x09C0) == 0x0880) rom[A] ^= 0x20; @@ -2039,8 +2039,8 @@ static DRIVER_INIT( number10 ) UINT8 *tmp; UINT8 *rom; - rom = memory_region(machine, "maincpu"); - length = memory_region_length(machine, "maincpu"); + rom = machine->region("maincpu")->base(); + length = machine->region("maincpu")->bytes(); for (A = 0;A < length;A++) { if ((A & 0x09C0) == 0x0880) rom[A] ^= 0x20; @@ -2069,8 +2069,8 @@ static DRIVER_INIT( number10 ) rom[0xeed] = 0xc3; /* Descramble graphic */ - rom = memory_region(machine, "gfx1"); - length = memory_region_length(machine, "gfx1"); + rom = machine->region("gfx1")->base(); + length = machine->region("gfx1")->bytes(); tmp = auto_alloc_array(machine, UINT8, length); memcpy(tmp,rom,length); for (A = 0;A < length;A++) @@ -2118,7 +2118,7 @@ ROM_END static DRIVER_INIT( cpokerpk ) { int A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (A=0x0714; A < 0xF000; A+=0x1000) rom[A] ^= 0x20; @@ -2172,7 +2172,7 @@ ROM_END static DRIVER_INIT( pktet346 ) { int A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (A = 0;A < 0x10000;A++) diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c index 87be6cae4af..6725983baf6 100644 --- a/src/mame/drivers/intrscti.c +++ b/src/mame/drivers/intrscti.c @@ -120,7 +120,7 @@ ROM_END static DRIVER_INIT( intrscti ) { - UINT8 *cpu = memory_region( machine, "maincpu" ); + UINT8 *cpu = machine->region( "maincpu" )->base(); int i; for (i=0x8000;i<0x8fff;i++) { diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index a94ae8358ef..9e7a5d79a3d 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -317,7 +317,7 @@ static const ym2610_interface ym2610_config = static MACHINE_START( inufuku ) { inufuku_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x8000); memory_set_bank(machine, "bank1", 0); diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c index e678ff4d99e..2916d612d71 100644 --- a/src/mame/drivers/iqblock.c +++ b/src/mame/drivers/iqblock.c @@ -90,7 +90,7 @@ static WRITE8_HANDLER( iqblock_irqack_w ) static READ8_HANDLER( extrarom_r ) { - return memory_region(space->machine, "user1")[offset]; + return space->machine->region("user1")->base()[offset]; } @@ -425,7 +425,7 @@ ROM_END static DRIVER_INIT( iqblock ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int i; /* decrypt the program ROM */ @@ -447,7 +447,7 @@ static DRIVER_INIT( iqblock ) static DRIVER_INIT( grndtour ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int i; /* decrypt the program ROM */ diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c index b7eb5a49b84..cce7712b536 100644 --- a/src/mame/drivers/itech32.c +++ b/src/mame/drivers/itech32.c @@ -656,7 +656,7 @@ static READ32_HANDLER( gtclass_prot_result_r ) static WRITE8_HANDLER( sound_bank_w ) { - memory_set_bankptr(space->machine, "bank1", &memory_region(space->machine, "soundcpu")[0x10000 + data * 0x4000]); + memory_set_bankptr(space->machine, "bank1", &space->machine->region("soundcpu")->base()[0x10000 + data * 0x4000]); } diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index 444f9ed9228..759aa608794 100644 --- a/src/mame/drivers/itech8.c +++ b/src/mame/drivers/itech8.c @@ -674,7 +674,7 @@ static MACHINE_RESET( itech8 ) /* make sure bank 0 is selected */ if (main_cpu_type == M6809 || main_cpu_type == HD6309) { - memory_set_bankptr(machine, "bank1", &memory_region(machine, "maincpu")[0x4000]); + memory_set_bankptr(machine, "bank1", &machine->region("maincpu")->base()[0x4000]); machine->device("maincpu")->reset(); } @@ -722,7 +722,7 @@ static WRITE8_HANDLER( blitter_w ) { /* bit 0x20 on address 7 controls CPU banking */ if (offset / 2 == 7) - memory_set_bankptr(space->machine, "bank1", &memory_region(space->machine, "maincpu")[0x4000 + 0xc000 * ((data >> 5) & 1)]); + memory_set_bankptr(space->machine, "bank1", &space->machine->region("maincpu")->base()[0x4000 + 0xc000 * ((data >> 5) & 1)]); /* the rest is handled by the video hardware */ itech8_blitter_w(space, offset, data); @@ -732,7 +732,7 @@ static WRITE8_HANDLER( blitter_w ) static WRITE8_HANDLER( rimrockn_bank_w ) { /* banking is controlled here instead of by the blitter output */ - memory_set_bankptr(space->machine, "bank1", &memory_region(space->machine, "maincpu")[0x4000 + 0xc000 * (data & 3)]); + memory_set_bankptr(space->machine, "bank1", &space->machine->region("maincpu")->base()[0x4000 + 0xc000 * (data & 3)]); } diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c index 0b46114128d..642dff0264b 100644 --- a/src/mame/drivers/itgambl2.c +++ b/src/mame/drivers/itgambl2.c @@ -74,7 +74,7 @@ static VIDEO_START( itgambl2 ) static VIDEO_UPDATE( itgambl2 ) { int x,y,count; - const UINT8 *blit_ram = memory_region(screen->machine,"gfx1"); + const UINT8 *blit_ram = screen->machine->region("gfx1")->base(); if(input_code_pressed(screen->machine, KEYCODE_Z)) test_x++; diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c index 583e6b47b5c..9b6546355cc 100644 --- a/src/mame/drivers/itgambl3.c +++ b/src/mame/drivers/itgambl3.c @@ -62,7 +62,7 @@ static VIDEO_START( itgambl3 ) static VIDEO_UPDATE( itgambl3 ) { int x,y,count; - const UINT8 *blit_ram = memory_region(screen->machine,"gfx1"); + const UINT8 *blit_ram = screen->machine->region("gfx1")->base(); if(input_code_pressed(screen->machine, KEYCODE_Z)) test_x++; diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c index 265b73fb469..ad3f0be4bd8 100644 --- a/src/mame/drivers/jack.c +++ b/src/mame/drivers/jack.c @@ -114,7 +114,7 @@ static READ8_HANDLER( striv_question_r ) // Read the actual byte from question roms else { - UINT8 *ROM = memory_region(space->machine, "user1"); + UINT8 *ROM = space->machine->region("user1")->base(); int real_address; real_address = state->question_address | (offset & 0x3f0) | state->remap_address[offset & 0x0f]; @@ -1307,7 +1307,7 @@ static void treahunt_decode( running_machine *machine ) { int A; address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x4000); int data; @@ -1376,7 +1376,7 @@ static DRIVER_INIT( loverboy ) the start of the game code. ToDo: Figure out what's really going on */ - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0x13] = 0x01; ROM[0x12] = 0x9d; @@ -1387,7 +1387,7 @@ static DRIVER_INIT( loverboy ) static DRIVER_INIT( striv ) { jack_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); UINT8 data; int A; diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index c400f6df0cc..4e587504c4e 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -119,7 +119,7 @@ static READ8_HANDLER( jackal_spriteram_r ) static WRITE8_HANDLER( jackal_rambank_w ) { jackal_state *state = space->machine->driver_data(); - UINT8 *rgn = memory_region(space->machine, "master"); + UINT8 *rgn = space->machine->region("master")->base(); if (data & 0x04) popmessage("jackal_rambank_w %02x", data); @@ -336,7 +336,7 @@ static INTERRUPT_GEN( jackal_interrupt ) static MACHINE_START( jackal ) { jackal_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "master"); + UINT8 *ROM = machine->region("master")->base(); memory_configure_bank(machine, "bank1", 0, 1, &ROM[0x04000], 0x8000); memory_configure_bank(machine, "bank1", 1, 1, &ROM[0x14000], 0x8000); @@ -351,7 +351,7 @@ static MACHINE_START( jackal ) static MACHINE_RESET( jackal ) { jackal_state *state = machine->driver_data(); - UINT8 *rgn = memory_region(machine, "master"); + UINT8 *rgn = machine->region("master")->base(); // HACK: running at the nominal clock rate, music stops working // at the beginning of the game. This fixes it. diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c index 44978226734..ec2c8995824 100644 --- a/src/mame/drivers/jackie.c +++ b/src/mame/drivers/jackie.c @@ -308,7 +308,7 @@ static WRITE8_HANDLER( igs_irqack_w ) static READ8_HANDLER( expram_r ) { - UINT8 *rom = memory_region(space->machine, "gfx3"); + UINT8 *rom = space->machine->region("gfx3")->base(); offset += exp_bank * 0x8000; // logerror("PC %06X: %04x = %02x\n",cpu_get_pc(space->cpu),offset,rom[offset]); @@ -502,7 +502,7 @@ static DRIVER_INIT( jackie ) { int A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (A = 0;A < 0xf000;A++) { diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c index 77a71f1f06a..622135bd733 100644 --- a/src/mame/drivers/jackpool.c +++ b/src/mame/drivers/jackpool.c @@ -284,7 +284,7 @@ ROM_END static DRIVER_INIT( jackpool ) { - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); /* patch NVRAM routine */ rom[0x9040/2] = 0x6602; diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c index fff56820ea7..112b8258951 100644 --- a/src/mame/drivers/jailbrek.c +++ b/src/mame/drivers/jailbrek.c @@ -406,7 +406,7 @@ ROM_END static DRIVER_INIT( jailbrek ) { - UINT8 *SPEECH_ROM = memory_region(machine, "vlm"); + UINT8 *SPEECH_ROM = machine->region("vlm")->base(); int ind; /* @@ -418,7 +418,7 @@ static DRIVER_INIT( jailbrek ) represents address line A13.) */ - if (memory_region_length(machine, "vlm") == 0x4000) + if (machine->region("vlm")->bytes() == 0x4000) { for (ind = 0; ind < 0x2000; ++ind) { diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c index bdff1a0247d..4889fe87455 100644 --- a/src/mame/drivers/jalmah.c +++ b/src/mame/drivers/jalmah.c @@ -279,7 +279,7 @@ priority = 8, then 4, 2 and finally 1). ***************************************************************************************/ static void jalmah_priority_system(running_machine *machine) { - UINT8 *pri_rom = memory_region(machine, "user1"); + UINT8 *pri_rom = machine->region("user1")->base(); UINT8 i; UINT8 prinum[0x10]; @@ -862,7 +862,7 @@ static WRITE16_HANDLER( jalmah_okirom_w ) { if(ACCESSING_BITS_0_7) { - UINT8 *oki = memory_region(space->machine, "oki"); + UINT8 *oki = space->machine->region("oki")->base(); oki_rom = data & 1; @@ -879,7 +879,7 @@ static WRITE16_HANDLER( jalmah_okibank_w ) { if(ACCESSING_BITS_0_7) { - UINT8 *oki = memory_region(space->machine, "oki"); + UINT8 *oki = space->machine->region("oki")->base(); oki_bank = data & 3; diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c index 8458a2ddc23..a7702aa95f0 100644 --- a/src/mame/drivers/jangou.c +++ b/src/mame/drivers/jangou.c @@ -154,7 +154,7 @@ w [$17] static UINT8 jangou_gfx_nibble( running_machine *machine, UINT16 niboffset ) { - const UINT8 *const blit_rom = memory_region(machine, "gfx"); + const UINT8 *const blit_rom = machine->region("gfx")->base(); if (niboffset & 1) return (blit_rom[(niboffset >> 1) & 0xffff] & 0xf0) >> 4; @@ -1368,7 +1368,7 @@ static DRIVER_INIT (luckygrl) { // this is WRONG int A; - UINT8 *ROM = memory_region(machine, "cpu0"); + UINT8 *ROM = machine->region("cpu0")->base(); unsigned char patn1[32] = { 0x00, 0xA0, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0xA0, diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c index df1a30eed24..2c42a8a1098 100644 --- a/src/mame/drivers/jantotsu.c +++ b/src/mame/drivers/jantotsu.c @@ -301,7 +301,7 @@ static void jan_adpcm_int( device_t *device ) } else { - UINT8 *ROM = memory_region(device->machine, "adpcm"); + UINT8 *ROM = device->machine->region("adpcm")->base(); state->adpcm_data = ((state->adpcm_trigger ? (ROM[state->adpcm_pos] & 0x0f) : (ROM[state->adpcm_pos] & 0xf0) >> 4)); msm5205_data_w(device, state->adpcm_data & 0xf); diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c index 93493259cd6..bff0c9fcbc4 100644 --- a/src/mame/drivers/jchan.c +++ b/src/mame/drivers/jchan.c @@ -383,8 +383,8 @@ static VIDEO_UPDATE(jchan) bitmap_fill(sprite_bitmap_1, cliprect, 0x0000); bitmap_fill(sprite_bitmap_2, cliprect, 0x0000); - skns_draw_sprites(screen->machine, sprite_bitmap_1, cliprect, jchan_sprite_ram32_1, 0x4000, memory_region(screen->machine,"gfx1"), memory_region_length (screen->machine, "gfx1"), jchan_sprite_regs32_1 ); - skns_draw_sprites(screen->machine, sprite_bitmap_2, cliprect, jchan_sprite_ram32_2, 0x4000, memory_region(screen->machine,"gfx2"), memory_region_length (screen->machine, "gfx2"), jchan_sprite_regs32_2 ); + skns_draw_sprites(screen->machine, sprite_bitmap_1, cliprect, jchan_sprite_ram32_1, 0x4000, screen->machine->region("gfx1")->base(), screen->machine->region ("gfx1")->bytes(), jchan_sprite_regs32_1 ); + skns_draw_sprites(screen->machine, sprite_bitmap_2, cliprect, jchan_sprite_ram32_2, 0x4000, screen->machine->region("gfx2")->base(), screen->machine->region ("gfx2")->bytes(), jchan_sprite_regs32_2 ); // ignoring priority bits for now - might use alpha too, check 0x8000 of palette writes for (y=0;y<240;y++) diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c index 324da61fee8..2fa818078b6 100644 --- a/src/mame/drivers/jedi.c +++ b/src/mame/drivers/jedi.c @@ -162,7 +162,7 @@ static MACHINE_START( jedi ) timer_adjust_oneshot(state->interrupt_timer, machine->primary_screen->time_until_pos(32), 32); /* configure the banks */ - memory_configure_bank(machine, "bank1", 0, 3, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 3, machine->region("maincpu")->base() + 0x10000, 0x4000); /* set up save state */ state_save_register_global(machine, state->nvram_enabled); diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c index 8b5d9a6a4d7..d91b8290558 100644 --- a/src/mame/drivers/jokrwild.c +++ b/src/mame/drivers/jokrwild.c @@ -538,7 +538,7 @@ static DRIVER_INIT( jokrwild ) *****************************************************************************/ { int i, offs; - UINT8 *srcp = memory_region( machine, "maincpu" ); + UINT8 *srcp = machine->region( "maincpu" )->base(); for (i = 0x8000; i < 0x10000; i++) { diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index 3c0eb2c74fa..5e79ebc416b 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -427,7 +427,7 @@ INPUT_PORTS_END static PALETTE_INIT(jongkyo) { int i; - UINT8* proms = memory_region(machine, "proms"); + UINT8* proms = machine->region("proms")->base(); for (i = 0; i < 0x40; i++) { int data = proms[i]; @@ -550,7 +550,7 @@ ROM_END static DRIVER_INIT( jongkyo ) { int i; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* first of all, do a simple bitswap */ for (i = 0x6000; i < 0x9000; ++i) diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c index b46ca8fd6c0..c31af859d47 100644 --- a/src/mame/drivers/jpmsys5.c +++ b/src/mame/drivers/jpmsys5.c @@ -212,7 +212,7 @@ static VIDEO_UPDATE( jpmsys5v ) static WRITE16_HANDLER( rombank_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); data &= 0x1f; memory_set_bankptr(space->machine, "bank1", &rom[0x20000 + 0x20000 * data]); } @@ -576,7 +576,7 @@ static ACIA6850_INTERFACE( acia2_if ) static MACHINE_START( jpmsys5v ) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu")); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base()); touch_timer = timer_alloc(machine, touch_cb, NULL); } diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c index 4c82fd9dcde..458f001c3f4 100644 --- a/src/mame/drivers/jrpacman.c +++ b/src/mame/drivers/jrpacman.c @@ -369,7 +369,7 @@ static DRIVER_INIT( jrpacman ) { 0,0 } }; - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); int i, j, A; for (i = A = 0; table[i].count; i++) diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c index 3967166e7f4..599037f7467 100644 --- a/src/mame/drivers/junofrst.c +++ b/src/mame/drivers/junofrst.c @@ -134,7 +134,7 @@ static WRITE8_HANDLER( junofrst_blitter_w ) if (offset == 3) { int i; - UINT8 *gfx_rom = memory_region(space->machine, "gfx1"); + UINT8 *gfx_rom = space->machine->region("gfx1")->base(); offs_t src = ((state->blitterdata[2] << 8) | state->blitterdata[3]) & 0xfffc; offs_t dest = (state->blitterdata[0] << 8) | state->blitterdata[1]; @@ -504,7 +504,7 @@ static DRIVER_INIT( junofrst ) { UINT8 *decrypted = konami1_decode(machine, "maincpu"); - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x1000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x1000); memory_configure_bank_decrypted(machine, "bank1", 0, 16, decrypted + 0x10000, 0x1000); } diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index 67560c68371..a31bc933d92 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -799,8 +799,8 @@ ADDRESS_MAP_END static void kaneko16_common_oki_bank_w( running_machine* machine, const char *bankname, const char* tag, int bank, size_t fixedsize, size_t bankedsize ) { UINT32 bankaddr; - UINT8* samples = memory_region(machine,tag); - size_t length = memory_region_length(machine,tag); + UINT8* samples = machine->region(tag)->base(); + size_t length = machine->region(tag)->bytes(); bankaddr = fixedsize + (bankedsize * bank); @@ -2236,8 +2236,8 @@ MACHINE_CONFIG_END */ static void kaneko16_unscramble_tiles(running_machine *machine, const char *region) { - UINT8 *RAM = memory_region(machine, region); - int size = memory_region_length(machine, region); + UINT8 *RAM = machine->region(region)->base(); + int size = machine->region(region)->bytes(); int i; if (RAM == NULL) return; @@ -2262,11 +2262,11 @@ static void kaneko16_expand_sample_banks(running_machine *machine, const char *r int bank; UINT8 *src0; - if (memory_region_length(machine, region) < 0x40000 * 16) + if (machine->region(region)->bytes() < 0x40000 * 16) fatalerror("gtmr SOUND1 region too small"); /* bank 0 maps to itself, so we just leave it alone */ - src0 = memory_region(machine, region); + src0 = machine->region(region)->base(); for (bank = 15; bank > 0; bank--) { UINT8 *srcn = src0 + 0x10000 * (bank < 3 ? 3 : bank); diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c index c5d915833e3..ae6654add60 100644 --- a/src/mame/drivers/kangaroo.c +++ b/src/mame/drivers/kangaroo.c @@ -174,7 +174,7 @@ static WRITE8_HANDLER(mcu_sim_w); static MACHINE_START( kangaroo ) { - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "gfx1"), 0x2000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("gfx1")->base(), 0x2000); } diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index 7b29d7ebf44..7057030ca39 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -1138,7 +1138,7 @@ static DRIVER_INIT( wndrplnt ) static DRIVER_INIT( chelnov ) { karnov_state *state = machine->driver_data(); - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); state->microcontroller_id = CHELNOV; state->coin_mask = 0xe0; @@ -1149,7 +1149,7 @@ static DRIVER_INIT( chelnov ) static DRIVER_INIT( chelnovu ) { karnov_state *state = machine->driver_data(); - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); state->microcontroller_id = CHELNOVU; state->coin_mask = 0xe0; @@ -1160,7 +1160,7 @@ static DRIVER_INIT( chelnovu ) static DRIVER_INIT( chelnovj ) { karnov_state *state = machine->driver_data(); - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); state->microcontroller_id = CHELNOVJ; state->coin_mask = 0xe0; diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c index b2f9795e61d..7cf0d6a77e7 100644 --- a/src/mame/drivers/kchamp.c +++ b/src/mame/drivers/kchamp.c @@ -732,7 +732,7 @@ static UINT8 *decrypt_code(running_machine *machine) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x10000); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int A; space->set_decrypted_region(0x0000, 0xffff, decrypted); @@ -747,7 +747,7 @@ static UINT8 *decrypt_code(running_machine *machine) static DRIVER_INIT( kchampvs ) { kchamp_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); UINT8 *decrypted = decrypt_code(machine); int A; diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c index b9279e7a2b7..d04b0b9335f 100644 --- a/src/mame/drivers/kickgoal.c +++ b/src/mame/drivers/kickgoal.c @@ -814,7 +814,7 @@ ROM_END static DRIVER_INIT( kickgoal ) { #if 0 /* we should find a real fix instead */ - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); /* fix "bug" that prevents game from writing to EEPROM */ rom[0x12b0/2] = 0x0001; diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c index ecbb2fb0b8e..c6bfeb87ff4 100644 --- a/src/mame/drivers/kingdrby.c +++ b/src/mame/drivers/kingdrby.c @@ -936,8 +936,8 @@ static PALETTE_INIT(kingdrby) static PALETTE_INIT(kingdrbb) { - UINT8 *raw_prom = memory_region(machine, "raw_prom"); - UINT8 *prom = memory_region(machine, "proms"); + UINT8 *raw_prom = machine->region("raw_prom")->base(); + UINT8 *prom = machine->region("proms")->base(); int bit0, bit1, bit2 , r, g, b; int i; diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c index 9f943f21ffa..bc1ae9c2f0d 100644 --- a/src/mame/drivers/kingobox.c +++ b/src/mame/drivers/kingobox.c @@ -794,7 +794,7 @@ ROM_END static DRIVER_INIT( ringking3 ) { int i; - UINT8 *RAM = memory_region(machine, "proms"); + UINT8 *RAM = machine->region("proms")->base(); /* expand the first color PROM to look like the kingofb ones... */ for (i = 0; i < 0x100; i++) @@ -804,8 +804,8 @@ static DRIVER_INIT( ringking3 ) static DRIVER_INIT( ringkingw ) { int i,j,k; - UINT8 *PROMS = memory_region(machine, "proms"); - UINT8 *USER1 = memory_region(machine, "user1"); + UINT8 *PROMS = machine->region("proms")->base(); + UINT8 *USER1 = machine->region("user1")->base(); /* change the PROMs encode in a simple format to use kingofb decode */ for(i = 0, j = 0; j < 0x40; i++, j++) diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c index 21f1f0a8870..36108c0669c 100644 --- a/src/mame/drivers/kingpin.c +++ b/src/mame/drivers/kingpin.c @@ -178,7 +178,7 @@ static DRIVER_INIT( kingpin ) TMS9928A_configure(&tms9928a_interface); /* Hacks to keep the emu a'runnin */ - code_base = memory_region(machine, "maincpu"); + code_base = machine->region("maincpu")->base(); code_base[0x17d4] = 0xc3; /* Maybe sound related? */ } diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c index 128cef54fb4..2e16815959d 100644 --- a/src/mame/drivers/konamigq.c +++ b/src/mame/drivers/konamigq.c @@ -351,7 +351,7 @@ static DRIVER_INIT( konamigq ) psx_driver_init(machine); - state->p_n_pcmram = memory_region( machine, "shared" ) + 0x80000; + state->p_n_pcmram = machine->region( "shared" )->base() + 0x80000; } static void konamigq_exit(running_machine &machine) diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index bf571d073f4..35226f7aa22 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -928,14 +928,14 @@ static READ32_HANDLER( gx6bppspr_r ) static READ32_HANDLER( type1_roz_r1 ) { - UINT32 *ROM = (UINT32 *)memory_region(space->machine, "gfx3"); + UINT32 *ROM = (UINT32 *)space->machine->region("gfx3")->base(); return ROM[offset]; } static READ32_HANDLER( type1_roz_r2 ) { - UINT32 *ROM = (UINT32 *)memory_region(space->machine, "gfx3"); + UINT32 *ROM = (UINT32 *)space->machine->region("gfx3")->base(); ROM += (0x600000/2); @@ -3747,7 +3747,7 @@ static DRIVER_INIT(konamigx) case 2: // tkmmpzdm hack { - UINT32 *rom = (UINT32*)memory_region(machine, "maincpu"); + UINT32 *rom = (UINT32*)machine->region("maincpu")->base(); // The display is initialized after POST but the copyright screen disabled // planes B,C,D and didn't bother restoring them. I've spent a good diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c index 4d688e2ab9c..b822c68bf13 100644 --- a/src/mame/drivers/ksayakyu.c +++ b/src/mame/drivers/ksayakyu.c @@ -253,7 +253,7 @@ GFXDECODE_END static MACHINE_START( ksayakyu ) { ksayakyu_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c index 2f9c8ae002b..1b0b23af755 100644 --- a/src/mame/drivers/ksys573.c +++ b/src/mame/drivers/ksys573.c @@ -1499,9 +1499,9 @@ static void *atapi_get_device(running_machine *machine) static void security_cart_init( running_machine *machine, int cart, const char *eeprom_region, const char *ds2401_region ) { ksys573_state *state = machine->driver_data(); - UINT8 *eeprom_rom = memory_region( machine, eeprom_region ); - int eeprom_length = memory_region_length( machine, eeprom_region ); - UINT8 *ds2401_rom = memory_region( machine, ds2401_region ); + UINT8 *eeprom_rom = machine->region( eeprom_region )->base(); + int eeprom_length = machine->region( eeprom_region )->bytes(); + UINT8 *ds2401_rom = machine->region( ds2401_region )->base(); if( eeprom_rom != NULL ) { diff --git a/src/mame/drivers/kungfur.c b/src/mame/drivers/kungfur.c index 667eb2d6030..2e0ec53c03a 100644 --- a/src/mame/drivers/kungfur.c +++ b/src/mame/drivers/kungfur.c @@ -270,7 +270,7 @@ static void kfr_adpcm1_int(device_t *device) } else { - UINT8 *ROM = memory_region(device->machine, "adpcm1"); + UINT8 *ROM = device->machine->region("adpcm1")->base(); adpcm_data = ((trigger ? (ROM[adpcm_pos[0]] & 0x0f) : (ROM[adpcm_pos[0]] & 0xf0)>>4) ); msm5205_data_w(device->machine->device("adpcm1"),adpcm_data & 0xf); @@ -296,7 +296,7 @@ static void kfr_adpcm2_int(device_t *device) } else { - UINT8 *ROM = memory_region(device->machine, "adpcm2"); + UINT8 *ROM = device->machine->region("adpcm2")->base(); adpcm_data = ((trigger ? (ROM[adpcm_pos[1]] & 0x0f) : (ROM[adpcm_pos[1]] & 0xf0)>>4) ); msm5205_data_w(device->machine->device("adpcm2"),adpcm_data & 0xf); diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c index 51adb4c0337..e409fa14df8 100644 --- a/src/mame/drivers/labyrunr.c +++ b/src/mame/drivers/labyrunr.c @@ -186,7 +186,7 @@ static const ym2203_interface ym2203_interface_2 = static MACHINE_START( labyrunr ) { labyrunr_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 6, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c index 7651226e7d3..ad0fad527d9 100644 --- a/src/mame/drivers/ladybug.c +++ b/src/mame/drivers/ladybug.c @@ -1064,8 +1064,8 @@ static DRIVER_INIT( dorodon ) offs_t i; address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x6000); - UINT8 *rom = memory_region(machine, "maincpu"); - UINT8 *table = memory_region(machine, "user1"); + UINT8 *rom = machine->region("maincpu")->base(); + UINT8 *table = machine->region("user1")->base(); space->set_decrypted_region(0x0000, 0x5fff, decrypted); diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c index eea1969c701..0bb8024380b 100644 --- a/src/mame/drivers/lastduel.c +++ b/src/mame/drivers/lastduel.c @@ -484,7 +484,7 @@ static MACHINE_START( lastduel ) static MACHINE_START( madgear ) { - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c index 6c57ccf3038..fe13cf64356 100644 --- a/src/mame/drivers/lastfght.c +++ b/src/mame/drivers/lastfght.c @@ -121,7 +121,7 @@ static VIDEO_UPDATE( lastfght ) int x, y, count = 0; static unsigned base = 0; static int view_roms = 0; - UINT8 *gfxdata = memory_region(screen->machine, "gfx1"); + UINT8 *gfxdata = screen->machine->region("gfx1")->base(); UINT8 data; if (input_code_pressed_once(screen->machine, KEYCODE_ENTER)) view_roms ^= 1; @@ -129,7 +129,7 @@ static VIDEO_UPDATE( lastfght ) { if (input_code_pressed_once(screen->machine, KEYCODE_PGDN)) base += 512 * 256; if (input_code_pressed_once(screen->machine, KEYCODE_PGUP)) base -= 512 * 256; - base %= memory_region_length(screen->machine, "gfx1"); + base %= screen->machine->region("gfx1")->bytes(); count = base; @@ -313,7 +313,7 @@ static WRITE16_HANDLER( lastfght_blit_w ) if (ACCESSING_BITS_8_15) { int x, y, addr; - UINT8 *gfxdata = memory_region( space->machine, "gfx1" ); + UINT8 *gfxdata = space->machine->region( "gfx1" )->base(); bitmap_t *dest = state->bitmap[state->dest]; #if 0 @@ -615,7 +615,7 @@ ROM_END static DRIVER_INIT(lastfght) { - UINT16 *rom = (UINT16*)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16*)machine->region("maincpu")->base(); // pass initial check (protection ? hw?) rom[0x00354 / 2] = 0x403e; diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c index d14adb8f0fe..75cca2327e0 100644 --- a/src/mame/drivers/lazercmd.c +++ b/src/mame/drivers/lazercmd.c @@ -789,7 +789,7 @@ ROM_END static DRIVER_INIT( lazercmd ) { int i, y; - UINT8 *gfx = memory_region(machine, "gfx1"); + UINT8 *gfx = machine->region("gfx1")->base(); /****************************************************************** * To show the maze bit #6 and #7 of the video ram are used. @@ -818,7 +818,7 @@ static DRIVER_INIT( lazercmd ) static DRIVER_INIT( medlanes ) { int i, y; - UINT8 *gfx = memory_region(machine, "gfx1"); + UINT8 *gfx = machine->region("gfx1")->base(); /****************************************************************** * To show the maze bit #6 and #7 of the video ram are used. @@ -847,7 +847,7 @@ static DRIVER_INIT( medlanes ) static DRIVER_INIT( bbonk ) { int i, y; - UINT8 *gfx = memory_region(machine, "gfx1"); + UINT8 *gfx = machine->region("gfx1")->base(); /****************************************************************** * To show the maze bit #6 and #7 of the video ram are used. diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c index 8dff8981643..a373d0d3f4a 100644 --- a/src/mame/drivers/legionna.c +++ b/src/mame/drivers/legionna.c @@ -2192,7 +2192,7 @@ ROM_END static DRIVER_INIT( cupsoc ) { #if CUPSOC_DEBUG_MODE - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); /*Press p1 button 3 to enter into debug mode during gameplay*/ ROM[0xffffb/2] = 0x0000; @@ -2203,13 +2203,13 @@ static DRIVER_INIT( cupsoc ) static DRIVER_INIT( denjinmk ) { /* problem with audio comms? */ - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); ROM[0x5fe4/2] = 0x4e71; } static DRIVER_INIT( legiongfx ) { - descramble_legionnaire_gfx( machine, memory_region(machine, "gfx5") ); + descramble_legionnaire_gfx( machine, machine->region("gfx5")->base() ); } diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c index ecd63ef03a6..551514c0c71 100644 --- a/src/mame/drivers/leland.c +++ b/src/mame/drivers/leland.c @@ -1993,9 +1993,9 @@ static DRIVER_INIT( cerberus ) { /* master CPU bankswitching */ leland_update_master_bank = cerberus_bankswitch; - memory_set_bankptr(machine, "bank1", memory_region(machine, "master") + 0x2000); - memory_set_bankptr(machine, "bank2", memory_region(machine, "master") + 0xa000); - memory_set_bankptr(machine, "bank3", memory_region(machine, "slave") + 0x2000); + memory_set_bankptr(machine, "bank1", machine->region("master")->base() + 0x2000); + memory_set_bankptr(machine, "bank2", machine->region("master")->base() + 0xa000); + memory_set_bankptr(machine, "bank3", machine->region("slave")->base() + 0x2000); /* set up the master CPU I/O ports */ init_master_ports(machine, 0x40, 0x80); diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c index 39fe41b486e..ef726f007b2 100644 --- a/src/mame/drivers/lethal.c +++ b/src/mame/drivers/lethal.c @@ -596,7 +596,7 @@ static const k054539_interface k054539_config = static MACHINE_START( lethalen ) { lethal_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 0x20, &ROM[0x10000], 0x2000); memory_set_bank(machine, "bank1", 0); @@ -620,7 +620,7 @@ static MACHINE_START( lethalen ) static MACHINE_RESET( lethalen ) { lethal_state *state = machine->driver_data(); - UINT8 *prgrom = (UINT8 *)memory_region(machine, "maincpu"); + UINT8 *prgrom = (UINT8 *)machine->region("maincpu")->base(); int i; memory_set_bankptr(machine, "bank2", &prgrom[0x48000]); diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c index 2e62db2f9d6..4a1f4c85b42 100644 --- a/src/mame/drivers/liberate.c +++ b/src/mame/drivers/liberate.c @@ -28,7 +28,7 @@ static READ8_HANDLER( deco16_bank_r ) { liberate_state *state = space->machine->driver_data(); - const UINT8 *ROM = memory_region(space->machine, "user1"); + const UINT8 *ROM = space->machine->region("user1")->base(); /* The tilemap bank can be swapped into main memory */ if (state->bank) @@ -79,7 +79,7 @@ static WRITE8_HANDLER( deco16_bank_w ) static READ8_HANDLER( prosoccr_bank_r ) { liberate_state *state = space->machine->driver_data(); - const UINT8 *ROM = memory_region(space->machine, "user1"); + const UINT8 *ROM = space->machine->region("user1")->base(); /* The tilemap bank can be swapped into main memory */ if (state->bank) @@ -109,7 +109,7 @@ static READ8_HANDLER( prosoccr_bank_r ) static READ8_HANDLER( prosoccr_charram_r ) { liberate_state *state = space->machine->driver_data(); - UINT8 *SRC_GFX = memory_region(space->machine, "shared_gfx"); + UINT8 *SRC_GFX = space->machine->region("shared_gfx")->base(); if (state->gfx_rom_readback) { @@ -131,7 +131,7 @@ static READ8_HANDLER( prosoccr_charram_r ) static WRITE8_HANDLER( prosoccr_charram_w ) { liberate_state *state = space->machine->driver_data(); - UINT8 *FG_GFX = memory_region(space->machine, "fg_gfx"); + UINT8 *FG_GFX = space->machine->region("fg_gfx")->base(); if (state->bank) { @@ -189,7 +189,7 @@ static WRITE8_HANDLER( prosoccr_io_bank_w ) static READ8_HANDLER( prosport_charram_r ) { - UINT8 *FG_GFX = memory_region(space->machine, "progolf_fg_gfx"); + UINT8 *FG_GFX = space->machine->region("progolf_fg_gfx")->base(); switch (offset & 0x1800) { @@ -209,7 +209,7 @@ static READ8_HANDLER( prosport_charram_r ) static WRITE8_HANDLER( prosport_charram_w ) { - UINT8 *FG_GFX = memory_region(space->machine, "progolf_fg_gfx"); + UINT8 *FG_GFX = space->machine->region("progolf_fg_gfx")->base(); switch (offset & 0x1800) { @@ -1358,7 +1358,7 @@ static void sound_cpu_decrypt(running_machine *machine) { address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x4000); - UINT8 *rom = memory_region(machine, "audiocpu"); + UINT8 *rom = machine->region("audiocpu")->base(); int i; /* Bit swapping on sound cpu - Opcodes only */ @@ -1370,7 +1370,7 @@ static void sound_cpu_decrypt(running_machine *machine) static DRIVER_INIT( prosport ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); int i; /* Main cpu has the nibbles swapped */ @@ -1392,7 +1392,7 @@ static DRIVER_INIT( liberate ) int A; address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x10000); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); space->set_decrypted_region(0x0000, 0xffff, decrypted); diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c index afe48dd7fc1..3e852237980 100644 --- a/src/mame/drivers/limenko.c +++ b/src/mame/drivers/limenko.c @@ -338,8 +338,8 @@ static void draw_sprites(running_machine *machine, UINT32 *sprites, const rectan { int i; - UINT8 *base_gfx = memory_region(machine, "gfx1"); - UINT8 *gfx_max = base_gfx + memory_region_length(machine, "gfx1"); + UINT8 *base_gfx = machine->region("gfx1")->base(); + UINT8 *gfx_max = base_gfx + machine->region("gfx1")->bytes(); UINT8 *gfxdata; gfx_element gfx; @@ -1028,8 +1028,8 @@ static DRIVER_INIT( sb2003 ) static DRIVER_INIT( spotty ) { - UINT8 *dst = memory_region(machine, "gfx1"); - UINT8 *src = memory_region(machine, "user2"); + UINT8 *dst = machine->region("gfx1")->base(); + UINT8 *src = machine->region("user2")->base(); int x; /* expand 4bpp roms to 8bpp space */ diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c index 4e21266fce5..616023aa010 100644 --- a/src/mame/drivers/lkage.c +++ b/src/mame/drivers/lkage.c @@ -161,7 +161,7 @@ ADDRESS_MAP_END static READ8_HANDLER( port_fetch_r ) { - return memory_region(space->machine, "user1")[offset]; + return space->machine->region("user1")->base()[offset]; } static ADDRESS_MAP_START( lkage_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index 7dd0d0f9486..9fbbd4a6b84 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -878,8 +878,8 @@ ROM_END static DRIVER_INIT( looping ) { - int length = memory_region_length(machine, "maincpu"); - UINT8 *rom = memory_region(machine, "maincpu"); + int length = machine->region("maincpu")->bytes(); + UINT8 *rom = machine->region("maincpu")->base(); int i; cop_io = auto_alloc_array(machine, UINT8, 0x08); diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c index 16b2d718a72..6f2f80ebee8 100644 --- a/src/mame/drivers/lordgun.c +++ b/src/mame/drivers/lordgun.c @@ -57,7 +57,7 @@ Notes: static DRIVER_INIT( lordgun ) { int i; - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); // Decryption @@ -82,7 +82,7 @@ static DRIVER_INIT( lordgun ) // From XingXing: static DRIVER_INIT( aliencha ) { - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); // Protection @@ -106,7 +106,7 @@ static DRIVER_INIT( aliencha ) static DRIVER_INIT( alienchac ) { - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); // Protection diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c index a3bd1b39891..e7be4fefa55 100644 --- a/src/mame/drivers/lsasquad.c +++ b/src/mame/drivers/lsasquad.c @@ -567,7 +567,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( lsasquad ) { lsasquad_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c index e053f1a1e79..217b6251080 100644 --- a/src/mame/drivers/ltcasino.c +++ b/src/mame/drivers/ltcasino.c @@ -697,7 +697,7 @@ ROM_END static DRIVER_INIT(mv4in1) { int i; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for(i=0;i<0x10000;i++) rom[i]=BITSWAP8(rom[i],7,6,5,4,3,1,2,0); } diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c index 245e7055d76..1cfec0d1a9a 100644 --- a/src/mame/drivers/luckgrln.c +++ b/src/mame/drivers/luckgrln.c @@ -844,7 +844,7 @@ static DRIVER_INIT( luckgrln ) { int i; UINT8 x,v; - UINT8* rom = memory_region(machine,"rom_data"); + UINT8* rom = machine->region("rom_data")->base(); for (i=0;i<0x20000;i++) { diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c index a5796e47a65..8b609bfa981 100644 --- a/src/mame/drivers/lucky74.c +++ b/src/mame/drivers/lucky74.c @@ -1136,7 +1136,7 @@ static void lucky74_adpcm_int(device_t *device) if (lucky74_adpcm_data == -1) { /* transferring 1st nibble */ - lucky74_adpcm_data = memory_region(device->machine, "adpcm")[lucky74_adpcm_pos]; + lucky74_adpcm_data = device->machine->region("adpcm")->base()[lucky74_adpcm_pos]; lucky74_adpcm_pos = (lucky74_adpcm_pos + 1) & 0xffff; msm5205_data_w(device, lucky74_adpcm_data >> 4); diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c index 7105780c6f6..e5dd375cca2 100644 --- a/src/mame/drivers/lwings.c +++ b/src/mame/drivers/lwings.c @@ -743,7 +743,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( lwings ) { lwings_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c index d4a6785854b..20234e2eab7 100644 --- a/src/mame/drivers/m107.c +++ b/src/mame/drivers/m107.c @@ -50,7 +50,7 @@ static WRITE16_HANDLER( bankswitch_w ) { if (ACCESSING_BITS_0_7) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); memory_set_bankptr(space->machine, "bank1",&RAM[0x100000 + ((data&0x7)*0x10000)]); } } @@ -1012,12 +1012,12 @@ ROM_END static DRIVER_INIT( firebarr ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); memcpy(RAM + 0xffff0, RAM + 0x7fff0, 0x10); /* Start vector */ memory_set_bankptr(machine, "bank1", &RAM[0xa0000]); /* Initial bank */ - RAM = memory_region(machine, "soundcpu"); + RAM = machine->region("soundcpu")->base(); memcpy(RAM + 0xffff0,RAM + 0x1fff0, 0x10); /* Sound cpu Start vector */ m107_irq_vectorbase = 0x20; @@ -1026,12 +1026,12 @@ static DRIVER_INIT( firebarr ) static DRIVER_INIT( dsoccr94 ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); memcpy(RAM + 0xffff0, RAM + 0x7fff0, 0x10); /* Start vector */ memory_set_bankptr(machine, "bank1", &RAM[0xa0000]); /* Initial bank */ - RAM = memory_region(machine, "soundcpu"); + RAM = machine->region("soundcpu")->base(); memcpy(RAM + 0xffff0, RAM + 0x1fff0, 0x10); /* Sound cpu Start vector */ m107_irq_vectorbase = 0x80; @@ -1040,12 +1040,12 @@ static DRIVER_INIT( dsoccr94 ) static DRIVER_INIT( wpksoc ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); memcpy(RAM + 0xffff0, RAM + 0x7fff0, 0x10); /* Start vector */ memory_set_bankptr(machine, "bank1", &RAM[0xa0000]); /* Initial bank */ - RAM = memory_region(machine, "soundcpu"); + RAM = machine->region("soundcpu")->base(); memcpy(RAM + 0xffff0, RAM + 0x1fff0, 0x10); /* Sound cpu Start vector */ diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c index cad74da87b7..51a67f8ada8 100644 --- a/src/mame/drivers/m58.c +++ b/src/mame/drivers/m58.c @@ -434,7 +434,7 @@ static DRIVER_INIT( yard85 ) // on these sets the content of the sprite color PROM needs reversing // are the proms on the other sets from bootleg boards, or hand modified? UINT8* buffer = auto_alloc_array(machine, UINT8, 0x10); - UINT8* region = memory_region(machine,"proms"); + UINT8* region = machine->region("proms")->base(); int i; for (i=0;i<0x10;i++) diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c index a95ad9179a0..41ae564e88f 100644 --- a/src/mame/drivers/m62.c +++ b/src/mame/drivers/m62.c @@ -2154,50 +2154,50 @@ ROM_END static DRIVER_INIT( battroad ) { /* configure memory banks */ - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x2000); } static DRIVER_INIT( ldrun2 ) { /* configure memory banks */ - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0x10000, 0x2000); } static DRIVER_INIT( ldrun4 ) { /* configure memory banks */ - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0x10000, 0x4000); } static DRIVER_INIT( kidniki ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); /* in Kid Niki, bank 0 has code falling from 7fff to 8000, */ /* so I have to copy it there because bank switching wouldn't catch it */ memcpy(ROM + 0x08000, ROM + 0x10000, 0x2000); /* configure memory banks */ - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x2000); } static DRIVER_INIT( spelunkr ) { /* configure memory banks */ - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("maincpu")->base() + 0x10000, 0x2000); } static DRIVER_INIT( spelunk2 ) { /* configure memory banks */ - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x20000, 0x1000); - memory_configure_bank(machine, "bank2", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x1000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("maincpu")->base() + 0x20000, 0x1000); + memory_configure_bank(machine, "bank2", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x1000); } static DRIVER_INIT( youjyudn ) { /* configure memory banks */ - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0x10000, 0x4000); } GAME( 1984, kungfum, 0, kungfum, kungfum, 0, ROT0, "Irem", "Kung-Fu Master", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index b6c53f40b41..67439f95967 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -417,7 +417,7 @@ static READ8_HANDLER( snddata_r ) switch (state->p2 & 0xf0) { case 0x60: return soundlatch_r(space, 0); ; - case 0x70: return memory_region(space->machine, "user1")[((state->p1 & 0x1f) << 8) | offset]; + case 0x70: return space->machine->region("user1")->base()[((state->p1 & 0x1f) << 8) | offset]; } return 0xff; } @@ -675,8 +675,8 @@ static SAMPLES_START( fghtbskt_sh_start ) { running_machine *machine = device->machine; m63_state *state = machine->driver_data(); - int i, len = memory_region_length(machine, "samples"); - UINT8 *ROM = memory_region(machine, "samples"); + int i, len = machine->region("samples")->bytes(); + UINT8 *ROM = machine->region("samples")->base(); state->samplebuf = auto_alloc_array(machine, INT16, len); state_save_register_global_pointer(machine, state->samplebuf, len); diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c index 559db1792cf..e5d76c8ecb4 100644 --- a/src/mame/drivers/m72.c +++ b/src/mame/drivers/m72.c @@ -261,7 +261,7 @@ static INTERRUPT_GEN( m72_mcu_int ) static READ8_HANDLER(m72_mcu_sample_r ) { UINT8 sample; - sample = memory_region(space->machine, "samples")[mcu_sample_addr++]; + sample = space->machine->region("samples")->base()[mcu_sample_addr++]; return sample; } @@ -344,7 +344,7 @@ INLINE DRIVER_INIT( m72_8751 ) * prefetching on the V30. */ { - UINT8 *rom=memory_region(machine, "mcu"); + UINT8 *rom=machine->region("mcu")->base(); rom[0x12d+5] += 1; printf(" 5: %d\n", rom[0x12d+5]); rom[0x12d+8] += 5; printf(" 8: %d\n", rom[0x12d+8]); @@ -384,8 +384,8 @@ the NMI handler in the other games. #if 0 static int find_sample(int num) { - UINT8 *rom = memory_region(machine, "samples"); - int len = memory_region_length(machine, "samples"); + UINT8 *rom = machine->region("samples")->base(); + int len = machine->region("samples")->bytes(); int addr = 0; while (num--) diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c index b49b544f0c3..106274f6265 100644 --- a/src/mame/drivers/m79amb.c +++ b/src/mame/drivers/m79amb.c @@ -289,7 +289,7 @@ static const UINT8 lut_pos[0x20] = { static DRIVER_INIT( m79amb ) { m79amb_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int i, j; /* PROM data is active low */ diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c index 09db27c67d3..ad398215df3 100644 --- a/src/mame/drivers/m90.c +++ b/src/mame/drivers/m90.c @@ -41,7 +41,7 @@ static UINT32 bankaddress; static void set_m90_bank(running_machine *machine) { - UINT8 *rom = memory_region(machine, "user1"); + UINT8 *rom = machine->region("user1")->base(); if (!rom) popmessage("bankswitch with no banked ROM!"); @@ -1216,7 +1216,7 @@ static DRIVER_INIT( quizf1 ) static DRIVER_INIT( bomblord ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); int i; for (i=0; i<0x100000; i+=8) diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c index 7099cdca937..4325fb407f8 100644 --- a/src/mame/drivers/m92.c +++ b/src/mame/drivers/m92.c @@ -221,7 +221,7 @@ static TIMER_CALLBACK( m92_scanline_interrupt ); static void set_m92_bank(running_machine *machine) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1",&RAM[bankaddress]); } @@ -275,14 +275,14 @@ static TIMER_CALLBACK( m92_scanline_interrupt ) static READ16_HANDLER( m92_eeprom_r ) { - UINT8 *RAM = memory_region(space->machine, "user1"); + UINT8 *RAM = space->machine->region("user1")->base(); // logerror("%05x: EEPROM RE %04x\n",cpu_get_pc(space->cpu),offset); return RAM[offset] | 0xff00; } static WRITE16_HANDLER( m92_eeprom_w ) { - UINT8 *RAM = memory_region(space->machine, "user1"); + UINT8 *RAM = space->machine->region("user1")->base(); // logerror("%05x: EEPROM WR %04x\n",cpu_get_pc(space->cpu),offset); if (ACCESSING_BITS_0_7) RAM[offset] = data; @@ -2071,7 +2071,7 @@ ROM_END static void init_m92(running_machine *machine, int hasbanks) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); if (hasbanks) { @@ -2084,7 +2084,7 @@ static void init_m92(running_machine *machine, int hasbanks) memory_set_bankptr(machine, "bank2", &RAM[0xc0000]); } - RAM = memory_region(machine, "soundcpu"); + RAM = machine->region("soundcpu")->base(); if (RAM) memcpy(RAM + 0xffff0, RAM + 0x1fff0, 0x10); /* Sound cpu Start vector */ @@ -2165,7 +2165,7 @@ static DRIVER_INIT( lethalth ) static DRIVER_INIT( nbbatman ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); init_m92(machine, 1); @@ -2195,7 +2195,7 @@ static DRIVER_INIT( dsoccr94j ) static DRIVER_INIT( gunforc2 ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); init_m92(machine, 1); memcpy(RAM + 0x80000, RAM + 0x100000, 0x20000); } diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c index 57b2a9bb09b..86ae70be228 100644 --- a/src/mame/drivers/macs.c +++ b/src/mame/drivers/macs.c @@ -123,14 +123,14 @@ static READ8_HANDLER( macs_input_r ) static WRITE8_HANDLER( macs_rom_bank_w ) { - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + (data* 0x4000) + 0x10000 + macs_cart_slot*0x400000 ); + memory_set_bankptr(space->machine, "bank1", space->machine->region("maincpu")->base() + (data* 0x4000) + 0x10000 + macs_cart_slot*0x400000 ); st0016_rom_bank=data; } static WRITE8_HANDLER( macs_output_w ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); switch(offset) { @@ -661,11 +661,11 @@ static MACHINE_RESET(macs) 730E: ED B0 ldir ... */ - memcpy(macs_ram1 + 0x0e9f, memory_region(machine, "user1")+0x7327, 0xc7); - memcpy(macs_ram1 + 0x1e9f, memory_region(machine, "user1")+0x7327, 0xc7); + memcpy(macs_ram1 + 0x0e9f, machine->region("user1")->base()+0x7327, 0xc7); + memcpy(macs_ram1 + 0x1e9f, machine->region("user1")->base()+0x7327, 0xc7); - memcpy(macs_ram1 + 0x0800, memory_region(machine, "user1")+0x73fa, 0x507); - memcpy(macs_ram1 + 0x1800, memory_region(machine, "user1")+0x73fa, 0x507); + memcpy(macs_ram1 + 0x0800, machine->region("user1")->base()+0x73fa, 0x507); + memcpy(macs_ram1 + 0x1800, machine->region("user1")->base()+0x73fa, 0x507); #define MAKEJMP(n,m) macs_ram2[(n) - 0xe800 + 0]=0xc3;\ macs_ram2[(n) - 0xe800 + 1]=(m)&0xff;\ @@ -701,10 +701,10 @@ static MACHINE_RESET(macs) macs_ram1[0x1ff9]=0x07; #endif - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x10000 ); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0x10000 ); memory_set_bankptr(machine, "bank2", macs_ram1+0x800); memory_set_bankptr(machine, "bank3", macs_ram1+0x10000); - memory_set_bankptr(machine, "bank4", memory_region(machine, "maincpu") ); + memory_set_bankptr(machine, "bank4", machine->region("maincpu")->base() ); } static DRIVER_INIT(macs) diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c index d2a8faefbed..bf57e9fc7ae 100644 --- a/src/mame/drivers/madalien.c +++ b/src/mame/drivers/madalien.c @@ -29,7 +29,7 @@ static INPUT_CHANGED( coin_inserted ) INLINE UINT8 shift_common(running_machine *machine, UINT8 hi, UINT8 lo) { - const UINT8 *table = memory_region(machine, "user2"); + const UINT8 *table = machine->region("user2")->base(); return table[((hi & 0x07) << 8) | lo]; } diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c index d0c4771ee06..7d0e3e1da9c 100644 --- a/src/mame/drivers/madmotor.c +++ b/src/mame/drivers/madmotor.c @@ -334,7 +334,7 @@ ROM_END static DRIVER_INIT( madmotor ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int i; for (i = 0x00000;i < 0x80000;i++) diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c index beb87afed40..18a9c7a9eb9 100644 --- a/src/mame/drivers/magicard.c +++ b/src/mame/drivers/magicard.c @@ -603,7 +603,7 @@ INPUT_PORTS_END static MACHINE_RESET( magicard ) { - UINT16 *src = (UINT16*)memory_region( machine, "maincpu" ); + UINT16 *src = (UINT16*)machine->region( "maincpu" )->base(); UINT16 *dst = magicram; memcpy (dst, src, 0x80000); machine->device("maincpu")->reset(); diff --git a/src/mame/drivers/magtouch.c b/src/mame/drivers/magtouch.c index 16d982f3d61..ef10bd63308 100644 --- a/src/mame/drivers/magtouch.c +++ b/src/mame/drivers/magtouch.c @@ -186,7 +186,7 @@ static MACHINE_START( magtouch ) init_pc_common(machine, PCCOMMON_KEYBOARD_AT, magtouch_set_keyb_int); - memory_configure_bank(machine, "rombank", 0, 0x80, memory_region(machine, "game_prg"), 0x8000 ); + memory_configure_bank(machine, "rombank", 0, 0x80, machine->region("game_prg")->base(), 0x8000 ); memory_set_bank(machine, "rombank", 0); microtouch_init(machine, magtouch_microtouch_tx_callback, NULL); diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c index 27f9e689aa5..f94d4449951 100644 --- a/src/mame/drivers/mainevt.c +++ b/src/mame/drivers/mainevt.c @@ -418,7 +418,7 @@ static const k051960_interface mainevt_k051960_intf = static MACHINE_START( mainevt ) { mainevt_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c index 5e26dddf596..ca85dd97567 100644 --- a/src/mame/drivers/malzak.c +++ b/src/mame/drivers/malzak.c @@ -374,7 +374,7 @@ static MACHINE_START( malzak ) { malzak_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "user2"), 0x400); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("user2")->base(), 0x400); state->s2636_0 = machine->device("s2636_0"); state->s2636_1 = machine->device("s2636_1"); diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index fb8aff813d7..cf330492d7c 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -160,7 +160,7 @@ static READ8_HANDLER( marinedt_obj1_x_r ) //----xxxx x pos in tile ram marinedt_state *state = space->machine->driver_data(); - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); if (RAM[0x430e]) --state->cx; diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c index 551294c6c7b..36917f21654 100644 --- a/src/mame/drivers/mastboy.c +++ b/src/mame/drivers/mastboy.c @@ -531,7 +531,7 @@ static READ8_HANDLER(banked_ram_r) if (bank>0x3) // ROM access { - UINT8 *src = memory_region( space->machine, "gfx1" ); + UINT8 *src = space->machine->region( "gfx1" )->base(); bank &=0x3; return src[offset+(bank*0x4000)]; } @@ -547,7 +547,7 @@ static READ8_HANDLER(banked_ram_r) UINT8 *src; int bank; bank = mastboy_bank & 0x7f; - src = memory_region ( space->machine, "user1" ) + bank * 0x4000; + src = space->machine->region ( "user1" )->base() + bank * 0x4000; return src[offset]; } } @@ -984,7 +984,7 @@ ROM_END static DRIVER_INIT( mastboy ) { - mastboy_vram = memory_region( machine, "gfx1" ); // makes decoding the RAM based tiles easier this way + mastboy_vram = machine->region( "gfx1" )->base(); // makes decoding the RAM based tiles easier this way } GAME( 1991, mastboy, 0, mastboy, mastboy, mastboy, ROT0, "Gaelco", "Master Boy (Spanish, PCB Rev A)", 0 ) diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c index dc5a9a00d9b..25f23e98af3 100644 --- a/src/mame/drivers/maxaflex.c +++ b/src/mame/drivers/maxaflex.c @@ -441,7 +441,7 @@ ROM_END static DRIVER_INIT( a600xl ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); memcpy( rom + 0x5000, rom + 0xd000, 0x800 ); } diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index 97dd83f1deb..328aafd39ed 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -350,7 +350,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( mayumi ) { mayumi_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x4000); memory_set_bank(machine, "bank1", 0); diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index 68503af61c7..746431ab9b2 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -316,7 +316,7 @@ static WRITE8_HANDLER( cfb_rom_bank_sel_w ) /* mazer blazer */ mazerbla_state *state = space->machine->driver_data(); state->gfx_rom_bank = data; - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "sub2") + (state->gfx_rom_bank * 0x2000) + 0x10000); + memory_set_bankptr(space->machine, "bank1", space->machine->region("sub2")->base() + (state->gfx_rom_bank * 0x2000) + 0x10000); } static WRITE8_HANDLER( cfb_rom_bank_sel_w_gg ) /* great guns */ @@ -324,7 +324,7 @@ static WRITE8_HANDLER( cfb_rom_bank_sel_w_gg ) /* great guns */ mazerbla_state *state = space->machine->driver_data(); state->gfx_rom_bank = data >> 1; - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "sub2") + (state->gfx_rom_bank * 0x2000) + 0x10000); + memory_set_bankptr(space->machine, "bank1", space->machine->region("sub2")->base() + (state->gfx_rom_bank * 0x2000) + 0x10000); } @@ -371,7 +371,7 @@ static READ8_HANDLER( vcu_set_cmd_param_r ) static READ8_HANDLER( vcu_set_gfx_addr_r ) { mazerbla_state *state = space->machine->driver_data(); - UINT8 * rom = memory_region(space->machine, "sub2") + (state->gfx_rom_bank * 0x2000) + 0x10000; + UINT8 * rom = space->machine->region("sub2")->base() + (state->gfx_rom_bank * 0x2000) + 0x10000; int offs; int x, y; int bits = 0; @@ -518,7 +518,7 @@ static READ8_HANDLER( vcu_set_gfx_addr_r ) static READ8_HANDLER( vcu_set_clr_addr_r ) { mazerbla_state *state = space->machine->driver_data(); - UINT8 * rom = memory_region(space->machine, "sub2") + (state->gfx_rom_bank * 0x2000) + 0x10000; + UINT8 * rom = space->machine->region("sub2")->base() + (state->gfx_rom_bank * 0x2000) + 0x10000; int offs; int x, y; int bits = 0; @@ -1685,7 +1685,7 @@ static DRIVER_INIT( mazerbla ) static DRIVER_INIT( greatgun ) { mazerbla_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "sub2"); + UINT8 *rom = machine->region("sub2")->base(); state->game_id = GREATGUN; diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index d0c1e482adc..18977ff41cf 100644 --- a/src/mame/drivers/mcatadv.c +++ b/src/mame/drivers/mcatadv.c @@ -429,7 +429,7 @@ static const ym2610_interface mcatadv_ym2610_interface = static MACHINE_START( mcatadv ) { mcatadv_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "soundcpu"); + UINT8 *ROM = machine->region("soundcpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); memory_set_bank(machine, "bank1", 1); diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c index 54d4c437df3..7590887b763 100644 --- a/src/mame/drivers/meadows.c +++ b/src/mame/drivers/meadows.c @@ -886,12 +886,12 @@ static DRIVER_INIT( gypsyjug ) 0x01,0x80, 0x03,0xc0, 0x03,0xc0, 0x01,0x80 }; int i; - UINT8 *gfx2 = memory_region(machine, "gfx2"); - UINT8 *gfx3 = memory_region(machine, "gfx3"); - UINT8 *gfx4 = memory_region(machine, "gfx4"); - UINT8 *gfx5 = memory_region(machine, "gfx5"); - int len3 = memory_region_length(machine, "gfx3"); - int len4 = memory_region_length(machine, "gfx4"); + UINT8 *gfx2 = machine->region("gfx2")->base(); + UINT8 *gfx3 = machine->region("gfx3")->base(); + UINT8 *gfx4 = machine->region("gfx4")->base(); + UINT8 *gfx5 = machine->region("gfx5")->base(); + int len3 = machine->region("gfx3")->bytes(); + int len4 = machine->region("gfx4")->bytes(); memcpy(gfx3,gfx2,len3); @@ -910,8 +910,8 @@ static DRIVER_INIT( minferno ) UINT8 *mem; /* create an inverted copy of the graphics data */ - mem = memory_region(machine, "gfx1"); - length = memory_region_length(machine, "gfx1"); + mem = machine->region("gfx1")->base(); + length = machine->region("gfx1")->bytes(); for (i = 0; i < length/2; i++) mem[i] = ~mem[i + length/2]; } diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index 9734a2b7110..52e86990692 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -1034,7 +1034,7 @@ static MACHINE_START(mediagx) static MACHINE_RESET(mediagx) { mediagx_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "bios"); + UINT8 *rom = machine->region("bios")->base(); cpu_set_irq_callback(machine->device("maincpu"), irq_callback); diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index 624188576fe..20a0dae0985 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -2619,7 +2619,7 @@ static WRITE16_HANDLER( _32x_68k_a15106_w ) // install the game rom in the normal 0x000000-0x03fffff space used by the genesis - this allows VDP DMA operations to work as they have to be from this area or RAM // it should also UNMAP the banked rom area... - memory_install_rom(space, 0x0000100, 0x03fffff, 0, 0, memory_region(space->machine, "gamecart") + 0x100); + memory_install_rom(space, 0x0000100, 0x03fffff, 0, 0, space->machine->region("gamecart")->base() + 0x100); } else { @@ -2627,7 +2627,7 @@ static WRITE16_HANDLER( _32x_68k_a15106_w ) // this is actually blank / nop area // we should also map the banked area back (we don't currently unmap it tho) - memory_install_rom(space, 0x0000100, 0x03fffff, 0, 0, memory_region(space->machine, "maincpu")+0x100); + memory_install_rom(space, 0x0000100, 0x03fffff, 0, 0, space->machine->region("maincpu")->base()+0x100); } if((a15106_reg & 4) == 0) // clears the FIFO state @@ -2919,12 +2919,12 @@ static WRITE16_HANDLER( _32x_68k_a15100_w ) if (data & 0x01) { _32x_adapter_enabled = 1; - memory_install_rom(space, 0x0880000, 0x08fffff, 0, 0, memory_region(space->machine, "gamecart")); // 'fixed' 512kb rom bank + memory_install_rom(space, 0x0880000, 0x08fffff, 0, 0, space->machine->region("gamecart")->base()); // 'fixed' 512kb rom bank memory_install_read_bank(space, 0x0900000, 0x09fffff, 0, 0, "bank12"); // 'bankable' 1024kb rom bank - memory_set_bankptr(space->machine, "bank12", memory_region(space->machine, "gamecart")+((_32x_68k_a15104_reg&0x3)*0x100000) ); + memory_set_bankptr(space->machine, "bank12", space->machine->region("gamecart")->base()+((_32x_68k_a15104_reg&0x3)*0x100000) ); - memory_install_rom(space, 0x0000000, 0x03fffff, 0, 0, memory_region(space->machine, "32x_68k_bios")); + memory_install_rom(space, 0x0000000, 0x03fffff, 0, 0, space->machine->region("32x_68k_bios")->base()); /* VDP area */ memory_install_readwrite16_handler(space, 0x0a15180, 0x0a1518b, 0, 0, _32x_common_vdp_regs_r, _32x_common_vdp_regs_w); // common / shared VDP regs @@ -2940,7 +2940,7 @@ static WRITE16_HANDLER( _32x_68k_a15100_w ) { _32x_adapter_enabled = 0; - memory_install_rom(space, 0x0000000, 0x03fffff, 0, 0, memory_region(space->machine, "gamecart")); + memory_install_rom(space, 0x0000000, 0x03fffff, 0, 0, space->machine->region("gamecart")->base()); memory_install_readwrite16_handler(cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000070, 0x000073, 0, 0, _32x_68k_hint_vector_r, _32x_68k_hint_vector_w); // h interrupt vector } } @@ -3008,7 +3008,7 @@ static WRITE16_HANDLER( _32x_68k_a15104_w ) _32x_68k_a15104_reg = (_32x_68k_a15104_reg & 0x00ff) | (data & 0xff00); } - memory_set_bankptr(space->machine, "bank12", memory_region(space->machine, "gamecart")+((_32x_68k_a15104_reg&0x3)*0x100000) ); + memory_set_bankptr(space->machine, "bank12", space->machine->region("gamecart")->base()+((_32x_68k_a15104_reg&0x3)*0x100000) ); } /**********************************************************************************************/ @@ -6106,7 +6106,7 @@ static UINT32 pm_io(address_space *space, int reg, int write, UINT32 d) int addr = svp.pmac_read[reg]&0xffff; if ((mode & 0xfff0) == 0x0800) // ROM, inc 1, verified to be correct { - UINT16 *ROM = (UINT16 *) memory_region(space->machine, "maincpu"); + UINT16 *ROM = (UINT16 *) space->machine->region("maincpu")->base(); svp.pmac_read[reg] += 1; d = ROM[addr|((mode&0xf)<<16)]; } @@ -6340,7 +6340,7 @@ static void svp_init(running_machine *machine) svp.iram = auto_alloc_array(machine, UINT8, 0x800); memory_set_bankptr(machine, "bank3", svp.iram ); /* SVP ROM just shares m68k region.. */ - ROM = memory_region(machine, "maincpu"); + ROM = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank4", ROM + 0x800 ); megadrive_io_read_data_port_ptr = megadrive_io_read_data_port_svp; @@ -9054,7 +9054,7 @@ static void megadriv_init_common(running_machine *machine) some games specify a single address, (start 200001, end 200001) this usually means there is serial eeprom instead */ int i; - UINT16 *rom = (UINT16*)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16*)machine->region("maincpu")->base(); mame_printf_debug("DEBUG:: Header: Backup RAM string (ignore for games without)\n"); for (i=0;i<12;i++) @@ -9214,7 +9214,7 @@ DRIVER_INIT( _32x ) if (_32x_adapter_enabled == 0) { - memory_install_rom(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000000, 0x03fffff, 0, 0, memory_region(machine, "gamecart")); + memory_install_rom(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000000, 0x03fffff, 0, 0, machine->region("gamecart")->base()); memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x000070, 0x000073, 0, 0, _32x_68k_hint_vector_r, _32x_68k_hint_vector_w); // h interrupt vector }; diff --git a/src/mame/drivers/megadrvb.c b/src/mame/drivers/megadrvb.c index c277ffa29dd..3a2e3be0409 100644 --- a/src/mame/drivers/megadrvb.c +++ b/src/mame/drivers/megadrvb.c @@ -650,7 +650,7 @@ static DRIVER_INIT( aladmdb ) * Game does a check @ 1afc00 with work RAM fff57c that makes it play like the original console version (i.e. 8 energy hits instead of 2) */ #if ENERGY_CONSOLE_MODE - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); rom[0x1afc08/2] = 0x6600; #endif @@ -666,7 +666,7 @@ static DRIVER_INIT( aladmdb ) static DRIVER_INIT( mk3mdb ) { int x; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (x=0x000001;x<0x100001;x+=2) { @@ -716,7 +716,7 @@ static DRIVER_INIT( ssf2mdb ) memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x400000, 0x5fffff, 0, 0, "bank5"); memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x400000, 0x5fffff, 0, 0); - memory_set_bankptr(machine, "bank5", memory_region( machine, "maincpu" ) + 0x400000 ); + memory_set_bankptr(machine, "bank5", machine->region( "maincpu" )->base() + 0x400000 ); memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x770070, 0x770075, 0, 0, ssf2mdb_dsw_r ); @@ -727,7 +727,7 @@ static DRIVER_INIT( ssf2mdb ) static DRIVER_INIT( srmdb ) { int x; - UINT8* rom = memory_region(machine, "maincpu"); + UINT8* rom = machine->region("maincpu")->base(); /* todo, reduce bitswaps to single swap */ for (x=0x00001;x<0x40000;x+=2) diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c index 2495d1550e5..cc07c31b418 100644 --- a/src/mame/drivers/megaplay.c +++ b/src/mame/drivers/megaplay.c @@ -435,7 +435,7 @@ static READ16_HANDLER( megaplay_io_read ) static READ8_HANDLER( bank_r ) { UINT32 fulladdress; - UINT8* bank = memory_region(space->machine, "mtbios"); + UINT8* bank = space->machine->region("mtbios")->base(); fulladdress = mplay_bios.mp_bios_bank_addr + offset; @@ -460,7 +460,7 @@ static READ8_HANDLER( bank_r ) } else { - return memory_region(space->machine, "maincpu")[fulladdress ^ 1]; + return space->machine->region("maincpu")->base()[fulladdress ^ 1]; } } else if (fulladdress >= 0xa10000 && fulladdress <= 0xa1001f) // IO Acess @@ -831,9 +831,9 @@ ROM_END static void mplay_start(running_machine *machine) { - UINT8 *src = memory_region(machine, "mtbios"); - UINT8 *instruction_rom = memory_region(machine, "user1"); - UINT8 *game_rom = memory_region(machine, "maincpu"); + UINT8 *src = machine->region("mtbios")->base(); + UINT8 *instruction_rom = machine->region("user1")->base(); + UINT8 *game_rom = machine->region("maincpu")->base(); int offs; diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index 375cd35c670..4f83ec0feb8 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -1379,7 +1379,7 @@ static WRITE16_HANDLER( protection_peekaboo_w ) if ((protection_val & 0x90) == 0x90) { - UINT8 *RAM = memory_region(space->machine, "oki1"); + UINT8 *RAM = space->machine->region("oki1")->base(); int new_bank = (protection_val & 0x7) % 7; if (bank != new_bank) @@ -3558,8 +3558,8 @@ ROM_END void phantasm_rom_decode(running_machine *machine, const char *region) { - UINT16 *RAM = (UINT16 *) memory_region(machine, region); - int i, size = memory_region_length(machine, region); + UINT16 *RAM = (UINT16 *) machine->region(region)->base(); + int i, size = machine->region(region)->bytes(); if (size > 0x40000) size = 0x40000; for (i = 0 ; i < size/2 ; i++) @@ -3592,8 +3592,8 @@ void phantasm_rom_decode(running_machine *machine, const char *region) void astyanax_rom_decode(running_machine *machine, const char *region) { - UINT16 *RAM = (UINT16 *) memory_region(machine, region); - int i, size = memory_region_length(machine, region); + UINT16 *RAM = (UINT16 *) machine->region(region)->base(); + int i, size = machine->region(region)->bytes(); if (size > 0x40000) size = 0x40000; for (i = 0 ; i < size/2 ; i++) @@ -3626,8 +3626,8 @@ void astyanax_rom_decode(running_machine *machine, const char *region) void rodland_rom_decode(running_machine *machine, const char *region) { - UINT16 *RAM = (UINT16 *) memory_region(machine, region); - int i, size = memory_region_length(machine, region); + UINT16 *RAM = (UINT16 *) machine->region(region)->base(); + int i, size = machine->region(region)->bytes(); if (size > 0x40000) size = 0x40000; for (i = 0 ; i < size/2 ; i++) @@ -3661,8 +3661,8 @@ void rodland_rom_decode(running_machine *machine, const char *region) static void rodlandj_gfx_unmangle(running_machine *machine, const char *region) { - UINT8 *rom = memory_region(machine, region); - int size = memory_region_length(machine, region); + UINT8 *rom = machine->region(region)->base(); + int size = machine->region(region)->bytes(); UINT8 *buffer; int i; @@ -3693,8 +3693,8 @@ static void rodlandj_gfx_unmangle(running_machine *machine, const char *region) static void jitsupro_gfx_unmangle(running_machine *machine, const char *region) { - UINT8 *rom = memory_region(machine, region); - int size = memory_region_length(machine, region); + UINT8 *rom = machine->region(region)->base(); + int size = machine->region(region)->bytes(); UINT8 *buffer; int i; @@ -3726,7 +3726,7 @@ static void jitsupro_gfx_unmangle(running_machine *machine, const char *region) static DRIVER_INIT( 64street ) { -// UINT16 *RAM = (UINT16 *) memory_region(machine, "maincpu"); +// UINT16 *RAM = (UINT16 *) machine->region("maincpu")->base(); // RAM[0x006b8/2] = 0x6004; // d8001 test // RAM[0x10EDE/2] = 0x6012; // watchdog @@ -3743,7 +3743,7 @@ static DRIVER_INIT( astyanax ) astyanax_rom_decode(machine, "maincpu"); - RAM = (UINT16 *) memory_region(machine, "maincpu"); + RAM = (UINT16 *) machine->region("maincpu")->base(); RAM[0x0004e6/2] = 0x6040; // protection } @@ -3815,7 +3815,7 @@ static DRIVER_INIT( hachoo ) astyanax_rom_decode(machine, "maincpu"); - RAM = (UINT16 *) memory_region(machine, "maincpu"); + RAM = (UINT16 *) machine->region("maincpu")->base(); RAM[0x0006da/2] = 0x6000; // protection } @@ -3834,7 +3834,7 @@ static DRIVER_INIT( iganinju ) phantasm_rom_decode(machine, "maincpu"); - RAM = (UINT16 *) memory_region(machine, "maincpu"); + RAM = (UINT16 *) machine->region("maincpu")->base(); RAM[0x02f000/2] = 0x835d; // protection RAM[0x00006e/2] = 0x0420; // the only game that does @@ -3852,7 +3852,7 @@ static DRIVER_INIT( jitsupro ) { device_t *oki1 = machine->device("oki1"); device_t *oki2 = machine->device("oki2"); - UINT16 *RAM = (UINT16 *) memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *) machine->region("maincpu")->base(); astyanax_rom_decode(machine, "maincpu"); // Code @@ -3883,7 +3883,7 @@ static DRIVER_INIT( plusalph ) astyanax_rom_decode(machine, "maincpu"); - RAM = (UINT16 *) memory_region(machine, "maincpu"); + RAM = (UINT16 *) machine->region("maincpu")->base(); RAM[0x0012b6/2] = 0x0000; // protection } @@ -3932,7 +3932,7 @@ static DRIVER_INIT( stdragon ) phantasm_rom_decode(machine, "maincpu"); - RAM = (UINT16 *) memory_region(machine, "maincpu"); + RAM = (UINT16 *) machine->region("maincpu")->base(); RAM[0x00045e/2] = 0x0098; // protection } @@ -3943,7 +3943,7 @@ static READ16_HANDLER( monkelf_input_r ) static DRIVER_INIT( monkelf ) { - UINT16 *ROM = (UINT16*)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16*)machine->region("maincpu")->base(); ROM[0x00744/2] = 0x4e71; memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xe0000, 0xe000f, 0, 0, monkelf_input_r); diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index c9912d00095..c641625767e 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -234,7 +234,7 @@ INPUT_PORTS_END static READ8_HANDLER( megatech_instr_r ) { - UINT8* instr = memory_region(space->machine, "mtbios") + 0x8000; + UINT8* instr = space->machine->region("mtbios")->base() + 0x8000; return instr[offset / 2]; // else @@ -276,9 +276,9 @@ static void megatech_select_game(running_machine *machine, int gameno) devtag_reset(machine, "ymsnd"); sprintf(tempname, "game%d", gameno); - game_region = memory_region(machine, tempname); + game_region = machine->region(tempname)->base(); sprintf(tempname, "inst%d", gameno); - bios_region = memory_region(machine, tempname); + bios_region = machine->region(tempname)->base(); megadriv_stop_scanline_timer();// stop the scanline timer for the genesis vdp... it can be restarted in video eof when needed segae_md_sms_stop_scanline_timer();// stop the scanline timer for the sms vdp @@ -287,8 +287,8 @@ static void megatech_select_game(running_machine *machine, int gameno) /* if the regions exist we're fine */ if (game_region && bios_region) { - memcpy(memory_region(machine, "mtbios")+0x8000, bios_region, 0x8000); - memcpy(memory_region(machine, "maincpu"), game_region, 0x300000); + memcpy(machine->region("mtbios")->base()+0x8000, bios_region, 0x8000); + memcpy(machine->region("maincpu")->base(), game_region, 0x300000); // I store an extra byte at the end of the instruction rom region when loading // to indicate if the current cart is an SMS cart.. the original hardware @@ -324,8 +324,8 @@ static void megatech_select_game(running_machine *machine, int gameno) // cputag_set_input_line(machine, "genesis_snd_z80", INPUT_LINE_RESET, ASSERT_LINE); /* no cart.. */ - memset(memory_region(machine, "mtbios") + 0x8000, 0x00, 0x8000); - memset(memory_region(machine, "maincpu"), 0x00, 0x300000); + memset(machine->region("mtbios")->base() + 0x8000, 0x00, 0x8000); + memset(machine->region("maincpu")->base(), 0x00, 0x300000); } return; @@ -349,21 +349,21 @@ static WRITE8_HANDLER( megatech_cart_select_w ) if (mtech_bios.mtech_bios.mt_cart_select_reg == 2) { printf("game 2 selected\n"); - memcpy(memory_region(space->machine, "mtbios") + 0x8000, memory_region(space->machine, "inst0"), 0x8000); + memcpy(space->machine->region("mtbios")->base() + 0x8000, space->machine->region("inst0")->base(), 0x8000); } // else if (mtech_bios.mt_cart_select_reg == 0) // { // printf("game 0 selected\n"); -// memcpy(memory_region(space->machine, "mtbios") + 0x8000, memory_region(space->machine, "inst2"), 0x8000); +// memcpy(space->machine->region("mtbios")->base() + 0x8000, space->machine->region("inst2")->base(), 0x8000); // } else if (mtech_bios.mt_cart_select_reg == 6) { printf("game 6 selected\n"); - memcpy(memory_region(space->machine, "mtbios") + 0x8000, memory_region(space->machine, "user6"), 0x8000); + memcpy(space->machine->region("mtbios")->base() + 0x8000, space->machine->region("user6")->base(), 0x8000); } else { - memset(memory_region(space->machine, "mtbios" )+ 0x8000, 0x00, 0x8000); + memset(space->machine->region("mtbios" )->base()+ 0x8000, 0x00, 0x8000); } */ diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c index 4393a3a1706..e39c6158b88 100644 --- a/src/mame/drivers/merit.c +++ b/src/mame/drivers/merit.c @@ -93,7 +93,7 @@ static MACHINE_START(merit) static READ8_HANDLER( questions_r ) { - UINT8 *questions = memory_region(space->machine, "user1"); + UINT8 *questions = space->machine->region("user1")->base(); int address; switch(question_address >> 16) @@ -211,9 +211,9 @@ static MC6845_UPDATE_ROW( update_row ) UINT16 x = 0; int rlen; - gfx[0] = memory_region(device->machine, "gfx1"); - gfx[1] = memory_region(device->machine, "gfx2"); - rlen = memory_region_length(device->machine, "gfx2"); + gfx[0] = device->machine->region("gfx1")->base(); + gfx[1] = device->machine->region("gfx2")->base(); + rlen = device->machine->region("gfx2")->bytes(); //ma = ma ^ 0x7ff; for (cx = 0; cx < x_count; cx++) @@ -1212,8 +1212,8 @@ void merit_state::dodge_nvram_init(nvram_device &nvram, void *base, size_t size) static MACHINE_START(casino5) { MACHINE_START_CALL(merit); - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x2000, 0x2000); - memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "maincpu") + 0x6000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0x2000, 0x2000); + memory_configure_bank(machine, "bank2", 0, 2, machine->region("maincpu")->base() + 0x6000, 0x2000); memory_set_bank(machine, "bank1", 0); memory_set_bank(machine, "bank2", 0); } @@ -2014,7 +2014,7 @@ static DRIVER_INIT( key_7 ) static DRIVER_INIT( couple ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); #if 0 //quick rom compare test { @@ -2040,7 +2040,7 @@ static DRIVER_INIT( couple ) static DRIVER_INIT( dtrvwz5 ) { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); /* fill b000 - b0ff with ret 0xc9 */ for ( i = 0xb000; i < 0xb100; i++ ) ROM[i] = 0xc9; diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index 2c6abaeab1c..c89330601df 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -456,7 +456,7 @@ static WRITE8_HANDLER(meritm_crt250_questions_bank_w) return; } - dst = memory_region(space->machine, "maincpu") + 0x70000 + 2; + dst = space->machine->region("maincpu")->base() + 0x70000 + 2; if (data == 0) { @@ -485,7 +485,7 @@ static WRITE8_HANDLER(meritm_crt250_questions_bank_w) default: logerror( "meritm_crt250_questions_bank_w: unknown data = %02x\n", data ); return; } logerror( "Reading question byte at %06X\n", questions_address | questions_loword_address); - *dst = memory_region(space->machine, "extra")[questions_address | questions_loword_address]; + *dst = space->machine->region("extra")->base()[questions_address | questions_loword_address]; } }; @@ -975,7 +975,7 @@ static MACHINE_START(merit_common) static MACHINE_START(meritm_crt250) { - memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu"), 0x10000); + memory_configure_bank(machine, "bank1", 0, 8, machine->region("maincpu")->base(), 0x10000); meritm_bank = 0xff; meritm_crt250_switch_banks(machine); MACHINE_START_CALL(merit_common); @@ -1001,8 +1001,8 @@ static MACHINE_START(meritm_crt260) meritm_ram = auto_alloc_array(machine, UINT8, 0x8000 ); machine->device("nvram")->set_base(meritm_ram, 0x8000); memset(meritm_ram, 0x00, 0x8000); - memory_configure_bank(machine, "bank1", 0, 128, memory_region(machine, "maincpu"), 0x8000); - memory_configure_bank(machine, "bank2", 0, 128, memory_region(machine, "maincpu"), 0x8000); + memory_configure_bank(machine, "bank1", 0, 128, machine->region("maincpu")->base(), 0x8000); + memory_configure_bank(machine, "bank2", 0, 128, machine->region("maincpu")->base(), 0x8000); memory_configure_bank(machine, "bank3", 0, 4, meritm_ram, 0x2000); meritm_bank = 0xff; meritm_psd_a15 = 0; diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c index 505663393c7..79291531567 100644 --- a/src/mame/drivers/mermaid.c +++ b/src/mame/drivers/mermaid.c @@ -417,7 +417,7 @@ static void rougien_adpcm_int( device_t *device ) } else { - UINT8 *ROM = memory_region(device->machine, "adpcm"); + UINT8 *ROM = device->machine->region("adpcm")->base(); state->adpcm_data = ((state->adpcm_trigger ? (ROM[state->adpcm_pos] & 0x0f) : (ROM[state->adpcm_pos] & 0xf0) >> 4)); msm5205_data_w(device, state->adpcm_data & 0xf); diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c index 16b3033892a..b5e14c5b030 100644 --- a/src/mame/drivers/metalmx.c +++ b/src/mame/drivers/metalmx.c @@ -782,7 +782,7 @@ MACHINE_CONFIG_END static DRIVER_INIT( metalmx ) { - UINT8 *adsp_boot = (UINT8*)memory_region(machine, "adsp"); + UINT8 *adsp_boot = (UINT8*)machine->region("adsp")->base(); metalmx_state *state = machine->driver_data(); state->adsp->load_boot_data(adsp_boot, state->adsp_internal_program_ram); diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 5c13a3ea6c0..c8fdc4ccb36 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -395,7 +395,7 @@ static WRITE16_HANDLER( metro_soundstatus_w ) static WRITE8_HANDLER( metro_sound_rombank_w ) { int bankaddress; - UINT8 *ROM = memory_region(space->machine, "audiocpu"); + UINT8 *ROM = space->machine->region("audiocpu")->base(); bankaddress = 0x10000-0x4000 + ((data >> 4) & 0x03) * 0x4000; if (bankaddress < 0x10000) bankaddress = 0x0000; @@ -406,7 +406,7 @@ static WRITE8_HANDLER( metro_sound_rombank_w ) static WRITE8_HANDLER( daitorid_sound_rombank_w ) { int bankaddress; - UINT8 *ROM = memory_region(space->machine, "audiocpu"); + UINT8 *ROM = space->machine->region("audiocpu")->base(); bankaddress = 0x10000-0x4000 + ((data >> 4) & 0x07) * 0x4000; if (bankaddress < 0x10000) bankaddress = 0x10000; @@ -593,8 +593,8 @@ static WRITE16_HANDLER( metro_coin_lockout_4words_w ) static READ16_HANDLER( metro_bankedrom_r ) { metro_state *state = space->machine->driver_data(); - UINT8 *ROM = memory_region(space->machine, "gfx1"); - size_t len = memory_region_length(space->machine, "gfx1"); + UINT8 *ROM = space->machine->region("gfx1")->base(); + size_t len = space->machine->region("gfx1")->bytes(); offset = offset * 2 + 0x10000 * (*state->rombank); @@ -684,8 +684,8 @@ static WRITE16_HANDLER( metro_blitter_w ) if (offset == 0x0c / 2) { - UINT8 *src = memory_region(space->machine, "gfx1"); - size_t src_len = memory_region_length(space->machine, "gfx1"); + UINT8 *src = space->machine->region("gfx1")->base(); + size_t src_len = space->machine->region("gfx1")->bytes(); UINT32 tmap = (state->blitter_regs[0x00 / 2] << 16) + state->blitter_regs[0x02 / 2]; UINT32 src_offs = (state->blitter_regs[0x04 / 2] << 16) + state->blitter_regs[0x06 / 2]; @@ -1699,7 +1699,7 @@ static WRITE16_HANDLER( blzntrnd_sound_w ) static WRITE8_HANDLER( blzntrnd_sh_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "audiocpu"); + UINT8 *RAM = space->machine->region("audiocpu")->base(); int bankaddress; bankaddress = 0x10000 + (data & 0x03) * 0x4000; @@ -6072,8 +6072,8 @@ static DRIVER_INIT( balcube ) { metro_state *state = machine->driver_data(); - const size_t len = memory_region_length(machine, "gfx1"); - UINT8 *src = memory_region(machine, "gfx1"); + const size_t len = machine->region("gfx1")->bytes(); + UINT8 *src = machine->region("gfx1")->base(); UINT8 *end = src + len; while (src < end) @@ -6093,7 +6093,7 @@ static DRIVER_INIT( balcube ) static DRIVER_INIT( dharmak ) { - UINT8 *src = memory_region( machine, "gfx1" ); + UINT8 *src = machine->region( "gfx1" )->base(); int i; for (i = 0; i < 0x200000; i += 4) diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c index 8513426e2a3..beada844a74 100644 --- a/src/mame/drivers/mexico86.c +++ b/src/mame/drivers/mexico86.c @@ -422,7 +422,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( mexico86 ) { mexico86_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 6, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 4bfa489f059..c75c8602689 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -849,7 +849,7 @@ ROM_END static DRIVER_INIT( livequiz ) { - UINT16 *rom = (UINT16 *) memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *) machine->region("maincpu")->base(); // PROTECTION CHECKS rom[0x13345a/2] = 0x4e75; diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c index 9bfbb2d58db..62d3f66ffd9 100644 --- a/src/mame/drivers/midvunit.c +++ b/src/mame/drivers/midvunit.c @@ -74,7 +74,7 @@ static MACHINE_RESET( midvunit ) dcs_reset_w(1); dcs_reset_w(0); - memcpy(ram_base, memory_region(machine, "user1"), 0x20000*4); + memcpy(ram_base, machine->region("user1")->base(), 0x20000*4); machine->device("maincpu")->reset(); timer[0] = machine->device("timer0"); @@ -87,7 +87,7 @@ static MACHINE_RESET( midvplus ) dcs_reset_w(1); dcs_reset_w(0); - memcpy(ram_base, memory_region(machine, "user1"), 0x20000*4); + memcpy(ram_base, machine->region("user1")->base(), 0x20000*4); machine->device("maincpu")->reset(); timer[0] = machine->device("timer0"); diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c index 9571c678841..55e13bb74fa 100644 --- a/src/mame/drivers/midzeus.c +++ b/src/mame/drivers/midzeus.c @@ -95,7 +95,7 @@ static MACHINE_START( midzeus ) static MACHINE_RESET( midzeus ) { - memcpy(ram_base, memory_region(machine, "user1"), 0x40000*4); + memcpy(ram_base, machine->region("user1")->base(), 0x40000*4); *ram_base <<= 1; machine->device("maincpu")->reset(); @@ -1421,7 +1421,7 @@ static DRIVER_INIT( crusnexo ) { dcs2_init(machine, 0, 0); midway_ioasic_init(machine, MIDWAY_IOASIC_STANDARD, 472/* or 476,477,478,110 */, 99, NULL); - memory_configure_bank(machine, "bank1", 0, 3, memory_region(machine, "user2"), 0x400000*4); + memory_configure_bank(machine, "bank1", 0, 3, machine->region("user2")->base(), 0x400000*4); memory_install_readwrite32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x9b0004, 0x9b0007, 0, 0, crusnexo_leds_r, crusnexo_leds_w); memory_install_write32_handler (cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8d0009, 0x8d000a, 0, 0, keypad_select_w); @@ -1432,7 +1432,7 @@ static DRIVER_INIT( thegrid ) { dcs2_init(machine, 0, 0); midway_ioasic_init(machine, MIDWAY_IOASIC_STANDARD, 474/* or 491 */, 99, NULL); - memory_configure_bank(machine, "bank1", 0, 3, memory_region(machine, "user2"), 0x400000*4); + memory_configure_bank(machine, "bank1", 0, 3, machine->region("user2")->base(), 0x400000*4); } diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c index d964c3ccdc3..f2d2a42a5c0 100644 --- a/src/mame/drivers/mirax.c +++ b/src/mame/drivers/mirax.c @@ -471,8 +471,8 @@ ROM_END static DRIVER_INIT( mirax ) { - UINT8 *DATA = memory_region(machine, "data_code"); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *DATA = machine->region("data_code")->base(); + UINT8 *ROM = machine->region("maincpu")->base(); int i; for(i=0x0000;i<0x4000;i++) diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c index 4469212a48f..81a5c5ef47e 100644 --- a/src/mame/drivers/missb2.c +++ b/src/mame/drivers/missb2.c @@ -55,7 +55,7 @@ static VIDEO_UPDATE( missb2 ) sx = 0; - prom = memory_region(screen->machine, "proms"); + prom = screen->machine->region("proms")->base(); for (offs = 0; offs < state->objectram_size; offs += 4) { /* skip empty sprites */ @@ -461,8 +461,8 @@ ROM_END static void configure_banks( running_machine* machine ) { - UINT8 *ROM = memory_region(machine, "maincpu"); - UINT8 *SLAVE = memory_region(machine, "slave"); + UINT8 *ROM = machine->region("maincpu")->base(); + UINT8 *SLAVE = machine->region("slave")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c index 2c651e53c3c..5aea41e5d71 100644 --- a/src/mame/drivers/missile.c +++ b/src/mame/drivers/missile.c @@ -505,7 +505,7 @@ DIRECT_UPDATE_HANDLER( missile_direct_handler ) static MACHINE_START( missile ) { /* initialize globals */ - writeprom = memory_region(machine, "proms"); + writeprom = machine->region("proms")->base(); flipscreen = 0; /* set up an opcode base handler since we use mapped handlers for RAM */ @@ -777,7 +777,7 @@ static READ8_HANDLER( missile_r ) /* ROM */ else if (offset >= 0x5000) - result = memory_region(space->machine, "maincpu")[offset]; + result = space->machine->region("maincpu")->base()[offset]; /* POKEY */ else if (offset < 0x4800) @@ -1162,7 +1162,7 @@ ROM_END static DRIVER_INIT( suprmatk ) { int i; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (i = 0; i < 0x40; i++) { diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index 896cca2ed93..7e3822bb587 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -2102,14 +2102,14 @@ ROM_END static void bootleg_decode( running_machine *machine ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - space->set_decrypted_region(0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x50000); - memory_configure_bank_decrypted(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x60000, 0x4000); + space->set_decrypted_region(0x0000, 0x7fff, machine->region("maincpu")->base() + 0x50000); + memory_configure_bank_decrypted(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x60000, 0x4000); } static void configure_banks( running_machine *machine ) { - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); } @@ -2158,7 +2158,7 @@ static DRIVER_INIT( spang ) mitchell_state *state = machine->driver_data(); state->input_type = 3; nvram_size = 0x80; - nvram = &memory_region(machine, "maincpu")[0xe000]; /* NVRAM */ + nvram = &machine->region("maincpu")->base()[0xe000]; /* NVRAM */ spang_decode(machine); configure_banks(machine); } @@ -2168,7 +2168,7 @@ static DRIVER_INIT( spangbl ) mitchell_state *state = machine->driver_data(); state->input_type = 3; nvram_size = 0x80; - nvram = &memory_region(machine, "maincpu")[0xe000]; /* NVRAM */ + nvram = &machine->region("maincpu")->base()[0xe000]; /* NVRAM */ bootleg_decode(machine); configure_banks(machine); } @@ -2178,7 +2178,7 @@ static DRIVER_INIT( spangj ) mitchell_state *state = machine->driver_data(); state->input_type = 3; nvram_size = 0x80; - nvram = &memory_region(machine, "maincpu")[0xe000]; /* NVRAM */ + nvram = &machine->region("maincpu")->base()[0xe000]; /* NVRAM */ spangj_decode(machine); configure_banks(machine); } @@ -2187,7 +2187,7 @@ static DRIVER_INIT( sbbros ) mitchell_state *state = machine->driver_data(); state->input_type = 3; nvram_size = 0x80; - nvram = &memory_region(machine, "maincpu")[0xe000]; /* NVRAM */ + nvram = &machine->region("maincpu")->base()[0xe000]; /* NVRAM */ sbbros_decode(machine); configure_banks(machine); } @@ -2252,7 +2252,7 @@ static DRIVER_INIT( block ) mitchell_state *state = machine->driver_data(); state->input_type = 2; nvram_size = 0x80; - nvram = &memory_region(machine, "maincpu")[0xff80]; /* NVRAM */ + nvram = &machine->region("maincpu")->base()[0xff80]; /* NVRAM */ block_decode(machine); configure_banks(machine); } @@ -2261,7 +2261,7 @@ static DRIVER_INIT( blockbl ) mitchell_state *state = machine->driver_data(); state->input_type = 2; nvram_size = 0x80; - nvram = &memory_region(machine, "maincpu")[0xff80]; /* NVRAM */ + nvram = &machine->region("maincpu")->base()[0xff80]; /* NVRAM */ bootleg_decode(machine); configure_banks(machine); } @@ -2269,9 +2269,9 @@ static DRIVER_INIT( blockbl ) static DRIVER_INIT( mstworld ) { /* descramble the program rom .. */ - int len = memory_region_length(machine, "maincpu"); + int len = machine->region("maincpu")->bytes(); UINT8* source = auto_alloc_array(machine, UINT8, len); - UINT8* dst = memory_region(machine, "maincpu") ; + UINT8* dst = machine->region("maincpu")->base() ; int x; static const int tablebank[]= diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c index dabeb65344b..2fba1abad2d 100644 --- a/src/mame/drivers/mjkjidai.c +++ b/src/mame/drivers/mjkjidai.c @@ -74,7 +74,7 @@ static DEVICE_START( mjkjidai_adpcm ) state->playing = 0; state->stream = stream_create(device, 0, 1, device->clock(), state, mjkjidai_adpcm_callback); - state->base = memory_region(machine, "adpcm"); + state->base = machine->region("adpcm")->base(); state->adpcm.reset(); } diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index 86fbb609185..270e452fd11 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -155,7 +155,7 @@ static VIDEO_UPDATE( mjsister ) static TIMER_CALLBACK( dac_callback ) { mjsister_state *state = machine->driver_data(); - UINT8 *DACROM = memory_region(machine, "samples"); + UINT8 *DACROM = machine->region("samples")->base(); dac_data_w(state->dac, DACROM[(state->dac_bank * 0x10000 + state->dac_adr++) & 0x1ffff]); @@ -447,7 +447,7 @@ static STATE_POSTLOAD( mjsister_redraw ) static MACHINE_START( mjsister ) { mjsister_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0x10000], 0x8000); diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index 83150b8cc43..e9ada0ae1fa 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -232,7 +232,7 @@ static WRITE16_HANDLER(ml_output_w) static WRITE8_DEVICE_HANDLER( sound_bankswitch_w ) { data=0; - memory_set_bankptr(device->machine, "bank1", memory_region(device->machine, "audiocpu") + ((data) & 0x03) * 0x4000 + 0x10000 ); + memory_set_bankptr(device->machine, "bank1", device->machine->region("audiocpu")->base() + ((data) & 0x03) * 0x4000 + 0x10000 ); } static void ml_msm5205_vck(device_t *device) @@ -249,7 +249,7 @@ static void ml_msm5205_vck(device_t *device) } else { - UINT8 *ROM = memory_region(device->machine, "adpcm"); + UINT8 *ROM = device->machine->region("adpcm")->base(); adpcm_data = ((trigger ? (ROM[adpcm_pos] & 0x0f) : (ROM[adpcm_pos] & 0xf0)>>4) ); msm5205_data_w(device,adpcm_data & 0xf); @@ -805,7 +805,7 @@ ROM_END static DRIVER_INIT(mlanding) { -// UINT8 *rom = memory_region(machine, "sub"); +// UINT8 *rom = machine->region("sub")->base(); // rom[0x88b]=0x4e; // rom[0x88a]=0x71; } diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c index 10a20554055..a1b05fc9b77 100644 --- a/src/mame/drivers/model1.c +++ b/src/mame/drivers/model1.c @@ -671,7 +671,7 @@ static WRITE16_HANDLER( bank_w ) if(ACCESSING_BITS_0_7) { switch(data & 0xf) { case 0x1: // 100000-1fffff data roms banking - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + 0x1000000 + 0x100000*((data >> 4) & 0xf)); + memory_set_bankptr(space->machine, "bank1", space->machine->region("maincpu")->base() + 0x1000000 + 0x100000*((data >> 4) & 0xf)); logerror("BANK %x\n", 0x1000000 + 0x100000*((data >> 4) & 0xf)); break; case 0x2: // 200000-2fffff data roms banking (unused, all known games have only one bank) @@ -737,7 +737,7 @@ static INTERRUPT_GEN(model1_interrupt) static MACHINE_RESET(model1) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x1000000); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0x1000000); irq_init(machine); model1_tgp_reset(machine, !strcmp(machine->gamedrv->name, "swa") || !strcmp(machine->gamedrv->name, "wingwar") || !strcmp(machine->gamedrv->name, "wingwaru") || !strcmp(machine->gamedrv->name, "wingwarj")); if (!strcmp(machine->gamedrv->name, "swa")) @@ -756,7 +756,7 @@ static MACHINE_RESET(model1) static MACHINE_RESET(model1_vr) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x1000000); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0x1000000); irq_init(machine); model1_vr_tgp_reset(machine); model1_sound_irq = 3; diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index 518e2253989..99206a3c5d5 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -367,11 +367,11 @@ static MACHINE_RESET(model2o) static MACHINE_RESET(model2_scsp) { - memory_set_bankptr(machine, "bank4", memory_region(machine, "scsp") + 0x200000); - memory_set_bankptr(machine, "bank5", memory_region(machine, "scsp") + 0x600000); + memory_set_bankptr(machine, "bank4", machine->region("scsp")->base() + 0x200000); + memory_set_bankptr(machine, "bank5", machine->region("scsp")->base() + 0x600000); // copy the 68k vector table into RAM - memcpy(model2_soundram, memory_region(machine, "audiocpu") + 0x80000, 16); + memcpy(model2_soundram, machine->region("audiocpu")->base() + 0x80000, 16); machine->device("audiocpu")->reset(); } @@ -1171,7 +1171,7 @@ static int model2_maxxstate = 0; static READ32_HANDLER( maxx_r ) { - UINT32 *ROM = (UINT32 *)memory_region(space->machine, "maincpu"); + UINT32 *ROM = (UINT32 *)space->machine->region("maincpu")->base(); if (offset <= 0x1f/4) { @@ -1863,9 +1863,9 @@ ADDRESS_MAP_END static WRITE16_HANDLER( model2snd_ctrl ) { // handle sample banking - if (memory_region_length(space->machine, "scsp") > 0x800000) + if (space->machine->region("scsp")->bytes() > 0x800000) { - UINT8 *snd = memory_region(space->machine, "scsp"); + UINT8 *snd = space->machine->region("scsp")->base(); if (data & 0x20) { memory_set_bankptr(space->machine, "bank4", snd + 0x200000); @@ -4825,7 +4825,7 @@ static DRIVER_INIT( genprot ) static DRIVER_INIT( pltkids ) { - UINT32 *ROM = (UINT32 *)memory_region(machine, "maincpu"); + UINT32 *ROM = (UINT32 *)machine->region("maincpu")->base(); memory_install_readwrite32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w); protstate = protpos = 0; @@ -4836,7 +4836,7 @@ static DRIVER_INIT( pltkids ) static DRIVER_INIT( zerogun ) { - UINT32 *ROM = (UINT32 *)memory_region(machine, "maincpu"); + UINT32 *ROM = (UINT32 *)machine->region("maincpu")->base(); memory_install_readwrite32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w); protstate = protpos = 0; @@ -4879,7 +4879,7 @@ static WRITE32_HANDLER( jaleco_network_w ) static DRIVER_INIT( sgt24h ) { - UINT32 *ROM = (UINT32 *)memory_region(machine, "maincpu"); + UINT32 *ROM = (UINT32 *)machine->region("maincpu")->base(); memory_install_readwrite32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w); memory_install_readwrite32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x01a10000, 0x01a1ffff, 0, 0, jaleco_network_r, jaleco_network_w); @@ -4900,7 +4900,7 @@ static DRIVER_INIT( overrev ) static DRIVER_INIT( doa ) { - UINT32 *ROM = (UINT32 *)memory_region(machine, "maincpu"); + UINT32 *ROM = (UINT32 *)machine->region("maincpu")->base(); memory_install_readwrite32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x01d80000, 0x01dfffff, 0, 0, model2_prot_r, model2_prot_w); protstate = protpos = 0; diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index 528215b6d20..b645b5a5d94 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -1218,13 +1218,13 @@ static MACHINE_START(model3_21) static void model3_init(running_machine *machine, int step) { model3_step = step; - memory_set_bankptr(machine, "bank1", memory_region( machine, "user1" ) + 0x800000 ); /* banked CROM */ + memory_set_bankptr(machine, "bank1", machine->region( "user1" )->base() + 0x800000 ); /* banked CROM */ - memory_set_bankptr(machine, "bank4", memory_region(machine, "samples") + 0x200000); - memory_set_bankptr(machine, "bank5", memory_region(machine, "samples") + 0x600000); + memory_set_bankptr(machine, "bank4", machine->region("samples")->base() + 0x200000); + memory_set_bankptr(machine, "bank5", machine->region("samples")->base() + 0x600000); // copy the 68k vector table into RAM - memcpy(model3_soundram, memory_region(machine, "audiocpu")+0x80000, 16); + memcpy(model3_soundram, machine->region("audiocpu")->base()+0x80000, 16); machine->device("audiocpu")->reset(); model3_machine_init(step); // step 1.5 @@ -1536,7 +1536,7 @@ static WRITE64_HANDLER( model3_sys_w ) data >>= 56; data = (~data) & 0x7; - memory_set_bankptr(space->machine, "bank1", memory_region( space->machine, "user1" ) + 0x800000 + (data * 0x800000)); /* banked CROM */ + memory_set_bankptr(space->machine, "bank1", space->machine->region( "user1" )->base() + 0x800000 + (data * 0x800000)); /* banked CROM */ } if (ACCESSING_BITS_24_31) { @@ -1765,7 +1765,7 @@ static WRITE64_HANDLER(daytona2_rombank_w) { data >>= 56; data = (~data) & 0xf; - memory_set_bankptr(space->machine, "bank1", memory_region( space->machine, "user1" ) + 0x800000 + (data * 0x800000)); /* banked CROM */ + memory_set_bankptr(space->machine, "bank1", space->machine->region( "user1" )->base() + 0x800000 + (data * 0x800000)); /* banked CROM */ } } @@ -4875,9 +4875,9 @@ ROM_END static WRITE16_HANDLER( model3snd_ctrl ) { // handle sample banking - if (memory_region_length(space->machine, "scsp2") > 0x800000) + if (space->machine->region("scsp2")->bytes() > 0x800000) { - UINT8 *snd = memory_region(space->machine, "scsp2"); + UINT8 *snd = space->machine->region("scsp2")->base(); if (data & 0x20) { memory_set_bankptr(space->machine, "bank4", snd + 0x200000); @@ -5137,9 +5137,9 @@ static void interleave_vroms(running_machine *machine) { int start; int i,j,x; - UINT16 *vrom1 = (UINT16*)memory_region(machine, "user3"); - UINT16 *vrom2 = (UINT16*)memory_region(machine, "user4"); - int vrom_length = memory_region_length(machine, "user3"); + UINT16 *vrom1 = (UINT16*)machine->region("user3")->base(); + UINT16 *vrom2 = (UINT16*)machine->region("user4")->base(); + int vrom_length = machine->region("user3")->bytes(); UINT16 *vrom; model3_vrom = auto_alloc_array(machine, UINT32, 0x4000000/4); @@ -5200,7 +5200,7 @@ static DRIVER_INIT( model3_20 ) static DRIVER_INIT( lostwsga ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_15); /* TODO: there's an M68K device at 0xC0000000 - FF, maybe lightgun controls ? */ @@ -5211,7 +5211,7 @@ static DRIVER_INIT( lostwsga ) static DRIVER_INIT( scud ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_15); /* TODO: network device at 0xC0000000 - FF */ @@ -5223,7 +5223,7 @@ static DRIVER_INIT( scud ) static DRIVER_INIT( scudp ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_15); /* TODO: network device at 0xC0000000 - FF */ @@ -5240,7 +5240,7 @@ static DRIVER_INIT( scudp ) static DRIVER_INIT( lemans24 ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_15); memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc1000000, 0xc10000ff, 0, 0, scsi_r, scsi_w ); @@ -5254,7 +5254,7 @@ static DRIVER_INIT( lemans24 ) static DRIVER_INIT( vf3 ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_10); @@ -5267,7 +5267,7 @@ static DRIVER_INIT( vf3 ) static DRIVER_INIT( vs215 ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); rom[(0x70dde0^4)/4] = 0x60000000; rom[(0x70e6f0^4)/4] = 0x60000000; @@ -5287,7 +5287,7 @@ static DRIVER_INIT( vs215 ) static DRIVER_INIT( vs29815 ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); rom[(0x6028ec^4)/4] = 0x60000000; rom[(0x60290c^4)/4] = 0x60000000; @@ -5306,7 +5306,7 @@ static DRIVER_INIT( vs29815 ) static DRIVER_INIT( bass ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); rom[(0x7999a8^4)/4] = 0x60000000; rom[(0x7999c8^4)/4] = 0x60000000; @@ -5337,7 +5337,7 @@ static DRIVER_INIT( getbass ) static DRIVER_INIT( vs2 ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); @@ -5347,7 +5347,7 @@ static DRIVER_INIT( vs2 ) static DRIVER_INIT( vs298 ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); @@ -5358,7 +5358,7 @@ static DRIVER_INIT( vs298 ) static DRIVER_INIT( vs2v991 ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); @@ -5368,7 +5368,7 @@ static DRIVER_INIT( vs2v991 ) static DRIVER_INIT( vs299b ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); @@ -5378,7 +5378,7 @@ static DRIVER_INIT( vs299b ) static DRIVER_INIT( vs299a ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); @@ -5388,7 +5388,7 @@ static DRIVER_INIT( vs299a ) static DRIVER_INIT( vs299 ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); @@ -5398,7 +5398,7 @@ static DRIVER_INIT( vs299 ) static DRIVER_INIT( harley ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); memory_install_readwrite64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc0000000, 0xc00fffff, 0, 0, network_r, network_w ); @@ -5412,7 +5412,7 @@ static DRIVER_INIT( harley ) static DRIVER_INIT( srally2 ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); rom[(0x7c0c4^4)/4] = 0x60000000; @@ -5422,7 +5422,7 @@ static DRIVER_INIT( srally2 ) static DRIVER_INIT( swtrilgy ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); rom[(0xf0e48^4)/4] = 0x60000000; @@ -5433,7 +5433,7 @@ static DRIVER_INIT( swtrilgy ) static DRIVER_INIT( swtrilga ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); rom[(0xf6dd0^4)/4] = 0x60000000; @@ -5441,7 +5441,7 @@ static DRIVER_INIT( swtrilga ) static DRIVER_INIT( von2 ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); rom[(0x189168^4)/4] = 0x60000000; @@ -5453,7 +5453,7 @@ static DRIVER_INIT( von2 ) static DRIVER_INIT( dirtdvls ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); rom[(0x0600a0^4)/4] = 0x60000000; @@ -5466,7 +5466,7 @@ static DRIVER_INIT( dirtdvls ) static DRIVER_INIT( daytona2 ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); memory_install_write64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc3800000, 0xc3800007, 0, 0, daytona2_rombank_w ); @@ -5479,7 +5479,7 @@ static DRIVER_INIT( daytona2 ) static DRIVER_INIT( dayto2pe ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); memory_install_write64_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xc3800000, 0xc3800007, 0, 0, daytona2_rombank_w ); @@ -5493,7 +5493,7 @@ static DRIVER_INIT( dayto2pe ) static DRIVER_INIT( spikeout ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); rom[(0x6059cc^4)/4] = 0x60000000; @@ -5502,7 +5502,7 @@ static DRIVER_INIT( spikeout ) static DRIVER_INIT( spikeofe ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); rom[(0x6059cc^4)/4] = 0x60000000; @@ -5511,7 +5511,7 @@ static DRIVER_INIT( spikeofe ) static DRIVER_INIT( eca ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); rom[(0x535580^4)/4] = 0x60000000; @@ -5521,7 +5521,7 @@ static DRIVER_INIT( eca ) static DRIVER_INIT( skichamp ) { - UINT32 *rom = (UINT32*)memory_region(machine, "user1"); + UINT32 *rom = (UINT32*)machine->region("user1")->base(); DRIVER_INIT_CALL(model3_20); rom[(0x5263c8^4)/4] = 0x60000000; diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c index 839cc1d59c3..1857f2b3df7 100644 --- a/src/mame/drivers/momoko.c +++ b/src/mame/drivers/momoko.c @@ -228,7 +228,7 @@ static const ym2203_interface ym2203_config = static MACHINE_START( momoko ) { momoko_state *state = machine->driver_data(); - UINT8 *BG_MAP = memory_region(machine, "user1"); + UINT8 *BG_MAP = machine->region("user1")->base(); memory_configure_bank(machine, "bank1", 0, 32, &BG_MAP[0x0000], 0x1000); diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index 5e56baf92f7..03d847fb319 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -182,7 +182,7 @@ static READ16_HANDLER( sound_status_r ) static WRITE8_HANDLER( sound_bankswitch_w ) { - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "soundcpu") + 0x10000 + (data&0xf)*0x4000); + memory_set_bankptr(space->machine, "bank1", space->machine->region("soundcpu")->base() + 0x10000 + (data&0xf)*0x4000); } diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c index 13bd0bc4a75..b7327d44cb5 100644 --- a/src/mame/drivers/mouser.c +++ b/src/mame/drivers/mouser.c @@ -284,9 +284,9 @@ static DRIVER_INIT( mouser ) offs_t i; address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x6000); - UINT8 *table = memory_region(machine, "user1"); + UINT8 *table = machine->region("user1")->base(); space->set_decrypted_region(0x0000, 0x5fff, decrypted); diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index 359715aca0b..a0feac60c30 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -440,7 +440,7 @@ static MACHINE_RESET( mpu4 ) /* init rom bank, some games don't set this */ { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &rom[0x01000], 0x10000); diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c index 3045cc77f52..89e6d6b16d0 100644 --- a/src/mame/drivers/mpu4drvr.c +++ b/src/mame/drivers/mpu4drvr.c @@ -2035,7 +2035,7 @@ static PALETTE_INIT( dealem ) 3, resistances_rg, weights_g, 1000, 0, 2, resistances_b, weights_b, 1000, 0); - len = memory_region_length(machine, "proms"); + len = machine->region("proms")->bytes(); for (i = 0; i < len; i++) { int bit0,bit1,bit2,r,g,b; diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c index 229e14fa697..ebfcf762630 100644 --- a/src/mame/drivers/mquake.c +++ b/src/mame/drivers/mquake.c @@ -95,7 +95,7 @@ static WRITE8_DEVICE_HANDLER( mquake_es5503_w ) // if not writing a "halt", set the bank if (!(data & 1)) { - es5503_set_base(device, memory_region(device->machine, "ensoniq") + ((data>>4)*0x10000)); + es5503_set_base(device, device->machine->region("ensoniq")->base() + ((data>>4)*0x10000)); } } } @@ -320,7 +320,7 @@ static const es5503_interface es5503_intf = static MACHINE_RESET(mquake) { /* set ES5503 wave memory (this is banked in 64k increments) */ - es5503_set_base(machine->device("ensoniq"), memory_region(machine, "ensoniq")); + es5503_set_base(machine->device("ensoniq"), machine->region("ensoniq")->base()); MACHINE_RESET_CALL(amiga); } @@ -461,7 +461,7 @@ static DRIVER_INIT(mquake) /* set up memory */ memory_configure_bank(machine, "bank1", 0, 1, state->chip_ram, 0); - memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user1"), 0); + memory_configure_bank(machine, "bank1", 1, 1, machine->region("user1")->base(), 0); } diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c index fdcb34fbe97..11b9b821e57 100644 --- a/src/mame/drivers/mrdo.c +++ b/src/mame/drivers/mrdo.c @@ -34,7 +34,7 @@ There's a chance that certain bootlegs might have the different 8/20 MHz XTALS. /* if a read from this address doesn't return the value it expects. */ static READ8_HANDLER( mrdo_SECRE_r ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); return RAM[cpu_get_reg(space->cpu, Z80_HL)]; } diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c index 8b953d40cdc..ffdde7b4474 100644 --- a/src/mame/drivers/ms32.c +++ b/src/mame/drivers/ms32.c @@ -1304,7 +1304,7 @@ ADDRESS_MAP_END static MACHINE_RESET( ms32 ) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu")); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base()); memory_set_bank(machine, "bank4", 0); memory_set_bank(machine, "bank5", 1); irq_init(machine); @@ -2143,8 +2143,8 @@ void ms32_rearrange_sprites(running_machine *machine, const char *region) UINT8 *result_data; - source_data = memory_region ( machine, region ); - source_size = memory_region_length( machine, region ); + source_data = machine->region ( region )->base(); + source_size = machine->region( region )->bytes(); result_data = auto_alloc_array(machine, UINT8, source_size); @@ -2168,8 +2168,8 @@ void decrypt_ms32_tx(running_machine *machine, int addr_xor,int data_xor, const UINT8 *result_data; - source_data = memory_region ( machine, region ); - source_size = memory_region_length( machine, region ); + source_data = machine->region ( region )->base(); + source_size = machine->region( region )->bytes(); result_data = auto_alloc_array(machine, UINT8, source_size); @@ -2222,8 +2222,8 @@ void decrypt_ms32_bg(running_machine *machine, int addr_xor,int data_xor, const UINT8 *result_data; - source_data = memory_region ( machine, region ); - source_size = memory_region_length( machine, region ); + source_data = machine->region ( region )->base(); + source_size = machine->region( region )->bytes(); result_data = auto_alloc_array(machine, UINT8, source_size); @@ -2274,8 +2274,8 @@ void decrypt_ms32_bg(running_machine *machine, int addr_xor,int data_xor, const static void configure_banks(running_machine *machine) { state_save_register_global(machine, to_main); - memory_configure_bank(machine, "bank4", 0, 16, memory_region(machine, "audiocpu") + 0x14000, 0x4000); - memory_configure_bank(machine, "bank5", 0, 16, memory_region(machine, "audiocpu") + 0x14000, 0x4000); + memory_configure_bank(machine, "bank4", 0, 16, machine->region("audiocpu")->base() + 0x14000, 0x4000); + memory_configure_bank(machine, "bank5", 0, 16, machine->region("audiocpu")->base() + 0x14000, 0x4000); } static DRIVER_INIT( ms32_common ) @@ -2333,7 +2333,7 @@ static DRIVER_INIT (47pie2) static DRIVER_INIT (f1superb) { #if 0 // we shouldn't need this hack, something else is wrong, and the x offsets are never copied either, v70 problems?? - UINT32 *pROM = (UINT32 *)memory_region(machine, "maincpu"); + UINT32 *pROM = (UINT32 *)machine->region("maincpu")->base(); pROM[0x19d04/4]=0x167a021a; // bne->br : sprite Y offset table is always copied to RAM #endif DRIVER_INIT_CALL(ss92046_01); diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index 998cfc81c11..434a25cb8b8 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -463,7 +463,7 @@ A12 <-> A13 */ UINT32 i,j,jscr,romoffset; - UINT8 *multfish_gfx = memory_region(machine, "gfx"); + UINT8 *multfish_gfx = machine->region("gfx")->base(); UINT8 *temprom = auto_alloc_array(machine, UINT8, multfish_ROM_SIZE); @@ -535,7 +535,7 @@ INLINE void rom_decodeh(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 xor static void lottery_decode(running_machine *machine, UINT8 xor12, UINT8 xor34, UINT8 xor56, UINT8 xor78, UINT32 xor_addr) { - UINT8 *multfish_gfx = memory_region(machine, "gfx"); + UINT8 *multfish_gfx = machine->region("gfx")->base(); UINT8 *temprom = auto_alloc_array(machine, UINT8, multfish_ROM_SIZE); /* ROMs decode */ @@ -576,7 +576,7 @@ INLINE void roment_decodeh(UINT8 *romptr, UINT8 *tmprom, UINT8 xor_data, UINT32 static void ent_decode(running_machine *machine, UINT8 xor12, UINT8 xor34, UINT8 xor56, UINT8 xor78, UINT32 xor_addr) { - UINT8 *multfish_gfx = memory_region(machine, "gfx"); + UINT8 *multfish_gfx = machine->region("gfx")->base(); UINT8 *temprom = auto_alloc_array(machine, UINT8, multfish_ROM_SIZE); /* ROMs decode */ @@ -1001,7 +1001,7 @@ static MACHINE_RESET( multfish ) { multfish_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu"), 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base(), 0x4000); memory_set_bank(machine, "bank1", 0); state->disp_enable = 0; diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c index 3d0d7f1c498..fb4dc598cce 100644 --- a/src/mame/drivers/multigam.c +++ b/src/mame/drivers/multigam.c @@ -136,7 +136,7 @@ static void set_videorom_bank(running_machine* machine, int start, int count, in /* count determines the size of the area mapped in KB */ for (i = 0; i < count; i++, offset += 0x400) { - memory_set_bankptr(machine, banknames[i + start], memory_region(machine, "gfx1") + offset); + memory_set_bankptr(machine, banknames[i + start], machine->region("gfx1")->base() + offset); } } @@ -238,8 +238,8 @@ static int multigam_game_gfx_bank = 0; static WRITE8_HANDLER(multigam_switch_prg_rom) { /* switch PRG rom */ - UINT8* dst = memory_region(space->machine, "maincpu"); - UINT8* src = memory_region(space->machine, "user1"); + UINT8* dst = space->machine->region("maincpu")->base(); + UINT8* src = space->machine->region("user1")->base(); if (data & 0x80) { @@ -258,7 +258,7 @@ static WRITE8_HANDLER(multigam_switch_prg_rom) static WRITE8_HANDLER(multigam_switch_gfx_rom) { - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "gfx1") + (0x2000 * (data & 0x3f))); + memory_set_bankptr(space->machine, "bank1", space->machine->region("gfx1")->base() + (0x2000 * (data & 0x3f))); set_mirroring(data & 0x40 ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT); multigam_game_gfx_bank = data; }; @@ -268,7 +268,7 @@ static WRITE8_HANDLER(multigam_mapper2_w) { if (multigam_game_gfx_bank & 0x80) { - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "gfx1") + (0x2000 * ((data & 0x3) + (multigam_game_gfx_bank & 0x3c)))); + memory_set_bankptr(space->machine, "bank1", space->machine->region("gfx1")->base() + (0x2000 * ((data & 0x3) + (multigam_game_gfx_bank & 0x3c)))); } else { @@ -362,7 +362,7 @@ static WRITE8_HANDLER( multigam3_mmc3_rom_switch_w ) if (multigam3_mmc3_last_bank != (data & 0xc0)) { int bank; - UINT8 *prg = memory_region(space->machine, "maincpu"); + UINT8 *prg = space->machine->region("maincpu")->base(); /* reset the banks */ if (multigam3_mmc3_command & 0x40) @@ -415,7 +415,7 @@ static WRITE8_HANDLER( multigam3_mmc3_rom_switch_w ) case 6: /* program banking */ { - UINT8 *prg = memory_region(space->machine, "maincpu"); + UINT8 *prg = space->machine->region("maincpu")->base(); if (multigam3_mmc3_command & 0x40) { /* high bank */ @@ -440,7 +440,7 @@ static WRITE8_HANDLER( multigam3_mmc3_rom_switch_w ) case 7: /* program banking */ { /* mid bank */ - UINT8 *prg = memory_region(space->machine, "maincpu"); + UINT8 *prg = space->machine->region("maincpu")->base(); multigam3_mmc3_banks[1] = data & bankmask; bank = multigam3_mmc3_banks[1] * 0x2000; @@ -469,7 +469,7 @@ static WRITE8_HANDLER( multigam3_mmc3_rom_switch_w ) } else { - memory_set_bankptr(space->machine, "bank10", memory_region(space->machine, "maincpu") + 0x6000); + memory_set_bankptr(space->machine, "bank10", space->machine->region("maincpu")->base() + 0x6000); } if (data & 0x40) { @@ -497,7 +497,7 @@ static WRITE8_HANDLER( multigam3_mmc3_rom_switch_w ) static void multigam_init_mmc3(running_machine *machine, UINT8 *prg_base, int prg_size, int chr_bank_base) { - UINT8* dst = memory_region(machine, "maincpu"); + UINT8* dst = machine->region("maincpu")->base(); // Tom & Jerry in Super Game III enables 6000 ram, but does not read/write it // however, it expects ROM from 6000 there (code jumps to $6xxx) @@ -541,8 +541,8 @@ static WRITE8_HANDLER(multigm3_switch_gfx_rom) static WRITE8_HANDLER(multigm3_switch_prg_rom) { /* switch PRG rom */ - UINT8* dst = memory_region(space->machine, "maincpu"); - UINT8* src = memory_region(space->machine, "user1"); + UINT8* dst = space->machine->region("maincpu")->base(); + UINT8* src = space->machine->region("user1")->base(); if (data == 0xa8) { @@ -552,7 +552,7 @@ static WRITE8_HANDLER(multigm3_switch_prg_rom) else { memory_install_write8_handler(space, 0x8000, 0xffff, 0, 0, multigm3_mapper2_w ); - memory_set_bankptr(space->machine, "bank10", memory_region(space->machine, "maincpu") + 0x6000); + memory_set_bankptr(space->machine, "bank10", space->machine->region("maincpu")->base() + 0x6000); } if (data & 0x80) @@ -606,14 +606,14 @@ static int multigam_mapper02_prg_size; static WRITE8_HANDLER(multigam3_mapper02_rom_switch_w) { - UINT8* mem = memory_region(space->machine, "maincpu"); + UINT8* mem = space->machine->region("maincpu")->base(); int bankmask = (multigam_mapper02_prg_size/0x4000) - 1; memcpy(mem + 0x8000, multigam_mapper02_prg_base + 0x4000*(data & bankmask), 0x4000); } static void multigam_init_mapper02(running_machine *machine, UINT8* prg_base, int prg_size) { - UINT8* mem = memory_region(machine, "maincpu"); + UINT8* mem = machine->region("maincpu")->base(); memcpy(mem + 0x8000, prg_base + prg_size - 0x8000, 0x8000); memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xffff, 0, 0, multigam3_mapper02_rom_switch_w ); @@ -741,7 +741,7 @@ static WRITE8_HANDLER( mmc1_rom_switch_w ) case 3: /* program banking */ { int bank = (mmc1_shiftreg & mmc1_rom_mask) * 0x4000; - UINT8 *prg = memory_region(space->machine, "maincpu"); + UINT8 *prg = space->machine->region("maincpu")->base(); if (!size16k) { @@ -773,7 +773,7 @@ static WRITE8_HANDLER( mmc1_rom_switch_w ) static void multigam_init_mmc1(running_machine *machine, UINT8 *prg_base, int prg_size, int chr_bank_base) { - UINT8* dst = memory_region(machine, "maincpu"); + UINT8* dst = machine->region("maincpu")->base(); memcpy(&dst[0x8000], prg_base + (prg_size - 0x8000), 0x8000); @@ -817,7 +817,7 @@ static UINT8 supergm3_chr_bank; static void supergm3_set_bank(running_machine *machine) { device_t *ppu = machine->device("ppu"); - UINT8* mem = memory_region(machine, "maincpu"); + UINT8* mem = machine->region("maincpu")->base(); // video bank if (supergm3_chr_bank == 0x10 || @@ -858,14 +858,14 @@ static void supergm3_set_bank(running_machine *machine) { // mapper 02 multigam_init_mapper02(machine, - memory_region(machine, "user1") + (supergm3_prg_bank & 0x1f)*0x20000, + machine->region("user1")->base() + (supergm3_prg_bank & 0x1f)*0x20000, 0x20000); } else if (supergm3_chr_bank & 0x10) { // MMC3 multigam_init_mmc3(machine, - memory_region(machine, "user1") + (supergm3_prg_bank & 0x1f)*0x20000, + machine->region("user1")->base() + (supergm3_prg_bank & 0x1f)*0x20000, (supergm3_prg_bank & 0x20) ? 0x20000 : 0x40000, (supergm3_chr_bank & 0x0f)*0x80); } @@ -873,7 +873,7 @@ static void supergm3_set_bank(running_machine *machine) { //MMC1 multigam_init_mmc1(machine, - memory_region(machine, "user1") + (supergm3_prg_bank & 0x1f)*0x20000, + machine->region("user1")->base() + (supergm3_prg_bank & 0x1f)*0x20000, 0x20000, (supergm3_chr_bank & 0x0f)*0x80/4 ); } @@ -1094,7 +1094,7 @@ static MACHINE_START( multigam ) memory_install_readwrite8_handler(cpu_get_address_space(machine->device("ppu"), ADDRESS_SPACE_PROGRAM), 0x2000, 0x3eff, 0, 0, multigam_nt_r, multigam_nt_w); memory_install_read_bank(cpu_get_address_space(machine->device("ppu"), ADDRESS_SPACE_PROGRAM), 0x0000, 0x1fff, 0, 0, "bank1"); - memory_set_bankptr(machine, "bank1", memory_region(machine, "gfx1")); + memory_set_bankptr(machine, "bank1", machine->region("gfx1")->base()); } static MACHINE_START( multigm3 ) @@ -1325,8 +1325,8 @@ static DRIVER_INIT(multigm3) const UINT8 decode[16] = { 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a }; - multigm3_decrypt(memory_region(machine, "maincpu"), memory_region_length(machine, "maincpu"), decode ); - multigm3_decrypt(memory_region(machine, "user1"), memory_region_length(machine, "user1"), decode ); + multigm3_decrypt(machine->region("maincpu")->base(), machine->region("maincpu")->bytes(), decode ); + multigm3_decrypt(machine->region("user1")->base(), machine->region("user1")->bytes(), decode ); multigmc_mmc3_6000_ram = auto_alloc_array(machine, UINT8, 0x2000); @@ -1343,7 +1343,7 @@ static DRIVER_INIT(multigmt) int i; int addr; - rom = memory_region(machine, "maincpu"); + rom = machine->region("maincpu")->base(); size = 0x8000; memcpy(buf, rom, size); for (i = 0; i < size; i++) @@ -1353,7 +1353,7 @@ static DRIVER_INIT(multigmt) rom[i] = buf[addr]; } - rom = memory_region(machine, "user1"); + rom = machine->region("user1")->base(); size = 0x80000; memcpy(buf, rom, size); for (i = 0; i < size; i++) @@ -1361,7 +1361,7 @@ static DRIVER_INIT(multigmt) addr = BITSWAP24(i,23,22,21,20,19,18,17,16,15,14,13,8,11,12,10,9,7,6,5,4,3,2,1,0); rom[i] = buf[addr]; } - rom = memory_region(machine, "gfx1"); + rom = machine->region("gfx1")->base(); size = 0x80000; memcpy(buf, rom, size); for (i = 0; i < size; i++) diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c index 5d31b862714..3e22970be7b 100644 --- a/src/mame/drivers/mustache.c +++ b/src/mame/drivers/mustache.c @@ -264,10 +264,10 @@ static DRIVER_INIT( mustache ) { int i; - int G1 = memory_region_length(machine, "gfx1")/3; - int G2 = memory_region_length(machine, "gfx2")/2; - UINT8 *gfx1 = memory_region(machine, "gfx1"); - UINT8 *gfx2 = memory_region(machine, "gfx2"); + int G1 = machine->region("gfx1")->bytes()/3; + int G2 = machine->region("gfx2")->bytes()/2; + UINT8 *gfx1 = machine->region("gfx1")->base(); + UINT8 *gfx2 = machine->region("gfx2")->base(); UINT8 *buf=auto_alloc_array(machine, UINT8, G2*2); /* BG data lines */ diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c index 198626559b0..f8e48cac4d3 100644 --- a/src/mame/drivers/mystwarr.c +++ b/src/mame/drivers/mystwarr.c @@ -570,7 +570,7 @@ static int cur_sound_region; static void reset_sound_region(running_machine *machine) { - memory_set_bankptr(machine, "bank2", memory_region(machine, "soundcpu") + 0x10000 + cur_sound_region*0x4000); + memory_set_bankptr(machine, "bank2", machine->region("soundcpu")->base() + 0x10000 + cur_sound_region*0x4000); } static WRITE8_HANDLER( sound_bankswitch_w ) diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c index 17bfb6f8e3b..2d04f63585e 100644 --- a/src/mame/drivers/namcofl.c +++ b/src/mame/drivers/namcofl.c @@ -197,11 +197,11 @@ static WRITE32_HANDLER( namcofl_sysreg_w ) if (data == 0) // RAM at 00000000, ROM at 10000000 { memory_set_bankptr(space->machine, "bank1", namcofl_workram ); - memory_set_bankptr(space->machine, "bank2", memory_region(space->machine, "maincpu") ); + memory_set_bankptr(space->machine, "bank2", space->machine->region("maincpu")->base() ); } else // ROM at 00000000, RAM at 10000000 { - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") ); + memory_set_bankptr(space->machine, "bank1", space->machine->region("maincpu")->base() ); memory_set_bankptr(space->machine, "bank2", namcofl_workram ); } } @@ -580,7 +580,7 @@ static MACHINE_RESET( namcofl ) timer_set(machine, machine->primary_screen->time_until_pos(machine->primary_screen->visible_area().max_y + 3, 0), NULL, 0, network_interrupt_callback); timer_set(machine, machine->primary_screen->time_until_pos(machine->primary_screen->visible_area().max_y + 1, 0), NULL, 0, vblank_interrupt_callback); - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") ); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() ); memory_set_bankptr(machine, "bank2", namcofl_workram ); memset(namcofl_workram, 0x00, 0x100000); @@ -808,7 +808,7 @@ static void namcofl_common_init(running_machine *machine) { namcofl_workram = auto_alloc_array(machine, UINT32, 0x100000/4); - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") ); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() ); memory_set_bankptr(machine, "bank2", namcofl_workram ); } diff --git a/src/mame/drivers/namcoic.c b/src/mame/drivers/namcoic.c index e04792a3d8d..9b6b5b1d80f 100644 --- a/src/mame/drivers/namcoic.c +++ b/src/mame/drivers/namcoic.c @@ -1091,7 +1091,7 @@ roz_get_info( running_machine *machine, tile_data *tileinfo, int tile_index, int break; } SET_TILE_INFO( mRozGfxBank,mangle,0/*color*/,0/*flag*/ ); - tileinfo->mask_data = 32*tile + (UINT8 *)memory_region( machine, mRozMaskRegion ); + tileinfo->mask_data = 32*tile + (UINT8 *)machine->region( mRozMaskRegion )->base(); } /* roz_get_info */ static @@ -1601,7 +1601,7 @@ namco_road_set_transparent_color(pen_t pen) void namco_road_draw(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int pri ) { - const UINT8 *clut = (const UINT8 *)memory_region(machine, "user3"); + const UINT8 *clut = (const UINT8 *)machine->region("user3")->base(); bitmap_t *pSourceBitmap; unsigned yscroll; int i; diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c index 9e476dc77b4..cec536c1716 100644 --- a/src/mame/drivers/namcona1.c +++ b/src/mame/drivers/namcona1.c @@ -1067,7 +1067,7 @@ MACHINE_CONFIG_END static void init_namcona1( running_machine *machine, int gametype ) { - UINT16 *pMem = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *pMem = (UINT16 *)machine->region( "maincpu" )->base(); namcona1_gametype = gametype; mpBank0 = &pMem[0x80000/2]; diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c index fb1bd430ba7..55ccb36ba86 100644 --- a/src/mame/drivers/namconb1.c +++ b/src/mame/drivers/namconb1.c @@ -607,7 +607,7 @@ static MACHINE_START(namconb) static DRIVER_INIT( nebulray ) { - UINT8 *pMem = (UINT8 *)memory_region(machine, NAMCONB1_TILEMASKREGION); + UINT8 *pMem = (UINT8 *)machine->region(NAMCONB1_TILEMASKREGION)->base(); size_t numBytes = (0xfe7-0xe6f)*8; memset( &pMem[0xe6f*8], 0, numBytes ); diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c index b67c7117ad4..a949b78231d 100644 --- a/src/mame/drivers/namcos10.c +++ b/src/mame/drivers/namcos10.c @@ -318,8 +318,8 @@ static void memm_driver_init( running_machine *machine ) static void memn_driver_init( running_machine *machine ) { - UINT8 *BIOS = (UINT8 *)memory_region( machine, "user1" ); - UINT8 *ROM = (UINT8 *)memory_region( machine, "user2" ); + UINT8 *BIOS = (UINT8 *)machine->region( "user1" )->base(); + UINT8 *ROM = (UINT8 *)machine->region( "user2" )->base(); memcpy32le( (UINT32 *)( BIOS + 0x0000000 ), ROM + 0x08000, 0x001c000 ); memcpy32le( (UINT32 *)( BIOS + 0x0020000 ), ROM + 0x24000, 0x03dffff ); @@ -330,8 +330,8 @@ static void memn_driver_init( running_machine *machine ) static void decrypt_bios( running_machine *machine, int b15, int b14, int b13, int b12, int b11, int b10, int b9, int b8, int b7, int b6, int b5, int b4, int b3, int b2, int b1, int b0 ) { - UINT16 *BIOS = (UINT16 *)memory_region( machine, "user1" ); - int len = memory_region_length( machine, "user1" ) / 2; + UINT16 *BIOS = (UINT16 *)machine->region( "user1" )->base(); + int len = machine->region( "user1" )->bytes() / 2; int i; for( i = 0; i < len; i++ ) diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c index 62288401fce..05bbd318a17 100644 --- a/src/mame/drivers/namcos11.c +++ b/src/mame/drivers/namcos11.c @@ -937,8 +937,8 @@ static DRIVER_INIT( namcos11 ) if( namcos11_config_table[ n_game ].n_daughterboard != 0 ) { int bank; - UINT32 len = memory_region_length( machine, "user2" ); - UINT8 *rgn = memory_region( machine, "user2" ); + UINT32 len = machine->region( "user2" )->bytes(); + UINT8 *rgn = machine->region( "user2" )->base(); memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f000000, 0x1f0fffff, 0, 0, "bank1" ); memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x1f100000, 0x1f1fffff, 0, 0, "bank2" ); diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index 23b39e9a336..95e7a661c5f 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1084,8 +1084,8 @@ static void namcos12_rom_read( running_machine *machine, UINT32 n_address, INT32 verboselog( machine, 1, "namcos12_rom_read( %08x, %08x ) game %08x\n", n_address, n_size, n_offset ); } - source = (UINT16 *) memory_region( machine, n_region ); - n_romleft = ( memory_region_length( machine, n_region ) - n_offset ) / 4; + source = (UINT16 *) machine->region( n_region )->base(); + n_romleft = ( machine->region( n_region )->bytes() - n_offset ) / 4; if( n_size > n_romleft ) { verboselog( machine, 1, "namcos12_rom_read dma truncated %d to %d passed end of rom\n", n_size, n_romleft ); @@ -1208,7 +1208,7 @@ static void system11gun_install( running_machine *machine ) static WRITE32_HANDLER( kcoff_w ) { - memory_set_bankptr( space->machine, "bank2", memory_region( space->machine, "user1" ) + 0x20280 ); + memory_set_bankptr( space->machine, "bank2", space->machine->region( "user1" )->base() + 0x20280 ); } static WRITE32_HANDLER( kcon_w ) @@ -1521,7 +1521,7 @@ static DRIVER_INIT( namcos12 ) psx_dma_install_read_handler( machine, 5, namcos12_rom_read ); - memory_configure_bank(machine, "bank1", 0, memory_region_length( machine, "user2" ) / 0x200000, memory_region( machine, "user2" ), 0x200000 ); + memory_configure_bank(machine, "bank1", 0, machine->region( "user2" )->bytes() / 0x200000, machine->region( "user2" )->base(), 0x200000 ); state->s12_porta = 0; state->s12_rtcstate = 0; @@ -1546,7 +1546,7 @@ static DRIVER_INIT( ptblank2 ) DRIVER_INIT_CALL(namcos12); /* patch out wait for dma 5 to complete */ - *( (UINT32 *)( memory_region( machine, "user1" ) + 0x331c4 ) ) = 0; + *( (UINT32 *)( machine->region( "user1" )->base() + 0x331c4 ) ) = 0; system11gun_install(machine); } diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 9041eaaf6dd..e925f1acd26 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -5096,7 +5096,7 @@ static DRIVER_INIT( metlhawk ) { /* unscramble sprites */ int i, j, k, l; - UINT8 *data = memory_region(machine, "gfx1"); + UINT8 *data = machine->region("gfx1")->base(); for(i=0; i<0x200000; i+=32*32) { for(j=0; j<32*32; j+=32*4) @@ -5213,7 +5213,7 @@ static DRIVER_INIT( bubbletr ){ static DRIVER_INIT( luckywld ){ - UINT8 *pData = (UINT8 *)memory_region( machine, "gfx5" ); + UINT8 *pData = (UINT8 *)machine->region( "gfx5" )->base(); int i; for( i=0; i<32*0x4000; i++ ) { /* unscramble gfx mask */ diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c index e2a18f57da0..f196302ef2e 100644 --- a/src/mame/drivers/namcos21.c +++ b/src/mame/drivers/namcos21.c @@ -351,7 +351,7 @@ static dsp_state *mpDspState; static INT32 ReadPointROMData( running_machine *machine, unsigned offset ) { - const INT32 *pPointData = (INT32 *)memory_region( machine, "user2" ); + const INT32 *pPointData = (INT32 *)machine->region( "user2" )->base(); INT32 result = pPointData[offset]; return result; } @@ -625,7 +625,7 @@ static WRITE16_HANDLER( dspram16_w ) static int InitDSP( running_machine *machine ) { - UINT16 *pMem = (UINT16 *)memory_region(machine, "dspmaster"); + UINT16 *pMem = (UINT16 *)machine->region("dspmaster")->base(); /** * DSP BIOS tests "CPU ID" on startup * "JAPAN (C)1990 NAMCO LTD. by H.F " @@ -1260,7 +1260,7 @@ static WRITE16_HANDLER( winrun_dsp_pointrom_addr_w ) static READ16_HANDLER( winrun_dsp_pointrom_data_r ) { - UINT16 *ptrom = (UINT16 *)memory_region(space->machine, "user2"); + UINT16 *ptrom = (UINT16 *)space->machine->region("user2")->base(); return ptrom[winrun_pointrom_addr++]; } /* winrun_dsp_pointrom_data_r */ @@ -1302,7 +1302,7 @@ ADDRESS_MAP_END static READ16_HANDLER( gpu_data_r ) { - const UINT16 *pSrc = (UINT16 *)memory_region( space->machine, "user3" ); + const UINT16 *pSrc = (UINT16 *)space->machine->region( "user3" )->base(); return pSrc[offset]; } @@ -1320,7 +1320,7 @@ static WRITE16_HANDLER( winrun_dspbios_w ) COMBINE_DATA( &winrun_dspbios[offset] ); if( offset==0xfff ) { - UINT16 *mem = (UINT16 *)memory_region(space->machine, "dsp"); + UINT16 *mem = (UINT16 *)space->machine->region("dsp")->base(); memcpy( mem, winrun_dspbios, 0x2000 ); winrun_dsp_alive = 1; } @@ -2199,7 +2199,7 @@ static void namcos21_init( running_machine *machine, int game_type ) { namcos2_gametype = game_type; pointram = auto_alloc_array(machine, UINT8, PTRAM_SIZE); - mpDataROM = (UINT16 *)memory_region( machine, "user1" ); + mpDataROM = (UINT16 *)machine->region( "user1" )->base(); InitDSP(machine); mbNeedsKickstart = 20; if( game_type==NAMCOS21_CYBERSLED ) @@ -2210,7 +2210,7 @@ static void namcos21_init( running_machine *machine, int game_type ) static DRIVER_INIT( winrun ) { - UINT16 *pMem = (UINT16 *)memory_region(machine, "dsp"); + UINT16 *pMem = (UINT16 *)machine->region("dsp")->base(); int pc = 0; pMem[pc++] = 0xff80; /* b */ pMem[pc++] = 0; @@ -2218,7 +2218,7 @@ static DRIVER_INIT( winrun ) winrun_dspcomram = auto_alloc_array(machine, UINT16, 0x1000*2); namcos2_gametype = NAMCOS21_WINRUN91; - mpDataROM = (UINT16 *)memory_region( machine, "user1" ); + mpDataROM = (UINT16 *)machine->region( "user1" )->base(); pointram = auto_alloc_array(machine, UINT8, PTRAM_SIZE); pointram_idx = 0; mbNeedsKickstart = 0; @@ -2242,7 +2242,7 @@ static DRIVER_INIT( cybsled ) static DRIVER_INIT( solvalou ) { - UINT16 *mem = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *mem = (UINT16 *)machine->region("maincpu")->base(); mem[0x20ce4/2+1] = 0x0000; // $200128 mem[0x20cf4/2+0] = 0x4e71; // 2nd ptr_booting mem[0x20cf4/2+1] = 0x4e71; @@ -2253,13 +2253,13 @@ static DRIVER_INIT( solvalou ) static DRIVER_INIT( driveyes ) { - UINT16 *pMem = (UINT16 *)memory_region(machine, "dsp"); + UINT16 *pMem = (UINT16 *)machine->region("dsp")->base(); int pc = 0; pMem[pc++] = 0xff80; /* b */ pMem[pc++] = 0; winrun_dspcomram = auto_alloc_array(machine, UINT16, 0x1000*2); namcos2_gametype = NAMCOS21_DRIVERS_EYES; - mpDataROM = (UINT16 *)memory_region( machine, "user1" ); + mpDataROM = (UINT16 *)machine->region( "user1" )->base(); pointram = auto_alloc_array(machine, UINT8, PTRAM_SIZE); pointram_idx = 0; mbNeedsKickstart = 0; diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index 5bb4dce2837..2c4a15342ed 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -1962,9 +1962,9 @@ static NVRAM_HANDLER( namcos22 ) else { memset( namcos22_nvmem, 0x00, namcos22_nvmem_size ); - if (memory_region_length(machine, "nvram") == namcos22_nvmem_size) + if (machine->region("nvram")->bytes() == namcos22_nvmem_size) { - UINT8* nvram = memory_region(machine,"nvram"); + UINT8* nvram = machine->region("nvram")->base(); for( i=0; iregion("maincpu")->base(); /* patch out strange routine (uninitialized-eprom related?) */ pROM[0x1992C/4] = 0x4E754E75; @@ -5921,7 +5921,7 @@ static DRIVER_INIT( raveracw ) static DRIVER_INIT( cybrcomm ) { - UINT32 *pROM = (UINT32 *)memory_region(machine, "maincpu"); + UINT32 *pROM = (UINT32 *)machine->region("maincpu")->base(); pROM[0x18ade8/4] = 0x4e714e71; pROM[0x18ae38/4] = 0x4e714e71; pROM[0x18ae80/4] = 0x4e714e71; @@ -5939,7 +5939,7 @@ static DRIVER_INIT( cybrcomm ) static DRIVER_INIT( cybrcyc ) { /* patch DSP RAM test */ - UINT32 *pROM = (UINT32 *)memory_region(machine, "maincpu"); + UINT32 *pROM = (UINT32 *)machine->region("maincpu")->base(); pROM[0x355C/4] &= 0x0000ffff; pROM[0x355C/4] |= 0x4e710000; diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 3159f2b5cab..86c978e1cfa 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -2627,14 +2627,14 @@ ADDRESS_MAP_END static DRIVER_INIT(ss23) { - ptrom = (const UINT32 *)memory_region(machine, "pointrom"); - tmlrom = (const UINT16 *)memory_region(machine, "textilemapl"); - tmhrom = memory_region(machine, "textilemaph"); - texrom = memory_region(machine, "textile"); + ptrom = (const UINT32 *)machine->region("pointrom")->base(); + tmlrom = (const UINT16 *)machine->region("textilemapl")->base(); + tmhrom = machine->region("textilemaph")->base(); + texrom = machine->region("textile")->base(); - tileid_mask = (memory_region_length(machine, "textilemapl")/2 - 1) & ~0xff; // Used for y masking - tile_mask = memory_region_length(machine, "textile")/256 - 1; - ptrom_limit = memory_region_length(machine, "pointrom")/4; + tileid_mask = (machine->region("textilemapl")->bytes()/2 - 1) & ~0xff; // Used for y masking + tile_mask = machine->region("textile")->bytes()/256 - 1; + ptrom_limit = machine->region("pointrom")->bytes()/4; mi_rd = mi_wr = im_rd = im_wr = 0; namcos23_jvssense = 1; diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c index 0ea2323c122..a2a2118757b 100644 --- a/src/mame/drivers/namcos86.c +++ b/src/mame/drivers/namcos86.c @@ -184,18 +184,18 @@ TODO: static WRITE8_HANDLER( bankswitch1_w ) { - UINT8 *base = memory_region(space->machine, "cpu1") + 0x10000; + UINT8 *base = space->machine->region("cpu1")->base() + 0x10000; /* if the ROM expansion module is available, don't do anything. This avoids conflict */ /* with bankswitch1_ext_w() in wndrmomo */ - if (memory_region(space->machine, "user1")) return; + if (space->machine->region("user1")->base()) return; memory_set_bankptr(space->machine, "bank1",base + ((data & 0x03) * 0x2000)); } static WRITE8_HANDLER( bankswitch1_ext_w ) { - UINT8 *base = memory_region(space->machine, "user1"); + UINT8 *base = space->machine->region("user1")->base(); if (base == 0) return; @@ -204,7 +204,7 @@ static WRITE8_HANDLER( bankswitch1_ext_w ) static WRITE8_HANDLER( bankswitch2_w ) { - UINT8 *base = memory_region(space->machine, "cpu2") + 0x10000; + UINT8 *base = space->machine->region("cpu2")->base() + 0x10000; memory_set_bankptr(space->machine, "bank2",base + ((data & 0x03) * 0x2000)); } @@ -296,7 +296,7 @@ static WRITE8_HANDLER( namcos86_led_w ) static WRITE8_HANDLER( cus115_w ) { /* make sure the expansion board is present */ - if (!memory_region(space->machine, "user1")) + if (!space->machine->region("user1")->base()) { popmessage("expansion board not present"); return; @@ -326,7 +326,7 @@ static WRITE8_HANDLER( cus115_w ) static MACHINE_RESET( namco86 ) { - UINT8 *base = memory_region(machine, "cpu1") + 0x10000; + UINT8 *base = machine->region("cpu1")->base() + 0x10000; memory_set_bankptr(machine, "bank1",base); } @@ -1479,8 +1479,8 @@ static DRIVER_INIT( namco86 ) UINT8 *buffer; /* shuffle tile ROMs so regular gfx unpack routines can be used */ - gfx = memory_region(machine, "gfx1"); - size = memory_region_length(machine, "gfx1") * 2 / 3; + gfx = machine->region("gfx1")->base(); + size = machine->region("gfx1")->bytes() * 2 / 3; buffer = auto_alloc_array(machine, UINT8, size ); { @@ -1504,8 +1504,8 @@ static DRIVER_INIT( namco86 ) auto_free( machine, buffer ); } - gfx = memory_region(machine, "gfx2"); - size = memory_region_length(machine, "gfx2") * 2 / 3; + gfx = machine->region("gfx2")->base(); + size = machine->region("gfx2")->bytes() * 2 / 3; buffer = auto_alloc_array(machine, UINT8, size ); { diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index 6ab8086a0bd..1e275516315 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -6785,9 +6785,9 @@ static const UINT32 dirtypig_key = 0xc194f; static DRIVER_INIT( atomiswave ) { - UINT64 *ROM = (UINT64 *)memory_region(machine, "awflash"); + UINT64 *ROM = (UINT64 *)machine->region("awflash")->base(); #if 0 - UINT8 *dcdata = (UINT8 *)memory_region(machine, "user1"); + UINT8 *dcdata = (UINT8 *)machine->region("user1")->base(); FILE *f; f = fopen("aw.bin", "wb"); @@ -6804,8 +6804,8 @@ static DRIVER_INIT( atomiswave ) static DRIVER_INIT(DRIVER) \ { \ int i; \ - UINT16 *src = (UINT16 *)(memory_region(machine, "user1")); \ - int rom_size = memory_region_length(machine, "user1"); \ + UINT16 *src = (UINT16 *)(machine->region("user1")->base()); \ + int rom_size = machine->region("user1")->bytes(); \ for(i=0; imachine, "user1")[question_offset]; + return space->machine->region("user1")->base()[question_offset]; } static WRITE8_HANDLER( trvmstr_questions_w ) diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c index 509d51d0dd8..3ef37e7323b 100644 --- a/src/mame/drivers/nbmj8688.c +++ b/src/mame/drivers/nbmj8688.c @@ -67,8 +67,8 @@ static DRIVER_INIT( otonano ) static DRIVER_INIT( mjcamera ) { - UINT8 *rom = memory_region(machine, "voice") + 0x20000; - UINT8 *prot = memory_region(machine, "user1"); + UINT8 *rom = machine->region("voice")->base() + 0x20000; + UINT8 *prot = machine->region("user1")->base(); int i; /* this is one possible way to rearrange the protection ROM data to get the @@ -87,7 +87,7 @@ static DRIVER_INIT( mjcamera ) static DRIVER_INIT( kanatuen ) { /* uses the same protection data as mjcamer, but a different check */ - UINT8 *rom = memory_region(machine, "voice") + 0x30000; + UINT8 *rom = machine->region("voice")->base() + 0x30000; rom[0x0004] = 0x09; rom[0x0103] = 0x0e; @@ -101,7 +101,7 @@ static DRIVER_INIT( kyuhito ) { #if 1 /* uses the same protection data as ????, but a different check */ - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); rom[0x0149] = 0x00; rom[0x014a] = 0x00; @@ -113,8 +113,8 @@ static DRIVER_INIT( kyuhito ) static DRIVER_INIT( idhimitu ) { - UINT8 *rom = memory_region(machine, "voice") + 0x20000; - UINT8 *prot = memory_region(machine, "user1"); + UINT8 *rom = machine->region("voice")->base() + 0x20000; + UINT8 *prot = machine->region("user1")->base(); int i; /* this is one possible way to rearrange the protection ROM data to get the @@ -138,8 +138,8 @@ static DRIVER_INIT( kaguya ) static DRIVER_INIT( kaguya2 ) { - UINT8 *rom = memory_region(machine, "voice") + 0x20000; - UINT8 *prot = memory_region(machine, "user1"); + UINT8 *rom = machine->region("voice")->base() + 0x20000; + UINT8 *prot = machine->region("user1")->base(); int i; /* this is one possible way to rearrange the protection ROM data to get the diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c index 2b761f476e1..fee5f0347d8 100644 --- a/src/mame/drivers/nbmj8891.c +++ b/src/mame/drivers/nbmj8891.c @@ -61,7 +61,7 @@ TODO: static DRIVER_INIT( gionbana ) { - UINT8 *prot = memory_region(machine, "protection"); + UINT8 *prot = machine->region("protection")->base(); int i; /* this is one possible way to rearrange the protection ROM data to get the @@ -85,7 +85,7 @@ static DRIVER_INIT( mgion ) static DRIVER_INIT( omotesnd ) { #if 0 - UINT8 *prot = memory_region(machine, "protection"); + UINT8 *prot = machine->region("protection")->base(); int i; /* this is one possible way to rearrange the protection ROM data to get the @@ -100,7 +100,7 @@ static DRIVER_INIT( omotesnd ) #endif #if 1 - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); // Protection ROM check skip ROM[0x0106] = 0x00; @@ -135,7 +135,7 @@ static DRIVER_INIT( msjiken ) static DRIVER_INIT( telmahjn ) { - UINT8 *prot = memory_region(machine, "protection"); + UINT8 *prot = machine->region("protection")->base(); int i; /* this is one possible way to rearrange the protection ROM data to get the @@ -153,7 +153,7 @@ static DRIVER_INIT( telmahjn ) static DRIVER_INIT( mgmen89 ) { - UINT8 *prot = memory_region(machine, "protection"); + UINT8 *prot = machine->region("protection")->base(); int i; /* this is one possible way to rearrange the protection ROM data to get the @@ -171,8 +171,8 @@ static DRIVER_INIT( mgmen89 ) static DRIVER_INIT( mjfocus ) { - UINT8 *prot = memory_region(machine, "protection"); - UINT8 *ram = memory_region(machine, "maincpu") + 0xf800; + UINT8 *prot = machine->region("protection")->base(); + UINT8 *ram = machine->region("maincpu")->base() + 0xf800; int i; /* need to clear RAM otherwise it doesn't boot... */ @@ -194,7 +194,7 @@ static DRIVER_INIT( mjfocus ) static DRIVER_INIT( mjfocusm ) { #if 1 - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); // Protection ROM check skip ROM[0x014e] = 0x00; @@ -206,7 +206,7 @@ static DRIVER_INIT( mjfocusm ) static DRIVER_INIT( scandal ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); int i; for (i = 0xf800; i < 0x10000; i++) ROM[i] = 0x00; @@ -223,10 +223,10 @@ static DRIVER_INIT( mjnanpas ) { /* they forgot to enable the protection check in this game... */ #if 0 - UINT8 *prot = memory_region(machine, "protection"); + UINT8 *prot = machine->region("protection")->base(); int i; - memory_region(machine, "maincpu")[0x003d] = 0x01; // force the protection check to be executed + machine->region("maincpu")->base()[0x003d] = 0x01; // force the protection check to be executed /* this is one possible way to rearrange the protection ROM data to get the expected 0xfe1a checksum. It's probably completely wrong! But since the @@ -284,7 +284,7 @@ static DRIVER_INIT( hanaoji ) static DRIVER_INIT( pairsnb ) { - UINT8 *prot = memory_region(machine, "protection"); + UINT8 *prot = machine->region("protection")->base(); int i; /* this is one possible way to rearrange the protection ROM data to get the @@ -302,7 +302,7 @@ static DRIVER_INIT( pairsnb ) static DRIVER_INIT( pairsten ) { - UINT8 *prot = memory_region(machine, "protection"); + UINT8 *prot = machine->region("protection")->base(); int i; /* this is one possible way to rearrange the protection ROM data to get the diff --git a/src/mame/drivers/nbmj8900.c b/src/mame/drivers/nbmj8900.c index 5440bad976e..dceee3f0428 100644 --- a/src/mame/drivers/nbmj8900.c +++ b/src/mame/drivers/nbmj8900.c @@ -45,7 +45,7 @@ TODO: static DRIVER_INIT( ohpaipee ) { #if 0 - UINT8 *prot = memory_region(machine, "protdata"); + UINT8 *prot = machine->region("protdata")->base(); int i; /* this is one possible way to rearrange the protection ROM data to get the @@ -59,7 +59,7 @@ static DRIVER_INIT( ohpaipee ) prot[i] = BITSWAP8(prot[i],2,7,3,5,0,6,4,1); } #else - unsigned char *ROM = memory_region(machine, "maincpu"); + unsigned char *ROM = machine->region("maincpu")->base(); // Protection ROM check skip ROM[0x00e4] = 0x00; @@ -78,7 +78,7 @@ static DRIVER_INIT( ohpaipee ) static DRIVER_INIT( togenkyo ) { #if 0 - UINT8 *prot = memory_region(machine, "protdata"); + UINT8 *prot = machine->region("protdata")->base(); int i; /* this is one possible way to rearrange the protection ROM data to get the @@ -91,7 +91,7 @@ static DRIVER_INIT( togenkyo ) prot[i] = BITSWAP8(prot[i],2,7,3,5,0,6,4,1); } #else - unsigned char *ROM = memory_region(machine, "maincpu"); + unsigned char *ROM = machine->region("maincpu")->base(); // Protection ROM check skip ROM[0x010b] = 0x00; diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c index 8d415fee1fc..8f1292a762b 100644 --- a/src/mame/drivers/nbmj8991.c +++ b/src/mame/drivers/nbmj8991.c @@ -70,7 +70,7 @@ static MACHINE_RESET( nbmj8991 ) device_t *audiocpu = machine->device("audiocpu"); if (audiocpu != NULL && audiocpu->type() == Z80) { - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x8000, 0x8000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("audiocpu")->base() + 0x8000, 0x8000); memory_set_bank(machine, "bank1", 0); } MACHINE_RESET_CALL(nb1413m3); @@ -108,7 +108,7 @@ static DRIVER_INIT( vanilla ) static DRIVER_INIT( finalbny ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); int i; for (i = 0xf800; i < 0x10000; i++) ROM[i] = 0x00; @@ -134,7 +134,7 @@ static DRIVER_INIT( hyouban ) static DRIVER_INIT( galkaika ) { #if 1 - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); // Patch to IM2 -> IM1 ROM[0x0002] = 0x56; @@ -145,7 +145,7 @@ static DRIVER_INIT( galkaika ) static DRIVER_INIT( tokyogal ) { #if 1 - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); // Patch to IM2 -> IM1 ROM[0x0002] = 0x56; @@ -156,7 +156,7 @@ static DRIVER_INIT( tokyogal ) static DRIVER_INIT( tokimbsj ) { #if 1 - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); // Patch to IM2 -> IM1 ROM[0x0002] = 0x56; diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c index 5ddc0388b77..2d78927ebab 100644 --- a/src/mame/drivers/nbmj9195.c +++ b/src/mame/drivers/nbmj9195.c @@ -61,7 +61,7 @@ static NVRAM_HANDLER( nbmj9195 ) static WRITE8_HANDLER( nbmj9195_soundbank_w ) { - UINT8 *SNDROM = memory_region(space->machine, "audiocpu"); + UINT8 *SNDROM = space->machine->region("audiocpu")->base(); memory_set_bankptr(space->machine, "bank1", &SNDROM[0x08000 + (0x8000 * (data & 0x03))]); } @@ -510,7 +510,7 @@ static MACHINE_RESET( sailorws ) static DRIVER_INIT( nbmj9195 ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); // sound program patch ROM[0x0213] = 0x00; // DI -> NOP diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c index e05b7d9cffc..422470ef394 100644 --- a/src/mame/drivers/neodrvr.c +++ b/src/mame/drivers/neodrvr.c @@ -7855,8 +7855,8 @@ static DRIVER_INIT( kof2002b ) kof2002_decrypt_68k(machine); neo_pcm2_swap(machine, 0); neogeo_cmc50_m1_decrypt(machine); - kof2002b_gfx_decrypt(machine, memory_region(machine, "sprites"),0x4000000); - kof2002b_gfx_decrypt(machine, memory_region(machine, "fixed"),0x20000); + kof2002b_gfx_decrypt(machine, machine->region("sprites")->base(),0x4000000); + kof2002b_gfx_decrypt(machine, machine->region("fixed")->base(),0x20000); } static DRIVER_INIT( kf2k2pls ) @@ -7959,7 +7959,7 @@ static DRIVER_INIT( mslug5 ) static TIMER_CALLBACK( ms5pcb_bios_timer_callback ) { int harddip3 = input_port_read(machine, "HARDDIP") & 1; - memory_set_bankptr(machine, NEOGEO_BANK_BIOS, memory_region(machine, "mainbios") + 0x20000 + harddip3 * 0x20000); + memory_set_bankptr(machine, NEOGEO_BANK_BIOS, machine->region("mainbios")->base() + 0x20000 + harddip3 * 0x20000); } static DRIVER_INIT( ms5pcb ) @@ -7996,7 +7996,7 @@ static DRIVER_INIT( ms5plus ) static TIMER_CALLBACK( svcpcb_bios_timer_callback ) { int harddip3 = input_port_read(machine, "HARDDIP") & 1; - memory_set_bankptr(machine, NEOGEO_BANK_BIOS, memory_region(machine, "mainbios") + 0x20000 + harddip3 * 0x20000); + memory_set_bankptr(machine, NEOGEO_BANK_BIOS, machine->region("mainbios")->base() + 0x20000 + harddip3 * 0x20000); } static DRIVER_INIT( svcpcb ) @@ -8099,7 +8099,7 @@ static DRIVER_INIT( kf2k3pcb ) incorrect */ { int i; - UINT8* rom = memory_region(machine, "audiocpu"); + UINT8* rom = machine->region("audiocpu")->base(); for (i = 0; i < 0x90000; i++) { rom[i] = BITSWAP8(rom[i], 5, 6, 1, 4, 3, 0, 7, 2); diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index 40ff9740550..20d8affa961 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -713,7 +713,7 @@ static void set_main_cpu_vector_table_source( running_machine *machine, UINT8 da static void _set_main_cpu_bank_address( running_machine *machine ) { neogeo_state *state = machine->driver_data(); - memory_set_bankptr(machine, NEOGEO_BANK_CARTRIDGE, &memory_region(machine, "maincpu")[state->main_cpu_bank_address]); + memory_set_bankptr(machine, NEOGEO_BANK_CARTRIDGE, &machine->region("maincpu")->base()[state->main_cpu_bank_address]); } @@ -732,7 +732,7 @@ void neogeo_set_main_cpu_bank_address( address_space *space, UINT32 bank_address static WRITE16_HANDLER( main_cpu_bank_select_w ) { UINT32 bank_address; - UINT32 len = memory_region_length(space->machine, "maincpu"); + UINT32 len = space->machine->region("maincpu")->bytes(); if ((len <= 0x100000) && (data & 0x07)) logerror("PC %06x: warning: bankswitch to %02x but no banks available\n", cpu_get_pc(space->cpu), data); @@ -756,11 +756,11 @@ static void main_cpu_banking_init( running_machine *machine ) address_space *mainspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); /* create vector banks */ - memory_configure_bank(machine, NEOGEO_BANK_VECTORS, 0, 1, memory_region(machine, "mainbios"), 0); - memory_configure_bank(machine, NEOGEO_BANK_VECTORS, 1, 1, memory_region(machine, "maincpu"), 0); + memory_configure_bank(machine, NEOGEO_BANK_VECTORS, 0, 1, machine->region("mainbios")->base(), 0); + memory_configure_bank(machine, NEOGEO_BANK_VECTORS, 1, 1, machine->region("maincpu")->base(), 0); /* set initial main CPU bank */ - if (memory_region_length(machine, "maincpu") > 0x100000) + if (machine->region("maincpu")->bytes() > 0x100000) neogeo_set_main_cpu_bank_address(mainspace, 0x100000); else neogeo_set_main_cpu_bank_address(mainspace, 0x000000); @@ -832,7 +832,7 @@ static void _set_audio_cpu_rom_source( address_space *space ) { neogeo_state *state = space->machine->driver_data(); -/* if (!memory_region(machine, "audiobios")) */ +/* if (!machine->region("audiobios")->base()) */ state->audio_cpu_rom_source = 1; memory_set_bank(space->machine, NEOGEO_BANK_AUDIO_CPU_MAIN_BANK, state->audio_cpu_rom_source); @@ -867,14 +867,14 @@ static void audio_cpu_banking_init( running_machine *machine ) UINT32 address_mask; /* audio bios/cartridge selection */ - if (memory_region(machine, "audiobios")) - memory_configure_bank(machine, NEOGEO_BANK_AUDIO_CPU_MAIN_BANK, 0, 1, memory_region(machine, "audiobios"), 0); - memory_configure_bank(machine, NEOGEO_BANK_AUDIO_CPU_MAIN_BANK, 1, 1, memory_region(machine, "audiocpu"), 0); + if (machine->region("audiobios")->base()) + memory_configure_bank(machine, NEOGEO_BANK_AUDIO_CPU_MAIN_BANK, 0, 1, machine->region("audiobios")->base(), 0); + memory_configure_bank(machine, NEOGEO_BANK_AUDIO_CPU_MAIN_BANK, 1, 1, machine->region("audiocpu")->base(), 0); /* audio banking */ - address_mask = memory_region_length(machine, "audiocpu") - 0x10000 - 1; + address_mask = machine->region("audiocpu")->bytes() - 0x10000 - 1; - rgn = memory_region(machine, "audiocpu"); + rgn = machine->region("audiocpu")->base(); for (region = 0; region < 4; region++) { for (bank = 0; bank < 0x100; bank++) @@ -1059,7 +1059,7 @@ static MACHINE_START( neogeo ) neogeo_state *state = machine->driver_data(); /* set the BIOS bank */ - memory_set_bankptr(machine, NEOGEO_BANK_BIOS, memory_region(machine, "mainbios")); + memory_set_bankptr(machine, NEOGEO_BANK_BIOS, machine->region("mainbios")->base()); /* set the initial main CPU bank */ main_cpu_banking_init(machine); diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c index 16d003adfae..6ea638a6386 100644 --- a/src/mame/drivers/neoprint.c +++ b/src/mame/drivers/neoprint.c @@ -433,7 +433,7 @@ ROM_END /* FIXME: get rid of these two, probably something to do with irq3 and camera / printer devices */ static DRIVER_INIT( npcartv1 ) { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); ROM[0x1260/2] = 0x4e71; @@ -443,7 +443,7 @@ static DRIVER_INIT( npcartv1 ) static DRIVER_INIT( 98best44 ) { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); ROM[0x1312/2] = 0x4e71; } diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c index 94c735fb105..baded90bc08 100644 --- a/src/mame/drivers/nightgal.c +++ b/src/mame/drivers/nightgal.c @@ -92,7 +92,7 @@ static VIDEO_UPDATE( nightgal ) static UINT8 nightgal_gfx_nibble( running_machine *machine, int niboffset ) { - UINT8 *blit_rom = memory_region(machine,"gfx1"); + UINT8 *blit_rom = machine->region("gfx1")->base(); if (niboffset & 1) { @@ -1224,7 +1224,7 @@ ROM_END static DRIVER_INIT( royalqn ) { - UINT8 *ROM = memory_region(machine, "sub"); + UINT8 *ROM = machine->region("sub")->base(); /* patch open bus / protection */ ROM[0xc27e] = 0x02; @@ -1233,7 +1233,7 @@ static DRIVER_INIT( royalqn ) static DRIVER_INIT( ngalsumr ) { - UINT8 *ROM = memory_region(machine, "sub"); + UINT8 *ROM = machine->region("sub")->base(); /* patch protection */ ROM[0xd6ce] = 0x02; diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c index 8f9b9f70eae..2da20e8aed6 100644 --- a/src/mame/drivers/ninjakd2.c +++ b/src/mame/drivers/ninjakd2.c @@ -160,15 +160,15 @@ static INTERRUPT_GEN( ninjakd2_interrupt ) static MACHINE_RESET( ninjakd2 ) { /* initialize main Z80 bank */ - memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, machine->region("maincpu")->base() + 0x10000, 0x4000); memory_set_bank(machine, "bank1", 0); } static void robokid_init_banks(running_machine *machine) { /* initialize main Z80 bank */ - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu"), 0x4000); - memory_configure_bank(machine, "bank1", 2, 14, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base(), 0x4000); + memory_configure_bank(machine, "bank1", 2, 14, machine->region("maincpu")->base() + 0x10000, 0x4000); memory_set_bank(machine, "bank1", 0); } @@ -212,8 +212,8 @@ static WRITE8_HANDLER( ninjakd2_soundreset_w ) static SAMPLES_START( ninjakd2_init_samples ) { running_machine *machine = device->machine; - const UINT8* const rom = memory_region(machine, "pcm"); - const int length = memory_region_length(machine, "pcm"); + const UINT8* const rom = machine->region("pcm")->base(); + const int length = machine->region("pcm")->bytes(); INT16* sampledata = auto_alloc_array(machine, INT16, length); int i; @@ -228,12 +228,12 @@ static SAMPLES_START( ninjakd2_init_samples ) static WRITE8_HANDLER( ninjakd2_pcm_play_w ) { device_t *samples = space->machine->device("pcm"); - const UINT8* const rom = memory_region(space->machine, "pcm"); + const UINT8* const rom = space->machine->region("pcm")->base(); // only Ninja Kid II uses this if (rom) { - const int length = memory_region_length(space->machine, "pcm"); + const int length = space->machine->region("pcm")->bytes(); const int start = data << 8; @@ -1396,9 +1396,9 @@ by one place all the intervening bits. static void lineswap_gfx_roms(running_machine *machine, const char *region, const int bit) { - const int length = memory_region_length(machine, region); + const int length = machine->region(region)->bytes(); - UINT8* const src = memory_region(machine, region); + UINT8* const src = machine->region(region)->base(); UINT8* const temp = auto_alloc_array(machine, UINT8, length); @@ -1443,7 +1443,7 @@ static DRIVER_INIT( ninjakd2 ) static DRIVER_INIT( bootleg ) { address_space *space = cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM); - space->set_decrypted_region(0x0000, 0x7fff, memory_region(machine, "soundcpu") + 0x10000); + space->set_decrypted_region(0x0000, 0x7fff, machine->region("soundcpu")->base() + 0x10000); gfx_unscramble(machine); } diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index b0fe643e97b..adfed83c49b 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -761,7 +761,7 @@ static MACHINE_START( ninjaw ) { ninjaw_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank10", 0, 8, memory_region(machine, "audiocpu") + 0xc000, 0x4000); + memory_configure_bank(machine, "bank10", 0, 8, machine->region("audiocpu")->base() + 0xc000, 0x4000); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c index 1e3945a94a9..3247ce02f27 100644 --- a/src/mame/drivers/niyanpai.c +++ b/src/mame/drivers/niyanpai.c @@ -60,7 +60,7 @@ static int musobana_outcoin_flag; static void niyanpai_soundbank_w(running_machine *machine, int data) { - UINT8 *SNDROM = memory_region(machine, "audiocpu"); + UINT8 *SNDROM = machine->region("audiocpu")->base(); memory_set_bankptr(machine, "bank1", &SNDROM[0x08000 + (0x8000 * (data & 0x03))]); } @@ -190,7 +190,7 @@ static MACHINE_RESET( niyanpai ) static DRIVER_INIT( niyanpai ) { - UINT8 *SNDROM = memory_region(machine, "audiocpu"); + UINT8 *SNDROM = machine->region("audiocpu")->base(); // sound program patch SNDROM[0x0213] = 0x00; // DI -> NOP diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index b3acf8c7a1e..fd858576ef3 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -215,7 +215,7 @@ static WRITE16_HANDLER ( ssmissin_sound_w ) static WRITE8_HANDLER ( ssmissin_soundbank_w ) { - UINT8 *rom = memory_region(space->machine, "oki1"); + UINT8 *rom = space->machine->region("oki1")->base(); int bank; bank = data & 0x3; @@ -277,14 +277,14 @@ static WRITE16_HANDLER( macross2_sound_command_w ) static WRITE8_HANDLER( macross2_sound_bank_w ) { - UINT8 *rom = memory_region(space->machine, "audiocpu") + 0x10000; + UINT8 *rom = space->machine->region("audiocpu")->base() + 0x10000; memory_set_bankptr(space->machine, "bank1",rom + (data & 0x07) * 0x4000); } static WRITE8_HANDLER( tharrier_oki6295_bankswitch_0_w ) { - UINT8 *rom = memory_region(space->machine, "oki1"); + UINT8 *rom = space->machine->region("oki1")->base(); data &= 3; if (data != 3) @@ -293,7 +293,7 @@ static WRITE8_HANDLER( tharrier_oki6295_bankswitch_0_w ) static WRITE8_HANDLER( tharrier_oki6295_bankswitch_1_w ) { - UINT8 *rom = memory_region(space->machine, "oki2"); + UINT8 *rom = space->machine->region("oki2")->base(); data &= 3; if (data != 3) @@ -1072,7 +1072,7 @@ static WRITE8_HANDLER( okibank_w ) static WRITE8_HANDLER( raphero_sound_rombank_w ) { - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "audiocpu") + 0x10000 + (data & 0x07) * 0x4000); + memory_set_bankptr(space->machine, "bank1",space->machine->region("audiocpu")->base() + 0x10000 + (data & 0x07) * 0x4000); } static ADDRESS_MAP_START( raphero_sound_mem_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -4433,16 +4433,16 @@ static void decode_gfx(running_machine *machine) /* background */ - rom = memory_region(machine, "gfx2"); - len = memory_region_length(machine, "gfx2"); + rom = machine->region("gfx2")->base(); + len = machine->region("gfx2")->bytes(); for (A = 0;A < len;A++) { rom[A] = decode_byte( rom[A], decode_data_bg[bjtwin_address_map_bg0(A)]); } /* sprites */ - rom = memory_region(machine, "gfx3"); - len = memory_region_length(machine, "gfx3"); + rom = machine->region("gfx3")->base(); + len = machine->region("gfx3")->bytes(); for (A = 0;A < len;A += 2) { UINT16 tmp = decode_word( rom[A+1]*256 + rom[A], decode_data_sprite[bjtwin_address_map_sprites(A)]); @@ -4471,8 +4471,8 @@ static void decode_tdragonb(running_machine *machine) {0x7,0x6,0x5,0x3,0x4,0x2,0x1,0x0}, }; - rom = memory_region(machine, "maincpu"); - len = memory_region_length(machine, "maincpu"); + rom = machine->region("maincpu")->base(); + len = machine->region("maincpu")->bytes(); for (A = 0;A < len;A += 2) { int h = A+NATIVE_ENDIAN_VALUE_LE_BE(1,0), l = A+NATIVE_ENDIAN_VALUE_LE_BE(0,1); @@ -4481,15 +4481,15 @@ static void decode_tdragonb(running_machine *machine) rom[l] = tmp & 0xff; } - rom = memory_region(machine, "gfx2"); - len = memory_region_length(machine, "gfx2"); + rom = machine->region("gfx2")->base(); + len = machine->region("gfx2")->bytes(); for (A = 0;A < len;A++) { rom[A] = decode_byte( rom[A], decode_data_tdragonbgfx[0]); } - rom = memory_region(machine, "gfx3"); - len = memory_region_length(machine, "gfx3"); + rom = machine->region("gfx3")->base(); + len = machine->region("gfx3")->bytes(); for (A = 0;A < len;A++) { rom[A] = decode_byte( rom[A], decode_data_tdragonbgfx[0]); @@ -4508,15 +4508,15 @@ static void decode_ssmissin(running_machine *machine) {0x7,0x6,0x5,0x3,0x4,0x2,0x1,0x0}, }; - rom = memory_region(machine, "gfx2"); - len = memory_region_length(machine, "gfx2"); + rom = machine->region("gfx2")->base(); + len = machine->region("gfx2")->bytes(); for (A = 0;A < len;A++) { rom[A] = decode_byte( rom[A], decode_data_tdragonbgfx[0]); } - rom = memory_region(machine, "gfx3"); - len = memory_region_length(machine, "gfx3"); + rom = machine->region("gfx3")->base(); + len = machine->region("gfx3")->bytes(); for (A = 0;A < len;A++) { rom[A] = decode_byte( rom[A], decode_data_tdragonbgfx[0]); @@ -4531,7 +4531,7 @@ static DRIVER_INIT( nmk ) static DRIVER_INIT( hachamf ) { - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); //rom[0x0006/2] = 0x7dc2; /* replace reset vector with the "real" one */ @@ -4542,7 +4542,7 @@ static DRIVER_INIT( hachamf ) static DRIVER_INIT( tdragonb ) { - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); decode_tdragonb(machine); @@ -4553,7 +4553,7 @@ static DRIVER_INIT( tdragonb ) static DRIVER_INIT( tdragon ) { - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); //rom[0x94b0/2] = 0; /* Patch out JMP to shared memory (protection) */ //rom[0x94b2/2] = 0x92f4; @@ -4587,7 +4587,7 @@ static DRIVER_INIT( bjtwin ) * 008F7E: 207C 000F 9000 movea.l #$f9000, A0 */ #if 0 - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); rom[0x09172/2] = 0x6006; /* patch checksum error */ rom[0x08f74/2] = 0x4e71; #endif @@ -5000,8 +5000,8 @@ static void decryptcode( running_machine *machine, int a23, int a22, int a21, in int a11, int a10, int a9, int a8, int a7, int a6, int a5, int a4, int a3, int a2, int a1, int a0 ) { int i; - UINT8 *RAM = memory_region( machine, "maincpu" ); - size_t size = memory_region_length( machine, "maincpu" ); + UINT8 *RAM = machine->region( "maincpu" )->base(); + size_t size = machine->region( "maincpu" )->bytes(); UINT8 *buffer = auto_alloc_array(machine, UINT8, size ); memcpy( buffer, RAM, size ); diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c index f269dadb29c..5d1a2739929 100644 --- a/src/mame/drivers/norautp.c +++ b/src/mame/drivers/norautp.c @@ -3343,21 +3343,21 @@ ROM_END */ //static DRIVER_INIT( norautrh ) //{ -// UINT8 *ROM = memory_region(machine, "maincpu"); +// UINT8 *ROM = machine->region("maincpu")->base(); // ROM[0x1110] = 0x00; // ROM[0x1111] = 0x00; //} //static DRIVER_INIT( norautpn ) //{ -// UINT8 *ROM = memory_region(machine, "maincpu"); +// UINT8 *ROM = machine->region("maincpu")->base(); // ROM[0x0827] = 0x00; // ROM[0x0828] = 0x00; //} //static DRIVER_INIT( norautu ) //{ -// UINT8 *ROM = memory_region(machine, "maincpu"); +// UINT8 *ROM = machine->region("maincpu")->base(); // ROM[0x083c] = 0x00; // ROM[0x083d] = 0x00; // ROM[0x083e] = 0x00; @@ -3365,7 +3365,7 @@ ROM_END //static DRIVER_INIT( gtipoker ) //{ -// UINT8 *ROM = memory_region(machine, "maincpu"); +// UINT8 *ROM = machine->region("maincpu")->base(); // ROM[0x0cc6] = 0x00; // ROM[0x0cc7] = 0x00; // ROM[0x0cc8] = 0x00; @@ -3376,7 +3376,7 @@ ROM_END //static DRIVER_INIT( dphl ) //{ -// UINT8 *ROM = memory_region(machine, "maincpu"); +// UINT8 *ROM = machine->region("maincpu")->base(); // ROM[0x1510] = 0x00; // ROM[0x1511] = 0x00; // ROM[0x1512] = 0x00; @@ -3384,7 +3384,7 @@ ROM_END //static DRIVER_INIT( dphla ) //{ -// UINT8 *ROM = memory_region(machine, "maincpu"); +// UINT8 *ROM = machine->region("maincpu")->base(); // ROM[0x0b09] = 0x00; // ROM[0x0b0a] = 0x00; // ROM[0x0b0b] = 0x00; @@ -3394,9 +3394,9 @@ static DRIVER_INIT( enc ) { /* Attempt to decrypt the program ROM */ -// UINT8 *rom = memory_region(machine, "maincpu"); +// UINT8 *rom = machine->region("maincpu")->base(); // UINT8 *buffer; -// int size = 0x2000; //memory_region_length(machine, "maincpu"); +// int size = 0x2000; //machine->region("maincpu")->bytes(); // int start = 0; // int i; @@ -3433,7 +3433,7 @@ static DRIVER_INIT( deb ) /* Just for debugging purposes */ /* Should be removed soon */ { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0x02f7] = 0xca; ROM[0x02f8] = 0x18; ROM[0x206c] = 0xff; @@ -3443,7 +3443,7 @@ static DRIVER_INIT( ssa ) /* Passing the video PPI handshaking lines */ /* Just for debugging purposes */ { -// UINT8 *ROM = memory_region(machine, "maincpu"); +// UINT8 *ROM = machine->region("maincpu")->base(); // ROM[0x073b] = 0x00; // ROM[0x073c] = 0x00; diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c index 4e7c65a74e7..298be8632ba 100644 --- a/src/mame/drivers/nova2001.c +++ b/src/mame/drivers/nova2001.c @@ -985,9 +985,9 @@ This code is overly generic because it is used for several games in ninjakd2.c static void lineswap_gfx_roms(running_machine *machine, const char *region, const int bit) { - const int length = memory_region_length(machine, region); + const int length = machine->region(region)->bytes(); - UINT8* const src = memory_region(machine, region); + UINT8* const src = machine->region(region)->base(); UINT8* const temp = auto_alloc_array(machine, UINT8, length); diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c index 86eb78e6cc5..4cd10e62bf3 100644 --- a/src/mame/drivers/nss.c +++ b/src/mame/drivers/nss.c @@ -372,13 +372,13 @@ static READ8_HANDLER( m50458_r ) { if(m50458_rom_bank) { - UINT8 *gfx_rom = memory_region(space->machine, "m50458_gfx"); + UINT8 *gfx_rom = space->machine->region("m50458_gfx")->base(); return gfx_rom[offset & 0xfff]; } else { - UINT8 *gfx_ram = memory_region(space->machine, "m50458_vram"); + UINT8 *gfx_ram = space->machine->region("m50458_vram")->base(); return gfx_ram[offset & 0xfff]; } @@ -392,7 +392,7 @@ static WRITE8_HANDLER( m50458_w ) logerror("Warning: write to M50458 GFX ROM!\n"); else { - UINT8 *gfx_ram = memory_region(space->machine, "m50458_vram"); + UINT8 *gfx_ram = space->machine->region("m50458_vram")->base(); gfx_ram[offset & 0xfff] = data; } @@ -486,7 +486,7 @@ ADDRESS_MAP_END static MACHINE_START( nss ) { - UINT8 *ROM = memory_region(machine, "bios"); + UINT8 *ROM = machine->region("bios")->base(); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x10000], 0x8000); memory_set_bank(machine, "bank1", 0); diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 1e4c8ba6d47..dc81cb25405 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -716,7 +716,7 @@ MACHINE_CONFIG_END static DRIVER_INIT(nwktr) { init_konami_cgboard(machine, 1, CGBOARD_TYPE_NWKTR); - set_cgboard_texture_bank(machine, 0, "bank5", memory_region(machine, "user5")); + set_cgboard_texture_bank(machine, 0, "bank5", machine->region("user5")->base()); sharc_dataram = auto_alloc_array(machine, UINT32, 0x100000/4); led_reg0 = led_reg1 = 0x7f; diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c index fa7fc1067d0..9657cc54b42 100644 --- a/src/mame/drivers/nycaptor.c +++ b/src/mame/drivers/nycaptor.c @@ -342,7 +342,7 @@ static WRITE8_HANDLER( nycaptor_generic_control_w ) { nycaptor_state *state = space->machine->driver_data(); state->generic_control_reg = data; - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + 0x10000 + ((data&0x08)>>3)*0x4000 ); + memory_set_bankptr(space->machine, "bank1", space->machine->region("maincpu")->base() + 0x10000 + ((data&0x08)>>3)*0x4000 ); } static ADDRESS_MAP_START( nycaptor_master_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -448,7 +448,7 @@ static WRITE8_HANDLER( cyclshtg_generic_control_w ) int bank = (data >> 2) & 3; state->generic_control_reg = data; - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + 0x10000 + bank*0x4000 ); + memory_set_bankptr(space->machine, "bank1", space->machine->region("maincpu")->base() + 0x10000 + bank*0x4000 ); } @@ -1369,7 +1369,7 @@ static DRIVER_INIT( bronx ) { nycaptor_state *state = machine->driver_data(); int i; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (i = 0; i < 0x20000; i++) rom[i] = BITSWAP8(rom[i], 0, 1, 2, 3, 4, 5, 6, 7); @@ -1381,7 +1381,7 @@ static DRIVER_INIT( colt ) { nycaptor_state *state = machine->driver_data(); int i; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (i = 0; i < 0x20000; i++) rom[i] = BITSWAP8(rom[i], 0, 1, 2, 3, 4, 5, 6, 7); diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c index f42b74d7245..08033d72296 100644 --- a/src/mame/drivers/ohmygod.c +++ b/src/mame/drivers/ohmygod.c @@ -23,7 +23,7 @@ static WRITE16_HANDLER( ohmygod_ctrl_w ) if (ACCESSING_BITS_0_7) { - UINT8 *rom = memory_region(space->machine, "oki"); + UINT8 *rom = space->machine->region("oki")->base(); /* ADPCM bank switch */ if (state->sndbank != ((data >> state->adpcm_bank_shift) & 0x0f)) @@ -307,7 +307,7 @@ static MACHINE_START( ohmygod ) static MACHINE_RESET( ohmygod ) { ohmygod_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "oki"); + UINT8 *rom = machine->region("oki")->base(); state->sndbank = 0; memcpy(rom + 0x20000, rom + 0x40000 + 0x20000 * state->sndbank, 0x20000); diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c index d0efd645f78..190355af792 100644 --- a/src/mame/drivers/ojankohs.c +++ b/src/mame/drivers/ojankohs.c @@ -814,7 +814,7 @@ static MACHINE_START( common ) static MACHINE_START( ojankohs ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 0x40, &ROM[0x10000], 0x4000); @@ -823,7 +823,7 @@ static MACHINE_START( ojankohs ) static MACHINE_START( ojankoy ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 0x20, &ROM[0x10000], 0x4000); @@ -832,7 +832,7 @@ static MACHINE_START( ojankoy ) static MACHINE_START( ojankoc ) { - UINT8 *ROM = memory_region(machine, "user1"); + UINT8 *ROM = machine->region("user1")->base(); memory_configure_bank(machine, "bank1", 0, 0x10, &ROM[0x0000], 0x8000); diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c index 2a149f02e4c..3a7b6aad7d8 100644 --- a/src/mame/drivers/omegrace.c +++ b/src/mame/drivers/omegrace.c @@ -577,8 +577,8 @@ ROM_END static DRIVER_INIT( omegrace ) { - int i, len = memory_region_length(machine, "user1"); - UINT8 *prom = memory_region(machine, "user1"); + int i, len = machine->region("user1")->bytes(); + UINT8 *prom = machine->region("user1")->base(); /* Omega Race has two pairs of the state PROM output * lines swapped before going into the decoder. diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index 07bdace25c8..1804955aed0 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -343,7 +343,7 @@ static const ym3812_interface ym3812_config = static MACHINE_START( onetwo ) { onetwo_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c index 7703174235e..c4aa4f43329 100644 --- a/src/mame/drivers/opwolf.c +++ b/src/mame/drivers/opwolf.c @@ -480,7 +480,7 @@ static void opwolf_msm5205_vck( device_t *device ) } else { - state->adpcm_data[chip] = memory_region(device->machine, "adpcm")[state->adpcm_pos[chip]]; + state->adpcm_data[chip] = device->machine->region("adpcm")->base()[state->adpcm_pos[chip]]; state->adpcm_pos[chip] = (state->adpcm_pos[chip] + 1) & 0x7ffff; msm5205_data_w(device, state->adpcm_data[chip] >> 4); } @@ -987,7 +987,7 @@ ROM_END static DRIVER_INIT( opwolf ) { opwolf_state *state = machine->driver_data(); - UINT16* rom = (UINT16*)memory_region(machine, "maincpu"); + UINT16* rom = (UINT16*)machine->region("maincpu")->base(); state->opwolf_region = rom[0x03fffe / 2] & 0xff; @@ -997,14 +997,14 @@ static DRIVER_INIT( opwolf ) state->opwolf_gun_xoffs = 0xec - (rom[0x03ffb0 / 2] & 0xff); state->opwolf_gun_yoffs = 0x1c - (rom[0x03ffae / 2] & 0xff); - memory_configure_bank(machine, "bank10", 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank10", 0, 4, machine->region("audiocpu")->base() + 0x10000, 0x4000); } static DRIVER_INIT( opwolfb ) { opwolf_state *state = machine->driver_data(); - UINT16* rom = (UINT16*)memory_region(machine, "maincpu"); + UINT16* rom = (UINT16*)machine->region("maincpu")->base(); state->opwolf_region = rom[0x03fffe / 2] & 0xff; @@ -1012,7 +1012,7 @@ static DRIVER_INIT( opwolfb ) state->opwolf_gun_xoffs = -2; state->opwolf_gun_yoffs = 17; - memory_configure_bank(machine, "bank10", 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank10", 0, 4, machine->region("audiocpu")->base() + 0x10000, 0x4000); } diff --git a/src/mame/drivers/othello.c b/src/mame/drivers/othello.c index 36df596171c..cf48f68b758 100644 --- a/src/mame/drivers/othello.c +++ b/src/mame/drivers/othello.c @@ -83,7 +83,7 @@ static MC6845_UPDATE_ROW( update_row ) UINT32 data_address; UINT32 tmp; - const UINT8 *gfx = memory_region(device->machine, "gfx"); + const UINT8 *gfx = device->machine->region("gfx")->base(); for(cx = 0; cx < x_count; ++cx) { @@ -281,7 +281,7 @@ static WRITE8_DEVICE_HANDLER( n7751_rom_control_w ) static READ8_HANDLER( n7751_rom_r ) { othello_state *state = space->machine->driver_data(); - return memory_region(space->machine, "n7751data")[state->sound_addr]; + return space->machine->region("n7751data")->base()[state->sound_addr]; } static READ8_HANDLER( n7751_command_r ) diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index 1dae704d5ce..bc97b7c88d9 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -686,7 +686,7 @@ static MACHINE_START( othunder ) { othunder_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank10", 0, 4, memory_region(machine, "audiocpu") + 0xc000, 0x4000); + memory_configure_bank(machine, "bank10", 0, 4, machine->region("audiocpu")->base() + 0xc000, 0x4000); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c index 40c9667c564..b2c89f6a4de 100644 --- a/src/mame/drivers/pachifev.c +++ b/src/mame/drivers/pachifev.c @@ -259,7 +259,7 @@ static void pf_adpcm_int(device_t *device) } else { - UINT8 *ROM = memory_region(device->machine, "adpcm"); + UINT8 *ROM = device->machine->region("adpcm")->base(); adpcm_data = ((trigger ? (ROM[adpcm_pos] & 0x0f) : (ROM[adpcm_pos] & 0xf0)>>4) ); msm5205_data_w(device,adpcm_data & 0xf); diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index 741f40b9054..8ec8f6a09f0 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -377,7 +377,7 @@ static UINT8 cannonb_bit_to_read; static MACHINE_RESET( mschamp ) { - UINT8 *rom = memory_region(machine, "maincpu") + 0x10000; + UINT8 *rom = machine->region("maincpu")->base() + 0x10000; int whichbank = input_port_read(machine, "GAME") & 1; memory_configure_bank(machine, "bank1", 0, 2, &rom[0x0000], 0x8000); @@ -674,7 +674,7 @@ static WRITE8_HANDLER( bigbucks_bank_w ) static READ8_HANDLER( bigbucks_question_r ) { - UINT8 *question = memory_region(space->machine, "user1"); + UINT8 *question = space->machine->region("user1")->base(); UINT8 ret; ret = question[(bigbucks_bank << 16) | (offset ^ 0xffff)]; @@ -779,7 +779,7 @@ static WRITE8_HANDLER( rocktrv2_question_bank_w ) static READ8_HANDLER( rocktrv2_question_r ) { - UINT8 *question = memory_region(space->machine, "user1"); + UINT8 *question = space->machine->region("user1")->base(); return question[offset | (rocktrv2_question_bank * 0x8000)]; } @@ -868,17 +868,17 @@ static READ8_HANDLER( pacman_read_nop ) #define mspacman_disable_decode_latch(m) memory_set_bank(m, "bank1", 0) // any access to these ROM addresses disables the decoder, and all you see is the original Pac-Man code -static READ8_HANDLER( mspacman_disable_decode_r_0x0038 ) { mspacman_disable_decode_latch(space->machine); return memory_region(space->machine, "maincpu")[offset+0x0038]; } -static READ8_HANDLER( mspacman_disable_decode_r_0x03b0 ) { mspacman_disable_decode_latch(space->machine); return memory_region(space->machine, "maincpu")[offset+0x03b0]; } -static READ8_HANDLER( mspacman_disable_decode_r_0x1600 ) { mspacman_disable_decode_latch(space->machine); return memory_region(space->machine, "maincpu")[offset+0x1600]; } -static READ8_HANDLER( mspacman_disable_decode_r_0x2120 ) { mspacman_disable_decode_latch(space->machine); return memory_region(space->machine, "maincpu")[offset+0x2120]; } -static READ8_HANDLER( mspacman_disable_decode_r_0x3ff0 ) { mspacman_disable_decode_latch(space->machine); return memory_region(space->machine, "maincpu")[offset+0x3ff0]; } -static READ8_HANDLER( mspacman_disable_decode_r_0x8000 ) { mspacman_disable_decode_latch(space->machine); return memory_region(space->machine, "maincpu")[offset+0x8000]; } -static READ8_HANDLER( mspacman_disable_decode_r_0x97f0 ) { mspacman_disable_decode_latch(space->machine); return memory_region(space->machine, "maincpu")[offset+0x97f0]; } +static READ8_HANDLER( mspacman_disable_decode_r_0x0038 ) { mspacman_disable_decode_latch(space->machine); return space->machine->region("maincpu")->base()[offset+0x0038]; } +static READ8_HANDLER( mspacman_disable_decode_r_0x03b0 ) { mspacman_disable_decode_latch(space->machine); return space->machine->region("maincpu")->base()[offset+0x03b0]; } +static READ8_HANDLER( mspacman_disable_decode_r_0x1600 ) { mspacman_disable_decode_latch(space->machine); return space->machine->region("maincpu")->base()[offset+0x1600]; } +static READ8_HANDLER( mspacman_disable_decode_r_0x2120 ) { mspacman_disable_decode_latch(space->machine); return space->machine->region("maincpu")->base()[offset+0x2120]; } +static READ8_HANDLER( mspacman_disable_decode_r_0x3ff0 ) { mspacman_disable_decode_latch(space->machine); return space->machine->region("maincpu")->base()[offset+0x3ff0]; } +static READ8_HANDLER( mspacman_disable_decode_r_0x8000 ) { mspacman_disable_decode_latch(space->machine); return space->machine->region("maincpu")->base()[offset+0x8000]; } +static READ8_HANDLER( mspacman_disable_decode_r_0x97f0 ) { mspacman_disable_decode_latch(space->machine); return space->machine->region("maincpu")->base()[offset+0x97f0]; } static WRITE8_HANDLER( mspacman_disable_decode_w ) { mspacman_disable_decode_latch(space->machine); } // any access to these ROM addresses enables the decoder, and you'll see the Ms. Pac-Man code -static READ8_HANDLER( mspacman_enable_decode_r_0x3ff8 ) { mspacman_enable_decode_latch(space->machine); return memory_region(space->machine, "maincpu")[offset+0x3ff8+0x10000]; } +static READ8_HANDLER( mspacman_enable_decode_r_0x3ff8 ) { mspacman_enable_decode_latch(space->machine); return space->machine->region("maincpu")->base()[offset+0x3ff8+0x10000]; } static WRITE8_HANDLER( mspacman_enable_decode_w ) { mspacman_enable_decode_latch(space->machine); } @@ -5349,7 +5349,7 @@ static void maketrax_rom_decode(running_machine *machine) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x4000); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* patch protection using a copy of the opcodes so ROM checksum */ /* tests will not fail */ @@ -5381,7 +5381,7 @@ static void korosuke_rom_decode(running_machine *machine) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x4000); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* patch protection using a copy of the opcodes so ROM checksum */ /* tests will not fail */ @@ -5416,10 +5416,10 @@ static DRIVER_INIT( ponpoko ) int i, j; UINT8 *RAM, temp; - int length = memory_region_length(machine, "gfx1")/2; + int length = machine->region("gfx1")->bytes()/2; /* Characters */ - RAM = memory_region(machine, "gfx1"); + RAM = machine->region("gfx1")->base(); for (i = 0;i < length;i += 0x10) { for (j = 0; j < 8; j++) @@ -5431,7 +5431,7 @@ static DRIVER_INIT( ponpoko ) } /* Sprites */ - RAM = memory_region(machine, "gfx1")+length; + RAM = machine->region("gfx1")->base()+length; for (i = 0;i < length;i += 0x20) { for (j = 0; j < 8; j++) @@ -5469,7 +5469,7 @@ static DRIVER_INIT( eyes ) /* CPU ROMs */ /* Data lines D3 and D5 swapped */ - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (i = 0; i < 0x4000; i++) { RAM[i] = BITSWAP8(RAM[i],7,6,3,4,5,2,1,0); @@ -5479,8 +5479,8 @@ static DRIVER_INIT( eyes ) /* Graphics ROMs */ /* Data lines D4 and D6 and address lines A0 and A2 are swapped */ - RAM = memory_region(machine, "gfx1"); - len = memory_region_length(machine, "gfx1"); + RAM = machine->region("gfx1")->base(); + len = machine->region("gfx1")->bytes(); for (i = 0;i < len;i += 8) eyes_decode(&RAM[i]); } @@ -5553,10 +5553,10 @@ static DRIVER_INIT( mspacman ) /* CPU ROMs */ /* Pac-Man code is in low bank */ - ROM = memory_region(machine, "maincpu"); + ROM = machine->region("maincpu")->base(); /* decrypted Ms. Pac-Man code is in high bank */ - DROM = &memory_region(machine, "maincpu")[0x10000]; + DROM = &machine->region("maincpu")->base()[0x10000]; /* copy ROMs into decrypted bank */ for (i = 0; i < 0x1000; i++) @@ -5603,8 +5603,8 @@ static DRIVER_INIT( woodpek ) /* Graphics ROMs */ /* Data lines D4 and D6 and address lines A0 and A2 are swapped */ - RAM = memory_region(machine, "gfx1"); - len = memory_region_length(machine, "gfx1"); + RAM = machine->region("gfx1")->base(); + len = machine->region("gfx1")->bytes(); for (i = 0;i < len;i += 8) eyes_decode(&RAM[i]); } @@ -5621,7 +5621,7 @@ static DRIVER_INIT( jumpshot ) static DRIVER_INIT( drivfrcp ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &ROM[0 * 0x2000]); memory_set_bankptr(machine, "bank2", &ROM[1 * 0x2000]); memory_set_bankptr(machine, "bank3", &ROM[2 * 0x2000]); @@ -5630,7 +5630,7 @@ static DRIVER_INIT( drivfrcp ) static DRIVER_INIT( 8bpm ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); int i; /* Data lines D0 and D6 swapped */ @@ -5647,7 +5647,7 @@ static DRIVER_INIT( 8bpm ) static DRIVER_INIT( porky ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); int i; /* Data lines D0 and D4 swapped */ @@ -5670,7 +5670,7 @@ static DRIVER_INIT( porky ) static DRIVER_INIT( rocktrv2 ) { /* hack to pass the rom check for the bad rom */ - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0x7ffe] = 0xa7; ROM[0x7fee] = 0x6d; @@ -5682,7 +5682,7 @@ socket and run through the 74298. Clock is tied to system clock. */ static DRIVER_INIT( mspacmbe ) { UINT8 temp; - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); int i; /* Address lines A1 and A0 swapped if A2=0 */ diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c index 6518459b588..57b1d21dfae 100644 --- a/src/mame/drivers/panicr.c +++ b/src/mame/drivers/panicr.c @@ -143,8 +143,8 @@ static TILE_GET_INFO( get_bgtile_info ) { int code,attr; - code=memory_region(machine, "user1")[tile_index]; - attr=memory_region(machine, "user2")[tile_index]; + code=machine->region("user1")->base()[tile_index]; + attr=machine->region("user2")->base()[tile_index]; code+=((attr&7)<<8); SET_TILE_INFO( 1, @@ -457,8 +457,8 @@ static DRIVER_INIT( panicr ) int size; int i; - rom = memory_region(machine, "gfx1"); - size = memory_region_length(machine, "gfx1"); + rom = machine->region("gfx1")->base(); + size = machine->region("gfx1")->bytes(); // text data lines for (i = 0;i < size/2;i++) @@ -480,8 +480,8 @@ static DRIVER_INIT( panicr ) } - rom = memory_region(machine, "gfx2"); - size = memory_region_length(machine, "gfx2"); + rom = machine->region("gfx2")->base(); + size = machine->region("gfx2")->bytes(); // tiles data lines for (i = 0;i < size/4;i++) @@ -507,8 +507,8 @@ static DRIVER_INIT( panicr ) } - rom = memory_region(machine, "gfx3"); - size = memory_region_length(machine, "gfx3"); + rom = machine->region("gfx3")->base(); + size = machine->region("gfx3")->bytes(); // sprites data lines for (i = 0;i < size/2;i++) @@ -533,8 +533,8 @@ static DRIVER_INIT( panicr ) //rearrange bg tilemaps a bit.... - rom = memory_region(machine, "user1"); - size = memory_region_length(machine, "user1"); + rom = machine->region("user1")->base(); + size = machine->region("user1")->bytes(); memcpy(buf,rom, size); { @@ -546,8 +546,8 @@ static DRIVER_INIT( panicr ) } } - rom = memory_region(machine, "user2"); - size = memory_region_length(machine, "user2"); + rom = machine->region("user2")->base(); + size = machine->region("user2")->bytes(); memcpy(buf,rom, size); { diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c index 0123df954c1..cc0830a1083 100644 --- a/src/mame/drivers/paradise.c +++ b/src/mame/drivers/paradise.c @@ -44,7 +44,7 @@ paradise: I'm not sure it's working correctly: static WRITE8_HANDLER( paradise_rombank_w ) { int bank = data; - int bank_n = memory_region_length(space->machine, "maincpu") / 0x4000 - 1; + int bank_n = space->machine->region("maincpu")->bytes() / 0x4000 - 1; if (bank >= bank_n) { @@ -544,8 +544,8 @@ GFXDECODE_END static MACHINE_START( paradise ) { paradise_state *state = machine->driver_data(); - int bank_n = memory_region_length(machine, "maincpu") / 0x4000 - 1; - UINT8 *ROM = memory_region(machine, "maincpu"); + int bank_n = machine->region("maincpu")->bytes() / 0x4000 - 1; + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 3, &ROM[0x00000], 0x4000); memory_configure_bank(machine, "bank1", 3, bank_n - 3, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c index 805d504bad2..dc014987b77 100644 --- a/src/mame/drivers/parodius.c +++ b/src/mame/drivers/parodius.c @@ -258,7 +258,7 @@ static const k05324x_interface parodius_k05324x_intf = static MACHINE_START( parodius ) { parodius_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 14, &ROM[0x10000], 0x4000); memory_configure_bank(machine, "bank1", 14, 2, &ROM[0x08000], 0x4000); diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c index 917c8f81b2e..4eb8beac465 100644 --- a/src/mame/drivers/pasha2.c +++ b/src/mame/drivers/pasha2.c @@ -116,7 +116,7 @@ static WRITE16_HANDLER( pasha2_misc_w ) case 0xb000: case 0xc000: case 0xd000: - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "user2") + 0x400 * (bank - 0x8000)); break; + memory_set_bankptr(space->machine, "bank1", space->machine->region("user2")->base() + 0x400 * (bank - 0x8000)); break; } } } @@ -473,7 +473,7 @@ static DRIVER_INIT( pasha2 ) { memory_install_read16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x95744, 0x95747, 0, 0, pasha2_speedup_r ); - memory_set_bankptr(machine, "bank1", memory_region(machine, "user2")); + memory_set_bankptr(machine, "bank1", machine->region("user2")->base()); } GAME( 1998, pasha2, 0, pasha2, pasha2, pasha2, ROT0, "Dong Sung", "Pasha Pasha 2", GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c index e64d9d8b97a..12dab511d97 100644 --- a/src/mame/drivers/pastelg.c +++ b/src/mame/drivers/pastelg.c @@ -45,7 +45,7 @@ static DRIVER_INIT( pastelg ) static READ8_HANDLER( pastelg_sndrom_r ) { - UINT8 *ROM = memory_region(space->machine, "voice"); + UINT8 *ROM = space->machine->region("voice")->base(); return ROM[pastelg_blitter_src_addr_r() & 0x7fff]; } diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c index 2299d4c9d10..bc0a9e711d6 100644 --- a/src/mame/drivers/pbaction.c +++ b/src/mame/drivers/pbaction.c @@ -472,7 +472,7 @@ static READ8_HANDLER( pbactio3_prot_kludge_r ) static DRIVER_INIT( pbactio3 ) { int i; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* first of all, do a simple bitswap */ for (i = 0; i < 0xc000; i++) diff --git a/src/mame/drivers/pcat_nit.c b/src/mame/drivers/pcat_nit.c index 59603821724..fb24b108291 100644 --- a/src/mame/drivers/pcat_nit.c +++ b/src/mame/drivers/pcat_nit.c @@ -217,7 +217,7 @@ static MACHINE_START( streetg2 ) init_pc_common(machine, PCCOMMON_KEYBOARD_AT, streetg2_set_keyb_int); - memory_configure_bank(machine, "rombank", 0, 0x80, memory_region(machine, "game_prg"), 0x8000 ); + memory_configure_bank(machine, "rombank", 0, 0x80, machine->region("game_prg")->base(), 0x8000 ); memory_set_bank(machine, "rombank", 0); microtouch_init(machine, pcat_nit_microtouch_tx_callback, NULL); diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c index 3c9d8e9add2..dc21dd034b7 100644 --- a/src/mame/drivers/pcktgal.c +++ b/src/mame/drivers/pcktgal.c @@ -23,7 +23,7 @@ static WRITE8_HANDLER( pcktgal_bank_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); if (data & 1) { memory_set_bankptr(space->machine, "bank1", &RAM[0x4000]); } else { memory_set_bankptr(space->machine, "bank1", &RAM[0x10000]); } @@ -409,7 +409,7 @@ static DRIVER_INIT( deco222 ) int A; address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x10000); - UINT8 *rom = memory_region(machine, "audiocpu"); + UINT8 *rom = machine->region("audiocpu")->base(); space->set_decrypted_region(0x8000, 0xffff, decrypted); @@ -417,17 +417,17 @@ static DRIVER_INIT( deco222 ) for (A = 0x8000;A < 0x18000;A++) decrypted[A-0x8000] = (rom[A] & 0x9f) | ((rom[A] & 0x20) << 1) | ((rom[A] & 0x40) >> 1); - memory_configure_bank(machine, "bank3", 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank3", 0, 2, machine->region("audiocpu")->base() + 0x10000, 0x4000); memory_configure_bank_decrypted(machine, "bank3", 0, 2, &decrypted[0x8000], 0x4000); } static DRIVER_INIT( graphics ) { - UINT8 *rom = memory_region(machine, "gfx1"); - int len = memory_region_length(machine, "gfx1"); + UINT8 *rom = machine->region("gfx1")->base(); + int len = machine->region("gfx1")->bytes(); int i,j,temp[16]; - memory_configure_bank(machine, "bank3", 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank3", 0, 2, machine->region("audiocpu")->base() + 0x10000, 0x4000); /* Tile graphics roms have some swapped lines, original version only */ for (i = 0x00000;i < len;i += 32) diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c index e650265b5fd..08fc51d7ebd 100644 --- a/src/mame/drivers/pcxt.c +++ b/src/mame/drivers/pcxt.c @@ -238,7 +238,7 @@ static VIDEO_UPDATE( filetto ) static void vga_bitmap_layer(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect) { int x,y,z; - UINT8 *region = memory_region(machine, "user1"); + UINT8 *region = machine->region("user1")->base(); static UINT32 cur_bank; /*TODO: might be a different descramble algorythm plus plain bg bank*/ @@ -382,7 +382,7 @@ static WRITE8_HANDLER( disk_iobank_w ) if (newbank != bank) { bank = newbank; - memory_set_bankptr(space->machine, "bank1",memory_region(space->machine, "user1") + 0x10000 * bank ); + memory_set_bankptr(space->machine, "bank1",space->machine->region("user1")->base() + 0x10000 * bank ); } lastvalue = data; @@ -1064,8 +1064,8 @@ static DRIVER_INIT( tetriskr ) { int i,j,k; int index=0; - UINT8 *region = memory_region(machine, "user1"); - UINT8 *gfx = memory_region(machine, "gfx2"); + UINT8 *region = machine->region("user1")->base(); + UINT8 *gfx = machine->region("gfx2")->base(); for(i=0;i<0x20000;i++) { diff --git a/src/mame/drivers/pengadvb.c b/src/mame/drivers/pengadvb.c index 6cc918361a1..512f4300bb5 100644 --- a/src/mame/drivers/pengadvb.c +++ b/src/mame/drivers/pengadvb.c @@ -40,7 +40,7 @@ static void mem_map_banks(running_machine *machine) case 0: { memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1" ); - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu")); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base()); break; }; case 1: @@ -60,16 +60,16 @@ static void mem_map_banks(running_machine *machine) { memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x5fff, 0, 0, "bank21" ); memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank22" ); - memory_set_bankptr(machine, "bank21", memory_region(machine, "maincpu") + 0x4000); - memory_set_bankptr(machine, "bank22", memory_region(machine, "maincpu") + 0x4000 + 0x2000); + memory_set_bankptr(machine, "bank21", machine->region("maincpu")->base() + 0x4000); + memory_set_bankptr(machine, "bank22", machine->region("maincpu")->base() + 0x4000 + 0x2000); break; } case 1: { memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x5fff, 0, 0, "bank21" ); memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x6000, 0x7fff, 0, 0, "bank22" ); - memory_set_bankptr(machine, "bank21", memory_region(machine, "game") + mem_banks[0]*0x2000); - memory_set_bankptr(machine, "bank22", memory_region(machine, "game") + mem_banks[1]*0x2000); + memory_set_bankptr(machine, "bank21", machine->region("game")->base() + mem_banks[0]*0x2000); + memory_set_bankptr(machine, "bank22", machine->region("game")->base() + mem_banks[1]*0x2000); break; } case 2: @@ -88,8 +88,8 @@ static void mem_map_banks(running_machine *machine) { memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0x9fff, 0, 0, "bank31" ); memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa000, 0xbfff, 0, 0, "bank32" ); - memory_set_bankptr(machine, "bank31", memory_region(machine, "game") + mem_banks[2]*0x2000); - memory_set_bankptr(machine, "bank32", memory_region(machine, "game") + mem_banks[3]*0x2000); + memory_set_bankptr(machine, "bank31", machine->region("game")->base() + mem_banks[2]*0x2000); + memory_set_bankptr(machine, "bank32", machine->region("game")->base() + mem_banks[3]*0x2000); break; } case 0: @@ -294,8 +294,8 @@ MACHINE_CONFIG_END static void pengadvb_decrypt(running_machine *machine, const char* region) { - UINT8 *mem = memory_region(machine, region); - int memsize = memory_region_length(machine, region); + UINT8 *mem = machine->region(region)->base(); + int memsize = machine->region(region)->bytes(); UINT8 *buf; int i; diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c index 64efba74975..335b55717dc 100644 --- a/src/mame/drivers/pengo.c +++ b/src/mame/drivers/pengo.c @@ -661,7 +661,7 @@ static DRIVER_INIT( penta ) }; address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x8000); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int A; space->set_decrypted_region(0x0000, 0x7fff, decrypt); diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index 08c8d6f4092..114cbb8abb2 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -260,7 +260,7 @@ static const mc6845_interface mc6845_intf = static void peplus_load_superdata(running_machine *machine, const char *bank_name) { - UINT8 *super_data = memory_region(machine, bank_name); + UINT8 *super_data = machine->region(bank_name)->base(); /* Distribute Superboard Data */ memcpy(s3000_ram, &super_data[0x3000], 0x1000); diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index 02c5ede7bf4..86eaa58fb03 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -4305,11 +4305,11 @@ ROM_END static void expand_32x32x5bpp(running_machine *machine) { - UINT8 *src = memory_region( machine, "tiles" ); + UINT8 *src = machine->region( "tiles" )->base(); gfx_layout glcopy; glcopy = *(&pgm32_charlayout); - size_t srcsize = memory_region_length( machine, "tiles" ); + size_t srcsize = machine->region( "tiles" )->bytes(); int cnt, pix; size_t gfx2_size_needed = ((srcsize/5)*8)+0x1000; UINT8 *dst = auto_alloc_array(machine, UINT8, gfx2_size_needed); @@ -4348,8 +4348,8 @@ static void expand_32x32x5bpp(running_machine *machine) static void expand_colourdata( running_machine *machine ) { pgm_state *state = machine->driver_data(); - UINT8 *src = memory_region( machine, "sprcol" ); - size_t srcsize = memory_region_length( machine, "sprcol" ); + UINT8 *src = machine->region( "sprcol" )->base(); + size_t srcsize = machine->region( "sprcol" )->bytes(); int cnt; size_t needed = srcsize / 2 * 3; @@ -4388,7 +4388,7 @@ static void pgm_basic_init_nobank( running_machine *machine ) static void pgm_basic_init( running_machine *machine ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &ROM[0x100000]); pgm_basic_init_nobank(machine); @@ -4446,7 +4446,7 @@ static void drgwld2_common_init(running_machine *machine) static DRIVER_INIT( drgw2 ) { /* incomplete? */ - UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base(); drgwld2_common_init(machine); /* These ROM patches are not hacks, the protection device overlays the normal ROM code, this has been confirmed on a real PCB @@ -4458,7 +4458,7 @@ static DRIVER_INIT( drgw2 ) static DRIVER_INIT( dw2v100x ) { - UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base(); drgwld2_common_init(machine); mem16[0x131084 / 2] = 0x4e93; @@ -4468,7 +4468,7 @@ static DRIVER_INIT( dw2v100x ) static DRIVER_INIT( drgw2c ) { - UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base(); drgwld2_common_init(machine); /* These ROM patches are not hacks, the protection device overlays the normal ROM code, this has been confirmed on a real PCB @@ -4480,7 +4480,7 @@ static DRIVER_INIT( drgw2c ) static DRIVER_INIT( drgw2j ) { - UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base(); drgwld2_common_init(machine); /* These ROM patches are not hacks, the protection device overlays the normal ROM code, this has been confirmed on a real PCB @@ -4806,17 +4806,17 @@ static void IGS022_do_dma(running_machine* machine, UINT16 src, UINT16 dst, UINT }; */ int x; - UINT16 *PROTROM = (UINT16*)memory_region(machine, "igs022data"); + UINT16 *PROTROM = (UINT16*)machine->region("igs022data")->base(); for (x = 0; x < size; x++) { - //UINT16 *RAMDUMP = (UINT16*)memory_region(space->machine, "user2"); + //UINT16 *RAMDUMP = (UINT16*)space->machine->region("user2")->base(); //UINT16 dat = RAMDUMP[dst + x]; UINT16 dat2 = PROTROM[src + x]; UINT8 extraoffset = param&0xfe; // the lowest bit changed the table addressing in tests, see 'rawDataOdd' table instead.. it's still related to the main one, not identical - UINT8* dectable = (UINT8*)memory_region(machine, "igs022data");//rawDataEven; // the basic decryption table is at the start of the mcu data rom! at least in killbld + UINT8* dectable = (UINT8*)machine->region("igs022data")->base();//rawDataEven; // the basic decryption table is at the start of the mcu data rom! at least in killbld UINT16 extraxor = ((dectable[((x*2)+0+extraoffset)&0xff]) << 8) | (dectable[((x*2)+1+extraoffset)&0xff] << 0); dat2 = ((dat2 & 0x00ff)<<8) | ((dat2 & 0xff00)>>8); @@ -4847,7 +4847,7 @@ static void IGS022_do_dma(running_machine* machine, UINT16 src, UINT16 dst, UINT { /* mode 5 seems to be a straight copy */ int x; - UINT16 *PROTROM = (UINT16*)memory_region(machine, "igs022data"); + UINT16 *PROTROM = (UINT16*)machine->region("igs022data")->base(); for (x = 0; x < size; x++) { UINT16 dat = PROTROM[src + x]; @@ -4860,7 +4860,7 @@ static void IGS022_do_dma(running_machine* machine, UINT16 src, UINT16 dst, UINT { /* mode 6 seems to swap bytes and nibbles */ int x; - UINT16 *PROTROM = (UINT16*)memory_region(machine, "igs022data"); + UINT16 *PROTROM = (UINT16*)machine->region("igs022data")->base(); for (x = 0; x < size; x++) { UINT16 dat = PROTROM[src + x]; @@ -4893,7 +4893,7 @@ static void IGS022_do_dma(running_machine* machine, UINT16 src, UINT16 dst, UINT static void IGS022_reset(running_machine* machine) { int i; - UINT16 *PROTROM = (UINT16*)memory_region(machine, "igs022data"); + UINT16 *PROTROM = (UINT16*)machine->region("igs022data")->base(); pgm_state *state = machine->driver_data(); UINT16 tmp; @@ -5234,7 +5234,7 @@ static DRIVER_INIT( drgw3 ) { int x; - UINT16 *RAMDUMP = (UINT16*)memory_region(machine, "user2"); + UINT16 *RAMDUMP = (UINT16*)machine->region("user2")->base(); for (x=0;x<(0x4000/2);x++) { state->sharedprotram[x] = RAMDUMP[x]; @@ -5254,7 +5254,7 @@ static DRIVER_INIT( puzzli2 ) an acts in a similar way to kov etc. */ pgm_state *state = machine->driver_data(); - UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base(); pgm_basic_init(machine); kovsh_latch_init(machine); @@ -5300,7 +5300,7 @@ static DRIVER_INIT( puzzli2 ) static DRIVER_INIT( dw2001 ) { //pgm_state *state = machine->driver_data(); - UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base(); pgm_basic_init(machine); kovsh_latch_init(machine); @@ -5384,7 +5384,7 @@ static void olds_write_reg( running_machine *machine, UINT16 addr, UINT32 val ) static MACHINE_RESET( olds ) { pgm_state *state = machine->driver_data(); - UINT16 *mem16 = (UINT16 *)memory_region(machine, "user2"); + UINT16 *mem16 = (UINT16 *)machine->region("user2")->base(); int i; MACHINE_RESET_CALL(pgm); @@ -5516,7 +5516,7 @@ static DRIVER_INIT( olds ) static void pgm_decode_kovlsqh2_tiles( running_machine *machine ) { int i, j; - UINT16 *src = (UINT16 *)(memory_region(machine, "tiles") + 0x400000); + UINT16 *src = (UINT16 *)(machine->region("tiles")->base() + 0x400000); UINT16 *dst = auto_alloc_array(machine, UINT16, 0x800000); for (i = 0; i < 0x800000 / 2; i++) @@ -5551,7 +5551,7 @@ static void pgm_decode_kovlsqh2_sprites( running_machine *machine, UINT8 *src ) static void pgm_decode_kovlsqh2_samples( running_machine *machine ) { int i; - UINT8 *src = (UINT8 *)(memory_region(machine, "ics") + 0x400000); + UINT8 *src = (UINT8 *)(machine->region("ics")->base() + 0x400000); for (i = 0; i < 0x400000; i+=2) { src[i + 0x000001] = src[i + 0x400001]; @@ -5563,7 +5563,7 @@ static void pgm_decode_kovlsqh2_samples( running_machine *machine ) static void pgm_decode_kovqhsgs_program( running_machine *machine ) { int i; - UINT16 *src = (UINT16 *)(memory_region(machine, "maincpu") + 0x100000); + UINT16 *src = (UINT16 *)(machine->region("maincpu")->base() + 0x100000); UINT16 *dst = auto_alloc_array(machine, UINT16, 0x400000); for (i = 0; i < 0x400000 / 2; i++) @@ -5581,7 +5581,7 @@ static void pgm_decode_kovqhsgs_program( running_machine *machine ) static void pgm_decode_kovqhsgs2_program( running_machine *machine ) { int i; - UINT16 *src = (UINT16 *)(memory_region(machine, "maincpu") + 0x100000); + UINT16 *src = (UINT16 *)(machine->region("maincpu")->base() + 0x100000); UINT16 *dst = auto_alloc_array(machine, UINT16, 0x400000); for (i = 0; i < 0x400000 / 2; i++) @@ -5602,14 +5602,14 @@ static DRIVER_INIT( kovlsqh2 ) pgm_decode_kovqhsgs2_program(machine); pgm_decode_kovlsqh2_tiles(machine); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x0000000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x0800000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x1000000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x1800000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x2000000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x2800000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprmask") + 0x0000000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprmask") + 0x0800000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprcol")->base() + 0x0000000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprcol")->base() + 0x0800000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprcol")->base() + 0x1000000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprcol")->base() + 0x1800000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprcol")->base() + 0x2000000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprcol")->base() + 0x2800000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprmask")->base() + 0x0000000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprmask")->base() + 0x0800000); pgm_decode_kovlsqh2_samples(machine); pgm_basic_init(machine); @@ -5621,14 +5621,14 @@ static DRIVER_INIT( kovqhsgs ) pgm_decode_kovqhsgs_program(machine); pgm_decode_kovlsqh2_tiles(machine); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x0000000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x0800000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x1000000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x1800000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x2000000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x2800000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprmask") + 0x0000000); - pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprmask") + 0x0800000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprcol")->base() + 0x0000000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprcol")->base() + 0x0800000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprcol")->base() + 0x1000000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprcol")->base() + 0x1800000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprcol")->base() + 0x2000000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprcol")->base() + 0x2800000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprmask")->base() + 0x0000000); + pgm_decode_kovlsqh2_sprites(machine, machine->region("sprmask")->base() + 0x0800000); pgm_decode_kovlsqh2_samples(machine); diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c index 10a7ca1a6ed..1945729d33b 100644 --- a/src/mame/drivers/phoenix.c +++ b/src/mame/drivers/phoenix.c @@ -446,7 +446,7 @@ static const ay8910_interface survival_ay8910_interface = static MACHINE_RESET( phoenix ) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x4000); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0x4000); } diff --git a/src/mame/drivers/photon.c b/src/mame/drivers/photon.c index ac7473f8265..cfc8fc562ac 100644 --- a/src/mame/drivers/photon.c +++ b/src/mame/drivers/photon.c @@ -23,8 +23,8 @@ static void pk8000_set_bank(running_machine *machine,UINT8 data) { - UINT8 *rom = memory_region(machine, "maincpu"); - UINT8 *ram = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); + UINT8 *ram = machine->region("maincpu")->base(); UINT8 block1 = data & 3; UINT8 block2 = (data >> 2) & 3; UINT8 block3 = (data >> 4) & 3; @@ -189,7 +189,7 @@ static VIDEO_START( photon ) static VIDEO_UPDATE( photon ) { - return pk8000_video_update(screen, bitmap, cliprect, memory_region(screen->machine, "maincpu")); + return pk8000_video_update(screen, bitmap, cliprect, screen->machine->region("maincpu")->base()); } static MACHINE_CONFIG_START( photon, driver_device ) diff --git a/src/mame/drivers/photon2.c b/src/mame/drivers/photon2.c index 0e8e300ba88..039b05bbed4 100644 --- a/src/mame/drivers/photon2.c +++ b/src/mame/drivers/photon2.c @@ -182,7 +182,7 @@ static WRITE8_HANDLER(photon2_membank_w) logerror( "Unknown banking write: %02X\n", data); } - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + 0x4000*bank ); + memory_set_bankptr(space->machine, "bank1", space->machine->region("maincpu")->base() + 0x4000*bank ); } static READ8_HANDLER(photon2_fe_r) @@ -293,7 +293,7 @@ static INTERRUPT_GEN( spec_interrupt_hack ) static MACHINE_RESET( photon2 ) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu")); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base()); } static MACHINE_CONFIG_START( photon2, driver_device ) diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c index 5d96dc22540..b88e4cb5f73 100644 --- a/src/mame/drivers/pingpong.c +++ b/src/mame/drivers/pingpong.c @@ -56,7 +56,7 @@ static WRITE8_HANDLER( cashquiz_question_bank_low_w ) static const char * const bankname[] = { "bank1", "bank2", "bank3", "bank4", "bank5", "bank6", "bank7", "bank8" }; const char *bank = bankname[data & 7]; int bankaddr = question_addr_high | ((data - 0x60) * 0x100); - UINT8 *questions = memory_region(space->machine, "user1") + bankaddr; + UINT8 *questions = space->machine->region("user1")->base() + bankaddr; memory_set_bankptr(space->machine, bank,questions); } @@ -565,7 +565,7 @@ ROM_END static DRIVER_INIT( merlinmm ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); int i; /* decrypt program code */ @@ -579,12 +579,12 @@ static DRIVER_INIT( cashquiz ) int i; /* decrypt program code */ - ROM = memory_region(machine, "maincpu"); + ROM = machine->region("maincpu")->base(); for( i = 0; i < 0x4000; i++ ) ROM[i] = BITSWAP8(ROM[i],0,1,2,3,4,5,6,7); /* decrypt questions */ - ROM = memory_region(machine, "user1"); + ROM = machine->region("user1")->base(); for( i = 0; i < 0x40000; i++ ) ROM[i] = BITSWAP8(ROM[i],0,1,2,3,4,5,6,7); @@ -603,14 +603,14 @@ static DRIVER_INIT( cashquiz ) memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5700, 0x57ff, 0, 0, "bank8"); // setup default banks - memory_set_bankptr(machine, "bank1", memory_region(machine, "user1") + 0x100*0 ); - memory_set_bankptr(machine, "bank2", memory_region(machine, "user1") + 0x100*1 ); - memory_set_bankptr(machine, "bank3", memory_region(machine, "user1") + 0x100*2 ); - memory_set_bankptr(machine, "bank4", memory_region(machine, "user1") + 0x100*3 ); - memory_set_bankptr(machine, "bank5", memory_region(machine, "user1") + 0x100*4 ); - memory_set_bankptr(machine, "bank6", memory_region(machine, "user1") + 0x100*5 ); - memory_set_bankptr(machine, "bank7", memory_region(machine, "user1") + 0x100*6 ); - memory_set_bankptr(machine, "bank8", memory_region(machine, "user1") + 0x100*7 ); + memory_set_bankptr(machine, "bank1", machine->region("user1")->base() + 0x100*0 ); + memory_set_bankptr(machine, "bank2", machine->region("user1")->base() + 0x100*1 ); + memory_set_bankptr(machine, "bank3", machine->region("user1")->base() + 0x100*2 ); + memory_set_bankptr(machine, "bank4", machine->region("user1")->base() + 0x100*3 ); + memory_set_bankptr(machine, "bank5", machine->region("user1")->base() + 0x100*4 ); + memory_set_bankptr(machine, "bank6", machine->region("user1")->base() + 0x100*5 ); + memory_set_bankptr(machine, "bank7", machine->region("user1")->base() + 0x100*6 ); + memory_set_bankptr(machine, "bank8", machine->region("user1")->base() + 0x100*7 ); } diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index 2ab033c51be..bec04922e4b 100644 --- a/src/mame/drivers/pipedrm.c +++ b/src/mame/drivers/pipedrm.c @@ -594,11 +594,11 @@ static MACHINE_START( pipedrm ) state->subcpu = machine->device("sub"); /* initialize main Z80 bank */ - memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 8, machine->region("maincpu")->base() + 0x10000, 0x2000); memory_set_bank(machine, "bank1", 0); /* initialize sound bank */ - memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "sub") + 0x10000, 0x8000); + memory_configure_bank(machine, "bank2", 0, 2, machine->region("sub")->base() + 0x10000, 0x8000); memory_set_bank(machine, "bank2", 0); /* state save */ diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c index 59925c4283d..5ede7752bda 100644 --- a/src/mame/drivers/pipeline.c +++ b/src/mame/drivers/pipeline.c @@ -344,8 +344,8 @@ static const ym2203_interface ym2203_config = static PALETTE_INIT(pipeline) { int r,g,b,i,c; - UINT8 *prom1 = &memory_region(machine, "proms")[0x000]; - UINT8 *prom2 = &memory_region(machine, "proms")[0x100]; + UINT8 *prom1 = &machine->region("proms")->base()[0x000]; + UINT8 *prom2 = &machine->region("proms")->base()[0x100]; for(i=0;i<0x100;i++) { diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c index 6580c5d7932..4d7e2391f9e 100644 --- a/src/mame/drivers/pirates.c +++ b/src/mame/drivers/pirates.c @@ -343,11 +343,11 @@ static void pirates_decrypt_68k(running_machine *machine) UINT16 *buf, *rom; int i; - rom_size = memory_region_length(machine, "maincpu"); + rom_size = machine->region("maincpu")->bytes(); buf = auto_alloc_array(machine, UINT16, rom_size/2); - rom = (UINT16 *)memory_region(machine, "maincpu"); + rom = (UINT16 *)machine->region("maincpu")->base(); memcpy (buf, rom, rom_size); for (i=0; iregion("gfx1")->bytes(); buf = auto_alloc_array(machine, UINT8, rom_size); - rom = memory_region(machine, "gfx1"); + rom = machine->region("gfx1")->base(); memcpy (buf, rom, rom_size); for (i=0; iregion("gfx2")->bytes(); buf = auto_alloc_array(machine, UINT8, rom_size); - rom = memory_region(machine, "gfx2"); + rom = machine->region("gfx2")->base(); memcpy (buf, rom, rom_size); for (i=0; iregion("oki")->bytes(); buf = auto_alloc_array(machine, UINT8, rom_size); - rom = memory_region(machine, "oki"); + rom = machine->region("oki")->base(); memcpy (buf, rom, rom_size); for (i=0; iregion("maincpu")->base(); pirates_decrypt_68k(machine); pirates_decrypt_p(machine); diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index 2b67d9f05b4..f74c93a8c42 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -170,7 +170,7 @@ static WRITE8_DEVICE_HANDLER( playmark_oki_banking_w ) { state->old_oki_bank = data & 7; - if (((state->old_oki_bank - 1) * 0x40000) < memory_region_length(device->machine, "oki")) + if (((state->old_oki_bank - 1) * 0x40000) < device->machine->region("oki")->bytes()) { downcast(device)->set_bank_base(0x40000 * (state->old_oki_bank - 1)); } @@ -1449,8 +1449,8 @@ static UINT8 playmark_asciitohex(UINT8 data) static DRIVER_INIT( bigtwin ) { playmark_state *state = machine->driver_data(); - UINT8 *playmark_PICROM_HEX = memory_region(machine, "user1"); - UINT16 *playmark_PICROM = (UINT16 *)memory_region(machine, "audiocpu"); + UINT8 *playmark_PICROM_HEX = machine->region("user1")->base(); + UINT16 *playmark_PICROM = (UINT16 *)machine->region("audiocpu")->base(); INT32 offs, data; UINT16 src_pos = 0; UINT16 dst_pos = 0; diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c index bf1f046795c..34d34b0ea80 100644 --- a/src/mame/drivers/plygonet.c +++ b/src/mame/drivers/plygonet.c @@ -140,7 +140,7 @@ static WRITE32_HANDLER( polygonet_eeprom_w ) static READ32_HANDLER( ttl_rom_r ) { UINT32 *ROM; - ROM = (UINT32 *)memory_region(space->machine, "gfx1"); + ROM = (UINT32 *)space->machine->region("gfx1")->base(); return ROM[offset]; } @@ -149,7 +149,7 @@ static READ32_HANDLER( ttl_rom_r ) static READ32_HANDLER( psac_rom_r ) { UINT32 *ROM; - ROM = (UINT32 *)memory_region(space->machine, "gfx2"); + ROM = (UINT32 *)space->machine->region("gfx2")->base(); return ROM[offset]; } @@ -563,7 +563,7 @@ ADDRESS_MAP_END static void reset_sound_region(running_machine *machine) { polygonet_state *state = machine->driver_data(); - memory_set_bankptr(machine, "bank2", memory_region(machine, "soundcpu") + 0x10000 + state->cur_sound_region*0x4000); + memory_set_bankptr(machine, "bank2", machine->region("soundcpu")->base() + 0x10000 + state->cur_sound_region*0x4000); } static WRITE8_HANDLER( sound_bankswitch_w ) diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index fbadf9fed54..6447dfb4e4f 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -466,7 +466,7 @@ ROM_END static DRIVER_INIT(pip) { -// UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); +// UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); // rom[0x2696/2] = 0x4e71; // rom[0x26a0/2] = 0x4e71; } diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c index 6f4e8fbe241..9d692ff2b8c 100644 --- a/src/mame/drivers/pokechmp.c +++ b/src/mame/drivers/pokechmp.c @@ -53,7 +53,7 @@ ClawGrip, Jul 2006 static WRITE8_HANDLER( pokechmp_bank_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); if (data == 0x00) { @@ -263,7 +263,7 @@ MACHINE_CONFIG_END static DRIVER_INIT( pokechmp ) { - memory_configure_bank(machine, "bank3", 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank3", 0, 2, machine->region("audiocpu")->base() + 0x10000, 0x4000); } diff --git a/src/mame/drivers/poker72.c b/src/mame/drivers/poker72.c index a3aab739714..7f8299beeb7 100644 --- a/src/mame/drivers/poker72.c +++ b/src/mame/drivers/poker72.c @@ -62,7 +62,7 @@ static WRITE8_HANDLER( poker72_paletteram_w ) static WRITE8_HANDLER( output_w ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); printf("%02x\n",data); @@ -324,7 +324,7 @@ static const ay8910_interface ay8910_config = static MACHINE_RESET( poker72 ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &ROM[0]); } @@ -379,7 +379,7 @@ ROM_END static DRIVER_INIT( poker72 ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); rom[0x4a9] = 0x28; } diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c index cc32d5c94d0..bc1ca31f999 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -390,9 +390,9 @@ static const namco_51xx_interface namco_51xx_intf = static READ8_DEVICE_HANDLER( namco_52xx_rom_r ) { - UINT32 length = memory_region_length(device->machine, "52xx"); + UINT32 length = device->machine->region("52xx")->bytes(); logerror("ROM @ %04X\n", offset); - return (offset < length) ? memory_region(device->machine, "52xx")[offset] : 0xff; + return (offset < length) ? device->machine->region("52xx")->base()[offset] : 0xff; } static READ8_DEVICE_HANDLER( namco_52xx_si_r ) diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c index a358f4f3c74..c69f367dd8a 100644 --- a/src/mame/drivers/policetr.c +++ b/src/mame/drivers/policetr.c @@ -202,7 +202,7 @@ static WRITE32_HANDLER( policetr_bsmt2000_data_w ) static READ32_HANDLER( bsmt2000_data_r ) { - return memory_region(space->machine, "bsmt")[bsmt_data_bank * 0x10000 + bsmt_data_offset] << 8; + return space->machine->region("bsmt")->base()[bsmt_data_bank * 0x10000 + bsmt_data_offset] << 8; } diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c index ee0b0ef4d13..bf2fde74887 100644 --- a/src/mame/drivers/poolshrk.c +++ b/src/mame/drivers/poolshrk.c @@ -15,8 +15,8 @@ static int poolshrk_da_latch; static DRIVER_INIT( poolshrk ) { - UINT8* pSprite = memory_region(machine, "gfx1"); - UINT8* pOffset = memory_region(machine, "proms"); + UINT8* pSprite = machine->region("gfx1")->base(); + UINT8* pOffset = machine->region("proms")->base(); int i; int j; diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c index cca072de2ab..e06fb51fe4a 100644 --- a/src/mame/drivers/popeye.c +++ b/src/mame/drivers/popeye.c @@ -620,7 +620,7 @@ ROM_END static DRIVER_INIT( skyskipr ) { UINT8 *buffer; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int len = 0x10000; /* decrypt the program ROMs */ @@ -641,7 +641,7 @@ static DRIVER_INIT( skyskipr ) static DRIVER_INIT( popeye ) { UINT8 *buffer; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int len = 0x10000; /* decrypt the program ROMs */ diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c index b37f4e57689..ef1532c26ea 100644 --- a/src/mame/drivers/powerbal.c +++ b/src/mame/drivers/powerbal.c @@ -69,7 +69,7 @@ static WRITE16_DEVICE_HANDLER( oki_banking ) { int addr = 0x40000 * ((data & 3) - 1); - if (addr < memory_region_length(device->machine, "oki")) + if (addr < device->machine->region("oki")->bytes()) downcast(device)->set_bank_base(addr); } } diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c index 1c7f94ff053..95e2a0c256f 100644 --- a/src/mame/drivers/powerins.c +++ b/src/mame/drivers/powerins.c @@ -49,7 +49,7 @@ static WRITE16_HANDLER( powerins_okibank_w ) { if (ACCESSING_BITS_0_7) { - UINT8 *RAM = memory_region(space->machine, "oki1"); + UINT8 *RAM = space->machine->region("oki1")->base(); int new_bank = data & 0x7; if (new_bank != oki_bank) diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index e2bf7e7fe44..8a8d1818ae4 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -153,7 +153,7 @@ static WRITE8_HANDLER( ppmast93_bgram_w ) static WRITE8_HANDLER( ppmast93_port4_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); int bank; coin_counter_w(space->machine, 0, data & 0x08); diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c index 89f109e1c52..108c47efe85 100644 --- a/src/mame/drivers/progolf.c +++ b/src/mame/drivers/progolf.c @@ -201,7 +201,7 @@ static READ8_HANDLER( progolf_videoram_r ) { progolf_state *state = space->machine->driver_data(); UINT8 *videoram = state->videoram; - UINT8 *gfx_rom = memory_region(space->machine, "gfx1"); + UINT8 *gfx_rom = space->machine->region("gfx1")->base(); if (offset >= 0x0800) { @@ -530,7 +530,7 @@ static DRIVER_INIT( progolf ) { int A; address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); UINT8* decrypted = auto_alloc_array(machine, UINT8, 0x10000); space->set_decrypted_region(0x0000,0xffff, decrypted); @@ -544,7 +544,7 @@ static DRIVER_INIT( progolfa ) { int A; address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); UINT8* decrypted = auto_alloc_array(machine, UINT8, 0x10000); space->set_decrypted_region(0x0000,0xffff, decrypted); diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index 22e67388f2c..434cefc97ce 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -1829,8 +1829,8 @@ static DRIVER_INIT( sngkace ) psikyo_state *state = machine->driver_data(); { - UINT8 *RAM = memory_region(machine, "ymsnd"); - int len = memory_region_length(machine, "ymsnd"); + UINT8 *RAM = machine->region("ymsnd")->base(); + int len = machine->region("ymsnd")->bytes(); int i; /* Bit 6&7 of the samples are swapped. Naughty, naughty... */ @@ -1850,13 +1850,13 @@ static DRIVER_INIT( sngkace ) state->ka302c_banking = 0; // SH201B doesn't have any gfx banking /* setup audiocpu banks */ - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x8000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("audiocpu")->base() + 0x10000, 0x8000); /* Enable other regions */ #if 0 if (!strcmp(machine->gamedrv->name,"sngkace")) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0x995] = 0x4e; ROM[0x994] = 0x71; ROM[0x997] = 0x4e; @@ -1910,7 +1910,7 @@ static DRIVER_INIT( tengai ) /* setup audiocpu banks */ /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x10000 + 0x200, 0x8000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("audiocpu")->base() + 0x10000 + 0x200, 0x8000); } static DRIVER_INIT( gunbird ) @@ -1927,7 +1927,7 @@ static DRIVER_INIT( gunbird ) /* setup audiocpu banks */ /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x10000 + 0x200, 0x8000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("audiocpu")->base() + 0x10000 + 0x200, 0x8000); } @@ -1951,7 +1951,7 @@ static DRIVER_INIT( s1945 ) /* setup audiocpu banks */ /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x10000 + 0x200, 0x8000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("audiocpu")->base() + 0x10000 + 0x200, 0x8000); } static DRIVER_INIT( s1945a ) @@ -1974,7 +1974,7 @@ static DRIVER_INIT( s1945a ) /* setup audiocpu banks */ /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x10000 + 0x200, 0x8000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("audiocpu")->base() + 0x10000 + 0x200, 0x8000); } static DRIVER_INIT( s1945j ) @@ -1997,7 +1997,7 @@ static DRIVER_INIT( s1945j ) /* setup audiocpu banks */ /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x10000 + 0x200, 0x8000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("audiocpu")->base() + 0x10000 + 0x200, 0x8000); } static DRIVER_INIT( s1945jn ) @@ -2014,7 +2014,7 @@ static DRIVER_INIT( s1945jn ) /* setup audiocpu banks */ /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x10000 + 0x200, 0x8000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("audiocpu")->base() + 0x10000 + 0x200, 0x8000); } static DRIVER_INIT( s1945bl ) @@ -2029,7 +2029,7 @@ static DRIVER_INIT( s1945bl ) state->ka302c_banking = 1; - memory_configure_bank(machine, "okibank", 0, 4, memory_region(machine, "oki") + 0x30000, 0x10000); + memory_configure_bank(machine, "okibank", 0, 4, machine->region("oki")->base() + 0x30000, 0x10000); memory_set_bank(machine, "okibank", 0); } diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 5860d6cd872..a319047def4 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -330,7 +330,7 @@ static WRITE32_HANDLER( ps4_vidregs_w ) if (ACCESSING_BITS_0_15) // Bank { // memory_set_bank(space->machine, "bank2", state->vidregs[offset] & 0x1fff); /* Bank comes from vidregs */ - memory_set_bankptr(space->machine, "bank2", memory_region(space->machine, "gfx1") + 0x2000 * (state->vidregs[offset] & 0x1fff)); /* Bank comes from vidregs */ } + memory_set_bankptr(space->machine, "bank2", space->machine->region("gfx1")->base() + 0x2000 * (state->vidregs[offset] & 0x1fff)); /* Bank comes from vidregs */ } } #endif } @@ -339,7 +339,7 @@ static WRITE32_HANDLER( ps4_vidregs_w ) static READ32_HANDLER( ps4_sample_r ) /* Send sample data for test */ { psikyo4_state *state = space->machine->driver_data(); - UINT8 *ROM = memory_region(space->machine, "ymf"); + UINT8 *ROM = space->machine->region("ymf")->base(); return ROM[state->sample_offs++] << 16; } #endif @@ -349,8 +349,8 @@ static READ32_HANDLER( ps4_sample_r ) /* Send sample data for test */ static void set_hotgmck_pcm_bank( running_machine *machine, int n ) { psikyo4_state *state = machine->driver_data(); - UINT8 *ymf_pcmbank = memory_region(machine, "ymf") + 0x200000; - UINT8 *pcm_rom = memory_region(machine, "ymfsource"); + UINT8 *ymf_pcmbank = machine->region("ymf")->base() + 0x200000; + UINT8 *pcm_rom = machine->region("ymfsource")->base(); memcpy(ymf_pcmbank + n * 0x100000, pcm_rom + PCM_BANK_NO(n) * 0x100000, 0x100000); } @@ -705,7 +705,7 @@ static MACHINE_START( psikyo4 ) #if ROMTEST // FIXME: Too many banks! it cannot be handled in this way, currently -// memory_configure_bank(machine, "bank2", 0, 0x2000, memory_region(machine, "gfx1"), 0x2000); +// memory_configure_bank(machine, "bank2", 0, 0x2000, machine->region("gfx1")->base(), 0x2000); state->sample_offs = 0; state_save_register_global(machine, state->sample_offs); @@ -1062,8 +1062,8 @@ static STATE_POSTLOAD( hotgmck_pcm_bank_postload ) static void install_hotgmck_pcm_bank(running_machine *machine) { psikyo4_state *state = machine->driver_data(); - UINT8 *ymf_pcm = memory_region(machine, "ymf"); - UINT8 *pcm_rom = memory_region(machine, "ymfsource"); + UINT8 *ymf_pcm = machine->region("ymf")->base(); + UINT8 *pcm_rom = machine->region("ymfsource")->base(); memcpy(ymf_pcm, pcm_rom, 0x200000); @@ -1078,7 +1078,7 @@ static void install_hotgmck_pcm_bank(running_machine *machine) static DRIVER_INIT( hotgmck ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &RAM[0x100000]); install_hotgmck_pcm_bank(machine); // Banked PCM ROM } diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index 36304ddb410..2c4dc0ec96e 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -389,7 +389,7 @@ static WRITE32_HANDLER( psikyosh_vidregs_w ) static READ32_HANDLER( psh_sample_r ) /* Send sample data for test */ { psikyosh_state *state = space->machine->driver_data(); - UINT8 *ROM = memory_region(space->machine, "ymf"); + UINT8 *ROM = space->machine->region("ymf")->base(); return ROM[state->sample_offs++] << 16; } @@ -804,7 +804,7 @@ static MACHINE_START( psikyosh ) state->maincpu = machine->device("maincpu"); - memory_configure_bank(machine, "bank2", 0, 0x1000, memory_region(machine, "gfx1"), 0x20000); + memory_configure_bank(machine, "bank2", 0, 0x1000, machine->region("gfx1")->base(), 0x20000); state->sample_offs = 0; state_save_register_global(machine, state->sample_offs); @@ -1203,7 +1203,7 @@ static DRIVER_INIT( s1945ii ) static DRIVER_INIT( daraku ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &RAM[0x100000]); sh2drc_set_options(machine->device("maincpu"), SH2DRC_FASTEST_OPTIONS); } @@ -1215,14 +1215,14 @@ static DRIVER_INIT( sbomberb ) static DRIVER_INIT( gunbird2 ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &RAM[0x100000]); sh2drc_set_options(machine->device("maincpu"), SH2DRC_FASTEST_OPTIONS); } static DRIVER_INIT( s1945iii ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &RAM[0x100000]); sh2drc_set_options(machine->device("maincpu"), SH2DRC_FASTEST_OPTIONS); } diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c index 3f60b42a08a..bc0eb95ac37 100644 --- a/src/mame/drivers/psychic5.c +++ b/src/mame/drivers/psychic5.c @@ -351,7 +351,7 @@ static READ8_HANDLER( psychic5_bankselect_r ) static WRITE8_HANDLER( psychic5_bankselect_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); int bankaddress; if (psychic5_bank_latch != data) @@ -364,7 +364,7 @@ static WRITE8_HANDLER( psychic5_bankselect_w ) static WRITE8_HANDLER( bombsa_bankselect_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); int bankaddress; if (psychic5_bank_latch != data) diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c index eee0a3cab15..4319cd8872f 100644 --- a/src/mame/drivers/pturn.c +++ b/src/mame/drivers/pturn.c @@ -123,7 +123,7 @@ static TILE_GET_INFO( get_pturn_tile_info ) static TILE_GET_INFO( get_pturn_bg_tile_info ) { int tileno,palno; - tileno = memory_region(machine, "user1")[tile_index]; + tileno = machine->region("user1")->base()[tile_index]; palno=bgpalette; if(palno==1) { diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c index 18eeb4f73f4..3f872a6f17a 100644 --- a/src/mame/drivers/puckpkmn.c +++ b/src/mame/drivers/puckpkmn.c @@ -259,8 +259,8 @@ Screenshots available on my site at http://guru.mameworld.info/oldnews2001.html static DRIVER_INIT( puckpkmn ) { - UINT8 *rom = memory_region(machine, "maincpu"); - size_t len = memory_region_length(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); + size_t len = machine->region("maincpu")->bytes(); int i; for (i = 0; i < len; i++) diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c index de224b4d2f7..be98079647c 100644 --- a/src/mame/drivers/qdrmfgp.c +++ b/src/mame/drivers/qdrmfgp.c @@ -127,7 +127,7 @@ static WRITE16_HANDLER( gp2_control_w ) static READ16_HANDLER( v_rom_r ) { device_t *k056832 = space->machine->device("k056832"); - UINT8 *mem8 = memory_region(space->machine, "gfx1"); + UINT8 *mem8 = space->machine->region("gfx1")->base(); int bank = k056832_word_r(k056832, 0x34/2, 0xffff); offset += bank * 0x800 * 4; @@ -623,7 +623,7 @@ static MACHINE_START( qdrmfgp2 ) static MACHINE_RESET( qdrmfgp ) { - sndram = memory_region(machine, "konami") + 0x100000; + sndram = machine->region("konami")->base() + 0x100000; /* reset the IDE controller */ gp2_irq_control = 0; diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c index 1c9265c7f2f..25217f5a72d 100644 --- a/src/mame/drivers/qix.c +++ b/src/mame/drivers/qix.c @@ -1278,8 +1278,8 @@ static DRIVER_INIT( kram3 ) ********************************/ i = 0; - //patch = memory_region(machine, "user1"); - rom = memory_region(machine, "maincpu"); + //patch = machine->region("user1")->base(); + rom = machine->region("maincpu")->base(); decrypted = auto_alloc_array(machine, UINT8, 0x6000); mainspace->set_decrypted_region(0xa000, 0xffff, decrypted); @@ -1291,8 +1291,8 @@ static DRIVER_INIT( kram3 ) } i = 0; - //patch = memory_region(machine, "user2"); - rom = memory_region(machine, "videocpu"); + //patch = machine->region("user2")->base(); + rom = machine->region("videocpu")->base(); decrypted = auto_alloc_array(machine, UINT8, 0x6000); videospace->set_decrypted_region(0xa000, 0xffff, decrypted); @@ -1308,8 +1308,8 @@ static DRIVER_INIT( kram3 ) static DRIVER_INIT( zookeep ) { /* configure the banking */ - memory_configure_bank(machine, "bank1", 0, 1, memory_region(machine, "videocpu") + 0xa000, 0); - memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "videocpu") + 0x10000, 0); + memory_configure_bank(machine, "bank1", 0, 1, machine->region("videocpu")->base() + 0xa000, 0); + memory_configure_bank(machine, "bank1", 1, 1, machine->region("videocpu")->base() + 0x10000, 0); memory_set_bank(machine, "bank1", 0); } diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c index c66e06a0673..0c8bd97e427 100644 --- a/src/mame/drivers/quizdna.c +++ b/src/mame/drivers/quizdna.c @@ -18,13 +18,13 @@ Quiz Gekiretsu Scramble (Gakuen Paradise 2) (c) 1993 Face static WRITE8_HANDLER( quizdna_rombank_w ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); memory_set_bankptr(space->machine, "bank1",&ROM[0x10000+0x4000*(data & 0x3f)]); } static WRITE8_HANDLER( gekiretu_rombank_w ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); memory_set_bankptr(space->machine, "bank1",&ROM[0x10000+0x4000*((data & 0x3f) ^ 0x0a)]); } diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c index eaeab4145f9..09d08481ca6 100644 --- a/src/mame/drivers/quizo.c +++ b/src/mame/drivers/quizo.c @@ -127,7 +127,7 @@ static WRITE8_HANDLER(port60_w) data=0; } port60=data; - memory_set_bankptr(space->machine, "bank1", &memory_region(space->machine, "user1")[rombankLookup[data]*0x4000] ); + memory_set_bankptr(space->machine, "bank1", &space->machine->region("user1")->base()[rombankLookup[data]*0x4000] ); } static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c index 38e2cc42ca1..bbc3ba4ceb1 100644 --- a/src/mame/drivers/quizpun2.c +++ b/src/mame/drivers/quizpun2.c @@ -183,7 +183,7 @@ static READ8_HANDLER( quizpun2_protection_r ) case STATE_EEPROM_R: // EEPROM read { - UINT8 *eeprom = memory_region(space->machine, "eeprom"); + UINT8 *eeprom = space->machine->region("eeprom")->base(); ret = eeprom[prot.addr]; break; } @@ -208,7 +208,7 @@ static WRITE8_HANDLER( quizpun2_protection_w ) { case STATE_EEPROM_W: { - UINT8 *eeprom = memory_region(space->machine, "eeprom"); + UINT8 *eeprom = space->machine->region("eeprom")->base(); eeprom[prot.addr] = data; prot.addr++; if ((prot.addr % 8) == 0) @@ -275,7 +275,7 @@ static WRITE8_HANDLER( quizpun2_protection_w ) static WRITE8_HANDLER( quizpun2_rombank_w ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); memory_set_bankptr(space->machine, "bank1", &ROM[ 0x10000 + 0x2000 * (data & 0x1f) ] ); } diff --git a/src/mame/drivers/r2dx_v33.c b/src/mame/drivers/r2dx_v33.c index 2e3d1f47aa0..48f29e4566c 100644 --- a/src/mame/drivers/r2dx_v33.c +++ b/src/mame/drivers/r2dx_v33.c @@ -200,7 +200,7 @@ static VIDEO_UPDATE( rdx_v33 ) if(frame == 5) { int i,data; - static UINT8 *rom = memory_region(space->machine,"mainprg"); + static UINT8 *rom = space->machine->region("mainprg")->base(); for(i=0;i<0x800;i+=2) { @@ -707,7 +707,7 @@ MACHINE_CONFIG_END static DRIVER_INIT(rdx_v33) { - memory_configure_bank(machine, "bank1", 0, 0x20, memory_region(machine, "mainprg"), 0x20000); + memory_configure_bank(machine, "bank1", 0, 0x20, machine->region("mainprg")->base(), 0x20000); raiden2_decrypt_sprites(machine); @@ -716,7 +716,7 @@ static DRIVER_INIT(rdx_v33) static DRIVER_INIT(nzerotea) { - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "mainprg"), 0x20000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("mainprg")->base(), 0x20000); raiden2_decrypt_sprites(machine); diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index ff4cbca19cd..6904c6afa12 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -492,7 +492,7 @@ static READ32_HANDLER( randomrabbits ) /* rom bank is used when testing roms, not currently hooked up */ static WRITE32_HANDLER ( rabbit_rombank_w ) { - UINT8 *dataroms = memory_region(space->machine, "gfx1"); + UINT8 *dataroms = space->machine->region("gfx1")->base(); #if 0 int bank; printf("rabbit rombank %08x\n",data); @@ -591,7 +591,7 @@ static TIMER_CALLBACK( rabbit_blit_done ) static void rabbit_do_blit(running_machine *machine) { - UINT8 *blt_data = memory_region(machine, "gfx1"); + UINT8 *blt_data = machine->region("gfx1")->base(); int blt_source = (rabbit_blitterregs[0]&0x000fffff)>>0; int blt_column = (rabbit_blitterregs[1]&0x00ff0000)>>16; int blt_line = (rabbit_blitterregs[1]&0x000000ff); diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c index 88b119dbb1f..be7954f161a 100644 --- a/src/mame/drivers/raiden.c +++ b/src/mame/drivers/raiden.c @@ -556,7 +556,7 @@ bit-swapping */ static void common_decrypt(running_machine *machine) { - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); int i; for (i = 0; i < 0x20000; i++) @@ -568,7 +568,7 @@ static void common_decrypt(running_machine *machine) RAM[0xc0000/2 + i] = data; } - RAM = (UINT16 *)memory_region(machine, "sub"); + RAM = (UINT16 *)machine->region("sub")->base(); for (i = 0; i < 0x20000; i++) { diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 405beb18814..a6fb06a04c1 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -2256,14 +2256,14 @@ ROM_END static DRIVER_INIT (raiden2) { - memory_configure_bank(machine, "mainbank", 0, 2, memory_region(machine, "mainprg"), 0x20000); + memory_configure_bank(machine, "mainbank", 0, 2, machine->region("mainprg")->base(), 0x20000); raiden2_decrypt_sprites(machine); } static DRIVER_INIT (xsedae) { /* doesn't have banking */ - //memory_configure_bank(machine, "mainbank", 0, 2, memory_region(machine, "mainprg"), 0x20000); + //memory_configure_bank(machine, "mainbank", 0, 2, machine->region("mainprg")->base(), 0x20000); } /* GAME DRIVERS */ diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c index 9018b5a8aec..d0fc54de772 100644 --- a/src/mame/drivers/rainbow.c +++ b/src/mame/drivers/rainbow.c @@ -872,7 +872,7 @@ ROM_END static DRIVER_INIT( rainbow ) { - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0xc000], 0x4000); @@ -881,7 +881,7 @@ static DRIVER_INIT( rainbow ) static DRIVER_INIT( rainbowe ) { - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0xc000], 0x4000); @@ -891,8 +891,8 @@ static DRIVER_INIT( rainbowe ) static DRIVER_INIT( jumping ) { rainbow_state *state = machine->driver_data(); - int i, len = memory_region_length(machine, "gfx2"); - UINT8 *rom = memory_region(machine, "gfx2"); + int i, len = machine->region("gfx2")->bytes(); + UINT8 *rom = machine->region("gfx2")->base(); /* Sprite colour map is reversed - switch to normal */ diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c index 5a3dcf8d429..84d24d15b80 100644 --- a/src/mame/drivers/rampart.c +++ b/src/mame/drivers/rampart.c @@ -479,7 +479,7 @@ ROM_END static DRIVER_INIT( rampart ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); memcpy(&rom[0x140000], &rom[0x40000], 0x8000); atarigen_slapstic_init(machine->device("maincpu"), 0x140000, 0x438000, 118); diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c index 40fd1c0e6d8..d3491fdf02f 100644 --- a/src/mame/drivers/rastan.c +++ b/src/mame/drivers/rastan.c @@ -182,7 +182,7 @@ static void rastan_msm5205_vck( device_t *device ) } else { - state->adpcm_data = memory_region(device->machine, "adpcm")[state->adpcm_pos]; + state->adpcm_data = device->machine->region("adpcm")->base()[state->adpcm_pos]; state->adpcm_pos = (state->adpcm_pos + 1) & 0xffff; msm5205_data_w(device, state->adpcm_data >> 4); } @@ -365,7 +365,7 @@ static const msm5205_interface msm5205_config = static MACHINE_START( rastan ) { rastan_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 1, &ROM[0x00000], 0x4000); memory_configure_bank(machine, "bank1", 1, 3, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c index 64f41ee1f9d..e70e1eca9ba 100644 --- a/src/mame/drivers/redclash.c +++ b/src/mame/drivers/redclash.c @@ -520,9 +520,9 @@ ROM_END static DRIVER_INIT( redclash ) { int i,j; - const UINT8 *src = memory_region(machine, "gfx2"); - UINT8 *dst = memory_region(machine, "gfx3"); - int len = memory_region_length(machine, "gfx3"); + const UINT8 *src = machine->region("gfx2")->base(); + UINT8 *dst = machine->region("gfx3")->base(); + int len = machine->region("gfx3")->bytes(); /* rearrange the sprite graphics */ for (i = 0;i < len;i++) diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c index 55c4050f1f2..72177b2fcaf 100644 --- a/src/mame/drivers/relief.c +++ b/src/mame/drivers/relief.c @@ -447,7 +447,7 @@ ROM_END static DRIVER_INIT( relief ) { - UINT8 *sound_base = memory_region(machine, "oki"); + UINT8 *sound_base = machine->region("oki")->base(); /* expand the ADPCM data to avoid lots of memcpy's during gameplay */ /* the upper 128k is fixed, the lower 128k is bankswitched */ diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c index a74acb3b895..16bc1867437 100644 --- a/src/mame/drivers/renegade.c +++ b/src/mame/drivers/renegade.c @@ -175,7 +175,7 @@ static DEVICE_START( renegade_adpcm ) struct renegade_adpcm_state *state = &renegade_adpcm; state->playing = 0; state->stream = stream_create(device, 0, 1, device->clock(), state, renegade_adpcm_callback); - state->base = memory_region(machine, "adpcm"); + state->base = machine->region("adpcm")->base(); state->adpcm.reset(); } @@ -249,7 +249,7 @@ static const UINT8 kuniokun_xor_table[0x2a] = static void setbank(running_machine *machine) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &RAM[bank ? 0x10000 : 0x4000]); } diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c index 54e7670db91..e0b9bf8f5d0 100644 --- a/src/mame/drivers/rmhaihai.c +++ b/src/mame/drivers/rmhaihai.c @@ -133,7 +133,7 @@ logerror("%04x: keyboard_w %02x\n",cpu_get_pc(space->cpu),data); static READ8_HANDLER( samples_r ) { - return memory_region(space->machine, "adpcm")[offset]; + return space->machine->region("adpcm")->base()[offset]; } static WRITE8_DEVICE_HANDLER( adpcm_w ) @@ -159,7 +159,7 @@ static WRITE8_HANDLER( ctrl_w ) static WRITE8_HANDLER( themj_rombank_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu") + 0x10000; + UINT8 *rom = space->machine->region("maincpu")->base() + 0x10000; int bank = data & 0x03; logerror("banksw %d\n",bank); memory_set_bankptr(space->machine, "bank1", rom + bank*0x4000); @@ -643,8 +643,8 @@ ROM_END static DRIVER_INIT( rmhaihai ) { - UINT8 *rom = memory_region(machine, "gfx1"); - int size = memory_region_length(machine, "gfx1"); + UINT8 *rom = machine->region("gfx1")->base(); + int size = machine->region("gfx1")->bytes(); int a,b; size /= 2; diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index 39bd20bbfc6..2ddd8724dda 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -274,7 +274,7 @@ static const k007420_interface rockrage_k007420_intf = static MACHINE_START( rockrage ) { rockrage_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c index 60538a27bcf..17a5d4882fe 100644 --- a/src/mame/drivers/rocnrope.c +++ b/src/mame/drivers/rocnrope.c @@ -25,7 +25,7 @@ /* Roc'n'Rope has the IRQ vectors in RAM. The rom contains $FFFF at this address! */ static WRITE8_HANDLER( rocnrope_interrupt_vector_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); RAM[0xfff2 + offset] = data; } diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c index 79f5b4b4d71..315254bb8a3 100644 --- a/src/mame/drivers/rohga.c +++ b/src/mame/drivers/rohga.c @@ -1503,8 +1503,8 @@ static DRIVER_INIT( nitrobal ) static DRIVER_INIT( schmeisr ) { - const UINT8 *src = memory_region(machine, "gfx2"); - UINT8 *dst = memory_region(machine, "gfx1"); + const UINT8 *src = machine->region("gfx2")->base(); + UINT8 *dst = machine->region("gfx1")->base(); memcpy(dst, src, 0x20000); memcpy(dst + 0x20000, src + 0x80000, 0x20000); diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c index e765cdfb2c8..f78a30d3050 100644 --- a/src/mame/drivers/rollerg.c +++ b/src/mame/drivers/rollerg.c @@ -237,7 +237,7 @@ static const k051316_interface rollerg_k051316_intf = static MACHINE_START( rollerg ) { rollerg_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 6, &ROM[0x10000], 0x4000); memory_configure_bank(machine, "bank1", 6, 2, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c index 5d790ab6a9c..67c5d35e73f 100644 --- a/src/mame/drivers/route16.c +++ b/src/mame/drivers/route16.c @@ -942,7 +942,7 @@ static READ8_HANDLER( routex_prot_read ) static DRIVER_INIT( route16 ) { - UINT8 *ROM = memory_region(machine, "cpu1"); + UINT8 *ROM = machine->region("cpu1")->base(); /* Is this actually a bootleg? some of the protection has been removed */ @@ -957,7 +957,7 @@ static DRIVER_INIT( route16 ) static DRIVER_INIT( route16a ) { - UINT8 *ROM = memory_region(machine, "cpu1"); + UINT8 *ROM = machine->region("cpu1")->base(); /* TO DO : Replace these patches with simulation of the protection device */ /* patch the protection */ diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index 8bddad36823..efee0b5c8e5 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -117,8 +117,8 @@ static UINT8 *janptr96_nvram; static PALETTE_INIT( royalmah ) { offs_t i; - const UINT8 *prom = memory_region(machine, "proms"); - int len = memory_region_length(machine, "proms"); + const UINT8 *prom = machine->region("proms")->base(); + int len = machine->region("proms")->bytes(); for (i = 0; i < len; i++) { @@ -152,8 +152,8 @@ static PALETTE_INIT( royalmah ) static PALETTE_INIT( mjderngr ) { offs_t i; - const UINT8 *prom = memory_region(machine, "proms"); - int len = memory_region_length(machine, "proms"); + const UINT8 *prom = machine->region("proms")->base(); + int len = machine->region("proms")->bytes(); for (i = 0; i < len / 2; i++) { @@ -306,7 +306,7 @@ static READ8_HANDLER ( suzume_dsw_r ) static WRITE8_HANDLER ( suzume_bank_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); int address; suzume_bank = data; @@ -322,7 +322,7 @@ logerror("%04x: bank %02x\n",cpu_get_pc(space->cpu),data); static WRITE8_HANDLER ( mjapinky_bank_w ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); rombank = data; memory_set_bankptr(space->machine, "bank1",ROM + 0x10000 + 0x8000 * data); } @@ -338,12 +338,12 @@ static WRITE8_HANDLER( mjapinky_palbank_w ) static READ8_HANDLER( mjapinky_dsw_r ) { if (rombank == 0x0e) return input_port_read(space->machine, "DSW3"); - else return *(memory_region(space->machine, "maincpu") + 0x10000 + 0x8000 * rombank); + else return *(space->machine->region("maincpu")->base() + 0x10000 + 0x8000 * rombank); } static WRITE8_HANDLER ( tontonb_bank_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); int address; logerror("%04x: bank %02x\n",cpu_get_pc(space->cpu),data); @@ -361,7 +361,7 @@ logerror("%04x: bank %02x\n",cpu_get_pc(space->cpu),data); /* bits 5 and 6 seem to affect which Dip Switch to read in 'majs101b' */ static WRITE8_HANDLER ( dynax_bank_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); int address; //logerror("%04x: bank %02x\n",cpu_get_pc(space->cpu),data); @@ -390,7 +390,7 @@ static READ8_HANDLER ( daisyari_dsw_r ) static WRITE8_HANDLER ( daisyari_bank_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); int address; dsw_select = (data & 0xc); @@ -418,7 +418,7 @@ static READ8_HANDLER ( mjclub_dsw_r ) static WRITE8_HANDLER ( mjclub_bank_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); int address; dsw_select = data & 0xc0; @@ -651,7 +651,7 @@ static WRITE8_HANDLER( jansou_6402_w ) static READ8_HANDLER( jansou_6403_r ) { - UINT8 *GFXROM = memory_region(space->machine, "gfx1"); + UINT8 *GFXROM = space->machine->region("gfx1")->base(); int d0 = GFXROM[gfx_adr]; int d1 = GFXROM[gfx_adr+1]; int c0 = jansou_colortable[d1 & 0x0f] & 0x0f; @@ -752,7 +752,7 @@ static READ8_HANDLER( janptr96_dsw_r ) static WRITE8_HANDLER( janptr96_rombank_w ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); memory_set_bankptr(space->machine, "bank1",ROM + 0x10000 + 0x8000 * data); } @@ -805,7 +805,7 @@ static WRITE8_HANDLER( mjifb_coin_counter_w ) static READ8_HANDLER( mjifb_rom_io_r ) { if (mjifb_rom_enable) - return ((UINT8*)(memory_region(space->machine, "maincpu") + 0x10000 + rombank * 0x4000))[offset]; + return ((UINT8*)(space->machine->region("maincpu")->base() + 0x10000 + rombank * 0x4000))[offset]; offset += 0x8000; @@ -916,7 +916,7 @@ ADDRESS_MAP_END static READ8_HANDLER( mjdejavu_rom_io_r ) { if (mjifb_rom_enable) - return ((UINT8*)(memory_region(space->machine, "maincpu") + 0x10000 + rombank * 0x4000))[offset]; + return ((UINT8*)(space->machine->region("maincpu")->base() + 0x10000 + rombank * 0x4000))[offset]; offset += 0x8000; @@ -977,7 +977,7 @@ static READ8_HANDLER( mjtensin_p3_r ) static void mjtensin_update_rombank(running_machine *machine) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x10000 + rombank * 0x8000 ); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0x10000 + rombank * 0x8000 ); } static WRITE8_HANDLER( mjtensin_p4_w ) { @@ -1018,7 +1018,7 @@ ADDRESS_MAP_END static void cafetime_update_rombank(running_machine *machine) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x10000 + rombank * 0x8000 ); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0x10000 + rombank * 0x8000 ); } static WRITE8_HANDLER( cafetime_p4_w ) { @@ -1103,7 +1103,7 @@ static WRITE8_HANDLER( mjvegasa_rombank_w ) static READ8_HANDLER( mjvegasa_rom_io_r ) { if ((rombank & 0x70) != 0x70) - return memory_region(space->machine, "maincpu")[0x10000 + rombank * 0x8000 + offset]; + return space->machine->region("maincpu")->base()[0x10000 + rombank * 0x8000 + offset]; offset += 0x8000; @@ -4641,7 +4641,7 @@ ROM_START( jansoua ) ROM_END -static DRIVER_INIT( ippatsu ) { memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x8000 ); } +static DRIVER_INIT( ippatsu ) { memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0x8000 ); } static DRIVER_INIT( janptr96 ) { diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c index d42ce653c32..d61ee93a495 100644 --- a/src/mame/drivers/rpunch.c +++ b/src/mame/drivers/rpunch.c @@ -138,7 +138,7 @@ static void ym2151_irq_gen(device_t *device, int state) static MACHINE_RESET( rpunch ) { - UINT8 *snd = memory_region(machine, "upd"); + UINT8 *snd = machine->region("upd")->base(); memcpy(snd, snd + 0x20000, 0x20000); } @@ -202,7 +202,7 @@ static WRITE8_DEVICE_HANDLER( upd_control_w ) { if ((data & 1) != upd_rom_bank) { - UINT8 *snd = memory_region(device->machine, "upd"); + UINT8 *snd = device->machine->region("upd")->base(); upd_rom_bank = data & 1; memcpy(snd, snd + 0x20000 * (upd_rom_bank + 1), 0x20000); } diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index 5fd0278eb67..0028d4ec5c2 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -362,7 +362,7 @@ static const k053247_interface rng_k055673_intf = static MACHINE_START( rng ) { rungun_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "soundcpu"); + UINT8 *ROM = machine->region("soundcpu")->base(); memory_configure_bank(machine, "bank2", 0, 8, &ROM[0x10000], 0x4000); diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c index 9e4028a3add..c220355be41 100644 --- a/src/mame/drivers/sandscrp.c +++ b/src/mame/drivers/sandscrp.c @@ -234,7 +234,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( sandscrp_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); int bank = data & 0x07; if ( bank != data ) logerror("CPU #1 - PC %04X: Bank %02X\n",cpu_get_pc(space->cpu),data); diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c index 296baccc605..6f7f36f8066 100644 --- a/src/mame/drivers/sangho.c +++ b/src/mame/drivers/sangho.c @@ -65,7 +65,7 @@ static void pzlestar_map_banks(running_machine *machine) case 2: memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1"); memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0); - memory_set_bankptr(machine, "bank1", memory_region(machine, "user1")+ 0x10000); + memory_set_bankptr(machine, "bank1", machine->region("user1")->base()+ 0x10000); break; case 1: case 3: @@ -87,12 +87,12 @@ static void pzlestar_map_banks(running_machine *machine) case 2: memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank2"); memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0); - memory_set_bankptr(machine, "bank2", memory_region(machine, "user1")+ 0x18000); + memory_set_bankptr(machine, "bank2", machine->region("user1")->base()+ 0x18000); break; case 3: memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0, "bank2"); memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0); - memory_set_bankptr(machine, "bank2", memory_region(machine, "user1")+ 0x20000 + (pzlestar_rom_bank*0x8000) + 0x4000); + memory_set_bankptr(machine, "bank2", machine->region("user1")->base()+ 0x20000 + (pzlestar_rom_bank*0x8000) + 0x4000); break; case 1: memory_unmap_read(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4000, 0x7fff, 0, 0); @@ -113,7 +113,7 @@ static void pzlestar_map_banks(running_machine *machine) case 3: memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, "bank3"); memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0); - memory_set_bankptr(machine, "bank3", memory_region(machine, "user1")+ 0x20000 + (pzlestar_rom_bank*0x8000)); + memory_set_bankptr(machine, "bank3", machine->region("user1")->base()+ 0x20000 + (pzlestar_rom_bank*0x8000)); break; case 1: case 2: @@ -183,18 +183,18 @@ static void sexyboom_map_bank(running_machine *machine, int bank) else { // rom 0 - memory_set_bankptr(machine, read_bank_name, memory_region(machine, "user1")+0x4000*banknum); + memory_set_bankptr(machine, read_bank_name, machine->region("user1")->base()+0x4000*banknum); memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), bank*0x4000, (bank+1)*0x4000 - 1, 0, 0); } } else if (banktype == 0x82) { - memory_set_bankptr(machine, read_bank_name, memory_region(machine, "user1")+0x20000+banknum*0x4000); + memory_set_bankptr(machine, read_bank_name, machine->region("user1")->base()+0x20000+banknum*0x4000); memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), bank*0x4000, (bank+1)*0x4000 - 1, 0, 0); } else if (banktype == 0x80) { - memory_set_bankptr(machine, read_bank_name, memory_region(machine, "user1")+0x120000+banknum*0x4000); + memory_set_bankptr(machine, read_bank_name, machine->region("user1")->base()+0x120000+banknum*0x4000); memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), bank*0x4000, (bank+1)*0x4000 - 1, 0, 0); } else diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c index 9d501b63434..dbb42d1fd64 100644 --- a/src/mame/drivers/sauro.c +++ b/src/mame/drivers/sauro.c @@ -521,7 +521,7 @@ static DRIVER_INIT( tecfri ) /* This game doesn't like all memory to be initialized to zero, it won't initialize the high scores */ - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); memset(&RAM[0xe000], 0, 0x100); RAM[0xe000] = 1; diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index 0a6577c8bc3..c99a3f3287e 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -65,7 +65,7 @@ public: static TILE_GET_INFO( get_sb_tile_info ) { sbowling_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "user1"); + UINT8 *rom = machine->region("user1")->base(); int tileno = rom[tile_index + state->bgmap * 1024]; SET_TILE_INFO(0, tileno, 0, 0); diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c index 181cddc3ec6..45650de0f69 100644 --- a/src/mame/drivers/scregg.c +++ b/src/mame/drivers/scregg.c @@ -391,7 +391,7 @@ static DRIVER_INIT( rockduck ) { // rd2.rdh and rd1.rdj are bitswapped, but not rd3.rdg .. are they really from the same board? int x; - UINT8 *src = memory_region( machine, "gfx1" ); + UINT8 *src = machine->region( "gfx1" )->base(); for (x = 0x2000; x < 0x6000; x++) { diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index 040f8bef4fc..e7c07450140 100644 --- a/src/mame/drivers/segac2.c +++ b/src/mame/drivers/segac2.c @@ -141,8 +141,8 @@ static MACHINE_RESET( segac2 ) /* determine how many sound banks */ sound_banks = 0; - if (memory_region(machine, "upd")) - sound_banks = memory_region_length(machine, "upd") / 0x20000; + if (machine->region("upd")->base()) + sound_banks = machine->region("upd")->bytes() / 0x20000; /* reset the protection */ prot_write_buf = 0; @@ -2169,7 +2169,7 @@ static DRIVER_INIT( ichirjbl ) { /* when did this actually work? - the protection is patched but the new check fails? */ - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); rom[0x390/2] = 0x6600; segac2_common_init(machine, NULL); diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c index a16e392c874..720929a7302 100644 --- a/src/mame/drivers/segae.c +++ b/src/mame/drivers/segae.c @@ -353,7 +353,7 @@ static WRITE8_HANDLER( systeme_bank_w ) segae_set_vram_banks(data); - //memcpy(sms_rom+0x8000, memory_region(space->machine, "user1")+0x10000+rombank*0x4000, 0x4000); + //memcpy(sms_rom+0x8000, space->machine->region("user1")->base()+0x10000+rombank*0x4000, 0x4000); memory_set_bank(space->machine, "bank1", rombank); } @@ -390,7 +390,7 @@ static void init_ports_systeme(running_machine *machine) static void init_systeme_map(running_machine *machine) { - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); /* alternate way of accessing video ram */ memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x8000, 0xbfff, 0, 0, segasyse_videoram_w); diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c index b5fefe4cd4d..324311d8969 100644 --- a/src/mame/drivers/segag80r.c +++ b/src/mame/drivers/segag80r.c @@ -1417,7 +1417,7 @@ static void monsterb_expand_gfx(running_machine *machine, const char *region) /* expand the background ROMs; A11/A12 of each ROM is independently controlled via */ /* banking */ - dest = memory_region(machine, region); + dest = machine->region(region)->base(); temp = auto_alloc_array(machine, UINT8, 0x4000); memcpy(temp, dest, 0x4000); diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c index 3a7e24c3db2..f56a8254f92 100644 --- a/src/mame/drivers/segahang.c +++ b/src/mame/drivers/segahang.c @@ -1857,7 +1857,7 @@ static DRIVER_INIT( enduror ) static DRIVER_INIT( endurobl ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); UINT16 *decrypt = auto_alloc_array(machine, UINT16, 0x40000/2); hangon_generic_init(machine); @@ -1871,7 +1871,7 @@ static DRIVER_INIT( endurobl ) static DRIVER_INIT( endurob2 ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); UINT16 *decrypt = auto_alloc_array(machine, UINT16, 0x40000/2); hangon_generic_init(machine); diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c index 9a10865afba..7b98e082720 100644 --- a/src/mame/drivers/segald.c +++ b/src/mame/drivers/segald.c @@ -596,7 +596,7 @@ ROM_END static DRIVER_INIT( astron ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 2, &ROM[0x8000], 0x4000); } diff --git a/src/mame/drivers/segamsys.c b/src/mame/drivers/segamsys.c index bb7050c7299..ed814471e0e 100644 --- a/src/mame/drivers/segamsys.c +++ b/src/mame/drivers/segamsys.c @@ -1608,13 +1608,13 @@ static WRITE8_HANDLER( mt_sms_standard_rom_bank_w ) //printf("bank ram??\n"); break; case 1: - memcpy(sms_rom+0x0000, memory_region(space->machine, "maincpu")+bank*0x4000, 0x4000); + memcpy(sms_rom+0x0000, space->machine->region("maincpu")->base()+bank*0x4000, 0x4000); break; case 2: - memcpy(sms_rom+0x4000, memory_region(space->machine, "maincpu")+bank*0x4000, 0x4000); + memcpy(sms_rom+0x4000, space->machine->region("maincpu")->base()+bank*0x4000, 0x4000); break; case 3: - memcpy(sms_rom+0x8000, memory_region(space->machine, "maincpu")+bank*0x4000, 0x4000); + memcpy(sms_rom+0x8000, space->machine->region("maincpu")->base()+bank*0x4000, 0x4000); break; } @@ -1623,19 +1623,19 @@ static WRITE8_HANDLER( mt_sms_standard_rom_bank_w ) static WRITE8_HANDLER( codemasters_rom_bank_0000_w ) { int bank = data&0x1f; - memcpy(sms_rom+0x0000, memory_region(space->machine,"maincpu")+bank*0x4000, 0x4000); + memcpy(sms_rom+0x0000, space->machine->region("maincpu")->base()+bank*0x4000, 0x4000); } static WRITE8_HANDLER( codemasters_rom_bank_4000_w ) { int bank = data&0x1f; - memcpy(sms_rom+0x4000, memory_region(space->machine,"maincpu")+bank*0x4000, 0x4000); + memcpy(sms_rom+0x4000, space->machine->region("maincpu")->base()+bank*0x4000, 0x4000); } static WRITE8_HANDLER( codemasters_rom_bank_8000_w ) { int bank = data&0x1f; - memcpy(sms_rom+0x8000, memory_region(space->machine,"maincpu")+bank*0x4000, 0x4000); + memcpy(sms_rom+0x8000, space->machine->region("maincpu")->base()+bank*0x4000, 0x4000); } @@ -1677,7 +1677,7 @@ void megatech_set_genz80_as_sms_standard_map(running_machine *machine, const cha /* fixed rom bank area */ sms_rom = (UINT8 *)memory_install_rom(cputag_get_address_space(machine, tag, ADDRESS_SPACE_PROGRAM), 0x0000, 0xbfff, 0, 0, NULL); - memcpy(sms_rom, memory_region(machine, "maincpu"), 0xc000); + memcpy(sms_rom, machine->region("maincpu")->base(), 0xc000); if (mapper == MAPPER_STANDARD ) { diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index 5a6588bbccf..ace01671ba0 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -2155,22 +2155,22 @@ static DRIVER_INIT( outrunb ) state->custom_io_w = outrun_custom_io_w; /* main CPU: swap bits 11,12 and 6,7 */ - word = (UINT16 *)memory_region(machine, "maincpu"); - length = memory_region_length(machine, "maincpu") / 2; + word = (UINT16 *)machine->region("maincpu")->base(); + length = machine->region("maincpu")->bytes() / 2; for (i = 0; i < length; i++) word[i] = BITSWAP16(word[i], 15,14,11,12,13,10,9,8,6,7,5,4,3,2,1,0); /* sub CPU: swap bits 14,15 and 2,3 */ - word = (UINT16 *)memory_region(machine, "sub"); - length = memory_region_length(machine, "sub") / 2; + word = (UINT16 *)machine->region("sub")->base(); + length = machine->region("sub")->bytes() / 2; for (i = 0; i < length; i++) word[i] = BITSWAP16(word[i], 14,15,13,12,11,10,9,8,7,6,5,4,2,3,1,0); /* road gfx */ /* rom a-2.bin: swap bits 6,7 */ /* rom a-3.bin: swap bits 5,6 */ - byte = memory_region(machine, "gfx3"); - length = memory_region_length(machine, "gfx3") / 2; + byte = machine->region("gfx3")->base(); + length = machine->region("gfx3")->bytes() / 2; for (i = 0; i < length; i++) { byte[i] = BITSWAP8(byte[i], 6,7,5,4,3,2,1,0); @@ -2178,8 +2178,8 @@ static DRIVER_INIT( outrunb ) } /* Z80 code: swap bits 5,6 */ - byte = memory_region(machine, "soundcpu"); - length = memory_region_length(machine, "soundcpu"); + byte = machine->region("soundcpu")->base(); + length = machine->region("soundcpu")->bytes(); for (i = 0; i < length; i++) byte[i] = BITSWAP8(byte[i], 7,5,6,4,3,2,1,0); } diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c index 0cf7243695c..097d6c8dd98 100644 --- a/src/mame/drivers/segas16a.c +++ b/src/mame/drivers/segas16a.c @@ -450,7 +450,7 @@ static WRITE8_HANDLER( n7751_command_w ) */ segas1x_state *state = space->machine->driver_data(); - int numroms = memory_region_length(space->machine, "n7751data") / 0x8000; + int numroms = space->machine->region("n7751data")->bytes() / 0x8000; state->n7751_rom_address &= 0x3fff; state->n7751_rom_address |= (data & 0x01) << 14; if (!(data & 0x02) && numroms >= 1) state->n7751_rom_address |= 0x00000; @@ -495,7 +495,7 @@ static READ8_HANDLER( n7751_rom_r ) { /* read from BUS */ segas1x_state *state = space->machine->driver_data(); - return memory_region(space->machine, "n7751data")[state->n7751_rom_address]; + return space->machine->region("n7751data")->base()[state->n7751_rom_address]; } @@ -970,11 +970,11 @@ static READ8_HANDLER( mcu_io_r ) return maincpu_byte_r(space->machine, 0x840001 ^ offset); case 5: - return memory_region(space->machine, "maincpu")[0x00000 + offset]; + return space->machine->region("maincpu")->base()[0x00000 + offset]; case 6: - return memory_region(space->machine, "maincpu")[0x10000 + offset]; + return space->machine->region("maincpu")->base()[0x10000 + offset]; case 7: - return memory_region(space->machine, "maincpu")[0x20000 + offset]; + return space->machine->region("maincpu")->base()[0x20000 + offset]; default: logerror("%03X: MCU movx read mode %02X offset %04X\n", diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index 8e2f83f3431..43190beb73b 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -1318,7 +1318,7 @@ static WRITE16_HANDLER( unknown_rgn2_w ) static WRITE8_DEVICE_HANDLER( upd7759_control_w ) { segas1x_state *state = device->machine->driver_data(); - int size = memory_region_length(device->machine, "soundcpu") - 0x10000; + int size = device->machine->region("soundcpu")->bytes() - 0x10000; if (size > 0) { int bankoffs = 0; @@ -1375,7 +1375,7 @@ static WRITE8_DEVICE_HANDLER( upd7759_control_w ) bankoffs += (data & 0x07) * 0x04000; break; } - memory_set_bankptr(device->machine, "bank1", memory_region(device->machine, "soundcpu") + 0x10000 + (bankoffs % size)); + memory_set_bankptr(device->machine, "bank1", device->machine->region("soundcpu")->base() + 0x10000 + (bankoffs % size)); } } @@ -6735,8 +6735,8 @@ static WRITE16_HANDLER( isgsm_cart_addr_low_w ) // when reading from this port the data is xored by a fixed value depending on the cart static READ16_HANDLER( isgsm_cart_data_r ) { - int size = memory_region_length(space->machine,"gamecart_rgn"); - UINT8* rgn = memory_region(space->machine,"gamecart_rgn"); + int size = space->machine->region("gamecart_rgn")->bytes(); + UINT8* rgn = space->machine->region("gamecart_rgn")->base(); isgsm_cart_addr++; @@ -6760,16 +6760,16 @@ static WRITE16_HANDLER( isgsm_data_w ) switch (isgsm_type&0x0f) { - case 0x0: dest = memory_region(space->machine,"gfx2"); + case 0x0: dest = space->machine->region("gfx2")->base(); break; - case 0x1: dest = memory_region(space->machine,"gfx1"); + case 0x1: dest = space->machine->region("gfx1")->base(); break; - case 0x2: dest = memory_region(space->machine,"soundcpu"); + case 0x2: dest = space->machine->region("soundcpu")->base(); break; - case 0x3: dest = memory_region(space->machine,"maincpu"); + case 0x3: dest = space->machine->region("maincpu")->base(); break; default: // no other cases? @@ -6880,7 +6880,7 @@ static WRITE16_HANDLER( isgsm_data_w ) dest[isgsm_addr] = byte; - if (dest == memory_region(space->machine,"gfx1")) + if (dest == space->machine->region("gfx1")->base()) { // we need to re-decode the tiles if writing to this area to keep MAME happy @@ -6974,14 +6974,14 @@ static WRITE16_HANDLER( isgsm_main_bank_change_w ) // other values on real hw have strange results, change memory mapping etc?? if (data==1) { - memory_set_bankptr(space->machine,ISGSM_MAIN_BANK, memory_region(space->machine, "maincpu")); + memory_set_bankptr(space->machine,ISGSM_MAIN_BANK, space->machine->region("maincpu")->base()); } } static MACHINE_START( isgsm ) { - memory_set_bankptr(machine,ISGSM_CART_BANK, memory_region(machine, "gamecart_rgn")); - memory_set_bankptr(machine,ISGSM_MAIN_BANK, memory_region(machine, "bios")); + memory_set_bankptr(machine,ISGSM_CART_BANK, machine->region("gamecart_rgn")->base()); + memory_set_bankptr(machine,ISGSM_MAIN_BANK, machine->region("bios")->base()); } static ADDRESS_MAP_START( isgsm_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -7140,8 +7140,8 @@ static MACHINE_RESET( isgsm ) for (int i = 0; i < 16; i++) segaic16_sprites_set_bank(machine, 0, i, i); - memory_set_bankptr(machine,ISGSM_CART_BANK, memory_region(machine, "gamecart_rgn")); - memory_set_bankptr(machine,ISGSM_MAIN_BANK, memory_region(machine, "bios")); + memory_set_bankptr(machine,ISGSM_CART_BANK, machine->region("gamecart_rgn")->base()); + memory_set_bankptr(machine,ISGSM_MAIN_BANK, machine->region("bios")->base()); devtag_reset( machine, "maincpu" ); } @@ -7169,7 +7169,7 @@ DRIVER_INIT( isgsm ) // decrypt the bios... UINT16* temp = (UINT16*)malloc(0x20000); - UINT16* rom = (UINT16*)memory_region(machine, "bios"); + UINT16* rom = (UINT16*)machine->region("bios")->base(); int i; for (i=0;i<0x10000;i++) @@ -7186,7 +7186,7 @@ DRIVER_INIT( shinfz ) DRIVER_INIT_CALL( isgsm ); UINT16* temp = (UINT16*)malloc(0x200000); - UINT16* rom = (UINT16*)memory_region(machine, "gamecart_rgn"); + UINT16* rom = (UINT16*)machine->region("gamecart_rgn")->base(); int i; for (i=0;i<0x100000;i++) @@ -7206,7 +7206,7 @@ DRIVER_INIT( tetrbx ) DRIVER_INIT_CALL( isgsm ); UINT16* temp = (UINT16*)malloc(0x80000); - UINT16* rom = (UINT16*)memory_region(machine, "gamecart_rgn"); + UINT16* rom = (UINT16*)machine->region("gamecart_rgn")->base(); int i; for (i=0;i<0x80000/2;i++) diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index 7651af04d16..ee3a11246ba 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -429,7 +429,7 @@ static WRITE16_HANDLER( rom_5987_bank_w ) /* sprite banking */ else { - int maxbanks = memory_region_length(space->machine, "gfx2") / 0x40000; + int maxbanks = space->machine->region("gfx2")->bytes() / 0x40000; if (data >= maxbanks) data = 255; segaic16_sprites_set_bank(space->machine, 0, (offset - 8) * 2 + 0, data * 2 + 0); @@ -587,7 +587,7 @@ static WRITE16_HANDLER( wwally_custom_io_w ) static WRITE8_HANDLER( soundbank_w ) { - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "soundcpu") + 0x10000 + 0x2000 * data); + memory_set_bankptr(space->machine, "bank1", space->machine->region("soundcpu")->base() + 0x10000 + 0x2000 * data); } diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c index d39212526f8..aa2bc1ba6eb 100644 --- a/src/mame/drivers/segas24.c +++ b/src/mame/drivers/segas24.c @@ -426,7 +426,7 @@ static WRITE16_HANDLER( fdc_w ) break; case 0x9: logerror("Read multiple [%02x] %d..%d side %d track %d\n", data, fdc_sector, fdc_sector+fdc_data-1, data & 8 ? 1 : 0, fdc_phys_track); - fdc_pt = memory_region(space->machine, "floppy") + track_size*(2*fdc_phys_track+(data & 8 ? 1 : 0)); + fdc_pt = space->machine->region("floppy")->base() + track_size*(2*fdc_phys_track+(data & 8 ? 1 : 0)); fdc_span = track_size; fdc_status = 3; fdc_drq = 1; @@ -434,7 +434,7 @@ static WRITE16_HANDLER( fdc_w ) break; case 0xb: logerror("Write multiple [%02x] %d..%d side %d track %d\n", data, fdc_sector, fdc_sector+fdc_data-1, data & 8 ? 1 : 0, fdc_phys_track); - fdc_pt = memory_region(space->machine, "floppy") + track_size*(2*fdc_phys_track+(data & 8 ? 1 : 0)); + fdc_pt = space->machine->region("floppy")->base() + track_size*(2*fdc_phys_track+(data & 8 ? 1 : 0)); fdc_span = track_size; fdc_status = 3; fdc_drq = 1; @@ -710,7 +710,7 @@ static UINT8 curbank; static void reset_bank(running_machine *machine) { - if (memory_region(machine, "romboard")) + if (machine->region("romboard")->base()) { memory_set_bank(machine, "bank1", curbank & 15); memory_set_bank(machine, "bank2", curbank & 15); @@ -1071,14 +1071,14 @@ static NVRAM_HANDLER(system24) if(!track_size || !file) return; if(read_or_write) - mame_fwrite(file, memory_region(machine, "floppy"), 2*track_size); + mame_fwrite(file, machine->region("floppy")->base(), 2*track_size); else - mame_fread(file, memory_region(machine, "floppy"), 2*track_size); + mame_fread(file, machine->region("floppy")->base(), 2*track_size); } static MACHINE_START( system24 ) { - UINT8 *usr1 = memory_region(machine, "romboard"); + UINT8 *usr1 = machine->region("romboard")->base(); if (usr1) { memory_configure_bank(machine, "bank1", 0, 16, usr1, 0x40000); diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index 183ae18af76..86b06c81759 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -1166,14 +1166,14 @@ static void ym3438_irq_handler(device_t *device, int state) static WRITE8_HANDLER( sound_bank_lo_w ) { sound_bank = (sound_bank & ~0x3f) | (data & 0x3f); - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "soundcpu") + 0x100000 + 0x2000 * sound_bank); + memory_set_bankptr(space->machine, "bank1", space->machine->region("soundcpu")->base() + 0x100000 + 0x2000 * sound_bank); } static WRITE8_HANDLER( sound_bank_hi_w ) { sound_bank = (sound_bank & 0x3f) | ((data & 0x04) << 4) | ((data & 0x03) << 7); - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "soundcpu") + 0x100000 + 0x2000 * sound_bank); + memory_set_bankptr(space->machine, "bank1", space->machine->region("soundcpu")->base() + 0x100000 + 0x2000 * sound_bank); } @@ -4126,7 +4126,7 @@ static DRIVER_INIT( holo ) static DRIVER_INIT( jpark ) { /* Temp. Patch until we emulate the 'Drive Board', thanks to Malice */ - UINT16 *pROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *pROM = (UINT16 *)machine->region("maincpu")->base(); segas32_common_init(analog_custom_io_r, analog_custom_io_w); diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 6d4bae8739f..5c7bc3c5598 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -1009,8 +1009,8 @@ static READ8_HANDLER( z80_coin_r ) static READ32_HANDLER( soundrom_r ) { - UINT8 *sound = (UINT8*)memory_region(space->machine, "user2"); - UINT16 *sound16 = (UINT16*)memory_region(space->machine, "user2"); + UINT8 *sound = (UINT8*)space->machine->region("user2")->base(); + UINT16 *sound16 = (UINT16*)space->machine->region("user2")->base(); if (mem_mask == 0x000000ff) { @@ -1821,9 +1821,9 @@ static MACHINE_START( spi ) static MACHINE_RESET( spi ) { int i; - UINT8 *sound = memory_region(machine, "ymf"); + UINT8 *sound = machine->region("ymf")->base(); - UINT8 *rombase = memory_region(machine, "user1"); + UINT8 *rombase = machine->region("user1")->base(); UINT8 flash_data = rombase[0x1ffffc]; cputag_set_input_line(machine, "soundcpu", INPUT_LINE_RESET, ASSERT_LINE ); @@ -1905,7 +1905,7 @@ static MACHINE_START( sxx2f ) static MACHINE_RESET( sxx2f ) { - UINT8 *rom = memory_region(machine, "soundcpu"); + UINT8 *rom = machine->region("soundcpu")->base(); memory_set_bankptr(machine, "bank4", z80_rom); memory_set_bankptr(machine, "bank5", z80_rom); @@ -2082,9 +2082,9 @@ static void init_spi(running_machine *machine) flash[0] = machine->device("flash0"); flash[1] = machine->device("flash1"); - seibuspi_text_decrypt(memory_region(machine, "gfx1")); - seibuspi_bg_decrypt(memory_region(machine, "gfx2"), memory_region_length(machine, "gfx2")); - seibuspi_sprite_decrypt(memory_region(machine, "gfx3"), 0x400000); + seibuspi_text_decrypt(machine->region("gfx1")->base()); + seibuspi_bg_decrypt(machine->region("gfx2")->base(), machine->region("gfx2")->bytes()); + seibuspi_sprite_decrypt(machine->region("gfx3")->base(), 0x400000); } static DRIVER_INIT( rdft ) @@ -2145,9 +2145,9 @@ static void init_rf2(running_machine *machine) flash[1] = machine->device("flash1"); memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0282AC, 0x0282AF, 0, 0, rf2_speedup_r ); - seibuspi_rise10_text_decrypt(memory_region(machine, "gfx1")); - seibuspi_rise10_bg_decrypt(memory_region(machine, "gfx2"), memory_region_length(machine, "gfx2")); - seibuspi_rise10_sprite_decrypt(memory_region(machine, "gfx3"), 0x600000); + seibuspi_rise10_text_decrypt(machine->region("gfx1")->base()); + seibuspi_rise10_bg_decrypt(machine->region("gfx2")->base(), machine->region("gfx2")->bytes()); + seibuspi_rise10_sprite_decrypt(machine->region("gfx3")->base(), 0x600000); memory_install_write32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x560, 0x563, 0, 0, sprite_dma_start_w); } @@ -2169,9 +2169,9 @@ static void init_rfjet(running_machine *machine) flash[1] = machine->device("flash1"); memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x002894c, 0x002894f, 0, 0, rfjet_speedup_r ); - seibuspi_rise11_text_decrypt(memory_region(machine, "gfx1")); - seibuspi_rise11_bg_decrypt(memory_region(machine, "gfx2"), memory_region_length(machine, "gfx2")); - seibuspi_rise11_sprite_decrypt_rfjet(memory_region(machine, "gfx3"), 0x800000); + seibuspi_rise11_text_decrypt(machine->region("gfx1")->base()); + seibuspi_rise11_bg_decrypt(machine->region("gfx2")->base(), machine->region("gfx2")->bytes()); + seibuspi_rise11_sprite_decrypt_rfjet(machine->region("gfx3")->base(), 0x800000); memory_install_write32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x560, 0x563, 0, 0, sprite_dma_start_w); } @@ -2236,11 +2236,11 @@ MACHINE_CONFIG_END static DRIVER_INIT( sys386f2 ) { int i, j; - UINT16 *src = (UINT16 *)memory_region(machine, "gfx3"); + UINT16 *src = (UINT16 *)machine->region("gfx3")->base(); UINT16 tmp[0x40 / 2], Offset; // sprite_reorder() only - for(i = 0; i < memory_region_length(machine, "gfx3") / 0x40; i++) + for(i = 0; i < machine->region("gfx3")->bytes() / 0x40; i++) { memcpy(tmp, src, 0x40); diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 8660579c884..69f0dc5a2bf 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -2921,7 +2921,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( sub_bankswitch_w ) { - UINT8 *rom = memory_region(space->machine, "sub"); + UINT8 *rom = space->machine->region("sub")->base(); int bank = data >> 4; memory_set_bankptr(space->machine, "bank1", &rom[bank * 0x4000 + 0xc000]); @@ -9914,7 +9914,7 @@ static DRIVER_INIT( arbalest ) static DRIVER_INIT( metafox ) { - UINT16 *RAM = (UINT16 *) memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *) machine->region("maincpu")->base(); /* This game uses the 21c000-21ffff area for protection? */ // memory_nop_readwrite(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x21c000, 0x21ffff, 0, 0); @@ -9937,7 +9937,7 @@ static DRIVER_INIT ( blandia ) rom_size = 0x80000; buf = auto_alloc_array(machine, UINT8, rom_size); - rom = memory_region(machine, "gfx2") + 0x40000; + rom = machine->region("gfx2")->base() + 0x40000; for (rpos = 0; rpos < rom_size/2; rpos++) { buf[rpos+0x40000] = rom[rpos*2]; @@ -9946,7 +9946,7 @@ static DRIVER_INIT ( blandia ) memcpy( rom, buf, rom_size ); - rom = memory_region(machine, "gfx3") + 0x40000; + rom = machine->region("gfx3")->base() + 0x40000; for (rpos = 0; rpos < rom_size/2; rpos++) { buf[rpos+0x40000] = rom[rpos*2]; @@ -9974,7 +9974,7 @@ static DRIVER_INIT( zombraid ) static DRIVER_INIT( kiwame ) { - UINT16 *RAM = (UINT16 *) memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *) machine->region("maincpu")->base(); /* WARNING: This game writes to the interrupt vector table. Lev 1 routine address is stored at $100 */ @@ -9996,8 +9996,8 @@ static DRIVER_INIT( wiggie ) UINT8 temp[16]; int i,j; - src = memory_region(machine, "maincpu"); - len = memory_region_length(machine, "maincpu"); + src = machine->region("maincpu")->base(); + len = machine->region("maincpu")->bytes(); for (i = 0;i < len;i += 16) { memcpy(temp,&src[i],16); @@ -10027,7 +10027,7 @@ static DRIVER_INIT( wiggie ) static DRIVER_INIT( crazyfgt ) { seta_state *state = machine->driver_data(); - UINT16 *RAM = (UINT16 *) memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *) machine->region("maincpu")->base(); // protection check at boot RAM[0x1078/2] = 0x4e71; @@ -10045,7 +10045,7 @@ static DRIVER_INIT( crazyfgt ) static DRIVER_INIT( inttoote ) { seta_state *state = machine->driver_data(); - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // missing / unused video regs state->vregs = auto_alloc_array_clear(machine, UINT16, 3); @@ -10060,7 +10060,7 @@ static DRIVER_INIT( inttoote ) static DRIVER_INIT( inttootea ) { seta_state *state = machine->driver_data(); - //UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + //UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // missing / unused video regs state->vregs = auto_alloc_array_clear(machine, UINT16, 3); diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 2d3d762a83e..3f1ca48df39 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -550,8 +550,8 @@ static WRITE16_HANDLER( seta2_sound_bank_w ) { if (ACCESSING_BITS_0_7) { - UINT8 *ROM = memory_region( space->machine, "x1snd" ); - int banks = (memory_region_length( space->machine, "x1snd" ) - 0x100000) / 0x20000; + UINT8 *ROM = space->machine->region( "x1snd" )->base(); + int banks = (space->machine->region( "x1snd" )->bytes() - 0x100000) / 0x20000; if (data >= banks) { logerror("CPU #0 PC %06X: invalid sound bank %04X\n",cpu_get_pc(space->cpu),data); @@ -754,7 +754,7 @@ ADDRESS_MAP_END static READ16_HANDLER( pzlbowl_protection_r ) { UINT32 address = (space->read_word(0x20ba16) << 16) | space->read_word(0x20ba18); - return memory_region(space->machine, "maincpu")[address - 2]; + return space->machine->region("maincpu")->base()[address - 2]; } static READ16_HANDLER( pzlbowl_coins_r ) @@ -2816,8 +2816,8 @@ ROM_END static DRIVER_INIT( funcube2 ) { - UINT32 *main_cpu = (UINT32 *) memory_region(machine, "maincpu"); - UINT16 *sub_cpu = (UINT16 *) memory_region(machine, "sub"); + UINT32 *main_cpu = (UINT32 *) machine->region("maincpu")->base(); + UINT16 *sub_cpu = (UINT16 *) machine->region("sub")->base(); main_cpu[0x810/4] = 0xe0214e71; main_cpu[0x814/4] = 0x4e71203c; @@ -2836,8 +2836,8 @@ static DRIVER_INIT( funcube2 ) // Note: same as funcube2 static DRIVER_INIT( funcube4 ) { - UINT32 *main_cpu = (UINT32 *) memory_region(machine, "maincpu"); - UINT16 *sub_cpu = (UINT16 *) memory_region(machine, "sub"); + UINT32 *main_cpu = (UINT32 *) machine->region("maincpu")->base(); + UINT16 *sub_cpu = (UINT16 *) machine->region("sub")->base(); main_cpu[0x810/4] = 0xe0214e71; main_cpu[0x814/4] = 0x4e71203c; diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c index 51a3272de2a..fe16eda1b68 100644 --- a/src/mame/drivers/sf.c +++ b/src/mame/drivers/sf.c @@ -174,7 +174,7 @@ static READ16_HANDLER( button2_r ) static WRITE8_HANDLER( sound2_bank_w ) { - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "audio2") + 0x8000 * (data + 1)); + memory_set_bankptr(space->machine, "bank1", space->machine->region("audio2")->base() + 0x8000 * (data + 1)); } diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index 4c32c8a3350..c84b617ff3d 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -1085,7 +1085,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( sfbonus_bank_w ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); UINT8 bank; bank = data & 7; @@ -1217,7 +1217,7 @@ GFXDECODE_END static MACHINE_RESET( sfbonus ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &ROM[0]); } @@ -1235,12 +1235,12 @@ static NVRAM_HANDLER( sfbonus ) } else { - UINT8* defaultram = memory_region(machine, "defaults"); + UINT8* defaultram = machine->region("defaults")->base(); memset(nvram,0x00,nvram_size); if (defaultram) if ((defaultram[0x02]==0x00) && (defaultram[0x03]==0x00)) // hack! rom region optional regions get cleared with garbage if no rom is present, this is not good! - memcpy(nvram, memory_region(machine, "defaults"), memory_region_length(machine, "defaults")); + memcpy(nvram, machine->region("defaults")->base(), machine->region("defaults")->bytes()); } } } @@ -5465,7 +5465,7 @@ static DRIVER_INIT( sfbonus_common) state_save_register_global_pointer(machine, sfbonus_reel4_ram , 0x0800); // hack, because the debugger is broken - sfbonus_videoram = memory_region(machine, "debugram"); + sfbonus_videoram = machine->region("debugram")->base(); if (!sfbonus_videoram) sfbonus_videoram = auto_alloc_array(machine, UINT8, 0x10000); @@ -5475,9 +5475,9 @@ static DRIVER_INIT( sfbonus_common) // dummy.rom helper { - UINT8 *ROM = memory_region(machine, "maincpu"); - int length = memory_region_length(machine, "maincpu"); - UINT8* ROM2 = memory_region(machine, "user1"); + UINT8 *ROM = machine->region("maincpu")->base(); + int length = machine->region("maincpu")->bytes(); + UINT8* ROM2 = machine->region("user1")->base(); if (ROM2) { @@ -5527,9 +5527,9 @@ static void sfbonus_bitswap( running_machine* machine, { int i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); - for(i = 0; i < memory_region_length(machine, "maincpu"); i++) + for(i = 0; i < machine->region("maincpu")->bytes(); i++) { UINT8 x = ROM[i]; diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c index 29a987949da..0108abe150a 100644 --- a/src/mame/drivers/sfkick.c +++ b/src/mame/drivers/sfkick.c @@ -91,7 +91,7 @@ static void sfkick_remap_banks(running_machine *machine) { case 0: /* bios */ { - UINT8 *mem = memory_region(machine, "bios"); + UINT8 *mem = machine->region("bios")->base(); memory_set_bankptr(machine,"bank1", mem); memory_set_bankptr(machine,"bank2", mem+0x2000); } @@ -99,7 +99,7 @@ static void sfkick_remap_banks(running_machine *machine) case 1: /* ext rom */ { - UINT8 *mem = memory_region(machine, "extrom"); + UINT8 *mem = machine->region("extrom")->base(); memory_set_bankptr(machine,"bank1", mem+0x4000); memory_set_bankptr(machine,"bank2", mem+0x6000); } @@ -107,7 +107,7 @@ static void sfkick_remap_banks(running_machine *machine) case 2: /* banked */ { - UINT8 *mem = memory_region(machine, "banked"); + UINT8 *mem = machine->region("banked")->base(); memory_set_bankptr(machine,"bank1", mem+0x2000*sfkick_bank[0]); memory_set_bankptr(machine,"bank2", mem+0x2000*sfkick_bank[1]); } @@ -115,7 +115,7 @@ static void sfkick_remap_banks(running_machine *machine) case 3: /* unknown */ { - UINT8 *mem = memory_region(machine, "banked"); + UINT8 *mem = machine->region("banked")->base(); memory_set_bankptr(machine,"bank1", mem+0x18000); memory_set_bankptr(machine,"bank2", mem+0x18000); } @@ -127,7 +127,7 @@ static void sfkick_remap_banks(running_machine *machine) { case 0: /* bios - upper part */ { - UINT8 *mem = memory_region(machine, "bios"); + UINT8 *mem = machine->region("bios")->base(); memory_set_bankptr(machine,"bank3", mem+0x4000); memory_set_bankptr(machine,"bank4", mem+0x6000); } @@ -136,7 +136,7 @@ static void sfkick_remap_banks(running_machine *machine) case 1: /* unknown */ case 3: { - UINT8 *mem = memory_region(machine, "banked"); + UINT8 *mem = machine->region("banked")->base(); memory_set_bankptr(machine,"bank3", mem+0x18000); memory_set_bankptr(machine,"bank4", mem+0x18000); } @@ -144,7 +144,7 @@ static void sfkick_remap_banks(running_machine *machine) case 2: /* banked */ { - UINT8 *mem = memory_region(machine, "banked"); + UINT8 *mem = machine->region("banked")->base(); memory_set_bankptr(machine,"bank3", mem+0x2000*sfkick_bank[2]); memory_set_bankptr(machine,"bank4", mem+0x2000*sfkick_bank[3]); } @@ -156,7 +156,7 @@ static void sfkick_remap_banks(running_machine *machine) { case 0: /* cartridge */ { - UINT8 *mem = memory_region(machine, "cartridge"); + UINT8 *mem = machine->region("cartridge")->base(); memory_set_bankptr(machine,"bank5", mem+0x4000); memory_set_bankptr(machine,"bank6", mem+0x6000); } @@ -165,7 +165,7 @@ static void sfkick_remap_banks(running_machine *machine) case 1: /* unknown */ case 3: { - UINT8 *mem = memory_region(machine, "banked"); + UINT8 *mem = machine->region("banked")->base(); memory_set_bankptr(machine,"bank5", mem+0x18000); memory_set_bankptr(machine,"bank6", mem+0x18000); } @@ -173,7 +173,7 @@ static void sfkick_remap_banks(running_machine *machine) case 2: /* banked */ { - UINT8 *mem = memory_region(machine, "banked"); + UINT8 *mem = machine->region("banked")->base(); memory_set_bankptr(machine,"bank5", mem+0x2000*sfkick_bank[4]); memory_set_bankptr(machine,"bank6", mem+0x2000*sfkick_bank[5]); } @@ -186,7 +186,7 @@ static void sfkick_remap_banks(running_machine *machine) case 0: /* unknown */ case 1: { - UINT8 *mem = memory_region(machine, "banked"); + UINT8 *mem = machine->region("banked")->base(); memory_set_bankptr(machine,"bank7", mem+0x18000); memory_set_bankptr(machine,"bank8", mem+0x18000); } @@ -194,7 +194,7 @@ static void sfkick_remap_banks(running_machine *machine) case 2: /* banked */ { - UINT8 *mem = memory_region(machine, "banked"); + UINT8 *mem = machine->region("banked")->base(); memory_set_bankptr(machine,"bank7", mem+0x2000*sfkick_bank[6]); memory_set_bankptr(machine,"bank8", mem+0x2000*sfkick_bank[7]); } diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c index 6b6d5a98850..ea42929d6e5 100644 --- a/src/mame/drivers/shangha3.c +++ b/src/mame/drivers/shangha3.c @@ -59,7 +59,7 @@ static WRITE16_HANDLER( shangha3_prot_w ) static READ16_HANDLER( heberpop_gfxrom_r ) { - UINT8 *ROM = memory_region(space->machine, "gfx1"); + UINT8 *ROM = space->machine->region("gfx1")->base(); return ROM[2*offset] | (ROM[2*offset+1] << 8); } diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c index 1da2a74353b..393e76f3bfa 100644 --- a/src/mame/drivers/shangkid.c +++ b/src/mame/drivers/shangkid.c @@ -134,8 +134,8 @@ static DRIVER_INIT( shangkid ) shangkid_gfx_type = 1; /* set up banking */ - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x8000, 0x8000); - memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "audiocpu") + 0x0000, 0x10000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0x8000, 0x8000); + memory_configure_bank(machine, "bank2", 0, 2, machine->region("audiocpu")->base() + 0x0000, 0x10000); } /***************************************************************************************/ diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c index 63cdc084087..e1148d309dd 100644 --- a/src/mame/drivers/shootout.c +++ b/src/mame/drivers/shootout.c @@ -410,9 +410,9 @@ ROM_END static DRIVER_INIT( shootout ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - int length = memory_region_length(machine, "maincpu"); + int length = machine->region("maincpu")->bytes(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, length - 0x8000); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int A; space->set_decrypted_region(0x8000, 0xffff, decrypt); @@ -420,13 +420,13 @@ static DRIVER_INIT( shootout ) for (A = 0x8000;A < length;A++) decrypt[A-0x8000] = (rom[A] & 0x9f) | ((rom[A] & 0x40) >> 1) | ((rom[A] & 0x20) << 1); - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); memory_configure_bank_decrypted(machine, "bank1", 0, 16, decrypt + 0x8000, 0x4000); } static DRIVER_INIT( shootouj ) { - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); } diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c index a44acab8701..4b0e84f13b8 100644 --- a/src/mame/drivers/sidearms.c +++ b/src/mame/drivers/sidearms.c @@ -44,7 +44,7 @@ Notes: static WRITE8_HANDLER( sidearms_bankswitch_w ) { int bankaddress; - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); /* bits 0 and 1 select the ROM bank */ @@ -124,7 +124,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( whizz_bankswitch_w ) { int bankaddress; - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); int bank = 0; switch (data & 0xC0) diff --git a/src/mame/drivers/sigmab52.c b/src/mame/drivers/sigmab52.c index 2e17fd5d949..ba4cc039657 100644 --- a/src/mame/drivers/sigmab52.c +++ b/src/mame/drivers/sigmab52.c @@ -279,7 +279,7 @@ static READ8_HANDLER(unk_f700_r) static WRITE8_HANDLER(unk_f710_w) { - memory_set_bankptr(space->machine, "bank1" ,&memory_region(space->machine, "maincpu")[0x10000 + ((data&0x80)?0x4000:0x0000)]); + memory_set_bankptr(space->machine, "bank1" ,&space->machine->region("maincpu")->base()[0x10000 + ((data&0x80)?0x4000:0x0000)]); } static READ8_HANDLER(unk_f721_r) @@ -527,11 +527,11 @@ static INTERRUPT_GEN( timer_irq ) static MACHINE_START(jwildb52) { - memory_set_bankptr(machine, "bank1", &memory_region(machine, "maincpu")[0x10000 + 0x0000]); + memory_set_bankptr(machine, "bank1", &machine->region("maincpu")->base()[0x10000 + 0x0000]); - memory_set_bankptr(machine, "bank2", &memory_region(machine, "maincpu")[0x10000 + 0xf800]); + memory_set_bankptr(machine, "bank2", &machine->region("maincpu")->base()[0x10000 + 0xf800]); - memory_set_bankptr(machine, "bank3", &memory_region(machine, "maincpu")[0x10000 + 0x8000]); + memory_set_bankptr(machine, "bank3", &machine->region("maincpu")->base()[0x10000 + 0x8000]); /* @@ -545,7 +545,7 @@ static MACHINE_START(jwildb52) */ { - UINT16 *rom = (UINT16*)memory_region(machine, "gfx1"); + UINT16 *rom = (UINT16*)machine->region("gfx1")->base(); int i; device_t *hd63484 = machine->device("hd63484"); diff --git a/src/mame/drivers/sigmab98.c b/src/mame/drivers/sigmab98.c index f9e4f2d34f4..0bc5397c0b1 100644 --- a/src/mame/drivers/sigmab98.c +++ b/src/mame/drivers/sigmab98.c @@ -543,7 +543,7 @@ ROM_END static DRIVER_INIT( gegege ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); // Protection? rom[0xbd3] = 0x18; diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c index 0f99ced1115..6a13d9494cb 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -328,7 +328,7 @@ static DRIVER_INIT( silkroad ) verified as correct... problem with the original which the gfx hardware didn't care about? */ - UINT8 *src = memory_region(machine, "gfx1")+0x1000000; + UINT8 *src = machine->region("gfx1")->base()+0x1000000; int len = 0x0200000; UINT8 *buffer; diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index a47d1876166..f96a94dcef0 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -1015,8 +1015,8 @@ ROM_END static DRIVER_INIT( simpl156 ) { - UINT8 *rom = memory_region(machine, "okimusic"); - int length = memory_region_length(machine, "okimusic"); + UINT8 *rom = machine->region("okimusic")->base(); + int length = machine->region("okimusic")->bytes(); UINT8 *buf1 = auto_alloc_array(machine, UINT8, length); UINT32 x; diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c index 957c115a877..fdd75d1fde0 100644 --- a/src/mame/drivers/skimaxx.c +++ b/src/mame/drivers/skimaxx.c @@ -124,8 +124,8 @@ static READ32_HANDLER( skimaxx_blitter_r ) static VIDEO_START( skimaxx ) { - skimaxx_blitter_gfx = (UINT16 *) memory_region( machine, "blitter" ); - skimaxx_blitter_gfx_len = memory_region_length( machine, "blitter" ) / 2; + skimaxx_blitter_gfx = (UINT16 *) machine->region( "blitter" )->base(); + skimaxx_blitter_gfx_len = machine->region( "blitter" )->bytes() / 2; bg_buffer = auto_alloc_array(machine, UINT32, 0x400 * 0x100 * sizeof(UINT16) / sizeof(UINT32) * 2); // 2 buffers skimaxx_bg_buffer_back = bg_buffer + 0x400 * 0x100 * sizeof(UINT16) / sizeof(UINT32) * 0; diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c index 162339aba86..d5249d2dae4 100644 --- a/src/mame/drivers/skullxbo.c +++ b/src/mame/drivers/skullxbo.c @@ -620,7 +620,7 @@ ROM_END static DRIVER_INIT( skullxbo ) { atarijsa_init(machine, "FF5802", 0x0080); - memset(memory_region(machine, "gfx1") + 0x170000, 0, 0x20000); + memset(machine->region("gfx1")->base() + 0x170000, 0, 0x20000); } diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c index 102f38cd75e..532ab5f929d 100644 --- a/src/mame/drivers/skyfox.c +++ b/src/mame/drivers/skyfox.c @@ -434,8 +434,8 @@ ROM_END /* Untangle the graphics: cut each 32x32x8 tile in 16 8x8x8 tiles */ static DRIVER_INIT( skyfox ) { - UINT8 *RAM = memory_region(machine, "gfx1"); - UINT8 *end = RAM + memory_region_length(machine, "gfx1"); + UINT8 *RAM = machine->region("gfx1")->base(); + UINT8 *end = RAM + machine->region("gfx1")->bytes(); UINT8 buf[32 * 32]; while (RAM < end) diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c index 607d8e4ff81..c64df7f73cb 100644 --- a/src/mame/drivers/skykid.c +++ b/src/mame/drivers/skykid.c @@ -92,7 +92,7 @@ static WRITE8_HANDLER( skykid_irq_2_ctrl_w ) static MACHINE_START( skykid ) { /* configure the banks */ - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0x10000, 0x2000); state_save_register_global(machine, inputport_selected); } @@ -623,7 +623,7 @@ static DRIVER_INIT( skykid ) int i; /* unpack the third sprite ROM */ - rom = memory_region(machine, "gfx3") + 0x4000; + rom = machine->region("gfx3")->base() + 0x4000; for (i = 0;i < 0x2000;i++) { rom[i + 0x4000] = rom[i]; // sprite set #1, plane 3 diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c index 2d71e66ef7f..ea8b78772c5 100644 --- a/src/mame/drivers/slapfght.c +++ b/src/mame/drivers/slapfght.c @@ -1827,7 +1827,7 @@ static DRIVER_INIT( getstarj ) static DRIVER_INIT( gtstarb1 ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); getstar_id = GTSTARB1; getstar_init(machine); diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index 991641d282b..d15ec47fa15 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -536,7 +536,7 @@ static MACHINE_START( slapshot ) { slapshot_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank10", 0, 4, memory_region(machine, "audiocpu") + 0xc000, 0x4000); + memory_configure_bank(machine, "bank10", 0, 4, machine->region("audiocpu")->base() + 0xc000, 0x4000); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -744,8 +744,8 @@ ROM_END static DRIVER_INIT( slapshot ) { UINT32 offset,i; - UINT8 *gfx = memory_region(machine, "gfx2"); - int size = memory_region_length(machine, "gfx2"); + UINT8 *gfx = machine->region("gfx2")->base(); + int size = machine->region("gfx2")->bytes(); int data; offset = size / 2; diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c index bfd09accd30..9dc440080dd 100644 --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c @@ -278,7 +278,7 @@ static void blit_gfx(running_machine *machine) { sliver_state *state = machine->driver_data(); int tmpptr=0; - const UINT8 *rom = memory_region(machine, "user1"); + const UINT8 *rom = machine->region("user1")->base(); while (tmpptr < state->fptr) { @@ -343,7 +343,7 @@ static void render_jpeg(running_machine *machine) return; } - rom = memory_region(machine, "user3"); + rom = machine->region("user3")->base(); for (y = 0; y < state->jpeg_h; y++) { for (x = 0; x < state->jpeg_w; x++) @@ -459,7 +459,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER(oki_setbank) { - UINT8 *sound = memory_region(space->machine, "oki"); + UINT8 *sound = space->machine->region("oki")->base(); int bank=(data^0xff)&3; //xor or not ? memcpy(sound+0x20000, sound+0x100000+0x20000*bank, 0x20000); } diff --git a/src/mame/drivers/slotcarn.c b/src/mame/drivers/slotcarn.c index dc7d35fc7bf..f394deb037d 100644 --- a/src/mame/drivers/slotcarn.c +++ b/src/mame/drivers/slotcarn.c @@ -97,9 +97,9 @@ static MC6845_UPDATE_ROW( update_row ) UINT16 x = 0; int rlen; - gfx[0] = memory_region(device->machine, "gfx1"); - gfx[1] = memory_region(device->machine, "gfx2"); - rlen = memory_region_length(device->machine, "gfx2"); + gfx[0] = device->machine->region("gfx1")->base(); + gfx[1] = device->machine->region("gfx2")->base(); + rlen = device->machine->region("gfx2")->bytes(); //ma = ma ^ 0x7ff; for (cx = 0; cx < x_count; cx++) diff --git a/src/mame/drivers/sms.c b/src/mame/drivers/sms.c index f96beae722e..2780b6dbe46 100644 --- a/src/mame/drivers/sms.c +++ b/src/mame/drivers/sms.c @@ -516,7 +516,7 @@ ADDRESS_MAP_END static MACHINE_START( sms ) { - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "questions"), 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("questions")->base(), 0x4000); state_save_register_global(machine, communication_port_status); state_save_register_global_array(machine, communication_port); diff --git a/src/mame/drivers/snesb.c b/src/mame/drivers/snesb.c index 8eda76263aa..a4a5fe77803 100644 --- a/src/mame/drivers/snesb.c +++ b/src/mame/drivers/snesb.c @@ -530,7 +530,7 @@ MACHINE_CONFIG_END static DRIVER_INIT(kinstb) { INT32 i; - UINT8 *rom = memory_region(machine, "user3"); + UINT8 *rom = machine->region("user3")->base(); for (i = 0; i < 0x400000; i++) { @@ -546,7 +546,7 @@ static DRIVER_INIT(kinstb) static DRIVER_INIT( ffight2b ) { INT32 i; - UINT8 *rom = memory_region(machine, "user3"); + UINT8 *rom = machine->region("user3")->base(); for(i = 0; i < 0x200000; i++) { @@ -605,8 +605,8 @@ static const UINT8 address_substitution_high[] = static DRIVER_INIT( sblast2b ) { int i, cipherText, plainText, newAddress; - UINT8 *src = memory_region(machine, "user7"); - UINT8 *dst = memory_region(machine, "user3"); + UINT8 *src = machine->region("user7")->base(); + UINT8 *dst = machine->region("user3")->base(); for (i =0; i < 0x80000 * 3; i++) { @@ -654,7 +654,7 @@ static DRIVER_INIT( sblast2b ) static DRIVER_INIT( iron ) { INT32 i; - UINT8 *rom = memory_region(machine, "user3"); + UINT8 *rom = machine->region("user3")->base(); for (i = 0; i < 0x140000; i++) { @@ -679,7 +679,7 @@ static DRIVER_INIT( iron ) static DRIVER_INIT( endless ) { INT32 i; - UINT8 *rom = memory_region(machine, "user3"); + UINT8 *rom = machine->region("user3")->base(); /* there is more to this, 0x800 based block swaps? */ for (i = 0; i < 0x200000; i++) @@ -692,7 +692,7 @@ static DRIVER_INIT( endless ) static DRIVER_INIT( denseib ) { - UINT8 *rom = memory_region(machine, "user3"); + UINT8 *rom = machine->region("user3")->base(); INT32 i; for (i = 0; i < 0x200000; i++) diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c index f056c2be250..4a993798002 100644 --- a/src/mame/drivers/snk.c +++ b/src/mame/drivers/snk.c @@ -89,7 +89,7 @@ Notes: a bug. The service mode functionality is very limited anyway. To get past the failed ROM test and see the service mode, use this ROM patch: - UINT8 *mem = memory_region(machine, "maincpu"); + UINT8 *mem = machine->region("maincpu")->base(); mem[0x3a5d] = mem[0x3a5e] = mem[0x3a5f] = 0; - The "SNK Wave" custom sound circuitry is only actually used by marvins and diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index c444d32a3fe..ee469f17bab 100644 --- a/src/mame/drivers/snk68.c +++ b/src/mame/drivers/snk68.c @@ -1001,7 +1001,7 @@ ROM_END static DRIVER_INIT( searchar ) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank1", machine->region("user1")->base()); } /******************************************************************************/ diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c index 6b4b8f5c612..2b598c033ae 100644 --- a/src/mame/drivers/snowbros.c +++ b/src/mame/drivers/snowbros.c @@ -396,13 +396,13 @@ static void sb3_play_music(running_machine *machine, int data) { case 0x23: case 0x26: - snd = memory_region(machine, "oki"); + snd = machine->region("oki")->base(); memcpy(snd+0x20000, snd+0x80000+0x00000, 0x20000); sb3_music_is_playing = 1; break; case 0x24: - snd = memory_region(machine, "oki"); + snd = machine->region("oki")->base(); memcpy(snd+0x20000, snd+0x80000+0x20000, 0x20000); sb3_music_is_playing = 1; break; @@ -415,7 +415,7 @@ static void sb3_play_music(running_machine *machine, int data) case 0x2b: case 0x2c: case 0x2d: - snd = memory_region(machine, "oki"); + snd = machine->region("oki")->base(); memcpy(snd+0x20000, snd+0x80000+0x40000, 0x20000); sb3_music_is_playing = 1; break; @@ -1423,7 +1423,7 @@ static const ym2151_interface ym2151_config = static MACHINE_RESET (semiprot) { - UINT16 *PROTDATA = (UINT16*)memory_region(machine, "user1"); + UINT16 *PROTDATA = (UINT16*)machine->region("user1")->base(); int i; for (i = 0;i < 0x200/2;i++) @@ -1432,7 +1432,7 @@ static MACHINE_RESET (semiprot) static MACHINE_RESET (finalttr) { - UINT16 *PROTDATA = (UINT16*)memory_region(machine, "user1"); + UINT16 *PROTDATA = (UINT16*)machine->region("user1")->base(); int i; for (i = 0;i < 0x200/2;i++) @@ -2249,7 +2249,7 @@ static READ16_HANDLER ( moremorp_0a_read ) static DRIVER_INIT( moremorp ) { -// UINT16 *PROTDATA = (UINT16*)memory_region(machine, "user1"); +// UINT16 *PROTDATA = (UINT16*)machine->region("user1")->base(); // int i; // for (i = 0;i < 0x200/2;i++) @@ -2262,8 +2262,8 @@ static DRIVER_INIT( moremorp ) static DRIVER_INIT( cookbib2 ) { -// UINT16 *HCROM = (UINT16*)memory_region(machine, "maincpu"); -// UINT16 *PROTDATA = (UINT16*)memory_region(machine, "user1"); +// UINT16 *HCROM = (UINT16*)machine->region("maincpu")->base(); +// UINT16 *PROTDATA = (UINT16*)machine->region("user1")->base(); // int i; // hyperpac_ram[0xf000/2] = 0x46fc; // hyperpac_ram[0xf002/2] = 0x2700; @@ -2627,8 +2627,8 @@ static READ16_HANDLER ( _4in1_02_read ) static DRIVER_INIT(4in1boot) { UINT8 *buffer; - UINT8 *src = memory_region(machine, "maincpu"); - int len = memory_region_length(machine, "maincpu"); + UINT8 *src = machine->region("maincpu")->base(); + int len = machine->region("maincpu")->bytes(); /* strange order */ buffer = auto_alloc_array(machine, UINT8, len); @@ -2642,8 +2642,8 @@ static DRIVER_INIT(4in1boot) auto_free(machine, buffer); } - src = memory_region(machine, "soundcpu"); - len = memory_region_length(machine, "soundcpu"); + src = machine->region("soundcpu")->base(); + len = machine->region("soundcpu")->bytes(); /* strange order */ buffer = auto_alloc_array(machine, UINT8, len); @@ -2660,8 +2660,8 @@ static DRIVER_INIT(4in1boot) static DRIVER_INIT(snowbro3) { UINT8 *buffer; - UINT8 *src = memory_region(machine, "maincpu"); - int len = memory_region_length(machine, "maincpu"); + UINT8 *src = machine->region("maincpu")->base(); + int len = machine->region("maincpu")->bytes(); /* strange order */ buffer = auto_alloc_array(machine, UINT8, len); diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c index c30f6c6b6a2..79c4e0e9842 100644 --- a/src/mame/drivers/sothello.c +++ b/src/mame/drivers/sothello.c @@ -59,7 +59,7 @@ static int msm_data = 0; static WRITE8_HANDLER(bank_w) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); int bank=0; switch(data^0xff) { diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index 04deebff802..95cfc13fe73 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/src/mame/drivers/spdodgeb.c @@ -90,7 +90,7 @@ static void spd_adpcm_int(device_t *device) } else { - UINT8 *ROM = memory_region(device->machine, "adpcm") + 0x10000 * chip; + UINT8 *ROM = device->machine->region("adpcm")->base() + 0x10000 * chip; adpcm_data[chip] = ROM[adpcm_pos[chip]++]; msm5205_data_w(device,adpcm_data[chip] >> 4); diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c index 85873620546..36281b3bbd6 100644 --- a/src/mame/drivers/speedspn.c +++ b/src/mame/drivers/speedspn.c @@ -66,7 +66,7 @@ static WRITE8_HANDLER(speedspn_banked_rom_change) { /* is this weird banking some form of protection? */ - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); int addr; switch (data) diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c index fd1a6a9ce62..d16cc46d954 100644 --- a/src/mame/drivers/spiders.c +++ b/src/mame/drivers/spiders.c @@ -560,7 +560,7 @@ static READ8_DEVICE_HANDLER( gfx_rom_r ) if (gfx_rom_ctrl_mode) { - UINT8 *rom = memory_region(device->machine, "gfx1"); + UINT8 *rom = device->machine->region("gfx1")->base(); ret = rom[gfx_rom_address]; diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c index 99554324f49..92a550ed0ca 100644 --- a/src/mame/drivers/splash.c +++ b/src/mame/drivers/splash.c @@ -865,7 +865,7 @@ static DRIVER_INIT( roldfrog ) static DRIVER_INIT( rebus ) { splash_state *state = machine->driver_data(); - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); state->bitmap_type = 1; state->sprite_attr2_shift = 0; @@ -895,7 +895,7 @@ static DRIVER_INIT( rebus ) static DRIVER_INIT( funystrp ) { splash_state *state = machine->driver_data(); - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); state->bitmap_type = 0; state->sprite_attr2_shift = 0; diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index fcff86150aa..81d78733a7c 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -424,7 +424,7 @@ MACHINE_CONFIG_END static DRIVER_INIT( spk116it ) { int A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (A = 0;A < 0x10000;A++) diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index 6684ceeb780..4944db0beca 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -154,7 +154,7 @@ static WRITE8_HANDLER( spool99_cram_w ) static READ8_HANDLER( spool99_io_r ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); // if(!(io_switch)) { @@ -221,7 +221,7 @@ ADDRESS_MAP_END static READ8_HANDLER( vcarn_io_r ) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); // if(!(io_switch)) { @@ -412,7 +412,7 @@ static DRIVER_INIT( spool99 ) { spool99_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); // vram = auto_alloc_array(machine, UINT8, 0x2000); memcpy(state->main, ROM, 0x100); } diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c index 920f9836ada..b535d054337 100644 --- a/src/mame/drivers/sprcros2.c +++ b/src/mame/drivers/sprcros2.c @@ -66,7 +66,7 @@ Notes: static WRITE8_HANDLER( sprcros2_m_port7_w ) { sprcros2_state *state = space->machine->driver_data(); - UINT8 *RAM = memory_region(space->machine, "master"); + UINT8 *RAM = space->machine->region("master")->base(); //76543210 //x------- unused @@ -88,7 +88,7 @@ static WRITE8_HANDLER( sprcros2_m_port7_w ) static WRITE8_HANDLER( sprcros2_s_port3_w ) { sprcros2_state *state = space->machine->driver_data(); - UINT8 *RAM = memory_region(space->machine, "slave"); + UINT8 *RAM = space->machine->region("slave")->base(); //76543210 //xxxx---- unused diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index 53c162c977e..50a947c3d48 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -509,7 +509,7 @@ static const k051960_interface spy_k051960_intf = static MACHINE_START( spy ) { spy_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 12, &ROM[0x10000], 0x2000); diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c index 668cb8941fc..79de0f107ba 100644 --- a/src/mame/drivers/srmp2.c +++ b/src/mame/drivers/srmp2.c @@ -79,7 +79,7 @@ static INTERRUPT_GEN( srmp2_interrupt ) static DRIVER_INIT( srmp2 ) { - UINT16 *RAM = (UINT16 *) memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *) machine->region("maincpu")->base(); /* Fix "ERROR BACK UP" and "ERROR IOX" */ RAM[0x20c80 / 2] = 0x4e75; // RTS @@ -87,7 +87,7 @@ static DRIVER_INIT( srmp2 ) static DRIVER_INIT( srmp3 ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); /* BANK ROM (0x08000 - 0x1ffff) Check skip [MAIN ROM side] */ RAM[0x00000 + 0x7b69] = 0x00; // NOP @@ -183,7 +183,7 @@ static WRITE16_DEVICE_HANDLER( srmp2_adpcm_code_w ) */ srmp2_state *state = device->machine->driver_data(); - UINT8 *ROM = memory_region(device->machine, "adpcm"); + UINT8 *ROM = device->machine->region("adpcm")->base(); state->adpcm_sptr = (ROM[((state->adpcm_bank * 0x10000) + (data << 2) + 0)] << 8); state->adpcm_eptr = (ROM[((state->adpcm_bank * 0x10000) + (data << 2) + 1)] << 8); @@ -207,7 +207,7 @@ static WRITE8_DEVICE_HANDLER( srmp3_adpcm_code_w ) */ srmp2_state *state = device->machine->driver_data(); - UINT8 *ROM = memory_region(device->machine, "adpcm"); + UINT8 *ROM = device->machine->region("adpcm")->base(); state->adpcm_sptr = (ROM[((state->adpcm_bank * 0x10000) + (data << 2) + 0)] << 8); state->adpcm_eptr = (ROM[((state->adpcm_bank * 0x10000) + (data << 2) + 1)] << 8); @@ -224,7 +224,7 @@ static WRITE8_DEVICE_HANDLER( srmp3_adpcm_code_w ) static void srmp2_adpcm_int(device_t *device) { srmp2_state *state = device->machine->driver_data(); - UINT8 *ROM = memory_region(device->machine, "adpcm"); + UINT8 *ROM = device->machine->region("adpcm")->base(); if (state->adpcm_sptr) { @@ -346,7 +346,7 @@ static WRITE8_HANDLER( srmp3_rombank_w ) */ srmp2_state *state = space->machine->driver_data(); - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); int addr; state->adpcm_bank = ((data & 0xe0) >> 5); diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index 4122d0588d6..1891661e766 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -258,7 +258,7 @@ static READ32_HANDLER(data_r) { srmp5_state *state = space->machine->driver_data(); UINT32 data; - const UINT8 *usr = memory_region(space->machine, "user2"); + const UINT8 *usr = space->machine->region("user2")->base(); data=((state->databank>>4)&0xf)*0x100000; //guess data=usr[data+offset*2]+usr[data+offset*2+1]*256; diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 7b5a2ee377a..1b714b8285d 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -323,7 +323,7 @@ static WRITE16_HANDLER( video_regs_w ) case 0x5e/2: // bank switch, used by ROM check { - const UINT8 *rom = memory_region(space->machine, "nile"); + const UINT8 *rom = space->machine->region("nile")->base(); LOG(("%x\n",data)); memory_set_bankptr(space->machine, "bank1",(UINT16 *)(rom + (data & 0x0f)*0x200000)); break; @@ -410,7 +410,7 @@ static WRITE16_HANDLER(srmp6_dma_w) COMBINE_DATA(&dmaram[offset]); if (offset==13 && dmaram[offset]==0x40) { - const UINT8 *rom = memory_region(space->machine, "nile"); + const UINT8 *rom = space->machine->region("nile")->base(); UINT32 srctab=2*((((UINT32)dmaram[5])<<16)|dmaram[4]); UINT32 srcdata=2*((((UINT32)dmaram[11])<<16)|dmaram[10]); UINT32 len=4*(((((UINT32)dmaram[7]&3)<<16)|dmaram[6])+1); //??? WRONG! diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c index b188554b0e7..0f1ccd01419 100644 --- a/src/mame/drivers/srumbler.c +++ b/src/mame/drivers/srumbler.c @@ -29,9 +29,9 @@ static WRITE8_HANDLER( srumbler_bankswitch_w ) that as well to be 100% accurate. */ int i; - UINT8 *ROM = memory_region(space->machine, "user1"); - UINT8 *prom1 = memory_region(space->machine, "proms") + (data & 0xf0); - UINT8 *prom2 = memory_region(space->machine, "proms") + 0x100 + ((data & 0x0f) << 4); + UINT8 *ROM = space->machine->region("user1")->base(); + UINT8 *prom1 = space->machine->region("proms")->base() + (data & 0xf0); + UINT8 *prom2 = space->machine->region("proms")->base() + 0x100 + ((data & 0x0f) << 4); for (i = 0x05;i < 0x10;i++) { diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c index 983c3f44270..dcb23cdae1a 100644 --- a/src/mame/drivers/ssfindo.c +++ b/src/mame/drivers/ssfindo.c @@ -420,7 +420,7 @@ static WRITE32_HANDLER(PS7500_IO_w) static READ32_HANDLER(io_r) { - UINT16 *FLASH = (UINT16 *)memory_region(space->machine, "user2"); //16 bit - WORD access + UINT16 *FLASH = (UINT16 *)space->machine->region("user2")->base(); //16 bit - WORD access int adr=flashAdr*0x200+(flashOffset); diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c index 37fb6eddc11..d6c71bb8667 100644 --- a/src/mame/drivers/sshangha.c +++ b/src/mame/drivers/sshangha.c @@ -439,7 +439,7 @@ static DRIVER_INIT( sshangha ) #if SSHANGHA_HACK /* This is a hack to allow you to use the extra features of the first "Unused" Dip Switch (see notes above). */ - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); RAM[0x000384/2] = 0x4e71; RAM[0x000386/2] = 0x4e71; RAM[0x000388/2] = 0x4e71; diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c index 4afc8e45b00..122e4cdccc1 100644 --- a/src/mame/drivers/ssingles.c +++ b/src/mame/drivers/ssingles.c @@ -182,7 +182,7 @@ static MC6845_UPDATE_ROW( update_row ) UINT32 tile_address; UINT16 cell,palette; UINT8 b0,b1; - const UINT8 *gfx = memory_region(device->machine, "gfx1"); + const UINT8 *gfx = device->machine->region("gfx1")->base(); for(cx=0;cxdriver_data(); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); memset(&rom[0xc000], 0 ,0x3fff); /* req for some control types */ state->oldport = 0x80; diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c index 296e6d345ba..69804fd7095 100644 --- a/src/mame/drivers/sstrangr.c +++ b/src/mame/drivers/sstrangr.c @@ -91,7 +91,7 @@ static VIDEO_UPDATE( sstrngr2 ) get_pens(pens); - color_map_base = &memory_region(screen->machine, "proms")[state->flip_screen ? 0x0000 : 0x0200]; + color_map_base = &screen->machine->region("proms")->base()[state->flip_screen ? 0x0000 : 0x0200]; for (offs = 0; offs < 0x2000; offs++) { diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 222b487c072..8be4971fa01 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -347,7 +347,7 @@ static MACHINE_RESET( ssv ) ssv_state *state = machine->driver_data(); state->requested_int = 0; cpu_set_irq_callback(machine->device("maincpu"), ssv_irq_callback); - memory_set_bankptr(machine, "bank1", memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank1", machine->region("user1")->base()); } @@ -542,8 +542,8 @@ static WRITE16_HANDLER( gdfs_blitram_w ) UINT32 dst = (gdfs_blitram[0xc4/2] + (gdfs_blitram[0xc6/2] << 16)) << 4; UINT32 len = (gdfs_blitram[0xc8/2]) << 4; - UINT8 *rom = memory_region(space->machine, "gfx2"); - size_t size = memory_region_length(space->machine, "gfx2"); + UINT8 *rom = space->machine->region("gfx2")->base(); + size_t size = space->machine->region("gfx2")->bytes(); if ( (src+len <= size) && (dst+len <= 4 * 0x100000) ) { @@ -965,8 +965,8 @@ ADDRESS_MAP_END static READ16_HANDLER( eaglshot_gfxrom_r ) { ssv_state *state = space->machine->driver_data(); - UINT8 *rom = memory_region(space->machine, "gfx1"); - size_t size = memory_region_length(space->machine, "gfx1"); + UINT8 *rom = space->machine->region("gfx1")->base(); + size_t size = space->machine->region("gfx1")->bytes(); offset = offset * 2 + state->gfxrom_select * 0x200000; @@ -2654,7 +2654,7 @@ static DRIVER_INIT( meosism ) { init_ssv(machine, 0); } static DRIVER_INIT( mslider ) { init_ssv(machine, 0); } static DRIVER_INIT( ryorioh ) { init_ssv(machine, 0); } static DRIVER_INIT( srmp4 ) { init_ssv(machine, 0); -// ((UINT16 *)memory_region(machine, "user1"))[0x2b38/2] = 0x037a; /* patch to see gal test mode */ +// ((UINT16 *)machine->region("user1")->base())[0x2b38/2] = 0x037a; /* patch to see gal test mode */ } static DRIVER_INIT( srmp7 ) { init_ssv(machine, 0); } static DRIVER_INIT( stmblade ) { init_ssv(machine, 0); } diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c index 7c65021e935..4eda4188573 100644 --- a/src/mame/drivers/st0016.c +++ b/src/mame/drivers/st0016.c @@ -69,7 +69,7 @@ static WRITE8_HANDLER(mux_select_w) WRITE8_HANDLER(st0016_rom_bank_w) { - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + (data* 0x4000) + 0x10000 ); + memory_set_bankptr(space->machine, "bank1", space->machine->region("maincpu")->base() + (data* 0x4000) + 0x10000 ); st0016_rom_bank=data; } @@ -670,13 +670,13 @@ static DRIVER_INIT(nratechu) static DRIVER_INIT(mayjinsn) { st0016_game=4|0x80; - memory_set_bankptr(machine, "bank2", memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank2", machine->region("user1")->base()); } static DRIVER_INIT(mayjisn2) { st0016_game=4; - memory_set_bankptr(machine, "bank2", memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank2", machine->region("user1")->base()); } /************************************* diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c index ac0aa5a9ea3..7c16854425f 100644 --- a/src/mame/drivers/starwars.c +++ b/src/mame/drivers/starwars.c @@ -508,14 +508,14 @@ static DRIVER_INIT( starwars ) starwars_mproc_init(machine); /* initialize banking */ - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x6000, 0x10000 - 0x6000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0x6000, 0x10000 - 0x6000); memory_set_bank(machine, "bank1", 0); } static DRIVER_INIT( esb ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* init the slapstic */ slapstic_init(machine, 101); diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index bea82b2449b..8e62555f92c 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -219,8 +219,8 @@ static INTERRUPT_GEN( statriv2_interrupt ) static READ8_HANDLER( question_data_r ) { - const UINT8 *qrom = memory_region(space->machine, "questions"); - UINT32 qromsize = memory_region_length(space->machine, "questions"); + const UINT8 *qrom = space->machine->region("questions")->base(); + UINT32 qromsize = space->machine->region("questions")->bytes(); UINT32 address; if (question_offset_high == 0xff) @@ -1093,8 +1093,8 @@ static DRIVER_INIT( addr_lmhe ) * * \***************************************************/ - UINT8 *qrom = memory_region(machine, "questions"); - UINT32 length = memory_region_length(machine, "questions"); + UINT8 *qrom = machine->region("questions")->base(); + UINT32 length = machine->region("questions")->bytes(); UINT32 address; for (address = 0; address < length; address++) diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c index 6ee047f3b45..8e0afa5df3f 100644 --- a/src/mame/drivers/stv.c +++ b/src/mame/drivers/stv.c @@ -2385,7 +2385,7 @@ DRIVER_INIT ( stv ) #ifdef UNUSED_FUNCTION static void print_game_info(void) { - UINT8 *ROM = memory_region(machine, "user1"); + UINT8 *ROM = machine->region("user1")->base(); static FILE *print_file = NULL; UINT8 STR[0x100]; UINT32 src_i,dst_i; @@ -4015,7 +4015,7 @@ by Sega titles,and this is a Sunsoft game)It's likely to be a left-over... static DRIVER_INIT( sanjeon ) { - UINT8 *src = memory_region ( machine, "user1" ); + UINT8 *src = machine->region ( "user1" )->base(); int x; for (x=0;x<0x3000000;x++) diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c index 1740c0b027f..dad029af26c 100644 --- a/src/mame/drivers/sub.c +++ b/src/mame/drivers/sub.c @@ -381,7 +381,7 @@ GFXDECODE_END static PALETTE_INIT( sub ) { int i; - UINT8* lookup = memory_region(machine,"proms2"); + UINT8* lookup = machine->region("proms2")->base(); /* allocate the colortable */ machine->colortable = colortable_alloc(machine, 0x100); diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index c2579b8ad14..c6f1988dee5 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -3328,7 +3328,7 @@ ROM_END static DRIVER_INIT( smoto16 ) { - UINT8 *rom = memory_region( machine, "maincpu" ); + UINT8 *rom = machine->region( "maincpu" )->base(); rom[0x12d0] = 0x20; // "ERROR 951010" } @@ -3564,7 +3564,7 @@ static void subsino_decrypt(running_machine* machine, void (*bitswaps)(UINT8* de { int i; UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x10000); - UINT8* region = memory_region(machine,"maincpu"); + UINT8* region = machine->region("maincpu")->base(); for (i=0;i<0x10000;i++) { @@ -3611,13 +3611,13 @@ static DRIVER_INIT( sharkpye ) static DRIVER_INIT( smoto20 ) { - UINT8 *rom = memory_region( machine, "maincpu" ); + UINT8 *rom = machine->region( "maincpu" )->base(); rom[0x12e1] = 0x20; // "ERROR 951010" } static DRIVER_INIT( tisub ) { - UINT8 *rom = memory_region( machine, "maincpu" ); + UINT8 *rom = machine->region( "maincpu" )->base(); DRIVER_INIT_CALL(victor5); @@ -3632,7 +3632,7 @@ static DRIVER_INIT( tisub ) static DRIVER_INIT( tisuba ) { - UINT8 *rom = memory_region( machine, "maincpu" ); + UINT8 *rom = machine->region( "maincpu" )->base(); DRIVER_INIT_CALL(victor5); @@ -3647,7 +3647,7 @@ static DRIVER_INIT( tisuba ) static DRIVER_INIT( stisub ) { - UINT8 *rom = memory_region( machine, "maincpu" ); + UINT8 *rom = machine->region( "maincpu" )->base(); rom[0x1005] = 0x1d; //patch protection check rom[0x7ab] = 0x18; //patch "winning protection" check rom[0x957] = 0x18; //patch "losing protection" check diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c index 850af9d7b03..3883c286424 100644 --- a/src/mame/drivers/suna16.c +++ b/src/mame/drivers/suna16.c @@ -263,7 +263,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( bssoccer_pcm_1_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "pcm1"); + UINT8 *RAM = space->machine->region("pcm1")->base(); int bank = data & 7; if (bank & ~7) logerror("CPU#2 PC %06X - ROM bank unknown bits: %02X\n", cpu_get_pc(space->cpu), data); memory_set_bankptr(space->machine, "bank1", &RAM[bank * 0x10000 + 0x1000]); @@ -271,7 +271,7 @@ static WRITE8_HANDLER( bssoccer_pcm_1_bankswitch_w ) static WRITE8_HANDLER( bssoccer_pcm_2_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "pcm2"); + UINT8 *RAM = space->machine->region("pcm2")->base(); int bank = data & 7; if (bank & ~7) logerror("CPU#3 PC %06X - ROM bank unknown bits: %02X\n", cpu_get_pc(space->cpu), data); memory_set_bankptr(space->machine, "bank2", &RAM[bank * 0x10000 + 0x1000]); @@ -325,7 +325,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( uballoon_pcm_1_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "pcm1"); + UINT8 *RAM = space->machine->region("pcm1")->base(); int bank = data & 1; if (bank & ~1) logerror("CPU#2 PC %06X - ROM bank unknown bits: %02X\n", cpu_get_pc(space->cpu), data); memory_set_bankptr(space->machine, "bank1", &RAM[bank * 0x10000 + 0x400]); @@ -1095,7 +1095,7 @@ ROM_END static DRIVER_INIT( uballoon ) { - UINT16 *RAM = (UINT16 *) memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *) machine->region("maincpu")->base(); // Patch out the protection checks RAM[0x0113c/2] = 0x4e71; // bne $646 diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index 795db1b8df1..e49c053ab02 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -61,7 +61,7 @@ Notes: static DRIVER_INIT( hardhead ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int i; for (i = 0; i < 0x8000; i++) @@ -76,15 +76,15 @@ static DRIVER_INIT( hardhead ) rom[i] = BITSWAP8(rom[i], 7,6,5,3,4,2,1,0) ^ 0x58; } - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); } /* Non encrypted bootleg */ static DRIVER_INIT( hardhedb ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - space->set_decrypted_region(0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x48000); - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + space->set_decrypted_region(0x0000, 0x7fff, machine->region("maincpu")->base() + 0x48000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); } /*************************************************************************** @@ -96,8 +96,8 @@ static DRIVER_INIT( hardhedb ) static UINT8 *brickzn_decrypt(running_machine *machine) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *RAM = memory_region(machine, "maincpu"); - size_t size = memory_region_length(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); + size_t size = machine->region("maincpu")->bytes(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, size); int i; @@ -138,7 +138,7 @@ static UINT8 *brickzn_decrypt(running_machine *machine) static DRIVER_INIT( brickzn ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); UINT8 *decrypt = brickzn_decrypt(machine); int i; @@ -163,13 +163,13 @@ static DRIVER_INIT( brickzn ) decrypt[0x24b5] = 0x00; // HALT -> NOP decrypt[0x2583] = 0x00; // HALT -> NOP - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); memory_configure_bank_decrypted(machine, "bank1", 0, 16, decrypt + 0x10000, 0x4000); } static DRIVER_INIT( brickzn3 ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); UINT8 *decrypt = brickzn_decrypt(machine); int i; @@ -194,7 +194,7 @@ static DRIVER_INIT( brickzn3 ) decrypt[0x2487] = 0x00; // HALT -> NOP decrypt[0x256c] = 0x00; // HALT -> NOP - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); memory_configure_bank_decrypted(machine, "bank1", 0, 16, decrypt + 0x10000, 0x4000); } @@ -206,8 +206,8 @@ static DRIVER_INIT( brickzn3 ) static DRIVER_INIT( hardhea2 ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *RAM = memory_region(machine, "maincpu"); - size_t size = memory_region_length(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); + size_t size = machine->region("maincpu")->bytes(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, size); UINT8 x; int i; @@ -281,7 +281,7 @@ rom13: 0?, 1y, 2n, 3n ?,?,?,? (palettes) RAM[i] = BITSWAP8(RAM[i], 5,6,7,4,3,2,1,0) ^ 0x41; } - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); memory_configure_bank(machine, "bank2", 0, 2, auto_alloc_array(machine, UINT8, 0x2000 * 2), 0x2000); } @@ -293,8 +293,8 @@ rom13: 0?, 1y, 2n, 3n ?,?,?,? (palettes) static DRIVER_INIT( starfigh ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *RAM = memory_region(machine, "maincpu"); - size_t size = memory_region_length(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); + size_t size = machine->region("maincpu")->bytes(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, size); UINT8 x; int i; @@ -350,7 +350,7 @@ static DRIVER_INIT( starfigh ) RAM[i] = BITSWAP8(RAM[i], 5,6,7,4,3,2,1,0) ^ 0x45; } - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); } @@ -361,8 +361,8 @@ static DRIVER_INIT( starfigh ) static DRIVER_INIT( sparkman ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *RAM = memory_region(machine, "maincpu"); - size_t size = memory_region_length(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); + size_t size = machine->region("maincpu")->bytes(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, size); UINT8 x; int i; @@ -418,7 +418,7 @@ static DRIVER_INIT( sparkman ) RAM[i] = BITSWAP8(RAM[i], 5,6,7,4,3,2,1,0) ^ 0x44; } - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); } /*************************************************************************** @@ -2383,7 +2383,7 @@ ROM_END static DRIVER_INIT( suna8 ) { - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x4000); } /* Working Games */ diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c index 29863a5ea15..46b68b2f1d9 100644 --- a/src/mame/drivers/superqix.c +++ b/src/mame/drivers/superqix.c @@ -119,8 +119,8 @@ static INT16 *samplebuf; static SAMPLES_START( pbillian_sh_start ) { running_machine *machine = device->machine; - UINT8 *src = memory_region(machine, "samples"); - int i, len = memory_region_length(machine, "samples"); + UINT8 *src = machine->region("samples")->base(); + int i, len = machine->region("samples")->bytes(); /* convert 8-bit unsigned samples to 8-bit signed */ samplebuf = auto_alloc_array(machine, INT16, len); @@ -542,7 +542,7 @@ static void machine_init_common(running_machine *machine) static MACHINE_START( superqix ) { /* configure the banks */ - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("maincpu")->base() + 0x10000, 0x4000); machine_init_common(machine); } @@ -550,7 +550,7 @@ static MACHINE_START( superqix ) static MACHINE_START( pbillian ) { /* configure the banks */ - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0x10000, 0x4000); machine_init_common(machine); } @@ -1359,8 +1359,8 @@ static DRIVER_INIT( perestro ) int i,j; /* decrypt program code; the address lines are shuffled around in a non-trivial way */ - src = memory_region(machine, "maincpu"); - len = memory_region_length(machine, "maincpu"); + src = machine->region("maincpu")->base(); + len = machine->region("maincpu")->bytes(); for (i = 0;i < len;i += 16) { memcpy(temp,&src[i],16); @@ -1379,8 +1379,8 @@ static DRIVER_INIT( perestro ) } /* decrypt gfx ROMs; simple bit swap on the address lines */ - src = memory_region(machine, "gfx1"); - len = memory_region_length(machine, "gfx1"); + src = machine->region("gfx1")->base(); + len = machine->region("gfx1")->bytes(); for (i = 0;i < len;i += 16) { memcpy(temp,&src[i],16); @@ -1390,8 +1390,8 @@ static DRIVER_INIT( perestro ) } } - src = memory_region(machine, "gfx2"); - len = memory_region_length(machine, "gfx2"); + src = machine->region("gfx2")->base(); + len = machine->region("gfx2")->bytes(); for (i = 0;i < len;i += 16) { memcpy(temp,&src[i],16); @@ -1401,8 +1401,8 @@ static DRIVER_INIT( perestro ) } } - src = memory_region(machine, "gfx3"); - len = memory_region_length(machine, "gfx3"); + src = machine->region("gfx3")->base(); + len = machine->region("gfx3")->bytes(); for (i = 0;i < len;i += 16) { memcpy(temp,&src[i],16); diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index b73872ff576..c3548e237d2 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -134,7 +134,7 @@ static WRITE8_HANDLER( supertnk_bankswitch_0_w ) bank_address = 0x10000 + (state->rom_bank * 0x1000); - memory_set_bankptr(space->machine, "bank1", &memory_region(space->machine, "maincpu")[bank_address]); + memory_set_bankptr(space->machine, "bank1", &space->machine->region("maincpu")->base()[bank_address]); } @@ -147,7 +147,7 @@ static WRITE8_HANDLER( supertnk_bankswitch_1_w ) bank_address = 0x10000 + (state->rom_bank * 0x1000); - memory_set_bankptr(space->machine, "bank1", &memory_region(space->machine, "maincpu")[bank_address]); + memory_set_bankptr(space->machine, "bank1", &space->machine->region("maincpu")->base()[bank_address]); } @@ -182,7 +182,7 @@ static VIDEO_START( supertnk ) { supertnk_state *state = machine->driver_data(); offs_t i; - const UINT8 *prom = memory_region(machine, "proms"); + const UINT8 *prom = machine->region("proms")->base(); for (i = 0; i < NUM_PENS; i++) { @@ -489,8 +489,8 @@ static DRIVER_INIT( supertnk ) { /* decode the TMS9980 ROMs */ offs_t offs; - UINT8 *rom = memory_region(machine, "maincpu"); - size_t len = memory_region_length(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); + size_t len = machine->region("maincpu")->bytes(); for (offs = 0; offs < len; offs++) { diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index d954c6c431f..faec0c8ba3b 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -251,7 +251,7 @@ static READ8_HANDLER( rom_bank_select_r ) static WRITE8_HANDLER( rom_bank_select_w ) { suprgolf_state *state = space->machine->driver_data(); - UINT8 *region_base = memory_region(space->machine, "user1"); + UINT8 *region_base = space->machine->region("user1")->base(); state->rom_bank = data; @@ -266,7 +266,7 @@ static WRITE8_HANDLER( rom_bank_select_w ) static WRITE8_HANDLER( rom2_bank_select_w ) { - UINT8 *region_base = memory_region(space->machine, "user2"); + UINT8 *region_base = space->machine->region("user2")->base(); mame_printf_debug("ROM_BANK 0x4000 - %X @%X\n",data,cpu_get_previouspc(space->cpu)); memory_set_bankptr(space->machine, "bank1", region_base + (data&0x0f ) * 0x4000); @@ -582,7 +582,7 @@ ROM_END static DRIVER_INIT( suprgolf ) { - UINT8 *ROM = memory_region(machine, "user2"); + UINT8 *ROM = machine->region("user2")->base(); ROM[0x74f4-0x4000] = 0x00; ROM[0x74f5-0x4000] = 0x00; diff --git a/src/mame/drivers/suprloco.c b/src/mame/drivers/suprloco.c index 15eeea9729e..2a4da2d1a4b 100644 --- a/src/mame/drivers/suprloco.c +++ b/src/mame/drivers/suprloco.c @@ -260,9 +260,9 @@ static DRIVER_INIT( suprloco ) int i, j, k, color_source, color_dest; UINT8 *source, *dest, *lookup; - source = memory_region(machine, "gfx1"); + source = machine->region("gfx1")->base(); dest = source + 0x6000; - lookup = memory_region(machine, "proms") + 0x0200; + lookup = machine->region("proms")->base() + 0x0200; for (i = 0; i < 0x80; i++, lookup += 8) { diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c index 5f6798099ef..d24d68c092f 100644 --- a/src/mame/drivers/suprnova.c +++ b/src/mame/drivers/suprnova.c @@ -457,7 +457,7 @@ static TIMER_DEVICE_CALLBACK( interrupt_callback ) static MACHINE_RESET(skns) { - memory_set_bankptr(machine, "bank1",memory_region(machine, "user1")); + memory_set_bankptr(machine, "bank1",machine->region("user1")->base()); } @@ -747,7 +747,7 @@ static READ32_HANDLER( skns_msm6242_r ) static WRITE32_HANDLER( skns_v3t_w ) { - UINT8 *btiles = memory_region(space->machine, "gfx3"); + UINT8 *btiles = space->machine->region("gfx3")->base(); COMBINE_DATA(&skns_v3t_ram[offset]); diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c index df1cfebe1f9..9287444f83f 100644 --- a/src/mame/drivers/suprslam.c +++ b/src/mame/drivers/suprslam.c @@ -117,7 +117,7 @@ static WRITE8_HANDLER( pending_command_clear_w ) static WRITE8_HANDLER( suprslam_sh_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "audiocpu"); + UINT8 *RAM = space->machine->region("audiocpu")->base(); int bankaddress; bankaddress = 0x10000 + (data & 0x03) * 0x8000; diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c index ce108ae6120..2dccb80c2bb 100644 --- a/src/mame/drivers/surpratk.c +++ b/src/mame/drivers/surpratk.c @@ -201,7 +201,7 @@ static const k05324x_interface surpratk_k05324x_intf = static MACHINE_START( surpratk ) { surpratk_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 28, &ROM[0x10000], 0x2000); memory_configure_bank(machine, "bank1", 28, 4, &ROM[0x08000], 0x2000); diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c index dd434f70fb7..a79582a597a 100644 --- a/src/mame/drivers/system1.c +++ b/src/mame/drivers/system1.c @@ -355,12 +355,12 @@ static const UINT8 cc_ex[0x100] = { static MACHINE_START( system1 ) { - UINT32 numbanks = (memory_region_length(machine, "maincpu") - 0x10000) / 0x4000; + UINT32 numbanks = (machine->region("maincpu")->bytes() - 0x10000) / 0x4000; if (numbanks > 0) - memory_configure_bank(machine, "bank1", 0, numbanks, memory_region(machine, "maincpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, numbanks, machine->region("maincpu")->base() + 0x10000, 0x4000); else - memory_configure_bank(machine, "bank1", 0, 1, memory_region(machine, "maincpu") + 0x8000, 0); + memory_configure_bank(machine, "bank1", 0, 1, machine->region("maincpu")->base() + 0x8000, 0); memory_set_bank(machine, "bank1", 0); z80_set_cycle_tables(machine->device("maincpu"), cc_op, cc_cb, cc_ed, cc_xy, cc_xycb, cc_ex); @@ -578,7 +578,7 @@ static READ8_HANDLER( mcu_io_r ) return space->machine->device("maincpu")->space(AS_PROGRAM)->read_byte(offset); case 1: - return memory_region(space->machine, "maincpu")[offset + 0x10000]; + return space->machine->region("maincpu")->base()[offset + 0x10000]; case 2: return space->machine->device("maincpu")->space(AS_IO)->read_byte(offset); @@ -4546,12 +4546,12 @@ static DRIVER_INIT( myherok ) /* additionally to the usual protection, all the program ROMs have data lines */ /* D0 and D1 swapped. */ - rom = memory_region(machine, "maincpu"); + rom = machine->region("maincpu")->base(); for (A = 0;A < 0xc000;A++) rom[A] = (rom[A] & 0xfc) | ((rom[A] & 1) << 1) | ((rom[A] & 2) >> 1); /* the tile gfx ROMs are mangled as well: */ - rom = memory_region(machine, "tiles"); + rom = machine->region("tiles")->base(); /* the first ROM has data lines D0 and D6 swapped. */ for (A = 0x0000;A < 0x4000;A++) @@ -4586,7 +4586,7 @@ static DRIVER_INIT( myherok ) static READ8_HANDLER( nob_start_r ) { /* in reality, it's likely some M1-dependent behavior */ - return (cpu_get_pc(space->cpu) <= 0x0003) ? 0x80 : memory_region(space->machine, "maincpu")[1]; + return (cpu_get_pc(space->cpu) <= 0x0003) ? 0x80 : space->machine->region("maincpu")->base()[1]; } static DRIVER_INIT( nob ) @@ -4611,7 +4611,7 @@ static DRIVER_INIT( nobb ) /* Patch to get PRG ROMS ('T', 'R' and 'S) status as "GOOD" in the "test mode" */ /* not really needed */ -// UINT8 *ROM = memory_region(machine, "maincpu"); +// UINT8 *ROM = machine->region("maincpu")->base(); // ROM[0x3296] = 0x18; // 'jr' instead of 'jr z' - 'T' (PRG Main ROM) // ROM[0x32be] = 0x18; // 'jr' instead of 'jr z' - 'R' (Banked ROM 1) @@ -4624,7 +4624,7 @@ static DRIVER_INIT( nobb ) /* Patch to get sound in later levels(the program enters into a tight loop)*/ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO); - UINT8 *ROM2 = memory_region(machine, "soundcpu"); + UINT8 *ROM2 = machine->region("soundcpu")->base(); ROM2[0x02f9] = 0x28;//'jr z' instead of 'jr' @@ -4640,7 +4640,7 @@ static DRIVER_INIT( nobb ) static DRIVER_INIT( bootleg ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - space->set_decrypted_region(0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x10000); + space->set_decrypted_region(0x0000, 0x7fff, machine->region("maincpu")->base() + 0x10000); DRIVER_INIT_CALL(bank00); } @@ -4648,14 +4648,14 @@ static DRIVER_INIT( bootleg ) static DRIVER_INIT( bootsys2 ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - space->set_decrypted_region(0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x20000); - memory_configure_bank_decrypted(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x30000, 0x4000); + space->set_decrypted_region(0x0000, 0x7fff, machine->region("maincpu")->base() + 0x20000); + memory_configure_bank_decrypted(machine, "bank1", 0, 4, machine->region("maincpu")->base() + 0x30000, 0x4000); DRIVER_INIT_CALL(bank0c); } static DRIVER_INIT( choplift ) { - UINT8 *mcurom = memory_region(machine, "mcu"); + UINT8 *mcurom = machine->region("mcu")->base(); /* the ROM dump we have is bad; the following patches make it work */ mcurom[0x100] = 0x55; /* D5 in current dump */ diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index c8c4b237a97..c2edc4c761e 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -400,7 +400,7 @@ static READ8_HANDLER( tturfbl_soundbank_r ) static WRITE8_HANDLER( tturfbl_soundbank_w ) { segas1x_bootleg_state *state = space->machine->driver_data(); - UINT8 *mem = memory_region(space->machine, "soundcpu"); + UINT8 *mem = space->machine->region("soundcpu")->base(); switch(data) { @@ -471,11 +471,11 @@ ADDRESS_MAP_END static WRITE8_DEVICE_HANDLER( upd7759_bank_w ) //* { - int offs, size = memory_region_length(device->machine, "soundcpu") - 0x10000; + int offs, size = device->machine->region("soundcpu")->bytes() - 0x10000; upd7759_reset_w(device, data & 0x40); offs = 0x10000 + (data * 0x4000) % size; - memory_set_bankptr(device->machine, "bank1", memory_region(device->machine, "soundcpu") + offs); + memory_set_bankptr(device->machine, "bank1", device->machine->region("soundcpu")->base() + offs); } @@ -1071,7 +1071,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( sys18_soundbank_w ) { segas1x_bootleg_state *state = space->machine->driver_data(); - UINT8 *mem = memory_region(space->machine, "soundcpu"); + UINT8 *mem = space->machine->region("soundcpu")->base(); int rom = (data >> 6) & 3; int bank = (data & 0x3f); int mask = state->sound_info[rom * 2 + 0]; @@ -1239,7 +1239,7 @@ static READ8_HANDLER( shdancbl_soundbank_r ) static WRITE8_HANDLER( shdancbl_bankctrl_w ) { segas1x_bootleg_state *state = space->machine->driver_data(); - UINT8 *mem = memory_region(space->machine, "soundcpu"); + UINT8 *mem = space->machine->region("soundcpu")->base(); switch (data) { @@ -3384,8 +3384,8 @@ static DRIVER_INIT( goldnaxeb1 ) { segas1x_bootleg_state *state = machine->driver_data(); int i; - UINT8 *ROM = memory_region(machine, "maincpu"); - UINT8 *KEY = memory_region(machine, "decryption"); + UINT8 *ROM = machine->region("maincpu")->base(); + UINT8 *KEY = machine->region("decryption")->base(); address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); UINT8 data[0x1000]; @@ -3428,7 +3428,7 @@ static DRIVER_INIT( bayrouteb1 ) // decrypt DRIVER_INIT_CALL( goldnaxeb1 ); - ROM2 = (UINT16*)memory_region(machine, "maincpu"); + ROM2 = (UINT16*)machine->region("maincpu")->base(); decrypted_region2 = (UINT16*)state->decrypted_region; // patch interrupt vector @@ -3443,7 +3443,7 @@ static DRIVER_INIT( bayrouteb1 ) static DRIVER_INIT( bayrouteb2 ) { - UINT8 *mem = memory_region(machine, "soundcpu"); + UINT8 *mem = machine->region("soundcpu")->base(); memcpy(mem, mem + 0x10000, 0x8000); @@ -3461,7 +3461,7 @@ static DRIVER_INIT( goldnaxeb2 ) static DRIVER_INIT( tturfbl ) { - UINT8 *mem = memory_region(machine, "soundcpu"); + UINT8 *mem = machine->region("soundcpu")->base(); memcpy(mem, mem + 0x10000, 0x8000); @@ -3497,7 +3497,7 @@ static DRIVER_INIT( fpointbl ) /* Tetris-based */ static DRIVER_INIT( beautyb ) { - UINT16*rom = (UINT16*)memory_region( machine, "maincpu" ); + UINT16*rom = (UINT16*)machine->region( "maincpu" )->base(); int x; for (x = 0; x < 0x8000; x++) @@ -3516,7 +3516,7 @@ static DRIVER_INIT( beautyb ) static DRIVER_INIT( shdancbl ) { segas1x_bootleg_state *state = machine->driver_data(); - UINT8 *mem = memory_region(machine, "soundcpu");; + UINT8 *mem = machine->region("soundcpu")->base();; /* Copy first 32K of IC45 to Z80 address space */ memcpy(mem, mem + 0x10000, 0x8000); @@ -3531,7 +3531,7 @@ static DRIVER_INIT( shdancbl ) static DRIVER_INIT( mwalkbl ) { segas1x_bootleg_state *state = machine->driver_data(); - UINT8 *RAM = memory_region(machine, "soundcpu"); + UINT8 *RAM = machine->region("soundcpu")->base(); static const int mwalk_sound_info[] = { 0x0f, 0x00000, // ROM #1 = 128K @@ -3553,7 +3553,7 @@ static DRIVER_INIT( mwalkbl ) static DRIVER_INIT( astormbl ) { segas1x_bootleg_state *state = machine->driver_data(); - UINT8 *RAM = memory_region(machine, "soundcpu"); + UINT8 *RAM = machine->region("soundcpu")->base(); static const int astormbl_sound_info[] = { 0x0f, 0x00000, // ROM #1 = 128K diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c index c7228ec27df..27a1802e343 100644 --- a/src/mame/drivers/tail2nos.c +++ b/src/mame/drivers/tail2nos.c @@ -209,7 +209,7 @@ static const k051316_interface tail2nos_k051316_intf = static MACHINE_START( tail2nos ) { tail2nos_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank3", 0, 2, &ROM[0x10000], 0x8000); memory_set_bank(machine, "bank3", 0); @@ -228,8 +228,8 @@ static MACHINE_RESET( tail2nos ) tail2nos_state *state = machine->driver_data(); /* point to the extra ROMs */ - memory_set_bankptr(machine, "bank1", memory_region(machine, "user1")); - memory_set_bankptr(machine, "bank2", memory_region(machine, "user2")); + memory_set_bankptr(machine, "bank1", machine->region("user1")->base()); + memory_set_bankptr(machine, "bank2", machine->region("user2")->base()); state->charbank = 0; state->charpalette = 0; diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index 8bdadded1be..ecc91bfdbe8 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -2987,7 +2987,7 @@ MACHINE_CONFIG_END #if 0 static void ryujin_patch(void) { - UINT16 *rom = (UINT16*)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16*)machine->region("maincpu")->base(); rom[ 0x62/2 ] = 1; //0 (already in rom) - Taito Corporation 1993 //1 - Taito America corp with blue FBI logo @@ -3043,7 +3043,7 @@ MACHINE_CONFIG_END #if 0 static void sbm_patch(void) { - UINT16 *rom = (UINT16*)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16*)machine->region("maincpu")->base(); rom[ 0x7ffff/2 ] = 2; //US version } #endif @@ -3824,7 +3824,7 @@ ROM_END static DRIVER_INIT( taito_b ) { - memory_configure_bank(machine, "bank1", 0, 4, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank1", 0, 4, machine->region("audiocpu")->base() + 0x10000, 0x4000); } GAME( 1989, masterw, 0, masterw, masterw, taito_b, ROT270, "Taito Corporation Japan", "Master of Weapon (World)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index 5fd8fbeb787..b2e89e52131 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -3362,7 +3362,7 @@ static MACHINE_START( common ) static MACHINE_START( f2 ) { MACHINE_START_CALL(common); - memory_configure_bank(machine, "bank2", 0, 8, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank2", 0, 8, machine->region("audiocpu")->base() + 0x10000, 0x4000); } static MACHINE_CONFIG_START( taito_f2, taitof2_state ) @@ -5554,7 +5554,7 @@ static DRIVER_INIT( finalb ) int i; UINT8 data; UINT32 offset; - UINT8 *gfx = memory_region(machine, "gfx2"); + UINT8 *gfx = machine->region("gfx2")->base(); offset = 0x100000; for (i = 0x180000; i < 0x200000; i++) @@ -5590,8 +5590,8 @@ static DRIVER_INIT( cameltry ) static DRIVER_INIT( mjnquest ) { taitof2_state *state = machine->driver_data(); - int i, len = memory_region_length(machine, "gfx2"); - UINT8 *gfx = memory_region(machine, "gfx2"); + int i, len = machine->region("gfx2")->bytes(); + UINT8 *gfx = machine->region("gfx2")->base(); /* the bytes in each longword are in reversed order, put them in the order used by the other games. */ diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c index ff8b058e845..074ca14b36e 100644 --- a/src/mame/drivers/taito_f3.c +++ b/src/mame/drivers/taito_f3.c @@ -129,7 +129,7 @@ static WRITE32_HANDLER( f3_sound_reset_1_w ) static WRITE32_HANDLER( f3_sound_bankswitch_w ) { if (f3_game==KIRAMEKI) { - UINT16 *rom = (UINT16 *)memory_region(space->machine, "audiocpu"); + UINT16 *rom = (UINT16 *)space->machine->region("audiocpu")->base(); UINT32 idx; idx = (offset << 1) & 0x1e; @@ -3470,8 +3470,8 @@ static void tile_decode(running_machine *machine) { UINT8 lsb,msb; UINT32 offset,i; - UINT8 *gfx = memory_region(machine, "gfx2"); - int size=memory_region_length(machine, "gfx2"); + UINT8 *gfx = machine->region("gfx2")->base(); + int size=machine->region("gfx2")->bytes(); int data; /* Setup ROM formats: @@ -3503,8 +3503,8 @@ static void tile_decode(running_machine *machine) offset+=4; } - gfx = memory_region(machine, "gfx1"); - size=memory_region_length(machine, "gfx1"); + gfx = machine->region("gfx1")->base(); + size=machine->region("gfx1")->bytes(); offset = size/2; for (i = size/2+size/4; iregion("maincpu")->base(); /* Doesn't boot without this - eprom related? */ RAM[0x5af0/4]=0x4e710000|(RAM[0x5af0/4]&0xffff); @@ -3654,7 +3654,7 @@ static WRITE32_HANDLER( bubsympb_oki_w ) //if (mem_mask==0x000000ff) downcast(device)->write(0,data&0xff); if (ACCESSING_BITS_16_23) { - UINT8 *snd = memory_region(space->machine, "oki"); + UINT8 *snd = space->machine->region("oki")->base(); int bank = (data & 0x000f0000) >> 16; // almost certainly wrong memcpy(snd+0x30000, snd+0x80000+0x30000+bank*0x10000, 0x10000); @@ -3674,7 +3674,7 @@ static DRIVER_INIT( bubsympb ) /* expand gfx rom */ { int i; - UINT8 *gfx = memory_region(machine, "gfx2"); + UINT8 *gfx = machine->region("gfx2")->base(); for (i=0x200000;i<0x400000; i+=4) { @@ -3721,7 +3721,7 @@ static DRIVER_INIT( landmakr ) static DRIVER_INIT( landmkrp ) { - UINT32 *RAM = (UINT32 *)memory_region(machine, "maincpu"); + UINT32 *RAM = (UINT32 *)machine->region("maincpu")->base(); /* For some reason the least significant byte in the last 2 long words of ROM is swapped. As the roms have been verified ok, I assume this is some @@ -3764,7 +3764,7 @@ static DRIVER_INIT( pbobbl2p ) // which eventually causes the game to crash // -- protection check?? or some kind of checksum fail? - UINT32 *ROM = (UINT32 *)memory_region(machine, "maincpu"); + UINT32 *ROM = (UINT32 *)machine->region("maincpu")->base(); /* protection? */ ROM[0x40090/4]=0x00004e71|(ROM[0x40090/4]&0xffff0000); diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c index 165968a3a5a..85f16c5cceb 100644 --- a/src/mame/drivers/taito_h.c +++ b/src/mame/drivers/taito_h.c @@ -525,7 +525,7 @@ static MACHINE_RESET( taitoh ) static MACHINE_START( taitoh ) { taitoh_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 4, &ROM[0xc000], 0x4000); diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index 3e6abd25764..0def398ddec 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -176,7 +176,7 @@ static void machine_reset(running_machine *machine) } state->cur_rombank = state->cur_rombank2 = 0; - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x10000); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0x10000); gfx_element_set_source(machine->gfx[2], state->rambanks); @@ -384,7 +384,7 @@ static WRITE8_HANDLER( rombankswitch_w ) //logerror("robs %d, %02x (%04x)\n", offset, data, cpu_get_pc(space->cpu)); state->cur_rombank = data; - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + 0x10000 + 0x2000 * state->cur_rombank); + memory_set_bankptr(space->machine, "bank1", space->machine->region("maincpu")->base() + 0x10000 + 0x2000 * state->cur_rombank); } } @@ -405,7 +405,7 @@ static WRITE8_HANDLER( rombank2switch_w ) //logerror("robs2 %02x (%04x)\n", data, cpu_get_pc(space->cpu)); state->cur_rombank2 = data; - memory_set_bankptr(space->machine, "bank6", memory_region(space->machine, "slave") + 0x10000 + 0x4000 * state->cur_rombank2); + memory_set_bankptr(space->machine, "bank6", space->machine->region("slave")->base() + 0x10000 + 0x4000 * state->cur_rombank2); } } @@ -625,7 +625,7 @@ static void champwr_msm5205_vck( device_t *device ) } else { - state->adpcm_data = memory_region(device->machine, "adpcm")[state->adpcm_pos]; + state->adpcm_data = device->machine->region("adpcm")->base()[state->adpcm_pos]; state->adpcm_pos = (state->adpcm_pos + 1) & 0x1ffff; msm5205_data_w(device, state->adpcm_data >> 4); } @@ -775,7 +775,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER( sound_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "audiocpu"); + UINT8 *RAM = space->machine->region("audiocpu")->base(); int banknum = (data - 1) & 3; memory_set_bankptr (space->machine, "bank7", &RAM [0x10000 + (banknum * 0x4000)]); @@ -1953,7 +1953,7 @@ static WRITE8_DEVICE_HANDLER( portA_w ) if (state->cur_bank != (data & 0x03)) { int bankaddress; - UINT8 *RAM = memory_region(device->machine, "audiocpu"); + UINT8 *RAM = device->machine->region("audiocpu")->base(); state->cur_bank = data & 0x03; bankaddress = 0x10000 + (state->cur_bank - 1) * 0x4000; @@ -2888,7 +2888,7 @@ static DRIVER_INIT( plottinga ) v |= 1 << (7 - j); tab[i] = v; } - p = memory_region(machine, "maincpu"); + p = machine->region("maincpu")->base(); for (i = 0; i < 0x20000; i++) { *p = tab[*p]; @@ -2898,7 +2898,7 @@ static DRIVER_INIT( plottinga ) static DRIVER_INIT( evilston ) { - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); ROM[0x72] = 0x45; /* reti -> retn ('dead' loop @ $1104 )*/ memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xa7fe, 0xa7fe, 0, 0, evilston_snd_w); } diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index 9e5b8060a60..21b9f871aa8 100644 --- a/src/mame/drivers/taito_x.c +++ b/src/mame/drivers/taito_x.c @@ -399,7 +399,7 @@ static void reset_sound_region(running_machine *machine) { seta_state *state = machine->driver_data(); - memory_set_bankptr(machine, "bank2", memory_region(machine, "audiocpu") + (state->taitox_banknum * 0x4000) + 0x10000 ); + memory_set_bankptr(machine, "bank2", machine->region("audiocpu")->base() + (state->taitox_banknum * 0x4000) + 0x10000 ); } static WRITE8_HANDLER( sound_bankswitch_w ) diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index c2ac4ab408f..613e1f5c806 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -2990,9 +2990,9 @@ static MACHINE_START( bshark ) static MACHINE_START( taitoz ) { - int banks = (memory_region_length(machine, "audiocpu") - 0xc000) / 0x4000; + int banks = (machine->region("audiocpu")->bytes() - 0xc000) / 0x4000; - memory_configure_bank(machine, "bank10", 0, banks, memory_region(machine, "audiocpu") + 0xc000, 0x4000); + memory_configure_bank(machine, "bank10", 0, banks, machine->region("audiocpu")->base() + 0xc000, 0x4000); state_save_register_postload(machine, taitoz_postload, NULL); diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index eec7d38fa73..be8241b6b9e 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -611,7 +611,7 @@ static STATE_POSTLOAD( taitoair_postload ) static MACHINE_START( taitoair ) { taitoair_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); int i; memory_configure_bank(machine, "bank1", 0, 4, &ROM[0xc000], 0x4000); diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c index d7eb8b0a030..331d36e4f82 100644 --- a/src/mame/drivers/taitojc.c +++ b/src/mame/drivers/taitojc.c @@ -875,7 +875,7 @@ ADDRESS_MAP_END static READ16_HANDLER( dsp_rom_r ) { taitojc_state *state = space->machine->driver_data(); - UINT16 *rom = (UINT16*)memory_region(space->machine, "gfx2"); + UINT16 *rom = (UINT16*)space->machine->region("gfx2")->base(); UINT16 data = rom[state->dsp_rom_pos++]; //mame_printf_debug("dsp_rom_r: %08X, %08X at %08X\n", offset, mem_mask, cpu_get_pc(space->cpu)); diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c index b330cf1b420..26521dc3c5c 100644 --- a/src/mame/drivers/taitowlf.c +++ b/src/mame/drivers/taitowlf.c @@ -141,7 +141,7 @@ static void mxtc_config_w(device_t *busdevice, device_t *device, int function, i } else // disable RAM access (reads go to BIOS ROM) { - memory_set_bankptr(busdevice->machine, "bank1", memory_region(busdevice->machine, "user1") + 0x30000); + memory_set_bankptr(busdevice->machine, "bank1", busdevice->machine->region("user1")->base() + 0x30000); } break; } @@ -546,7 +546,7 @@ static MACHINE_START(taitowlf) static MACHINE_RESET(taitowlf) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "user1") + 0x30000); + memory_set_bankptr(machine, "bank1", machine->region("user1")->base() + 0x30000); } diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c index d9bcfd1df47..99cc958d071 100644 --- a/src/mame/drivers/tank8.c +++ b/src/mame/drivers/tank8.c @@ -464,10 +464,10 @@ ROM_END static DRIVER_INIT( decode ) { - const UINT8* DECODE = memory_region(machine, "user1"); + const UINT8* DECODE = machine->region("user1")->base(); - UINT8* p1 = memory_region(machine, "maincpu") + 0x00000; - UINT8* p2 = memory_region(machine, "maincpu") + 0x10000; + UINT8* p1 = machine->region("maincpu")->base() + 0x00000; + UINT8* p2 = machine->region("maincpu")->base() + 0x10000; int i; diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c index 8bd40d72819..46ec86f58a9 100644 --- a/src/mame/drivers/tankbust.c +++ b/src/mame/drivers/tankbust.c @@ -99,8 +99,8 @@ static WRITE8_HANDLER( tankbust_e0xx_w ) case 7: /* 0xe007 bankswitch */ /* bank 1 at 0x6000-9fff = from 0x10000 when bit0=0 else from 0x14000 */ /* bank 2 at 0xa000-bfff = from 0x18000 when bit0=0 else from 0x1a000 */ - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "maincpu") + 0x10000 + ((data&1) * 0x4000) ); - memory_set_bankptr(space->machine, "bank2", memory_region(space->machine, "maincpu") + 0x18000 + ((data&1) * 0x2000) ); /* verified (the game will reset after the "game over" otherwise) */ + memory_set_bankptr(space->machine, "bank1", space->machine->region("maincpu")->base() + 0x10000 + ((data&1) * 0x4000) ); + memory_set_bankptr(space->machine, "bank2", space->machine->region("maincpu")->base() + 0x18000 + ((data&1) * 0x2000) ); /* verified (the game will reset after the "game over" otherwise) */ break; } } diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c index ccd450d964d..b2940162f1a 100644 --- a/src/mame/drivers/taotaido.c +++ b/src/mame/drivers/taotaido.c @@ -124,7 +124,7 @@ static WRITE8_HANDLER( pending_command_clear_w ) static WRITE8_HANDLER( taotaido_sh_bankswitch_w ) { - UINT8 *rom = memory_region(space->machine, "audiocpu") + 0x10000; + UINT8 *rom = space->machine->region("audiocpu")->base() + 0x10000; memory_set_bankptr(space->machine, "bank1",rom + (data & 0x03) * 0x8000); } diff --git a/src/mame/drivers/targeth.c b/src/mame/drivers/targeth.c index e00d8e4eb5d..a85f8374eef 100644 --- a/src/mame/drivers/targeth.c +++ b/src/mame/drivers/targeth.c @@ -47,7 +47,7 @@ static INTERRUPT_GEN(targeth_interrupt ) static WRITE16_HANDLER( OKIM6295_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "oki"); + UINT8 *RAM = space->machine->region("oki")->base(); if (ACCESSING_BITS_0_7){ memcpy(&RAM[0x30000], &RAM[0x40000 + (data & 0x0f)*0x10000], 0x10000); diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c index c351fa0f03c..005b5e18967 100644 --- a/src/mame/drivers/tatsumi.c +++ b/src/mame/drivers/tatsumi.c @@ -1275,9 +1275,9 @@ ROM_END static DRIVER_INIT( apache3 ) { - UINT8 *dst = memory_region(machine, "gfx1"); - UINT8 *src1 = memory_region(machine, "gfx2"); - UINT8 *src2 = memory_region(machine, "gfx3"); + UINT8 *dst = machine->region("gfx1")->base(); + UINT8 *src1 = machine->region("gfx2")->base(); + UINT8 *src2 = machine->region("gfx3")->base(); int i; for (i=0; i<0x100000; i+=32) { @@ -1290,10 +1290,10 @@ static DRIVER_INIT( apache3 ) } // Copy sprite & palette data out of GFX rom area - tatsumi_rom_sprite_lookup1 = memory_region(machine, "gfx2"); - tatsumi_rom_sprite_lookup2 = memory_region(machine, "gfx3"); - tatsumi_rom_clut0 = memory_region(machine, "gfx2")+ 0x100000 - 0x800; - tatsumi_rom_clut1 = memory_region(machine, "gfx3")+ 0x100000 - 0x800; + tatsumi_rom_sprite_lookup1 = machine->region("gfx2")->base(); + tatsumi_rom_sprite_lookup2 = machine->region("gfx3")->base(); + tatsumi_rom_clut0 = machine->region("gfx2")->base()+ 0x100000 - 0x800; + tatsumi_rom_clut1 = machine->region("gfx3")->base()+ 0x100000 - 0x800; tatsumi_reset(machine); @@ -1302,9 +1302,9 @@ static DRIVER_INIT( apache3 ) static DRIVER_INIT( roundup5 ) { - UINT8 *dst = memory_region(machine, "gfx1"); - UINT8 *src1 = memory_region(machine, "gfx2"); - UINT8 *src2 = memory_region(machine, "gfx3"); + UINT8 *dst = machine->region("gfx1")->base(); + UINT8 *src1 = machine->region("gfx2")->base(); + UINT8 *src2 = machine->region("gfx3")->base(); int i; for (i=0; i<0xc0000; i+=32) { @@ -1317,21 +1317,21 @@ static DRIVER_INIT( roundup5 ) } // Copy sprite & palette data out of GFX rom area - tatsumi_rom_sprite_lookup1 = memory_region(machine, "gfx2"); - tatsumi_rom_sprite_lookup2 = memory_region(machine, "gfx3"); - tatsumi_rom_clut0 = memory_region(machine, "gfx2")+ 0xc0000 - 0x800; - tatsumi_rom_clut1 = memory_region(machine, "gfx3")+ 0xc0000 - 0x800; + tatsumi_rom_sprite_lookup1 = machine->region("gfx2")->base(); + tatsumi_rom_sprite_lookup2 = machine->region("gfx3")->base(); + tatsumi_rom_clut0 = machine->region("gfx2")->base()+ 0xc0000 - 0x800; + tatsumi_rom_clut1 = machine->region("gfx3")->base()+ 0xc0000 - 0x800; tatsumi_reset(machine); } static DRIVER_INIT( cyclwarr ) { - UINT8 *dst = memory_region(machine, "gfx1"); - UINT8 *src1 = memory_region(machine, "gfx2"); - int len1 = memory_region_length(machine, "gfx2"); - UINT8 *src2 = memory_region(machine, "gfx3"); - int len2 = memory_region_length(machine, "gfx3"); + UINT8 *dst = machine->region("gfx1")->base(); + UINT8 *src1 = machine->region("gfx2")->base(); + int len1 = machine->region("gfx2")->bytes(); + UINT8 *src2 = machine->region("gfx3")->base(); + int len2 = machine->region("gfx3")->bytes(); int i; for (i=0; iregion("maincpu")->base(); memcpy(cyclwarr_cpua_ram,dst,8); memory_set_bankptr(machine, "bank1", dst); - dst = memory_region(machine, "sub"); + dst = machine->region("sub")->base(); memcpy(cyclwarr_cpub_ram,dst,8); memory_set_bankptr(machine, "bank2", dst); // Copy sprite & palette data out of GFX rom area - tatsumi_rom_sprite_lookup1 = memory_region(machine, "gfx2"); - tatsumi_rom_sprite_lookup2 = memory_region(machine, "gfx3"); - tatsumi_rom_clut0 = memory_region(machine, "gfx2") + len1 - 0x1000; - tatsumi_rom_clut1 = memory_region(machine, "gfx3") + len2 - 0x1000; + tatsumi_rom_sprite_lookup1 = machine->region("gfx2")->base(); + tatsumi_rom_sprite_lookup2 = machine->region("gfx3")->base(); + tatsumi_rom_clut0 = machine->region("gfx2")->base() + len1 - 0x1000; + tatsumi_rom_clut1 = machine->region("gfx3")->base() + len2 - 0x1000; tatsumi_reset(machine); } diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c index 6fe534db12c..b5454365155 100644 --- a/src/mame/drivers/tattack.c +++ b/src/mame/drivers/tattack.c @@ -225,7 +225,7 @@ ROM_END static DRIVER_INIT(tattack) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); rom[0x1b4]=0; rom[0x1b5]=0; diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c index b73de349f0f..7cba42c66ae 100644 --- a/src/mame/drivers/tbowl.c +++ b/src/mame/drivers/tbowl.c @@ -37,7 +37,7 @@ note: check this, its borrowed from tecmo.c / wc90.c at the moment and could wel static WRITE8_HANDLER( tbowlb_bankswitch_w ) { int bankaddress; - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); bankaddress = 0x10000 + ((data & 0xf8) << 8); @@ -47,7 +47,7 @@ static WRITE8_HANDLER( tbowlb_bankswitch_w ) static WRITE8_HANDLER( tbowlc_bankswitch_w ) { int bankaddress; - UINT8 *RAM = memory_region(space->machine, "sub"); + UINT8 *RAM = space->machine->region("sub")->base(); bankaddress = 0x10000 + ((data & 0xf8) << 8); @@ -168,7 +168,7 @@ static void tbowl_adpcm_int(device_t *device) { int num = (strcmp(device->tag(), "msm1") == 0) ? 0 : 1; if (adpcm_pos[num] >= adpcm_end[num] || - adpcm_pos[num] >= memory_region_length(device->machine, "adpcm")/2) + adpcm_pos[num] >= device->machine->region("adpcm")->bytes()/2) msm5205_reset_w(device,1); else if (adpcm_data[num] != -1) { @@ -177,7 +177,7 @@ static void tbowl_adpcm_int(device_t *device) } else { - UINT8 *ROM = memory_region(device->machine, "adpcm") + 0x10000 * num; + UINT8 *ROM = device->machine->region("adpcm")->base() + 0x10000 * num; adpcm_data[num] = ROM[adpcm_pos[num]++]; msm5205_data_w(device,adpcm_data[num] >> 4); diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c index acee09f81ea..5ce474acd7c 100644 --- a/src/mame/drivers/tcl.c +++ b/src/mame/drivers/tcl.c @@ -181,8 +181,8 @@ static DRIVER_INIT(tcl) /* only the first part is decrypted (and verified)*/ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *dest = memory_region(machine, "maincpu"); - int len = memory_region_length(machine, "maincpu"); + UINT8 *dest = machine->region("maincpu")->base(); + int len = machine->region("maincpu")->bytes(); UINT8 *src = auto_alloc_array(machine, UINT8, len); int i,idx=0; diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c index 23b5050f612..82b3dc034a1 100644 --- a/src/mame/drivers/tecmo.c +++ b/src/mame/drivers/tecmo.c @@ -58,7 +58,7 @@ static int adpcm_data; static WRITE8_HANDLER( tecmo_bankswitch_w ) { int bankaddress; - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); bankaddress = 0x10000 + ((data & 0xf8) << 8); @@ -87,7 +87,7 @@ static WRITE8_DEVICE_HANDLER( tecmo_adpcm_vol_w ) static void tecmo_adpcm_int(device_t *device) { if (adpcm_pos >= adpcm_end || - adpcm_pos >= memory_region_length(device->machine, "adpcm")) + adpcm_pos >= device->machine->region("adpcm")->bytes()) msm5205_reset_w(device,1); else if (adpcm_data != -1) { @@ -96,7 +96,7 @@ static void tecmo_adpcm_int(device_t *device) } else { - UINT8 *ROM = memory_region(device->machine, "adpcm"); + UINT8 *ROM = device->machine->region("adpcm")->base(); adpcm_data = ROM[adpcm_pos++]; msm5205_data_w(device,adpcm_data >> 4); diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c index 607de13e623..700be08ec8a 100644 --- a/src/mame/drivers/tecmosys.c +++ b/src/mame/drivers/tecmosys.c @@ -524,14 +524,14 @@ GFXDECODE_END static WRITE8_HANDLER( deroon_bankswitch_w ) { - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "audiocpu") + ((data-2) & 0x0f) * 0x4000 + 0x10000 ); + memory_set_bankptr(space->machine, "bank1", space->machine->region("audiocpu")->base() + ((data-2) & 0x0f) * 0x4000 + 0x10000 ); } static WRITE8_HANDLER( tecmosys_oki_bank_w ) { UINT8 upperbank = (data & 0x30) >> 4; UINT8 lowerbank = (data & 0x03) >> 0; - UINT8* region = memory_region(space->machine, "oki"); + UINT8* region = space->machine->region("oki")->base(); memcpy( region+0x00000, region+0x80000 + lowerbank * 0x20000, 0x20000 ); memcpy( region+0x20000, region+0x80000 + upperbank * 0x20000, 0x20000 ); @@ -583,7 +583,7 @@ static VIDEO_START(deroon) static void tecmosys_render_sprites_to_bitmap(running_machine *machine, bitmap_t *bitmap, UINT16 extrax, UINT16 extray ) { - UINT8 *gfxsrc = memory_region ( machine, "gfx1" ); + UINT8 *gfxsrc = machine->region ( "gfx1" )->base(); int i; /* render sprites (with priority information) to temp bitmap */ @@ -1056,8 +1056,8 @@ ROM_END static void tecmosys_decramble(running_machine *machine) { - UINT8 *gfxsrc = memory_region ( machine, "gfx1" ); - size_t srcsize = memory_region_length( machine, "gfx1" ); + UINT8 *gfxsrc = machine->region ( "gfx1" )->base(); + size_t srcsize = machine->region( "gfx1" )->bytes(); int i; for (i=0; i < srcsize; i+=4) diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c index e671984ee60..b366a5a0e7e 100644 --- a/src/mame/drivers/tehkanwc.c +++ b/src/mame/drivers/tehkanwc.c @@ -195,7 +195,7 @@ static void tehkanwc_adpcm_int(device_t *device) { static int toggle; - UINT8 *SAMPLES = memory_region(device->machine, "adpcm"); + UINT8 *SAMPLES = device->machine->region("adpcm")->base(); int msm_data = SAMPLES[msm_data_offs & 0x7fff]; if (toggle == 0) @@ -708,7 +708,7 @@ static DRIVER_INIT( teedoff ) 023A: 00 nop */ - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); ROM[0x0238] = 0x00; ROM[0x0239] = 0x00; diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c index d61ca2620bc..34184016bda 100644 --- a/src/mame/drivers/tetrisp2.c +++ b/src/mame/drivers/tetrisp2.c @@ -112,7 +112,7 @@ static READ16_HANDLER( rockn_adpcmbank_r ) static WRITE16_HANDLER( rockn_adpcmbank_w ) { - UINT8 *SNDROM = memory_region(space->machine, "ymz"); + UINT8 *SNDROM = space->machine->region("ymz")->base(); int bank; rockn_adpcmbank = data; @@ -129,7 +129,7 @@ static WRITE16_HANDLER( rockn_adpcmbank_w ) static WRITE16_HANDLER( rockn2_adpcmbank_w ) { - UINT8 *SNDROM = memory_region(space->machine, "ymz"); + UINT8 *SNDROM = space->machine->region("ymz")->base(); int bank; char banktable[9][3]= @@ -177,13 +177,13 @@ static WRITE16_HANDLER( nndmseal_sound_bank_w ) if (ACCESSING_BITS_0_7) { - UINT8 *rom = memory_region(space->machine, "okisource"); + UINT8 *rom = space->machine->region("okisource")->base(); if (data & 0x04) { bank_lo = data & 0x03; - memcpy(memory_region(space->machine, "oki"), rom + (bank_lo * 0x80000), 0x20000); + memcpy(space->machine->region("oki")->base(), rom + (bank_lo * 0x80000), 0x20000); // logerror("PC:%06X sound bank_lo = %02X\n",cpu_get_pc(space->cpu),bank_lo); } @@ -191,7 +191,7 @@ static WRITE16_HANDLER( nndmseal_sound_bank_w ) { bank_hi = data & 0x03; - memcpy(memory_region(space->machine, "oki") + 0x20000, rom + (bank_lo * 0x80000) + (bank_hi * 0x20000), 0x20000); + memcpy(space->machine->region("oki")->base() + 0x20000, rom + (bank_lo * 0x80000) + (bank_hi * 0x20000), 0x20000); // logerror("PC:%06X sound bank_hi = %02X\n",cpu_get_pc(space->cpu),bank_hi); } diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c index 98578549918..6d5c4b31540 100644 --- a/src/mame/drivers/thedeep.c +++ b/src/mame/drivers/thedeep.c @@ -56,7 +56,7 @@ static int rombank; static MACHINE_RESET( thedeep ) { - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x10000 + 0 * 0x4000); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0x10000 + 0 * 0x4000); thedeep_scroll[0] = 0; thedeep_scroll[1] = 0; thedeep_scroll[2] = 0; @@ -89,7 +89,7 @@ static WRITE8_HANDLER( thedeep_protection_w ) int new_rombank = protection_command & 3; if (rombank == new_rombank) break; rombank = new_rombank; - rom = memory_region(space->machine, "maincpu"); + rom = space->machine->region("maincpu")->base(); memory_set_bankptr(space->machine, "bank1", rom + 0x10000 + rombank * 0x4000); /* there's code which falls through from the fixed ROM to bank #1, I have to */ /* copy it there otherwise the CPU bank switching support will not catch it. */ @@ -119,7 +119,7 @@ static WRITE8_HANDLER( thedeep_protection_w ) // d166-d174: hl = (hl + 2*a) // d175-d181: hl *= e (e must be non zero) // d182-d19a: hl /= de - protection_data = memory_region(space->machine, "cpu3")[0x185+protection_index++]; + protection_data = space->machine->region("cpu3")->base()[0x185+protection_index++]; else protection_data = 0xc9; diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c index 62c6716eec9..fe13cf63fce 100644 --- a/src/mame/drivers/thepit.c +++ b/src/mame/drivers/thepit.c @@ -1032,7 +1032,7 @@ static READ8_HANDLER( rtriv_question_r ) // Read the actual byte from question roms else if((offset & 0xc00) == 0xc00) { - UINT8 *ROM = memory_region(space->machine, "user1"); + UINT8 *ROM = space->machine->region("user1")->base(); int real_address; real_address = (0x8000 * question_rom) | question_address | (offset & 0x3f0) | remap_address[offset & 0x0f]; diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c index f37b0d0b865..1cabab6de15 100644 --- a/src/mame/drivers/thief.c +++ b/src/mame/drivers/thief.c @@ -643,8 +643,8 @@ ROM_END static DRIVER_INIT( thief ) { - UINT8 *dest = memory_region( machine, "maincpu" ); - const UINT8 *source = memory_region( machine, "cpu1" ); + UINT8 *dest = machine->region( "maincpu" )->base(); + const UINT8 *source = machine->region( "cpu1" )->base(); /* C8 is mapped (banked) in CPU1's address space; it contains Z80 code */ memcpy( &dest[0xe010], &source[0x290], 0x20 ); diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c index 676c9e1374f..e7428429832 100644 --- a/src/mame/drivers/thoop2.c +++ b/src/mame/drivers/thoop2.c @@ -51,7 +51,7 @@ GFXDECODE_END static WRITE16_HANDLER( OKIM6295_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "oki"); + UINT8 *RAM = space->machine->region("oki")->base(); if (ACCESSING_BITS_0_7){ memcpy(&RAM[0x30000], &RAM[0x40000 + (data & 0x0f)*0x10000], 0x10000); diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c index 1d6a25cf953..2964f0f226a 100644 --- a/src/mame/drivers/thunderx.c +++ b/src/mame/drivers/thunderx.c @@ -322,7 +322,7 @@ static WRITE8_HANDLER( thunderx_1f98_w ) static WRITE8_HANDLER( scontra_bankswitch_w ) { thunderx_state *state = space->machine->driver_data(); - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); int offs; //logerror("%04x: bank switch %02x\n",cpu_get_pc(space->cpu),data); @@ -648,7 +648,7 @@ static MACHINE_START( scontra ) static MACHINE_START( thunderx ) { thunderx_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 12, &ROM[0x10000], 0x2000); memory_configure_bank(machine, "bank1", 12, 4, &ROM[0x08000], 0x2000); diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index 222786abaee..82bb8a06147 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -331,7 +331,7 @@ static void tmaster_draw(running_machine *machine) { int x,y,x0,x1,y0,y1,dx,dy,flipx,flipy,sx,sy,sw,sh, addr, mode, layer,buffer, color; - UINT8 *gfxdata = memory_region( machine, "blitter" ) + tmaster_gfx_offs; + UINT8 *gfxdata = machine->region( "blitter" )->base() + tmaster_gfx_offs; UINT16 pen; @@ -600,12 +600,12 @@ static WRITE16_HANDLER( galgames_palette_data_w ) // Sound static READ16_HANDLER( galgames_okiram_r ) { - return memory_region(space->machine, "oki")[offset] | 0xff00; + return space->machine->region("oki")->base()[offset] | 0xff00; } static WRITE16_HANDLER( galgames_okiram_w ) { if (ACCESSING_BITS_0_7) - memory_region(space->machine, "oki")[offset] = data & 0xff; + space->machine->region("oki")->base()[offset] = data & 0xff; } // Carts (preliminary, PIC communication is not implemented) @@ -847,7 +847,7 @@ static MACHINE_START( tmaster ) static MACHINE_RESET( tmaster ) { tmaster_gfx_offs = 0; - tmaster_gfx_size = memory_region_length(machine, "blitter"); + tmaster_gfx_size = machine->region("blitter")->bytes(); tmaster_devices.duart68681 = machine->device( "duart68681" ); } @@ -1595,7 +1595,7 @@ ROM_END static DRIVER_INIT( tm4k ) { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // protection ROM[0x834ce/2] = 0x4e75; @@ -1616,7 +1616,7 @@ Protection resembles that of tm5k rather than tm4ka: static DRIVER_INIT( tm4ka ) { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // protection ROM[0x83476/2] = 0x4e75; @@ -1638,7 +1638,7 @@ Protection starts: static DRIVER_INIT( tm4kb ) { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // protection ROM[0x82b7a/2] = 0x4e75; @@ -1659,7 +1659,7 @@ Protection starts: static DRIVER_INIT( tm5k ) { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // protection ROM[0x96002/2] = 0x4e75; @@ -1682,7 +1682,7 @@ Protection starts: static DRIVER_INIT( tm5kca ) { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // protection ROM[0x95ffe/2] = 0x4e75; @@ -1694,7 +1694,7 @@ static DRIVER_INIT( tm5kca ) static DRIVER_INIT( tm5ka ) { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // protection ROM[0x96b30/2] = 0x4e75; @@ -1715,7 +1715,7 @@ Protection starts: static DRIVER_INIT( tm7k ) { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // protection ROM[0x81730/2] = 0x4e75; @@ -1738,7 +1738,7 @@ Protection starts: static DRIVER_INIT( tm7ka ) { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // protection ROM[0x81594/2] = 0x4e75; @@ -1761,7 +1761,7 @@ Protection starts: static DRIVER_INIT( tm7keval ) /* kit came with a security key labeled A-21657-004, which is a TM5000 key */ { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // protection ROM[0x8949e/2] = 0x4e75; @@ -1784,7 +1784,7 @@ Protection starts: static DRIVER_INIT( tm8k ) { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // protection ROM[0x78b70/2] = 0x4e75; @@ -1807,7 +1807,7 @@ Protection starts: static DRIVER_INIT( galgames ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); int cart; // RAM bank at 0x000000-0x03ffff and 0x200000-0x23ffff @@ -1829,9 +1829,9 @@ static DRIVER_INIT( galgames ) for (cart = 1; cart <= 4; cart++) { - UINT8 *CART = memory_region(machine, "maincpu"); + UINT8 *CART = machine->region("maincpu")->base(); - if (0x200000 * (cart+1) <= memory_region_length(machine, "maincpu")) + if (0x200000 * (cart+1) <= machine->region("maincpu")->bytes()) CART += 0x200000 * cart; memory_configure_bank(machine, GALGAMES_BANK_200000_R, GALGAMES_ROM0+cart, 1, CART, 0x40000); @@ -1841,7 +1841,7 @@ static DRIVER_INIT( galgames ) static DRIVER_INIT( galgame2 ) { - UINT16 *ROM = (UINT16 *)memory_region( machine, "maincpu" ); + UINT16 *ROM = (UINT16 *)machine->region( "maincpu" )->base(); // Patch BIOS to see the game code as first cartridge (until the PIC therein is emulated) ROM[0x118da/2] = 0x4a06; diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c index d76b49e82cc..2ff5b6bef3d 100644 --- a/src/mame/drivers/tmmjprd.c +++ b/src/mame/drivers/tmmjprd.c @@ -264,7 +264,7 @@ static void ttmjprd_draw_tilemap(running_machine *machine, bitmap_t *bitmap, con static VIDEO_UPDATE( tmmjprd ) { - UINT8* gfxroms = memory_region(screen->machine,"gfx2"); + UINT8* gfxroms = screen->machine->region("gfx2")->base(); device_t *left_screen = screen->machine->device("lscreen"); device_t *right_screen = screen->machine->device("rscreen"); @@ -354,7 +354,7 @@ static TIMER_CALLBACK( tmmjprd_blit_done ) static void tmmjprd_do_blit(running_machine *machine) { - UINT8 *blt_data = memory_region(machine, "gfx1"); + UINT8 *blt_data = machine->region("gfx1")->base(); int blt_source = (tmmjprd_blitterregs[0]&0x000fffff)>>0; int blt_column = (tmmjprd_blitterregs[1]&0x00ff0000)>>16; int blt_line = (tmmjprd_blitterregs[1]&0x000000ff); diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c index 7a912b8aece..03e2a0bb6a4 100644 --- a/src/mame/drivers/tmnt.c +++ b/src/mame/drivers/tmnt.c @@ -299,7 +299,7 @@ static SAMPLES_START( tmnt_decode_sample ) running_machine *machine = device->machine; tmnt_state *state = machine->driver_data(); int i; - UINT8 *source = memory_region(machine, "title"); + UINT8 *source = machine->region("title")->base(); state->sampledata = auto_alloc_array(machine, INT16, 0x40000); state_save_register_global_pointer(machine, state->sampledata, 0x40000); @@ -962,7 +962,7 @@ static WRITE16_HANDLER( tmnt2_1c0800_w ) CellSrc = state->tmnt2_1c0800[0x00] | (state->tmnt2_1c0800[0x01] << 16 ); // if (CellDest >= 0x180000 && CellDest < 0x183fe0) { CellVar -= 0x104000; - src = (UINT16 *)(memory_region(space->machine, "maincpu") + CellSrc); + src = (UINT16 *)(space->machine->region("maincpu")->base() + CellSrc); CellVar >>= 1; @@ -2632,7 +2632,7 @@ static const k054539_interface k054539_config = static MACHINE_START( prmrsocr ) { MACHINE_START_CALL(common); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); } @@ -4115,8 +4115,8 @@ static DRIVER_INIT( mia ) be shuffled around because the ROMs are connected differently to the 051962 custom IC. */ - gfxdata = memory_region(machine, "gfx1"); - len = memory_region_length(machine, "gfx1"); + gfxdata = machine->region("gfx1")->base(); + len = machine->region("gfx1")->bytes(); for (i = 0; i < len; i += 4) { for (j = 0; j < 4; j++) @@ -4136,8 +4136,8 @@ static DRIVER_INIT( mia ) be shuffled around because the ROMs are connected differently to the 051937 custom IC. */ - gfxdata = memory_region(machine, "gfx2"); - len = memory_region_length(machine, "gfx2"); + gfxdata = machine->region("gfx2")->base(); + len = machine->region("gfx2")->bytes(); for (i = 0; i < len; i += 4) { for (j = 0; j < 4; j++) @@ -4208,8 +4208,8 @@ static DRIVER_INIT( tmnt ) be shuffled around because the ROMs are connected differently to the 051962 custom IC. */ - gfxdata = memory_region(machine, "gfx1"); - len = memory_region_length(machine, "gfx1"); + gfxdata = machine->region("gfx1")->base(); + len = machine->region("gfx1")->bytes(); for (i = 0; i < len; i += 4) { for (j = 0; j < 4; j++) @@ -4229,8 +4229,8 @@ static DRIVER_INIT( tmnt ) be shuffled around because the ROMs are connected differently to the 051937 custom IC. */ - gfxdata = memory_region(machine, "gfx2"); - len = memory_region_length(machine, "gfx2"); + gfxdata = machine->region("gfx2")->base(); + len = machine->region("gfx2")->bytes(); for (i = 0; i < len; i += 4) { for (j = 0; j < 4; j++) @@ -4247,7 +4247,7 @@ static DRIVER_INIT( tmnt ) temp = auto_alloc_array(machine, UINT8, len); memcpy(temp, gfxdata, len); - code_conv_table = &memory_region(machine, "proms")[0x0000]; + code_conv_table = &machine->region("proms")->base()[0x0000]; for (A = 0; A < len / 4; A++) { #define CA0 0 diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c index d7c41631e95..58474738dcf 100644 --- a/src/mame/drivers/tnzs.c +++ b/src/mame/drivers/tnzs.c @@ -638,7 +638,7 @@ static SAMPLES_START( kageki_init_samples ) int start, size; int i, n; - src = memory_region(machine, "samples") + 0x0090; + src = machine->region("samples")->base() + 0x0090; for (i = 0; i < MAX_SAMPLES; i++) { start = (src[(i * 2) + 1] * 256) + src[(i * 2)]; diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 301e496522d..354476fad25 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -324,7 +324,7 @@ static MACHINE_RESET( vfive ) static MACHINE_RESET( bgaregga ) { toaplan2_state *state = machine->driver_data(); - UINT8 *Z80 = (UINT8 *)memory_region(machine, "audiocpu"); + UINT8 *Z80 = (UINT8 *)machine->region("audiocpu")->base(); // Set Z80 bank switch - default bank is 2 state->current_bank = 4; @@ -400,7 +400,7 @@ static DRIVER_INIT( fixeight ) static DRIVER_INIT( fixeighb ) { toaplan2_state *state = machine->driver_data(); - UINT16 *bgdata = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *bgdata = (UINT16 *)machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &bgdata[0x40000]); /* $80000 - $fffff */ state->sub_cpu_type = CPU_2_NONE; @@ -413,7 +413,7 @@ static DRIVER_INIT( pipibibi ) toaplan2_state *state = machine->driver_data(); int A; int oldword, newword; - UINT16 *pipibibi_68k_rom = (UINT16 *)(memory_region(machine, "maincpu")); + UINT16 *pipibibi_68k_rom = (UINT16 *)(machine->region("maincpu")->base()); /* unscramble the 68K ROM data. */ @@ -1037,7 +1037,7 @@ static WRITE16_DEVICE_HANDLER( fixeighb_oki_bankswitch_w ) data &= 7; if (data <= 4) { - UINT8 *fixeighb_oki = memory_region(device->machine, "oki"); + UINT8 *fixeighb_oki = device->machine->region("oki")->base(); memcpy(&fixeighb_oki[0x30000], &fixeighb_oki[(data * 0x10000) + 0x40000], 0x10000); } } @@ -1171,7 +1171,7 @@ static WRITE16_HANDLER( batrider_z80_busreq_w ) static READ16_HANDLER( raizing_z80rom_r ) { - UINT8 *Z80_ROM_test = (UINT8 *)memory_region(space->machine, "audiocpu"); + UINT8 *Z80_ROM_test = (UINT8 *)space->machine->region("audiocpu")->base(); if (offset < 0x8000) return Z80_ROM_test[offset] & 0xff; diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c index c27dd01292c..cc241650de6 100644 --- a/src/mame/drivers/toki.c +++ b/src/mame/drivers/toki.c @@ -72,7 +72,7 @@ static void toki_adpcm_int (device_t *device) static WRITE8_DEVICE_HANDLER( toki_adpcm_control_w ) { int bankaddress; - UINT8 *RAM = memory_region(device->machine, "audiocpu"); + UINT8 *RAM = device->machine->region("audiocpu")->base(); /* the code writes either 2 or 3 in the bottom two bits */ @@ -741,7 +741,7 @@ ROM_END static DRIVER_INIT( toki ) { - UINT8 *ROM = memory_region(machine, "oki"); + UINT8 *ROM = machine->region("oki")->base(); UINT8 *buffer = auto_alloc_array(machine, UINT8, 0x20000); int i; @@ -764,14 +764,14 @@ static DRIVER_INIT( tokib ) UINT8 *rom; /* invert the sprite data in the ROMs */ - len = memory_region_length(machine, "gfx2"); - rom = memory_region(machine, "gfx2"); + len = machine->region("gfx2")->bytes(); + rom = machine->region("gfx2")->base(); for (i = 0; i < len; i++) rom[i] ^= 0xff; /* merge background tile graphics together */ - len = memory_region_length(machine, "gfx3"); - rom = memory_region(machine, "gfx3"); + len = machine->region("gfx3")->bytes(); + rom = machine->region("gfx3")->base(); for (offs = 0; offs < len; offs += 0x20000) { UINT8 *base = &rom[offs]; @@ -784,8 +784,8 @@ static DRIVER_INIT( tokib ) memcpy (&base[0x18000 + i * 0x800], &temp[0x1800 + i * 0x2000], 0x800); } } - len = memory_region_length(machine, "gfx4"); - rom = memory_region(machine, "gfx4"); + len = machine->region("gfx4")->bytes(); + rom = machine->region("gfx4")->base(); for (offs = 0; offs < len; offs += 0x20000) { UINT8 *base = &rom[offs]; @@ -807,7 +807,7 @@ static DRIVER_INIT(jujub) /* Program ROMs are bitswapped */ { int i; - UINT16 *prgrom = (UINT16*)memory_region(machine, "maincpu"); + UINT16 *prgrom = (UINT16*)machine->region("maincpu")->base(); for (i = 0; i < 0x60000/2; i++) { @@ -822,7 +822,7 @@ static DRIVER_INIT(jujub) { address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM); UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x20000); - UINT8 *rom = memory_region(machine, "audiocpu"); + UINT8 *rom = machine->region("audiocpu")->base(); int i; memcpy(decrypt,rom,0x20000); @@ -837,7 +837,7 @@ static DRIVER_INIT(jujub) } { - UINT8 *ROM = memory_region(machine, "oki"); + UINT8 *ROM = machine->region("oki")->base(); UINT8 *buffer = auto_alloc_array(machine, UINT8, 0x20000); int i; diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index edcb82f2f58..276ba6a1f38 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -416,7 +416,7 @@ static void topspeed_msm5205_vck( device_t *device ) } else { - state->adpcm_data = memory_region(device->machine, "adpcm")[state->adpcm_pos]; + state->adpcm_data = device->machine->region("adpcm")->base()[state->adpcm_pos]; state->adpcm_pos = (state->adpcm_pos + 1) & 0x1ffff; msm5205_data_w(device, state->adpcm_data >> 4); } @@ -650,7 +650,7 @@ static MACHINE_START( topspeed ) { topspeed_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank10", 0, 4, memory_region(machine, "audiocpu") + 0xc000, 0x4000); + memory_configure_bank(machine, "bank10", 0, 4, machine->region("audiocpu")->base() + 0xc000, 0x4000); state->maincpu = machine->device("maincpu"); state->subcpu = machine->device("sub"); diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c index e110cdc2710..4cc28735c85 100644 --- a/src/mame/drivers/trackfld.c +++ b/src/mame/drivers/trackfld.c @@ -1413,7 +1413,7 @@ static DRIVER_INIT( trackfld ) static DRIVER_INIT( atlantol ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); UINT8 *decrypt; int A; @@ -1442,7 +1442,7 @@ static DRIVER_INIT( atlantol ) static DRIVER_INIT( mastkin ) { - UINT8 *prom = memory_region(machine, "proms"); + UINT8 *prom = machine->region("proms")->base(); int i; /* build a fake palette so the screen won't be all black */ @@ -1463,14 +1463,14 @@ static DRIVER_INIT( mastkin ) static DRIVER_INIT( wizzquiz ) { - UINT8 *ROM = memory_region(machine, "maincpu") + 0xe000; + UINT8 *ROM = machine->region("maincpu")->base() + 0xe000; int i; /* decrypt program rom */ for (i = 0; i < 0x2000; i++) ROM[i] = BITSWAP8(ROM[i],0,1,2,3,4,5,6,7); - ROM = memory_region(machine, "user1"); + ROM = machine->region("user1")->base(); /* decrypt questions roms */ for (i = 0; i < 0x40000; i++) diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c index d3345d1ca9a..5f5d7934695 100644 --- a/src/mame/drivers/travrusa.c +++ b/src/mame/drivers/travrusa.c @@ -454,7 +454,7 @@ ROM_END static DRIVER_INIT( motorace ) { int A, j; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); UINT8 *buffer = auto_alloc_array(machine, UINT8, 0x2000); memcpy(buffer, rom, 0x2000); @@ -472,7 +472,7 @@ static DRIVER_INIT( motorace ) static DRIVER_INIT( shtridra ) { int A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); /* D3/D4 and D5/D6 swapped */ for (A = 0; A < 0x2000; A++) diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c index b25ca7d1781..5786d5ffec6 100644 --- a/src/mame/drivers/trucocl.c +++ b/src/mame/drivers/trucocl.c @@ -52,7 +52,7 @@ static TIMER_CALLBACK( dac_irq ) static WRITE8_DEVICE_HANDLER( audio_dac_w ) { - UINT8 *rom = memory_region(device->machine, "maincpu"); + UINT8 *rom = device->machine->region("maincpu")->base(); int dac_address = ( data & 0xf0 ) << 8; int sel = ( ( (~data) >> 1 ) & 2 ) | ( data & 1 ); diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c index b2bd7c285f0..f0f8c4327a1 100644 --- a/src/mame/drivers/trvmadns.c +++ b/src/mame/drivers/trvmadns.c @@ -81,7 +81,7 @@ static WRITE8_HANDLER( trvmadns_banking_w ) } else if((data & 0xf0) == 0x80 || (data & 0xf0) == 0x90) { - rom = memory_region(space->machine, "user2"); + rom = space->machine->region("user2")->base(); switch(data & 0xf) { @@ -109,7 +109,7 @@ static WRITE8_HANDLER( trvmadns_banking_w ) //logerror("port80 = %02X\n",data); } - rom = memory_region(space->machine, "user1"); + rom = space->machine->region("user1")->base(); /* 7 diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c index a26f97a9741..3f0c41142d8 100644 --- a/src/mame/drivers/trvquest.c +++ b/src/mame/drivers/trvquest.c @@ -45,7 +45,7 @@ static READ8_HANDLER( trvquest_question_r ) { gameplan_state *state = space->machine->driver_data(); - return memory_region(space->machine, "questions")[*state->trvquest_question * 0x2000 + offset]; + return space->machine->region("questions")->base()[*state->trvquest_question * 0x2000 + offset]; } static WRITE8_DEVICE_HANDLER( trvquest_coin_w ) diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c index d58b78fec14..acba1c497cb 100644 --- a/src/mame/drivers/tryout.c +++ b/src/mame/drivers/tryout.c @@ -45,7 +45,7 @@ static WRITE8_HANDLER( tryout_sound_irq_ack_w ) static WRITE8_HANDLER( tryout_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); int bankaddress; bankaddress = 0x10000 + (data & 0x01) * 0x2000; diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c index 1d32fd6a503..3c8f1094f9d 100644 --- a/src/mame/drivers/ttchamp.c +++ b/src/mame/drivers/ttchamp.c @@ -93,7 +93,7 @@ static WRITE16_HANDLER( paloff_w ) static WRITE16_HANDLER( pcup_prgbank_w ) { int bank; - UINT8 *ROM1 = memory_region(space->machine, "user1"); + UINT8 *ROM1 = space->machine->region("user1")->base(); if (ACCESSING_BITS_0_7) { @@ -322,7 +322,7 @@ ROM_END static DRIVER_INIT (ttchamp) { - UINT8 *ROM1 = memory_region(machine, "user1"); + UINT8 *ROM1 = machine->region("user1")->base(); memory_set_bankptr(machine, "bank1",&ROM1[0x120000]); memory_set_bankptr(machine, "bank2",&ROM1[0x180000]); } diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c index 5689fb078a6..3c702e41da3 100644 --- a/src/mame/drivers/tumbleb.c +++ b/src/mame/drivers/tumbleb.c @@ -499,7 +499,7 @@ static const int tumbleb_sound_lookup[256] = { /* we use channels 1,2,3 for sound effects, and channel 4 for music */ static void tumbleb2_set_music_bank( running_machine *machine, int bank ) { - UINT8 *oki = memory_region(machine, "oki"); + UINT8 *oki = machine->region("oki")->base(); memcpy(&oki[0x38000], &oki[0x80000 + 0x38000 + 0x8000 * bank], 0x8000); } @@ -792,7 +792,7 @@ static WRITE16_HANDLER( semicom_soundcmd_w ) static WRITE8_HANDLER( oki_sound_bank_w ) { - UINT8 *oki = memory_region(space->machine, "oki"); + UINT8 *oki = space->machine->region("oki")->base(); memcpy(&oki[0x30000], &oki[(data * 0x10000) + 0x40000], 0x10000); } @@ -817,7 +817,7 @@ ADDRESS_MAP_END static WRITE8_HANDLER(jumppop_z80_bank_w) { - memory_set_bankptr(space->machine, "bank1", memory_region(space->machine, "audiocpu") + 0x10000 + (0x4000 * data)); + memory_set_bankptr(space->machine, "bank1", space->machine->region("audiocpu")->base() + 0x10000 + (0x4000 * data)); } static ADDRESS_MAP_START( jumppop_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -866,8 +866,8 @@ ADDRESS_MAP_END static WRITE8_HANDLER( jumpkids_oki_bank_w ) { - UINT8* sound1 = memory_region(space->machine, "oki"); - UINT8* sound2 = memory_region(space->machine, "oki2"); + UINT8* sound1 = space->machine->region("oki")->base(); + UINT8* sound2 = space->machine->region("oki2")->base(); int bank = data & 0x03; memcpy(sound1 + 0x20000, sound2 + bank * 0x20000, 0x20000); @@ -2227,8 +2227,8 @@ static MACHINE_RESET (htchctch) tumbleb_state *state = machine->driver_data(); /* copy protection data every reset */ - UINT16 *PROTDATA = (UINT16*)memory_region(machine, "user1"); - int i, len = memory_region_length(machine, "user1"); + UINT16 *PROTDATA = (UINT16*)machine->region("user1")->base(); + int i, len = machine->region("user1")->bytes(); for (i = 0; i < len / 2; i++) state->mainram[0x000/2 + i] = PROTDATA[i]; @@ -3345,7 +3345,7 @@ ROM_END void tumblepb_patch_code(running_machine *machine, UINT16 offset) { /* A hack which enables all Dip Switches effects */ - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); RAM[(offset + 0)/2] = 0x0240; RAM[(offset + 2)/2] = 0xffff; // andi.w #$f3ff, D0 } @@ -3354,8 +3354,8 @@ void tumblepb_patch_code(running_machine *machine, UINT16 offset) static void tumblepb_gfx1_rearrange(running_machine *machine) { - UINT8 *rom = memory_region(machine, "gfx1"); - int len = memory_region_length(machine, "gfx1"); + UINT8 *rom = machine->region("gfx1")->base(); + int len = machine->region("gfx1")->bytes(); int i; /* gfx data is in the wrong order */ @@ -3412,7 +3412,7 @@ static DRIVER_INIT( fncywld ) #if FNCYWLD_HACK /* This is a hack to allow you to use the extra features of the 2 first "Unused" Dip Switch (see notes above). */ - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); RAM[0x0005fa/2] = 0x4e71; RAM[0x00060a/2] = 0x4e71; #endif @@ -3438,9 +3438,9 @@ static DRIVER_INIT( htchctch ) { tumbleb_state *state = machine->driver_data(); -// UINT16 *HCROM = (UINT16*)memory_region(machine, "maincpu"); - UINT16 *PROTDATA = (UINT16*)memory_region(machine, "user1"); - int i, len = memory_region_length(machine, "user1"); +// UINT16 *HCROM = (UINT16*)machine->region("maincpu")->base(); + UINT16 *PROTDATA = (UINT16*)machine->region("user1")->base(); + int i, len = machine->region("user1")->bytes(); /* simulate RAM initialization done by the protection MCU */ /* verified on real hardware */ // static UINT16 htchctch_mcu68k[] = @@ -3692,7 +3692,7 @@ static DRIVER_INIT( htchctch ) static void suprtrio_decrypt_code(running_machine *machine) { - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); UINT16 *buf = auto_alloc_array(machine, UINT16, 0x80000/2); int i; @@ -3710,7 +3710,7 @@ static void suprtrio_decrypt_code(running_machine *machine) static void suprtrio_decrypt_gfx(running_machine *machine) { - UINT16 *rom = (UINT16 *)memory_region(machine, "gfx1"); + UINT16 *rom = (UINT16 *)machine->region("gfx1")->base(); UINT16 *buf = auto_alloc_array(machine, UINT16, 0x100000/2); int i; diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c index 519bc26d439..04ad7a052c5 100644 --- a/src/mame/drivers/tumblep.c +++ b/src/mame/drivers/tumblep.c @@ -389,7 +389,7 @@ ROM_END void tumblep_patch_code(UINT16 offset) { /* A hack which enables all Dip Switches effects */ - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); RAM[(offset + 0)/2] = 0x0240; RAM[(offset + 2)/2] = 0xffff; // andi.w #$f3ff, D0 } diff --git a/src/mame/drivers/turbo.c b/src/mame/drivers/turbo.c index 45e84657aaf..0fd9a326c13 100644 --- a/src/mame/drivers/turbo.c +++ b/src/mame/drivers/turbo.c @@ -1760,7 +1760,7 @@ static void turbo_rom_decode(running_machine *machine) 2,1,2,1 /* 0x5000-0x5fff */ }; - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); int offs, i, j; UINT8 src; diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c index 796fce37e45..0b5ff975f59 100644 --- a/src/mame/drivers/tutankhm.c +++ b/src/mame/drivers/tutankhm.c @@ -199,7 +199,7 @@ static MACHINE_START( tutankhm ) { tutankhm_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x1000); + memory_configure_bank(machine, "bank1", 0, 16, machine->region("maincpu")->base() + 0x10000, 0x1000); state->maincpu = machine->device("maincpu"); diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index fd380dc59b6..3b4bd278a77 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -98,7 +98,7 @@ static WRITE16_HANDLER( videoram16_w ) static READ16_HANDLER( extra_rom_r ) { - return ((UINT16 *)memory_region(space->machine, "gfx3"))[offset]; + return ((UINT16 *)space->machine->region("gfx3")->base())[offset]; } static READ16_HANDLER( twin16_gfx_rom1_r ) @@ -1307,7 +1307,7 @@ static void gfx_untangle( running_machine *machine ) int i; UINT16 *temp = auto_alloc_array(machine, UINT16, 0x200000/2); - twin16_gfx_rom = (UINT16 *)memory_region(machine, "gfx2"); + twin16_gfx_rom = (UINT16 *)machine->region("gfx2")->base(); memcpy( temp, twin16_gfx_rom, 0x200000 ); for( i=0; i<0x080000; i++ ) diff --git a/src/mame/drivers/twinkle.c b/src/mame/drivers/twinkle.c index 62121f7ee34..75a6e832613 100644 --- a/src/mame/drivers/twinkle.c +++ b/src/mame/drivers/twinkle.c @@ -736,14 +736,14 @@ static WRITE16_HANDLER( twinkle_spu_ctrl_w ) static READ16_HANDLER( twinkle_waveram_r ) { - UINT16 *waveram = (UINT16 *)memory_region(space->machine, "rfsnd"); + UINT16 *waveram = (UINT16 *)space->machine->region("rfsnd")->base(); return waveram[offset]; } static WRITE16_HANDLER( twinkle_waveram_w ) { - UINT16 *waveram = (UINT16 *)memory_region(space->machine, "rfsnd"); + UINT16 *waveram = (UINT16 *)space->machine->region("rfsnd")->base(); COMBINE_DATA(&waveram[offset]); } diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c index 867f2afc0ca..7111860497f 100644 --- a/src/mame/drivers/undrfire.c +++ b/src/mame/drivers/undrfire.c @@ -962,8 +962,8 @@ ROM_END static DRIVER_INIT( undrfire ) { UINT32 offset,i; - UINT8 *gfx = memory_region(machine, "gfx3"); - int size=memory_region_length(machine, "gfx3"); + UINT8 *gfx = machine->region("gfx3")->base(); + int size=machine->region("gfx3")->bytes(); int data; /* make piv tile GFX format suitable for gfxdecode */ @@ -991,8 +991,8 @@ static DRIVER_INIT( undrfire ) static DRIVER_INIT( cbombers ) { UINT32 offset,i; - UINT8 *gfx = memory_region(machine, "gfx3"); - int size=memory_region_length(machine, "gfx3"); + UINT8 *gfx = machine->region("gfx3")->base(); + int size=machine->region("gfx3")->bytes(); int data; diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c index ba565bab2b9..362d1593a5f 100644 --- a/src/mame/drivers/unico.c +++ b/src/mame/drivers/unico.c @@ -98,7 +98,7 @@ static WRITE16_HANDLER( zeropnt_sound_bank_w ) contains garbage. Indeed, only banks 0&1 are used */ int bank = (data >> 8 ) & 1; - UINT8 *dst = memory_region(space->machine, "oki"); + UINT8 *dst = space->machine->region("oki")->base(); UINT8 *src = dst + 0x80000 + 0x20000 + 0x20000 * bank; memcpy(dst + 0x20000, src, 0x20000); @@ -194,7 +194,7 @@ static WRITE32_HANDLER( zeropnt2_sound_bank_w ) if (ACCESSING_BITS_24_31) { int bank = ((data >> 24) & 3) % 4; - UINT8 *dst = memory_region(space->machine, "oki1"); + UINT8 *dst = space->machine->region("oki1")->base(); UINT8 *src = dst + 0x80000 + 0x20000 + 0x20000 * bank; memcpy(dst + 0x20000, src, 0x20000); } diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c index 6b3bccbdd00..61c459f15ba 100644 --- a/src/mame/drivers/upscope.c +++ b/src/mame/drivers/upscope.c @@ -408,7 +408,7 @@ static DRIVER_INIT( upscope ) /* set up memory */ memory_configure_bank(machine, "bank1", 0, 1, state->chip_ram, 0); - memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "user1"), 0); + memory_configure_bank(machine, "bank1", 1, 1, machine->region("user1")->base(), 0); } diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c index 13162f3e2da..1ce01e5f367 100644 --- a/src/mame/drivers/usgames.c +++ b/src/mame/drivers/usgames.c @@ -33,7 +33,7 @@ Sound: AY-3-8912 static WRITE8_HANDLER( usgames_rombank_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); // logerror ("BANK WRITE? -%02x-\n",data); //popmessage("%02x",data); diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c index f0cf73a28d6..941d90fa4c2 100644 --- a/src/mame/drivers/vaportra.c +++ b/src/mame/drivers/vaportra.c @@ -839,7 +839,7 @@ C3D54* static DRIVER_INIT( vaportra ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); int i; for (i = 0x00000; i < 0x80000; i++) diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c index a3dcbd46c0a..6bedff8f0bc 100644 --- a/src/mame/drivers/vball.c +++ b/src/mame/drivers/vball.c @@ -161,7 +161,7 @@ static WRITE8_HANDLER( vball_irq_ack_w ) */ static WRITE8_HANDLER( vb_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); memory_set_bankptr(space->machine, "bank1", &RAM[0x10000 + (0x4000 * (data & 1))]); if (vball_gfxset != ((data & 0x20) ^ 0x20)) diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c index 70ccc9c5d17..771eeaecbc7 100644 --- a/src/mame/drivers/vcombat.c +++ b/src/mame/drivers/vcombat.c @@ -413,7 +413,7 @@ DIRECT_UPDATE_HANDLER( vcombat_vid_1_direct_handler ) static DRIVER_INIT( vcombat ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); /* The two i860s execute out of RAM */ address_space *space = machine->device("vid_0")->space(AS_PROGRAM); diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c index 61a23edfc3a..ea41afda458 100644 --- a/src/mame/drivers/vega.c +++ b/src/mame/drivers/vega.c @@ -97,7 +97,7 @@ UINT8 ascii_to_bin( UINT8 ascii ) DRIVER_INIT(vegaa) { UINT8* buf = (UINT8*)malloc(0x10000); - UINT8* rom = memory_region(machine,"maincpu"); + UINT8* rom = machine->region("maincpu")->base(); int i; int count = 0; // last 0xc bytes of file are just some settings, ignore diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c index 2e390b07958..35a0748ba50 100644 --- a/src/mame/drivers/vendetta.c +++ b/src/mame/drivers/vendetta.c @@ -455,7 +455,7 @@ static const k053247_interface esckids_k053246_intf = static MACHINE_START( vendetta ) { vendetta_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 28, &ROM[0x10000], 0x2000); memory_set_bank(machine, "bank1", 0); diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c index b6f1ffe018f..c1fafaa74ce 100644 --- a/src/mame/drivers/vigilant.c +++ b/src/mame/drivers/vigilant.c @@ -26,7 +26,7 @@ Buccaneers has a 5.6888 Mhz and a 18.432 Mhz OSC static WRITE8_HANDLER( vigilant_bank_select_w ) { int bankaddress; - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); bankaddress = 0x10000 + (data & 0x07) * 0x4000; memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c index 37609282e92..eeaa889663a 100644 --- a/src/mame/drivers/vmetal.c +++ b/src/mame/drivers/vmetal.c @@ -84,7 +84,7 @@ static READ16_HANDLER ( varia_crom_read ) /* game reads the cgrom, result is 7772, verified to be correct on the real board */ metro_state *state = space->machine->driver_data(); - UINT8 *cgrom = memory_region(space->machine, "gfx1"); + UINT8 *cgrom = space->machine->region("gfx1")->base(); UINT16 retdat; offset = offset << 1; diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c index cb31080f171..56921ad021f 100644 --- a/src/mame/drivers/wallc.c +++ b/src/mame/drivers/wallc.c @@ -254,7 +254,7 @@ static DRIVER_INIT( wallc ) UINT8 c; UINT32 i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i=0; i<0x2000*2; i++) { @@ -269,7 +269,7 @@ static DRIVER_INIT( wallca ) UINT8 c; UINT32 i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); for (i=0; i<0x4000; i++) { diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index a98a50c9e07..8c1b7fcb25c 100644 --- a/src/mame/drivers/wardner.c +++ b/src/mame/drivers/wardner.c @@ -141,7 +141,7 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw ) int bankaddress = 0; address_space *mainspace; - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); mainspace = cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM); wardner_membank = data; diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index 60c907663e8..7ae94bc3ee1 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -540,7 +540,7 @@ static MACHINE_START( warriorb ) { warriorb_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank10", 0, 8, memory_region(machine, "audiocpu") + 0xc000, 0x4000); + memory_configure_bank(machine, "bank10", 0, 8, machine->region("audiocpu")->base() + 0xc000, 0x4000); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c index 9f497eef96d..c35082cf9cf 100644 --- a/src/mame/drivers/wc90.c +++ b/src/mame/drivers/wc90.c @@ -83,7 +83,7 @@ voice.ic82 CRC32 abc61f3d SHA1 c6f123d16a26c4d77c635617dd97bb4b906c463a static WRITE8_HANDLER( wc90_bankswitch_w ) { int bankaddress; - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); bankaddress = 0x10000 + ( ( data & 0xf8 ) << 8 ); @@ -93,7 +93,7 @@ static WRITE8_HANDLER( wc90_bankswitch_w ) static WRITE8_HANDLER( wc90_bankswitch1_w ) { int bankaddress; - UINT8 *RAM = memory_region(space->machine, "sub"); + UINT8 *RAM = space->machine->region("sub")->base(); bankaddress = 0x10000 + ( ( data & 0xf8 ) << 8 ); diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c index 97e3f0fcabf..91f3b359e0f 100644 --- a/src/mame/drivers/wc90b.c +++ b/src/mame/drivers/wc90b.c @@ -100,7 +100,7 @@ static int msm5205next; static WRITE8_HANDLER( wc90b_bankswitch_w ) { int bankaddress; - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); bankaddress = 0x10000 + ((data & 0xf8) << 8); memory_set_bankptr(space->machine, "bank1",&ROM[bankaddress]); @@ -109,7 +109,7 @@ static WRITE8_HANDLER( wc90b_bankswitch_w ) static WRITE8_HANDLER( wc90b_bankswitch1_w ) { int bankaddress; - UINT8 *ROM = memory_region(space->machine, "sub"); + UINT8 *ROM = space->machine->region("sub")->base(); bankaddress = 0x10000 + ((data & 0xf8) << 8); memory_set_bankptr(space->machine, "bank2",&ROM[bankaddress]); @@ -124,7 +124,7 @@ static WRITE8_HANDLER( wc90b_sound_command_w ) static WRITE8_DEVICE_HANDLER( adpcm_control_w ) { int bankaddress; - UINT8 *ROM = memory_region(device->machine, "audiocpu"); + UINT8 *ROM = device->machine->region("audiocpu")->base(); /* the code writes either 2 or 3 in the bottom two bits */ bankaddress = 0x10000 + (data & 0x01) * 0x4000; diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c index fd2cccf0757..e75736181ed 100644 --- a/src/mame/drivers/wecleman.c +++ b/src/mame/drivers/wecleman.c @@ -1215,9 +1215,9 @@ static void wecleman_unpack_sprites(running_machine *machine) { const char *region = "gfx1"; // sprites - const UINT32 len = memory_region_length(machine, region); - UINT8 *src = memory_region(machine, region) + len / 2 - 1; - UINT8 *dst = memory_region(machine, region) + len - 1; + const UINT32 len = machine->region(region)->bytes(); + UINT8 *src = machine->region(region)->base() + len / 2 - 1; + UINT8 *dst = machine->region(region)->base() + len - 1; while(dst > src) { @@ -1247,7 +1247,7 @@ static DRIVER_INIT( wecleman ) { int i, len; UINT8 *RAM; -// UINT16 *RAM1 = (UINT16 *) memory_region(machine, "maincpu"); /* Main CPU patches */ +// UINT16 *RAM1 = (UINT16 *) machine->region("maincpu")->base(); /* Main CPU patches */ // RAM1[0x08c2/2] = 0x601e; // faster self test /* Decode GFX Roms - Compensate for the address lines scrambling */ @@ -1257,8 +1257,8 @@ static DRIVER_INIT( wecleman ) I hope you'll appreciate this effort! */ /* let's swap even and odd *pixels* of the sprites */ - RAM = memory_region(machine, "gfx1"); - len = memory_region_length(machine, "gfx1"); + RAM = machine->region("gfx1")->base(); + len = machine->region("gfx1")->bytes(); for (i = 0; i < len; i ++) { /* TODO: could be wrong, colors have to be fixed. */ @@ -1267,18 +1267,18 @@ static DRIVER_INIT( wecleman ) RAM[i] = BITSWAP8(RAM[i],7,0,1,2,3,4,5,6); } - bitswap(machine, memory_region(machine, "gfx1"), memory_region_length(machine, "gfx1"), + bitswap(machine, machine->region("gfx1")->base(), machine->region("gfx1")->bytes(), 0,1,20,19,18,17,14,9,16,6,4,7,8,15,10,11,13,5,12,3,2); /* Now we can unpack each nibble of the sprites into a pixel (one byte) */ wecleman_unpack_sprites(machine); /* Bg & Fg & Txt */ - bitswap(machine, memory_region(machine, "gfx2"), memory_region_length(machine, "gfx2"), + bitswap(machine, machine->region("gfx2")->base(), machine->region("gfx2")->bytes(), 20,19,18,17,16,15,12,7,14,4,2,5,6,13,8,9,11,3,10,1,0); /* Road */ - bitswap(machine, memory_region(machine, "gfx3"), memory_region_length(machine, "gfx3"), + bitswap(machine, machine->region("gfx3")->base(), machine->region("gfx3")->bytes(), 20,19,18,17,16,15,14,7,12,4,2,5,6,13,8,9,11,3,10,1,0); spr_color_offs = 0x40; @@ -1343,7 +1343,7 @@ static void hotchase_sprite_decode( running_machine *machine, int num16_banks, i UINT8 *base, *temp; int i; - base = memory_region(machine, "gfx1"); // sprites + base = machine->region("gfx1")->base(); // sprites temp = auto_alloc_array(machine, UINT8, bank_size ); for( i = num16_banks; i >0; i-- ){ @@ -1388,7 +1388,7 @@ static void hotchase_sprite_decode( running_machine *machine, int num16_banks, i /* Unpack sprites data and do some patching */ static DRIVER_INIT( hotchase ) { -// UINT16 *RAM1 = (UINT16) memory_region(machine, "maincpu"); /* Main CPU patches */ +// UINT16 *RAM1 = (UINT16) machine->region("maincpu")->base(); /* Main CPU patches */ // RAM[0x1140/2] = 0x0015; RAM[0x195c/2] = 0x601A; // faster self test UINT8 *RAM; @@ -1396,13 +1396,13 @@ static DRIVER_INIT( hotchase ) /* Decode GFX Roms */ /* Let's swap even and odd bytes of the sprites gfx roms */ - RAM = memory_region(machine, "gfx1"); + RAM = machine->region("gfx1")->base(); /* Now we can unpack each nibble of the sprites into a pixel (one byte) */ hotchase_sprite_decode(machine,3,0x80000*2); // num banks, bank len /* Let's copy the second half of the fg layer gfx (charset) over the first */ - RAM = memory_region(machine, "gfx3"); + RAM = machine->region("gfx3")->base(); memcpy(&RAM[0], &RAM[0x10000/2], 0x10000/2); spr_color_offs = 0; diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c index 174d988f982..79ae8801ca7 100644 --- a/src/mame/drivers/welltris.c +++ b/src/mame/drivers/welltris.c @@ -322,7 +322,7 @@ TODO: static WRITE8_HANDLER( welltris_sh_bankswitch_w ) { - UINT8 *rom = memory_region(space->machine, "audiocpu") + 0x10000; + UINT8 *rom = space->machine->region("audiocpu")->base() + 0x10000; memory_set_bankptr(space->machine, "bank1",rom + (data & 0x03) * 0x8000); } @@ -692,7 +692,7 @@ static DRIVER_INIT( welltris ) { #if WELLTRIS_4P_HACK /* A Hack which shows 4 player mode in code which is disabled */ - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); RAM[0xB91C/2] = 0x4e71; RAM[0xB91E/2] = 0x4e71; #endif diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index 89033f51e77..ff4eaa6783c 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -953,7 +953,7 @@ static MACHINE_START( wgp ) { wgp_state *state = machine->driver_data(); - memory_configure_bank(machine, "bank10", 0, 4, memory_region(machine, "audiocpu") + 0xc000, 0x4000); + memory_configure_bank(machine, "bank10", 0, 4, machine->region("audiocpu")->base() + 0xc000, 0x4000); state->maincpu = machine->device("maincpu"); state->audiocpu = machine->device("audiocpu"); @@ -1270,7 +1270,7 @@ static DRIVER_INIT( wgp ) #if 0 /* Patch for coding error that causes corrupt data in sprite tilemapping area from $4083c0-847f */ - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); ROM[0x25dc / 2] = 0x0602; // faulty value is 0x0206 #endif } @@ -1278,7 +1278,7 @@ static DRIVER_INIT( wgp ) static DRIVER_INIT( wgp2 ) { /* Code patches to prevent failure in memory checks */ - UINT16 *ROM = (UINT16 *)memory_region(machine, "sub"); + UINT16 *ROM = (UINT16 *)machine->region("sub")->base(); ROM[0x8008 / 2] = 0x0; ROM[0x8010 / 2] = 0x0; } diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c index 8b2ee7bcacd..ff22aa5555d 100644 --- a/src/mame/drivers/wheelfir.c +++ b/src/mame/drivers/wheelfir.c @@ -372,7 +372,7 @@ static WRITE16_HANDLER(wheelfir_blit_w) cputag_set_input_line(space->machine, "maincpu", 1, HOLD_LINE); { - UINT8 *rom = memory_region(space->machine, "gfx1"); + UINT8 *rom = space->machine->region("gfx1")->base(); int width = space->machine->primary_screen->width(); int height = space->machine->primary_screen->height(); @@ -784,7 +784,7 @@ static MACHINE_START( wheelfir ) state->zoom_table[i]=-1; } - UINT16 *ROM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *ROM = (UINT16 *)machine->region("maincpu")->base(); for(int j=0;j<400;++j) { @@ -869,7 +869,7 @@ ROM_END static DRIVER_INIT(wheelfir) { - UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *RAM = (UINT16 *)machine->region("maincpu")->base(); RAM[0xdd3da/2] = 0x4e71; //hack } diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c index c170f129069..fc4147641e9 100644 --- a/src/mame/drivers/williams.c +++ b/src/mame/drivers/williams.c @@ -2709,7 +2709,7 @@ static DRIVER_INIT( defender ) static DRIVER_INIT( defndjeu ) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int i; CONFIGURE_BLITTER(WILLIAMS_BLITTER_NONE, 0x0000); diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index cc54fc50e8f..7c5d187e671 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -400,7 +400,7 @@ ROM_END static DRIVER_INIT( wink ) { UINT32 i; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); UINT8 *buffer = auto_alloc_array(machine, UINT8, 0x8000); // protection module reverse engineered by HIGHWAYMAN diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 731fd3f47c4..087172c4360 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -355,7 +355,7 @@ static WRITE8_HANDLER(write_a00x) if(newbank != bank) { - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); bank = newbank; ROM = &ROM[0x10000+0x8000 * newbank + UNBANKED_SIZE]; memory_set_bankptr(space->machine, "bank1",ROM); @@ -394,7 +394,7 @@ static READ8_HANDLER(prot_read_700x) case 0x25e: return offset;//enough to pass... } - return memory_region(space->machine, "sub")[0x7000+offset]; + return space->machine->region("sub")->base()[0x7000+offset]; } /* @@ -840,7 +840,7 @@ ROM_END static DRIVER_INIT(witch) { - UINT8 *ROM = (UINT8 *)memory_region(machine, "maincpu"); + UINT8 *ROM = (UINT8 *)machine->region("maincpu")->base(); memory_set_bankptr(machine, "bank1", &ROM[0x10000+UNBANKED_SIZE]); memory_install_read8_handler(cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM), 0x7000, 0x700f, 0, 0, prot_read_700x); diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c index 481fadf46d2..8c3063c6654 100644 --- a/src/mame/drivers/wiz.c +++ b/src/mame/drivers/wiz.c @@ -1031,8 +1031,8 @@ static DRIVER_INIT( stinger ) { 5,7,3, 0x28 } }; address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); - int size = memory_region_length(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); + int size = machine->region("maincpu")->bytes(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, size); int A; const UINT8 *tbl; diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c index 81475fa7c14..3bdb23abee8 100644 --- a/src/mame/drivers/wldarrow.c +++ b/src/mame/drivers/wldarrow.c @@ -477,7 +477,7 @@ ROM_END static DRIVER_INIT( wldarrow ) { offs_t i; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (i = 0; i < 0x3800; i++) rom[i] ^= 0xff; diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c index 2d36cf9f5e1..522a56276f7 100644 --- a/src/mame/drivers/xain.c +++ b/src/mame/drivers/xain.c @@ -577,8 +577,8 @@ static const ym2203_interface ym2203_config = static MACHINE_START( xsleena ) { - memory_configure_bank(machine, "bank1", 0, 2, memory_region(machine, "maincpu") + 0x4000, 0xc000); - memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "sub") + 0x4000, 0xc000); + memory_configure_bank(machine, "bank1", 0, 2, machine->region("maincpu")->base() + 0x4000, 0xc000); + memory_configure_bank(machine, "bank2", 0, 2, machine->region("sub")->base() + 0x4000, 0xc000); memory_set_bank(machine, "bank1", 0); memory_set_bank(machine, "bank2", 0); } diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c index 77ba9feda30..78d339a9ba6 100644 --- a/src/mame/drivers/xexex.c +++ b/src/mame/drivers/xexex.c @@ -464,7 +464,7 @@ static STATE_POSTLOAD( xexex_postload ) static MACHINE_START( xexex ) { xexex_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank2", 0, 8, &ROM[0x10000], 0x4000); memory_set_bank(machine, "bank2", 0); @@ -694,8 +694,8 @@ static DRIVER_INIT( xexex ) if (!strcmp(machine->gamedrv->name, "xexex")) { // Invulnerability -// *(UINT16 *)(memory_region(machine, "maincpu") + 0x648d4) = 0x4a79; -// *(UINT16 *)(memory_region(machine, "maincpu") + 0x00008) = 0x5500; +// *(UINT16 *)(machine->region("maincpu")->base() + 0x648d4) = 0x4a79; +// *(UINT16 *)(machine->region("maincpu")->base() + 0x00008) = 0x5500; state->strip_0x1a = 1; } } diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index 37a7f248431..4a63b30718f 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -312,7 +312,7 @@ static STATE_POSTLOAD( xmen_postload ) static MACHINE_START( xmen ) { xmen_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "audiocpu"); + UINT8 *ROM = machine->region("audiocpu")->base(); memory_configure_bank(machine, "bank4", 0, 8, &ROM[0x10000], 0x4000); memory_set_bank(machine, "bank4", 0); diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c index ef0f3d8a4b4..92617ef5285 100644 --- a/src/mame/drivers/xorworld.c +++ b/src/mame/drivers/xorworld.c @@ -229,7 +229,7 @@ static DRIVER_INIT( xorworld ) /* patch some strange protection (without this, strange characters appear after level 5 and some pieces don't rotate properly some times) */ - UINT16 *rom = (UINT16 *)(memory_region(machine, "maincpu") + 0x1390); + UINT16 *rom = (UINT16 *)(machine->region("maincpu")->base() + 0x1390); PATCH(0x4239); PATCH(0x00ff); PATCH(0xe196); /* clr.b $ffe196 */ PATCH(0x4239); PATCH(0x00ff); PATCH(0xe197); /* clr.b $ffe197 */ diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c index 204d720b8b5..24397e9c432 100644 --- a/src/mame/drivers/xxmissio.c +++ b/src/mame/drivers/xxmissio.c @@ -79,7 +79,7 @@ static INTERRUPT_GEN( xxmissio_interrupt_s ) static MACHINE_START( xxmissio ) { - memory_configure_bank(machine, "bank1", 0, 8, memory_region(machine, "user1"), 0x4000); + memory_configure_bank(machine, "bank1", 0, 8, machine->region("user1")->base(), 0x4000); memory_set_bank(machine, "bank1", 0); } diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c index d6a6253b313..24bc5122ba7 100644 --- a/src/mame/drivers/yunsun16.c +++ b/src/mame/drivers/yunsun16.c @@ -106,7 +106,7 @@ static WRITE16_HANDLER( yunsun16_sound_bank_w ) if (ACCESSING_BITS_0_7) { int bank = data & 3; - UINT8 *dst = memory_region(space->machine, "oki"); + UINT8 *dst = space->machine->region("oki")->base(); UINT8 *src = dst + 0x80000 + 0x20000 * bank; memcpy(dst + 0x20000, src, 0x20000); } diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c index adbb08363be..2678e63ad18 100644 --- a/src/mame/drivers/yunsung8.c +++ b/src/mame/drivers/yunsung8.c @@ -468,8 +468,8 @@ static const msm5205_interface yunsung8_msm5205_interface = static MACHINE_START( yunsung8 ) { yunsung8_state *state = machine->driver_data(); - UINT8 *MAIN = memory_region(machine, "maincpu"); - UINT8 *AUDIO = memory_region(machine, "audiocpu"); + UINT8 *MAIN = machine->region("maincpu")->base(); + UINT8 *AUDIO = machine->region("audiocpu")->base(); state->videoram = auto_alloc_array(machine, UINT8, 0x4000); state->videoram_0 = state->videoram + 0x0000; // Ram is banked diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c index 0c6ff98df16..b6a3cfb8c6a 100644 --- a/src/mame/drivers/zaxxon.c +++ b/src/mame/drivers/zaxxon.c @@ -1445,8 +1445,8 @@ static void zaxxonj_decode(running_machine *machine, const char *cputag) int A; address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, cputag); - int size = memory_region_length(machine, cputag); + UINT8 *rom = machine->region(cputag)->base(); + int size = machine->region(cputag)->bytes(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, size); space->set_decrypted_region(0x0000, size - 1, decrypt); diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index 77035234c91..d84a8620b0f 100644 --- a/src/mame/drivers/zn.c +++ b/src/mame/drivers/zn.c @@ -696,12 +696,12 @@ static READ32_HANDLER( capcom_kickharness_r ) static WRITE32_HANDLER( bank_coh1000c_w ) { - memory_set_bankptr( space->machine, "bank2", memory_region( space->machine, "user2" ) + 0x400000 + ( data * 0x400000 ) ); + memory_set_bankptr( space->machine, "bank2", space->machine->region( "user2" )->base() + 0x400000 + ( data * 0x400000 ) ); } static WRITE8_HANDLER( qsound_bankswitch_w ) { - memory_set_bankptr( space->machine, "bank10", memory_region( space->machine, "audiocpu" ) + 0x10000 + ( ( data & 0x0f ) * 0x4000 ) ); + memory_set_bankptr( space->machine, "bank10", space->machine->region( "audiocpu" )->base() + 0x10000 + ( ( data & 0x0f ) * 0x4000 ) ); } static INTERRUPT_GEN( qsound_interrupt ) @@ -739,9 +739,9 @@ static DRIVER_INIT( coh1000c ) static MACHINE_RESET( coh1000c ) { - memory_set_bankptr( machine, "bank1", memory_region( machine, "user2" ) ); /* fixed game rom */ - memory_set_bankptr( machine, "bank2", memory_region( machine, "user2" ) + 0x400000 ); /* banked game rom */ - memory_set_bankptr( machine, "bank3", memory_region( machine, "user3" ) ); /* country rom */ + memory_set_bankptr( machine, "bank1", machine->region( "user2" )->base() ); /* fixed game rom */ + memory_set_bankptr( machine, "bank2", machine->region( "user2" )->base() + 0x400000 ); /* banked game rom */ + memory_set_bankptr( machine, "bank3", machine->region( "user3" )->base() ); /* country rom */ zn_machine_init(machine); } @@ -929,7 +929,7 @@ Notes: static WRITE32_HANDLER( bank_coh3002c_w ) { - memory_set_bankptr( space->machine, "bank2", memory_region( space->machine, "user2" ) + 0x400000 + ( data * 0x400000 ) ); + memory_set_bankptr( space->machine, "bank2", space->machine->region( "user2" )->base() + 0x400000 + ( data * 0x400000 ) ); } static DRIVER_INIT( coh3002c ) @@ -947,9 +947,9 @@ static DRIVER_INIT( coh3002c ) static MACHINE_RESET( coh3002c ) { - memory_set_bankptr( machine, "bank1", memory_region( machine, "user2" ) ); /* fixed game rom */ - memory_set_bankptr( machine, "bank2", memory_region( machine, "user2" ) + 0x400000 ); /* banked game rom */ - memory_set_bankptr( machine, "bank3", memory_region( machine, "user3" ) ); /* country rom */ + memory_set_bankptr( machine, "bank1", machine->region( "user2" )->base() ); /* fixed game rom */ + memory_set_bankptr( machine, "bank2", machine->region( "user2" )->base() + 0x400000 ); /* banked game rom */ + memory_set_bankptr( machine, "bank3", machine->region( "user3" )->base() ); /* country rom */ zn_machine_init(machine); } @@ -1190,12 +1190,12 @@ static WRITE32_HANDLER( bank_coh1000t_w ) device_t *mb3773 = space->machine->device("mb3773"); mb3773_set_ck(mb3773, (data & 0x20) >> 5); verboselog( space->machine, 1, "bank_coh1000t_w( %08x, %08x, %08x )\n", offset, data, mem_mask ); - memory_set_bankptr( space->machine, "bank1", memory_region( space->machine, "user2" ) + ( ( data & 3 ) * 0x800000 ) ); + memory_set_bankptr( space->machine, "bank1", space->machine->region( "user2" )->base() + ( ( data & 3 ) * 0x800000 ) ); } static WRITE8_HANDLER( fx1a_sound_bankswitch_w ) { - memory_set_bankptr( space->machine, "bank10", memory_region( space->machine, "audiocpu" ) + 0x10000 + ( ( ( data - 1 ) & 0x07 ) * 0x4000 ) ); + memory_set_bankptr( space->machine, "bank10", space->machine->region( "audiocpu" )->base() + 0x10000 + ( ( ( data - 1 ) & 0x07 ) * 0x4000 ) ); } static READ32_HANDLER( taitofx1a_ymsound_r ) @@ -1235,7 +1235,7 @@ static DRIVER_INIT( coh1000ta ) static MACHINE_RESET( coh1000ta ) { zn_state *state = machine->driver_data(); - memory_set_bankptr( machine, "bank1", memory_region( machine, "user2" ) ); /* banked game rom */ + memory_set_bankptr( machine, "bank1", machine->region( "user2" )->base() ); /* banked game rom */ memory_set_bankptr( machine, "bank2", state->taitofx1_eeprom1 ); zn_machine_init(machine); } @@ -1330,7 +1330,7 @@ static MACHINE_RESET( coh1000tb ) { zn_state *state = machine->driver_data(); - memory_set_bankptr( machine, "bank1", memory_region( machine, "user2" ) ); /* banked game rom */ + memory_set_bankptr( machine, "bank1", machine->region( "user2" )->base() ); /* banked game rom */ memory_set_bankptr( machine, "bank2", state->taitofx1_eeprom1 ); memory_set_bankptr( machine, "bank3", state->taitofx1_eeprom2 ); zn_machine_init(machine); @@ -1516,7 +1516,7 @@ static DRIVER_INIT( coh1000w ) static MACHINE_RESET( coh1000w ) { - memory_set_bankptr( machine, "bank1", memory_region( machine, "user2" ) ); /* fixed game rom */ + memory_set_bankptr( machine, "bank1", machine->region( "user2" )->base() ); /* fixed game rom */ zn_machine_init(machine); devtag_reset(machine, "ide"); @@ -1682,7 +1682,7 @@ static WRITE32_HANDLER( coh1002e_bank_w ) { znsecsel_w( space, offset, data, mem_mask ); - memory_set_bankptr( space->machine, "bank1", memory_region( space->machine, "user2" ) + ( ( data & 3 ) * 0x800000 ) ); + memory_set_bankptr( space->machine, "bank1", space->machine->region( "user2" )->base() + ( ( data & 3 ) * 0x800000 ) ); } static WRITE32_HANDLER( coh1002e_latch_w ) @@ -1704,7 +1704,7 @@ static DRIVER_INIT( coh1002e ) static MACHINE_RESET( coh1002e ) { - memory_set_bankptr( machine, "bank1", memory_region( machine, "user2" ) ); /* banked game rom */ + memory_set_bankptr( machine, "bank1", machine->region( "user2" )->base() ); /* banked game rom */ zn_machine_init(machine); } @@ -1796,7 +1796,7 @@ static WRITE32_HANDLER( bam2_mcu_w ) { if (ACCESSING_BITS_0_15) { - memory_set_bankptr( space->machine, "bank2", memory_region( space->machine, "user2" ) + ( ( data & 0xf ) * 0x400000 ) ); + memory_set_bankptr( space->machine, "bank2", space->machine->region( "user2" )->base() + ( ( data & 0xf ) * 0x400000 ) ); } else if (ACCESSING_BITS_16_31) { @@ -1851,8 +1851,8 @@ static DRIVER_INIT( bam2 ) static MACHINE_RESET( bam2 ) { - memory_set_bankptr( machine, "bank1", memory_region( machine, "user2" ) ); /* fixed game rom */ - memory_set_bankptr( machine, "bank2", memory_region( machine, "user2" ) + 0x400000 ); /* banked game rom */ + memory_set_bankptr( machine, "bank1", machine->region( "user2" )->base() ); /* fixed game rom */ + memory_set_bankptr( machine, "bank2", machine->region( "user2" )->base() + 0x400000 ); /* banked game rom */ zn_machine_init(machine); } @@ -2189,7 +2189,7 @@ static DRIVER_INIT( coh1000a ) static MACHINE_RESET( coh1000a ) { - memory_set_bankptr( machine, "bank1", memory_region( machine, "user2" ) ); /* fixed game rom */ + memory_set_bankptr( machine, "bank1", machine->region( "user2" )->base() ); /* fixed game rom */ zn_machine_init(machine); if( ( !strcmp( machine->gamedrv->name, "jdredd" ) ) || ( !strcmp( machine->gamedrv->name, "jdreddb" ) ) ) @@ -2331,7 +2331,7 @@ Notes: static WRITE32_HANDLER( coh1001l_bnk_w ) { - memory_set_bankptr( space->machine, "bank1", memory_region( space->machine, "user2" ) + ( ( ( data >> 16 ) & 3 ) * 0x800000 ) ); + memory_set_bankptr( space->machine, "bank1", space->machine->region( "user2" )->base() + ( ( ( data >> 16 ) & 3 ) * 0x800000 ) ); } static DRIVER_INIT( coh1001l ) @@ -2344,7 +2344,7 @@ static DRIVER_INIT( coh1001l ) static MACHINE_RESET( coh1001l ) { - memory_set_bankptr( machine, "bank1", memory_region( machine, "user2" ) ); /* banked rom */ + memory_set_bankptr( machine, "bank1", machine->region( "user2" )->base() ); /* banked rom */ zn_machine_init(machine); } @@ -2373,7 +2373,7 @@ Key: Mother KN01 static WRITE32_HANDLER( coh1002v_bnk_w ) { - memory_set_bankptr( space->machine, "bank2", memory_region( space->machine, "user3" ) + ( data * 0x100000 ) ); + memory_set_bankptr( space->machine, "bank2", space->machine->region( "user3" )->base() + ( data * 0x100000 ) ); } static DRIVER_INIT( coh1002v ) @@ -2387,8 +2387,8 @@ static DRIVER_INIT( coh1002v ) static MACHINE_RESET( coh1002v ) { - memory_set_bankptr( machine, "bank1", memory_region( machine, "user2" ) ); /* fixed game rom */ - memory_set_bankptr( machine, "bank2", memory_region( machine, "user3" ) ); /* banked rom */ + memory_set_bankptr( machine, "bank1", machine->region( "user2" )->base() ); /* fixed game rom */ + memory_set_bankptr( machine, "bank2", machine->region( "user3" )->base() ); /* banked rom */ zn_machine_init(machine); } @@ -2557,7 +2557,7 @@ Notes: static WRITE32_HANDLER( coh1002m_bank_w ) { verboselog( space->machine, 1, "coh1002m_bank_w( %08x, %08x, %08x )\n", offset, data, mem_mask ); - memory_set_bankptr( space->machine, "bank1", memory_region( space->machine, "user2" ) + ((data>>16) * 0x800000) ); + memory_set_bankptr( space->machine, "bank1", space->machine->region( "user2" )->base() + ((data>>16) * 0x800000) ); } static READ32_HANDLER( cbaj_z80_r ) @@ -2589,7 +2589,7 @@ static DRIVER_INIT( coh1002m ) static MACHINE_RESET( coh1002m ) { - memory_set_bankptr( machine, "bank1", memory_region( machine, "user2" ) ); + memory_set_bankptr( machine, "bank1", machine->region( "user2" )->base() ); zn_machine_init(machine); } diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 56e37fd338f..ae9a1bba055 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -839,7 +839,7 @@ static void init_zr107(running_machine *machine) led_reg0 = led_reg1 = 0x7f; ccu_vcth = ccu_vctl = 0; - K001005_preprocess_texture_data(memory_region(machine, "gfx1"), memory_region_length(machine, "gfx1"), 0); + K001005_preprocess_texture_data(machine->region("gfx1")->base(), machine->region("gfx1")->bytes(), 0); } static DRIVER_INIT(zr107) diff --git a/src/mame/machine/acitya.c b/src/mame/machine/acitya.c index 3a178ee5770..f26ca3c9d79 100644 --- a/src/mame/machine/acitya.c +++ b/src/mame/machine/acitya.c @@ -24,7 +24,7 @@ static void acitya_decrypt_rom_8(running_machine *machine) int mem; UINT8 *RAM; - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (mem=0;mem<0x4000;mem++) @@ -60,7 +60,7 @@ static void acitya_decrypt_rom_9(running_machine *machine) int mem; UINT8 *RAM; - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (mem=0;mem<0x4000;mem++) { @@ -93,7 +93,7 @@ static void acitya_decrypt_rom_A(running_machine *machine) int mem; UINT8 *RAM; - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (mem=0;mem<0x4000;mem++) { @@ -126,7 +126,7 @@ static void acitya_decrypt_rom_B(running_machine *machine) int mem; UINT8 *RAM; - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (mem=0;mem<0x4000;mem++) { @@ -186,7 +186,7 @@ READ8_HANDLER( acitya_decrypt_rom ) MACHINE_START( acitya ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); /* While the PAL supports up to 16 decryption methods, only four are actually used in the PAL. Therefore, we'll take a little diff --git a/src/mame/machine/ajax.c b/src/mame/machine/ajax.c index 0e52be9ec84..5f815e5c43c 100644 --- a/src/mame/machine/ajax.c +++ b/src/mame/machine/ajax.c @@ -200,8 +200,8 @@ WRITE8_HANDLER( ajax_bankswitch_2_w ) MACHINE_START( ajax ) { ajax_state *state = machine->driver_data(); - UINT8 *MAIN = memory_region(machine, "maincpu"); - UINT8 *SUB = memory_region(machine, "sub"); + UINT8 *MAIN = machine->region("maincpu")->base(); + UINT8 *SUB = machine->region("sub")->base(); memory_configure_bank(machine, "bank1", 0, 9, &SUB[0x10000], 0x2000); memory_configure_bank(machine, "bank2", 0, 12, &MAIN[0x10000], 0x2000); diff --git a/src/mame/machine/archimds.c b/src/mame/machine/archimds.c index 482a03d51b7..df72b15bf40 100644 --- a/src/mame/machine/archimds.c +++ b/src/mame/machine/archimds.c @@ -119,7 +119,7 @@ static TIMER_CALLBACK( vidc_vblank ) static TIMER_CALLBACK( vidc_video_tick ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - static UINT8 *vram = memory_region(machine,"vram"); + static UINT8 *vram = machine->region("vram")->base(); UINT32 size; size = vidc_vidend-vidc_vidstart+0x10; @@ -257,7 +257,7 @@ READ32_HANDLER(archimedes_memc_logical_r) { UINT32 *rom; - rom = (UINT32 *)memory_region(space->machine, "maincpu"); + rom = (UINT32 *)space->machine->region("maincpu")->base(); return rom[offset & 0x1fffff]; } diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c index e783a8334a0..573d5e3355f 100644 --- a/src/mame/machine/atari.c +++ b/src/mame/machine/atari.c @@ -112,7 +112,7 @@ void a600xl_mmu(running_machine *machine, UINT8 new_mmu) logerror("%s MMU SELFTEST ROM\n", machine->gamedrv->name); memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x57ff, 0, 0, "bank2"); memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5000, 0x57ff, 0, 0); - memory_set_bankptr(machine, "bank2", memory_region(machine, "maincpu") + 0x5000); + memory_set_bankptr(machine, "bank2", machine->region("maincpu")->base() + 0x5000); } } diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c index 13c07d6f4cd..ea1fe7184af 100644 --- a/src/mame/machine/balsente.c +++ b/src/mame/machine/balsente.c @@ -173,9 +173,9 @@ MACHINE_RESET( balsente ) memset(state->noise_position, 0, sizeof(state->noise_position)); /* point the banks to bank 0 */ - numbanks = (memory_region_length(machine, "maincpu") > 0x40000) ? 16 : 8; - memory_configure_bank(machine, "bank1", 0, numbanks, &memory_region(machine, "maincpu")[0x10000], 0x6000); - memory_configure_bank(machine, "bank2", 0, numbanks, &memory_region(machine, "maincpu")[0x12000], 0x6000); + numbanks = (machine->region("maincpu")->bytes() > 0x40000) ? 16 : 8; + memory_configure_bank(machine, "bank1", 0, numbanks, &machine->region("maincpu")->base()[0x10000], 0x6000); + memory_configure_bank(machine, "bank2", 0, numbanks, &machine->region("maincpu")->base()[0x12000], 0x6000); memory_set_bank(space->machine, "bank1", 0); memory_set_bank(space->machine, "bank2", 0); machine->device("maincpu")->reset(); @@ -293,7 +293,7 @@ WRITE8_HANDLER( balsente_rombank2_select_w ) int bank = data & 7; /* top bit controls which half of the ROMs to use (Name that Tune only) */ - if (memory_region_length(space->machine, "maincpu") > 0x40000) bank |= (data >> 4) & 8; + if (space->machine->region("maincpu")->bytes() > 0x40000) bank |= (data >> 4) & 8; /* when they set the AB bank, it appears as though the CD bank is reset */ if (data & 0x20) diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c index 8dce90acf13..ccbd944e3c8 100644 --- a/src/mame/machine/beezer.c +++ b/src/mame/machine/beezer.c @@ -116,7 +116,7 @@ WRITE8_HANDLER( beezer_bankswitch_w ) } else { - UINT8 *rom = memory_region(space->machine, "maincpu") + 0x10000; + UINT8 *rom = space->machine->region("maincpu")->base() + 0x10000; memory_install_ram(space, 0xc000, 0xcfff, 0, 0, rom + (data & 0x07) * 0x2000 + ((data & 0x08) ? 0x1000: 0)); } } diff --git a/src/mame/machine/btime.c b/src/mame/machine/btime.c index d87970e2b59..a7b24367edc 100644 --- a/src/mame/machine/btime.c +++ b/src/mame/machine/btime.c @@ -7,7 +7,7 @@ READ8_HANDLER( mmonkey_protection_r ) { btime_state *state = space->machine->driver_data(); - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); int ret = 0; if (offset == 0x0000) @@ -25,7 +25,7 @@ READ8_HANDLER( mmonkey_protection_r ) WRITE8_HANDLER( mmonkey_protection_w ) { btime_state *state = space->machine->driver_data(); - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); if (offset == 0) { diff --git a/src/mame/machine/cclimber.c b/src/mame/machine/cclimber.c index bf8d99858c4..f4f5422d3c4 100644 --- a/src/mame/machine/cclimber.c +++ b/src/mame/machine/cclimber.c @@ -7,7 +7,7 @@ static void cclimber_decode(running_machine *machine, const UINT8 convtable[8][16]) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x10000); int A; @@ -94,7 +94,7 @@ void mshuttle_decode(running_machine *machine) DRIVER_INIT( ckongb ) { int A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (A = 0x0000;A < 0x6000;A++) /* all the program ROMs are encrypted */ { @@ -105,7 +105,7 @@ DRIVER_INIT( ckongb ) #if CANNONB_HACK static void cannonb_patch(void) { - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); rom[0x2ba0] = 0x21; rom[0x2ba1] = 0xfb; @@ -117,7 +117,7 @@ static void cannonb_patch(void) DRIVER_INIT( cannonb ) { int A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (A = 0x0000;A < 0x1000;A++) /* only first ROM is encrypted */ { diff --git a/src/mame/machine/cps2crpt.c b/src/mame/machine/cps2crpt.c index a828b287b09..820087c5bbb 100644 --- a/src/mame/machine/cps2crpt.c +++ b/src/mame/machine/cps2crpt.c @@ -633,8 +633,8 @@ static void optimise_sboxes(struct optimised_sbox* out, const struct sbox* in) static void cps2_decrypt(running_machine *machine, const UINT32 *master_key, UINT32 upper_limit) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); - int length = memory_region_length(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); + int length = machine->region("maincpu")->bytes(); UINT16 *dec = auto_alloc_array(machine, UINT16, length/2); int i; UINT32 key1[4]; diff --git a/src/mame/machine/dec0.c b/src/mame/machine/dec0.c index 15190a3b54a..50ebaccd5d0 100644 --- a/src/mame/machine/dec0.c +++ b/src/mame/machine/dec0.c @@ -511,7 +511,7 @@ static WRITE16_HANDLER( robocop_68000_share_w ) static void h6280_decrypt(running_machine *machine, const char *cputag) { int i; - UINT8 *RAM = memory_region(machine, cputag); + UINT8 *RAM = machine->region(cputag)->base(); /* Read each byte, decrypt it */ for (i = 0x00000; i < 0x10000; i++) @@ -520,7 +520,7 @@ static void h6280_decrypt(running_machine *machine, const char *cputag) DRIVER_INIT( hippodrm ) { - UINT8 *RAM = memory_region(machine, "sub"); + UINT8 *RAM = machine->region("sub")->base(); memory_install_readwrite16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x180000, 0x180fff, 0, 0, hippodrm_68000_share_r, hippodrm_68000_share_w); memory_install_write16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xffc800, 0xffcfff, 0, 0, sprite_mirror_w); @@ -536,7 +536,7 @@ DRIVER_INIT( hippodrm ) DRIVER_INIT( slyspy ) { - UINT8 *RAM = memory_region(machine, "audiocpu"); + UINT8 *RAM = machine->region("audiocpu")->base(); h6280_decrypt(machine, "audiocpu"); @@ -567,7 +567,7 @@ DRIVER_INIT( birdtry ) GAME=3; - src = memory_region(machine, "gfx4"); + src = machine->region("gfx4")->base(); /* some parts of the graphic have bytes swapped */ for (k = 0;k < 0x70000;k += 0x20000) diff --git a/src/mame/machine/deco102.c b/src/mame/machine/deco102.c index cbd73136557..ecbb93d4a39 100644 --- a/src/mame/machine/deco102.c +++ b/src/mame/machine/deco102.c @@ -51,8 +51,8 @@ void deco102_decrypt_cpu(running_machine *machine, const char *cputag, int addre { int i; address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM); - UINT16 *rom = (UINT16 *)memory_region(machine, cputag); - int size = memory_region_length(machine, cputag); + UINT16 *rom = (UINT16 *)machine->region(cputag)->base(); + int size = machine->region(cputag)->bytes(); UINT16 *opcodes = auto_alloc_array(machine, UINT16, size / 2); UINT16 *buf = auto_alloc_array(machine, UINT16, size / 2); diff --git a/src/mame/machine/deco156.c b/src/mame/machine/deco156.c index c292223e6c9..3435089026b 100644 --- a/src/mame/machine/deco156.c +++ b/src/mame/machine/deco156.c @@ -124,8 +124,8 @@ static void decrypt(UINT32 *src, UINT32 *dst, int length) void deco156_decrypt(running_machine *machine) { - UINT32 *rom = (UINT32 *)memory_region(machine, "maincpu"); - int length = memory_region_length(machine, "maincpu"); + UINT32 *rom = (UINT32 *)machine->region("maincpu")->base(); + int length = machine->region("maincpu")->bytes(); UINT32 *buf = auto_alloc_array(machine, UINT32, length/4); memcpy(buf, rom, length); diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c index f61814b45ea..f81b217f81b 100644 --- a/src/mame/machine/decocass.c +++ b/src/mame/machine/decocass.c @@ -296,7 +296,7 @@ static READ8_HANDLER( decocass_type1_latch_26_pass_3_inv_2_r ) { offs_t promaddr; UINT8 save; - UINT8 *prom = memory_region(space->machine, "dongle"); + UINT8 *prom = space->machine->region("dongle")->base(); if (state->firsttime) { @@ -376,7 +376,7 @@ static READ8_HANDLER( decocass_type1_pass_136_r ) { offs_t promaddr; UINT8 save; - UINT8 *prom = memory_region(space->machine, "dongle"); + UINT8 *prom = space->machine->region("dongle")->base(); if (state->firsttime) { @@ -456,7 +456,7 @@ static READ8_HANDLER( decocass_type1_latch_27_pass_3_inv_2_r ) { offs_t promaddr; UINT8 save; - UINT8 *prom = memory_region(space->machine, "dongle"); + UINT8 *prom = space->machine->region("dongle")->base(); if (state->firsttime) { @@ -536,7 +536,7 @@ static READ8_HANDLER( decocass_type1_latch_26_pass_5_inv_2_r ) { offs_t promaddr; UINT8 save; - UINT8 *prom = memory_region(space->machine, "dongle"); + UINT8 *prom = space->machine->region("dongle")->base(); if (state->firsttime) { @@ -618,7 +618,7 @@ static READ8_HANDLER( decocass_type1_latch_16_pass_3_inv_1_r ) { offs_t promaddr; UINT8 save; - UINT8 *prom = memory_region(space->machine, "dongle"); + UINT8 *prom = space->machine->region("dongle")->base(); if (state->firsttime) { @@ -686,7 +686,7 @@ static READ8_HANDLER( decocass_type2_r ) { if (1 == (offset & 1)) { - UINT8 *prom = memory_region(space->machine, "dongle"); + UINT8 *prom = space->machine->region("dongle")->base(); data = prom[256 * state->type2_d2_latch + state->type2_promaddr]; LOG(3,("%10s 6502-PC: %04x decocass_type2_r(%02x): $%02x <- prom[%03x]\n", attotime_string(timer_get_time(space->machine), 6), cpu_get_previouspc(space->cpu), offset, data, 256 * state->type2_d2_latch + state->type2_promaddr)); } @@ -768,7 +768,7 @@ static READ8_HANDLER( decocass_type3_r ) { if (1 == state->type3_pal_19) { - UINT8 *prom = memory_region(space->machine, "dongle"); + UINT8 *prom = space->machine->region("dongle")->base(); data = prom[state->type3_ctrs]; LOG(3,("%10s 6502-PC: %04x decocass_type3_r(%02x): $%02x <- prom[$%03x]\n", attotime_string(timer_get_time(space->machine), 6), cpu_get_previouspc(space->cpu), offset, data, state->type3_ctrs)); if (++state->type3_ctrs == 4096) @@ -1009,7 +1009,7 @@ static READ8_HANDLER( decocass_type4_r ) { if (state->type4_latch) { - UINT8 *prom = memory_region(space->machine, "dongle"); + UINT8 *prom = space->machine->region("dongle")->base(); data = prom[state->type4_ctrs]; LOG(3,("%10s 6502-PC: %04x decocass_type4_r(%02x): $%02x '%c' <- PROM[%04x]\n", attotime_string(timer_get_time(space->machine), 6), cpu_get_previouspc(space->cpu), offset, data, (data >= 32) ? data : '.', state->type4_ctrs)); @@ -1669,7 +1669,7 @@ MACHINE_RESET( cflyball ) MACHINE_RESET( czeroize ) { decocass_state *state = machine->driver_data(); - UINT8 *mem = memory_region(machine, "dongle"); + UINT8 *mem = machine->region("dongle")->base(); decocass_reset_common(machine); LOG(0,("dongle type #3 (PAL)\n")); state->dongle_r = decocass_type3_r; diff --git a/src/mame/machine/decocrpt.c b/src/mame/machine/decocrpt.c index 7b246319079..edbf238a6b4 100644 --- a/src/mame/machine/decocrpt.c +++ b/src/mame/machine/decocrpt.c @@ -600,8 +600,8 @@ static const UINT8 deco74_swap_table[0x800] = static void deco_decrypt(running_machine *machine,const char *rgntag,const UINT8 *xor_table,const UINT16 *address_table,const UINT8 *swap_table,int remap_only) { - UINT16 *rom = (UINT16 *)memory_region(machine, rgntag); - int len = memory_region_length(machine, rgntag)/2; + UINT16 *rom = (UINT16 *)machine->region(rgntag)->base(); + int len = machine->region(rgntag)->bytes()/2; UINT16 *buffer = auto_alloc_array(machine, UINT16, len); int i; diff --git a/src/mame/machine/fd1089.c b/src/mame/machine/fd1089.c index e6cb2096009..3f7ae6fa3d6 100644 --- a/src/mame/machine/fd1089.c +++ b/src/mame/machine/fd1089.c @@ -405,8 +405,8 @@ static void clear_decrypted(running_machine &machine) static void sys16_decrypt(running_machine *machine, const UINT8 *key,int cputype) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); - int size = memory_region_length(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); + int size = machine->region("maincpu")->bytes(); int A; decrypted = auto_alloc_array(machine, UINT16, size/2); @@ -432,11 +432,11 @@ void *fd1089_get_decrypted_base(void) void fd1089a_decrypt(running_machine *machine) { - sys16_decrypt(machine, memory_region(machine, "fd1089a"), FD1089A); + sys16_decrypt(machine, machine->region("fd1089a")->base(), FD1089A); } void fd1089b_decrypt(running_machine *machine) { - sys16_decrypt(machine, memory_region(machine, "fd1089b"), FD1089B); + sys16_decrypt(machine, machine->region("fd1089b")->base(), FD1089B); } diff --git a/src/mame/machine/fddebug.c b/src/mame/machine/fddebug.c index 030f775bd42..82faf891551 100644 --- a/src/mame/machine/fddebug.c +++ b/src/mame/machine/fddebug.c @@ -482,11 +482,11 @@ void fd1094_init_debugging(running_machine *machine, const char *cpureg, const c key_changed = changed; /* set up the regions */ - coderegion = (UINT16 *)memory_region(machine, cpureg); - coderegion_words = memory_region_length(machine, cpureg) / 2; - keyregion = (UINT8 *)memory_region(machine, keyreg); - keystatus = (UINT16 *)memory_region(machine, statreg); - keystatus_words = memory_region_length(machine, statreg) / 2; + coderegion = (UINT16 *)machine->region(cpureg)->base(); + coderegion_words = machine->region(cpureg)->bytes() / 2; + keyregion = (UINT8 *)machine->region(keyreg)->base(); + keystatus = (UINT16 *)machine->region(statreg)->base(); + keystatus_words = machine->region(statreg)->bytes() / 2; assert(coderegion_words == keystatus_words); /* allocate memory for the ignore table */ diff --git a/src/mame/machine/gaelco2.c b/src/mame/machine/gaelco2.c index 75a3f7dd9f9..1c55eaea093 100644 --- a/src/mame/machine/gaelco2.c +++ b/src/mame/machine/gaelco2.c @@ -23,10 +23,10 @@ static void gaelco2_ROM16_split_gfx(running_machine *machine, const char *src_re int i; /* get a pointer to the source data */ - UINT8 *src = (UINT8 *)memory_region(machine, src_reg); + UINT8 *src = (UINT8 *)machine->region(src_reg)->base(); /* get a pointer to the destination data */ - UINT8 *dst = (UINT8 *)memory_region(machine, dst_reg); + UINT8 *dst = (UINT8 *)machine->region(dst_reg)->base(); /* fill destination areas with the proper data */ for (i = 0; i < length/2; i++){ diff --git a/src/mame/machine/galaxold.c b/src/mame/machine/galaxold.c index c27183891d5..a1b03d9fb7e 100644 --- a/src/mame/machine/galaxold.c +++ b/src/mame/machine/galaxold.c @@ -166,7 +166,7 @@ WRITE8_HANDLER( zigzag_sillyprotection_w ) DRIVER_INIT( zigzag ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); memory_configure_bank(machine, "bank1", 0, 2, &RAM[0x2000], 0x1000); memory_configure_bank(machine, "bank2", 0, 2, &RAM[0x2000], 0x1000); memory_set_bank(machine, "bank1", 0); @@ -194,7 +194,7 @@ static READ8_HANDLER( dingoe_3001_r ) DRIVER_INIT( dingoe ) { offs_t i; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (i = 0; i < 0x3000; i++) { @@ -301,8 +301,8 @@ DRIVER_INIT( mooncrsu ) DRIVER_INIT( mooncrst ) { - offs_t i, len = memory_region_length(machine, "maincpu"); - UINT8 *rom = memory_region(machine, "maincpu"); + offs_t i, len = machine->region("maincpu")->bytes(); + UINT8 *rom = machine->region("maincpu")->base(); for (i = 0;i < len;i++) @@ -320,7 +320,7 @@ DRIVER_INIT( moonqsr ) { offs_t i; address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x8000); space->set_decrypted_region(0x0000, 0x7fff, decrypt); @@ -378,8 +378,8 @@ Pin layout is such that links can replace the PAL if encryption is not used. { 1,4,1,4 } }; - offs_t i, len = memory_region_length(machine, "maincpu"); - UINT8 *rom = memory_region(machine, "maincpu"); + offs_t i, len = machine->region("maincpu")->bytes(); + UINT8 *rom = machine->region("maincpu")->base(); for (i = 0; i < len; i++) @@ -398,8 +398,8 @@ Pin layout is such that links can replace the PAL if encryption is not used. DRIVER_INIT( 4in1 ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - offs_t i, len = memory_region_length(machine, "maincpu"); - UINT8 *RAM = memory_region(machine, "maincpu"); + offs_t i, len = machine->region("maincpu")->bytes(); + UINT8 *RAM = machine->region("maincpu")->base(); /* Decrypt Program Roms */ for (i = 0; i < len; i++) diff --git a/src/mame/machine/harddriv.c b/src/mame/machine/harddriv.c index d72a54383b2..6f110025c25 100644 --- a/src/mame/machine/harddriv.c +++ b/src/mame/machine/harddriv.c @@ -59,8 +59,8 @@ MACHINE_START( harddriv ) atarigen_init(machine); /* predetermine memory regions */ - state->sim_memory = (UINT16 *)memory_region(machine, "user1"); - state->sim_memory_size = memory_region_length(machine, "user1") / 2; + state->sim_memory = (UINT16 *)machine->region("user1")->base(); + state->sim_memory_size = machine->region("user1")->bytes() / 2; state->adsp_pgm_memory_word = (UINT16 *)((UINT8 *)state->adsp_pgm_memory + 1); } diff --git a/src/mame/machine/irobot.c b/src/mame/machine/irobot.c index 84a47aba9f4..3a8b6da5fde 100644 --- a/src/mame/machine/irobot.c +++ b/src/mame/machine/irobot.c @@ -123,7 +123,7 @@ WRITE8_HANDLER( irobot_statwr_w ) WRITE8_HANDLER( irobot_out0_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); irobot_out0 = data; switch (data & 0x60) @@ -145,7 +145,7 @@ WRITE8_HANDLER( irobot_out0_w ) WRITE8_HANDLER( irobot_rom_banksel_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); switch ((data & 0x0E) >> 1) { @@ -190,7 +190,7 @@ static TIMER_CALLBACK( scanline_callback ) MACHINE_RESET( irobot ) { - UINT8 *MB = memory_region(machine, "mathbox"); + UINT8 *MB = machine->region("mathbox")->base(); /* initialize the memory regions */ mbROM = MB + 0x00000; @@ -370,7 +370,7 @@ static void irmb_dout(const irmb_ops *curop, UINT32 d) /* Convert microcode roms to a more usable form */ static void load_oproms(running_machine *machine) { - UINT8 *MB = memory_region(machine, "proms") + 0x20; + UINT8 *MB = machine->region("proms")->base() + 0x20; int i; /* allocate RAM */ diff --git a/src/mame/machine/jumpshot.c b/src/mame/machine/jumpshot.c index 89ab0e78abc..5ee552ccff8 100644 --- a/src/mame/machine/jumpshot.c +++ b/src/mame/machine/jumpshot.c @@ -46,7 +46,7 @@ void jumpshot_decode(running_machine *machine) /* CPU ROMs */ - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (i = 0; i < 0x4000; i++) { RAM[i] = decrypt(i,RAM[i]); diff --git a/src/mame/machine/kabuki.c b/src/mame/machine/kabuki.c index a6cd36ab3e6..d54087b0f78 100644 --- a/src/mame/machine/kabuki.c +++ b/src/mame/machine/kabuki.c @@ -162,9 +162,9 @@ static void kabuki_decode(UINT8 *src,UINT8 *dest_op,UINT8 *dest_data, static void mitchell_decode(running_machine *machine, int swap_key1,int swap_key2,int addr_key,int xor_key) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); - UINT8 *decrypt = auto_alloc_array(machine, UINT8, memory_region_length(machine, "maincpu")); - int numbanks = (memory_region_length(machine, "maincpu") - 0x10000) / 0x4000; + UINT8 *rom = machine->region("maincpu")->base(); + UINT8 *decrypt = auto_alloc_array(machine, UINT8, machine->region("maincpu")->bytes()); + int numbanks = (machine->region("maincpu")->bytes() - 0x10000) / 0x4000; int i; space->set_decrypted_region(0x0000, 0x7fff, decrypt); @@ -204,7 +204,7 @@ static void cps1_decode(running_machine *machine,int swap_key1,int swap_key2,int { address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM); UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x8000); - UINT8 *rom = memory_region(machine, "audiocpu"); + UINT8 *rom = machine->region("audiocpu")->base(); space->set_decrypted_region(0x0000, 0x7fff, decrypt); kabuki_decode(rom,decrypt,rom,0x0000,0x8000, swap_key1,swap_key2,addr_key,xor_key); diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c index 256d0db3c31..d417bd26ad0 100644 --- a/src/mame/machine/kaneko16.c +++ b/src/mame/machine/kaneko16.c @@ -1715,7 +1715,7 @@ static int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* d address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8* rom = memory_region(machine,"cpu1"); + UINT8* rom = machine->region("cpu1")->base(); UINT8 numregions; UINT16 length; int local_counter=0; @@ -2024,7 +2024,7 @@ static int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* d DRIVER_INIT(calc3_scantables) { - UINT8* rom = memory_region(machine,"cpu1"); + UINT8* rom = machine->region("cpu1")->base(); UINT8 numregions; int x; @@ -2336,7 +2336,7 @@ static const UINT8 toybox_mcu_decryption_table_alt[0x100] = { DRIVER_INIT( decrypt_toybox_rom ) { - UINT8 *src = (UINT8 *)memory_region(machine, "mcudata" ); + UINT8 *src = (UINT8 *)machine->region("mcudata" )->base(); int i; @@ -2363,7 +2363,7 @@ DRIVER_INIT( decrypt_toybox_rom ) DRIVER_INIT( decrypt_toybox_rom_alt ) { - UINT8 *src = (UINT8 *)memory_region(machine, "mcudata" ); + UINT8 *src = (UINT8 *)machine->region("mcudata" )->base(); int i; @@ -2375,7 +2375,7 @@ DRIVER_INIT( decrypt_toybox_rom_alt ) void toxboy_handle_04_subcommand(running_machine* machine,UINT8 mcu_subcmd, UINT16*mcu_ram) { - UINT8 *src = (UINT8 *)memory_region(machine, "mcudata")+0x10000; + UINT8 *src = (UINT8 *)machine->region("mcudata")->base()+0x10000; UINT8* dst = (UINT8 *)mcu_ram; int offs = (mcu_subcmd&0x3f)*8; diff --git a/src/mame/machine/konami1.c b/src/mame/machine/konami1.c index 60b65ffdb1c..30ca2c0fa23 100644 --- a/src/mame/machine/konami1.c +++ b/src/mame/machine/konami1.c @@ -43,8 +43,8 @@ static UINT8 konami1_decodebyte( UINT8 opcode, UINT16 address ) UINT8 *konami1_decode(running_machine *machine, const char *cpu) { address_space *space = cputag_get_address_space(machine, cpu, ADDRESS_SPACE_PROGRAM); - const UINT8 *rom = memory_region(machine, cpu); - int size = memory_region_length(machine, cpu); + const UINT8 *rom = machine->region(cpu)->base(); + int size = machine->region(cpu)->bytes(); int A; UINT8 *decrypted = auto_alloc_array(machine, UINT8, size); diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c index 3c80e7de98d..fb069b1832a 100644 --- a/src/mame/machine/leland.c +++ b/src/mame/machine/leland.c @@ -396,13 +396,13 @@ MACHINE_RESET( leland ) alternate_bank = 0; /* initialize the master banks */ - master_length = memory_region_length(machine, "master"); - master_base = memory_region(machine, "master"); + master_length = machine->region("master")->bytes(); + master_base = machine->region("master")->base(); (*leland_update_master_bank)(machine); /* initialize the slave banks */ - slave_length = memory_region_length(machine, "slave"); - slave_base = memory_region(machine, "slave"); + slave_length = machine->region("slave")->bytes(); + slave_base = machine->region("slave")->base(); if (slave_length > 0x10000) memory_set_bankptr(machine, "bank3", &slave_base[0x10000]); } @@ -425,8 +425,8 @@ MACHINE_RESET( ataxx ) timer_adjust_oneshot(master_int_timer, machine->primary_screen->time_until_pos(8), 8); /* initialize the XROM */ - xrom_length = memory_region_length(machine, "user1"); - xrom_base = memory_region(machine, "user1"); + xrom_length = machine->region("user1")->bytes(); + xrom_base = machine->region("user1")->base(); xrom1_addr = 0; xrom2_addr = 0; @@ -440,13 +440,13 @@ MACHINE_RESET( ataxx ) master_bank = 0; /* initialize the master banks */ - master_length = memory_region_length(machine, "master"); - master_base = memory_region(machine, "master"); + master_length = machine->region("master")->bytes(); + master_base = machine->region("master")->base(); ataxx_bankswitch(machine); /* initialize the slave banks */ - slave_length = memory_region_length(machine, "slave"); - slave_base = memory_region(machine, "slave"); + slave_length = machine->region("slave")->bytes(); + slave_base = machine->region("slave")->base(); if (slave_length > 0x10000) memory_set_bankptr(machine, "bank3", &slave_base[0x10000]); } @@ -1444,8 +1444,8 @@ READ8_HANDLER( leland_raster_r ) void leland_rotate_memory(running_machine *machine, const char *cpuname) { int startaddr = 0x10000; - int banks = (memory_region_length(machine, cpuname) - startaddr) / 0x8000; - UINT8 *ram = memory_region(machine, cpuname); + int banks = (machine->region(cpuname)->bytes() - startaddr) / 0x8000; + UINT8 *ram = machine->region(cpuname)->base(); UINT8 temp[0x2000]; int i; diff --git a/src/mame/machine/mc8123.c b/src/mame/machine/mc8123.c index 36f9cdd5b49..cfcb41da076 100644 --- a/src/mame/machine/mc8123.c +++ b/src/mame/machine/mc8123.c @@ -381,8 +381,8 @@ void mc8123_decrypt_rom(running_machine *machine, const char *cpu, const char *k int fixed_length = numbanks == 1 ? 0xc000 : 0x8000; UINT8 *decrypted1 = auto_alloc_array(machine, UINT8, fixed_length); UINT8 *decrypted2 = numbanks > 1 ? auto_alloc_array(machine, UINT8, 0x4000 * numbanks) : 0; - UINT8 *rom = memory_region(machine, cpu); - UINT8 *key = memory_region(machine, keyrgn); + UINT8 *rom = machine->region(cpu)->base(); + UINT8 *key = machine->region(keyrgn)->base(); int A, bank; space->set_decrypted_region(0x0000, fixed_length-1, decrypted1); diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c index 0f65d957fd8..83d1bbcfa6c 100644 --- a/src/mame/machine/mhavoc.c +++ b/src/mame/machine/mhavoc.c @@ -105,7 +105,7 @@ MACHINE_RESET( mhavoc ) memory_configure_bank(machine, "bank1", 0, 1, mhavoc_zram0, 0); memory_configure_bank(machine, "bank1", 1, 1, mhavoc_zram1, 0); - memory_configure_bank(machine, "bank2", 0, 4, memory_region(machine, "alpha") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank2", 0, 4, machine->region("alpha")->base() + 0x10000, 0x2000); /* reset RAM/ROM banks to 0 */ mhavoc_ram_banksel_w(space, 0, 0); diff --git a/src/mame/machine/micro3d.c b/src/mame/machine/micro3d.c index cfbb2816c51..3c2d2d57938 100644 --- a/src/mame/machine/micro3d.c +++ b/src/mame/machine/micro3d.c @@ -443,7 +443,7 @@ WRITE32_HANDLER( micro3d_mac2_w ) case 0x08: { int i; - const UINT16 *rom = (UINT16*)memory_region(space->machine, "vertex"); + const UINT16 *rom = (UINT16*)space->machine->region("vertex")->base(); for (i = 0; i <= cnt; ++i) { @@ -482,7 +482,7 @@ WRITE32_HANDLER( micro3d_mac2_w ) case 0x0c: { int i; - const UINT16 *rom = (UINT16*)memory_region(space->machine, "vertex"); + const UINT16 *rom = (UINT16*)space->machine->region("vertex")->base(); for (i = 0; i <= cnt; ++i) { @@ -515,7 +515,7 @@ WRITE32_HANDLER( micro3d_mac2_w ) case 0x0f: { int i; - const UINT16 *rom = (UINT16*)memory_region(space->machine, "vertex"); + const UINT16 *rom = (UINT16*)space->machine->region("vertex")->base(); for (i = 0; i <= cnt; ++i, vtx_addr += 4) { diff --git a/src/mame/machine/midtunit.c b/src/mame/machine/midtunit.c index 5c21d2b67db..8e8b0bc6121 100644 --- a/src/mame/machine/midtunit.c +++ b/src/mame/machine/midtunit.c @@ -421,7 +421,7 @@ static void init_tunit_generic(running_machine *machine, int sound) register_state_saving(machine); /* load the graphics ROMs -- quadruples */ - base = memory_region(machine, "gfx1"); + base = machine->region("gfx1")->base(); for (i = 0; i < midyunit_gfx_rom_size; i += 4) { midyunit_gfx_rom[i + 0] = base[0 * gfx_chunk + i / 4]; diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c index 2ebbd94e61f..14f4d2692c1 100644 --- a/src/mame/machine/midwunit.c +++ b/src/mame/machine/midwunit.c @@ -394,8 +394,8 @@ static void init_wunit_generic(running_machine *machine) register_state_saving(machine); /* load the graphics ROMs -- quadruples */ - midyunit_gfx_rom = base = memory_region(machine, "gfx1"); - len = memory_region_length(machine, "gfx1"); + midyunit_gfx_rom = base = machine->region("gfx1")->base(); + len = machine->region("gfx1")->bytes(); for (i = 0; i < len / 0x400000; i++) { memcpy(midwunit_decode_memory, base, 0x400000); @@ -600,8 +600,8 @@ DRIVER_INIT( revx ) register_state_saving(machine); /* load the graphics ROMs -- quadruples */ - midyunit_gfx_rom = base = memory_region(machine, "gfx1"); - len = memory_region_length(machine, "gfx1"); + midyunit_gfx_rom = base = machine->region("gfx1")->base(); + len = machine->region("gfx1")->bytes(); for (i = 0; i < len / 0x200000; i++) { memcpy(midwunit_decode_memory, base, 0x200000); diff --git a/src/mame/machine/midyunit.c b/src/mame/machine/midyunit.c index a1ebc916817..439e7852177 100644 --- a/src/mame/machine/midyunit.c +++ b/src/mame/machine/midyunit.c @@ -278,7 +278,7 @@ static void init_generic(running_machine *machine, int bpp, int sound, int prot_ int i; /* load graphics ROMs */ - base = memory_region(machine, "gfx1"); + base = machine->region("gfx1")->base(); switch (bpp) { case 4: @@ -327,7 +327,7 @@ static void init_generic(running_machine *machine, int bpp, int sound, int prot_ case SOUND_CVSD_SMALL: williams_cvsd_init(machine); memory_install_write8_handler(cputag_get_address_space(machine, "cvsdcpu", ADDRESS_SPACE_PROGRAM), prot_start, prot_end, 0, 0, cvsd_protection_w); - cvsd_protection_base = memory_region(machine, "cvsdcpu") + 0x10000 + (prot_start - 0x8000); + cvsd_protection_base = machine->region("cvsdcpu")->base() + 0x10000 + (prot_start - 0x8000); break; case SOUND_CVSD: diff --git a/src/mame/machine/model1.c b/src/mame/machine/model1.c index 63b41274e9a..386040e2a21 100644 --- a/src/mame/machine/model1.c +++ b/src/mame/machine/model1.c @@ -500,7 +500,7 @@ static TGP_FUNCTION( matrix_rotz ) static TGP_FUNCTION( track_read_quad ) { - const UINT32 *tgp_data = (const UINT32 *)memory_region(machine, "user2"); + const UINT32 *tgp_data = (const UINT32 *)machine->region("user2")->base(); UINT32 a = fifoin_pop(); int offd; @@ -865,7 +865,7 @@ static TGP_FUNCTION( f47 ) static TGP_FUNCTION( track_read_info ) { - const UINT32 *tgp_data = (const UINT32 *)memory_region(machine, "user2"); + const UINT32 *tgp_data = (const UINT32 *)machine->region("user2")->base(); UINT16 a = fifoin_pop(); int offd; @@ -1012,7 +1012,7 @@ static void tri_calc_pq(float ax, float ay, float bx, float by, float cx, float static TGP_FUNCTION( track_lookup ) { - const UINT32 *tgp_data = (const UINT32 *)memory_region(machine, "user2"); + const UINT32 *tgp_data = (const UINT32 *)machine->region("user2")->base(); float a = fifoin_pop_f(); UINT32 b = fifoin_pop(); float c = fifoin_pop_f(); diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c index 27072b3068b..5c68d509432 100644 --- a/src/mame/machine/n64.c +++ b/src/mame/machine/n64.c @@ -2032,8 +2032,8 @@ MACHINE_START( n64 ) MACHINE_RESET( n64 ) { int i; - //UINT32 *pif_rom = (UINT32*)memory_region(machine, "user1"); - UINT32 *cart = (UINT32*)memory_region(machine, "user2"); + //UINT32 *pif_rom = (UINT32*)machine->region("user1")->base(); + UINT32 *cart = (UINT32*)machine->region("user2")->base(); UINT64 boot_checksum; mi_version = 0; diff --git a/src/mame/machine/namcond1.c b/src/mame/machine/namcond1.c index 50393eb3286..09db834a9ef 100644 --- a/src/mame/machine/namcond1.c +++ b/src/mame/machine/namcond1.c @@ -27,7 +27,7 @@ MACHINE_START( namcond1 ) MACHINE_RESET( namcond1 ) { #ifdef MAME_DEBUG - /*UINT8 *ROM = memory_region(machine, REGION_CPU1);*/ + /*UINT8 *ROM = machine->region(REGION_CPU1)->base();*/ /*UINT32 debug_trigger_addr;*/ /*int i;*/ diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c index 8d4af1a21ff..9518c1aeb14 100644 --- a/src/mame/machine/namcos1.c +++ b/src/mame/machine/namcos1.c @@ -559,7 +559,7 @@ static WRITE8_HANDLER( key_type3_w ) WRITE8_HANDLER( namcos1_sound_bankswitch_w ) { - UINT8 *rom = memory_region(space->machine, "audiocpu") + 0xc000; + UINT8 *rom = space->machine->region("audiocpu")->base() + 0xc000; int bank = (data & 0x70) >> 4; memory_set_bankptr(space->machine, "bank17",rom + 0x4000 * bank); @@ -827,7 +827,7 @@ static void namcos1_build_banks(running_machine *machine,read8_space_func key_r, /* PRG0-PRG7 */ { - UINT8 *rom = memory_region(machine, "user1"); + UINT8 *rom = machine->region("user1")->base(); namcos1_install_bank(0x200,0x3ff,0,rom_w,0,rom); @@ -919,7 +919,7 @@ WRITE8_HANDLER( namcos1_mcu_bankswitch_w ) /* bit 0-1 : address line A15-A16 */ addr += (data & 3) * 0x8000; - memory_set_bankptr(space->machine, "bank20", memory_region(space->machine, "mcu") + addr); + memory_set_bankptr(space->machine, "bank20", space->machine->region("mcu")->base() + addr); } @@ -1124,7 +1124,7 @@ DRIVER_INIT( bakutotu ) static const UINT8 target[8] = {0x34,0x37,0x35,0x37,0x96,0x00,0x2e,0xed}; UINT8 *rombase, *srcptr, *endptr, *scanptr; - rombase = memory_region(machine, "user1"); + rombase = machine->region("user1")->base(); srcptr = rombase + 0x1e000; endptr = srcptr + 0xa000; diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c index e9f4761be7a..9937e769c32 100644 --- a/src/mame/machine/namcos2.c +++ b/src/mame/machine/namcos2.c @@ -153,7 +153,7 @@ READ16_HANDLER( namcos2_68k_eeprom_r ){ /* 68000 Shared memory area - Data ROM area */ /*************************************************************/ READ16_HANDLER( namcos2_68k_data_rom_r ){ - UINT16 *ROM = (UINT16 *)memory_region(space->machine, "user1"); + UINT16 *ROM = (UINT16 *)space->machine->region("user1")->base(); return ROM[offset]; } @@ -701,8 +701,8 @@ INTERRUPT_GEN( namcos2_68k_gpu_vblank ) WRITE8_HANDLER( namcos2_sound_bankselect_w ) { - UINT8 *RAM=memory_region(space->machine, "audiocpu"); - UINT32 max = (memory_region_length(space->machine, "audiocpu") - 0x10000) / 0x4000; + UINT8 *RAM=space->machine->region("audiocpu")->base(); + UINT32 max = (space->machine->region("audiocpu")->bytes() - 0x10000) / 0x4000; int bank = ( data >> 4 ) % max; /* 991104.CAB */ memory_set_bankptr(space->machine, BANKED_SOUND_ROM, &RAM[ 0x10000 + ( 0x4000 * bank ) ] ); } diff --git a/src/mame/machine/naomi.c b/src/mame/machine/naomi.c index 185d744da84..2aae6edbff6 100644 --- a/src/mame/machine/naomi.c +++ b/src/mame/machine/naomi.c @@ -66,9 +66,9 @@ static UINT8 asciihex_to_dec(UINT8 in) static void create_pic_from_retdat(running_machine* machine) { { - UINT8* hexregion = memory_region(machine,"pichex"); - UINT8* retregion = memory_region(machine,"picreturn"); - UINT8* newregion = memory_region(machine,"pic"); + UINT8* hexregion = machine->region("pichex")->base(); + UINT8* retregion = machine->region("picreturn")->base(); + UINT8* newregion = machine->region("pic")->base(); int outcount = 0; if (hexregion && retregion && newregion) diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c index 9d3f0a69567..da3deb08d99 100644 --- a/src/mame/machine/naomibd.c +++ b/src/mame/machine/naomibd.c @@ -943,7 +943,7 @@ static void load_rom_gdrom(running_machine* machine, naomibd_state *v) memset(name,'\0',128); - realpic = memory_region(machine,"pic"); + realpic = machine->region("pic")->base(); if (realpic) { @@ -1104,7 +1104,7 @@ static void load_rom_gdrom(running_machine* machine, naomibd_state *v) } } // get des key - realpic = memory_region(machine,"pic"); + realpic = machine->region("pic")->base(); if (realpic) { @@ -1787,18 +1787,18 @@ static DEVICE_START( naomibd ) switch (config->type) { case ROM_BOARD: - v->memory = (UINT8 *)memory_region(device->machine, config->regiontag); - v->protdata = (UINT8 *)memory_region(device->machine, "naomibd_prot"); + v->memory = (UINT8 *)device->machine->region(config->regiontag)->base(); + v->protdata = (UINT8 *)device->machine->region("naomibd_prot")->base(); break; case AW_ROM_BOARD: - v->memory = (UINT8 *)memory_region(device->machine, config->regiontag); + v->memory = (UINT8 *)device->machine->region(config->regiontag)->base(); break; case DIMM_BOARD: v->memory = (UINT8 *)auto_alloc_array_clear(device->machine, UINT8, 0x40000000); // 0x40000000 is needed for some Chihiro sets, Naomi should be less, we should pass as device param v->gdromchd = get_disk_handle(device->machine, config->gdromregiontag); - v->picdata = (UINT8 *)memory_region(device->machine, config->picregiontag); + v->picdata = (UINT8 *)device->machine->region(config->picregiontag)->base(); if (v->memory != NULL && v->gdromchd != NULL && v->picdata != NULL) load_rom_gdrom(device->machine, v); break; @@ -1873,7 +1873,7 @@ static DEVICE_NVRAM( naomibd ) /*if (file) eeprom_load(file); else*/ - games_contents = memory_region(device->machine, "naomibd_eeprom"); + games_contents = device->machine->region("naomibd_eeprom")->base(); if (games_contents) { diff --git a/src/mame/machine/nb1413m3.c b/src/mame/machine/nb1413m3.c index eeb00cd07e1..1d8a81e52bb 100644 --- a/src/mame/machine/nb1413m3.c +++ b/src/mame/machine/nb1413m3.c @@ -315,8 +315,8 @@ READ8_HANDLER( nb1413m3_sndrom_r ) popmessage("Sound ROM %02X:%05X [B1:%02X B2:%02X]", rombank, offset, nb1413m3_sndrombank1, nb1413m3_sndrombank2); #endif - if (offset < memory_region_length(space->machine, nb1413m3_sndromrgntag)) - return memory_region(space->machine, nb1413m3_sndromrgntag)[offset]; + if (offset < space->machine->region(nb1413m3_sndromrgntag)->bytes()) + return space->machine->region(nb1413m3_sndromrgntag)->base()[offset]; else { popmessage("read past sound ROM length (%05x[%02X])",offset, rombank); @@ -339,7 +339,7 @@ WRITE8_HANDLER( nb1413m3_sndrombank2_w ) READ8_HANDLER( nb1413m3_gfxrom_r ) { - UINT8 *GFXROM = memory_region(space->machine, "gfx1"); + UINT8 *GFXROM = space->machine->region("gfx1")->base(); return GFXROM[(0x20000 * (nb1413m3_gfxrombank | ((nb1413m3_sndrombank1 & 0x02) << 3))) + ((0x0200 * nb1413m3_gfxradr_h) + (0x0002 * nb1413m3_gfxradr_l)) + (offset & 0x01)]; } diff --git a/src/mame/machine/neoboot.c b/src/mame/machine/neoboot.c index b0731a29164..dc94911bde4 100644 --- a/src/mame/machine/neoboot.c +++ b/src/mame/machine/neoboot.c @@ -22,8 +22,8 @@ void neogeo_bootleg_cx_decrypt( running_machine *machine ) { int i; - int cx_size = memory_region_length( machine, "sprites" ); - UINT8 *rom = memory_region( machine, "sprites" ); + int cx_size = machine->region( "sprites" )->bytes(); + UINT8 *rom = machine->region( "sprites" )->base(); UINT8 *buf = auto_alloc_array(machine, UINT8, cx_size ); memcpy( buf, rom, cx_size ); @@ -38,8 +38,8 @@ void neogeo_bootleg_cx_decrypt( running_machine *machine ) void neogeo_bootleg_sx_decrypt( running_machine *machine, int value ) { - int sx_size = memory_region_length( machine, "fixed" ); - UINT8 *rom = memory_region( machine, "fixed" ); + int sx_size = machine->region( "fixed" )->bytes(); + UINT8 *rom = machine->region( "fixed" )->base(); int i; if (value == 1) @@ -71,9 +71,9 @@ void neogeo_bootleg_sx_decrypt( running_machine *machine, int value ) void kog_px_decrypt( running_machine *machine ) { /* the protection chip does some *very* strange things to the rom */ - UINT8 *src = memory_region(machine, "maincpu"); + UINT8 *src = machine->region("maincpu")->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, 0x600000 ); - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); int i; static const int sec[] = { 0x3, 0x8, 0x7, 0xC, 0x1, 0xA, 0x6, 0xD }; @@ -155,10 +155,10 @@ static READ16_HANDLER( kof10th_RAMB_r ) static WRITE16_HANDLER( kof10th_custom_w ) { if (!kof10thExtraRAMB[0xFFE]) { // Write to RAM bank A - UINT16 *prom = (UINT16*)memory_region( space->machine, "maincpu" ); + UINT16 *prom = (UINT16*)space->machine->region( "maincpu" )->base(); COMBINE_DATA(&prom[(0xE0000/2) + (offset & 0xFFFF)]); } else { // Write S data on-the-fly - UINT8 *srom = memory_region( space->machine, "fixed" ); + UINT8 *srom = space->machine->region( "fixed" )->base(); srom[offset] = BITSWAP8(data,7,6,0,4,3,2,1,5); } } @@ -169,7 +169,7 @@ static WRITE16_HANDLER( kof10th_bankswitch_w ) if (offset == 0x5FFF8) { // Standard bankswitch kof10thBankswitch(space, data); } else if (offset == 0x5FFFC && kof10thExtraRAMB[0xFFC] != data) { // Special bankswitch - UINT8 *src = memory_region( space->machine, "maincpu" ); + UINT8 *src = space->machine->region( "maincpu" )->base(); memcpy (src + 0x10000, src + ((data & 1) ? 0x810000 : 0x710000), 0xcffff); } COMBINE_DATA(&kof10thExtraRAMB[offset & 0xFFF]); @@ -187,7 +187,7 @@ void decrypt_kof10th(running_machine *machine) { int i, j; UINT8 *dst = auto_alloc_array(machine, UINT8, 0x900000); - UINT8 *src = memory_region( machine, "maincpu" ); + UINT8 *src = machine->region( "maincpu" )->base(); memcpy(dst + 0x000000, src + 0x700000, 0x100000); // Correct (Verified in Uni-bios) memcpy(dst + 0x100000, src + 0x000000, 0x800000); @@ -215,10 +215,10 @@ void decrypt_kof10th(running_machine *machine) void decrypt_kf10thep(running_machine *machine) { int i; - UINT16 *rom = (UINT16*)memory_region(machine, "maincpu"); - UINT8 *src = memory_region(machine, "maincpu"); - UINT16 *buf = (UINT16*)memory_region(machine, "audiocrypt"); - UINT8 *srom = (UINT8*)memory_region(machine, "fixed"); + UINT16 *rom = (UINT16*)machine->region("maincpu")->base(); + UINT8 *src = machine->region("maincpu")->base(); + UINT16 *buf = (UINT16*)machine->region("audiocrypt")->base(); + UINT8 *srom = (UINT8*)machine->region("fixed")->base(); UINT8 *sbuf = auto_alloc_array(machine, UINT8, 0x20000); UINT8 *dst = auto_alloc_array(machine, UINT8, 0x200000); @@ -256,7 +256,7 @@ void decrypt_kf10thep(running_machine *machine) static void kf2k5uni_px_decrypt( running_machine *machine ) { int i, j, ofst; - UINT8 *src = memory_region( machine, "maincpu" ); + UINT8 *src = machine->region( "maincpu" )->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, 0x80); for (i = 0; i < 0x800000; i+=0x80) @@ -276,7 +276,7 @@ static void kf2k5uni_px_decrypt( running_machine *machine ) static void kf2k5uni_sx_decrypt( running_machine *machine ) { int i; - UINT8 *srom = memory_region( machine, "fixed" ); + UINT8 *srom = machine->region( "fixed" )->base(); for (i = 0; i < 0x20000; i++) srom[i] = BITSWAP8(srom[i], 4, 5, 6, 7, 0, 1, 2, 3); @@ -285,7 +285,7 @@ static void kf2k5uni_sx_decrypt( running_machine *machine ) static void kf2k5uni_mx_decrypt( running_machine *machine ) { int i; - UINT8 *mrom = memory_region( machine, "audiocpu" ); + UINT8 *mrom = machine->region( "audiocpu" )->base(); for (i = 0; i < 0x30000; i++) mrom[i] = BITSWAP8(mrom[i], 4, 5, 6, 7, 0, 1, 2, 3); @@ -343,7 +343,7 @@ void kf2k2mp_decrypt( running_machine *machine ) { int i,j; - UINT8 *src = memory_region(machine, "maincpu"); + UINT8 *src = machine->region("maincpu")->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, 0x80); memmove(src, src + 0x300000, 0x500000); @@ -366,7 +366,7 @@ void kf2k2mp_decrypt( running_machine *machine ) void kf2k2mp2_px_decrypt( running_machine *machine ) { - UINT8 *src = memory_region(machine, "maincpu"); + UINT8 *src = machine->region("maincpu")->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, 0x600000); memcpy (dst + 0x000000, src + 0x1C0000, 0x040000); @@ -388,7 +388,7 @@ static void cthd2003_neogeo_gfx_address_fix_do(running_machine *machine, int sta int tilesize=128; UINT8* rom = auto_alloc_array(machine, UINT8, 16*tilesize); // 16 tiles buffer - UINT8* realrom = memory_region(machine, "sprites") + start*tilesize; + UINT8* realrom = machine->region("sprites")->base() + start*tilesize; for (i = 0; i < (end-start)/16; i++) { for (j = 0; j < 16; j++) { @@ -441,7 +441,7 @@ static void cthd2003_c(running_machine *machine, int pow) void decrypt_cthd2003( running_machine *machine ) { - UINT8 *romdata = memory_region(machine, "fixed"); + UINT8 *romdata = machine->region("fixed")->base(); UINT8 *tmp = auto_alloc_array(machine, UINT8, 8*128*128); memcpy(tmp+8*0*128, romdata+8*0*128, 8*32*128); @@ -450,7 +450,7 @@ void decrypt_cthd2003( running_machine *machine ) memcpy(tmp+8*96*128, romdata+8*96*128, 8*32*128); memcpy(romdata, tmp, 8*128*128); - romdata = memory_region(machine, "audiocpu")+0x10000; + romdata = machine->region("audiocpu")->base()+0x10000; memcpy(tmp+8*0*128, romdata+8*0*128, 8*32*128); memcpy(tmp+8*32*128, romdata+8*64*128, 8*32*128); memcpy(tmp+8*64*128, romdata+8*32*128, 8*32*128); @@ -482,7 +482,7 @@ void patch_cthd2003( running_machine *machine ) { /* patches thanks to razoola */ int i; - UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base(); /* special ROM banking handler */ memory_install_write16_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x2ffff0, 0x2fffff, 0, 0, cthd2003_bankswitch_w); @@ -525,8 +525,8 @@ void patch_cthd2003( running_machine *machine ) static void ct2k3sp_sx_decrypt( running_machine *machine ) { - int rom_size = memory_region_length( machine, "fixed" ); - UINT8 *rom = memory_region( machine, "fixed" ); + int rom_size = machine->region( "fixed" )->bytes(); + UINT8 *rom = machine->region( "fixed" )->base(); UINT8 *buf = auto_alloc_array(machine, UINT8, rom_size ); int i; int ofst; @@ -555,7 +555,7 @@ static void ct2k3sp_sx_decrypt( running_machine *machine ) void decrypt_ct2k3sp( running_machine *machine ) { - UINT8 *romdata = memory_region(machine, "audiocpu")+0x10000; + UINT8 *romdata = machine->region("audiocpu")->base()+0x10000; UINT8*tmp = auto_alloc_array(machine, UINT8, 8*128*128); memcpy(tmp+8*0*128, romdata+8*0*128, 8*32*128); memcpy(tmp+8*32*128, romdata+8*64*128, 8*32*128); @@ -575,7 +575,7 @@ void decrypt_ct2k3sp( running_machine *machine ) void decrypt_ct2k3sa( running_machine *machine ) { - UINT8 *romdata = memory_region(machine, "audiocpu")+0x10000; + UINT8 *romdata = machine->region("audiocpu")->base()+0x10000; UINT8*tmp = auto_alloc_array(machine, UINT8, 8*128*128); memcpy(tmp+8*0*128, romdata+8*0*128, 8*32*128); memcpy(tmp+8*32*128, romdata+8*64*128, 8*32*128); @@ -592,7 +592,7 @@ void patch_ct2k3sa( running_machine *machine ) { /* patches thanks to razoola - same as for cthd2003*/ int i; - UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base(); // theres still a problem on the character select screen but it seems to be related to cpu core timing issues, // overclocking the 68k prevents it. @@ -633,7 +633,7 @@ void patch_ct2k3sa( running_machine *machine ) void decrypt_kof2k4se_68k( running_machine *machine ) { - UINT8 *src = memory_region(machine, "maincpu")+0x100000; + UINT8 *src = machine->region("maincpu")->base()+0x100000; UINT8 *dst = auto_alloc_array(machine, UINT8, 0x400000); int i; static const int sec[] = {0x300000,0x200000,0x100000,0x000000}; @@ -653,7 +653,7 @@ void decrypt_kof2k4se_68k( running_machine *machine ) void lans2004_vx_decrypt( running_machine *machine ) { int i; - UINT8 *rom = memory_region( machine, "ymsnd" ); + UINT8 *rom = machine->region( "ymsnd" )->base(); for (i = 0; i < 0xA00000; i++) rom[i] = BITSWAP8(rom[i], 0, 1, 5, 4, 3, 2, 6, 7); } @@ -662,8 +662,8 @@ void lans2004_decrypt_68k( running_machine *machine ) { /* Descrambling P ROMs - Thanks to Razoola for the info */ int i; - UINT8 *src = memory_region( machine, "maincpu" ); - UINT16 *rom = (UINT16*)memory_region( machine, "maincpu" ); + UINT8 *src = machine->region( "maincpu" )->base(); + UINT16 *rom = (UINT16*)machine->region( "maincpu" )->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, 0x600000); { @@ -742,8 +742,8 @@ void svcboot_px_decrypt( running_machine *machine ) 0x06, 0x07, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00 }; int i; - int size = memory_region_length( machine, "maincpu" ); - UINT8 *src = memory_region( machine, "maincpu" ); + int size = machine->region( "maincpu" )->bytes(); + UINT8 *src = machine->region( "maincpu" )->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, size ); int ofst; for( i = 0; i < size / 0x100000; i++ ){ @@ -771,8 +771,8 @@ void svcboot_cx_decrypt( running_machine *machine ) { 3, 0, 2, 1 }, }; int i; - int size = memory_region_length( machine, "sprites" ); - UINT8 *src = memory_region( machine, "sprites" ); + int size = machine->region( "sprites" )->bytes(); + UINT8 *src = machine->region( "sprites" )->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, size ); int ofst; memcpy( dst, src, size ); @@ -798,8 +798,8 @@ void svcplus_px_decrypt( running_machine *machine ) static const int sec[] = { 0x00, 0x03, 0x02, 0x05, 0x04, 0x01 }; - int size = memory_region_length( machine, "maincpu" ); - UINT8 *src = memory_region( machine, "maincpu" ); + int size = machine->region( "maincpu" )->bytes(); + UINT8 *src = machine->region( "maincpu" )->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, size ); int i; int ofst; @@ -822,7 +822,7 @@ void svcplus_px_decrypt( running_machine *machine ) void svcplus_px_hack( running_machine *machine ) { /* patched by the protection chip? */ - UINT8 *src = memory_region( machine, "maincpu" ); + UINT8 *src = machine->region( "maincpu" )->base(); src[ 0x0f8010 ] = 0x40; src[ 0x0f8011 ] = 0x04; src[ 0x0f8012 ] = 0x00; @@ -843,8 +843,8 @@ void svcplusa_px_decrypt( running_machine *machine ) static const int sec[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x00 }; - int size = memory_region_length( machine, "maincpu" ); - UINT8 *src = memory_region( machine, "maincpu" ); + int size = machine->region( "maincpu" )->bytes(); + UINT8 *src = machine->region( "maincpu" )->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, size ); memcpy( dst, src, size ); for( i = 0; i < 6; i++ ){ @@ -862,8 +862,8 @@ void svcsplus_px_decrypt( running_machine *machine ) static const int sec[] = { 0x06, 0x07, 0x01, 0x02, 0x03, 0x04, 0x05, 0x00 }; - int size = memory_region_length( machine, "maincpu" ); - UINT8 *src = memory_region( machine, "maincpu" ); + int size = machine->region( "maincpu" )->bytes(); + UINT8 *src = machine->region( "maincpu" )->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, size ); int i; int ofst; @@ -882,7 +882,7 @@ void svcsplus_px_decrypt( running_machine *machine ) void svcsplus_px_hack( running_machine *machine ) { /* patched by the protection chip? */ - UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base(); mem16[0x9e90/2] = 0x000f; mem16[0x9e92/2] = 0xc9c0; mem16[0xa10c/2] = 0x4eb9; @@ -924,7 +924,7 @@ static WRITE16_HANDLER( kof2003_w ) UINT8* cr = (UINT8 *)kof2003_tbl; UINT32 address = (cr[BYTE_XOR_LE(0x1ff3)]<<16)|(cr[BYTE_XOR_LE(0x1ff2)]<<8)|cr[BYTE_XOR_LE(0x1ff1)]; UINT8 prt = cr[BYTE_XOR_LE(0x1ff2)]; - UINT8* mem = (UINT8 *)memory_region(space->machine, "maincpu"); + UINT8* mem = (UINT8 *)space->machine->region("maincpu")->base(); cr[BYTE_XOR_LE(0x1ff0)] = 0xa0; cr[BYTE_XOR_LE(0x1ff1)] &= 0xfe; @@ -942,7 +942,7 @@ static WRITE16_HANDLER( kof2003p_w ) UINT8* cr = (UINT8 *)kof2003_tbl; UINT32 address = (cr[BYTE_XOR_LE(0x1ff3)]<<16)|(cr[BYTE_XOR_LE(0x1ff2)]<<8)|cr[BYTE_XOR_LE(0x1ff0)]; UINT8 prt = cr[BYTE_XOR_LE(0x1ff2)]; - UINT8* mem = (UINT8 *)memory_region(space->machine, "maincpu"); + UINT8* mem = (UINT8 *)space->machine->region("maincpu")->base(); cr[BYTE_XOR_LE(0x1ff0)] &= 0xfe; cr[BYTE_XOR_LE(0x1ff3)] &= 0x7f; @@ -960,7 +960,7 @@ void kf2k3bl_px_decrypt( running_machine *machine ) }; int rom_size = 0x800000; - UINT8 *rom = memory_region( machine, "maincpu" ); + UINT8 *rom = machine->region( "maincpu" )->base(); UINT8 *buf = auto_alloc_array(machine, UINT8, rom_size ); memcpy( buf, rom, rom_size ); @@ -982,7 +982,7 @@ void kf2k3bl_install_protection(running_machine *machine) void kf2k3pl_px_decrypt( running_machine *machine ) { UINT16*tmp = auto_alloc_array(machine, UINT16, 0x100000/2); - UINT16*rom = (UINT16*)memory_region( machine, "maincpu" ); + UINT16*rom = (UINT16*)machine->region( "maincpu" )->base(); int j; int i; @@ -1010,7 +1010,7 @@ void kf2k3pl_install_protection(running_machine *machine) void kf2k3upl_px_decrypt( running_machine *machine ) { { - UINT8 *src = memory_region(machine, "maincpu"); + UINT8 *src = machine->region("maincpu")->base(); memmove(src+0x100000, src, 0x600000); memmove(src, src+0x700000, 0x100000); } @@ -1019,8 +1019,8 @@ void kf2k3upl_px_decrypt( running_machine *machine ) int ofst; int i; - UINT8 *rom = memory_region( machine, "maincpu" ) + 0xfe000; - UINT8 *buf = memory_region( machine, "maincpu" ) + 0xd0610; + UINT8 *rom = machine->region( "maincpu" )->base() + 0xfe000; + UINT8 *buf = machine->region( "maincpu" )->base() + 0xd0610; for( i = 0; i < 0x2000 / 2; i++ ){ ofst = (i & 0xff00) + BITSWAP8( (i & 0x00ff), 7, 6, 0, 4, 3, 2, 1, 5 ); @@ -1040,8 +1040,8 @@ void kf2k3upl_install_protection(running_machine *machine) void samsho5b_px_decrypt( running_machine *machine ) { - int px_size = memory_region_length( machine, "maincpu" ); - UINT8 *rom = memory_region( machine, "maincpu" ); + int px_size = machine->region( "maincpu" )->bytes(); + UINT8 *rom = machine->region( "maincpu" )->base(); UINT8 *buf = auto_alloc_array(machine, UINT8, px_size ); int ofst; int i; @@ -1067,8 +1067,8 @@ void samsho5b_px_decrypt( running_machine *machine ) void samsho5b_vx_decrypt( running_machine *machine ) { - int vx_size = memory_region_length( machine, "ymsnd" ); - UINT8 *rom = memory_region( machine, "ymsnd" ); + int vx_size = machine->region( "ymsnd" )->bytes(); + UINT8 *rom = machine->region( "ymsnd" )->base(); int i; for( i = 0; i < vx_size; i++ ) @@ -1084,7 +1084,7 @@ void samsho5b_vx_decrypt( running_machine *machine ) void matrimbl_decrypt( running_machine *machine ) { /* decrypt Z80 */ - UINT8 *rom = memory_region( machine, "audiocpu" )+0x10000; + UINT8 *rom = machine->region( "audiocpu" )->base()+0x10000; UINT8 *buf = auto_alloc_array(machine, UINT8, 0x20000 ); int i, j=0; memcpy( buf, rom, 0x20000 ); diff --git a/src/mame/machine/neocrypt.c b/src/mame/machine/neocrypt.c index 42300b47441..f8ade05116b 100644 --- a/src/mame/machine/neocrypt.c +++ b/src/mame/machine/neocrypt.c @@ -535,11 +535,11 @@ static void neogeo_gfx_decrypt(running_machine *machine, int extra_xor) UINT8 *rom; int rpos; - rom_size = memory_region_length(machine, "sprites"); + rom_size = machine->region("sprites")->bytes(); buf = auto_alloc_array(machine, UINT8, rom_size); - rom = memory_region(machine, "sprites"); + rom = machine->region("sprites")->base(); // Data xor for (rpos = 0;rpos < rom_size/4;rpos++) @@ -595,10 +595,10 @@ static void neogeo_gfx_decrypt(running_machine *machine, int extra_xor) void neogeo_sfix_decrypt(running_machine *machine) { int i; - int rom_size = memory_region_length(machine, "sprites"); - int tx_size = memory_region_length(machine, "fixed"); - UINT8 *src = memory_region(machine, "sprites")+rom_size-tx_size; - UINT8 *dst = memory_region(machine, "fixed"); + int rom_size = machine->region("sprites")->bytes(); + int tx_size = machine->region("fixed")->bytes(); + UINT8 *src = machine->region("sprites")->base()+rom_size-tx_size; + UINT8 *dst = machine->region("fixed")->base(); for (i = 0;i < tx_size;i++) dst[i] = src[(i & ~0x1f) + ((i & 7) << 2) + ((~i & 8) >> 2) + ((i & 0x10) >> 4)]; @@ -677,8 +677,8 @@ void svcpcb_gfx_decrypt(running_machine *machine) static const UINT8 xorval[ 4 ] = { 0x34, 0x21, 0xc4, 0xe9 }; int i; int ofst; - int rom_size = memory_region_length( machine, "sprites" ); - UINT8 *rom = memory_region( machine, "sprites" ); + int rom_size = machine->region( "sprites" )->bytes(); + UINT8 *rom = machine->region( "sprites" )->base(); UINT8 *buf = auto_alloc_array(machine, UINT8, rom_size ); for( i = 0; i < rom_size; i++ ) @@ -710,8 +710,8 @@ void svcpcb_gfx_decrypt(running_machine *machine) void svcpcb_s1data_decrypt(running_machine *machine) { int i; - UINT8 *s1 = memory_region( machine, "fixed" ); - size_t s1_size = memory_region_length( machine, "fixed" ); + UINT8 *s1 = machine->region( "fixed" )->base(); + size_t s1_size = machine->region( "fixed" )->bytes(); for( i = 0; i < s1_size; i++ ) // Decrypt S { @@ -727,8 +727,8 @@ void kf2k3pcb_gfx_decrypt(running_machine *machine) static const UINT8 xorval[ 4 ] = { 0x34, 0x21, 0xc4, 0xe9 }; int i; int ofst; - int rom_size = memory_region_length( machine, "sprites" ); - UINT8 *rom = memory_region( machine, "sprites" ); + int rom_size = machine->region( "sprites" )->bytes(); + UINT8 *rom = machine->region( "sprites" )->base(); UINT8 *buf = auto_alloc_array(machine, UINT8, rom_size ); for ( i = 0; i < rom_size; i++ ) @@ -758,26 +758,26 @@ void kf2k3pcb_decrypt_s1data(running_machine *machine) UINT8 *src; UINT8 *dst; int i; - int tx_size = memory_region_length( machine, "fixed" ); - int srom_size = memory_region_length( machine, "sprites" ); + int tx_size = machine->region( "fixed" )->bytes(); + int srom_size = machine->region( "sprites" )->bytes(); - src = memory_region( machine, "sprites" ) + srom_size - 0x1000000 - 0x80000; // Decrypt S - dst = memory_region( machine, "fixed" ); + src = machine->region( "sprites" )->base() + srom_size - 0x1000000 - 0x80000; // Decrypt S + dst = machine->region( "fixed" )->base(); for( i = 0; i < tx_size / 2; i++ ) { dst[ i ] = src[ (i & ~0x1f) + ((i & 7) << 2) + ((~i & 8) >> 2) + ((i & 0x10) >> 4) ]; } - src = memory_region( machine, "sprites" ) + srom_size - 0x80000; - dst = memory_region( machine, "fixed" ) + 0x80000; + src = machine->region( "sprites" )->base() + srom_size - 0x80000; + dst = machine->region( "fixed" )->base() + 0x80000; for( i = 0; i < tx_size / 2; i++ ) { dst[ i ] = src[ (i & ~0x1f) + ((i & 7) << 2) + ((~i & 8) >> 2) + ((i & 0x10) >> 4) ]; } - dst = memory_region( machine, "fixed" ); + dst = machine->region( "fixed" )->base(); for( i = 0; i < tx_size; i++ ) { @@ -887,9 +887,9 @@ static int m1_address_scramble(int address, UINT16 key) void neogeo_cmc50_m1_decrypt(running_machine *machine) { - UINT8* rom = memory_region(machine, "audiocrypt"); + UINT8* rom = machine->region("audiocrypt")->base(); size_t rom_size = 0x80000; - UINT8* rom2 = memory_region(machine, "audiocpu"); + UINT8* rom2 = machine->region("audiocpu")->base(); UINT8* buffer = auto_alloc_array(machine, UINT8, rom_size); @@ -956,7 +956,7 @@ NeoGeo 'P' ROM encryption /* Kof98 uses an early encryption, quite different from the others */ void kof98_decrypt_68k(running_machine *machine) { - UINT8 *src = memory_region(machine, "maincpu"); + UINT8 *src = machine->region("maincpu")->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, 0x200000); int i, j, k; static const UINT32 sec[]={0x000000,0x100000,0x000004,0x100004,0x10000a,0x00000a,0x10000e,0x00000e}; @@ -1006,7 +1006,7 @@ void kof99_decrypt_68k(running_machine *machine) UINT16 *rom; int i,j; - rom = (UINT16 *)(memory_region(machine, "maincpu") + 0x100000); + rom = (UINT16 *)(machine->region("maincpu")->base() + 0x100000); /* swap data lines on the whole ROMs */ for (i = 0;i < 0x800000/2;i++) { @@ -1025,7 +1025,7 @@ void kof99_decrypt_68k(running_machine *machine) } /* swap address lines & relocate fixed part */ - rom = (UINT16 *)memory_region(machine, "maincpu"); + rom = (UINT16 *)machine->region("maincpu")->base(); for (i = 0;i < 0x0c0000/2;i++) { rom[i] = rom[0x700000/2 + BITSWAP24(i,23,22,21,20,19,18,11,6,14,17,16,5,8,10,12,0,4,3,2,7,9,15,13,1)]; @@ -1039,7 +1039,7 @@ void garou_decrypt_68k(running_machine *machine) int i,j; /* thanks to Razoola and Mr K for the info */ - rom = (UINT16 *)(memory_region(machine, "maincpu") + 0x100000); + rom = (UINT16 *)(machine->region("maincpu")->base() + 0x100000); /* swap data lines on the whole ROMs */ for (i = 0;i < 0x800000/2;i++) { @@ -1047,14 +1047,14 @@ void garou_decrypt_68k(running_machine *machine) } /* swap address lines & relocate fixed part */ - rom = (UINT16 *)memory_region(machine, "maincpu"); + rom = (UINT16 *)machine->region("maincpu")->base(); for (i = 0;i < 0x0c0000/2;i++) { rom[i] = rom[0x710000/2 + BITSWAP24(i,23,22,21,20,19,18,4,5,16,14,7,9,6,13,17,15,3,1,2,12,11,8,10,0)]; } /* swap address lines for the banked part */ - rom = (UINT16 *)(memory_region(machine, "maincpu") + 0x100000); + rom = (UINT16 *)(machine->region("maincpu")->base() + 0x100000); for (i = 0;i < 0x800000/2;i+=0x8000/2) { UINT16 buffer[0x8000/2]; @@ -1073,7 +1073,7 @@ void garouo_decrypt_68k(running_machine *machine) int i,j; /* thanks to Razoola and Mr K for the info */ - rom = (UINT16 *)(memory_region(machine, "maincpu") + 0x100000); + rom = (UINT16 *)(machine->region("maincpu")->base() + 0x100000); /* swap data lines on the whole ROMs */ for (i = 0;i < 0x800000/2;i++) { @@ -1081,14 +1081,14 @@ void garouo_decrypt_68k(running_machine *machine) } /* swap address lines & relocate fixed part */ - rom = (UINT16 *)memory_region(machine, "maincpu"); + rom = (UINT16 *)machine->region("maincpu")->base(); for (i = 0;i < 0x0c0000/2;i++) { rom[i] = rom[0x7f8000/2 + BITSWAP24(i,23,22,21,20,19,18,5,16,11,2,6,7,17,3,12,8,14,4,0,9,1,10,15,13)]; } /* swap address lines for the banked part */ - rom = (UINT16 *)(memory_region(machine, "maincpu") + 0x100000); + rom = (UINT16 *)(machine->region("maincpu")->base() + 0x100000); for (i = 0;i < 0x800000/2;i+=0x8000/2) { UINT16 buffer[0x8000/2]; @@ -1107,7 +1107,7 @@ void mslug3_decrypt_68k(running_machine *machine) int i,j; /* thanks to Razoola and Mr K for the info */ - rom = (UINT16 *)(memory_region(machine, "maincpu") + 0x100000); + rom = (UINT16 *)(machine->region("maincpu")->base() + 0x100000); /* swap data lines on the whole ROMs */ for (i = 0;i < 0x800000/2;i++) { @@ -1115,14 +1115,14 @@ void mslug3_decrypt_68k(running_machine *machine) } /* swap address lines & relocate fixed part */ - rom = (UINT16 *)memory_region(machine, "maincpu"); + rom = (UINT16 *)machine->region("maincpu")->base(); for (i = 0;i < 0x0c0000/2;i++) { rom[i] = rom[0x5d0000/2 + BITSWAP24(i,23,22,21,20,19,18,15,2,1,13,3,0,9,6,16,4,11,5,7,12,17,14,10,8)]; } /* swap address lines for the banked part */ - rom = (UINT16 *)(memory_region(machine, "maincpu") + 0x100000); + rom = (UINT16 *)(machine->region("maincpu")->base() + 0x100000); for (i = 0;i < 0x800000/2;i+=0x10000/2) { UINT16 buffer[0x10000/2]; @@ -1141,7 +1141,7 @@ void kof2000_decrypt_68k(running_machine *machine) int i,j; /* thanks to Razoola and Mr K for the info */ - rom = (UINT16 *)(memory_region(machine, "maincpu") + 0x100000); + rom = (UINT16 *)(machine->region("maincpu")->base() + 0x100000); /* swap data lines on the whole ROMs */ for (i = 0;i < 0x800000/2;i++) { @@ -1160,7 +1160,7 @@ void kof2000_decrypt_68k(running_machine *machine) } /* swap address lines & relocate fixed part */ - rom = (UINT16 *)memory_region(machine, "maincpu"); + rom = (UINT16 *)machine->region("maincpu")->base(); for (i = 0;i < 0x0c0000/2;i++) { rom[i] = rom[0x73a000/2 + BITSWAP24(i,23,22,21,20,19,18,8,4,15,13,3,14,16,2,6,17,7,12,10,0,5,11,1,9)]; @@ -1173,7 +1173,7 @@ void kof2002_decrypt_68k(running_machine *machine) { int i; static const int sec[]={0x100000,0x280000,0x300000,0x180000,0x000000,0x380000,0x200000,0x080000}; - UINT8 *src = memory_region(machine, "maincpu")+0x100000; + UINT8 *src = machine->region("maincpu")->base()+0x100000; UINT8 *dst = auto_alloc_array(machine, UINT8, 0x400000); memcpy( dst, src, 0x400000 ); for( i=0; i<8; ++i ) @@ -1188,7 +1188,7 @@ void matrim_decrypt_68k(running_machine *machine) { int i; static const int sec[]={0x100000,0x280000,0x300000,0x180000,0x000000,0x380000,0x200000,0x080000}; - UINT8 *src = memory_region(machine, "maincpu")+0x100000; + UINT8 *src = machine->region("maincpu")->base()+0x100000; UINT8 *dst = auto_alloc_array(machine, UINT8, 0x400000); memcpy( dst, src, 0x400000); for( i=0; i<8; ++i ) @@ -1203,7 +1203,7 @@ void samsho5_decrypt_68k(running_machine *machine) { int i; static const int sec[]={0x000000,0x080000,0x700000,0x680000,0x500000,0x180000,0x200000,0x480000,0x300000,0x780000,0x600000,0x280000,0x100000,0x580000,0x400000,0x380000}; - UINT8 *src = memory_region(machine, "maincpu"); + UINT8 *src = machine->region("maincpu")->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, 0x800000); memcpy( dst, src, 0x800000 ); @@ -1219,7 +1219,7 @@ void samsh5sp_decrypt_68k(running_machine *machine) { int i; static const int sec[]={0x000000,0x080000,0x500000,0x480000,0x600000,0x580000,0x700000,0x280000,0x100000,0x680000,0x400000,0x780000,0x200000,0x380000,0x300000,0x180000}; - UINT8 *src = memory_region(machine, "maincpu"); + UINT8 *src = machine->region("maincpu")->base(); UINT8 *dst = auto_alloc_array(machine, UINT8, 0x800000); memcpy( dst, src, 0x800000 ); @@ -1239,7 +1239,7 @@ void mslug5_decrypt_68k(running_machine *machine) int i; int ofst; int rom_size = 0x800000; - UINT8 *rom = memory_region( machine, "maincpu" ); + UINT8 *rom = machine->region( "maincpu" )->base(); UINT8 *buf = auto_alloc_array(machine, UINT8, rom_size ); for( i = 0; i < 0x100000; i++ ) @@ -1284,7 +1284,7 @@ void svc_px_decrypt(running_machine *machine) int i; int ofst; int rom_size = 0x800000; - UINT8 *rom = memory_region( machine, "maincpu" ); + UINT8 *rom = machine->region( "maincpu" )->base(); UINT8 *buf = auto_alloc_array(machine, UINT8, rom_size ); for( i = 0; i < 0x100000; i++ ) @@ -1328,7 +1328,7 @@ void kf2k3pcb_decrypt_68k(running_machine *machine) int i; int ofst; int rom_size = 0x900000; - UINT8 *rom = memory_region( machine, "maincpu" ); + UINT8 *rom = machine->region( "maincpu" )->base(); UINT8 *buf = auto_alloc_array(machine, UINT8, rom_size ); for (i = 0; i < 0x100000; i++) @@ -1371,7 +1371,7 @@ void kof2003_decrypt_68k(running_machine *machine) int i; int ofst; int rom_size = 0x900000; - UINT8 *rom = memory_region( machine, "maincpu" ); + UINT8 *rom = machine->region( "maincpu" )->base(); UINT8 *buf = auto_alloc_array(machine, UINT8, rom_size ); for (i = 0; i < 0x100000; i++) @@ -1419,7 +1419,7 @@ void kof2003h_decrypt_68k(running_machine *machine) int i; int ofst; int rom_size = 0x900000; - UINT8 *rom = memory_region( machine, "maincpu" ); + UINT8 *rom = machine->region( "maincpu" )->base(); UINT8 *buf = auto_alloc_array(machine, UINT8, rom_size ); for (i = 0; i < 0x100000; i++) @@ -1469,8 +1469,8 @@ NeoGeo 'V' (PCM) ROM encryption /* Neo-Pcm2 Drivers for Encrypted V Roms */ void neo_pcm2_snk_1999(running_machine *machine, int value) { /* thanks to Elsemi for the NEO-PCM2 info */ - UINT16 *rom = (UINT16 *)memory_region(machine, "ymsnd"); - int size = memory_region_length(machine, "ymsnd"); + UINT16 *rom = (UINT16 *)machine->region("ymsnd")->base(); + int size = machine->region("ymsnd")->bytes(); int i, j; if( rom != NULL ) @@ -1509,7 +1509,7 @@ void neo_pcm2_swap(running_machine *machine, int value) {0xcb,0x29,0x7d,0x43,0xd2,0x3a,0xc2,0xb4}, {0x4b,0xa4,0x63,0x46,0xf0,0x91,0xea,0x62}, {0x4b,0xa4,0x63,0x46,0xf0,0x91,0xea,0x62}}; - UINT8 *src = memory_region(machine, "ymsnd"); + UINT8 *src = machine->region("ymsnd")->base(); UINT8 *buf = auto_alloc_array(machine, UINT8, 0x1000000); int i, j, d; @@ -1553,7 +1553,7 @@ void kof2003biosdecode(running_machine *machine) 0xd3,0xd2,0x5c,0x5d,0x57,0x56,0xd8,0xd9, 0xd3,0xd2,0x5c,0x5d,0x57,0x56,0xd8,0xd9, }; - UINT16*src= (UINT16*)memory_region( machine, "mainbios" ); + UINT16*src= (UINT16*)machine->region( "mainbios" )->base(); UINT16*buf= auto_alloc_array(machine, UINT16, 0x80000/2); int a,addr; diff --git a/src/mame/machine/neoprot.c b/src/mame/machine/neoprot.c index f6b2dbe2a1b..bf703882a12 100644 --- a/src/mame/machine/neoprot.c +++ b/src/mame/machine/neoprot.c @@ -119,7 +119,7 @@ void fatfury2_install_protection( running_machine *machine ) static WRITE16_HANDLER ( kof98_prot_w ) { /* info from razoola */ - UINT16* mem16 = (UINT16*)memory_region(space->machine, "maincpu"); + UINT16* mem16 = (UINT16*)space->machine->region("maincpu")->base(); switch (data) { @@ -160,7 +160,7 @@ void install_kof98_protection( running_machine *machine ) void mslugx_install_protection( running_machine *machine ) { int i; - UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *mem16 = (UINT16 *)machine->region("maincpu")->base(); for (i = 0;i < (0x100000/2) - 4;i++) { diff --git a/src/mame/machine/nmk004.c b/src/mame/machine/nmk004.c index 020f74f598b..92563852705 100644 --- a/src/mame/machine/nmk004.c +++ b/src/mame/machine/nmk004.c @@ -167,7 +167,7 @@ static void oki_play_sample(int sample_no) if (sample != 0) { - UINT8 *rom = memory_region(NMK004_state.machine, (chip == 0) ? "oki1" : "oki2"); + UINT8 *rom = NMK004_state.machine->region((chip == 0) ? "oki1" : "oki2")->base(); int bank = (byte2 & 0x0c) >> 2; int vol = (byte2 & 0x70) >> 4; @@ -1025,7 +1025,7 @@ static TIMER_CALLBACK( real_nmk004_init ) NMK004_state.oki1device = machine->device("oki1"); NMK004_state.oki2device = machine->device("oki2"); - NMK004_state.rom = memory_region(machine, "audiocpu"); + NMK004_state.rom = machine->region("audiocpu")->base(); ym2203_control_port_w(NMK004_state.ymdevice, 0, 0x2f); diff --git a/src/mame/machine/nmk112.c b/src/mame/machine/nmk112.c index d8acc9149ca..91c8aee633b 100644 --- a/src/mame/machine/nmk112.c +++ b/src/mame/machine/nmk112.c @@ -128,10 +128,10 @@ static DEVICE_START( nmk112 ) nmk112_state *nmk112 = get_safe_token(device); const nmk112_interface *intf = get_interface(device); - nmk112->rom0 = memory_region(device->machine, intf->rgn0); - nmk112->size0 = memory_region_length(device->machine, intf->rgn0) - 0x40000; - nmk112->rom1 = memory_region(device->machine, intf->rgn1); - nmk112->size1 = memory_region_length(device->machine, intf->rgn1) - 0x40000; + nmk112->rom0 = device->machine->region(intf->rgn0)->base(); + nmk112->size0 = device->machine->region(intf->rgn0)->bytes() - 0x40000; + nmk112->rom1 = device->machine->region(intf->rgn1)->base(); + nmk112->size1 = device->machine->region(intf->rgn1)->bytes() - 0x40000; nmk112->page_mask = ~intf->disable_page_mask; diff --git a/src/mame/machine/opwolf.c b/src/mame/machine/opwolf.c index 966e472638d..10ad5c2fba9 100644 --- a/src/mame/machine/opwolf.c +++ b/src/mame/machine/opwolf.c @@ -423,7 +423,7 @@ WRITE16_HANDLER( opwolf_cchip_data_w ) if (offset == 0x14) { #if OPWOLF_READ_COINAGE_FROM_ROM - UINT16* rom = (UINT16*)memory_region(space->machine, "maincpu"); + UINT16* rom = (UINT16*)space->machine->region("maincpu")->base(); UINT32 coin_table[2] = {0, 0}; UINT8 coin_offset[2]; int slot; diff --git a/src/mame/machine/pacplus.c b/src/mame/machine/pacplus.c index beed2a87365..7508350d7d6 100644 --- a/src/mame/machine/pacplus.c +++ b/src/mame/machine/pacplus.c @@ -46,7 +46,7 @@ void pacplus_decode(running_machine *machine) /* CPU ROMs */ - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (i = 0; i < 0x4000; i++) { RAM[i] = decrypt(i,RAM[i]); diff --git a/src/mame/machine/pgmcrypt.c b/src/mame/machine/pgmcrypt.c index ee1844031c2..76e9b06f49b 100644 --- a/src/mame/machine/pgmcrypt.c +++ b/src/mame/machine/pgmcrypt.c @@ -27,7 +27,7 @@ void pgm_kov_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")+0x100000); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()+0x100000); int rom_size = 0x400000; @@ -89,7 +89,7 @@ void pgm_kovsh_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")+0x100000); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()+0x100000); int rom_size = 0x400000; @@ -130,7 +130,7 @@ void pgm_dw2_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")+0x100000); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()+0x100000); int rom_size = 0x80000; @@ -172,7 +172,7 @@ void pgm_photoy2k_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")+0x100000); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()+0x100000); int rom_size = 0x400000; @@ -232,7 +232,7 @@ void pgm_pstar_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")+0x100000); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()+0x100000); int rom_size = 0x100000; @@ -272,7 +272,7 @@ void pgm_dw3_decrypt(running_machine *machine) // UINT16 *src=(UINT16 *) (OP_ROM+0x100000); int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")+0x100000); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()+0x100000); int rom_size = 0x100000; @@ -304,7 +304,7 @@ void pgm_killbld_decrypt(running_machine *machine) // UINT16 *src=(UINT16 *) (OP_ROM+0x100000); int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")+0x100000); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()+0x100000); int rom_size = 0x200000; @@ -343,7 +343,7 @@ static const UINT8 dfront_tab[256] = { void pgm_dfront_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *)(memory_region(machine, "user1")); + UINT16 *src = (UINT16 *)(machine->region("user1")->base()); int rom_size = 0x400000; @@ -403,7 +403,7 @@ static const UINT8 ddp2_tab[256] = { void pgm_ddp2_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *)(memory_region(machine, "user1")); + UINT16 *src = (UINT16 *)(machine->region("user1")->base()); int rom_size = 0x200000; @@ -457,7 +457,7 @@ static const UINT8 mm_tab[256] = { void pgm_mm_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *)(memory_region(machine, "user1")); + UINT16 *src = (UINT16 *)(machine->region("user1")->base()); int rom_size = 0x200000; @@ -516,7 +516,7 @@ static const UINT8 kov2_tab[256] = { void pgm_kov2_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *)(memory_region(machine, "user1")); + UINT16 *src = (UINT16 *)(machine->region("user1")->base()); int rom_size = 0x200000; @@ -572,7 +572,7 @@ static const UINT8 kov2p_tab[256] = { void pgm_kov2p_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *)(memory_region(machine, "user1")); + UINT16 *src = (UINT16 *)(machine->region("user1")->base()); int rom_size = 0x200000; @@ -631,7 +631,7 @@ static const UINT8 puzzli2_tab[256] = { void pgm_puzzli2_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")+0x100000); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()+0x100000); int rom_size = 0x100000; @@ -690,7 +690,7 @@ static const UINT8 theglad_tab[256] = { void pgm_theglad_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *)(memory_region(machine, "user1")); + UINT16 *src = (UINT16 *)(machine->region("user1")->base()); int rom_size = 0x200000; @@ -750,7 +750,7 @@ static const UINT8 oldsplus_tab[256] = { void pgm_oldsplus_decrypt(running_machine *machine) { int i; - unsigned short *src = (unsigned short *)(memory_region(machine, "maincpu")+0x100000); + unsigned short *src = (unsigned short *)(machine->region("maincpu")->base()+0x100000); int rom_size = 0x400000; @@ -810,7 +810,7 @@ static const UINT8 kovshp_tab[256] = { void pgm_kovshp_decrypt(running_machine *machine) { int i; - unsigned short *src = (unsigned short *)(memory_region(machine, "maincpu")+0x100000); + unsigned short *src = (unsigned short *)(machine->region("maincpu")->base()+0x100000); int rom_size = 0x400000; @@ -870,7 +870,7 @@ static const UINT8 killbldp_tab[256] = { void pgm_killbldp_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *)(memory_region(machine, "user1")); + UINT16 *src = (UINT16 *)(machine->region("user1")->base()); int rom_size = 0x200000; @@ -911,7 +911,7 @@ void pgm_killbldp_decrypt(running_machine *machine) void pgm_svg_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *)(memory_region(machine, "user1")); + UINT16 *src = (UINT16 *)(machine->region("user1")->base()); int rom_size = 0x800000; @@ -969,7 +969,7 @@ static const UINT8 dw2001_tab[256] = { void pgm_dw2001_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *)(memory_region(machine, "user1")); + UINT16 *src = (UINT16 *)(machine->region("user1")->base()); int rom_size = 0x200000; @@ -1026,7 +1026,7 @@ static const UINT8 py2k2_tab[256] = { void pgm_py2k2_decrypt(running_machine *machine) // and ddpdoj/ddpdojbl { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")+0x100000); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()+0x100000); int rom_size = 0x400000; @@ -1072,7 +1072,7 @@ static const unsigned char ket_tab[256] = { void pgm_ket_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()); int rom_size = 0x400000; @@ -1118,7 +1118,7 @@ static const unsigned char espgal_tab[256] = { void pgm_espgal_decrypt(running_machine *machine) { int i; - UINT16 *src = (UINT16 *) (memory_region(machine, "maincpu")); + UINT16 *src = (UINT16 *) (machine->region("maincpu")->base()); int rom_size = 0x400000; diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c index bfeacb585f3..e3b48d9f2c1 100644 --- a/src/mame/machine/playch10.c +++ b/src/mame/machine/playch10.c @@ -79,7 +79,7 @@ MACHINE_RESET( pc10 ) MACHINE_START( pc10 ) { - vrom = memory_region(machine, "gfx2"); + vrom = machine->region("gfx2")->base(); /* allocate 4K of nametable ram here */ /* move to individual boards as documentation of actual boards allows */ @@ -94,12 +94,12 @@ MACHINE_START( pc10 ) nvram_device *nvram = machine->device("nvram"); if (nvram != NULL) - nvram->set_base(memory_region( machine, "cart" ) + 0x6000, 0x1000); + nvram->set_base(machine->region( "cart" )->base() + 0x6000, 0x1000); } MACHINE_START( playch10_hboard ) { - vrom = memory_region(machine, "gfx2"); + vrom = machine->region("gfx2")->base(); /* allocate 4K of nametable ram here */ /* move to individual boards as documentation of actual boards allows */ @@ -228,7 +228,7 @@ WRITE8_HANDLER( pc10_prot_w ) /* is the actual protection memory area */ /* setting the whole 0x2000 region every time is a waste */ /* so we just set $ffff with the current value */ - memory_region(space->machine, "maincpu")[0xffff] = pc10_prot_r(space, 0); + space->machine->region("maincpu")->base()[0xffff] = pc10_prot_r(space, 0); } } @@ -401,7 +401,7 @@ static void pc10_set_videorom_bank( running_machine *machine, int first, int cou /* yeah, this is probably a horrible assumption to make.*/ /* but the driver is 100% consistant */ - len = memory_region_length(machine, "gfx2"); + len = machine->region("gfx2")->bytes(); len /= 0x400; // convert to KB len /= size; // convert to bank resolution len--; // convert to mask @@ -578,7 +578,7 @@ static WRITE8_HANDLER( mmc1_rom_switch_w ) case 3: /* program banking */ { int bank = (mmc1_shiftreg & mmc1_rom_mask) * 0x4000; - UINT8 *prg = memory_region(space->machine, "cart"); + UINT8 *prg = space->machine->region("cart")->base(); if (!size16k) { @@ -634,14 +634,14 @@ DRIVER_INIT( pcaboard ) static WRITE8_HANDLER( bboard_rom_switch_w ) { int bankoffset = 0x10000 + ((data & 7) * 0x4000); - UINT8 *prg = memory_region(space->machine, "cart"); + UINT8 *prg = space->machine->region("cart")->base(); memcpy(&prg[0x08000], &prg[bankoffset], 0x4000); } DRIVER_INIT( pcbboard ) { - UINT8 *prg = memory_region(machine, "cart"); + UINT8 *prg = machine->region("cart")->base(); /* We do manual banking, in case the code falls through */ /* Copy the initial banks */ @@ -687,7 +687,7 @@ DRIVER_INIT( pccboard ) DRIVER_INIT( pcdboard ) { - UINT8 *prg = memory_region(machine, "cart"); + UINT8 *prg = machine->region("cart")->base(); /* We do manual banking, in case the code falls through */ /* Copy the initial banks */ @@ -760,7 +760,7 @@ static WRITE8_HANDLER( eboard_rom_switch_w ) case 0x2000: /* code bank switching */ { int bankoffset = 0x10000 + (data & 0x0f) * 0x2000; - UINT8 *prg = memory_region(space->machine, "cart"); + UINT8 *prg = space->machine->region("cart")->base(); memcpy(&prg[0x08000], &prg[bankoffset], 0x2000); } break; @@ -798,7 +798,7 @@ static WRITE8_HANDLER( eboard_rom_switch_w ) DRIVER_INIT( pceboard ) { - UINT8 *prg = memory_region(machine, "cart"); + UINT8 *prg = machine->region("cart")->base(); /* we have no vram, make sure switching games doesn't point to an old allocation */ vram = NULL; @@ -825,7 +825,7 @@ DRIVER_INIT( pceboard ) DRIVER_INIT( pcfboard ) { - UINT8 *prg = memory_region(machine, "cart"); + UINT8 *prg = machine->region("cart")->base(); /* we have no vram, make sure switching games doesn't point to an old allocation */ vram = NULL; @@ -892,7 +892,7 @@ static WRITE8_HANDLER( gboard_rom_switch_w ) if (gboard_last_bank != (data & 0xc0)) { int bank; - UINT8 *prg = memory_region(space->machine, "cart"); + UINT8 *prg = space->machine->region("cart")->base(); /* reset the banks */ if (gboard_command & 0x40) @@ -945,7 +945,7 @@ static WRITE8_HANDLER( gboard_rom_switch_w ) case 6: /* program banking */ { - UINT8 *prg = memory_region(space->machine, "cart"); + UINT8 *prg = space->machine->region("cart")->base(); if (gboard_command & 0x40) { /* high bank */ @@ -970,7 +970,7 @@ static WRITE8_HANDLER( gboard_rom_switch_w ) case 7: /* program banking */ { /* mid bank */ - UINT8 *prg = memory_region(space->machine, "cart"); + UINT8 *prg = space->machine->region("cart")->base(); gboard_banks[1] = data & 0x1f; bank = gboard_banks[1] * 0x2000 + 0x10000; @@ -1015,7 +1015,7 @@ static WRITE8_HANDLER( gboard_rom_switch_w ) DRIVER_INIT( pcgboard ) { - UINT8 *prg = memory_region(machine, "cart"); + UINT8 *prg = machine->region("cart")->base(); vram = NULL; /* We do manual banking, in case the code falls through */ @@ -1055,7 +1055,7 @@ DRIVER_INIT( pcgboard_type2 ) static WRITE8_HANDLER( iboard_rom_switch_w ) { int bank = data & 7; - UINT8 *prg = memory_region(space->machine, "cart"); + UINT8 *prg = space->machine->region("cart")->base(); if (data & 0x10) pc10_set_mirroring(PPU_MIRROR_HIGH); @@ -1067,7 +1067,7 @@ static WRITE8_HANDLER( iboard_rom_switch_w ) DRIVER_INIT( pciboard ) { - UINT8 *prg = memory_region(machine, "cart"); + UINT8 *prg = machine->region("cart")->base(); /* We do manual banking, in case the code falls through */ /* Copy the initial banks */ @@ -1136,7 +1136,7 @@ static WRITE8_HANDLER( hboard_rom_switch_w ) DRIVER_INIT( pchboard ) { - UINT8 *prg = memory_region(machine, "cart"); + UINT8 *prg = machine->region("cart")->base(); memcpy(&prg[0x08000], &prg[0x4c000], 0x4000); memcpy(&prg[0x0c000], &prg[0x4c000], 0x4000); @@ -1162,7 +1162,7 @@ DRIVER_INIT( pchboard ) DRIVER_INIT( pckboard ) { - UINT8 *prg = memory_region(machine, "cart"); + UINT8 *prg = machine->region("cart")->base(); /* We do manual banking, in case the code falls through */ /* Copy the initial banks */ diff --git a/src/mame/machine/r2crypt.c b/src/mame/machine/r2crypt.c index 6e6b070dcbf..849ae572b49 100644 --- a/src/mame/machine/r2crypt.c +++ b/src/mame/machine/r2crypt.c @@ -251,7 +251,7 @@ static UINT32 trans(UINT32 v, UINT32 x) void raiden2_decrypt_sprites(running_machine *machine) { int i; - UINT32 *data = (UINT32 *)memory_region(machine, "gfx3"); + UINT32 *data = (UINT32 *)machine->region("gfx3")->base(); for(i=0; i<0x800000/4; i++) { UINT32 x1, v1, y1; diff --git a/src/mame/machine/s16fd.c b/src/mame/machine/s16fd.c index 2db1026924d..c1de529c687 100644 --- a/src/mame/machine/s16fd.c +++ b/src/mame/machine/s16fd.c @@ -203,9 +203,9 @@ void fd1094_driver_init(running_machine *machine, const char* tag, void (*set_de strcpy(fd1094_cputag, tag); - fd1094_cpuregion = (UINT16*)memory_region(machine, fd1094_cputag); - fd1094_cpuregionsize = memory_region_length(machine, fd1094_cputag); - fd1094_key = memory_region(machine, "user1"); + fd1094_cpuregion = (UINT16*)machine->region(fd1094_cputag)->base(); + fd1094_cpuregionsize = machine->region(fd1094_cputag)->bytes(); + fd1094_key = machine->region("user1")->base(); fd1094_set_decrypted = set_decrypted; /* punt if no key; this allows us to be called even for non-FD1094 games */ @@ -221,7 +221,7 @@ void fd1094_driver_init(running_machine *machine, const char* tag, void (*set_de fd1094_state = -1; /* key debugging */ - if ((machine->debug_flags & DEBUG_FLAG_ENABLED) != 0 && memory_region(machine, "user2") != NULL) + if ((machine->debug_flags & DEBUG_FLAG_ENABLED) != 0 && machine->region("user2")->base() != NULL) { fd1094_init_debugging(machine, fd1094_cputag, "user1", "user2", key_changed); } diff --git a/src/mame/machine/s24fd.c b/src/mame/machine/s24fd.c index 646acbf1684..2781aa591ee 100644 --- a/src/mame/machine/s24fd.c +++ b/src/mame/machine/s24fd.c @@ -158,7 +158,7 @@ void s24_fd1094_driver_init(running_machine *machine) s24_fd1094_cpuregion = (UINT16*)s24_mainram1; s24_fd1094_cpuregionsize = 0x40000; - s24_fd1094_key = memory_region(machine, "fd1094key"); + s24_fd1094_key = machine->region("fd1094key")->base(); /* punt if no key; this allows us to be called even for non-s24_fd1094 games */ if (!s24_fd1094_key) diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c index 29b3282cd5b..1b01fa9d5d7 100644 --- a/src/mame/machine/scramble.c +++ b/src/mame/machine/scramble.c @@ -28,7 +28,7 @@ MACHINE_RESET( scramble ) MACHINE_RESET( explorer ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); RAM[0x47ff] = 0; /* If not set, it doesn't reset after the 1st time */ MACHINE_RESET_CALL(galaxold); @@ -244,7 +244,7 @@ DRIVER_INIT( mariner ) /* extra ROM */ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5800, 0x67ff, 0, 0, "bank1"); memory_unmap_write(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x5800, 0x67ff, 0, 0); - memory_set_bankptr(machine, "bank1", memory_region(machine, "maincpu") + 0x5800); + memory_set_bankptr(machine, "bank1", machine->region("maincpu")->base() + 0x5800); memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x9008, 0x9008, 0, 0, mariner_protection_2_r); memory_install_read8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0xb401, 0xb401, 0, 0, mariner_protection_1_r); @@ -260,12 +260,12 @@ DRIVER_INIT( frogger ) UINT8 *ROM; /* the first ROM of the second CPU has data lines D0 and D1 swapped. Decode it. */ - ROM = memory_region(machine, "audiocpu"); + ROM = machine->region("audiocpu")->base(); for (A = 0;A < 0x0800;A++) ROM[A] = BITSWAP8(ROM[A],7,6,5,4,3,2,0,1); /* likewise, the 2nd gfx ROM has data lines D0 and D1 swapped. Decode it. */ - ROM = memory_region(machine, "gfx1"); + ROM = machine->region("gfx1")->base(); for (A = 0x0800;A < 0x1000;A++) ROM[A] = BITSWAP8(ROM[A],7,6,5,4,3,2,0,1); } @@ -276,7 +276,7 @@ DRIVER_INIT( froggers ) UINT8 *ROM; /* the first ROM of the second CPU has data lines D0 and D1 swapped. Decode it. */ - ROM = memory_region(machine, "audiocpu"); + ROM = machine->region("audiocpu")->base(); for (A = 0;A < 0x0800;A++) ROM[A] = BITSWAP8(ROM[A],7,6,5,4,3,2,0,1); } @@ -294,7 +294,7 @@ DRIVER_INIT( devilfsh ) /* A2 -> A3 */ /* A3 -> A1 */ - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (i = 0; i < 0x10000; i += 16) { offs_t j; @@ -320,12 +320,12 @@ DRIVER_INIT( hotshock ) { /* protection??? The game jumps into never-neverland here. I think it just expects a RET there */ - memory_region(machine, "maincpu")[0x2ef9] = 0xc9; + machine->region("maincpu")->base()[0x2ef9] = 0xc9; } DRIVER_INIT( cavelon ) { - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); /* banked ROM */ memory_install_read_bank(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x0000, 0x3fff, 0, 0, "bank1"); @@ -370,7 +370,7 @@ DRIVER_INIT( mimonkey ) { 0x80,0x87,0x81,0x87,0x83,0x00,0x84,0x01,0x01,0x86,0x86,0x80,0x86,0x00,0x86,0x86 } }; - UINT8 *ROM = memory_region(machine, "maincpu"); + UINT8 *ROM = machine->region("maincpu")->base(); int A, ctr = 0, line, col; for( A = 0; A < 0x4000; A++ ) @@ -416,8 +416,8 @@ DRIVER_INIT( anteater ) * Optimizations done by Fabio Buffoni */ - RAM = memory_region(machine, "gfx1"); - len = memory_region_length(machine, "gfx1"); + RAM = machine->region("gfx1")->base(); + len = machine->region("gfx1")->bytes(); scratch = alloc_array_or_die(UINT8, len); @@ -454,8 +454,8 @@ DRIVER_INIT( rescue ) * Optimizations done by Fabio Buffoni */ - RAM = memory_region(machine, "gfx1"); - len = memory_region_length(machine, "gfx1"); + RAM = machine->region("gfx1")->base(); + len = machine->region("gfx1")->bytes(); scratch = auto_alloc_array(machine, UINT8, len); @@ -490,8 +490,8 @@ DRIVER_INIT( minefld ) * Code To Decode Minefield by Mike Balfour and Nicola Salmoria */ - RAM = memory_region(machine, "gfx1"); - len = memory_region_length(machine, "gfx1"); + RAM = machine->region("gfx1")->base(); + len = machine->region("gfx1")->bytes(); scratch = auto_alloc_array(machine, UINT8, len); @@ -529,8 +529,8 @@ DRIVER_INIT( losttomb ) * Optimizations done by Fabio Buffoni */ - RAM = memory_region(machine, "gfx1"); - len = memory_region_length(machine, "gfx1"); + RAM = machine->region("gfx1")->base(); + len = machine->region("gfx1")->bytes(); scratch = alloc_array_or_die(UINT8, len); @@ -556,7 +556,7 @@ DRIVER_INIT( losttomb ) DRIVER_INIT( hustler ) { offs_t A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (A = 0;A < 0x4000;A++) @@ -584,7 +584,7 @@ DRIVER_INIT( hustler ) /* the first ROM of the second CPU has data lines D0 and D1 swapped. Decode it. */ { - rom = memory_region(machine, "audiocpu"); + rom = machine->region("audiocpu")->base(); for (A = 0;A < 0x0800;A++) @@ -595,7 +595,7 @@ DRIVER_INIT( hustler ) DRIVER_INIT( billiard ) { offs_t A; - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); for (A = 0;A < 0x4000;A++) @@ -625,7 +625,7 @@ DRIVER_INIT( billiard ) /* the first ROM of the second CPU has data lines D0 and D1 swapped. Decode it. */ { - rom = memory_region(machine, "audiocpu"); + rom = machine->region("audiocpu")->base(); for (A = 0;A < 0x0800;A++) @@ -653,8 +653,8 @@ DRIVER_INIT( mrkougb ) DRIVER_INIT( ad2083 ) { UINT8 c; - int i, len = memory_region_length(machine, "maincpu"); - UINT8 *ROM = memory_region(machine, "maincpu"); + int i, len = machine->region("maincpu")->bytes(); + UINT8 *ROM = machine->region("maincpu")->base(); for (i=0; iregion(cputag)->base(); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x8000); space->set_decrypted_region(0x0000, 0x7fff, decrypted); diff --git a/src/mame/machine/segacrpt.c b/src/mame/machine/segacrpt.c index fa5c81d789e..69fbf6a8a73 100644 --- a/src/mame/machine/segacrpt.c +++ b/src/mame/machine/segacrpt.c @@ -159,7 +159,7 @@ static void lfkp(int mask) { int A; - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); for (A = 0x0000;A < 0x8000-14;A++) @@ -218,9 +218,9 @@ static void sega_decode(running_machine *machine, const char *cputag, const UINT int A; address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM); - int length = memory_region_length(machine, cputag); + int length = machine->region(cputag)->bytes(); int cryptlen = MIN(length, 0x8000); - UINT8 *rom = memory_region(machine, cputag); + UINT8 *rom = machine->region(cputag)->base(); UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0xc000); space->set_decrypted_region(0x0000, cryptlen - 1, decrypted); @@ -440,7 +440,7 @@ void toprollr_decode(running_machine *machine, const char *cputag, const char *r int A; address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, regiontag); + UINT8 *rom = machine->region(regiontag)->base(); int bankstart; decrypted = auto_alloc_array(machine, UINT8, 0x6000*3); @@ -471,7 +471,7 @@ void toprollr_decode(running_machine *machine, const char *cputag, const char *r rom[A+bankstart] = (src & ~0xa8) | (convtable[2*row+1][col] ^ xorval); } - memory_configure_bank(machine, "bank1",0,3, memory_region(machine, regiontag),0x6000); + memory_configure_bank(machine, "bank1",0,3, machine->region(regiontag)->base(),0x6000); memory_configure_bank_decrypted(machine, "bank1",0,3,decrypted,0x6000); space->set_decrypted_region(0x0000, 0x5fff, decrypted); memory_set_bank(space->machine, "bank1", 0); @@ -798,7 +798,7 @@ void jongkyo_decode(running_machine *machine, const char *cputag) int A; address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, cputag); + UINT8 *rom = machine->region(cputag)->base(); decrypted = auto_alloc_array(machine, UINT8, 0x9000); for (A = 0x0000;A < 0x9000;A++) @@ -830,7 +830,7 @@ void jongkyo_decode(running_machine *machine, const char *cputag) rom[A] = (src & ~0xa8) | (convtable[2*row+1][col] ^ xorval); } - memory_configure_bank(machine, "bank1",0,8, memory_region(machine, cputag)+0x7000,0x0400); + memory_configure_bank(machine, "bank1",0,8, machine->region(cputag)->base()+0x7000,0x0400); memory_configure_bank_decrypted(machine, "bank1",0,8,decrypted+0x7000,0x0400); space->set_decrypted_region(0x0000, 0x6bff, decrypted); memory_set_bank(space->machine, "bank1", 0); diff --git a/src/mame/machine/segas32.c b/src/mame/machine/segas32.c index 0127c45f9d6..8cbe1dbbf47 100644 --- a/src/mame/machine/segas32.c +++ b/src/mame/machine/segas32.c @@ -36,7 +36,7 @@ const UINT8 ga2_v25_opcode_table[256] = { void decrypt_ga2_protrom(running_machine *machine) { int i; - UINT8 *rom = memory_region(machine, "mcu"); + UINT8 *rom = machine->region("mcu")->base(); UINT8* temp = auto_alloc_array(machine, UINT8, 0x100000); // make copy of ROM so original can be overwritten @@ -113,7 +113,7 @@ WRITE16_HANDLER(sonic_level_load_protection) } else { - const UINT8 *ROM = memory_region(space->machine, "maincpu"); + const UINT8 *ROM = space->machine->region("maincpu")->base(); level = *((ROM + LEVEL_ORDER_ARRAY) + (system32_workram[CLEARED_LEVELS / 2] * 2) - 1); level |= *((ROM + LEVEL_ORDER_ARRAY) + (system32_workram[CLEARED_LEVELS / 2] * 2) - 2) << 8; } @@ -163,7 +163,7 @@ WRITE16_HANDLER(brival_protection_w) }; char ret[32]; int curProtType; - UINT8 *ROM = memory_region(space->machine, "maincpu"); + UINT8 *ROM = space->machine->region("maincpu")->base(); switch (offset) { diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c index 99172aef4d9..863fb579387 100644 --- a/src/mame/machine/simpsons.c +++ b/src/mame/machine/simpsons.c @@ -122,11 +122,11 @@ MACHINE_RESET( simpsons ) state->video_bank = 0; /* init the default banks */ - memory_configure_bank(machine, "bank1", 0, 64, memory_region(machine, "maincpu") + 0x10000, 0x2000); + memory_configure_bank(machine, "bank1", 0, 64, machine->region("maincpu")->base() + 0x10000, 0x2000); memory_set_bank(machine, "bank1", 0); - memory_configure_bank(machine, "bank2", 0, 2, memory_region(machine, "audiocpu") + 0x10000, 0); - memory_configure_bank(machine, "bank2", 2, 6, memory_region(machine, "audiocpu") + 0x10000, 0x4000); + memory_configure_bank(machine, "bank2", 0, 2, machine->region("audiocpu")->base() + 0x10000, 0); + memory_configure_bank(machine, "bank2", 2, 6, machine->region("audiocpu")->base() + 0x10000, 0x4000); memory_set_bank(machine, "bank2", 0); simpsons_video_banking(machine, 0); diff --git a/src/mame/machine/slapfght.c b/src/mame/machine/slapfght.c index 67334c162f7..d86864cc6e2 100644 --- a/src/mame/machine/slapfght.c +++ b/src/mame/machine/slapfght.c @@ -87,14 +87,14 @@ WRITE8_HANDLER( slapfight_port_07_w ) WRITE8_HANDLER( slapfight_port_08_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); memory_set_bankptr(space->machine, "bank1",&RAM[0x10000]); } WRITE8_HANDLER( slapfight_port_09_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); memory_set_bankptr(space->machine, "bank1",&RAM[0x14000]); } diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index 4fbb5e30cfa..43e747e0ae6 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -1872,7 +1872,7 @@ DRIVER_INIT( snes ) UINT16 total_blocks, read_blocks; UINT8 *rom; - rom = memory_region(machine, "user3"); + rom = machine->region("user3")->base(); snes_ram = auto_alloc_array_clear(machine, UINT8, 0x1400000); /* all NSS games seem to use MODE 20 */ @@ -1881,7 +1881,7 @@ DRIVER_INIT( snes ) state->has_addon_chip = HAS_NONE; /* Find the number of blocks in this ROM */ - total_blocks = (memory_region_length(machine, "user3") / 0x8000); + total_blocks = (machine->region("user3")->bytes() / 0x8000); read_blocks = 0; /* Loading all the data blocks from cart, we only partially cover banks 0x00 to 0x7f. Therefore, we @@ -1938,7 +1938,7 @@ DRIVER_INIT( snes_hirom ) UINT16 total_blocks, read_blocks; UINT8 *rom; - rom = memory_region(machine, "user3"); + rom = machine->region("user3")->base(); snes_ram = auto_alloc_array(machine, UINT8, 0x1400000); memset(snes_ram, 0, 0x1400000); @@ -1947,7 +1947,7 @@ DRIVER_INIT( snes_hirom ) state->has_addon_chip = HAS_NONE; /* Find the number of blocks in this ROM */ - total_blocks = (memory_region_length(machine, "user3") / 0x10000); + total_blocks = (machine->region("user3")->bytes() / 0x10000); read_blocks = 0; /* See above for details about the way we fill banks 0x00 to 0x7f */ diff --git a/src/mame/machine/snes7110.c b/src/mame/machine/snes7110.c index 9d1b5a84c60..1f4284ab147 100644 --- a/src/mame/machine/snes7110.c +++ b/src/mame/machine/snes7110.c @@ -274,7 +274,7 @@ static void SPC7110Decomp_write(SPC7110Decomp *thisptr, UINT8 data) static UINT8 SPC7110Decomp_dataread(SPC7110Decomp *thisptr) { - UINT8 *ROM = memory_region(thisptr->machine, "cart"); + UINT8 *ROM = thisptr->machine->region("cart")->base(); UINT32 size = thisptr->rom_size - 0x100000; while(thisptr->decomp_offset >= size) { @@ -1069,7 +1069,7 @@ static void spc7110_update_time(running_machine *machine, UINT8 offset) static UINT8 spc7110_mmio_read(address_space *space, UINT32 addr) { running_machine *machine = space->machine; - UINT8 *ROM = memory_region(machine, "cart"); + UINT8 *ROM = machine->region("cart")->base(); addr &= 0xffff; @@ -1255,7 +1255,7 @@ static UINT8 spc7110_mmio_read(address_space *space, UINT32 addr) static void spc7110_mmio_write(running_machine *machine, UINT32 addr, UINT8 data) { - UINT8 *ROM = memory_region(machine, "cart"); + UINT8 *ROM = machine->region("cart")->base(); addr &= 0xffff; @@ -1641,7 +1641,7 @@ static void spc7110_mmio_write(running_machine *machine, UINT32 addr, UINT8 data static UINT8 spc7110_bank7_read(address_space *space, UINT32 offset) { - UINT8 *ROM = memory_region(space->machine, "cart"); + UINT8 *ROM = space->machine->region("cart")->base(); UINT32 addr = offset & 0x0fffff; switch (offset & 0xf00000) diff --git a/src/mame/machine/snesbsx.c b/src/mame/machine/snesbsx.c index d5280158360..27a5ecd472d 100644 --- a/src/mame/machine/snesbsx.c +++ b/src/mame/machine/snesbsx.c @@ -48,7 +48,7 @@ static struct _snes_bsx_state bsx_state; static void bsx_update_memory_map(void) { bsx_state.ram_source = BIT(bsx_state.cart_regs[0x01], 7) ? SNES_BSX_PRAM : SNES_BSX_FLASH; -// UINT8 *RAM = (bsx_state.cart_regs[0x01] & 0x80) == 0x00 ? memory_region(space->machine, "flash") : bsx_state.pram; +// UINT8 *RAM = (bsx_state.cart_regs[0x01] & 0x80) == 0x00 ? space->machine->region("flash")->base() : bsx_state.pram; logerror("BSX: updated memory map, current RAM: %d", bsx_state.ram_source); if (!BIT(bsx_state.cart_regs[0x02], 7)) @@ -149,7 +149,7 @@ static void bsx_init( running_machine *machine ) #ifdef UNUSED_FUNCTION static READ8_HANDLER( bsx_flash_read ) { - UINT8 *FLASH = memory_region(space->machine, "flash"); + UINT8 *FLASH = space->machine->region("flash")->base(); if (offset == 0x0002) { diff --git a/src/mame/machine/snesdsp1.c b/src/mame/machine/snesdsp1.c index 31c89917827..c1729f64d61 100644 --- a/src/mame/machine/snesdsp1.c +++ b/src/mame/machine/snesdsp1.c @@ -333,7 +333,7 @@ static void dsp1_set_dr( UINT8 iDr ) static void dsp1_init( running_machine *machine ) { UINT32 i; - UINT8 *dspin = memory_region(machine, "addons"); + UINT8 *dspin = machine->region("addons")->base(); dsp1_state.Sr = DRC|RQM; dsp1_state.SrLowByteAccess = FALSE; diff --git a/src/mame/machine/snesdsp3.c b/src/mame/machine/snesdsp3.c index 0c867891b4a..6b6dd2376b2 100644 --- a/src/mame/machine/snesdsp3.c +++ b/src/mame/machine/snesdsp3.c @@ -1099,7 +1099,7 @@ static void dsp3_register_save( running_machine *machine ) static void dsp3_init( running_machine *machine ) { UINT32 i; - UINT8 *dspin = memory_region(machine, "addons"); + UINT8 *dspin = machine->region("addons")->base(); dsp3_Reset(); diff --git a/src/mame/machine/snessdd1.c b/src/mame/machine/snessdd1.c index 7ef815fc2d3..f7e5bc8fbaa 100644 --- a/src/mame/machine/snessdd1.c +++ b/src/mame/machine/snessdd1.c @@ -650,7 +650,7 @@ static void sdd1_mmio_write(address_space *space, UINT32 addr, UINT8 data) static UINT8 sdd1_read(running_machine* machine, UINT32 addr) { - unsigned char *ROM = memory_region(machine, "cart"); + unsigned char *ROM = machine->region("cart")->base(); if(snes_sdd1.sdd1_enable & snes_sdd1.xfer_enable) { diff --git a/src/mame/machine/starwars.c b/src/mame/machine/starwars.c index 2359a013ffb..a8affb1766c 100644 --- a/src/mame/machine/starwars.c +++ b/src/mame/machine/starwars.c @@ -172,7 +172,7 @@ WRITE8_HANDLER( starwars_adc_select_w ) void starwars_mproc_init(running_machine *machine) { - UINT8 *src = memory_region(machine, "user2"); + UINT8 *src = machine->region("user2")->base(); int cnt, val; PROM_STR = auto_alloc_array(machine, UINT8, 1024); diff --git a/src/mame/machine/stfight.c b/src/mame/machine/stfight.c index ebe93b82ee6..36c96470114 100644 --- a/src/mame/machine/stfight.c +++ b/src/mame/machine/stfight.c @@ -50,7 +50,7 @@ static int stfight_coin_mech_query; DRIVER_INIT( empcity ) { address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); - UINT8 *rom = memory_region(machine, "maincpu"); + UINT8 *rom = machine->region("maincpu")->base(); int A; decrypt = auto_alloc_array(machine, UINT8, 0x8000); @@ -111,7 +111,7 @@ MACHINE_RESET( stfight ) // - in fact I don't even know how/where it's switched in! static WRITE8_HANDLER( stfight_bank_w ) { - UINT8 *ROM2 = memory_region(space->machine, "maincpu") + 0x10000; + UINT8 *ROM2 = space->machine->region("maincpu")->base() + 0x10000; memory_set_bankptr(space->machine, "bank1", &ROM2[data<<14] ); } @@ -199,7 +199,7 @@ static const int sampleLimits[] = void stfight_adpcm_int(device_t *device) { - UINT8 *SAMPLES = memory_region(device->machine, "adpcm"); + UINT8 *SAMPLES = device->machine->region("adpcm")->base(); int adpcm_data = SAMPLES[adpcm_data_offs & 0x7fff]; // finished playing sample? diff --git a/src/mame/machine/stvprot.c b/src/mame/machine/stvprot.c index 2c3e8dab4a2..e345cfc1d65 100644 --- a/src/mame/machine/stvprot.c +++ b/src/mame/machine/stvprot.c @@ -114,7 +114,7 @@ static UINT8 char_offset; //helper to jump the decoding of the NULL chars. static READ32_HANDLER( twcup98_prot_r ) { - UINT32 *ROM = (UINT32 *)memory_region(space->machine, "user1"); + UINT32 *ROM = (UINT32 *)space->machine->region("user1")->base(); if(a_bus[0] & 0x00010000)//protection calculation is activated { @@ -173,7 +173,7 @@ void install_twcup98_protection(running_machine *machine) static READ32_HANDLER( sss_prot_r ) { - UINT32 *ROM = (UINT32 *)memory_region(space->machine, "user1"); + UINT32 *ROM = (UINT32 *)space->machine->region("user1")->base(); if(a_bus[0] & 0x00010000)//protection calculation is activated { @@ -238,7 +238,7 @@ void install_sss_protection(running_machine *machine) static READ32_HANDLER( rsgun_prot_r ) { - UINT32 *ROM = (UINT32 *)memory_region(space->machine, "user1"); + UINT32 *ROM = (UINT32 *)space->machine->region("user1")->base(); if(a_bus[0] & 0x00010000)//protection calculation is activated { @@ -313,7 +313,7 @@ void install_rsgun_protection(running_machine *machine) static READ32_HANDLER( elandore_prot_r ) { - UINT32 *ROM = (UINT32 *)memory_region(space->machine, "user1"); + UINT32 *ROM = (UINT32 *)space->machine->region("user1")->base(); if(a_bus[0] & 0x00010000)//protection calculation is activated { @@ -420,7 +420,7 @@ static const UINT32 vector_prot[] = { 0x0603B1B2,0x234 }; static READ32_HANDLER( ffreveng_prot_r ) { - UINT32 *ROM = (UINT32 *)memory_region(space->machine, "user1"); + UINT32 *ROM = (UINT32 *)space->machine->region("user1")->base(); if(a_bus[0] & 0x00010000)//protection calculation is activated { @@ -485,11 +485,11 @@ static READ32_HANDLER(astrass_prot_r) if ( offset == 3 && ctrl_index != -1 ) { UINT32 data = 0; - UINT32 *prot_data = (UINT32 *)memory_region(space->machine, "user2"); + UINT32 *prot_data = (UINT32 *)space->machine->region("user2")->base(); data = prot_data[ctrl_index++]; - if ( ctrl_index >= memory_region_length(space->machine, "user2")/4 ) + if ( ctrl_index >= space->machine->region("user2")->bytes()/4 ) { ctrl_index = -1; } @@ -531,7 +531,7 @@ static UINT16 decathlt_prottable2[128]; static READ32_HANDLER( decathlt_prot_r ) { - UINT32 *ROM = (UINT32 *)memory_region(space->machine, "user1"); + UINT32 *ROM = (UINT32 *)space->machine->region("user1")->base(); if (offset==2) { diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c index 6bacc28ea1b..7528c1da0c8 100644 --- a/src/mame/machine/taitosj.c +++ b/src/mame/machine/taitosj.c @@ -26,8 +26,8 @@ static UINT32 address; MACHINE_START( taitosj ) { - memory_configure_bank(machine, "bank1", 0, 1, memory_region(machine, "maincpu") + 0x6000, 0); - memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "maincpu") + 0x10000, 0); + memory_configure_bank(machine, "bank1", 0, 1, machine->region("maincpu")->base() + 0x6000, 0); + memory_configure_bank(machine, "bank1", 1, 1, machine->region("maincpu")->base() + 0x10000, 0); state_save_register_global(machine, fromz80); state_save_register_global(machine, toz80); diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c index 3ab40a44417..55c07f69417 100644 --- a/src/mame/machine/tatsumi.c +++ b/src/mame/machine/tatsumi.c @@ -301,7 +301,7 @@ WRITE16_HANDLER(cyclwarr_control_w) READ16_HANDLER( tatsumi_v30_68000_r ) { - const UINT16* rom=(UINT16*)memory_region(space->machine, "sub"); + const UINT16* rom=(UINT16*)space->machine->region("sub")->base(); logerror("%05X:68000_r(%04X),cw=%04X\n", cpu_get_pc(space->cpu), offset*2, tatsumi_control_word); /* Read from 68k RAM */ @@ -310,7 +310,7 @@ logerror("%05X:68000_r(%04X),cw=%04X\n", cpu_get_pc(space->cpu), offset*2, tatsu // hack to make roundup 5 boot if (cpu_get_pc(space->cpu)==0xec575) { - UINT8 *dst = memory_region(space->machine, "maincpu"); + UINT8 *dst = space->machine->region("maincpu")->base(); dst[BYTE_XOR_LE(0xec57a)]=0x46; dst[BYTE_XOR_LE(0xec57b)]=0x46; diff --git a/src/mame/machine/theglobp.c b/src/mame/machine/theglobp.c index 9b9a1024e10..e8fc0bd1027 100644 --- a/src/mame/machine/theglobp.c +++ b/src/mame/machine/theglobp.c @@ -73,7 +73,7 @@ static void theglobp_decrypt_rom_8(running_machine *machine) int mem; UINT8 *RAM; - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (mem=0;mem<0x4000;mem++) @@ -110,7 +110,7 @@ static void theglobp_decrypt_rom_9(running_machine *machine) int mem; UINT8 *RAM; - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (mem=0;mem<0x4000;mem++) { @@ -145,7 +145,7 @@ static void theglobp_decrypt_rom_A(running_machine *machine) int mem; UINT8 *RAM; - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (mem=0;mem<0x4000;mem++) { @@ -180,7 +180,7 @@ static void theglobp_decrypt_rom_B(running_machine *machine) int mem; UINT8 *RAM; - RAM = memory_region(machine, "maincpu"); + RAM = machine->region("maincpu")->base(); for (mem=0;mem<0x4000;mem++) { @@ -240,7 +240,7 @@ READ8_HANDLER( theglobp_decrypt_rom ) MACHINE_START( theglobp ) { - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); /* While the PAL supports up to 16 decryption methods, only four are actually used in the PAL. Therefore, we'll take a little diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c index 200fc793030..2f0a6564da2 100644 --- a/src/mame/machine/tnzs.c +++ b/src/mame/machine/tnzs.c @@ -543,7 +543,7 @@ DRIVER_INIT( tnzsb ) DRIVER_INIT( kabukiz ) { tnzs_state *state = machine->driver_data(); - UINT8 *SOUND = memory_region(machine, "audiocpu"); + UINT8 *SOUND = machine->region("audiocpu")->base(); state->mcu_type = MCU_NONE_KABUKIZ; memory_configure_bank(machine, "bank3", 0, 8, &SOUND[0x10000], 0x4000); @@ -681,8 +681,8 @@ static STATE_POSTLOAD( tnzs_postload ) MACHINE_START( tnzs ) { tnzs_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); - UINT8 *SUB = memory_region(machine, "sub"); + UINT8 *ROM = machine->region("maincpu")->base(); + UINT8 *SUB = machine->region("sub")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); memory_configure_bank(machine, "bank2", 0, 4, &SUB[0x10000], 0x2000); @@ -719,8 +719,8 @@ MACHINE_START( tnzs ) MACHINE_START( jpopnics ) { tnzs_state *state = machine->driver_data(); - UINT8 *ROM = memory_region(machine, "maincpu"); - UINT8 *SUB = memory_region(machine, "sub"); + UINT8 *ROM = machine->region("maincpu")->base(); + UINT8 *SUB = machine->region("sub")->base(); memory_configure_bank(machine, "bank1", 0, 8, &ROM[0x10000], 0x4000); memory_configure_bank(machine, "bank2", 0, 4, &SUB[0x10000], 0x2000); diff --git a/src/mame/machine/tx1.c b/src/mame/machine/tx1.c index 02e24d8569c..16ce39ca0a9 100644 --- a/src/mame/machine/tx1.c +++ b/src/mame/machine/tx1.c @@ -453,7 +453,7 @@ static void tx1_update_state(running_machine *machine) #define LLOEN(a) !(a & 0x40) #define GO_EN(a) !(a & 0x4000) - const UINT16 *prom = (UINT16*)memory_region(machine, "au_data") + (0x8000 >> 1); + const UINT16 *prom = (UINT16*)machine->region("au_data")->base() + (0x8000 >> 1); for (;;) { @@ -511,7 +511,7 @@ static void tx1_update_state(running_machine *machine) data = math.muxlatch; else if (dsel == 1) { - UINT16 *romdata = (UINT16*)memory_region(machine, "au_data"); + UINT16 *romdata = (UINT16*)machine->region("au_data")->base(); UINT16 addr = get_tx1_datarom_addr(); data = romdata[addr]; } @@ -687,7 +687,7 @@ READ16_HANDLER( tx1_math_r ) TODO make this constant somewhere e.g. math.retval = math.romptr[ get_tx1_datarom_addr() ]; */ - UINT16 *romdata = (UINT16*)memory_region(space->machine, "au_data"); + UINT16 *romdata = (UINT16*)space->machine->region("au_data")->base(); UINT16 addr = get_tx1_datarom_addr(); math.retval = romdata[addr]; } @@ -833,7 +833,7 @@ WRITE16_HANDLER( tx1_math_w ) READ16_HANDLER( tx1_spcs_rom_r ) { - math.cpulatch = *(UINT16*)((UINT8*)memory_region(space->machine, "math_cpu") + 0xfc000 + 0x1000 + offset*2); + math.cpulatch = *(UINT16*)((UINT8*)space->machine->region("math_cpu")->base() + 0xfc000 + 0x1000 + offset*2); if (math.mux == TX1_SEL_ILDEN) { @@ -1010,7 +1010,7 @@ static void buggyboy_update_state(running_machine *machine) #define LLOEN(a) !(a & 0x40) #define GO_EN(a) !(a & 0x4000) - const UINT16 *prom = (UINT16*)memory_region(machine, "au_data") + (0x8000 >> 1); + const UINT16 *prom = (UINT16*)machine->region("au_data")->base() + (0x8000 >> 1); for (;;) { @@ -1043,7 +1043,7 @@ static void buggyboy_update_state(running_machine *machine) if (math.mux == BB_MUX_DPROE) { - UINT16 *romdata = (UINT16*)memory_region(machine, "au_data"); + UINT16 *romdata = (UINT16*)machine->region("au_data")->base(); UINT16 addr = get_bb_datarom_addr(); kick_sn74s516(machine, &romdata[addr], ins); } @@ -1158,7 +1158,7 @@ READ16_HANDLER( buggyboy_math_r ) /* /DPROE */ else if ((offset & 0xc00) == 0xc00) { - UINT16 *romdata = (UINT16*)memory_region(space->machine, "au_data"); + UINT16 *romdata = (UINT16*)space->machine->region("au_data")->base(); UINT16 addr = get_bb_datarom_addr(); math.retval = romdata[addr]; @@ -1289,7 +1289,7 @@ WRITE16_HANDLER( buggyboy_math_w ) */ READ16_HANDLER( buggyboy_spcs_rom_r ) { - math.cpulatch = *(UINT16*)((UINT8*)memory_region(space->machine, "math_cpu") + 0xfc000 + 0x1000 + offset*2); + math.cpulatch = *(UINT16*)((UINT8*)space->machine->region("math_cpu")->base() + 0xfc000 + 0x1000 + offset*2); if (math.mux == BB_MUX_ILDEN) { diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c index 2b99a36aef2..79183848557 100644 --- a/src/mame/machine/vsnes.c +++ b/src/mame/machine/vsnes.c @@ -214,8 +214,8 @@ MACHINE_START( vsnes ) memory_install_readwrite8_handler(ppu1_space, 0x2000, 0x3eff, 0, 0, vsnes_nt0_r, vsnes_nt0_w); - vrom[0] = memory_region(machine, "gfx1"); - vrom_size[0] = memory_region_length(machine, "gfx1"); + vrom[0] = machine->region("gfx1")->base(); + vrom_size[0] = machine->region("gfx1")->bytes(); vrom_banks = vrom_size[0] / 0x400; /* establish chr banks */ @@ -238,10 +238,10 @@ MACHINE_START( vsnes ) MACHINE_START( vsdual ) { - vrom[0] = memory_region(machine, "gfx1"); - vrom[1] = memory_region(machine, "gfx2"); - vrom_size[0] = memory_region_length(machine, "gfx1"); - vrom_size[1] = memory_region_length(machine, "gfx2"); + vrom[0] = machine->region("gfx1")->base(); + vrom[1] = machine->region("gfx2")->base(); + vrom_size[0] = machine->region("gfx1")->bytes(); + vrom_size[1] = machine->region("gfx2")->bytes(); /* establish nametable ram */ nt_ram[0] = auto_alloc_array(machine, UINT8, 0x1000); @@ -429,7 +429,7 @@ static WRITE8_HANDLER( vskonami_rom_banking ) case 2: /* code bank 1 */ case 4: /* code bank 2 */ { - UINT8 *prg = memory_region(space->machine, "maincpu"); + UINT8 *prg = space->machine->region("maincpu")->base(); memcpy(&prg[0x08000 + reg * 0x1000], &prg[bankoffset], 0x2000); } break; @@ -448,7 +448,7 @@ DRIVER_INIT( vskonami ) { /* We do manual banking, in case the code falls through */ /* Copy the initial banks */ - UINT8 *prg = memory_region(machine, "maincpu"); + UINT8 *prg = machine->region("maincpu")->base(); memcpy(&prg[0x08000], &prg[0x18000], 0x8000); /* banking is done with writes to the $8000-$ffff area */ @@ -464,7 +464,7 @@ static WRITE8_HANDLER( vsgshoe_gun_in0_w ) int addr; if((data & 0x04) != old_bank) { - UINT8 *prg = memory_region(space->machine, "maincpu"); + UINT8 *prg = space->machine->region("maincpu")->base(); old_bank = data & 0x04; addr = old_bank ? 0x12000: 0x10000; memcpy(&prg[0x08000], &prg[addr], 0x2000); @@ -476,7 +476,7 @@ static WRITE8_HANDLER( vsgshoe_gun_in0_w ) DRIVER_INIT( vsgshoe ) { /* set up the default bank */ - UINT8 *prg = memory_region(machine, "maincpu"); + UINT8 *prg = machine->region("maincpu")->base(); memcpy (&prg[0x08000], &prg[0x12000], 0x2000); /* vrom switching is enabled with bit 2 of $4016 */ @@ -574,7 +574,7 @@ static WRITE8_HANDLER( drmario_rom_banking ) case 3: /* program banking */ { int bank = (drmario_shiftreg & 0x03) * 0x4000; - UINT8 *prg = memory_region(space->machine, "maincpu"); + UINT8 *prg = space->machine->region("maincpu")->base(); if (!size16k) { @@ -607,7 +607,7 @@ DRIVER_INIT( drmario ) { /* We do manual banking, in case the code falls through */ /* Copy the initial banks */ - UINT8 *prg = memory_region(machine, "maincpu"); + UINT8 *prg = machine->region("maincpu")->base(); memcpy(&prg[0x08000], &prg[0x10000], 0x4000); memcpy(&prg[0x0c000], &prg[0x1c000], 0x4000); @@ -624,7 +624,7 @@ DRIVER_INIT( drmario ) static WRITE8_HANDLER( vsvram_rom_banking ) { int rombank = 0x10000 + (data & 7) * 0x4000; - UINT8 *prg = memory_region(space->machine, "maincpu"); + UINT8 *prg = space->machine->region("maincpu")->base(); memcpy(&prg[0x08000], &prg[rombank], 0x4000); } @@ -632,7 +632,7 @@ static WRITE8_HANDLER( vsvram_rom_banking ) DRIVER_INIT( vsvram ) { /* when starting the game, the 1st 16k and the last 16k are loaded into the 2 banks */ - UINT8 *prg = memory_region(machine, "maincpu"); + UINT8 *prg = machine->region("maincpu")->base(); memcpy(&prg[0x08000], &prg[0x28000], 0x8000); /* banking is done with writes to the $8000-$ffff area */ @@ -652,7 +652,7 @@ static int IRQ_enable, IRQ_count, IRQ_count_latch; static void mapper4_set_prg( running_machine *machine ) { - UINT8 *prg = memory_region(machine, "maincpu"); + UINT8 *prg = machine->region("maincpu")->base(); UINT8 prg_flip = (MMC3_cmd & 0x40) ? 2 : 0; memcpy(&prg[0x8000], &prg[0x2000 * (MMC3_prg_bank[0 ^ prg_flip] & MMC3_prg_mask) + 0x10000], 0x2000); @@ -784,9 +784,9 @@ static WRITE8_HANDLER( mapper4_w ) DRIVER_INIT( MMC3 ) { - UINT8 *prg = memory_region(machine, "maincpu"); + UINT8 *prg = machine->region("maincpu")->base(); IRQ_enable = IRQ_count = IRQ_count_latch = 0; - int MMC3_prg_chunks = (memory_region_length(machine, "maincpu") - 0x10000) / 0x4000; + int MMC3_prg_chunks = (machine->region("maincpu")->bytes() - 0x10000) / 0x4000; MMC3_prg_bank[0] = MMC3_prg_bank[2] = 0xfe; MMC3_prg_bank[1] = MMC3_prg_bank[3] = 0xff; @@ -962,7 +962,7 @@ static WRITE8_HANDLER( mapper68_rom_banking ) case 0x7000: { - UINT8 *prg = memory_region(space->machine, "maincpu"); + UINT8 *prg = space->machine->region("maincpu")->base(); memcpy(&prg[0x08000], &prg[0x10000 + data * 0x4000], 0x4000); } break; @@ -977,7 +977,7 @@ DRIVER_INIT( platoon ) /* when starting a mapper 68 game the first 16K ROM bank in the cart is loaded into $8000 the LAST 16K ROM bank is loaded into $C000. The last 16K of ROM cannot be swapped. */ - UINT8 *prg = memory_region(machine, "maincpu"); + UINT8 *prg = machine->region("maincpu")->base(); memcpy(&prg[0x08000], &prg[0x10000], 0x4000); memcpy(&prg[0x0c000], &prg[0x2c000], 0x4000); @@ -1036,7 +1036,7 @@ static WRITE8_HANDLER( vsdual_vrom_banking ) DRIVER_INIT( vsdual ) { - UINT8 *prg = memory_region(machine, "maincpu"); + UINT8 *prg = machine->region("maincpu")->base(); /* vrom switching is enabled with bit 2 of $4016 */ memory_install_write8_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x4016, 0x4016, 0, 0, vsdual_vrom_banking); diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c index bc873bcafad..9eb8d67f9f0 100644 --- a/src/mame/machine/williams.c +++ b/src/mame/machine/williams.c @@ -354,7 +354,7 @@ static MACHINE_START( williams_common ) { /* configure the memory bank */ memory_configure_bank(machine, "bank1", 0, 1, williams_videoram, 0); - memory_configure_bank(machine, "bank1", 1, 1, memory_region(machine, "maincpu") + 0x10000, 0); + memory_configure_bank(machine, "bank1", 1, 1, machine->region("maincpu")->base() + 0x10000, 0); state_save_register_global(machine, vram_bank); } @@ -450,7 +450,7 @@ MACHINE_START( williams2 ) { /* configure memory banks */ memory_configure_bank(machine, "bank1", 0, 1, williams_videoram, 0); - memory_configure_bank(machine, "bank1", 1, 4, memory_region(machine, "maincpu") + 0x10000, 0x10000); + memory_configure_bank(machine, "bank1", 1, 4, machine->region("maincpu")->base() + 0x10000, 0x10000); /* register for save states */ state_save_register_global(machine, vram_bank); @@ -737,7 +737,7 @@ MACHINE_START( defender ) MACHINE_START_CALL(williams_common); /* configure the banking and make sure it is reset to 0 */ - memory_configure_bank(machine, "bank1", 0, 9, &memory_region(machine, "maincpu")[0x10000], 0x1000); + memory_configure_bank(machine, "bank1", 0, 9, &machine->region("maincpu")->base()[0x10000], 0x1000); state_save_register_postload(machine, defender_postload, NULL); } @@ -842,10 +842,10 @@ MACHINE_START( blaster ) /* banking is different for blaster */ memory_configure_bank(machine, "bank1", 0, 1, williams_videoram, 0); - memory_configure_bank(machine, "bank1", 1, 16, memory_region(machine, "maincpu") + 0x18000, 0x4000); + memory_configure_bank(machine, "bank1", 1, 16, machine->region("maincpu")->base() + 0x18000, 0x4000); memory_configure_bank(machine, "bank2", 0, 1, williams_videoram + 0x4000, 0); - memory_configure_bank(machine, "bank2", 1, 16, memory_region(machine, "maincpu") + 0x10000, 0x0000); + memory_configure_bank(machine, "bank2", 1, 16, machine->region("maincpu")->base() + 0x10000, 0x0000); state_save_register_global(machine, blaster_bank); } diff --git a/src/mame/machine/wrally.c b/src/mame/machine/wrally.c index 87bd6635bf7..c3734562db8 100644 --- a/src/mame/machine/wrally.c +++ b/src/mame/machine/wrally.c @@ -33,7 +33,7 @@ WRITE16_HANDLER( wrally_flipscreen_w ) WRITE16_HANDLER( OKIM6295_bankswitch_w ) { - UINT8 *RAM = memory_region(space->machine, "oki"); + UINT8 *RAM = space->machine->region("oki")->base(); if (ACCESSING_BITS_0_7){ memcpy(&RAM[0x30000], &RAM[0x40000 + (data & 0x0f)*0x10000], 0x10000); diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c index 21f4ace21c4..6fdb1c04281 100644 --- a/src/mame/video/1943.c +++ b/src/mame/video/1943.c @@ -175,7 +175,7 @@ WRITE8_HANDLER( c1943_d806_w ) static TILE_GET_INFO( c1943_get_bg2_tile_info ) { - UINT8 *tilerom = memory_region(machine, "gfx5") + 0x8000; + UINT8 *tilerom = machine->region("gfx5")->base() + 0x8000; int offs = tile_index * 2; int attr = tilerom[offs + 1]; @@ -188,7 +188,7 @@ static TILE_GET_INFO( c1943_get_bg2_tile_info ) static TILE_GET_INFO( c1943_get_bg_tile_info ) { - UINT8 *tilerom = memory_region(machine, "gfx5"); + UINT8 *tilerom = machine->region("gfx5")->base(); int offs = tile_index * 2; int attr = tilerom[offs + 1]; diff --git a/src/mame/video/20pacgal.c b/src/mame/video/20pacgal.c index 3d02171d0c8..e0fe40a28a5 100644 --- a/src/mame/video/20pacgal.c +++ b/src/mame/video/20pacgal.c @@ -25,7 +25,7 @@ static void get_pens(running_machine *machine, const _20pacgal_state *state, pen_t *pens) { offs_t offs; - UINT8 *color_prom = memory_region(machine, "proms") + (NUM_PENS * state->game_selected); + UINT8 *color_prom = machine->region("proms")->base() + (NUM_PENS * state->game_selected); for (offs = 0; offs < NUM_PENS ;offs++) { diff --git a/src/mame/video/8080bw.c b/src/mame/video/8080bw.c index 0ab1e348491..e6618d38d91 100644 --- a/src/mame/video/8080bw.c +++ b/src/mame/video/8080bw.c @@ -122,7 +122,7 @@ VIDEO_UPDATE( invadpt2 ) invadpt2_get_pens(pens); - prom = memory_region(screen->machine, "proms"); + prom = screen->machine->region("proms")->base(); color_map_base = state->color_map ? &prom[0x0400] : &prom[0x0000]; for (offs = 0; offs < state->main_ram_size; offs++) @@ -154,7 +154,7 @@ VIDEO_UPDATE( ballbomb ) invadpt2_get_pens(pens); - prom = memory_region(screen->machine, "proms"); + prom = screen->machine->region("proms")->base(); color_map_base = state->color_map ? &prom[0x0400] : &prom[0x0000]; for (offs = 0; offs < state->main_ram_size; offs++) @@ -186,7 +186,7 @@ VIDEO_UPDATE( schaser ) invadpt2_get_pens(pens); - background_map_base = memory_region(screen->machine, "proms"); + background_map_base = screen->machine->region("proms")->base(); for (offs = 0; offs < state->main_ram_size; offs++) { @@ -279,8 +279,8 @@ VIDEO_UPDATE( polaris ) invadpt2_get_pens(pens); - color_map_base = memory_region(screen->machine, "proms"); - cloud_gfx = memory_region(screen->machine, "user1"); + color_map_base = screen->machine->region("proms")->base(); + cloud_gfx = screen->machine->region("user1")->base(); for (offs = 0; offs < state->main_ram_size; offs++) { @@ -403,7 +403,7 @@ VIDEO_UPDATE( indianbt ) cosmo_get_pens(pens); - prom = memory_region(screen->machine, "proms"); + prom = screen->machine->region("proms")->base(); color_map_base = state->color_map ? &prom[0x0400] : &prom[0x0000]; for (offs = 0; offs < state->main_ram_size; offs++) diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c index cb65c498e9f..210db8cdb78 100644 --- a/src/mame/video/aerofgt.c +++ b/src/mame/video/aerofgt.c @@ -139,7 +139,7 @@ VIDEO_START( spinlbrk ) /* sprite maps are hardcoded in this game */ /* enemy sprites use ROM instead of RAM */ - state->spriteram2 = (UINT16 *)memory_region(machine, "gfx5"); + state->spriteram2 = (UINT16 *)machine->region("gfx5")->base(); state->spriteram2_size = 0x20000; /* front sprites are direct maps */ @@ -698,7 +698,7 @@ static void spikes91_draw_sprites( running_machine *machine, bitmap_t *bitmap, c aerofgt_state *state = machine->driver_data(); int i; UINT8 *lookup; - lookup = memory_region(machine, "user1"); + lookup = machine->region("user1")->base(); state->spritepalettebank = 1; for (i = state->spriteram3_size / 2 - 4; i >= 4; i -= 4) diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index 68fc3312fe1..37b2fb4e487 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -345,7 +345,7 @@ static void draw_sprites_I( running_machine *machine, bitmap_t *bitmap, const re alpha68k_state *state = machine->driver_data(); UINT16 *spriteram = state->spriteram; int data, offs, mx, my, tile, color, fy, i; - UINT8 *color_prom = memory_region(machine, "user1"); + UINT8 *color_prom = machine->region("user1")->base(); gfx_element *gfx = machine->gfx[0]; for (offs = 0; offs < 0x400; offs += 0x20) @@ -454,7 +454,7 @@ static void kyros_draw_sprites( running_machine *machine, bitmap_t *bitmap, cons UINT16 *spriteram = state->spriteram; int offs, mx, my, color, tile, i, bank, fy, fx; int data; - UINT8 *color_prom = memory_region(machine, "user1"); + UINT8 *color_prom = machine->region("user1")->base(); //AT for (offs = 0; offs < 0x400; offs += 0x20) diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index 4a6ce61381e..8afbbb34b38 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -199,7 +199,7 @@ WRITE8_HANDLER( appoooh_out_w ) /* bit 6 ROM bank select */ { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); memory_set_bankptr(space->machine, "bank1",&RAM[data&0x40 ? 0x10000 : 0x0a000]); } diff --git a/src/mame/video/arabian.c b/src/mame/video/arabian.c index 2eb8d089a3e..567af4fe3e9 100644 --- a/src/mame/video/arabian.c +++ b/src/mame/video/arabian.c @@ -154,7 +154,7 @@ PALETTE_INIT( arabian ) VIDEO_START( arabian ) { arabian_state *state = machine->driver_data(); - UINT8 *gfxbase = memory_region(machine, "gfx1"); + UINT8 *gfxbase = machine->region("gfx1")->base(); int offs; /* allocate a common bitmap to use for both planes */ diff --git a/src/mame/video/archimds.c b/src/mame/video/archimds.c index ab430743ca5..08129d07020 100644 --- a/src/mame/video/archimds.c +++ b/src/mame/video/archimds.c @@ -43,7 +43,7 @@ VIDEO_UPDATE( archimds_vidc ) int count; int x,y,xi; UINT8 pen; - static UINT8 *vram = memory_region(screen->machine,"vram"); + static UINT8 *vram = screen->machine->region("vram")->base(); count = (0); diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c index ab92bd0d679..a692c3e6f37 100644 --- a/src/mame/video/argus.c +++ b/src/mame/video/argus.c @@ -398,8 +398,8 @@ static void argus_write_dummy_rams(running_machine *machine, int dramoffs, int v int voffs; int offs; - UINT8 *VROM1 = memory_region(machine, "user1"); /* "ag_15.bin" */ - UINT8 *VROM2 = memory_region(machine, "user2"); /* "ag_16.bin" */ + UINT8 *VROM1 = machine->region("user1")->base(); /* "ag_15.bin" */ + UINT8 *VROM2 = machine->region("user2")->base(); /* "ag_16.bin" */ /* offset in pattern data */ offs = VROM1[vromoffs] | (VROM1[vromoffs + 1] << 8); diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c index e2e1b28e534..5e998f11463 100644 --- a/src/mame/video/armedf.c +++ b/src/mame/video/armedf.c @@ -307,7 +307,7 @@ static void copy_textmap(running_machine *machine, int index) */ armedf_state *state = machine->driver_data(); - UINT8 * data = (UINT8 *)memory_region(machine, "gfx5"); + UINT8 * data = (UINT8 *)machine->region("gfx5")->base(); for(int i=0;i<0x400;++i) { diff --git a/src/mame/video/artmagic.c b/src/mame/video/artmagic.c index 2ffd4c0e0e9..7c5e40b3a8a 100644 --- a/src/mame/video/artmagic.c +++ b/src/mame/video/artmagic.c @@ -58,8 +58,8 @@ INLINE UINT16 *address_to_vram(offs_t *address) VIDEO_START( artmagic ) { - blitter_base = (UINT16 *)memory_region(machine, "gfx1"); - blitter_mask = memory_region_length(machine, "gfx1")/2 - 1; + blitter_base = (UINT16 *)machine->region("gfx1")->base(); + blitter_mask = machine->region("gfx1")->bytes()/2 - 1; state_save_register_global_array(machine, artmagic_xor); state_save_register_global(machine, artmagic_is_stoneball); diff --git a/src/mame/video/atarirle.c b/src/mame/video/atarirle.c index 9b96a65cb1e..c909c338a57 100644 --- a/src/mame/video/atarirle.c +++ b/src/mame/video/atarirle.c @@ -270,7 +270,7 @@ INLINE int convert_mask(const atarirle_entry *input, atarirle_mask *result) void atarirle_init(running_machine *machine, int map, const atarirle_desc *desc) { - const UINT16 *base = (const UINT16 *)memory_region(machine, desc->region); + const UINT16 *base = (const UINT16 *)machine->region(desc->region)->base(); atarirle_data *mo = &atarirle[map]; int i, width, height; @@ -304,7 +304,7 @@ void atarirle_init(running_machine *machine, int map, const atarirle_desc *desc) mo->maxcolors = desc->maxcolors / 16; mo->rombase = base; - mo->romlength = memory_region_length(machine, desc->region); + mo->romlength = machine->region(desc->region)->bytes(); mo->objectcount = count_objects(base, mo->romlength); mo->cliprect = machine->primary_screen->visible_area(); diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c index aaf0aab77b4..633721fc7cc 100644 --- a/src/mame/video/atarisy1.c +++ b/src/mame/video/atarisy1.c @@ -646,7 +646,7 @@ static int get_bank(running_machine *machine, UINT8 prom1, UINT8 prom2, int bpp) return state->bank_gfx[bpp - 4][bank_index]; /* if the bank is out of range, call it 0 */ - const region_info *tiles = machine->region("tiles"); + const memory_region *tiles = machine->region("tiles"); if (0x80000 * (bank_index - 1) >= tiles->bytes()) return 0; diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c index 8f2051157ca..3e35baab333 100644 --- a/src/mame/video/avgdvg.c +++ b/src/mame/video/avgdvg.c @@ -482,7 +482,7 @@ static void mhavoc_data(vgdata *vg) if (vg->pc & 0x2000) { - bank = &memory_region(vg->machine, "alpha")[0x18000]; + bank = &vg->machine->region("alpha")->base()[0x18000]; vg->data = bank[(vg->map << 13) | ((vg->pc ^ 1) & 0x1fff)]; } else @@ -1204,7 +1204,7 @@ static TIMER_CALLBACK( vg_set_halt_callback ) static TIMER_CALLBACK( run_state_machine ) { int cycles = 0; - UINT8 *state_prom = memory_region(machine, "user1"); + UINT8 *state_prom = machine->region("user1")->base(); while (cycles < VGSLICE) { diff --git a/src/mame/video/balsente.c b/src/mame/video/balsente.c index 053ed72ac6a..3c4f39ae4c7 100644 --- a/src/mame/video/balsente.c +++ b/src/mame/video/balsente.c @@ -22,12 +22,12 @@ VIDEO_START( balsente ) /* reset the system */ state->palettebank_vis = 0; - state->sprite_bank[0] = memory_region(machine, "gfx1"); - state->sprite_bank[1] = memory_region(machine, "gfx1") + 0x10000; + state->sprite_bank[0] = machine->region("gfx1")->base(); + state->sprite_bank[1] = machine->region("gfx1")->base() + 0x10000; /* determine sprite size */ - state->sprite_data = memory_region(machine, "gfx1"); - state->sprite_mask = memory_region_length(machine, "gfx1") - 1; + state->sprite_data = machine->region("gfx1")->base(); + state->sprite_mask = machine->region("gfx1")->bytes() - 1; /* register for saving */ state_save_register_global_array(machine, state->expanded_videoram); diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c index de812a490c8..6a9ba550d7f 100644 --- a/src/mame/video/bbusters.c +++ b/src/mame/video/bbusters.c @@ -206,7 +206,7 @@ static void bbusters_draw_block(running_machine *machine, bitmap_t *dest,int x,i static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const UINT16 *source, int bank, int colval, int colmask) { bbusters_state *state = machine->driver_data(); - const UINT8 *scale_table=memory_region(machine, "user1"); + const UINT8 *scale_table=machine->region("user1")->base(); int offs; for (offs = 0;offs <0x800 ;offs += 4) { diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c index dd99a583e12..4c8f49e0293 100644 --- a/src/mame/video/bfm_adr2.c +++ b/src/mame/video/bfm_adr2.c @@ -186,7 +186,7 @@ VIDEO_RESET( adder2 ) adder2_data_to_sc2 = 0; { - UINT8 *rom = memory_region(machine, "adder2"); + UINT8 *rom = machine->region("adder2")->base(); memory_configure_bank(machine, "bank2", 0, 4, &rom[0x00000], 0x08000); @@ -426,7 +426,7 @@ void adder2_decode_char_roms(running_machine *machine) { UINT8 *p; - p = memory_region(machine, "gfx1"); + p = machine->region("gfx1")->base(); if ( p ) { diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c index e14f8e14f9b..99d0746b5ad 100644 --- a/src/mame/video/bking.c +++ b/src/mame/video/bking.c @@ -326,7 +326,7 @@ VIDEO_EOF( bking ) if (latch != 0) { - const UINT8* MASK = memory_region(machine, "user1") + 8 * state->hit; + const UINT8* MASK = machine->region("user1")->base() + 8 * state->hit; int x; int y; diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c index 2ea79aaf6c5..46fda310bac 100644 --- a/src/mame/video/bombjack.c +++ b/src/mame/video/bombjack.c @@ -46,7 +46,7 @@ WRITE8_HANDLER( bombjack_flipscreen_w ) static TILE_GET_INFO( get_bg_tile_info ) { bombjack_state *state = machine->driver_data(); - UINT8 *tilerom = memory_region(machine, "gfx4"); + UINT8 *tilerom = machine->region("gfx4")->base(); int offs = (state->background_image & 0x07) * 0x200 + tile_index; int code = (state->background_image & 0x10) ? tilerom[offs] : 0; diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c index a3aab75c4f0..26988640f69 100644 --- a/src/mame/video/btime.c +++ b/src/mame/video/btime.c @@ -386,7 +386,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r { btime_state *state = machine->driver_data(); int i; - const UINT8 *gfx = memory_region(machine, "bg_map"); + const UINT8 *gfx = machine->region("bg_map")->base(); int scroll = -(state->bnj_scroll2 | ((state->bnj_scroll1 & 0x03) << 8)); // One extra iteration for wrap around diff --git a/src/mame/video/bublbobl.c b/src/mame/video/bublbobl.c index 3acc1097929..bb0d84dda99 100644 --- a/src/mame/video/bublbobl.c +++ b/src/mame/video/bublbobl.c @@ -32,7 +32,7 @@ VIDEO_UPDATE( bublbobl ) sx = 0; - prom = memory_region(screen->machine, "proms"); + prom = screen->machine->region("proms")->base(); for (offs = 0; offs < state->objectram_size; offs += 4) { /* skip empty sprites */ diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c index 12f3b5c6bfc..501fc3c2be4 100644 --- a/src/mame/video/buggychl.c +++ b/src/mame/video/buggychl.c @@ -172,7 +172,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect g_profiler.start(PROFILER_USER1); - gfx = memory_region(machine, "gfx2"); + gfx = machine->region("gfx2")->base(); for (offs = 0; offs < state->spriteram_size; offs += 4) { int sx, sy, flipy, zoom, ch, x, px, y; diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index 0dc9764a9f4..0ba858a954d 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -129,7 +129,7 @@ WRITE8_HANDLER( bwing_scrollreg_w ) } #if BW_DEBUG - (memory_region(space->machine, REGION_CPU1))[0x1b10 + offset] = data; + (space->machine->region(REGION_CPU1)->base())[0x1b10 + offset] = data; #endif } @@ -219,7 +219,7 @@ VIDEO_START( bwing ) fill_srxlat(state->srxlat); - state->fgdata = memory_region(machine, "gpu"); + state->fgdata = machine->region("gpu")->base(); state->bgdata = state->fgdata + 0x1000; for (i = 0; i < 4; i++) diff --git a/src/mame/video/capbowl.c b/src/mame/video/capbowl.c index 18d35352b3d..e40901d424c 100644 --- a/src/mame/video/capbowl.c +++ b/src/mame/video/capbowl.c @@ -119,7 +119,7 @@ WRITE8_HANDLER( bowlrama_blitter_w ) READ8_HANDLER( bowlrama_blitter_r ) { capbowl_state *state = space->machine->driver_data(); - UINT8 data = memory_region(space->machine, "gfx1")[state->blitter_addr]; + UINT8 data = space->machine->region("gfx1")->base()[state->blitter_addr]; UINT8 result = 0; switch (offset) diff --git a/src/mame/video/carpolo.c b/src/mame/video/carpolo.c index 7c5732d7e7b..805a934e459 100644 --- a/src/mame/video/carpolo.c +++ b/src/mame/video/carpolo.c @@ -197,7 +197,7 @@ static void draw_alpha_line(running_machine *machine, bitmap_t *bitmap, const re static void remap_sprite_code(running_machine *machine, int bank, int code, int *remapped_code, int *flipy) { - UINT8* PROM = memory_region(machine, "user1"); + UINT8* PROM = machine->region("user1")->base(); code = (bank << 4) | code; *remapped_code = PROM[code] & 0x0f; diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c index 32dbf56c301..80b5617463c 100644 --- a/src/mame/video/cave.c +++ b/src/mame/video/cave.c @@ -543,8 +543,8 @@ static void get_sprite_info_cave( running_machine *machine ) { cave_state *state = machine->driver_data(); pen_t base_pal = 0; - const UINT8 *base_gfx = memory_region(machine, "sprites"); - int code_max = memory_region_length(machine, "sprites") / (16*16); + const UINT8 *base_gfx = machine->region("sprites")->base(); + int code_max = machine->region("sprites")->bytes() / (16*16); UINT16 *source; UINT16 *finish; @@ -672,8 +672,8 @@ static void get_sprite_info_donpachi( running_machine *machine ) { cave_state *state = machine->driver_data(); pen_t base_pal = 0; - const UINT8 *base_gfx = memory_region(machine, "sprites"); - int code_max = memory_region_length(machine, "sprites") / (16*16); + const UINT8 *base_gfx = machine->region("sprites")->base(); + int code_max = machine->region("sprites")->bytes() / (16*16); UINT16 *source; UINT16 *finish; diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c index 14d7d60f487..308fa1ba8ed 100644 --- a/src/mame/video/ccastles.c +++ b/src/mame/video/ccastles.c @@ -21,9 +21,9 @@ VIDEO_START( ccastles ) static const int resistances[3] = { 22000, 10000, 4700 }; /* get pointers to our PROMs */ - state->syncprom = memory_region(machine, "proms") + 0x000; - state->wpprom = memory_region(machine, "proms") + 0x200; - state->priprom = memory_region(machine, "proms") + 0x300; + state->syncprom = machine->region("proms")->base() + 0x000; + state->wpprom = machine->region("proms")->base() + 0x200; + state->priprom = machine->region("proms")->base() + 0x300; /* compute the color output resistor weights at startup */ compute_resistor_weights(0, 255, -1.0, diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c index c6d8907a86d..7c44b9bb9b4 100644 --- a/src/mame/video/cclimber.c +++ b/src/mame/video/cclimber.c @@ -690,7 +690,7 @@ VIDEO_UPDATE( cclimber ) VIDEO_UPDATE( yamato ) { int i; - UINT8 *sky_rom = memory_region(screen->machine, "user1") + 0x1200; + UINT8 *sky_rom = screen->machine->region("user1")->base() + 0x1200; for (i = 0; i < 0x100; i++) { diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c index aefc8ee4ffc..8fdeecd2620 100644 --- a/src/mame/video/centiped.c +++ b/src/mame/video/centiped.c @@ -406,7 +406,7 @@ WRITE8_HANDLER( mazeinv_paletteram_w ) space->machine->generic.paletteram.u8[offset] = data; /* the value passed in is a look-up index into the color PROM */ - melliped_mazeinv_set_color(space->machine, offset, ~memory_region(space->machine, "proms")[~data & 0x0f]); + melliped_mazeinv_set_color(space->machine, offset, ~space->machine->region("proms")->base()[~data & 0x0f]); } diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c index b7185ca012d..f94f9cbc13c 100644 --- a/src/mame/video/chaknpop.c +++ b/src/mame/video/chaknpop.c @@ -163,7 +163,7 @@ static STATE_POSTLOAD( chaknpop_postload ) VIDEO_START( chaknpop ) { chaknpop_state *state = machine->driver_data(); - UINT8 *RAM = memory_region(machine, "maincpu"); + UINT8 *RAM = machine->region("maincpu")->base(); /* info offset type w h col row */ state->tx_tilemap = tilemap_create(machine, chaknpop_get_tx_tile_info, tilemap_scan_rows, 8, 8, 32, 32); diff --git a/src/mame/video/changela.c b/src/mame/video/changela.c index 494067c2d09..cdfe15d4f18 100644 --- a/src/mame/video/changela.c +++ b/src/mame/video/changela.c @@ -47,7 +47,7 @@ static void draw_obj0( running_machine *machine, bitmap_t *bitmap, int sy ) changela_state *state = machine->driver_data(); int sx, i; - UINT8* ROM = memory_region(machine, "user1"); + UINT8* ROM = machine->region("user1")->base(); UINT8* RAM = state->spriteram; for (sx = 0; sx < 256; sx++) @@ -110,7 +110,7 @@ static void draw_obj1( running_machine *machine, bitmap_t *bitmap ) changela_state *state = machine->driver_data(); int sx, sy; - UINT8* ROM = memory_region(machine, "gfx2"); + UINT8* ROM = machine->region("gfx2")->base(); UINT8* RAM = state->videoram; UINT8 reg[4] = { 0 }; /* 4x4-bit registers (U58, U59) */ @@ -175,11 +175,11 @@ static void draw_river( running_machine *machine, bitmap_t *bitmap, int sy ) changela_state *state = machine->driver_data(); int sx, i, j; - UINT8* ROM = memory_region(machine, "user2"); + UINT8* ROM = machine->region("user2")->base(); UINT8* RAM = state->memory_devices + 0x800; - UINT8* TILE_ROM = memory_region(machine, "gfx1"); + UINT8* TILE_ROM = machine->region("gfx1")->base(); UINT8* TILE_RAM = state->memory_devices + 0x1000; - UINT8* PROM = memory_region(machine, "proms"); + UINT8* PROM = machine->region("proms")->base(); int preload = ((sy < 32) ? 1 : 0); @@ -355,14 +355,14 @@ static void draw_tree( running_machine *machine, bitmap_t *bitmap, int sy, int t int sx, i, j; /* State machine */ - UINT8* ROM = memory_region(machine, "user2"); + UINT8* ROM = machine->region("user2")->base(); UINT8* RAM = state->memory_devices + 0x840 + 0x40 * tree_num; - UINT8* PROM = memory_region(machine, "proms"); + UINT8* PROM = machine->region("proms")->base(); /* Tree Data */ UINT8* RAM2 = state->tree_ram + 0x20 * tree_num; - UINT8* TILE_ROM = (tree_num ? (memory_region(machine, "user3") + 0x1000) : (memory_region(machine, "gfx1") + 0x2000)); - UINT8* TILE_RAM = (tree_num ? (memory_region(machine, "user3")) : (state->memory_devices + 0x1800)); + UINT8* TILE_ROM = (tree_num ? (machine->region("user3")->base() + 0x1000) : (machine->region("gfx1")->base() + 0x2000)); + UINT8* TILE_RAM = (tree_num ? (machine->region("user3")->base()) : (state->memory_devices + 0x1800)); int preload = ((sy < 32) ? 1 : 0); diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c index 9be73671b0b..fded5668401 100644 --- a/src/mame/video/citycon.c +++ b/src/mame/video/citycon.c @@ -35,7 +35,7 @@ static TILE_GET_INFO( get_fg_tile_info ) static TILE_GET_INFO( get_bg_tile_info ) { citycon_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "gfx4"); + UINT8 *rom = machine->region("gfx4")->base(); int code = rom[0x1000 * state->bg_image + tile_index]; SET_TILE_INFO( 3 + state->bg_image, diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c index f49a4fd7f00..23cccdb9f5e 100644 --- a/src/mame/video/cloud9.c +++ b/src/mame/video/cloud9.c @@ -25,9 +25,9 @@ VIDEO_START( cloud9 ) memory_set_bankptr(machine, "bank1", state->videoram); /* get pointers to our PROMs */ - state->syncprom = memory_region(machine, "proms") + 0x000; - state->wpprom = memory_region(machine, "proms") + 0x200; - state->priprom = memory_region(machine, "proms") + 0x300; + state->syncprom = machine->region("proms")->base() + 0x000; + state->wpprom = machine->region("proms")->base() + 0x200; + state->priprom = machine->region("proms")->base() + 0x300; /* compute the color output resistor weights at startup */ compute_resistor_weights(0, 255, -1.0, diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c index 342abe9eeba..bc74c1edbf1 100644 --- a/src/mame/video/cosmic.c +++ b/src/mame/video/cosmic.c @@ -21,7 +21,7 @@ static pen_t panic_map_color( running_machine *machine, UINT8 x, UINT8 y ) { cosmic_state *state = machine->driver_data(); offs_t offs = (state->color_registers[0] << 9) | (state->color_registers[2] << 10) | ((x >> 4) << 5) | (y >> 3); - pen_t pen = memory_region(machine, "user1")[offs]; + pen_t pen = machine->region("user1")->base()[offs]; if (state->color_registers[1]) pen >>= 4; @@ -33,7 +33,7 @@ static pen_t cosmica_map_color( running_machine *machine, UINT8 x, UINT8 y ) { cosmic_state *state = machine->driver_data(); offs_t offs = (state->color_registers[0] << 9) | ((x >> 4) << 5) | (y >> 3); - pen_t pen = memory_region(machine, "user1")[offs]; + pen_t pen = machine->region("user1")->base()[offs]; if (state->color_registers[0]) /* yes, 0 again according to the schematics */ pen >>= 4; @@ -45,7 +45,7 @@ static pen_t cosmicg_map_color( running_machine *machine, UINT8 x, UINT8 y ) { cosmic_state *state = machine->driver_data(); offs_t offs = (state->color_registers[0] << 8) | (state->color_registers[1] << 9) | ((y >> 4) << 4) | (x >> 4); - pen_t pen = memory_region(machine, "user1")[offs]; + pen_t pen = machine->region("user1")->base()[offs]; /* the upper 4 bits are for cocktail mode support */ return pen & 0x0f; @@ -55,7 +55,7 @@ static pen_t magspot_map_color( running_machine *machine, UINT8 x, UINT8 y ) { cosmic_state *state = machine->driver_data(); offs_t offs = (state->color_registers[0] << 9) | ((x >> 3) << 4) | (y >> 4); - pen_t pen = memory_region(machine, "user1")[offs]; + pen_t pen = machine->region("user1")->base()[offs]; if (state->color_registers[1]) pen >>= 4; @@ -321,7 +321,7 @@ static void cosmica_draw_starfield( screen_device *screen, bitmap_t *bitmap, con { UINT8 y = 0; UINT8 map = 0; - UINT8 *PROM = memory_region(screen->machine, "user2"); + UINT8 *PROM = screen->machine->region("user2")->base(); while (1) { @@ -369,8 +369,8 @@ static void cosmica_draw_starfield( screen_device *screen, bitmap_t *bitmap, con static void devzone_draw_grid( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { UINT8 y; - UINT8 *horz_PROM = memory_region(machine, "user2"); - UINT8 *vert_PROM = memory_region(machine, "user3"); + UINT8 *horz_PROM = machine->region("user2")->base(); + UINT8 *vert_PROM = machine->region("user3")->base(); offs_t horz_addr = 0; UINT8 count = 0; @@ -428,7 +428,7 @@ static void nomnlnd_draw_background( screen_device *screen, bitmap_t *bitmap, co { UINT8 y = 0; UINT8 water = screen->frame_number(); - UINT8 *PROM = memory_region(screen->machine, "user2"); + UINT8 *PROM = screen->machine->region("user2")->base(); /* all positioning is via logic gates: diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c index a29d7015c01..2d8a3891bc9 100644 --- a/src/mame/video/cps1.c +++ b/src/mame/video/cps1.c @@ -1498,14 +1498,14 @@ static MACHINE_RESET( cps ) if (strcmp(gamename, "sf2rb") == 0) { /* Patch out protection check */ - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); rom[0xe5464 / 2] = 0x6012; } if (strcmp(gamename, "sf2rb2") == 0) { /* Patch out protection check */ - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); rom[0xe5332 / 2] = 0x6014; } @@ -1516,13 +1516,13 @@ static MACHINE_RESET( cps ) by the cpu core as a 32-bit branch. This branch would make the game crash (address error, since it would branch to an odd address) if location 180ca6 (outside ROM space) isn't 0. Protection check? */ - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); rom[0x11756 / 2] = 0x4e71; } else if (strcmp(gamename, "ghouls") == 0) { /* Patch out self-test... it takes forever */ - UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu"); + UINT16 *rom = (UINT16 *)machine->region("maincpu")->base(); rom[0x61964 / 2] = 0x4ef9; rom[0x61966 / 2] = 0x0000; rom[0x61968 / 2] = 0x0400; @@ -1697,9 +1697,9 @@ INLINE int cps2_port( running_machine *machine, int offset ) static void cps1_gfx_decode( running_machine *machine ) { - int size = memory_region_length(machine, "gfx"); + int size = machine->region("gfx")->bytes(); int i, j, gfxsize; - UINT8 *cps1_gfx = memory_region(machine, "gfx"); + UINT8 *cps1_gfx = machine->region("gfx")->base(); gfxsize = size / 4; @@ -1753,11 +1753,11 @@ static void unshuffle( UINT64 *buf, int len ) static void cps2_gfx_decode( running_machine *machine ) { const int banksize = 0x200000; - int size = memory_region_length(machine, "gfx"); + int size = machine->region("gfx")->bytes(); int i; for (i = 0; i < size; i += banksize) - unshuffle((UINT64 *)(memory_region(machine, "gfx") + i), banksize / 8); + unshuffle((UINT64 *)(machine->region("gfx")->base() + i), banksize / 8); cps1_gfx_decode(machine); } @@ -2690,7 +2690,7 @@ static void cps1_render_stars( screen_device *screen, bitmap_t *bitmap, const re { cps_state *state = screen->machine->driver_data(); int offs; - UINT8 *stars_rom = memory_region(screen->machine, "stars"); + UINT8 *stars_rom = screen->machine->region("stars")->base(); if (!stars_rom && (state->stars_enabled[0] || state->stars_enabled[1])) { diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c index 2027f3577f7..28f02a24e18 100644 --- a/src/mame/video/crbaloon.c +++ b/src/mame/video/crbaloon.c @@ -105,7 +105,7 @@ static void draw_sprite_and_check_collision(running_machine *machine, bitmap_t * UINT8 color = crbaloon_spriteram[0] >> 4; UINT8 sy = crbaloon_spriteram[2] - 32; - UINT8 *gfx = memory_region(machine, "gfx2") + (code << 7); + UINT8 *gfx = machine->region("gfx2")->base() + (code << 7); if (flip_screen_get(machine)) diff --git a/src/mame/video/crgolf.c b/src/mame/video/crgolf.c index 4d18be6877d..6ece813ed58 100644 --- a/src/mame/video/crgolf.c +++ b/src/mame/video/crgolf.c @@ -53,7 +53,7 @@ READ8_HANDLER( crgolf_videoram_r ) static void get_pens( running_machine *machine, pen_t *pens ) { offs_t offs; - const UINT8 *prom = memory_region(machine, "proms"); + const UINT8 *prom = machine->region("proms")->base(); for (offs = 0; offs < NUM_PENS; offs++) { diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c index d4baedc1ea5..165b6cb4f4d 100644 --- a/src/mame/video/darkmist.c +++ b/src/mame/video/darkmist.c @@ -18,8 +18,8 @@ static TILE_GET_INFO( get_bgtile_info ) { int code,attr,pal; - code=memory_region(machine, "user1")[tile_index]; /* TTTTTTTT */ - attr=memory_region(machine, "user2")[tile_index]; /* -PPP--TT - FIXED BITS (0xxx00xx) */ + code=machine->region("user1")->base()[tile_index]; /* TTTTTTTT */ + attr=machine->region("user2")->base()[tile_index]; /* -PPP--TT - FIXED BITS (0xxx00xx) */ code+=(attr&3)<<8; pal=(attr>>4); @@ -34,8 +34,8 @@ static TILE_GET_INFO( get_fgtile_info ) { int code,attr,pal; - code=memory_region(machine, "user3")[tile_index]; /* TTTTTTTT */ - attr=memory_region(machine, "user4")[tile_index]; /* -PPP--TT - FIXED BITS (0xxx00xx) */ + code=machine->region("user3")->base()[tile_index]; /* TTTTTTTT */ + attr=machine->region("user4")->base()[tile_index]; /* -PPP--TT - FIXED BITS (0xxx00xx) */ pal=attr>>4; code+=(attr&3)<<8; diff --git a/src/mame/video/dcheese.c b/src/mame/video/dcheese.c index f9af61d1d22..b9583a39523 100644 --- a/src/mame/video/dcheese.c +++ b/src/mame/video/dcheese.c @@ -27,7 +27,7 @@ PALETTE_INIT( dcheese ) { - const UINT16 *src = (UINT16 *)memory_region(machine, "user1"); + const UINT16 *src = (UINT16 *)machine->region("user1")->base(); int i; /* really 65536 colors, but they don't use the later ones so we can stay */ @@ -168,8 +168,8 @@ static void do_blit( running_machine *machine ) INT32 dxdy = (INT32)(((state->blitter_xparam[6] & 0x0fff) | ((state->blitter_xparam[7] & 0x0fff) << 12)) << 12) >> 12; INT32 dydx = (INT32)(((state->blitter_yparam[4] & 0x0fff) | ((state->blitter_yparam[5] & 0x0fff) << 12)) << 12) >> 12; INT32 dydy = (INT32)(((state->blitter_yparam[6] & 0x0fff) | ((state->blitter_yparam[7] & 0x0fff) << 12)) << 12) >> 12; - UINT8 *src = memory_region(machine, "gfx1"); - UINT32 pagemask = (memory_region_length(machine, "gfx1") - 1) / 0x40000; + UINT8 *src = machine->region("gfx1")->base(); + UINT32 pagemask = (machine->region("gfx1")->bytes() - 1) / 0x40000; int xstart = state->blitter_xparam[14]; int xend = state->blitter_xparam[15] + 1; int ystart = state->blitter_yparam[14]; diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c index 0eee17a0233..9b4c895e062 100644 --- a/src/mame/video/dday.c +++ b/src/mame/video/dday.c @@ -187,7 +187,7 @@ static TILE_GET_INFO( get_sl_tile_info ) int code, sl_flipx, flipx; UINT8* sl_map; - sl_map = &memory_region(machine, "user1")[(state->sl_image & 0x07) * 0x0200]; + sl_map = &machine->region("user1")->base()[(state->sl_image & 0x07) * 0x0200]; flipx = (tile_index >> 4) & 0x01; sl_flipx = (state->sl_image >> 3) & 0x01; diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c index f08b374c1ed..da31d761031 100644 --- a/src/mame/video/deadang.c +++ b/src/mame/video/deadang.c @@ -43,14 +43,14 @@ static TILEMAP_MAPPER( bg_scan ) static TILE_GET_INFO( get_pf3_tile_info ) { - const UINT16 *bgMap = (const UINT16 *)memory_region(machine, "gfx6"); + const UINT16 *bgMap = (const UINT16 *)machine->region("gfx6")->base(); int code= bgMap[tile_index]; SET_TILE_INFO(4,code&0x7ff,code>>12,0); } static TILE_GET_INFO( get_pf2_tile_info ) { - const UINT16 *bgMap = (const UINT16 *)memory_region(machine, "gfx7"); + const UINT16 *bgMap = (const UINT16 *)machine->region("gfx7")->base(); int code= bgMap[tile_index]; SET_TILE_INFO(3,code&0x7ff,code>>12,0); } diff --git a/src/mame/video/deco_mlc.c b/src/mame/video/deco_mlc.c index ce0816b5511..0cf7bdd28f4 100644 --- a/src/mame/video/deco_mlc.c +++ b/src/mame/video/deco_mlc.c @@ -230,8 +230,8 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap,const rectan UINT32 *index_ptr=0; int offs,fx=0,fy=0,x,y,color,colorOffset,sprite,indx,h,w,bx,by,fx1,fy1; int xoffs,yoffs; - UINT8 *rom = memory_region(machine, "gfx2") + 0x20000, *index_ptr8; - UINT8 *rawrom = memory_region(machine, "gfx2"); + UINT8 *rom = machine->region("gfx2")->base() + 0x20000, *index_ptr8; + UINT8 *rawrom = machine->region("gfx2")->base(); int blockIsTilemapIndex=0; int sprite2=0,indx2=0,use8bppMode=0; int yscale,xscale; diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c index 290977d03e3..c924273bf0c 100644 --- a/src/mame/video/deniam.c +++ b/src/mame/video/deniam.c @@ -218,7 +218,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect { deniam_state *state = machine->driver_data(); int offs; - UINT8 *gfx = memory_region(machine, "gfx2"); + UINT8 *gfx = machine->region("gfx2")->base(); for (offs = state->spriteram_size / 2 - 8; offs >= 0; offs -= 8) { diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c index c357e6de283..e7b1d0f775c 100644 --- a/src/mame/video/digdug.c +++ b/src/mame/video/digdug.c @@ -89,7 +89,7 @@ static TILEMAP_MAPPER( tilemap_scan ) static TILE_GET_INFO( bg_get_tile_info ) { - UINT8 *rom = memory_region(machine, "gfx4"); + UINT8 *rom = machine->region("gfx4")->base(); _galaga_state *state = machine->driver_data<_galaga_state>(); int code = rom[tile_index | (state->bg_select << 10)]; diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c index 647c05a927e..89db6e760d9 100644 --- a/src/mame/video/dkong.c +++ b/src/mame/video/dkong.c @@ -905,11 +905,11 @@ static void check_palette(running_machine *machine) switch (newset) { case 0x00: - color_prom = memory_region(machine, "proms"); + color_prom = machine->region("proms")->base(); PALETTE_INIT_CALL(radarscp); break; case 0x01: - color_prom = memory_region(machine, "proms"); + color_prom = machine->region("proms")->base(); PALETTE_INIT_CALL(dkong2b); break; } @@ -951,8 +951,8 @@ VIDEO_START( dkong ) { case HARDWARE_TRS02: state->bg_bits = machine->primary_screen->alloc_compatible_bitmap(); - state->gfx3 = memory_region(machine, "gfx3"); - state->gfx3_len = memory_region_length(machine, "gfx3"); + state->gfx3 = machine->region("gfx3")->base(); + state->gfx3_len = machine->region("gfx3")->bytes(); /* fall through */ case HARDWARE_TKG04: case HARDWARE_TKG02: @@ -964,9 +964,9 @@ VIDEO_START( dkong ) tilemap_set_scrolldx(state->bg_tilemap, 0, 128); state->bg_bits = machine->primary_screen->alloc_compatible_bitmap(); - state->gfx4 = memory_region(machine, "gfx4"); - state->gfx3 = memory_region(machine, "gfx3"); - state->gfx3_len = memory_region_length(machine, "gfx3"); + state->gfx4 = machine->region("gfx4")->base(); + state->gfx3 = machine->region("gfx3")->base(); + state->gfx3_len = machine->region("gfx3")->bytes(); break; default: diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c index d4cf99ecf35..f1e5bf7e554 100644 --- a/src/mame/video/dooyong.c +++ b/src/mame/video/dooyong.c @@ -638,8 +638,8 @@ VIDEO_UPDATE( popbingo ) VIDEO_START( lastday ) { /* Configure tilemap callbacks */ - bg_tilerom = memory_region(machine, "gfx5"); - fg_tilerom = memory_region(machine, "gfx6"); + bg_tilerom = machine->region("gfx5")->base(); + fg_tilerom = machine->region("gfx6")->base(); bg_tilerom2 = NULL; fg_tilerom2 = NULL; bg_gfx = 2; @@ -675,8 +675,8 @@ VIDEO_START( lastday ) VIDEO_START( gulfstrm ) { /* Configure tilemap callbacks */ - bg_tilerom = memory_region(machine, "gfx5"); - fg_tilerom = memory_region(machine, "gfx6"); + bg_tilerom = machine->region("gfx5")->base(); + fg_tilerom = machine->region("gfx6")->base(); bg_tilerom2 = NULL; fg_tilerom2 = NULL; bg_gfx = 2; @@ -711,8 +711,8 @@ VIDEO_START( gulfstrm ) VIDEO_START( pollux ) { /* Configure tilemap callbacks */ - bg_tilerom = memory_region(machine, "gfx5"); - fg_tilerom = memory_region(machine, "gfx6"); + bg_tilerom = machine->region("gfx5")->base(); + fg_tilerom = machine->region("gfx6")->base(); bg_tilerom2 = NULL; fg_tilerom2 = NULL; bg_gfx = 2; @@ -744,9 +744,9 @@ VIDEO_START( pollux ) VIDEO_START( bluehawk ) { /* Configure tilemap callbacks */ - bg_tilerom = memory_region(machine, "gfx3") + 0x78000; - fg_tilerom = memory_region(machine, "gfx4") + 0x78000; - fg2_tilerom = memory_region(machine, "gfx5") + 0x38000; + bg_tilerom = machine->region("gfx3")->base() + 0x78000; + fg_tilerom = machine->region("gfx4")->base() + 0x78000; + fg2_tilerom = machine->region("gfx5")->base() + 0x38000; bg_tilerom2 = NULL; fg_tilerom2 = NULL; fg2_tilerom2 = NULL; @@ -784,8 +784,8 @@ VIDEO_START( bluehawk ) VIDEO_START( flytiger ) { /* Configure tilemap callbacks */ - bg_tilerom = memory_region(machine, "gfx3") + 0x78000; - fg_tilerom = memory_region(machine, "gfx4") + 0x78000; + bg_tilerom = machine->region("gfx3")->base() + 0x78000; + fg_tilerom = machine->region("gfx4")->base() + 0x78000; bg_tilerom2 = NULL; fg_tilerom2 = NULL; bg_gfx = 2; @@ -819,8 +819,8 @@ VIDEO_START( flytiger ) VIDEO_START( primella ) { /* Configure tilemap callbacks */ - bg_tilerom = memory_region(machine, "gfx2") + memory_region_length(machine, "gfx2") - 0x8000; - fg_tilerom = memory_region(machine, "gfx3") + memory_region_length(machine, "gfx3") - 0x8000; + bg_tilerom = machine->region("gfx2")->base() + machine->region("gfx2")->bytes() - 0x8000; + fg_tilerom = machine->region("gfx3")->base() + machine->region("gfx3")->bytes() - 0x8000; bg_tilerom2 = NULL; fg_tilerom2 = NULL; bg_gfx = 1; @@ -853,14 +853,14 @@ VIDEO_START( primella ) VIDEO_START( rshark ) { /* Configure tilemap callbacks */ - bg_tilerom = memory_region(machine, "gfx5"); - bg2_tilerom = memory_region(machine, "gfx4"); - fg_tilerom = memory_region(machine, "gfx3"); - fg2_tilerom = memory_region(machine, "gfx2"); - bg_tilerom2 = memory_region(machine, "gfx6") + 0x60000; - bg2_tilerom2 = memory_region(machine, "gfx6") + 0x40000; - fg_tilerom2 = memory_region(machine, "gfx6") + 0x20000; - fg2_tilerom2 = memory_region(machine, "gfx6") + 0x00000; + bg_tilerom = machine->region("gfx5")->base(); + bg2_tilerom = machine->region("gfx4")->base(); + fg_tilerom = machine->region("gfx3")->base(); + fg2_tilerom = machine->region("gfx2")->base(); + bg_tilerom2 = machine->region("gfx6")->base() + 0x60000; + bg2_tilerom2 = machine->region("gfx6")->base() + 0x40000; + fg_tilerom2 = machine->region("gfx6")->base() + 0x20000; + fg2_tilerom2 = machine->region("gfx6")->base() + 0x00000; bg_gfx = 4; bg2_gfx = 3; fg_gfx = 2; @@ -897,7 +897,7 @@ VIDEO_START( rshark ) VIDEO_START( popbingo ) { /* Configure tilemap callbacks */ - bg_tilerom = memory_region(machine, "gfx2"); + bg_tilerom = machine->region("gfx2")->base(); bg_gfx = 1; /* Create tilemaps */ diff --git a/src/mame/video/dribling.c b/src/mame/video/dribling.c index 6cd3882ed31..6a4320d716a 100644 --- a/src/mame/video/dribling.c +++ b/src/mame/video/dribling.c @@ -17,7 +17,7 @@ PALETTE_INIT( dribling ) { - const UINT8 *prom = memory_region(machine, "proms") + 0x400; + const UINT8 *prom = machine->region("proms")->base() + 0x400; int i; for (i = 0; i < 256; i++) @@ -61,8 +61,8 @@ WRITE8_HANDLER( dribling_colorram_w ) VIDEO_UPDATE( dribling ) { dribling_state *state = screen->machine->driver_data(); - UINT8 *prombase = memory_region(screen->machine, "proms"); - UINT8 *gfxbase = memory_region(screen->machine, "gfx1"); + UINT8 *prombase = screen->machine->region("proms")->base(); + UINT8 *gfxbase = screen->machine->region("gfx1")->base(); int x, y; /* loop over rows */ diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c index 211a86137f6..135d97520de 100644 --- a/src/mame/video/dynax.c +++ b/src/mame/video/dynax.c @@ -379,8 +379,8 @@ static int blitter_drawgfx( running_machine *machine, int layer, int mask, const { dynax_state *state = machine->driver_data(); UINT8 cmd; - UINT8 *ROM = memory_region(machine, gfx); - size_t ROM_size = memory_region_length(machine, gfx); + UINT8 *ROM = machine->region(gfx)->base(); + size_t ROM_size = machine->region(gfx)->bytes(); int sx; @@ -1236,8 +1236,8 @@ static int debug_viewer( running_machine *machine, bitmap_t *bitmap, const recta if (toggle) { dynax_state *state = machine->driver_data(); - UINT8 *RAM = memory_region( machine, "gfx1" ); - size_t size = memory_region_length( machine, "gfx1" ); + UINT8 *RAM = machine->region( "gfx1" )->base(); + size_t size = machine->region( "gfx1" )->bytes(); static int i = 0, c = 0, r = 0; if (input_code_pressed_once(machine, KEYCODE_I)) c = (c - 1) & 0x1f; diff --git a/src/mame/video/epos.c b/src/mame/video/epos.c index 787a08601e6..773af94797f 100644 --- a/src/mame/video/epos.c +++ b/src/mame/video/epos.c @@ -25,8 +25,8 @@ static void get_pens( running_machine *machine, pen_t *pens ) { offs_t i; - const UINT8 *prom = memory_region(machine, "proms"); - int len = memory_region_length(machine, "proms"); + const UINT8 *prom = machine->region("proms")->base(); + int len = machine->region("proms")->bytes(); for (i = 0; i < len; i++) { diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c index bace23fbc68..e8064b2b3be 100644 --- a/src/mame/video/equites.c +++ b/src/mame/video/equites.c @@ -335,7 +335,7 @@ Also, note that sprites are 30x30, not 32x32. static void splndrbt_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { equites_state *state = machine->driver_data(); - const UINT8 * const xrom = memory_region(machine, "user2"); + const UINT8 * const xrom = machine->region("user2")->base(); const UINT8 * const yrom = xrom + 0x100; const gfx_element* const gfx = machine->gfx[2]; int offs; @@ -413,7 +413,7 @@ static void splndrbt_copy_bg( running_machine *machine, bitmap_t *dst_bitmap, co equites_state *state = machine->driver_data(); bitmap_t * const src_bitmap = tilemap_get_pixmap(state->bg_tilemap); bitmap_t * const flags_bitmap = tilemap_get_flagsmap(state->bg_tilemap); - const UINT8 * const xrom = memory_region(machine, "user1"); + const UINT8 * const xrom = machine->region("user1")->base(); const UINT8 * const yrom = xrom + 0x2000; int scroll_x = state->splndrbt_bg_scrollx; int scroll_y = state->splndrbt_bg_scrolly; diff --git a/src/mame/video/esripsys.c b/src/mame/video/esripsys.c index 1ea7ffa1feb..b8df1876bfc 100644 --- a/src/mame/video/esripsys.c +++ b/src/mame/video/esripsys.c @@ -252,13 +252,13 @@ int esripsys_draw(running_machine *machine, int l, int r, int fig, int attr, int if (x_flip) { - rom_l = memory_region(machine, "8bpp_r"); - rom_r = memory_region(machine, "8bpp_l"); + rom_l = machine->region("8bpp_r")->base(); + rom_r = machine->region("8bpp_l")->base(); } else { - rom_l = memory_region(machine, "8bpp_l"); - rom_r = memory_region(machine, "8bpp_r"); + rom_l = machine->region("8bpp_l")->base(); + rom_r = machine->region("8bpp_r")->base(); } for (cnt = 0; cnt <= fig; cnt++) @@ -321,7 +321,7 @@ int esripsys_draw(running_machine *machine, int l, int r, int fig, int attr, int /* 4bpp case */ else { - const UINT8* const rom = memory_region(machine, "4bpp"); + const UINT8* const rom = machine->region("4bpp")->base(); int ptr = 0; int cnt; UINT32 lpos = l; diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c index 100dda894e0..d61b58a42d4 100644 --- a/src/mame/video/exedexes.c +++ b/src/mame/video/exedexes.c @@ -10,8 +10,8 @@ #include "includes/exedexes.h" -#define TileMap(offs) (memory_region(machine, "gfx5")[offs]) -#define BackTileMap(offs) (memory_region(machine, "gfx5")[offs+0x4000]) +#define TileMap(offs) (machine->region("gfx5")->base()[offs]) +#define BackTileMap(offs) (machine->region("gfx5")->base()[offs+0x4000]) /*************************************************************************** @@ -132,7 +132,7 @@ WRITE8_HANDLER( exedexes_gfxctrl_w ) static TILE_GET_INFO( get_bg_tile_info ) { - UINT8 *tilerom = memory_region(machine, "gfx5"); + UINT8 *tilerom = machine->region("gfx5")->base(); int attr = tilerom[tile_index]; int code = attr & 0x3f; @@ -144,7 +144,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - int code = memory_region(machine, "gfx5")[tile_index]; + int code = machine->region("gfx5")->base()[tile_index]; SET_TILE_INFO(2, code, 0, 0); } diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c index 9fffe1c6599..3ec1394e322 100644 --- a/src/mame/video/exerion.c +++ b/src/mame/video/exerion.c @@ -110,7 +110,7 @@ VIDEO_START( exerion ) UINT8 *gfx; /* get pointers to the mixing and lookup PROMs */ - state->background_mixer = memory_region(machine, "proms") + 0x320; + state->background_mixer = machine->region("proms")->base() + 0x320; /* allocate memory for the decoded background graphics */ state->background_gfx[0] = auto_alloc_array(machine, UINT16, 256 * 256 * 4); @@ -135,7 +135,7 @@ VIDEO_START( exerion ) * Where AA,BB,CC,DD are the 2bpp data for the pixel,and a,b,c,d are the OR * of these two bits together. */ - gfx = memory_region(machine, "gfx3"); + gfx = machine->region("gfx3")->base(); for (i = 0; i < 4; i++) { int y; diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c index ff32c043b3f..1cc7d91c404 100644 --- a/src/mame/video/exprraid.c +++ b/src/mame/video/exprraid.c @@ -50,7 +50,7 @@ WRITE8_HANDLER( exprraid_scrolly_w ) static TILE_GET_INFO( get_bg_tile_info ) { exprraid_state *state = machine->driver_data(); - UINT8 *tilerom = memory_region(machine, "gfx4"); + UINT8 *tilerom = machine->region("gfx4")->base(); int data, attr, bank, code, color, flags; int quadrant = 0, offs; diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c index f9a62fbea63..2694377c3dd 100644 --- a/src/mame/video/f1gp.c +++ b/src/mame/video/f1gp.c @@ -52,10 +52,10 @@ VIDEO_START( f1gp ) tilemap_set_transparent_pen(state->fg_tilemap, 0xff); - state->zoomdata = (UINT16 *)memory_region(machine, "gfx4"); + state->zoomdata = (UINT16 *)machine->region("gfx4")->base(); gfx_element_set_source(machine->gfx[3], (UINT8 *)state->zoomdata); -// state_save_register_global_pointer(machine, state->zoomdata, memory_region_length(machine, "gfx4")); +// state_save_register_global_pointer(machine, state->zoomdata, machine->region("gfx4")->bytes()); } @@ -68,10 +68,10 @@ VIDEO_START( f1gpb ) tilemap_set_transparent_pen(state->fg_tilemap, 0xff); - state->zoomdata = (UINT16 *)memory_region(machine, "gfx4"); + state->zoomdata = (UINT16 *)machine->region("gfx4")->base(); gfx_element_set_source(machine->gfx[3], (UINT8 *)state->zoomdata); -// state_save_register_global_pointer(machine, state->zoomdata, memory_region_length(machine, "gfx4")); +// state_save_register_global_pointer(machine, state->zoomdata, machine->region("gfx4")->bytes()); } VIDEO_START( f1gp2 ) diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c index 92ba2dd4ab9..d5258ec0098 100644 --- a/src/mame/video/fcombat.c +++ b/src/mame/video/fcombat.c @@ -14,8 +14,8 @@ static TILE_GET_INFO( get_bg_tile_info ) //palno = (tile_index - (tile_index / 32 * 16) * 32 * 16) / 32; - tileno = memory_region(machine, "user1")[tile_index]; - palno = 0x18; //memory_region(machine, "user2")[tile_index] >> 3; + tileno = machine->region("user1")->base()[tile_index]; + palno = 0x18; //machine->region("user2")->base()[tile_index] >> 3; SET_TILE_INFO(2, tileno, palno, 0); } diff --git a/src/mame/video/galastrm.c b/src/mame/video/galastrm.c index 208c30b35e5..e546e5ed5ca 100644 --- a/src/mame/video/galastrm.c +++ b/src/mame/video/galastrm.c @@ -104,7 +104,7 @@ static struct tempsprite *sprite_ptr_pre; static void draw_sprites_pre(running_machine *machine, int x_offs, int y_offs) { UINT32 *spriteram32 = machine->generic.spriteram.u32; - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); int offs, data, tilenum, color, flipx, flipy; int x, y, priority, dblsize, curx, cury; int sprites_flipscreen = 0; diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c index 63ce65190bd..dc426a926ae 100644 --- a/src/mame/video/galaxian.c +++ b/src/mame/video/galaxian.c @@ -343,7 +343,7 @@ PALETTE_INIT( galaxian ) 2, &rgb_resistances[1], bweights, 470, 0); /* decode the palette first */ - len = memory_region_length(machine, "proms"); + len = machine->region("proms")->bytes(); for (i = 0; i < len; i++) { UINT8 bit0, bit1, bit2, r, g, b; @@ -1036,7 +1036,7 @@ void frogger_draw_background(running_machine *machine, bitmap_t *bitmap, const r #ifdef UNUSED_FUNCTION void amidar_draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { - const UINT8 *prom = memory_region(machine, "user1"); + const UINT8 *prom = machine->region("user1")->base(); rectangle draw; int x; diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c index 1f4af4d41c9..1049292b2eb 100644 --- a/src/mame/video/galaxold.c +++ b/src/mame/video/galaxold.c @@ -22,7 +22,7 @@ static const rectangle* spritevisiblearea; static const rectangle* spritevisibleareaflipx; -#define STARS_COLOR_BASE (memory_region_length(machine, "proms")) +#define STARS_COLOR_BASE (machine->region("proms")->bytes()) #define BULLETS_COLOR_BASE (STARS_COLOR_BASE + 64) #define BACKGROUND_COLOR_BASE (BULLETS_COLOR_BASE + 2) @@ -169,7 +169,7 @@ PALETTE_INIT( galaxold ) /* first, the character/sprite palette */ - len = memory_region_length(machine, "proms"); + len = machine->region("proms")->bytes(); for (i = 0;i < len;i++) { int bit0,bit1,bit2,r,g,b; @@ -243,7 +243,7 @@ PALETTE_INIT( rockclim ) /* first, the character/sprite palette */ - len = memory_region_length(machine, "proms"); + len = machine->region("proms")->bytes(); for (i = 0;i < len;i++) { int bit0,bit1,bit2,r,g,b; @@ -410,7 +410,7 @@ PALETTE_INIT( dambustr ) int i, len; /* first, the character/sprite palette */ - len = memory_region_length(machine, "proms"); + len = machine->region("proms")->bytes(); for (i = 0;i < len;i++) { @@ -1162,7 +1162,7 @@ static void mariner_modify_charcode(running_machine *machine, UINT16 *code,UINT8 /* bit 0 of the PROM controls character banking */ - prom = memory_region(machine, "user2"); + prom = machine->region("user2")->base(); *code |= ((prom[x] & 0x01) << 8); } @@ -1341,7 +1341,7 @@ static void stratgyx_draw_background(running_machine *machine, bitmap_t *bitmap, the green gun if BCG is asserted bits 2-7 are unconnected */ - prom = memory_region(machine, "user1"); + prom = machine->region("user1")->base(); for (x = 0; x < 32; x++) { @@ -1413,7 +1413,7 @@ static void mariner_draw_background(running_machine *machine, bitmap_t *bitmap, line (column) of the screen. The first 0x20 bytes for unflipped, and the 2nd 0x20 bytes for flipped screen. */ - prom = memory_region(machine, "user1"); + prom = machine->region("user1")->base(); if (flipscreen_x) { @@ -1709,7 +1709,7 @@ static void mariner_draw_stars(running_machine *machine, bitmap_t *bitmap, const /* bit 2 of the PROM controls star visibility */ - prom = memory_region(machine, "user2"); + prom = machine->region("user2")->base(); for (offs = 0;offs < STAR_COUNT;offs++) { diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c index 6fe18adc8dd..e3e0b51645f 100644 --- a/src/mame/video/galivan.c +++ b/src/mame/video/galivan.c @@ -121,7 +121,7 @@ PALETTE_INIT( galivan ) static TILE_GET_INFO( get_bg_tile_info ) { - UINT8 *BGROM = memory_region(machine, "gfx4"); + UINT8 *BGROM = machine->region("gfx4")->base(); int attr = BGROM[tile_index + 0x4000]; int code = BGROM[tile_index] | ((attr & 0x03) << 8); SET_TILE_INFO( @@ -146,7 +146,7 @@ static TILE_GET_INFO( get_tx_tile_info ) static TILE_GET_INFO( ninjemak_get_bg_tile_info ) { - UINT8 *BGROM = memory_region(machine, "gfx4"); + UINT8 *BGROM = machine->region("gfx4")->base(); int attr = BGROM[tile_index + 0x4000]; int code = BGROM[tile_index] | ((attr & 0x03) << 8); SET_TILE_INFO( @@ -341,7 +341,7 @@ WRITE8_HANDLER( ninjemak_scrolly_w ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { galivan_state *state = machine->driver_data(); - const UINT8 *spritepalettebank = memory_region(machine, "user1"); + const UINT8 *spritepalettebank = machine->region("user1")->base(); UINT8 *spriteram = state->spriteram; int offs; diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c index e66a0a8be27..200b10a3a7b 100644 --- a/src/mame/video/ginganin.c +++ b/src/mame/video/ginganin.c @@ -76,7 +76,7 @@ Note: if MAME_DEBUG is defined, pressing Z with: static TILE_GET_INFO( get_bg_tile_info ) { - UINT8 *gfx = memory_region(machine, "gfx5"); + UINT8 *gfx = machine->region("gfx5")->base(); int code = gfx[2 * tile_index + 0] * 256 + gfx[2 * tile_index + 1]; SET_TILE_INFO( BG_GFX, diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c index 2c2d5458918..c6a691b28c6 100644 --- a/src/mame/video/glass.c +++ b/src/mame/video/glass.c @@ -85,7 +85,7 @@ WRITE16_HANDLER( glass_blitter_w ) /* fill the screen bitmap with the current picture */ { int i, j; - UINT8 *gfx = (UINT8 *)memory_region(space->machine, "gfx3"); + UINT8 *gfx = (UINT8 *)space->machine->region("gfx3")->base(); gfx = gfx + (state->current_command & 0x07) * 0x10000 + (state->current_command & 0x08) * 0x10000 + 0x140; diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index d615757b7ad..b8d5bc74ece 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -423,7 +423,7 @@ VIDEO_UPDATE( goldstar ) if (state->cm_enable_reg &0x04) { - if (memory_region(screen->machine,"user1")) + if (screen->machine->region("user1")->base()) { const gfx_element *gfx = screen->machine->gfx[2]; int girlyscroll = (INT8)((state->cm_girl_scroll & 0xf0)); diff --git a/src/mame/video/gomoku.c b/src/mame/video/gomoku.c index f64ff6cffc6..9e281fd5699 100644 --- a/src/mame/video/gomoku.c +++ b/src/mame/video/gomoku.c @@ -113,9 +113,9 @@ WRITE8_HANDLER( gomoku_bg_dispsw_w ) VIDEO_START( gomoku ) { - UINT8 *GOMOKU_BG_X = memory_region( machine, "user1" ); - UINT8 *GOMOKU_BG_Y = memory_region( machine, "user2" ); - UINT8 *GOMOKU_BG_D = memory_region( machine, "user3" ); + UINT8 *GOMOKU_BG_X = machine->region( "user1" )->base(); + UINT8 *GOMOKU_BG_Y = machine->region( "user2" )->base(); + UINT8 *GOMOKU_BG_D = machine->region( "user3" )->base(); int x, y; int bgdata; int color; @@ -155,9 +155,9 @@ VIDEO_START( gomoku ) VIDEO_UPDATE( gomoku ) { - UINT8 *GOMOKU_BG_X = memory_region( screen->machine, "user1" ); - UINT8 *GOMOKU_BG_Y = memory_region( screen->machine, "user2" ); - UINT8 *GOMOKU_BG_D = memory_region( screen->machine, "user3" ); + UINT8 *GOMOKU_BG_X = screen->machine->region( "user1" )->base(); + UINT8 *GOMOKU_BG_Y = screen->machine->region( "user2" )->base(); + UINT8 *GOMOKU_BG_D = screen->machine->region( "user3" )->base(); int x, y; int bgram; int bgoffs; diff --git a/src/mame/video/gradius3.c b/src/mame/video/gradius3.c index d85ca5df475..ed7a2cced6d 100644 --- a/src/mame/video/gradius3.c +++ b/src/mame/video/gradius3.c @@ -101,7 +101,7 @@ VIDEO_START( gradius3 ) READ16_HANDLER( gradius3_gfxrom_r ) { - UINT8 *gfxdata = memory_region(space->machine, "gfx2"); + UINT8 *gfxdata = space->machine->region("gfx2")->base(); return (gfxdata[2 * offset + 1] << 8) | gfxdata[2 * offset]; } diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c index e879321cd58..0baf216461e 100644 --- a/src/mame/video/grchamp.c +++ b/src/mame/video/grchamp.c @@ -248,7 +248,7 @@ static void draw_objects(running_machine *machine, grchamp_state *state, int y, */ - const UINT8 *prom = memory_region(machine, "proms") + 0x20; + const UINT8 *prom = machine->region("proms")->base() + 0x20; const gfx_element *gfx; int change = (state->cpu0_out[0] & 0x20) << 3; int num; @@ -367,9 +367,9 @@ VIDEO_UPDATE( grchamp ) }; grchamp_state *state = screen->machine->driver_data(); - const UINT8 *amedata = memory_region(screen->machine, "gfx5"); - const UINT8 *headdata = memory_region(screen->machine, "gfx6"); - const UINT8 *pldata = memory_region(screen->machine, "gfx7"); + const UINT8 *amedata = screen->machine->region("gfx5")->base(); + const UINT8 *headdata = screen->machine->region("gfx6")->base(); + const UINT8 *pldata = screen->machine->region("gfx7")->base(); bitmap_t *lpixmap = tilemap_get_pixmap(state->left_tilemap); bitmap_t *rpixmap = tilemap_get_pixmap(state->right_tilemap); bitmap_t *cpixmap = tilemap_get_pixmap(state->center_tilemap); diff --git a/src/mame/video/gridlee.c b/src/mame/video/gridlee.c index 338d5e17d50..73c25134577 100644 --- a/src/mame/video/gridlee.c +++ b/src/mame/video/gridlee.c @@ -179,7 +179,7 @@ VIDEO_UPDATE( gridlee ) } /* draw the sprite images */ - gfx = memory_region(screen->machine, "gfx1"); + gfx = screen->machine->region("gfx1")->base(); for (i = 0; i < 32; i++) { UINT8 *sprite = screen->machine->generic.spriteram.u8 + i * 4; diff --git a/src/mame/video/groundfx.c b/src/mame/video/groundfx.c index c3abb47e8a7..ab536b516b0 100644 --- a/src/mame/video/groundfx.c +++ b/src/mame/video/groundfx.c @@ -79,7 +79,7 @@ Heavy use is made of sprite zooming. static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect,int do_hack,int x_offs,int y_offs) { UINT32 *spriteram32 = machine->generic.spriteram.u32; - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); int offs, data, tilenum, color, flipx, flipy; int x, y, priority, dblsize, curx, cury; int sprites_flipscreen = 0; diff --git a/src/mame/video/gticlub.c b/src/mame/video/gticlub.c index 966a924c98d..78e7de56b4a 100644 --- a/src/mame/video/gticlub.c +++ b/src/mame/video/gticlub.c @@ -55,7 +55,7 @@ static UINT32 K001006_r(running_machine *machine, int chip, int offset, UINT32 m { case 0x0b: // CG Board ROM read { - UINT16 *rom = (UINT16*)memory_region(machine, "gfx1"); + UINT16 *rom = (UINT16*)machine->region("gfx1")->base(); return rom[K001006_addr[chip] / 2] << 16; } case 0x0d: // Palette RAM read @@ -200,7 +200,7 @@ void K001005_init(running_machine *machine) int height = machine->primary_screen->height(); K001005_zbuffer = auto_bitmap_alloc(machine, width, height, BITMAP_FORMAT_INDEXED32); - gfxrom = memory_region(machine, "gfx1"); + gfxrom = machine->region("gfx1")->base(); K001005_bitmap[0] = machine->primary_screen->alloc_compatible_bitmap(); K001005_bitmap[1] = machine->primary_screen->alloc_compatible_bitmap(); @@ -1019,7 +1019,7 @@ VIDEO_UPDATE( gticlub ) int index = (debug_tex_page - 1) * 0x40000; int pal = debug_tex_palette & 7; int tp = (debug_tex_palette >> 3) & 1; - UINT8 *rom = memory_region(machine, "gfx1"); + UINT8 *rom = machine->region("gfx1")->base(); for (y=0; y < 384; y++) { diff --git a/src/mame/video/gunbustr.c b/src/mame/video/gunbustr.c index 45467a74b31..0848af2d91e 100644 --- a/src/mame/video/gunbustr.c +++ b/src/mame/video/gunbustr.c @@ -69,7 +69,7 @@ Heavy use is made of sprite zooming. static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect,const int *primasks,int x_offs,int y_offs) { UINT32 *spriteram32 = machine->generic.spriteram.u32; - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); int offs, data, tilenum, color, flipx, flipy; int x, y, priority, dblsize, curx, cury; int sprites_flipscreen = 0; diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c index 674a6015ed1..8971bd6fbdc 100644 --- a/src/mame/video/gunsmoke.c +++ b/src/mame/video/gunsmoke.c @@ -108,7 +108,7 @@ WRITE8_HANDLER( gunsmoke_d806_w ) static TILE_GET_INFO( get_bg_tile_info ) { - UINT8 *tilerom = memory_region(machine, "gfx4"); + UINT8 *tilerom = machine->region("gfx4")->base(); int offs = tile_index * 2; int attr = tilerom[offs + 1]; diff --git a/src/mame/video/hexion.c b/src/mame/video/hexion.c index 82bc5d4a78e..896cfbf2feb 100644 --- a/src/mame/video/hexion.c +++ b/src/mame/video/hexion.c @@ -50,7 +50,7 @@ VIDEO_START( hexion ) tilemap_set_scrollx(bg_tilemap[1],0,-4); tilemap_set_scrolly(bg_tilemap[1],0,4); - vram[0] = memory_region(machine, "maincpu") + 0x30000; + vram[0] = machine->region("maincpu")->base() + 0x30000; vram[1] = vram[0] + 0x2000; unkram = vram[1] + 0x2000; } @@ -65,7 +65,7 @@ VIDEO_START( hexion ) WRITE8_HANDLER( hexion_bankswitch_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu") + 0x10000; + UINT8 *rom = space->machine->region("maincpu")->base() + 0x10000; /* bits 0-3 select ROM bank */ memory_set_bankptr(space->machine, "bank1",rom + 0x2000 * (data & 0x0f)); @@ -91,7 +91,7 @@ READ8_HANDLER( hexion_bankedram_r ) { if (gfxrom_select && offset < 0x1000) { - return memory_region(space->machine, "gfx1")[((gfxrom_select & 0x7f) << 12) + offset]; + return space->machine->region("gfx1")->base()[((gfxrom_select & 0x7f) << 12) + offset]; } else if (bankctrl == 0) { diff --git a/src/mame/video/hnayayoi.c b/src/mame/video/hnayayoi.c index f83dc8d2077..04b13ba84ef 100644 --- a/src/mame/video/hnayayoi.c +++ b/src/mame/video/hnayayoi.c @@ -132,8 +132,8 @@ static void copy_pixel( running_machine *machine, int x, int y, int pen ) WRITE8_HANDLER( dynax_blitter_rev1_start_w ) { hnayayoi_state *state = space->machine->driver_data(); - UINT8 *rom = memory_region(space->machine, "gfx1"); - int romlen = memory_region_length(space->machine, "gfx1"); + UINT8 *rom = space->machine->region("gfx1")->base(); + int romlen = space->machine->region("gfx1")->bytes(); int sx = state->blit_dest & 0xff; int sy = state->blit_dest >> 8; int x, y; diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c index 838854a1907..080bb12161f 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -2064,11 +2064,11 @@ static void recoverPolygonBlock(running_machine* machine, const UINT16* packet, //////////////////////////////////////////////*/ // 3d ROM Offset - UINT16* threeDRoms = (UINT16*)(memory_region(machine, "verts")); + UINT16* threeDRoms = (UINT16*)(machine->region("verts")->base()); UINT32 threeDOffset = (((UINT32)packet[2]) << 16) | ((UINT32)packet[3]); UINT16* threeDPointer = &threeDRoms[threeDOffset * 3]; - if (threeDOffset >= memory_region_length(machine, "verts")) + if (threeDOffset >= machine->region("verts")->bytes()) { printf("Strange geometry packet: (ignoring)\n"); printPacket(packet, 1); @@ -3023,7 +3023,7 @@ INLINE void FillSmoothTexPCHorizontalLine(running_machine *machine, UINT8 paletteEntry = 0; float t_coord, s_coord; - const UINT8 *gfx = memory_region(machine, "textures"); + const UINT8 *gfx = machine->region("textures")->base(); const UINT8 *textureOffset = &gfx[prOptions.texIndex * 1024 * 1024]; for (; x_start <= x_end; x_start++) diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c index b4bd9b9e45d..643e298c6bc 100644 --- a/src/mame/video/homedata.c +++ b/src/mame/video/homedata.c @@ -41,7 +41,7 @@ static void mrokumei_handleblit( address_space *space, int rom_base ) int dest_addr; int base_addr; int opcode, data, num_tiles; - UINT8 *pBlitData = memory_region(space->machine, "user1") + rom_base; + UINT8 *pBlitData = space->machine->region("user1")->base() + rom_base; dest_param = state->blitter_param[(state->blitter_param_count - 4) & 3] * 256 + state->blitter_param[(state->blitter_param_count - 3) & 3]; @@ -127,7 +127,7 @@ static void reikaids_handleblit( address_space *space, int rom_base ) int flipx; int source_addr, base_addr; int dest_addr; - UINT8 *pBlitData = memory_region(space->machine, "user1") + rom_base; + UINT8 *pBlitData = space->machine->region("user1")->base() + rom_base; int opcode, data, num_tiles; @@ -225,7 +225,7 @@ static void pteacher_handleblit( address_space *space, int rom_base ) int source_addr; int dest_addr, base_addr; int opcode, data, num_tiles; - UINT8 *pBlitData = memory_region(space->machine, "user1") + rom_base; + UINT8 *pBlitData = space->machine->region("user1")->base() + rom_base; dest_param = state->blitter_param[(state->blitter_param_count - 4) & 3] * 256 + state->blitter_param[(state->blitter_param_count - 3) & 3]; @@ -826,7 +826,7 @@ WRITE8_HANDLER( reikaids_blitter_start_w ) WRITE8_HANDLER( pteacher_blitter_start_w ) { homedata_state *state = space->machine->driver_data(); - pteacher_handleblit(space, (state->blitter_bank >> 5) * 0x10000 & (memory_region_length(space->machine, "user1") - 1)); + pteacher_handleblit(space, (state->blitter_bank >> 5) * 0x10000 & (space->machine->region("user1")->bytes() - 1)); } diff --git a/src/mame/video/hyhoo.c b/src/mame/video/hyhoo.c index d557fe10e51..65cfdd6c3d9 100644 --- a/src/mame/video/hyhoo.c +++ b/src/mame/video/hyhoo.c @@ -52,7 +52,7 @@ WRITE8_HANDLER( hyhoo_blitter_w ) WRITE8_HANDLER( hyhoo_romsel_w ) { - int gfxlen = memory_region_length(space->machine, "gfx1"); + int gfxlen = space->machine->region("gfx1")->bytes(); hyhoo_gfxrom = (((data & 0xc0) >> 4) + (data & 0x03)); hyhoo_highcolorflag = data; nb1413m3_gfxrombank_w(space, 0, data); @@ -74,7 +74,7 @@ static TIMER_CALLBACK( blitter_timer_callback ) static void hyhoo_gfxdraw(running_machine *machine) { - UINT8 *GFX = memory_region(machine, "gfx1"); + UINT8 *GFX = machine->region("gfx1")->base(); int x, y; int dx1, dx2, dy; @@ -116,7 +116,7 @@ static void hyhoo_gfxdraw(running_machine *machine) skipy = -1; } - gfxlen = memory_region_length(machine, "gfx1"); + gfxlen = machine->region("gfx1")->bytes(); gfxaddr = (hyhoo_gfxrom << 17) + (blitter_src_addr << 1); for (y = starty, ctry = sizey; ctry >= 0; y += skipy, ctry--) diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c index a21c66d37fd..27e113fbe39 100644 --- a/src/mame/video/hyprduel.c +++ b/src/mame/video/hyprduel.c @@ -462,8 +462,8 @@ VIDEO_START( magerror_14220 ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { hyprduel_state *state = machine->driver_data(); - UINT8 *base_gfx = memory_region(machine, "gfx1"); - UINT8 *gfx_max = base_gfx + memory_region_length(machine, "gfx1"); + UINT8 *base_gfx = machine->region("gfx1")->base(); + UINT8 *gfx_max = base_gfx + machine->region("gfx1")->bytes(); int max_x = machine->primary_screen->width(); int max_y = machine->primary_screen->height(); diff --git a/src/mame/video/ikki.c b/src/mame/video/ikki.c index fa34f89d43a..32c13f26072 100644 --- a/src/mame/video/ikki.c +++ b/src/mame/video/ikki.c @@ -128,7 +128,7 @@ VIDEO_UPDATE( ikki ) { ikki_state *state = screen->machine->driver_data(); offs_t offs; - UINT8 *VIDEOATTR = memory_region(screen->machine, "user1"); + UINT8 *VIDEOATTR = screen->machine->region("user1")->base(); /* draw bg layer */ diff --git a/src/mame/video/itech32.c b/src/mame/video/itech32.c index 3b81e40215f..9281855da9a 100644 --- a/src/mame/video/itech32.c +++ b/src/mame/video/itech32.c @@ -222,8 +222,8 @@ VIDEO_START( itech32 ) videoplane[0][i] = videoplane[1][i] = 0xff; /* fetch the GROM base */ - grom_base = memory_region(machine, "gfx1"); - grom_size = memory_region_length(machine, "gfx1"); + grom_base = machine->region("gfx1")->base(); + grom_size = machine->region("gfx1")->bytes(); grom_bank = 0; grom_bank_mask = grom_size >> 24; if (grom_bank_mask == 2) diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c index 963ef1cdec4..6cb6188364a 100644 --- a/src/mame/video/itech8.c +++ b/src/mame/video/itech8.c @@ -202,8 +202,8 @@ VIDEO_START( itech8 ) page_select = 0xc0; /* fetch the GROM base */ - grom_base = memory_region(machine, "grom"); - grom_size = memory_region_length(machine, "grom"); + grom_base = machine->region("grom")->base(); + grom_size = machine->region("grom")->bytes(); } diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c index 44fe8cb40b8..3d5344f0191 100644 --- a/src/mame/video/jackal.c +++ b/src/mame/video/jackal.c @@ -63,7 +63,7 @@ void jackal_mark_tile_dirty( running_machine *machine, int offset ) static TILE_GET_INFO( get_bg_tile_info ) { - UINT8 *RAM = memory_region(machine, "master"); + UINT8 *RAM = machine->region("master")->base(); int attr = RAM[0x2000 + tile_index]; int code = RAM[0x2400 + tile_index] + ((attr & 0xc0) << 2) + ((attr & 0x30) << 6); @@ -82,7 +82,7 @@ VIDEO_START( jackal ) static void draw_background( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { jackal_state *state = machine->driver_data(); - UINT8 *RAM = memory_region(machine, "master"); + UINT8 *RAM = machine->region("master")->base(); int i; state->scrollram = &RAM[0x0020]; @@ -204,7 +204,7 @@ static void draw_sprites_region( running_machine *machine, bitmap_t *bitmap, con static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { jackal_state *state = machine->driver_data(); - UINT8 *RAM = memory_region(machine, "master"); + UINT8 *RAM = machine->region("master")->base(); UINT8 *sr, *ss; if (state->videoctrl[0x03] & 0x08) diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c index 6c0c31d7ce3..62f088e3af5 100644 --- a/src/mame/video/jedi.c +++ b/src/mame/video/jedi.c @@ -137,10 +137,10 @@ static void draw_background_and_text(running_machine *machine, jedi_state *state int y; int background_line_buffer[0x200]; /* RAM chip at 2A */ - UINT8 *tx_gfx = memory_region(machine, "gfx1"); - UINT8 *bg_gfx = memory_region(machine, "gfx2"); - UINT8 *prom1 = &memory_region(machine, "proms")[0x0000 | ((*state->smoothing_table & 0x03) << 8)]; - UINT8 *prom2 = &memory_region(machine, "proms")[0x0800 | ((*state->smoothing_table & 0x03) << 8)]; + UINT8 *tx_gfx = machine->region("gfx1")->base(); + UINT8 *bg_gfx = machine->region("gfx2")->base(); + UINT8 *prom1 = &machine->region("proms")->base()[0x0000 | ((*state->smoothing_table & 0x03) << 8)]; + UINT8 *prom2 = &machine->region("proms")->base()[0x0800 | ((*state->smoothing_table & 0x03) << 8)]; int vscroll = state->vscroll; int hscroll = state->hscroll; int tx_bank = *state->foreground_bank; @@ -236,7 +236,7 @@ static void draw_sprites(running_machine *machine, jedi_state *state, bitmap_t * { offs_t offs; UINT8 *spriteram = state->spriteram; - UINT8 *gfx3 = memory_region(machine, "gfx3"); + UINT8 *gfx3 = machine->region("gfx3")->base(); for (offs = 0x00; offs < 0x30; offs++) { diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c index d96ab556fed..20fead3b012 100644 --- a/src/mame/video/kaneko16.c +++ b/src/mame/video/kaneko16.c @@ -258,7 +258,7 @@ PALETTE_INIT( berlwall ) VIDEO_START( berlwall ) { int sx, x,y; - UINT8 *RAM = memory_region(machine, "gfx3"); + UINT8 *RAM = machine->region("gfx3")->base(); /* Render the hi-color static backgrounds held in the ROMs */ diff --git a/src/mame/video/kangaroo.c b/src/mame/video/kangaroo.c index 77a7815cf0e..53c56a01b0e 100644 --- a/src/mame/video/kangaroo.c +++ b/src/mame/video/kangaroo.c @@ -103,8 +103,8 @@ WRITE8_HANDLER( kangaroo_video_control_w ) static void blitter_execute( running_machine *machine ) { kangaroo_state *state = machine->driver_data(); - UINT32 gfxhalfsize = memory_region_length(machine, "gfx1") / 2; - const UINT8 *gfxbase = memory_region(machine, "gfx1"); + UINT32 gfxhalfsize = machine->region("gfx1")->bytes() / 2; + const UINT8 *gfxbase = machine->region("gfx1")->base(); UINT16 src = state->video_control[0] + 256 * state->video_control[1]; UINT16 dst = state->video_control[2] + 256 * state->video_control[3]; UINT8 height = state->video_control[5]; diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c index 5b2e233ab21..64d5ea96111 100644 --- a/src/mame/video/kncljoe.c +++ b/src/mame/video/kncljoe.c @@ -155,7 +155,7 @@ WRITE8_HANDLER( kncljoe_control_w ) if (state->sprite_bank != i) { state->sprite_bank = i; - memset(memory_region(space->machine, "maincpu") + 0xf100, 0, 0x180); + memset(space->machine->region("maincpu")->base() + 0xf100, 0, 0x180); } } diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c index a9526cdaeb3..3294b2df6ad 100644 --- a/src/mame/video/konamigx.c +++ b/src/mame/video/konamigx.c @@ -1868,7 +1868,7 @@ WRITE32_HANDLER( konamigx_type3_psac2_bank_w ) static TILE_GET_INFO( get_gx_psac3_tile_info ) { int tileno, colour, flip; - UINT8 *tmap = memory_region(machine, "gfx4"); + UINT8 *tmap = machine->region("gfx4")->base(); int base_index = tile_index; @@ -1889,7 +1889,7 @@ WRITE32_HANDLER( konamigx_type3_psac2_bank_w ) static TILE_GET_INFO( get_gx_psac3_alt_tile_info ) { int tileno, colour, flip; - UINT8 *tmap = memory_region(machine, "gfx4")+0x20000; + UINT8 *tmap = machine->region("gfx4")->base()+0x20000; int base_index = tile_index; diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index 5fbb8fe3958..2cf876c86f2 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -1189,16 +1189,16 @@ static void shuffle(UINT16 *buf,int len) /* helper function to join two 16-bit ROMs and form a 32-bit data stream */ void konami_rom_deinterleave_2(running_machine *machine, const char *mem_region) { - shuffle((UINT16 *)memory_region(machine, mem_region),memory_region_length(machine, mem_region)/2); + shuffle((UINT16 *)machine->region(mem_region)->base(),machine->region(mem_region)->bytes()/2); } /* hacked version of rom_deinterleave_2_half for Lethal Enforcers */ void konami_rom_deinterleave_2_half(running_machine *machine, const char *mem_region) { - UINT8 *rgn = memory_region(machine, mem_region); + UINT8 *rgn = machine->region(mem_region)->base(); - shuffle((UINT16 *)rgn,memory_region_length(machine, mem_region)/4); - shuffle((UINT16 *)(rgn+memory_region_length(machine, mem_region)/2),memory_region_length(machine, mem_region)/4); + shuffle((UINT16 *)rgn,machine->region(mem_region)->bytes()/4); + shuffle((UINT16 *)(rgn+machine->region(mem_region)->length()/2),machine->region(mem_region)->bytes()/4); } /* helper function to join four 16-bit ROMs and form a 64-bit data stream */ @@ -2010,13 +2010,13 @@ void K052109_vh_start(running_machine *machine,const char *gfx_memory_region,int switch (plane_order) { case NORMAL_PLANE_ORDER: - total = memory_region_length(machine, gfx_memory_region) / 32; - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout, 4); + total = machine->region(gfx_memory_region)->bytes() / 32; + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout, 4); break; case GRADIUS3_PLANE_ORDER: total = 0x1000; - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout_gradius3, 4); + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout_gradius3, 4); break; default: @@ -2110,11 +2110,11 @@ else (*K052109_callback)(0,bank,&code,&color,&flags,&priority); addr = (code << 5) + (offset & 0x1f); - addr &= memory_region_length(space->machine, K052109_memory_region)-1; + addr &= space->machine->region(K052109_memory_region)->bytes()-1; // logerror("%04x: off = %04x sub = %02x (bnk = %x) adr = %06x\n",cpu_get_pc(space->cpu),offset,K052109_romsubbank,bank,addr); - return memory_region(space->machine, K052109_memory_region)[addr]; + return space->machine->region(K052109_memory_region)->base()[addr]; } } @@ -2517,18 +2517,18 @@ void K051960_vh_start(running_machine *machine,const char *gfx_memory_region,int switch (plane_order) { case NORMAL_PLANE_ORDER: - total = memory_region_length(machine, gfx_memory_region) / 128; - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &spritelayout, 4); + total = machine->region(gfx_memory_region)->bytes() / 128; + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &spritelayout, 4); break; case REVERSE_PLANE_ORDER: - total = memory_region_length(machine, gfx_memory_region) / 128; - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &spritelayout_reverse, 4); + total = machine->region(gfx_memory_region)->bytes() / 128; + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &spritelayout_reverse, 4); break; case GRADIUS3_PLANE_ORDER: total = 0x4000; - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &spritelayout_gradius3, 4); + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &spritelayout_gradius3, 4); break; default: @@ -2570,11 +2570,11 @@ static int K051960_fetchromdata(running_machine *machine, int byte) (*K051960_callback)(&code,&color,&pri,&shadow); addr = (code << 7) | (off1 << 2) | byte; - addr &= memory_region_length(machine, K051960_memory_region)-1; + addr &= machine->region(K051960_memory_region)->bytes()-1; // popmessage("%s: addr %06x",cpuexec_describe_context(machine),addr); - return memory_region(machine, K051960_memory_region)[addr]; + return machine->region(K051960_memory_region)->base()[addr]; } READ8_HANDLER( K051960_r ) @@ -3027,8 +3027,8 @@ void K053245_vh_start(running_machine *machine,int chip, const char *gfx_memory_ switch (plane_order) { case NORMAL_PLANE_ORDER: - total = memory_region_length(machine, gfx_memory_region) / 128; - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &spritelayout, 4); + total = machine->region(gfx_memory_region)->bytes() / 128; + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &spritelayout, 4); break; default: @@ -3122,11 +3122,11 @@ static UINT8 K053244_chip_r (running_machine *machine, int chip, int offset) addr = (K053244_rombank[chip] << 19) | ((K053244_regs[chip][11] & 0x7) << 18) | (K053244_regs[chip][8] << 10) | (K053244_regs[chip][9] << 2) | ((offset & 3) ^ 1); - addr &= memory_region_length(machine, K053245_memory_region[chip])-1; + addr &= machine->region(K053245_memory_region[chip])->bytes()-1; // popmessage("%s: offset %02x addr %06x",cpuexec_describe_context(machine),offset&3,addr); - return memory_region(machine, K053245_memory_region[chip])[addr]; + return machine->region(K053245_memory_region[chip])->base()[addr]; } else if (offset == 0x06) { @@ -3792,13 +3792,13 @@ void K053247_vh_start(running_machine *machine, const char *gfx_memory_region, i switch (plane_order) { case NORMAL_PLANE_ORDER: - total = memory_region_length(machine, gfx_memory_region) / 128; - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &spritelayout, 4); + total = machine->region(gfx_memory_region)->bytes() / 128; + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &spritelayout, 4); break; case TASMAN_PLANE_ORDER: - total = memory_region_length(machine, gfx_memory_region) / 128; - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &tasman_16x16_layout, 4); + total = machine->region(gfx_memory_region)->bytes() / 128; + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &tasman_16x16_layout, 4); break; default: @@ -3900,19 +3900,19 @@ void K055673_vh_start(running_machine *machine, const char *gfx_memory_region, i break; assert(gfx_index != MAX_GFX_ELEMENTS); - K055673_rom = (UINT16 *)memory_region(machine, gfx_memory_region); + K055673_rom = (UINT16 *)machine->region(gfx_memory_region)->base(); /* decode the graphics */ switch(layout) { case K055673_LAYOUT_GX: - size4 = (memory_region_length(machine, gfx_memory_region)/(1024*1024))/5; + size4 = (machine->region(gfx_memory_region)->bytes()/(1024*1024))/5; size4 *= 4*1024*1024; /* set the # of tiles based on the 4bpp section */ K055673_rom = auto_alloc_array(machine, UINT16, size4 * 5 / 2); d = (UINT8 *)K055673_rom; // now combine the graphics together to form 5bpp - s1 = memory_region(machine, gfx_memory_region); // 4bpp area + s1 = machine->region(gfx_memory_region)->base(); // 4bpp area s2 = s1 + (size4); // 1bpp area for (i = 0; i < size4; i+= 4) { @@ -3928,17 +3928,17 @@ void K055673_vh_start(running_machine *machine, const char *gfx_memory_region, i break; case K055673_LAYOUT_RNG: - total = memory_region_length(machine, gfx_memory_region) / (16*16/2); + total = machine->region(gfx_memory_region)->bytes() / (16*16/2); decode_gfx(machine, gfx_index, (UINT8 *)K055673_rom, total, &spritelayout2, 4); break; case K055673_LAYOUT_LE2: - total = memory_region_length(machine, gfx_memory_region) / (16*16); + total = machine->region(gfx_memory_region)->bytes() / (16*16); decode_gfx(machine, gfx_index, (UINT8 *)K055673_rom, total, &spritelayout3, 4); break; case K055673_LAYOUT_GX6: - total = memory_region_length(machine, gfx_memory_region) / (16*16*6/8); + total = machine->region(gfx_memory_region)->bytes() / (16*16*6/8); decode_gfx(machine, gfx_index, (UINT8 *)K055673_rom, total, &spritelayout4, 4); break; @@ -4035,9 +4035,9 @@ WRITE8_HANDLER( K053247_w ) // in this window, +0 = 32 bits from one set of ROMs, and +8 = 32 bits from another set READ16_HANDLER( K055673_rom_word_r ) // 5bpp { - UINT8 *ROM8 = (UINT8 *)memory_region(space->machine, K053247_memory_region); - UINT16 *ROM = (UINT16 *)memory_region(space->machine, K053247_memory_region); - int size4 = (memory_region_length(space->machine, K053247_memory_region)/(1024*1024))/5; + UINT8 *ROM8 = (UINT8 *)space->machine->region(K053247_memory_region)->base(); + UINT16 *ROM = (UINT16 *)space->machine->region(K053247_memory_region)->base(); + int size4 = (space->machine->region(K053247_memory_region)->bytes()/(1024*1024))/5; int romofs; size4 *= 4*1024*1024; // get offset to 5th bit @@ -4073,7 +4073,7 @@ READ16_HANDLER( K055673_rom_word_r ) // 5bpp READ16_HANDLER( K055673_GX6bpp_rom_word_r ) { - UINT16 *ROM = (UINT16 *)memory_region(space->machine, K053247_memory_region); + UINT16 *ROM = (UINT16 *)space->machine->region(K053247_memory_region)->base(); int romofs; romofs = K053246_regs[6]<<16 | K053246_regs[7]<<8 | K053246_regs[4]; @@ -4113,10 +4113,10 @@ READ8_HANDLER( K053246_r ) int addr; addr = (K053246_regs[6] << 17) | (K053246_regs[7] << 9) | (K053246_regs[4] << 1) | ((offset & 1) ^ 1); - addr &= memory_region_length(space->machine, K053247_memory_region)-1; + addr &= space->machine->region(K053247_memory_region)->bytes()-1; if (VERBOSE) popmessage("%04x: offset %02x addr %06x",cpu_get_pc(space->cpu),offset,addr); - return memory_region(space->machine, K053247_memory_region)[addr]; + return space->machine->region(K053247_memory_region)->base()[addr]; } else { @@ -4691,22 +4691,22 @@ static void K051316_vh_start(running_machine *machine,int chip, const char *gfx_ case -4: total = 0x400; bpp = 4; - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout_tail2nos, 4); + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout_tail2nos, 4); break; case 4: - total = memory_region_length(machine, gfx_memory_region) / 128; - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout4, 4); + total = machine->region(gfx_memory_region)->bytes() / 128; + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout4, 4); break; case 7: - total = memory_region_length(machine, gfx_memory_region) / 256; - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout7, 7); + total = machine->region(gfx_memory_region)->bytes() / 256; + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout7, 7); break; case 8: - total = memory_region_length(machine, gfx_memory_region) / 256; - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout8, 8); + total = machine->region(gfx_memory_region)->bytes() / 256; + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout8, 8); break; default: @@ -4813,11 +4813,11 @@ static int K051316_rom_r(running_machine *machine, int chip, int offset) addr = offset + (K051316_ctrlram[chip][0x0c] << 11) + (K051316_ctrlram[chip][0x0d] << 19); if (K051316_bpp[chip] <= 4) addr /= 2; - addr &= memory_region_length(machine, K051316_memory_region[chip])-1; + addr &= machine->region(K051316_memory_region[chip])->bytes()-1; // popmessage("%s: offset %04x addr %04x",cpuexec_describe_context(machine),offset,addr); - return memory_region(machine, K051316_memory_region[chip])[addr]; + return machine->region(K051316_memory_region[chip])->base()[addr]; } else { @@ -5773,38 +5773,38 @@ void K056832_vh_start(running_machine *machine, const char *gfx_memory_region, i switch (bpp) { case K056832_BPP_4: - total = memory_region_length(machine, gfx_memory_region) / (i*4); - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout4, 4); + total = machine->region(gfx_memory_region)->bytes() / (i*4); + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout4, 4); break; case K056832_BPP_5: - total = memory_region_length(machine, gfx_memory_region) / (i*5); - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout5, 4); + total = machine->region(gfx_memory_region)->bytes() / (i*5); + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout5, 4); break; case K056832_BPP_6: - total = memory_region_length(machine, gfx_memory_region) / (i*6); - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout6, 4); + total = machine->region(gfx_memory_region)->bytes() / (i*6); + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout6, 4); break; case K056832_BPP_8: - total = memory_region_length(machine, gfx_memory_region) / (i*8); - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout8, 4); + total = machine->region(gfx_memory_region)->bytes() / (i*8); + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout8, 4); break; case K056832_BPP_8LE: - total = memory_region_length(machine, gfx_memory_region) / (i*8); - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout8le, 4); + total = machine->region(gfx_memory_region)->bytes() / (i*8); + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout8le, 4); break; case K056832_BPP_8TASMAN: - total = memory_region_length(machine, gfx_memory_region) / (i*8); - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout8_tasman, 4); + total = machine->region(gfx_memory_region)->bytes() / (i*8); + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout8_tasman, 4); break; case K056832_BPP_4dj: - total = memory_region_length(machine, gfx_memory_region) / (i*4); - decode_gfx(machine, gfx_index, memory_region(machine, gfx_memory_region), total, &charlayout4dj, 4); + total = machine->region(gfx_memory_region)->bytes() / (i*4); + decode_gfx(machine, gfx_index, machine->region(gfx_memory_region)->base(), total, &charlayout4dj, 4); break; default: @@ -5817,8 +5817,8 @@ void K056832_vh_start(running_machine *machine, const char *gfx_memory_region, i K056832_gfxnum = gfx_index; K056832_callback = callback; - K056832_rombase = memory_region(machine, gfx_memory_region); - K056832_NumGfxBanks = memory_region_length(machine, gfx_memory_region) / 0x2000; + K056832_rombase = machine->region(gfx_memory_region)->base(); + K056832_NumGfxBanks = machine->region(gfx_memory_region)->bytes() / 0x2000; K056832_CurGfxBank = 0; K056832_use_ext_linescroll = 0; K056832_uses_tile_banks = 0; @@ -5918,7 +5918,7 @@ static int K056832_rom_read_b(running_machine *machine, int offset, int blksize, UINT8 *rombase; int base, ret; - rombase = (UINT8 *)memory_region(machine, K056832_memory_region); + rombase = (UINT8 *)machine->region(K056832_memory_region)->base(); if ((K056832_rom_half) && (zerosec)) { @@ -6031,7 +6031,7 @@ READ16_HANDLER( K056832_rom_word_r ) if (!K056832_rombase) { - K056832_rombase = memory_region(space->machine, K056832_memory_region); + K056832_rombase = space->machine->region(K056832_memory_region)->base(); } rombase = (UINT8 *)K056832_rombase; @@ -6058,7 +6058,7 @@ READ16_HANDLER( K056832_mw_rom_word_r ) if (!K056832_rombase) { - K056832_rombase = memory_region(space->machine, K056832_memory_region); + K056832_rombase = space->machine->region(K056832_memory_region)->base(); } if (K056832_regsb[2] & 0x8) @@ -6123,7 +6123,7 @@ READ16_HANDLER( K056832_bishi_rom_word_r ) if (!K056832_rombase) { - K056832_rombase = memory_region(space->machine, K056832_memory_region); + K056832_rombase = space->machine->region(K056832_memory_region)->base(); } return K056832_rombase[addr+2] | (K056832_rombase[addr] << 8); @@ -6135,7 +6135,7 @@ READ16_HANDLER( K056832_rom_word_8000_r ) if (!K056832_rombase) { - K056832_rombase = memory_region(space->machine, K056832_memory_region); + K056832_rombase = space->machine->region(K056832_memory_region)->base(); } return K056832_rombase[addr+2] | (K056832_rombase[addr] << 8); @@ -6147,7 +6147,7 @@ READ16_HANDLER( K056832_old_rom_word_r ) if (!K056832_rombase) { - K056832_rombase = memory_region(space->machine, K056832_memory_region); + K056832_rombase = space->machine->region(K056832_memory_region)->base(); } return K056832_rombase[addr+1] | (K056832_rombase[addr] << 8); @@ -7615,8 +7615,8 @@ void K053250_unpack_pixels(running_machine *machine, const char *region) UINT8 *src_ptr, *dst_ptr; int hi_nibble, lo_nibble, offset; - dst_ptr = src_ptr = memory_region(machine, region); - offset = memory_region_length(machine, region) / 2 - 1; + dst_ptr = src_ptr = machine->region(region)->base(); + offset = machine->region(region)->bytes() / 2 - 1; do { @@ -7638,14 +7638,14 @@ void K053250_vh_start(running_machine *machine, int chips, const char **region) for(chip=0; chipregion(region[chip])->base(); ram = auto_alloc_array(machine, UINT16, 0x6000/2); K053250_info.chip[chip].ram = ram; K053250_info.chip[chip].rammax = ram + 0x800; K053250_info.chip[chip].buffer[0] = ram + 0x2000; K053250_info.chip[chip].buffer[1] = ram + 0x2800; memset(ram+0x2000, 0, 0x2000); - K053250_info.chip[chip].rommask = memory_region_length(machine, region[chip]); + K053250_info.chip[chip].rommask = machine->region(region[chip])->bytes(); K053250_info.chip[chip].page[1] = K053250_info.chip[chip].page[0] = 0; K053250_info.chip[chip].offsy = K053250_info.chip[chip].offsx = 0; K053250_info.chip[chip].frame = -1; diff --git a/src/mame/video/konicdev.c b/src/mame/video/konicdev.c index 99890b07c37..bc5fdeec95e 100644 --- a/src/mame/video/konicdev.c +++ b/src/mame/video/konicdev.c @@ -1213,16 +1213,16 @@ static void konami_shuffle_8(UINT8 *buf,int len) /* helper function to join two 16-bit ROMs and form a 32-bit data stream */ void konamid_rom_deinterleave_2(running_machine *machine, const char *mem_region) { - konami_shuffle_16((UINT16 *)memory_region(machine, mem_region),memory_region_length(machine, mem_region)/2); + konami_shuffle_16((UINT16 *)machine->region(mem_region)->base(),machine->region(mem_region)->bytes()/2); } /* hacked version of rom_deinterleave_2_half for Lethal Enforcers */ void konamid_rom_deinterleave_2_half(running_machine *machine, const char *mem_region) { - UINT8 *rgn = memory_region(machine, mem_region); + UINT8 *rgn = machine->region(mem_region)->base(); - konami_shuffle_16((UINT16 *)rgn,memory_region_length(machine, mem_region)/4); - konami_shuffle_16((UINT16 *)(rgn+memory_region_length(machine, mem_region)/2),memory_region_length(machine, mem_region)/4); + konami_shuffle_16((UINT16 *)rgn,machine->region(mem_region)->bytes()/4); + konami_shuffle_16((UINT16 *)(rgn+machine->region(mem_region)->bytes()/2),machine->region(mem_region)->bytes()/4); } /* helper function to join four 16-bit ROMs and form a 64-bit data stream */ @@ -1259,7 +1259,7 @@ static void deinterleave_gfx(running_machine *machine, const char *gfx_memory_re konamid_rom_deinterleave_4(machine, gfx_memory_region); break; case KONAMI_ROM_SHUFFLE8: - konami_shuffle_8(memory_region(machine, gfx_memory_region), memory_region_length(machine, gfx_memory_region)); + konami_shuffle_8(machine->region(gfx_memory_region)->base(), machine->region(gfx_memory_region)->bytes()); break; } } @@ -2227,11 +2227,11 @@ READ8_DEVICE_HANDLER( k052109_r ) k052109->callback(device->machine, 0, bank, &code, &color, &flags, &priority); addr = (code << 5) + (offset & 0x1f); - addr &= memory_region_length(device->machine, k052109->memory_region) - 1; + addr &= device->machine->region(k052109->memory_region)->bytes() - 1; // logerror("%04x: off = %04x sub = %02x (bnk = %x) adr = %06x\n", cpu_get_pc(space->cpu), offset, k052109->romsubbank, bank, addr); - return memory_region(device->machine, k052109->memory_region)[addr]; + return device->machine->region(k052109->memory_region)->base()[addr]; } } @@ -2696,13 +2696,13 @@ static DEVICE_START( k052109 ) switch (intf->plane_order) { case NORMAL_PLANE_ORDER: - total = memory_region_length(machine, intf->gfx_memory_region) / 32; - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / 32; + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout, 4); break; case GRADIUS3_PLANE_ORDER: total = 0x1000; - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout_gradius3, 4); + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout_gradius3, 4); break; default: @@ -2835,11 +2835,11 @@ static int k051960_fetchromdata( device_t *device, int byte ) k051960->callback(device->machine, &code, &color, &pri, &shadow); addr = (code << 7) | (off1 << 2) | byte; - addr &= memory_region_length(device->machine, k051960->memory_region) - 1; + addr &= device->machine->region(k051960->memory_region)->bytes() - 1; // popmessage("%s: addr %06x", cpuexec_describe_context(device->machine), addr); - return memory_region(device->machine, k051960->memory_region)[addr]; + return device->machine->region(k051960->memory_region)->base()[addr]; } READ8_DEVICE_HANDLER( k051960_r ) @@ -3248,18 +3248,18 @@ static DEVICE_START( k051960 ) switch (intf->plane_order) { case NORMAL_PLANE_ORDER: - total = memory_region_length(machine, intf->gfx_memory_region) / 128; - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &spritelayout, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / 128; + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &spritelayout, 4); break; case REVERSE_PLANE_ORDER: - total = memory_region_length(machine, intf->gfx_memory_region) / 128; - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &spritelayout_reverse, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / 128; + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &spritelayout_reverse, 4); break; case GRADIUS3_PLANE_ORDER: total = 0x4000; - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &spritelayout_gradius3, 4); + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &spritelayout_gradius3, 4); break; default: @@ -3430,11 +3430,11 @@ READ8_DEVICE_HANDLER( k053244_r ) addr = (k053244->rombank << 19) | ((k053244->regs[11] & 0x7) << 18) | (k053244->regs[8] << 10) | (k053244->regs[9] << 2) | ((offset & 3) ^ 1); - addr &= memory_region_length(machine, k053244->memory_region) - 1; + addr &= machine->region(k053244->memory_region)->bytes() - 1; // popmessage("%s: offset %02x addr %06x", cpuexec_describe_context(machine), offset & 3, addr); - return memory_region(machine, k053244->memory_region)[addr]; + return machine->region(k053244->memory_region)->base()[addr]; } else if (offset == 0x06) { @@ -4059,8 +4059,8 @@ static DEVICE_START( k05324x ) switch (intf->plane_order) { case NORMAL_PLANE_ORDER: - total = memory_region_length(machine, intf->gfx_memory_region) / 128; - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &spritelayout, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / 128; + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &spritelayout, 4); break; default: @@ -4284,9 +4284,9 @@ WRITE8_DEVICE_HANDLER( k053247_w ) READ16_DEVICE_HANDLER( k055673_rom_word_r ) // 5bpp { k053247_state *k053246 = k053247_get_safe_token(device); - UINT8 *ROM8 = (UINT8 *)memory_region(device->machine, k053246->memory_region); - UINT16 *ROM = (UINT16 *)memory_region(device->machine, k053246->memory_region); - int size4 = (memory_region_length(device->machine, k053246->memory_region) / (1024 * 1024)) / 5; + UINT8 *ROM8 = (UINT8 *)device->machine->region(k053246->memory_region)->base(); + UINT16 *ROM = (UINT16 *)device->machine->region(k053246->memory_region)->base(); + int size4 = (device->machine->region(k053246->memory_region)->bytes() / (1024 * 1024)) / 5; int romofs; size4 *= 4 * 1024 * 1024; // get offset to 5th bit @@ -4323,7 +4323,7 @@ READ16_DEVICE_HANDLER( k055673_rom_word_r ) // 5bpp READ16_DEVICE_HANDLER( k055673_GX6bpp_rom_word_r ) { k053247_state *k053246 = k053247_get_safe_token(device); - UINT16 *ROM = (UINT16 *)memory_region(device->machine, k053246->memory_region); + UINT16 *ROM = (UINT16 *)device->machine->region(k053246->memory_region)->base(); int romofs; romofs = k053246->kx46_regs[6] << 16 | k053246->kx46_regs[7] << 8 | k053246->kx46_regs[4]; @@ -4363,10 +4363,10 @@ READ8_DEVICE_HANDLER( k053246_r ) int addr; addr = (k053246->kx46_regs[6] << 17) | (k053246->kx46_regs[7] << 9) | (k053246->kx46_regs[4] << 1) | ((offset & 1) ^ 1); - addr &= memory_region_length(device->machine, k053246->memory_region) - 1; + addr &= device->machine->region(k053246->memory_region)->bytes() - 1; // if (VERBOSE) // popmessage("%04x: offset %02x addr %06x", cpu_get_pc(space->cpu), offset, addr); - return memory_region(device->machine, k053246->memory_region)[addr]; + return device->machine->region(k053246->memory_region)->base()[addr]; } else { @@ -4888,13 +4888,13 @@ static DEVICE_START( k053247 ) switch (intf->plane_order) { case NORMAL_PLANE_ORDER: - total = memory_region_length(machine, intf->gfx_memory_region) / 128; - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &spritelayout, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / 128; + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &spritelayout, 4); break; case TASMAN_PLANE_ORDER: - total = memory_region_length(machine, intf->gfx_memory_region) / 128; - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &tasman_16x16_layout, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / 128; + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &tasman_16x16_layout, 4); break; default: @@ -4992,19 +4992,19 @@ static DEVICE_START( k055673 ) k053247->screen = machine->device(intf->screen); - K055673_rom = (UINT16 *)memory_region(machine, intf->gfx_memory_region); + K055673_rom = (UINT16 *)machine->region(intf->gfx_memory_region)->base(); /* decode the graphics */ switch (intf->plane_order) /* layout would be more correct than plane_order, but we use k053247_interface */ { case K055673_LAYOUT_GX: - size4 = (memory_region_length(machine, intf->gfx_memory_region) / (1024 * 1024)) / 5; + size4 = (machine->region(intf->gfx_memory_region)->bytes() / (1024 * 1024)) / 5; size4 *= 4 * 1024 * 1024; /* set the # of tiles based on the 4bpp section */ K055673_rom = auto_alloc_array(machine, UINT16, size4 * 5 / 2); d = (UINT8 *)K055673_rom; // now combine the graphics together to form 5bpp - s1 = memory_region(machine, intf->gfx_memory_region); // 4bpp area + s1 = machine->region(intf->gfx_memory_region)->base(); // 4bpp area s2 = s1 + (size4); // 1bpp area for (i = 0; i < size4; i+= 4) { @@ -5020,17 +5020,17 @@ static DEVICE_START( k055673 ) break; case K055673_LAYOUT_RNG: - total = memory_region_length(machine, intf->gfx_memory_region) / (16 * 16 / 2); + total = machine->region(intf->gfx_memory_region)->bytes() / (16 * 16 / 2); decode_gfx(machine, intf->gfx_num, (UINT8 *)K055673_rom, total, &spritelayout2, 4); break; case K055673_LAYOUT_LE2: - total = memory_region_length(machine, intf->gfx_memory_region) / (16 * 16); + total = machine->region(intf->gfx_memory_region)->bytes() / (16 * 16); decode_gfx(machine, intf->gfx_num, (UINT8 *)K055673_rom, total, &spritelayout3, 4); break; case K055673_LAYOUT_GX6: - total = memory_region_length(machine, intf->gfx_memory_region) / (16 * 16 * 6 / 8); + total = machine->region(intf->gfx_memory_region)->bytes() / (16 * 16 * 6 / 8); decode_gfx(machine, intf->gfx_num, (UINT8 *)K055673_rom, total, &spritelayout4, 4); break; @@ -5168,11 +5168,11 @@ READ8_DEVICE_HANDLER( k051316_rom_r ) int addr = offset + (k051316->ctrlram[0x0c] << 11) + (k051316->ctrlram[0x0d] << 19); if (k051316->bpp <= 4) addr /= 2; - addr &= memory_region_length(device->machine, k051316->memory_region) - 1; + addr &= device->machine->region(k051316->memory_region)->bytes() - 1; // popmessage("%s: offset %04x addr %04x", cpuexec_describe_context(device->machine), offset, addr); - return memory_region(device->machine, k051316->memory_region)[addr]; + return device->machine->region(k051316->memory_region)->base()[addr]; } else { @@ -5338,22 +5338,22 @@ static DEVICE_START( k051316 ) case -4: total = 0x400; is_tail2nos = 1; - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout_tail2nos, 4); + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout_tail2nos, 4); break; case 4: - total = memory_region_length(machine, intf->gfx_memory_region) / 128; - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout4, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / 128; + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout4, 4); break; case 7: - total = memory_region_length(machine, intf->gfx_memory_region) / 256; - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout7, 7); + total = machine->region(intf->gfx_memory_region)->bytes() / 256; + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout7, 7); break; case 8: - total = memory_region_length(machine, intf->gfx_memory_region) / 256; - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout8, 8); + total = machine->region(intf->gfx_memory_region)->bytes() / 256; + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout8, 8); break; default: @@ -6373,7 +6373,7 @@ static int k056832_rom_read_b( device_t *device, int offset, int blksize, int bl UINT8 *rombase; int base, ret; - rombase = (UINT8 *)memory_region(device->machine, k056832->memory_region); + rombase = (UINT8 *)device->machine->region(k056832->memory_region)->base(); if ((k056832->rom_half) && (zerosec)) { @@ -6464,7 +6464,7 @@ READ16_DEVICE_HANDLER( k056832_rom_word_r ) if (!k056832->rombase) { - k056832->rombase = memory_region(device->machine, k056832->memory_region); + k056832->rombase = device->machine->region(k056832->memory_region)->base(); } rombase = (UINT8 *)k056832->rombase; @@ -6490,7 +6490,7 @@ READ16_DEVICE_HANDLER( k056832_mw_rom_word_r ) int addr; if (!k056832->rombase) - k056832->rombase = memory_region(device->machine, k056832->memory_region); + k056832->rombase = device->machine->region(k056832->memory_region)->base(); if (k056832->regsb[2] & 0x8) { @@ -6553,7 +6553,7 @@ READ16_DEVICE_HANDLER( k056832_bishi_rom_word_r ) int addr = 0x4000 * k056832->cur_gfx_banks + offset; if (!k056832->rombase) - k056832->rombase = memory_region(device->machine, k056832->memory_region); + k056832->rombase = device->machine->region(k056832->memory_region)->base(); return k056832->rombase[addr + 2] | (k056832->rombase[addr] << 8); } @@ -6564,7 +6564,7 @@ READ16_DEVICE_HANDLER( k056832_rom_word_8000_r ) int addr = 0x8000 * k056832->cur_gfx_banks + 2 * offset; if (!k056832->rombase) - k056832->rombase = memory_region(device->machine, k056832->memory_region); + k056832->rombase = device->machine->region(k056832->memory_region)->base(); return k056832->rombase[addr + 2] | (k056832->rombase[addr] << 8); } @@ -6575,7 +6575,7 @@ READ16_DEVICE_HANDLER( k056832_old_rom_word_r ) int addr = 0x2000 * k056832->cur_gfx_banks + 2 * offset; if (!k056832->rombase) - k056832->rombase = memory_region(device->machine, k056832->memory_region); + k056832->rombase = device->machine->region(k056832->memory_region)->base(); return k056832->rombase[addr + 1] | (k056832->rombase[addr] << 8); } @@ -7847,38 +7847,38 @@ static DEVICE_START( k056832 ) switch (intf->bpp) { case K056832_BPP_4: - total = memory_region_length(machine, intf->gfx_memory_region) / (i * 4); - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout4, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / (i * 4); + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout4, 4); break; case K056832_BPP_5: - total = memory_region_length(machine, intf->gfx_memory_region) / (i * 5); - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout5, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / (i * 5); + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout5, 4); break; case K056832_BPP_6: - total = memory_region_length(machine, intf->gfx_memory_region) / (i * 6); - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout6, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / (i * 6); + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout6, 4); break; case K056832_BPP_8: - total = memory_region_length(machine, intf->gfx_memory_region) / (i * 8); - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout8, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / (i * 8); + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout8, 4); break; case K056832_BPP_8LE: - total = memory_region_length(machine, intf->gfx_memory_region) / (i * 8); - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout8le, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / (i * 8); + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout8le, 4); break; case K056832_BPP_8TASMAN: - total = memory_region_length(machine, intf->gfx_memory_region) / (i * 8); - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout8_tasman, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / (i * 8); + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout8_tasman, 4); break; case K056832_BPP_4dj: - total = memory_region_length(machine, intf->gfx_memory_region) / (i * 4); - decode_gfx(machine, intf->gfx_num, memory_region(machine, intf->gfx_memory_region), total, &charlayout4dj, 4); + total = machine->region(intf->gfx_memory_region)->bytes() / (i * 4); + decode_gfx(machine, intf->gfx_num, machine->region(intf->gfx_memory_region)->base(), total, &charlayout4dj, 4); break; default: @@ -7894,8 +7894,8 @@ static DEVICE_START( k056832 ) k056832->gfxnum = intf->gfx_num; k056832->callback = intf->callback; - k056832->rombase = memory_region(machine, intf->gfx_memory_region); - k056832->num_gfx_banks = memory_region_length(machine, intf->gfx_memory_region) / 0x2000; + k056832->rombase = machine->region(intf->gfx_memory_region)->base(); + k056832->num_gfx_banks = machine->region(intf->gfx_memory_region)->bytes() / 0x2000; k056832->djmain_hack = intf->djmain_hack; k056832->cur_gfx_banks = 0; @@ -8541,8 +8541,8 @@ static void k053250_unpack_pixels(running_machine *machine, const char *region) UINT8 *src_ptr, *dst_ptr; int hi_nibble, lo_nibble, offset; - dst_ptr = src_ptr = memory_region(machine, region); - offset = memory_region_length(machine, region) / 2 - 1; + dst_ptr = src_ptr = machine->region(region)->base(); + offset = machine->region(region)->bytes() / 2 - 1; do { @@ -8945,8 +8945,8 @@ static DEVICE_START( k053250 ) k053250_state *k053250 = k053250_get_safe_token(device); const k053250_interface *intf = k053250_get_interface(device); - k053250->base = memory_region(device->machine, intf->gfx_memory_region); - k053250->rommask = memory_region_length(device->machine, intf->gfx_memory_region); + k053250->base = device->machine->region(intf->gfx_memory_region)->base(); + k053250->rommask = device->machine->region(intf->gfx_memory_region)->bytes(); k053250->screen = device->machine->device(intf->screen); @@ -9113,7 +9113,7 @@ READ32_DEVICE_HANDLER( k001006_r ) { case 0x0b: // CG Board ROM read { - UINT16 *rom = (UINT16*)memory_region(device->machine, k001006->gfx_region); + UINT16 *rom = (UINT16*)device->machine->region(k001006->gfx_region)->base(); return rom[k001006->addr / 2] << 16; } case 0x0d: // Palette RAM read @@ -10089,7 +10089,7 @@ static DEVICE_START( k001005 ) height = k001005->screen->height(); k001005->zbuffer = auto_bitmap_alloc(device->machine, width, height, BITMAP_FORMAT_INDEXED32); - k001005->gfxrom = memory_region(device->machine, intf->gfx_memory_region); + k001005->gfxrom = device->machine->region(intf->gfx_memory_region)->base(); k001005->bitmap[0] = k001005->screen->alloc_compatible_bitmap(); k001005->bitmap[1] = k001005->screen->alloc_compatible_bitmap(); diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c index c3eaa935d56..0ceafc00dec 100644 --- a/src/mame/video/ksayakyu.c +++ b/src/mame/video/ksayakyu.c @@ -34,7 +34,7 @@ WRITE8_HANDLER(ksayakyu_videoctrl_w) PALETTE_INIT( ksayakyu ) { - const UINT8 *prom = memory_region(machine, "proms"); + const UINT8 *prom = machine->region("proms")->base(); int r, g, b, i; for (i = 0; i < 0x100; i++) @@ -49,8 +49,8 @@ PALETTE_INIT( ksayakyu ) static TILE_GET_INFO( get_ksayakyu_tile_info ) { - int code = memory_region(machine, "user1")[tile_index]; - int attr = memory_region(machine, "user1")[tile_index + 0x2000]; + int code = machine->region("user1")->base()[tile_index]; + int attr = machine->region("user1")->base()[tile_index + 0x2000]; code += (attr & 3) << 8; SET_TILE_INFO(1, code, ((attr >> 2) & 0x0f) * 2, (attr & 0x80) ? TILE_FLIPX : 0); } diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c index 29b4b239b14..a6ee4f078e8 100644 --- a/src/mame/video/kyugo.c +++ b/src/mame/video/kyugo.c @@ -47,7 +47,7 @@ VIDEO_START( kyugo ) { kyugo_state *state = machine->driver_data(); - state->color_codes = memory_region(machine, "proms") + 0x300; + state->color_codes = machine->region("proms")->base() + 0x300; state->fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); state->bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 64, 32); diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c index 3bd8ee5ef95..d6241a315e5 100644 --- a/src/mame/video/lasso.c +++ b/src/mame/video/lasso.c @@ -134,7 +134,7 @@ static TILE_GET_INFO( lasso_get_bg_tile_info ) static TILE_GET_INFO( wwjgtin_get_track_tile_info ) { - UINT8 *ROM = memory_region(machine, "user1"); + UINT8 *ROM = machine->region("user1")->base(); int code = ROM[tile_index]; int color = ROM[tile_index + 0x2000]; diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c index f1c49ec60a0..8d69c7c6cb5 100644 --- a/src/mame/video/leland.c +++ b/src/mame/video/leland.c @@ -406,9 +406,9 @@ static VIDEO_UPDATE( leland ) { int y; - const UINT8 *bg_prom = memory_region(screen->machine, "user1"); - const UINT8 *bg_gfx = memory_region(screen->machine, "gfx1"); - offs_t bg_gfx_bank_page_size = memory_region_length(screen->machine, "gfx1") / 3; + const UINT8 *bg_prom = screen->machine->region("user1")->base(); + const UINT8 *bg_gfx = screen->machine->region("gfx1")->base(); + offs_t bg_gfx_bank_page_size = screen->machine->region("gfx1")->bytes() / 3; offs_t char_bank = (((gfxbank >> 4) & 0x03) * 0x2000) & (bg_gfx_bank_page_size - 1); offs_t prom_bank = ((gfxbank >> 3) & 0x01) * 0x2000; @@ -474,8 +474,8 @@ static VIDEO_UPDATE( ataxx ) { int y; - const UINT8 *bg_gfx = memory_region(screen->machine, "gfx1"); - offs_t bg_gfx_bank_page_size = memory_region_length(screen->machine, "gfx1") / 6; + const UINT8 *bg_gfx = screen->machine->region("gfx1")->base(); + offs_t bg_gfx_bank_page_size = screen->machine->region("gfx1")->bytes() / 6; offs_t bg_gfx_offs_mask = bg_gfx_bank_page_size - 1; /* for each scanline in the visible region */ diff --git a/src/mame/video/lethalj.c b/src/mame/video/lethalj.c index c1e9a92ec28..c3f23054cb6 100644 --- a/src/mame/video/lethalj.c +++ b/src/mame/video/lethalj.c @@ -94,8 +94,8 @@ VIDEO_START( lethalj ) screenram = auto_alloc_array(machine, UINT16, BLITTER_DEST_WIDTH * BLITTER_DEST_HEIGHT); /* predetermine blitter info */ - blitter_base = (UINT16 *)memory_region(machine, "gfx1"); - blitter_rows = memory_region_length(machine, "gfx1") / (2*BLITTER_SOURCE_WIDTH); + blitter_base = (UINT16 *)machine->region("gfx1")->base(); + blitter_rows = machine->region("gfx1")->bytes() / (2*BLITTER_SOURCE_WIDTH); } diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index 0b5d492e4e6..e7268ddfb68 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -40,7 +40,7 @@ static TILEMAP_MAPPER( fix_scan ) static TILE_GET_INFO( get_back_tile_info ) { liberate_state *state = machine->driver_data(); - const UINT8 *RAM = memory_region(machine, "user1"); + const UINT8 *RAM = machine->region("user1")->base(); int tile, bank; /* Convert tile index of 512x512 to paged format */ diff --git a/src/mame/video/liberatr.c b/src/mame/video/liberatr.c index d20531bad2e..adedf7b4aac 100644 --- a/src/mame/video/liberatr.c +++ b/src/mame/video/liberatr.c @@ -68,8 +68,8 @@ void liberatr_state::init_planet(planet &liberatr_planet, UINT8 *planet_rom) { UINT16 longitude; - const UINT8 *latitude_scale = memory_region(machine, "user1"); - const UINT8 *longitude_scale = memory_region(machine, "user2"); + const UINT8 *latitude_scale = machine->region("user1")->base(); + const UINT8 *longitude_scale = machine->region("user2")->base(); /* for each starting longitude */ for (longitude = 0; longitude < 0x100; longitude++) @@ -212,8 +212,8 @@ void liberatr_state::init_planet(planet &liberatr_planet, UINT8 *planet_rom) void liberatr_state::video_start() { // for each planet in the planet ROMs - init_planet(m_planets[0], &memory_region(machine, "gfx1")[0x2000]); - init_planet(m_planets[1], &memory_region(machine, "gfx1")[0x0000]); + init_planet(m_planets[0], &machine->region("gfx1")->base()[0x2000]); + init_planet(m_planets[1], &machine->region("gfx1")->base()[0x0000]); } diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c index c229000b453..291b1a5d75b 100644 --- a/src/mame/video/lockon.c +++ b/src/mame/video/lockon.c @@ -174,7 +174,7 @@ static void scene_draw( running_machine *machine ) UINT32 y; /* 3bpp characters */ - const UINT8 *const gfx1 = memory_region(machine, "gfx2"); + const UINT8 *const gfx1 = machine->region("gfx2")->base(); const UINT8 *const gfx2 = gfx1 + 0x10000; const UINT8 *const gfx3 = gfx1 + 0x20000; const UINT8 *const clut = gfx1 + 0x30000; @@ -311,7 +311,7 @@ static void ground_draw( running_machine *machine ) lockon_state *state = machine->driver_data(); /* ROM pointers */ - const UINT8 *const gfx_rom = memory_region(machine, "gfx4"); + const UINT8 *const gfx_rom = machine->region("gfx4")->base(); const UINT8 *const lut_rom = gfx_rom + 0x30000 + ((state->ground_ctrl >> 2) & 0x3 ? 0x10000 : 0); const UINT8 *const clut_rom = gfx_rom + 0x50000; @@ -438,10 +438,10 @@ static void objects_draw( running_machine *machine ) UINT32 offs; lockon_state *state = machine->driver_data(); - const UINT8 *const romlut = memory_region(machine, "user1"); - const UINT16 *const chklut = (UINT16*)memory_region(machine, "user2"); - const UINT8 *const gfxrom = memory_region(machine, "gfx5"); - const UINT8 *const sproms = memory_region(machine, "proms") + 0x800; + const UINT8 *const romlut = machine->region("user1")->base(); + const UINT16 *const chklut = (UINT16*)machine->region("user2")->base(); + const UINT8 *const gfxrom = machine->region("gfx5")->base(); + const UINT8 *const sproms = machine->region("proms")->base() + 0x800; for (offs = 0; offs < state->objectram_size; offs += 4) { @@ -806,7 +806,7 @@ static void rotate_draw( running_machine *machine, bitmap_t *bitmap, const recta static void hud_draw( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { lockon_state *state = machine->driver_data(); - UINT8 *tile_rom = memory_region(machine, "gfx3"); + UINT8 *tile_rom = machine->region("gfx3")->base(); UINT32 offs; for (offs = 0x0; offs <= state->hudram_size; offs += 2) diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c index 49ed9bdbf55..1708ccf71ea 100644 --- a/src/mame/video/lwings.c +++ b/src/mame/video/lwings.c @@ -63,8 +63,8 @@ static TILE_GET_INFO( get_bg2_tile_info ) { lwings_state *state = machine->driver_data(); int code, color; - UINT8 *rom = memory_region(machine, "gfx5"); - int mask = memory_region_length(machine, "gfx5") - 1; + UINT8 *rom = machine->region("gfx5")->base(); + int mask = machine->region("gfx5")->bytes() - 1; tile_index = (tile_index + state->bg2_image * 0x20) & mask; code = rom[tile_index]; diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c index 1d7fa86e260..7cae5cee347 100644 --- a/src/mame/video/m107.c +++ b/src/mame/video/m107.c @@ -166,7 +166,7 @@ VIDEO_START( m107 ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { int offs; - UINT8 *rom = memory_region(machine, "user1"); + UINT8 *rom = machine->region("user1")->base(); for (offs = 0;offs < 0x800;offs += 4) { diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c index cb0eb235dac..c65747278e9 100644 --- a/src/mame/video/madalien.c +++ b/src/mame/video/madalien.c @@ -108,7 +108,7 @@ static TILEMAP_MAPPER( scan_mode3 ) static TILE_GET_INFO( get_tile_info_BG_1 ) { - UINT8 *map = memory_region(machine, "user1") + ((*madalien_video_flags & 0x08) << 6); + UINT8 *map = machine->region("user1")->base() + ((*madalien_video_flags & 0x08) << 6); SET_TILE_INFO(1, map[tile_index], BIT(*madalien_video_flags, 2) ? 2 : 0, 0); } @@ -116,7 +116,7 @@ static TILE_GET_INFO( get_tile_info_BG_1 ) static TILE_GET_INFO( get_tile_info_BG_2 ) { - UINT8 *map = memory_region(machine, "user1") + ((*madalien_video_flags & 0x08) << 6) + 0x80; + UINT8 *map = machine->region("user1")->base() + ((*madalien_video_flags & 0x08) << 6) + 0x80; SET_TILE_INFO(1, map[tile_index], BIT(*madalien_video_flags, 2) ? 2 : 0, 0); } diff --git a/src/mame/video/magmax.c b/src/mame/video/magmax.c index 848e42751ce..a3302ad421e 100644 --- a/src/mame/video/magmax.c +++ b/src/mame/video/magmax.c @@ -71,7 +71,7 @@ PALETTE_INIT( magmax ) VIDEO_START( magmax ) { int i,v; - UINT8 * prom14D = memory_region(machine, "user2"); + UINT8 * prom14D = machine->region("user2")->base(); /* Set up save state */ state_save_register_global(machine, flipscreen); @@ -106,7 +106,7 @@ VIDEO_UPDATE( magmax ) else { int v; - UINT8 * rom18B = memory_region(screen->machine, "user1"); + UINT8 * rom18B = screen->machine->region("user1")->base(); UINT32 scroll_h = (*magmax_scroll_x) & 0x3fff; UINT32 scroll_v = (*magmax_scroll_y) & 0xff; diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c index b5f83e8fbb9..67ec4d9653b 100644 --- a/src/mame/video/mcatadv.c +++ b/src/mame/video/mcatadv.c @@ -63,7 +63,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect UINT16 *destline; UINT8 *priline; - UINT8 *sprdata = memory_region(machine, "gfx1"); + UINT8 *sprdata = machine->region("gfx1")->base(); int xstart, xend, xinc; int ystart, yend, yinc; diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c index 69574bb6bd0..4a8fc901244 100644 --- a/src/mame/video/mcr68.c +++ b/src/mame/video/mcr68.c @@ -76,7 +76,7 @@ VIDEO_START( mcr68 ) VIDEO_START( zwackery ) { - const UINT8 *colordatabase = (const UINT8 *)memory_region(machine, "gfx3"); + const UINT8 *colordatabase = (const UINT8 *)machine->region("gfx3")->base(); gfx_element *gfx0 = machine->gfx[0]; gfx_element *gfx2 = machine->gfx[2]; UINT8 *srcdata0, *dest0; diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c index d757c9725e3..75abbe7d961 100644 --- a/src/mame/video/metro.c +++ b/src/mame/video/metro.c @@ -442,8 +442,8 @@ VIDEO_START( gstrik2 ) void metro_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { metro_state *state = machine->driver_data(); - UINT8 *base_gfx = memory_region(machine, "gfx1"); - UINT8 *gfx_max = base_gfx + memory_region_length(machine, "gfx1"); + UINT8 *base_gfx = machine->region("gfx1")->base(); + UINT8 *gfx_max = base_gfx + machine->region("gfx1")->bytes(); int max_x = machine->primary_screen->width(); int max_y = machine->primary_screen->height(); diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c index 65a1553466f..21c413f209f 100644 --- a/src/mame/video/mjkjidai.c +++ b/src/mame/video/mjkjidai.c @@ -53,7 +53,7 @@ WRITE8_HANDLER( mjkjidai_videoram_w ) WRITE8_HANDLER( mjkjidai_ctrl_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); // logerror("%04x: port c0 = %02x\n",cpu_get_pc(space->cpu),data); diff --git a/src/mame/video/model1.c b/src/mame/video/model1.c index c200c404d6d..cb267f64b34 100644 --- a/src/mame/video/model1.c +++ b/src/mame/video/model1.c @@ -1444,7 +1444,7 @@ VIDEO_START(model1) sys24_tile_vh_start(machine, 0x3fff); - poly_rom = (UINT32 *)memory_region(machine, "user1"); + poly_rom = (UINT32 *)machine->region("user1")->base(); poly_ram = auto_alloc_array_clear(machine, UINT32, 0x400000); tgp_ram = auto_alloc_array_clear(machine, UINT16, 0x100000-0x40000); pointdb = auto_alloc_array_clear(machine, struct point, 1000000*2); diff --git a/src/mame/video/model2.c b/src/mame/video/model2.c index 5b5b98e7b97..5612b04ce75 100644 --- a/src/mame/video/model2.c +++ b/src/mame/video/model2.c @@ -2701,10 +2701,10 @@ VIDEO_START(model2) machine->add_notifier(MACHINE_NOTIFY_EXIT, model2_exit); /* initialize the geometry engine */ - geo_init( machine, (UINT32*)memory_region(machine, "user2") ); + geo_init( machine, (UINT32*)machine->region("user2")->base() ); /* initialize the hardware rasterizer */ - model2_3d_init( machine, (UINT16*)memory_region(machine, "user3") ); + model2_3d_init( machine, (UINT16*)machine->region("user3")->base() ); } static void convert_bitmap( running_machine *machine, bitmap_t *dst, bitmap_t *src, const rectangle *rect ) diff --git a/src/mame/video/momoko.c b/src/mame/video/momoko.c index 4fe311511da..3090958ea3e 100644 --- a/src/mame/video/momoko.c +++ b/src/mame/video/momoko.c @@ -81,7 +81,7 @@ static void momoko_draw_bg_pri( running_machine *machine, bitmap_t *bitmap, int int xx, sx, sy, px, py, dot; UINT32 gfxadr; UINT8 d0, d1; - UINT8 *BG_GFX = memory_region(machine, "gfx2"); + UINT8 *BG_GFX = machine->region("gfx2")->base(); for (sy = 0; sy < 8; sy++) { @@ -117,10 +117,10 @@ VIDEO_UPDATE( momoko ) int x, y, dx, dy, rx, ry, radr, chr, sy, fx, fy, px, py, offs, col, pri, flip ; UINT8 *spriteram = state->spriteram; - UINT8 *BG_MAP = memory_region(screen->machine, "user1"); - UINT8 *BG_COL_MAP = memory_region(screen->machine, "user2"); - UINT8 *FG_MAP = memory_region(screen->machine, "user3"); - UINT8 *TEXT_COLOR = memory_region(screen->machine, "proms"); + UINT8 *BG_MAP = screen->machine->region("user1")->base(); + UINT8 *BG_COL_MAP = screen->machine->region("user2")->base(); + UINT8 *FG_MAP = screen->machine->region("user3")->base(); + UINT8 *TEXT_COLOR = screen->machine->region("proms")->base(); flip = state->flipscreen ^ (input_port_read(screen->machine, "FAKE") & 0x01); diff --git a/src/mame/video/munchmo.c b/src/mame/video/munchmo.c index eb66d1a2e3d..60782345f14 100644 --- a/src/mame/video/munchmo.c +++ b/src/mame/video/munchmo.c @@ -83,7 +83,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r the tiles in ROM B2.2B */ munchmo_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "gfx2"); + UINT8 *rom = machine->region("gfx2")->base(); const gfx_element *gfx = machine->gfx[1]; int offs; diff --git a/src/mame/video/mw8080bw.c b/src/mame/video/mw8080bw.c index b7cf61b2ccb..8b62723313d 100644 --- a/src/mame/video/mw8080bw.c +++ b/src/mame/video/mw8080bw.c @@ -229,7 +229,7 @@ VIDEO_UPDATE( phantom2 ) UINT16 cloud_counter = state->phantom2_cloud_counter; - UINT8 *cloud_region = memory_region(screen->machine, "proms"); + UINT8 *cloud_region = screen->machine->region("proms")->base(); while (1) { diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c index 2917b0f24b3..7e2a14c4b2a 100644 --- a/src/mame/video/mystston.c +++ b/src/mame/video/mystston.c @@ -75,7 +75,7 @@ static void set_palette(running_machine *machine, mystston_state *state) static const int resistances_b [2] = { 3300, 1500 }; double weights_rg[3], weights_b[2]; - UINT8 *color_prom = memory_region(machine, "proms"); + UINT8 *color_prom = machine->region("proms")->base(); compute_resistor_weights(0, 255, -1.0, 3, resistances_rg, weights_rg, 0, 1000, diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c index 37071f9e030..b27b0da0eed 100644 --- a/src/mame/video/mystwarr.c +++ b/src/mame/video/mystwarr.c @@ -20,8 +20,8 @@ static tilemap_t *ult_936_tilemap; // reading the original raw data static void mystwarr_decode_tiles(running_machine *machine) { - UINT8 *s = memory_region(machine, "gfx1"); - int len = memory_region_length(machine, "gfx1"); + UINT8 *s = machine->region("gfx1")->base(); + int len = machine->region("gfx1")->bytes(); UINT8 *pFinish = s+len-3; UINT8 *d, *decoded; int gfxnum; @@ -141,7 +141,7 @@ static void martchmp_sprite_callback(int *code, int *color, int *priority) static TILE_GET_INFO( get_gai_936_tile_info ) { int tileno, colour; - UINT8 *ROM = memory_region(machine, "gfx4"); + UINT8 *ROM = machine->region("gfx4")->base(); UINT8 *dat1 = ROM, *dat2 = ROM + 0x20000, *dat3 = ROM + 0x60000; tileno = dat3[tile_index] | ((dat2[tile_index]&0x3f)<<8); @@ -188,7 +188,7 @@ VIDEO_START(gaiapols) static TILE_GET_INFO( get_ult_936_tile_info ) { int tileno, colour; - UINT8 *ROM = memory_region(machine, "gfx4"); + UINT8 *ROM = machine->region("gfx4")->base(); UINT8 *dat1 = ROM, *dat2 = ROM + 0x40000; tileno = dat2[tile_index] | ((dat1[tile_index]&0x1f)<<8); @@ -441,8 +441,8 @@ WRITE16_HANDLER(ddd_053936_clip_w) // reference: 223e5c in gaiapolis (ROMs 34j and 36m) READ16_HANDLER(gai_053936_tilerom_0_r) { - UINT8 *ROM1 = (UINT8 *)memory_region(space->machine, "gfx4"); - UINT8 *ROM2 = (UINT8 *)memory_region(space->machine, "gfx4"); + UINT8 *ROM1 = (UINT8 *)space->machine->region("gfx4")->base(); + UINT8 *ROM2 = (UINT8 *)space->machine->region("gfx4")->base(); ROM1 += 0x20000; ROM2 += 0x20000+0x40000; @@ -452,8 +452,8 @@ READ16_HANDLER(gai_053936_tilerom_0_r) READ16_HANDLER(ddd_053936_tilerom_0_r) { - UINT8 *ROM1 = (UINT8 *)memory_region(space->machine, "gfx4"); - UINT8 *ROM2 = (UINT8 *)memory_region(space->machine, "gfx4"); + UINT8 *ROM1 = (UINT8 *)space->machine->region("gfx4")->base(); + UINT8 *ROM2 = (UINT8 *)space->machine->region("gfx4")->base(); ROM2 += 0x40000; @@ -463,7 +463,7 @@ READ16_HANDLER(ddd_053936_tilerom_0_r) // reference: 223e1a in gaiapolis (ROM 36j) READ16_HANDLER(ddd_053936_tilerom_1_r) { - UINT8 *ROM = (UINT8 *)memory_region(space->machine, "gfx4"); + UINT8 *ROM = (UINT8 *)space->machine->region("gfx4")->base(); return ROM[offset/2]; } @@ -471,7 +471,7 @@ READ16_HANDLER(ddd_053936_tilerom_1_r) // reference: 223db0 in gaiapolis (ROMs 32n, 29n, 26n) READ16_HANDLER(gai_053936_tilerom_2_r) { - UINT8 *ROM = (UINT8 *)memory_region(space->machine, "gfx3"); + UINT8 *ROM = (UINT8 *)space->machine->region("gfx3")->base(); offset += (roz_rombank * 0x100000); @@ -480,7 +480,7 @@ READ16_HANDLER(gai_053936_tilerom_2_r) READ16_HANDLER(ddd_053936_tilerom_2_r) { - UINT8 *ROM = (UINT8 *)memory_region(space->machine, "gfx3"); + UINT8 *ROM = (UINT8 *)space->machine->region("gfx3")->base(); offset += (roz_rombank * 0x100000); diff --git a/src/mame/video/n64.h b/src/mame/video/n64.h index 0df5aac2e39..214e2730582 100644 --- a/src/mame/video/n64.h +++ b/src/mame/video/n64.h @@ -427,8 +427,8 @@ class Processor m_tmem = auto_alloc_array(m_machine, UINT8, 0x1000); memset(m_tmem, 0, 0x1000); - UINT8 *normpoint = memory_region(m_machine, "normpoint"); - UINT8 *normslope = memory_region(m_machine, "normslope"); + UINT8 *normpoint = m_machine->region("normpoint")->base(); + UINT8 *normslope = m_machine->region("normslope")->base(); for(INT32 i = 0; i < 64; i++) { diff --git a/src/mame/video/n8080.c b/src/mame/video/n8080.c index e75d9e2ff26..39c682a94f9 100644 --- a/src/mame/video/n8080.c +++ b/src/mame/video/n8080.c @@ -148,7 +148,7 @@ VIDEO_UPDATE( spacefev ) int y; const UINT8* pRAM = state->videoram; - const UINT8* pPROM = memory_region(screen->machine, "proms"); + const UINT8* pPROM = screen->machine->region("proms")->base(); for (y = 0; y < 256; y++) { @@ -214,7 +214,7 @@ VIDEO_UPDATE( sheriff ) n8080_state *state = screen->machine->driver_data(); UINT8 mask = flip_screen_get(screen->machine) ? 0xff : 0x00; - const UINT8* pPROM = memory_region(screen->machine, "proms"); + const UINT8* pPROM = screen->machine->region("proms")->base(); int x; int y; diff --git a/src/mame/video/namcofl.c b/src/mame/video/namcofl.c index c5c028bbe69..de65e54a4ab 100644 --- a/src/mame/video/namcofl.c +++ b/src/mame/video/namcofl.c @@ -122,7 +122,7 @@ static int FLobjcode2tile( int code ) VIDEO_START( namcofl ) { - namco_tilemap_init( machine, NAMCONB1_TILEGFX, memory_region(machine, NAMCONB1_TILEMASKREGION), TilemapCB ); + namco_tilemap_init( machine, NAMCONB1_TILEGFX, machine->region(NAMCONB1_TILEMASKREGION)->base(), TilemapCB ); namco_obj_init(machine,NAMCONB1_SPRITEGFX,0x0,FLobjcode2tile); namco_roz_init(machine,NAMCONB1_ROTGFX,NAMCONB1_ROTMASKREGION); } diff --git a/src/mame/video/namconb1.c b/src/mame/video/namconb1.c index d8f30348ab6..93580e7d389 100644 --- a/src/mame/video/namconb1.c +++ b/src/mame/video/namconb1.c @@ -165,7 +165,7 @@ NB1objcode2tile( int code ) VIDEO_START( namconb1 ) { - namco_tilemap_init( machine, NAMCONB1_TILEGFX, memory_region(machine, NAMCONB1_TILEMASKREGION), NB1TilemapCB ); + namco_tilemap_init( machine, NAMCONB1_TILEGFX, machine->region(NAMCONB1_TILEMASKREGION)->base(), NB1TilemapCB ); namco_obj_init(machine,NAMCONB1_SPRITEGFX,0x0,NB1objcode2tile); } /* namconb1 */ @@ -227,7 +227,7 @@ NB2objcode2tile( int code ) VIDEO_START( namconb2 ) { - namco_tilemap_init(machine, NAMCONB1_TILEGFX, memory_region(machine, NAMCONB1_TILEMASKREGION), NB2TilemapCB ); + namco_tilemap_init(machine, NAMCONB1_TILEGFX, machine->region(NAMCONB1_TILEMASKREGION)->base(), NB2TilemapCB ); namco_obj_init(machine,NAMCONB1_SPRITEGFX,0x0,NB2objcode2tile); namco_roz_init(machine, NAMCONB1_ROTGFX,NAMCONB1_ROTMASKREGION); } /* namconb2_vh_start */ diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c index 24258446b3a..017396bab88 100644 --- a/src/mame/video/namcos1.c +++ b/src/mame/video/namcos1.c @@ -102,7 +102,7 @@ VIDEO_START( namcos1 ) { int i; - tilemap_maskdata = (UINT8 *)memory_region(machine, "gfx1"); + tilemap_maskdata = (UINT8 *)machine->region("gfx1")->base(); /* allocate videoram */ namcos1_videoram = auto_alloc_array(machine, UINT8, 0x8000); diff --git a/src/mame/video/namcos2.c b/src/mame/video/namcos2.c index 7a22f5f82ac..e89925b5fd4 100644 --- a/src/mame/video/namcos2.c +++ b/src/mame/video/namcos2.c @@ -443,7 +443,7 @@ READ16_HANDLER( namcos2_sprite_ram_r ) VIDEO_START( namcos2 ) { - namco_tilemap_init(machine,2,memory_region(machine, "gfx4"),TilemapCB); + namco_tilemap_init(machine,2,machine->region("gfx4")->base(),TilemapCB); tilemap_roz = tilemap_create(machine, get_tile_info_roz,tilemap_scan_rows,8,8,256,256); tilemap_set_transparent_pen(tilemap_roz,0xff); DrawSpriteInit(machine); @@ -492,7 +492,7 @@ VIDEO_UPDATE( namcos2_default ) VIDEO_START( finallap ) { - namco_tilemap_init(machine,2,memory_region(machine, "gfx4"),TilemapCB); + namco_tilemap_init(machine,2,machine->region("gfx4")->base(),TilemapCB); DrawSpriteInit(machine); namco_road_init(machine, 3); } @@ -522,7 +522,7 @@ VIDEO_UPDATE( finallap ) VIDEO_START( luckywld ) { - namco_tilemap_init(machine,2,memory_region(machine, "gfx4"),TilemapCB); + namco_tilemap_init(machine,2,machine->region("gfx4")->base(),TilemapCB); namco_obj_init( machine, 0, 0x0, NULL ); if( namcos2_gametype==NAMCOS2_LUCKY_AND_WILD ) { @@ -563,7 +563,7 @@ VIDEO_UPDATE( luckywld ) VIDEO_START( sgunner ) { - namco_tilemap_init(machine,2,memory_region(machine, "gfx4"),TilemapCB); + namco_tilemap_init(machine,2,machine->region("gfx4")->base(),TilemapCB); namco_obj_init( machine, 0, 0x0, NULL ); } @@ -589,7 +589,7 @@ VIDEO_UPDATE( sgunner ) VIDEO_START( metlhawk ) { - namco_tilemap_init(machine,2,memory_region(machine, "gfx4"),TilemapCB); + namco_tilemap_init(machine,2,machine->region("gfx4")->base(),TilemapCB); namco_roz_init( machine, 1, "gfx5" ); } diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c index f1f91945ce3..c50f7fa099b 100644 --- a/src/mame/video/namcos22.c +++ b/src/mame/video/namcos22.c @@ -632,7 +632,7 @@ ApplyGamma( running_machine *machine, bitmap_t *bitmap ) } else { /* system 22 */ - const UINT8 *rlut = 0x000+(const UINT8 *)memory_region(machine, "user1"); + const UINT8 *rlut = 0x000+(const UINT8 *)machine->region("user1")->base(); const UINT8 *glut = 0x100+rlut; const UINT8 *blut = 0x200+rlut; for( y=0; yheight; y++ ) @@ -2213,10 +2213,10 @@ static VIDEO_START( common ) for (code = 0; code < machine->gfx[GFX_TEXTURE_TILE]->total_elements; code++) gfx_element_decode(machine->gfx[GFX_TEXTURE_TILE], code); - Prepare3dTexture(machine, memory_region(machine, "textilemap"), machine->gfx[GFX_TEXTURE_TILE]->gfxdata ); + Prepare3dTexture(machine, machine->region("textilemap")->base(), machine->gfx[GFX_TEXTURE_TILE]->gfxdata ); dirtypal = auto_alloc_array(machine, UINT8, NAMCOS22_PALETTE_SIZE/4); - mPtRomSize = memory_region_length(machine, "pointrom")/3; - mpPolyL = memory_region(machine, "pointrom"); + mPtRomSize = machine->region("pointrom")->bytes()/3; + mpPolyL = machine->region("pointrom")->base(); mpPolyM = mpPolyL + mPtRomSize; mpPolyH = mpPolyM + mPtRomSize; diff --git a/src/mame/video/nbmj8688.c b/src/mame/video/nbmj8688.c index ee1bf400d91..384b202d5f0 100644 --- a/src/mame/video/nbmj8688.c +++ b/src/mame/video/nbmj8688.c @@ -185,7 +185,7 @@ WRITE8_HANDLER( mjsikaku_scrolly_w ) WRITE8_HANDLER( mjsikaku_romsel_w ) { - int gfxlen = memory_region_length(space->machine, "gfx1"); + int gfxlen = space->machine->region("gfx1")->bytes(); mjsikaku_gfxrom = (data & 0x0f); if ((mjsikaku_gfxrom << 17) > (gfxlen - 1)) @@ -199,7 +199,7 @@ WRITE8_HANDLER( mjsikaku_romsel_w ) WRITE8_HANDLER( secolove_romsel_w ) { - int gfxlen = memory_region_length(space->machine, "gfx1"); + int gfxlen = space->machine->region("gfx1")->bytes(); mjsikaku_gfxrom = ((data & 0xc0) >> 4) + (data & 0x03); mjsikaku_gfxflag2_w(space, 0, data); @@ -214,7 +214,7 @@ WRITE8_HANDLER( secolove_romsel_w ) WRITE8_HANDLER( crystalg_romsel_w ) { - int gfxlen = memory_region_length(space->machine, "gfx1"); + int gfxlen = space->machine->region("gfx1")->bytes(); mjsikaku_gfxrom = (data & 0x03); mjsikaku_gfxflag2_w(space, 0, data); @@ -229,7 +229,7 @@ WRITE8_HANDLER( crystalg_romsel_w ) WRITE8_HANDLER( seiha_romsel_w ) { - int gfxlen = memory_region_length(space->machine, "gfx1"); + int gfxlen = space->machine->region("gfx1")->bytes(); mjsikaku_gfxrom = (data & 0x1f); mjsikaku_gfxflag3_w(space, 0, data); @@ -297,7 +297,7 @@ static TIMER_CALLBACK( blitter_timer_callback ) static void mbmj8688_gfxdraw(running_machine *machine, int gfxtype) { - UINT8 *GFX = memory_region(machine, "gfx1"); + UINT8 *GFX = machine->region("gfx1")->base(); int x, y; int dx1, dx2, dy; @@ -340,7 +340,7 @@ static void mbmj8688_gfxdraw(running_machine *machine, int gfxtype) skipy = -1; } - gfxlen = memory_region_length(machine, "gfx1"); + gfxlen = machine->region("gfx1")->bytes(); gfxaddr = (mjsikaku_gfxrom << 17) + (blitter_src_addr << 1); //popmessage("ADDR:%08X DX:%03d DY:%03d SX:%03d SY:%03d", gfxaddr, startx, starty, sizex, sizey); //if (blitter_direction_x|blitter_direction_y) popmessage("ADDR:%08X FX:%01d FY:%01d", gfxaddr, blitter_direction_x, blitter_direction_y); diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c index a3438ff5372..68b2affb179 100644 --- a/src/mame/video/nbmj8891.c +++ b/src/mame/video/nbmj8891.c @@ -273,7 +273,7 @@ WRITE8_HANDLER( nbmj8891_vramsel_w ) WRITE8_HANDLER( nbmj8891_romsel_w ) { - int gfxlen = memory_region_length(space->machine, "gfx1"); + int gfxlen = space->machine->region("gfx1")->bytes(); nbmj8891_gfxrom = (data & 0x0f); if ((0x20000 * nbmj8891_gfxrom) > (gfxlen - 1)) @@ -338,7 +338,7 @@ static TIMER_CALLBACK( blitter_timer_callback ) static void nbmj8891_gfxdraw(running_machine *machine) { - UINT8 *GFX = memory_region(machine, "gfx1"); + UINT8 *GFX = machine->region("gfx1")->base(); int width = machine->primary_screen->width(); int x, y; @@ -377,7 +377,7 @@ static void nbmj8891_gfxdraw(running_machine *machine) skipy = -1; } - gfxlen = memory_region_length(machine, "gfx1"); + gfxlen = machine->region("gfx1")->bytes(); gfxaddr = (nbmj8891_gfxrom << 17) + (blitter_src_addr << 1); for (y = starty, ctry = sizey; ctry >= 0; y += skipy, ctry--) @@ -495,7 +495,7 @@ static void nbmj8891_gfxdraw(running_machine *machine) ******************************************************************************/ VIDEO_START( nbmj8891_1layer ) { - UINT8 *CLUT = memory_region(machine, "protection"); + UINT8 *CLUT = machine->region("protection")->base(); int i; int width = machine->primary_screen->width(); int height = machine->primary_screen->height(); diff --git a/src/mame/video/nbmj8900.c b/src/mame/video/nbmj8900.c index 694cb4737e2..726a12c06c7 100644 --- a/src/mame/video/nbmj8900.c +++ b/src/mame/video/nbmj8900.c @@ -169,12 +169,12 @@ WRITE8_HANDLER( nbmj8900_romsel_w ) { nbmj8900_gfxrom = (data & 0x0f); - if ((0x20000 * nbmj8900_gfxrom) > (memory_region_length(space->machine, "gfx") - 1)) + if ((0x20000 * nbmj8900_gfxrom) > (space->machine->region("gfx")->bytes() - 1)) { #ifdef MAME_DEBUG popmessage("GFXROM BANK OVER!!"); #endif - nbmj8900_gfxrom &= (memory_region_length(space->machine, "gfx") / 0x20000 - 1); + nbmj8900_gfxrom &= (space->machine->region("gfx")->bytes() / 0x20000 - 1); } } @@ -230,7 +230,7 @@ static TIMER_CALLBACK( blitter_timer_callback ) static void nbmj8900_gfxdraw(running_machine *machine) { - unsigned char *GFX = memory_region(machine, "gfx"); + unsigned char *GFX = machine->region("gfx")->base(); int x, y; int dx1, dx2, dy1, dy2; @@ -274,12 +274,12 @@ static void nbmj8900_gfxdraw(running_machine *machine) { for (x = startx, ctrx = sizex; ctrx >= 0; x += skipx, ctrx--) { - if ((gfxaddr > (memory_region_length(machine, "gfx") - 1))) + if ((gfxaddr > (machine->region("gfx")->bytes() - 1))) { #ifdef MAME_DEBUG popmessage("GFXROM ADDRESS OVER!!"); #endif - gfxaddr &= (memory_region_length(machine, "gfx") - 1); + gfxaddr &= (machine->region("gfx")->bytes() - 1); } color = GFX[gfxaddr++]; diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c index c9bc28cb364..085b47765d9 100644 --- a/src/mame/video/nbmj8991.c +++ b/src/mame/video/nbmj8991.c @@ -94,7 +94,7 @@ WRITE8_HANDLER( nbmj8991_palette_type3_w ) ******************************************************************************/ WRITE8_HANDLER( nbmj8991_blitter_w ) { - int gfxlen = memory_region_length(space->machine, "gfx1"); + int gfxlen = space->machine->region("gfx1")->bytes(); switch (offset) { @@ -194,7 +194,7 @@ static TIMER_CALLBACK( blitter_timer_callback ) static void nbmj8991_gfxdraw(running_machine *machine) { - UINT8 *GFX = memory_region(machine, "gfx1"); + UINT8 *GFX = machine->region("gfx1")->base(); int width = machine->primary_screen->width(); int x, y; @@ -234,7 +234,7 @@ static void nbmj8991_gfxdraw(running_machine *machine) skipy = -1; } - gfxlen = memory_region_length(machine, "gfx1"); + gfxlen = machine->region("gfx1")->bytes(); gfxaddr = (nbmj8991_gfxrom << 17) + (blitter_src_addr << 1); for (y = starty, ctry = sizey; ctry >= 0; y += skipy, ctry--) diff --git a/src/mame/video/nbmj9195.c b/src/mame/video/nbmj9195.c index 967689a2b98..90bf71a387e 100644 --- a/src/mame/video/nbmj9195.c +++ b/src/mame/video/nbmj9195.c @@ -102,7 +102,7 @@ WRITE8_HANDLER( nbmj9195_nb22090_palette_w ) static int nbmj9195_blitter_r(running_machine *machine, int vram, int offset) { int ret; - UINT8 *GFXROM = memory_region(machine, "gfx1"); + UINT8 *GFXROM = machine->region("gfx1")->base(); switch (offset) { @@ -232,7 +232,7 @@ static TIMER_CALLBACK( blitter_timer_callback ) static void nbmj9195_gfxdraw(running_machine *machine, int vram) { - UINT8 *GFX = memory_region(machine, "gfx1"); + UINT8 *GFX = machine->region("gfx1")->base(); int width = machine->primary_screen->width(); int x, y; @@ -279,7 +279,7 @@ static void nbmj9195_gfxdraw(running_machine *machine, int vram) skipy = -1; } - gfxlen = memory_region_length(machine, "gfx1"); + gfxlen = machine->region("gfx1")->bytes(); gfxaddr = ((blitter_src_addr[vram] + 2) & 0x00ffffff); for (y = starty, ctry = sizey; ctry >= 0; y += skipy, ctry--) diff --git a/src/mame/video/neogeo.c b/src/mame/video/neogeo.c index 0013065c9e7..334ecbcdf3f 100644 --- a/src/mame/video/neogeo.c +++ b/src/mame/video/neogeo.c @@ -273,8 +273,8 @@ static void draw_fixed_layer( running_machine *machine, bitmap_t *bitmap, int sc neogeo_state *state = machine->driver_data(); int x; - UINT8* gfx_base = memory_region(machine, state->fixed_layer_source ? "fixed" : "fixedbios"); - UINT32 addr_mask = memory_region_length(machine, state->fixed_layer_source ? "fixed" : "fixedbios") - 1; + UINT8* gfx_base = machine->region(state->fixed_layer_source ? "fixed" : "fixedbios")->base(); + UINT32 addr_mask = machine->region(state->fixed_layer_source ? "fixed" : "fixedbios")->bytes() - 1; UINT16 *video_data = &state->videoram[0x7000 | (scanline >> 3)]; UINT32 *pixel_addr = BITMAP_ADDR32(bitmap, scanline, NEOGEO_HBEND); @@ -691,7 +691,7 @@ static void optimize_sprite_data( running_machine *machine ) power of 2 */ state->sprite_gfx_address_mask = 0xffffffff; - len = memory_region_length(machine, "sprites"); + len = machine->region("sprites")->bytes(); for (bit = 0x80000000; bit != 0; bit >>= 1) { @@ -703,7 +703,7 @@ static void optimize_sprite_data( running_machine *machine ) state->sprite_gfx = auto_alloc_array_clear(machine, UINT8, state->sprite_gfx_address_mask + 1); - src = memory_region(machine, "sprites"); + src = machine->region("sprites")->base(); dest = state->sprite_gfx; for (i = 0; i < len; i += 0x80, src += 0x80) @@ -894,7 +894,7 @@ VIDEO_START( neogeo ) state_save_register_postload(machine, regenerate_pens, NULL); - state->region_zoomy = memory_region(machine, "zoomy"); + state->region_zoomy = machine->region("zoomy")->base(); } diff --git a/src/mame/video/niyanpai.c b/src/mame/video/niyanpai.c index e029457927b..5deeb48cd85 100644 --- a/src/mame/video/niyanpai.c +++ b/src/mame/video/niyanpai.c @@ -89,7 +89,7 @@ WRITE16_HANDLER( niyanpai_palette_w ) static int niyanpai_blitter_r(running_machine *machine, int vram, int offset) { int ret; - UINT8 *GFXROM = memory_region(machine, "gfx1"); + UINT8 *GFXROM = machine->region("gfx1")->base(); switch (offset) { @@ -197,7 +197,7 @@ static TIMER_CALLBACK( blitter_timer_callback ) static void niyanpai_gfxdraw(running_machine *machine, int vram) { - UINT8 *GFX = memory_region(machine, "gfx1"); + UINT8 *GFX = machine->region("gfx1")->base(); int width = machine->primary_screen->width(); int x, y; @@ -244,7 +244,7 @@ static void niyanpai_gfxdraw(running_machine *machine, int vram) skipy = -1; } - gfxlen = memory_region_length(machine, "gfx1"); + gfxlen = machine->region("gfx1")->bytes(); gfxaddr = ((blitter_src_addr[vram] + 2) & 0x00ffffff); for (y = starty, ctry = sizey; ctry >= 0; y += skipy, ctry--) diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c index 8a1fe85efd4..0d3f417f14a 100644 --- a/src/mame/video/nmk16.c +++ b/src/mame/video/nmk16.c @@ -660,7 +660,7 @@ VIDEO_UPDATE( gunnail ) VIDEO_UPDATE( bioship ) { - UINT16 *tilerom = (UINT16 *)memory_region(screen->machine, "gfx5"); + UINT16 *tilerom = (UINT16 *)screen->machine->region("gfx5")->base(); int scrollx=-(bioship_scroll[1] + bioship_scroll[0]*256); int scrolly=-(bioship_scroll[3] + bioship_scroll[2]*256); diff --git a/src/mame/video/othunder.c b/src/mame/video/othunder.c index d5e27fde337..37a7bc09c69 100644 --- a/src/mame/video/othunder.c +++ b/src/mame/video/othunder.c @@ -66,7 +66,7 @@ spriteram is being tested, take no notice of that.] static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, const int *primasks, int y_offs ) { othunder_state *state = machine->driver_data(); - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); UINT16 tile_mask = (machine->gfx[0]->total_elements) - 1; UINT16 *spriteram16 = state->spriteram; int offs, data, tilenum, color, flipx, flipy; diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c index 82f96109ace..2e0d0cd8c0a 100644 --- a/src/mame/video/pacland.c +++ b/src/mame/video/pacland.c @@ -259,7 +259,7 @@ WRITE8_HANDLER( pacland_scroll1_w ) WRITE8_HANDLER( pacland_bankswitch_w ) { int bankaddress; - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); bankaddress = 0x10000 + ((data & 0x07) << 13); memory_set_bankptr(space->machine, "bank1",&RAM[bankaddress]); diff --git a/src/mame/video/pastelg.c b/src/mame/video/pastelg.c index aeed3f8481e..0c3f47eb5d7 100644 --- a/src/mame/video/pastelg.c +++ b/src/mame/video/pastelg.c @@ -111,7 +111,7 @@ WRITE8_HANDLER( threeds_output_w ) READ8_HANDLER( threeds_rom_readback_r ) { - UINT8 *GFX = memory_region(space->machine, "gfx1"); + UINT8 *GFX = space->machine->region("gfx1")->base(); return GFX[(blitter_src_addr | (pastelg_gfxrom << 16)) & 0x3ffff]; } @@ -119,7 +119,7 @@ READ8_HANDLER( threeds_rom_readback_r ) WRITE8_HANDLER( pastelg_romsel_w ) { - int gfxlen = memory_region_length(space->machine, "gfx1"); + int gfxlen = space->machine->region("gfx1")->bytes(); pastelg_gfxrom = ((data & 0xc0) >> 6); pastelg_palbank = ((data & 0x10) >> 4); nb1413m3_sndrombank1_w(space, 0, data); @@ -168,7 +168,7 @@ static TIMER_CALLBACK( blitter_timer_callback ) static void pastelg_gfxdraw(running_machine *machine) { - UINT8 *GFX = memory_region(machine, "gfx1"); + UINT8 *GFX = machine->region("gfx1")->base(); int width = machine->primary_screen->width(); int x, y; @@ -212,7 +212,7 @@ static void pastelg_gfxdraw(running_machine *machine) incy = -1; } - gfxlen = memory_region_length(machine, "gfx1"); + gfxlen = machine->region("gfx1")->bytes(); gfxaddr = (pastelg_gfxrom << 16) + blitter_src_addr; readflag = 0; diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c index 108255ea20a..56395e8daf3 100644 --- a/src/mame/video/pgm.c +++ b/src/mame/video/pgm.c @@ -10,8 +10,8 @@ static void pgm_prepare_sprite( running_machine *machine, int wide, int high, int palt, int boffset ) { pgm_state *state = machine->driver_data(); - UINT8 *bdata = memory_region(machine, "sprmask"); - size_t bdatasize = memory_region_length(machine, "sprmask") - 1; + UINT8 *bdata = machine->region("sprmask")->base(); + size_t bdatasize = machine->region("sprmask")->bytes() - 1; UINT8 *adata = state->sprite_a_region; size_t adatasize = state->sprite_a_region_size - 1; int xcnt, ycnt; diff --git a/src/mame/video/phoenix.c b/src/mame/video/phoenix.c index 0be8ba20217..a969e2c3072 100644 --- a/src/mame/video/phoenix.c +++ b/src/mame/video/phoenix.c @@ -230,7 +230,7 @@ VIDEO_START( phoenix ) WRITE8_HANDLER( phoenix_videoram_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); videoram_pg[videoram_pg_index][offset] = data; diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c index 3fd7d2c7eaa..25f68858d86 100644 --- a/src/mame/video/pitnrun.c +++ b/src/mame/video/pitnrun.c @@ -108,7 +108,7 @@ WRITE8_HANDLER(pitnrun_color_select_w) static void pitnrun_spotlights(running_machine *machine) { int x,y,i,b,datapix; - UINT8 *ROM = memory_region(machine, "user1"); + UINT8 *ROM = machine->region("user1")->base(); for(i=0;i<4;i++) for(y=0;y<128;y++) for(x=0;x<16;x++) @@ -223,19 +223,19 @@ VIDEO_UPDATE( pitnrun ) #ifdef MAME_DEBUG if (input_code_pressed_once(screen->machine, KEYCODE_Q)) { - UINT8 *ROM = memory_region(screen->machine, "maincpu"); + UINT8 *ROM = screen->machine->region("maincpu")->base(); ROM[0x84f6]=0; /* lap 0 - normal */ } if (input_code_pressed_once(screen->machine, KEYCODE_W)) { - UINT8 *ROM = memory_region(screen->machine, "maincpu"); + UINT8 *ROM = screen->machine->region("maincpu")->base(); ROM[0x84f6]=6; /* lap 6 = spotlight */ } if (input_code_pressed_once(screen->machine, KEYCODE_E)) { - UINT8 *ROM = memory_region(screen->machine, "maincpu"); + UINT8 *ROM = screen->machine->region("maincpu")->base(); ROM[0x84f6]=2; /* lap 3 (trial 2)= lightnings */ ROM[0x8102]=1; } diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c index c3949395f47..aee18f77f86 100644 --- a/src/mame/video/playch10.c +++ b/src/mame/video/playch10.c @@ -98,7 +98,7 @@ static TILE_GET_INFO( get_bg_tile_info ) VIDEO_START( playch10 ) { - const UINT8 *bios = memory_region(machine, "maincpu"); + const UINT8 *bios = machine->region("maincpu")->base(); pc10_bios = (bios[3] == 0x2a) ? 1 : 2; bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, @@ -107,7 +107,7 @@ VIDEO_START( playch10 ) VIDEO_START( playch10_hboard ) { - const UINT8 *bios = memory_region(machine, "maincpu"); + const UINT8 *bios = machine->region("maincpu")->base(); pc10_bios = (bios[3] == 0x2a) ? 1 : 2; bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c index 95b0586c5ef..17b14a3e128 100644 --- a/src/mame/video/plygonet.c +++ b/src/mame/video/plygonet.c @@ -106,7 +106,7 @@ VIDEO_START( polygonet ) assert(state->ttl_gfx_index != MAX_GFX_ELEMENTS); /* decode the ttl layer's gfx */ - machine->gfx[state->ttl_gfx_index] = gfx_element_alloc(machine, &charlayout, memory_region(machine, "gfx1"), machine->total_colors() / 16, 0); + machine->gfx[state->ttl_gfx_index] = gfx_element_alloc(machine, &charlayout, machine->region("gfx1")->base(), machine->total_colors() / 16, 0); /* create the tilemap */ state->ttl_tilemap = tilemap_create(machine, ttl_get_tile_info, plygonet_scan, 8, 8, 64, 32); diff --git a/src/mame/video/polepos.c b/src/mame/video/polepos.c index 5baeebe97e0..72cb7c44cae 100644 --- a/src/mame/video/polepos.c +++ b/src/mame/video/polepos.c @@ -352,7 +352,7 @@ WRITE8_HANDLER( polepos_alpha_w ) static void draw_road(running_machine *machine, bitmap_t *bitmap) { - const UINT8 *road_control = memory_region(machine, "gfx5"); + const UINT8 *road_control = machine->region("gfx5")->base(); const UINT8 *road_bits1 = road_control + 0x2000; const UINT8 *road_bits2 = road_control + 0x4000; int x, y, i; @@ -431,7 +431,7 @@ static void zoom_sprite(running_machine *machine, bitmap_t *bitmap,int big, { const gfx_element *gfx = machine->gfx[big ? 3 : 2]; const UINT8 *gfxdata = gfx_element_get_data(gfx, code % gfx->total_elements); - UINT8 *scaling_rom = memory_region(machine, "gfx6"); + UINT8 *scaling_rom = machine->region("gfx6")->base(); UINT32 transmask = colortable_get_transpen_mask(machine->colortable, gfx, color, 0x1f); int coloroffs = gfx->color_base + color * gfx->color_granularity; int x,y; diff --git a/src/mame/video/policetr.c b/src/mame/video/policetr.c index 8c41f54b025..ed765426163 100644 --- a/src/mame/video/policetr.c +++ b/src/mame/video/policetr.c @@ -42,10 +42,10 @@ static UINT32 srcbitmap_height_mask; VIDEO_START( policetr ) { /* the source bitmap is in ROM */ - srcbitmap = memory_region(machine, "gfx1"); + srcbitmap = machine->region("gfx1")->base(); /* compute the height */ - srcbitmap_height_mask = (memory_region_length(machine, "gfx1") / SRCBITMAP_WIDTH) - 1; + srcbitmap_height_mask = (machine->region("gfx1")->bytes() / SRCBITMAP_WIDTH) - 1; /* the destination bitmap is not directly accessible to the CPU */ dstbitmap = auto_alloc_array(machine, UINT8, DSTBITMAP_WIDTH * DSTBITMAP_HEIGHT); diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c index 23169d943c8..74773c2943f 100644 --- a/src/mame/video/popeye.c +++ b/src/mame/video/popeye.c @@ -139,7 +139,7 @@ PALETTE_INIT( popeyebl ) static void set_background_palette(running_machine *machine,int bank) { int i; - UINT8 *color_prom = memory_region(machine, "proms") + 16 * bank; + UINT8 *color_prom = machine->region("proms")->base() + 16 * bank; for (i = 0;i < 16;i++) { diff --git a/src/mame/video/portrait.c b/src/mame/video/portrait.c index edfa84c8b36..05b71b5e789 100644 --- a/src/mame/video/portrait.c +++ b/src/mame/video/portrait.c @@ -78,7 +78,7 @@ VIDEO_START( portrait ) PALETTE_INIT( portrait ) { int i; - UINT8* lookup = memory_region(machine,"tileattr"); + UINT8* lookup = machine->region("tileattr")->base(); /* allocate the colortable */ machine->colortable = colortable_alloc(machine, 0x40); diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c index 5ca67e3b889..b0dadcfa4f1 100644 --- a/src/mame/video/ppu2c0x.c +++ b/src/mame/video/ppu2c0x.c @@ -291,7 +291,7 @@ void ppu2c0x_init_palette_rgb( running_machine *machine, int first_entry ) int R, G, B; - UINT8 *palette_data = memory_region(machine, "palette"); + UINT8 *palette_data = machine->region("palette")->base(); /* Loop through the emphasis modes (8 total) */ for (color_emphasis = 0; color_emphasis < 8; color_emphasis++) diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c index d012215087b..c829d1af594 100644 --- a/src/mame/video/prehisle.c +++ b/src/mame/video/prehisle.c @@ -63,7 +63,7 @@ WRITE16_HANDLER( prehisle_control16_w ) static TILE_GET_INFO( get_bg2_tile_info ) { - UINT8 *tilerom = memory_region(machine, "gfx5"); + UINT8 *tilerom = machine->region("gfx5")->base(); int offs = tile_index * 2; int attr = tilerom[offs + 1] + (tilerom[offs] << 8); diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c index 16638505296..533d7e902fd 100644 --- a/src/mame/video/psikyo.c +++ b/src/mame/video/psikyo.c @@ -271,8 +271,8 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static const int pri[] = { 0, 0xfc, 0xff, 0xff }; int offs; UINT16 *spritelist = (UINT16 *)(state->spritebuf2 + 0x1800 / 4); - UINT8 *TILES = memory_region(machine, "spritelut"); // Sprites LUT - int TILES_LEN = memory_region_length(machine, "spritelut"); + UINT8 *TILES = machine->region("spritelut")->base(); // Sprites LUT + int TILES_LEN = machine->region("spritelut")->bytes(); int width = machine->primary_screen->width(); int height = machine->primary_screen->height(); @@ -393,8 +393,8 @@ static void draw_sprites_bootleg( running_machine *machine, bitmap_t *bitmap, co // UINT16 *spritelist = (UINT16 *)(machine->generic.spriteram.u32 + 0x1800/4); UINT16 *spritelist = (UINT16 *)(state->spritebuf2 + 0x1800 / 4); - UINT8 *TILES = memory_region(machine, "spritelut"); // Sprites LUT - int TILES_LEN = memory_region_length(machine, "spritelut"); + UINT8 *TILES = machine->region("spritelut")->base(); // Sprites LUT + int TILES_LEN = machine->region("spritelut")->bytes(); int width = machine->primary_screen->width(); int height = machine->primary_screen->height(); diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c index 690f30a16e0..8d8126b1eaa 100644 --- a/src/mame/video/punchout.c +++ b/src/mame/video/punchout.c @@ -333,7 +333,7 @@ static void drawbs2(running_machine *machine, bitmap_t *bitmap, const rectangle static void punchout_copy_top_palette(running_machine *machine, int bank) { int i; - const UINT8 *color_prom = memory_region(machine, "proms"); + const UINT8 *color_prom = machine->region("proms")->base(); // top monitor palette for (i = 0; i < 0x100; i++) @@ -352,7 +352,7 @@ static void punchout_copy_top_palette(running_machine *machine, int bank) static void punchout_copy_bot_palette(running_machine *machine, int bank) { int i; - const UINT8 *color_prom = memory_region(machine, "proms") + 0x600; + const UINT8 *color_prom = machine->region("proms")->base() + 0x600; // bottom monitor palette for (i = 0; i < 0x100; i++) diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c index 1f12f1574d7..c85d85359dd 100644 --- a/src/mame/video/pushman.c +++ b/src/mame/video/pushman.c @@ -15,7 +15,7 @@ static TILEMAP_MAPPER( background_scan_rows ) static TILE_GET_INFO( get_back_tile_info ) { - UINT8 *bg_map = memory_region(machine, "gfx4"); + UINT8 *bg_map = machine->region("gfx4")->base(); int tile; tile = bg_map[tile_index << 1] + (bg_map[(tile_index << 1) + 1] << 8); diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c index a817c57d37e..0c718094ff0 100644 --- a/src/mame/video/quizdna.c +++ b/src/mame/video/quizdna.c @@ -38,7 +38,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { int code,col,x,y; - UINT8 *FG = memory_region(machine, "user1"); + UINT8 *FG = machine->region("user1")->base(); x = tile_index & 0x1f; y = FG[(tile_index >> 5) & 0x1f] & 0x3f; @@ -73,7 +73,7 @@ VIDEO_START( quizdna ) WRITE8_HANDLER( quizdna_bg_ram_w ) { - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); quizdna_bg_ram[offset] = data; RAM[0x12000+offset] = data; @@ -84,7 +84,7 @@ WRITE8_HANDLER( quizdna_fg_ram_w ) { int i; int offs = offset & 0xfff; - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); RAM[0x10000+offs] = data; RAM[0x11000+offs] = data; /* mirror */ diff --git a/src/mame/video/redalert.c b/src/mame/video/redalert.c index 267b4c5796a..db93fe7876f 100644 --- a/src/mame/video/redalert.c +++ b/src/mame/video/redalert.c @@ -76,7 +76,7 @@ static void get_pens(running_machine *machine, pen_t *pens) double charmap_b_weights[2]; double back_r_weight[1]; double back_gb_weight[1]; - const UINT8 *prom = memory_region(machine, "proms"); + const UINT8 *prom = machine->region("proms")->base(); scaler = compute_resistor_weights(0, 0xff, -1, 1, resistances_bitmap, bitmap_weight, 470, 0, @@ -141,7 +141,7 @@ static void get_panther_pens(running_machine *machine, pen_t *pens) double charmap_b_weights[2]; double back_r_weight[1]; double back_gb_weight[1]; - const UINT8 *prom = memory_region(machine, "proms"); + const UINT8 *prom = machine->region("proms")->base(); scaler = compute_resistor_weights(0, 0xff, -1, 1, resistances_bitmap, bitmap_weight, 470, 0, diff --git a/src/mame/video/rollrace.c b/src/mame/video/rollrace.c index 8f9e135642e..4b56455094c 100644 --- a/src/mame/video/rollrace.c +++ b/src/mame/video/rollrace.c @@ -67,7 +67,7 @@ VIDEO_UPDATE( rollrace ) int sx, sy; int scroll; int col; - const UINT8 *mem = memory_region(screen->machine, "user1"); + const UINT8 *mem = screen->machine->region("user1")->base(); /* fill in background colour*/ bitmap_fill(bitmap,cliprect,ra_bkgpen); diff --git a/src/mame/video/route16.c b/src/mame/video/route16.c index 4f64ffeedc7..fe004dde378 100644 --- a/src/mame/video/route16.c +++ b/src/mame/video/route16.c @@ -83,8 +83,8 @@ VIDEO_UPDATE( route16 ) { offs_t offs; - UINT8 *color_prom1 = &memory_region(screen->machine, "proms")[0x000]; - UINT8 *color_prom2 = &memory_region(screen->machine, "proms")[0x100]; + UINT8 *color_prom1 = &screen->machine->region("proms")->base()[0x000]; + UINT8 *color_prom2 = &screen->machine->region("proms")->base()[0x100]; for (offs = 0; offs < route16_videoram_size; offs++) { @@ -139,8 +139,8 @@ static int video_update_stratvox_ttmahjng(running_machine *machine, bitmap_t *bi { offs_t offs; - UINT8 *color_prom1 = &memory_region(machine, "proms")[0x000]; - UINT8 *color_prom2 = &memory_region(machine, "proms")[0x100]; + UINT8 *color_prom1 = &machine->region("proms")->base()[0x000]; + UINT8 *color_prom2 = &machine->region("proms")->base()[0x100]; for (offs = 0; offs < route16_videoram_size; offs++) { diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c index 2c0752531e1..5d02f71c0e1 100644 --- a/src/mame/video/rungun.c +++ b/src/mame/video/rungun.c @@ -92,7 +92,7 @@ VIDEO_START( rng ) assert(gfx_index != MAX_GFX_ELEMENTS); // decode the ttl layer's gfx - machine->gfx[gfx_index] = gfx_element_alloc(machine, &charlayout, memory_region(machine, "gfx3"), machine->total_colors() / 16, 0); + machine->gfx[gfx_index] = gfx_element_alloc(machine, &charlayout, machine->region("gfx3")->base(), machine->total_colors() / 16, 0); state->ttl_gfx_index = gfx_index; // create the tilemap diff --git a/src/mame/video/sega16sp.c b/src/mame/video/sega16sp.c index bf54b1e0676..3cfc910d0aa 100644 --- a/src/mame/video/sega16sp.c +++ b/src/mame/video/sega16sp.c @@ -78,9 +78,9 @@ INLINE const sega16sp_interface *get_interface( device_t *device ) void segaic16_sprites_hangon_draw(running_machine *machine, device_t *device, bitmap_t *bitmap, const rectangle *cliprect) { - UINT8 numbanks = memory_region_length(machine, "gfx2") / 0x10000; - const UINT16 *spritebase = (const UINT16 *)memory_region(machine, "gfx2"); - const UINT8 *zoom = (const UINT8 *)memory_region(machine, "proms"); + UINT8 numbanks = machine->region("gfx2")->bytes() / 0x10000; + const UINT16 *spritebase = (const UINT16 *)machine->region("gfx2")->base(); + const UINT8 *zoom = (const UINT8 *)machine->region("proms")->base(); sega16sp_state *sega16sp = get_safe_token(device); UINT16* data = sega16sp->spriteram; @@ -243,9 +243,9 @@ void segaic16_sprites_hangon_draw(running_machine *machine, device_t *device, bi void segaic16_sprites_sharrier_draw(running_machine *machine, device_t *device, bitmap_t *bitmap, const rectangle *cliprect) { - UINT8 numbanks = memory_region_length(machine, "gfx2") / 0x20000; - const UINT32 *spritebase = (const UINT32 *)memory_region(machine, "gfx2"); - const UINT8 *zoom = (const UINT8 *)memory_region(machine, "proms"); + UINT8 numbanks = machine->region("gfx2")->bytes() / 0x20000; + const UINT32 *spritebase = (const UINT32 *)machine->region("gfx2")->base(); + const UINT8 *zoom = (const UINT8 *)machine->region("proms")->base(); sega16sp_state *sega16sp = get_safe_token(device); UINT16* data = sega16sp->spriteram; @@ -414,8 +414,8 @@ void segaic16_sprites_sharrier_draw(running_machine *machine, device_t *device, void segaic16_sprites_16a_draw(running_machine *machine, device_t *device, bitmap_t *bitmap, const rectangle *cliprect) { - UINT8 numbanks = memory_region_length(machine, "gfx2") / 0x10000; - const UINT16 *spritebase = (const UINT16 *)memory_region(machine, "gfx2"); + UINT8 numbanks = machine->region("gfx2")->bytes() / 0x10000; + const UINT16 *spritebase = (const UINT16 *)machine->region("gfx2")->base(); sega16sp_state *sega16sp = get_safe_token(device); UINT16* data = sega16sp->spriteram; @@ -580,11 +580,11 @@ void segaic16_sprites_16b_draw(running_machine *machine, device_t *device, bitma sega16sp_state *sega16sp = get_safe_token(device); UINT16* data = sega16sp->spriteram; - spritebase = (const UINT16 *)memory_region(machine, "gfx2"); + spritebase = (const UINT16 *)machine->region("gfx2")->base(); if (!spritebase) return; - numbanks = memory_region_length(machine, "gfx2") / 0x20000; + numbanks = machine->region("gfx2")->bytes() / 0x20000; /* first scan forward to find the end of the list */ for (data = sega16sp->spriteram; data < sega16sp->spriteram + sega16sp->ramsize/2; data += 8) @@ -741,8 +741,8 @@ void segaic16_sprites_16b_draw(running_machine *machine, device_t *device, bitma void segaic16_sprites_yboard_16b_draw(running_machine *machine, device_t *device, bitmap_t *bitmap, const rectangle *cliprect) { - UINT8 numbanks = memory_region_length(machine, "gfx2") / 0x20000; - const UINT16 *spritebase = (const UINT16 *)memory_region(machine, "gfx2"); + UINT8 numbanks = machine->region("gfx2")->bytes() / 0x20000; + const UINT16 *spritebase = (const UINT16 *)machine->region("gfx2")->base(); sega16sp_state *sega16sp = get_safe_token(device); UINT16* data = sega16sp->spriteram; @@ -919,8 +919,8 @@ void segaic16_sprites_yboard_16b_draw(running_machine *machine, device_t *device static void segaic16_sprites_xboard_outrun_draw(running_machine *machine, device_t *device, bitmap_t *bitmap, const rectangle *cliprect, int type) { - UINT8 numbanks = memory_region_length(machine, "gfx2") / 0x40000; - const UINT32 *spritebase = (const UINT32 *)memory_region(machine, "gfx2"); + UINT8 numbanks = machine->region("gfx2")->bytes() / 0x40000; + const UINT32 *spritebase = (const UINT32 *)machine->region("gfx2")->base(); sega16sp_state *sega16sp = get_safe_token(device); UINT16* data = sega16sp->spriteram; @@ -1090,8 +1090,8 @@ void segaic16_sprites_xboard_draw(running_machine *machine, device_t *device, bi void segaic16_sprites_yboard_draw(running_machine *machine, device_t *device, bitmap_t *bitmap, const rectangle *cliprect) { - UINT8 numbanks = memory_region_length(machine, "gfx1") / 0x80000; - const UINT64 *spritebase = (const UINT64 *)memory_region(machine, "gfx1"); + UINT8 numbanks = machine->region("gfx1")->bytes() / 0x80000; + const UINT64 *spritebase = (const UINT64 *)machine->region("gfx1")->base(); const UINT16 *rotatebase = segaic16_rotate[0].buffer ? segaic16_rotate[0].buffer : segaic16_rotate[0].rotateram; UINT8 visited[0x1000]; sega16sp_state *sega16sp = get_safe_token(device); @@ -1384,8 +1384,8 @@ void segaic16_sprites_yboard_draw(running_machine *machine, device_t *device, bi void segaic16_sprites_16a_bootleg_wb3bl_draw(running_machine *machine, device_t *device, bitmap_t *bitmap, const rectangle *cliprect) { - UINT8 numbanks = memory_region_length(machine, "gfx2") / 0x10000; - const UINT16 *spritebase = (const UINT16 *)memory_region(machine, "gfx2"); + UINT8 numbanks = machine->region("gfx2")->bytes() / 0x10000; + const UINT16 *spritebase = (const UINT16 *)machine->region("gfx2")->base(); sega16sp_state *sega16sp = get_safe_token(device); UINT16* data = sega16sp->spriteram; @@ -1407,8 +1407,8 @@ void segaic16_sprites_16a_bootleg_wb3bl_draw(running_machine *machine, device_t /* 4 player passing shot is different to this.. */ void segaic16_sprites_16a_bootleg_passhtb_draw(running_machine *machine, device_t *device, bitmap_t *bitmap, const rectangle *cliprect) { - UINT8 numbanks = memory_region_length(machine, "gfx2") / 0x10000; - const UINT16 *spritebase = (const UINT16 *)memory_region(machine, "gfx2"); + UINT8 numbanks = machine->region("gfx2")->bytes() / 0x10000; + const UINT16 *spritebase = (const UINT16 *)machine->region("gfx2")->base(); sega16sp_state *sega16sp = get_safe_token(device); UINT16* data = sega16sp->spriteram; @@ -1429,8 +1429,8 @@ void segaic16_sprites_16a_bootleg_passhtb_draw(running_machine *machine, device_ void segaic16_sprites_16a_bootleg_shinobld_draw(running_machine *machine, device_t *device, bitmap_t *bitmap, const rectangle *cliprect) { - UINT8 numbanks = memory_region_length(machine, "gfx2") / 0x10000; - const UINT16 *spritebase = (const UINT16 *)memory_region(machine, "gfx2"); + UINT8 numbanks = machine->region("gfx2")->bytes() / 0x10000; + const UINT16 *spritebase = (const UINT16 *)machine->region("gfx2")->base(); sega16sp_state *sega16sp = get_safe_token(device); UINT16* data = sega16sp->spriteram; diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c index 49edd46d11d..0897c26996c 100644 --- a/src/mame/video/segag80r.c +++ b/src/mame/video/segag80r.c @@ -170,7 +170,7 @@ static void spaceod_bg_init_palette(running_machine *machine) static TILE_GET_INFO( spaceod_get_tile_info ) { - int code = memory_region(machine, "gfx2")[tile_index + 0x1000 * (spaceod_bg_control >> 6)]; + int code = machine->region("gfx2")->base()[tile_index + 0x1000 * (spaceod_bg_control >> 6)]; SET_TILE_INFO(1, code + 0x100 * ((spaceod_bg_control >> 2) & 1), 0, 0); } @@ -185,7 +185,7 @@ static TILEMAP_MAPPER( spaceod_scan_rows ) static TILE_GET_INFO( bg_get_tile_info ) { - int code = memory_region(machine, "gfx2")[tile_index]; + int code = machine->region("gfx2")->base()[tile_index]; SET_TILE_INFO(1, code + 0x100 * bg_char_bank, code >> 4, 0); } @@ -232,13 +232,13 @@ VIDEO_START( segag80r ) /* background tilemap is effectively 1 screen x n screens */ case G80_BACKGROUND_MONSTERB: - bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_rows, 8,8, 32,memory_region_length(machine, "gfx2") / 32); + bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_rows, 8,8, 32,machine->region("gfx2")->bytes() / 32); break; /* background tilemap is effectively 4 screens x n screens */ case G80_BACKGROUND_PIGNEWT: case G80_BACKGROUND_SINDBADM: - bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_rows, 8,8, 128,memory_region_length(machine, "gfx2") / 128); + bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_rows, 8,8, 128,machine->region("gfx2")->bytes() / 128); break; } diff --git a/src/mame/video/segag80v.c b/src/mame/video/segag80v.c index 6b721637812..379bc86c0a9 100644 --- a/src/mame/video/segag80v.c +++ b/src/mame/video/segag80v.c @@ -112,7 +112,7 @@ INLINE int adjust_xy(int rawx, int rawy, int *outx, int *outy) static void sega_generate_vector_list(running_machine *machine) { - UINT8 *sintable = memory_region(machine, "proms"); + UINT8 *sintable = machine->region("proms")->base(); double total_time = 1.0 / (double)IRQ_CLOCK; UINT16 symaddr = 0; UINT8 *vectorram = segag80v_vectorram; diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c index d7e77e15d8c..d38d72c44f5 100644 --- a/src/mame/video/segaic16.c +++ b/src/mame/video/segaic16.c @@ -1408,8 +1408,8 @@ WRITE16_HANDLER( segaic16_textram_0_w ) static void segaic16_road_hangon_decode(running_machine *machine, struct road_info *info) { int x, y; - const UINT8 *gfx = memory_region(machine, "gfx3"); - int len = memory_region_length(machine, "gfx3"); + const UINT8 *gfx = machine->region("gfx3")->base(); + int len = machine->region("gfx3")->bytes(); /* allocate memory for the unpacked road data */ info->gfx = auto_alloc_array(machine, UINT8, 256 * 512); @@ -1669,8 +1669,8 @@ static void segaic16_road_hangon_draw(struct road_info *info, bitmap_t *bitmap, static void segaic16_road_outrun_decode(running_machine *machine, struct road_info *info) { int x, y; - const UINT8 *gfx = memory_region(machine, "gfx3"); - int len = memory_region_length(machine, "gfx3"); + const UINT8 *gfx = machine->region("gfx3")->base(); + int len = machine->region("gfx3")->bytes(); /* allocate memory for the unpacked road data */ info->gfx = auto_alloc_array(machine, UINT8, (256 * 2 + 1) * 512); diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c index f5a5e7abae7..5ea832bcce1 100644 --- a/src/mame/video/segas32.c +++ b/src/mame/video/segas32.c @@ -1702,8 +1702,8 @@ static int draw_one_sprite(running_machine *machine, UINT16 *data, int xoffs, in }; bitmap_t *bitmap = layer_data[(!is_multi32 || !(data[3] & 0x0800)) ? MIXER_LAYER_SPRITES_2 : MIXER_LAYER_MULTISPR_2].bitmap; - UINT8 numbanks = memory_region_length(machine, "gfx2") / 0x400000; - const UINT32 *spritebase = (const UINT32 *)memory_region(machine, "gfx2"); + UINT8 numbanks = machine->region("gfx2")->bytes() / 0x400000; + const UINT32 *spritebase = (const UINT32 *)machine->region("gfx2")->base(); int indirect = data[0] & 0x2000; int indlocal = data[0] & 0x1000; diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c index 001b7d59d67..86c26645cf8 100644 --- a/src/mame/video/seibuspi.c +++ b/src/mame/video/seibuspi.c @@ -526,7 +526,7 @@ VIDEO_START( spi ) for (i = 6000; i < 6016; i++) { alpha_table[i] = 1; } for (i = 6128; i < 6144; i++) { alpha_table[i] = 1; } - region_length = memory_region_length(machine, "gfx2"); + region_length = machine->region("gfx2")->bytes(); if (region_length <= 0x300000) { diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c index 3cc9d286e4a..193e2a4054a 100644 --- a/src/mame/video/seta.c +++ b/src/mame/video/seta.c @@ -291,8 +291,8 @@ WRITE16_HANDLER( seta_vregs_w ) if (new_bank != state->samples_bank) { - UINT8 *rom = memory_region(space->machine, "x1snd"); - int samples_len = memory_region_length(space->machine, "x1snd"); + UINT8 *rom = space->machine->region("x1snd")->base(); + int samples_len = space->machine->region("x1snd")->bytes(); int addr; state->samples_bank = new_bank; diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c index 2105b422abc..ef02657916c 100644 --- a/src/mame/video/sf.c +++ b/src/mame/video/sf.c @@ -9,7 +9,7 @@ static TILE_GET_INFO( get_bg_tile_info ) { - UINT8 *base = memory_region(machine, "gfx5") + 2 * tile_index; + UINT8 *base = machine->region("gfx5")->base() + 2 * tile_index; int attr = base[0x10000]; int color = base[0]; int code = (base[0x10000 + 1] << 8) | base[1]; @@ -22,7 +22,7 @@ static TILE_GET_INFO( get_bg_tile_info ) static TILE_GET_INFO( get_fg_tile_info ) { - UINT8 *base = memory_region(machine, "gfx5") + 0x20000 + 2 * tile_index; + UINT8 *base = machine->region("gfx5")->base() + 0x20000 + 2 * tile_index; int attr = base[0x10000]; int color = base[0]; int code = (base[0x10000 + 1] << 8) | base[1]; diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c index f8ac89894b9..b7f3a84a938 100644 --- a/src/mame/video/shangkid.c +++ b/src/mame/video/shangkid.c @@ -48,7 +48,7 @@ static TILE_GET_INFO( get_bg_tile_info ){ } tileinfo->category = - (memory_region( machine, "proms" )[0x800+color*4]==2)?1:0; + (machine->region( "proms" )->base()[0x800+color*4]==2)?1:0; } VIDEO_START( shangkid ) diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c index ba000de5219..58a75e4cdcb 100644 --- a/src/mame/video/shisen.c +++ b/src/mame/video/shisen.c @@ -14,7 +14,7 @@ WRITE8_HANDLER( sichuan2_bankswitch_w ) shisen_state *state = space->machine->driver_data(); int bankaddress; int bank; - UINT8 *RAM = memory_region(space->machine, "maincpu"); + UINT8 *RAM = space->machine->region("maincpu")->base(); if (data & 0xc0) logerror("bank switch %02x\n",data); diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c index 972a829d1b0..838c648a382 100644 --- a/src/mame/video/sidearms.c +++ b/src/mame/video/sidearms.c @@ -149,7 +149,7 @@ static TILEMAP_MAPPER( sidearms_tilemap_scan ) VIDEO_START( sidearms ) { sidearms_state *state = machine->driver_data(); - state->tilerom = memory_region(machine, "gfx4"); + state->tilerom = machine->region("gfx4")->base(); if (!state->gameid) { @@ -232,7 +232,7 @@ static void sidearms_draw_starfield( running_machine *machine, bitmap_t *bitmap _vcount_191 = state->vcount_191; _hcount_191 = state->hcount_191 & 0xff; - sf_rom = memory_region(machine, "user1"); + sf_rom = machine->region("user1")->base(); #if 0 // old loop (for reference; easier to read) if (!flipon) diff --git a/src/mame/video/skyfox.c b/src/mame/video/skyfox.c index 66ef2e8d67c..bcf879bb9e5 100644 --- a/src/mame/video/skyfox.c +++ b/src/mame/video/skyfox.c @@ -241,7 +241,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect) { skyfox_state *state = machine->driver_data(); - UINT8 *RAM = memory_region(machine, "gfx2"); + UINT8 *RAM = machine->region("gfx2")->base(); int x, y, i; /* The foreground stars (sprites) move at twice this speed when diff --git a/src/mame/video/skyraid.c b/src/mame/video/skyraid.c index a60427d5174..ea9eb4b07f0 100644 --- a/src/mame/video/skyraid.c +++ b/src/mame/video/skyraid.c @@ -39,7 +39,7 @@ static void draw_text(running_machine *machine, bitmap_t* bitmap, const rectangl static void draw_terrain(running_machine *machine, bitmap_t* bitmap, const rectangle *cliprect) { skyraid_state *state = machine->driver_data(); - const UINT8* p = memory_region(machine, "user1"); + const UINT8* p = machine->region("user1")->base(); int x; int y; @@ -119,7 +119,7 @@ static void draw_missiles(running_machine *machine, bitmap_t* bitmap, const rect static void draw_trapezoid(running_machine *machine, bitmap_t* dst, bitmap_t* src) { - const UINT8* p = memory_region(machine, "user2"); + const UINT8* p = machine->region("user2")->base(); int x; int y; diff --git a/src/mame/video/spacefb.c b/src/mame/video/spacefb.c index da83f5f8d72..057703fd9f4 100644 --- a/src/mame/video/spacefb.c +++ b/src/mame/video/spacefb.c @@ -218,7 +218,7 @@ static void draw_starfield(screen_device &screen, bitmap_t *bitmap, const rectan static void get_sprite_pens(running_machine *machine, pen_t *pens) { static const double fade_weights[] = { 1.0, 1.5, 2.5, 4.0 }; - const UINT8 *prom = memory_region(machine, "proms"); + const UINT8 *prom = machine->region("proms")->base(); int i; for (i = 0; i < NUM_SPRITE_PENS; i++) @@ -259,7 +259,7 @@ static void draw_bullet(running_machine *machine, offs_t offs, pen_t pen, bitmap { UINT8 sy; - UINT8 *gfx = memory_region(machine, "gfx2"); + UINT8 *gfx = machine->region("gfx2")->base(); UINT8 code = spacefb_videoram[offs + 0x0200] & 0x3f; UINT8 y = ~spacefb_videoram[offs + 0x0100] - 2; @@ -310,7 +310,7 @@ static void draw_sprite(running_machine *machine, offs_t offs, pen_t *pens, bitm { UINT8 sy; - UINT8 *gfx = memory_region(machine, "gfx1"); + UINT8 *gfx = machine->region("gfx1")->base(); UINT8 code = ~spacefb_videoram[offs + 0x0200]; UINT8 color_base = (~spacefb_videoram[offs + 0x0300] & 0x0f) << 2; diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c index 39ea24c2984..7239dce48b8 100644 --- a/src/mame/video/spdodgeb.c +++ b/src/mame/video/spdodgeb.c @@ -116,7 +116,7 @@ WRITE8_HANDLER( spdodgeb_scrollx_lo_w ) WRITE8_HANDLER( spdodgeb_ctrl_w ) { - UINT8 *rom = memory_region(space->machine, "maincpu"); + UINT8 *rom = space->machine->region("maincpu")->base(); /* bit 0 = flip screen */ flip_screen_set(space->machine, data & 0x01); diff --git a/src/mame/video/sspeedr.c b/src/mame/video/sspeedr.c index ea9f50e2b28..6c16bd0e1d3 100644 --- a/src/mame/video/sspeedr.c +++ b/src/mame/video/sspeedr.c @@ -97,7 +97,7 @@ WRITE8_HANDLER( sspeedr_track_ice_w ) static void draw_track(running_machine *machine, bitmap_t* bitmap) { - const UINT8* p = memory_region(machine, "gfx3"); + const UINT8* p = machine->region("gfx3")->base(); int x; int y; diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c index 0eaddfe49b5..e039f9882fb 100644 --- a/src/mame/video/st0016.c +++ b/src/mame/video/st0016.c @@ -191,8 +191,8 @@ WRITE8_HANDLER(st0016_vregs_w) UINT32 srcadr=(st0016_vregs[0xa0]|(st0016_vregs[0xa1]<<8)|(st0016_vregs[0xa2]<<16))<<1; UINT32 dstadr=(st0016_vregs[0xa3]|(st0016_vregs[0xa4]<<8)|(st0016_vregs[0xa5]<<16))<<1; UINT32 length=((st0016_vregs[0xa6]|(st0016_vregs[0xa7]<<8)|((st0016_vregs[0xa8]&0x1f)<<16))+1)<<1; - UINT32 srclen = (memory_region_length(space->machine, "maincpu")-0x10000); - UINT8 *mem = memory_region(space->machine, "maincpu"); + UINT32 srclen = (space->machine->region("maincpu")->bytes()-0x10000); + UINT8 *mem = space->machine->region("maincpu")->base(); srcadr += macs_cart_slot*0x400000; diff --git a/src/mame/video/stactics.c b/src/mame/video/stactics.c index 051146ff650..8366df3c329 100644 --- a/src/mame/video/stactics.c +++ b/src/mame/video/stactics.c @@ -312,7 +312,7 @@ static void set_indicator_leds(int data, const char *output_name, int base_index static void update_artwork(running_machine *machine, stactics_state *state) { int i; - UINT8 *beam_region = memory_region(machine, "user1"); + UINT8 *beam_region = machine->region("user1")->base(); /* set the lamps first */ output_set_indexed_value("base_lamp", 4, state->lamps[0] & 0x01); diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c index c96ecebae9c..134b2f716d2 100644 --- a/src/mame/video/stfight.c +++ b/src/mame/video/stfight.c @@ -103,7 +103,7 @@ static TILEMAP_MAPPER( fg_scan ) static TILE_GET_INFO( get_fg_tile_info ) { - UINT8 *fgMap = memory_region(machine, "gfx5"); + UINT8 *fgMap = machine->region("gfx5")->base(); int attr,tile_base; attr = fgMap[0x8000+tile_index]; @@ -126,7 +126,7 @@ static TILEMAP_MAPPER( bg_scan ) static TILE_GET_INFO( get_bg_tile_info ) { - UINT8 *bgMap = memory_region(machine, "gfx6"); + UINT8 *bgMap = machine->region("gfx6")->base(); int attr,tile_bank,tile_base; attr = bgMap[0x8000+tile_index]; diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c index 4dbe26c8d7e..ea7787ec90f 100644 --- a/src/mame/video/strnskil.c +++ b/src/mame/video/strnskil.c @@ -129,7 +129,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta VIDEO_UPDATE( strnskil ) { int row; - const UINT8 *usr1 = memory_region(screen->machine, "user1"); + const UINT8 *usr1 = screen->machine->region("user1")->base(); for (row = 0; row < 32; row++) { diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c index 9a47e8cae31..d6f1207fa83 100644 --- a/src/mame/video/stvvdp2.c +++ b/src/mame/video/stvvdp2.c @@ -6458,7 +6458,7 @@ static void stv_dump_ram() fp=fopen("68k.dmp", "w+b"); if (fp) { - fwrite(memory_region(machine, REGION_CPU3), 0x100000, 1, fp); + fwrite(machine->region(REGION_CPU3)->base(), 0x100000, 1, fp); fclose(fp); } } diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c index c7644112d48..6c587715f7e 100644 --- a/src/mame/video/suna8.c +++ b/src/mame/video/suna8.c @@ -83,7 +83,7 @@ static TILE_GET_INFO( get_tile_info ) if (input_code_pressed(machine, KEYCODE_X)) { - UINT8 *rom = memory_region(machine, "maincpu") + 0x10000 + 0x4000 * state->trombank; + UINT8 *rom = machine->region("maincpu")->base() + 0x10000 + 0x4000 * state->trombank; code = rom[ 2 * tile_index + 0 ]; attr = rom[ 2 * tile_index + 1 ]; } @@ -422,7 +422,7 @@ VIDEO_UPDATE( suna8 ) if (input_code_pressed(screen->machine, KEYCODE_Z) || input_code_pressed(screen->machine, KEYCODE_X)) { suna8_state *state = screen->machine->driver_data(); - int max_tiles = memory_region_length(screen->machine, "gfx1") / (0x400 * 0x20); + int max_tiles = screen->machine->region("gfx1")->bytes() / (0x400 * 0x20); if (input_code_pressed_once(screen->machine, KEYCODE_Q)) { state->page--; tilemap_mark_all_tiles_dirty_all(screen->machine); } if (input_code_pressed_once(screen->machine, KEYCODE_W)) { state->page++; tilemap_mark_all_tiles_dirty_all(screen->machine); } diff --git a/src/mame/video/superchs.c b/src/mame/video/superchs.c index f93ed6d4b61..915a55a8f24 100644 --- a/src/mame/video/superchs.c +++ b/src/mame/video/superchs.c @@ -67,7 +67,7 @@ Heavy use is made of sprite zooming. static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect,const int *primasks,int x_offs,int y_offs) { UINT32 *spriteram32 = machine->generic.spriteram.u32; - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); int offs, data, tilenum, color, flipx, flipy; int x, y, priority, dblsize, curx, cury; int sprites_flipscreen = 0; diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c index 98073a7ed90..eec930440c7 100644 --- a/src/mame/video/suprloco.c +++ b/src/mame/video/suprloco.c @@ -208,7 +208,7 @@ static void draw_sprite(running_machine *machine, bitmap_t *bitmap,const rectang dy = -1; } - gfx2 = memory_region(machine, "gfx2"); + gfx2 = machine->region("gfx2")->base(); for (row = 0;row < height;row++,adjy+=dy) { int color1,color2,flipx; diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c index cbd3f57eebe..f184507bf1b 100644 --- a/src/mame/video/suprnova.c +++ b/src/mame/video/suprnova.c @@ -1181,7 +1181,7 @@ VIDEO_UPDATE(skns) } bitmap_fill(sprite_bitmap, cliprect, 0x0000); - skns_draw_sprites(screen->machine, sprite_bitmap, cliprect, screen->machine->generic.spriteram.u32, screen->machine->generic.spriteram_size, memory_region(screen->machine,"gfx1"), memory_region_length (screen->machine, "gfx1"), skns_spc_regs ); + skns_draw_sprites(screen->machine, sprite_bitmap, cliprect, screen->machine->generic.spriteram.u32, screen->machine->generic.spriteram_size, screen->machine->region("gfx1")->base(), screen->machine->region ("gfx1")->bytes(), skns_spc_regs ); return 0; diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c index 4fe1951095f..a0576a3e434 100644 --- a/src/mame/video/system1.c +++ b/src/mame/video/system1.c @@ -299,7 +299,7 @@ WRITE8_DEVICE_HANDLER( system1_videoram_bank_w ) WRITE8_HANDLER( system1_paletteram_w ) { - const UINT8 *color_prom = memory_region(space->machine, "palette"); + const UINT8 *color_prom = space->machine->region("palette")->base(); int val,r,g,b; /* @@ -370,8 +370,8 @@ WRITE8_HANDLER( system1_paletteram_w ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int xoffset) { - UINT32 gfxbanks = memory_region_length(machine, "sprites") / 0x8000; - const UINT8 *gfxbase = memory_region(machine, "sprites"); + UINT32 gfxbanks = machine->region("sprites")->bytes() / 0x8000; + const UINT8 *gfxbase = machine->region("sprites")->base(); UINT8 *spriteram = machine->generic.spriteram.u8; int flipscreen = flip_screen_get(machine); int spritenum; @@ -493,7 +493,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static void video_update_common(device_t *screen, bitmap_t *bitmap, const rectangle *cliprect, bitmap_t *fgpixmap, bitmap_t **bgpixmaps, const int *bgrowscroll, int bgyscroll, int spritexoffs) { - const UINT8 *lookup = memory_region(screen->machine, "proms"); + const UINT8 *lookup = screen->machine->region("proms")->base(); int x, y; /* first clear the sprite bitmap and draw sprites within this area */ diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c index 52e6b270fcb..9f31a5db221 100644 --- a/src/mame/video/tail2nos.c +++ b/src/mame/video/tail2nos.c @@ -62,7 +62,7 @@ VIDEO_START( tail2nos ) tilemap_set_transparent_pen(state->bg_tilemap, 15); - state->zoomdata = (UINT16 *)memory_region(machine, "gfx3"); + state->zoomdata = (UINT16 *)machine->region("gfx3")->base(); state_save_register_global_pointer(machine, state->zoomdata, 0x20000 / 2); state_save_register_postload(machine, tail2nos_postload, NULL); diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c index f94aeedbdfb..599f975abd4 100644 --- a/src/mame/video/taito_z.c +++ b/src/mame/video/taito_z.c @@ -149,7 +149,7 @@ confirmed static void contcirc_draw_sprites_16x8( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int y_offs ) { taitoz_state *state = machine->driver_data(); - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); UINT16 *spriteram = state->spriteram; int offs, data, tilenum, color, flipx, flipy; int x, y, priority, curx, cury; @@ -244,7 +244,7 @@ static void contcirc_draw_sprites_16x8( running_machine *machine, bitmap_t *bitm static void chasehq_draw_sprites_16x16( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int y_offs ) { taitoz_state *state = machine->driver_data(); - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); UINT16 *spriteram = state->spriteram; int offs, data, tilenum, color, flipx, flipy; int x, y, priority, curx, cury; @@ -430,7 +430,7 @@ static void chasehq_draw_sprites_16x16( running_machine *machine, bitmap_t *bitm static void bshark_draw_sprites_16x8( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int y_offs ) { taitoz_state *state = machine->driver_data(); - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); UINT16 *spriteram = state->spriteram; int offs, data, tilenum, color, flipx, flipy; int x, y, priority, curx, cury; @@ -526,7 +526,7 @@ static void bshark_draw_sprites_16x8( running_machine *machine, bitmap_t *bitmap static void sci_draw_sprites_16x8( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int y_offs ) { taitoz_state *state = machine->driver_data(); - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); UINT16 *spriteram = state->spriteram; int offs, start_offs, data, tilenum, color, flipx, flipy; int x, y, priority, curx, cury; @@ -631,7 +631,7 @@ static void sci_draw_sprites_16x8( running_machine *machine, bitmap_t *bitmap, c static void aquajack_draw_sprites_16x8(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect,int y_offs) { taitoz_state *state = machine->driver_data(); - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); UINT16 *spriteram = state->spriteram; int offs, data, tilenum, color, flipx, flipy; int x, y, priority, curx, cury; @@ -726,7 +726,7 @@ static void aquajack_draw_sprites_16x8(running_machine *machine, bitmap_t *bitma static void spacegun_draw_sprites_16x8(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect,int y_offs) { taitoz_state *state = machine->driver_data(); - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); UINT16 *spriteram = state->spriteram; int offs, data, tilenum, color, flipx, flipy; int x, y, priority, curx, cury; diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c index c73aa60812f..6434cecbc34 100644 --- a/src/mame/video/taitoic.c +++ b/src/mame/video/taitoic.c @@ -3969,7 +3969,7 @@ void tc0150rod_draw( device_t *device, bitmap_t *bitmap, const rectangle *clipre UINT16 roada_line[512], roadb_line[512]; UINT16 *dst16; UINT16 *roada, *roadb; - UINT16 *roadgfx = (UINT16 *)memory_region(device->machine, tc0150rod->gfx_region); + UINT16 *roadgfx = (UINT16 *)device->machine->region(tc0150rod->gfx_region)->base(); UINT16 pixel, color, gfx_word; UINT16 roada_clipl, roada_clipr, roada_bodyctrl; diff --git a/src/mame/video/taitosj.c b/src/mame/video/taitosj.c index 41bec3888ae..69c2e289fb1 100644 --- a/src/mame/video/taitosj.c +++ b/src/mame/video/taitosj.c @@ -161,7 +161,7 @@ static void set_pens(running_machine *machine) static void compute_draw_order(running_machine *machine) { int i; - UINT8 *color_prom = memory_region(machine, "proms"); + UINT8 *color_prom = machine->region("proms")->base(); /* do a simple conversion of the PROM into layer priority order. Note that */ /* this is a simplification, which assumes the PROM encodes a sensible priority */ @@ -220,7 +220,7 @@ READ8_HANDLER( taitosj_gfxrom_r ) offs_t offs = taitosj_gfxpointer[0] | (taitosj_gfxpointer[1] << 8); if (offs < 0x8000) - ret = memory_region(space->machine, "gfx1")[offs]; + ret = space->machine->region("gfx1")->base()[offs]; else ret = 0; diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c index f91d24008a8..5992cb9a64c 100644 --- a/src/mame/video/tatsumi.c +++ b/src/mame/video/tatsumi.c @@ -980,7 +980,7 @@ static void draw_bg(running_machine *machine, bitmap_t *dst, tilemap_t *src, con Each tile (0x4000 of them) has a lookup table in ROM to build an individual 3-bit palette from sets of 8 bit palettes! */ - const UINT8* tile_cluts = memory_region(machine, "gfx4"); + const UINT8* tile_cluts = machine->region("gfx4")->base(); const bitmap_t *src_bitmap = tilemap_get_pixmap(src); int src_y_mask=ysize-1; int src_x_mask=xsize-1; @@ -1014,7 +1014,7 @@ static void draw_bg(running_machine *machine, bitmap_t *dst, tilemap_t *src, con static void draw_ground(running_machine *machine, bitmap_t *dst, const rectangle *cliprect) { int x, y; - const UINT8 *lut = memory_region(machine, "proms"); + const UINT8 *lut = machine->region("proms")->base(); UINT16 gva = 0x180; // TODO UINT8 sky_val = apache3_rotate_ctrl[1] & 0xff; diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c index d8bd8b0caf4..95a38658b2a 100644 --- a/src/mame/video/tceptor.c +++ b/src/mame/video/tceptor.c @@ -260,7 +260,7 @@ static void decode_bg(running_machine *machine, const char * region) }; int gfx_index = bg; - UINT8 *src = memory_region(machine, region) + 0x8000; + UINT8 *src = machine->region(region)->base() + 0x8000; UINT8 *buffer; int len = 0x8000; int i; @@ -278,7 +278,7 @@ static void decode_bg(running_machine *machine, const char * region) auto_free(machine, buffer); /* decode the graphics */ - machine->gfx[gfx_index] = gfx_element_alloc(machine, &bg_layout, memory_region(machine, region), 64, 2048); + machine->gfx[gfx_index] = gfx_element_alloc(machine, &bg_layout, machine->region(region)->base(), 64, 2048); } static void decode_sprite(running_machine *machine, int gfx_index, const gfx_layout *layout, const void *data) @@ -307,8 +307,8 @@ static void decode_sprite16(running_machine *machine, const char * region) 2*16*16 }; - UINT8 *src = memory_region(machine, region); - int len = memory_region_length(machine, region); + UINT8 *src = machine->region(region)->base(); + int len = machine->region(region)->bytes(); UINT8 *dst; int i, y; @@ -358,8 +358,8 @@ static void decode_sprite32(running_machine *machine, const char * region) 2*32*32 }; - UINT8 *src = memory_region(machine, region); - int len = memory_region_length(machine, region); + UINT8 *src = machine->region(region)->base(); + int len = machine->region(region)->bytes(); int total = spr32_layout.total; int size = spr32_layout.charincrement / 8; UINT8 *dst; diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c index 770085a7784..3ae29da78bc 100644 --- a/src/mame/video/terracre.c +++ b/src/mame/video/terracre.c @@ -37,7 +37,7 @@ TILE_GET_INFO( get_fg_tile_info ) static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - const UINT8 *spritepalettebank = memory_region(machine, "user1"); + const UINT8 *spritepalettebank = machine->region("user1")->base(); const gfx_element *pGfx = machine->gfx[2]; const UINT16 *pSource = machine->generic.spriteram.u16; int i; diff --git a/src/mame/video/thief.c b/src/mame/video/thief.c index f95028fc125..f7a63db06c2 100644 --- a/src/mame/video/thief.c +++ b/src/mame/video/thief.c @@ -172,7 +172,7 @@ static UINT16 fetch_image_addr( void ){ WRITE8_HANDLER( thief_blit_w ){ int i, offs, xoffset, dy; - UINT8 *gfx_rom = memory_region( space->machine, "gfx1" ); + UINT8 *gfx_rom = space->machine->region( "gfx1" )->base(); UINT8 x = thief_coprocessor.param[SCREEN_XPOS]; UINT8 y = thief_coprocessor.param[SCREEN_YPOS]; UINT8 width = thief_coprocessor.param[BLIT_WIDTH]; @@ -249,7 +249,7 @@ READ8_HANDLER( thief_coprocessor_r ){ return thief_coprocessor.image_ram[addr]; } else { - UINT8 *gfx_rom = memory_region( space->machine, "gfx1" ); + UINT8 *gfx_rom = space->machine->region( "gfx1" )->base(); addr -= 0x2000; if( addr<0x6000 ) return gfx_rom[addr]; } diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c index 62ec7953588..992ab8c8710 100644 --- a/src/mame/video/tigeroad.c +++ b/src/mame/video/tigeroad.c @@ -113,7 +113,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta static TILE_GET_INFO( get_bg_tile_info ) { - UINT8 *tilerom = memory_region(machine, "gfx4"); + UINT8 *tilerom = machine->region("gfx4")->base(); int data = tilerom[tile_index]; int attr = tilerom[tile_index + 1]; diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c index 23af13d8a3f..4a952a578f3 100644 --- a/src/mame/video/tmnt.c +++ b/src/mame/video/tmnt.c @@ -5,7 +5,7 @@ static TILE_GET_INFO( glfgreat_get_roz_tile_info ) { tmnt_state *state = machine->driver_data(); - UINT8 *rom = memory_region(machine, "user1"); + UINT8 *rom = machine->region("user1")->base(); int code; tile_index += 0x40000 * state->glfgreat_roz_rom_bank; @@ -17,7 +17,7 @@ static TILE_GET_INFO( glfgreat_get_roz_tile_info ) static TILE_GET_INFO( prmrsocr_get_roz_tile_info ) { - UINT8 *rom = memory_region(machine, "user1"); + UINT8 *rom = machine->region("user1")->base(); int code = rom[tile_index + 0x20000] + 256 * rom[tile_index]; SET_TILE_INFO(0, code & 0x1fff, code >> 13, 0); @@ -421,14 +421,14 @@ READ16_HANDLER( glfgreat_rom_r ) tmnt_state *state = space->machine->driver_data(); if (state->glfgreat_roz_rom_mode) - return memory_region(space->machine, "gfx3")[state->glfgreat_roz_char_bank * 0x80000 + offset]; + return space->machine->region("gfx3")->base()[state->glfgreat_roz_char_bank * 0x80000 + offset]; else if (offset < 0x40000) { - UINT8 *usr = memory_region(space->machine, "user1"); + UINT8 *usr = space->machine->region("user1")->base(); return usr[offset + 0x80000 + state->glfgreat_roz_rom_bank * 0x40000] + 256 * usr[offset + state->glfgreat_roz_rom_bank * 0x40000]; } else - return memory_region(space->machine, "user1")[((offset & 0x3ffff) >> 2) + 0x100000 + state->glfgreat_roz_rom_bank * 0x10000]; + return space->machine->region("user1")->base()[((offset & 0x3ffff) >> 2) + 0x100000 + state->glfgreat_roz_rom_bank * 0x10000]; } WRITE16_HANDLER( glfgreat_122000_w ) @@ -532,10 +532,10 @@ READ16_HANDLER( prmrsocr_rom_r ) tmnt_state *state = space->machine->driver_data(); if(state->glfgreat_roz_char_bank) - return memory_region(space->machine, "gfx3")[offset]; + return space->machine->region("gfx3")->base()[offset]; else { - UINT8 *usr = memory_region(space->machine, "user1"); + UINT8 *usr = space->machine->region("user1")->base(); return 256 * usr[offset] + usr[offset + 0x020000]; } } diff --git a/src/mame/video/tubep.c b/src/mame/video/tubep.c index c30b40a56ff..654c128f855 100644 --- a/src/mame/video/tubep.c +++ b/src/mame/video/tubep.c @@ -466,7 +466,7 @@ static void draw_sprite(running_machine *machine) { UINT32 XDOT; UINT32 YDOT; - UINT8 * romCxx = memory_region(machine, "user2")+0x00000; + UINT8 * romCxx = machine->region("user2")->base()+0x00000; UINT8 * romD10 = romCxx+0x10000; UINT8 * romEF13 = romCxx+0x12000; UINT8 * romHI2 = romCxx+0x14000; @@ -615,8 +615,8 @@ VIDEO_UPDATE( tubep ) pen_t pen_base = 32; //change it later UINT32 v; - UINT8 *text_gfx_base = memory_region(screen->machine, "gfx1"); - UINT8 *romBxx = memory_region(screen->machine, "user1") + 0x2000*background_romsel; + UINT8 *text_gfx_base = screen->machine->region("gfx1")->base(); + UINT8 *romBxx = screen->machine->region("user1")->base() + 0x2000*background_romsel; /* logerror(" update: from DISP=%i y_min=%3i y_max=%3i\n", DISP_, cliprect->min_y, cliprect->max_y+1); */ @@ -768,8 +768,8 @@ VIDEO_UPDATE( rjammer ) int DISP_ = DISP^1; UINT32 v; - UINT8 *text_gfx_base = memory_region(screen->machine, "gfx1"); - UINT8 *rom13D = memory_region(screen->machine, "user1"); + UINT8 *text_gfx_base = screen->machine->region("gfx1")->base(); + UINT8 *rom13D = screen->machine->region("user1")->base(); UINT8 *rom11BD = rom13D+0x1000; UINT8 *rom19C = rom13D+0x5000; diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c index f8cce5839a3..553709f1d50 100644 --- a/src/mame/video/tunhunt.c +++ b/src/mame/video/tunhunt.c @@ -156,7 +156,7 @@ static void set_pens(running_machine *machine) 0020: 00 f0 f0 f0 b0 b0 00 f0 00 f0 f0 00 b0 00 f0 f0 */ - //const UINT8 *color_prom = memory_region( machine, "proms" ); + //const UINT8 *color_prom = machine->region( "proms" )->base(); int color; int shade; int i; diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c index 1325850e3b4..0051a8b846a 100644 --- a/src/mame/video/turbo.c +++ b/src/mame/video/turbo.c @@ -285,7 +285,7 @@ INLINE UINT32 sprite_xscale(UINT8 dacinput, double vr1, double vr2, double cext) static void turbo_prepare_sprites(running_machine *machine, turbo_state *state, UINT8 y, sprite_info *info) { - const UINT8 *pr1119 = memory_region(machine, "proms") + 0x200; + const UINT8 *pr1119 = machine->region("proms")->base() + 0x200; int sprnum; /* initialize the line enable signals to 0 */ @@ -351,7 +351,7 @@ static void turbo_prepare_sprites(running_machine *machine, turbo_state *state, static UINT32 turbo_get_sprite_bits(running_machine *machine, UINT8 road, sprite_info *sprinfo) { - const UINT8 *sprite_gfxdata = memory_region(machine, "gfx1"); + const UINT8 *sprite_gfxdata = machine->region("gfx1")->base(); UINT8 sprlive = sprinfo->lst; UINT32 sprdata = 0; int level; @@ -408,8 +408,8 @@ VIDEO_UPDATE( turbo ) { turbo_state *state = screen->machine->driver_data(); bitmap_t *fgpixmap = tilemap_get_pixmap(state->fg_tilemap); - const UINT8 *road_gfxdata = memory_region(screen->machine, "gfx3"); - const UINT8 *prom_base = memory_region(screen->machine, "proms"); + const UINT8 *road_gfxdata = screen->machine->region("gfx3")->base(); + const UINT8 *prom_base = screen->machine->region("proms")->base(); const UINT8 *pr1114 = prom_base + 0x000; const UINT8 *pr1115 = prom_base + 0x020; const UINT8 *pr1116 = prom_base + 0x040; @@ -644,7 +644,7 @@ VIDEO_UPDATE( turbo ) static void subroc3d_prepare_sprites(running_machine *machine, turbo_state *state, UINT8 y, sprite_info *info) { - const UINT8 *pr1449 = memory_region(machine, "proms") + 0x300; + const UINT8 *pr1449 = machine->region("proms")->base() + 0x300; int sprnum; /* initialize the line enable signals to 0 */ @@ -710,7 +710,7 @@ static UINT32 subroc3d_get_sprite_bits(running_machine *machine, sprite_info *sp end is in bit 1, plb in bit 0 */ static const UINT8 plb_end[16] = { 0,1,1,2, 1,1,1,1, 1,1,1,1, 0,1,1,2 }; - const UINT8 *sprite_gfxdata = memory_region(machine, "gfx1"); + const UINT8 *sprite_gfxdata = machine->region("gfx1")->base(); UINT32 sprdata = 0; int level; @@ -763,7 +763,7 @@ VIDEO_UPDATE( subroc3d ) { turbo_state *state = screen->machine->driver_data(); bitmap_t *fgpixmap = tilemap_get_pixmap(state->fg_tilemap); - const UINT8 *prom_base = memory_region(screen->machine, "proms"); + const UINT8 *prom_base = screen->machine->region("proms")->base(); const UINT8 *pr1419 = prom_base + 0x000; const UINT8 *pr1620 = prom_base + 0x200; const UINT8 *pr1450 = prom_base + 0x500; @@ -863,7 +863,7 @@ VIDEO_UPDATE( subroc3d ) static void buckrog_prepare_sprites(running_machine *machine, turbo_state *state, UINT8 y, sprite_info *info) { - const UINT8 *pr5196 = memory_region(machine, "proms") + 0x100; + const UINT8 *pr5196 = machine->region("proms")->base() + 0x100; int sprnum; /* initialize the line enable signals to 0 */ @@ -930,7 +930,7 @@ static UINT32 buckrog_get_sprite_bits(running_machine *machine, sprite_info *spr end is in bit 1, plb in bit 0 */ static const UINT8 plb_end[16] = { 0,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,2 }; - const UINT8 *sprite_gfxdata = memory_region(machine, "gfx1"); + const UINT8 *sprite_gfxdata = machine->region("gfx1")->base(); UINT32 sprdata = 0; int level; @@ -983,8 +983,8 @@ VIDEO_UPDATE( buckrog ) { turbo_state *state = screen->machine->driver_data(); bitmap_t *fgpixmap = tilemap_get_pixmap(state->fg_tilemap); - const UINT8 *bgcolor = memory_region(screen->machine, "gfx3"); - const UINT8 *prom_base = memory_region(screen->machine, "proms"); + const UINT8 *bgcolor = screen->machine->region("gfx3")->base(); + const UINT8 *prom_base = screen->machine->region("proms")->base(); const UINT8 *pr5194 = prom_base + 0x000; const UINT8 *pr5198 = prom_base + 0x500; const UINT8 *pr5199 = prom_base + 0x700; diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c index f1136d27b08..398f6d0177b 100644 --- a/src/mame/video/tx1.c +++ b/src/mame/video/tx1.c @@ -258,7 +258,7 @@ static void tx1_draw_char(running_machine *machine, UINT8 *bitmap) UINT8 *chars, *gfx2; /* 2bpp characters */ - chars = memory_region(machine, "char_tiles"); + chars = machine->region("char_tiles")->base(); gfx2 = chars + 0x4000; /* X scroll value is the last word in char RAM */ @@ -433,13 +433,13 @@ static void tx1_draw_road(running_machine *machine, UINT8 *bitmap) UINT8 pix[2][4][3]; /* Road slice map ROMs */ - const UINT8 *const gfx3 = memory_region(machine, "gfx3"); + const UINT8 *const gfx3 = machine->region("gfx3")->base(); const UINT8 *const rom_a = gfx3; const UINT8 *const rom_b = gfx3 + 0x2000; const UINT8 *const rom_c = gfx3 + 0x4000; /* Pixel data */ - const UINT8 *const proms = memory_region(machine, "proms"); + const UINT8 *const proms = machine->region("proms")->base(); const UINT8 *const prom_a = proms + 0x1100; const UINT8 *const prom_b = proms + 0x1300; const UINT8 *const prom_c = proms + 0x1500; @@ -874,18 +874,18 @@ static void tx1_draw_objects(running_machine *machine, UINT8 *bitmap) UINT32 offs; /* The many lookup table ROMs */ - const UINT8 *const ic48 = memory_region(machine, "user3"); + const UINT8 *const ic48 = machine->region("user3")->base(); const UINT8 *const ic281 = ic48 + 0x2000; - const UINT8 *const proms = memory_region(machine, "proms"); + const UINT8 *const proms = machine->region("proms")->base(); const UINT8 *const ic190 = proms + 0xc00; const UINT8 *const ic162 = proms + 0xe00; const UINT8 *const ic25 = proms + 0x1000; - const UINT8 *const ic106 = memory_region(machine, "obj_map"); + const UINT8 *const ic106 = machine->region("obj_map")->base(); const UINT8 *const ic73 = ic106 + 0x4000; - const UINT8 *const pixdata_rgn = memory_region(machine, "obj_tiles"); + const UINT8 *const pixdata_rgn = machine->region("obj_tiles")->base(); for (offs = 0x0; offs <= tx1_objram_size; offs += 8) { @@ -1143,7 +1143,7 @@ VIDEO_EOF( tx1 ) static void tx1_combine_layers(running_machine *machine, bitmap_t *bitmap, int screen) { int x, y; - UINT8 *chr_pal = memory_region(machine, "proms") + 0x900; + UINT8 *chr_pal = machine->region("proms")->base() + 0x900; int x_offset = screen * 256; @@ -1344,8 +1344,8 @@ static void buggyboy_draw_char(running_machine *machine, UINT8 *bitmap, int wide UINT32 x_mask; /* 2bpp characters */ - chars = memory_region(machine, "char_tiles"); - gfx2 = memory_region(machine, "char_tiles") + 0x4000; + chars = machine->region("char_tiles")->base(); + gfx2 = machine->region("char_tiles")->base() + 0x4000; /* X/Y scroll values are the last word in char RAM */ if (wide) @@ -1576,8 +1576,8 @@ static void buggyboy_draw_road(running_machine *machine, UINT8 *bitmap) UINT32 rva20_6; /* ROM/PROM lookup tables */ - const UINT8 *rcols = (UINT8*)(memory_region(machine, "proms") + 0x1500); - const UINT8 *rom = memory_region(machine, "road"); + const UINT8 *rcols = (UINT8*)(machine->region("proms")->base() + 0x1500); + const UINT8 *rom = machine->region("road")->base(); const UINT8 *prom0 = rom + 0x4000; const UINT8 *prom1 = rom + 0x4200; const UINT8 *prom2 = rom + 0x4400; @@ -2205,8 +2205,8 @@ static void buggybjr_draw_road(running_machine *machine, UINT8 *bitmap, int wide UINT32 rva20_6; /* ROM/PROM lookup tables */ - const UINT8 *rcols = (UINT8*)(memory_region(machine, "proms") + 0x1500); - const UINT8 *rom = memory_region(machine, "road"); + const UINT8 *rcols = (UINT8*)(machine->region("proms")->base() + 0x1500); + const UINT8 *rom = machine->region("road")->base(); const UINT8 *prom0 = rom + 0x4000; const UINT8 *prom1 = rom + 0x4200; const UINT8 *prom2 = rom + 0x4400; @@ -2616,17 +2616,17 @@ static void buggyboy_draw_objs(running_machine *machine, UINT8 *bitmap, int wide UINT32 x_stride; /* The many lookup table ROMs */ - const UINT8 *const bug13 = (UINT8*)memory_region(machine, "obj_luts"); + const UINT8 *const bug13 = (UINT8*)machine->region("obj_luts")->base(); const UINT8 *const bug18s = bug13 + 0x2000; - const UINT8 *const bb8 = (UINT8*)memory_region(machine, "proms") + 0x1600; + const UINT8 *const bb8 = (UINT8*)machine->region("proms")->base() + 0x1600; - const UINT8 *const bug16s = (UINT8*)memory_region(machine, "obj_map"); + const UINT8 *const bug16s = (UINT8*)machine->region("obj_map")->base(); const UINT8 *const bug17s = bug16s + 0x8000; - const UINT8 *const bb9o = (UINT8*)memory_region(machine, "proms") + 0x500; + const UINT8 *const bb9o = (UINT8*)machine->region("proms")->base() + 0x500; const UINT8 *const bb9e = bb9o + 0x800; - const UINT8 *const pixdata_rgn = (UINT8*)memory_region(machine, "obj_tiles"); + const UINT8 *const pixdata_rgn = (UINT8*)machine->region("obj_tiles")->base(); if (wide) { @@ -2974,7 +2974,7 @@ WRITE16_HANDLER( buggyboy_scolst_w ) static void bb_combine_layers(running_machine *machine, bitmap_t *bitmap, int screen) { - UINT8 *chr_pal = memory_region(machine, "proms") + 0x400; + UINT8 *chr_pal = machine->region("proms")->base() + 0x400; UINT32 bmp_stride; UINT32 x_offset; UINT32 y; diff --git a/src/mame/video/undrfire.c b/src/mame/video/undrfire.c index 1db157eebe2..46c49f3579f 100644 --- a/src/mame/video/undrfire.c +++ b/src/mame/video/undrfire.c @@ -78,7 +78,7 @@ Heavy use is made of sprite zooming. static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect,const int *primasks,int x_offs,int y_offs) { UINT32 *spriteram32 = machine->generic.spriteram.u32; - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); int offs, data, tilenum, color, flipx, flipy; int x, y, priority, dblsize, curx, cury; int sprites_flipscreen = 0; @@ -221,8 +221,8 @@ logerror("Sprite number %04x had %02x invalid chunks\n",tilenum,bad_chunks); static void draw_sprites_cbombers(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect,const int *primasks,int x_offs,int y_offs) { UINT32 *spriteram32 = machine->generic.spriteram.u32; - UINT16 *spritemap = (UINT16 *)memory_region(machine, "user1"); - UINT8 *spritemapHibit = (UINT8 *)memory_region(machine, "user2"); + UINT16 *spritemap = (UINT16 *)machine->region("user1")->base(); + UINT8 *spritemapHibit = (UINT8 *)machine->region("user2")->base(); int offs, data, tilenum, color, flipx, flipy; int x, y, priority, dblsize, curx, cury; diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c index 58b8aace38c..224f4e5ff82 100644 --- a/src/mame/video/vball.c +++ b/src/mame/video/vball.c @@ -84,7 +84,7 @@ void vb_bgprombank_w( running_machine *machine, int bank ) if (bank==vb_bgprombank) return; - color_prom = memory_region(machine, "proms") + bank*0x80; + color_prom = machine->region("proms")->base() + bank*0x80; for (i=0;i<128;i++, color_prom++) { palette_set_color_rgb(machine,i,pal4bit(color_prom[0] >> 0),pal4bit(color_prom[0] >> 4), pal4bit(color_prom[0x800] >> 0)); @@ -100,7 +100,7 @@ void vb_spprombank_w( running_machine *machine, int bank ) if (bank==vb_spprombank) return; - color_prom = memory_region(machine, "proms")+0x400 + bank*0x80; + color_prom = machine->region("proms")->base()+0x400 + bank*0x80; for (i=128;i<256;i++,color_prom++) { palette_set_color_rgb(machine,i,pal4bit(color_prom[0] >> 0),pal4bit(color_prom[0] >> 4), pal4bit(color_prom[0x800] >> 0)); diff --git a/src/mame/video/vertigo.c b/src/mame/video/vertigo.c index 4912130919e..44517b86efa 100644 --- a/src/mame/video/vertigo.c +++ b/src/mame/video/vertigo.c @@ -251,8 +251,8 @@ void vertigo_vproc_reset(running_machine *machine) int i; UINT64 *mcode; - vertigo_vectorrom = (UINT16 *)memory_region(machine, "user1"); - mcode = (UINT64 *)memory_region(machine, "proms"); + vertigo_vectorrom = (UINT16 *)machine->region("user1")->base(); + mcode = (UINT64 *)machine->region("proms")->base(); /* Decode microcode */ for (i = 0; i < MC_LENGTH; i++) diff --git a/src/mame/video/vicdual.c b/src/mame/video/vicdual.c index 478c67b3d2b..8ec9c573868 100644 --- a/src/mame/video/vicdual.c +++ b/src/mame/video/vicdual.c @@ -83,7 +83,7 @@ VIDEO_UPDATE( vicdual_bw ) VIDEO_UPDATE( vicdual_color ) { - UINT8 *color_prom = (UINT8 *)memory_region(screen->machine, "proms"); + UINT8 *color_prom = (UINT8 *)screen->machine->region("proms")->base(); UINT8 x = 0; UINT8 y = cliprect->min_y; UINT8 video_data = 0; diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c index 33a4c61f1e2..bdb906c58e7 100644 --- a/src/mame/video/wecleman.c +++ b/src/mame/video/wecleman.c @@ -95,8 +95,8 @@ static pen_t black_pen; static void get_sprite_info(running_machine *machine) { const pen_t *base_pal = machine->pens; - UINT8 *base_gfx = memory_region(machine, "gfx1"); - int gfx_max = memory_region_length(machine, "gfx1"); + UINT8 *base_gfx = machine->region("gfx1")->base(); + int gfx_max = machine->region("gfx1")->bytes(); UINT16 *source = machine->generic.spriteram.u16; diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c index 2590f2a0636..aeeed350b0f 100644 --- a/src/mame/video/williams.c +++ b/src/mame/video/williams.c @@ -191,7 +191,7 @@ VIDEO_START( williams ) VIDEO_START( blaster ) { - blitter_init(machine, williams_blitter_config, memory_region(machine, "proms")); + blitter_init(machine, williams_blitter_config, machine->region("proms")->base()); create_palette_lookup(machine); state_save_register(machine); } diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c index e09a016de70..eb2bb846d7a 100644 --- a/src/mame/video/xevious.c +++ b/src/mame/video/xevious.c @@ -318,7 +318,7 @@ READ8_HANDLER( xevious_bb_r ) { _galaga_state *state = space->machine->driver_data<_galaga_state>(); - UINT8 *rom2a = memory_region(space->machine, "gfx4"); + UINT8 *rom2a = space->machine->region("gfx4")->base(); UINT8 *rom2b = rom2a+0x1000; UINT8 *rom2c = rom2a+0x3000; int adr_2b,adr_2c; diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c index a352c27021b..eaa6fef2fc6 100644 --- a/src/mame/video/zaxxon.c +++ b/src/mame/video/zaxxon.c @@ -68,8 +68,8 @@ PALETTE_INIT( zaxxon ) static TILE_GET_INFO( get_bg_tile_info ) { - const UINT8 *source = memory_region(machine, "tilemap_dat"); - int size = memory_region_length(machine, "tilemap_dat") / 2; + const UINT8 *source = machine->region("tilemap_dat")->base(); + int size = machine->region("tilemap_dat")->bytes() / 2; int eff_index = tile_index & (size - 1); int code = source[eff_index] + 256 * (source[eff_index + size] & 3); int color = source[eff_index + size] >> 4;