summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2010-08-19 07:26:14 +0000
committer Aaron Giles <aaron@aarongiles.com>2010-08-19 07:26:14 +0000
commit3598b772bc80b2efb6396c65996462b38eedc593 (patch)
treee975a31f1f8599b8a947b11675b674fd993accf2 /src
parentdd19e512c03c58a100ae5025c9fd7624387667fd (diff)
Replace "const address_space" with "address_space" throughout the system.
The purpose of making it const before was to discourage direct tampering, but private/protected does a better job of that now anyhow, and it is annoying now. s/const[ \t]+address_space\b/address_space/g; Is basically what I did.
Diffstat (limited to 'src')
-rw-r--r--src/emu/audio/generic.c6
-rw-r--r--src/emu/cpu/adsp2100/adsp2100.c6
-rw-r--r--src/emu/cpu/alph8201/alph8201.c2
-rw-r--r--src/emu/cpu/am29000/am29000.c6
-rw-r--r--src/emu/cpu/apexc/apexc.c4
-rw-r--r--src/emu/cpu/arm/arm.c2
-rw-r--r--src/emu/cpu/arm7/arm7core.h2
-rw-r--r--src/emu/cpu/asap/asap.c2
-rw-r--r--src/emu/cpu/avr8/avr8.c4
-rw-r--r--src/emu/cpu/ccpu/ccpu.c6
-rw-r--r--src/emu/cpu/cdp1802/cdp1802.c4
-rw-r--r--src/emu/cpu/cop400/cop400.c6
-rw-r--r--src/emu/cpu/cp1610/cp1610.c2
-rw-r--r--src/emu/cpu/cubeqcpu/cubeqcpu.c6
-rw-r--r--src/emu/cpu/drcbec.c2
-rw-r--r--src/emu/cpu/drcbex64.c2
-rw-r--r--src/emu/cpu/drcbex86.c2
-rw-r--r--src/emu/cpu/drcfe.c2
-rw-r--r--src/emu/cpu/dsp32/dsp32.c2
-rw-r--r--src/emu/cpu/dsp56k/dsp56k.h4
-rw-r--r--src/emu/cpu/e132xs/e132xs.c4
-rw-r--r--src/emu/cpu/esrip/esrip.c2
-rw-r--r--src/emu/cpu/f8/f8.c4
-rw-r--r--src/emu/cpu/g65816/g65816cm.h2
-rw-r--r--src/emu/cpu/h6280/h6280.h4
-rw-r--r--src/emu/cpu/h83002/h8priv.h4
-rw-r--r--src/emu/cpu/hd6309/hd6309.c2
-rw-r--r--src/emu/cpu/i386/i386priv.h4
-rw-r--r--src/emu/cpu/i4004/i4004.c6
-rw-r--r--src/emu/cpu/i8008/i8008.c4
-rw-r--r--src/emu/cpu/i8085/i8085.c4
-rw-r--r--src/emu/cpu/i86/i286.c4
-rw-r--r--src/emu/cpu/i86/i86.c4
-rw-r--r--src/emu/cpu/i86/i86mem.c4
-rw-r--r--src/emu/cpu/i86/i86mem.h8
-rw-r--r--src/emu/cpu/i860/i860.h2
-rw-r--r--src/emu/cpu/i960/i960.c2
-rw-r--r--src/emu/cpu/jaguar/jaguar.c2
-rw-r--r--src/emu/cpu/konami/konami.c2
-rw-r--r--src/emu/cpu/lh5801/lh5801.c2
-rw-r--r--src/emu/cpu/lr35902/lr35902.c2
-rw-r--r--src/emu/cpu/m37710/m37710cm.h4
-rw-r--r--src/emu/cpu/m6502/m4510.c6
-rw-r--r--src/emu/cpu/m6502/m6502.c8
-rw-r--r--src/emu/cpu/m6502/m6509.c6
-rw-r--r--src/emu/cpu/m6502/m65ce02.c6
-rw-r--r--src/emu/cpu/m6800/m6800.c6
-rw-r--r--src/emu/cpu/m68000/m68kcpu.c28
-rw-r--r--src/emu/cpu/m68000/m68kcpu.h16
-rw-r--r--src/emu/cpu/m6805/m6805.c2
-rw-r--r--src/emu/cpu/m6809/m6809.c2
-rw-r--r--src/emu/cpu/mb86233/mb86233.c2
-rw-r--r--src/emu/cpu/mb88xx/mb88xx.c6
-rw-r--r--src/emu/cpu/mc68hc11/mc68hc11.c4
-rw-r--r--src/emu/cpu/mcs48/mcs48.c6
-rw-r--r--src/emu/cpu/mcs51/mcs51.c6
-rw-r--r--src/emu/cpu/minx/minx.c2
-rw-r--r--src/emu/cpu/mips/mips3com.h2
-rw-r--r--src/emu/cpu/mips/psx.c4
-rw-r--r--src/emu/cpu/mips/r3000.c50
-rw-r--r--src/emu/cpu/mn10200/mn10200.c4
-rw-r--r--src/emu/cpu/nec/nec.c16
-rw-r--r--src/emu/cpu/pdp1/pdp1.c2
-rw-r--r--src/emu/cpu/pdp1/tx0.c2
-rw-r--r--src/emu/cpu/pic16c5x/pic16c5x.c6
-rw-r--r--src/emu/cpu/pic16c62x/pic16c62x.c6
-rw-r--r--src/emu/cpu/powerpc/ppc.c46
-rw-r--r--src/emu/cpu/powerpc/ppc403.c12
-rw-r--r--src/emu/cpu/powerpc/ppc_mem.c30
-rw-r--r--src/emu/cpu/powerpc/ppccom.h2
-rw-r--r--src/emu/cpu/rsp/rsp.h2
-rw-r--r--src/emu/cpu/s2650/s2650.c4
-rw-r--r--src/emu/cpu/saturn/saturn.c2
-rw-r--r--src/emu/cpu/sc61860/sc61860.c2
-rw-r--r--src/emu/cpu/scmp/scmp.c4
-rw-r--r--src/emu/cpu/se3208/se3208.c10
-rw-r--r--src/emu/cpu/sh2/sh2comn.h4
-rw-r--r--src/emu/cpu/sh4/sh4comn.h6
-rw-r--r--src/emu/cpu/sharc/sharc.c4
-rw-r--r--src/emu/cpu/sm8500/sm8500.c2
-rw-r--r--src/emu/cpu/spc700/spc700.c2
-rw-r--r--src/emu/cpu/ssem/ssem.c2
-rw-r--r--src/emu/cpu/ssp1601/ssp1601.c4
-rw-r--r--src/emu/cpu/superfx/superfx.c2
-rw-r--r--src/emu/cpu/t11/t11.c2
-rw-r--r--src/emu/cpu/tlcs90/tlcs90.c4
-rw-r--r--src/emu/cpu/tlcs900/tlcs900.c2
-rw-r--r--src/emu/cpu/tms0980/tms0980.c4
-rw-r--r--src/emu/cpu/tms32010/tms32010.c6
-rw-r--r--src/emu/cpu/tms32025/tms32025.c6
-rw-r--r--src/emu/cpu/tms32031/tms32031.c2
-rw-r--r--src/emu/cpu/tms32051/tms32051.c4
-rw-r--r--src/emu/cpu/tms34010/34010gfx.c22
-rw-r--r--src/emu/cpu/tms34010/tms34010.c4
-rw-r--r--src/emu/cpu/tms34010/tms34010.h4
-rw-r--r--src/emu/cpu/tms57002/tms57002.c2
-rw-r--r--src/emu/cpu/tms7000/tms7000.c4
-rw-r--r--src/emu/cpu/tms9900/99xxcore.h4
-rw-r--r--src/emu/cpu/unsp/unsp.h2
-rw-r--r--src/emu/cpu/upd7810/upd7810.c4
-rw-r--r--src/emu/cpu/v30mz/v30mz.c4
-rw-r--r--src/emu/cpu/v60/v60.c4
-rw-r--r--src/emu/cpu/v60/v60mem.c46
-rw-r--r--src/emu/cpu/v810/v810.c4
-rw-r--r--src/emu/cpu/z180/z180.c4
-rw-r--r--src/emu/cpu/z8/z8.c6
-rw-r--r--src/emu/cpu/z8/z8ops.c8
-rw-r--r--src/emu/cpu/z80/z80.c4
-rw-r--r--src/emu/cpu/z8000/z8000.c4
-rw-r--r--src/emu/debug/debugcmd.c26
-rw-r--r--src/emu/debug/debugcmd.h2
-rw-r--r--src/emu/debug/debugcmt.c2
-rw-r--r--src/emu/debug/debugcpu.c58
-rw-r--r--src/emu/debug/debugcpu.h44
-rw-r--r--src/emu/debug/dvdisasm.h4
-rw-r--r--src/emu/debug/dvmemory.c4
-rw-r--r--src/emu/debug/dvmemory.h6
-rw-r--r--src/emu/dimemory.h2
-rw-r--r--src/emu/machine/idectrl.c2
-rw-r--r--src/emu/machine/latch8.c2
-rw-r--r--src/emu/memconv.h72
-rw-r--r--src/emu/memory.c64
-rw-r--r--src/emu/memory.h366
-rw-r--r--src/emu/sound/nes_defs.h2
-rw-r--r--src/emu/sound/scsp.c6
-rw-r--r--src/emu/video/pc_vga.c4
-rw-r--r--src/emu/video/tms34061.c12
-rw-r--r--src/emu/video/tms34061.h4
-rw-r--r--src/mame/audio/8080bw.c4
-rw-r--r--src/mame/audio/cage.c4
-rw-r--r--src/mame/audio/cage.h2
-rw-r--r--src/mame/audio/dcs.c6
-rw-r--r--src/mame/audio/gottlieb.c4
-rw-r--r--src/mame/audio/harddriv.c4
-rw-r--r--src/mame/audio/leland.c4
-rw-r--r--src/mame/audio/mario.c4
-rw-r--r--src/mame/audio/seibu.c2
-rw-r--r--src/mame/audio/williams.c10
-rw-r--r--src/mame/drivers/39in1.c4
-rw-r--r--src/mame/drivers/alg.c2
-rw-r--r--src/mame/drivers/appoooh.c2
-rw-r--r--src/mame/drivers/astrocde.c8
-rw-r--r--src/mame/drivers/atarigt.c10
-rw-r--r--src/mame/drivers/atarisy2.c2
-rw-r--r--src/mame/drivers/atarisy4.c6
-rw-r--r--src/mame/drivers/badlands.c2
-rw-r--r--src/mame/drivers/bagman.c2
-rw-r--r--src/mame/drivers/balsente.c14
-rw-r--r--src/mame/drivers/bbusters.c4
-rw-r--r--src/mame/drivers/berzerk.c4
-rw-r--r--src/mame/drivers/bfcobra.c2
-rw-r--r--src/mame/drivers/bigfghtr.c2
-rw-r--r--src/mame/drivers/btime.c6
-rw-r--r--src/mame/drivers/bzone.c2
-rw-r--r--src/mame/drivers/cabal.c2
-rw-r--r--src/mame/drivers/calorie.c2
-rw-r--r--src/mame/drivers/centiped.c4
-rw-r--r--src/mame/drivers/combatsc.c2
-rw-r--r--src/mame/drivers/commando.c4
-rw-r--r--src/mame/drivers/coolpool.c6
-rw-r--r--src/mame/drivers/coolridr.c2
-rw-r--r--src/mame/drivers/cps2.c2
-rw-r--r--src/mame/drivers/crbaloon.c2
-rw-r--r--src/mame/drivers/crystal.c16
-rw-r--r--src/mame/drivers/cshooter.c2
-rw-r--r--src/mame/drivers/darkmist.c2
-rw-r--r--src/mame/drivers/ddenlovr.c4
-rw-r--r--src/mame/drivers/dec8.c4
-rw-r--r--src/mame/drivers/deco32.c2
-rw-r--r--src/mame/drivers/decocass.c2
-rw-r--r--src/mame/drivers/eolithsp.c2
-rw-r--r--src/mame/drivers/ertictac.c2
-rw-r--r--src/mame/drivers/exidy.c2
-rw-r--r--src/mame/drivers/exterm.c2
-rw-r--r--src/mame/drivers/flstory.c2
-rw-r--r--src/mame/drivers/freekick.c2
-rw-r--r--src/mame/drivers/funworld.c4
-rw-r--r--src/mame/drivers/galaga.c2
-rw-r--r--src/mame/drivers/galaxian.c56
-rw-r--r--src/mame/drivers/galpani2.c10
-rw-r--r--src/mame/drivers/gameplan.c2
-rw-r--r--src/mame/drivers/gauntlet.c2
-rw-r--r--src/mame/drivers/gei.c4
-rw-r--r--src/mame/drivers/guab.c2
-rw-r--r--src/mame/drivers/hng64.c2
-rw-r--r--src/mame/drivers/homedata.c4
-rw-r--r--src/mame/drivers/hshavoc.c2
-rw-r--r--src/mame/drivers/hyprduel.c2
-rw-r--r--src/mame/drivers/igs011.c2
-rw-r--r--src/mame/drivers/itech32.c4
-rw-r--r--src/mame/drivers/jack.c2
-rw-r--r--src/mame/drivers/jalmah.c2
-rw-r--r--src/mame/drivers/kchamp.c2
-rw-r--r--src/mame/drivers/konamigx.c16
-rw-r--r--src/mame/drivers/konamim2.c2
-rw-r--r--src/mame/drivers/kyugo.c2
-rw-r--r--src/mame/drivers/ladybug.c2
-rw-r--r--src/mame/drivers/liberate.c4
-rw-r--r--src/mame/drivers/littlerb.c2
-rw-r--r--src/mame/drivers/lockon.c16
-rw-r--r--src/mame/drivers/m72.c8
-rw-r--r--src/mame/drivers/mappy.c6
-rw-r--r--src/mame/drivers/mediagx.c2
-rw-r--r--src/mame/drivers/megadriv.c4
-rw-r--r--src/mame/drivers/metalmx.c4
-rw-r--r--src/mame/drivers/metro.c10
-rw-r--r--src/mame/drivers/mil4000.c2
-rw-r--r--src/mame/drivers/missile.c6
-rw-r--r--src/mame/drivers/mitchell.c2
-rw-r--r--src/mame/drivers/model2.c6
-rw-r--r--src/mame/drivers/model3.c4
-rw-r--r--src/mame/drivers/mouser.c2
-rw-r--r--src/mame/drivers/mpu4drvr.c2
-rw-r--r--src/mame/drivers/multigam.c8
-rw-r--r--src/mame/drivers/namcona1.c2
-rw-r--r--src/mame/drivers/namcos11.c4
-rw-r--r--src/mame/drivers/namcos12.c2
-rw-r--r--src/mame/drivers/namcos21.c2
-rw-r--r--src/mame/drivers/namcos23.c2
-rw-r--r--src/mame/drivers/nbmj9195.c4
-rw-r--r--src/mame/drivers/neogeo.c16
-rw-r--r--src/mame/drivers/ninjakd2.c2
-rw-r--r--src/mame/drivers/niyanpai.c4
-rw-r--r--src/mame/drivers/omegrace.c2
-rw-r--r--src/mame/drivers/pacman.c4
-rw-r--r--src/mame/drivers/pcktgal.c2
-rw-r--r--src/mame/drivers/pengo.c2
-rw-r--r--src/mame/drivers/pinkiri8.c2
-rw-r--r--src/mame/drivers/playmark.c2
-rw-r--r--src/mame/drivers/polepos.c2
-rw-r--r--src/mame/drivers/progolf.c4
-rw-r--r--src/mame/drivers/pturn.c2
-rw-r--r--src/mame/drivers/qix.c4
-rw-r--r--src/mame/drivers/quizpun2.c2
-rw-r--r--src/mame/drivers/raiden.c2
-rw-r--r--src/mame/drivers/raiden2.c4
-rw-r--r--src/mame/drivers/renegade.c2
-rw-r--r--src/mame/drivers/safarir.c4
-rw-r--r--src/mame/drivers/seattle.c20
-rw-r--r--src/mame/drivers/segae.c2
-rw-r--r--src/mame/drivers/segag80r.c4
-rw-r--r--src/mame/drivers/segag80v.c18
-rw-r--r--src/mame/drivers/segahang.c6
-rw-r--r--src/mame/drivers/segamsys.c10
-rw-r--r--src/mame/drivers/segaorun.c2
-rw-r--r--src/mame/drivers/segas16a.c2
-rw-r--r--src/mame/drivers/segas16b.c12
-rw-r--r--src/mame/drivers/segas18.c2
-rw-r--r--src/mame/drivers/segas24.c2
-rw-r--r--src/mame/drivers/segas32.c6
-rw-r--r--src/mame/drivers/segaxbd.c2
-rw-r--r--src/mame/drivers/segaybd.c2
-rw-r--r--src/mame/drivers/seibuspi.c8
-rw-r--r--src/mame/drivers/seta.c2
-rw-r--r--src/mame/drivers/sf.c2
-rw-r--r--src/mame/drivers/shootout.c2
-rw-r--r--src/mame/drivers/skimaxx.c4
-rw-r--r--src/mame/drivers/slapfght.c2
-rw-r--r--src/mame/drivers/sothello.c2
-rw-r--r--src/mame/drivers/spacefb.c2
-rw-r--r--src/mame/drivers/srumbler.c2
-rw-r--r--src/mame/drivers/sshangha.c2
-rw-r--r--src/mame/drivers/starwars.c4
-rw-r--r--src/mame/drivers/statriv2.c2
-rw-r--r--src/mame/drivers/stv.c28
-rw-r--r--src/mame/drivers/suna16.c2
-rw-r--r--src/mame/drivers/suna8.c12
-rw-r--r--src/mame/drivers/supertnk.c2
-rw-r--r--src/mame/drivers/system1.c12
-rw-r--r--src/mame/drivers/system16.c2
-rw-r--r--src/mame/drivers/taito_l.c2
-rw-r--r--src/mame/drivers/taitogn.c2
-rw-r--r--src/mame/drivers/taitojc.c4
-rw-r--r--src/mame/drivers/tcl.c2
-rw-r--r--src/mame/drivers/tiamc1.c2
-rw-r--r--src/mame/drivers/tickee.c4
-rw-r--r--src/mame/drivers/tigeroad.c2
-rw-r--r--src/mame/drivers/tmnt.c2
-rw-r--r--src/mame/drivers/toki.c2
-rw-r--r--src/mame/drivers/trackfld.c2
-rw-r--r--src/mame/drivers/tx1.c4
-rw-r--r--src/mame/drivers/vamphalf.c2
-rw-r--r--src/mame/drivers/vendetta.c2
-rw-r--r--src/mame/drivers/wardner.c4
-rw-r--r--src/mame/drivers/williams.c2
-rw-r--r--src/mame/drivers/wiz.c2
-rw-r--r--src/mame/drivers/wwfwfest.c2
-rw-r--r--src/mame/drivers/xtheball.c4
-rw-r--r--src/mame/drivers/zaxxon.c2
-rw-r--r--src/mame/includes/artmagic.h4
-rw-r--r--src/mame/includes/atari.h4
-rw-r--r--src/mame/includes/atarigt.h4
-rw-r--r--src/mame/includes/btoads.h4
-rw-r--r--src/mame/includes/eolithsp.h2
-rw-r--r--src/mame/includes/exterm.h8
-rw-r--r--src/mame/includes/gaelcrpt.h2
-rw-r--r--src/mame/includes/harddriv.h4
-rw-r--r--src/mame/includes/jpmimpct.h4
-rw-r--r--src/mame/includes/midtunit.h4
-rw-r--r--src/mame/includes/midyunit.h4
-rw-r--r--src/mame/includes/model3.h10
-rw-r--r--src/mame/includes/neogeo.h6
-rw-r--r--src/mame/includes/ojankohs.h2
-rw-r--r--src/mame/includes/segas24.h2
-rw-r--r--src/mame/includes/slapstic.h2
-rw-r--r--src/mame/includes/williams.h2
-rw-r--r--src/mame/machine/amiga.c6
-rw-r--r--src/mame/machine/archimds.c4
-rw-r--r--src/mame/machine/asic65.c2
-rw-r--r--src/mame/machine/atari.c4
-rw-r--r--src/mame/machine/atarigen.c2
-rw-r--r--src/mame/machine/bagman.c2
-rw-r--r--src/mame/machine/balsente.c2
-rw-r--r--src/mame/machine/cclimber.c2
-rw-r--r--src/mame/machine/cps2crpt.c2
-rw-r--r--src/mame/machine/cubocd32.c6
-rw-r--r--src/mame/machine/dc.c8
-rw-r--r--src/mame/machine/deco102.c2
-rw-r--r--src/mame/machine/fd1089.c2
-rw-r--r--src/mame/machine/fddebug.c20
-rw-r--r--src/mame/machine/gaelcrpt.c2
-rw-r--r--src/mame/machine/galaxold.c4
-rw-r--r--src/mame/machine/harddriv.c2
-rw-r--r--src/mame/machine/kabuki.c4
-rw-r--r--src/mame/machine/kaneko16.c8
-rw-r--r--src/mame/machine/konami1.c2
-rw-r--r--src/mame/machine/konppc.c4
-rw-r--r--src/mame/machine/mc8123.c2
-rw-r--r--src/mame/machine/mcr.c2
-rw-r--r--src/mame/machine/mhavoc.c2
-rw-r--r--src/mame/machine/micro3d.c4
-rw-r--r--src/mame/machine/midwayic.c10
-rw-r--r--src/mame/machine/midwayic.h10
-rw-r--r--src/mame/machine/model1.c8
-rw-r--r--src/mame/machine/namcos1.c2
-rw-r--r--src/mame/machine/namcos2.c4
-rw-r--r--src/mame/machine/neoboot.c2
-rw-r--r--src/mame/machine/neoprot.c2
-rw-r--r--src/mame/machine/pitnrun.c2
-rw-r--r--src/mame/machine/scudsp.c6
-rw-r--r--src/mame/machine/scudsp.h4
-rw-r--r--src/mame/machine/segacrp2.c2
-rw-r--r--src/mame/machine/segacrpt.c6
-rw-r--r--src/mame/machine/segaic16.c6
-rw-r--r--src/mame/machine/segas24.c4
-rw-r--r--src/mame/machine/segas32.c4
-rw-r--r--src/mame/machine/seicop.c22
-rw-r--r--src/mame/machine/slapstic.c4
-rw-r--r--src/mame/machine/snes.c34
-rw-r--r--src/mame/machine/snes7110.c6
-rw-r--r--src/mame/machine/snesrtc.c2
-rw-r--r--src/mame/machine/snessdd1.c4
-rw-r--r--src/mame/machine/stfight.c4
-rw-r--r--src/mame/machine/tait8741.c18
-rw-r--r--src/mame/machine/taitosj.c6
-rw-r--r--src/mame/machine/tatsumi.c12
-rw-r--r--src/mame/machine/tnzs.c2
-rw-r--r--src/mame/machine/toaplan1.c4
-rw-r--r--src/mame/machine/twincobr.c10
-rw-r--r--src/mame/machine/vsnes.c2
-rw-r--r--src/mame/machine/williams.c8
-rw-r--r--src/mame/video/armedf.c2
-rw-r--r--src/mame/video/artmagic.c4
-rw-r--r--src/mame/video/astrocde.c2
-rw-r--r--src/mame/video/atari.c6
-rw-r--r--src/mame/video/atarisy1.c2
-rw-r--r--src/mame/video/bionicc.c2
-rw-r--r--src/mame/video/blktiger.c2
-rw-r--r--src/mame/video/blstroid.c2
-rw-r--r--src/mame/video/btoads.c4
-rw-r--r--src/mame/video/cischeat.c2
-rw-r--r--src/mame/video/combatsc.c2
-rw-r--r--src/mame/video/commando.c2
-rw-r--r--src/mame/video/crshrace.c2
-rw-r--r--src/mame/video/dc.c6
-rw-r--r--src/mame/video/dogfgt.c2
-rw-r--r--src/mame/video/dooyong.c4
-rw-r--r--src/mame/video/dynduke.c2
-rw-r--r--src/mame/video/exedexes.c2
-rw-r--r--src/mame/video/exterm.c8
-rw-r--r--src/mame/video/gaelco2.c2
-rw-r--r--src/mame/video/genesis.c12
-rw-r--r--src/mame/video/gng.c2
-rw-r--r--src/mame/video/gtia.c2
-rw-r--r--src/mame/video/gtia.h4
-rw-r--r--src/mame/video/harddriv.c4
-rw-r--r--src/mame/video/hng64.c2
-rw-r--r--src/mame/video/homedata.c6
-rw-r--r--src/mame/video/itech8.c2
-rw-r--r--src/mame/video/jaguar.c2
-rw-r--r--src/mame/video/jpmimpct.c4
-rw-r--r--src/mame/video/lastduel.c2
-rw-r--r--src/mame/video/leland.c6
-rw-r--r--src/mame/video/lwings.c2
-rw-r--r--src/mame/video/midtunit.c4
-rw-r--r--src/mame/video/midyunit.c4
-rw-r--r--src/mame/video/model3.c10
-rw-r--r--src/mame/video/namcos22.c8
-rw-r--r--src/mame/video/ojankohs.c4
-rw-r--r--src/mame/video/popeye.c2
-rw-r--r--src/mame/video/ppu2c0x.c4
-rw-r--r--src/mame/video/ppu2c0x.h2
-rw-r--r--src/mame/video/psikyosh.c2
-rw-r--r--src/mame/video/psx.c2
-rw-r--r--src/mame/video/segas32.c2
-rw-r--r--src/mame/video/sidearms.c2
-rw-r--r--src/mame/video/simpsons.c2
-rw-r--r--src/mame/video/skydiver.c2
-rw-r--r--src/mame/video/srumbler.c2
-rw-r--r--src/mame/video/taito_b.c2
-rw-r--r--src/mame/video/tia.c4
-rw-r--r--src/mame/video/tigeroad.c2
-rw-r--r--src/mame/video/toaplan1.c10
-rw-r--r--src/mame/video/twin16.c2
-rw-r--r--src/mame/video/twincobr.c2
-rw-r--r--src/mame/video/vdc.c2
-rw-r--r--src/mame/video/vrender0.c2
-rw-r--r--src/mame/video/williams.c6
-rw-r--r--src/osd/sdl/debugosx.m8
419 files changed, 1308 insertions, 1308 deletions
diff --git a/src/emu/audio/generic.c b/src/emu/audio/generic.c
index a1a79a90066..0fc16ba9c79 100644
--- a/src/emu/audio/generic.c
+++ b/src/emu/audio/generic.c
@@ -85,7 +85,7 @@ static TIMER_CALLBACK( latch_callback )
latch_w - handle a write to a given latch
-------------------------------------------------*/
-INLINE void latch_w(const address_space *space, int which, UINT16 value)
+INLINE void latch_w(address_space *space, int which, UINT16 value)
{
timer_call_after_resynch(space->machine, NULL, which | (value << 8), latch_callback);
}
@@ -95,7 +95,7 @@ INLINE void latch_w(const address_space *space, int which, UINT16 value)
latch_r - handle a read from a given latch
-------------------------------------------------*/
-INLINE UINT16 latch_r(const address_space *space, int which)
+INLINE UINT16 latch_r(address_space *space, int which)
{
generic_audio_private *state = space->machine->generic_audio_data;
state->latch_read[which] = 1;
@@ -107,7 +107,7 @@ INLINE UINT16 latch_r(const address_space *space, int which)
latch_clear - clear a given latch
-------------------------------------------------*/
-INLINE void latch_clear(const address_space *space, int which)
+INLINE void latch_clear(address_space *space, int which)
{
generic_audio_private *state = space->machine->generic_audio_data;
state->latched_value[which] = state->latch_clear_value;
diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/emu/cpu/adsp2100/adsp2100.c
index 628ba02cdae..d147b719fa8 100644
--- a/src/emu/cpu/adsp2100/adsp2100.c
+++ b/src/emu/cpu/adsp2100/adsp2100.c
@@ -263,9 +263,9 @@ typedef struct
adsp21xx_timer_func timer_fired;
/* memory spaces */
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
} adsp2100_state;
diff --git a/src/emu/cpu/alph8201/alph8201.c b/src/emu/cpu/alph8201/alph8201.c
index 078d939674e..17f78d5968f 100644
--- a/src/emu/cpu/alph8201/alph8201.c
+++ b/src/emu/cpu/alph8201/alph8201.c
@@ -198,7 +198,7 @@ struct _alpha8201_state
#endif
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
int inst_cycles;
};
diff --git a/src/emu/cpu/am29000/am29000.c b/src/emu/cpu/am29000/am29000.c
index 68072195351..73a1bfa440a 100644
--- a/src/emu/cpu/am29000/am29000.c
+++ b/src/emu/cpu/am29000/am29000.c
@@ -131,9 +131,9 @@ typedef struct _am29000_state
UINT32 exec_pc;
UINT32 next_pc;
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
} am29000_state;
diff --git a/src/emu/cpu/apexc/apexc.c b/src/emu/cpu/apexc/apexc.c
index 86efb77d773..d218e77eb5d 100644
--- a/src/emu/cpu/apexc/apexc.c
+++ b/src/emu/cpu/apexc/apexc.c
@@ -359,8 +359,8 @@ struct _apexc_state
UINT32 pc; /* address of next instruction for the disassembler */
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
};
diff --git a/src/emu/cpu/arm/arm.c b/src/emu/cpu/arm/arm.c
index 7797cde7d02..814410ead26 100644
--- a/src/emu/cpu/arm/arm.c
+++ b/src/emu/cpu/arm/arm.c
@@ -236,7 +236,7 @@ typedef struct
UINT8 pendingFiq;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
endianness_t endian;
} ARM_REGS;
diff --git a/src/emu/cpu/arm7/arm7core.h b/src/emu/cpu/arm7/arm7core.h
index e3192dca64b..20ef9a4ccd0 100644
--- a/src/emu/cpu/arm7/arm7core.h
+++ b/src/emu/cpu/arm7/arm7core.h
@@ -163,7 +163,7 @@ enum
endianness_t endian; \
device_irq_callback irq_callback; \
legacy_cpu_device *device; \
- const address_space *program;
+ address_space *program;
/* CPU state struct */
diff --git a/src/emu/cpu/asap/asap.c b/src/emu/cpu/asap/asap.c
index 30dc0c4ab43..fe7f2393109 100644
--- a/src/emu/cpu/asap/asap.c
+++ b/src/emu/cpu/asap/asap.c
@@ -86,7 +86,7 @@ struct _asap_state
UINT8 irq_state;
int icount;
device_irq_callback irq_callback;
- const address_space *program;
+ address_space *program;
legacy_cpu_device *device;
/* src2val table, registers are at the end */
diff --git a/src/emu/cpu/avr8/avr8.c b/src/emu/cpu/avr8/avr8.c
index abe18022c09..d154f13ef12 100644
--- a/src/emu/cpu/avr8/avr8.c
+++ b/src/emu/cpu/avr8/avr8.c
@@ -27,8 +27,8 @@ struct _avr8_state
UINT32 pc;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
};
diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c
index a3576bf9180..2896937e1cf 100644
--- a/src/emu/cpu/ccpu/ccpu.c
+++ b/src/emu/cpu/ccpu/ccpu.c
@@ -44,9 +44,9 @@ struct _ccpu_state
int icount;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
};
diff --git a/src/emu/cpu/cdp1802/cdp1802.c b/src/emu/cpu/cdp1802/cdp1802.c
index 2cdfc52932d..51b1e2c7412 100644
--- a/src/emu/cpu/cdp1802/cdp1802.c
+++ b/src/emu/cpu/cdp1802/cdp1802.c
@@ -26,8 +26,8 @@ struct _cdp1802_state
{
const cdp1802_interface *intf;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
devcb_resolved_write_line out_q_func;
devcb_resolved_read8 in_dma_func;
diff --git a/src/emu/cpu/cop400/cop400.c b/src/emu/cpu/cop400/cop400.c
index 99059438085..0983df05729 100644
--- a/src/emu/cpu/cop400/cop400.c
+++ b/src/emu/cpu/cop400/cop400.c
@@ -89,9 +89,9 @@ struct _cop400_state
{
const cop400_interface *intf;
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
UINT8 featuremask;
diff --git a/src/emu/cpu/cp1610/cp1610.c b/src/emu/cpu/cp1610/cp1610.c
index 1d3d14fc8fc..1142d16b88e 100644
--- a/src/emu/cpu/cp1610/cp1610.c
+++ b/src/emu/cpu/cp1610/cp1610.c
@@ -47,7 +47,7 @@ struct _cp1610_state
int intrm_pending;
int mask_interrupts;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
};
diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/emu/cpu/cubeqcpu/cubeqcpu.c
index a1afafdf2dd..32c097b3a1b 100644
--- a/src/emu/cpu/cubeqcpu/cubeqcpu.c
+++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c
@@ -98,7 +98,7 @@ typedef struct
UINT16 *sound_data;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
} cquestsnd_state;
@@ -139,7 +139,7 @@ typedef struct
legacy_cpu_device *device;
legacy_cpu_device *lindevice;
- const address_space *program;
+ address_space *program;
int icount;
} cquestrot_state;
@@ -185,7 +185,7 @@ typedef struct
legacy_cpu_device *device;
legacy_cpu_device *rotdevice;
- const address_space *program;
+ address_space *program;
int icount;
} cquestlin_state;
diff --git a/src/emu/cpu/drcbec.c b/src/emu/cpu/drcbec.c
index 4e1d48c8c47..07d2c906637 100644
--- a/src/emu/cpu/drcbec.c
+++ b/src/emu/cpu/drcbec.c
@@ -213,7 +213,7 @@ enum
struct _drcbe_state
{
running_device * device; /* CPU device we are associated with */
- const address_space * space[ADDRESS_SPACES]; /* pointers to CPU's address space */
+ address_space * space[ADDRESS_SPACES]; /* pointers to CPU's address space */
drcuml_state * drcuml; /* pointer back to our owner */
drccache * cache; /* pointer to the cache */
drcuml_machine_state state; /* state of the machine */
diff --git a/src/emu/cpu/drcbex64.c b/src/emu/cpu/drcbex64.c
index c9da5eae42c..81c95b50bef 100644
--- a/src/emu/cpu/drcbex64.c
+++ b/src/emu/cpu/drcbex64.c
@@ -278,7 +278,7 @@ struct _drcbe_state
x86code * debug_log_hashjmp; /* hashjmp debugging */
x86code * drcmap_get_value; /* map lookup helper */
data_accessors accessors[ADDRESS_SPACES]; /* memory accessors */
- const address_space * space[ADDRESS_SPACES]; /* address spaces */
+ address_space * space[ADDRESS_SPACES]; /* address spaces */
UINT8 sse41; /* do we have SSE4.1 support? */
UINT32 ssemode; /* saved SSE mode */
diff --git a/src/emu/cpu/drcbex86.c b/src/emu/cpu/drcbex86.c
index b984d75a120..ced858d1380 100644
--- a/src/emu/cpu/drcbex86.c
+++ b/src/emu/cpu/drcbex86.c
@@ -179,7 +179,7 @@ struct _drcbe_state
double fptemp; /* temporary storage for floating point */
data_accessors accessors[ADDRESS_SPACES]; /* memory accessors */
- const address_space * space[ADDRESS_SPACES]; /* address spaces */
+ address_space * space[ADDRESS_SPACES]; /* address spaces */
UINT8 sse3; /* do we have SSE3 support? */
UINT16 fpumode; /* saved FPU mode */
diff --git a/src/emu/cpu/drcfe.c b/src/emu/cpu/drcfe.c
index 6796444a871..1e9c41e5c20 100644
--- a/src/emu/cpu/drcfe.c
+++ b/src/emu/cpu/drcfe.c
@@ -55,7 +55,7 @@ struct _drcfe_state
/* CPU parameters */
cpu_device * cpudevice; /* CPU device object */
- const address_space *program; /* program address space for this CPU */
+ address_space *program; /* program address space for this CPU */
offs_t pageshift; /* shift to convert address to a page index */
/* opcode descriptor arrays */
diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c
index 9a643844da4..4e60dec66ac 100644
--- a/src/emu/cpu/dsp32/dsp32.c
+++ b/src/emu/cpu/dsp32/dsp32.c
@@ -185,7 +185,7 @@ struct _dsp32_state
UINT32 ppc;
void (*output_pins_changed)(running_device *device, UINT32 pins);
legacy_cpu_device * device;
- const address_space *program;
+ address_space *program;
};
diff --git a/src/emu/cpu/dsp56k/dsp56k.h b/src/emu/cpu/dsp56k/dsp56k.h
index 3667aca818d..ace6eccabee 100644
--- a/src/emu/cpu/dsp56k/dsp56k.h
+++ b/src/emu/cpu/dsp56k/dsp56k.h
@@ -233,8 +233,8 @@ typedef struct
int interrupt_cycles;
void (*output_pins_changed)(UINT32 pins);
legacy_cpu_device *device;
- const address_space *program;
- const address_space *data;
+ address_space *program;
+ address_space *data;
UINT16 peripheral_ram[0x40];
UINT16 program_ram[0x800];
diff --git a/src/emu/cpu/e132xs/e132xs.c b/src/emu/cpu/e132xs/e132xs.c
index 6fc51c6df70..8c85ba64a6b 100644
--- a/src/emu/cpu/e132xs/e132xs.c
+++ b/src/emu/cpu/e132xs/e132xs.c
@@ -320,8 +320,8 @@ struct _hyperstone_state
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
UINT32 opcodexor;
INT32 instruction_length;
diff --git a/src/emu/cpu/esrip/esrip.c b/src/emu/cpu/esrip/esrip.c
index 7ff64cc8e01..bf05659dea5 100644
--- a/src/emu/cpu/esrip/esrip.c
+++ b/src/emu/cpu/esrip/esrip.c
@@ -110,7 +110,7 @@ typedef struct
UINT8 *lbrm;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
read16_device_func fdt_r;
diff --git a/src/emu/cpu/f8/f8.c b/src/emu/cpu/f8/f8.c
index 941999ac143..3abb75d0428 100644
--- a/src/emu/cpu/f8/f8.c
+++ b/src/emu/cpu/f8/f8.c
@@ -54,8 +54,8 @@ struct _f8_Regs
UINT16 irq_vector;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *iospace;
+ address_space *program;
+ address_space *iospace;
int icount;
UINT8 r[64]; /* scratchpad RAM */
int irq_request;
diff --git a/src/emu/cpu/g65816/g65816cm.h b/src/emu/cpu/g65816/g65816cm.h
index 1cd7a9a5159..763e7576fe9 100644
--- a/src/emu/cpu/g65816/g65816cm.h
+++ b/src/emu/cpu/g65816/g65816cm.h
@@ -95,7 +95,7 @@ struct _g65816i_cpu_struct
uint irq_delay; /* delay 1 instruction before checking irq */
device_irq_callback int_ack; /* Interrupt Acknowledge */
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
read8_space_func read_vector; /* Read vector override */
uint stopped; /* Sets how the CPU is stopped */
void (*const *opcodes)(g65816i_cpu_struct *cpustate);
diff --git a/src/emu/cpu/h6280/h6280.h b/src/emu/cpu/h6280/h6280.h
index da4c5f7e2ce..8fab3e89a84 100644
--- a/src/emu/cpu/h6280/h6280.h
+++ b/src/emu/cpu/h6280/h6280.h
@@ -62,8 +62,8 @@ typedef struct
UINT8 irq_pending;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
#if LAZY_FLAGS
INT32 NZ; /* last value (lazy N and Z flag) */
diff --git a/src/emu/cpu/h83002/h8priv.h b/src/emu/cpu/h83002/h8priv.h
index 381d2838633..9003ae8485a 100644
--- a/src/emu/cpu/h83002/h8priv.h
+++ b/src/emu/cpu/h83002/h8priv.h
@@ -28,8 +28,8 @@ struct _h83xx_state
device_irq_callback irq_cb;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
// onboard peripherals stuff
UINT8 per_regs[256];
diff --git a/src/emu/cpu/hd6309/hd6309.c b/src/emu/cpu/hd6309/hd6309.c
index 8ad722d8147..d567edbc043 100644
--- a/src/emu/cpu/hd6309/hd6309.c
+++ b/src/emu/cpu/hd6309/hd6309.c
@@ -137,7 +137,7 @@ struct _m68_state_t
PAIR ea; /* effective address */
/* Memory spaces */
- const address_space *program;
+ address_space *program;
UINT8 int_state; /* SYNC and CWAI flags */
UINT8 nmi_state;
diff --git a/src/emu/cpu/i386/i386priv.h b/src/emu/cpu/i386/i386priv.h
index 0ed6749d51a..8045ef1eab7 100644
--- a/src/emu/cpu/i386/i386priv.h
+++ b/src/emu/cpu/i386/i386priv.h
@@ -228,8 +228,8 @@ struct _i386_state
UINT8 irq_state;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
UINT32 a20_mask;
int cpuid_max_input_value_eax;
diff --git a/src/emu/cpu/i4004/i4004.c b/src/emu/cpu/i4004/i4004.c
index e49e23816bb..c3f015abf15 100644
--- a/src/emu/cpu/i4004/i4004.c
+++ b/src/emu/cpu/i4004/i4004.c
@@ -34,9 +34,9 @@ struct _i4004_state
UINT8 flags; // used for I/O only
legacy_cpu_device *device;
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
int icount;
int pc_pos; // PC possition in ADDR
int addr_mask;
diff --git a/src/emu/cpu/i8008/i8008.c b/src/emu/cpu/i8008/i8008.c
index 9d82168c958..f173bf83007 100644
--- a/src/emu/cpu/i8008/i8008.c
+++ b/src/emu/cpu/i8008/i8008.c
@@ -34,8 +34,8 @@ struct _i8008_state
UINT8 HALT;
UINT8 flags; // temporary I/O only
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
int pc_pos; // PC possition in ADDR
diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c
index ce8494f9fbf..b3476e8fe6f 100644
--- a/src/emu/cpu/i8085/i8085.c
+++ b/src/emu/cpu/i8085/i8085.c
@@ -184,8 +184,8 @@ struct _i8085_state
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
};
diff --git a/src/emu/cpu/i86/i286.c b/src/emu/cpu/i86/i286.c
index 02ea3a75ad7..6fd3aac95be 100644
--- a/src/emu/cpu/i86/i286.c
+++ b/src/emu/cpu/i86/i286.c
@@ -59,8 +59,8 @@ struct _i80286_state
} ldtr, tr;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
INT32 AuxVal, OverVal, SignVal, ZeroVal, CarryVal, DirVal; /* 0 or non-0 valued flags */
UINT8 ParityVal;
UINT8 TF, IF; /* 0 or 1 valued flags */
diff --git a/src/emu/cpu/i86/i86.c b/src/emu/cpu/i86/i86.c
index 24973817d48..82af4d61d31 100644
--- a/src/emu/cpu/i86/i86.c
+++ b/src/emu/cpu/i86/i86.c
@@ -60,8 +60,8 @@ struct _i8086_state
memory_interface mem;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
unsigned prefix_base; /* base address of the latest prefix segment */
diff --git a/src/emu/cpu/i86/i86mem.c b/src/emu/cpu/i86/i86mem.c
index c1954c9cdda..653fe495164 100644
--- a/src/emu/cpu/i86/i86mem.c
+++ b/src/emu/cpu/i86/i86mem.c
@@ -19,7 +19,7 @@ static void configure_memory_8bit(i8086_state *cpustate)
16-bit memory accessors
*****************************************************************************/
-static UINT16 read_word_16le(const address_space *space, offs_t addr)
+static UINT16 read_word_16le(address_space *space, offs_t addr)
{
if (!(addr & 1))
return memory_read_word_16le(space, addr);
@@ -30,7 +30,7 @@ static UINT16 read_word_16le(const address_space *space, offs_t addr)
}
}
-static void write_word_16le(const address_space *space, offs_t addr, UINT16 data)
+static void write_word_16le(address_space *space, offs_t addr, UINT16 data)
{
if (!(addr & 1))
memory_write_word_16le(space, addr, data);
diff --git a/src/emu/cpu/i86/i86mem.h b/src/emu/cpu/i86/i86mem.h
index 9bccd2a2342..a49797c56a0 100644
--- a/src/emu/cpu/i86/i86mem.h
+++ b/src/emu/cpu/i86/i86mem.h
@@ -3,8 +3,8 @@ struct _memory_interface
{
offs_t fetch_xor;
- UINT8 (*rbyte)(const address_space *, offs_t);
- UINT16 (*rword)(const address_space *, offs_t);
- void (*wbyte)(const address_space *, offs_t, UINT8);
- void (*wword)(const address_space *, offs_t, UINT16);
+ UINT8 (*rbyte)(address_space *, offs_t);
+ UINT16 (*rword)(address_space *, offs_t);
+ void (*wbyte)(address_space *, offs_t, UINT8);
+ void (*wword)(address_space *, offs_t, UINT16);
};
diff --git a/src/emu/cpu/i860/i860.h b/src/emu/cpu/i860/i860.h
index 1625a5970c3..aa5692612f6 100644
--- a/src/emu/cpu/i860/i860.h
+++ b/src/emu/cpu/i860/i860.h
@@ -169,7 +169,7 @@ typedef struct {
* MAME-specific stuff.
*/
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
UINT32 ppc;
int icount;
diff --git a/src/emu/cpu/i960/i960.c b/src/emu/cpu/i960/i960.c
index 8f921f1f897..9ae1359bb10 100644
--- a/src/emu/cpu/i960/i960.c
+++ b/src/emu/cpu/i960/i960.c
@@ -35,7 +35,7 @@ struct _i960_state_t {
device_irq_callback irq_cb;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
};
diff --git a/src/emu/cpu/jaguar/jaguar.c b/src/emu/cpu/jaguar/jaguar.c
index d2e0afbbfca..f0f1b981beb 100644
--- a/src/emu/cpu/jaguar/jaguar.c
+++ b/src/emu/cpu/jaguar/jaguar.c
@@ -101,7 +101,7 @@ struct _jaguar_state
device_irq_callback irq_callback;
jaguar_int_func cpu_interrupt;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
};
diff --git a/src/emu/cpu/konami/konami.c b/src/emu/cpu/konami/konami.c
index 43412a73422..143c8f3b984 100644
--- a/src/emu/cpu/konami/konami.c
+++ b/src/emu/cpu/konami/konami.c
@@ -62,7 +62,7 @@ struct _konami_state
UINT8 nmi_pending;
int icount;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
konami_set_lines_func setlines_callback;
};
diff --git a/src/emu/cpu/lh5801/lh5801.c b/src/emu/cpu/lh5801/lh5801.c
index c30b60e336c..3cd4cf4af8c 100644
--- a/src/emu/cpu/lh5801/lh5801.c
+++ b/src/emu/cpu/lh5801/lh5801.c
@@ -51,7 +51,7 @@ struct _lh5810_state
{
const lh5801_cpu_core *config;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
PAIR s, p, u, x, y;
int tm; //9 bit
diff --git a/src/emu/cpu/lr35902/lr35902.c b/src/emu/cpu/lr35902/lr35902.c
index 699e89e6ffc..05958475063 100644
--- a/src/emu/cpu/lr35902/lr35902.c
+++ b/src/emu/cpu/lr35902/lr35902.c
@@ -66,7 +66,7 @@ typedef struct {
int ei_delay;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
/* Timer stuff */
lr35902_timer_fired_func timer_fired_func;
diff --git a/src/emu/cpu/m37710/m37710cm.h b/src/emu/cpu/m37710/m37710cm.h
index 5fedde511b0..0c10bffc795 100644
--- a/src/emu/cpu/m37710/m37710cm.h
+++ b/src/emu/cpu/m37710/m37710cm.h
@@ -110,8 +110,8 @@ struct _m37710i_cpu_struct
uint destination; /* temp register */
device_irq_callback int_ack;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
uint stopped; /* Sets how the CPU is stopped */
void (*const *opcodes)(m37710i_cpu_struct *cpustate); /* opcodes with no prefix */
void (*const *opcodes42)(m37710i_cpu_struct *cpustate); /* opcodes with 0x42 prefix */
diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c
index e3d7bfca3d4..2a8503600a8 100644
--- a/src/emu/cpu/m6502/m4510.c
+++ b/src/emu/cpu/m6502/m4510.c
@@ -144,7 +144,7 @@ struct _m4510_Regs {
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *space;
+ address_space *space;
int icount;
read8_space_func rdmem_id; /* readmem callback for indexed instructions */
@@ -182,12 +182,12 @@ INLINE int m4510_cpu_readop_arg(m4510_Regs *cpustate)
#define M4510
#include "t65ce02.c"
-static UINT8 default_rdmem_id(const address_space *space, offs_t address)
+static UINT8 default_rdmem_id(address_space *space, offs_t address)
{
m4510_Regs *cpustate = get_safe_token(space->cpu);
return memory_read_byte_8le(space, M4510_MEM(address));
}
-static void default_wrmem_id(const address_space *space, offs_t address, UINT8 data)
+static void default_wrmem_id(address_space *space, offs_t address, UINT8 data)
{
m4510_Regs *cpustate = get_safe_token(space->cpu);
memory_write_byte_8le(space, M4510_MEM(address), data);
diff --git a/src/emu/cpu/m6502/m6502.c b/src/emu/cpu/m6502/m6502.c
index b007c21a5b8..8ec0784915f 100644
--- a/src/emu/cpu/m6502/m6502.c
+++ b/src/emu/cpu/m6502/m6502.c
@@ -70,8 +70,8 @@ struct _m6502_Regs
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *space;
- const address_space *io;
+ address_space *space;
+ address_space *io;
int int_occured;
int icount;
@@ -99,8 +99,8 @@ INLINE m6502_Regs *get_safe_token(running_device *device)
return (m6502_Regs *)downcast<legacy_cpu_device *>(device)->token();
}
-static UINT8 default_rdmem_id(const address_space *space, offs_t offset) { return memory_read_byte_8le(space, offset); }
-static void default_wdmem_id(const address_space *space, offs_t offset, UINT8 data) { memory_write_byte_8le(space, offset, data); }
+static UINT8 default_rdmem_id(address_space *space, offs_t offset) { return memory_read_byte_8le(space, offset); }
+static void default_wdmem_id(address_space *space, offs_t offset, UINT8 data) { memory_write_byte_8le(space, offset, data); }
/***************************************************************
* include the opcode macros, functions and tables
diff --git a/src/emu/cpu/m6502/m6509.c b/src/emu/cpu/m6502/m6509.c
index f0d023217a9..9d989465e45 100644
--- a/src/emu/cpu/m6502/m6509.c
+++ b/src/emu/cpu/m6502/m6509.c
@@ -79,7 +79,7 @@ struct _m6509_Regs {
UINT8 so_state;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *space;
+ address_space *space;
int icount;
@@ -134,8 +134,8 @@ static ADDRESS_MAP_START(m6509_mem, ADDRESS_SPACE_PROGRAM, 8)
AM_RANGE(0x00001, 0x00001) AM_MIRROR(0xF0000) AM_READWRITE(m6509_read_00001, m6509_write_00001)
ADDRESS_MAP_END
-static UINT8 default_rdmem_id(const address_space *space, offs_t address) { return memory_read_byte_8le(space, address); }
-static void default_wdmem_id(const address_space *space, offs_t address, UINT8 data) { memory_write_byte_8le(space, address, data); }
+static UINT8 default_rdmem_id(address_space *space, offs_t address) { return memory_read_byte_8le(space, address); }
+static void default_wdmem_id(address_space *space, offs_t address, UINT8 data) { memory_write_byte_8le(space, address, data); }
static CPU_INIT( m6509 )
{
diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c
index c4d9667e6c1..6f5bfd352fb 100644
--- a/src/emu/cpu/m6502/m65ce02.c
+++ b/src/emu/cpu/m6502/m65ce02.c
@@ -76,7 +76,7 @@ struct _m65ce02_Regs {
int icount;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *space;
+ address_space *space;
read8_space_func rdmem_id; /* readmem callback for indexed instructions */
write8_space_func wrmem_id; /* writemem callback for indexed instructions */
};
@@ -94,8 +94,8 @@ INLINE m65ce02_Regs *get_safe_token(running_device *device)
#include "t65ce02.c"
-static UINT8 default_rdmem_id(const address_space *space, offs_t address) { return memory_read_byte_8le(space, address); }
-static void default_wdmem_id(const address_space *space, offs_t address, UINT8 data) { memory_write_byte_8le(space, address, data); }
+static UINT8 default_rdmem_id(address_space *space, offs_t address) { return memory_read_byte_8le(space, address); }
+static void default_wdmem_id(address_space *space, offs_t address, UINT8 data) { memory_write_byte_8le(space, address, data); }
static CPU_INIT( m65ce02 )
{
diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c
index ba95cab83dc..1ab28fd172f 100644
--- a/src/emu/cpu/m6800/m6800.c
+++ b/src/emu/cpu/m6800/m6800.c
@@ -116,9 +116,9 @@ struct _m6800_state
legacy_cpu_device *device;
/* Memory spaces */
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
void (* const * insn)(m6800_state *); /* instruction table */
const UINT8 *cycles; /* clock cycle of instruction table */
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c
index 96185b4f092..1489a6105be 100644
--- a/src/emu/cpu/m68000/m68kcpu.c
+++ b/src/emu/cpu/m68000/m68kcpu.c
@@ -944,7 +944,7 @@ void m68k_set_encrypted_opcode_range(running_device *device, offs_t start, offs_
* 8-bit data memory interface
****************************************************************************/
-static UINT16 m68008_read_immediate_16(const address_space *space, offs_t address)
+static UINT16 m68008_read_immediate_16(address_space *space, offs_t address)
{
offs_t addr = address;
return (memory_decrypted_read_byte(space, addr) << 8) | (memory_decrypted_read_byte(space, addr + 1));
@@ -967,13 +967,13 @@ static const m68k_memory_interface interface_d8 =
* 16-bit data memory interface
****************************************************************************/
-static UINT16 read_immediate_16(const address_space *space, offs_t address)
+static UINT16 read_immediate_16(address_space *space, offs_t address)
{
m68ki_cpu_core *m68k = get_safe_token(space->cpu);
return memory_decrypted_read_word(space, (address) ^ m68k->memory.opcode_xor);
}
-static UINT16 simple_read_immediate_16(const address_space *space, offs_t address)
+static UINT16 simple_read_immediate_16(address_space *space, offs_t address)
{
return memory_decrypted_read_word(space, address);
}
@@ -996,7 +996,7 @@ static const m68k_memory_interface interface_d16 =
****************************************************************************/
/* potentially misaligned 16-bit reads with a 32-bit data bus (and 24-bit address bus) */
-static UINT16 readword_d32(const address_space *space, offs_t address)
+static UINT16 readword_d32(address_space *space, offs_t address)
{
UINT16 result;
@@ -1007,7 +1007,7 @@ static UINT16 readword_d32(const address_space *space, offs_t address)
}
/* potentially misaligned 16-bit writes with a 32-bit data bus (and 24-bit address bus) */
-static void writeword_d32(const address_space *space, offs_t address, UINT16 data)
+static void writeword_d32(address_space *space, offs_t address, UINT16 data)
{
if (!(address & 1))
{
@@ -1019,7 +1019,7 @@ static void writeword_d32(const address_space *space, offs_t address, UINT16 dat
}
/* potentially misaligned 32-bit reads with a 32-bit data bus (and 24-bit address bus) */
-static UINT32 readlong_d32(const address_space *space, offs_t address)
+static UINT32 readlong_d32(address_space *space, offs_t address)
{
UINT32 result;
@@ -1036,7 +1036,7 @@ static UINT32 readlong_d32(const address_space *space, offs_t address)
}
/* potentially misaligned 32-bit writes with a 32-bit data bus (and 24-bit address bus) */
-static void writelong_d32(const address_space *space, offs_t address, UINT32 data)
+static void writelong_d32(address_space *space, offs_t address, UINT32 data)
{
if (!(address & 3))
{
@@ -1068,7 +1068,7 @@ static const m68k_memory_interface interface_d32 =
};
/* interface for 32-bit data bus with PMMU (68EC020, 68020) */
-static UINT8 read_byte_32_mmu(const address_space *space, offs_t address)
+static UINT8 read_byte_32_mmu(address_space *space, offs_t address)
{
m68ki_cpu_core *m68k = get_safe_token(space->cpu);
@@ -1080,7 +1080,7 @@ static UINT8 read_byte_32_mmu(const address_space *space, offs_t address)
return memory_read_byte_32be(space, address);
}
-static void write_byte_32_mmu(const address_space *space, offs_t address, UINT8 data)
+static void write_byte_32_mmu(address_space *space, offs_t address, UINT8 data)
{
m68ki_cpu_core *m68k = get_safe_token(space->cpu);
@@ -1092,7 +1092,7 @@ static void write_byte_32_mmu(const address_space *space, offs_t address, UINT8
memory_write_byte_32be(space, address, data);
}
-static UINT16 read_immediate_16_mmu(const address_space *space, offs_t address)
+static UINT16 read_immediate_16_mmu(address_space *space, offs_t address)
{
m68ki_cpu_core *m68k = get_safe_token(space->cpu);
@@ -1105,7 +1105,7 @@ static UINT16 read_immediate_16_mmu(const address_space *space, offs_t address)
}
/* potentially misaligned 16-bit reads with a 32-bit data bus (and 24-bit address bus) */
-static UINT16 readword_d32_mmu(const address_space *space, offs_t address)
+static UINT16 readword_d32_mmu(address_space *space, offs_t address)
{
m68ki_cpu_core *m68k = get_safe_token(space->cpu);
UINT16 result;
@@ -1122,7 +1122,7 @@ static UINT16 readword_d32_mmu(const address_space *space, offs_t address)
}
/* potentially misaligned 16-bit writes with a 32-bit data bus (and 24-bit address bus) */
-static void writeword_d32_mmu(const address_space *space, offs_t address, UINT16 data)
+static void writeword_d32_mmu(address_space *space, offs_t address, UINT16 data)
{
m68ki_cpu_core *m68k = get_safe_token(space->cpu);
@@ -1141,7 +1141,7 @@ static void writeword_d32_mmu(const address_space *space, offs_t address, UINT16
}
/* potentially misaligned 32-bit reads with a 32-bit data bus (and 24-bit address bus) */
-static UINT32 readlong_d32_mmu(const address_space *space, offs_t address)
+static UINT32 readlong_d32_mmu(address_space *space, offs_t address)
{
m68ki_cpu_core *m68k = get_safe_token(space->cpu);
UINT32 result;
@@ -1164,7 +1164,7 @@ static UINT32 readlong_d32_mmu(const address_space *space, offs_t address)
}
/* potentially misaligned 32-bit writes with a 32-bit data bus (and 24-bit address bus) */
-static void writelong_d32_mmu(const address_space *space, offs_t address, UINT32 data)
+static void writelong_d32_mmu(address_space *space, offs_t address, UINT32 data)
{
m68ki_cpu_core *m68k = get_safe_token(space->cpu);
diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h
index 75ce67c757e..e9fb13b7ad1 100644
--- a/src/emu/cpu/m68000/m68kcpu.h
+++ b/src/emu/cpu/m68000/m68kcpu.h
@@ -539,13 +539,13 @@ typedef struct _m68k_memory_interface m68k_memory_interface;
struct _m68k_memory_interface
{
offs_t opcode_xor; // Address Calculation
- UINT16 (*readimm16)(const address_space *, offs_t); // Immediate read 16 bit
- UINT8 (*read8)(const address_space *, offs_t); // Normal read 8 bit
- UINT16 (*read16)(const address_space *, offs_t); // Normal read 16 bit
- UINT32 (*read32)(const address_space *, offs_t); // Normal read 32 bit
- void (*write8)(const address_space *, offs_t, UINT8); // Write 8 bit
- void (*write16)(const address_space *, offs_t, UINT16); // Write 16 bit
- void (*write32)(const address_space *, offs_t, UINT32); // Write 32 bit
+ UINT16 (*readimm16)(address_space *, offs_t); // Immediate read 16 bit
+ UINT8 (*read8)(address_space *, offs_t); // Normal read 8 bit
+ UINT16 (*read16)(address_space *, offs_t); // Normal read 16 bit
+ UINT32 (*read32)(address_space *, offs_t); // Normal read 32 bit
+ void (*write8)(address_space *, offs_t, UINT8); // Write 8 bit
+ void (*write16)(address_space *, offs_t, UINT16); // Write 16 bit
+ void (*write32)(address_space *, offs_t, UINT32); // Write 32 bit
};
struct _m68ki_cpu_core
@@ -628,7 +628,7 @@ struct _m68ki_cpu_core
m68k_tas_func tas_instr_callback; /* Called when a TAS instruction is encountered, allows / disallows writeback */
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
m68k_memory_interface memory;
offs_t encrypted_start;
offs_t encrypted_end;
diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c
index 7b356f6013a..830c9e6517a 100644
--- a/src/emu/cpu/m6805/m6805.c
+++ b/src/emu/cpu/m6805/m6805.c
@@ -62,7 +62,7 @@ typedef struct
UINT16 pending_interrupts; /* MB */
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int irq_state[9]; /* KW Additional lines for HD63705 */
int nmi_state;
} m6805_Regs;
diff --git a/src/emu/cpu/m6809/m6809.c b/src/emu/cpu/m6809/m6809.c
index 9e64437b562..665efada724 100644
--- a/src/emu/cpu/m6809/m6809.c
+++ b/src/emu/cpu/m6809/m6809.c
@@ -105,7 +105,7 @@ struct _m68_state_t
PAIR ea; /* effective address */
/* Memory spaces */
- const address_space *program;
+ address_space *program;
UINT8 int_state; /* SYNC and CWAI flags */
UINT8 nmi_state;
diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/emu/cpu/mb86233/mb86233.c
index 9f7328cef42..cd61a1d1ed5 100644
--- a/src/emu/cpu/mb86233/mb86233.c
+++ b/src/emu/cpu/mb86233/mb86233.c
@@ -51,7 +51,7 @@ struct _mb86233_state
UINT32 extport[0x30];
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
/* FIFO */
diff --git a/src/emu/cpu/mb88xx/mb88xx.c b/src/emu/cpu/mb88xx/mb88xx.c
index 32cb4787468..be904aed01a 100644
--- a/src/emu/cpu/mb88xx/mb88xx.c
+++ b/src/emu/cpu/mb88xx/mb88xx.c
@@ -75,9 +75,9 @@ struct _mb88_state
UINT8 pending_interrupt;
device_irq_callback irqcallback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
int icount;
};
diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/emu/cpu/mc68hc11/mc68hc11.c
index 6b8407e5eb3..b336247771a 100644
--- a/src/emu/cpu/mc68hc11/mc68hc11.c
+++ b/src/emu/cpu/mc68hc11/mc68hc11.c
@@ -62,8 +62,8 @@ struct _hc11_state
device_irq_callback irq_callback;
UINT8 irq_state[2];
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
int ram_position;
diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c
index 94f5e98816c..a735800fb5e 100644
--- a/src/emu/cpu/mcs48/mcs48.c
+++ b/src/emu/cpu/mcs48/mcs48.c
@@ -154,9 +154,9 @@ struct _mcs48_state
int icount;
/* Memory spaces */
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
UINT8 feature_mask; /* processor feature flags */
UINT16 int_rom_size; /* internal rom size */
diff --git a/src/emu/cpu/mcs51/mcs51.c b/src/emu/cpu/mcs51/mcs51.c
index 97b14180669..6b54f066aae 100644
--- a/src/emu/cpu/mcs51/mcs51.c
+++ b/src/emu/cpu/mcs51/mcs51.c
@@ -285,9 +285,9 @@ struct _mcs51_state_t
legacy_cpu_device *device;
/* Memory spaces */
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
/* Serial Port TX/RX Callbacks */
// TODO: Move to special port r/w
diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c
index 3b89bcbabb4..52e6e4bb7be 100644
--- a/src/emu/cpu/minx/minx.c
+++ b/src/emu/cpu/minx/minx.c
@@ -85,7 +85,7 @@ typedef struct {
UINT8 interrupt_pending;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
} minx_state;
diff --git a/src/emu/cpu/mips/mips3com.h b/src/emu/cpu/mips/mips3com.h
index d88321f9492..a8b1e06d356 100644
--- a/src/emu/cpu/mips/mips3com.h
+++ b/src/emu/cpu/mips/mips3com.h
@@ -196,7 +196,7 @@ struct _mips3_state
mips3_flavor flavor;
device_irq_callback irq_callback;
legacy_cpu_device * device;
- const address_space *program;
+ address_space *program;
UINT32 system_clock;
UINT32 cpu_clock;
UINT64 count_zero_time;
diff --git a/src/emu/cpu/mips/psx.c b/src/emu/cpu/mips/psx.c
index 61277581c14..aa23ecc8f9e 100644
--- a/src/emu/cpu/mips/psx.c
+++ b/src/emu/cpu/mips/psx.c
@@ -186,7 +186,7 @@ struct _psxcpu_state
UINT32 multiplier_operand2;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int bus_attached;
UINT32 bad_byte_address_mask;
UINT32 bad_half_address_mask;
@@ -1300,7 +1300,7 @@ static WRITE32_HANDLER( psx_berr_w )
psxcpu->berr = 1;
}
-static void mips_update_scratchpad( const address_space *space )
+static void mips_update_scratchpad( address_space *space )
{
psxcpu_state *psxcpu = get_safe_token(space->cpu);
diff --git a/src/emu/cpu/mips/r3000.c b/src/emu/cpu/mips/r3000.c
index 3f15bb8ed77..04dbcffda17 100644
--- a/src/emu/cpu/mips/r3000.c
+++ b/src/emu/cpu/mips/r3000.c
@@ -139,7 +139,7 @@ struct _r3000_state
int hasfpu;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
/* endian-dependent load/store */
void (*lwl)(r3000_state *r3000, UINT32 op);
@@ -187,19 +187,19 @@ static void lwr_le(r3000_state *r3000, UINT32 op);
static void swl_le(r3000_state *r3000, UINT32 op);
static void swr_le(r3000_state *r3000, UINT32 op);
-static UINT8 readcache_be(const address_space *space, offs_t offset);
-static UINT16 readcache_be_word(const address_space *space, offs_t offset);
-static UINT32 readcache_be_dword(const address_space *space, offs_t offset);
-static void writecache_be(const address_space *space, offs_t offset, UINT8 data);
-static void writecache_be_word(const address_space *space, offs_t offset, UINT16 data);
-static void writecache_be_dword(const address_space *space, offs_t offset, UINT32 data);
+static UINT8 readcache_be(address_space *space, offs_t offset);
+static UINT16 readcache_be_word(address_space *space, offs_t offset);
+static UINT32 readcache_be_dword(address_space *space, offs_t offset);
+static void writecache_be(address_space *space, offs_t offset, UINT8 data);
+static void writecache_be_word(address_space *space, offs_t offset, UINT16 data);
+static void writecache_be_dword(address_space *space, offs_t offset, UINT32 data);
-static UINT8 readcache_le(const address_space *space, offs_t offset);
-static UINT16 readcache_le_word(const address_space *space, offs_t offset);
-static UINT32 readcache_le_dword(const address_space *space, offs_t offset);
-static void writecache_le(const address_space *space, offs_t offset, UINT8 data);
-static void writecache_le_word(const address_space *space, offs_t offset, UINT16 data);
-static void writecache_le_dword(const address_space *space, offs_t offset, UINT32 data);
+static UINT8 readcache_le(address_space *space, offs_t offset);
+static UINT16 readcache_le_word(address_space *space, offs_t offset);
+static UINT32 readcache_le_dword(address_space *space, offs_t offset);
+static void writecache_le(address_space *space, offs_t offset, UINT8 data);
+static void writecache_le_word(address_space *space, offs_t offset, UINT16 data);
+static void writecache_le_dword(address_space *space, offs_t offset, UINT32 data);
@@ -891,84 +891,84 @@ static CPU_EXECUTE( r3000 )
CACHE I/O
***************************************************************************/
-static UINT8 readcache_be(const address_space *space, offs_t offset)
+static UINT8 readcache_be(address_space *space, offs_t offset)
{
r3000_state *r3000 = get_safe_token(space->cpu);
offset &= 0x1fffffff;
return (offset * 4 < r3000->cache_size) ? r3000->cache[BYTE4_XOR_BE(offset)] : 0xff;
}
-static UINT16 readcache_be_word(const address_space *space, offs_t offset)
+static UINT16 readcache_be_word(address_space *space, offs_t offset)
{
r3000_state *r3000 = get_safe_token(space->cpu);
offset &= 0x1fffffff;
return (offset * 4 < r3000->cache_size) ? *(UINT16 *)&r3000->cache[WORD_XOR_BE(offset)] : 0xffff;
}
-static UINT32 readcache_be_dword(const address_space *space, offs_t offset)
+static UINT32 readcache_be_dword(address_space *space, offs_t offset)
{
r3000_state *r3000 = get_safe_token(space->cpu);
offset &= 0x1fffffff;
return (offset * 4 < r3000->cache_size) ? *(UINT32 *)&r3000->cache[offset] : 0xffffffff;
}
-static void writecache_be(const address_space *space, offs_t offset, UINT8 data)
+static void writecache_be(address_space *space, offs_t offset, UINT8 data)
{
r3000_state *r3000 = get_safe_token(space->cpu);
offset &= 0x1fffffff;
if (offset * 4 < r3000->cache_size) r3000->cache[BYTE4_XOR_BE(offset)] = data;
}
-static void writecache_be_word(const address_space *space, offs_t offset, UINT16 data)
+static void writecache_be_word(address_space *space, offs_t offset, UINT16 data)
{
r3000_state *r3000 = get_safe_token(space->cpu);
offset &= 0x1fffffff;
if (offset * 4 < r3000->cache_size) *(UINT16 *)&r3000->cache[WORD_XOR_BE(offset)] = data;
}
-static void writecache_be_dword(const address_space *space, offs_t offset, UINT32 data)
+static void writecache_be_dword(address_space *space, offs_t offset, UINT32 data)
{
r3000_state *r3000 = get_safe_token(space->cpu);
offset &= 0x1fffffff;
if (offset * 4 < r3000->cache_size) *(UINT32 *)&r3000->cache[offset] = data;
}
-static UINT8 readcache_le(const address_space *space, offs_t offset)
+static UINT8 readcache_le(address_space *space, offs_t offset)
{
r3000_state *r3000 = get_safe_token(space->cpu);
offset &= 0x1fffffff;
return (offset * 4 < r3000->cache_size) ? r3000->cache[BYTE4_XOR_LE(offset)] : 0xff;
}
-static UINT16 readcache_le_word(const address_space *space, offs_t offset)
+static UINT16 readcache_le_word(address_space *space, offs_t offset)
{
r3000_state *r3000 = get_safe_token(space->cpu);
offset &= 0x1fffffff;
return (offset * 4 < r3000->cache_size) ? *(UINT16 *)&r3000->cache[WORD_XOR_LE(offset)] : 0xffff;
}
-static UINT32 readcache_le_dword(const address_space *space, offs_t offset)
+static UINT32 readcache_le_dword(address_space *space, offs_t offset)
{
r3000_state *r3000 = get_safe_token(space->cpu);
offset &= 0x1fffffff;
return (offset * 4 < r3000->cache_size) ? *(UINT32 *)&r3000->cache[offset] : 0xffffffff;
}
-static void writecache_le(const address_space *space, offs_t offset, UINT8 data)
+static void writecache_le(address_space *space, offs_t offset, UINT8 data)
{
r3000_state *r3000 = get_safe_token(space->cpu);
offset &= 0x1fffffff;
if (offset * 4 < r3000->cache_size) r3000->cache[BYTE4_XOR_LE(offset)] = data;
}
-static void writecache_le_word(const address_space *space, offs_t offset, UINT16 data)
+static void writecache_le_word(address_space *space, offs_t offset, UINT16 data)
{
r3000_state *r3000 = get_safe_token(space->cpu);
offset &= 0x1fffffff;
if (offset * 4 < r3000->cache_size) *(UINT16 *)&r3000->cache[WORD_XOR_LE(offset)] = data;
}
-static void writecache_le_dword(const address_space *space, offs_t offset, UINT32 data)
+static void writecache_le_dword(address_space *space, offs_t offset, UINT32 data)
{
r3000_state *r3000 = get_safe_token(space->cpu);
offset &= 0x1fffffff;
diff --git a/src/emu/cpu/mn10200/mn10200.c b/src/emu/cpu/mn10200/mn10200.c
index 35f49b7caf2..0c3a1518c6c 100644
--- a/src/emu/cpu/mn10200/mn10200.c
+++ b/src/emu/cpu/mn10200/mn10200.c
@@ -65,8 +65,8 @@ struct _mn102_info
int cycles;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
};
static void mn10200_w(mn102_info *mn102, UINT32 adr, UINT32 data, int type);
diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c
index 7ce59c8657f..31a5aba0256 100644
--- a/src/emu/cpu/nec/nec.c
+++ b/src/emu/cpu/nec/nec.c
@@ -135,10 +135,10 @@ typedef struct
{
offs_t fetch_xor;
- UINT8 (*rbyte)(const address_space *, offs_t);
- UINT16 (*rword)(const address_space *, offs_t);
- void (*wbyte)(const address_space *, offs_t, UINT8);
- void (*wword)(const address_space *, offs_t, UINT16);
+ UINT8 (*rbyte)(address_space *, offs_t);
+ UINT16 (*rword)(address_space *, offs_t);
+ void (*wbyte)(address_space *, offs_t, UINT8);
+ void (*wword)(address_space *, offs_t, UINT16);
} memory_interface;
@@ -162,8 +162,8 @@ struct _nec_state_t
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
memory_interface mem;
@@ -1153,7 +1153,7 @@ static void configure_memory_8bit(nec_state_t *nec_state)
16-bit memory accessors
*****************************************************************************/
-static UINT16 read_word_16le(const address_space *space, offs_t addr)
+static UINT16 read_word_16le(address_space *space, offs_t addr)
{
if (!(addr & 1))
return memory_read_word_16le(space, addr);
@@ -1164,7 +1164,7 @@ static UINT16 read_word_16le(const address_space *space, offs_t addr)
}
}
-static void write_word_16le(const address_space *space, offs_t addr, UINT16 data)
+static void write_word_16le(address_space *space, offs_t addr, UINT16 data)
{
if (!(addr & 1))
memory_write_word_16le(space, addr, data);
diff --git a/src/emu/cpu/pdp1/pdp1.c b/src/emu/cpu/pdp1/pdp1.c
index 7200d42456a..e3c7a4548db 100644
--- a/src/emu/cpu/pdp1/pdp1.c
+++ b/src/emu/cpu/pdp1/pdp1.c
@@ -418,7 +418,7 @@ struct _pdp1_state
int type_20_sbs;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
};
diff --git a/src/emu/cpu/pdp1/tx0.c b/src/emu/cpu/pdp1/tx0.c
index e880abceba3..13e4784a6d8 100644
--- a/src/emu/cpu/pdp1/tx0.c
+++ b/src/emu/cpu/pdp1/tx0.c
@@ -65,7 +65,7 @@ struct _tx0_state
int icount;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
};
INLINE tx0_state *get_safe_token(running_device *device)
diff --git a/src/emu/cpu/pic16c5x/pic16c5x.c b/src/emu/cpu/pic16c5x/pic16c5x.c
index 9f21b9fdad2..3ebe8fa81be 100644
--- a/src/emu/cpu/pic16c5x/pic16c5x.c
+++ b/src/emu/cpu/pic16c5x/pic16c5x.c
@@ -98,9 +98,9 @@ struct _pic16c5x_state
legacy_cpu_device *device;
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
};
INLINE pic16c5x_state *get_safe_token(running_device *device)
diff --git a/src/emu/cpu/pic16c62x/pic16c62x.c b/src/emu/cpu/pic16c62x/pic16c62x.c
index 5cc4d749586..e0d67b3493c 100644
--- a/src/emu/cpu/pic16c62x/pic16c62x.c
+++ b/src/emu/cpu/pic16c62x/pic16c62x.c
@@ -88,9 +88,9 @@ struct _pic16c62x_state
legacy_cpu_device *device;
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
};
INLINE pic16c62x_state *get_safe_token(running_device *device)
diff --git a/src/emu/cpu/powerpc/ppc.c b/src/emu/cpu/powerpc/ppc.c
index 6f251107dcc..f06b59feb6b 100644
--- a/src/emu/cpu/powerpc/ppc.c
+++ b/src/emu/cpu/powerpc/ppc.c
@@ -307,7 +307,7 @@ typedef struct {
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
// STUFF added for the 6xx series
UINT32 dec, dec_frac;
@@ -330,20 +330,20 @@ typedef struct {
/* PowerPC function pointers for memory accesses/exceptions */
jmp_buf exception_jmpbuf;
- UINT8 (*read8)(const address_space *space, offs_t address);
- UINT16 (*read16)(const address_space *space, offs_t address);
- UINT32 (*read32)(const address_space *space, offs_t address);
- UINT64 (*read64)(const address_space *space, offs_t address);
- void (*write8)(const address_space *space, offs_t address, UINT8 data);
- void (*write16)(const address_space *space, offs_t address, UINT16 data);
- void (*write32)(const address_space *space, offs_t address, UINT32 data);
- void (*write64)(const address_space *space, offs_t address, UINT64 data);
- UINT16 (*read16_unaligned)(const address_space *space, offs_t address);
- UINT32 (*read32_unaligned)(const address_space *space, offs_t address);
- UINT64 (*read64_unaligned)(const address_space *space, offs_t address);
- void (*write16_unaligned)(const address_space *space, offs_t address, UINT16 data);
- void (*write32_unaligned)(const address_space *space, offs_t address, UINT32 data);
- void (*write64_unaligned)(const address_space *space, offs_t address, UINT64 data);
+ UINT8 (*read8)(address_space *space, offs_t address);
+ UINT16 (*read16)(address_space *space, offs_t address);
+ UINT32 (*read32)(address_space *space, offs_t address);
+ UINT64 (*read64)(address_space *space, offs_t address);
+ void (*write8)(address_space *space, offs_t address, UINT8 data);
+ void (*write16)(address_space *space, offs_t address, UINT16 data);
+ void (*write32)(address_space *space, offs_t address, UINT32 data);
+ void (*write64)(address_space *space, offs_t address, UINT64 data);
+ UINT16 (*read16_unaligned)(address_space *space, offs_t address);
+ UINT32 (*read32_unaligned)(address_space *space, offs_t address);
+ UINT64 (*read64_unaligned)(address_space *space, offs_t address);
+ void (*write16_unaligned)(address_space *space, offs_t address, UINT16 data);
+ void (*write32_unaligned)(address_space *space, offs_t address, UINT32 data);
+ void (*write64_unaligned)(address_space *space, offs_t address, UINT64 data);
void (* optable19[1024])(UINT32);
void (* optable31[1024])(UINT32);
@@ -786,14 +786,14 @@ INLINE UINT32 ppc_get_spr(int spr)
return 0;
}
-static UINT8 ppc_read8_translated(const address_space *space, offs_t address);
-static UINT16 ppc_read16_translated(const address_space *space, offs_t address);
-static UINT32 ppc_read32_translated(const address_space *space, offs_t address);
-static UINT64 ppc_read64_translated(const address_space *space, offs_t address);
-static void ppc_write8_translated(const address_space *space, offs_t address, UINT8 data);
-static void ppc_write16_translated(const address_space *space, offs_t address, UINT16 data);
-static void ppc_write32_translated(const address_space *space, offs_t address, UINT32 data);
-static void ppc_write64_translated(const address_space *space, offs_t address, UINT64 data);
+static UINT8 ppc_read8_translated(address_space *space, offs_t address);
+static UINT16 ppc_read16_translated(address_space *space, offs_t address);
+static UINT32 ppc_read32_translated(address_space *space, offs_t address);
+static UINT64 ppc_read64_translated(address_space *space, offs_t address);
+static void ppc_write8_translated(address_space *space, offs_t address, UINT8 data);
+static void ppc_write16_translated(address_space *space, offs_t address, UINT16 data);
+static void ppc_write32_translated(address_space *space, offs_t address, UINT32 data);
+static void ppc_write64_translated(address_space *space, offs_t address, UINT64 data);
INLINE void ppc_set_msr(UINT32 value)
{
diff --git a/src/emu/cpu/powerpc/ppc403.c b/src/emu/cpu/powerpc/ppc403.c
index 30265909351..7fb08c4cf46 100644
--- a/src/emu/cpu/powerpc/ppc403.c
+++ b/src/emu/cpu/powerpc/ppc403.c
@@ -906,7 +906,7 @@ static void ppc403_dma_exec(int ch)
/*********************************************************************************/
-static UINT8 ppc403_read8(const address_space *space, UINT32 a)
+static UINT8 ppc403_read8(address_space *space, UINT32 a)
{
if(a >= 0x40000000 && a <= 0x4000000f) /* Serial Port */
return ppc403_spu_r(a);
@@ -916,7 +916,7 @@ static UINT8 ppc403_read8(const address_space *space, UINT32 a)
#define ppc403_read16 memory_read_word_32be
#define ppc403_read32 memory_read_dword_32be
-static void ppc403_write8(const address_space *space, UINT32 a, UINT8 d)
+static void ppc403_write8(address_space *space, UINT32 a, UINT8 d)
{
if( a >= 0x40000000 && a <= 0x4000000f ) /* Serial Port */
{
@@ -929,24 +929,24 @@ static void ppc403_write8(const address_space *space, UINT32 a, UINT8 d)
#define ppc403_write16 memory_write_word_32be
#define ppc403_write32 memory_write_dword_32be
-static UINT16 ppc403_read16_unaligned(const address_space *space, UINT32 a)
+static UINT16 ppc403_read16_unaligned(address_space *space, UINT32 a)
{
fatalerror("ppc: Unaligned read16 %08X at %08X", a, ppc.pc);
return 0;
}
-static UINT32 ppc403_read32_unaligned(const address_space *space, UINT32 a)
+static UINT32 ppc403_read32_unaligned(address_space *space, UINT32 a)
{
fatalerror("ppc: Unaligned read32 %08X at %08X", a, ppc.pc);
return 0;
}
-static void ppc403_write16_unaligned(const address_space *space, UINT32 a, UINT16 d)
+static void ppc403_write16_unaligned(address_space *space, UINT32 a, UINT16 d)
{
fatalerror("ppc: Unaligned write16 %08X, %04X at %08X", a, d, ppc.pc);
}
-static void ppc403_write32_unaligned(const address_space *space, UINT32 a, UINT32 d)
+static void ppc403_write32_unaligned(address_space *space, UINT32 a, UINT32 d)
{
fatalerror("ppc: Unaligned write32 %08X, %08X at %08X", a, d, ppc.pc);
}
diff --git a/src/emu/cpu/powerpc/ppc_mem.c b/src/emu/cpu/powerpc/ppc_mem.c
index 2da52291213..94f5bd3d7f3 100644
--- a/src/emu/cpu/powerpc/ppc_mem.c
+++ b/src/emu/cpu/powerpc/ppc_mem.c
@@ -66,29 +66,29 @@ INLINE void WRITE64(UINT32 a, UINT64 d)
/***********************************************************************/
-static UINT16 ppc_read16_unaligned(const address_space *space, UINT32 a)
+static UINT16 ppc_read16_unaligned(address_space *space, UINT32 a)
{
return ((UINT16)ppc.read8(space, a+0) << 8) | ((UINT16)ppc.read8(space, a+1) << 0);
}
-static UINT32 ppc_read32_unaligned(const address_space *space, UINT32 a)
+static UINT32 ppc_read32_unaligned(address_space *space, UINT32 a)
{
return ((UINT32)ppc.read8(space, a+0) << 24) | ((UINT32)ppc.read8(space, a+1) << 16) |
((UINT32)ppc.read8(space, a+2) << 8) | ((UINT32)ppc.read8(space, a+3) << 0);
}
-static UINT64 ppc_read64_unaligned(const address_space *space, UINT32 a)
+static UINT64 ppc_read64_unaligned(address_space *space, UINT32 a)
{
return ((UINT64)READ32(space, a+0) << 32) | (UINT64)(READ32(space, a+4));
}
-static void ppc_write16_unaligned(const address_space *space, UINT32 a, UINT16 d)
+static void ppc_write16_unaligned(address_space *space, UINT32 a, UINT16 d)
{
ppc.write8(space, a+0, (UINT8)(d >> 8));
ppc.write8(space, a+1, (UINT8)(d));
}
-static void ppc_write32_unaligned(const address_space *space, UINT32 a, UINT32 d)
+static void ppc_write32_unaligned(address_space *space, UINT32 a, UINT32 d)
{
ppc.write8(space, a+0, (UINT8)(d >> 24));
ppc.write8(space, a+1, (UINT8)(d >> 16));
@@ -96,7 +96,7 @@ static void ppc_write32_unaligned(const address_space *space, UINT32 a, UINT32 d
ppc.write8(space, a+3, (UINT8)(d >> 0));
}
-static void ppc_write64_unaligned(const address_space *space, UINT32 a, UINT64 d)
+static void ppc_write64_unaligned(address_space *space, UINT32 a, UINT64 d)
{
ppc.write32(space, a+0, (UINT32)(d >> 32));
ppc.write32(space, a+4, (UINT32)(d));
@@ -306,56 +306,56 @@ static int ppc_translate_address_cb(int space, offs_t *addr)
return success;
}
-static UINT8 ppc_read8_translated(const address_space *space, offs_t address)
+static UINT8 ppc_read8_translated(address_space *space, offs_t address)
{
ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_READ);
return memory_read_byte_64be(space, address);
}
-static UINT16 ppc_read16_translated(const address_space *space, offs_t address)
+static UINT16 ppc_read16_translated(address_space *space, offs_t address)
{
ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_READ);
return memory_read_word_64be(space, address);
}
-static UINT32 ppc_read32_translated(const address_space *space, offs_t address)
+static UINT32 ppc_read32_translated(address_space *space, offs_t address)
{
ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_READ);
return memory_read_dword_64be(space, address);
}
-static UINT64 ppc_read64_translated(const address_space *space, offs_t address)
+static UINT64 ppc_read64_translated(address_space *space, offs_t address)
{
ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_READ);
return memory_read_qword_64be(space, address);
}
-static void ppc_write8_translated(const address_space *space, offs_t address, UINT8 data)
+static void ppc_write8_translated(address_space *space, offs_t address, UINT8 data)
{
ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_WRITE);
memory_write_byte_64be(space, address, data);
}
-static void ppc_write16_translated(const address_space *space, offs_t address, UINT16 data)
+static void ppc_write16_translated(address_space *space, offs_t address, UINT16 data)
{
ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_WRITE);
memory_write_word_64be(space, address, data);
}
-static void ppc_write32_translated(const address_space *space, offs_t address, UINT32 data)
+static void ppc_write32_translated(address_space *space, offs_t address, UINT32 data)
{
ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_WRITE);
memory_write_dword_64be(space, address, data);
}
-static void ppc_write64_translated(const address_space *space, offs_t address, UINT64 data)
+static void ppc_write64_translated(address_space *space, offs_t address, UINT64 data)
{
ppc_translate_address(&address, PPC_TRANSLATE_DATA | PPC_TRANSLATE_WRITE);
memory_write_qword_64be(space, address, data);
}
#ifndef PPC_DRC
-static UINT32 ppc_readop_translated(const address_space *space, offs_t address)
+static UINT32 ppc_readop_translated(address_space *space, offs_t address)
{
ppc_translate_address(&address, PPC_TRANSLATE_CODE | PPC_TRANSLATE_READ);
return memory_read_dword_64be(space, address);
diff --git a/src/emu/cpu/powerpc/ppccom.h b/src/emu/cpu/powerpc/ppccom.h
index 072cc638db8..cb0f2f9d6b2 100644
--- a/src/emu/cpu/powerpc/ppccom.h
+++ b/src/emu/cpu/powerpc/ppccom.h
@@ -552,7 +552,7 @@ struct _powerpc_state
/* internal stuff */
device_irq_callback irq_callback;
legacy_cpu_device * device;
- const address_space *program;
+ address_space *program;
offs_t codexor;
UINT32 irq_pending;
UINT32 system_clock;
diff --git a/src/emu/cpu/rsp/rsp.h b/src/emu/cpu/rsp/rsp.h
index 404b3919123..e98258c4c1f 100644
--- a/src/emu/cpu/rsp/rsp.h
+++ b/src/emu/cpu/rsp/rsp.h
@@ -210,7 +210,7 @@ struct _rsp_state
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
rspimp_state* impstate;
diff --git a/src/emu/cpu/s2650/s2650.c b/src/emu/cpu/s2650/s2650.c
index f5a119b4b66..cbb811b8d88 100644
--- a/src/emu/cpu/s2650/s2650.c
+++ b/src/emu/cpu/s2650/s2650.c
@@ -43,8 +43,8 @@ struct _s2650_regs {
int icount;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
};
INLINE s2650_regs *get_safe_token(running_device *device)
diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c
index 8d442e018ae..594d6c1b8ef 100644
--- a/src/emu/cpu/saturn/saturn.c
+++ b/src/emu/cpu/saturn/saturn.c
@@ -83,7 +83,7 @@ struct _saturn_state
int monitor_in;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
};
diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c
index 40aad0faffe..c753d601ef5 100644
--- a/src/emu/cpu/sc61860/sc61860.c
+++ b/src/emu/cpu/sc61860/sc61860.c
@@ -56,7 +56,7 @@ struct _sc61860_state
struct { int t2ms, t512ms; int count;} timer;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
};
diff --git a/src/emu/cpu/scmp/scmp.c b/src/emu/cpu/scmp/scmp.c
index bfbd9d3c55f..73dd02b46a7 100644
--- a/src/emu/cpu/scmp/scmp.c
+++ b/src/emu/cpu/scmp/scmp.c
@@ -33,8 +33,8 @@ struct _scmp_state
UINT8 SR;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
devcb_resolved_write8 flag_out_func;
diff --git a/src/emu/cpu/se3208/se3208.c b/src/emu/cpu/se3208/se3208.c
index 07b5659d3b8..f1d0418e258 100644
--- a/src/emu/cpu/se3208/se3208.c
+++ b/src/emu/cpu/se3208/se3208.c
@@ -24,7 +24,7 @@ struct _se3208_state_t
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
UINT8 IRQ;
UINT8 NMI;
@@ -65,7 +65,7 @@ INLINE se3208_state_t *get_safe_token(running_device *device)
return (se3208_state_t *)downcast<legacy_cpu_device *>(device)->token();
}
-INLINE UINT32 read_dword_unaligned(const address_space *space, UINT32 address)
+INLINE UINT32 read_dword_unaligned(address_space *space, UINT32 address)
{
if (address & 3)
return memory_read_byte_32le(space,address) | memory_read_byte_32le(space,address+1)<<8 | memory_read_byte_32le(space,address+2)<<16 | memory_read_byte_32le(space,address+3)<<24;
@@ -73,7 +73,7 @@ INLINE UINT32 read_dword_unaligned(const address_space *space, UINT32 address)
return memory_read_dword_32le(space,address);
}
-INLINE UINT16 read_word_unaligned(const address_space *space, UINT32 address)
+INLINE UINT16 read_word_unaligned(address_space *space, UINT32 address)
{
if (address & 1)
return memory_read_byte_32le(space,address) | memory_read_byte_32le(space,address+1)<<8;
@@ -81,7 +81,7 @@ INLINE UINT16 read_word_unaligned(const address_space *space, UINT32 address)
return memory_read_word_32le(space,address);
}
-INLINE void write_dword_unaligned(const address_space *space, UINT32 address, UINT32 data)
+INLINE void write_dword_unaligned(address_space *space, UINT32 address, UINT32 data)
{
if (address & 3)
{
@@ -96,7 +96,7 @@ INLINE void write_dword_unaligned(const address_space *space, UINT32 address, UI
}
}
-INLINE void write_word_unaligned(const address_space *space, UINT32 address, UINT16 data)
+INLINE void write_word_unaligned(address_space *space, UINT32 address, UINT16 data)
{
if (address & 1)
{
diff --git a/src/emu/cpu/sh2/sh2comn.h b/src/emu/cpu/sh2/sh2comn.h
index b716f67c185..654a3993a0d 100644
--- a/src/emu/cpu/sh2/sh2comn.h
+++ b/src/emu/cpu/sh2/sh2comn.h
@@ -116,8 +116,8 @@ typedef struct
INT8 irq_line_state[17];
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *internal;
+ address_space *program;
+ address_space *internal;
UINT32 *m;
INT8 nmi_line_state;
diff --git a/src/emu/cpu/sh4/sh4comn.h b/src/emu/cpu/sh4/sh4comn.h
index b25f7aaeaf3..fcf375a24f8 100644
--- a/src/emu/cpu/sh4/sh4comn.h
+++ b/src/emu/cpu/sh4/sh4comn.h
@@ -63,9 +63,9 @@ typedef struct
INT8 irq_line_state[17];
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *internal;
- const address_space *program;
- const address_space *io;
+ address_space *internal;
+ address_space *program;
+ address_space *io;
UINT32 *m;
INT8 nmi_line_state;
diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c
index cdab5130735..1255795b255 100644
--- a/src/emu/cpu/sharc/sharc.c
+++ b/src/emu/cpu/sharc/sharc.c
@@ -126,8 +126,8 @@ struct _SHARC_REGS
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *data;
+ address_space *program;
+ address_space *data;
void (*opcode_handler)(SHARC_REGS *cpustate);
int icount;
UINT64 opcode;
diff --git a/src/emu/cpu/sm8500/sm8500.c b/src/emu/cpu/sm8500/sm8500.c
index cf2e33d9109..e548591b584 100644
--- a/src/emu/cpu/sm8500/sm8500.c
+++ b/src/emu/cpu/sm8500/sm8500.c
@@ -52,7 +52,7 @@ struct _sm8500_state
int icount;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
UINT8 internal_ram[0x500];
};
diff --git a/src/emu/cpu/spc700/spc700.c b/src/emu/cpu/spc700/spc700.c
index 3ede181ec6e..57056ca2679 100644
--- a/src/emu/cpu/spc700/spc700.c
+++ b/src/emu/cpu/spc700/spc700.c
@@ -88,7 +88,7 @@ typedef struct
uint ir; /* Instruction Register */
device_irq_callback int_ack;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
uint stopped; /* stopped status */
int ICount;
uint source;
diff --git a/src/emu/cpu/ssem/ssem.c b/src/emu/cpu/ssem/ssem.c
index a83e8e71cfb..13cdd4f9420 100644
--- a/src/emu/cpu/ssem/ssem.c
+++ b/src/emu/cpu/ssem/ssem.c
@@ -22,7 +22,7 @@ struct _ssem_state
UINT32 halt;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
};
diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/emu/cpu/ssp1601/ssp1601.c
index 46cb2b9c3cb..c9b48337b89 100644
--- a/src/emu/cpu/ssp1601/ssp1601.c
+++ b/src/emu/cpu/ssp1601/ssp1601.c
@@ -53,8 +53,8 @@ struct _ssp1601_state_t
int g_cycles;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
};
INLINE ssp1601_state_t *get_safe_token(running_device *device)
diff --git a/src/emu/cpu/superfx/superfx.c b/src/emu/cpu/superfx/superfx.c
index e647f873056..be955de4c04 100644
--- a/src/emu/cpu/superfx/superfx.c
+++ b/src/emu/cpu/superfx/superfx.c
@@ -62,7 +62,7 @@ struct _superfx_state
pixelcache_t pixelcache[2];
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
};
diff --git a/src/emu/cpu/t11/t11.c b/src/emu/cpu/t11/t11.c
index 7627a6350dc..6609df4c70c 100644
--- a/src/emu/cpu/t11/t11.c
+++ b/src/emu/cpu/t11/t11.c
@@ -34,7 +34,7 @@ struct _t11_state
int icount;
device_irq_callback irq_callback;
legacy_cpu_device * device;
- const address_space *program;
+ address_space *program;
};
diff --git a/src/emu/cpu/tlcs90/tlcs90.c b/src/emu/cpu/tlcs90/tlcs90.c
index 90546814cfa..4fd481a8b63 100644
--- a/src/emu/cpu/tlcs90/tlcs90.c
+++ b/src/emu/cpu/tlcs90/tlcs90.c
@@ -32,8 +32,8 @@ typedef struct
UINT16 irq_state, irq_mask;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
int extra_cycles; // extra cycles for interrupts
UINT8 internal_registers[48];
diff --git a/src/emu/cpu/tlcs900/tlcs900.c b/src/emu/cpu/tlcs900/tlcs900.c
index 50464b03037..3aae6e2142e 100644
--- a/src/emu/cpu/tlcs900/tlcs900.c
+++ b/src/emu/cpu/tlcs900/tlcs900.c
@@ -73,7 +73,7 @@ struct _tlcs900_state
int regbank;
device_irq_callback irqcallback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
};
diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c
index ee519c105aa..e198ed3d607 100644
--- a/src/emu/cpu/tms0980/tms0980.c
+++ b/src/emu/cpu/tms0980/tms0980.c
@@ -268,8 +268,8 @@ struct _tms0980_state
UINT8 byte_size; /* 8 or 9 bit bytes */
const UINT32 *decode_table;
const tms0980_config *config;
- const address_space *program;
- const address_space *data;
+ address_space *program;
+ address_space *data;
};
diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/emu/cpu/tms32010/tms32010.c
index 7550187f817..8de6af06011 100644
--- a/src/emu/cpu/tms32010/tms32010.c
+++ b/src/emu/cpu/tms32010/tms32010.c
@@ -98,9 +98,9 @@ struct _tms32010_state
int addr_mask;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
};
INLINE tms32010_state *get_safe_token(running_device *device)
diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/emu/cpu/tms32025/tms32025.c
index daccc1b0167..1fdca95e213 100644
--- a/src/emu/cpu/tms32025/tms32025.c
+++ b/src/emu/cpu/tms32025/tms32025.c
@@ -174,9 +174,9 @@ struct _tms32025_state
int waiting_for_serial_frame;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
UINT16 *pgmmap[0x200];
UINT16 *datamap[0x200];
diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c
index 07b86529615..0a142775ca2 100644
--- a/src/emu/cpu/tms32031/tms32031.c
+++ b/src/emu/cpu/tms32031/tms32031.c
@@ -120,7 +120,7 @@ struct _tms32031_state
tms32031_iack_func iack_w;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
};
INLINE tms32031_state *get_safe_token(running_device *device)
diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c
index 8c36bffba2c..2a47b6f8171 100644
--- a/src/emu/cpu/tms32051/tms32051.c
+++ b/src/emu/cpu/tms32051/tms32051.c
@@ -144,8 +144,8 @@ struct _tms32051_state
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *data;
+ address_space *program;
+ address_space *data;
int icount;
};
diff --git a/src/emu/cpu/tms34010/34010gfx.c b/src/emu/cpu/tms34010/34010gfx.c
index cfb74e9b666..f3196a9e463 100644
--- a/src/emu/cpu/tms34010/34010gfx.c
+++ b/src/emu/cpu/tms34010/34010gfx.c
@@ -201,7 +201,7 @@ static int compute_pixblt_b_cycles(int left_partials, int right_partials, int fu
/* Shift register handling */
-static void shiftreg_w(const address_space *space, offs_t offset,UINT16 data)
+static void shiftreg_w(address_space *space, offs_t offset,UINT16 data)
{
tms34010_state *tms = get_safe_token(space->cpu);
if (tms->config->from_shiftreg)
@@ -210,7 +210,7 @@ static void shiftreg_w(const address_space *space, offs_t offset,UINT16 data)
logerror("From ShiftReg function not set. PC = %08X\n", tms->pc);
}
-static UINT16 shiftreg_r(const address_space *space, offs_t offset)
+static UINT16 shiftreg_r(address_space *space, offs_t offset)
{
tms34010_state *tms = get_safe_token(space->cpu);
if (tms->config->to_shiftreg)
@@ -220,7 +220,7 @@ static UINT16 shiftreg_r(const address_space *space, offs_t offset)
return tms->shiftreg[0];
}
-static UINT16 dummy_shiftreg_r(const address_space *space, offs_t offset)
+static UINT16 dummy_shiftreg_r(address_space *space, offs_t offset)
{
tms34010_state *tms = get_safe_token(space->cpu);
return tms->shiftreg[0];
@@ -1028,8 +1028,8 @@ static void FUNCTION_NAME(pixblt)(tms34010_state *tms, int src_is_linear, int ds
if (!P_FLAG(tms))
{
int dx, dy, x, y, /*words,*/ yreverse;
- void (*word_write)(const address_space *space,offs_t address,UINT16 data);
- UINT16 (*word_read)(const address_space *space,offs_t address);
+ void (*word_write)(address_space *space,offs_t address,UINT16 data);
+ UINT16 (*word_read)(address_space *space,offs_t address);
UINT32 readwrites = 0;
UINT32 saddr, daddr;
XY dstxy = { 0 };
@@ -1375,8 +1375,8 @@ static void FUNCTION_NAME(pixblt_r)(tms34010_state *tms, int src_is_linear, int
if (!P_FLAG(tms))
{
int dx, dy, x, y, words, yreverse;
- void (*word_write)(const address_space *space,offs_t address,UINT16 data);
- UINT16 (*word_read)(const address_space *space,offs_t address);
+ void (*word_write)(address_space *space,offs_t address,UINT16 data);
+ UINT16 (*word_read)(address_space *space,offs_t address);
UINT32 saddr, daddr;
XY dstxy = { 0 };
@@ -1640,8 +1640,8 @@ static void FUNCTION_NAME(pixblt_b)(tms34010_state *tms, int dst_is_linear)
if (!P_FLAG(tms))
{
int dx, dy, x, y, words, left_partials, right_partials, full_words;
- void (*word_write)(const address_space *space,offs_t address,UINT16 data);
- UINT16 (*word_read)(const address_space *space,offs_t address);
+ void (*word_write)(address_space *space,offs_t address,UINT16 data);
+ UINT16 (*word_read)(address_space *space,offs_t address);
UINT32 saddr, daddr;
XY dstxy = { 0 };
@@ -1854,8 +1854,8 @@ static void FUNCTION_NAME(fill)(tms34010_state *tms, int dst_is_linear)
if (!P_FLAG(tms))
{
int dx, dy, x, y, words, left_partials, right_partials, full_words;
- void (*word_write)(const address_space *space,offs_t address,UINT16 data);
- UINT16 (*word_read)(const address_space *space,offs_t address);
+ void (*word_write)(address_space *space,offs_t address,UINT16 data);
+ UINT16 (*word_read)(address_space *space,offs_t address);
UINT32 daddr;
XY dstxy = { 0 };
diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c
index 42320be3c89..2fb1f202e23 100644
--- a/src/emu/cpu/tms34010/tms34010.c
+++ b/src/emu/cpu/tms34010/tms34010.c
@@ -63,7 +63,7 @@ struct _tms34010_state
UINT8 executing;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
const tms34010_config *config;
screen_device *screen;
emu_timer * scantimer;
@@ -1556,7 +1556,7 @@ static STATE_POSTLOAD( tms34010_state_postload )
void tms34010_host_w(running_device *cpu, int reg, int data)
{
- const address_space *space;
+ address_space *space;
tms34010_state *tms = get_safe_token(cpu);
unsigned int addr;
diff --git a/src/emu/cpu/tms34010/tms34010.h b/src/emu/cpu/tms34010/tms34010.h
index b63bf7715a4..22a975778a2 100644
--- a/src/emu/cpu/tms34010/tms34010.h
+++ b/src/emu/cpu/tms34010/tms34010.h
@@ -198,8 +198,8 @@ struct _tms34010_config
int pixperclock; /* pixels per clock */
void (*scanline_callback)(screen_device &screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params);
void (*output_int)(running_device *device, int state); /* output interrupt callback */
- void (*to_shiftreg)(const address_space *space, offs_t, UINT16 *); /* shift register write */
- void (*from_shiftreg)(const address_space *space, offs_t, UINT16 *); /* shift register read */
+ void (*to_shiftreg)(address_space *space, offs_t, UINT16 *); /* shift register write */
+ void (*from_shiftreg)(address_space *space, offs_t, UINT16 *); /* shift register read */
};
diff --git a/src/emu/cpu/tms57002/tms57002.c b/src/emu/cpu/tms57002/tms57002.c
index 6520828199f..ae1c1a5457e 100644
--- a/src/emu/cpu/tms57002/tms57002.c
+++ b/src/emu/cpu/tms57002/tms57002.c
@@ -104,7 +104,7 @@ typedef struct {
cd cache;
- const address_space *program, *data;
+ address_space *program, *data;
int icount;
int unsupported_inst_warning;
} tms57002_t;
diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c
index 372d4c15bef..c7c3c40d125 100644
--- a/src/emu/cpu/tms7000/tms7000.c
+++ b/src/emu/cpu/tms7000/tms7000.c
@@ -74,8 +74,8 @@ struct _tms7000_state
UINT8 pf[0x100]; /* Perpherial file */
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
int div_by_16_trigger;
int cycles_per_INT2;
diff --git a/src/emu/cpu/tms9900/99xxcore.h b/src/emu/cpu/tms9900/99xxcore.h
index 10ece6b3d0e..9f4684da138 100644
--- a/src/emu/cpu/tms9900/99xxcore.h
+++ b/src/emu/cpu/tms9900/99xxcore.h
@@ -437,8 +437,8 @@ struct _tms99xx_state
retreive the value on IC0-IC3 (non-standard behaviour) */
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
UINT8 IDLE; /* nonzero if processor is IDLE - i.e waiting for interrupt while writing
diff --git a/src/emu/cpu/unsp/unsp.h b/src/emu/cpu/unsp/unsp.h
index 14a394469da..cc2eb1df87e 100644
--- a/src/emu/cpu/unsp/unsp.h
+++ b/src/emu/cpu/unsp/unsp.h
@@ -24,7 +24,7 @@ struct _unsp_state
UINT8 saved_sb;
legacy_cpu_device *device;
- const address_space *program;
+ address_space *program;
int icount;
unspimp_state *impstate;
diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c
index 6b1f67e203e..5a21c3e3dc5 100644
--- a/src/emu/cpu/upd7810/upd7810.c
+++ b/src/emu/cpu/upd7810/upd7810.c
@@ -500,8 +500,8 @@ struct _upd7810_state
UPD7810_CONFIG config;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
};
diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c
index f62fe584631..5206efc5bc0 100644
--- a/src/emu/cpu/v30mz/v30mz.c
+++ b/src/emu/cpu/v30mz/v30mz.c
@@ -85,8 +85,8 @@ struct _v30mz_state
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
UINT32 prefix_base; /* base address of the latest prefix segment */
diff --git a/src/emu/cpu/v60/v60.c b/src/emu/cpu/v60/v60.c
index c96e6747777..21c1d741450 100644
--- a/src/emu/cpu/v60/v60.c
+++ b/src/emu/cpu/v60/v60.c
@@ -79,8 +79,8 @@ struct _v60_state
UINT8 nmi_line;
device_irq_callback irq_cb;
legacy_cpu_device * device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
UINT32 PPC;
int icount;
int stall_io;
diff --git a/src/emu/cpu/v60/v60mem.c b/src/emu/cpu/v60/v60mem.c
index fc88294ba3f..ddff7c2be95 100644
--- a/src/emu/cpu/v60/v60mem.c
+++ b/src/emu/cpu/v60/v60mem.c
@@ -3,15 +3,15 @@
/****************************************************************/
struct cpu_info {
- UINT8 (*mr8) (const address_space *space, offs_t address);
- void (*mw8) (const address_space *space, offs_t address, UINT8 data);
- UINT16 (*mr16)(const address_space *space, offs_t address);
- void (*mw16)(const address_space *space, offs_t address, UINT16 data);
- UINT32 (*mr32)(const address_space *space, offs_t address);
- void (*mw32)(const address_space *space, offs_t address, UINT32 data);
- UINT8 (*or8) (const address_space *space, offs_t address);
- UINT16 (*or16)(const address_space *space, offs_t address);
- UINT32 (*or32)(const address_space *space, offs_t address);
+ UINT8 (*mr8) (address_space *space, offs_t address);
+ void (*mw8) (address_space *space, offs_t address, UINT8 data);
+ UINT16 (*mr16)(address_space *space, offs_t address);
+ void (*mw16)(address_space *space, offs_t address, UINT16 data);
+ UINT32 (*mr32)(address_space *space, offs_t address);
+ void (*mw32)(address_space *space, offs_t address, UINT32 data);
+ UINT8 (*or8) (address_space *space, offs_t address);
+ UINT16 (*or16)(address_space *space, offs_t address);
+ UINT32 (*or32)(address_space *space, offs_t address);
UINT32 start_pc;
};
@@ -24,7 +24,7 @@ struct cpu_info {
#define MemRead8_16 memory_read_byte_16le
#define MemWrite8_16 memory_write_byte_16le
-static UINT16 MemRead16_16(const address_space *space, offs_t address)
+static UINT16 MemRead16_16(address_space *space, offs_t address)
{
if (!(address & 1))
return memory_read_word_16le(space, address);
@@ -35,7 +35,7 @@ static UINT16 MemRead16_16(const address_space *space, offs_t address)
}
}
-static void MemWrite16_16(const address_space *space, offs_t address, UINT16 data)
+static void MemWrite16_16(address_space *space, offs_t address, UINT16 data)
{
if (!(address & 1))
memory_write_word_16le(space, address, data);
@@ -46,7 +46,7 @@ static void MemWrite16_16(const address_space *space, offs_t address, UINT16 dat
}
}
-static UINT32 MemRead32_16(const address_space *space, offs_t address)
+static UINT32 MemRead32_16(address_space *space, offs_t address)
{
if (!(address & 1))
{
@@ -61,7 +61,7 @@ static UINT32 MemRead32_16(const address_space *space, offs_t address)
}
}
-static void MemWrite32_16(const address_space *space, offs_t address, UINT32 data)
+static void MemWrite32_16(address_space *space, offs_t address, UINT32 data)
{
if (!(address & 1))
{
@@ -81,17 +81,17 @@ static void MemWrite32_16(const address_space *space, offs_t address, UINT32 dat
/* Opcode accesses for 16-bit data bus, 24-bit address bus (V60) */
/*****************************************************************/
-static UINT8 OpRead8_16(const address_space *space, offs_t address)
+static UINT8 OpRead8_16(address_space *space, offs_t address)
{
return memory_decrypted_read_byte(space, BYTE_XOR_LE(address));
}
-static UINT16 OpRead16_16(const address_space *space, offs_t address)
+static UINT16 OpRead16_16(address_space *space, offs_t address)
{
return memory_decrypted_read_byte(space, BYTE_XOR_LE(address)) | (memory_decrypted_read_byte(space, BYTE_XOR_LE(address + 1)) << 8);
}
-static UINT32 OpRead32_16(const address_space *space, offs_t address)
+static UINT32 OpRead32_16(address_space *space, offs_t address)
{
return memory_decrypted_read_byte(space, BYTE_XOR_LE(address)) | (memory_decrypted_read_byte(space, BYTE_XOR_LE(address + 1)) << 8) |
(memory_decrypted_read_byte(space, BYTE_XOR_LE(address + 2)) << 16) | (memory_decrypted_read_byte(space, BYTE_XOR_LE(address + 3)) << 24);
@@ -106,7 +106,7 @@ static UINT32 OpRead32_16(const address_space *space, offs_t address)
#define MemRead8_32 memory_read_byte_32le
#define MemWrite8_32 memory_write_byte_32le
-static UINT16 MemRead16_32(const address_space *space, offs_t address)
+static UINT16 MemRead16_32(address_space *space, offs_t address)
{
if (!(address & 1))
return memory_read_word_32le(space, address);
@@ -117,7 +117,7 @@ static UINT16 MemRead16_32(const address_space *space, offs_t address)
}
}
-static void MemWrite16_32(const address_space *space, offs_t address, UINT16 data)
+static void MemWrite16_32(address_space *space, offs_t address, UINT16 data)
{
if (!(address & 1))
memory_write_word_32le(space, address, data);
@@ -128,7 +128,7 @@ static void MemWrite16_32(const address_space *space, offs_t address, UINT16 dat
}
}
-static UINT32 MemRead32_32(const address_space *space, offs_t address)
+static UINT32 MemRead32_32(address_space *space, offs_t address)
{
if (!(address & 3))
return memory_read_dword_32le(space, address);
@@ -145,7 +145,7 @@ static UINT32 MemRead32_32(const address_space *space, offs_t address)
}
}
-static void MemWrite32_32(const address_space *space, offs_t address, UINT32 data)
+static void MemWrite32_32(address_space *space, offs_t address, UINT32 data)
{
if (!(address & 3))
memory_write_dword_32le(space, address, data);
@@ -168,17 +168,17 @@ static void MemWrite32_32(const address_space *space, offs_t address, UINT32 dat
/* Opcode accesses for 32-bit data bus, 32-bit address bus (V60) */
/*****************************************************************/
-static UINT8 OpRead8_32(const address_space *space, offs_t address)
+static UINT8 OpRead8_32(address_space *space, offs_t address)
{
return memory_decrypted_read_byte(space, BYTE4_XOR_LE(address));
}
-static UINT16 OpRead16_32(const address_space *space, offs_t address)
+static UINT16 OpRead16_32(address_space *space, offs_t address)
{
return memory_decrypted_read_byte(space, BYTE4_XOR_LE(address)) | (memory_decrypted_read_byte(space, BYTE4_XOR_LE(address + 1)) << 8);
}
-static UINT32 OpRead32_32(const address_space *space, offs_t address)
+static UINT32 OpRead32_32(address_space *space, offs_t address)
{
return memory_decrypted_read_byte(space, BYTE4_XOR_LE(address)) | (memory_decrypted_read_byte(space, BYTE4_XOR_LE(address + 1)) << 8) |
(memory_decrypted_read_byte(space, BYTE4_XOR_LE(address + 2)) << 16) | (memory_decrypted_read_byte(space, BYTE4_XOR_LE(address + 3)) << 24);
diff --git a/src/emu/cpu/v810/v810.c b/src/emu/cpu/v810/v810.c
index 431cdde424c..1658ecb9bed 100644
--- a/src/emu/cpu/v810/v810.c
+++ b/src/emu/cpu/v810/v810.c
@@ -31,8 +31,8 @@ struct _v810_state
UINT8 nmi_line;
device_irq_callback irq_cb;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
UINT32 PPC;
int icount;
};
diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c
index f44b27e41f6..14bf9ec1f86 100644
--- a/src/emu/cpu/z180/z180.c
+++ b/src/emu/cpu/z180/z180.c
@@ -140,8 +140,8 @@ struct _z180_state
z80_daisy_chain daisy;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *iospace;
+ address_space *program;
+ address_space *iospace;
UINT8 rtemp;
UINT32 ioltemp;
int icount;
diff --git a/src/emu/cpu/z8/z8.c b/src/emu/cpu/z8/z8.c
index 25ce548e346..835d5d55269 100644
--- a/src/emu/cpu/z8/z8.c
+++ b/src/emu/cpu/z8/z8.c
@@ -159,9 +159,9 @@ enum
typedef struct _z8_state z8_state;
struct _z8_state
{
- const address_space *program;
- const address_space *data;
- const address_space *io;
+ address_space *program;
+ address_space *data;
+ address_space *io;
/* registers */
UINT16 pc; /* program counter */
diff --git a/src/emu/cpu/z8/z8ops.c b/src/emu/cpu/z8/z8ops.c
index 6b656cdb9a8..62e82c81da8 100644
--- a/src/emu/cpu/z8/z8ops.c
+++ b/src/emu/cpu/z8/z8ops.c
@@ -140,7 +140,7 @@ INSTRUCTION( ld_IR2_R1 ) { mode_IR2_R1(load) }
INSTRUCTION( ld_R1_IM ) { mode_R1_IM(load) }
INSTRUCTION( ld_IR1_IM ) { mode_IR1_IM(load) }
-static void load_from_memory(z8_state *cpustate, const address_space *space)
+static void load_from_memory(z8_state *cpustate, address_space *space)
{
UINT8 operands = fetch(cpustate);
UINT8 dst = get_working_register(cpustate, operands >> 4);
@@ -152,7 +152,7 @@ static void load_from_memory(z8_state *cpustate, const address_space *space)
register_write(cpustate, dst, data);
}
-static void load_to_memory(z8_state *cpustate, const address_space *space)
+static void load_to_memory(z8_state *cpustate, address_space *space)
{
UINT8 operands = fetch(cpustate);
UINT8 src = get_working_register(cpustate, operands >> 4);
@@ -164,7 +164,7 @@ static void load_to_memory(z8_state *cpustate, const address_space *space)
memory_write_byte(cpustate->program, address, data);
}
-static void load_from_memory_autoinc(z8_state *cpustate, const address_space *space)
+static void load_from_memory_autoinc(z8_state *cpustate, address_space *space)
{
UINT8 operands = fetch(cpustate);
UINT8 dst = get_working_register(cpustate, operands >> 4);
@@ -180,7 +180,7 @@ static void load_from_memory_autoinc(z8_state *cpustate, const address_space *sp
register_pair_write(cpustate, src, address + 1);
}
-static void load_to_memory_autoinc(z8_state *cpustate, const address_space *space)
+static void load_to_memory_autoinc(z8_state *cpustate, address_space *space)
{
UINT8 operands = fetch(cpustate);
UINT8 src = get_working_register(cpustate, operands >> 4);
diff --git a/src/emu/cpu/z80/z80.c b/src/emu/cpu/z80/z80.c
index 6932ec59959..c4c79a91626 100644
--- a/src/emu/cpu/z80/z80.c
+++ b/src/emu/cpu/z80/z80.c
@@ -150,8 +150,8 @@ struct _z80_state
UINT32 ea;
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
z80_daisy_chain daisy;
UINT8 rtemp;
diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c
index 17869269b5f..9ccb6e4cd6f 100644
--- a/src/emu/cpu/z8000/z8000.c
+++ b/src/emu/cpu/z8000/z8000.c
@@ -83,8 +83,8 @@ struct _z8000_state
int irq_state[2]; /* IRQ line states (NVI, VI) */
device_irq_callback irq_callback;
legacy_cpu_device *device;
- const address_space *program;
- const address_space *io;
+ address_space *program;
+ address_space *io;
int icount;
};
diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c
index c639226240d..03b7b038bb3 100644
--- a/src/emu/debug/debugcmd.c
+++ b/src/emu/debug/debugcmd.c
@@ -161,7 +161,7 @@ static void execute_hardreset(running_machine *machine, int ref, int params, con
given address is valid for cheating
-------------------------------------------------*/
-INLINE int cheat_address_is_valid(const address_space *space, offs_t address)
+INLINE int cheat_address_is_valid(address_space *space, offs_t address)
{
return debug_cpu_translate(space, TRANSLATE_READ, &address) && (memory_get_write_ptr(space, address) != NULL);
}
@@ -210,7 +210,7 @@ INLINE UINT64 cheat_byte_swap(const cheat_system *cheatsys, UINT64 value)
and swapping if necessary
-------------------------------------------------*/
-INLINE UINT64 cheat_read_extended(const cheat_system *cheatsys, const address_space *space, offs_t address)
+INLINE UINT64 cheat_read_extended(const cheat_system *cheatsys, address_space *space, offs_t address)
{
return cheat_sign_extend(cheatsys, cheat_byte_swap(cheatsys, debug_read_memory(space, address, cheatsys->width, TRUE)));
}
@@ -554,7 +554,7 @@ int debug_command_parameter_cpu(running_machine *machine, const char *param, dev
address space
-------------------------------------------------*/
-int debug_command_parameter_cpu_space(running_machine *machine, const char *param, int spacenum, const address_space **result)
+int debug_command_parameter_cpu_space(running_machine *machine, const char *param, int spacenum, address_space **result)
{
device_t *cpu;
@@ -1305,7 +1305,7 @@ static void execute_bplist(running_machine *machine, int ref, int params, const
static void execute_wpset(running_machine *machine, int ref, int params, const char *param[])
{
parsed_expression *condition = NULL;
- const address_space *space;
+ address_space *space;
const char *action = NULL;
UINT64 address, length;
int type = 0;
@@ -1511,7 +1511,7 @@ static void execute_hotspot(running_machine *machine, int ref, int params, const
static void execute_save(running_machine *machine, int ref, int params, const char *param[])
{
UINT64 offset, endoffset, length;
- const address_space *space;
+ address_space *space;
FILE *f;
UINT64 i;
@@ -1555,7 +1555,7 @@ static void execute_save(running_machine *machine, int ref, int params, const ch
static void execute_dump(running_machine *machine, int ref, int params, const char *param[])
{
UINT64 offset, endoffset, length, width = 0, ascii = 1;
- const address_space *space;
+ address_space *space;
FILE *f = NULL;
UINT64 i, j;
@@ -1653,7 +1653,7 @@ static void execute_dump(running_machine *machine, int ref, int params, const ch
static void execute_cheatinit(running_machine *machine, int ref, int params, const char *param[])
{
UINT64 offset, length = 0, real_length = 0;
- const address_space *space;
+ address_space *space;
UINT32 active_cheat = 0;
UINT64 curaddr;
UINT8 i, region_count = 0;
@@ -1815,7 +1815,7 @@ static void execute_cheatinit(running_machine *machine, int ref, int params, con
static void execute_cheatnext(running_machine *machine, int ref, int params, const char *param[])
{
- const address_space *space;
+ address_space *space;
UINT64 cheatindex;
UINT32 active_cheat = 0;
UINT8 condition;
@@ -1984,7 +1984,7 @@ static void execute_cheatnext(running_machine *machine, int ref, int params, con
static void execute_cheatlist(running_machine *machine, int ref, int params, const char *param[])
{
char spaceletter, sizeletter;
- const address_space *space;
+ address_space *space;
device_t *cpu;
UINT32 active_cheat = 0;
UINT64 cheatindex;
@@ -2079,7 +2079,7 @@ static void execute_cheatundo(running_machine *machine, int ref, int params, con
static void execute_find(running_machine *machine, int ref, int params, const char *param[])
{
UINT64 offset, endoffset, length;
- const address_space *space;
+ address_space *space;
UINT64 data_to_find[256];
UINT8 data_size[256];
int cur_data_size;
@@ -2179,7 +2179,7 @@ static void execute_dasm(running_machine *machine, int ref, int params, const ch
{
UINT64 offset, length, bytes = 1;
int minbytes, maxbytes, byteswidth;
- const address_space *space;
+ address_space *space;
FILE *f = NULL;
int i, j;
@@ -2373,7 +2373,7 @@ static void execute_traceflush(running_machine *machine, int ref, int params, co
static void execute_history(running_machine *machine, int ref, int params, const char *param[])
{
/* validate parameters */
- const address_space *space;
+ address_space *space;
if (!debug_command_parameter_cpu_space(machine, (params > 0) ? param[0] : NULL, ADDRESS_SPACE_PROGRAM, &space))
return;
@@ -2473,7 +2473,7 @@ static void execute_source(running_machine *machine, int ref, int params, const
static void execute_map(running_machine *machine, int ref, int params, const char *param[])
{
- const address_space *space;
+ address_space *space;
offs_t taddress;
UINT64 address;
int intention;
diff --git a/src/emu/debug/debugcmd.h b/src/emu/debug/debugcmd.h
index 6a68dfd96b6..7e43b784786 100644
--- a/src/emu/debug/debugcmd.h
+++ b/src/emu/debug/debugcmd.h
@@ -33,6 +33,6 @@ int debug_command_parameter_number(running_machine *machine, const char *param,
int debug_command_parameter_cpu(running_machine *machine, const char *param, device_t **result);
/* validates a parameter as a cpu and retrieves the given address space */
-int debug_command_parameter_cpu_space(running_machine *machine, const char *param, int spacenum, const address_space **result);
+int debug_command_parameter_cpu_space(running_machine *machine, const char *param, int spacenum, address_space **result);
#endif
diff --git a/src/emu/debug/debugcmt.c b/src/emu/debug/debugcmt.c
index b2e2edb3b17..3b9c1a3ef46 100644
--- a/src/emu/debug/debugcmt.c
+++ b/src/emu/debug/debugcmt.c
@@ -281,7 +281,7 @@ UINT32 debug_comment_all_change_count(running_machine *machine)
UINT32 debug_comment_get_opcode_crc32(device_t *device, offs_t address)
{
- const address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM);
int i;
UINT32 crc;
UINT8 opbuf[64], argbuf[64];
diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index 31c0d3a9195..c70ce62337b 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -112,10 +112,10 @@ static void process_source_file(running_machine *machine);
/* expression handlers */
static UINT64 expression_read_memory(void *param, const char *name, int space, UINT32 address, int size);
-static UINT64 expression_read_program_direct(const address_space *space, int opcode, offs_t address, int size);
+static UINT64 expression_read_program_direct(address_space *space, int opcode, offs_t address, int size);
static UINT64 expression_read_memory_region(running_machine *machine, const char *rgntag, offs_t address, int size);
static void expression_write_memory(void *param, const char *name, int space, UINT32 address, int size, UINT64 data);
-static void expression_write_program_direct(const address_space *space, int opcode, offs_t address, int size, UINT64 data);
+static void expression_write_program_direct(address_space *space, int opcode, offs_t address, int size, UINT64 data);
static void expression_write_memory_region(running_machine *machine, const char *rgntag, offs_t address, int size, UINT64 data);
static EXPRERR expression_validate(void *param, const char *name, int space);
@@ -323,7 +323,7 @@ void debug_cpu_source_script(running_machine *machine, const char *file)
address
-------------------------------------------------*/
-int debug_cpu_translate(const address_space *space, int intention, offs_t *address)
+int debug_cpu_translate(address_space *space, int intention, offs_t *address)
{
device_memory_interface *memory;
if (space->cpu->interface(memory))
@@ -341,7 +341,7 @@ int debug_cpu_translate(const address_space *space, int intention, offs_t *addre
the specified memory space
-------------------------------------------------*/
-UINT8 debug_read_byte(const address_space *_space, offs_t address, int apply_translation)
+UINT8 debug_read_byte(address_space *_space, offs_t address, int apply_translation)
{
address_space *space = const_cast<address_space *>(_space);
debugcpu_private *global = space->machine->debugcpu_data;
@@ -377,7 +377,7 @@ UINT8 debug_read_byte(const address_space *_space, offs_t address, int apply_tra
specified memory space
-------------------------------------------------*/
-UINT16 debug_read_word(const address_space *_space, offs_t address, int apply_translation)
+UINT16 debug_read_word(address_space *_space, offs_t address, int apply_translation)
{
address_space *space = const_cast<address_space *>(_space);
debugcpu_private *global = space->machine->debugcpu_data;
@@ -432,7 +432,7 @@ UINT16 debug_read_word(const address_space *_space, offs_t address, int apply_tr
specified memory space
-------------------------------------------------*/
-UINT32 debug_read_dword(const address_space *_space, offs_t address, int apply_translation)
+UINT32 debug_read_dword(address_space *_space, offs_t address, int apply_translation)
{
address_space *space = const_cast<address_space *>(_space);
debugcpu_private *global = space->machine->debugcpu_data;
@@ -487,7 +487,7 @@ UINT32 debug_read_dword(const address_space *_space, offs_t address, int apply_t
specified memory space
-------------------------------------------------*/
-UINT64 debug_read_qword(const address_space *_space, offs_t address, int apply_translation)
+UINT64 debug_read_qword(address_space *_space, offs_t address, int apply_translation)
{
address_space *space = const_cast<address_space *>(_space);
debugcpu_private *global = space->machine->debugcpu_data;
@@ -542,7 +542,7 @@ UINT64 debug_read_qword(const address_space *_space, offs_t address, int apply_t
from the specified memory space
-------------------------------------------------*/
-UINT64 debug_read_memory(const address_space *space, offs_t address, int size, int apply_translation)
+UINT64 debug_read_memory(address_space *space, offs_t address, int size, int apply_translation)
{
UINT64 result = ~(UINT64)0 >> (64 - 8*size);
switch (size)
@@ -561,7 +561,7 @@ UINT64 debug_read_memory(const address_space *space, offs_t address, int size, i
specified memory space
-------------------------------------------------*/
-void debug_write_byte(const address_space *_space, offs_t address, UINT8 data, int apply_translation)
+void debug_write_byte(address_space *_space, offs_t address, UINT8 data, int apply_translation)
{
address_space *space = const_cast<address_space *>(_space);
debugcpu_private *global = space->machine->debugcpu_data;
@@ -595,7 +595,7 @@ void debug_write_byte(const address_space *_space, offs_t address, UINT8 data, i
specified memory space
-------------------------------------------------*/
-void debug_write_word(const address_space *_space, offs_t address, UINT16 data, int apply_translation)
+void debug_write_word(address_space *_space, offs_t address, UINT16 data, int apply_translation)
{
address_space *space = const_cast<address_space *>(_space);
debugcpu_private *global = space->machine->debugcpu_data;
@@ -648,7 +648,7 @@ void debug_write_word(const address_space *_space, offs_t address, UINT16 data,
specified memory space
-------------------------------------------------*/
-void debug_write_dword(const address_space *_space, offs_t address, UINT32 data, int apply_translation)
+void debug_write_dword(address_space *_space, offs_t address, UINT32 data, int apply_translation)
{
address_space *space = const_cast<address_space *>(_space);
debugcpu_private *global = space->machine->debugcpu_data;
@@ -701,7 +701,7 @@ void debug_write_dword(const address_space *_space, offs_t address, UINT32 data,
specified memory space
-------------------------------------------------*/
-void debug_write_qword(const address_space *_space, offs_t address, UINT64 data, int apply_translation)
+void debug_write_qword(address_space *_space, offs_t address, UINT64 data, int apply_translation)
{
address_space *space = const_cast<address_space *>(_space);
debugcpu_private *global = space->machine->debugcpu_data;
@@ -754,7 +754,7 @@ void debug_write_qword(const address_space *_space, offs_t address, UINT64 data,
to the specified memory space
-------------------------------------------------*/
-void debug_write_memory(const address_space *space, offs_t address, UINT64 data, int size, int apply_translation)
+void debug_write_memory(address_space *space, offs_t address, UINT64 data, int size, int apply_translation)
{
switch (size)
{
@@ -771,7 +771,7 @@ void debug_write_memory(const address_space *space, offs_t address, UINT64 data,
the given offset from opcode space
-------------------------------------------------*/
-UINT64 debug_read_opcode(const address_space *_space, offs_t address, int size, int arg)
+UINT64 debug_read_opcode(address_space *_space, offs_t address, int size, int arg)
{
address_space *space = const_cast<address_space *>(_space);
UINT64 result = ~(UINT64)0 & (~(UINT64)0 >> (64 - 8*size)), result2;
@@ -1039,7 +1039,7 @@ static UINT64 expression_read_memory(void *param, const char *name, int spacenum
running_machine *machine = (running_machine *)param;
UINT64 result = ~(UINT64)0 >> (64 - 8*size);
device_t *device = NULL;
- const address_space *space;
+ address_space *space;
switch (spacenum)
{
@@ -1093,7 +1093,7 @@ static UINT64 expression_read_memory(void *param, const char *name, int spacenum
directly from an opcode or RAM pointer
-------------------------------------------------*/
-static UINT64 expression_read_program_direct(const address_space *_space, int opcode, offs_t address, int size)
+static UINT64 expression_read_program_direct(address_space *_space, int opcode, offs_t address, int size)
{
address_space *space = const_cast<address_space *>(_space);
UINT64 result = ~(UINT64)0 >> (64 - 8*size);
@@ -1207,7 +1207,7 @@ static void expression_write_memory(void *param, const char *name, int spacenum,
{
running_machine *machine = (running_machine *)param;
device_t *device = NULL;
- const address_space *space;
+ address_space *space;
switch (spacenum)
{
@@ -1260,7 +1260,7 @@ static void expression_write_memory(void *param, const char *name, int spacenum,
directly to an opcode or RAM pointer
-------------------------------------------------*/
-static void expression_write_program_direct(const address_space *_space, int opcode, offs_t address, int size, UINT64 data)
+static void expression_write_program_direct(address_space *_space, int opcode, offs_t address, int size, UINT64 data)
{
address_space *space = const_cast<address_space *>(_space);
if (space != NULL)
@@ -1905,7 +1905,7 @@ void device_debug::instruction_hook(offs_t curpc)
// memory read happens
//-------------------------------------------------
-void device_debug::memory_read_hook(const address_space &space, offs_t address, UINT64 mem_mask)
+void device_debug::memory_read_hook(address_space &space, offs_t address, UINT64 mem_mask)
{
// check watchpoints
watchpoint_check(space, WATCHPOINT_READ, address, 0, mem_mask);
@@ -1922,7 +1922,7 @@ void device_debug::memory_read_hook(const address_space &space, offs_t address,
// memory write happens
//-------------------------------------------------
-void device_debug::memory_write_hook(const address_space &space, offs_t address, UINT64 data, UINT64 mem_mask)
+void device_debug::memory_write_hook(address_space &space, offs_t address, UINT64 data, UINT64 mem_mask)
{
watchpoint_check(space, WATCHPOINT_WRITE, address, data, mem_mask);
}
@@ -1966,7 +1966,7 @@ offs_t device_debug::disassemble(char *buffer, offs_t pc, const UINT8 *oprom, co
#ifdef MAME_DEBUG
if (m_memory != NULL && m_disasm != NULL)
{
- const address_space *space = m_memory->space(AS_PROGRAM);
+ address_space *space = m_memory->space(AS_PROGRAM);
int bytes = space->address_to_byte(result & DASMFLAG_LENGTHMASK);
assert(bytes >= m_disasm->min_opcode_bytes());
assert(bytes <= m_disasm->max_opcode_bytes());
@@ -2279,7 +2279,7 @@ void device_debug::breakpoint_enable_all(bool enable)
// returning its index
//-------------------------------------------------
-int device_debug::watchpoint_set(const address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition, const char *action)
+int device_debug::watchpoint_set(address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition, const char *action)
{
assert(space.spacenum() < ARRAY_LENGTH(m_wplist));
@@ -2309,7 +2309,7 @@ bool device_debug::watchpoint_clear(int index)
if ((*wp)->m_index == index)
{
watchpoint *deleteme = *wp;
- const address_space &space = deleteme->m_space;
+ address_space &space = deleteme->m_space;
*wp = deleteme->m_next;
auto_free(m_device.machine, deleteme);
watchpoint_update_flags(space);
@@ -2573,7 +2573,7 @@ void device_debug::breakpoint_check(offs_t pc)
// watchpoint flags
//-------------------------------------------------
-void device_debug::watchpoint_update_flags(const address_space &space)
+void device_debug::watchpoint_update_flags(address_space &space)
{
// if hotspots are enabled, turn on all reads
bool enableread = false;
@@ -2602,7 +2602,7 @@ void device_debug::watchpoint_update_flags(const address_space &space)
// for a given CPU and address space
//-------------------------------------------------
-void device_debug::watchpoint_check(const address_space &space, int type, offs_t address, UINT64 value_to_write, UINT64 mem_mask)
+void device_debug::watchpoint_check(address_space &space, int type, offs_t address, UINT64 value_to_write, UINT64 mem_mask)
{
debugcpu_private *global = space.machine->debugcpu_data;
@@ -2688,7 +2688,7 @@ void device_debug::watchpoint_check(const address_space &space, int type, offs_t
// memory read access
//-------------------------------------------------
-void device_debug::hotspot_check(const address_space &space, offs_t address)
+void device_debug::hotspot_check(address_space &space, offs_t address)
{
offs_t curpc = pc();
@@ -2739,7 +2739,7 @@ UINT32 device_debug::dasm_wrapped(astring &buffer, offs_t pc)
assert(m_memory != NULL && m_disasm != NULL);
// determine the adjusted PC
- const address_space *space = m_memory->space(AS_PROGRAM);
+ address_space *space = m_memory->space(AS_PROGRAM);
offs_t pcbyte = space->address_to_byte(pc) & space->bytemask();
// fetch the bytes up to the maximum
@@ -2788,7 +2788,7 @@ UINT64 device_debug::get_cycles(void *globalref, void *ref)
UINT64 device_debug::get_logunmap(void *globalref, void *ref)
{
- const address_space *space = reinterpret_cast<const address_space *>(ref);
+ address_space *space = reinterpret_cast<address_space *>(ref);
return memory_get_log_unmap(space);
}
@@ -2892,7 +2892,7 @@ bool device_debug::breakpoint::hit(offs_t pc)
// watchpoint - constructor
//-------------------------------------------------
-device_debug::watchpoint::watchpoint(int index, const address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition, const char *action)
+device_debug::watchpoint::watchpoint(int index, address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition, const char *action)
: m_next(NULL),
m_space(space),
m_index(index),
diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h
index 1373aaabfdf..4598afbdde4 100644
--- a/src/emu/debug/debugcpu.h
+++ b/src/emu/debug/debugcpu.h
@@ -107,12 +107,12 @@ public:
public:
// construction/destruction
- watchpoint(int index, const address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition = NULL, const char *action = NULL);
+ watchpoint(int index, address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition = NULL, const char *action = NULL);
~watchpoint();
// getters
watchpoint *next() const { return m_next; }
- const address_space &space() const { return m_space; }
+ address_space &space() const { return m_space; }
int index() const { return m_index; }
int type() const { return m_type; }
bool enabled() const { return m_enabled; }
@@ -126,7 +126,7 @@ public:
bool hit(int type, offs_t address, int size);
watchpoint * m_next; // next in the list
- const address_space &m_space; // address space
+ address_space &m_space; // address space
int m_index; // user reported index
bool m_enabled; // enabled?
UINT8 m_type; // type (read/write)
@@ -156,8 +156,8 @@ public:
void interrupt_hook(int irqline);
void exception_hook(int exception);
void instruction_hook(offs_t curpc);
- void memory_read_hook(const address_space &space, offs_t address, UINT64 mem_mask);
- void memory_write_hook(const address_space &space, offs_t address, UINT64 data, UINT64 mem_mask);
+ void memory_read_hook(address_space &space, offs_t address, UINT64 mem_mask);
+ void memory_write_hook(address_space &space, offs_t address, UINT64 data, UINT64 mem_mask);
// hooks into our operations
void set_instruction_hook(debug_instruction_hook_func hook);
@@ -194,7 +194,7 @@ public:
// watchpoints
watchpoint *watchpoint_first(int spacenum) const { return m_wplist[spacenum]; }
- int watchpoint_set(const address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition, const char *action);
+ int watchpoint_set(address_space &space, int type, offs_t address, offs_t length, parsed_expression *condition, const char *action);
bool watchpoint_clear(int wpnum);
void watchpoint_clear_all();
bool watchpoint_enable(int index, bool enable = true);
@@ -225,9 +225,9 @@ private:
// breakpoint and watchpoint helpers
void breakpoint_update_flags();
void breakpoint_check(offs_t pc);
- void watchpoint_update_flags(const address_space &space);
- void watchpoint_check(const address_space &space, int type, offs_t address, UINT64 value_to_write, UINT64 mem_mask);
- void hotspot_check(const address_space &space, offs_t address);
+ void watchpoint_update_flags(address_space &space);
+ void watchpoint_check(address_space &space, int type, offs_t address, UINT64 value_to_write, UINT64 mem_mask);
+ void hotspot_check(address_space &space, offs_t address);
// symbol get/set callbacks
static UINT64 get_current_pc(void *globalref, void *ref);
@@ -304,7 +304,7 @@ private:
{
offs_t m_access; // access address
offs_t m_pc; // PC of the access
- const address_space *m_space; // space where the access occurred
+ address_space *m_space; // space where the access occurred
UINT32 m_count; // number of hits
};
hotspot_entry * m_hotspots; // hotspot list
@@ -394,40 +394,40 @@ void debug_cpu_source_script(running_machine *machine, const char *file);
/* ----- debugger memory accessors ----- */
/* return the physical address corresponding to the given logical address */
-int debug_cpu_translate(const address_space *space, int intention, offs_t *address);
+int debug_cpu_translate(address_space *space, int intention, offs_t *address);
/* return a byte from the the specified memory space */
-UINT8 debug_read_byte(const address_space *space, offs_t address, int apply_translation);
+UINT8 debug_read_byte(address_space *space, offs_t address, int apply_translation);
/* return a word from the the specified memory space */
-UINT16 debug_read_word(const address_space *space, offs_t address, int apply_translation);
+UINT16 debug_read_word(address_space *space, offs_t address, int apply_translation);
/* return a dword from the the specified memory space */
-UINT32 debug_read_dword(const address_space *space, offs_t address, int apply_translation);
+UINT32 debug_read_dword(address_space *space, offs_t address, int apply_translation);
/* return a qword from the the specified memory space */
-UINT64 debug_read_qword(const address_space *space, offs_t address, int apply_translation);
+UINT64 debug_read_qword(address_space *space, offs_t address, int apply_translation);
/* return 1,2,4 or 8 bytes from the specified memory space */
-UINT64 debug_read_memory(const address_space *space, offs_t address, int size, int apply_translation);
+UINT64 debug_read_memory(address_space *space, offs_t address, int size, int apply_translation);
/* write a byte to the specified memory space */
-void debug_write_byte(const address_space *space, offs_t address, UINT8 data, int apply_translation);
+void debug_write_byte(address_space *space, offs_t address, UINT8 data, int apply_translation);
/* write a word to the specified memory space */
-void debug_write_word(const address_space *space, offs_t address, UINT16 data, int apply_translation);
+void debug_write_word(address_space *space, offs_t address, UINT16 data, int apply_translation);
/* write a dword to the specified memory space */
-void debug_write_dword(const address_space *space, offs_t address, UINT32 data, int apply_translation);
+void debug_write_dword(address_space *space, offs_t address, UINT32 data, int apply_translation);
/* write a qword to the specified memory space */
-void debug_write_qword(const address_space *space, offs_t address, UINT64 data, int apply_translation);
+void debug_write_qword(address_space *space, offs_t address, UINT64 data, int apply_translation);
/* write 1,2,4 or 8 bytes to the specified memory space */
-void debug_write_memory(const address_space *space, offs_t address, UINT64 data, int size, int apply_translation);
+void debug_write_memory(address_space *space, offs_t address, UINT64 data, int size, int apply_translation);
/* read 1,2,4 or 8 bytes at the given offset from opcode space */
-UINT64 debug_read_opcode(const address_space *space, offs_t offset, int size, int arg);
+UINT64 debug_read_opcode(address_space *space, offs_t offset, int size, int arg);
#endif
diff --git a/src/emu/debug/dvdisasm.h b/src/emu/debug/dvdisasm.h
index aed35f3724b..16f0fff1a5f 100644
--- a/src/emu/debug/dvdisasm.h
+++ b/src/emu/debug/dvdisasm.h
@@ -73,13 +73,13 @@ class debug_view_disasm_source : public debug_view_source
public:
// getters
device_t &device() const { return m_device; }
- const address_space *space() const { return m_space; }
+ address_space *space() const { return m_space; }
private:
// internal state
device_t & m_device; // underlying device
device_disasm_interface *m_disasmintf; // disassembly interface
- const address_space *m_space; // address space to display
+ address_space *m_space; // address space to display
};
diff --git a/src/emu/debug/dvmemory.c b/src/emu/debug/dvmemory.c
index 4399565929e..2073cbc5492 100644
--- a/src/emu/debug/dvmemory.c
+++ b/src/emu/debug/dvmemory.c
@@ -72,7 +72,7 @@ const debug_view_memory::memory_view_pos debug_view_memory::s_memory_pos_table[9
// debug_view_memory_source - constructors
//-------------------------------------------------
-debug_view_memory_source::debug_view_memory_source(const char *name, const address_space &space)
+debug_view_memory_source::debug_view_memory_source(const char *name, address_space &space)
: debug_view_source(name, space.cpu),
m_space(&space),
m_memintf(dynamic_cast<device_memory_interface *>(space.cpu)),
@@ -156,7 +156,7 @@ void debug_view_memory::enumerate_sources()
for (bool gotone = m_machine.m_devicelist.first(memintf); gotone; gotone = memintf->next(memintf))
for (int spacenum = 0; spacenum < ADDRESS_SPACES; spacenum++)
{
- const address_space *space = memintf->space(spacenum);
+ address_space *space = memintf->space(spacenum);
if (space != NULL)
{
name.printf("%s '%s' %s space memory", memintf->device().name(), memintf->device().tag(), space->name());
diff --git a/src/emu/debug/dvmemory.h b/src/emu/debug/dvmemory.h
index 3775885ff7e..dc27de2bd87 100644
--- a/src/emu/debug/dvmemory.h
+++ b/src/emu/debug/dvmemory.h
@@ -52,15 +52,15 @@ class debug_view_memory_source : public debug_view_source
{
friend class debug_view_memory;
- debug_view_memory_source(const char *name, const address_space &space);
+ debug_view_memory_source(const char *name, address_space &space);
debug_view_memory_source(const char *name, const region_info &region);
debug_view_memory_source(const char *name, void *base, int element_size, int num_elements);
public:
- const address_space *space() const { return m_space; }
+ address_space *space() const { return m_space; }
private:
- const address_space *m_space; // address space we reference (if any)
+ address_space *m_space; // address space we reference (if any)
device_memory_interface *m_memintf; // pointer to the memory interface of the device
void * m_base; // pointer to memory base
offs_t m_length; // length of memory
diff --git a/src/emu/dimemory.h b/src/emu/dimemory.h
index fd3ab38cc44..88aab52b8c3 100644
--- a/src/emu/dimemory.h
+++ b/src/emu/dimemory.h
@@ -198,7 +198,7 @@ inline device_memory_interface *device_memory(device_t *device)
// given address space on this device
//-------------------------------------------------
-inline const address_space *device_get_space(device_t *device, int spacenum = 0)
+inline address_space *device_get_space(device_t *device, int spacenum = 0)
{
return device_memory(device)->space(spacenum);
}
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 83f83b8f75f..5d3c934c937 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -126,7 +126,7 @@ struct _ide_state
UINT8 verify_only;
UINT8 dma_active;
- const address_space *dma_space;
+ address_space *dma_space;
UINT8 dma_address_xor;
UINT8 dma_last_buffer;
offs_t dma_address;
diff --git a/src/emu/machine/latch8.c b/src/emu/machine/latch8.c
index 0bdb024145f..6709424fc18 100644
--- a/src/emu/machine/latch8.c
+++ b/src/emu/machine/latch8.c
@@ -83,7 +83,7 @@ READ8_DEVICE_HANDLER( latch8_r )
if (latch8->has_read)
{
/* temporary hack until all relevant systems are devices */
- const address_space *space = cpu_get_address_space(device->machine->firstcpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(device->machine->firstcpu, ADDRESS_SPACE_PROGRAM);
int i;
for (i=0; i<8; i++)
{
diff --git a/src/emu/memconv.h b/src/emu/memconv.h
index 96f17a53900..c802126ac55 100644
--- a/src/emu/memconv.h
+++ b/src/emu/memconv.h
@@ -85,7 +85,7 @@
*
*************************************/
-INLINE UINT16 read16be_with_read8_handler(read8_space_func handler, const address_space *space, offs_t offset, UINT16 mem_mask)
+INLINE UINT16 read16be_with_read8_handler(read8_space_func handler, address_space *space, offs_t offset, UINT16 mem_mask)
{
UINT16 result = 0;
if (ACCESSING_BITS_8_15)
@@ -96,7 +96,7 @@ INLINE UINT16 read16be_with_read8_handler(read8_space_func handler, const addres
}
-INLINE void write16be_with_write8_handler(write8_space_func handler, const address_space *space, offs_t offset, UINT16 data, UINT16 mem_mask)
+INLINE void write16be_with_write8_handler(write8_space_func handler, address_space *space, offs_t offset, UINT16 data, UINT16 mem_mask)
{
if (ACCESSING_BITS_8_15)
(*handler)(space, offset * 2 + 0, data >> 8);
@@ -111,7 +111,7 @@ INLINE void write16be_with_write8_handler(write8_space_func handler, const addre
*
*************************************/
-INLINE UINT16 read16le_with_read8_handler(read8_space_func handler, const address_space *space, offs_t offset, UINT16 mem_mask)
+INLINE UINT16 read16le_with_read8_handler(read8_space_func handler, address_space *space, offs_t offset, UINT16 mem_mask)
{
UINT16 result = 0;
if (ACCESSING_BITS_0_7)
@@ -122,7 +122,7 @@ INLINE UINT16 read16le_with_read8_handler(read8_space_func handler, const addres
}
-INLINE void write16le_with_write8_handler(write8_space_func handler, const address_space *space, offs_t offset, UINT16 data, UINT16 mem_mask)
+INLINE void write16le_with_write8_handler(write8_space_func handler, address_space *space, offs_t offset, UINT16 data, UINT16 mem_mask)
{
if (ACCESSING_BITS_0_7)
(*handler)(space, offset * 2 + 0, data >> 0);
@@ -137,7 +137,7 @@ INLINE void write16le_with_write8_handler(write8_space_func handler, const addre
*
*************************************/
-INLINE UINT32 read32be_with_read8_handler(read8_space_func handler, const address_space *space, offs_t offset, UINT32 mem_mask)
+INLINE UINT32 read32be_with_read8_handler(read8_space_func handler, address_space *space, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
if (ACCESSING_BITS_16_31)
@@ -148,7 +148,7 @@ INLINE UINT32 read32be_with_read8_handler(read8_space_func handler, const addres
}
-INLINE void write32be_with_write8_handler(write8_space_func handler, const address_space *space, offs_t offset, UINT32 data, UINT32 mem_mask)
+INLINE void write32be_with_write8_handler(write8_space_func handler, address_space *space, offs_t offset, UINT32 data, UINT32 mem_mask)
{
if (ACCESSING_BITS_16_31)
write16be_with_write8_handler(handler, space, offset * 2 + 0, data >> 16, mem_mask >> 16);
@@ -163,7 +163,7 @@ INLINE void write32be_with_write8_handler(write8_space_func handler, const addre
*
*************************************/
-INLINE UINT32 read32le_with_read8_handler(read8_space_func handler, const address_space *space, offs_t offset, UINT32 mem_mask)
+INLINE UINT32 read32le_with_read8_handler(read8_space_func handler, address_space *space, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
if (ACCESSING_BITS_0_15)
@@ -174,7 +174,7 @@ INLINE UINT32 read32le_with_read8_handler(read8_space_func handler, const addres
}
-INLINE void write32le_with_write8_handler(write8_space_func handler, const address_space *space, offs_t offset, UINT32 data, UINT32 mem_mask)
+INLINE void write32le_with_write8_handler(write8_space_func handler, address_space *space, offs_t offset, UINT32 data, UINT32 mem_mask)
{
if (ACCESSING_BITS_0_15)
write16le_with_write8_handler(handler, space, offset * 2 + 0, data, mem_mask);
@@ -189,7 +189,7 @@ INLINE void write32le_with_write8_handler(write8_space_func handler, const addre
*
*************************************/
-INLINE UINT32 read32be_with_16be_handler(read16_space_func handler, const address_space *space, offs_t offset, UINT32 mem_mask)
+INLINE UINT32 read32be_with_16be_handler(read16_space_func handler, address_space *space, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
if (ACCESSING_BITS_16_31)
@@ -200,7 +200,7 @@ INLINE UINT32 read32be_with_16be_handler(read16_space_func handler, const addres
}
-INLINE void write32be_with_16be_handler(write16_space_func handler, const address_space *space, offs_t offset, UINT32 data, UINT32 mem_mask)
+INLINE void write32be_with_16be_handler(write16_space_func handler, address_space *space, offs_t offset, UINT32 data, UINT32 mem_mask)
{
if (ACCESSING_BITS_16_31)
(*handler)(space, offset * 2 + 0, data >> 16, mem_mask >> 16);
@@ -215,7 +215,7 @@ INLINE void write32be_with_16be_handler(write16_space_func handler, const addres
*
*************************************/
-INLINE UINT32 read32le_with_16le_handler(read16_space_func handler, const address_space *space, offs_t offset, UINT32 mem_mask)
+INLINE UINT32 read32le_with_16le_handler(read16_space_func handler, address_space *space, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
if (ACCESSING_BITS_0_15)
@@ -226,7 +226,7 @@ INLINE UINT32 read32le_with_16le_handler(read16_space_func handler, const addres
}
-INLINE void write32le_with_16le_handler(write16_space_func handler, const address_space *space, offs_t offset, UINT32 data, UINT32 mem_mask)
+INLINE void write32le_with_16le_handler(write16_space_func handler, address_space *space, offs_t offset, UINT32 data, UINT32 mem_mask)
{
if (ACCESSING_BITS_0_15)
(*handler)(space, offset * 2 + 0, data, mem_mask);
@@ -241,7 +241,7 @@ INLINE void write32le_with_16le_handler(write16_space_func handler, const addres
*
*************************************/
-INLINE UINT32 read32be_with_16le_handler(read16_space_func handler, const address_space *space, offs_t offset, UINT32 mem_mask)
+INLINE UINT32 read32be_with_16le_handler(read16_space_func handler, address_space *space, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
mem_mask = FLIPENDIAN_INT32(mem_mask);
@@ -250,7 +250,7 @@ INLINE UINT32 read32be_with_16le_handler(read16_space_func handler, const addres
}
-INLINE void write32be_with_16le_handler(write16_space_func handler, const address_space *space, offs_t offset, UINT32 data, UINT32 mem_mask)
+INLINE void write32be_with_16le_handler(write16_space_func handler, address_space *space, offs_t offset, UINT32 data, UINT32 mem_mask)
{
data = FLIPENDIAN_INT32(data);
mem_mask = FLIPENDIAN_INT32(mem_mask);
@@ -264,7 +264,7 @@ INLINE void write32be_with_16le_handler(write16_space_func handler, const addres
*
*************************************/
-INLINE UINT32 read32le_with_16be_handler(read16_space_func handler, const address_space *space, offs_t offset, UINT32 mem_mask)
+INLINE UINT32 read32le_with_16be_handler(read16_space_func handler, address_space *space, offs_t offset, UINT32 mem_mask)
{
UINT32 result = 0;
mem_mask = FLIPENDIAN_INT32(mem_mask);
@@ -273,7 +273,7 @@ INLINE UINT32 read32le_with_16be_handler(read16_space_func handler, const addres
}
-INLINE void write32le_with_16be_handler(write16_space_func handler, const address_space *space, offs_t offset, UINT32 data, UINT32 mem_mask)
+INLINE void write32le_with_16be_handler(write16_space_func handler, address_space *space, offs_t offset, UINT32 data, UINT32 mem_mask)
{
data = FLIPENDIAN_INT32(data);
mem_mask = FLIPENDIAN_INT32(mem_mask);
@@ -287,7 +287,7 @@ INLINE void write32le_with_16be_handler(write16_space_func handler, const addres
*
*************************************/
-INLINE UINT64 read64be_with_read8_handler(read8_space_func handler, const address_space *space, offs_t offset, UINT64 mem_mask)
+INLINE UINT64 read64be_with_read8_handler(read8_space_func handler, address_space *space, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if (ACCESSING_BITS_32_63)
@@ -298,7 +298,7 @@ INLINE UINT64 read64be_with_read8_handler(read8_space_func handler, const addres
}
-INLINE void write64be_with_write8_handler(write8_space_func handler, const address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64be_with_write8_handler(write8_space_func handler, address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if (ACCESSING_BITS_32_63)
write32be_with_write8_handler(handler, space, offset * 2 + 0, data >> 32, mem_mask >> 32);
@@ -313,7 +313,7 @@ INLINE void write64be_with_write8_handler(write8_space_func handler, const addre
*
*************************************/
-INLINE UINT64 read64le_with_read8_handler(read8_space_func handler, const address_space *space, offs_t offset, UINT64 mem_mask)
+INLINE UINT64 read64le_with_read8_handler(read8_space_func handler, address_space *space, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if (ACCESSING_BITS_0_31)
@@ -324,7 +324,7 @@ INLINE UINT64 read64le_with_read8_handler(read8_space_func handler, const addres
}
-INLINE void write64le_with_write8_handler(write8_space_func handler, const address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64le_with_write8_handler(write8_space_func handler, address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if (ACCESSING_BITS_0_31)
write32le_with_write8_handler(handler, space, offset * 2 + 0, data >> 0, mem_mask >> 0);
@@ -339,7 +339,7 @@ INLINE void write64le_with_write8_handler(write8_space_func handler, const addre
*
*************************************/
-INLINE UINT32 read64be_with_16be_handler(read16_space_func handler, const address_space *space, offs_t offset, UINT64 mem_mask)
+INLINE UINT32 read64be_with_16be_handler(read16_space_func handler, address_space *space, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if (ACCESSING_BITS_32_63)
@@ -350,7 +350,7 @@ INLINE UINT32 read64be_with_16be_handler(read16_space_func handler, const addres
}
-INLINE void write64be_with_16be_handler(write16_space_func handler, const address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64be_with_16be_handler(write16_space_func handler, address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if (ACCESSING_BITS_32_63)
write32be_with_16be_handler(handler, space, offset * 2 + 0, data >> 32, mem_mask >> 32);
@@ -365,7 +365,7 @@ INLINE void write64be_with_16be_handler(write16_space_func handler, const addres
*
*************************************/
-INLINE UINT32 read64le_with_16le_handler(read16_space_func handler, const address_space *space, offs_t offset, UINT64 mem_mask)
+INLINE UINT32 read64le_with_16le_handler(read16_space_func handler, address_space *space, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if (ACCESSING_BITS_0_31)
@@ -376,7 +376,7 @@ INLINE UINT32 read64le_with_16le_handler(read16_space_func handler, const addres
}
-INLINE void write64le_with_16le_handler(write16_space_func handler, const address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64le_with_16le_handler(write16_space_func handler, address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if (ACCESSING_BITS_0_31)
write32le_with_16le_handler(handler, space, offset * 2 + 0, data >> 0, mem_mask >> 0);
@@ -391,7 +391,7 @@ INLINE void write64le_with_16le_handler(write16_space_func handler, const addres
*
*************************************/
-INLINE UINT32 read64be_with_16le_handler(read16_space_func handler, const address_space *space, offs_t offset, UINT64 mem_mask)
+INLINE UINT32 read64be_with_16le_handler(read16_space_func handler, address_space *space, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if (ACCESSING_BITS_32_63)
@@ -402,7 +402,7 @@ INLINE UINT32 read64be_with_16le_handler(read16_space_func handler, const addres
}
-INLINE void write64be_with_16le_handler(write16_space_func handler, const address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64be_with_16le_handler(write16_space_func handler, address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if (ACCESSING_BITS_32_63)
write32be_with_16le_handler(handler, space, offset * 2 + 0, data >> 32, mem_mask >> 32);
@@ -417,7 +417,7 @@ INLINE void write64be_with_16le_handler(write16_space_func handler, const addres
*
*************************************/
-INLINE UINT32 read64le_with_16be_handler(read16_space_func handler, const address_space *space, offs_t offset, UINT64 mem_mask)
+INLINE UINT32 read64le_with_16be_handler(read16_space_func handler, address_space *space, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if (ACCESSING_BITS_0_31)
@@ -428,7 +428,7 @@ INLINE UINT32 read64le_with_16be_handler(read16_space_func handler, const addres
}
-INLINE void write64le_with_16be_handler(write16_space_func handler, const address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64le_with_16be_handler(write16_space_func handler, address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if (ACCESSING_BITS_0_31)
write32le_with_16be_handler(handler, space, offset * 2 + 0, data >> 0, mem_mask >> 0);
@@ -443,7 +443,7 @@ INLINE void write64le_with_16be_handler(write16_space_func handler, const addres
*
*************************************/
-INLINE UINT64 read64be_with_32be_handler(read32_space_func handler, const address_space *space, offs_t offset, UINT64 mem_mask)
+INLINE UINT64 read64be_with_32be_handler(read32_space_func handler, address_space *space, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if (ACCESSING_BITS_32_63)
@@ -454,7 +454,7 @@ INLINE UINT64 read64be_with_32be_handler(read32_space_func handler, const addres
}
-INLINE void write64be_with_32be_handler(write32_space_func handler, const address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64be_with_32be_handler(write32_space_func handler, address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if (ACCESSING_BITS_32_63)
(*handler)(space, offset * 2 + 0, data >> 32, mem_mask >> 32);
@@ -469,7 +469,7 @@ INLINE void write64be_with_32be_handler(write32_space_func handler, const addres
*
*************************************/
-INLINE UINT64 read64le_with_32le_handler(read32_space_func handler, const address_space *space, offs_t offset, UINT64 mem_mask)
+INLINE UINT64 read64le_with_32le_handler(read32_space_func handler, address_space *space, offs_t offset, UINT64 mem_mask)
{
UINT64 result = 0;
if (ACCESSING_BITS_0_31)
@@ -480,7 +480,7 @@ INLINE UINT64 read64le_with_32le_handler(read32_space_func handler, const addres
}
-INLINE void write64le_with_32le_handler(write32_space_func handler, const address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64le_with_32le_handler(write32_space_func handler, address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
if (ACCESSING_BITS_0_31)
(*handler)(space, offset * 2 + 0, data >> 0, mem_mask >> 0);
@@ -495,7 +495,7 @@ INLINE void write64le_with_32le_handler(write32_space_func handler, const addres
*
*************************************/
-INLINE UINT64 read64be_with_32le_handler(read32_space_func handler, const address_space *space, offs_t offset, UINT64 mem_mask)
+INLINE UINT64 read64be_with_32le_handler(read32_space_func handler, address_space *space, offs_t offset, UINT64 mem_mask)
{
UINT64 result;
mem_mask = FLIPENDIAN_INT64(mem_mask);
@@ -504,7 +504,7 @@ INLINE UINT64 read64be_with_32le_handler(read32_space_func handler, const addres
}
-INLINE void write64be_with_32le_handler(write32_space_func handler, const address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64be_with_32le_handler(write32_space_func handler, address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
data = FLIPENDIAN_INT64(data);
mem_mask = FLIPENDIAN_INT64(mem_mask);
@@ -518,7 +518,7 @@ INLINE void write64be_with_32le_handler(write32_space_func handler, const addres
*
*************************************/
-INLINE UINT64 read64le_with_32be_handler(read32_space_func handler, const address_space *space, offs_t offset, UINT64 mem_mask)
+INLINE UINT64 read64le_with_32be_handler(read32_space_func handler, address_space *space, offs_t offset, UINT64 mem_mask)
{
UINT64 result;
mem_mask = FLIPENDIAN_INT64(mem_mask);
@@ -527,7 +527,7 @@ INLINE UINT64 read64le_with_32be_handler(read32_space_func handler, const addres
}
-INLINE void write64le_with_32be_handler(write32_space_func handler, const address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
+INLINE void write64le_with_32be_handler(write32_space_func handler, address_space *space, offs_t offset, UINT64 data, UINT64 mem_mask)
{
data = FLIPENDIAN_INT64(data);
mem_mask = FLIPENDIAN_INT64(mem_mask);
diff --git a/src/emu/memory.c b/src/emu/memory.c
index b1f3e6deada..804d3352502 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -483,10 +483,10 @@ public:
void set_delegate(read64_delegate delegate, UINT64 mask = 0);
// configure legacy address space functions
- void set_legacy_func(const address_space &space, read8_space_func func, const char *name, UINT64 mask = 0);
- void set_legacy_func(const address_space &space, read16_space_func func, const char *name, UINT64 mask = 0);
- void set_legacy_func(const address_space &space, read32_space_func func, const char *name, UINT64 mask = 0);
- void set_legacy_func(const address_space &space, read64_space_func func, const char *name, UINT64 mask = 0);
+ void set_legacy_func(address_space &space, read8_space_func func, const char *name, UINT64 mask = 0);
+ void set_legacy_func(address_space &space, read16_space_func func, const char *name, UINT64 mask = 0);
+ void set_legacy_func(address_space &space, read32_space_func func, const char *name, UINT64 mask = 0);
+ void set_legacy_func(address_space &space, read64_space_func func, const char *name, UINT64 mask = 0);
// configure legacy device functions
void set_legacy_func(device_t &device, read8_device_func func, const char *name, UINT64 mask = 0);
@@ -532,7 +532,7 @@ private:
// unions to hold legacy objects and callbacks
union
{
- const address_space * space;
+ address_space * space;
device_t * device;
} m_legacy_object;
@@ -574,10 +574,10 @@ public:
void set_delegate(write64_delegate delegate, UINT64 mask = 0);
// configure legacy address space functions
- void set_legacy_func(const address_space &space, write8_space_func func, const char *name, UINT64 mask = 0);
- void set_legacy_func(const address_space &space, write16_space_func func, const char *name, UINT64 mask = 0);
- void set_legacy_func(const address_space &space, write32_space_func func, const char *name, UINT64 mask = 0);
- void set_legacy_func(const address_space &space, write64_space_func func, const char *name, UINT64 mask = 0);
+ void set_legacy_func(address_space &space, write8_space_func func, const char *name, UINT64 mask = 0);
+ void set_legacy_func(address_space &space, write16_space_func func, const char *name, UINT64 mask = 0);
+ void set_legacy_func(address_space &space, write32_space_func func, const char *name, UINT64 mask = 0);
+ void set_legacy_func(address_space &space, write64_space_func func, const char *name, UINT64 mask = 0);
// configure legacy device functions
void set_legacy_func(device_t &device, write8_device_func func, const char *name, UINT64 mask = 0);
@@ -623,7 +623,7 @@ private:
// unions to hold legacy objects and callbacks
union
{
- const address_space * space;
+ address_space * space;
device_t * device;
} m_legacy_object;
@@ -876,20 +876,20 @@ public:
// generate accessor table
virtual void accessors(data_accessors &accessors) const
{
- accessors.read_byte = reinterpret_cast<UINT8 (*)(const address_space *, offs_t)>(&read_byte_static);
- accessors.read_word = reinterpret_cast<UINT16 (*)(const address_space *, offs_t)>(&read_word_static);
- accessors.read_word_masked = reinterpret_cast<UINT16 (*)(const address_space *, offs_t, UINT16)>(&read_word_masked_static);
- accessors.read_dword = reinterpret_cast<UINT32 (*)(const address_space *, offs_t)>(&read_dword_static);
- accessors.read_dword_masked = reinterpret_cast<UINT32 (*)(const address_space *, offs_t, UINT32)>(&read_dword_masked_static);
- accessors.read_qword = reinterpret_cast<UINT64 (*)(const address_space *, offs_t)>(&read_qword_static);
- accessors.read_qword_masked = reinterpret_cast<UINT64 (*)(const address_space *, offs_t, UINT64)>(&read_qword_masked_static);
- accessors.write_byte = reinterpret_cast<void (*)(const address_space *, offs_t, UINT8)>(&write_byte_static);
- accessors.write_word = reinterpret_cast<void (*)(const address_space *, offs_t, UINT16)>(&write_word_static);
- accessors.write_word_masked = reinterpret_cast<void (*)(const address_space *, offs_t, UINT16, UINT16)>(&write_word_masked_static);
- accessors.write_dword = reinterpret_cast<void (*)(const address_space *, offs_t, UINT32)>(&write_dword_static);
- accessors.write_dword_masked = reinterpret_cast<void (*)(const address_space *, offs_t, UINT32, UINT32)>(&write_dword_masked_static);
- accessors.write_qword = reinterpret_cast<void (*)(const address_space *, offs_t, UINT64)>(&write_qword_static);
- accessors.write_qword_masked = reinterpret_cast<void (*)(const address_space *, offs_t, UINT64, UINT64)>(&write_qword_masked_static);
+ accessors.read_byte = reinterpret_cast<UINT8 (*)(address_space *, offs_t)>(&read_byte_static);
+ accessors.read_word = reinterpret_cast<UINT16 (*)(address_space *, offs_t)>(&read_word_static);
+ accessors.read_word_masked = reinterpret_cast<UINT16 (*)(address_space *, offs_t, UINT16)>(&read_word_masked_static);
+ accessors.read_dword = reinterpret_cast<UINT32 (*)(address_space *, offs_t)>(&read_dword_static);
+ accessors.read_dword_masked = reinterpret_cast<UINT32 (*)(address_space *, offs_t, UINT32)>(&read_dword_masked_static);
+ accessors.read_qword = reinterpret_cast<UINT64 (*)(address_space *, offs_t)>(&read_qword_static);
+ accessors.read_qword_masked = reinterpret_cast<UINT64 (*)(address_space *, offs_t, UINT64)>(&read_qword_masked_static);
+ accessors.write_byte = reinterpret_cast<void (*)(address_space *, offs_t, UINT8)>(&write_byte_static);
+ accessors.write_word = reinterpret_cast<void (*)(address_space *, offs_t, UINT16)>(&write_word_static);
+ accessors.write_word_masked = reinterpret_cast<void (*)(address_space *, offs_t, UINT16, UINT16)>(&write_word_masked_static);
+ accessors.write_dword = reinterpret_cast<void (*)(address_space *, offs_t, UINT32)>(&write_dword_static);
+ accessors.write_dword_masked = reinterpret_cast<void (*)(address_space *, offs_t, UINT32, UINT32)>(&write_dword_masked_static);
+ accessors.write_qword = reinterpret_cast<void (*)(address_space *, offs_t, UINT64)>(&write_qword_static);
+ accessors.write_qword_masked = reinterpret_cast<void (*)(address_space *, offs_t, UINT64, UINT64)>(&write_qword_masked_static);
}
//
@@ -4065,28 +4065,28 @@ void handler_entry_read::set_delegate(read64_delegate delegate, UINT64 mask)
// space stub of the appropriate size
//-------------------------------------------------
-void handler_entry_read::set_legacy_func(const address_space &space, read8_space_func func, const char *name, UINT64 mask)
+void handler_entry_read::set_legacy_func(address_space &space, read8_space_func func, const char *name, UINT64 mask)
{
m_legacy_handler.space8 = func;
m_legacy_object.space = &space;
set_delegate(read8_delegate(read8_proto_delegate::_create_member<handler_entry_read, &handler_entry_read::read_stub_legacy>(name), *this), mask);
}
-void handler_entry_read::set_legacy_func(const address_space &space, read16_space_func func, const char *name, UINT64 mask)
+void handler_entry_read::set_legacy_func(address_space &space, read16_space_func func, const char *name, UINT64 mask)
{
m_legacy_handler.space16 = func;
m_legacy_object.space = &space;
set_delegate(read16_delegate(read16_proto_delegate::_create_member<handler_entry_read, &handler_entry_read::read_stub_legacy>(name), *this), mask);
}
-void handler_entry_read::set_legacy_func(const address_space &space, read32_space_func func, const char *name, UINT64 mask)
+void handler_entry_read::set_legacy_func(address_space &space, read32_space_func func, const char *name, UINT64 mask)
{
m_legacy_handler.space32 = func;
m_legacy_object.space = &space;
set_delegate(read32_delegate(read32_proto_delegate::_create_member<handler_entry_read, &handler_entry_read::read_stub_legacy>(name), *this), mask);
}
-void handler_entry_read::set_legacy_func(const address_space &space, read64_space_func func, const char *name, UINT64 mask)
+void handler_entry_read::set_legacy_func(address_space &space, read64_space_func func, const char *name, UINT64 mask)
{
m_legacy_handler.space64 = func;
m_legacy_object.space = &space;
@@ -4392,28 +4392,28 @@ void handler_entry_write::set_delegate(write64_delegate delegate, UINT64 mask)
// space stub of the appropriate size
//-------------------------------------------------
-void handler_entry_write::set_legacy_func(const address_space &space, write8_space_func func, const char *name, UINT64 mask)
+void handler_entry_write::set_legacy_func(address_space &space, write8_space_func func, const char *name, UINT64 mask)
{
m_legacy_handler.space8 = func;
m_legacy_object.space = &space;
set_delegate(write8_delegate(write8_proto_delegate::_create_member<handler_entry_write, &handler_entry_write::write_stub_legacy>(name), *this), mask);
}
-void handler_entry_write::set_legacy_func(const address_space &space, write16_space_func func, const char *name, UINT64 mask)
+void handler_entry_write::set_legacy_func(address_space &space, write16_space_func func, const char *name, UINT64 mask)
{
m_legacy_handler.space16 = func;
m_legacy_object.space = &space;
set_delegate(write16_delegate(write16_proto_delegate::_create_member<handler_entry_write, &handler_entry_write::write_stub_legacy>(name), *this), mask);
}
-void handler_entry_write::set_legacy_func(const address_space &space, write32_space_func func, const char *name, UINT64 mask)
+void handler_entry_write::set_legacy_func(address_space &space, write32_space_func func, const char *name, UINT64 mask)
{
m_legacy_handler.space32 = func;
m_legacy_object.space = &space;
set_delegate(write32_delegate(write32_proto_delegate::_create_member<handler_entry_write, &handler_entry_write::write_stub_legacy>(name), *this), mask);
}
-void handler_entry_write::set_legacy_func(const address_space &space, write64_space_func func, const char *name, UINT64 mask)
+void handler_entry_write::set_legacy_func(address_space &space, write64_space_func func, const char *name, UINT64 mask)
{
m_legacy_handler.space64 = func;
m_legacy_object.space = &space;
diff --git a/src/emu/memory.h b/src/emu/memory.h
index 385d27efc2a..b63da7395b0 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -101,14 +101,14 @@ typedef void (*address_map_constructor)(address_map &map, const device_config &d
// legacy space read/write handlers
-typedef UINT8 (*read8_space_func) (ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset);
-typedef void (*write8_space_func) (ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 data);
-typedef UINT16 (*read16_space_func) (ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 mem_mask);
-typedef void (*write16_space_func)(ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask);
-typedef UINT32 (*read32_space_func) (ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 mem_mask);
-typedef void (*write32_space_func)(ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 data, ATTR_UNUSED UINT32 mem_mask);
-typedef UINT64 (*read64_space_func) (ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 mem_mask);
-typedef void (*write64_space_func)(ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 data, ATTR_UNUSED UINT64 mem_mask);
+typedef UINT8 (*read8_space_func) (ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset);
+typedef void (*write8_space_func) (ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 data);
+typedef UINT16 (*read16_space_func) (ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 mem_mask);
+typedef void (*write16_space_func)(ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask);
+typedef UINT32 (*read32_space_func) (ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 mem_mask);
+typedef void (*write32_space_func)(ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 data, ATTR_UNUSED UINT32 mem_mask);
+typedef UINT64 (*read64_space_func) (ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 mem_mask);
+typedef void (*write64_space_func)(ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 data, ATTR_UNUSED UINT64 mem_mask);
// legacy device read/write handlers
typedef UINT8 (*read8_device_func) (ATTR_UNUSED device_t *device, ATTR_UNUSED offs_t offset);
@@ -124,21 +124,21 @@ typedef void (*write64_device_func)(ATTR_UNUSED device_t *device, ATTR_UNUSED of
// struct with function pointers for accessors; use is generally discouraged unless necessary
struct data_accessors
{
- UINT8 (*read_byte)(const address_space *space, offs_t byteaddress);
- UINT16 (*read_word)(const address_space *space, offs_t byteaddress);
- UINT16 (*read_word_masked)(const address_space *space, offs_t byteaddress, UINT16 mask);
- UINT32 (*read_dword)(const address_space *space, offs_t byteaddress);
- UINT32 (*read_dword_masked)(const address_space *space, offs_t byteaddress, UINT32 mask);
- UINT64 (*read_qword)(const address_space *space, offs_t byteaddress);
- UINT64 (*read_qword_masked)(const address_space *space, offs_t byteaddress, UINT64 mask);
-
- void (*write_byte)(const address_space *space, offs_t byteaddress, UINT8 data);
- void (*write_word)(const address_space *space, offs_t byteaddress, UINT16 data);
- void (*write_word_masked)(const address_space *space, offs_t byteaddress, UINT16 data, UINT16 mask);
- void (*write_dword)(const address_space *space, offs_t byteaddress, UINT32 data);
- void (*write_dword_masked)(const address_space *space, offs_t byteaddress, UINT32 data, UINT32 mask);
- void (*write_qword)(const address_space *space, offs_t byteaddress, UINT64 data);
- void (*write_qword_masked)(const address_space *space, offs_t byteaddress, UINT64 data, UINT64 mask);
+ UINT8 (*read_byte)(address_space *space, offs_t byteaddress);
+ UINT16 (*read_word)(address_space *space, offs_t byteaddress);
+ UINT16 (*read_word_masked)(address_space *space, offs_t byteaddress, UINT16 mask);
+ UINT32 (*read_dword)(address_space *space, offs_t byteaddress);
+ UINT32 (*read_dword_masked)(address_space *space, offs_t byteaddress, UINT32 mask);
+ UINT64 (*read_qword)(address_space *space, offs_t byteaddress);
+ UINT64 (*read_qword_masked)(address_space *space, offs_t byteaddress, UINT64 mask);
+
+ void (*write_byte)(address_space *space, offs_t byteaddress, UINT8 data);
+ void (*write_word)(address_space *space, offs_t byteaddress, UINT16 data);
+ void (*write_word_masked)(address_space *space, offs_t byteaddress, UINT16 data, UINT16 mask);
+ void (*write_dword)(address_space *space, offs_t byteaddress, UINT32 data);
+ void (*write_dword_masked)(address_space *space, offs_t byteaddress, UINT32 data, UINT32 mask);
+ void (*write_qword)(address_space *space, offs_t byteaddress, UINT64 data);
+ void (*write_qword_masked)(address_space *space, offs_t byteaddress, UINT64 data, UINT64 mask);
};
@@ -511,14 +511,14 @@ protected:
// space read/write handler function macros
-#define READ8_HANDLER(name) UINT8 name(ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset)
-#define WRITE8_HANDLER(name) void name(ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 data)
-#define READ16_HANDLER(name) UINT16 name(ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 mem_mask)
-#define WRITE16_HANDLER(name) void name(ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask)
-#define READ32_HANDLER(name) UINT32 name(ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 mem_mask)
-#define WRITE32_HANDLER(name) void name(ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 data, ATTR_UNUSED UINT32 mem_mask)
-#define READ64_HANDLER(name) UINT64 name(ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 mem_mask)
-#define WRITE64_HANDLER(name) void name(ATTR_UNUSED const address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 data, ATTR_UNUSED UINT64 mem_mask)
+#define READ8_HANDLER(name) UINT8 name(ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset)
+#define WRITE8_HANDLER(name) void name(ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT8 data)
+#define READ16_HANDLER(name) UINT16 name(ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 mem_mask)
+#define WRITE16_HANDLER(name) void name(ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT16 data, ATTR_UNUSED UINT16 mem_mask)
+#define READ32_HANDLER(name) UINT32 name(ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 mem_mask)
+#define WRITE32_HANDLER(name) void name(ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT32 data, ATTR_UNUSED UINT32 mem_mask)
+#define READ64_HANDLER(name) UINT64 name(ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 mem_mask)
+#define WRITE64_HANDLER(name) void name(ATTR_UNUSED address_space *space, ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64 data, ATTR_UNUSED UINT64 mem_mask)
// device read/write handler function macros
@@ -838,37 +838,37 @@ inline UINT64 direct_read_data::read_decrypted_qword(offs_t byteaddress)
// LEGACY FUNCTIONS TO REMOVE
//**************************************************************************
-static inline UINT8 memory_read_byte(const address_space *space, offs_t byteaddress)
+static inline UINT8 memory_read_byte(address_space *space, offs_t byteaddress)
{
return const_cast<address_space *>(space)->read_byte(byteaddress);
}
-static inline UINT16 memory_read_word(const address_space *space, offs_t byteaddress)
+static inline UINT16 memory_read_word(address_space *space, offs_t byteaddress)
{
return const_cast<address_space *>(space)->read_word(byteaddress);
}
-static inline UINT16 memory_read_word_masked(const address_space *space, offs_t byteaddress, UINT16 mask)
+static inline UINT16 memory_read_word_masked(address_space *space, offs_t byteaddress, UINT16 mask)
{
return const_cast<address_space *>(space)->read_word(byteaddress, mask);
}
-static inline UINT32 memory_read_dword(const address_space *space, offs_t byteaddress)
+static inline UINT32 memory_read_dword(address_space *space, offs_t byteaddress)
{
return const_cast<address_space *>(space)->read_dword(byteaddress);
}
-static inline UINT32 memory_read_dword_masked(const address_space *space, offs_t byteaddress, UINT32 mask)
+static inline UINT32 memory_read_dword_masked(address_space *space, offs_t byteaddress, UINT32 mask)
{
return const_cast<address_space *>(space)->read_dword(byteaddress, mask);
}
-static inline UINT64 memory_read_qword(const address_space *space, offs_t byteaddress)
+static inline UINT64 memory_read_qword(address_space *space, offs_t byteaddress)
{
return const_cast<address_space *>(space)->read_qword(byteaddress);
}
-static inline UINT64 memory_read_qword_masked(const address_space *space, offs_t byteaddress, UINT64 mask)
+static inline UINT64 memory_read_qword_masked(address_space *space, offs_t byteaddress, UINT64 mask)
{
return const_cast<address_space *>(space)->read_qword(byteaddress, mask);
}
@@ -879,222 +879,222 @@ static inline UINT64 memory_read_qword_masked(const address_space *space, offs_t
value to the specified address space
-------------------------------------------------*/
-static inline void memory_write_byte(const address_space *space, offs_t byteaddress, UINT8 data)
+static inline void memory_write_byte(address_space *space, offs_t byteaddress, UINT8 data)
{
const_cast<address_space *>(space)->write_byte(byteaddress, data);
}
-static inline void memory_write_word(const address_space *space, offs_t byteaddress, UINT16 data)
+static inline void memory_write_word(address_space *space, offs_t byteaddress, UINT16 data)
{
const_cast<address_space *>(space)->write_word(byteaddress, data);
}
-static inline void memory_write_word_masked(const address_space *space, offs_t byteaddress, UINT16 data, UINT16 mask)
+static inline void memory_write_word_masked(address_space *space, offs_t byteaddress, UINT16 data, UINT16 mask)
{
const_cast<address_space *>(space)->write_word(byteaddress, data, mask);
}
-static inline void memory_write_dword(const address_space *space, offs_t byteaddress, UINT32 data)
+static inline void memory_write_dword(address_space *space, offs_t byteaddress, UINT32 data)
{
const_cast<address_space *>(space)->write_dword(byteaddress, data);
}
-static inline void memory_write_dword_masked(const address_space *space, offs_t byteaddress, UINT32 data, UINT32 mask)
+static inline void memory_write_dword_masked(address_space *space, offs_t byteaddress, UINT32 data, UINT32 mask)
{
const_cast<address_space *>(space)->write_dword(byteaddress, data, mask);
}
-static inline void memory_write_qword(const address_space *space, offs_t byteaddress, UINT64 data)
+static inline void memory_write_qword(address_space *space, offs_t byteaddress, UINT64 data)
{
const_cast<address_space *>(space)->write_qword(byteaddress, data);
}
-static inline void memory_write_qword_masked(const address_space *space, offs_t byteaddress, UINT64 data, UINT64 mask)
+static inline void memory_write_qword_masked(address_space *space, offs_t byteaddress, UINT64 data, UINT64 mask)
{
const_cast<address_space *>(space)->write_qword(byteaddress, data, mask);
}
-static inline void *memory_raw_read_ptr(const address_space *space, offs_t byteaddress) { return space->direct().read_raw_ptr(byteaddress); }
-static inline UINT8 memory_raw_read_byte(const address_space *space, offs_t byteaddress) { return space->direct().read_raw_byte(byteaddress); }
-static inline UINT16 memory_raw_read_word(const address_space *space, offs_t byteaddress) { return space->direct().read_raw_word(byteaddress); }
-static inline UINT32 memory_raw_read_dword(const address_space *space, offs_t byteaddress) { return space->direct().read_raw_dword(byteaddress); }
-static inline UINT64 memory_raw_read_qword(const address_space *space, offs_t byteaddress) { return space->direct().read_raw_qword(byteaddress); }
+static inline void *memory_raw_read_ptr(address_space *space, offs_t byteaddress) { return space->direct().read_raw_ptr(byteaddress); }
+static inline UINT8 memory_raw_read_byte(address_space *space, offs_t byteaddress) { return space->direct().read_raw_byte(byteaddress); }
+static inline UINT16 memory_raw_read_word(address_space *space, offs_t byteaddress) { return space->direct().read_raw_word(byteaddress); }
+static inline UINT32 memory_raw_read_dword(address_space *space, offs_t byteaddress) { return space->direct().read_raw_dword(byteaddress); }
+static inline UINT64 memory_raw_read_qword(address_space *space, offs_t byteaddress) { return space->direct().read_raw_qword(byteaddress); }
-static inline void *memory_decrypted_read_ptr(const address_space *space, offs_t byteaddress) { return space->direct().read_decrypted_ptr(byteaddress); }
-static inline UINT8 memory_decrypted_read_byte(const address_space *space, offs_t byteaddress) { return space->direct().read_decrypted_byte(byteaddress); }
-static inline UINT16 memory_decrypted_read_word(const address_space *space, offs_t byteaddress) { return space->direct().read_decrypted_word(byteaddress); }
-static inline UINT32 memory_decrypted_read_dword(const address_space *space, offs_t byteaddress) { return space->direct().read_decrypted_dword(byteaddress); }
-static inline UINT64 memory_decrypted_read_qword(const address_space *space, offs_t byteaddress) { return space->direct().read_decrypted_qword(byteaddress); }
+static inline void *memory_decrypted_read_ptr(address_space *space, offs_t byteaddress) { return space->direct().read_decrypted_ptr(byteaddress); }
+static inline UINT8 memory_decrypted_read_byte(address_space *space, offs_t byteaddress) { return space->direct().read_decrypted_byte(byteaddress); }
+static inline UINT16 memory_decrypted_read_word(address_space *space, offs_t byteaddress) { return space->direct().read_decrypted_word(byteaddress); }
+static inline UINT32 memory_decrypted_read_dword(address_space *space, offs_t byteaddress) { return space->direct().read_decrypted_dword(byteaddress); }
+static inline UINT64 memory_decrypted_read_qword(address_space *space, offs_t byteaddress) { return space->direct().read_decrypted_qword(byteaddress); }
-static inline void memory_set_decrypted_region(const address_space *space, offs_t addrstart, offs_t addrend, void *base)
+static inline void memory_set_decrypted_region(address_space *space, offs_t addrstart, offs_t addrend, void *base)
{
const_cast<address_space *>(space)->set_decrypted_region(addrstart, addrend, base);
}
-static inline void *memory_get_read_ptr(const address_space *space, offs_t byteaddress)
+static inline void *memory_get_read_ptr(address_space *space, offs_t byteaddress)
{
return const_cast<address_space *>(space)->get_read_ptr(byteaddress);
}
-static inline void *memory_get_write_ptr(const address_space *space, offs_t byteaddress)
+static inline void *memory_get_write_ptr(address_space *space, offs_t byteaddress)
{
return const_cast<address_space *>(space)->get_write_ptr(byteaddress);
}
-static inline const char *memory_get_handler_string(const address_space *space, read_or_write readorwrite, offs_t byteaddress)
+static inline const char *memory_get_handler_string(address_space *space, read_or_write readorwrite, offs_t byteaddress)
{
return const_cast<address_space *>(space)->get_handler_string(readorwrite, byteaddress);
}
-static inline void memory_enable_read_watchpoints(const address_space *space, bool enable)
+static inline void memory_enable_read_watchpoints(address_space *space, bool enable)
{
const_cast<address_space *>(space)->enable_read_watchpoints(enable);
}
-static inline void memory_enable_write_watchpoints(const address_space *space, bool enable)
+static inline void memory_enable_write_watchpoints(address_space *space, bool enable)
{
const_cast<address_space *>(space)->enable_write_watchpoints(enable);
}
-static inline void memory_set_debugger_access(const address_space *space, bool debugger)
+static inline void memory_set_debugger_access(address_space *space, bool debugger)
{
const_cast<address_space *>(space)->set_debugger_access(debugger);
}
-static inline void memory_set_log_unmap(const address_space *space, bool log)
+static inline void memory_set_log_unmap(address_space *space, bool log)
{
const_cast<address_space *>(space)->set_log_unmap(log);
}
-static inline bool memory_get_log_unmap(const address_space *space)
+static inline bool memory_get_log_unmap(address_space *space)
{
return space->log_unmap();
}
// declare generic address space handlers
-static inline UINT8 memory_read_byte_8le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
-static inline UINT16 memory_read_word_8le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
-static inline UINT16 memory_read_word_masked_8le(const address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
-static inline UINT32 memory_read_dword_8le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
-static inline UINT32 memory_read_dword_masked_8le(const address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
-static inline UINT64 memory_read_qword_8le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
-static inline UINT64 memory_read_qword_masked_8le(const address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
-static inline void memory_write_byte_8le(const address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
-static inline void memory_write_word_8le(const address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
-static inline void memory_write_word_masked_8le(const address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
-static inline void memory_write_dword_8le(const address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
-static inline void memory_write_dword_masked_8le(const address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
-static inline void memory_write_qword_8le(const address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
-static inline void memory_write_qword_masked_8le(const address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
-
-static inline UINT8 memory_read_byte_8be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
-static inline UINT16 memory_read_word_8be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
-static inline UINT16 memory_read_word_masked_8be(const address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
-static inline UINT32 memory_read_dword_8be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
-static inline UINT32 memory_read_dword_masked_8be(const address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
-static inline UINT64 memory_read_qword_8be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
-static inline UINT64 memory_read_qword_masked_8be(const address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
-static inline void memory_write_byte_8be(const address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
-static inline void memory_write_word_8be(const address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
-static inline void memory_write_word_masked_8be(const address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
-static inline void memory_write_dword_8be(const address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
-static inline void memory_write_dword_masked_8be(const address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
-static inline void memory_write_qword_8be(const address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
-static inline void memory_write_qword_masked_8be(const address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
-
-static inline UINT8 memory_read_byte_16le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
-static inline UINT16 memory_read_word_16le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
-static inline UINT16 memory_read_word_masked_16le(const address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
-static inline UINT32 memory_read_dword_16le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
-static inline UINT32 memory_read_dword_masked_16le(const address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
-static inline UINT64 memory_read_qword_16le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
-static inline UINT64 memory_read_qword_masked_16le(const address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
-static inline void memory_write_byte_16le(const address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
-static inline void memory_write_word_16le(const address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
-static inline void memory_write_word_masked_16le(const address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
-static inline void memory_write_dword_16le(const address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
-static inline void memory_write_dword_masked_16le(const address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
-static inline void memory_write_qword_16le(const address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
-static inline void memory_write_qword_masked_16le(const address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
-
-static inline UINT8 memory_read_byte_16be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
-static inline UINT16 memory_read_word_16be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
-static inline UINT16 memory_read_word_masked_16be(const address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
-static inline UINT32 memory_read_dword_16be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
-static inline UINT32 memory_read_dword_masked_16be(const address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
-static inline UINT64 memory_read_qword_16be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
-static inline UINT64 memory_read_qword_masked_16be(const address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
-static inline void memory_write_byte_16be(const address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
-static inline void memory_write_word_16be(const address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
-static inline void memory_write_word_masked_16be(const address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
-static inline void memory_write_dword_16be(const address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
-static inline void memory_write_dword_masked_16be(const address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
-static inline void memory_write_qword_16be(const address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
-static inline void memory_write_qword_masked_16be(const address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
-
-static inline UINT8 memory_read_byte_32le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
-static inline UINT16 memory_read_word_32le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
-static inline UINT16 memory_read_word_masked_32le(const address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
-static inline UINT32 memory_read_dword_32le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
-static inline UINT32 memory_read_dword_masked_32le(const address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
-static inline UINT64 memory_read_qword_32le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
-static inline UINT64 memory_read_qword_masked_32le(const address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
-static inline void memory_write_byte_32le(const address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
-static inline void memory_write_word_32le(const address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
-static inline void memory_write_word_masked_32le(const address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
-static inline void memory_write_dword_32le(const address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
-static inline void memory_write_dword_masked_32le(const address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
-static inline void memory_write_qword_32le(const address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
-static inline void memory_write_qword_masked_32le(const address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
-
-static inline UINT8 memory_read_byte_32be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
-static inline UINT16 memory_read_word_32be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
-static inline UINT16 memory_read_word_masked_32be(const address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
-static inline UINT32 memory_read_dword_32be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
-static inline UINT32 memory_read_dword_masked_32be(const address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
-static inline UINT64 memory_read_qword_32be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
-static inline UINT64 memory_read_qword_masked_32be(const address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
-static inline void memory_write_byte_32be(const address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
-static inline void memory_write_word_32be(const address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
-static inline void memory_write_word_masked_32be(const address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
-static inline void memory_write_dword_32be(const address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
-static inline void memory_write_dword_masked_32be(const address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
-static inline void memory_write_qword_32be(const address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
-static inline void memory_write_qword_masked_32be(const address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
-
-static inline UINT8 memory_read_byte_64le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
-static inline UINT16 memory_read_word_64le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
-static inline UINT16 memory_read_word_masked_64le(const address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
-static inline UINT32 memory_read_dword_64le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
-static inline UINT32 memory_read_dword_masked_64le(const address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
-static inline UINT64 memory_read_qword_64le(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
-static inline UINT64 memory_read_qword_masked_64le(const address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
-static inline void memory_write_byte_64le(const address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
-static inline void memory_write_word_64le(const address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
-static inline void memory_write_word_masked_64le(const address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
-static inline void memory_write_dword_64le(const address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
-static inline void memory_write_dword_masked_64le(const address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
-static inline void memory_write_qword_64le(const address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
-static inline void memory_write_qword_masked_64le(const address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
-
-static inline UINT8 memory_read_byte_64be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
-static inline UINT16 memory_read_word_64be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
-static inline UINT16 memory_read_word_masked_64be(const address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
-static inline UINT32 memory_read_dword_64be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
-static inline UINT32 memory_read_dword_masked_64be(const address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
-static inline UINT64 memory_read_qword_64be(const address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
-static inline UINT64 memory_read_qword_masked_64be(const address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
-static inline void memory_write_byte_64be(const address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
-static inline void memory_write_word_64be(const address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
-static inline void memory_write_word_masked_64be(const address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
-static inline void memory_write_dword_64be(const address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
-static inline void memory_write_dword_masked_64be(const address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
-static inline void memory_write_qword_64be(const address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
-static inline void memory_write_qword_masked_64be(const address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
+static inline UINT8 memory_read_byte_8le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
+static inline UINT16 memory_read_word_8le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
+static inline UINT16 memory_read_word_masked_8le(address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
+static inline UINT32 memory_read_dword_8le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
+static inline UINT32 memory_read_dword_masked_8le(address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
+static inline UINT64 memory_read_qword_8le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
+static inline UINT64 memory_read_qword_masked_8le(address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
+static inline void memory_write_byte_8le(address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
+static inline void memory_write_word_8le(address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
+static inline void memory_write_word_masked_8le(address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
+static inline void memory_write_dword_8le(address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
+static inline void memory_write_dword_masked_8le(address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
+static inline void memory_write_qword_8le(address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
+static inline void memory_write_qword_masked_8le(address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
+
+static inline UINT8 memory_read_byte_8be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
+static inline UINT16 memory_read_word_8be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
+static inline UINT16 memory_read_word_masked_8be(address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
+static inline UINT32 memory_read_dword_8be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
+static inline UINT32 memory_read_dword_masked_8be(address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
+static inline UINT64 memory_read_qword_8be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
+static inline UINT64 memory_read_qword_masked_8be(address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
+static inline void memory_write_byte_8be(address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
+static inline void memory_write_word_8be(address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
+static inline void memory_write_word_masked_8be(address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
+static inline void memory_write_dword_8be(address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
+static inline void memory_write_dword_masked_8be(address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
+static inline void memory_write_qword_8be(address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
+static inline void memory_write_qword_masked_8be(address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
+
+static inline UINT8 memory_read_byte_16le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
+static inline UINT16 memory_read_word_16le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
+static inline UINT16 memory_read_word_masked_16le(address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
+static inline UINT32 memory_read_dword_16le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
+static inline UINT32 memory_read_dword_masked_16le(address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
+static inline UINT64 memory_read_qword_16le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
+static inline UINT64 memory_read_qword_masked_16le(address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
+static inline void memory_write_byte_16le(address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
+static inline void memory_write_word_16le(address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
+static inline void memory_write_word_masked_16le(address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
+static inline void memory_write_dword_16le(address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
+static inline void memory_write_dword_masked_16le(address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
+static inline void memory_write_qword_16le(address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
+static inline void memory_write_qword_masked_16le(address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
+
+static inline UINT8 memory_read_byte_16be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
+static inline UINT16 memory_read_word_16be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
+static inline UINT16 memory_read_word_masked_16be(address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
+static inline UINT32 memory_read_dword_16be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
+static inline UINT32 memory_read_dword_masked_16be(address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
+static inline UINT64 memory_read_qword_16be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
+static inline UINT64 memory_read_qword_masked_16be(address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
+static inline void memory_write_byte_16be(address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
+static inline void memory_write_word_16be(address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
+static inline void memory_write_word_masked_16be(address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
+static inline void memory_write_dword_16be(address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
+static inline void memory_write_dword_masked_16be(address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
+static inline void memory_write_qword_16be(address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
+static inline void memory_write_qword_masked_16be(address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
+
+static inline UINT8 memory_read_byte_32le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
+static inline UINT16 memory_read_word_32le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
+static inline UINT16 memory_read_word_masked_32le(address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
+static inline UINT32 memory_read_dword_32le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
+static inline UINT32 memory_read_dword_masked_32le(address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
+static inline UINT64 memory_read_qword_32le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
+static inline UINT64 memory_read_qword_masked_32le(address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
+static inline void memory_write_byte_32le(address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
+static inline void memory_write_word_32le(address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
+static inline void memory_write_word_masked_32le(address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
+static inline void memory_write_dword_32le(address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
+static inline void memory_write_dword_masked_32le(address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
+static inline void memory_write_qword_32le(address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
+static inline void memory_write_qword_masked_32le(address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
+
+static inline UINT8 memory_read_byte_32be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
+static inline UINT16 memory_read_word_32be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
+static inline UINT16 memory_read_word_masked_32be(address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
+static inline UINT32 memory_read_dword_32be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
+static inline UINT32 memory_read_dword_masked_32be(address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
+static inline UINT64 memory_read_qword_32be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
+static inline UINT64 memory_read_qword_masked_32be(address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
+static inline void memory_write_byte_32be(address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
+static inline void memory_write_word_32be(address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
+static inline void memory_write_word_masked_32be(address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
+static inline void memory_write_dword_32be(address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
+static inline void memory_write_dword_masked_32be(address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
+static inline void memory_write_qword_32be(address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
+static inline void memory_write_qword_masked_32be(address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
+
+static inline UINT8 memory_read_byte_64le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
+static inline UINT16 memory_read_word_64le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
+static inline UINT16 memory_read_word_masked_64le(address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
+static inline UINT32 memory_read_dword_64le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
+static inline UINT32 memory_read_dword_masked_64le(address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
+static inline UINT64 memory_read_qword_64le(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
+static inline UINT64 memory_read_qword_masked_64le(address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
+static inline void memory_write_byte_64le(address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
+static inline void memory_write_word_64le(address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
+static inline void memory_write_word_masked_64le(address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
+static inline void memory_write_dword_64le(address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
+static inline void memory_write_dword_masked_64le(address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
+static inline void memory_write_qword_64le(address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
+static inline void memory_write_qword_masked_64le(address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
+
+static inline UINT8 memory_read_byte_64be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_byte(address); }
+static inline UINT16 memory_read_word_64be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_word(address); }
+static inline UINT16 memory_read_word_masked_64be(address_space *space, offs_t address, UINT16 mask) { return (const_cast<address_space *>(space))->read_word(address, mask); }
+static inline UINT32 memory_read_dword_64be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_dword(address); }
+static inline UINT32 memory_read_dword_masked_64be(address_space *space, offs_t address, UINT32 mask) { return (const_cast<address_space *>(space))->read_dword(address, mask); }
+static inline UINT64 memory_read_qword_64be(address_space *space, offs_t address) { return (const_cast<address_space *>(space))->read_qword(address); }
+static inline UINT64 memory_read_qword_masked_64be(address_space *space, offs_t address, UINT64 mask) { return (const_cast<address_space *>(space))->read_qword(address, mask); }
+static inline void memory_write_byte_64be(address_space *space, offs_t address, UINT8 data) { return (const_cast<address_space *>(space))->write_byte(address, data); }
+static inline void memory_write_word_64be(address_space *space, offs_t address, UINT16 data) { return (const_cast<address_space *>(space))->write_word(address, data); }
+static inline void memory_write_word_masked_64be(address_space *space, offs_t address, UINT16 data, UINT16 mask) { return (const_cast<address_space *>(space))->write_word(address, data, mask); }
+static inline void memory_write_dword_64be(address_space *space, offs_t address, UINT32 data) { return (const_cast<address_space *>(space))->write_dword(address, data); }
+static inline void memory_write_dword_masked_64be(address_space *space, offs_t address, UINT32 data, UINT32 mask) { return (const_cast<address_space *>(space))->write_dword(address, data, mask); }
+static inline void memory_write_qword_64be(address_space *space, offs_t address, UINT64 data) { return (const_cast<address_space *>(space))->write_qword(address, data); }
+static inline void memory_write_qword_masked_64be(address_space *space, offs_t address, UINT64 data, UINT64 mask) { return (const_cast<address_space *>(space))->write_qword(address, data, mask); }
#endif /* __MEMORY_H__ */
diff --git a/src/emu/sound/nes_defs.h b/src/emu/sound/nes_defs.h
index 0cbd8431404..0f3932fe575 100644
--- a/src/emu/sound/nes_defs.h
+++ b/src/emu/sound/nes_defs.h
@@ -137,7 +137,7 @@ typedef struct dpcm_s
uint8 cur_byte;
boolean enabled;
boolean irq_occurred;
- const address_space *memory;
+ address_space *memory;
signed char vol;
} dpcm_t;
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index ac244b65f86..bb37aa2287e 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -227,7 +227,7 @@ struct _SCSP
running_device *device;
};
-static void dma_scsp(const address_space *space, struct _SCSP *SCSP); /*SCSP DMA transfer function*/
+static void dma_scsp(address_space *space, struct _SCSP *SCSP); /*SCSP DMA transfer function*/
#define scsp_dgate scsp_regs[0x16/2] & 0x4000
#define scsp_ddir scsp_regs[0x16/2] & 0x2000
#define scsp_dexe scsp_regs[0x16/2] & 0x1000
@@ -698,7 +698,7 @@ static void SCSP_UpdateSlotReg(struct _SCSP *SCSP,int s,int r)
static void SCSP_UpdateReg(struct _SCSP *SCSP, int reg)
{
/* temporary hack until this is converted to a device */
- const address_space *space = device_get_space(SCSP->device->machine->firstcpu, AS_PROGRAM);
+ address_space *space = device_get_space(SCSP->device->machine->firstcpu, AS_PROGRAM);
switch(reg&0x3f)
{
case 0x2:
@@ -1168,7 +1168,7 @@ static void SCSP_DoMasterSamples(struct _SCSP *SCSP, int nsamples)
}
}
-static void dma_scsp(const address_space *space, struct _SCSP *SCSP)
+static void dma_scsp(address_space *space, struct _SCSP *SCSP)
{
static UINT16 tmp_dma[3], *scsp_regs;
diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c
index 7a22ad892e2..e4657d5c26e 100644
--- a/src/emu/video/pc_vga.c
+++ b/src/emu/video/pc_vga.c
@@ -596,7 +596,7 @@ static WRITE64_HANDLER( vga_ega64_w ) { write64be_with_write8_handler(vga_ega_w,
static void vga_cpu_interface(running_machine *machine)
{
- const address_space *space = cpu_get_address_space(machine->firstcpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(machine->firstcpu, ADDRESS_SPACE_PROGRAM);
static int sequencer, gc;
read8_space_func read_handler;
write8_space_func write_handler;
@@ -1220,7 +1220,7 @@ static WRITE64_HANDLER( vga_port64be_03d0_w ) { write64be_with_write8_handler(vg
void pc_vga_init(running_machine *machine, const struct pc_vga_interface *vga_intf, const struct pc_svga_interface *svga_intf)
{
int i, j, k, mask, buswidth;
- const address_space *spacevga;
+ address_space *spacevga;
memset(&vga, 0, sizeof(vga));
diff --git a/src/emu/video/tms34061.c b/src/emu/video/tms34061.c
index 6d53fe75cec..c71d10f6b33 100644
--- a/src/emu/video/tms34061.c
+++ b/src/emu/video/tms34061.c
@@ -164,7 +164,7 @@ static TIMER_CALLBACK( tms34061_interrupt )
*
*************************************/
-static void register_w(const address_space *space, offs_t offset, UINT8 data)
+static void register_w(address_space *space, offs_t offset, UINT8 data)
{
int scanline;
int regnum = offset >> 2;
@@ -235,7 +235,7 @@ static void register_w(const address_space *space, offs_t offset, UINT8 data)
*
*************************************/
-static UINT8 register_r(const address_space *space, offs_t offset)
+static UINT8 register_r(address_space *space, offs_t offset)
{
int regnum = offset >> 2;
UINT16 result;
@@ -357,7 +357,7 @@ INLINE void adjust_xyaddress(int offset)
}
-static void xypixel_w(const address_space *space, int offset, UINT8 data)
+static void xypixel_w(address_space *space, int offset, UINT8 data)
{
/* determine the offset, then adjust it */
offs_t pixeloffs = tms34061.regs[TMS34061_XYADDRESS];
@@ -377,7 +377,7 @@ static void xypixel_w(const address_space *space, int offset, UINT8 data)
}
-static UINT8 xypixel_r(const address_space *space, int offset)
+static UINT8 xypixel_r(address_space *space, int offset)
{
/* determine the offset, then adjust it */
offs_t pixeloffs = tms34061.regs[TMS34061_XYADDRESS];
@@ -402,7 +402,7 @@ static UINT8 xypixel_r(const address_space *space, int offset)
*
*************************************/
-void tms34061_w(const address_space *space, int col, int row, int func, UINT8 data)
+void tms34061_w(address_space *space, int col, int row, int func, UINT8 data)
{
offs_t offs;
@@ -464,7 +464,7 @@ void tms34061_w(const address_space *space, int col, int row, int func, UINT8 da
}
-UINT8 tms34061_r(const address_space *space, int col, int row, int func)
+UINT8 tms34061_r(address_space *space, int col, int row, int func)
{
int result = 0;
offs_t offs;
diff --git a/src/emu/video/tms34061.h b/src/emu/video/tms34061.h
index 2bd0ff23157..187a80f7be0 100644
--- a/src/emu/video/tms34061.h
+++ b/src/emu/video/tms34061.h
@@ -59,8 +59,8 @@ struct tms34061_display
void tms34061_start(running_machine *machine, const struct tms34061_interface *interface);
/* reads/writes to the 34061 */
-UINT8 tms34061_r(const address_space *space, int col, int row, int func);
-void tms34061_w(const address_space *space, int col, int row, int func, UINT8 data);
+UINT8 tms34061_r(address_space *space, int col, int row, int func);
+void tms34061_w(address_space *space, int col, int row, int func, UINT8 data);
/* latch settings */
READ8_HANDLER( tms34061_latch_r );
diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c
index 1c69251d2c1..43fdeb03961 100644
--- a/src/mame/audio/8080bw.c
+++ b/src/mame/audio/8080bw.c
@@ -908,7 +908,7 @@ static TIMER_CALLBACK( schaser_effect_555_cb )
static STATE_POSTLOAD( schaser_reinit_555_time_remain )
{
mw8080bw_state *state = machine->driver_data<mw8080bw_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
state->schaser_effect_555_time_remain = double_to_attotime(state->schaser_effect_555_time_remain_savable);
schaser_sh_port_2_w(space, 0, state->port_2_last_extra);
}
@@ -931,7 +931,7 @@ MACHINE_START( schaser_sh )
MACHINE_RESET( schaser_sh )
{
mw8080bw_state *state = machine->driver_data<mw8080bw_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
state->schaser_effect_555_is_low = 0;
timer_adjust_oneshot(state->schaser_effect_555_timer, attotime_never, 0);
diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c
index deed06cc77d..154edb9ea11 100644
--- a/src/mame/audio/cage.c
+++ b/src/mame/audio/cage.c
@@ -237,7 +237,7 @@ static TIMER_DEVICE_CALLBACK( dma_timer_callback )
}
-static void update_dma_state(const address_space *space)
+static void update_dma_state(address_space *space)
{
/* determine the new enabled state */
int enabled = ((tms32031_io_regs[DMA_GLOBAL_CTL] & 3) == 3) && (tms32031_io_regs[DMA_TRANSFER_COUNT] != 0);
@@ -517,7 +517,7 @@ static READ32_HANDLER( cage_io_status_r )
}
-UINT16 main_from_cage_r(const address_space *space)
+UINT16 main_from_cage_r(address_space *space)
{
if (LOG_COMM)
logerror("%s:main read data = %04X\n", cpuexec_describe_context(space->machine), soundlatch_word_r(space, 0, 0));
diff --git a/src/mame/audio/cage.h b/src/mame/audio/cage.h
index 0c1e5ce2564..0126ddaceaf 100644
--- a/src/mame/audio/cage.h
+++ b/src/mame/audio/cage.h
@@ -14,7 +14,7 @@ void cage_init(running_machine *machine, offs_t speedup);
void cage_set_irq_handler(void (*irqhandler)(running_machine *, int));
void cage_reset_w(int state);
-UINT16 main_from_cage_r(const address_space *space);
+UINT16 main_from_cage_r(address_space *space);
UINT16 cage_control_r(void);
void main_to_cage_w(UINT16 data);
void cage_control_w(running_machine *machine, UINT16 data);
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index ed4a4e0a2ce..aad913275bb 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -285,8 +285,8 @@ typedef struct _dcs_state dcs_state;
struct _dcs_state
{
cpu_device *cpu;
- const address_space *program;
- const address_space *data;
+ address_space *program;
+ address_space *data;
UINT8 rev;
offs_t polling_offset;
UINT32 polling_count;
@@ -2270,7 +2270,7 @@ static int preprocess_stage_1(running_machine *machine, UINT16 data)
static TIMER_CALLBACK( s2_ack_callback )
{
- const address_space *space = cpu_get_address_space(dcs.cpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(dcs.cpu, ADDRESS_SPACE_PROGRAM);
/* if the output is full, stall for a usec */
if (IS_OUTPUT_FULL())
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index 6ad4624a221..d6e7b6d69bd 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -42,7 +42,7 @@ static int random_offset;
static void gottlieb1_sh_w(running_device *riot, UINT8 data);
-static void gottlieb2_sh_w(const address_space *space, UINT8 data);
+static void gottlieb2_sh_w(address_space *space, UINT8 data);
static void trigger_sample(running_device *samples, UINT8 data);
@@ -369,7 +369,7 @@ INPUT_PORTS_END
*
*************************************/
-static void gottlieb2_sh_w(const address_space *space, UINT8 data)
+static void gottlieb2_sh_w(address_space *space, UINT8 data)
{
/* when data is not 0xff, the transparent latch at A3 allows it to pass through unmolested */
if (data != 0xff)
diff --git a/src/mame/audio/harddriv.c b/src/mame/audio/harddriv.c
index 1001e082917..f8f58408457 100644
--- a/src/mame/audio/harddriv.c
+++ b/src/mame/audio/harddriv.c
@@ -242,7 +242,7 @@ WRITE16_HANDLER( hdsnd68k_320ram_w )
READ16_HANDLER( hdsnd68k_320ports_r )
{
harddriv_state *state = space->machine->driver_data<harddriv_state>();
- const address_space *iospace = cpu_get_address_space(state->sounddsp, ADDRESS_SPACE_IO);
+ address_space *iospace = cpu_get_address_space(state->sounddsp, ADDRESS_SPACE_IO);
return memory_read_word(iospace, (offset & 7) << 1);
}
@@ -250,7 +250,7 @@ READ16_HANDLER( hdsnd68k_320ports_r )
WRITE16_HANDLER( hdsnd68k_320ports_w )
{
harddriv_state *state = space->machine->driver_data<harddriv_state>();
- const address_space *iospace = cpu_get_address_space(state->sounddsp, ADDRESS_SPACE_IO);
+ address_space *iospace = cpu_get_address_space(state->sounddsp, ADDRESS_SPACE_IO);
memory_write_word(iospace, (offset & 7) << 1, data);
}
diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c
index b1cf37e0b56..e622a5fbfc5 100644
--- a/src/mame/audio/leland.c
+++ b/src/mame/audio/leland.c
@@ -380,7 +380,7 @@ static STREAM_UPDATE( leland_80186_dac_update )
static STREAM_UPDATE( leland_80186_dma_update )
{
- const address_space *dmaspace = (const address_space *)param;
+ address_space *dmaspace = (address_space *)param;
stream_sample_t *buffer = outputs[0];
int i, j;
@@ -514,7 +514,7 @@ static TIMER_CALLBACK( dma_timer_callback );
static DEVICE_START( common_sh_start )
{
running_machine *machine = device->machine;
- const address_space *dmaspace = cputag_get_address_space(machine, "audiocpu", AS_PROGRAM);
+ address_space *dmaspace = cputag_get_address_space(machine, "audiocpu", AS_PROGRAM);
int i;
/* determine which sound hardware is installed */
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index c9cf9ff1c8b..bfa90c96710 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -448,7 +448,7 @@ DISCRETE_SOUND_END
*
****************************************************************/
-static void set_ea(const address_space *space, int ea)
+static void set_ea(address_space *space, int ea)
{
mario_state *state = space->machine->driver_data<mario_state>();
//printf("ea: %d\n", ea);
@@ -489,7 +489,7 @@ static SOUND_START( mario )
static SOUND_RESET( mario )
{
mario_state *state = machine->driver_data<mario_state>();
- const address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
#if USE_8039
set_ea(machine, 1);
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index d3cab0bd2c4..fad571710c1 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -104,7 +104,7 @@ static UINT8 decrypt_opcode(int a,int src)
void seibu_sound_decrypt(running_machine *machine,const char *cpu,int length)
{
- const address_space *space = cputag_get_address_space(machine, cpu, ADDRESS_SPACE_PROGRAM);
+ 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);
int i;
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index 450f535a74f..36c76867c81 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -486,7 +486,7 @@ void williams_cvsd_data_w(running_machine *machine, int data)
void williams_cvsd_reset_w(int state)
{
- const address_space *space = cpu_get_address_space(sound_cpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(sound_cpu, ADDRESS_SPACE_PROGRAM);
/* going high halts the CPU */
if (state)
@@ -581,7 +581,7 @@ static WRITE8_HANDLER( narc_slave_sync_w )
void williams_narc_data_w(int data)
{
- const address_space *space = cpu_get_address_space(sound_cpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(sound_cpu, ADDRESS_SPACE_PROGRAM);
soundlatch_w(space, 0, data & 0xff);
cpu_set_input_line(sound_cpu, INPUT_LINE_NMI, (data & 0x100) ? CLEAR_LINE : ASSERT_LINE);
@@ -598,7 +598,7 @@ void williams_narc_reset_w(int state)
/* going high halts the CPU */
if (state)
{
- const address_space *space = cpu_get_address_space(sound_cpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(sound_cpu, ADDRESS_SPACE_PROGRAM);
narc_master_bank_select_w(space, 0, 0);
narc_slave_bank_select_w(space, 0, 0);
init_audio_state(space->machine);
@@ -668,7 +668,7 @@ static WRITE8_HANDLER( adpcm_talkback_w )
void williams_adpcm_data_w(int data)
{
- const address_space *space = cpu_get_address_space(sound_cpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(sound_cpu, ADDRESS_SPACE_PROGRAM);
soundlatch_w(space, 0, data & 0xff);
if (!(data & 0x200))
{
@@ -684,7 +684,7 @@ void williams_adpcm_reset_w(int state)
/* going high halts the CPU */
if (state)
{
- const address_space *space = cpu_get_address_space(sound_cpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(sound_cpu, ADDRESS_SPACE_PROGRAM);
adpcm_bank_select_w(space, 0, 0);
init_audio_state(space->machine);
cpu_set_input_line(sound_cpu, INPUT_LINE_RESET, ASSERT_LINE);
diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c
index 583bbd0731d..c157b4a865d 100644
--- a/src/mame/drivers/39in1.c
+++ b/src/mame/drivers/39in1.c
@@ -79,7 +79,7 @@ static WRITE32_HANDLER( pxa255_intc_w );
static READ32_HANDLER( pxa255_gpio_r );
static WRITE32_HANDLER( pxa255_gpio_w );
-static void pxa255_lcd_load_dma_descriptor(const address_space* space, UINT32 address, int channel);
+static void pxa255_lcd_load_dma_descriptor(address_space* space, UINT32 address, int channel);
static void pxa255_lcd_irq_check(running_machine* machine);
static void pxa255_lcd_dma_kickoff(running_machine* machine, int channel);
static void pxa255_lcd_check_load_next_branch(running_machine* machine, int channel);
@@ -1048,7 +1048,7 @@ static WRITE32_HANDLER( pxa255_gpio_w )
*/
-static void pxa255_lcd_load_dma_descriptor(const address_space* space, UINT32 address, int channel)
+static void pxa255_lcd_load_dma_descriptor(address_space* space, UINT32 address, int channel)
{
_39in1_state *state = space->machine->driver_data<_39in1_state>();
PXA255_LCD_Regs *lcd_regs = &state->lcd_regs;
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 431f31b7073..08a807b2e30 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -198,7 +198,7 @@ static CUSTOM_INPUT( lightgun_holster_r )
static WRITE8_DEVICE_HANDLER( alg_cia_0_porta_w )
{
- const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* switch banks as appropriate */
memory_set_bank(device->machine, "bank1", data & 1);
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index 90888de95cf..8619977a257 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -605,7 +605,7 @@ static DRIVER_INIT(robowres)
static DRIVER_INIT(robowresb)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_set_decrypted_region(space, 0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x1c000);
}
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index b5d970171cc..2a35aae9a1d 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -455,7 +455,7 @@ static WRITE8_HANDLER( profpac_banksw_w )
static STATE_POSTLOAD( profbank_banksw_restore )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
profpac_banksw_w(space, 0, profpac_bank);
}
@@ -1766,7 +1766,7 @@ static DRIVER_INIT( robby )
static DRIVER_INIT( profpac )
{
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
astrocade_video_config = AC_SOUND_PRESENT;
memory_install_read8_handler(iospace, 0x14, 0x14, 0x0fff, 0xff00, profpac_io_1_r);
@@ -1780,7 +1780,7 @@ static DRIVER_INIT( profpac )
static DRIVER_INIT( demndrgn )
{
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
astrocade_video_config = 0x00;
memory_install_read8_handler(iospace, 0x14, 0x14, 0x1fff, 0xff00, demndrgn_io_r);
@@ -1796,7 +1796,7 @@ static DRIVER_INIT( demndrgn )
static DRIVER_INIT( tenpindx )
{
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
astrocade_video_config = 0x00;
memory_install_read_port(iospace, 0x60, 0x60, 0x0000, 0xff00, "P60");
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index 32f4c32d6eb..dcc00eab9ea 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -81,7 +81,7 @@ static MACHINE_RESET( atarigt )
static void cage_irq_callback(running_machine *machine, int reason)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
if (reason)
atarigen_sound_int_gen(machine->device("maincpu"));
@@ -280,7 +280,7 @@ static void tmek_update_mode(offs_t offset)
}
-static void tmek_protection_w(const address_space *space, offs_t offset, UINT16 data)
+static void tmek_protection_w(address_space *space, offs_t offset, UINT16 data)
{
/*
T-Mek init:
@@ -303,7 +303,7 @@ static void tmek_protection_w(const address_space *space, offs_t offset, UINT16
}
}
-static void tmek_protection_r(const address_space *space, offs_t offset, UINT16 *data)
+static void tmek_protection_r(address_space *space, offs_t offset, UINT16 *data)
{
if (LOG_PROTECTION) logerror("%06X:Protection R@%06X\n", cpu_get_previouspc(space->cpu), offset);
@@ -369,7 +369,7 @@ static void primage_update_mode(offs_t offset)
-static void primrage_protection_w(const address_space *space, offs_t offset, UINT16 data)
+static void primrage_protection_w(address_space *space, offs_t offset, UINT16 data)
{
if (LOG_PROTECTION)
{
@@ -439,7 +439,7 @@ static void primrage_protection_w(const address_space *space, offs_t offset, UIN
-static void primrage_protection_r(const address_space *space, offs_t offset, UINT16 *data)
+static void primrage_protection_r(address_space *space, offs_t offset, UINT16 *data)
{
/* track accesses */
primage_update_mode(offset);
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index b09370381e5..eedcdb581f3 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -346,7 +346,7 @@ static WRITE16_HANDLER( bankselect_w )
static STATE_POSTLOAD( bankselect_postload )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
atarisy2_state *state = machine->driver_data<atarisy2_state>();
bankselect_w(space, 0, state->bankselect[0], 0xffff);
diff --git a/src/mame/drivers/atarisy4.c b/src/mame/drivers/atarisy4.c
index ef0d7361cb9..e9000ffaf08 100644
--- a/src/mame/drivers/atarisy4.c
+++ b/src/mame/drivers/atarisy4.c
@@ -776,7 +776,7 @@ static inline UINT8 hex_to_ascii(UINT8 in)
return in;
}
-void load_ldafile(const address_space *space, const UINT8 *file)
+void load_ldafile(address_space *space, const UINT8 *file)
{
#define READ_CHAR() file[i++]
int i = 0;
@@ -830,7 +830,7 @@ void load_ldafile(const address_space *space, const UINT8 *file)
}
/* Load memory space with data from a Tektronix-Extended HEX file */
-void load_hexfile(const address_space *space, const UINT8 *file)
+void load_hexfile(address_space *space, const UINT8 *file)
{
#define READ_HEX_CHAR() hex_to_ascii(file[i++])
@@ -935,7 +935,7 @@ next_line:
static DRIVER_INIT( laststar )
{
- const address_space *main = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *main = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* Allocate 16kB of shared RAM */
shared_ram[0] = auto_alloc_array_clear(machine, UINT16, 0x2000);
diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c
index 2764e4ae401..3d972a94d58 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -186,7 +186,7 @@ static void update_interrupts(running_machine *machine)
static void scanline_update(screen_device &screen, int scanline)
{
- const address_space *space = cputag_get_address_space(screen.machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(screen.machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
/* sound IRQ is on 32V */
if (scanline & 32)
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index 732755d1516..4e53b4d9dbb 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -73,7 +73,7 @@ static UINT8 ls259_buf[8] = {0,0,0,0,0,0,0,0};
static WRITE8_DEVICE_HANDLER( bagman_ls259_w )
{
- const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
bagman_pal16r6_w(space, offset,data); /*this is just a simulation*/
if (ls259_buf[offset] != (data&1) )
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index d8f249b6482..cec711d58b7 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -2135,45 +2135,45 @@ static DRIVER_INIT( minigolf2 ) { expand_roms(machine, 0x0c); config_shoo
static DRIVER_INIT( toggle ) { expand_roms(machine, EXPAND_ALL); config_shooter_adc(machine, FALSE, 0 /* noanalog */); }
static DRIVER_INIT( nametune )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_install_write8_handler(space, 0x9f00, 0x9f00, 0, 0, balsente_rombank2_select_w);
expand_roms(machine, EXPAND_NONE | SWAP_HALVES); config_shooter_adc(machine, FALSE, 0 /* noanalog */);
}
static DRIVER_INIT( nstocker )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_install_write8_handler(space, 0x9f00, 0x9f00, 0, 0, balsente_rombank2_select_w);
expand_roms(machine, EXPAND_NONE | SWAP_HALVES); config_shooter_adc(machine, TRUE, 1);
}
static DRIVER_INIT( sfootbal )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_install_write8_handler(space, 0x9f00, 0x9f00, 0, 0, balsente_rombank2_select_w);
expand_roms(machine, EXPAND_ALL | SWAP_HALVES); config_shooter_adc(machine, FALSE, 0);
}
static DRIVER_INIT( spiker )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_install_readwrite8_handler(space, 0x9f80, 0x9f8f, 0, 0, spiker_expand_r, spiker_expand_w);
memory_install_write8_handler(space, 0x9f00, 0x9f00, 0, 0, balsente_rombank2_select_w);
expand_roms(machine, EXPAND_ALL | SWAP_HALVES); config_shooter_adc(machine, FALSE, 1);
}
static DRIVER_INIT( stompin )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_install_write8_handler(space, 0x9f00, 0x9f00, 0, 0, balsente_rombank2_select_w);
expand_roms(machine, 0x0c | SWAP_HALVES); config_shooter_adc(machine, FALSE, 32);
}
static DRIVER_INIT( rescraid ) { expand_roms(machine, EXPAND_NONE); config_shooter_adc(machine, FALSE, 0 /* noanalog */); }
static DRIVER_INIT( grudge )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_install_read8_handler(space, 0x9400, 0x9400, 0, 0, grudge_steering_r);
expand_roms(machine, EXPAND_NONE); config_shooter_adc(machine, FALSE, 0);
}
static DRIVER_INIT( shrike )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_install_readwrite8_handler(space, 0x9e00, 0x9fff, 0, 0, shrike_shared_6809_r, shrike_shared_6809_w);
memory_install_write8_handler(space, 0x9e01, 0x9e01, 0, 0, shrike_sprite_select_w );
memory_install_readwrite16_handler(cputag_get_address_space(machine, "68k", ADDRESS_SPACE_PROGRAM), 0x10000, 0x1001f, 0, 0, shrike_io_68k_r, shrike_io_68k_w);
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index d998bf7b292..1b8157b9a25 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -716,7 +716,7 @@ static NVRAM_HANDLER( bbusters )
static VIDEO_EOF( bbuster )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space,0,0,0xffff);
buffer_spriteram16_2_w(space,0,0,0xffff);
@@ -724,7 +724,7 @@ static VIDEO_EOF( bbuster )
static VIDEO_EOF( mechatt )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space,0,0,0xffff);
}
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index 8756e2f91cf..943f3813b4e 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -544,7 +544,7 @@ static READ8_HANDLER( berzerk_audio_r )
static SOUND_RESET(berzerk)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
/* clears the flip-flop controlling the volume and freq on the speech chip */
berzerk_audio_w(space, 4, 0x40);
}
@@ -1185,7 +1185,7 @@ ROM_END
static DRIVER_INIT( moonwarp )
{
- const address_space *io = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *io = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
memory_install_read8_handler (io, 0x48, 0x48, 0, 0, moonwarp_p1_r);
memory_install_read8_handler (io, 0x4a, 0x4a, 0, 0, moonwarp_p2_r);
}
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index c0e798227ed..215f9357de8 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -409,7 +409,7 @@ INLINE UINT8* blitter_get_addr(running_machine *machine, UINT32 addr)
The Flare One blitter is a simpler design with slightly different parameters
and will require hardware tests to figure everything out correctly.
*/
-static void RunBlit(const address_space *space)
+static void RunBlit(address_space *space)
{
#define BLITPRG_READ(x) blitter.x = *(blitter_get_addr(space->machine, blitter.program.addr++))
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index 9310e9a8aee..ab392cb77e4 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -308,7 +308,7 @@ static VIDEO_UPDATE( bigfghtr )
static VIDEO_EOF( bigfghtr )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
}
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 95046fe934b..6dd791d0da5 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -206,7 +206,7 @@ INLINE UINT8 swap_bits_5_6(UINT8 data)
}
-static void btime_decrypt( const address_space *space )
+static void btime_decrypt( address_space *space )
{
btime_state *state = space->machine->driver_data<btime_state>();
UINT8 *src, *src1;
@@ -2077,7 +2077,7 @@ ROM_END
static void decrypt_C10707_cpu(running_machine *machine, const char *cputag)
{
- const address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM);
+ 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);
offs_t addr;
@@ -2107,7 +2107,7 @@ static READ8_HANDLER( wtennis_reset_hack_r )
static void init_rom1(running_machine *machine)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 *rom = memory_region(machine, "maincpu");
decrypted = auto_alloc_array(machine, UINT8, 0x10000);
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index 4b57b96cde7..f2e680f9fbd 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -800,7 +800,7 @@ static WRITE8_HANDLER( analog_select_w )
static DRIVER_INIT( bradley )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_install_ram(space, 0x400, 0x7ff, 0, 0, NULL);
memory_install_read_port(space, 0x1808, 0x1808, 0, 0, "1808");
memory_install_read_port(space, 0x1809, 0x1809, 0, 0, "1809");
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index c35aefc21f5..23886a213f8 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -841,7 +841,7 @@ ROM_END
static void seibu_sound_bootleg(running_machine *machine,const char *cpu,int length)
{
- const address_space *space = cputag_get_address_space(machine, cpu, ADDRESS_SPACE_PROGRAM);
+ 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);
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index 7f06787e04d..f01c27a532d 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -555,7 +555,7 @@ static DRIVER_INIT( calorie )
static DRIVER_INIT( calorieb )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_set_decrypted_region(space, 0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x10000);
}
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index 710a7d4139d..8de84ef1a3e 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -1976,7 +1976,7 @@ ROM_END
static DRIVER_INIT( caterplr )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
running_device *device = machine->device("pokey");
memory_install_readwrite8_device_handler(space, device, 0x1000, 0x100f, 0, 0, caterplr_AY8910_r, caterplr_AY8910_w);
memory_install_read8_device_handler(space, device, 0x1780, 0x1780, 0, 0, caterplr_rand_r);
@@ -1985,7 +1985,7 @@ static DRIVER_INIT( caterplr )
static DRIVER_INIT( magworm )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
running_device *device = machine->device("pokey");
memory_install_write8_device_handler(space, device, 0x1001, 0x1001, 0, 0, ay8910_address_w);
memory_install_readwrite8_device_handler(space, device, 0x1003, 0x1003, 0, 0, ay8910_r, ay8910_data_w);
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index f96db5b5ddf..780fac27c06 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -697,7 +697,7 @@ static MACHINE_START( combatsc )
static MACHINE_RESET( combatsc )
{
combatsc_state *state = machine->driver_data<combatsc_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int i;
memset(state->io_ram, 0x00, 0x4000);
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index c8c11c4ba9a..1294887b5e6 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -521,7 +521,7 @@ ROM_END
static DRIVER_INIT( commando )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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, 0xc000);
int A;
@@ -541,7 +541,7 @@ static DRIVER_INIT( commando )
static DRIVER_INIT( spaceinv )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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, 0xc000);
int A;
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index 5f45652635d..51458acdbda 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -112,7 +112,7 @@ static void coolpool_scanline(screen_device &screen, bitmap_t *bitmap, int scanl
*
*************************************/
-static void coolpool_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+static void coolpool_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
coolpool_state *state = space->machine->driver_data<coolpool_state>();
@@ -120,7 +120,7 @@ static void coolpool_to_shiftreg(const address_space *space, UINT32 address, UIN
}
-static void coolpool_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+static void coolpool_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
coolpool_state *state = space->machine->driver_data<coolpool_state>();
@@ -317,7 +317,7 @@ static int amerdart_trackball_dec(int data)
return data;
}
-static int amerdart_trackball_direction(const address_space *space, int num, int data)
+static int amerdart_trackball_direction(address_space *space, int num, int data)
{
coolpool_state *state = space->machine->driver_data<coolpool_state>();
diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c
index 2ceed941c88..c23b53c4c8b 100644
--- a/src/mame/drivers/coolridr.c
+++ b/src/mame/drivers/coolridr.c
@@ -485,7 +485,7 @@ static WRITE32_HANDLER( sysh1_pal_w )
/* FIXME: this seems to do a hell lot of stuff, it's not ST-V SCU but still somewhat complex :/ */
-static void sysh1_dma_transfer( const address_space *space, UINT16 dma_index )
+static void sysh1_dma_transfer( address_space *space, UINT16 dma_index )
{
static UINT32 src,dst,size,type,s_i;
static UINT8 end_dma_mark;
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 391f4a824ea..08e36c2286b 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -7900,7 +7900,7 @@ static WRITE16_HANDLER( gigamn2_dummyqsound_w )
static DRIVER_INIT( gigamn2 )
{
cps_state *state = machine->driver_data<cps_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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");
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index c59faa170fe..f8614abef0e 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -342,7 +342,7 @@ GFXDECODE_END
static MACHINE_RESET( crballoon )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
running_device *discrete = machine->device("discrete");
pc3092_reset();
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index c3ded17adfe..382da09734d 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -161,7 +161,7 @@ public:
static void IntReq( running_machine *machine, int num )
{
crystal_state *state = machine->driver_data<crystal_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
UINT32 IntEn = memory_read_dword(space, 0x01800c08);
UINT32 IntPend = memory_read_dword(space, 0x01800c0c);
if (IntEn & (1 << num))
@@ -243,7 +243,7 @@ static WRITE32_HANDLER( IntAck_w )
static IRQ_CALLBACK( icallback )
{
crystal_state *state = device->machine->driver_data<crystal_state>();
- const address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM);
UINT32 IntPend = memory_read_dword(space, 0x01800c0c);
int i;
@@ -280,7 +280,7 @@ static TIMER_CALLBACK( Timercb )
IntReq(machine, num[which]);
}
-INLINE void Timer_w( const address_space *space, int which, UINT32 data, UINT32 mem_mask )
+INLINE void Timer_w( address_space *space, int which, UINT32 data, UINT32 mem_mask )
{
crystal_state *state = space->machine->driver_data<crystal_state>();
@@ -399,7 +399,7 @@ static WRITE32_HANDLER( PIO_w )
COMBINE_DATA(&state->PIO);
}
-INLINE void DMA_w( const address_space *space, int which, UINT32 data, UINT32 mem_mask )
+INLINE void DMA_w( address_space *space, int which, UINT32 data, UINT32 mem_mask )
{
crystal_state *state = space->machine->driver_data<crystal_state>();
@@ -621,12 +621,12 @@ static MACHINE_RESET( crystal )
PatchReset(machine);
}
-static UINT16 GetVidReg( const address_space *space, UINT16 reg )
+static UINT16 GetVidReg( address_space *space, UINT16 reg )
{
return memory_read_word(space, 0x03000000 + reg);
}
-static void SetVidReg( const address_space *space, UINT16 reg, UINT16 val )
+static void SetVidReg( address_space *space, UINT16 reg, UINT16 val )
{
memory_write_word(space, 0x03000000 + reg, val);
}
@@ -635,7 +635,7 @@ static void SetVidReg( const address_space *space, UINT16 reg, UINT16 val )
static VIDEO_UPDATE( crystal )
{
crystal_state *state = screen->machine->driver_data<crystal_state>();
- const address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int DoFlip;
UINT32 B0 = 0x0;
@@ -696,7 +696,7 @@ static VIDEO_UPDATE( crystal )
static VIDEO_EOF(crystal)
{
crystal_state *state = machine->driver_data<crystal_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT16 head, tail;
int DoFlip = 0;
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index a7fec0f2021..d92bc5bce76 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -661,7 +661,7 @@ static DRIVER_INIT( cshooter )
static DRIVER_INIT( cshootere )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int A;
UINT8 *rom = memory_region(machine, "maincpu");
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x8000);
diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c
index ff9fe7ba270..fd47fdae940 100644
--- a/src/mame/drivers/darkmist.c
+++ b/src/mame/drivers/darkmist.c
@@ -423,7 +423,7 @@ static void decrypt_snd(running_machine *machine)
static DRIVER_INIT(darkmist)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int i, len;
UINT8 *ROM = memory_region(machine, "maincpu");
UINT8 *buffer = auto_alloc_array(machine, UINT8, 0x10000);
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 849d3aec1fe..20809f54958 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -693,7 +693,7 @@ INLINE void log_blit( running_machine *machine, int data )
#endif
}
-static void blitter_w( const address_space *space, int blitter, offs_t offset, UINT8 data, int irq_vector )
+static void blitter_w( address_space *space, int blitter, offs_t offset, UINT8 data, int irq_vector )
{
dynax_state *state = space->machine->driver_data<dynax_state>();
int hi_bits;
@@ -3060,7 +3060,7 @@ ADDRESS_MAP_END
Hanafuda Hana Gokou
***************************************************************************/
-static UINT8 hgokou_player_r( const address_space *space, int player )
+static UINT8 hgokou_player_r( address_space *space, int player )
{
dynax_state *state = space->machine->driver_data<dynax_state>();
UINT8 hopper_bit = ((state->hopper && !(space->machine->primary_screen->frame_number() % 10)) ? 0 : (1 << 6));
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 838d24d879a..9fae5f861fa 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -54,7 +54,7 @@ To do:
/* Only used by ghostb, gondo, garyoret, other games can control buffering */
static VIDEO_EOF( dec8 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
@@ -3444,7 +3444,7 @@ static DRIVER_INIT( dec8 )
static DRIVER_INIT( deco222 )
{
dec8_state *state = machine->driver_data<dec8_state>();
- const address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
int A;
UINT8 *decrypt;
UINT8 *rom;
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 8df52e6610c..a0db333bc91 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -495,7 +495,7 @@ static WRITE32_HANDLER( tattass_control_w )
static int readBitCount=0;
static int byteAddr=0;
eeprom_device *eeprom = space->machine->device<eeprom_device>("eeprom");
- const address_space *eeprom_space = eeprom->space();
+ address_space *eeprom_space = eeprom->space();
/* Eprom in low byte */
if (mem_mask==0x000000ff) { /* Byte write to low byte only (different from word writing including low byte) */
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index 44cd7fba0d4..80ea52f31c6 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -1356,7 +1356,7 @@ ROM_END
static DRIVER_INIT( decocass )
{
decocass_state *state = machine->driver_data<decocass_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 *rom = memory_region(machine, "maincpu");
int A;
diff --git a/src/mame/drivers/eolithsp.c b/src/mame/drivers/eolithsp.c
index d7341fdf992..84310191fc6 100644
--- a/src/mame/drivers/eolithsp.c
+++ b/src/mame/drivers/eolithsp.c
@@ -17,7 +17,7 @@ static int eolith_speedup_resume_scanline;
static int eolith_vblank = 0;
static int eolith_scanline = 0;
-void eolith_speedup_read(const address_space *space)
+void eolith_speedup_read(address_space *space)
{
/* for debug */
// if ((cpu_get_pc(space->cpu)!=eolith_speedup_address) && (eolith_vblank!=1) )
diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c
index 99df83918bc..789c3ab90d2 100644
--- a/src/mame/drivers/ertictac.c
+++ b/src/mame/drivers/ertictac.c
@@ -166,7 +166,7 @@ static WRITE32_HANDLER(T1GO_w)
/* porting code from machine/archimds.c, in the hope that someday that this driver uses that code ... */
static TIMER_CALLBACK( ertictac_audio_tick )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
dac_signed_data_w(space->machine->device("dac"), (0x80) | (memory_read_byte(space,vidc_sndcur)));
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c
index b4267998ce3..ef077314c24 100644
--- a/src/mame/drivers/exidy.c
+++ b/src/mame/drivers/exidy.c
@@ -1458,7 +1458,7 @@ static DRIVER_INIT( pepper2 )
static DRIVER_INIT( fax )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
exidy_video_config(0x04, 0x04, TRUE);
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index 8e5adc5e59f..39d427efa91 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -110,7 +110,7 @@ static READ16_HANDLER( exterm_host_data_r )
*
*************************************/
-static UINT16 exterm_trackball_port_r(const address_space *space, int which, UINT16 mem_mask)
+static UINT16 exterm_trackball_port_r(address_space *space, int which, UINT16 mem_mask)
{
UINT16 port;
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index 6989f903c0f..2b910312239 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -126,7 +126,7 @@ ADDRESS_MAP_END
static CUSTOM_INPUT( victnine_mcu_status_bit01_r )
{
flstory_state *state = field->port->machine->driver_data<flstory_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
return (victnine_mcu_status_r(space, 0) & 3);
}
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index c99cf7b87f3..66b1f420453 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -1111,7 +1111,7 @@ ROM_END
static DRIVER_INIT(gigasb)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_set_decrypted_region(space, 0x0000, 0xbfff, memory_region(machine, "maincpu") + 0x10000);
}
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 99b0f2449be..17e4784913a 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -4229,7 +4229,7 @@ static DRIVER_INIT( multiwin )
******************************************************/
{
UINT8 *ROM = memory_region(machine, "maincpu");
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int x;
@@ -4262,7 +4262,7 @@ static DRIVER_INIT( royalcdc )
******************************************************/
UINT8 *ROM = memory_region(machine, "maincpu");
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int x;
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index 49c5bdd6197..b4b55eb119c 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -887,7 +887,7 @@ static MACHINE_START( galaga )
static void bosco_latch_reset(running_machine *machine)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int i;
/* Reset all latches */
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 29a4ce30334..77bbc739e2c 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -1022,7 +1022,7 @@ static const ppi8255_interface scorpion_ppi8255_1_intf =
static INPUT_CHANGED( gmgalax_game_changed )
{
- const address_space *space = cputag_get_address_space(field->port->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(field->port->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* new value is the selected game */
gmgalax_selected_game = newval;
@@ -2601,7 +2601,7 @@ static void common_init(
static void unmap_galaxian_sound(running_machine *machine, offs_t base)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_unmap_write(space, base + 0x0004, base + 0x0007, 0, 0x07f8);
memory_unmap_write(space, base + 0x0800, base + 0x0807, 0, 0x07f8);
@@ -2624,7 +2624,7 @@ static DRIVER_INIT( galaxian )
static DRIVER_INIT( nolock )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* same as galaxian... */
DRIVER_INIT_CALL(galaxian);
@@ -2636,7 +2636,7 @@ static DRIVER_INIT( nolock )
static DRIVER_INIT( azurian )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* yellow bullets instead of white ones */
common_init(machine, scramble_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -2648,7 +2648,7 @@ static DRIVER_INIT( azurian )
static DRIVER_INIT( gmgalax )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, gmgalax_extend_tile_info, gmgalax_extend_sprite_info);
@@ -2665,7 +2665,7 @@ static DRIVER_INIT( gmgalax )
static DRIVER_INIT( pisces )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, pisces_extend_tile_info, pisces_extend_sprite_info);
@@ -2677,7 +2677,7 @@ static DRIVER_INIT( pisces )
static DRIVER_INIT( batman2 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, batman2_extend_tile_info, upper_extend_sprite_info);
@@ -2689,7 +2689,7 @@ static DRIVER_INIT( batman2 )
static DRIVER_INIT( frogg )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* same as galaxian... */
common_init(machine, galaxian_draw_bullet, frogger_draw_background, frogger_extend_tile_info, frogger_extend_sprite_info);
@@ -2725,7 +2725,7 @@ static DRIVER_INIT( mooncrsu )
static DRIVER_INIT( mooncrgx )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
@@ -2737,7 +2737,7 @@ static DRIVER_INIT( mooncrgx )
static DRIVER_INIT( moonqsr )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0x8000);
/* video extensions */
@@ -2755,7 +2755,7 @@ static WRITE8_HANDLER( artic_gfxbank_w )
static DRIVER_INIT( pacmanbl )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* same as galaxian... */
DRIVER_INIT_CALL(galaxian);
@@ -2821,7 +2821,7 @@ void tenspot_set_game_bank(running_machine* machine, int bank, int from_game)
static DRIVER_INIT( tenspot )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* these are needed for batman part 2 to work properly, this banking is probably a property of the artic board,
which tenspot appears to have copied */
@@ -2858,7 +2858,7 @@ static DRIVER_INIT( devilfsg )
static DRIVER_INIT( zigzag )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, NULL, galaxian_draw_background, NULL, NULL);
@@ -2898,8 +2898,8 @@ static DRIVER_INIT( jumpbug )
static DRIVER_INIT( checkman )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
@@ -2918,7 +2918,7 @@ static DRIVER_INIT( checkman )
static DRIVER_INIT( checkmaj )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -2933,7 +2933,7 @@ static DRIVER_INIT( checkmaj )
static DRIVER_INIT( dingo )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -2948,8 +2948,8 @@ static DRIVER_INIT( dingo )
static DRIVER_INIT( dingoe )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
@@ -2970,7 +2970,7 @@ static DRIVER_INIT( dingoe )
static DRIVER_INIT( skybase )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, pisces_extend_tile_info, pisces_extend_sprite_info);
@@ -3014,7 +3014,7 @@ static DRIVER_INIT( mshuttlj )
static DRIVER_INIT( kingball )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -3031,7 +3031,7 @@ static DRIVER_INIT( kingball )
static DRIVER_INIT( scorpnmc )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, batman2_extend_tile_info, upper_extend_sprite_info);
@@ -3052,7 +3052,7 @@ static DRIVER_INIT( scorpnmc )
static DRIVER_INIT( thepitm )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, galaxian_draw_bullet, galaxian_draw_background, mooncrst_extend_tile_info, mooncrst_extend_sprite_info);
@@ -3076,7 +3076,7 @@ static DRIVER_INIT( thepitm )
static DRIVER_INIT( theend )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, theend_draw_bullet, galaxian_draw_background, NULL, NULL);
@@ -3095,7 +3095,7 @@ static DRIVER_INIT( scramble )
static DRIVER_INIT( explorer )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, scramble_draw_bullet, scramble_draw_background, NULL, NULL);
@@ -3128,7 +3128,7 @@ static DRIVER_INIT( sfx )
static DRIVER_INIT( atlantis )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, scramble_draw_bullet, scramble_draw_background, NULL, NULL);
@@ -3170,7 +3170,7 @@ static DRIVER_INIT( frogger )
static DRIVER_INIT( froggrmc )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* video extensions */
common_init(machine, NULL, frogger_draw_background, frogger_extend_tile_info, frogger_extend_sprite_info);
@@ -3215,7 +3215,7 @@ static DRIVER_INIT( amidar )
static DRIVER_INIT( scorpion )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
common_init(machine, scramble_draw_bullet, scramble_draw_background, batman2_extend_tile_info, upper_extend_sprite_info);
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index 490321311b4..2b9420c6849 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -82,7 +82,7 @@ static MACHINE_RESET( galpani2 )
static void galpani2_write_kaneko(running_device *device)
{
- const address_space *dstspace = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM);
+ address_space *dstspace = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM);
int i,x,tpattidx;
unsigned char testpattern[] = {0xFF,0x55,0xAA,0xDD,0xBB,0x99};
@@ -112,8 +112,8 @@ static void galpani2_write_kaneko(running_device *device)
static WRITE8_HANDLER( galpani2_mcu_init_w )
{
running_machine *machine = space->machine;
- const address_space *srcspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
- const address_space *dstspace = cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM);
+ address_space *srcspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *dstspace = cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM);
UINT32 mcu_address, mcu_data;
for ( mcu_address = 0x100010; mcu_address < (0x100010 + 6); mcu_address += 1 )
@@ -126,8 +126,8 @@ static WRITE8_HANDLER( galpani2_mcu_init_w )
static void galpani2_mcu_nmi1(running_machine *machine)
{
- const address_space *srcspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
- const address_space *dstspace = cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM);
+ address_space *srcspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *dstspace = cputag_get_address_space(machine, "sub", ADDRESS_SPACE_PROGRAM);
UINT32 mcu_list, mcu_command, mcu_address, mcu_extra, mcu_src, mcu_dst, mcu_size;
for ( mcu_list = 0x100021; mcu_list < (0x100021 + 0x40); mcu_list += 4 )
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index d19c02639c5..021faf1a0c9 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -194,7 +194,7 @@ static WRITE_LINE_DEVICE_HANDLER( r6532_irq )
static WRITE8_DEVICE_HANDLER( r6532_soundlatch_w )
{
- const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
soundlatch_w(space, 0, data);
}
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index 89154ac40c9..fe5c0cf6cf7 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -144,7 +144,7 @@ static void update_interrupts(running_machine *machine)
static void scanline_update(screen_device &screen, int scanline)
{
- const address_space *space = cputag_get_address_space(screen.machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(screen.machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
/* sound IRQ is on 32V */
if (scanline & 32)
diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c
index 5ca4f914445..f78fd6bf48c 100644
--- a/src/mame/drivers/gei.c
+++ b/src/mame/drivers/gei.c
@@ -143,7 +143,7 @@ static WRITE8_DEVICE_HANDLER( lamps_w )
static WRITE8_DEVICE_HANDLER( sound_w )
{
- const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* bit 3 - coin lockout, lamp10 in poker / lamp6 in trivia test modes */
coin_lockout_global_w(device->machine, ~data & 0x08);
@@ -184,7 +184,7 @@ static WRITE8_DEVICE_HANDLER( lamps2_w )
static WRITE8_DEVICE_HANDLER( nmi_w )
{
- const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* bit 4 - play/raise button lamp, lamp 9 in selection test mode */
set_led_status(device->machine, 8,data & 0x10);
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index e8e936fb315..854fb580d40 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -573,7 +573,7 @@ static INPUT_CHANGED( coin_inserted )
if (newval == 0)
{
UINT32 credit;
- const address_space *space = cputag_get_address_space(field->port->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(field->port->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* Get the current credit value and add the new coin value */
credit = memory_read_dword(space, 0x8002c) + (UINT32)(FPTR)param;
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index d54201a2bc0..379d02c9fc5 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -596,7 +596,7 @@ static READ32_HANDLER( hng64_sysregs_r )
/* preliminary dma code, dma is used to copy program code -> ram */
static INT32 hng_dma_start,hng_dma_dst,hng_dma_len;
-static void hng64_do_dma(const address_space *space)
+static void hng64_do_dma(address_space *space)
{
// printf("Performing DMA Start %08x Len %08x Dst %08x\n",hng_dma_start, hng_dma_len, hng_dma_dst);
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index ebeef7d2edd..25b7fba6517 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -1222,7 +1222,7 @@ static MACHINE_RESET( homedata )
static MACHINE_RESET( pteacher )
{
homedata_state *state = machine->driver_data<homedata_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* on reset, ports are set as input (high impedance), therefore 0xff output */
pteacher_upd7807_portc_w(space, 0, 0xff);
@@ -1239,7 +1239,7 @@ static MACHINE_RESET( pteacher )
static MACHINE_RESET( reikaids )
{
homedata_state *state = machine->driver_data<homedata_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* on reset, ports are set as input (high impedance), therefore 0xff output */
reikaids_upd7807_portc_w(space, 0, 0xff);
diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c
index e06088d1d37..21ec4614eb3 100644
--- a/src/mame/drivers/hshavoc.c
+++ b/src/mame/drivers/hshavoc.c
@@ -218,7 +218,7 @@ static DRIVER_INIT(hshavoc)
*/
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_nop_write(space, 0x200000, 0x201fff, 0, 0);
}
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index 39244afe693..7736b04aa65 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -277,7 +277,7 @@ INLINE int blt_read( const UINT8 *ROM, const int offs )
return ROM[offs];
}
-INLINE void blt_write( const address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask )
+INLINE void blt_write( address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask )
{
switch( tmap )
{
diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c
index 84116ecae6d..6cb53b2cfd3 100644
--- a/src/mame/drivers/igs011.c
+++ b/src/mame/drivers/igs011.c
@@ -881,7 +881,7 @@ static WRITE16_HANDLER( igs011_prot_addr_w )
// igs011_prot2 = 0x00;
- const address_space *sp = cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *sp = cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 *rom = memory_region(space->machine, "maincpu");
// Plug previous address range with ROM access
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index c5c77ce78f1..f7b49f0e77d 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -726,7 +726,7 @@ static READ8_HANDLER( sound_data_buffer_r )
static WRITE8_DEVICE_HANDLER( drivedge_portb_out )
{
- const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
// logerror("PIA port B write = %02x\n", data);
/* bit 0 controls the fan light */
@@ -751,7 +751,7 @@ static WRITE8_DEVICE_HANDLER( drivedge_turbo_light )
static WRITE8_DEVICE_HANDLER( pia_portb_out )
{
- const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
// logerror("PIA port B write = %02x\n", data);
/* bit 4 controls the ticket dispenser */
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index a020d8d6e11..b4ffd7de6c4 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -1312,7 +1312,7 @@ ROM_END
static void treahunt_decode( running_machine *machine )
{
int A;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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, 0x4000);
int data;
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index 8eb88f17772..6f21016ac3f 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -634,7 +634,7 @@ static WRITE16_HANDLER( urashima_dma_w )
/*same as $f00c0 sub-routine,but with additional work-around,to remove from here...*/
static void daireika_palette_dma(running_machine *machine, UINT16 val)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT32 index_1, index_2, src_addr, tmp_addr;
/*a0=301c0+jm_shared_ram[0x540/2] & 0xf00 */
/*a1=88000*/
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index c9aa0a87828..b7e4a97bcc1 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -736,7 +736,7 @@ ROM_END
static UINT8 *decrypt_code(running_machine *machine)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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");
int A;
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 1898e81b7a6..50a8bf93c89 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -185,7 +185,7 @@ static struct sprite_entry {
UINT32 adr;
} sprites[0x100];
-static void generate_sprites(const address_space *space, UINT32 src, UINT32 spr, int count)
+static void generate_sprites(address_space *space, UINT32 src, UINT32 spr, int count)
{
int i;
int scount;
@@ -323,39 +323,39 @@ static void generate_sprites(const address_space *space, UINT32 src, UINT32 spr,
}
}
-static void tkmmpzdm_esc(const address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4)
+static void tkmmpzdm_esc(address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4)
{
konamigx_esc_alert(gx_workram, 0x0142, 0x100, 0);
}
-static void dragoonj_esc(const address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4)
+static void dragoonj_esc(address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4)
{
konamigx_esc_alert(gx_workram, 0x5c00, 0x100, 0);
}
-static void sal2_esc(const address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4)
+static void sal2_esc(address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4)
{
konamigx_esc_alert(gx_workram, 0x1c8c, 0x172, 1);
}
-static void sexyparo_esc(const address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4)
+static void sexyparo_esc(address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4)
{
// The d20000 should probably be p3
generate_sprites(space, 0xc00604, 0xd20000, 0xfc);
}
-static void tbyahhoo_esc(const address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4)
+static void tbyahhoo_esc(address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4)
{
generate_sprites(space, 0xc00000, 0xd20000, 0x100);
}
-static void daiskiss_esc(const address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4)
+static void daiskiss_esc(address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4)
{
generate_sprites(space, 0xc00000, 0xd20000, 0x100);
}
static UINT8 esc_program[4096];
-static void (*esc_cb)(const address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4);
+static void (*esc_cb)(address_space *space, UINT32 p1, UINT32 p2, UINT32 p3, UINT32 p4);
static WRITE32_HANDLER( esc_w )
{
diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c
index f4336aaf889..a76d0218e0d 100644
--- a/src/mame/drivers/konamim2.c
+++ b/src/mame/drivers/konamim2.c
@@ -786,7 +786,7 @@ static void cde_handle_reports(void)
}
}
-static void cde_dma_transfer(const address_space *space, int channel, int next)
+static void cde_dma_transfer(address_space *space, int channel, int next)
{
UINT32 address;
//int length;
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index 9738ee3ed2a..7ddf7e89643 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -465,7 +465,7 @@ static MACHINE_START( kyugo )
static MACHINE_RESET( kyugo )
{
kyugo_state *state = machine->driver_data<kyugo_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
// must start with interrupts and sub CPU disabled
cpu_interrupt_enable(machine->device("maincpu"), 0);
kyugo_sub_cpu_control_w(space, 0, 0);
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index e2d758489ad..a0d0f4e16e3 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -1068,7 +1068,7 @@ static DRIVER_INIT( dorodon )
/* decode the opcodes */
offs_t i;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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");
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index 93cb59f360f..deb775ee62e 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -1364,7 +1364,7 @@ ROM_END
static void sound_cpu_decrypt(running_machine *machine)
{
- const address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ 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");
int i;
@@ -1398,7 +1398,7 @@ static DRIVER_INIT( yellowcb )
static DRIVER_INIT( liberate )
{
int A;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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");
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index 2411e189bb4..e1fd8c082b4 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -213,7 +213,7 @@ static void littlerb_recalc_regs(void)
static void littlerb_data_write(running_machine *machine, UINT16 data, UINT16 mem_mask)
{
UINT32 addr = littlerb_write_address>>4; // is this right? should we shift?
- const address_space *vdp_space = machine->device<littlerb_vdp_device>("littlerbvdp")->space();
+ address_space *vdp_space = machine->device<littlerb_vdp_device>("littlerbvdp")->space();
memory_write_word_masked(vdp_space, addr*2, data, mem_mask);
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index 74f185da7f6..d8dfa525ff4 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -65,14 +65,14 @@ static WRITE16_HANDLER( adrst_w )
static READ16_HANDLER( main_gnd_r )
{
lockon_state *state = space->machine->driver_data<lockon_state>();
- const address_space *gndspace = cpu_get_address_space(state->ground, ADDRESS_SPACE_PROGRAM);
+ address_space *gndspace = cpu_get_address_space(state->ground, ADDRESS_SPACE_PROGRAM);
return memory_read_word(gndspace, V30_GND_ADDR | offset * 2);
}
static WRITE16_HANDLER( main_gnd_w )
{
lockon_state *state = space->machine->driver_data<lockon_state>();
- const address_space *gndspace = cpu_get_address_space(state->ground, ADDRESS_SPACE_PROGRAM);
+ address_space *gndspace = cpu_get_address_space(state->ground, ADDRESS_SPACE_PROGRAM);
if (ACCESSING_BITS_0_7)
memory_write_byte(gndspace, V30_GND_ADDR | (offset * 2 + 0), data);
@@ -83,14 +83,14 @@ static WRITE16_HANDLER( main_gnd_w )
static READ16_HANDLER( main_obj_r )
{
lockon_state *state = space->machine->driver_data<lockon_state>();
- const address_space *objspace = cpu_get_address_space(state->object, ADDRESS_SPACE_PROGRAM);
+ address_space *objspace = cpu_get_address_space(state->object, ADDRESS_SPACE_PROGRAM);
return memory_read_word(objspace, V30_OBJ_ADDR | offset * 2);
}
static WRITE16_HANDLER( main_obj_w )
{
lockon_state *state = space->machine->driver_data<lockon_state>();
- const address_space *objspace = cpu_get_address_space(state->object, ADDRESS_SPACE_PROGRAM);
+ address_space *objspace = cpu_get_address_space(state->object, ADDRESS_SPACE_PROGRAM);
if (ACCESSING_BITS_0_7)
memory_write_byte(objspace, V30_OBJ_ADDR | (offset * 2 + 0), data);
@@ -104,8 +104,8 @@ static WRITE16_HANDLER( tst_w )
if (offset < 0x800)
{
- const address_space *gndspace = cpu_get_address_space(state->ground, ADDRESS_SPACE_PROGRAM);
- const address_space *objspace = cpu_get_address_space(state->object, ADDRESS_SPACE_PROGRAM);
+ address_space *gndspace = cpu_get_address_space(state->ground, ADDRESS_SPACE_PROGRAM);
+ address_space *objspace = cpu_get_address_space(state->object, ADDRESS_SPACE_PROGRAM);
if (ACCESSING_BITS_0_7)
memory_write_byte(gndspace, V30_GND_ADDR | (offset * 2 + 0), data);
@@ -122,14 +122,14 @@ static WRITE16_HANDLER( tst_w )
static READ16_HANDLER( main_z80_r )
{
lockon_state *state = space->machine->driver_data<lockon_state>();
- const address_space *sndspace = cpu_get_address_space(state->audiocpu, ADDRESS_SPACE_PROGRAM);
+ address_space *sndspace = cpu_get_address_space(state->audiocpu, ADDRESS_SPACE_PROGRAM);
return 0xff00 | memory_read_byte(sndspace, offset);
}
static WRITE16_HANDLER( main_z80_w )
{
lockon_state *state = space->machine->driver_data<lockon_state>();
- const address_space *sndspace = cpu_get_address_space(state->audiocpu, ADDRESS_SPACE_PROGRAM);
+ address_space *sndspace = cpu_get_address_space(state->audiocpu, ADDRESS_SPACE_PROGRAM);
memory_write_byte(sndspace, offset, data);
}
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index 99412ca90da..98a9e495bb6 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -319,9 +319,9 @@ static READ8_HANDLER( m72_snd_cpu_sample_r )
INLINE DRIVER_INIT( m72_8751 )
{
- const address_space *program = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
- const address_space *io = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
- const address_space *sndio = cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_IO);
+ address_space *program = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *io = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *sndio = cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_IO);
running_device *dac = machine->device("dac");
protection_ram = auto_alloc_array(machine, UINT16, 0x10000/2);
@@ -403,7 +403,7 @@ static int find_sample(int num)
static INTERRUPT_GEN(fake_nmi)
{
- const address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM);
int sample = m72_sample_r(space,0);
if (sample)
m72_sample_w(device->machine->device("dac"),0,sample);
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index e562cddc6e6..44f6fa2e147 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -717,7 +717,7 @@ static WRITE8_HANDLER( mappy_latch_w )
static MACHINE_RESET( superpac )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int i;
/* Reset all latches */
@@ -727,7 +727,7 @@ static MACHINE_RESET( superpac )
static MACHINE_RESET( phozon )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int i;
/* Reset all latches */
@@ -737,7 +737,7 @@ static MACHINE_RESET( phozon )
static MACHINE_RESET( mappy )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int i;
/* Reset all latches */
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 8821d5638d5..34a696f3ff4 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -1206,7 +1206,7 @@ static void init_mediagx(running_machine *machine)
#if SPEEDUP_HACKS
-INLINE UINT32 generic_speedup(const address_space *space, int idx)
+INLINE UINT32 generic_speedup(address_space *space, int idx)
{
mediagx_state *state = space->machine->driver_data<mediagx_state>();
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index cb81c655730..48cc5a89835 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -174,7 +174,7 @@ static bitmap_t* render_bitmap;
#ifdef UNUSED_FUNCTION
/* taken from segaic16.c */
/* doesn't seem to meet my needs, not used */
-static UINT16 read_next_instruction(const address_space *space)
+static UINT16 read_next_instruction(address_space *space)
{
static UINT8 recurse = 0;
UINT16 result;
@@ -3545,7 +3545,7 @@ INLINE void overwrite_write(UINT16 *dst, UINT16 d)
if (d & 0x000f) { *dst &= ~0x000f; *dst |= d & 0x000f; }
}
-static UINT32 pm_io(const address_space *space, int reg, int write, UINT32 d)
+static UINT32 pm_io(address_space *space, int reg, int write, UINT32 d)
{
if (svp.emu_status & SSP_PMC_SET)
{
diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c
index b6dd68fa4c4..9a05626a70f 100644
--- a/src/mame/drivers/metalmx.c
+++ b/src/mame/drivers/metalmx.c
@@ -453,7 +453,7 @@ static READ32_HANDLER( dsp32c_2_r )
static WRITE32_HANDLER( host_gsp_w )
{
- const address_space *gsp_space = cputag_get_address_space(space->machine, "gsp", ADDRESS_SPACE_PROGRAM);
+ address_space *gsp_space = cputag_get_address_space(space->machine, "gsp", ADDRESS_SPACE_PROGRAM);
memory_write_word(gsp_space, (0xc0000000 + (offset << 5) + 0x10) / 8, data);
memory_write_word(gsp_space, (0xc0000000 + (offset << 5))/ 8 , data >> 16);
@@ -461,7 +461,7 @@ static WRITE32_HANDLER( host_gsp_w )
static READ32_HANDLER( host_gsp_r )
{
- const address_space *gsp_space = cputag_get_address_space(space->machine, "gsp", ADDRESS_SPACE_PROGRAM);
+ address_space *gsp_space = cputag_get_address_space(space->machine, "gsp", ADDRESS_SPACE_PROGRAM);
UINT32 val;
val = memory_read_word(gsp_space, (0xc0000000 + (offset << 5) + 0x10) / 8);
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 1b795d2c310..7bd6380c739 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -129,7 +129,7 @@ static READ16_HANDLER( metro_irq_cause_r )
static void update_irq_state( running_machine *machine )
{
metro_state *state = machine->driver_data<metro_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
/* Get the pending IRQs (only the enabled ones, e.g. where irq_enable is *0*) */
UINT16 irq = metro_irq_cause_r(space, 0, 0xffff) & ~*state->irq_enable;
@@ -340,7 +340,7 @@ static void ymf278b_interrupt( running_device *device, int active )
static int metro_io_callback( running_device *device, int ioline, int state )
{
metro_state *driver_state = device->machine->driver_data<metro_state>();
- const address_space *space = cpu_get_address_space(driver_state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(driver_state->maincpu, ADDRESS_SPACE_PROGRAM);
UINT8 data = 0;
switch (ioline)
@@ -665,7 +665,7 @@ INLINE int blt_read( const UINT8 *ROM, const int offs )
return ROM[offs];
}
-INLINE void blt_write( const address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask )
+INLINE void blt_write( address_space *space, const int tmap, const offs_t offs, const UINT16 data, const UINT16 mask )
{
switch(tmap)
{
@@ -6095,7 +6095,7 @@ static void metro_common( running_machine *machine )
static DRIVER_INIT( metro )
{
metro_state *state = machine->driver_data<metro_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
metro_common(machine);
@@ -6128,7 +6128,7 @@ static DRIVER_INIT( karatour )
static DRIVER_INIT( daitorid )
{
metro_state *state = machine->driver_data<metro_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
metro_common(machine);
diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c
index 025bfc38c16..d542047ea30 100644
--- a/src/mame/drivers/mil4000.c
+++ b/src/mame/drivers/mil4000.c
@@ -147,7 +147,7 @@ static TILE_GET_INFO( get_sc3_tile_info )
static VIDEO_START(mil4000)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int i;
// game doesn't clear the palette, so to avoid seeing mame defaults we clear it
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index 6416acb5f08..81166b4745a 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -512,7 +512,7 @@ static MACHINE_RESET( missile )
*
*************************************/
-INLINE int get_madsel(const address_space *space)
+INLINE int get_madsel(address_space *space)
{
UINT16 pc = cpu_get_previouspc(space->cpu);
@@ -549,7 +549,7 @@ INLINE offs_t get_bit3_addr(offs_t pixaddr)
}
-static void write_vram(const address_space *space, offs_t address, UINT8 data)
+static void write_vram(address_space *space, offs_t address, UINT8 data)
{
static const UINT8 data_lookup[4] = { 0x00, 0x0f, 0xf0, 0xff };
offs_t vramaddr;
@@ -579,7 +579,7 @@ static void write_vram(const address_space *space, offs_t address, UINT8 data)
}
-static UINT8 read_vram(const address_space *space, offs_t address)
+static UINT8 read_vram(address_space *space, offs_t address)
{
offs_t vramaddr;
UINT8 vramdata;
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index c544b9793c9..cfa1b7622f9 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -2119,7 +2119,7 @@ ROM_END
static void bootleg_decode( running_machine *machine )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_set_decrypted_region(space, 0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x50000);
memory_configure_bank_decrypted(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x60000, 0x4000);
}
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index b900c26f303..8bb9522bfee 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -199,7 +199,7 @@ static void copro_fifoin_push(running_device *device, UINT32 data)
static int copro_fifoout_rpos, copro_fifoout_wpos;
static UINT32 copro_fifoout_data[COPRO_FIFOOUT_SIZE];
static int copro_fifoout_num = 0;
-static UINT32 copro_fifoout_pop(const address_space *space)
+static UINT32 copro_fifoout_pop(address_space *space)
{
UINT32 r;
@@ -1012,7 +1012,7 @@ static WRITE32_HANDLER(model2_irq_w)
static int to_68k;
-static int snd_68k_ready_r(const address_space *space)
+static int snd_68k_ready_r(address_space *space)
{
int sr = cpu_get_reg(space->machine->device("audiocpu"), M68K_SR);
@@ -1025,7 +1025,7 @@ static int snd_68k_ready_r(const address_space *space)
return 0xff;
}
-static void snd_latch_to_68k_w(const address_space *space, int data)
+static void snd_latch_to_68k_w(address_space *space, int data)
{
if (!snd_68k_ready_r(space))
{
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 4e4d6650903..120633edf46 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -1014,7 +1014,7 @@ static WRITE64_HANDLER(scsi_w)
static UINT32 scsi_fetch(running_machine *machine, UINT32 dsp)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT32 result;
result = memory_read_dword(space, dsp);
return FLIPENDIAN_INT32(result);
@@ -1119,7 +1119,7 @@ static WRITE64_HANDLER( real3d_dma_w )
static void real3d_dma_callback(running_machine *machine, UINT32 src, UINT32 dst, int length, int byteswap)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
switch(dst >> 24)
{
case 0x88: /* Display List End Trigger */
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index 0c7e169856a..adf4de71f6e 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -286,7 +286,7 @@ static DRIVER_INIT( mouser )
/* Decode the opcodes */
offs_t i;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 *rom = memory_region(machine, "maincpu");
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x6000);
UINT8 *table = memory_region(machine, "user1");
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index 380cc19383e..a93f85477d0 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -2582,7 +2582,7 @@ static DRIVER_INIT (crmaze3a)
static DRIVER_INIT (mating)
{
- const address_space *space = cputag_get_address_space(machine, "video", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "video", ADDRESS_SPACE_PROGRAM);
running_device *device = machine->device("oki");
/* The Mating Game has an extra 256kB RAM on the program card */
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index 0506710d7da..56c41d4e963 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -1079,7 +1079,7 @@ static MACHINE_RESET( multigam )
static MACHINE_RESET( multigm3 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* reset the ppu */
multigm3_switch_prg_rom(space, 0, 0x01 );
};
@@ -1309,7 +1309,7 @@ ROM_END
static DRIVER_INIT( multigam )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
multigam_switch_prg_rom(space, 0x0, 0x01);
}
@@ -1324,7 +1324,7 @@ static void multigm3_decrypt(UINT8* mem, int memsize, const UINT8* decode_nibble
static DRIVER_INIT(multigm3)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
const UINT8 decode[16] = { 0x09, 0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00, 0x0f, 0x0e, 0x0d, 0x0c, 0x0b, 0x0a };
@@ -1338,7 +1338,7 @@ static DRIVER_INIT(multigm3)
static DRIVER_INIT(multigmt)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8* buf = auto_alloc_array(machine, UINT8, 0x80000);
UINT8 *rom;
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index ede447d1d4d..05fe866f1fd 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -499,7 +499,7 @@ static READ16_HANDLER( namcona1_vreg_r )
static int transfer_dword( running_machine *machine, UINT32 dest, UINT32 source )
{
UINT16 data;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
if( source>=0x400000 && source<0xc00000 )
{
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 4fc3cc626dd..710a3c8bfba 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -573,7 +573,7 @@ static INTERRUPT_GEN( namcos11_vblank )
static UINT32 m_n_bankoffset;
-INLINE void bankswitch_rom8( const address_space *space, const char *bank, int n_data )
+INLINE void bankswitch_rom8( address_space *space, const char *bank, int n_data )
{
memory_set_bank( space->machine, bank, ( ( n_data & 0xc0 ) >> 4 ) + ( n_data & 0x03 ) );
}
@@ -608,7 +608,7 @@ static WRITE32_HANDLER( bankswitch_rom64_upper_w )
}
}
-INLINE void bankswitch_rom64( const address_space *space, const char *bank, int n_data )
+INLINE void bankswitch_rom64( address_space *space, const char *bank, int n_data )
{
/* todo: verify behaviour */
memory_set_bank( space->machine, bank, ( ( ( ( n_data & 0xc0 ) >> 3 ) + ( n_data & 0x07 ) ) ^ m_n_bankoffset ) );
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index d4458551a6c..88876509c0d 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -1238,7 +1238,7 @@ static READ32_HANDLER( tektagt_protection_3_r )
static MACHINE_RESET( namcos12 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
psx_machine_init(machine);
bankoffset_w(space,0,0,0xffffffff);
has_tektagt_dma = 0;
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index d4760eeaaa4..931396496cf 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -562,7 +562,7 @@ namcos21_kickstart( running_machine *machine, int internal )
}
static UINT16
-ReadWordFromSlaveInput( const address_space *space )
+ReadWordFromSlaveInput( address_space *space )
{
UINT16 data = 0;
if( mpDspState->slaveBytesAvailable>0 )
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index ea467b5c17b..99341ace6b7 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -1911,7 +1911,7 @@ static void p3d_flush(const UINT16 *p, int size)
render_count[render_cur]++;
}
-static void p3d_dma(const address_space *space, UINT32 adr, UINT32 size)
+static void p3d_dma(address_space *space, UINT32 adr, UINT32 size)
{
adr &= 0x1fffffff;
UINT16 buffer[256];
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 5b3cc8e5cd4..aa1e96116eb 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -496,7 +496,7 @@ static Z80CTC_INTERFACE( ctc_intf_audio )
static MACHINE_RESET( sailorws )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int i;
// initialize TMPZ84C011 PIO
@@ -509,7 +509,7 @@ static MACHINE_RESET( sailorws )
static DRIVER_INIT( nbmj9195 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 *ROM = memory_region(machine, "audiocpu");
// sound program patch
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 49adeefd93f..d8b0f235c4c 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -260,7 +260,7 @@ void neogeo_set_display_position_interrupt_control( running_machine *machine, UI
}
-void neogeo_set_display_counter_msb( const address_space *space, UINT16 data )
+void neogeo_set_display_counter_msb( address_space *space, UINT16 data )
{
neogeo_state *state = space->machine->driver_data<neogeo_state>();
@@ -270,7 +270,7 @@ void neogeo_set_display_counter_msb( const address_space *space, UINT16 data )
}
-void neogeo_set_display_counter_lsb( const address_space *space, UINT16 data )
+void neogeo_set_display_counter_lsb( address_space *space, UINT16 data )
{
neogeo_state *state = space->machine->driver_data<neogeo_state>();
@@ -717,7 +717,7 @@ static void _set_main_cpu_bank_address( running_machine *machine )
}
-void neogeo_set_main_cpu_bank_address( const address_space *space, UINT32 bank_address )
+void neogeo_set_main_cpu_bank_address( address_space *space, UINT32 bank_address )
{
neogeo_state *state = space->machine->driver_data<neogeo_state>();
@@ -753,7 +753,7 @@ static WRITE16_HANDLER( main_cpu_bank_select_w )
static void main_cpu_banking_init( running_machine *machine )
{
- const address_space *mainspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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);
@@ -784,7 +784,7 @@ static void set_audio_cpu_banking( running_machine *machine )
}
-static void audio_cpu_bank_select( const address_space *space, int region, UINT8 bank )
+static void audio_cpu_bank_select( address_space *space, int region, UINT8 bank )
{
neogeo_state *state = space->machine->driver_data<neogeo_state>();
@@ -828,7 +828,7 @@ static READ8_HANDLER( audio_cpu_bank_select_8000_bfff_r )
}
-static void _set_audio_cpu_rom_source( const address_space *space )
+static void _set_audio_cpu_rom_source( address_space *space )
{
neogeo_state *state = space->machine->driver_data<neogeo_state>();
@@ -849,7 +849,7 @@ static void _set_audio_cpu_rom_source( const address_space *space )
}
-static void set_audio_cpu_rom_source( const address_space *space, UINT8 data )
+static void set_audio_cpu_rom_source( address_space *space, UINT8 data )
{
neogeo_state *state = space->machine->driver_data<neogeo_state>();
state->audio_cpu_rom_source = data;
@@ -1117,7 +1117,7 @@ static MACHINE_RESET( neogeo )
{
neogeo_state *state = machine->driver_data<neogeo_state>();
offs_t offs;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* reset system control registers */
for (offs = 0; offs < 8; offs++)
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index 294220b4b18..ea4164504df 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -1446,7 +1446,7 @@ static DRIVER_INIT( ninjakd2 )
static DRIVER_INIT( bootleg )
{
- const address_space *space = cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "soundcpu", ADDRESS_SPACE_PROGRAM);
memory_set_decrypted_region(space, 0x0000, 0x7fff, memory_region(machine, "soundcpu") + 0x10000);
gfx_unscramble(machine);
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index 1b125efbf95..6ce73f401dc 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -176,7 +176,7 @@ static Z80CTC_INTERFACE( ctc_intf )
static MACHINE_RESET( niyanpai )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int i;
// initialize TMPZ84C011 PIO
@@ -246,7 +246,7 @@ static READ16_HANDLER( musobana_inputport_0_r )
static CUSTOM_INPUT( musobana_outcoin_flag_r )
{
- const address_space *space = cputag_get_address_space(field->port->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(field->port->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
// tmp68301_parallel_interface[0x05]
// bit 0 coin counter
// bit 2 motor on
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index 252363cde4f..6d47474df80 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -231,7 +231,7 @@
static MACHINE_RESET( omegrace )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* Omega Race expects the vector processor to be ready. */
avgdvg_reset_w(space, 0, 0);
}
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index a2e3ba1d065..c09ed12dad4 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -5348,7 +5348,7 @@ ROM_END
static void maketrax_rom_decode(running_machine *machine)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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");
@@ -5380,7 +5380,7 @@ static DRIVER_INIT( maketrax )
static void korosuke_rom_decode(running_machine *machine)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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");
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index d6c3a377b50..58adf5f8ff3 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -414,7 +414,7 @@ ROM_END
static DRIVER_INIT( deco222 )
{
int A;
- const address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ 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");
diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c
index b36a08a728d..d46266c8d7c 100644
--- a/src/mame/drivers/pengo.c
+++ b/src/mame/drivers/pengo.c
@@ -660,7 +660,7 @@ static DRIVER_INIT( penta )
{ 0x88,0x0a,0x82,0x00,0xa0,0x22,0xaa,0x28 }, /* ...1...1...0.... */
{ 0x88,0x0a,0x82,0x00,0xa0,0x22,0xaa,0x28 } /* ...1...1...1.... */
};
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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");
int A;
diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c
index a8c0648e9da..2cebcbf4c7c 100644
--- a/src/mame/drivers/pinkiri8.c
+++ b/src/mame/drivers/pinkiri8.c
@@ -432,7 +432,7 @@ static WRITE8_HANDLER( pinkiri8_vram_w )
case 3:
- const address_space *vdp_space = space->machine->device<janshi_vdp_device>("janshivdp")->space();
+ address_space *vdp_space = space->machine->device<janshi_vdp_device>("janshivdp")->space();
if (LOG_VRAM) printf("%02x ", data);
prev_writes++;
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index 88b1e631750..98dffb3b46b 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -186,7 +186,7 @@ static WRITE8_HANDLER( playmark_oki_w )
static WRITE8_DEVICE_HANDLER( playmark_snd_control_w )
{
playmark_state *state = device->machine->driver_data<playmark_state>();
-// const address_space *space = cputag_get_address_space(device->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+// address_space *space = cputag_get_address_space(device->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
/* This port controls communications to and from the 68K, and the OKI
device.
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 96fe963d478..0b4391068f7 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -458,7 +458,7 @@ static const namco_53xx_interface namco_53xx_intf =
static MACHINE_RESET( polepos )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int i;
/* Reset all latches */
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index 80d594e5028..a715f687c89 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -511,7 +511,7 @@ ROM_END
static DRIVER_INIT( progolf )
{
int A;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 *rom = memory_region(machine, "maincpu");
UINT8* decrypted = auto_alloc_array(machine, UINT8, 0x10000);
@@ -525,7 +525,7 @@ static DRIVER_INIT( progolf )
static DRIVER_INIT( progolfa )
{
int A;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 *rom = memory_region(machine, "maincpu");
UINT8* decrypted = auto_alloc_array(machine, UINT8, 0x10000);
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index 8562646b43d..35b434a8ccc 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -440,7 +440,7 @@ static INTERRUPT_GEN( pturn_main_intgen )
static MACHINE_RESET( pturn )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
soundlatch_clear_w(space,0,0);
}
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index db74994ba5a..5973a30a261 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -1262,8 +1262,8 @@ static int kram3_decrypt(int address, int value)
static DRIVER_INIT( kram3 )
{
- const address_space *mainspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
- const address_space *videospace = cputag_get_address_space(machine, "videocpu", ADDRESS_SPACE_PROGRAM);
+ address_space *mainspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *videospace = cputag_get_address_space(machine, "videocpu", ADDRESS_SPACE_PROGRAM);
//const UINT8 *patch;
UINT8 *rom, *decrypted;
int i;
diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c
index b024519fe82..aeaf11ebf46 100644
--- a/src/mame/drivers/quizpun2.c
+++ b/src/mame/drivers/quizpun2.c
@@ -137,7 +137,7 @@ static MACHINE_RESET( quizpun2 )
prot.addr = 0;
}
-static void log_protection( const address_space *space, const char *warning )
+static void log_protection( address_space *space, const char *warning )
{
logerror("%04x: protection - %s (state %x, wait %x, param %02x, cmd %02x, addr %02x)\n", cpu_get_pc(space->cpu), warning,
prot.state,
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index f4cc22ba7c1..4ef3284b8dc 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -254,7 +254,7 @@ static INTERRUPT_GEN( raiden_interrupt )
static VIDEO_EOF( raiden )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space,0,0,0xffff); /* Could be a memory location instead */
}
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 1aa4ff7fd8c..2ae4be4a5dc 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -682,13 +682,13 @@ WRITE16_HANDLER(sprcpt_flags_2_w)
// XXX
// write only: 4c0 4c1 500 501 502 503
-static UINT16 handle_io_r(const address_space *space, int offset)
+static UINT16 handle_io_r(address_space *space, int offset)
{
logerror("io_r %04x, %04x (%x)\n", offset*2, mainram[offset], cpu_get_pc(space->cpu));
return mainram[offset];
}
-static void handle_io_w(const address_space *space, int offset, UINT16 data, UINT16 mem_mask)
+static void handle_io_w(address_space *space, int offset, UINT16 data, UINT16 mem_mask)
{
COMBINE_DATA(&mainram[offset]);
switch(offset) {
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index 021c03843af..d823a33c015 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -295,7 +295,7 @@ static DRIVER_INIT( kuniokun )
static DRIVER_INIT( kuniokunb )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* Remove the MCU handlers */
memory_unmap_readwrite(space, 0x3804, 0x3804, 0, 0);
diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c
index 04750cb78d6..40d85813cc9 100644
--- a/src/mame/drivers/safarir.c
+++ b/src/mame/drivers/safarir.c
@@ -146,7 +146,7 @@ static PALETTE_INIT( safarir )
static TILE_GET_INFO( get_bg_tile_info )
{
int color;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 code = ram_r(space,tile_index | 0x400);
if (code & 0x80)
@@ -168,7 +168,7 @@ static TILE_GET_INFO( get_bg_tile_info )
static TILE_GET_INFO( get_fg_tile_info )
{
int color, flags;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 code = ram_r(space,tile_index);
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index 4fd116cf36f..95a10fb52b2 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -470,7 +470,7 @@ static void vblank_assert(running_device *device, int state);
static void update_vblank_irq(running_machine *machine);
static void galileo_reset(void);
static TIMER_CALLBACK( galileo_timer_callback );
-static void galileo_perform_dma(const address_space *space, int which);
+static void galileo_perform_dma(address_space *space, int which);
static void voodoo_stall(running_device *device, int stall);
static void widget_reset(running_machine *machine);
static void update_widget_irq(running_machine *machine);
@@ -758,7 +758,7 @@ static void vblank_assert(running_device *device, int state)
*
*************************************/
-static UINT32 pci_bridge_r(const address_space *space, UINT8 reg, UINT8 type)
+static UINT32 pci_bridge_r(address_space *space, UINT8 reg, UINT8 type)
{
UINT32 result = galileo.pci_bridge_regs[reg];
@@ -779,7 +779,7 @@ static UINT32 pci_bridge_r(const address_space *space, UINT8 reg, UINT8 type)
}
-static void pci_bridge_w(const address_space *space, UINT8 reg, UINT8 type, UINT32 data)
+static void pci_bridge_w(address_space *space, UINT8 reg, UINT8 type, UINT32 data)
{
galileo.pci_bridge_regs[reg] = data;
if (LOG_PCI)
@@ -794,7 +794,7 @@ static void pci_bridge_w(const address_space *space, UINT8 reg, UINT8 type, UINT
*
*************************************/
-static UINT32 pci_3dfx_r(const address_space *space, UINT8 reg, UINT8 type)
+static UINT32 pci_3dfx_r(address_space *space, UINT8 reg, UINT8 type)
{
UINT32 result = galileo.pci_3dfx_regs[reg];
@@ -815,7 +815,7 @@ static UINT32 pci_3dfx_r(const address_space *space, UINT8 reg, UINT8 type)
}
-static void pci_3dfx_w(const address_space *space, UINT8 reg, UINT8 type, UINT32 data)
+static void pci_3dfx_w(address_space *space, UINT8 reg, UINT8 type, UINT32 data)
{
galileo.pci_3dfx_regs[reg] = data;
@@ -843,7 +843,7 @@ static void pci_3dfx_w(const address_space *space, UINT8 reg, UINT8 type, UINT32
*
*************************************/
-static UINT32 pci_ide_r(const address_space *space, UINT8 reg, UINT8 type)
+static UINT32 pci_ide_r(address_space *space, UINT8 reg, UINT8 type)
{
UINT32 result = galileo.pci_ide_regs[reg];
@@ -864,7 +864,7 @@ static UINT32 pci_ide_r(const address_space *space, UINT8 reg, UINT8 type)
}
-static void pci_ide_w(const address_space *space, UINT8 reg, UINT8 type, UINT32 data)
+static void pci_ide_w(address_space *space, UINT8 reg, UINT8 type, UINT32 data)
{
galileo.pci_ide_regs[reg] = data;
if (LOG_PCI)
@@ -925,7 +925,7 @@ static TIMER_CALLBACK( galileo_timer_callback )
*
*************************************/
-static int galileo_dma_fetch_next(const address_space *space, int which)
+static int galileo_dma_fetch_next(address_space *space, int which)
{
offs_t address = 0;
UINT32 data;
@@ -965,7 +965,7 @@ static int galileo_dma_fetch_next(const address_space *space, int which)
}
-static void galileo_perform_dma(const address_space *space, int which)
+static void galileo_perform_dma(address_space *space, int which)
{
do
{
@@ -1347,7 +1347,7 @@ static void voodoo_stall(running_device *device, int stall)
for (which = 0; which < 4; which++)
if (galileo.dma_stalled_on_voodoo[which])
{
- const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
if (LOG_DMA) logerror("Resuming DMA%d on voodoo\n", which);
/* mark this DMA as no longer stalled */
diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c
index 09cbe244d62..8d3ed191b4a 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -363,7 +363,7 @@ static void init_ports_systeme(running_machine *machine)
{
/* INIT THE PORTS *********************************************************************************************/
- const address_space *io = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *io = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
running_device *sn1 = machine->device("sn1");
running_device *sn2 = machine->device("sn2");
diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c
index aa25167fd32..09ad2e934df 100644
--- a/src/mame/drivers/segag80r.c
+++ b/src/mame/drivers/segag80r.c
@@ -184,7 +184,7 @@ static MACHINE_RESET( pignewt )
*
*************************************/
-static offs_t decrypt_offset(const address_space *space, offs_t offset)
+static offs_t decrypt_offset(address_space *space, offs_t offset)
{
/* ignore anything but accesses via opcode $32 (LD $(XXYY),A) */
offs_t pc = cpu_get_previouspc(space->cpu);
@@ -297,7 +297,7 @@ static WRITE8_HANDLER( coin_count_w )
static WRITE8_DEVICE_HANDLER( sindbadm_soundport_w )
{
- const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
soundlatch_w(space, 0, data);
cputag_set_input_line(device->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE);
cpuexec_boost_interleave(device->machine, attotime_zero, ATTOTIME_IN_USEC(50));
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index 93d090f8d5a..5a2999384af 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -210,7 +210,7 @@ static MACHINE_RESET( g80v )
*
*************************************/
-static offs_t decrypt_offset(const address_space *space, offs_t offset)
+static offs_t decrypt_offset(address_space *space, offs_t offset)
{
/* ignore anything but accesses via opcode $32 (LD $(XXYY),A) */
offs_t pc = cpu_get_previouspc(space->cpu);
@@ -1315,7 +1315,7 @@ ROM_END
static DRIVER_INIT( elim2 )
{
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
/* configure security */
sega_security(70);
@@ -1329,7 +1329,7 @@ static DRIVER_INIT( elim2 )
static DRIVER_INIT( elim4 )
{
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
/* configure security */
sega_security(76);
@@ -1347,7 +1347,7 @@ static DRIVER_INIT( elim4 )
static DRIVER_INIT( spacfury )
{
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
/* configure security */
sega_security(64);
@@ -1363,7 +1363,7 @@ static DRIVER_INIT( spacfury )
static DRIVER_INIT( zektor )
{
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
running_device *ay = machine->device("aysnd");
/* configure security */
@@ -1385,8 +1385,8 @@ static DRIVER_INIT( zektor )
static DRIVER_INIT( tacscan )
{
- const address_space *pgmspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *pgmspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
/* configure security */
sega_security(76);
@@ -1404,8 +1404,8 @@ static DRIVER_INIT( tacscan )
static DRIVER_INIT( startrek )
{
- const address_space *pgmspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *pgmspace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
/* configure security */
sega_security(64);
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index d9818f99873..200f874dadf 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -285,7 +285,7 @@ static WRITE16_HANDLER( sharrier_io_w )
static WRITE8_DEVICE_HANDLER( sound_latch_w )
{
segas1x_state *state = device->machine->driver_data<segas1x_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
soundlatch_w(space, offset, data);
}
@@ -1866,7 +1866,7 @@ static DRIVER_INIT( enduror )
static DRIVER_INIT( endurobl )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu");
UINT16 *decrypt = auto_alloc_array(machine, UINT16, 0x40000/2);
@@ -1880,7 +1880,7 @@ static DRIVER_INIT( endurobl )
static DRIVER_INIT( endurob2 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT16 *rom = (UINT16 *)memory_region(machine, "maincpu");
UINT16 *decrypt = auto_alloc_array(machine, UINT16, 0x40000/2);
diff --git a/src/mame/drivers/segamsys.c b/src/mame/drivers/segamsys.c
index 091b16ceb3d..a01f3938e59 100644
--- a/src/mame/drivers/segamsys.c
+++ b/src/mame/drivers/segamsys.c
@@ -485,7 +485,7 @@ static UINT8 vdp_data_r(struct sms_vdp *chip)
return retdata;
}
-static void vdp_data_w(const address_space *space, UINT8 data, struct sms_vdp* chip)
+static void vdp_data_w(address_space *space, UINT8 data, struct sms_vdp* chip)
{
/* data writes clear the pending flag */
chip->cmd_pend = 0;
@@ -549,7 +549,7 @@ static void vdp_data_w(const address_space *space, UINT8 data, struct sms_vdp* c
}
-static UINT8 vdp_ctrl_r(const address_space *space, struct sms_vdp *chip)
+static UINT8 vdp_ctrl_r(address_space *space, struct sms_vdp *chip)
{
UINT8 retvalue;
@@ -613,7 +613,7 @@ static void vdp_set_register(running_machine *machine, struct sms_vdp *chip)
// printf("VDP: setting register %01x to %02x\n",reg, chip->cmd_part1);
}
-static void vdp_ctrl_w(const address_space *space, UINT8 data, struct sms_vdp *chip)
+static void vdp_ctrl_w(address_space *space, UINT8 data, struct sms_vdp *chip)
{
if (chip->cmd_pend)
{ /* Part 2 of a command word write */
@@ -1480,7 +1480,7 @@ READ8_HANDLER( sms_ioport_gg00_r )
void init_extra_gg_ports(running_machine* machine, const char* tag)
{
- const address_space *io = cputag_get_address_space(machine, tag, ADDRESS_SPACE_IO);
+ address_space *io = cputag_get_address_space(machine, tag, ADDRESS_SPACE_IO);
memory_install_read8_handler (io, 0x00, 0x00, 0, 0, sms_ioport_gg00_r);
}
@@ -1643,7 +1643,7 @@ static void megatech_set_genz80_as_sms_standard_ports(running_machine *machine,
{
/* INIT THE PORTS *********************************************************************************************/
- const address_space *io = cputag_get_address_space(machine, tag, ADDRESS_SPACE_IO);
+ address_space *io = cputag_get_address_space(machine, tag, ADDRESS_SPACE_IO);
running_device *sn = machine->device("snsnd");
memory_install_readwrite8_handler(io, 0x0000, 0xffff, 0, 0, z80_unmapped_port_r, z80_unmapped_port_w);
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index 1e598bd75e6..e359e34dc7f 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -366,7 +366,7 @@ static const segaic16_memory_map_entry outrun_info[] =
static TIMER_CALLBACK( delayed_sound_data_w )
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
soundlatch_w(space, 0, param);
cpu_set_input_line(state->soundcpu, INPUT_LINE_NMI, ASSERT_LINE);
}
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 0fe970f7c57..0ff162b6809 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -597,7 +597,7 @@ static void dumpmtmt_i8751_sim(running_machine *machine)
static void quartet_i8751_sim(running_machine *machine)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
/* signal a VBLANK to the main CPU */
cpu_set_input_line(state->maincpu, 4, HOLD_LINE);
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index f8d58d1f09f..d3582160888 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -1026,7 +1026,7 @@ static void sound_w(running_machine *machine, UINT8 data)
if (state->soundcpu != NULL)
{
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
soundlatch_w(space, 0, data & 0xff);
cpu_set_input_line(state->soundcpu, 0, HOLD_LINE);
}
@@ -1418,7 +1418,7 @@ static INTERRUPT_GEN( i8751_main_cpu_vblank )
static void altbeast_common_i8751_sim(running_machine *machine, offs_t soundoffs, offs_t inputoffs)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
UINT16 temp;
/* signal a VBLANK to the main CPU */
@@ -1458,7 +1458,7 @@ static void altbeast_i8751_sim(running_machine *machine)
static void ddux_i8751_sim(running_machine *machine)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
UINT16 temp;
/* signal a VBLANK to the main CPU */
@@ -1496,7 +1496,7 @@ static void goldnaxe_i8751_init(running_machine *machine)
static void goldnaxe_i8751_sim(running_machine *machine)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
UINT16 temp;
/* signal a VBLANK to the main CPU */
@@ -1528,7 +1528,7 @@ static void goldnaxe_i8751_sim(running_machine *machine)
static void tturf_i8751_sim(running_machine *machine)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
UINT16 temp;
/* signal a VBLANK to the main CPU */
@@ -1552,7 +1552,7 @@ static void tturf_i8751_sim(running_machine *machine)
static void wb3_i8751_sim(running_machine *machine)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
UINT16 temp;
/* signal a VBLANK to the main CPU */
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index d4c7b1a8a79..e8c310e5203 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -139,7 +139,7 @@ static const segaic16_memory_map_entry *const region_info_list[] =
static void sound_w(running_machine *machine, UINT8 data)
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
soundlatch_w(space, 0, data & 0xff);
cpu_set_input_line(state->soundcpu, INPUT_LINE_NMI, PULSE_LINE);
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index 06d7bb91bed..4284b704dfe 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -696,7 +696,7 @@ static void reset_reset(running_machine *machine)
prev_resetcontrol = resetcontrol;
}
-static void resetcontrol_w(const address_space *space, UINT8 data)
+static void resetcontrol_w(address_space *space, UINT8 data)
{
resetcontrol = data;
logerror("Reset control %02x ('%s':%x)\n", resetcontrol, space->cpu->tag(), cpu_get_pc(space->cpu));
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 22cfbe1c016..274e5b9e21c 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -489,7 +489,7 @@ static TIMER_DEVICE_CALLBACK( signal_v60_irq_callback )
}
-static void int_control_w(const address_space *space, int offset, UINT8 data)
+static void int_control_w(address_space *space, int offset, UINT8 data)
{
int duration;
@@ -628,7 +628,7 @@ static INTERRUPT_GEN( start_of_vblank_int )
*
*************************************/
-static UINT16 common_io_chip_r(const address_space *space, int which, offs_t offset, UINT16 mem_mask)
+static UINT16 common_io_chip_r(address_space *space, int which, offs_t offset, UINT16 mem_mask)
{
static const char *const portnames[2][8] =
{
@@ -679,7 +679,7 @@ static UINT16 common_io_chip_r(const address_space *space, int which, offs_t off
}
-static void common_io_chip_w(const address_space *space, int which, offs_t offset, UINT16 data, UINT16 mem_mask)
+static void common_io_chip_w(address_space *space, int which, offs_t offset, UINT16 data, UINT16 mem_mask)
{
UINT8 old;
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index dad28f7125e..66efa43fd19 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -386,7 +386,7 @@ static void timer_ack_callback(running_machine *machine)
static TIMER_CALLBACK( delayed_sound_data_w )
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
soundlatch_w(space, 0, param);
cpu_set_input_line(state->soundcpu, INPUT_LINE_NMI, ASSERT_LINE);
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index d0d7ee8cda8..fbfe46ccc3d 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -236,7 +236,7 @@ static void sound_cpu_irq(running_device *device, int state)
static TIMER_CALLBACK( delayed_sound_data_w )
{
segas1x_state *state = machine->driver_data<segas1x_state>();
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
soundlatch_w(space, 0, param);
cpu_set_input_line(state->soundcpu, INPUT_LINE_NMI, ASSERT_LINE);
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index b343c1ae55c..daf78476115 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -759,7 +759,7 @@ static UINT8 sb_coin_latch = 0;
static UINT8 ejsakura_input_port = 0;
-static UINT8 z80_fifoout_pop(const address_space *space)
+static UINT8 z80_fifoout_pop(address_space *space)
{
UINT8 r;
if (fifoout_wpos == fifoout_rpos)
@@ -780,7 +780,7 @@ static UINT8 z80_fifoout_pop(const address_space *space)
return r;
}
-static void z80_fifoout_push(const address_space *space, UINT8 data)
+static void z80_fifoout_push(address_space *space, UINT8 data)
{
fifoout_data[fifoout_wpos++] = data;
if (fifoout_wpos == FIFO_SIZE)
@@ -795,7 +795,7 @@ static void z80_fifoout_push(const address_space *space, UINT8 data)
fifoout_read_request = 1;
}
-static UINT8 z80_fifoin_pop(const address_space *space)
+static UINT8 z80_fifoin_pop(address_space *space)
{
UINT8 r;
if (fifoin_wpos == fifoin_rpos)
@@ -816,7 +816,7 @@ static UINT8 z80_fifoin_pop(const address_space *space)
return r;
}
-static void z80_fifoin_push(const address_space *space, UINT8 data)
+static void z80_fifoin_push(address_space *space, UINT8 data)
{
fifoin_data[fifoin_wpos++] = data;
if(fifoin_wpos == FIFO_SIZE)
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 35541dd610f..cda06b435e4 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -3020,7 +3020,7 @@ ADDRESS_MAP_END
static MACHINE_RESET(calibr50)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
sub_bankswitch_w(space, 0, 0);
}
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 69c76c51fde..4b5904e10a7 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -54,7 +54,7 @@ static WRITE16_HANDLER( soundcmd_w )
/* The protection of the Japanese (and alt US) version */
/* I'd love to see someone dump the 68705 / i8751 roms */
-static void write_dword( const address_space *space, offs_t offset, UINT32 data )
+static void write_dword( address_space *space, offs_t offset, UINT32 data )
{
memory_write_word(space, offset, data >> 16);
memory_write_word(space, offset + 2, data);
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index 9b4c3989ff9..336f9cc8aef 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -413,7 +413,7 @@ ROM_END
static DRIVER_INIT( shootout )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int length = memory_region_length(machine, "maincpu");
UINT8 *decrypt = auto_alloc_array(machine, UINT8, length - 0x8000);
UINT8 *rom = memory_region(machine, "maincpu");
diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c
index 7fff66c8eb7..fb5fd0d1650 100644
--- a/src/mame/drivers/skimaxx.c
+++ b/src/mame/drivers/skimaxx.c
@@ -150,12 +150,12 @@ static VIDEO_UPDATE( skimaxx )
*************************************/
// TODO: Might not be used
-static void skimaxx_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+static void skimaxx_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(shiftreg, &fg_buffer[TOWORD(address)], 512 * sizeof(UINT16));
}
-static void skimaxx_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+static void skimaxx_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(&fg_buffer[TOWORD(address)], shiftreg, 512 * sizeof(UINT16));
}
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index 26e34033c30..b0169c20531 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -739,7 +739,7 @@ static const ay8910_interface ay8910_interface_2 =
static VIDEO_EOF( perfrman )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c
index 85c348eb9bb..e5b67468659 100644
--- a/src/mame/drivers/sothello.c
+++ b/src/mame/drivers/sothello.c
@@ -185,7 +185,7 @@ ADDRESS_MAP_END
/* sub 6809 */
-static void unlock_shared_ram(const address_space *space)
+static void unlock_shared_ram(address_space *space)
{
if(!space->machine->device<cpu_device>("sub")->suspended(SUSPEND_REASON_HALT))
{
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index d8b19dddf9c..cdd0c7ab1e2 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -174,7 +174,7 @@ static MACHINE_START( spacefb )
static MACHINE_RESET( spacefb )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
/* the 3 output ports are cleared on reset */
spacefb_port_0_w(space, 0, 0);
spacefb_port_1_w(space, 0, 0);
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index edaff06e441..eaa11cb6455 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -57,7 +57,7 @@ static WRITE8_HANDLER( srumbler_bankswitch_w )
static MACHINE_RESET( srumbler )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* initialize banked ROM pointers */
srumbler_bankswitch_w(space,0,0);
}
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index fc21756eeca..b7e41dd80d3 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -128,7 +128,7 @@ static READ16_HANDLER( deco_71_r )
static MACHINE_RESET( sshangha )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* Such thing is needed as there is no code to turn the screen
to normal orientation when the game is reset.
I'm using the value that forces the screen to be in normal
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index c79b05d42d6..14cc0710ece 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -57,7 +57,7 @@ static MACHINE_RESET( starwars )
/* ESB-specific */
if (starwars_is_esb)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* reset the slapstic */
slapstic_reset();
@@ -93,7 +93,7 @@ static WRITE8_HANDLER( irq_ack_w )
*
*************************************/
-static void esb_slapstic_tweak(const address_space *space, offs_t offset)
+static void esb_slapstic_tweak(address_space *space, offs_t offset)
{
int new_bank = slapstic_tweak(space, offset);
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index 6220b09f277..918965f2102 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -1102,7 +1102,7 @@ static WRITE8_HANDLER( laserdisc_io_w )
static DRIVER_INIT( laserdisc )
{
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
memory_install_readwrite8_handler(iospace, 0x28, 0x2b, 0, 0, laserdisc_io_r, laserdisc_io_w);
}
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 1f5e3d4c512..ee6a6ea68ec 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -239,12 +239,12 @@ static struct
UINT8 abus;
}stv_irq;
-static void dma_direct_lv0(const address_space *space); /*DMA level 0 direct transfer function*/
-static void dma_direct_lv1(const address_space *space); /*DMA level 1 direct transfer function*/
-static void dma_direct_lv2(const address_space *space); /*DMA level 2 direct transfer function*/
-static void dma_indirect_lv0(const address_space *space); /*DMA level 0 indirect transfer function*/
-static void dma_indirect_lv1(const address_space *space); /*DMA level 1 indirect transfer function*/
-static void dma_indirect_lv2(const address_space *space); /*DMA level 2 indirect transfer function*/
+static void dma_direct_lv0(address_space *space); /*DMA level 0 direct transfer function*/
+static void dma_direct_lv1(address_space *space); /*DMA level 1 direct transfer function*/
+static void dma_direct_lv2(address_space *space); /*DMA level 2 direct transfer function*/
+static void dma_indirect_lv0(address_space *space); /*DMA level 0 indirect transfer function*/
+static void dma_indirect_lv1(address_space *space); /*DMA level 1 indirect transfer function*/
+static void dma_indirect_lv2(address_space *space); /*DMA level 2 indirect transfer function*/
int minit_boost,sinit_boost;
@@ -463,7 +463,7 @@ static void system_reset()
/*Order is surely wrong but whatever...*/
}
-static UINT8 stv_SMPC_r8 (const address_space *space, int offset)
+static UINT8 stv_SMPC_r8 (address_space *space, int offset)
{
int return_data;
@@ -490,7 +490,7 @@ static UINT8 stv_SMPC_r8 (const address_space *space, int offset)
return return_data;
}
-static void stv_SMPC_w8 (const address_space *space, int offset, UINT8 data)
+static void stv_SMPC_w8 (address_space *space, int offset, UINT8 data)
{
system_time systime;
@@ -1432,7 +1432,7 @@ static TIMER_CALLBACK( dma_lv2_ended )
D2MV_0;
}
-static void dma_direct_lv0(const address_space *space)
+static void dma_direct_lv0(address_space *space)
{
static UINT32 tmp_src,tmp_dst,tmp_size;
if(LOG_SCU) logerror("DMA lv 0 transfer START\n"
@@ -1541,7 +1541,7 @@ static void dma_direct_lv0(const address_space *space)
}
}
-static void dma_direct_lv1(const address_space *space)
+static void dma_direct_lv1(address_space *space)
{
static UINT32 tmp_src,tmp_dst,tmp_size;
if(LOG_SCU) logerror("DMA lv 1 transfer START\n"
@@ -1642,7 +1642,7 @@ static void dma_direct_lv1(const address_space *space)
}
}
-static void dma_direct_lv2(const address_space *space)
+static void dma_direct_lv2(address_space *space)
{
static UINT32 tmp_src,tmp_dst,tmp_size;
if(LOG_SCU) logerror("DMA lv 2 transfer START\n"
@@ -1743,7 +1743,7 @@ static void dma_direct_lv2(const address_space *space)
}
}
-static void dma_indirect_lv0(const address_space *space)
+static void dma_indirect_lv0(address_space *space)
{
/*Helper to get out of the cycle*/
UINT8 job_done = 0;
@@ -1811,7 +1811,7 @@ static void dma_indirect_lv0(const address_space *space)
timer_set(space->machine, ATTOTIME_IN_USEC(300), NULL, 0, dma_lv0_ended);
}
-static void dma_indirect_lv1(const address_space *space)
+static void dma_indirect_lv1(address_space *space)
{
/*Helper to get out of the cycle*/
UINT8 job_done = 0;
@@ -1880,7 +1880,7 @@ static void dma_indirect_lv1(const address_space *space)
timer_set(space->machine, ATTOTIME_IN_USEC(300), NULL, 0, dma_lv1_ended);
}
-static void dma_indirect_lv2(const address_space *space)
+static void dma_indirect_lv2(address_space *space)
{
/*Helper to get out of the cycle*/
UINT8 job_done = 0;
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index c57252ebc04..c2e4da6c925 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -358,7 +358,7 @@ ADDRESS_MAP_END
static MACHINE_RESET(uballoon)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
uballoon_pcm_1_bankswitch_w(space, 0, 0);
}
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index f59a25bd42d..8d6c5923c17 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -82,7 +82,7 @@ static DRIVER_INIT( hardhead )
/* Non encrypted bootleg */
static DRIVER_INIT( hardhedb )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_set_decrypted_region(space, 0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x48000);
memory_configure_bank(machine, "bank1", 0, 16, memory_region(machine, "maincpu") + 0x10000, 0x4000);
}
@@ -95,7 +95,7 @@ static DRIVER_INIT( hardhedb )
static UINT8 *brickzn_decrypt(running_machine *machine)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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 *decrypt = auto_alloc_array(machine, UINT8, size);
@@ -205,7 +205,7 @@ static DRIVER_INIT( brickzn3 )
static DRIVER_INIT( hardhea2 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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 *decrypt = auto_alloc_array(machine, UINT8, size);
@@ -292,7 +292,7 @@ rom13: 0?, 1y, 2n, 3n ?,?,?,? (palettes)
static DRIVER_INIT( starfigh )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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 *decrypt = auto_alloc_array(machine, UINT8, size);
@@ -360,7 +360,7 @@ static DRIVER_INIT( starfigh )
static DRIVER_INIT( sparkman )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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 *decrypt = auto_alloc_array(machine, UINT8, size);
@@ -1665,7 +1665,7 @@ static INTERRUPT_GEN( hardhea2_interrupt )
static MACHINE_RESET( hardhea2 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
hardhea2_rambank_0_w(space,0,0);
}
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index ffced49abc4..f28bfdbd45e 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -286,7 +286,7 @@ static VIDEO_UPDATE( supertnk )
static MACHINE_RESET( supertnk )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
supertnk_bankswitch_0_w(space, 0, 0);
supertnk_bankswitch_1_w(space, 0, 0);
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index 684673ab50c..256f47c82df 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -4600,8 +4600,8 @@ static READ8_HANDLER( nob_start_r )
static DRIVER_INIT( nob )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
DRIVER_INIT_CALL(bank44);
@@ -4632,7 +4632,7 @@ static DRIVER_INIT( nobb )
// ROM[0x10000 + 0 * 0x8000 + 0x3347] = 0x18; // 'jr' instead of 'jr z'
/* Patch to get sound in later levels(the program enters into a tight loop)*/
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
UINT8 *ROM2 = memory_region(machine, "soundcpu");
ROM2[0x02f9] = 0x28;//'jr z' instead of 'jr'
@@ -4648,7 +4648,7 @@ static DRIVER_INIT( nobb )
static DRIVER_INIT( bootleg )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_set_decrypted_region(space, 0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x10000);
DRIVER_INIT_CALL(bank00);
}
@@ -4656,7 +4656,7 @@ static DRIVER_INIT( bootleg )
static DRIVER_INIT( bootsys2 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_set_decrypted_region(space, 0x0000, 0x7fff, memory_region(machine, "maincpu") + 0x20000);
memory_configure_bank_decrypted(machine, "bank1", 0, 4, memory_region(machine, "maincpu") + 0x30000, 0x4000);
DRIVER_INIT_CALL(bank0c);
@@ -4676,7 +4676,7 @@ static DRIVER_INIT( choplift )
static DRIVER_INIT( shtngmst )
{
- const address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
+ address_space *iospace = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_IO);
memory_install_read_port(iospace, 0x12, 0x12, 0x00, 0x00, "TRIGGER");
memory_install_read_port(iospace, 0x18, 0x18, 0x00, 0x03, "18");
memory_install_read_port(iospace, 0x1c, 0x1c, 0x00, 0x02, "GUNX");
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 1f1a6a9c976..abe70b8c075 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -3356,7 +3356,7 @@ static DRIVER_INIT( goldnaxeb1 )
int i;
UINT8 *ROM = memory_region(machine, "maincpu");
UINT8 *KEY = memory_region(machine, "decryption");
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 data[0x1000];
// the decryption key is in a rom (part of an MSDOS executable...)
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index b40950c700d..e2e303e04f6 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -456,7 +456,7 @@ static READ8_HANDLER( rambankswitch_r )
return state->cur_rambank[offset];
}
-static void bank_w(const address_space *space, offs_t offset, UINT8 data, int banknum )
+static void bank_w(address_space *space, offs_t offset, UINT8 data, int banknum )
{
taitol_state *state = space->machine->driver_data<taitol_state>();
diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c
index ada60b4577d..9e3df41d199 100644
--- a/src/mame/drivers/taitogn.c
+++ b/src/mame/drivers/taitogn.c
@@ -513,7 +513,7 @@ static WRITE32_HANDLER(flash_s3_w)
static void install_handlers(running_machine *machine, int mode)
{
- const address_space *a = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *a = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
if(mode == 0) {
// Mode 0 has access to the subbios, the mn102 flash and the rf5c296 mem zone
memory_install_readwrite32_handler(a, 0x1f000000, 0x1f1fffff, 0, 0, flash_subbios_r, flash_subbios_w);
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index f3cfdbe3057..591339e77df 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -479,7 +479,7 @@ static WRITE32_HANDLER (jc_control1_w)
-static UINT8 mcu_comm_reg_r(const address_space *space, int reg)
+static UINT8 mcu_comm_reg_r(address_space *space, int reg)
{
taitojc_state *state = space->machine->driver_data<taitojc_state>();
UINT8 r = 0;
@@ -506,7 +506,7 @@ static UINT8 mcu_comm_reg_r(const address_space *space, int reg)
return r;
}
-static void mcu_comm_reg_w(const address_space *space, int reg, UINT8 data)
+static void mcu_comm_reg_w(address_space *space, int reg, UINT8 data)
{
taitojc_state *state = space->machine->driver_data<taitojc_state>();
diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c
index ac08519f676..ea2ac56894b 100644
--- a/src/mame/drivers/tcl.c
+++ b/src/mame/drivers/tcl.c
@@ -180,7 +180,7 @@ static DRIVER_INIT(tcl)
{
/* only the first part is decrypted (and verified)*/
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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 *src = auto_alloc_array(machine, UINT8, len);
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index dc7844a965c..b0885912ada 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -120,7 +120,7 @@
static MACHINE_RESET( tiamc1 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
tiamc1_bankswitch_w(space, 0, 0);
}
diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c
index 9746cf4479a..906445fba88 100644
--- a/src/mame/drivers/tickee.c
+++ b/src/mame/drivers/tickee.c
@@ -224,14 +224,14 @@ static READ16_HANDLER( rapidfir_transparent_r )
}
-static void rapidfir_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+static void rapidfir_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
if (address < 0x800000)
memcpy(shiftreg, &tickee_vram[TOWORD(address)], TOBYTE(0x2000));
}
-static void rapidfir_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+static void rapidfir_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
if (address < 0x800000)
memcpy(&tickee_vram[TOWORD(address)], shiftreg, TOBYTE(0x2000));
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 02bab580c72..9ab996b3056 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -87,7 +87,7 @@ static const int f1dream_2450_lookup[32] = {
0x0003, 0x0080, 0x0006, 0x0060, 0x0000, 0x00e0, 0x000a, 0x00c0, 0x0003, 0x0080, 0x0006, 0x0060, 0x0000, 0x00e0, 0x000a, 0x00c0,
0x0003, 0x0080, 0x0006, 0x0060, 0x0000, 0x00e0, 0x000a, 0x00c0, 0x0003, 0x0080, 0x0006, 0x0060, 0x0000, 0x00e0, 0x000a, 0x00c0 };
-static void f1dream_protection_w(const address_space *space)
+static void f1dream_protection_w(address_space *space)
{
int indx;
int value = 255;
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index b0cfa0d8cb2..1e80bfc8023 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -806,7 +806,7 @@ INLINE UINT32 tmnt2_get_word( running_machine *machine, UINT32 addr )
return 0;
}
-static void tmnt2_put_word( const address_space *space, UINT32 addr, UINT16 data )
+static void tmnt2_put_word( address_space *space, UINT32 addr, UINT16 data )
{
tmnt_state *state = space->machine->driver_data<tmnt_state>();
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index cd484fe3a55..91f331dc688 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -834,7 +834,7 @@ static DRIVER_INIT(jujub)
/* Decrypt data for z80 program */
{
- const address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ 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");
int i;
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index f129d9c3a2e..5a8a3858848 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -1369,7 +1369,7 @@ static DRIVER_INIT( trackfld )
static DRIVER_INIT( atlantol )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 *rom = memory_region(machine, "maincpu");
UINT8 *decrypt;
int A;
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index 3e244109ea7..f22e60c0063 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -100,13 +100,13 @@ static INTERRUPT_GEN( z80_irq )
static READ16_HANDLER( z80_shared_r )
{
- const address_space *cpu2space = cputag_get_address_space(space->machine, "audio_cpu", ADDRESS_SPACE_PROGRAM);
+ address_space *cpu2space = cputag_get_address_space(space->machine, "audio_cpu", ADDRESS_SPACE_PROGRAM);
return memory_read_byte(cpu2space, offset);
}
static WRITE16_HANDLER( z80_shared_w )
{
- const address_space *cpu2space = cputag_get_address_space(space->machine, "audio_cpu", ADDRESS_SPACE_PROGRAM);
+ address_space *cpu2space = cputag_get_address_space(space->machine, "audio_cpu", ADDRESS_SPACE_PROGRAM);
memory_write_byte(cpu2space, offset, data & 0xff);
}
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index b7b53ace6b9..61ac0028d18 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -1621,7 +1621,7 @@ ROM_START( aoh )
ROM_COPY( "user2", 0x060000, 0x0e0000, 0x020000)
ROM_END
-static int irq_active(const address_space *space)
+static int irq_active(address_space *space)
{
UINT32 FCR = cpu_get_reg(space->cpu, 27);
if( !(FCR&(1<<29)) ) // int 2 (irq 4)
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index 0367e815140..49f4f2e792a 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -166,7 +166,7 @@ static WRITE8_HANDLER( vendetta_K052109_w )
static void vendetta_video_banking( running_machine *machine, int select )
{
vendetta_state *state = machine->driver_data<vendetta_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
if (select & 1)
{
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 60d186398ab..3275b07a118 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -140,7 +140,7 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw )
if (wardner_membank != data) {
int bankaddress = 0;
- const address_space *mainspace;
+ address_space *mainspace;
UINT8 *RAM = memory_region(space->machine, "maincpu");
mainspace = cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
@@ -178,7 +178,7 @@ static WRITE8_HANDLER( wardner_ramrom_bank_sw )
STATE_POSTLOAD( wardner_restore_bank )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
wardner_ramrom_bank_sw(space,0,1); /* Dummy value to ensure restoration */
wardner_ramrom_bank_sw(space,0,wardner_membank);
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index 8e8d8639c96..1de72f3cf85 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -524,7 +524,7 @@ static ADDRESS_MAP_START( defender_map, ADDRESS_SPACE_PROGRAM, 8 )
ADDRESS_MAP_END
-void defender_install_io_space(const address_space *space)
+void defender_install_io_space(address_space *space)
{
running_device *pia_0 = space->machine->device("pia_0");
running_device *pia_1 = space->machine->device("pia_1");
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index 7e0c9c8e14a..40c45ba7be6 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -1049,7 +1049,7 @@ static DRIVER_INIT( stinger )
{ 5,3,7, 0x80 },
{ 5,7,3, 0x28 }
};
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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 *decrypt = auto_alloc_array(machine, UINT8, size);
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index c689897fd9c..d816460593b 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -381,7 +381,7 @@ static const ym2151_interface ym2151_config =
static VIDEO_EOF( wwfwfest )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space,0,0,0xffff);
}
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index 841b67cd181..f05bfdfdfad 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -80,7 +80,7 @@ static void xtheball_scanline_update(screen_device &screen, bitmap_t *bitmap, in
*
*************************************/
-static void xtheball_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+static void xtheball_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
if (address >= 0x01000000 && address <= 0x010fffff)
memcpy(shiftreg, &vram_bg[TOWORD(address & 0xff000)], TOBYTE(0x1000));
@@ -91,7 +91,7 @@ static void xtheball_to_shiftreg(const address_space *space, UINT32 address, UIN
}
-static void xtheball_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+static void xtheball_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
if (address >= 0x01000000 && address <= 0x010fffff)
memcpy(&vram_bg[TOWORD(address & 0xff000)], shiftreg, TOBYTE(0x1000));
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index e29ce23694f..5a3c4453b3b 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -1450,7 +1450,7 @@ static void zaxxonj_decode(running_machine *machine, const char *cputag)
};
int A;
- const address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM);
+ 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 *decrypt = auto_alloc_array(machine, UINT8, size);
diff --git a/src/mame/includes/artmagic.h b/src/mame/includes/artmagic.h
index 4ae44cdce9c..c86337b9f27 100644
--- a/src/mame/includes/artmagic.h
+++ b/src/mame/includes/artmagic.h
@@ -13,8 +13,8 @@ extern int artmagic_xor[16], artmagic_is_stoneball;
VIDEO_START( artmagic );
-void artmagic_to_shiftreg(const address_space *space, offs_t address, UINT16 *data);
-void artmagic_from_shiftreg(const address_space *space, offs_t address, UINT16 *data);
+void artmagic_to_shiftreg(address_space *space, offs_t address, UINT16 *data);
+void artmagic_from_shiftreg(address_space *space, offs_t address, UINT16 *data);
READ16_HANDLER( artmagic_blitter_r );
WRITE16_HANDLER( artmagic_blitter_w );
diff --git a/src/mame/includes/atari.h b/src/mame/includes/atari.h
index 6ef492835d6..4d33ad2c979 100644
--- a/src/mame/includes/atari.h
+++ b/src/mame/includes/atari.h
@@ -210,7 +210,7 @@ typedef struct {
UINT16 data[HWIDTH]; /* graphics data buffer (text through chargen) */
} VIDEO;
-typedef void (*atari_renderer_func)(const address_space *space, VIDEO *video);
+typedef void (*atari_renderer_func)(address_space *space, VIDEO *video);
typedef struct {
atari_renderer_func renderer; /* current renderer */
@@ -534,7 +534,7 @@ void antic_reset(void);
READ8_HANDLER ( atari_antic_r );
WRITE8_HANDLER ( atari_antic_w );
-#define ANTIC_RENDERER(name) void name(const address_space *space, VIDEO *video)
+#define ANTIC_RENDERER(name) void name(address_space *space, VIDEO *video)
ANTIC_RENDERER( antic_mode_0_xx );
ANTIC_RENDERER( antic_mode_2_32 );
diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h
index 80441feefe1..a702ef83490 100644
--- a/src/mame/includes/atarigt.h
+++ b/src/mame/includes/atarigt.h
@@ -36,8 +36,8 @@ public:
UINT32 * mo_command;
- void (*protection_w)(const address_space *space, offs_t offset, UINT16 data);
- void (*protection_r)(const address_space *space, offs_t offset, UINT16 *data);
+ void (*protection_w)(address_space *space, offs_t offset, UINT16 data);
+ void (*protection_r)(address_space *space, offs_t offset, UINT16 *data);
};
diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h
index f49ce7f8889..30802f53308 100644
--- a/src/mame/includes/btoads.h
+++ b/src/mame/includes/btoads.h
@@ -34,7 +34,7 @@ WRITE16_HANDLER( btoads_vram_fg_draw_w );
READ16_HANDLER( btoads_vram_fg_display_r );
READ16_HANDLER( btoads_vram_fg_draw_r );
-void btoads_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
-void btoads_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
+void btoads_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
+void btoads_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
void btoads_scanline_update(screen_device &screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params);
diff --git a/src/mame/includes/eolithsp.h b/src/mame/includes/eolithsp.h
index 4dca5544b7b..e3b4fe9a41d 100644
--- a/src/mame/includes/eolithsp.h
+++ b/src/mame/includes/eolithsp.h
@@ -1,6 +1,6 @@
/*----------- defined in drivers/eolithsp.c -----------*/
-void eolith_speedup_read(const address_space *space);
+void eolith_speedup_read(address_space *space);
void init_eolith_speedup(running_machine *machine);
INTERRUPT_GEN( eolith_speedup );
CUSTOM_INPUT( eolith_speedup_getvblank );
diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h
index a2ff4e31d14..43b47162439 100644
--- a/src/mame/includes/exterm.h
+++ b/src/mame/includes/exterm.h
@@ -12,7 +12,7 @@ extern UINT16 *exterm_slave_videoram;
PALETTE_INIT( exterm );
void exterm_scanline_update(screen_device &screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params);
-void exterm_to_shiftreg_master(const address_space *space, UINT32 address, UINT16* shiftreg);
-void exterm_from_shiftreg_master(const address_space *space, UINT32 address, UINT16* shiftreg);
-void exterm_to_shiftreg_slave(const address_space *space, UINT32 address, UINT16* shiftreg);
-void exterm_from_shiftreg_slave(const address_space *space, UINT32 address, UINT16* shiftreg);
+void exterm_to_shiftreg_master(address_space *space, UINT32 address, UINT16* shiftreg);
+void exterm_from_shiftreg_master(address_space *space, UINT32 address, UINT16* shiftreg);
+void exterm_to_shiftreg_slave(address_space *space, UINT32 address, UINT16* shiftreg);
+void exterm_from_shiftreg_slave(address_space *space, UINT32 address, UINT16* shiftreg);
diff --git a/src/mame/includes/gaelcrpt.h b/src/mame/includes/gaelcrpt.h
index b4422069270..cb56ca81983 100644
--- a/src/mame/includes/gaelcrpt.h
+++ b/src/mame/includes/gaelcrpt.h
@@ -1,3 +1,3 @@
/*----------- defined in machine/gaelcrpt.c -----------*/
-UINT16 gaelco_decrypt(const address_space *space, int offset, int data, int param1, int param2);
+UINT16 gaelco_decrypt(address_space *space, int offset, int data, int param1, int param2);
diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h
index 0e5872a3b97..e765a65829c 100644
--- a/src/mame/includes/harddriv.h
+++ b/src/mame/includes/harddriv.h
@@ -338,8 +338,8 @@ READ16_HANDLER( hdsnddsp_compare_r );
/*----------- defined in video/harddriv.c -----------*/
VIDEO_START( harddriv );
-void hdgsp_write_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
-void hdgsp_read_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
+void hdgsp_write_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
+void hdgsp_read_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
READ16_HANDLER( hdgsp_control_lo_r );
WRITE16_HANDLER( hdgsp_control_lo_w );
diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h
index b8704fbdddc..632f84a74b0 100644
--- a/src/mame/includes/jpmimpct.h
+++ b/src/mame/includes/jpmimpct.h
@@ -11,8 +11,8 @@ extern UINT16 *jpmimpct_vram;
READ16_HANDLER( jpmimpct_bt477_r );
WRITE16_HANDLER( jpmimpct_bt477_w );
-void jpmimpct_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
-void jpmimpct_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
+void jpmimpct_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
+void jpmimpct_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
void jpmimpct_scanline_update(screen_device &screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params);
VIDEO_START( jpmimpct );
diff --git a/src/mame/includes/midtunit.h b/src/mame/includes/midtunit.h
index 1cec737599f..fd779b78244 100644
--- a/src/mame/includes/midtunit.h
+++ b/src/mame/includes/midtunit.h
@@ -47,8 +47,8 @@ READ16_HANDLER( midtunit_vram_r );
READ16_HANDLER( midtunit_vram_data_r );
READ16_HANDLER( midtunit_vram_color_r );
-void midtunit_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
-void midtunit_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
+void midtunit_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
+void midtunit_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
WRITE16_HANDLER( midtunit_control_w );
WRITE16_HANDLER( midwunit_control_w );
diff --git a/src/mame/includes/midyunit.h b/src/mame/includes/midyunit.h
index a0ed629061c..89bde14d7ee 100644
--- a/src/mame/includes/midyunit.h
+++ b/src/mame/includes/midyunit.h
@@ -54,8 +54,8 @@ READ16_HANDLER( midyunit_gfxrom_r );
WRITE16_HANDLER( midyunit_vram_w );
READ16_HANDLER( midyunit_vram_r );
-void midyunit_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
-void midyunit_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
+void midyunit_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
+void midyunit_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg);
WRITE16_HANDLER( midyunit_control_w );
WRITE16_HANDLER( midyunit_paletteram_w );
diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h
index d6a5200922a..484fcc12d7a 100644
--- a/src/mame/includes/model3.h
+++ b/src/mame/includes/model3.h
@@ -36,8 +36,8 @@ WRITE64_HANDLER(real3d_cmd_w);
WRITE64_HANDLER(real3d_display_list_w);
WRITE64_HANDLER(real3d_polygon_ram_w);
void real3d_display_list_end(running_machine *machine);
-void real3d_display_list1_dma(const address_space *space, UINT32 src, UINT32 dst, int length, int byteswap);
-void real3d_display_list2_dma(const address_space *space, UINT32 src, UINT32 dst, int length, int byteswap);
-void real3d_vrom_texture_dma(const address_space *space, UINT32 src, UINT32 dst, int length, int byteswap);
-void real3d_texture_fifo_dma(const address_space *space, UINT32 src, int length, int byteswap);
-void real3d_polygon_ram_dma(const address_space *space, UINT32 src, UINT32 dst, int length, int byteswap);
+void real3d_display_list1_dma(address_space *space, UINT32 src, UINT32 dst, int length, int byteswap);
+void real3d_display_list2_dma(address_space *space, UINT32 src, UINT32 dst, int length, int byteswap);
+void real3d_vrom_texture_dma(address_space *space, UINT32 src, UINT32 dst, int length, int byteswap);
+void real3d_texture_fifo_dma(address_space *space, UINT32 src, int length, int byteswap);
+void real3d_polygon_ram_dma(address_space *space, UINT32 src, UINT32 dst, int length, int byteswap);
diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h
index 29af86ab2a8..e14ca4481eb 100644
--- a/src/mame/includes/neogeo.h
+++ b/src/mame/includes/neogeo.h
@@ -116,10 +116,10 @@ public:
/*----------- defined in drivers/neogeo.c -----------*/
void neogeo_set_display_position_interrupt_control(running_machine *machine, UINT16 data);
-void neogeo_set_display_counter_msb(const address_space *space, UINT16 data);
-void neogeo_set_display_counter_lsb(const address_space *space, UINT16 data);
+void neogeo_set_display_counter_msb(address_space *space, UINT16 data);
+void neogeo_set_display_counter_lsb(address_space *space, UINT16 data);
void neogeo_acknowledge_interrupt(running_machine *machine, UINT16 data);
-void neogeo_set_main_cpu_bank_address(const address_space *space, UINT32 bank_address);
+void neogeo_set_main_cpu_bank_address(address_space *space, UINT32 bank_address);
READ16_HANDLER( neogeo_unmapped_r );
diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h
index 578f9973180..9716c5a1573 100644
--- a/src/mame/includes/ojankohs.h
+++ b/src/mame/includes/ojankohs.h
@@ -57,5 +57,5 @@ VIDEO_START( ojankoc );
VIDEO_UPDATE( ojankohs );
VIDEO_UPDATE( ojankoc );
-void ojankoc_flipscreen(const address_space *space, int data);
+void ojankoc_flipscreen(address_space *space, int data);
diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h
index 28309c3acfa..5e7b7893aad 100644
--- a/src/mame/includes/segas24.h
+++ b/src/mame/includes/segas24.h
@@ -9,7 +9,7 @@
void system24temp_sys16_io_set_callbacks(UINT8 (*io_r)(running_machine *machine, int port),
void (*io_w)(running_machine *machine, int port, UINT8 data),
- void (*cnt_w)(const address_space *space, UINT8 data),
+ void (*cnt_w)(address_space *space, UINT8 data),
read16_space_func iod_r,
write16_space_func iod_w);
READ16_HANDLER ( system24temp_sys16_io_r );
diff --git a/src/mame/includes/slapstic.h b/src/mame/includes/slapstic.h
index db3ceb78e8c..4ecd3c88a45 100644
--- a/src/mame/includes/slapstic.h
+++ b/src/mame/includes/slapstic.h
@@ -15,4 +15,4 @@ void slapstic_init(running_machine *machine, int chip);
void slapstic_reset(void);
int slapstic_bank(void);
-int slapstic_tweak(const address_space *space, offs_t offset);
+int slapstic_tweak(address_space *space, offs_t offset);
diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h
index c1a05038f3c..387ec0cfbe6 100644
--- a/src/mame/includes/williams.h
+++ b/src/mame/includes/williams.h
@@ -9,7 +9,7 @@
/*----------- defined in drivers/williams.c -----------*/
-void defender_install_io_space(const address_space *space);
+void defender_install_io_space(address_space *space);
/*----------- defined in machine/williams.c -----------*/
diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c
index 3252ff35cbf..ba4b0818e14 100644
--- a/src/mame/machine/amiga.c
+++ b/src/mame/machine/amiga.c
@@ -293,7 +293,7 @@ void amiga_machine_config(running_machine *machine, const amiga_machine_interfac
static void amiga_m68k_reset(running_device *device)
{
- const address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM);
logerror("Executed RESET at PC=%06x\n", cpu_get_pc(space->cpu));
@@ -973,7 +973,7 @@ static TIMER_CALLBACK( amiga_blitter_proc )
*
*************************************/
-static void blitter_setup(const address_space *space)
+static void blitter_setup(address_space *space)
{
int ticks, width, height, blittime;
@@ -1535,7 +1535,7 @@ WRITE16_HANDLER( amiga_custom_w )
void amiga_serial_in_w(running_machine *machine, UINT16 data)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int mask = (CUSTOM_REG(REG_SERPER) & 0x8000) ? 0x1ff : 0xff;
/* copy the data to the low 8 bits of SERDATR and set RBF */
diff --git a/src/mame/machine/archimds.c b/src/mame/machine/archimds.c
index f8da3ff3a77..3570e8ec8c9 100644
--- a/src/mame/machine/archimds.c
+++ b/src/mame/machine/archimds.c
@@ -111,7 +111,7 @@ static TIMER_CALLBACK( vidc_vblank )
/* at about every ~4/4 USEC do a DMA transfer byte */
static TIMER_CALLBACK( vidc_video_tick )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
static UINT8 *vram = memory_region(machine,"vram");
vram[vidc_vidcur] = (memory_read_byte(space,vidc_vidstart+vidc_vidcur));
@@ -131,7 +131,7 @@ static TIMER_CALLBACK( vidc_video_tick )
static TIMER_CALLBACK( vidc_audio_tick )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
dac_signed_data_w(space->machine->device("dac"), (memory_read_byte(space,vidc_sndcur)));
diff --git a/src/mame/machine/asic65.c b/src/mame/machine/asic65.c
index f221ec58970..ad947ab92a9 100644
--- a/src/mame/machine/asic65.c
+++ b/src/mame/machine/asic65.c
@@ -144,7 +144,7 @@ void asic65_config(running_machine *machine, int asictype)
void asic65_reset(running_machine *machine, int state)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* rom-based means reset and clear states */
if (asic65.cpu != NULL)
diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c
index fbbd2250bd4..7e1883cc8ec 100644
--- a/src/mame/machine/atari.c
+++ b/src/mame/machine/atari.c
@@ -314,13 +314,13 @@ static void pokey_reset(running_machine &machine)
}
-static UINT8 console_read(const address_space *space)
+static UINT8 console_read(address_space *space)
{
return input_port_read(space->machine, "console");
}
-static void console_write(const address_space *space, UINT8 data)
+static void console_write(address_space *space, UINT8 data)
{
running_device *dac = space->machine->device("dac");
if (data & 0x08)
diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c
index 7454cf49d21..5a75fec7b7f 100644
--- a/src/mame/machine/atarigen.c
+++ b/src/mame/machine/atarigen.c
@@ -802,7 +802,7 @@ static void update_6502_irq(running_machine *machine)
static TIMER_CALLBACK( delayed_sound_reset )
{
atarigen_state *state = machine->driver_data<atarigen_state>();
- const address_space *space = cpu_get_address_space(state->sound_cpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->sound_cpu, ADDRESS_SPACE_PROGRAM);
/* unhalt and reset the sound CPU */
if (param == 0)
diff --git a/src/mame/machine/bagman.c b/src/mame/machine/bagman.c
index 5307144ce06..e75b8c1a8d1 100644
--- a/src/mame/machine/bagman.c
+++ b/src/mame/machine/bagman.c
@@ -219,7 +219,7 @@ UINT8 line;
MACHINE_RESET( bagman )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
bagman_pal16r6_w(space, 0, 1); /*pin 2*/
bagman_pal16r6_w(space, 1, 1); /*pin 3*/
bagman_pal16r6_w(space, 2, 1); /*pin 4*/
diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c
index b6b29ce5c5a..d5a076073df 100644
--- a/src/mame/machine/balsente.c
+++ b/src/mame/machine/balsente.c
@@ -132,7 +132,7 @@ MACHINE_START( balsente )
MACHINE_RESET( balsente )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
balsente_state *state = machine->driver_data<balsente_state>();
int numbanks;
diff --git a/src/mame/machine/cclimber.c b/src/mame/machine/cclimber.c
index e481b510952..ab07dc57e09 100644
--- a/src/mame/machine/cclimber.c
+++ b/src/mame/machine/cclimber.c
@@ -6,7 +6,7 @@
static void cclimber_decode(running_machine *machine, const UINT8 convtable[8][16])
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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, 0x10000);
int A;
diff --git a/src/mame/machine/cps2crpt.c b/src/mame/machine/cps2crpt.c
index de2ae75d2d4..af581dbd40a 100644
--- a/src/mame/machine/cps2crpt.c
+++ b/src/mame/machine/cps2crpt.c
@@ -632,7 +632,7 @@ static void optimise_sboxes(struct optimised_sbox* out, const struct sbox* in)
static void cps2_decrypt(running_machine *machine, const UINT32 *master_key, UINT32 upper_limit)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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 *dec = auto_alloc_array(machine, UINT16, length/2);
diff --git a/src/mame/machine/cubocd32.c b/src/mame/machine/cubocd32.c
index eac74b71412..4ce18a97530 100644
--- a/src/mame/machine/cubocd32.c
+++ b/src/mame/machine/cubocd32.c
@@ -469,7 +469,7 @@ static void akiko_start_dma( void )
timer_adjust_oneshot( akiko.dma_timer, ATTOTIME_IN_USEC( CD_SECTOR_TIME / akiko.cdrom_speed ), 0 );
}
-static void akiko_setup_response( const address_space *space, int len, UINT8 *r1 )
+static void akiko_setup_response( address_space *space, int len, UINT8 *r1 )
{
int resp_addr = akiko.cdrom_address[1];
UINT8 resp_csum = 0xff;
@@ -516,7 +516,7 @@ static TIMER_CALLBACK( akiko_cd_delayed_cmd )
if ( param == 0x05 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
if (LOG_AKIKO_CD) logerror( "AKIKO: Completing Command %d\n", param );
resp[0] = 0x06;
@@ -538,7 +538,7 @@ static TIMER_CALLBACK( akiko_cd_delayed_cmd )
}
}
-static void akiko_update_cdrom(const address_space *space)
+static void akiko_update_cdrom(address_space *space)
{
UINT8 resp[32], cmdbuf[32];
diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c
index 2235abc3a1f..1e90b30c107 100644
--- a/src/mame/machine/dc.c
+++ b/src/mame/machine/dc.c
@@ -229,7 +229,7 @@ static TIMER_CALLBACK( yuv_fifo_irq )
dc_update_interrupt_status(machine);
}
-static void wave_dma_execute(const address_space *space)
+static void wave_dma_execute(address_space *space)
{
UINT32 src,dst,size;
dst = wave_dma.aica_addr;
@@ -268,7 +268,7 @@ static void wave_dma_execute(const address_space *space)
timer_set(space->machine, ATTOTIME_IN_USEC(300), NULL, 0, aica_dma_irq);
}
-static void pvr_dma_execute(const address_space *space)
+static void pvr_dma_execute(address_space *space)
{
UINT32 src,dst,size;
dst = pvr_dma.pvr_addr;
@@ -416,7 +416,7 @@ void dc_update_interrupt_status(running_machine *machine)
{
if((dc_sysctrl_regs[SB_G2DTNRM] & dc_sysctrl_regs[SB_ISTNRM]) || (dc_sysctrl_regs[SB_G2DTEXT] & dc_sysctrl_regs[SB_ISTEXT]))
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
printf("Wave DMA HW trigger\n");
wave_dma_execute(space);
@@ -428,7 +428,7 @@ void dc_update_interrupt_status(running_machine *machine)
{
if((dc_sysctrl_regs[SB_PDTNRM] & dc_sysctrl_regs[SB_ISTNRM]) || (dc_sysctrl_regs[SB_PDTEXT] & dc_sysctrl_regs[SB_ISTEXT]))
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
printf("PVR-DMA HW trigger\n");
pvr_dma_execute(space);
diff --git a/src/mame/machine/deco102.c b/src/mame/machine/deco102.c
index 197595afeed..283ca0387e2 100644
--- a/src/mame/machine/deco102.c
+++ b/src/mame/machine/deco102.c
@@ -50,7 +50,7 @@ static UINT16 decrypt(UINT16 data, int address, int select_xor)
void deco102_decrypt_cpu(running_machine *machine, const char *cputag, int address_xor, int data_select_xor, int opcode_select_xor)
{
int i;
- const address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM);
+ 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 *opcodes = auto_alloc_array(machine, UINT16, size / 2);
diff --git a/src/mame/machine/fd1089.c b/src/mame/machine/fd1089.c
index 0491d35124f..7cb1ff8a6da 100644
--- a/src/mame/machine/fd1089.c
+++ b/src/mame/machine/fd1089.c
@@ -404,7 +404,7 @@ static void clear_decrypted(running_machine &machine)
static void sys16_decrypt(running_machine *machine, const UINT8 *key,int cputype)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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");
int A;
diff --git a/src/mame/machine/fddebug.c b/src/mame/machine/fddebug.c
index fa24c07afe2..f2469bff442 100644
--- a/src/mame/machine/fddebug.c
+++ b/src/mame/machine/fddebug.c
@@ -277,7 +277,7 @@ static void execute_fdcset(running_machine *machine, int ref, int params, const
static void execute_fdclist(running_machine *machine, int ref, int params, const char **param);
static void execute_fdcsearch(running_machine *machine, int ref, int params, const char **param);
-static fd1094_possibility *try_all_possibilities(const address_space *space, int basepc, int offset, int length, UINT8 *instrbuffer, UINT8 *keybuffer, fd1094_possibility *possdata);
+static fd1094_possibility *try_all_possibilities(address_space *space, int basepc, int offset, int length, UINT8 *instrbuffer, UINT8 *keybuffer, fd1094_possibility *possdata);
static void tag_possibility(running_machine *machine, fd1094_possibility *possdata, UINT8 status);
static void perform_constrained_search(running_machine *machine);
@@ -287,8 +287,8 @@ static int does_key_work_for_constraints(const UINT16 *base, UINT8 *key);
static UINT32 reconstruct_base_seed(int keybaseaddr, UINT32 startseed);
static void build_optable(running_machine *machine);
-static int validate_ea(const address_space *space, UINT32 pc, UINT8 modereg, const UINT8 *parambase, UINT32 flags);
-static int validate_opcode(const address_space *space, UINT32 pc, const UINT8 *opdata, int maxwords);
+static int validate_ea(address_space *space, UINT32 pc, UINT8 modereg, const UINT8 *parambase, UINT32 flags);
+static int validate_opcode(address_space *space, UINT32 pc, const UINT8 *opdata, int maxwords);
@@ -429,7 +429,7 @@ INLINE void print_possibilities(running_machine *machine)
0=no, 1=yes, 2=unlikely
-----------------------------------------------*/
-INLINE int pc_is_valid(const address_space *space, UINT32 pc, UINT32 flags)
+INLINE int pc_is_valid(address_space *space, UINT32 pc, UINT32 flags)
{
/* if we're odd or out of range, fail */
if ((pc & 1) == 1)
@@ -447,7 +447,7 @@ INLINE int pc_is_valid(const address_space *space, UINT32 pc, UINT32 flags)
valid? 0=no, 1=yes, 2=unlikely
-----------------------------------------------*/
-INLINE int addr_is_valid(const address_space *space, UINT32 addr, UINT32 flags)
+INLINE int addr_is_valid(address_space *space, UINT32 addr, UINT32 flags)
{
/* if this a JMP, the address is a PC */
if (flags & OF_JMP)
@@ -1052,7 +1052,7 @@ static void execute_fdpc(running_machine *machine, int ref, int params, const ch
static void execute_fdsearch(running_machine *machine, int ref, int params, const char **param)
{
- const address_space *space = cpu_get_address_space(debug_cpu_get_visible_cpu(machine), ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(debug_cpu_get_visible_cpu(machine), ADDRESS_SPACE_PROGRAM);
int pc = cpu_get_pc(space->cpu);
int length, first = TRUE;
UINT8 instrdata[2];
@@ -1178,7 +1178,7 @@ static void execute_fdsearch(running_machine *machine, int ref, int params, cons
static void execute_fddasm(running_machine *machine, int ref, int params, const char **param)
{
- const address_space *space = cpu_get_address_space(debug_cpu_get_visible_cpu(machine), ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(debug_cpu_get_visible_cpu(machine), ADDRESS_SPACE_PROGRAM);
int origstate = fd1094_set_state(keyregion, -1);
const char *filename;
int skipped = FALSE;
@@ -1385,7 +1385,7 @@ static void execute_fdcsearch(running_machine *machine, int ref, int params, con
length
-----------------------------------------------*/
-static fd1094_possibility *try_all_possibilities(const address_space *space, int basepc, int offset, int length, UINT8 *instrbuffer, UINT8 *keybuffer, fd1094_possibility *possdata)
+static fd1094_possibility *try_all_possibilities(address_space *space, int basepc, int offset, int length, UINT8 *instrbuffer, UINT8 *keybuffer, fd1094_possibility *possdata)
{
UINT8 keymask, keystat;
UINT16 possvalue[4];
@@ -2226,7 +2226,7 @@ static void build_optable(running_machine *machine)
valid or not, and return the length
-----------------------------------------------*/
-static int validate_ea(const address_space *space, UINT32 pc, UINT8 modereg, const UINT8 *parambase, UINT32 flags)
+static int validate_ea(address_space *space, UINT32 pc, UINT8 modereg, const UINT8 *parambase, UINT32 flags)
{
UINT32 addr;
int valid;
@@ -2296,7 +2296,7 @@ static int validate_ea(const address_space *space, UINT32 pc, UINT8 modereg, con
the length specified
-----------------------------------------------*/
-static int validate_opcode(const address_space *space, UINT32 pc, const UINT8 *opdata, int maxwords)
+static int validate_opcode(address_space *space, UINT32 pc, const UINT8 *opdata, int maxwords)
{
UINT32 immvalue = 0;
int iffy = FALSE;
diff --git a/src/mame/machine/gaelcrpt.c b/src/mame/machine/gaelcrpt.c
index d6115916d5e..147c601ad00 100644
--- a/src/mame/machine/gaelcrpt.c
+++ b/src/mame/machine/gaelcrpt.c
@@ -120,7 +120,7 @@ static int decrypt(int const param1, int const param2, int const enc_prev_word,
-UINT16 gaelco_decrypt(const address_space *space, int offset, int data, int param1, int param2)
+UINT16 gaelco_decrypt(address_space *space, int offset, int data, int param1, int param2)
{
static int lastpc, lastoffset, lastencword, lastdecword;
diff --git a/src/mame/machine/galaxold.c b/src/mame/machine/galaxold.c
index 6f75a3252fc..690753d9ab1 100644
--- a/src/mame/machine/galaxold.c
+++ b/src/mame/machine/galaxold.c
@@ -319,7 +319,7 @@ DRIVER_INIT( mooncrgx )
DRIVER_INIT( moonqsr )
{
offs_t i;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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, 0x8000);
@@ -397,7 +397,7 @@ Pin layout is such that links can replace the PAL if encryption is not used.
DRIVER_INIT( 4in1 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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");
diff --git a/src/mame/machine/harddriv.c b/src/mame/machine/harddriv.c
index eded1dccf1f..1cbae42c046 100644
--- a/src/mame/machine/harddriv.c
+++ b/src/mame/machine/harddriv.c
@@ -689,7 +689,7 @@ static TIMER_CALLBACK( stmsp_sync_update )
}
-INLINE void stmsp_sync_w(const address_space *space, offs_t offset, UINT16 data, UINT16 mem_mask, int which)
+INLINE void stmsp_sync_w(address_space *space, offs_t offset, UINT16 data, UINT16 mem_mask, int which)
{
harddriv_state *state = space->machine->driver_data<harddriv_state>();
UINT16 newdata = state->stmsp_sync[which][offset];
diff --git a/src/mame/machine/kabuki.c b/src/mame/machine/kabuki.c
index 705cd853bb6..bc03e8cd0c7 100644
--- a/src/mame/machine/kabuki.c
+++ b/src/mame/machine/kabuki.c
@@ -161,7 +161,7 @@ static void kabuki_decode(UINT8 *src,UINT8 *dest_op,UINT8 *dest_data,
static void mitchell_decode(running_machine *machine, int swap_key1,int swap_key2,int addr_key,int xor_key)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ 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;
@@ -202,7 +202,7 @@ void block_decode(running_machine *machine) { mitchell_decode(machine,0x02461
static void cps1_decode(running_machine *machine,int swap_key1,int swap_key2,int addr_key,int xor_key)
{
- const address_space *space = cputag_get_address_space(machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ 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");
diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c
index 6d27c25e3a6..c702305d35f 100644
--- a/src/mame/machine/kaneko16.c
+++ b/src/mame/machine/kaneko16.c
@@ -1714,7 +1714,7 @@ static int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* d
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8* rom = memory_region(machine,"cpu1");
UINT8 numregions;
UINT16 length;
@@ -1814,7 +1814,7 @@ static int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* d
//printf("save to eeprom\n");
{
- const address_space *eeprom_space = space->machine->device<eeprom_device>("eeprom")->space();
+ address_space *eeprom_space = space->machine->device<eeprom_device>("eeprom")->space();
for (i=0;i<0x80;i++)
{
@@ -2107,7 +2107,7 @@ void calc3_mcu_run(running_machine *machine)
{
UINT16 mcu_command;
int i;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
if ( calc3_mcu_status != (1|2|4|8) ) return;
@@ -2164,7 +2164,7 @@ void calc3_mcu_run(running_machine *machine)
*/
{
- const address_space *eeprom_space = space->machine->device<eeprom_device>("eeprom")->space();
+ address_space *eeprom_space = space->machine->device<eeprom_device>("eeprom")->space();
for (i=0;i<0x80;i++)
{
diff --git a/src/mame/machine/konami1.c b/src/mame/machine/konami1.c
index a96702e577f..90738affef0 100644
--- a/src/mame/machine/konami1.c
+++ b/src/mame/machine/konami1.c
@@ -42,7 +42,7 @@ static UINT8 konami1_decodebyte( UINT8 opcode, UINT16 address )
UINT8 *konami1_decode(running_machine *machine, const char *cpu)
{
- const address_space *space = cputag_get_address_space(machine, cpu, ADDRESS_SPACE_PROGRAM);
+ 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);
int A;
diff --git a/src/mame/machine/konppc.c b/src/mame/machine/konppc.c
index dd9cb1fc75c..aad6c104e64 100644
--- a/src/mame/machine/konppc.c
+++ b/src/mame/machine/konppc.c
@@ -212,7 +212,7 @@ static UINT32 dsp_comm_sharc_r(int board, int offset)
return dsp_comm_ppc[board][offset];
}
-static void dsp_comm_sharc_w(const address_space *space, int board, int offset, UINT32 data)
+static void dsp_comm_sharc_w(address_space *space, int board, int offset, UINT32 data)
{
if (offset >= 2)
{
@@ -351,7 +351,7 @@ WRITE32_HANDLER( cgboard_1_shared_sharc_w )
/*****************************************************************************/
-static UINT32 nwk_fifo_r(const address_space *space, int board)
+static UINT32 nwk_fifo_r(address_space *space, int board)
{
const char *dsptag = (board == 0) ? "dsp" : "dsp2";
running_device *device = space->machine->device(dsptag);
diff --git a/src/mame/machine/mc8123.c b/src/mame/machine/mc8123.c
index b276d2b4272..b1f29c82f52 100644
--- a/src/mame/machine/mc8123.c
+++ b/src/mame/machine/mc8123.c
@@ -377,7 +377,7 @@ static UINT8 mc8123_decrypt(offs_t addr,UINT8 val,const UINT8 *key,int opcode)
void mc8123_decrypt_rom(running_machine *machine, const char *cpu, const char *keyrgn, const char *bankname, int numbanks)
{
- const address_space *space = cputag_get_address_space(machine, cpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, cpu, ADDRESS_SPACE_PROGRAM);
int fixed_length = numbanks == 1 ? 0xc000 : 0x8000;
UINT8 *decrypted1 = auto_alloc_array(machine, UINT8, fixed_length);
UINT8 *decrypted2 = numbanks > 1 ? auto_alloc_array(machine, UINT8, 0x4000 * numbanks) : 0;
diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c
index 9f986359ace..d79b98a9ecd 100644
--- a/src/mame/machine/mcr.c
+++ b/src/mame/machine/mcr.c
@@ -592,7 +592,7 @@ WRITE8_DEVICE_HANDLER( zwackery_pia1_w )
WRITE_LINE_DEVICE_HANDLER( zwackery_ca2_w )
{
- const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
csdeluxe_data_w(space, 0, (state << 4) | zwackery_sound_data);
}
diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c
index 78bdb9e0607..56a4e2fc516 100644
--- a/src/mame/machine/mhavoc.c
+++ b/src/mame/machine/mhavoc.c
@@ -100,7 +100,7 @@ MACHINE_START( mhavoc )
MACHINE_RESET( mhavoc )
{
- const address_space *space = cputag_get_address_space(machine, "alpha", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "alpha", ADDRESS_SPACE_PROGRAM);
has_gamma_cpu = (machine->device("gamma") != NULL);
memory_configure_bank(machine, "bank1", 0, 1, mhavoc_zram0, 0);
diff --git a/src/mame/machine/micro3d.c b/src/mame/machine/micro3d.c
index 1f1b9cdd47a..d8412ecc157 100644
--- a/src/mame/machine/micro3d.c
+++ b/src/mame/machine/micro3d.c
@@ -746,7 +746,7 @@ WRITE32_HANDLER( drmath_intr2_ack )
DRIVER_INIT( micro3d )
{
micro3d_state *state = machine->driver_data<micro3d_state>();
- const address_space *space = cputag_get_address_space(machine, "drmath", ADDRESS_SPACE_DATA);
+ address_space *space = cputag_get_address_space(machine, "drmath", ADDRESS_SPACE_DATA);
i8051_set_serial_tx_callback(machine->device("audiocpu"), data_from_i8031);
i8051_set_serial_rx_callback(machine->device("audiocpu"), data_to_i8031);
@@ -767,7 +767,7 @@ DRIVER_INIT( micro3d )
DRIVER_INIT( botssa )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* Required to pass the hardware version check */
memory_install_read16_handler(space, 0x140000, 0x140001, 0, 0, botssa_140000_r );
diff --git a/src/mame/machine/midwayic.c b/src/mame/machine/midwayic.c
index 2e116a15302..9c487725800 100644
--- a/src/mame/machine/midwayic.c
+++ b/src/mame/machine/midwayic.c
@@ -205,7 +205,7 @@ UINT8 midway_serial_pic_status_r(void)
}
-UINT8 midway_serial_pic_r(const address_space *space)
+UINT8 midway_serial_pic_r(address_space *space)
{
logerror("%s:security R = %04X\n", cpuexec_describe_context(space->machine), serial.buffer);
serial.status = 1;
@@ -213,7 +213,7 @@ UINT8 midway_serial_pic_r(const address_space *space)
}
-void midway_serial_pic_w(const address_space *space, UINT8 data)
+void midway_serial_pic_w(address_space *space, UINT8 data)
{
logerror("%s:security W = %04X\n", cpuexec_describe_context(space->machine), data);
@@ -293,7 +293,7 @@ void midway_serial_pic2_set_default_nvram(const UINT8 *nvram)
}
-UINT8 midway_serial_pic2_status_r(const address_space *space)
+UINT8 midway_serial_pic2_status_r(address_space *space)
{
UINT8 result = 0;
@@ -312,7 +312,7 @@ UINT8 midway_serial_pic2_status_r(const address_space *space)
}
-UINT8 midway_serial_pic2_r(const address_space *space)
+UINT8 midway_serial_pic2_r(address_space *space)
{
UINT8 result = 0;
@@ -332,7 +332,7 @@ UINT8 midway_serial_pic2_r(const address_space *space)
}
-void midway_serial_pic2_w(const address_space *space, UINT8 data)
+void midway_serial_pic2_w(address_space *space, UINT8 data)
{
running_machine *machine = space->machine;
static FILE *nvramlog;
diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h
index a44bf9e4d91..23522f9c828 100644
--- a/src/mame/machine/midwayic.h
+++ b/src/mame/machine/midwayic.h
@@ -9,16 +9,16 @@
void midway_serial_pic_init(running_machine *machine, int upper);
void midway_serial_pic_reset_w(int state);
UINT8 midway_serial_pic_status_r(void);
-UINT8 midway_serial_pic_r(const address_space *space);
-void midway_serial_pic_w(const address_space *space, UINT8 data);
+UINT8 midway_serial_pic_r(address_space *space);
+void midway_serial_pic_w(address_space *space, UINT8 data);
/* 2nd generation Midway serial/NVRAM/RTC PIC */
void midway_serial_pic2_init(running_machine *machine, int upper, int yearoffs);
void midway_serial_pic2_set_default_nvram(const UINT8 *nvram);
-UINT8 midway_serial_pic2_status_r(const address_space *space);
-UINT8 midway_serial_pic2_r(const address_space *space);
-void midway_serial_pic2_w(const address_space *space, UINT8 data);
+UINT8 midway_serial_pic2_status_r(address_space *space);
+UINT8 midway_serial_pic2_r(address_space *space);
+void midway_serial_pic2_w(address_space *space, UINT8 data);
NVRAM_HANDLER( midway_serial_pic2 );
diff --git a/src/mame/machine/model1.c b/src/mame/machine/model1.c
index 27e6e85607a..e4ff7c5ad6f 100644
--- a/src/mame/machine/model1.c
+++ b/src/mame/machine/model1.c
@@ -42,7 +42,7 @@ static UINT16 ram_adr, ram_latch[2], ram_scanadr;
static UINT32 *ram_data;
static float tgp_vr_base[4];
-static UINT32 fifoout_pop(const address_space *space)
+static UINT32 fifoout_pop(address_space *space)
{
UINT32 v;
if(fifoout_wpos == fifoout_rpos) {
@@ -88,7 +88,7 @@ static UINT32 fifoin_pop(void)
return v;
}
-static void fifoin_push(const address_space *space, UINT32 data)
+static void fifoin_push(address_space *space, UINT32 data)
{
// logerror("TGP FIFOIN write %08x (%x)\n", data, cpu_get_pc(space->cpu));
fifoin_data[fifoin_wpos++] = data;
@@ -2010,7 +2010,7 @@ static int copro_fifoin_pop(running_device *device, UINT32 *result)
return 1;
}
-static void copro_fifoin_push(const address_space *space, UINT32 data)
+static void copro_fifoin_push(address_space *space, UINT32 data)
{
if (copro_fifoin_num == FIFO_SIZE)
{
@@ -2028,7 +2028,7 @@ static void copro_fifoin_push(const address_space *space, UINT32 data)
copro_fifoin_num++;
}
-static UINT32 copro_fifoout_pop(const address_space *space)
+static UINT32 copro_fifoout_pop(address_space *space)
{
UINT32 r;
diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c
index 4498aab7a3c..099a25153bf 100644
--- a/src/mame/machine/namcos1.c
+++ b/src/mame/machine/namcos1.c
@@ -678,7 +678,7 @@ static void set_bank(running_machine *machine, int banknum, const bankhandler *h
"bank9", "bank10", "bank11", "bank12", "bank13", "bank14", "bank15", "bank16"
};
static const char *const cputags[] = { "maincpu", "sub" };
- const address_space *space = cputag_get_address_space(machine, cputags[(banknum >> 3) & 1], ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, cputags[(banknum >> 3) & 1], ADDRESS_SPACE_PROGRAM);
int bankstart = (banknum & 7) * 0x2000;
/* for BANK handlers , memory direct and OP-code base */
diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c
index 851ee78f582..68c8e8e1254 100644
--- a/src/mame/machine/namcos2.c
+++ b/src/mame/machine/namcos2.c
@@ -110,7 +110,7 @@ MACHINE_START( namcos2 )
MACHINE_RESET( namcos2 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
mFinalLapProtCount = 0;
namcos2_mcu_analog_ctrl = 0;
namcos2_mcu_analog_data = 0xaa;
@@ -486,7 +486,7 @@ static void InitC148(void)
}
static UINT16
-ReadWriteC148( const address_space *space, offs_t offset, UINT16 data, int bWrite )
+ReadWriteC148( address_space *space, offs_t offset, UINT16 data, int bWrite )
{
offs_t addr = ((offset * 2) + 0x1c0000) & 0x1fe000;
running_device *altcpu = NULL;
diff --git a/src/mame/machine/neoboot.c b/src/mame/machine/neoboot.c
index 010d362cabf..b0731a29164 100644
--- a/src/mame/machine/neoboot.c
+++ b/src/mame/machine/neoboot.c
@@ -139,7 +139,7 @@ void kog_px_decrypt( running_machine *machine )
static UINT16 kof10thExtraRAMB[0x01000];
-static void kof10thBankswitch(const address_space *space, UINT16 nBank)
+static void kof10thBankswitch(address_space *space, UINT16 nBank)
{
UINT32 bank = 0x100000 + ((nBank & 7) << 20);
if (bank >= 0x700000)
diff --git a/src/mame/machine/neoprot.c b/src/mame/machine/neoprot.c
index b6d10d5537d..f6b2dbe2a1b 100644
--- a/src/mame/machine/neoprot.c
+++ b/src/mame/machine/neoprot.c
@@ -500,7 +500,7 @@ static void pvc_prot2( running_machine *machine ) // on writes to e8/e9/ea/eb
}
-static void pvc_write_bankswitch( const address_space *space )
+static void pvc_write_bankswitch( address_space *space )
{
neogeo_state *state = space->machine->driver_data<neogeo_state>();
UINT32 bankaddress;
diff --git a/src/mame/machine/pitnrun.c b/src/mame/machine/pitnrun.c
index 4978a15e3ad..874a44917ea 100644
--- a/src/mame/machine/pitnrun.c
+++ b/src/mame/machine/pitnrun.c
@@ -106,7 +106,7 @@ static TIMER_CALLBACK( pitnrun_mcu_status_real_w )
WRITE8_HANDLER( pitnrun_68705_portB_w )
{
- const address_space *cpu0space = cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
if (~data & 0x02)
{
/* 68705 is going to read data from the Z80 */
diff --git a/src/mame/machine/scudsp.c b/src/mame/machine/scudsp.c
index c8993863472..8d0a1edd974 100644
--- a/src/mame/machine/scudsp.c
+++ b/src/mame/machine/scudsp.c
@@ -312,7 +312,7 @@ static UINT32 dsp_get_mem_source_dma( UINT32 memcode, UINT32 counter )
return 0;
}
-void dsp_prg_ctrl(const address_space *space, UINT32 data)
+void dsp_prg_ctrl(address_space *space, UINT32 data)
{
if(LEF) dsp_reg.pc = (data & 0xff);
if(EXF) dsp_execute_program(space);
@@ -590,7 +590,7 @@ static void dsp_move_immediate( void )
}
-static void dsp_dma( const address_space *space )
+static void dsp_dma( address_space *space )
{
UINT8 hold = (opcode & 0x4000) >> 14;
UINT32 add = (opcode & 0x38000) >> 15;
@@ -786,7 +786,7 @@ static void dsp_dump_mem( FILE *f )
}
#endif
-void dsp_execute_program(const address_space *dmaspace)
+void dsp_execute_program(address_space *dmaspace)
{
UINT32 cycles_run = 0;
UINT8 cont = 1;
diff --git a/src/mame/machine/scudsp.h b/src/mame/machine/scudsp.h
index 7a81a593556..f0efe9ebee8 100644
--- a/src/mame/machine/scudsp.h
+++ b/src/mame/machine/scudsp.h
@@ -1,9 +1,9 @@
/*SCU DSP stuff*/
-extern void dsp_prg_ctrl(const address_space *space, UINT32 data);
+extern void dsp_prg_ctrl(address_space *space, UINT32 data);
extern void dsp_prg_data(UINT32 data);
extern void dsp_ram_addr_ctrl(UINT32 data);
extern void dsp_ram_addr_w(UINT32 data);
extern UINT32 dsp_ram_addr_r(void);
-extern void dsp_execute_program(const address_space *dmaspace);
+extern void dsp_execute_program(address_space *dmaspace);
diff --git a/src/mame/machine/segacrp2.c b/src/mame/machine/segacrp2.c
index 20eb62b6d1d..ec7f8bf7235 100644
--- a/src/mame/machine/segacrp2.c
+++ b/src/mame/machine/segacrp2.c
@@ -60,7 +60,7 @@ static void sega_decode_2(running_machine *machine,const char *cputag,
};
- const address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM);
UINT8 *rom = memory_region(machine, cputag);
UINT8 *decrypted = auto_alloc_array(machine, UINT8, 0x8000);
diff --git a/src/mame/machine/segacrpt.c b/src/mame/machine/segacrpt.c
index 1fd4419d224..b5686c3e633 100644
--- a/src/mame/machine/segacrpt.c
+++ b/src/mame/machine/segacrpt.c
@@ -217,7 +217,7 @@ static void sega_decode(running_machine *machine, const char *cputag, const UINT
{
int A;
- const address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM);
int length = memory_region_length(machine, cputag);
int cryptlen = MIN(length, 0x8000);
UINT8 *rom = memory_region(machine, cputag);
@@ -439,7 +439,7 @@ void toprollr_decode(running_machine *machine, const char *cputag, const char *r
int A;
- const address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM);
UINT8 *rom = memory_region(machine, regiontag);
int bankstart;
decrypted = auto_alloc_array(machine, UINT8, 0x6000*3);
@@ -797,7 +797,7 @@ void jongkyo_decode(running_machine *machine, const char *cputag)
int A;
- const address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, cputag, ADDRESS_SPACE_PROGRAM);
UINT8 *rom = memory_region(machine, cputag);
decrypted = auto_alloc_array(machine, UINT8, 0x9000);
diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c
index bf6fe2ff3db..6f763739aa2 100644
--- a/src/mame/machine/segaic16.c
+++ b/src/mame/machine/segaic16.c
@@ -163,7 +163,7 @@ void segaic16_memory_mapper_set_decrypted(running_machine *machine, UINT8 *decry
}
-static void memory_mapper_w(const address_space *space, struct memory_mapper_chip *chip, offs_t offset, UINT8 data)
+static void memory_mapper_w(address_space *space, struct memory_mapper_chip *chip, offs_t offset, UINT8 data)
{
UINT8 oldval;
@@ -212,13 +212,13 @@ static void memory_mapper_w(const address_space *space, struct memory_mapper_chi
/* 02 - read data into latches 00,01 from 2 * (address in 07,08,09) */
if (data == 0x01)
{
- const address_space *targetspace = cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM);
+ address_space *targetspace = cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM);
offs_t addr = (chip->regs[0x0a] << 17) | (chip->regs[0x0b] << 9) | (chip->regs[0x0c] << 1);
memory_write_word(targetspace, addr, (chip->regs[0x00] << 8) | chip->regs[0x01]);
}
else if (data == 0x02)
{
- const address_space *targetspace = cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM);
+ address_space *targetspace = cpu_get_address_space(chip->cpu, ADDRESS_SPACE_PROGRAM);
offs_t addr = (chip->regs[0x07] << 17) | (chip->regs[0x08] << 9) | (chip->regs[0x09] << 1);
UINT16 result;
result = memory_read_word(targetspace, addr);
diff --git a/src/mame/machine/segas24.c b/src/mame/machine/segas24.c
index 2abde39826f..0c908ff3642 100644
--- a/src/mame/machine/segas24.c
+++ b/src/mame/machine/segas24.c
@@ -27,14 +27,14 @@ WRITE16_HANDLER( system24temp_sys16_shared_ram_w )
static UINT8 (*system24temp_sys16_io_io_r)(running_machine *machine, int port);
static void (*system24temp_sys16_io_io_w)(running_machine *machine, int port, UINT8 data);
-static void (*system24temp_sys16_io_cnt_w)(const address_space *space, UINT8 data);
+static void (*system24temp_sys16_io_cnt_w)(address_space *space, UINT8 data);
static READ16_HANDLER ((*system24temp_sys16_io_iod_r));
static WRITE16_HANDLER((*system24temp_sys16_io_iod_w));
static UINT8 system24temp_sys16_io_cnt, system24temp_sys16_io_dir;
void system24temp_sys16_io_set_callbacks(UINT8 (*io_r)(running_machine *machine, int port),
void (*io_w)(running_machine *machine, int port, UINT8 data),
- void (*cnt_w)(const address_space *space, UINT8 data),
+ void (*cnt_w)(address_space *space, UINT8 data),
read16_space_func iod_r,
write16_space_func iod_w)
{
diff --git a/src/mame/machine/segas32.c b/src/mame/machine/segas32.c
index 1e393949d8d..bbf2328da3a 100644
--- a/src/mame/machine/segas32.c
+++ b/src/mame/machine/segas32.c
@@ -36,7 +36,7 @@ static const UINT8 ga2_v25_opcode_table[256] = {
static void nec_v25_cpu_decrypt(running_machine *machine)
{
int i;
- const address_space *space = cputag_get_address_space(machine, "mcu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "mcu", ADDRESS_SPACE_PROGRAM);
UINT8 *rom = memory_region(machine, "mcu");
UINT8* decrypted = auto_alloc_array(machine, UINT8, 0x100000);
UINT8* temp = auto_alloc_array(machine, UINT8, 0x100000);
@@ -228,7 +228,7 @@ WRITE16_HANDLER(brival_protection_w)
void darkedge_fd1149_vblank(running_device *device)
{
- const address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(device, ADDRESS_SPACE_PROGRAM);
memory_write_word(space, 0x20f072, 0);
memory_write_word(space, 0x20f082, 0);
diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c
index 6ea2648e164..f043d59c5a0 100644
--- a/src/mame/machine/seicop.c
+++ b/src/mame/machine/seicop.c
@@ -1505,7 +1505,7 @@ static UINT8 xy_check;
/* -the second value should be end of calculation (in other words,check everything between the two values) */
#define PLAYER 0
#define ENEMY 1
-static void protection_move_jsr(const address_space *space,UINT32 work_ram,UINT8 k)
+static void protection_move_jsr(address_space *space,UINT32 work_ram,UINT8 k)
{
static UINT32 move_data,x_data,y_data;
/*Read the movement data to execute*/
@@ -1563,7 +1563,7 @@ static void protection_move_jsr(const address_space *space,UINT32 work_ram,UINT8
static UINT16 hit_check;
-static void protection_hit_jsr(const address_space *space,UINT32 work_ram1,UINT32 work_ram2)
+static void protection_hit_jsr(address_space *space,UINT32 work_ram1,UINT32 work_ram2)
{
int x1,y1,x2,y2/*,hit1,hit2*/;
x1 = (memory_read_word(space, work_ram1+0x8));
@@ -1585,7 +1585,7 @@ static void protection_hit_jsr(const address_space *space,UINT32 work_ram1,UINT3
}
/*directional movement protection*/
-static void moveprot_jsr(const address_space *space)
+static void moveprot_jsr(address_space *space)
{
static INT16 x_axis,y_axis;
static UINT16 move_data,distance,move_type;
@@ -1651,7 +1651,7 @@ static void moveprot_jsr(const address_space *space)
*/
/*sprite "look" protection*/
-static void move2prot_jsr(const address_space *space)
+static void move2prot_jsr(address_space *space)
{
static INT16 x_pl,y_pl,x_en,y_en,res;
x_pl = memory_read_word(space, cop_register[1]+0x8);
@@ -1674,7 +1674,7 @@ static void move2prot_jsr(const address_space *space)
#ifdef UNUSED_FUNCTION
/*"To point" movement protection*/
-static void move3x_prot_jsr(const address_space *space)
+static void move3x_prot_jsr(address_space *space)
{
static INT16 x_pl,x_en,x_dis;
x_pl = memory_read_word(space, cop_register[1]+0x8);
@@ -1688,7 +1688,7 @@ static void move3x_prot_jsr(const address_space *space)
memory_write_word(space, cop_register[0]+0x14,x_dis);
}
-static void move3y_prot_jsr(const address_space *space)
+static void move3y_prot_jsr(address_space *space)
{
static INT16 y_pl,y_en,y_dis;
y_pl = memory_read_word(space, cop_register[1]+0x4);
@@ -1804,7 +1804,7 @@ x/y check [2]
static UINT16 s_i;
-static void dma_transfer(const address_space *space)
+static void dma_transfer(address_space *space)
{
static UINT16 rel_xy;
static UINT16 abs_x,abs_y;
@@ -1861,7 +1861,7 @@ static UINT16 check_calc(UINT16 param)
return num;
}
-static UINT16 hit_check_jsr(const address_space *space)
+static UINT16 hit_check_jsr(address_space *space)
{
static INT16 xsrc,xdst,ysrc,ydst,xparam,yparam;
xsrc = (memory_read_word(space, 0x110008));
@@ -1897,7 +1897,7 @@ static UINT16 hit_check_jsr(const address_space *space)
/*Heated Barrel*/
/*command 0x8100 will check for the direction of the sprite*/
/*command 0x8900 will check the "point" movement*/
-static void cop2_move3_prot(const address_space *space)
+static void cop2_move3_prot(address_space *space)
{
static INT16 x_pl,x_en;
static INT16 y_pl,y_en;
@@ -1975,7 +1975,7 @@ static void cop2_move3_prot(const address_space *space)
}
/**/
-static UINT16 cop2_hit_prot(const address_space *space)
+static UINT16 cop2_hit_prot(address_space *space)
{
static INT16 xsrc,xdst;
static INT16 ysrc,ydst;
@@ -2014,7 +2014,7 @@ static UINT16 cop2_hit_prot(const address_space *space)
return 3;
}
-static void cop2_move2_prot(const address_space *space)
+static void cop2_move2_prot(address_space *space)
{
static INT16 xsrc,ysrc;
static INT16 param2;
diff --git a/src/mame/machine/slapstic.c b/src/mame/machine/slapstic.c
index a7e3240f979..4807917f9a1 100644
--- a/src/mame/machine/slapstic.c
+++ b/src/mame/machine/slapstic.c
@@ -864,7 +864,7 @@ int slapstic_bank(void)
*
*************************************/
-static int alt2_kludge(const address_space *space, offs_t offset)
+static int alt2_kludge(address_space *space, offs_t offset)
{
/* Of the 3 alternate addresses, only the middle one needs to actually hit
in the slapstic region; the first and third ones can be anywhere in the
@@ -911,7 +911,7 @@ static int alt2_kludge(const address_space *space, offs_t offset)
*
*************************************/
-int slapstic_tweak(const address_space *space, offs_t offset)
+int slapstic_tweak(address_space *space, offs_t offset)
{
/* reset is universal */
if (offset == 0x0000)
diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c
index 419913fc370..e50bb99ab0d 100644
--- a/src/mame/machine/snes.c
+++ b/src/mame/machine/snes.c
@@ -26,9 +26,9 @@
/* -- Globals -- */
UINT8 *snes_ram = NULL; /* 65816 ram */
-static void snes_dma(const address_space *space, UINT8 channels);
-static void snes_hdma_init(const address_space *space);
-static void snes_hdma(const address_space *space);
+static void snes_dma(address_space *space, UINT8 channels);
+static void snes_hdma_init(address_space *space);
+static void snes_hdma(address_space *space);
static READ8_HANDLER(snes_io_dma_r);
static WRITE8_HANDLER(snes_io_dma_w);
@@ -88,7 +88,7 @@ static TIMER_CALLBACK( snes_reset_oam_address )
{
snes_state *state = machine->driver_data<snes_state>();
// make sure we're in the 65816's context since we're messing with the OAM and stuff
- const address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
if (!(snes_ppu.screen_disabled)) //Reset OAM address, byuu says it happens at H=10
{
@@ -101,14 +101,14 @@ static TIMER_CALLBACK( snes_reset_oam_address )
static TIMER_CALLBACK( snes_reset_hdma )
{
snes_state *state = machine->driver_data<snes_state>();
- const address_space *cpu0space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
snes_hdma_init(cpu0space);
}
static TIMER_CALLBACK( snes_update_io )
{
snes_state *state = machine->driver_data<snes_state>();
- const address_space *cpu0space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
state->io_read(cpu0space->machine);
snes_ram[HVBJOY] &= 0xfe; /* Clear busy bit */
@@ -186,7 +186,7 @@ static TIMER_CALLBACK( snes_scanline_tick )
// hdma reset happens at scanline 0, H=~6
if (snes_ppu.beam.current_vert == 0)
{
- const address_space *cpu0space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
snes_hdma_init(cpu0space);
}
@@ -210,7 +210,7 @@ static TIMER_CALLBACK( snes_scanline_tick )
static TIMER_CALLBACK( snes_hblank_tick )
{
snes_state *state = machine->driver_data<snes_state>();
- const address_space *cpu0space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = cpu_get_address_space(state->maincpu, ADDRESS_SPACE_PROGRAM);
int nextscan;
snes_ppu.beam.current_vert = machine->primary_screen->vpos();
@@ -1604,7 +1604,7 @@ static void snes_init_timers( running_machine *machine )
static void snes_init_ram( running_machine *machine )
{
snes_state *state = machine->driver_data<snes_state>();
- const address_space *cpu0space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int i;
/* Init work RAM - 0x55 isn't exactly right but it's close */
@@ -1836,7 +1836,7 @@ MACHINE_RESET( snes )
DRIVER_INIT( snes )
{
snes_state *state = machine->driver_data<snes_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT16 total_blocks, read_blocks;
UINT8 *rom;
@@ -1902,7 +1902,7 @@ DRIVER_INIT( snes )
DRIVER_INIT( snes_hirom )
{
snes_state *state = machine->driver_data<snes_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT16 total_blocks, read_blocks;
UINT8 *rom;
@@ -1976,7 +1976,7 @@ INLINE int dma_abus_valid( UINT32 address )
return 1;
}
-INLINE UINT8 snes_abus_read( const address_space *space, UINT32 abus )
+INLINE UINT8 snes_abus_read( address_space *space, UINT32 abus )
{
if (!dma_abus_valid(abus))
return 0;
@@ -1984,7 +1984,7 @@ INLINE UINT8 snes_abus_read( const address_space *space, UINT32 abus )
return memory_read_byte(space, abus);
}
-INLINE void snes_dma_transfer( const address_space *space, UINT8 dma, UINT32 abus, UINT16 bbus )
+INLINE void snes_dma_transfer( address_space *space, UINT8 dma, UINT32 abus, UINT16 bbus )
{
snes_state *state = space->machine->driver_data<snes_state>();
@@ -2055,7 +2055,7 @@ INLINE int is_last_active_channel( running_machine *machine, int dma )
return 1;
}
-static void snes_hdma_update( const address_space *space, int dma )
+static void snes_hdma_update( address_space *space, int dma )
{
snes_state *state = space->machine->driver_data<snes_state>();
UINT32 abus = snes_get_hdma_addr(space->machine, dma);
@@ -2086,7 +2086,7 @@ static void snes_hdma_update( const address_space *space, int dma )
state->dma_channel[dma].do_transfer = 1;
}
-static void snes_hdma_init( const address_space *space )
+static void snes_hdma_init( address_space *space )
{
snes_state *state = space->machine->driver_data<snes_state>();
int i;
@@ -2102,7 +2102,7 @@ static void snes_hdma_init( const address_space *space )
}
}
-static void snes_hdma( const address_space *space )
+static void snes_hdma( address_space *space )
{
snes_state *state = space->machine->driver_data<snes_state>();
UINT16 bbus;
@@ -2186,7 +2186,7 @@ static void snes_hdma( const address_space *space )
}
}
-static void snes_dma( const address_space *space, UINT8 channels )
+static void snes_dma( address_space *space, UINT8 channels )
{
snes_state *state = space->machine->driver_data<snes_state>();
int i;
diff --git a/src/mame/machine/snes7110.c b/src/mame/machine/snes7110.c
index 0c6274a042c..9d1b5a84c60 100644
--- a/src/mame/machine/snes7110.c
+++ b/src/mame/machine/snes7110.c
@@ -767,7 +767,7 @@ static UINT32 SPC7110Decomp_morton_4x8(SPC7110Decomp *thisptr, UINT32 data)
}
static void spc7110_mmio_write(running_machine *machine, UINT32 addr, UINT8 data);
-static UINT8 spc7110_mmio_read(const address_space *space, UINT32 addr);
+static UINT8 spc7110_mmio_read(address_space *space, UINT32 addr);
static void spc7110_update_time(running_machine *machine, UINT8 offset);
enum RTC_State
@@ -1066,7 +1066,7 @@ static void spc7110_update_time(running_machine *machine, UINT8 offset)
}
}
-static UINT8 spc7110_mmio_read(const address_space *space, UINT32 addr)
+static UINT8 spc7110_mmio_read(address_space *space, UINT32 addr)
{
running_machine *machine = space->machine;
UINT8 *ROM = memory_region(machine, "cart");
@@ -1639,7 +1639,7 @@ static void spc7110_mmio_write(running_machine *machine, UINT32 addr, UINT8 data
}
}
-static UINT8 spc7110_bank7_read(const address_space *space, UINT32 offset)
+static UINT8 spc7110_bank7_read(address_space *space, UINT32 offset)
{
UINT8 *ROM = memory_region(space->machine, "cart");
UINT32 addr = offset & 0x0fffff;
diff --git a/src/mame/machine/snesrtc.c b/src/mame/machine/snesrtc.c
index a8c4e147784..3c1a21fef90 100644
--- a/src/mame/machine/snesrtc.c
+++ b/src/mame/machine/snesrtc.c
@@ -109,7 +109,7 @@ static UINT8 srtc_weekday( UINT32 year, UINT32 month, UINT32 day )
return (sum + 1) % 7; // 1900-01-01 was a Monday
}
-static UINT8 srtc_read( const address_space *space, UINT16 addr )
+static UINT8 srtc_read( address_space *space, UINT16 addr )
{
addr &= 0xffff;
diff --git a/src/mame/machine/snessdd1.c b/src/mame/machine/snessdd1.c
index ce7096d6fdb..7ef815fc2d3 100644
--- a/src/mame/machine/snessdd1.c
+++ b/src/mame/machine/snessdd1.c
@@ -569,7 +569,7 @@ static void sdd1_init(running_machine* machine)
snes_sdd1.buffer.ready = 0;
}
-static UINT8 sdd1_mmio_read(const address_space *space, UINT32 addr)
+static UINT8 sdd1_mmio_read(address_space *space, UINT32 addr)
{
addr &= 0xffff;
@@ -593,7 +593,7 @@ static UINT8 sdd1_mmio_read(const address_space *space, UINT32 addr)
return snes_open_bus_r(space, 0);
}
-static void sdd1_mmio_write(const address_space *space, UINT32 addr, UINT8 data)
+static void sdd1_mmio_write(address_space *space, UINT32 addr, UINT8 data)
{
addr &= 0xffff;
diff --git a/src/mame/machine/stfight.c b/src/mame/machine/stfight.c
index 9e5324a2400..62c565464f9 100644
--- a/src/mame/machine/stfight.c
+++ b/src/mame/machine/stfight.c
@@ -49,7 +49,7 @@ static int stfight_coin_mech_query;
DRIVER_INIT( empcity )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
UINT8 *rom = memory_region(machine, "maincpu");
int A;
@@ -93,7 +93,7 @@ DRIVER_INIT( stfight )
MACHINE_RESET( stfight )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
adpcm_data_offs = adpcm_data_end = 0;
toggle = 0;
fm_data = 0;
diff --git a/src/mame/machine/tait8741.c b/src/mame/machine/tait8741.c
index cb6cd79738d..4df82cf1c83 100644
--- a/src/mame/machine/tait8741.c
+++ b/src/mame/machine/tait8741.c
@@ -122,7 +122,7 @@ void TAITO8741_reset(int num)
}
/* 8741 update */
-static void taito8741_update(const address_space *space, int num)
+static void taito8741_update(address_space *space, int num)
{
I8741 *st,*sst;
int next = num;
@@ -273,7 +273,7 @@ int TAITO8741_start(const struct TAITO8741interface *taito8741intf)
}
/* read status port */
-static int I8741_status_r(const address_space *space, int num)
+static int I8741_status_r(address_space *space, int num)
{
I8741 *st = &taito8741[num];
taito8741_update(space, num);
@@ -282,7 +282,7 @@ static int I8741_status_r(const address_space *space, int num)
}
/* read data port */
-static int I8741_data_r(const address_space *space, int num)
+static int I8741_data_r(address_space *space, int num)
{
I8741 *st = &taito8741[num];
int ret = st->toData;
@@ -302,7 +302,7 @@ static int I8741_data_r(const address_space *space, int num)
}
/* Write data port */
-static void I8741_data_w(const address_space *space, int num, int data)
+static void I8741_data_w(address_space *space, int num, int data)
{
I8741 *st = &taito8741[num];
LOG(("%s:8741-%d DATA Write %02x\n",cpuexec_describe_context(space->machine),num,data));
@@ -313,7 +313,7 @@ static void I8741_data_w(const address_space *space, int num, int data)
}
/* Write command port */
-static void I8741_command_w(const address_space *space, int num, int data)
+static void I8741_command_w(address_space *space, int num, int data)
{
I8741 *st = &taito8741[num];
LOG(("%s:8741-%d CMD Write %02x\n",cpuexec_describe_context(space->machine),num,data));
@@ -444,7 +444,7 @@ static void josvolly_8741_do(running_machine *machine, int num)
}
}
-static void josvolly_8741_w(const address_space *space, int num, int offset, int data)
+static void josvolly_8741_w(address_space *space, int num, int offset, int data)
{
JV8741 *mcu = &i8741[num];
@@ -507,7 +507,7 @@ static void josvolly_8741_w(const address_space *space, int num, int offset, int
josvolly_8741_do(space->machine, num);
}
-static INT8 josvolly_8741_r(const address_space *space,int num,int offset)
+static INT8 josvolly_8741_r(address_space *space,int num,int offset)
{
JV8741 *mcu = &i8741[num];
int ret;
@@ -548,7 +548,7 @@ void cyclemb_8741_reset(running_machine *machine)
cyclemb_mcu.rst = 1;
}
-static void cyclemb_8741_w(const address_space *space, int num, int offset, int data)
+static void cyclemb_8741_w(address_space *space, int num, int offset, int data)
{
if(offset == 1) //command port
{
@@ -590,7 +590,7 @@ static void cyclemb_8741_w(const address_space *space, int num, int offset, int
}
}
-static INT8 cyclemb_8741_r(const address_space *space,int num,int offset)
+static INT8 cyclemb_8741_r(address_space *space,int num,int offset)
{
if(offset == 1) //status port
{
diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c
index b53410a3217..3a9e20f7d50 100644
--- a/src/mame/machine/taitosj.c
+++ b/src/mame/machine/taitosj.c
@@ -44,7 +44,7 @@ MACHINE_START( taitosj )
MACHINE_RESET( taitosj )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* set the default ROM bank (many games only have one bank and */
/* never write to the bank selector register) */
taitosj_bankswitch_w(space, 0, 0);
@@ -216,7 +216,7 @@ WRITE8_HANDLER( taitosj_68705_portB_w )
}
if (~data & 0x10)
{
- const address_space *cpu0space = cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
LOG(("%04x: 68705 write %02x to address %04x\n",cpu_get_pc(space->cpu), portA_out, address));
memory_write_byte(cpu0space, address, portA_out);
@@ -226,7 +226,7 @@ WRITE8_HANDLER( taitosj_68705_portB_w )
}
if (~data & 0x20)
{
- const address_space *cpu0space = cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *cpu0space = cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
portA_in = memory_read_byte(cpu0space, address);
LOG(("%04x: 68705 read %02x from address %04x\n", cpu_get_pc(space->cpu), portA_in, address));
}
diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c
index 757221b7310..a232b8c4d25 100644
--- a/src/mame/machine/tatsumi.c
+++ b/src/mame/machine/tatsumi.c
@@ -74,7 +74,7 @@ WRITE16_HANDLER( apache3_z80_ctrl_w )
READ16_HANDLER( apache3_v30_v20_r )
{
- const address_space *targetspace = cputag_get_address_space(space->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ address_space *targetspace = cputag_get_address_space(space->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
/* Each V20 byte maps to a V30 word */
if ((tatsumi_control_word & 0xe0) == 0xe0)
@@ -90,7 +90,7 @@ READ16_HANDLER( apache3_v30_v20_r )
WRITE16_HANDLER( apache3_v30_v20_w )
{
- const address_space *targetspace = cputag_get_address_space(space->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ address_space *targetspace = cputag_get_address_space(space->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
if ((tatsumi_control_word & 0xe0) != 0x80)
logerror("%08x: write unmapped v30 rom %08x\n", cpu_get_pc(space->cpu), offset);
@@ -150,7 +150,7 @@ WRITE16_HANDLER( apache3_rotate_w )
READ16_HANDLER( roundup_v30_z80_r )
{
- const address_space *targetspace = cputag_get_address_space(space->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ address_space *targetspace = cputag_get_address_space(space->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
/* Each Z80 byte maps to a V30 word */
if (tatsumi_control_word & 0x20)
@@ -161,7 +161,7 @@ READ16_HANDLER( roundup_v30_z80_r )
WRITE16_HANDLER( roundup_v30_z80_w )
{
- const address_space *targetspace = cputag_get_address_space(space->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ address_space *targetspace = cputag_get_address_space(space->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
/* Only 8 bits of the V30 data bus are connected - ignore writes to the other half */
if (ACCESSING_BITS_0_7)
@@ -345,7 +345,7 @@ WRITE16_HANDLER( tatsumi_v30_68000_w )
// self-test in Tatsumi games. Needs fixed, but hack it here for now.
READ8_DEVICE_HANDLER(tatsumi_hack_ym2151_r)
{
- const address_space *space = cputag_get_address_space(device->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(device->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
int r=ym2151_status_port_r(device,0);
if (cpu_get_pc(space->cpu)==0x2aca || cpu_get_pc(space->cpu)==0x29fe
@@ -359,7 +359,7 @@ READ8_DEVICE_HANDLER(tatsumi_hack_ym2151_r)
// Mame really should emulate the OKI status reads even with Mame sound off.
READ8_DEVICE_HANDLER(tatsumi_hack_oki_r)
{
- const address_space *space = cputag_get_address_space(device->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(device->machine, "audiocpu", ADDRESS_SPACE_PROGRAM);
int r=okim6295_r(device,0);
if (cpu_get_pc(space->cpu)==0x2b70 || cpu_get_pc(space->cpu)==0x2bb5
diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c
index 2f39cd1ea78..200fc793030 100644
--- a/src/mame/machine/tnzs.c
+++ b/src/mame/machine/tnzs.c
@@ -667,7 +667,7 @@ MACHINE_RESET( jpopnics )
static STATE_POSTLOAD( tnzs_postload )
{
tnzs_state *state = machine->driver_data<tnzs_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_set_bank(machine, "bank1", state->bank1);
memory_set_bank(machine, "bank2", state->bank2);
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index de4bf73dfff..0aea9c6abfb 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -91,7 +91,7 @@ READ16_HANDLER( demonwld_dsp_r )
{
/* DSP can read data from main CPU RAM via DSP IO port 1 */
- const address_space *mainspace;
+ address_space *mainspace;
UINT16 input_data = 0;
switch (main_ram_seg) {
case 0xc00000: mainspace = cputag_get_address_space(space->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
@@ -105,7 +105,7 @@ READ16_HANDLER( demonwld_dsp_r )
WRITE16_HANDLER( demonwld_dsp_w )
{
- const address_space *mainspace;
+ address_space *mainspace;
/* Data written to main CPU RAM via DSP IO port 1 */
dsp_execute = 0;
diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c
index 7654437c3ec..ed973639a1f 100644
--- a/src/mame/machine/twincobr.c
+++ b/src/mame/machine/twincobr.c
@@ -67,7 +67,7 @@ READ16_HANDLER( twincobr_dsp_r )
{
/* DSP can read data from main CPU RAM via DSP IO port 1 */
- const address_space *mainspace;
+ address_space *mainspace;
UINT16 input_data = 0;
switch (main_ram_seg) {
case 0x30000:
@@ -83,7 +83,7 @@ READ16_HANDLER( twincobr_dsp_r )
WRITE16_HANDLER( twincobr_dsp_w )
{
- const address_space *mainspace;
+ address_space *mainspace;
/* Data written to main CPU RAM via DSP IO port 1 */
dsp_execute = 0;
@@ -117,7 +117,7 @@ READ16_HANDLER( wardner_dsp_r )
{
/* DSP can read data from main CPU RAM via DSP IO port 1 */
- const address_space *mainspace;
+ address_space *mainspace;
UINT16 input_data = 0;
switch (main_ram_seg) {
case 0x7000:
@@ -134,7 +134,7 @@ READ16_HANDLER( wardner_dsp_r )
WRITE16_HANDLER( wardner_dsp_w )
{
- const address_space *mainspace;
+ address_space *mainspace;
/* Data written to main CPU RAM via DSP IO port 1 */
dsp_execute = 0;
@@ -271,7 +271,7 @@ WRITE16_HANDLER( twincobr_sharedram_w )
}
-static void toaplan0_coin_dsp_w(const address_space *space, int offset, int data)
+static void toaplan0_coin_dsp_w(address_space *space, int offset, int data)
{
if (data > 1)
LOG(("%s:Writing %08x to %08x.\n",cpuexec_describe_context(space->machine),data,toaplan_port_type[toaplan_main_cpu] - offset));
diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c
index 89220fbd04f..5d969ffe042 100644
--- a/src/mame/machine/vsnes.c
+++ b/src/mame/machine/vsnes.c
@@ -201,7 +201,7 @@ static void v_set_videorom_bank( running_machine* machine, int start, int count,
MACHINE_START( vsnes )
{
- const address_space *ppu1_space = cpu_get_address_space(machine->device("ppu1"), ADDRESS_SPACE_PROGRAM);
+ address_space *ppu1_space = cpu_get_address_space(machine->device("ppu1"), ADDRESS_SPACE_PROGRAM);
int i;
/* establish nametable ram */
diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c
index 7a604a2a3b2..91bd1f3e076 100644
--- a/src/mame/machine/williams.c
+++ b/src/mame/machine/williams.c
@@ -441,7 +441,7 @@ TIMER_DEVICE_CALLBACK( williams2_endscreen_callback )
static STATE_POSTLOAD( williams2_postload )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
williams2_bank_select_w(space, 0, vram_bank);
}
@@ -460,7 +460,7 @@ MACHINE_START( williams2 )
MACHINE_RESET( williams2 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* make sure our banking is reset */
williams2_bank_select_w(space, 0, 0);
@@ -725,7 +725,7 @@ WRITE8_HANDLER( williams2_7segment_w )
static STATE_POSTLOAD( defender_postload )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
defender_bank_select_w(space, 0, vram_bank);
}
@@ -743,7 +743,7 @@ MACHINE_START( defender )
MACHINE_RESET( defender )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
MACHINE_RESET_CALL(williams_common);
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index 6fa444fc6b0..55dd0b8ce9d 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -368,7 +368,7 @@ VIDEO_UPDATE( armedf )
VIDEO_EOF( armedf )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
}
diff --git a/src/mame/video/artmagic.c b/src/mame/video/artmagic.c
index 47698239d22..f4853ae9259 100644
--- a/src/mame/video/artmagic.c
+++ b/src/mame/video/artmagic.c
@@ -75,7 +75,7 @@ VIDEO_START( artmagic )
*
*************************************/
-void artmagic_to_shiftreg(const address_space *space, offs_t address, UINT16 *data)
+void artmagic_to_shiftreg(address_space *space, offs_t address, UINT16 *data)
{
UINT16 *vram = address_to_vram(&address);
if (vram)
@@ -83,7 +83,7 @@ void artmagic_to_shiftreg(const address_space *space, offs_t address, UINT16 *da
}
-void artmagic_from_shiftreg(const address_space *space, offs_t address, UINT16 *data)
+void artmagic_from_shiftreg(address_space *space, offs_t address, UINT16 *data)
{
UINT16 *vram = address_to_vram(&address);
if (vram)
diff --git a/src/mame/video/astrocde.c b/src/mame/video/astrocde.c
index b04451aa7f1..981d87a81d8 100644
--- a/src/mame/video/astrocde.c
+++ b/src/mame/video/astrocde.c
@@ -788,7 +788,7 @@ INLINE void increment_dest(UINT8 curwidth)
}
-static void execute_blit(const address_space *space)
+static void execute_blit(address_space *space)
{
/*
pattern_source = counter set U7/U16/U25/U34
diff --git a/src/mame/video/atari.c b/src/mame/video/atari.c
index e4fe1e096c4..0c7ce13c0bd 100644
--- a/src/mame/video/atari.c
+++ b/src/mame/video/atari.c
@@ -1174,7 +1174,7 @@ static TIMER_CALLBACK( antic_steal_cycles )
*****************************************************************************/
static TIMER_CALLBACK( antic_scanline_render )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
VIDEO *video = antic.video[antic.scanline];
LOG((" @cycle #%3d render mode $%X lines to go #%d\n", cycle(machine), (antic.cmd & 0x0f), antic.modelines));
@@ -1244,7 +1244,7 @@ INLINE void LMS(running_machine *machine, int new_cmd)
**************************************************************/
if( new_cmd & ANTIC_LMS )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int addr = RDANTIC(space);
antic.doffs = (antic.doffs + 1) & DOFFS;
addr += 256 * RDANTIC(space);
@@ -1269,7 +1269,7 @@ INLINE void LMS(running_machine *machine, int new_cmd)
*****************************************************************************/
static void antic_scanline_dma(running_machine *machine, int param)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
LOG((" @cycle #%3d DMA fetch\n", cycle(machine)));
if (antic.scanline == VBL_END)
antic.r.nmist &= ~VBL_NMI;
diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c
index 4fde3037e47..aaf0aab77b4 100644
--- a/src/mame/video/atarisy1.c
+++ b/src/mame/video/atarisy1.c
@@ -386,7 +386,7 @@ WRITE16_HANDLER( atarisy1_spriteram_w )
TIMER_DEVICE_CALLBACK( atarisy1_int3off_callback )
{
- const address_space *space = cputag_get_address_space(timer.machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(timer.machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* clear the state */
atarigen_scanline_int_ack_w(space, 0, 0, 0xffff);
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index e66fc3740d7..2ae32d614dc 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -262,7 +262,7 @@ VIDEO_UPDATE( bionicc )
VIDEO_EOF( bionicc )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
}
diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c
index 8a0790323e7..043d7e15265 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -247,7 +247,7 @@ VIDEO_UPDATE( blktiger )
VIDEO_EOF( blktiger )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c
index b3bda386389..1a19ae0d56f 100644
--- a/src/mame/video/blstroid.c
+++ b/src/mame/video/blstroid.c
@@ -90,7 +90,7 @@ VIDEO_START( blstroid )
static TIMER_CALLBACK( irq_off )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* clear the interrupt */
atarigen_scanline_int_ack_w(space, 0, 0, 0xffff);
diff --git a/src/mame/video/btoads.c b/src/mame/video/btoads.c
index fb67fce5ce8..f06492c20fa 100644
--- a/src/mame/video/btoads.c
+++ b/src/mame/video/btoads.c
@@ -284,7 +284,7 @@ static void render_sprite_row(UINT16 *sprite_source, UINT32 address)
*
*************************************/
-void btoads_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void btoads_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
address &= ~0x40000000;
@@ -311,7 +311,7 @@ void btoads_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shif
}
-void btoads_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void btoads_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
address &= ~0x40000000;
diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c
index 79e4dc6f69a..e6700d987a8 100644
--- a/src/mame/video/cischeat.c
+++ b/src/mame/video/cischeat.c
@@ -1336,7 +1336,7 @@ if ( input_code_pressed(screen->machine, KEYCODE_Z) || input_code_pressed(screen
if (msk != 0) megasys1_active_layers &= msk;
#if 1
{
- const address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
popmessage("Cmd: %04X Pos:%04X Lim:%04X Inp:%04X",
scudhamm_motor_command,
diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c
index e7db4402765..4051cdcfd6c 100644
--- a/src/mame/video/combatsc.c
+++ b/src/mame/video/combatsc.c
@@ -517,7 +517,7 @@ byte #4:
static void bootleg_draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, const UINT8 *source, int circuit )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
const gfx_element *gfx = machine->gfx[circuit + 2];
int limit = circuit ? (memory_read_byte(space, 0xc2) * 256 + memory_read_byte(space, 0xc3)) : (memory_read_byte(space, 0xc0) * 256 + memory_read_byte(space, 0xc1));
diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c
index effc86d514d..ee4a2deec1f 100644
--- a/src/mame/video/commando.c
+++ b/src/mame/video/commando.c
@@ -147,7 +147,7 @@ VIDEO_UPDATE( commando )
VIDEO_EOF( commando )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c
index 8b764252d0a..08429a48608 100644
--- a/src/mame/video/crshrace.c
+++ b/src/mame/video/crshrace.c
@@ -219,7 +219,7 @@ VIDEO_UPDATE( crshrace )
VIDEO_EOF( crshrace )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
buffer_spriteram16_2_w(space, 0, 0, 0xffff);
diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c
index 618fd18c85c..d344a25dea4 100644
--- a/src/mame/video/dc.c
+++ b/src/mame/video/dc.c
@@ -130,7 +130,7 @@ static UINT32 dilated1[15][1024];
static int dilatechose[64];
static float wbuffer[480][640];
static UINT32 debug_dip_status;
-static void pvr_accumulationbuffer_to_framebuffer(const address_space *space, int x,int y);
+static void pvr_accumulationbuffer_to_framebuffer(address_space *space, int x,int y);
UINT64 *dc_framebuffer_ram; // '32-bit access area'
UINT64 *dc_texture_ram; // '64-bit access area'
@@ -1963,7 +1963,7 @@ static void render_tri(bitmap_t *bitmap, texinfo *ti, const vert *v)
static void render_to_accumulation_buffer(running_machine *machine,bitmap_t *bitmap,const rectangle *cliprect)
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
int cs,rs,ns;
UINT32 c;
#if 0
@@ -2033,7 +2033,7 @@ static void render_to_accumulation_buffer(running_machine *machine,bitmap_t *bit
*/
-static void pvr_accumulationbuffer_to_framebuffer(const address_space *space, int x,int y)
+static void pvr_accumulationbuffer_to_framebuffer(address_space *space, int x,int y)
{
// the accumulation buffer is always 8888
//
diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c
index 1874afe0e16..5cf09640aa4 100644
--- a/src/mame/video/dogfgt.c
+++ b/src/mame/video/dogfgt.c
@@ -224,7 +224,7 @@ VIDEO_UPDATE( dogfgt )
if (state->lastflip != flip_screen_get(screen->machine) || state->lastpixcolor != state->pixcolor)
{
- const address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
state->lastflip = flip_screen_get(screen->machine);
state->lastpixcolor = state->pixcolor;
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index e6cc38e8297..cc58cfca849 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -907,14 +907,14 @@ VIDEO_START( popbingo )
VIDEO_EOF( dooyong )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
VIDEO_EOF( rshark )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
}
diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c
index 7c5e1ce29f4..f51ceb22ec2 100644
--- a/src/mame/video/dynduke.c
+++ b/src/mame/video/dynduke.c
@@ -244,7 +244,7 @@ VIDEO_UPDATE( dynduke )
VIDEO_EOF( dynduke )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff); // Could be a memory location instead
}
diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c
index 0f30addd5e0..100dda894e0 100644
--- a/src/mame/video/exedexes.c
+++ b/src/mame/video/exedexes.c
@@ -247,7 +247,7 @@ VIDEO_UPDATE( exedexes )
VIDEO_EOF( exedexes )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/video/exterm.c b/src/mame/video/exterm.c
index 700ba969d3e..3aeb2b8a128 100644
--- a/src/mame/video/exterm.c
+++ b/src/mame/video/exterm.c
@@ -36,25 +36,25 @@ PALETTE_INIT( exterm )
*
*************************************/
-void exterm_to_shiftreg_master(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void exterm_to_shiftreg_master(address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(shiftreg, &exterm_master_videoram[TOWORD(address)], 256 * sizeof(UINT16));
}
-void exterm_from_shiftreg_master(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void exterm_from_shiftreg_master(address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(&exterm_master_videoram[TOWORD(address)], shiftreg, 256 * sizeof(UINT16));
}
-void exterm_to_shiftreg_slave(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void exterm_to_shiftreg_slave(address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(shiftreg, &exterm_slave_videoram[TOWORD(address)], 256 * 2 * sizeof(UINT8));
}
-void exterm_from_shiftreg_slave(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void exterm_from_shiftreg_slave(address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(&exterm_slave_videoram[TOWORD(address)], shiftreg, 256 * 2 * sizeof(UINT8));
}
diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c
index 8871c01a629..04b6cce6a3d 100644
--- a/src/mame/video/gaelco2.c
+++ b/src/mame/video/gaelco2.c
@@ -509,7 +509,7 @@ VIDEO_UPDATE( gaelco2_dual )
VIDEO_EOF( gaelco2 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* sprites are one frame ahead */
buffer_spriteram16_w(space, 0, 0, 0xffff);
diff --git a/src/mame/video/genesis.c b/src/mame/video/genesis.c
index 0ab9bd89d03..d3a761cc33d 100644
--- a/src/mame/video/genesis.c
+++ b/src/mame/video/genesis.c
@@ -43,10 +43,10 @@
static int vdp_data_r(running_machine *machine);
static void vdp_data_w(running_machine *machine, int data);
static int vdp_control_r(running_machine *machine);
-static void vdp_control_w(const address_space *space, int data);
+static void vdp_control_w(address_space *space, int data);
static void vdp_register_w(running_machine *machine, int data, int vblank);
-static void vdp_control_dma(const address_space *space, int data);
-static void vdp_dma_68k(const address_space *space);
+static void vdp_control_dma(address_space *space, int data);
+static void vdp_dma_68k(address_space *space);
static void vdp_dma_fill(int);
static void vdp_dma_copy(void);
@@ -490,7 +490,7 @@ static int vdp_control_r(running_machine *machine)
}
-static void vdp_control_w(const address_space *space, int data)
+static void vdp_control_w(address_space *space, int data)
{
/* case 1: we're not expecting the 2nd half of a command */
if (!vdp_cmdpart)
@@ -629,7 +629,7 @@ static void vdp_register_w(running_machine *machine, int data, int vblank)
}
-static void vdp_control_dma(const address_space *space, int data)
+static void vdp_control_dma(address_space *space, int data)
{
if ((vdp_code & 0x20) && (genesis_vdp_regs[1] & 0x10))
{
@@ -661,7 +661,7 @@ static void vdp_control_dma(const address_space *space, int data)
******************************************************************************/
-static void vdp_dma_68k(const address_space *space)
+static void vdp_dma_68k(address_space *space)
{
int length = genesis_vdp_regs[19] | (genesis_vdp_regs[20] << 8);
int source = (genesis_vdp_regs[21] << 1) | (genesis_vdp_regs[22] << 9) | ((genesis_vdp_regs[23] & 0x7f) << 17);
diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c
index 28f1bfa7ac3..a13d4e78666 100644
--- a/src/mame/video/gng.c
+++ b/src/mame/video/gng.c
@@ -152,7 +152,7 @@ VIDEO_UPDATE( gng )
VIDEO_EOF( gng )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/video/gtia.c b/src/mame/video/gtia.c
index 6ae4b4af3db..4ecfdc1922d 100644
--- a/src/mame/video/gtia.c
+++ b/src/mame/video/gtia.c
@@ -154,7 +154,7 @@ static int is_ntsc(running_machine *machine)
static void gtia_reset(running_machine &machine)
{
int i;
- const address_space *space = cputag_get_address_space(&machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(&machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* reset the GTIA read/write/helper registers */
for (i = 0; i < 32; i++)
diff --git a/src/mame/video/gtia.h b/src/mame/video/gtia.h
index 9555349156d..3fc7cd15f38 100644
--- a/src/mame/video/gtia.h
+++ b/src/mame/video/gtia.h
@@ -16,8 +16,8 @@
typedef struct _gtia_interface gtia_interface;
struct _gtia_interface
{
- UINT8 (*console_read)(const address_space *space);
- void (*console_write)(const address_space *space, UINT8 data);
+ UINT8 (*console_read)(address_space *space);
+ void (*console_write)(address_space *space, UINT8 data);
};
diff --git a/src/mame/video/harddriv.c b/src/mame/video/harddriv.c
index feb86e8cfb2..bb4a1869be8 100644
--- a/src/mame/video/harddriv.c
+++ b/src/mame/video/harddriv.c
@@ -96,7 +96,7 @@ VIDEO_START( harddriv )
*
*************************************/
-void hdgsp_write_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void hdgsp_write_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
harddriv_state *state = space->machine->driver_data<harddriv_state>();
@@ -124,7 +124,7 @@ void hdgsp_write_to_shiftreg(const address_space *space, UINT32 address, UINT16
}
-void hdgsp_read_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void hdgsp_read_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
harddriv_state *state = space->machine->driver_data<harddriv_state>();
diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c
index 82055cd400e..a911b6b9df3 100644
--- a/src/mame/video/hng64.c
+++ b/src/mame/video/hng64.c
@@ -1484,7 +1484,7 @@ VIDEO_UPDATE( hng64 )
// but it could be useful
if ( input_code_pressed_once(screen->machine, KEYCODE_L) )
{
- const address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
memory_write_byte(space, 0x2f27c8, 0x2);
}
#endif
diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c
index 517bc071e7b..b4bd9b9e45d 100644
--- a/src/mame/video/homedata.c
+++ b/src/mame/video/homedata.c
@@ -32,7 +32,7 @@
***************************************************************************/
-static void mrokumei_handleblit( const address_space *space, int rom_base )
+static void mrokumei_handleblit( address_space *space, int rom_base )
{
homedata_state *state = space->machine->driver_data<homedata_state>();
int i;
@@ -119,7 +119,7 @@ finish:
cpu_set_input_line(state->maincpu, M6809_FIRQ_LINE, HOLD_LINE);
}
-static void reikaids_handleblit( const address_space *space, int rom_base )
+static void reikaids_handleblit( address_space *space, int rom_base )
{
homedata_state *state = space->machine->driver_data<homedata_state>();
int i;
@@ -217,7 +217,7 @@ finish:
cpu_set_input_line(state->maincpu, M6809_FIRQ_LINE, HOLD_LINE);
}
-static void pteacher_handleblit( const address_space *space, int rom_base )
+static void pteacher_handleblit( address_space *space, int rom_base )
{
homedata_state *state = space->machine->driver_data<homedata_state>();
int i;
diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c
index db6661cec9e..963ef1cdec4 100644
--- a/src/mame/video/itech8.c
+++ b/src/mame/video/itech8.c
@@ -308,7 +308,7 @@ INLINE void consume_rle(int count)
*
*************************************/
-static void perform_blit(const address_space *space)
+static void perform_blit(address_space *space)
{
offs_t addr = tms_state.regs[TMS34061_XYADDRESS] | ((tms_state.regs[TMS34061_XYOFFSET] & 0x300) << 8);
UINT8 shift = (BLITTER_FLAGS & BLITFLAG_SHIFT) ? 4 : 0;
diff --git a/src/mame/video/jaguar.c b/src/mame/video/jaguar.c
index a8e7cbe086b..5c3145ddce0 100644
--- a/src/mame/video/jaguar.c
+++ b/src/mame/video/jaguar.c
@@ -493,7 +493,7 @@ static void jaguar_set_palette(UINT16 vmode)
static UINT8 *get_jaguar_memory(running_machine *machine, UINT32 offset)
{
- const address_space *space = cputag_get_address_space(machine, "gpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "gpu", ADDRESS_SPACE_PROGRAM);
return (UINT8 *)memory_get_read_ptr(space, offset);
}
diff --git a/src/mame/video/jpmimpct.c b/src/mame/video/jpmimpct.c
index fac3e009c6a..aa7f8410c02 100644
--- a/src/mame/video/jpmimpct.c
+++ b/src/mame/video/jpmimpct.c
@@ -98,12 +98,12 @@ READ16_HANDLER( jpmimpct_bt477_r )
*
*************************************/
-void jpmimpct_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void jpmimpct_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(shiftreg, &jpmimpct_vram[TOWORD(address)], 512 * sizeof(UINT16));
}
-void jpmimpct_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void jpmimpct_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(&jpmimpct_vram[TOWORD(address)], shiftreg, 512 * sizeof(UINT16));
}
diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c
index a47405fff31..d954c677e44 100644
--- a/src/mame/video/lastduel.c
+++ b/src/mame/video/lastduel.c
@@ -308,7 +308,7 @@ VIDEO_UPDATE( madgear )
VIDEO_EOF( lastduel )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* Spriteram is always 1 frame ahead, suggesting buffering. I can't find
a register to control this so I assume it happens automatically
diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c
index cb126adb7fd..f7a514db9f6 100644
--- a/src/mame/video/leland.c
+++ b/src/mame/video/leland.c
@@ -169,7 +169,7 @@ static void leland_video_addr_w(int offset, int data, int num)
*
*************************************/
-static int leland_vram_port_r(const address_space *space, int offset, int num)
+static int leland_vram_port_r(address_space *space, int offset, int num)
{
struct vram_state_data *state = vram_state + num;
int addr = state->addr;
@@ -216,7 +216,7 @@ static int leland_vram_port_r(const address_space *space, int offset, int num)
*
*************************************/
-static void leland_vram_port_w(const address_space *space, int offset, int data, int num)
+static void leland_vram_port_w(address_space *space, int offset, int data, int num)
{
struct vram_state_data *state = vram_state + num;
int addr = state->addr;
@@ -306,7 +306,7 @@ WRITE8_HANDLER( leland_master_video_addr_w )
static TIMER_CALLBACK( leland_delayed_mvram_w )
{
- const address_space *space = cputag_get_address_space(machine, "master", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "master", ADDRESS_SPACE_PROGRAM);
int num = (param >> 16) & 1;
int offset = (param >> 8) & 0xff;
diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c
index 133acaf304e..49ed9bdbf55 100644
--- a/src/mame/video/lwings.c
+++ b/src/mame/video/lwings.c
@@ -293,7 +293,7 @@ VIDEO_UPDATE( trojan )
VIDEO_EOF( lwings )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/video/midtunit.c b/src/mame/video/midtunit.c
index d910fea0dd3..9634132d083 100644
--- a/src/mame/video/midtunit.c
+++ b/src/mame/video/midtunit.c
@@ -220,13 +220,13 @@ READ16_HANDLER( midtunit_vram_color_r )
*
*************************************/
-void midtunit_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void midtunit_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(shiftreg, &local_videoram[address >> 3], 2 * 512 * sizeof(UINT16));
}
-void midtunit_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void midtunit_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(&local_videoram[address >> 3], shiftreg, 2 * 512 * sizeof(UINT16));
}
diff --git a/src/mame/video/midyunit.c b/src/mame/video/midyunit.c
index b35fad0fc41..a321d8b5297 100644
--- a/src/mame/video/midyunit.c
+++ b/src/mame/video/midyunit.c
@@ -200,13 +200,13 @@ READ16_HANDLER( midyunit_vram_r )
*
*************************************/
-void midyunit_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void midyunit_to_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(shiftreg, &local_videoram[address >> 3], 2 * 512 * sizeof(UINT16));
}
-void midyunit_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+void midyunit_from_shiftreg(address_space *space, UINT32 address, UINT16 *shiftreg)
{
memcpy(&local_videoram[address >> 3], shiftreg, 2 * 512 * sizeof(UINT16));
}
diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c
index 89b67b6443a..df872a32c4e 100644
--- a/src/mame/video/model3.c
+++ b/src/mame/video/model3.c
@@ -814,7 +814,7 @@ void real3d_display_list_end(running_machine *machine)
// real3d_display_list = 1;
}
-void real3d_display_list1_dma(const address_space *space, UINT32 src, UINT32 dst, int length, int byteswap)
+void real3d_display_list1_dma(address_space *space, UINT32 src, UINT32 dst, int length, int byteswap)
{
int i;
int d = (dst & 0xffffff) / 4;
@@ -830,7 +830,7 @@ void real3d_display_list1_dma(const address_space *space, UINT32 src, UINT32 dst
}
}
-void real3d_display_list2_dma(const address_space *space, UINT32 src, UINT32 dst, int length, int byteswap)
+void real3d_display_list2_dma(address_space *space, UINT32 src, UINT32 dst, int length, int byteswap)
{
int i;
int d = (dst & 0xffffff) / 4;
@@ -846,7 +846,7 @@ void real3d_display_list2_dma(const address_space *space, UINT32 src, UINT32 dst
}
}
-void real3d_vrom_texture_dma(const address_space *space, UINT32 src, UINT32 dst, int length, int byteswap)
+void real3d_vrom_texture_dma(address_space *space, UINT32 src, UINT32 dst, int length, int byteswap)
{
if((dst & 0xff) == 0) {
@@ -863,7 +863,7 @@ void real3d_vrom_texture_dma(const address_space *space, UINT32 src, UINT32 dst,
}
}
-void real3d_texture_fifo_dma(const address_space *space, UINT32 src, int length, int byteswap)
+void real3d_texture_fifo_dma(address_space *space, UINT32 src, int length, int byteswap)
{
int i;
for(i=0; i < length; i+=4) {
@@ -879,7 +879,7 @@ void real3d_texture_fifo_dma(const address_space *space, UINT32 src, int length,
}
}
-void real3d_polygon_ram_dma(const address_space *space, UINT32 src, UINT32 dst, int length, int byteswap)
+void real3d_polygon_ram_dma(address_space *space, UINT32 src, UINT32 dst, int length, int byteswap)
{
int i;
int d = (dst & 0xffffff) / 4;
diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c
index e0fc7d979ce..ae701b604e8 100644
--- a/src/mame/video/namcos22.c
+++ b/src/mame/video/namcos22.c
@@ -172,7 +172,7 @@ Clamp256( int v )
} /* Clamp256 */
#ifdef MAME_DEBUG
-static void Dump( const address_space *space, FILE *f, unsigned addr1, unsigned addr2, const char *name );
+static void Dump( address_space *space, FILE *f, unsigned addr1, unsigned addr2, const char *name );
#endif
static struct
@@ -2273,7 +2273,7 @@ VIDEO_UPDATE( namcos22s )
FILE *f = fopen( "dump.txt", "wb" );
if( f )
{
- const address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
{
int i,bank;
@@ -2323,7 +2323,7 @@ VIDEO_UPDATE( namcos22 )
FILE *f = fopen( "dump.txt", "wb" );
if( f )
{
- const address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
// Dump(space, f,0x90000000, 0x90000003, "led?" );
// Dump(space, f,0x90010000, 0x90017fff, "cz_ram");
@@ -2395,7 +2395,7 @@ WRITE16_HANDLER( namcos22_dspram16_w )
#ifdef MAME_DEBUG
static void
-Dump( const address_space *space, FILE *f, unsigned addr1, unsigned addr2, const char *name )
+Dump( address_space *space, FILE *f, unsigned addr1, unsigned addr2, const char *name )
{
unsigned addr;
fprintf( f, "%s:\n", name );
diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c
index 91790c23c3e..5ed719bb1c5 100644
--- a/src/mame/video/ojankohs.c
+++ b/src/mame/video/ojankohs.c
@@ -192,7 +192,7 @@ static TILE_GET_INFO( ojankoy_get_tile_info )
******************************************************************************/
-void ojankoc_flipscreen( const address_space *space, int data )
+void ojankoc_flipscreen( address_space *space, int data )
{
ojankohs_state *state = space->machine->driver_data<ojankohs_state>();
int x, y;
@@ -332,7 +332,7 @@ VIDEO_UPDATE( ojankoc )
if (state->screen_refresh)
{
- const address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* redraw bitmap */
for (offs = 0; offs < 0x8000; offs++)
diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c
index 0fa95cee92d..eae5eafc950 100644
--- a/src/mame/video/popeye.c
+++ b/src/mame/video/popeye.c
@@ -281,7 +281,7 @@ VIDEO_START( popeye )
static void draw_background(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect)
{
int offs;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
if (lastflip != flip_screen_get(machine))
{
diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c
index 70e8850fad4..c6036f8d297 100644
--- a/src/mame/video/ppu2c0x.c
+++ b/src/mame/video/ppu2c0x.c
@@ -76,7 +76,7 @@ static const pen_t default_colortable[] =
typedef struct _ppu2c0x_state ppu2c0x_state;
struct _ppu2c0x_state
{
- const address_space *space; /* memory space */
+ address_space *space; /* memory space */
bitmap_t *bitmap; /* target bitmap */
UINT8 *spriteram; /* sprite ram */
pen_t *colortable; /* color table modified at run time */
@@ -1179,7 +1179,7 @@ WRITE8_DEVICE_HANDLER( ppu2c0x_w )
*
*************************************/
-void ppu2c0x_spriteram_dma( const address_space *space, running_device *device, const UINT8 page )
+void ppu2c0x_spriteram_dma( address_space *space, running_device *device, const UINT8 page )
{
int i;
int address = page << 8;
diff --git a/src/mame/video/ppu2c0x.h b/src/mame/video/ppu2c0x.h
index 6c73a7d4b99..637982db77c 100644
--- a/src/mame/video/ppu2c0x.h
+++ b/src/mame/video/ppu2c0x.h
@@ -108,7 +108,7 @@ DECLARE_LEGACY_MEMORY_DEVICE(PPU_2C07, ppu2c07); // PAL NES
void ppu2c0x_init_palette(running_machine *machine, int first_entry ) ATTR_NONNULL(1);
void ppu2c0x_init_palette_rgb(running_machine *machine, int first_entry ) ATTR_NONNULL(1);
-void ppu2c0x_spriteram_dma(const address_space *space, running_device *device, const UINT8 page ) ATTR_NONNULL(1);
+void ppu2c0x_spriteram_dma(address_space *space, running_device *device, const UINT8 page ) ATTR_NONNULL(1);
void ppu2c0x_render( running_device *device, bitmap_t *bitmap, int flipx, int flipy, int sx, int sy ) ATTR_NONNULL(1);
int ppu2c0x_get_pixel( running_device *device, int x, int y ) ATTR_NONNULL(1);
int ppu2c0x_get_colorbase( running_device *device ) ATTR_NONNULL(1);
diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c
index e4de1de69fd..4f86599b6d3 100644
--- a/src/mame/video/psikyosh.c
+++ b/src/mame/video/psikyosh.c
@@ -1342,7 +1342,7 @@ popmessage ("%08x %08x %08x %08x\n%08x %08x %08x %08x",
VIDEO_EOF( psikyosh )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram32_w(space, 0, 0, 0xffffffff);
}
diff --git a/src/mame/video/psx.c b/src/mame/video/psx.c
index 78b735ab7e3..95fdd15b25d 100644
--- a/src/mame/video/psx.c
+++ b/src/mame/video/psx.c
@@ -3922,7 +3922,7 @@ INTERRUPT_GEN( psx_vblank )
void psx_gpu_reset( running_machine *machine )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
psx_gpu_w(space, 1, 0, 0xffffffff );
}
diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c
index 6ea5d062379..6d02dc19952 100644
--- a/src/mame/video/segas32.c
+++ b/src/mame/video/segas32.c
@@ -433,7 +433,7 @@ INLINE UINT16 common_paletteram_r(int which, offs_t offset)
}
-static void common_paletteram_w(const address_space *space, int which, offs_t offset, UINT16 data, UINT16 mem_mask)
+static void common_paletteram_w(address_space *space, int which, offs_t offset, UINT16 data, UINT16 mem_mask)
{
UINT16 value;
int convert;
diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c
index f5e200b70ba..972a829d1b0 100644
--- a/src/mame/video/sidearms.c
+++ b/src/mame/video/sidearms.c
@@ -368,7 +368,7 @@ VIDEO_UPDATE( sidearms )
VIDEO_EOF( sidearms )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram_w(space, 0, 0);
}
diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c
index ae8b10f9daf..550597d8884 100644
--- a/src/mame/video/simpsons.c
+++ b/src/mame/video/simpsons.c
@@ -97,7 +97,7 @@ static WRITE8_HANDLER( simpsons_k053247_w )
void simpsons_video_banking( running_machine *machine, int bank )
{
simpsons_state *state = machine->driver_data<simpsons_state>();
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
if (bank & 1)
{
diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c
index 66c4e747e59..88b03e83923 100644
--- a/src/mame/video/skydiver.c
+++ b/src/mame/video/skydiver.c
@@ -17,7 +17,7 @@ static int width = 0;
MACHINE_RESET( skydiver )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* reset all latches */
skydiver_start_lamp_1_w(space, 0, 0);
diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c
index c96107251d6..a50acf369d1 100644
--- a/src/mame/video/srumbler.c
+++ b/src/mame/video/srumbler.c
@@ -170,7 +170,7 @@ VIDEO_UPDATE( srumbler )
VIDEO_EOF( srumbler )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram_w(space,0,0);
}
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index 6d158f7360e..cdff33f9867 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -28,7 +28,7 @@ WRITE16_HANDLER( hitice_pixel_scroll_w )
static void hitice_clear_pixel_bitmap( running_machine *machine )
{
int i;
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
for (i = 0; i < 0x40000; i++)
hitice_pixelram_w(space, i, 0, 0xffff);
diff --git a/src/mame/video/tia.c b/src/mame/video/tia.c
index d665baddc67..9257f52e138 100644
--- a/src/mame/video/tia.c
+++ b/src/mame/video/tia.c
@@ -506,13 +506,13 @@ static int collision_check(UINT8* p1, UINT8* p2, int x1, int x2)
}
-INLINE int current_x(const address_space *space)
+INLINE int current_x(address_space *space)
{
return 3 * ((space->machine->firstcpu->total_cycles() - frame_cycles) % 76) - 68;
}
-INLINE int current_y(const address_space *space)
+INLINE int current_y(address_space *space)
{
return (space->machine->firstcpu->total_cycles() - frame_cycles) / 76;
}
diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c
index 91874f8e82b..a7c3c7b9798 100644
--- a/src/mame/video/tigeroad.c
+++ b/src/mame/video/tigeroad.c
@@ -165,7 +165,7 @@ VIDEO_UPDATE( tigeroad )
VIDEO_EOF( tigeroad )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
}
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index 51f373e5e4e..f756802c927 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -314,13 +314,13 @@ static void toaplan1_set_scrolls(void)
static STATE_POSTLOAD( rallybik_flipscreen )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
rallybik_bcu_flipscreen_w(space, 0, bcu_flipscreen, 0xffff);
}
static STATE_POSTLOAD( toaplan1_flipscreen )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
toaplan1_bcu_flipscreen_w(space, 0, bcu_flipscreen, 0xffff);
}
@@ -1227,20 +1227,20 @@ VIDEO_UPDATE( demonwld )
VIDEO_EOF( rallybik )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
}
VIDEO_EOF( toaplan1 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
memcpy(toaplan1_buffered_spritesizeram16, toaplan1_spritesizeram16, TOAPLAN1_SPRITESIZERAM_SIZE);
}
VIDEO_EOF( samesame )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space, 0, 0, 0xffff);
memcpy(toaplan1_buffered_spritesizeram16, toaplan1_spritesizeram16, TOAPLAN1_SPRITESIZERAM_SIZE);
cputag_set_input_line(machine, "maincpu", M68K_IRQ_2, HOLD_LINE); /* Frame done */
diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c
index 4b6e68ba031..fc0f7e7f482 100644
--- a/src/mame/video/twin16.c
+++ b/src/mame/video/twin16.c
@@ -547,7 +547,7 @@ VIDEO_EOF( twin16 )
memcpy(twin16_sprite_buffer,&machine->generic.spriteram.u16[0x1800],0x800*sizeof(UINT16));
}
else {
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
buffer_spriteram16_w(space,0,0,0xffff);
}
}
diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c
index ed79d6d4f84..ba0862bd5a0 100644
--- a/src/mame/video/twincobr.c
+++ b/src/mame/video/twincobr.c
@@ -505,7 +505,7 @@ VIDEO_UPDATE( toaplan0 )
VIDEO_EOF( toaplan0 )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
/* Spriteram is always 1 frame ahead, suggesting spriteram buffering.
There are no CPU output registers that control this so we
diff --git a/src/mame/video/vdc.c b/src/mame/video/vdc.c
index 4815c2d3a3b..582b50ed8ed 100644
--- a/src/mame/video/vdc.c
+++ b/src/mame/video/vdc.c
@@ -1179,7 +1179,7 @@ READ8_HANDLER( vpc_r )
static void vpc_init( running_machine *machine )
{
- const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
+ address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM);
vpc_w( space, 0, 0x11 );
vpc_w( space, 1, 0x11 );
vpc.window1.w = 0;
diff --git a/src/mame/video/vrender0.c b/src/mame/video/vrender0.c
index 853f7c84f4a..7cb5a28ae2b 100644
--- a/src/mame/video/vrender0.c
+++ b/src/mame/video/vrender0.c
@@ -403,7 +403,7 @@ static const _DrawTemplate DrawTile[]=
int vrender0_ProcessPacket(running_device *device, UINT32 PacketPtr, UINT16 *Dest, UINT8 *TEXTURE)
{
vr0video_state *vr0 = get_safe_token(device);
- const address_space *space = cpu_get_address_space(vr0->cpu, ADDRESS_SPACE_PROGRAM);
+ address_space *space = cpu_get_address_space(vr0->cpu, ADDRESS_SPACE_PROGRAM);
UINT32 Dx = Packet(1) & 0x3ff;
UINT32 Dy = Packet(2) & 0x1ff;
UINT32 Endx = Packet(3) & 0x3ff;
diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c
index 787ee0f0a0c..c54e7f51918 100644
--- a/src/mame/video/williams.c
+++ b/src/mame/video/williams.c
@@ -158,7 +158,7 @@ static UINT8 williams2_fg_color;
static void blitter_init(running_machine *machine, int blitter_config, const UINT8 *remap_prom);
static void create_palette_lookup(running_machine *machine);
static TILE_GET_INFO( get_tile_info );
-static int blitter_core(const address_space *space, int sstart, int dstart, int w, int h, int data);
+static int blitter_core(address_space *space, int sstart, int dstart, int w, int h, int data);
@@ -603,7 +603,7 @@ WRITE8_HANDLER( williams2_blit_window_enable_w )
*
*************************************/
-INLINE void blit_pixel(const address_space *space, int offset, int srcdata, int data, int mask, int solid)
+INLINE void blit_pixel(address_space *space, int offset, int srcdata, int data, int mask, int solid)
{
/* always read from video RAM regardless of the bank setting */
int pix = (offset < 0xc000) ? williams_videoram[offset] : memory_read_byte(space, offset);
@@ -630,7 +630,7 @@ INLINE void blit_pixel(const address_space *space, int offset, int srcdata, int
}
-static int blitter_core(const address_space *space, int sstart, int dstart, int w, int h, int data)
+static int blitter_core(address_space *space, int sstart, int dstart, int w, int h, int data)
{
int source, sxadv, syadv;
int dest, dxadv, dyadv;
diff --git a/src/osd/sdl/debugosx.m b/src/osd/sdl/debugosx.m
index bd12c85ecca..ba3107b6cc1 100644
--- a/src/osd/sdl/debugosx.m
+++ b/src/osd/sdl/debugosx.m
@@ -878,7 +878,7 @@ void console_create_window(running_machine *machine)
@implementation MAMEDisassemblyView
-- (device_debug::breakpoint *)findBreakpointAtAddress:(offs_t)address inAddressSpace:(const address_space *)space {
+- (device_debug::breakpoint *)findBreakpointAtAddress:(offs_t)address inAddressSpace:(address_space *)space {
device_debug *cpuinfo = space->cpu->debug();
device_debug::breakpoint *bp;
for (bp = cpuinfo->breakpoint_first(); (bp != NULL) && (address != bp->address()); bp = bp->next()) {}
@@ -1081,7 +1081,7 @@ void console_create_window(running_machine *machine)
- (IBAction)debugToggleBreakpoint:(id)sender {
if (view->cursor_visible()) {
- const address_space *space = downcast<const debug_view_disasm_source *>(view->source())->space();
+ address_space *space = downcast<const debug_view_disasm_source *>(view->source())->space();
if (!useConsole || (debug_cpu_get_visible_cpu(machine) == space->cpu)) {
offs_t address = downcast<debug_view_disasm *>(view)->selected_address();
device_debug::breakpoint *bp = [self findBreakpointAtAddress:address inAddressSpace:space];
@@ -1107,7 +1107,7 @@ void console_create_window(running_machine *machine)
- (IBAction)debugToggleBreakpointEnable:(id)sender {
if (view->cursor_visible()) {
- const address_space *space = downcast<const debug_view_disasm_source *>(view->source())->space();
+ address_space *space = downcast<const debug_view_disasm_source *>(view->source())->space();
if (!useConsole || (debug_cpu_get_visible_cpu(machine) == space->cpu)) {
offs_t address = downcast<debug_view_disasm *>(view)->selected_address();
device_debug::breakpoint *bp = [self findBreakpointAtAddress:address inAddressSpace:space];
@@ -1131,7 +1131,7 @@ void console_create_window(running_machine *machine)
- (IBAction)debugRunToCursor:(id)sender {
if (view->cursor_visible()) {
- const address_space *space = downcast<const debug_view_disasm_source *>(view->source())->space();
+ address_space *space = downcast<const debug_view_disasm_source *>(view->source())->space();
if (debug_cpu_get_visible_cpu(machine) == space->cpu) {
offs_t address = downcast<debug_view_disasm *>(view)->selected_address();
if (useConsole) {